diff options
Diffstat (limited to 'scripts/agatha.asm')
| -rwxr-xr-x | scripts/agatha.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/agatha.asm b/scripts/agatha.asm index 1e34c99c..424a9af4 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -3,9 +3,9 @@ AgathaScript: ; 7642d (1d:642d) call EnableAutoTextBoxDrawing ld hl, AgathaTrainerHeaders ld de, AgathaScriptPointers - ld a, [W_AGATHACURSCRIPT] + ld a, [wAgathaCurScript] call ExecuteCurMapScriptInTable - ld [W_AGATHACURSCRIPT], a + ld [wAgathaCurScript], a ret AgathaScript_76443: ; 76443 (1d:6443) @@ -27,7 +27,7 @@ AgathaScript_76459: ; 76459 (1d:6459) AgathaScript_76464: ; 76464 (1d:6464) xor a - ld [W_AGATHACURSCRIPT], a + ld [wAgathaCurScript], a ret AgathaScriptPointers: ; 76469 (1d:6469) @@ -53,8 +53,8 @@ AgathaScript_76474: ; 76474 (1d:6474) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_AGATHACURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wAgathaCurScript], a + ld [wCurMapScript], a ret AgathaScript0: ; 76490 (1d:6490) @@ -81,8 +81,8 @@ AgathaScript0: ; 76490 (1d:6490) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_AGATHACURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wAgathaCurScript], a + ld [wCurMapScript], a ret CoordsData_764d1: ; 764d1 (1d:64d1) @@ -99,20 +99,20 @@ AgathaScript3: ; 764da (1d:64da) call Delay3 xor a ld [wJoyIgnore], a - ld [W_AGATHACURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wAgathaCurScript], a + ld [wCurMapScript], a ret AgathaScript2: ; 764ed (1d:64ed) call EndTrainerBattle - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, AgathaScript_76464 ld a, $1 ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret AgathaTextPointers: ; 76505 (1d:6505) |