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/route25.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/route25.asm')
| -rwxr-xr-x | scripts/route25.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/route25.asm b/scripts/route25.asm index 49580ba6..15b52b81 100755 --- a/scripts/route25.asm +++ b/scripts/route25.asm @@ -3,13 +3,13 @@ Route25Script: ; 515cb (14:55cb) call EnableAutoTextBoxDrawing ld hl, Route25TrainerHeaders ld de, Route25ScriptPointers - ld a, [W_ROUTE25CURSCRIPT] + ld a, [wRoute25CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE25CURSCRIPT], a + ld [wRoute25CurScript], a ret Route25Script_515e1: ; 515e1 (14:55e1) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] ret z |