summaryrefslogtreecommitdiff
path: root/scripts/silphco3.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-06-11 15:45:24 -0500
committerdannye <corrnondacqb@yahoo.com>2016-06-11 15:45:24 -0500
commit269f2c3ba72776e975f5b00d9a1361cadbda42a7 (patch)
tree459220542fcbfbd48b9725b48597b5740ee1ec0f /scripts/silphco3.asm
parent2bb64d11e6015e39e934e7359697c08636645994 (diff)
Sync with pokered
from August 29, 2015 to April 6, 2016
Diffstat (limited to 'scripts/silphco3.asm')
-rwxr-xr-xscripts/silphco3.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm
index bdaac452..68ae7ed2 100755
--- a/scripts/silphco3.asm
+++ b/scripts/silphco3.asm
@@ -3,13 +3,13 @@ SilphCo3Script: ; 59f5b (16:5f5b)
call EnableAutoTextBoxDrawing
ld hl, SilphCo3TrainerHeaders
ld de, SilphCo3ScriptPointers
- ld a, [W_SILPHCO3CURSCRIPT]
+ ld a, [wSilphCo3CurScript]
call ExecuteCurMapScriptInTable
- ld [W_SILPHCO3CURSCRIPT], a
+ ld [wSilphCo3CurScript], a
ret
SilphCo3Script_59f71: ; 59f71 (16:5f71)
- ld hl, wd126
+ ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
ret z