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/ceruleangym.asm | |
| parent | 2bb64d11e6015e39e934e7359697c08636645994 (diff) | |
Sync with pokered
from August 29, 2015 to April 6, 2016
Diffstat (limited to 'scripts/ceruleangym.asm')
| -rwxr-xr-x | scripts/ceruleangym.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index f1ef4c43..d6abf4a1 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -1,14 +1,14 @@ CeruleanGymScript: ; 5c6b3 (17:46b3) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, CeruleanGymScript_5c6d0 call EnableAutoTextBoxDrawing ld hl, CeruleanGymTrainerHeaders ld de, CeruleanGymScriptPointers - ld a, [W_CERULEANGYMCURSCRIPT] + ld a, [wCeruleanGymCurScript] call ExecuteCurMapScriptInTable - ld [W_CERULEANGYMCURSCRIPT], a + ld [wCeruleanGymCurScript], a ret CeruleanGymScript_5c6d0: ; 5c6d0 (17:46d0) @@ -25,8 +25,8 @@ Gym2LeaderName: ; 5c6e7 (17:46e7) CeruleanGymScript_5c6ed: ; 5c6ed (17:46ed) xor a ld [wJoyIgnore], a - ld [W_CERULEANGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCeruleanGymCurScript], a + ld [wCurMapScript], a ret CeruleanGymScriptPointers: ; 5c6f8 (17:46f8) @@ -132,7 +132,7 @@ CeruleanGymText1: ; 5c771 (17:4771) xor a ld [hJoyHeld], a ld a, $3 - ld [W_CERULEANGYMCURSCRIPT], a + ld [wCeruleanGymCurScript], a .asm_5c7bb jp TextScriptEnd |