Lower p of shop bubble text and fix intermittent initial delay in dis…

…playing said text.

game/src/shop/core.asm

@@ -397,10 +397,10 @@ ShopPrepareFadeInPlusDisplayMoneyAndSpritesState::
   ld [$C103], a
   ld a, $18
   ld [$C104], a
-  ld a, 1
-  ld [$C0A0], a
-  ld a, 0
+  xor a
   ld [$C0A1], a
+  inc a ; ld a, 1
+  ld [$C0A0], a
   ld a, $B4
   ld [$C0A2], a
   ld a, 7
@@ -411,12 +411,12 @@ ShopPrepareFadeInPlusDisplayMoneyAndSpritesState::
   ld [$C0A4], a
   ld a, 1
   ld [W_OAM_SpritesReady], a
-  ld a, 0
+  xor a
   ld b, a
   ld a, $36
   ld de, $C0A0
   call $33B2
-  ld a, 0
+  xor a
   ld b, a
   ld a, $84
   ld de, $C100
@@ -432,7 +432,9 @@ ShopShopkeeperWelcomeMessageState::
   add $DE
   ld c, a
   ld b, 0
-  ld a, 2
+  ld a, 1
+  ld [W_OAM_SpritesReady], a
+  inc a ; ld a, 2
   call WrapMainScriptProcessor
   ld a, [W_MainScriptExitMode]
   or a

game/src/shop/paint_core.asm

@@ -116,7 +116,7 @@ PaintShopMappingState::
 PaintShopDisplayMoneyAndSpritesState::
   ld a, 1
   ld [$C0E0], a
-  ld a, 0
+  xor a
   ld [$C0E1], a
   ld a, $B4
   ld [$C0E2], a
@@ -132,20 +132,20 @@ PaintShopDisplayMoneyAndSpritesState::
   ld [$C101], a
   ld a, $A3
   ld [$C102], a
-  ld a, 0
+  xor a
   ld [$C105], a
   ld a, $58 ; Previously $59
   ld [$C103], a
   ld a, $18
   ld [$C104], a
   ld a, 1
   ld [W_OAM_SpritesReady], a
-  ld a, 0
+  xor a
   ld b, a
   ld a, $36
   ld de, $C0E0
   call $33B2
-  ld a, 0
+  xor a
   ld b, a
   ld a, $9E
   ld de, $C100
@@ -158,7 +158,9 @@ PaintShopDisplayMoneyAndSpritesState::
 
 PaintShopPrintOpeningMessageState::
   ld bc, $A0
-  ld a, 2
+  ld a, 1
+  ld [W_OAM_SpritesReady], a
+  inc a ; ld a, 2
   call WrapMainScriptProcessor
   ld a, [W_MainScriptExitMode]
   or a

game/src/version/metasprites02.asm

@@ -463,31 +463,31 @@ Metasprite0236::
   db $00,$10,$42,$01,$14
   db $00,$18,$43,$01,$14
   db $00,$20,$44,$01,$14
-  db $00,$28,$45,$01,$14
-  db $00,$30,$46,$01,$14
+  db $05,$28,$45,$01,$14
+  db $05,$30,$46,$01,$14
   db $08,$00,$47,$01,$14
   db $08,$08,$48,$01,$14
   db $08,$10,$49,$01,$14
   db $08,$18,$4A,$01,$14
   db $08,$20,$4B,$01,$14
-  db $08,$28,$4C,$01,$14
-  db $08,$30,$4D,$01,$14
+  db $0D,$28,$4C,$01,$14
+  db $0D,$30,$4D,$01,$14
 Metasprite0281::
   db $0E
   db $00,$00,$4E,$01,$14
   db $00,$08,$4F,$01,$14
   db $00,$10,$50,$01,$14
   db $00,$18,$51,$01,$14
   db $00,$20,$52,$01,$14
-  db $00,$28,$53,$01,$14
-  db $00,$30,$54,$01,$14
+  db $05,$28,$53,$01,$14
+  db $05,$30,$54,$01,$14
   db $08,$00,$55,$01,$14
   db $08,$08,$56,$01,$14
   db $08,$10,$57,$01,$14
   db $08,$18,$58,$01,$14
   db $08,$20,$59,$01,$14
-  db $08,$28,$5A,$01,$14
-  db $08,$30,$5B,$01,$14
+  db $0D,$28,$5A,$01,$14
+  db $0D,$30,$5B,$01,$14
 Metasprite0282::
   db $04
   db $00,$00,$64,$01,$12