diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 18:56:44 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 18:56:44 -0400 |
| commit | 2b7961759b3786725b95ee8f4a0b6e556091db7a (patch) | |
| tree | 6287d4bb7bad7d012f804dc18856341a09fc015b /engine/town_map.asm | |
| parent | Merge branch 'master' of https://github.com/iimarckus/pokered (diff) | |
| download | pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.tar.gz pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.tar.xz pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.zip | |
Fixes.
Diffstat (limited to 'engine/town_map.asm')
| -rwxr-xr-x | engine/town_map.asm | 3 |
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 |