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/route23.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/route23.asm')
| -rwxr-xr-x | scripts/route23.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/route23.asm b/scripts/route23.asm index 35f1b9cb..ca72c9fe 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -2,11 +2,11 @@ Route23Script: ; 511da (14:51da) call Route23Script_511e9 call EnableAutoTextBoxDrawing ld hl, Route23ScriptPointers - ld a, [W_ROUTE23CURSCRIPT] + ld a, [wRoute23CurScript] jp CallFunctionInTable Route23Script_511e9: ; 511e9 (14:51e9) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] ret z @@ -26,7 +26,7 @@ Route23ScriptPointers: ; 51213 (14:5213) Route23Script0: ; 51219 (14:5219) ld hl, YCoordsData_51255 - ld a, [W_YCOORD] + ld a, [wYCoord] ld b, a ld e, $0 EventFlagBit c, EVENT_PASSED_EARTHBADGE_CHECK + 1, EVENT_PASSED_CASCADEBADGE_CHECK @@ -40,7 +40,7 @@ Route23Script0: ; 51219 (14:5219) jr nz, .asm_51224 cp $23 jr nz, .asm_51237 - ld a, [W_XCOORD] + ld a, [wXCoord] cp $e ret nc .asm_51237 @@ -128,7 +128,7 @@ Route23Script1: ; 512ec (14:52ec) ret nz Route23Script2: ; 512f1 (14:52f1) ld a, $0 - ld [W_ROUTE23CURSCRIPT], a + ld [wRoute23CurScript], a ret Route23TextPointers: ; 512f7 (14:52f7) @@ -190,7 +190,7 @@ Route23Script_51346: ; 51346 (14:5346) inc a ld c, a ld b, FLAG_TEST - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges predef FlagActionPredef ld a, c and a @@ -199,7 +199,7 @@ Route23Script_51346: ; 51346 (14:5346) call PrintText call Route23Script_512d8 ld a, $1 - ld [W_ROUTE23CURSCRIPT], a + ld [wRoute23CurScript], a ret .asm_5136e ld hl, VictoryRoadGuardText2 @@ -210,7 +210,7 @@ Route23Script_51346: ; 51346 (14:5346) EventFlagAddress hl, EVENT_PASSED_CASCADEBADGE_CHECK predef FlagActionPredef ld a, $2 - ld [W_ROUTE23CURSCRIPT], a + ld [wRoute23CurScript], a ret Route23Script_51388: ; 51388 (14:5388) |