summaryrefslogtreecommitdiff
path: root/scripts/silphco9.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/silphco9.asm
parentccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff)
parent8a5a7d8e68538b727e0c166488265f395603366e (diff)
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/silphco9.asm')
-rwxr-xr-xscripts/silphco9.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/silphco9.asm b/scripts/silphco9.asm
index 02638459..589a086e 100755
--- a/scripts/silphco9.asm
+++ b/scripts/silphco9.asm
@@ -3,13 +3,13 @@ SilphCo9Script: ; 5d7bb (17:57bb)
call EnableAutoTextBoxDrawing
ld hl, SilphCo9TrainerHeaders
ld de, SilphCo9ScriptPointers
- ld a, [W_SILPHCO9CURSCRIPT]
+ ld a, [wSilphCo9CurScript]
call ExecuteCurMapScriptInTable
- ld [W_SILPHCO9CURSCRIPT], a
+ ld [wSilphCo9CurScript], a
ret
SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
- ld hl, wd126
+ ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
ret z