summaryrefslogtreecommitdiff
path: root/engine/town_map.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/town_map.asm')
-rwxr-xr-xengine/town_map.asm14
1 files changed, 6 insertions, 8 deletions
diff --git a/engine/town_map.asm b/engine/town_map.asm
index 2633b8385..100aaae17 100755
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -45,23 +45,23 @@ _TownMap: ; 9191c
call SetPalettes
ld a, [hCGB]
and a
- jr z, .sgb
- ld a, $e4
+ jr z, .dmg
+ ld a, %11100100
call DmgToCgbObjPal0
call DelayFrame
-.sgb
+.dmg
ld a, [wd002]
cp KANTO_LANDMARK
jr nc, .kanto
ld d, KANTO_LANDMARK - 1
ld e, 1
- call Function919b0
+ call .loop
jr .resume
.kanto
- call Function910e8
- call Function919b0
+ call TownMap_GetKantoLandmarkLimits
+ call .loop
.resume
pop af
@@ -72,9 +72,7 @@ _TownMap: ; 9191c
ld [Options], a
call ClearBGPalettes
ret
-; 919b0
-Function919b0: ; 919b0
.loop
call JoyTextDelay
ld hl, hJoyPressed