diff options
Diffstat (limited to 'scripts/route22.asm')
| -rwxr-xr-x | scripts/route22.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/scripts/route22.asm b/scripts/route22.asm index 49c57a47..fe881366 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -1,7 +1,7 @@ Route22Script: call EnableAutoTextBoxDrawing ld hl, Route22ScriptPointers - ld a, [W_ROUTE22CURSCRIPT] + ld a, [wRoute22CurScript] jp JumpTable Route22ScriptPointers: @@ -17,7 +17,7 @@ Route22ScriptPointers: Route22Script_50ece: xor a ld [wJoyIgnore], a - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a Route22Script7: ret @@ -31,7 +31,7 @@ Route22Script_50ed6: Route22Script_50ee1: ld a, OPP_SONY2 ld [wCurOpponent], a - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] add 7 ld [wTrainerNo], a ret @@ -98,7 +98,7 @@ Route22Script0: ld [H_SPRITEINDEX], a call Route22MoveRivalSprite ld a, $1 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22Script1: @@ -132,7 +132,7 @@ Route22Script1: call SaveEndBattleTextPointers call Route22Script_50ed6 ld a, $2 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22RivalDefeatedText1: @@ -147,11 +147,11 @@ Route22Script2: ld a, [wIsInBattle] cp $ff jp z, Route22Script_50ece - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] cp 2 jr nz, .asm_50fc9 ld a, $1 - ld [W_RIVALSTARTER], a + ld [wRivalStarter], a .asm_50fc9 ld a, [wPlayerFacingDirection] and a ; cp SPRITE_FACING_DOWN @@ -182,7 +182,7 @@ Route22Script2: call Route22Script_5100d .asm_51002 ld a, $3 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22Script_51008: @@ -231,7 +231,7 @@ Route22Script3: call PlayDefaultMusic ResetEvents EVENT_1ST_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE ld a, $0 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22Script_5104e: @@ -251,7 +251,7 @@ Route22Script_5104e: ld [H_SPRITEINDEX], a call Route22MoveRivalSprite ld a, $4 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22Script4: @@ -287,7 +287,7 @@ Route22Script4: call SaveEndBattleTextPointers call Route22Script_50ee1 ld a, $5 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22RivalDefeatedText2: @@ -335,7 +335,7 @@ Route22Script5: call Route22Script_51142 .asm_51137 ld a, $6 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22Script_5113d: @@ -370,7 +370,7 @@ Route22Script6: call PlayDefaultMusic ResetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE ld a, $7 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22TextPointers: |