summaryrefslogtreecommitdiff
path: root/scripts/vermiliongym.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/vermiliongym.asm
parent2bb64d11e6015e39e934e7359697c08636645994 (diff)
Sync with pokered
from August 29, 2015 to April 6, 2016
Diffstat (limited to 'scripts/vermiliongym.asm')
-rwxr-xr-xscripts/vermiliongym.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm
index d672a419..cd2b5b3c 100755
--- a/scripts/vermiliongym.asm
+++ b/scripts/vermiliongym.asm
@@ -1,5 +1,5 @@
VermilionGymScript: ; 5ca26 (17:4a26)
- ld hl, wd126
+ ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
push hl
@@ -11,9 +11,9 @@ VermilionGymScript: ; 5ca26 (17:4a26)
call EnableAutoTextBoxDrawing
ld hl, VermilionGymTrainerHeader0
ld de, VermilionGymScriptPointers
- ld a, [W_VERMILIONGYMCURSCRIPT]
+ ld a, [wVermilionGymCurScript]
call ExecuteCurMapScriptInTable
- ld [W_VERMILIONGYMCURSCRIPT], a
+ ld [wVermilionGymCurScript], a
ret
VermilionGymScript_5ca4c: ; 5ca4c (17:4a4c)
@@ -44,8 +44,8 @@ VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d)
VermilionGymScript_5ca8a: ; 5ca8a (17:4a8a)
xor a
ld [wJoyIgnore], a
- ld [W_VERMILIONGYMCURSCRIPT], a
- ld [W_CURMAPSCRIPT], a
+ ld [wVermilionGymCurScript], a
+ ld [wCurMapScript], a
ret
VermilionGymScriptPointers: ; 5ca95 (17:4a95)
@@ -160,8 +160,8 @@ VermilionGymText1: ; 5cb1d (17:4b1d)
xor a
ld [hJoyHeld], a
ld a, $3
- ld [W_VERMILIONGYMCURSCRIPT], a
- ld [W_CURMAPSCRIPT], a
+ ld [wVermilionGymCurScript], a
+ ld [wCurMapScript], a
.asm_5cb6a
jp TextScriptEnd