diff --git a/charmap.asm b/charmap.asm
index b1f6d5b..00b9e1f 100644
--- a/charmap.asm
+++ b/charmap.asm
@@ -36,42 +36,6 @@
 	charmap "<ROCKET>",  $5e ; "ROCKET"
 	charmap "<DEXEND>",  $5f
 
-; Actual characters (from gfx/font/font_extra.png)
-
-	charmap "<BOLD_A>",  $60 ; unused
-	charmap "<BOLD_B>",  $61 ; unused
-	charmap "<BOLD_C>",  $62 ; unused
-	charmap "<BOLD_D>",  $63 ; unused
-	charmap "<BOLD_E>",  $64 ; unused
-	charmap "<BOLD_F>",  $65 ; unused
-	charmap "<BOLD_G>",  $66 ; unused
-	charmap "<BOLD_H>",  $67 ; unused
-	charmap "<BOLD_I>",  $68 ; unused
-	charmap "<BOLD_V>",  $69
-	charmap "<BOLD_S>",  $6a
-	charmap "<BOLD_L>",  $6b ; unused
-	charmap "<BOLD_M>",  $6c ; unused
-	charmap "<COLON>",   $6d ; colon with tinier dots than ":"
-	charmap "ぃ",         $6e ; hiragana small i, unused
-	charmap "ぅ",         $6f ; hiragana small u, unused
-	charmap "<PO>",      $70
-	charmap "<KE>",      $71
-	charmap "“",         $72 ; opening quote
-	charmap "”",         $73 ; closing quote
-	charmap "·",         $74 ; middle dot, unused
-	charmap "…",         $75 ; ellipsis
-	charmap "ぁ",         $76 ; hiragana small a, unused
-	charmap "ぇ",         $77 ; hiragana small e, unused
-	charmap "ぉ",         $78 ; hiragana small o, unused
-
-	charmap "┌",         $79
-	charmap "─",         $7a
-	charmap "┐",         $7b
-	charmap "│",         $7c
-	charmap "└",         $7d
-	charmap "┘",         $7e
-	charmap " ",         $7f
-
 ; Actual characters (from gfx/font/font_battle_extra.png)
 
 	charmap "<LV>",      $6e
@@ -84,14 +48,7 @@
 
 ; Actual characters (from other graphics files)
 
-	; needed for _LoadFontsExtra1 (see engine/gfx/load_font.asm)
-	charmap "■",         $60 ; gfx/font/black.2bpp
-	charmap "▲",         $61 ; gfx/font/up_arrow.png
-	charmap "☎",         $62 ; gfx/font/phone_icon.2bpp
-
-	; needed for MagikarpHouseSign (see engine/events/magikarp.asm)
-	charmap "′",         $6e ; gfx/font/feet_inches.png
-	charmap "″",         $6f ; gfx/font/feet_inches.png
+	charmap " ",         $7f
 
 	; needed for StatsScreen_PlaceShinyIcon and PrintPartyMonPage1
 	charmap "⁂",         $3f ; gfx/stats/stats_tiles.png, tile 14
@@ -159,12 +116,16 @@
 	charmap "y",         $b8
 	charmap "z",         $b9
 
-	charmap "Ä",         $c0
-	charmap "Ö",         $c1
-	charmap "Ü",         $c2
-	charmap "ä",         $c3
-	charmap "ö",         $c4
-	charmap "ü",         $c5
+	charmap "┌",         $ba
+	charmap "─",         $bb
+	charmap "┐",         $bc
+	charmap "│",         $bd
+	charmap "└",         $be
+	charmap "┘",         $bf
+
+	charmap "′",         $ce
+	charmap "″",         $cf
+
 
 	charmap "'d",        $d0
 	charmap "'l",        $d1
@@ -173,16 +134,29 @@
 	charmap "'s",        $d4
 	charmap "'t",        $d5
 	charmap "'v",        $d6
+	
+	charmap "■",         $d7
+	charmap "▲",         $d8
+	charmap "☎",        $d9
+	charmap "<BOLD_V>",  $da
+	charmap "<BOLD_S>",  $db
+	charmap "<COLON>",   $dc ; colon with tinier dots than ":"
+	charmap "“",         $dd ; opening quote
+	charmap "”",         $de ; closing quote
 
 	charmap "←",         $df
 	charmap "'",         $e0
 	charmap "<PK>",      $e1
 	charmap "<MN>",      $e2
 	charmap "-",         $e3
+	
+	charmap "<PO>",      $e4
+	charmap "<KE>",      $e5
 
 	charmap "?",         $e6
 	charmap "!",         $e7
 	charmap ".",         $e8
+	charmap "<DOT>",     $e8 ; decimal point; same as "."
 	charmap "&",         $e9
 
 	charmap "é",         $ea
@@ -193,7 +167,7 @@
 	charmap "♂",         $ef
 	charmap "¥",         $f0
 	charmap "×",         $f1
-	charmap "<DOT>",     $f2 ; decimal point; same as "." in English
+	charmap "…",         $f2 ; ellipsis
 	charmap "/",         $f3
 	charmap ",",         $f4
 	charmap "♀",         $f5
diff --git a/constants/text_constants.asm b/constants/text_constants.asm
index a6ee360..f16eb7e 100644
--- a/constants/text_constants.asm
+++ b/constants/text_constants.asm
@@ -43,7 +43,7 @@ DEF PRINTNUM_LEFTALIGN    EQU 1 << PRINTNUM_LEFTALIGN_F
 DEF PRINTNUM_LEADINGZEROS EQU 1 << PRINTNUM_LEADINGZEROS_F
 
 ; character sets (see charmap.asm)
