summaryrefslogtreecommitdiff
path: root/engine/town_map.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-08-09 19:28:43 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-08-09 19:28:43 -0400
commit9c61b495da446c2216bcd8c56aaa55fffdbf3d61 (patch)
tree7f8706e0e174bffa26dad81fb08af5c6a98f99a1 /engine/town_map.asm
parentb2002fdf4abee435a879522980425913c51dc9e5 (diff)
Fix bank1c errors and a few missed bank0 errors.
Diffstat (limited to 'engine/town_map.asm')
-rwxr-xr-xengine/town_map.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/town_map.asm b/engine/town_map.asm
index 6b12c04b..535756b8 100755
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -1,5 +1,5 @@
DisplayTownMap: ; 70eb7 (1c:4eb7)
- ;call LoadTownMap
+ call LoadTownMap
ld hl, wUpdateSpritesEnabled
ld a, [hl]
push af
@@ -47,7 +47,7 @@ Func_70f08: ; 70f08 (1c:4f08)
ld a, $4
ld [wcd5b], a
ld hl, wOAMBuffer + $10
- call Func_71279
+ call Func_71302
pop hl
ld de, wcd6d
.loop
@@ -105,9 +105,9 @@ Func_70f08: ; 70f08 (1c:4f08)
jp Func_70ef4
.asm_70f87
ld a,[hJoy5]
- and D_DOWN | D_UP | B_BUTTON | A_BUTTON
+ and D_DOWN | D_UP
ret z
- callab PrintBeginningBattleText
+ callab Func_f0000
ret
INCLUDE "data/town_map_order.asm"
@@ -561,7 +561,7 @@ Func_7137a: ; 7137a (1c:537a)
jr .asm_71384
.asm_7138a
inc hl
- jr .asm_71384
+ jr .asm_71396
.asm_7138d
ld hl, ExternalMapEntries ; $539c
ld c, a
@@ -569,7 +569,7 @@ Func_7137a: ; 7137a (1c:537a)
add hl, bc
add hl, bc
add hl, bc
-.asm_7130d
+.asm_71396
ld a, [hli]
ld [de], a
ld a, [hli]