aboutsummaryrefslogtreecommitdiffstats
path: root/engine/town_map.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/town_map.asm')
-rwxr-xr-xengine/town_map.asm3
1 files changed, 1 insertions, 2 deletions
diff --git a/engine/town_map.asm b/engine/town_map.asm
index ee282b49..31eefcfd 100755
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -377,7 +377,6 @@ DrawPlayerOrBirdSprite: ; 7124e (1c:524e)
ld bc, $a0
jp CopyData
-<<<<<<< HEAD
DisplayWildLocations: ; 71279 (1c:5279)
callba FindWildLocationsOfMon
call ZeroOutDuplicatesInList
@@ -409,7 +408,7 @@ DisplayWildLocations: ; 71279 (1c:5279)
jr nz, .drawPlayerSprite
; if no OAM entries were written, print area unknown text
coord hl, 1, 7
- lb bc, $20f
+ lb bc, 2, 15
call TextBoxBorder
coord hl, 2, 9
ld de, AreaUnknownText