Expand tilesets from 192 to 255 tiles (#2) [Commit 2], Reorganization of pokecrystal charmap and fonts layout (#3)

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

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 " "