summaryrefslogtreecommitdiff
path: root/scripts/silphco4.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-01-12 18:45:02 -0600
committerdannye <corrnondacqb@yahoo.com>2016-01-12 18:45:02 -0600
commit5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch)
treea1ce27018f39d98f49d89468df426d0291e18560 /scripts/silphco4.asm
parentccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff)
parent8a5a7d8e68538b727e0c166488265f395603366e (diff)
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/silphco4.asm')
-rwxr-xr-xscripts/silphco4.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/silphco4.asm b/scripts/silphco4.asm
index 0dad6f6b..12e04f69 100755
--- a/scripts/silphco4.asm
+++ b/scripts/silphco4.asm
@@ -3,13 +3,13 @@ SilphCo4Script: ; 19d0b (6:5d0b)
call EnableAutoTextBoxDrawing
ld hl, SilphCo4TrainerHeaders
ld de, SilphCo4ScriptPointers
- ld a, [W_SILPHCO4CURSCRIPT]
+ ld a, [wSilphCo4CurScript]
call ExecuteCurMapScriptInTable
- ld [W_SILPHCO4CURSCRIPT], a
+ ld [wSilphCo4CurScript], a
ret
SilphCo4Script_19d21: ; 19d21 (6:5d21)
- ld hl, wd126
+ ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
ret z