From 0197e6f23c0db6baf11aa1e610521f78b6352605 Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Sat, 13 Jan 2018 15:22:16 -0500
Subject: [PATCH] Don't split stats gfx in three

---
 charmap.asm                |   3 +++
 engine/print_party.asm     |  11 +++++------
 engine/stats_screen.asm    |   6 +++---
 gfx/font.asm               |   9 ---------
 gfx/stats/exp_bar_ends.png | Bin 76 -> 0 bytes
 gfx/stats/shiny.png        | Bin 89 -> 0 bytes
 gfx/stats/stats_tiles.png  | Bin 195 -> 201 bytes
 7 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 gfx/stats/exp_bar_ends.png
 delete mode 100644 gfx/stats/shiny.png

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 "<SHINY>",   $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 "\"<ENEMY>\"" ; $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 "<SHINY>"
+	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], "<SHINY>"
 	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], "<SHINY>"
 	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 252bdd9902dbeae5bd37ca659680b6470888aec3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 76
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c1SA;dueEpuq=Y?P978H@CI8@O;rTBq@j=jm
YfuV1?@LT@PlKdcLp00i_>zopr07l~x=>Px#

diff --git a/gfx/stats/shiny.png b/gfx/stats/shiny.png
deleted file mode 100644
index 010aeafbf1ad6440cb2262e9993b0165747d98a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 89
zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<DR{a#hE&{2w)j84@u&UapXYi0
m^Bes6f9At;`@`(j3Y-jcLU=RJbzeUU(&Ops=d#Wzp$PzU{2oyN

diff --git a/gfx/stats/stats_tiles.png b/gfx/stats/stats_tiles.png
index 151704af5f4377ce5d332655389f1cfd881642a9..5da4a008e2d40db73c935528eae5d479bcd3f72b 100644
GIT binary patch
literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^9YD;%1SA-IFMjwAq$YT}IEGZ*iaqbhbyz`w^#Z@;
zff&^bxd)YZbe7y){3Xlj<gL*6iXP?6`;CvOm^7_8lYESS;U>0i0vX<n_B;0No2c`b
zFLCRxdrc*iruEv`3mQer`fWOQFL9Sp<#aQSEdlS3$XBW;pHW}w=s$^3GUffG=*6~u
zj@e!p&0W6l4>`TWX{XS~CDIq|=DKI_zd3B7WuG~D`@=te>%M{9=;`X`vd$@?2>{xC
BP`>~G

literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^0zhoR1SA+{U$=J$QeB=djv*DdYR?#QF&PT5Uf`EY
zSf_M@tGLC4&Ab26Ri;f}!|o{yY?J=+FU9bX*s_Y0PybntDfDa&c1j4kWgf89N_y6D
z)^zoaM(ZM0vrCDx9Cnbc@W0FAFY9y6qA5<1dF~(aFMNg8K?>9MFzfkWEt8vUouH&1
t$`*a;*0e7Ntq->B75Q^vcHR}KpNulor}Zk|)!7bmou{jx%Q~loCII<rMr!~7