-DEF FIRST_REGULAR_TEXT_CHAR     EQU $60
+DEF FIRST_REGULAR_TEXT_CHAR     EQU $7f
 DEF FIRST_HIRAGANA_DAKUTEN_CHAR EQU $20
 
 ; gfx/font/unown_font.png
diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm
index 1044d37..6f2a66d 100644
--- a/engine/events/halloffame.asm
+++ b/engine/events/halloffame.asm
@@ -1,5 +1,3 @@
-DEF HALLOFFAME_COLON EQU $63
-
 HallOfFame::
 	call HallOfFame_FadeOutMusic
 	ld a, [wStatusFlags]
@@ -549,10 +547,6 @@ DisplayHOFMon:
 
 HOF_AnimatePlayerPic:
 	call ClearBGPalettes
-	ld hl, vTiles2 tile HALLOFFAME_COLON
-	ld de, FontExtra + 13 tiles ; "<COLON>"
-	lb bc, BANK(FontExtra), 1
-	call Request2bpp
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, " "
@@ -622,7 +616,7 @@ HOF_AnimatePlayerPic:
 	ld de, wGameTimeHours
 	lb bc, 2, 3
 	call PrintNum
-	ld [hl], HALLOFFAME_COLON
+	ld [hl], "<COLON>"
 	inc hl
 	ld de, wGameTimeMinutes
 	lb bc, PRINTNUM_LEADINGZEROS | 1, 2
diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm
index f144767..c111c55 100644
--- a/engine/events/magikarp.asm
+++ b/engine/events/magikarp.asm
@@ -88,18 +88,7 @@ CheckMagikarpLength:
 	text_far _MagikarpGuruMeasureText
 	text_end
 
-Magikarp_LoadFeetInchesChars:
-	ld hl, vTiles2 tile "′" ; $6e
-	ld de, .feetinchchars
-	lb bc, BANK(.feetinchchars), 2
-	call Request2bpp
-	ret
-
-.feetinchchars
-INCBIN "gfx/font/feet_inches.2bpp"
-
 PrintMagikarpLength:
-	call Magikarp_LoadFeetInchesChars
 	ld hl, wStringBuffer1
 	ld de, wMagikarpLength
 	lb bc, PRINTNUM_LEFTALIGN | 1, 2
diff --git a/engine/events/map_name_sign.asm b/engine/events/map_name_sign.asm
index 3bf9e38..b0967a2 100644
--- a/engine/events/map_name_sign.asm
+++ b/engine/events/map_name_sign.asm
@@ -1,4 +1,4 @@
-DEF MAP_NAME_SIGN_START EQU $60
+DEF MAP_NAME_SIGN_START EQU $c0
 
 InitMapNameSign::
 	xor a
@@ -42,7 +42,6 @@ InitMapNameSign::
 ; Display for 60 frames
 	ld a, 60
 	ld [wLandmarkSignTimer], a
-	call LoadMapNameSignGFX
 	call InitMapNameFrame
 	farcall HDMATransfer_OnlyTopFourRows
 	ret
@@ -124,13 +123,6 @@ PlaceMapNameSign::
 	ldh [hLCDCPointer], a
 	ret
 
-LoadMapNameSignGFX:
-	ld de, MapEntryFrameGFX
-	ld hl, vTiles2 tile MAP_NAME_SIGN_START
-	lb bc, BANK(MapEntryFrameGFX), 14
-	call Get2bpp
-	ret
-
 InitMapNameFrame:
 	hlcoord 0, 0
 	ld b, 2
diff --git a/engine/gfx/load_font.asm b/engine/gfx/load_font.asm
index 2849659..04c18cf 100644
--- a/engine/gfx/load_font.asm
+++ b/engine/gfx/load_font.asm
@@ -16,24 +16,17 @@ Get2bppOptionalHDMA: ; unreferenced
 	jp Get2bpp
 
 _LoadStandardFont::
-	ld de, Font
-	ld hl, vTiles1
-	lb bc, BANK(Font), 128 ; "A" to "9"
-	ldh a, [rLCDC]
-	bit rLCDC_ENABLE, a
-	jp z, Copy1bpp
-
 	ld de, Font
 	ld hl, vTiles1
 	lb bc, BANK(Font), 32 ; "A" to "]"
 	call Get1bppViaHDMA
 	ld de, Font + 32 * LEN_1BPP_TILE
 	ld hl, vTiles1 tile $20
-	lb bc, BANK(Font), 32 ; "a" to $bf
+	lb bc, BANK(Font), 26 ; "a" to "z" (skip "┌" to "┘")
 	call Get1bppViaHDMA
 	ld de, Font + 64 * LEN_1BPP_TILE
 	ld hl, vTiles1 tile $40
-	lb bc, BANK(Font), 32 ; "Ä" to "←"
+	lb bc, BANK(Font), 32 ; $c0 to "←"
 	call Get1bppViaHDMA
 	ld de, Font + 96 * LEN_1BPP_TILE
 	ld hl, vTiles1 tile $60
@@ -42,26 +35,9 @@ _LoadStandardFont::
 	ret
 
 _LoadFontsExtra1::
