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/diglettscaveroute2.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/diglettscaveroute2.asm')
-rwxr-xr-x | scripts/diglettscaveroute2.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/diglettscaveroute2.asm b/scripts/diglettscaveroute2.asm index 93080be1..1bee2a1c 100755 --- a/scripts/diglettscaveroute2.asm +++ b/scripts/diglettscaveroute2.asm @@ -1,6 +1,6 @@ DiglettsCaveRoute2Script: ; 1deb0 (7:5eb0) - ld a, $d - ld [$d365], a + ld a, ROUTE_2 + ld [wLastMap], a jp EnableAutoTextBoxDrawing DiglettsCaveRoute2TextPointers: ; 1deb8 (7:5eb8) |