diff options
Diffstat (limited to 'scripts/pallettown.asm')
| -rwxr-xr-x | scripts/pallettown.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index 0b383110..27bae365 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -5,7 +5,7 @@ PalletTownScript: ; 18e5b (6:4e5b) .next call EnableAutoTextBoxDrawing ld hl, PalletTownScriptPointers - ld a, [W_PALLETTOWNCURSCRIPT] + ld a, [wPalletTownCurScript] jp JumpTable PalletTownScriptPointers: ; 18e73 (6:4e73) @@ -47,7 +47,7 @@ PalletTownScript0: ; 18e81 (6:4e81) ; trigger the next script ld a, 1 - ld [W_PALLETTOWNCURSCRIPT], a + ld [wPalletTownCurScript], a ret PalletTownScript1: ; 18eb2 (6:4eb2) @@ -75,7 +75,7 @@ PalletTownScript1: ; 18eb2 (6:4eb2) ld a, SPRITE_FACING_UP ld [wSpriteStateData1 + 1 * $10 + 9], a ld a, 2 - ld [W_PALLETTOWNCURSCRIPT], a + ld [wPalletTownCurScript], a ret PalletTownScript2: ; 18ed2 (6:4ed2) @@ -98,7 +98,7 @@ PalletTownScript2: ; 18ed2 (6:4ed2) ; trigger the next script ld a, 3 - ld [W_PALLETTOWNCURSCRIPT], a + ld [wPalletTownCurScript], a ret PalletTownScript3: ; 18f12 (6:4f12) @@ -130,7 +130,7 @@ PalletTownScript3: ; 18f12 (6:4f12) ; trigger the next script ld a, 4 - ld [W_PALLETTOWNCURSCRIPT], a + ld [wPalletTownCurScript], a ret PalletTownScript4: ; 18f4b (6:4f4b) @@ -139,7 +139,7 @@ PalletTownScript4: ; 18f4b (6:4f4b) ld [wJoyIgnore], a xor a ld [wListScrollOffset], a - ld a, STARTER_PIKACHU_BATTLE + ld a, BATTLE_TYPE_PIKACHU ld [wBattleType], a ld a, PIKACHU ld [wCurOpponent], a @@ -148,7 +148,7 @@ PalletTownScript4: ; 18f4b (6:4f4b) ; trigger the next script ld a, 5 - ld [W_PALLETTOWNCURSCRIPT], a + ld [wPalletTownCurScript], a ret PalletTownScript5: ; 18f56 (6:4f56) @@ -169,7 +169,7 @@ PalletTownScript5: ; 18f56 (6:4f56) ; trigger the next script ld a, 6 - ld [W_PALLETTOWNCURSCRIPT], a + ld [wPalletTownCurScript], a ret PalletTownScript6: ; 18f87 (6:4f87) @@ -186,7 +186,7 @@ PalletTownScript6: ; 18f87 (6:4f87) ; trigger the next script ld a, 7 - ld [W_PALLETTOWNCURSCRIPT], a + ld [wPalletTownCurScript], a ret PalletTownScript7: @@ -196,7 +196,7 @@ PalletTownScript7: ; trigger the next script ld a, 8 - ld [W_PALLETTOWNCURSCRIPT], a + ld [wPalletTownCurScript], a ret PalletTownScript8: |