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

2025-09-08 08:13:02 -07:00 · 2023-08-02 19:52:51 +02:00
parent a1e095074c
commit 6e3c5fd008
67 changed files with 243 additions and 380 deletions
--- 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
--- 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
--- 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
--- 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
--- 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 " "
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

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

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