diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 10:38:20 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 16:05:19 -0400 |
| commit | 1a0992a2f16ba2026c7fbf9fcfd1576a0f81c329 (patch) | |
| tree | 0981af81f93d33b07cbfe47674d87ae4aa2d46b0 /scripts/route22gate.asm | |
| parent | 82ffb336a975fe8cf9c3953fc380339feaae65b3 (diff) | |
| parent | d218d1972a9be5b9d0025a17842239e1fbf5b622 (diff) | |
Merge branch 'master' of https://github.com/huderlem/pokered into pull-data
Conflicts:
main.asm
text.asm
text/maps/route_22.asm
Diffstat (limited to 'scripts/route22gate.asm')
| -rwxr-xr-x | scripts/route22gate.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm index 4ce9e1d8..e445a358 100755 --- a/scripts/route22gate.asm +++ b/scripts/route22gate.asm @@ -5,11 +5,11 @@ Route22GateScript: ; 1e683 (7:6683) call CallFunctionInTable ld a, [W_YCOORD] cp $4 - ld a, $22 + ld a, ROUTE_23 jr c, .asm_1e69a ; 0x1e696 $2 - ld a, $21 + ld a, ROUTE_22 .asm_1e69a - ld [$d365], a + ld [wLastMap], a ret Route22GateScriptPointers: ; 1e69e (7:669e) |