-	ld de, FontsExtra_SolidBlackGFX
-	ld hl, vTiles2 tile "■" ; $60
-	lb bc, BANK(FontsExtra_SolidBlackGFX), 1
-	call Get1bppViaHDMA
-	ld de, PokegearPhoneIconGFX
-	ld hl, vTiles2 tile "☎" ; $62
-	lb bc, BANK(PokegearPhoneIconGFX), 1
-	call Get2bppViaHDMA
-	ld de, FontExtra + 3 tiles ; "<BOLD_D>"
-	ld hl, vTiles2 tile "<BOLD_D>"
-	lb bc, BANK(FontExtra), 22 ; "<BOLD_D>" to "ぉ"
-	call Get2bppViaHDMA
 	jr LoadFrame
 
 _LoadFontsExtra2::
-	ld de, FontsExtra2_UpArrowGFX
-	ld hl, vTiles2 tile "▲" ; $61
-	ld b, BANK(FontsExtra2_UpArrowGFX)
-	ld c, 1
-	call Get2bppViaHDMA
 	ret
 
 _LoadFontsBattleExtra::
@@ -79,7 +55,7 @@ LoadFrame:
 	call AddNTimes
 	ld d, h
 	ld e, l
-	ld hl, vTiles2 tile "┌" ; $79
+	ld hl, vTiles0 tile "┌" ; $ba
 	lb bc, BANK(Frames), TEXTBOX_FRAME_TILES ; "┌" to "┘"
 	call Get1bppViaHDMA
 	ld hl, vTiles2 tile " " ; $7f
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index 5e4c7e2..9e7fdfe 100644
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -1,8 +1,8 @@
 DEF NAMINGSCREEN_CURSOR     EQU $7e
 
-DEF NAMINGSCREEN_BORDER     EQU "■" ; $60
+DEF NAMINGSCREEN_BORDER     EQU "■" ; $d7
 DEF NAMINGSCREEN_MIDDLELINE EQU "→" ; $eb
-DEF NAMINGSCREEN_UNDERLINE  EQU "<DOT>" ; $f2
+DEF NAMINGSCREEN_UNDERLINE  EQU "☎" ; $d9
 
 _NamingScreen:
 	call DisableSpriteUpdates
@@ -840,7 +840,7 @@ LoadNamingScreenGFX:
 	lb bc, BANK(NamingScreenGFX_UnderLine), 1
 	call Get1bpp
 
-	ld de, vTiles2 tile NAMINGSCREEN_BORDER
+	ld de, vTiles0 tile NAMINGSCREEN_BORDER
 	ld hl, NamingScreenGFX_Border
 	ld bc, 1 tiles
 	ld a, BANK(NamingScreenGFX_Border)
diff --git a/engine/pokemon/correct_nick_errors.asm b/engine/pokemon/correct_nick_errors.asm
index 421bf92..4016120 100644
--- a/engine/pokemon/correct_nick_errors.asm
+++ b/engine/pokemon/correct_nick_errors.asm
@@ -70,5 +70,5 @@ CorrectNickErrors::
 	db "<ROUTE>",  "<GREEN>" + 1
 	db "<ENEMY>",  "<ENEMY>" + 1
 	db "<MOM>",    "<TM>"    + 1
-	db "<ROCKET>", "┘"       + 1
+	db "<ROCKET>", " "
 	db -1 ; end
diff --git a/gfx/font.asm b/gfx/font.asm
index 465920b..5666563 100644
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -1,6 +1,3 @@
-FontExtra:
-INCBIN "gfx/font/font_extra.2bpp"
-
 Font:
 INCBIN "gfx/font/font.1bpp"
 
@@ -38,9 +35,6 @@ INCBIN "gfx/pokegear/town_map.2bpp.lz"
 UnusedWeekdayKanjiGFX: ; unreferenced
 INCBIN "gfx/font/unused_weekday_kanji.2bpp"
 
-PokegearPhoneIconGFX:
-INCBIN "gfx/font/phone_icon.2bpp"
-
 UnusedBoldFontGFX: ; unreferenced
 INCBIN "gfx/font/unused_bold_font.1bpp"
 
@@ -48,19 +42,10 @@ TextboxSpaceGFX:
 ; StatsScreen_LoadTextboxSpaceGFX reads 2bpp; LoadFrame reads first half as 1bpp
 INCBIN "gfx/font/space.2bpp"
 
-FontsExtra_SolidBlackGFX:
-INCBIN "gfx/font/black.1bpp"
-
 UnusedUpArrowGFX: ; unreferenced
 INCBIN "gfx/font/unused_up_arrow.1bpp"
 
 MobilePhoneTilesGFX:
 INCBIN "gfx/mobile/phone_tiles.2bpp"
 
-MapEntryFrameGFX:
-INCBIN "gfx/frames/map_entry_sign.2bpp"
-
-FontsExtra2_UpArrowGFX:
-INCBIN "gfx/font/up_arrow.2bpp"
-
 INCLUDE "gfx/footprints.asm"
