From b4e087167f3263342bbe01b5256f42fcf2d726af Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 19:38:56 +0100 Subject: More unreferenced labels and unused text --- gfx/font.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gfx/font.asm') diff --git a/gfx/font.asm b/gfx/font.asm index 9da7eaafc..349f8facc 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -84,18 +84,18 @@ INCLUDE "gfx/footprints.asm" ; This and the following two functions are unreferenced. ; Debug, perhaps? -Unknown_fb434: +Unreferenced_fb434: db 0 -Functionfb435: ; 4b435 - ld a, [Unknown_fb434] +Unreferenced_Functionfb435: ; 4b435 + ld a, [Unreferenced_fb434] and a jp nz, Get1bpp_2 jp Get1bpp ; fb43f -Functionfb43f: ; fb43f - ld a, [Unknown_fb434] +Unreferenced_Functionfb43f: ; fb43f + ld a, [Unreferenced_fb434] and a jp nz, Get2bpp_2 jp Get2bpp -- cgit v1.2.3 From 163f3e0c3f56831b5255b31045798ac950098faa Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 22:16:17 -0500 Subject: Local UI tiles don't belong in charmap Separate 1bpp font tiles from gfx/mobile/phone_tiles.png --- gfx/font.asm | 58 +++++++++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 25 deletions(-) (limited to 'gfx/font.asm') diff --git a/gfx/font.asm b/gfx/font.asm index 9da7eaafc..64ff86caf 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -54,8 +54,8 @@ UnusedWeekdayKanjiGFX: ; unused kanji INCBIN "gfx/font/unused_weekday_kanji.2bpp" ; f8f24 -OverworldPhoneIconGFX: ; f8f24 -INCBIN "gfx/font/overworld_phone_icon.2bpp" +PokegearPhoneIconGFX: ; f8f24 +INCBIN "gfx/font/phone_icon.2bpp" ; f8f34 UnusedBoldFontGFX: ; unused bold letters + unown chars @@ -66,7 +66,15 @@ TextBoxSpaceGFX: ; f9204 INCBIN "gfx/frames/space.1bpp" ; f9214 -MobilePhoneTilesGFX: ; f9214 +FontsExtra_SolidBlackGFX: ; f9214 +INCBIN "gfx/font/black.1bpp" +; f921c + +UnusedUpArrowGFX: ; unused up arrow + whitespace +INCBIN "gfx/font/unused_arrow.1bpp" +; f9234 + +MobilePhoneTilesGFX: ; f9234 INCBIN "gfx/mobile/phone_tiles.2bpp" ; f9344 @@ -105,42 +113,42 @@ Functionfb43f: ; fb43f _LoadStandardFont:: ; fb449 ld de, Font ld hl, vTiles1 - lb bc, BANK(Font), $80 + 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), $20 + lb bc, BANK(Font), 32 ; "A" to "]" call Get1bpp_2 - ld de, Font + $20 * LEN_1BPP_TILE + ld de, Font + 32 * LEN_1BPP_TILE ld hl, vTiles1 tile $20 - lb bc, BANK(Font), $20 + lb bc, BANK(Font), 32 ; "a" to $bf call Get1bpp_2 - ld de, Font + $40 * LEN_1BPP_TILE + ld de, Font + 64 * LEN_1BPP_TILE ld hl, vTiles1 tile $40 - lb bc, BANK(Font), $20 + lb bc, BANK(Font), 32 ; "Ä" to "←" call Get1bpp_2 - ld de, Font + $60 * LEN_1BPP_TILE + ld de, Font + 96 * LEN_1BPP_TILE ld hl, vTiles1 tile $60 - lb bc, BANK(Font), $20 + lb bc, BANK(Font), 32 ; "'" to "9" call Get1bpp_2 ret ; fb48a _LoadFontsExtra1:: ; fb48a - ld de, MobilePhoneTilesGFX + ld de, FontsExtra_SolidBlackGFX ld hl, vTiles2 tile "" ; $60 - lb bc, BANK(MobilePhoneTilesGFX), 1 + lb bc, BANK(FontsExtra_SolidBlackGFX), 1 call Get1bpp_2 - ld de, OverworldPhoneIconGFX + ld de, PokegearPhoneIconGFX ld hl, vTiles2 tile "" ; $62 - lb bc, BANK(OverworldPhoneIconGFX), 1 + lb bc, BANK(PokegearPhoneIconGFX), 1 call Get2bpp_2 - ld de, FontExtra + 3 * LEN_2BPP_TILE - ld hl, vTiles2 tile $63 - lb bc, BANK(FontExtra), $16 + ld de, FontExtra tile 3 + ld hl, vTiles2 tile "" + lb bc, BANK(FontExtra), 22 ; "" to "ぉ" call Get2bpp_2 jr LoadFrame ; fb4b0 @@ -157,7 +165,7 @@ _LoadFontsExtra2:: ; fb4b0 _LoadFontsBattleExtra:: ; fb4be ld de, FontBattleExtra ld hl, vTiles2 tile $60 - lb bc, BANK(FontBattleExtra), $19 + lb bc, BANK(FontBattleExtra), 25 call Get2bpp_2 jr LoadFrame ; fb4cc @@ -165,13 +173,13 @@ _LoadFontsBattleExtra:: ; fb4be LoadFrame: ; fb4cc ld a, [TextBoxFrame] and 7 - ld bc, LEN_1BPP_TILE * 6 + 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 + lb bc, BANK(Frames), 6 ; "┌" to "┘" call Get1bpp_2 ld hl, vTiles2 tile " " ; $7f ld de, TextBoxSpaceGFX @@ -183,11 +191,11 @@ LoadFrame: ; fb4cc LoadBattleFontsHPBar: ; fb4f2 ld de, FontBattleExtra ld hl, vTiles2 tile $60 - lb bc, BANK(FontBattleExtra), $c + lb bc, BANK(FontBattleExtra), 12 call Get2bpp_2 ld hl, vTiles2 tile $70 - ld de, FontBattleExtra tile $10 - lb bc, BANK(FontBattleExtra), 3 + ld de, FontBattleExtra tile 16 + lb bc, BANK(FontBattleExtra), 3 ; "<ど>" to "『" call Get2bpp_2 call LoadFrame @@ -204,7 +212,7 @@ LoadHPBar: ; fb50d ld hl, vTiles2 tile $55 lb bc, BANK(ExpBarGFX), 9 call Get2bpp_2 - ld de, MobilePhoneTilesGFX + 9 * LEN_2BPP_TILE + ld de, MobilePhoneTilesGFX tile 7 ; mobile phone icon ld hl, vTiles2 tile $5e lb bc, BANK(MobilePhoneTilesGFX), 2 call Get2bpp_2 -- cgit v1.2.3 From 2085ebcc617fdd78cc8194dc4a9a34e9fb8e8b51 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 23:04:50 -0500 Subject: maskbits for NUM_FRAMES --- gfx/font.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gfx/font.asm') diff --git a/gfx/font.asm b/gfx/font.asm index 64ff86caf..3b7ec39e9 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -172,7 +172,7 @@ _LoadFontsBattleExtra:: ; fb4be LoadFrame: ; fb4cc ld a, [TextBoxFrame] - and 7 + maskbits NUM_FRAMES +- 1 ld bc, 6 * LEN_1BPP_TILE ld hl, Frames call AddNTimes -- cgit v1.2.3 From 0197e6f23c0db6baf11aa1e610521f78b6352605 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 13 Jan 2018 15:22:16 -0500 Subject: Don't split stats gfx in three --- gfx/font.asm | 9 --------- 1 file changed, 9 deletions(-) (limited to 'gfx/font.asm') diff --git a/gfx/font.asm b/gfx/font.asm index 3b7ec39e9..e376e8afd 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -23,15 +23,6 @@ INCBIN "gfx/frames/9.1bpp" StatsScreenPageTilesGFX: ; f89b0 INCBIN "gfx/stats/stats_tiles.2bpp" -; f8a90 - -ShinyIconGFX: ; f8a90 -; also part of StatsScreenPageTilesGFX -INCBIN "gfx/stats/shiny.2bpp" - -ExpBarEndsGFX: ; f8aa0 -; not referenced on its own, but part of StatsScreenPageTilesGFX -INCBIN "gfx/stats/exp_bar_ends.2bpp" ; f8ac0 EnemyHPBarBorderGFX: ; f8ac0 -- cgit v1.2.3 From 7a09fc9f750aec50dd568226083b279004ffe155 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 14 Jan 2018 19:43:35 -0500 Subject: GFX tile sizes in decimal --- gfx/font.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gfx/font.asm') diff --git a/gfx/font.asm b/gfx/font.asm index e376e8afd..fd95c9434 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -231,7 +231,7 @@ StatsScreen_LoadFont: ; fb53e LoadStatsScreenPageTilesGFX: ; fb571 ld de, StatsScreenPageTilesGFX ld hl, vTiles2 tile $31 - lb bc, BANK(StatsScreenPageTilesGFX), $11 + lb bc, BANK(StatsScreenPageTilesGFX), 17 call Get2bpp_2 ret ; fb57e -- cgit v1.2.3 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) --- gfx/font.asm | 155 ----------------------------------------------------------- 1 file changed, 155 deletions(-) (limited to 'gfx/font.asm') diff --git a/gfx/font.asm b/gfx/font.asm index e525df85b..bd7b60c3c 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -80,158 +80,3 @@ INCBIN "gfx/font/up_arrow.2bpp" Footprints: ; f9434 INCLUDE "gfx/footprints.asm" ; fb434 - -; 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 80dd085dbc618e14b77b6cb29afb0bd695e516e2 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 23:53:20 -0500 Subject: unused_up_arrow.png --- gfx/font.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gfx/font.asm') diff --git a/gfx/font.asm b/gfx/font.asm index bd7b60c3c..bf5741074 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -62,7 +62,7 @@ INCBIN "gfx/font/black.1bpp" ; f921c UnusedUpArrowGFX: ; unused up arrow + whitespace -INCBIN "gfx/font/unused_arrow.1bpp" +INCBIN "gfx/font/unused_up_arrow.1bpp" ; f9234 MobilePhoneTilesGFX: ; f9234 -- cgit v1.2.3