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/route16.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/route16.asm')
| -rwxr-xr-x | scripts/route16.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/route16.asm b/scripts/route16.asm index c762c999..1f6ba9a3 100755 --- a/scripts/route16.asm +++ b/scripts/route16.asm @@ -2,16 +2,16 @@ Route16Script: ; 59933 (16:5933) call EnableAutoTextBoxDrawing ld hl, Route16TrainerHeaders ld de, Route16ScriptPointers - ld a, [W_ROUTE16CURSCRIPT] + ld a, [wRoute16CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE16CURSCRIPT], a + ld [wRoute16CurScript], a ret Route16Script_59946: ; 59946 (16:5946) xor a ld [wJoyIgnore], a - ld [W_ROUTE16CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute16CurScript], a + ld [wCurMapScript], a ret Route16ScriptPointers: ; 59951 (16:5951) @@ -30,20 +30,20 @@ Route16Script0: ; 59959 (16:5959) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, SNORLAX - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ld a, 30 - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ld a, HS_ROUTE_16_SNORLAX ld [wMissableObjectIndex], a predef HideObject call UpdateSprites ld a, $3 - ld [W_ROUTE16CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute16CurScript], a + ld [wCurMapScript], a ret Route16Script3: ; 5998f (16:598f) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, Route16Script_59946 call UpdateSprites @@ -57,8 +57,8 @@ Route16Script3: ; 5998f (16:598f) SetEvent EVENT_BEAT_ROUTE16_SNORLAX call Delay3 ld a, $0 - ld [W_ROUTE16CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute16CurScript], a + ld [wCurMapScript], a ret Route16TextPointers: ; 599b9 (16:59b9) |