diff --git a/gfx/font/font.png b/gfx/font/font.png
index 7119c06..f1c0b5c 100644
Binary files a/gfx/font/font.png and b/gfx/font/font.png differ
diff --git a/gfx/font/font_inversed.png b/gfx/font/font_inversed.png
index 519339f..e5ff2d9 100644
Binary files a/gfx/font/font_inversed.png and b/gfx/font/font_inversed.png differ
diff --git a/gfx/font/overworld.png b/gfx/font/overworld.png
index 106c712..5656367 100644
Binary files a/gfx/font/overworld.png and b/gfx/font/overworld.png differ
diff --git a/gfx/tilesets/aerodactyl_word_room.png b/gfx/tilesets/aerodactyl_word_room.png
index 7ae2723..440ea2b 100644
Binary files a/gfx/tilesets/aerodactyl_word_room.png and b/gfx/tilesets/aerodactyl_word_room.png differ
diff --git a/gfx/tilesets/aerodactyl_word_room_palette_map.asm b/gfx/tilesets/aerodactyl_word_room_palette_map.asm
index 5ebde24..39b2005 100644
--- a/gfx/tilesets/aerodactyl_word_room_palette_map.asm
+++ b/gfx/tilesets/aerodactyl_word_room_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/gfx/tilesets/battle_tower_inside.png b/gfx/tilesets/battle_tower_inside.png
index cf9e12d..8292c22 100644
Binary files a/gfx/tilesets/battle_tower_inside.png and b/gfx/tilesets/battle_tower_inside.png differ
diff --git a/gfx/tilesets/battle_tower_inside_palette_map.asm b/gfx/tilesets/battle_tower_inside_palette_map.asm
index 1abce2a..956e266 100644
--- a/gfx/tilesets/battle_tower_inside_palette_map.asm
+++ b/gfx/tilesets/battle_tower_inside_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, WATER, WATER, WATER, RED, RED, RED, RED, WATER
 	tilepal 0, BROWN, YELLOW, RED, BROWN, BROWN, BROWN, RED, RED
 	tilepal 0, WATER, RED, RED, RED, RED, GRAY, RED, WATER
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, GRAY, WATER, GRAY, WATER, WATER, WATER, ROOF, ROOF
 	tilepal 1, YELLOW, YELLOW, GRAY, GRAY, WATER, WATER, RED, RED
 	tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER
diff --git a/gfx/tilesets/battle_tower_outside.png b/gfx/tilesets/battle_tower_outside.png
index 1c080ff..7d176db 100644
Binary files a/gfx/tilesets/battle_tower_outside.png and b/gfx/tilesets/battle_tower_outside.png differ
diff --git a/gfx/tilesets/battle_tower_outside_palette_map.asm b/gfx/tilesets/battle_tower_outside_palette_map.asm
index dfc74a9..e07abe8 100644
--- a/gfx/tilesets/battle_tower_outside_palette_map.asm
+++ b/gfx/tilesets/battle_tower_outside_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, RED, WATER, WATER, ROOF, ROOF, ROOF, ROOF, ROOF
 	tilepal 1, RED, RED, RED, ROOF, RED, WATER, WATER, WATER
 	tilepal 1, WATER, WATER, WATER, ROOF, ROOF, ROOF, ROOF, ROOF
diff --git a/gfx/tilesets/beta_word_room.png b/gfx/tilesets/beta_word_room.png
index 7ae2723..440ea2b 100644
Binary files a/gfx/tilesets/beta_word_room.png and b/gfx/tilesets/beta_word_room.png differ
diff --git a/gfx/tilesets/beta_word_room_palette_map.asm b/gfx/tilesets/beta_word_room_palette_map.asm
index 5ebde24..39b2005 100644
--- a/gfx/tilesets/beta_word_room_palette_map.asm
+++ b/gfx/tilesets/beta_word_room_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/gfx/tilesets/cave_palette_map.asm b/gfx/tilesets/cave_palette_map.asm
index 73c09eb..94a7fb6 100644
--- a/gfx/tilesets/cave_palette_map.asm
+++ b/gfx/tilesets/cave_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
 	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
diff --git a/gfx/tilesets/champions_room.png b/gfx/tilesets/champions_room.png
index e32c2fb..820c80e 100644
Binary files a/gfx/tilesets/champions_room.png and b/gfx/tilesets/champions_room.png differ
diff --git a/gfx/tilesets/champions_room_palette_map.asm b/gfx/tilesets/champions_room_palette_map.asm
index 551a093..beedbb9 100644
--- a/gfx/tilesets/champions_room_palette_map.asm
+++ b/gfx/tilesets/champions_room_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, BROWN, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN
 	tilepal 0, GRAY, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
 	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
 	tilepal 1, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY
diff --git a/gfx/tilesets/dark_cave_palette_map.asm b/gfx/tilesets/dark_cave_palette_map.asm
index 73c09eb..94a7fb6 100644
--- a/gfx/tilesets/dark_cave_palette_map.asm
+++ b/gfx/tilesets/dark_cave_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
 	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
diff --git a/gfx/tilesets/elite_four_room_palette_map.asm b/gfx/tilesets/elite_four_room_palette_map.asm
index b20f491..f0494e1 100644
--- a/gfx/tilesets/elite_four_room_palette_map.asm
+++ b/gfx/tilesets/elite_four_room_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF
 	tilepal 0, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY
 	tilepal 0, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN
 	tilepal 1, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN
 	tilepal 1, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN
diff --git a/gfx/tilesets/facility_palette_map.asm b/gfx/tilesets/facility_palette_map.asm
index f79f9c0..52c561b 100644
--- a/gfx/tilesets/facility_palette_map.asm
+++ b/gfx/tilesets/facility_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF
 	tilepal 0, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN
 	tilepal 1, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
diff --git a/gfx/tilesets/forest.png b/gfx/tilesets/forest.png
index 8536259..a420d89 100644
Binary files a/gfx/tilesets/forest.png and b/gfx/tilesets/forest.png differ
diff --git a/gfx/tilesets/forest_palette_map.asm b/gfx/tilesets/forest_palette_map.asm
index 6967880..61d95f3 100644
--- a/gfx/tilesets/forest_palette_map.asm
+++ b/gfx/tilesets/forest_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW
 	tilepal 1, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
 	tilepal 1, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN
