diff options
Diffstat (limited to 'scripts/oakslab.asm')
| -rwxr-xr-x | scripts/oakslab.asm | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 6fd540d0..5b10668e 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -6,7 +6,7 @@ OaksLabScript: ; 1cb0e (7:4b0e) xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, OaksLabScriptPointers - ld a, [W_OAKSLABCURSCRIPT] + ld a, [wOaksLabCurScript] call JumpTable ret @@ -48,7 +48,7 @@ OaksLabScript0: ; 1cb4e (7:4b4e) res 4, [hl] ld a, $1 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript1: ; 1cb6e (7:4b6e) @@ -58,7 +58,7 @@ OaksLabScript1: ; 1cb6e (7:4b6e) call MoveSprite ld a, $2 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OakEntryMovement: ; 1cb7e (7:4b7e) @@ -79,7 +79,7 @@ OaksLabScript2: ; 1cb82 (7:4b82) predef ShowObject ld a, $3 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript3: ; 1cba2 (7:4ba2) @@ -102,7 +102,7 @@ OaksLabScript3: ; 1cba2 (7:4ba2) call SetSpriteFacingDirectionAndDelay ld a, $4 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret PlayerEntryMovementRLE: ; 1cbcf (7:4bcf) @@ -125,7 +125,7 @@ OaksLabScript4: ; 1cbd2 (7:445f) call PlayDefaultMusic ld a, $5 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript5: ; 1cbfd (7:4bfd) @@ -156,7 +156,7 @@ OaksLabScript5: ; 1cbfd (7:4bfd) ld [wJoyIgnore], a ld a, $6 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript6: ; 1cc36 (7:4c36) @@ -186,7 +186,7 @@ OaksLabScript6: ; 1cc36 (7:4c36) ld [wPlayerMovingDirection], a ld a, $7 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript7: ; 1cc72 (7:4c72) @@ -196,7 +196,7 @@ OaksLabScript7: ; 1cc72 (7:4c72) call Delay3 ld a, $6 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript8: ; 1cc80 (7:4c80) @@ -205,7 +205,7 @@ OaksLabScript8: ; 1cc80 (7:4c80) ld de, .SonyPushesPlayerAwayFromEeveeBall call MoveSprite ld a, $9 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret .SonyPushesPlayerAwayFromEeveeBall @@ -228,7 +228,7 @@ OaksLabScript9: ; 1cd00 (7:4d00) ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, 1 - ld [W_RIVALSTARTER], a + ld [wRivalStarter], a ld a, EEVEE ld [wd11e], a call GetMonName @@ -239,7 +239,7 @@ OaksLabScript9: ; 1cd00 (7:4d00) call DisplayTextID ld a, $a - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret .asm_1c564 @@ -278,7 +278,7 @@ OaksLabScript10: ; 1cd6d (7:4d6d) .asm_1c5a6 call StartSimulatingJoypadStates ld a, $b - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabRLE_PlayerWalksToOak: @@ -299,7 +299,7 @@ OaksLabScript11: ld [wJoyIgnore], a ld a, $c - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript12: @@ -334,7 +334,7 @@ OaksLabScript12: ld [hSpriteIndexOrTextID], a call MoveSprite ld a, $d - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript13: @@ -359,7 +359,7 @@ OaksLabScript13: ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a ld a, $e - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript14: @@ -377,7 +377,7 @@ OaksLabScript14: ld b, $2 .asm_1c660 ld a, b - ld [W_RIVALSTARTER], a + ld [wRivalStarter], a ld a, $ff ^ (A_BUTTON | B_BUTTON) ld [wJoyIgnore], a @@ -395,7 +395,7 @@ OaksLabScript14: ld hl, wd74b set 3, [hl] ld a, $f - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript15: @@ -420,7 +420,7 @@ OaksLabScript15: .asm_1c6bd ld [wNPCMovementDirections], a ld a, $10 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret .OaksLabMovement_RivalWalksOut1 @@ -444,7 +444,7 @@ OaksLabScript16: predef HideObject call PlayDefaultMusic ld a, $11 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret .asm_1c6ed @@ -481,7 +481,7 @@ OaksLabScript17: ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $12 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript18: @@ -491,7 +491,7 @@ OaksLabScript18: xor a ld [wJoyIgnore], a ld a, $16 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript19: @@ -521,7 +521,7 @@ OaksLabScript19: ld de, wNPCMovementDirections2 call MoveSprite ld a, $14 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript_1c78e: @@ -585,7 +585,7 @@ OaksLabScript20: call DisplayTextID SetEvent EVENT_GOT_POKEDEX ld a, $1 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a SetEvent EVENT_OAK_GOT_PARCEL ld a, HS_LYING_OLD_MAN ld [wMissableObjectIndex], a @@ -607,7 +607,7 @@ OaksLabScript20: ld de, wNPCMovementDirections2 call MoveSprite ld a, $15 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript21: @@ -627,7 +627,7 @@ OaksLabScript21: xor a ld [wJoyIgnore], a ld a, $16 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript22: @@ -803,7 +803,7 @@ OaksLabScript_1c9ac: ld [wWhichEmotionBubble], a predef EmotionBubble ld a, $8 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a jp TextScriptEnd OaksLabText3: @@ -865,7 +865,7 @@ OaksLabText3: call PrintText call OaksLabScript_1c897 ld a, $13 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a jr .asm_1ca6f .asm_1ca4a @@ -1027,7 +1027,7 @@ OaksLabText_1cb3a: OaksLabText18: TX_ASM ld a, PIKACHU - ld [W_PLAYERSTARTER], a + ld [wPlayerStarter], a ld [wd11e], a call GetMonName ld a, $1 |