diff --git a/charmap.asm b/charmap.asm index 8cdff71e9..3b15daf46 100644 --- a/charmap.asm +++ b/charmap.asm @@ -89,6 +89,9 @@ 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 "A", $80 diff --git a/engine/print_party.asm b/engine/print_party.asm index ce624b013..819f38759 100755 --- a/engine/print_party.asm +++ b/engine/print_party.asm @@ -1,5 +1,4 @@ -PRINTPARTY_HP EQUS "\"◀\"" ; $71 -PRINTPARTY_SHINY EQUS "\"\"" ; $3f +PRINTPARTY_HP EQUS "\"◀\"" ; $71 PrintPage1: ; 1dc1b0 hlcoord 0, 0 @@ -153,9 +152,9 @@ PrintPartyMonPage1: ; 1dc381 lb bc, BANK(GBPrinterLvIcon), 1 call Request1bpp - ld de, ShinyIconGFX - ld hl, vTiles2 tile PRINTPARTY_SHINY - lb bc, BANK(ShinyIconGFX), 1 + ld de, StatsScreenPageTilesGFX + 14 tiles ; shiny icon + ld hl, vTiles2 tile "" + lb bc, BANK(StatsScreenPageTilesGFX), 1 call Get2bpp xor a @@ -333,7 +332,7 @@ Function1dc52c: ; 1dc52c farcall CheckShininess ret nc hlcoord 18, 2 - ld [hl], PRINTPARTY_SHINY + ld [hl], "" ret ; 1dc550 diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index fbe562d9c..c0963d766 100755 --- a/engine/stats_screen.asm +++ b/engine/stats_screen.asm @@ -489,7 +489,7 @@ StatsScreen_PlaceShinyIcon: ; 4dfa6 (13:5fa6) farcall CheckShininess ret nc hlcoord 19, 0 - ld [hl], $3f ; shiny icon + ld [hl], "" ret StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6) @@ -958,7 +958,7 @@ StatsScreen_LoadTextBoxSpaceGFX: ; 4e307 (13:6307) ld [rVBK], a ld de, TextBoxSpaceGFX lb bc, BANK(TextBoxSpaceGFX), 1 - ld hl, vTiles2 tile $7f + ld hl, vTiles2 tile " " call Get2bpp pop af ld [rVBK], a @@ -971,7 +971,7 @@ StatsScreen_LoadTextBoxSpaceGFX: ; 4e307 (13:6307) ; unreferenced Unknown_4e32a: ; 4e32a -; A blank tile? +; An unused space tile? ds 16 ; 4e33a 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 diff --git a/gfx/stats/exp_bar_ends.png b/gfx/stats/exp_bar_ends.png deleted file mode 100644 index 252bdd990..000000000 Binary files a/gfx/stats/exp_bar_ends.png and /dev/null differ diff --git a/gfx/stats/shiny.png b/gfx/stats/shiny.png deleted file mode 100644 index 010aeafbf..000000000 Binary files a/gfx/stats/shiny.png and /dev/null differ diff --git a/gfx/stats/stats_tiles.png b/gfx/stats/stats_tiles.png index 151704af5..5da4a008e 100644 Binary files a/gfx/stats/stats_tiles.png and b/gfx/stats/stats_tiles.png differ