diff --git a/gfx/tilesets/game_corner.png b/gfx/tilesets/game_corner.png
index d519dd6..210be6e 100644
Binary files a/gfx/tilesets/game_corner.png and b/gfx/tilesets/game_corner.png differ
diff --git a/gfx/tilesets/game_corner_palette_map.asm b/gfx/tilesets/game_corner_palette_map.asm
index 34bb9f6..1521549 100644
--- a/gfx/tilesets/game_corner_palette_map.asm
+++ b/gfx/tilesets/game_corner_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, RED, RED
 	tilepal 0, RED, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
 	tilepal 0, GRAY, GRAY, GRAY, WATER, ROOF, ROOF, WATER, WATER
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, YELLOW, RED, YELLOW, RED, GREEN, GREEN, BROWN, ROOF
 	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, BROWN
 	tilepal 1, YELLOW, RED, YELLOW, RED, GREEN, GREEN, BROWN, ROOF
diff --git a/gfx/tilesets/gate.png b/gfx/tilesets/gate.png
index 5036f90..eecee17 100644
Binary files a/gfx/tilesets/gate.png and b/gfx/tilesets/gate.png differ
diff --git a/gfx/tilesets/gate_palette_map.asm b/gfx/tilesets/gate_palette_map.asm
index 7854d3a..8916bd4 100644
--- a/gfx/tilesets/gate_palette_map.asm
+++ b/gfx/tilesets/gate_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
 	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
 	tilepal 1, GRAY, GRAY, GRAY, GRAY, ROOF, RED, GRAY, GRAY
diff --git a/gfx/tilesets/ho_oh_word_room.png b/gfx/tilesets/ho_oh_word_room.png
index 7ae2723..440ea2b 100644
Binary files a/gfx/tilesets/ho_oh_word_room.png and b/gfx/tilesets/ho_oh_word_room.png differ
diff --git a/gfx/tilesets/ho_oh_word_room_palette_map.asm b/gfx/tilesets/ho_oh_word_room_palette_map.asm
index 5ebde24..39b2005 100644
--- a/gfx/tilesets/ho_oh_word_room_palette_map.asm
+++ b/gfx/tilesets/ho_oh_word_room_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/gfx/tilesets/house.png b/gfx/tilesets/house.png
index ce3547b..0c38681 100644
Binary files a/gfx/tilesets/house.png and b/gfx/tilesets/house.png differ
diff --git a/gfx/tilesets/house_palette_map.asm b/gfx/tilesets/house_palette_map.asm
index ce7b988..6cf7099 100644
--- a/gfx/tilesets/house_palette_map.asm
+++ b/gfx/tilesets/house_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER
 	tilepal 0, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, WATER, RED, RED, RED, RED, BROWN, WATER, WATER
 	tilepal 1, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER
diff --git a/gfx/tilesets/ice_path.png b/gfx/tilesets/ice_path.png
index 70dea39..c410f27 100644
Binary files a/gfx/tilesets/ice_path.png and b/gfx/tilesets/ice_path.png differ
diff --git a/gfx/tilesets/ice_path_palette_map.asm b/gfx/tilesets/ice_path_palette_map.asm
index 9858440..77488bc 100644
--- a/gfx/tilesets/ice_path_palette_map.asm
+++ b/gfx/tilesets/ice_path_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
 	tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, WATER, WATER, WATER
 	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
 	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
 	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
diff --git a/gfx/tilesets/johto.png b/gfx/tilesets/johto.png
index 62ceb23..20d6e3e 100644
Binary files a/gfx/tilesets/johto.png and b/gfx/tilesets/johto.png differ
diff --git a/gfx/tilesets/johto_modern.png b/gfx/tilesets/johto_modern.png
index 1c080ff..7d176db 100644
Binary files a/gfx/tilesets/johto_modern.png and b/gfx/tilesets/johto_modern.png differ
diff --git a/gfx/tilesets/johto_modern_palette_map.asm b/gfx/tilesets/johto_modern_palette_map.asm
index f2af7a9..ff504bf 100644
--- a/gfx/tilesets/johto_modern_palette_map.asm
+++ b/gfx/tilesets/johto_modern_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
 	tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY
 	tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF
 	tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
 	tilepal 1, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, ROOF
diff --git a/gfx/tilesets/johto_palette_map.asm b/gfx/tilesets/johto_palette_map.asm
index 62fbd2d..7c52840 100644
--- a/gfx/tilesets/johto_palette_map.asm
+++ b/gfx/tilesets/johto_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, BROWN, BROWN, BROWN, RED, RED, RED, RED, RED
 	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
 	tilepal 1, RED, RED, RED, RED, BROWN, BROWN, BROWN, BROWN
diff --git a/gfx/tilesets/kabuto_word_room.png b/gfx/tilesets/kabuto_word_room.png
index 7ae2723..440ea2b 100644
Binary files a/gfx/tilesets/kabuto_word_room.png and b/gfx/tilesets/kabuto_word_room.png differ
diff --git a/gfx/tilesets/kabuto_word_room_palette_map.asm b/gfx/tilesets/kabuto_word_room_palette_map.asm
index 5ebde24..39b2005 100644
--- a/gfx/tilesets/kabuto_word_room_palette_map.asm
+++ b/gfx/tilesets/kabuto_word_room_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/gfx/tilesets/kanto_palette_map.asm b/gfx/tilesets/kanto_palette_map.asm
index e3e497f..109e5e3 100644
--- a/gfx/tilesets/kanto_palette_map.asm
+++ b/gfx/tilesets/kanto_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, RED
 	tilepal 0, GREEN, GREEN, GREEN, ROOF, BROWN, BROWN, BROWN, BROWN
 	tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, GRAY, BROWN, BROWN, RED, BROWN, ROOF, ROOF, ROOF
 	tilepal 1, ROOF, ROOF, YELLOW, YELLOW, YELLOW, GRAY, BROWN, GRAY
 	tilepal 1, GRAY, BROWN, ROOF, BROWN, WATER, ROOF, ROOF, ROOF
