diff options
Diffstat (limited to 'scripts/silphco7.asm')
| -rwxr-xr-x | scripts/silphco7.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 1634472b..cc26d117 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -3,13 +3,13 @@ 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) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -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) @@ -183,7 +183,7 @@ SilphCo7Script3: ; 51c82 (14:5c82) call SaveEndBattleTextPointers ld a, OPP_SONY2 ld [wCurOpponent], a - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] add 4 ld [wTrainerNo], a ld a, $4 |