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/route22gate.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/route22gate.asm')
| -rwxr-xr-x | scripts/route22gate.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm index 95546a99..53ae8378 100755 --- a/scripts/route22gate.asm +++ b/scripts/route22gate.asm @@ -1,9 +1,9 @@ Route22GateScript: ; 1e683 (7:6683) call EnableAutoTextBoxDrawing ld hl, Route22GateScriptPointers - ld a, [W_ROUTE22GATECURSCRIPT] + ld a, [wRoute22GateCurScript] call CallFunctionInTable - ld a, [W_YCOORD] + ld a, [wYCoord] cp $4 ld a, ROUTE_23 jr c, .asm_1e69a @@ -49,7 +49,7 @@ Route22GateScript1: ; 1e6cd (7:66cd) ld [wJoyIgnore], a call Delay3 ld a, $0 - ld [W_ROUTE22GATECURSCRIPT], a + ld [wRoute22GateCurScript], a Route22GateScript2: ; 1e6de (7:66de) ret @@ -58,7 +58,7 @@ Route22GateTextPointers: ; 1e6df (7:66df) Route22GateText1: ; 1e6e1 (7:66e1) TX_ASM - ld a, [W_OBTAINEDBADGES] + ld a, [wObtainedBadges] bit 0, a jr nz, .asm_1e6f6 ld hl, Route22GateText_1e704 @@ -71,7 +71,7 @@ Route22GateText1: ; 1e6e1 (7:66e1) call PrintText ld a, $2 .asm_1e6fe - ld [W_ROUTE22GATECURSCRIPT], a + ld [wRoute22GateCurScript], a jp TextScriptEnd Route22GateText_1e704: ; 1e704 (7:6704) |