diff --git a/gfx/tilesets/lab.png b/gfx/tilesets/lab.png
index 75301c7..877d16f 100644
Binary files a/gfx/tilesets/lab.png and b/gfx/tilesets/lab.png differ
diff --git a/gfx/tilesets/lab_palette_map.asm b/gfx/tilesets/lab_palette_map.asm
index 24399c6..7b58bd4 100644
--- a/gfx/tilesets/lab_palette_map.asm
+++ b/gfx/tilesets/lab_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
 	tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER
 	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
 	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
diff --git a/gfx/tilesets/lighthouse.png b/gfx/tilesets/lighthouse.png
index 0da4b39..d062439 100644
Binary files a/gfx/tilesets/lighthouse.png and b/gfx/tilesets/lighthouse.png differ
diff --git a/gfx/tilesets/lighthouse_palette_map.asm b/gfx/tilesets/lighthouse_palette_map.asm
index 5f80e3a..4ea8e76 100644
--- a/gfx/tilesets/lighthouse_palette_map.asm
+++ b/gfx/tilesets/lighthouse_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, RED, RED, GRAY, GRAY, GREEN, GREEN, ROOF, ROOF
 	tilepal 0, YELLOW, YELLOW, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY
 	tilepal 0, RED, RED, GREEN, GREEN, ROOF, ROOF, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, BROWN, BROWN, ROOF, GRAY, GRAY, BROWN, BROWN, RED
 	tilepal 1, RED, RED, RED, BROWN, RED, RED, RED, RED
 	tilepal 1, ROOF, WATER, ROOF, BROWN, RED, WATER, WATER, RED
diff --git a/gfx/tilesets/mansion.png b/gfx/tilesets/mansion.png
index 44e697a..eaabe56 100644
Binary files a/gfx/tilesets/mansion.png and b/gfx/tilesets/mansion.png differ
diff --git a/gfx/tilesets/mansion_palette_map.asm b/gfx/tilesets/mansion_palette_map.asm
index 2bd27ad..012cea1 100644
--- a/gfx/tilesets/mansion_palette_map.asm
+++ b/gfx/tilesets/mansion_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, WATER, BROWN, BROWN
 	tilepal 0, BROWN, GREEN, BROWN, BROWN, WATER, WATER, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW, YELLOW
 	tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, RED, RED, WATER, WATER
 	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW
diff --git a/gfx/tilesets/mart.png b/gfx/tilesets/mart.png
index d4ef69d..54a9d41 100644
Binary files a/gfx/tilesets/mart.png and b/gfx/tilesets/mart.png differ
diff --git a/gfx/tilesets/mart_palette_map.asm b/gfx/tilesets/mart_palette_map.asm
index 991510d..5f4091c 100644
--- a/gfx/tilesets/mart_palette_map.asm
+++ b/gfx/tilesets/mart_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, GREEN, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
 	tilepal 0, GRAY, GRAY, RED, YELLOW, YELLOW, YELLOW, ROOF, ROOF
 	tilepal 0, ROOF, ROOF, ROOF, ROOF, RED, RED, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN, GRAY
 	tilepal 1, GRAY, GREEN, GREEN, RED, RED, WATER, WATER, ROOF
 	tilepal 1, GRAY, GRAY, GRAY, YELLOW, YELLOW, YELLOW, ROOF, GRAY
diff --git a/gfx/tilesets/omanyte_word_room.png b/gfx/tilesets/omanyte_word_room.png
index 7ae2723..440ea2b 100644
Binary files a/gfx/tilesets/omanyte_word_room.png and b/gfx/tilesets/omanyte_word_room.png differ
diff --git a/gfx/tilesets/omanyte_word_room_palette_map.asm b/gfx/tilesets/omanyte_word_room_palette_map.asm
index 5ebde24..39b2005 100644
--- a/gfx/tilesets/omanyte_word_room_palette_map.asm
+++ b/gfx/tilesets/omanyte_word_room_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/gfx/tilesets/park.png b/gfx/tilesets/park.png
index 830affe..4fd5378 100644
Binary files a/gfx/tilesets/park.png and b/gfx/tilesets/park.png differ
diff --git a/gfx/tilesets/park_palette_map.asm b/gfx/tilesets/park_palette_map.asm
index f9c65ef..27d5348 100644
--- a/gfx/tilesets/park_palette_map.asm
+++ b/gfx/tilesets/park_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, BROWN, BROWN, GREEN, GREEN, GRAY, GRAY, GRAY, RED
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
 	tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, WATER
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, WATER, WATER, GRAY, RED, GREEN, BROWN, GRAY, GRAY
 	tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
 	tilepal 1, WATER, WATER, RED, GRAY, WATER, ROOF, GRAY, GRAY
diff --git a/gfx/tilesets/players_house_palette_map.asm b/gfx/tilesets/players_house_palette_map.asm
index 5d08983..c57d441 100644
--- a/gfx/tilesets/players_house_palette_map.asm
+++ b/gfx/tilesets/players_house_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
 	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, GRAY, BROWN, BROWN, BROWN, RED, GREEN, WATER, WATER
 	tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, RED, BROWN, WATER, WATER
