From 2b7961759b3786725b95ee8f4a0b6e556091db7a Mon Sep 17 00:00:00 2001
From: luckytyphlosion <alan.rj.huang@gmail.com>
Date: Sun, 30 Aug 2015 18:56:44 -0400
Subject: Fixes.

---
 engine/town_map.asm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'engine/town_map.asm')

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
-- 
cgit v1.3.1-sl0p