diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 15:45:24 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 15:45:24 -0500 |
| commit | 269f2c3ba72776e975f5b00d9a1361cadbda42a7 (patch) | |
| tree | 459220542fcbfbd48b9725b48597b5740ee1ec0f /scripts/pewtergym.asm | |
| parent | 2bb64d11e6015e39e934e7359697c08636645994 (diff) | |
Sync with pokered
from August 29, 2015 to April 6, 2016
Diffstat (limited to 'scripts/pewtergym.asm')
| -rwxr-xr-x | scripts/pewtergym.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 3e9ab693..444f5d87 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -1,14 +1,14 @@ PewterGymScript: ; 5c387 (17:4387) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, PewterGymScript_5c3a4 call EnableAutoTextBoxDrawing ld hl, PewterGymTrainerHeaders ld de, PewterGymScriptPointers - ld a, [W_PEWTERGYMCURSCRIPT] + ld a, [wPewterGymCurScript] call ExecuteCurMapScriptInTable - ld [W_PEWTERGYMCURSCRIPT], a + ld [wPewterGymCurScript], a ret PewterGymScript_5c3a4: ; 5c3a4 (17:43a4) @@ -26,8 +26,8 @@ Gym1LeaderName: ; 5c3b9 (17:43b9) PewterGymScript_5c3bf: ; 5c3bf (17:43bf) xor a ld [wJoyIgnore], a - ld [W_PEWTERGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPewterGymCurScript], a + ld [wCurMapScript], a ret PewterGymScriptPointers: ; 5c3ca (17:43ca) @@ -131,8 +131,8 @@ PewterGymText1: ; 5c44e (17:444e) xor a ld [hJoyHeld], a ld a, $3 - ld [W_PEWTERGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPewterGymCurScript], a + ld [wCurMapScript], a .asm_5c49b jp TextScriptEnd |