diff --git a/gfx/tilesets/players_room_palette_map.asm b/gfx/tilesets/players_room_palette_map.asm
index 1c0cb1f..eca7f47 100644
--- a/gfx/tilesets/players_room_palette_map.asm
+++ b/gfx/tilesets/players_room_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
 	tilepal 0, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
 	tilepal 1, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED
 	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
diff --git a/gfx/tilesets/pokecenter.png b/gfx/tilesets/pokecenter.png
index 69cacdb..1bdcdde 100644
Binary files a/gfx/tilesets/pokecenter.png and b/gfx/tilesets/pokecenter.png differ
diff --git a/gfx/tilesets/pokecenter_palette_map.asm b/gfx/tilesets/pokecenter_palette_map.asm
index 78508b5..1ab3ac3 100644
--- a/gfx/tilesets/pokecenter_palette_map.asm
+++ b/gfx/tilesets/pokecenter_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, YELLOW, YELLOW, GRAY, GRAY, GRAY, RED, RED, GRAY
 	tilepal 0, RED, RED, RED, RED, RED, RED, GRAY, GRAY
 	tilepal 0, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, GRAY, RED, GRAY, WATER, WATER, WATER, ROOF, ROOF
 	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
 	tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER
diff --git a/gfx/tilesets/pokecom_center.png b/gfx/tilesets/pokecom_center.png
index fbbf270..096f019 100644
Binary files a/gfx/tilesets/pokecom_center.png and b/gfx/tilesets/pokecom_center.png differ
diff --git a/gfx/tilesets/pokecom_center_palette_map.asm b/gfx/tilesets/pokecom_center_palette_map.asm
index 75ee649..ad24fad 100644
--- a/gfx/tilesets/pokecom_center_palette_map.asm
+++ b/gfx/tilesets/pokecom_center_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, YELLOW, YELLOW, WATER, WATER, GRAY, RED, RED, GRAY
 	tilepal 0, RED, RED, WATER, WATER, WATER, WATER, GRAY, GRAY
 	tilepal 0, YELLOW, YELLOW, WATER, WATER, GRAY, GRAY, YELLOW, YELLOW
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, GRAY, GRAY, GRAY, WATER, RED, RED, WATER, WATER
 	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GRAY, WATER
 	tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, RED, WATER, WATER
diff --git a/gfx/tilesets/port_palette_map.asm b/gfx/tilesets/port_palette_map.asm
index 6bfdf46..a7792d4 100644
--- a/gfx/tilesets/port_palette_map.asm
+++ b/gfx/tilesets/port_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
 	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
 	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, GRAY, WATER, WATER, GRAY, GRAY, RED, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, RED, BROWN
 	tilepal 1, ROOF, WATER, WATER, WATER, WATER, RED, BROWN, BROWN
diff --git a/gfx/tilesets/radio_tower.png b/gfx/tilesets/radio_tower.png
index 4f823f7..76728ec 100644
Binary files a/gfx/tilesets/radio_tower.png and b/gfx/tilesets/radio_tower.png differ
diff --git a/gfx/tilesets/radio_tower_palette_map.asm b/gfx/tilesets/radio_tower_palette_map.asm
index 3530f74..363a15b 100644
--- a/gfx/tilesets/radio_tower_palette_map.asm
+++ b/gfx/tilesets/radio_tower_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
 	tilepal 0, RED, RED, WATER, WATER, GRAY, GRAY, GRAY, GRAY
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
 	tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
 	tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, YELLOW, YELLOW, RED
diff --git a/gfx/tilesets/ruins_of_alph.png b/gfx/tilesets/ruins_of_alph.png
index 7ae2723..440ea2b 100644
Binary files a/gfx/tilesets/ruins_of_alph.png and b/gfx/tilesets/ruins_of_alph.png differ
diff --git a/gfx/tilesets/ruins_of_alph_palette_map.asm b/gfx/tilesets/ruins_of_alph_palette_map.asm
index 5ebde24..39b2005 100644
--- a/gfx/tilesets/ruins_of_alph_palette_map.asm
+++ b/gfx/tilesets/ruins_of_alph_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/gfx/tilesets/tower.png b/gfx/tilesets/tower.png
index 05484b5..71be4f1 100644
Binary files a/gfx/tilesets/tower.png and b/gfx/tilesets/tower.png differ
diff --git a/gfx/tilesets/tower_palette_map.asm b/gfx/tilesets/tower_palette_map.asm
index 6e3c101..f289455 100644
--- a/gfx/tilesets/tower_palette_map.asm
+++ b/gfx/tilesets/tower_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED
 	tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED
diff --git a/gfx/tilesets/traditional_house.png b/gfx/tilesets/traditional_house.png
index bda1f79..bdc1283 100644
Binary files a/gfx/tilesets/traditional_house.png and b/gfx/tilesets/traditional_house.png differ
diff --git a/gfx/tilesets/traditional_house_palette_map.asm b/gfx/tilesets/traditional_house_palette_map.asm
index 5daa0da..b66c1fb 100644
--- a/gfx/tilesets/traditional_house_palette_map.asm
+++ b/gfx/tilesets/traditional_house_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY
 	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
 	tilepal 1, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY
