diff options
Diffstat (limited to 'scripts/celadongamecorner.asm')
| -rwxr-xr-x | scripts/celadongamecorner.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 0c4fd963..43aae927 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -4,7 +4,7 @@ CeladonGameCornerScript: call EnableAutoTextBoxDrawing ld hl, CeladonGameCornerScriptPointers ld a, [wCeladonGameCornerCurScript] - jp CallFunctionInTable + jp JumpTable CeladonGameCornerScript_48bcf: ld hl, wCurrentMapScriptFlags @@ -71,8 +71,12 @@ CeladonGameCornerScript1: .asm_48c43 ld a, [wXCoord] cp $8 - jr nz, .asm_48c4d + jr nz, .pikachu ld de, MovementData_48c63 + jr .asm_48c4d +.pikachu + callab Func_f1f23 + ld de, MovementData_48c5a .asm_48c4d ld a, $b ld [H_SPRITEINDEX], a @@ -85,8 +89,8 @@ MovementData_48c5a: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_UP db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_UP db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT @@ -144,7 +148,7 @@ CeladonGameCornerText2: ld a, [wCurrentMenuItem] and a jr nz, .asm_48d0f - ld b,COIN_CASE + ld b, COIN_CASE call IsItemInBag jr z, .asm_48d19 call Has9990Coins @@ -345,8 +349,7 @@ CeladonGameCornerText_48e26: Received20CoinsText: TX_FAR _Received20CoinsText - TX_SFX_ITEM - db "@" + db $0B, "@" CeladonGameCornerText_48e31: TX_FAR _CeladonGameCornerText_48e31 @@ -362,7 +365,7 @@ CeladonGameCornerText10: jr nz, .asm_48e75 ld hl, CeladonGameCornerText_48e88 call PrintText - ld b,COIN_CASE + ld b, COIN_CASE call IsItemInBag jr z, .asm_48e7f call Has9990Coins @@ -397,8 +400,7 @@ CeladonGameCornerText_48e88: CeladonGameCornerText_48e8d: TX_FAR _CeladonGameCornerText_48e8d - TX_SFX_ITEM - db "@" + db $0B, "@" CeladonGameCornerText_48e93: TX_FAR _CeladonGameCornerText_48e93 @@ -475,13 +477,11 @@ CeladonGameCornerScript_48f1e: ld hl, wd730 set 6, [hl] coord hl, 11, 0 - ld b, $5 - ld c, $7 + lb bc, 5, 7 call TextBoxBorder call UpdateSprites coord hl, 12, 1 - ld b, 4 - ld c, 7 + lb bc, 4, 7 call ClearScreenArea coord hl, 12, 2 ld de, GameCornerMoneyText @@ -491,7 +491,7 @@ CeladonGameCornerScript_48f1e: call PlaceString coord hl, 12, 3 ld de, wPlayerMoney - ld c, $a3 + ld c, 3 | MONEY_SIGN | LEADING_ZEROES call PrintBCDNumber coord hl, 12, 4 ld de, GameCornerCoinText |