Adjust Town Map UI

Author: JustRegularLuna

charmap.asm

@@ -147,6 +147,7 @@ charmap "ゅ", $E1
 charmap "ょ", $E2
 charmap "ー", $E3
 
+charmap "_", $1F ; special linebreak for area names
 charmap "[pkmn]", $4A ; PkMn
 charmap "@", $50
 charmap "[PLAYER]", $52

engine/town_map.asm

@@ -36,7 +36,7 @@ DisplayTownMap:
 
 .townMapLoop
 	coord hl, 1, 0
-	lb bc, 1, 19
+	lb bc, 2, 11
 	call ClearScreenArea
 	ld hl, TownMapOrder
 	ld a, [wWhichTownMapLocation]
@@ -134,7 +134,10 @@ LoadTownMap_Nest:
 	call PlaceString
 	ld h, b
 	ld l, c
-	ld de, MonsNestText
+	ld de, MonsText
+	call PlaceString
+	coord hl, 1, 1
+	ld de, NestText
 	call PlaceString
 	call WaitForTextScrollButtonPress
 	call ExitTownMap
@@ -145,8 +148,11 @@ LoadTownMap_Nest:
 	ld [hTilesetType], a
 	ret
 
-MonsNestText:
-	db "'s nest@"
+MonsText:
+	db "'s@"
+
+NestText:
+	db "Nest@"
 
 LoadTownMap_Fly:
 	ld a, [hTilesetType]
@@ -172,8 +178,8 @@ LoadTownMap_Fly:
 	ld [hl], $ff
 	push hl
 	coord hl, 0, 0
-	ld de, ToText
-	call PlaceString
+	ld a, $3f ; up/down arrow tile
+	ld [hl], a
 	ld a, [wCurMap]
 	ld b, $0
 	call DrawPlayerOrBirdSprite
@@ -184,22 +190,18 @@ LoadTownMap_Fly:
 	ld [de], a
 	push hl
 	push hl
-	coord hl, 3, 0
-	lb bc, 1, 15
+	coord hl, 1, 0
+	lb bc, 2, 11
 	call ClearScreenArea
 	pop hl
 	ld a, [hl]
 	ld b, $4
 	call DrawPlayerOrBirdSprite ; draw bird sprite
-	coord hl, 3, 0
+	coord hl, 1, 0
 	ld de, wcd6d
 	call PlaceString
 	ld c, 15
 	call DelayFrames
-	coord hl, 18, 0
-	ld [hl], "▲"
-	coord hl, 19, 0
-	ld [hl], "▼"
 	pop hl
 .inputLoop
 	push hl
@@ -263,9 +265,6 @@ LoadTownMap_Fly:
 	ld hl, wFlyLocationsList + 11
 	jr .pressedDown
 
-ToText:
-	db "To@"
-
 BuildFlyLocationsList:
 	ld hl, wFlyLocationsList - 1
 	ld [hl], $ff

gfx/tilemaps/kanto_map.kmp

@@ -59,12 +59,15 @@ PlaceNextChar::
 	ret
 
 Char4ETest::
+	cp "_"
+	jr z, .line_feed
 	cp $4E ; next
 	jr nz, .char4FTest
 	ld bc, 2 * SCREEN_WIDTH
 	ld a,[hFlags_0xFFF6]
 	bit 2,a
 	jr z,.ok
+.line_feed
 	ld bc,SCREEN_WIDTH
 .ok
 	pop hl

home/text.asm

@@ -2,25 +2,25 @@ MapNames:
 PalletTownName:
 	db "Pallet Town@"
 ViridianCityName:
-	db "Viridian City@"
+	db "Viridian_City@"
 PewterCityName:
 	db "Pewter City@"
 CeruleanCityName:
-	db "Cerulean City@"
+	db "Cerulean_City@"
 LavenderTownName:
-	db "Lavender Town@"
+	db "Lavender_Town@"
 VermilionCityName:
-	db "Vermilion City@"
+	db "Vermilion_City@"
 CeladonCityName:
-	db "Celadon City@"
+	db "Celadon_City@"
 FuchsiaCityName:
-	db "Fuchsia City@"
+	db "Fuchsia_City@"
 CinnabarIslandName:
-	db "Cinnabar Island@"
+	db "Cinnabar_Island@"
 IndigoPlateauName:
-	db "Indigo Plateau@"
+	db "Indigo_Plateau@"
 SaffronCityName:
-	db "Saffron City@"
+	db "Saffron_City@"
 Route1Name:
 	db "Route 1@"
 Route2Name:
@@ -72,38 +72,38 @@ Route24Name:
 Route25Name:
 	db "Route 25@"
 ViridianForestName:
-	db "Viridian Forest@"
+	db "Viridian_Forest@"
 MountMoonName:
 	db "Mt. Moon@"
 MountMoonSquareName:
-	db "Mt. Moon Square@"
+	db "Mt. Moon_Square@"
 RockTunnelName:
 	db "Rock Tunnel@"
 SeaCottageName:
 	db "Sea Cottage@"
 SSAnneName:
 	db "S.S. Anne@"
 PokemonLeagueName:
-	db "#mon League@"
+	db "#mon_League@"
 UndergroundPathName:
-	db "Underground Path@"
+	db "Underground_Path@"
 PokemonTowerName:
-	db "#mon Tower@"
+	db "#mon_Tower@"
 SeafoamIslandsName:
-	db "Seafoam Islands@"
+	db "Seafoam_Islands@"
 VictoryRoadName:
-	db "Victory Road@"
+	db "Victory_Road@"
 DiglettsCaveName:
-	db "Diglett's Cave@"
+	db "Diglett's_Cave@"
 RocketHQName:
-	db "Team Rocket HQ@"
+	db "Team Rocket_HQ@"
 SilphCoName:
 	db "Silph Co.@"
 PokemonMansionName:
-	db $4a," Mansion@"
+	db "#mon_Mansion@"
 SafariZoneName:
 	db "Safari Zone@"
 CeruleanCaveName:
-	db "Cerulean Cave@"
+	db "Cerulean_Cave@"
 PowerPlantName:
 	db "Power Plant@"