summaryrefslogtreecommitdiff
path: root/scripts/silphco7.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/silphco7.asm')
-rwxr-xr-xscripts/silphco7.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm
index 6281783a..2e93d92a 100755
--- a/scripts/silphco7.asm
+++ b/scripts/silphco7.asm
@@ -3,13 +3,13 @@ SilphCo7Script:
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:
- ld hl, wd126
+ ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
ret z
@@ -106,8 +106,8 @@ SilphCo7Text_51c0c:
ld [wJoyIgnore], a
SilphCo7Text_51c10:
- ld [W_SILPHCO7CURSCRIPT], a
- ld [W_CURMAPSCRIPT], a
+ ld [wSilphCo7CurScript], a
+ ld [wCurMapScript], a
ret
SilphCo7ScriptPointers:
@@ -183,7 +183,7 @@ SilphCo7Script3:
call SaveEndBattleTextPointers
ld a, OPP_SONY2
ld [wCurOpponent], a
- ld a, [W_RIVALSTARTER]
+ ld a, [wRivalStarter]
add 4
ld [wTrainerNo], a
ld a, $4