diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
| commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
| tree | a1ce27018f39d98f49d89468df426d0291e18560 /scripts/route24.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/route24.asm')
| -rwxr-xr-x | scripts/route24.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/scripts/route24.asm b/scripts/route24.asm index 6eba1d35..02b439e1 100755 --- a/scripts/route24.asm +++ b/scripts/route24.asm @@ -2,16 +2,16 @@ Route24Script: ; 513ad (14:53ad) call EnableAutoTextBoxDrawing ld hl, Route24TrainerHeaders ld de, Route24ScriptPointers - ld a, [W_ROUTE24CURSCRIPT] + ld a, [wRoute24CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE24CURSCRIPT], a + ld [wRoute24CurScript], a ret Route24Script_513c0: ; 513c0 (14:53c0) xor a ld [wJoyIgnore], a - ld [W_ROUTE24CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute24CurScript], a + ld [wCurMapScript], a ret Route24ScriptPointers: ; 513cb (14:53cb) @@ -40,8 +40,8 @@ Route24Script0: ; 513d5 (14:53d5) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $4 - ld [W_ROUTE24CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute24CurScript], a + ld [wCurMapScript], a ret CoordsData_5140e: ; 5140e (14:540e) @@ -53,12 +53,12 @@ Route24Script4: ; 51411 (14:5411) ret nz call Delay3 ld a, $0 - ld [W_ROUTE24CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute24CurScript], a + ld [wCurMapScript], a ret Route24Script3: ; 51422 (14:5422) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, Route24Script_513c0 call UpdateSprites @@ -71,8 +71,8 @@ Route24Script3: ; 51422 (14:5422) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_ROUTE24CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute24CurScript], a + ld [wCurMapScript], a ret Route24TextPointers: ; 5144b (14:544b) @@ -170,8 +170,8 @@ Route24Text1: ; 514a4 (14:54a4) xor a ld [hJoyHeld], a ld a, $3 - ld [W_ROUTE24CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute24CurScript], a + ld [wCurMapScript], a jp TextScriptEnd .asm_514f9 ld hl, Route24Text_51530 |