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/silphco11.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/silphco11.asm')
| -rwxr-xr-x | scripts/silphco11.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 4c83c20d..10a74853 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -3,13 +3,13 @@ SilphCo11Script: ; 620fa (18:60fa) call EnableAutoTextBoxDrawing ld hl, SilphCo11TrainerHeaders ld de, SilphCo11ScriptPointers - ld a, [W_SILPHCO11CURSCRIPT] + ld a, [wSilphCo11CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO11CURSCRIPT], a + ld [wSilphCo11CurScript], a ret SilphCo11Script_62110: ; 62110 (18:6110) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -150,8 +150,8 @@ SilphCo11Script_621c4: ; 621c4 (18:61c4) ld [wJoyIgnore], a SilphCo11Script_621c8: ; 621c8 (18:61c8) - ld [W_SILPHCO11CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wSilphCo11CurScript], a + ld [wCurMapScript], a ret SilphCo11ScriptPointers: ; 621cf (18:61cf) @@ -205,7 +205,7 @@ SilphCo11Script_6221a: ; 6221a (18:621a) jp SetSpriteFacingDirectionAndDelay SilphCo11Script5: ; 62227 (18:6227) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, SilphCo11Script_621c4 ld a, [wcf0d] |