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/pokemontower7.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/pokemontower7.asm')
| -rwxr-xr-x | scripts/pokemontower7.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index 6dddebb2..3e1fcccb 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -77,8 +77,8 @@ PokemonTower7Script4: ; 60d86 (18:4d86) ld [H_DOWNARROWBLINKCNT1], a ; $ff8b ld a, $1 ld [$d42f], a - ld a, $4 - ld [$d365], a + ld a, LAVENDER_TOWN + ld [wLastMap], a ld hl, $d72d set 3, [hl] ld a, $0 |