From 9180362211cf465c52798124baa5c5c06ba1d332 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 15 Jan 2018 11:06:17 -0500 Subject: Move code out of gfx/ (close #474) --- engine/load_font.asm | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) create mode 100644 engine/load_font.asm (limited to 'engine/load_font.asm') diff --git a/engine/load_font.asm b/engine/load_font.asm new file mode 100644 index 000000000..347a85746 --- /dev/null +++ b/engine/load_font.asm @@ -0,0 +1,156 @@ +INCLUDE "gfx/font.asm" + +; This and the following two functions are unreferenced. +; Debug, perhaps? +Unreferenced_fb434: + db 0 + +Unreferenced_Functionfb435: ; 4b435 + ld a, [Unreferenced_fb434] + and a + jp nz, Get1bpp_2 + jp Get1bpp +; fb43f + +Unreferenced_Functionfb43f: ; fb43f + ld a, [Unreferenced_fb434] + and a + jp nz, Get2bpp_2 + jp Get2bpp +; End unreferenced block +; fb449 + +_LoadStandardFont:: ; fb449 + ld de, Font + ld hl, vTiles1 + lb bc, BANK(Font), 128 ; "A" to "9" + ld a, [rLCDC] + bit rLCDC_ENABLE, a + jp z, Copy1bpp + + ld de, Font + ld hl, vTiles1 + lb bc, BANK(Font), 32 ; "A" to "]" + call Get1bpp_2 + ld de, Font + 32 * LEN_1BPP_TILE + ld hl, vTiles1 tile $20 + lb bc, BANK(Font), 32 ; "a" to $bf + call Get1bpp_2 + ld de, Font + 64 * LEN_1BPP_TILE + ld hl, vTiles1 tile $40 + lb bc, BANK(Font), 32 ; "Ä" to "←" + call Get1bpp_2 + ld de, Font + 96 * LEN_1BPP_TILE + ld hl, vTiles1 tile $60 + lb bc, BANK(Font), 32 ; "'" to "9" + call Get1bpp_2 + ret +; fb48a + +_LoadFontsExtra1:: ; fb48a + ld de, FontsExtra_SolidBlackGFX + ld hl, vTiles2 tile "" ; $60 + lb bc, BANK(FontsExtra_SolidBlackGFX), 1 + call Get1bpp_2 + ld de, PokegearPhoneIconGFX + ld hl, vTiles2 tile "" ; $62 + lb bc, BANK(PokegearPhoneIconGFX), 1 + call Get2bpp_2 + ld de, FontExtra tile 3 + ld hl, vTiles2 tile "" + lb bc, BANK(FontExtra), 22 ; "" to "ぉ" + call Get2bpp_2 + jr LoadFrame +; fb4b0 + +_LoadFontsExtra2:: ; fb4b0 + ld de, FontsExtra2_UpArrowGFX + ld hl, vTiles2 tile "▲" ; $61 + ld b, BANK(FontsExtra2_UpArrowGFX) + ld c, 1 + call Get2bpp_2 + ret +; fb4be + +_LoadFontsBattleExtra:: ; fb4be + ld de, FontBattleExtra + ld hl, vTiles2 tile $60 + lb bc, BANK(FontBattleExtra), 25 + call Get2bpp_2 + jr LoadFrame +; fb4cc + +LoadFrame: ; fb4cc + ld a, [TextBoxFrame] + maskbits NUM_FRAMES +- 1 + ld bc, 6 * LEN_1BPP_TILE + ld hl, Frames + call AddNTimes + ld d, h + ld e, l + ld hl, vTiles2 tile "┌" ; $79 + lb bc, BANK(Frames), 6 ; "┌" to "┘" + call Get1bpp_2 + ld hl, vTiles2 tile " " ; $7f + ld de, TextBoxSpaceGFX + lb bc, BANK(TextBoxSpaceGFX), 1 + call Get1bpp_2 + ret +; fb4f2 + +LoadBattleFontsHPBar: ; fb4f2 + ld de, FontBattleExtra + ld hl, vTiles2 tile $60 + lb bc, BANK(FontBattleExtra), 12 + call Get2bpp_2 + ld hl, vTiles2 tile $70 + ld de, FontBattleExtra tile 16 + lb bc, BANK(FontBattleExtra), 3 ; "<ど>" to "『" + call Get2bpp_2 + call LoadFrame + +LoadHPBar: ; fb50d + ld de, EnemyHPBarBorderGFX + ld hl, vTiles2 tile $6c + lb bc, BANK(EnemyHPBarBorderGFX), 4 + call Get1bpp_2 + ld de, HPExpBarBorderGFX + ld hl, vTiles2 tile $73 + lb bc, BANK(HPExpBarBorderGFX), 6 + call Get1bpp_2 + ld de, ExpBarGFX + ld hl, vTiles2 tile $55 + lb bc, BANK(ExpBarGFX), 9 + call Get2bpp_2 + ld de, MobilePhoneTilesGFX tile 7 ; mobile phone icon + ld hl, vTiles2 tile $5e + lb bc, BANK(MobilePhoneTilesGFX), 2 + call Get2bpp_2 + ret +; fb53e + +StatsScreen_LoadFont: ; fb53e + call _LoadFontsBattleExtra + ld de, EnemyHPBarBorderGFX + ld hl, vTiles2 tile $6c + lb bc, BANK(EnemyHPBarBorderGFX), 4 + call Get1bpp_2 + ld de, HPExpBarBorderGFX + ld hl, vTiles2 tile $78 + lb bc, BANK(HPExpBarBorderGFX), 1 + call Get1bpp_2 + ld de, HPExpBarBorderGFX + 3 * LEN_1BPP_TILE + ld hl, vTiles2 tile $76 + lb bc, BANK(HPExpBarBorderGFX), 2 + call Get1bpp_2 + ld de, ExpBarGFX + ld hl, vTiles2 tile $55 + lb bc, BANK(ExpBarGFX), 8 + call Get2bpp_2 +LoadStatsScreenPageTilesGFX: ; fb571 + ld de, StatsScreenPageTilesGFX + ld hl, vTiles2 tile $31 + lb bc, BANK(StatsScreenPageTilesGFX), 17 + call Get2bpp_2 + ret +; fb57e -- cgit v1.2.3 From 7b3de85a06e81d14ac0c73e8f9e1ab8e4a474beb Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 16 Jan 2018 17:27:50 -0500 Subject: Avoid "+- 1" at every maskbits --- engine/load_font.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/load_font.asm') diff --git a/engine/load_font.asm b/engine/load_font.asm index 347a85746..af64b69f6 100644 --- a/engine/load_font.asm +++ b/engine/load_font.asm @@ -82,7 +82,7 @@ _LoadFontsBattleExtra:: ; fb4be LoadFrame: ; fb4cc ld a, [TextBoxFrame] - maskbits NUM_FRAMES +- 1 + maskbits NUM_FRAMES ld bc, 6 * LEN_1BPP_TILE ld hl, Frames call AddNTimes -- cgit v1.2.3 From e69544b61f5014b77852567efc3b78bc56982a20 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 19 Jan 2018 02:30:19 -0500 Subject: More Unicode --- engine/load_font.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/load_font.asm') diff --git a/engine/load_font.asm b/engine/load_font.asm index af64b69f6..3dd692968 100644 --- a/engine/load_font.asm +++ b/engine/load_font.asm @@ -49,11 +49,11 @@ _LoadStandardFont:: ; fb449 _LoadFontsExtra1:: ; fb48a ld de, FontsExtra_SolidBlackGFX - ld hl, vTiles2 tile "" ; $60 + ld hl, vTiles2 tile "■" ; $60 lb bc, BANK(FontsExtra_SolidBlackGFX), 1 call Get1bpp_2 ld de, PokegearPhoneIconGFX - ld hl, vTiles2 tile "" ; $62 + ld hl, vTiles2 tile "☎" ; $62 lb bc, BANK(PokegearPhoneIconGFX), 1 call Get2bpp_2 ld de, FontExtra tile 3 -- cgit v1.2.3 From ddec0ee305f25bc9941e19e16c79f499c5e95c23 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 19 Jan 2018 20:48:33 -0500 Subject: More Japanese characters --- engine/load_font.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/load_font.asm') diff --git a/engine/load_font.asm b/engine/load_font.asm index 3dd692968..345fa6ff6 100644 --- a/engine/load_font.asm +++ b/engine/load_font.asm @@ -56,7 +56,7 @@ _LoadFontsExtra1:: ; fb48a ld hl, vTiles2 tile "☎" ; $62 lb bc, BANK(PokegearPhoneIconGFX), 1 call Get2bpp_2 - ld de, FontExtra tile 3 + ld de, FontExtra + 3 tiles ; "" ld hl, vTiles2 tile "" lb bc, BANK(FontExtra), 22 ; "" to "ぉ" call Get2bpp_2 @@ -104,8 +104,8 @@ LoadBattleFontsHPBar: ; fb4f2 lb bc, BANK(FontBattleExtra), 12 call Get2bpp_2 ld hl, vTiles2 tile $70 - ld de, FontBattleExtra tile 16 - lb bc, BANK(FontBattleExtra), 3 ; "<ど>" to "『" + ld de, FontBattleExtra + 16 tiles ; "" + lb bc, BANK(FontBattleExtra), 3 ; "" to "『" call Get2bpp_2 call LoadFrame @@ -122,7 +122,7 @@ LoadHPBar: ; fb50d ld hl, vTiles2 tile $55 lb bc, BANK(ExpBarGFX), 9 call Get2bpp_2 - ld de, MobilePhoneTilesGFX tile 7 ; mobile phone icon + ld de, MobilePhoneTilesGFX + 7 tiles ; mobile phone icon ld hl, vTiles2 tile $5e lb bc, BANK(MobilePhoneTilesGFX), 2 call Get2bpp_2 -- cgit v1.2.3