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/celadongym.asm | |
| parent | Clean up main.asm (diff) | |
| download | pokeyellow-269f2c3ba72776e975f5b00d9a1361cadbda42a7.tar.gz pokeyellow-269f2c3ba72776e975f5b00d9a1361cadbda42a7.tar.xz pokeyellow-269f2c3ba72776e975f5b00d9a1361cadbda42a7.zip | |
Sync with pokered
from August 29, 2015 to April 6, 2016
Diffstat (limited to 'scripts/celadongym.asm')
| -rwxr-xr-x | scripts/celadongym.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index 6588b25e..a9c017d0 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -1,14 +1,14 @@ CeladonGymScript: ; 4890a (12:490a) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, CeladonGymScript_48927 call EnableAutoTextBoxDrawing ld hl, CeladonGymTrainerHeaders ld de, CeladonGymScriptPointers - ld a, [W_CELADONGYMCURSCRIPT] + ld a, [wCeladonGymCurScript] call ExecuteCurMapScriptInTable - ld [W_CELADONGYMCURSCRIPT], a + ld [wCeladonGymCurScript], a ret CeladonGymScript_48927: ; 48927 (12:4927) @@ -25,8 +25,8 @@ Gym4LeaderName: ; 4893d (12:493d) CeladonGymText_48943: ; 48943 (12:4943) xor a ld [wJoyIgnore], a - ld [W_CELADONGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCeladonGymCurScript], a + ld [wCurMapScript], a ret CeladonGymScriptPointers: ; 4894e (12:494e) @@ -178,8 +178,8 @@ CeladonGymText1: ; 48a11 (12:4a11) ld a, $4 ld [wGymLeaderNo], a ld a, $3 - ld [W_CELADONGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCeladonGymCurScript], a + ld [wCurMapScript], a .asm_48a5b jp TextScriptEnd |