From 6e3c5fd00874e9af40624aedf192ecb511099dec Mon Sep 17 00:00:00 2001
From: xCrystal <rgr.crystal@gmail.com>
Date: Wed, 2 Aug 2023 19:52:51 +0200
Subject: [PATCH] Expand tilesets from 192 to 255 tiles (#2) [Commit 2],
 Reorganization of pokecrystal charmap and fonts layout (#3)

---
 charmap.asm                                   | 153 +++++++-----------
 engine/battle/trainer_huds.asm                |   2 +-
 engine/events/magikarp.asm                    |  11 --
 engine/games/card_flip.asm                    |   2 +-
 engine/gfx/load_font.asm                      |  58 ++-----
 engine/gfx/load_overworld_font.asm            |   2 +-
 engine/menus/delete_save.asm                  |   2 +-
 engine/menus/init_gender.asm                  |   2 +-
 engine/menus/intro_menu.asm                   |  10 +-
 engine/menus/main_menu.asm                    |   2 +-
 engine/menus/naming_screen.asm                |   2 +-
 engine/menus/options_menu.asm                 |   2 +-
 engine/menus/start_menu.asm                   |   2 +-
 engine/overworld/init_map.asm                 |   2 +-
 engine/overworld/warp_connection.asm          |   2 +-
 engine/pokedex/new_pokedex_entry.asm          |   2 +-
 engine/pokedex/pokedex.asm                    |   4 +-
 engine/pokemon/mail_2.asm                     |   2 +-
 gfx/font.asm                                  |  12 --
 gfx/font/black.png                            | Bin 68 -> 0 bytes
 gfx/font/font.png                             | Bin 770 -> 1901 bytes
 gfx/font/font_extra.png                       | Bin 245 -> 0 bytes
 gfx/font/font_inversed.png                    | Bin 736 -> 1919 bytes
 gfx/font/overworld.png                        | Bin 752 -> 1899 bytes
 gfx/font/phone_icon.png                       | Bin 82 -> 0 bytes
 gfx/font/up_arrow.png                         | Bin 86 -> 0 bytes
 .../aerodactyl_word_room_palette_map.asm      |   9 +-
 .../battle_tower_inside_palette_map.asm       |   9 +-
 .../battle_tower_outside_palette_map.asm      |   9 +-
 gfx/tilesets/beta_word_room_palette_map.asm   |   9 +-
 gfx/tilesets/cave_palette_map.asm             |   9 +-
 gfx/tilesets/champions_room_palette_map.asm   |   9 +-
 gfx/tilesets/dark_cave_palette_map.asm        |   9 +-
 gfx/tilesets/elite_four_room_palette_map.asm  |   9 +-
 gfx/tilesets/facility_palette_map.asm         |   9 +-
 gfx/tilesets/forest_palette_map.asm           |   9 +-
 gfx/tilesets/game_corner_palette_map.asm      |   9 +-
 gfx/tilesets/gate_palette_map.asm             |   9 +-
 gfx/tilesets/ho_oh_word_room_palette_map.asm  |   9 +-
 gfx/tilesets/house_palette_map.asm            |   9 +-
 gfx/tilesets/ice_path_palette_map.asm         |   9 +-
 gfx/tilesets/johto_modern_palette_map.asm     |   9 +-
 gfx/tilesets/johto_palette_map.asm            |   9 +-
 gfx/tilesets/kabuto_word_room_palette_map.asm |   9 +-
 gfx/tilesets/kanto_palette_map.asm            |   9 +-
 gfx/tilesets/lab_palette_map.asm              |   9 +-
 gfx/tilesets/lighthouse_palette_map.asm       |   9 +-
 gfx/tilesets/mansion_palette_map.asm          |   9 +-
 gfx/tilesets/mart_palette_map.asm             |   9 +-
 .../omanyte_word_room_palette_map.asm         |   9 +-
 gfx/tilesets/park_palette_map.asm             |   9 +-
 gfx/tilesets/players_house_palette_map.asm    |   9 +-
 gfx/tilesets/players_room_palette_map.asm     |   9 +-
 gfx/tilesets/pokecenter_palette_map.asm       |   9 +-
 gfx/tilesets/pokecom_center_palette_map.asm   |   9 +-
 gfx/tilesets/port_palette_map.asm             |   9 +-
 gfx/tilesets/radio_tower_palette_map.asm      |   9 +-
 gfx/tilesets/ruins_of_alph_palette_map.asm    |   9 +-
 gfx/tilesets/tower_palette_map.asm            |   9 +-
 .../traditional_house_palette_map.asm         |   9 +-
 gfx/tilesets/train_station_palette_map.asm    |   9 +-
 gfx/tilesets/underground_palette_map.asm      |   9 +-
 gfx/tilesets/unused_museum_palette_map.asm    |   9 +-
 home/gfx.asm                                  |   5 +-
 home/map.asm                                  |   8 +-
 maps/Level1_Map1.blk                          |   2 +-
 maps/Level1_Map1.blk.bak                      |   1 +
 67 files changed, 243 insertions(+), 380 deletions(-)
 delete mode 100644 gfx/font/black.png
 mode change 100644 => 100755 gfx/font/font.png
 delete mode 100755 gfx/font/font_extra.png
 mode change 100644 => 100755 gfx/font/font_inversed.png
 mode change 100644 => 100755 gfx/font/overworld.png
 delete mode 100644 gfx/font/phone_icon.png
 delete mode 100644 gfx/font/up_arrow.png
 create mode 100755 maps/Level1_Map1.blk.bak

diff --git a/charmap.asm b/charmap.asm
index 76ee6b120..8efb59029 100644
--- a/charmap.asm
+++ b/charmap.asm
@@ -35,42 +35,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 ; unused
-	; charmap "<BOLD_S>",  $6a ; unused
-	; charmap "<BOLD_L>",  $6b ; unused
-	; charmap "<BOLD_M>",  $6c ; unused
-	; charmap "<COLON>",   $6d ; unused (colon with tinier dots than ":")
-	; charmap "ぃ",         $6e ; hiragana small i, unused
-	; charmap "ぅ",         $6f ; hiragana small u, unused
-	charmap "<PO>",      $63
-	charmap "<KE>",      $64
-	charmap "“",         $65 ; opening quote
-	charmap "”",         $66 ; closing quote
-	; charmap "·",         $74 ; middle dot, unused
-	charmap "…",         $67 ; 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
@@ -83,20 +47,13 @@
 
 ; 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
-
 	; needed for StatsScreen_PlaceShinyIcon and PrintPartyMonPage1
 	charmap "⁂",         $3f ; gfx/stats/stats_tiles.png, tile 14
 
 ; Actual characters (from gfx/font/font.png)
 
+	charmap " ",         $7f
+
 	charmap "A",         $80
 	charmap "B",         $81
 	charmap "C",         $82
@@ -123,14 +80,12 @@
 	charmap "X",         $97
 	charmap "Y",         $98
 	charmap "Z",         $99
-
 	charmap "(",         $9a
 	charmap ")",         $9b
 	charmap ":",         $9c
 	charmap ";",         $9d
 	charmap "[",         $9e
 	charmap "]",         $9f
-
 	charmap "a",         $a0
 	charmap "b",         $a1
 	charmap "c",         $a2
@@ -157,56 +112,62 @@
 	charmap "x",         $b7
 	charmap "y",         $b8
 	charmap "z",         $b9
+	charmap "■",         $ba
+	charmap "▲",         $bb
+	charmap "☎",         $bc
+	charmap "“",         $bd
+	charmap "”",         $be
+	charmap "…",         $bf
+	charmap "'d",        $c0
+	charmap "'l",        $c1
+	charmap "'m",        $c2
+	charmap "'r",        $c3
+	charmap "'s",        $c4
+	charmap "'t",        $c5
+	charmap "'v",        $c6
+	charmap "′",         $c7
+	charmap "″",         $c8
+	charmap "¥",         $c9
+	charmap "'",         $d0
+	charmap "<PK>",      $d1
+	charmap "<MN>",      $d2
+	charmap "-",         $d3
+	charmap "<PO>",      $d4
+	charmap "<KE>",      $d5
+	charmap "?",         $d6
+	charmap "!",         $d7
+	charmap ".",         $d8
+	charmap "&",         $d9
+	charmap "é",         $da
+	charmap "→",         $db
+	charmap "▷",         $dc
+	charmap "▶",         $dd
+	charmap "▼",         $de
+	charmap "♂",         $df
+	charmap "←",         $e0
+	charmap "×",         $e1
+	; charmap "<DOT>",     $e2 ; decimal point; same as "." in English
+	charmap "/",         $e3
+	charmap ",",         $e4
+	charmap "♀",         $e5
+	charmap "0",         $e6
+	charmap "1",         $e7
+	charmap "2",         $e8
+	charmap "3",         $e9
+	charmap "4",         $ea
+	charmap "5",         $eb
+	charmap "6",         $ec
+	charmap "7",         $ed
+	charmap "8",         $ee
+	charmap "9",         $ef
 
-	; charmap "Ä",         $c0
-	; charmap "Ö",         $c1
-	; charmap "Ü",         $c2
-	; charmap "ä",         $c3
-	; charmap "ö",         $c4
-	; charmap "ü",         $c5
-
-	charmap "'d",        $d0
-	charmap "'l",        $d1
-	charmap "'m",        $d2
-	charmap "'r",        $d3
-	charmap "'s",        $d4
-	charmap "'t",        $d5
-	charmap "'v",        $d6
-
-	charmap "←",         $df
-	charmap "'",         $e0
-	charmap "<PK>",      $e1
-	charmap "<MN>",      $e2
-	charmap "-",         $e3
-
-	charmap "?",         $e6
-	charmap "!",         $e7
-	charmap ".",         $e8
-	charmap "&",         $e9
-
-	charmap "é",         $ea
-	charmap "→",         $eb
-	charmap "▷",         $ec
-	charmap "▶",         $ed
-	charmap "▼",         $ee
-	charmap "♂",         $ef
-	charmap "¥",         $f0
-	charmap "×",         $f1
-	; charmap "<DOT>",     $f2 ; decimal point; same as "." in English
-	charmap "/",         $f3
-	charmap ",",         $f4
-	charmap "♀",         $f5
-
-	charmap "0",         $f6
-	charmap "1",         $f7
-	charmap "2",         $f8
-	charmap "3",         $f9
-	charmap "4",         $fa
-	charmap "5",         $fb
-	charmap "6",         $fc
-	charmap "7",         $fd
-	charmap "8",         $fe
-	charmap "9",         $ff
+; Textbox frame (from gfx/frame/*)
+	charmap "┌",         $f0
+	charmap "─",         $f1
+	charmap "┐",         $f2
+	charmap "│",         $f3
+	charmap "└",         $f4
+	charmap "┘",         $f5
 
 ; ASCII charmap, for mobile functions
 pushc
diff --git a/engine/battle/trainer_huds.asm b/engine/battle/trainer_huds.asm
index fdf0060de..87218979c 100644
--- a/engine/battle/trainer_huds.asm
+++ b/engine/battle/trainer_huds.asm
@@ -234,7 +234,7 @@ INCBIN "gfx/battle/balls.2bpp"
 
 _ShowLinkBattleParticipants:
 	call ClearBGPalettes
-	call LoadFontsExtra
+	call LoadFrame
 	hlcoord 2, 3
 	ld b, 9
 	ld c, 14
diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm
index 390db85f3..65031c783 100644
--- a/engine/events/magikarp.asm
+++ b/engine/events/magikarp.asm
@@ -74,18 +74,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/games/card_flip.asm b/engine/games/card_flip.asm
index c66ac7525..74e5e671b 100644
--- a/engine/games/card_flip.asm
+++ b/engine/games/card_flip.asm
@@ -22,7 +22,7 @@ _CardFlip:
 	call DelayFrame
 	call DisableLCD
 	call LoadStandardFont
-	call LoadFontsExtra
+	call LoadFrame
 
 	ld hl, CardFlipLZ01
 	ld de, vTiles2 tile $00
diff --git a/engine/gfx/load_font.asm b/engine/gfx/load_font.asm
index ac5a585e3..d462a4dd6 100644
--- a/engine/gfx/load_font.asm
+++ b/engine/gfx/load_font.asm
@@ -1,77 +1,39 @@
 INCLUDE "gfx/font.asm"
 
-EnableHDMAForGraphics:
-	db FALSE
-
-Get1bppOptionalHDMA: ; unreferenced
-	ld a, [EnableHDMAForGraphics]
-	and a
-	jp nz, Get1bppViaHDMA
-	jp Get1bpp
-
-Get2bppOptionalHDMA: ; unreferenced
-	ld a, [EnableHDMAForGraphics]
-	and a
-	jp nz, Get2bppViaHDMA
-	jp Get2bpp
-
 _LoadStandardFont::
 	ld de, Font
 	ld hl, vTiles1
-	lb bc, BANK(Font), 128 ; "A" to "9"
+	lb bc, BANK(Font), 112 ; "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 "]"
+	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), 32
 	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
 	call Get1bppViaHDMA
 	ld de, Font + 96 * LEN_1BPP_TILE
 	ld hl, vTiles1 tile $60
-	lb bc, BANK(Font), 32 ; "'" to "9"
+	lb bc, BANK(Font), 16 ; ..."9"
 	call Get1bppViaHDMA
 	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 ; "<PO>"
-	ld hl, vTiles2 tile "<PO>" ; $63
-	lb bc, BANK(FontExtra), 5 ; "<PO>" 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::
 	ld de, FontBattleExtra
 	ld hl, vTiles2 tile $60
 	lb bc, BANK(FontBattleExtra), 25
 	call Get2bppViaHDMA
-	jr LoadFrame
+	jr _LoadFrame
 
-LoadFrame:
+_LoadFrame::
 	ld a, [wTextboxFrame]
 	maskbits NUM_FRAMES
 	ld bc, TEXTBOX_FRAME_TILES * LEN_1BPP_TILE
@@ -79,10 +41,10 @@ LoadFrame:
 	call AddNTimes
 	ld d, h
 	ld e, l
-	ld hl, vTiles2 tile "┌" ; $79
+	ld hl, vTiles0 tile "┌" ; $f0
 	lb bc, BANK(Frames), TEXTBOX_FRAME_TILES ; "┌" to "┘"
 	call Get1bppViaHDMA
-	ld hl, vTiles2 tile " " ; $7f
+	ld hl, vTiles2 tile " " ; $f5
 	ld de, TextboxSpaceGFX
 	lb bc, BANK(TextboxSpaceGFX), 1
 	call Get1bppViaHDMA
@@ -97,7 +59,7 @@ LoadBattleFontsHPBar:
 	ld de, FontBattleExtra + 16 tiles ; "<DO>"
 	lb bc, BANK(FontBattleExtra), 3 ; "<DO>" to "『"
 	call Get2bppViaHDMA
-	call LoadFrame
+	call _LoadFrame
 
 LoadHPBar:
 	ld de, EnemyHPBarBorderGFX
diff --git a/engine/gfx/load_overworld_font.asm b/engine/gfx/load_overworld_font.asm
index f4ef84619..f32ebbb41 100644
--- a/engine/gfx/load_overworld_font.asm
+++ b/engine/gfx/load_overworld_font.asm
@@ -1,7 +1,7 @@
 LoadOverworldFont::
 	ld de, .OverworldFontGFX
 	ld hl, vTiles1
-	lb bc, BANK(.OverworldFontGFX), $80
+	lb bc, BANK(.OverworldFontGFX), 112
 	call Get2bpp
 	ld de, .OverworldFontSpaceGFX
 	ld hl, vTiles2 tile " "
diff --git a/engine/menus/delete_save.asm b/engine/menus/delete_save.asm
index 696b40f92..467d66209 100644
--- a/engine/menus/delete_save.asm
+++ b/engine/menus/delete_save.asm
@@ -3,7 +3,7 @@ _DeleteSaveData:
 	ld b, CGB_DIPLOMA
 	call GetCGBLayout
 	call LoadStandardFont
-	call LoadFontsExtra
+	call LoadFrame
 	ld de, MUSIC_MAIN_MENU
 	call PlayMusic
 	ld hl, .ClearAllSaveDataText
diff --git a/engine/menus/init_gender.asm b/engine/menus/init_gender.asm
index 76c6cb4bd..2ef9cc344 100644
--- a/engine/menus/init_gender.asm
+++ b/engine/menus/init_gender.asm
@@ -63,7 +63,7 @@ InitGenderScreen:
 	call DelayFrames
 	call ClearBGPalettes
 	call InitCrystalData
-	call LoadFontsExtra
+	call LoadFrame
 	hlcoord 0, 0
 	ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
 	ld a, $0
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index 25fcec006..144c6e418 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -40,7 +40,7 @@ NewGame_ClearTilemapEtc:
 	xor a
 	ldh [hMapAnims], a
 	call ClearTilemap
-	call LoadFontsExtra
+	call LoadFrame
 	call LoadStandardFont
 	call ClearWindowData
 	ret
@@ -402,7 +402,7 @@ DisplayNormalContinueData:
 	call Continue_LoadMenuHeader
 	call Continue_DisplayBadgesDexPlayerName
 	call Continue_PrintGameTime
-	call LoadFontsExtra
+	call LoadFrame
 	call UpdateSprites
 	ret
 
@@ -644,7 +644,7 @@ NamePlayer:
 	call RotateThreePalettesRight
 	call ClearTilemap
 
-	call LoadFontsExtra
+	call LoadFrame
 	call WaitBGMap
 
 	xor a
@@ -732,7 +732,7 @@ ShrinkPlayer:
 	call DelayFrames
 
 	call Intro_PlacePlayerSprite
-	call LoadFontsExtra
+	call LoadFrame
 
 	ld c, 50
 	call DelayFrames
@@ -1107,7 +1107,7 @@ DeleteSaveData:
 
 Copyright:
 	call ClearTilemap
-	call LoadFontsExtra
+	call LoadFrame
 	ld de, CopyrightGFX
 	ld hl, vTiles2 tile $60
 	lb bc, BANK(CopyrightGFX), 29
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm
index 5a207fb98..1e85037f2 100644
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -210,7 +210,7 @@ ClearTilemapEtc:
 	xor a
 	ldh [hMapAnims], a
 	call ClearTilemap
-	call LoadFontsExtra
+	call LoadFrame
 	call LoadStandardFont
 	call ClearWindowData
 	ret
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index 1d2f0f41c..122581205 100644
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -820,7 +820,7 @@ LoadNamingScreenGFX:
 	call ClearSprites
 	callfar ClearSpriteAnims
 	call LoadStandardFont
-	call LoadFontsExtra
+	call LoadFrame
 
 	ld de, NamingScreenGFX_MiddleLine
 	ld hl, vTiles0 tile NAMINGSCREEN_MIDDLELINE
diff --git a/engine/menus/options_menu.asm b/engine/menus/options_menu.asm
index e39e1e57c..df7e17132 100644
--- a/engine/menus/options_menu.asm
+++ b/engine/menus/options_menu.asm
@@ -480,7 +480,7 @@ UpdateFrame:
 	hlcoord 16, 15 ; where on the screen the number is drawn
 	add "1"
 	ld [hl], a
-	call LoadFontsExtra
+	call LoadFrame
 	and a
 	ret
 
diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm
index 25d3db992..44fccd63d 100644
--- a/engine/menus/start_menu.asm
+++ b/engine/menus/start_menu.asm
@@ -82,7 +82,7 @@ StartMenu::
 	push af
 	ld a, 1
 	ldh [hOAMUpdate], a
-	call LoadFontsExtra
+	call LoadFrame
 	pop af
 	ldh [hOAMUpdate], a
 .ReturnEnd:
diff --git a/engine/overworld/init_map.asm b/engine/overworld/init_map.asm
index 68cb3b265..c98f36c1f 100644
--- a/engine/overworld/init_map.asm
+++ b/engine/overworld/init_map.asm
@@ -70,7 +70,7 @@ LoadFonts_NoOAMUpdate::
 	ret
 
 .LoadGFX:
-	call LoadFontsExtra
+	call LoadFrame
 	ld a, $90
 	ldh [hWY], a
 	call SafeUpdateSprites
diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm
index 1c8972548..9a53dac70 100644
--- a/engine/overworld/warp_connection.asm
+++ b/engine/overworld/warp_connection.asm
@@ -287,7 +287,7 @@ LoadMapGraphics:
 	xor a
 	ldh [hTileAnimFrame], a
 	farcall RefreshSprites
-	call LoadFontsExtra
+	call LoadFrame
 	farcall LoadOverworldFont
 	ret
 
diff --git a/engine/pokedex/new_pokedex_entry.asm b/engine/pokedex/new_pokedex_entry.asm
index 9a948116a..1703350ef 100644
--- a/engine/pokedex/new_pokedex_entry.asm
+++ b/engine/pokedex/new_pokedex_entry.asm
@@ -35,7 +35,7 @@ NewPokedexEntry:
 
 .ReturnFromDexRegistration:
 	call ClearTilemap
-	call LoadFontsExtra
+	call LoadFrame
 	call LoadStandardFont
 	farcall Pokedex_PlaceFrontpicTopLeftCorner
 	call WaitBGMap2
diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm
index 475853661..7c79fe244 100644
--- a/engine/pokedex/pokedex.asm
+++ b/engine/pokedex/pokedex.asm
@@ -2410,7 +2410,7 @@ Pokedex_LoadGFX:
 	xor a
 	call ByteFill
 	call Pokedex_LoadInvertedFont
-	call LoadFontsExtra
+	call LoadFrame
 	ld hl, vTiles2 tile $60
 	ld bc, $20 tiles
 	call Pokedex_InvertTiles
@@ -2494,7 +2494,7 @@ _NewPokedexEntry:
 	call Pokedex_ResetBGMapMode
 	call DisableLCD
 	call LoadStandardFont
-	call LoadFontsExtra
+	call LoadFrame
 	call Pokedex_LoadGFX
 	call Pokedex_LoadAnyFootprint
 	ld a, [wTempSpecies]
diff --git a/engine/pokemon/mail_2.asm b/engine/pokemon/mail_2.asm
index c808de828..8e246aaac 100644
--- a/engine/pokemon/mail_2.asm
+++ b/engine/pokemon/mail_2.asm
@@ -26,7 +26,7 @@ ReadAnyMail:
 	call ClearSprites
 	call ClearTilemap
 	call DisableLCD
-	call LoadFontsExtra
+	call LoadFrame
 	pop de
 	push de
 	ld hl, vTiles1
diff --git a/gfx/font.asm b/gfx/font.asm
index 6af1f91e5..9a6329fe7 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"
 
@@ -35,9 +32,6 @@ INCBIN "gfx/battle/expbar.2bpp"
 TownMapGFX:
 INCBIN "gfx/pokegear/town_map.2bpp.lz"
 
-PokegearPhoneIconGFX:
-INCBIN "gfx/font/phone_icon.2bpp"
-
 UnusedBoldFontGFX: ; unreferenced
 INCBIN "gfx/font/unused_bold_font.1bpp"
 
@@ -45,10 +39,4 @@ TextboxSpaceGFX:
 ; StatsScreen_LoadTextboxSpaceGFX reads 2bpp; LoadFrame reads first half as 1bpp
 INCBIN "gfx/font/space.2bpp"
 
-FontsExtra_SolidBlackGFX:
-INCBIN "gfx/font/black.1bpp"
-
-FontsExtra2_UpArrowGFX:
-INCBIN "gfx/font/up_arrow.2bpp"
-
 INCLUDE "gfx/footprints.asm"
diff --git a/gfx/font/black.png b/gfx/font/black.png
deleted file mode 100644
index e2bd6299c5234d2b1e221f37d9b46777a7d83e6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 68
zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<aeKNrhE&{2PB_5Fz#zfE=yrQE
PH%Qvk)z4*}Q$iB}$5;<o

diff --git a/gfx/font/font.png b/gfx/font/font.png
old mode 100644
new mode 100755
index 7119c06913d39f507dc7f6ab81cf1b71496c0487..15e89e2f3fb0c35bf4692a9f4231ed3c07e9327f
GIT binary patch
delta 1899
zcmV-x2bB1N2JH@z7k@Yi1^@s6HK*{?00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^
z1poj532;bRa{vGmbN~PnbOGLGA9w%&2Lee%K~#8N?V5>hVmlB-ll=cb&r6{cDvI8G
zmjHPj$-?fXy6x*pfXwH=Z$5tb{QUfo<ptOrj{zRXm@Yr^6Mw{Yep1!fIHLBbMx{*<
z6Y0CQ`<2X3d*>%ulgzF#=6V6Lg1!bTF<pM-S2{naYGnCUPKC#;t{wP+=K$CuKTut-
zQTYh%Uq9>3WCbD{fe(2{u%-T4WW99gc|;oOcUI$_%LP!8C>d)VN8|clqw|w2#_j6s
zn8vPXM)2JIVSkd9hw32D2kTsa0;tnLu#YHiE0Mm^`AOzid*t5>4-{k1xpaMP)n{)y
z$d@*+V_GPSt@2s(2v&MM3*F1v{kVQqZ{>WE`5k*7Op$Cep5t-!NBNqY=>yjHS`k(K
zC|~VS51ONX*Xr~mZ9;#SU-^mFaeI_cZaxOS`TueAF@KQgolv_{#Z2-6;<6h``w@Pi
zF>0IUM`U>*t9K^aYg8Y24>z9zI5YvM&tp7SeL(He`fRc~+K=y-djfd%LA#@8q0r`a
z9Qdo4&JU{k5!W|?3f5hrimcccqF$n&LDsWsM7f<`$^2a&&^ph;=!+mU?Sq@;rhNQ1
zs97B_eShrR>HMJc?*-bGe&^r9-35pakcC;?n@~ST_8_*PdeK8rTUMJfk#9m&_qRb0
zTl>%W@<ZV|+pNd$ZOHY`K=-qyp5|vvbUPjRS9{w_`YC|TW=*R-YP!pDCK^$Grb#<>
zH72rwOg|&53nulPNnF$;(O#qaz;oZ<1H2H`!++n(_)Xx^Y}G{GYVH~RD^vZweVp-c
zb#wuq1sos_0ppB^I?+6%?jvcx2?RX&is)df9M|;xD7WgPs$b<DLADpK8TFxk!&l`h
zD}MI@`os4CNSF!$kB=yu2=dhy<$|sG9!nw}r>ey|EBb27=Ac@;4@~{nUjZ<1L?Bp4
z7JnDPVmchH@7kJEX;f&Q>mLC$xAgUBE*C(Xf7AxF{%RkH<;CInZM27HM9&6;=NrBU
zAlIP6N4l83et;OaWoWGDWjYi6C??VeT^vwbHV2cnQpGBN;(Gw!JUDt=tnrG+_2)0Z
zBZ)4b(jD(gzCK8w1FUsE;a9&0=r;Q%e}8b<!{1BzDS(6c-2Fi9na}5B&)R*2cDz>k
zV6u+JDpd|1C?9Hd35d=$e)VF6p8_%wk0V{a+9Ll^=%EnSqmR9=Kn)JsR?zwx@Kyc{
z-ILBIjDH1G!mzV>j%R~Ct{jfTy{&5ad2Bf!)MQ<qgKR$GasiOU&2c!LF#I~UY=1IC
z_3(<dLwi=Y^3%={!ThLpMWyF#(ceq@DS#XHc|^9E2*$eKHKP2i54TU&AkqR^yn~p`
zH$n5gm#)Vtx|e7^x&VJ29yVFox92*Y*53TRp!%hP7rNe%p9bltow(n5v|rhyMIV{e
zdj&54C$Qq#{97Ny>chu6sx__mDt};y-+Q{>6gCe#UrDvr9N_srCy@<kzWadtsRMNF
zJ}1frk&RS(uf*t&K}vR*w5#7^qZks|BC@!w)+$r|zrxZNK}V1sBy8~Mcmz>z?B!8C
zoyqu%prfcR7koNa4qW5$iuF-Y>qyOKVf;nV*?4`7=)kpChrXj96l+B_Uw@tVpM!^-
zaj~9(n_mIgq~CJd+)mV2#bq!j%cH&0RSg|ZW}i~!PP8+Bmpjp(5NV9w1K{RkWKGbw
z^<PM*AHi77p$<`BHlM)ws7I_Zymm%bJJNO{KkG+B;o9vt7a-dJ1*;8CHlNYyt1pXH
zKiSjM6x6_AUmPT}MNp@r^M6MmhiBn6?tTR@P=SqhCU0pZ!}VPoKH4-EcrNf5;5jR(
zzRn5lI@BML`B!rhA3-~NQ?$nDCqRYfXfbUP^JqA*AzvGGvRuI2qhVj1N3buBj;v4Q
zc6)GtwdR~X@%3u|p4?_PxPYR*$wnN_iSnsWGXH8_kmb5Pii2%Zvwx}qTc*Q2P}QmO
z)voK&n?MK2+LTiHjsW@`tDvvd-dIO-eUDuGh{*aze7C2){)kOK0gw_kthUL9B9I5N
z+|K_dhUW(K>~1c=)`zx*)mqsG-t6P<uYtdDxLY2+#z*;+3zF?obBWiBnDj8ot?Fm_
zpo$sme^35(O~UVjx_@3_OKw+R*O&vZK|AnV(AmgDAJ7kbq(iD&Ao8niw;!*URe&c^
zQ0*)1%_ZI!=xiXfD_tE>>3R*#Q>K2$^+BZJ`cXV=qn`i-ac-N^<wlJ<kw%o4X?1p`
z>jNOhHM1H@l@BtFX{_70cHqB!4Af-IITVP%mWjb$`CM-W)nxWM)Kwdp)^jZm;`K5-
zj`L}L2Q{YqQgmOQKl&8l_9!lEFw>0aVk<xEgRD0PahVTLCyMF%P=A*{(T{Y=9{rmO
l@JP^P*UBX3%?ckM{{hWV=<MeY3Dp1q002ovPDHLkV1j?M#2Wwr

delta 759
zcmV<T0to%>4uS@d7k@wk00000y$v`50008XNkl<Zc-oCs%Zej03^e$<pkEpAwL!mb
z@HL=cG3aX0R>_^sB<aj-n|``1smhYNtSCCAXsM-6QSZ{Lnufai)FQ=I%{)H^?!F=v
zN5~L2Q%^wRBS!)bJhj%GR*G2>PQaKPaI;|G3xLB9&#zr_^?$aIE>uPHx$$e^$LARI
z?sOmq0*Y)F8Yc@nteXV@@yk)jwd-D?E`zJVF(((S6>?Quu>po7@P?rnv38Ie1ehJ}
zn-aA627n9MfYx$t5Rfhs&=4xgVYLibPH(_z0WlcaTLKLJEuLbSjoepEiVPO`lq?ov
zNfw_KSX+mHNq-!08*)CUlYc@z0L#xQeF99p&Kf>5j?)4nso0?j0ZLdGLd-i)rG*==
z5DmL*UZ&s{oF-M$3<ZY=0OBWreqqO+Ex^UBU1sIL)M<e+5CH4XI&|T6e*0qokucv?
zyUwU;m3)~h*b7{HeFB)@Qa=KiFwCeIzzC|i0lY7Lb$=0&6Q~qa+Z2BZ5)y%)oK{A>
z#t_d7qU#F_*T=Y|i5*b&AA}+?Rv~n^OF&kZlf(x=_6N_bxCUfBp63Su{4*b*#1Fgq
z0}F9c2zie8;=yL2I3tI?2Qjlh=rN9Y)UVp!1nU*MiJCo@vE=;?fCh~j0(8|YK>r6|
zJi6>6hJVuq>vM!&u=rJnr8WNO-6QjHVl0>&+rmQgZzrI3$~_?5(p#YYRJ7TE1w8>$
zHvqj`Oxb^LhK$NaxI@x(!J<c<qpi!~2vXbfdnOZbYha%iu+K^svf5*MhM?$o3@ii!
z+8PfRGkRmM*evdVk68^DXC66UuG9YBJ7I3Z1#o|?OZW#Ul|0H>4@!W^L_=qtD)Vb_
z6f}R`9fp(O0riIPFB(`6K+j1}{Ru#&58;Vt8Bl~4CPDx`{4Th4SXF6!@~=P(2re{#
pB2%%V_B4*}85!hV0{_tI{sP6AHdPg1^bY_4002ovPDHLkV1ipMQd|H4

diff --git a/gfx/font/font_extra.png b/gfx/font/font_extra.png
deleted file mode 100755
index 6f0a228aef073cf553db4280e08c25a7754bca12..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 245
zcmeAS@N?(olHy`uVBq!ia0vp^8bHj!!3HF|gZ4%PDaPU;cPEB*=VV?2IV|apzK#qG
z8~eHcB(eheoCO|{#S9EWB_ParFHODzDA?uc;uvD#zjY!v-vI><=fv;(H*Z!ky?Qo&
zk$$0&#)aIxG|l-6ONGSl*nZmMzG7J~<8y<!hX<LHa^n_W-PRVydxoP~!b0kn-uujn
z>QbxAu2+0zW#rXZVYvKO=!Mmv%YSV&eZBu|&;LA!ySejjDqXuObK!^D$L{imz<I)7
o;%04p?s`>Ctcoq|>*g7IdALgcJ6(M}59lfePgg&ebxsLQ05?cm^#A|>

diff --git a/gfx/font/font_inversed.png b/gfx/font/font_inversed.png
old mode 100644
new mode 100755
index 519339f39d7e75e5cde08e64bad0a59745badf45..ae1ee40f2420f7b334eab1d4850847b2d853eed9
GIT binary patch
delta 1917
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
D29fcg

delta 725
zcmV;`0xJFg4&Vil7k@wk00000y$v`50007~Nkl<Zc-oy++lnM13=Q}i@K*x;D){Sx
zdKKnZ0{be|o)hiu?%C>@VU((}^muYHiBjbB8mFK0oHbl~^y%i}>RSB_QFk-VDZy8Z
zh@(lgP&3yABwn&7;J|2%p=1%WGq`ZZ83)7^5PSe|=%JjI9)G!eF{B9h@Ei}$=H#mm
zeiz!HgCzN~!ev{*xw)(W;M+!9yRRLt(YPBn=2`)p&{nr13t(u1KXgZzvXpco!0b?6
zCSm#s01>eOW8_{TAVnl#Kvf!t-O<#!ya1a4IvB0D1Q_I-yy#E|Z7)*kWLSaIO)Cm?
zNh{vBavvC95PvJN$0_8g-2p}SlD_~de(MyismEr3CKD%A;Q;*gAjGuuaWdTShSPA$
zrZ_=-gv-fb1i*$300W$#fRw8X@WcQeW{*1A3!;mFnmP~w_V0qh<fpBC5mD17?PaLo
zEb#90Rf^uye*`dK7*U@Xn$U|2P&ob+%Cwd7fTUoyfqzo|1HfOgSz7l`I*5K_p!%b~
z@c<G`zht2O6;;Nr{hFD@GNEq(Ssyf`;u?_oxSuxw$Y(sj6Y{GT8V*P9er1IsIVHQ>
zwGQq_JL)k%=FrQ40p=(?LsWoE5ee`zzXtG7yx4mY{5J95_@VfeKYJ(g6QhbQpld4~
z3X1>OfPdNP?&fsZO*)EEWwC}58xV5=_%>(#y)h%Q5N>fPf>i+lg0db54fj#>9?1mU
z2LH%_bIz?%#$&lkWYSXyCIaV2X%7)q`hZWi6?cHXzbs_Ok><~3*xzd>=qg0;VlBZN
z;GDEWc0M=(78M1ZdFqU>#?IpJtHN**cEEcrcutE7_5;v!5%m&Z0zle=5602p5i+3g
z0nl+>@aUqQljN1R0vVv3cwQnEwSlUU9Mw}&N&QzQt}ESNR^+sVEa4^!00000NkvXX
Hu0mjfNEKKg

diff --git a/gfx/font/overworld.png b/gfx/font/overworld.png
old mode 100644
new mode 100755
index 106c712dd4cde403a0d0dab5f70e1f108fc6e527..92b60bff03a40d5c6fb971e47693977808841074
GIT binary patch
delta 1897
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

delta 741
zcmV<B0vi464)6t#7k@wk00000y$v`50008FNkl<Zc-oy+ORgLt3`DFVpW=yC%cn%F
zMm`1d3i*_&ax<BadL~gC^$!Z$RoGBg6rEDE)KaIYcj;A4LtTApk>aXmo?U^ruL#8z
zGQ`c)6Oj1GmVg6atu?2WVpfC$FeV4wEExC!;PAt<w@c1GEq|m7Rnh!z>@DnkjY02D
z2Vx+g$jL%uv!KIzvH&3dausszdd^Un!P(%LgA3LQxvH%=0fsB^ho)$;&LA}iFgx5&
zO3>m702gusTFbdXK)OgkL#QN&*)m)?d;+!w#9(A^2{8D#c!^;)a$hkiGFYH1SuDho
zEIuo+P8|X!aeu*W$o@_ze}sAfmhT~b0ZjbP8a^|QZ2^%~tk8r2C9De}=AF0F!VOP|
zhE+B%Q}7B7lPYP3g2Mv<@e@G5uw$<l;9}M;v$A1mTVM<X!1}8WUHF_&J@yX?^Q_u+
zMpdii%T&Qy;Mwa7!2Fi_5x|6DM!f+>P{k9#_tJM45q~*=N<p<v@wXr$5$MUbGU7dk
zc%2Yk-&nXl+9ge_fU18Hio{rj(A_QpSy@gJ9{{;OcxJ^lAnS489{}*re1H;PR`UxB
zaZw1l+Z78(aYi<^>ljpzam=Is)aI87gPJ{-vE<z^T_iwP{SIJS>ax!+Sf3;Ge{@({
z<JX>v`hQdw4ohdm$Z`PSh_(T>Q|_S@>=xL5Dz@2x1>FFtCxA~=?!PxfM&(9$)|aLW
zrzj{Ol+)n|Qrq%-CKGUL{G$b|vyz3Z_86WaVmk&F0s(D}hl?4#L6gnm4)~bWaIy2q
z`E#B2_q`M5CS34fUBVNfRPrdh9+Uu+i4C1~s$R^m!B(*O>$$^l5ImsX5T2re`2h4B
zbkJKt04jY5Z+y$>H7!hp0D3qsxOA9RX?*fjpaldMnuo|#%&0w$WA}^<@-BgY*y(-)
XkAo~V^;H+e00000NkvXXu0mjfL6B5g

diff --git a/gfx/font/phone_icon.png b/gfx/font/phone_icon.png
deleted file mode 100644
index 9e13a121b338c3dbf5c70b8b33c525dd5a8118a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 82
zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<NqV|ChE&{2PGD$a=J_KpQNiQD
dae_gKjg3L?8H-uWQTF#B#h$KyF6*2UngGIw6N>-<

diff --git a/gfx/font/up_arrow.png b/gfx/font/up_arrow.png
deleted file mode 100644
index 6f2b957f0c8db668d36512c1111d0b483c07a682..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 86
zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<$$GjthE&{2{_%f4W5>Tg=|2+A
j7c|UoY?N&I_n)0%!gkJI&NEIlf;4!#`njxgN@xNACV(A_

diff --git a/gfx/tilesets/aerodactyl_word_room_palette_map.asm b/gfx/tilesets/aerodactyl_word_room_palette_map.asm
index 5ebde24ba..39b200589 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_palette_map.asm b/gfx/tilesets/battle_tower_inside_palette_map.asm
index 1abce2a16..956e266da 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_palette_map.asm b/gfx/tilesets/battle_tower_outside_palette_map.asm
index dfc74a9c0..e07abe8b6 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_palette_map.asm b/gfx/tilesets/beta_word_room_palette_map.asm
index 5ebde24ba..39b200589 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 73c09ebe5..94a7fb61c 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_palette_map.asm b/gfx/tilesets/champions_room_palette_map.asm
index 551a09351..beedbb93d 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 73c09ebe5..94a7fb61c 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 b20f49195..f0494e13c 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 f79f9c01b..52c561b25 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_palette_map.asm b/gfx/tilesets/forest_palette_map.asm
index 696788084..61d95f3b2 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_palette_map.asm b/gfx/tilesets/game_corner_palette_map.asm
index 34bb9f6f0..152154900 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_palette_map.asm b/gfx/tilesets/gate_palette_map.asm
index 7854d3a81..8916bd4af 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_palette_map.asm b/gfx/tilesets/ho_oh_word_room_palette_map.asm
index 5ebde24ba..39b200589 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_palette_map.asm b/gfx/tilesets/house_palette_map.asm
index ce7b988b7..6cf70993b 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_palette_map.asm b/gfx/tilesets/ice_path_palette_map.asm
index 985844071..77488bc75 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_modern_palette_map.asm b/gfx/tilesets/johto_modern_palette_map.asm
index f2af7a92d..ff504bf9f 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 62fbd2d00..7c528401d 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_palette_map.asm b/gfx/tilesets/kabuto_word_room_palette_map.asm
index 5ebde24ba..39b200589 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 e3e497fb9..109e5e390 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_palette_map.asm b/gfx/tilesets/lab_palette_map.asm
index 24399c6ea..7b58bd425 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_palette_map.asm b/gfx/tilesets/lighthouse_palette_map.asm
index 5f80e3a4d..4ea8e76ee 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_palette_map.asm b/gfx/tilesets/mansion_palette_map.asm
index 2bd27ad22..012cea188 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_palette_map.asm b/gfx/tilesets/mart_palette_map.asm
index 991510d12..5f4091c6f 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_palette_map.asm b/gfx/tilesets/omanyte_word_room_palette_map.asm
index 5ebde24ba..39b200589 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_palette_map.asm b/gfx/tilesets/park_palette_map.asm
index f9c65ef89..27d5348a7 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 5d089835b..c57d441d2 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 1c0cb1f08..eca7f471c 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_palette_map.asm b/gfx/tilesets/pokecenter_palette_map.asm
index 78508b59e..1ab3ac330 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_palette_map.asm b/gfx/tilesets/pokecom_center_palette_map.asm
index 75ee649f9..ad24fad5e 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 6bfdf4686..a7792d41e 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_palette_map.asm b/gfx/tilesets/radio_tower_palette_map.asm
index 3530f7479..363a15b67 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_palette_map.asm b/gfx/tilesets/ruins_of_alph_palette_map.asm
index 5ebde24ba..39b200589 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_palette_map.asm b/gfx/tilesets/tower_palette_map.asm
index 6e3c10115..f28945516 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_palette_map.asm b/gfx/tilesets/traditional_house_palette_map.asm
index 5daa0da6b..b66c1fb6e 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_palette_map.asm b/gfx/tilesets/train_station_palette_map.asm
index f52f5bbe7..13d0c38e4 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_palette_map.asm b/gfx/tilesets/underground_palette_map.asm
index 6b9b5546d..aeef04201 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 cfbe6dbcd..a5887b1ab 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/gfx.asm b/home/gfx.asm
index 0145cbee9..22b253328 100644
--- a/home/gfx.asm
+++ b/home/gfx.asm
@@ -44,9 +44,8 @@ LoadFontsBattleExtra::
 	farcall _LoadFontsBattleExtra
 	ret
 
-LoadFontsExtra::
-	farcall _LoadFontsExtra1
-	farcall _LoadFontsExtra2
+LoadFrame::
+	farcall _LoadFrame
 	ret
 
 DecompressRequest2bpp::
diff --git a/home/map.asm b/home/map.asm
index 541307809..a5e9ea806 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -1335,7 +1335,7 @@ LoadTilesetGFX::
 
 	ld hl, wDecompressScratch
 	ld de, vTiles2
-	ld bc, $60 tiles
+	ld bc, $7f tiles
 	call CopyBytes
 
 	ldh a, [rVBK]
@@ -1343,9 +1343,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
@@ -1947,7 +1947,7 @@ ReloadTilesetAndPalettes::
 	call ClearSprites
 	farcall RefreshSprites
 	call LoadStandardFont
-	call LoadFontsExtra
+	call LoadFrame
 	ldh a, [hROMBank]
 	push af
 	ld a, [wMapGroup]
diff --git a/maps/Level1_Map1.blk b/maps/Level1_Map1.blk
index 63d33c2f8..c2f432bb0 100755
--- a/maps/Level1_Map1.blk
+++ b/maps/Level1_Map1.blk
@@ -1 +1 @@
-

\ No newline at end of file
+

\ No newline at end of file
diff --git a/maps/Level1_Map1.blk.bak b/maps/Level1_Map1.blk.bak
new file mode 100755
index 000000000..63d33c2f8
--- /dev/null
+++ b/maps/Level1_Map1.blk.bak
@@ -0,0 +1 @@
+

\ No newline at end of file