diff options
Diffstat (limited to 'scripts/silphco7.asm')
| -rwxr-xr-x | scripts/silphco7.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 5333e07f..f771f865 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -3,9 +3,9 @@ SilphCo7Script: ; 51b61 (14:5b61) call EnableAutoTextBoxDrawing ld hl, SilphCo7TrainerHeaders ld de, SilphCo7ScriptPointers - ld a, [W_SILPHCO7CURSCRIPT] + ld a, [wSilphCo7CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO7CURSCRIPT], a + ld [wSilphCo7CurScript], a ret SilphCo7Script_51b77: ; 51b77 (14:5b77) @@ -106,8 +106,8 @@ SilphCo7Text_51c0c: ; 51c0c (14:5c0c) ld [wJoyIgnore], a SilphCo7Text_51c10: ; 51c10 (14:5c10) - ld [W_SILPHCO7CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wSilphCo7CurScript], a + ld [wCurMapScript], a ret SilphCo7ScriptPointers: ; 51c17 (14:5c17) @@ -184,8 +184,8 @@ SilphCo7Script3: ; 51c82 (14:5c82) ld de, SilphCo7Text_51ecd call SaveEndBattleTextPointers ld a, OPP_SONY2 - ld [W_CUROPPONENT], a - ld a, [W_RIVALSTARTER] + ld [wCurOpponent], a + ld a, [wRivalStarter] cp STARTER2 jr nz, .asm_51cb6 ld a, $7 @@ -198,12 +198,12 @@ SilphCo7Script3: ; 51c82 (14:5c82) .asm_51cbe ld a, $9 .asm_51cc0 - ld [W_TRAINERNO], a + ld [wTrainerNo], a ld a, $4 jp SilphCo7Text_51c10 SilphCo7Script4: ; 51cc8 (14:5cc8) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, SilphCo7Text_51c0c ld a, $f0 |