diff --git a/gfx/tilesets/train_station.png b/gfx/tilesets/train_station.png
index b0704b9..653e8e1 100644
Binary files a/gfx/tilesets/train_station.png and b/gfx/tilesets/train_station.png differ
diff --git a/gfx/tilesets/train_station_palette_map.asm b/gfx/tilesets/train_station_palette_map.asm
index f52f5bb..13d0c38 100644
--- a/gfx/tilesets/train_station_palette_map.asm
+++ b/gfx/tilesets/train_station_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
 	tilepal 0, WATER, GREEN, GREEN, WATER, BROWN, BROWN, BROWN, GREEN
 	tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, WATER, WATER, WATER, WATER, GRAY, GRAY, GRAY, GRAY
 	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
 	tilepal 1, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
diff --git a/gfx/tilesets/underground.png b/gfx/tilesets/underground.png
index c33c3fd..57722ef 100644
Binary files a/gfx/tilesets/underground.png and b/gfx/tilesets/underground.png differ
diff --git a/gfx/tilesets/underground_palette_map.asm b/gfx/tilesets/underground_palette_map.asm
index 6b9b554..aeef042 100644
--- a/gfx/tilesets/underground_palette_map.asm
+++ b/gfx/tilesets/underground_palette_map.asm
@@ -10,11 +10,10 @@
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
 	tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, GRAY, GRAY, RED, WATER, WATER, WATER, WATER, RED
 	tilepal 1, RED, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
 	tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, RED
diff --git a/gfx/tilesets/unused_museum_palette_map.asm b/gfx/tilesets/unused_museum_palette_map.asm
index cfbe6db..a5887b1 100644
--- a/gfx/tilesets/unused_museum_palette_map.asm
+++ b/gfx/tilesets/unused_museum_palette_map.asm
@@ -13,11 +13,10 @@
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
 	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
 	tilepal 1, WATER, RED, YELLOW, YELLOW, RED, GREEN, GREEN, BROWN
 	tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
 	tilepal 1, GRAY, GRAY, YELLOW, YELLOW, RED, GREEN, GREEN, BROWN
diff --git a/home/map.asm b/home/map.asm
index 70ba898..5a6765b 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -1320,7 +1320,7 @@ LoadTilesetGFX::
 
 	ld hl, wDecompressScratch
 	ld de, vTiles2
-	ld bc, $60 tiles
+	ld bc, $7f tiles
 	call CopyBytes
 
 	ldh a, [rVBK]
@@ -1328,9 +1328,9 @@ LoadTilesetGFX::
 	ld a, BANK(vTiles5)
 	ldh [rVBK], a
 
-	ld hl, wDecompressScratch + $60 tiles
+	ld hl, wDecompressScratch + $80 tiles
 	ld de, vTiles5
-	ld bc, $60 tiles
+	ld bc, $80 tiles
 	call CopyBytes
 
 	pop af
diff --git a/home/text.asm b/home/text.asm
index 276bfe0..2d8c9f7 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -252,40 +252,6 @@ ENDM
 	dict "<USER>",    PlaceMoveUsersName
 	dict "<ENEMY>",   PlaceEnemysName
 	dict "<PLAY_G>",  PlaceGenderedPlayerName
-	dict "ﾟ",         .place
-	dict "ﾞ",         .place
-
-	cp FIRST_REGULAR_TEXT_CHAR
-	jr nc, .place
-; dakuten or handakuten
-	cp "パ"
-	jr nc, .handakuten
-; dakuten
-	cp FIRST_HIRAGANA_DAKUTEN_CHAR
-	jr nc, .hiragana_dakuten
-; katakana dakuten
-	add "カ" - "ガ"
-	jr .place_dakuten
-
-.hiragana_dakuten
-	add "か" - "が"
-.place_dakuten
-	ld b, "ﾞ" ; dakuten
-	jr .place
-
-.handakuten
-	cp "ぱ"
-	jr nc, .hiragana_handakuten
-; katakana handakuten
-	add "ハ" - "パ"
-	jr .place_handakuten
-
-.hiragana_handakuten
-	add "は" - "ぱ"
-.place_handakuten
-	ld b, "ﾟ" ; handakuten
-
-.place
 	ld [hli], a
 	call PrintLetterDelay
 	jp NextChar
diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm
index 0450a41..eb186d0 100644
--- a/mobile/mobile_41.asm
+++ b/mobile/mobile_41.asm
@@ -1014,16 +1014,8 @@ Stubbed_Function106462:
 	ret
 
 Function106464::
-	ld de, FontsExtra_SolidBlackGFX
-	ld hl, vTiles2 tile "■" ; $60
-	lb bc, BANK(FontsExtra_SolidBlackGFX), 1
-	call Get2bpp
-	ld de, FontsExtra2_UpArrowGFX
-	ld hl, vTiles2 tile "▲" ; $61
-	lb bc, BANK(FontsExtra2_UpArrowGFX), 1
-	call Get2bpp
 	ld de, MobileDialingFrameGFX
-	ld hl, vTiles2 tile "☎" ; $62
+	ld hl, vTiles2 tile $62
 	ld c, 9
 	ld b, BANK(MobileDialingFrameGFX)
 	call Get2bpp
@@ -1042,7 +1034,7 @@ Function10649b: ; unreferenced
 	call AddNTimes
 	ld d, h
 	ld e, l
-	ld hl, vTiles2 tile "┌" ; $79
+	ld hl, vTiles0 tile "┌" ; $ba
 	ld c, TEXTBOX_FRAME_TILES ; "┌" to "┘"
 	ld b, BANK(Frames)
 	call Function1064c3