From bf544e84cfdff75c48ef168096f6d3832c2da853 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Tue, 9 Aug 2022 11:02:04 -0400
Subject: [PATCH] Clean up graphics

---
 graphics/naming_screen/back_button.png        | Bin 297 -> 284 bytes
 graphics/naming_screen/cursor.png             | Bin 175 -> 159 bytes
 graphics/naming_screen/cursor_filled.png      | Bin 187 -> 166 bytes
 graphics/naming_screen/cursor_squished.png    | Bin 178 -> 164 bytes
 graphics/naming_screen/input_arrow.png        | Bin 166 -> 153 bytes
 .../naming_screen/{pc_icon.pal => menu.pal}   |   0
 graphics/naming_screen/menu.png               | Bin 438 -> 438 bytes
 graphics/naming_screen/ok_button.png          | Bin 277 -> 264 bytes
 graphics/naming_screen/page_swap_button.png   | Bin 158 -> 145 bytes
 graphics/naming_screen/page_swap_frame.png    | Bin 266 -> 253 bytes
 graphics/naming_screen/page_swap_lower.png    | Bin 199 -> 186 bytes
 graphics/naming_screen/page_swap_others.png   | Bin 206 -> 193 bytes
 graphics/naming_screen/page_swap_upper.png    | Bin 203 -> 190 bytes
 graphics/naming_screen/pc_icon_off.png        | Bin 205 -> 192 bytes
 graphics/naming_screen/pc_icon_on.png         | Bin 216 -> 203 bytes
 graphics/naming_screen/underscore.png         | Bin 150 -> 137 bytes
 graphics_file_rules.mk                        |  10 +++++++
 include/graphics.h                            |   2 +-
 src/graphics.c                                |   4 +--
 src/naming_screen.c                           |  26 +++++++++---------
 20 files changed, 26 insertions(+), 16 deletions(-)
 rename graphics/naming_screen/{pc_icon.pal => menu.pal} (100%)

diff --git a/graphics/naming_screen/back_button.png b/graphics/naming_screen/back_button.png
index 57c4341942ac69be31c26c751113185c62c8445c..52f76b6fa7372fafd24f0bb60c2320a687e25588 100644
GIT binary patch
delta 56
zcmZ3<G>2(|zMiF}Wp{V;(Y;%q-Mi{l++Drq=$c}$t8<Ez=2%YIo3(d|!n1o(Ks7+1
LruAgO#H{@Q1T`B#

delta 69
zcmbQkw32CpzIAbNad&s~nl(#~?%ne2-qoYe=3ITZ_u0353}A5eY|yiNQSY90e|vYd
Y=hN#2KtaZmAirP+hi5m^CdTdu04*~m9smFU

diff --git a/graphics/naming_screen/cursor.png b/graphics/naming_screen/cursor.png
index e34896cb9f6680f2bc736c7b722b08407b1d13f4..e0f5022bede18df5971a850950cb4cfc6923da65 100644
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm!VDxC`x5MdltF+`h-=oItN%GT?pb<maRe#C
z3ZC7&3KWNsj&|jjfgCMQ7sn8enaK$W0xV2y3JENREDbyY2RVe8xP=oEn375ku5F0s
cDrYNYV5s+GT6xj`=}(Z+p00i_>zopr0FF2#=>Px#

literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^8bHj!!VDxUYZhbxDT4r?5ZA0ZSO5S2Z)s`S-Q9e2
z@0Mrxu6h-BSFbs`rr7K1oZ_T8mQ(g-?Omeq>|PX54G^elJy`(M%UBZR7tG-B>_!@p
zqwDG77{W0#IUzxSg^A7N0EdtW!>L9KgUAUCixqY$Oi^$Y$l~czIO7!3P$0$d<QLP*
T*265SK#dHZu6{1-oD!M<tiU>P

diff --git a/graphics/naming_screen/cursor_filled.png b/graphics/naming_screen/cursor_filled.png
index bf1049e892e658ea122762a57d2ccb0b9a0f5201..efb5e110159713efb2d257357b94d01e747be24b 100644
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm!VDxC`x5MdltF+`h-=oItN%GT?pb<maRe#C
z3ZC7&3KWNsj&|jjfgD3m7sn8enaK$W0xV2y3JENREDb!4iOI>%6DBM$6c9*|Xl68O
kmWVCTelYFOTt`_32FV(p`8#g9t_0cO>FVdQ&MBb@0K$ML1^@s6

literal 187
zcmeAS@N?(olHy`uVBq!ia0vp^8bHj!!VDxUYZhbxDT4r?5ZA0ZSO5S2Z)s`S-Q9e2
z@0Mrxu6h-BSFbs`rr7K1oZ_T8mQ(g-?Omeq>|PX54G^elJy`(M%UBZR7tG-B>_!@p
zW9jMQ7{W0#IUzxSg^7)gE!iNUfx&IU0)_xS6*Ue~5fL*pGZ7c@mLd;<7O7?>j?Dr*
f5BwUfcsUqsgL&qs*Cg`+4Po$f^>bP0l+XkK&wn|8

diff --git a/graphics/naming_screen/cursor_squished.png b/graphics/naming_screen/cursor_squished.png
index 45197320ded14c7de637c1609878055c29250e80..5126fcccaebd6dca631ef6d85ed28ded7c2207b0 100644
GIT binary patch
literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm!VDxC`x5MdltF+`h-=oItN%GT?pb<maRe#C
z3ZC7&3KWNsj&|jjfgF8L7sn8enaK$U*jXAGT#TC}m=qWjlark%Ojuwj&>(Rvq2Ww}
i_d(IaTMzRtv1DNQ#=y><B&l~2WWJ}XpUXO@geCynRVWDn

literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^8bHj!!VDxUYZhbxDT4r?5ZA0ZSO5S2Z)s`S-Q9e2
z@0Mrxu6h-BSFbs`rr7K1oZ_T8mQ(g-?Omeq>|PX54G^elJy`(M%UBZR7tG-B>_!^M
zAWs*^5RRG22@Q<N1_=(VO$vsNC60;7$<8|#C<riUx(Vnqh&C55m=v+);bw;JV20RQ
Wc5dFy+8=;=89ZJ6T-G@yGywp8^*gix

diff --git a/graphics/naming_screen/input_arrow.png b/graphics/naming_screen/input_arrow.png
index dd3f2a671512ec614bc30ea5008e60d7788815cf..0a5072673357c8519eadae2c04c3a79a6a2f69bc 100644
GIT binary patch
delta 53
wcmZ3+IFoULk#=!$F#`hpXJCM$q&b$=Yl5ci%{uyQ&eeB&w@>YOG%?Et0IG}>qW}N^

delta 66
zcmbQqxQuavkwtfR^U=Lqp543ZRoq>@=IEMYud8#4ljc}X*_*X@iNdpcQI=q!ruAe2
U0|NtNNswPKgTu2MX%k~@06gv;)&Kwi

diff --git a/graphics/naming_screen/pc_icon.pal b/graphics/naming_screen/menu.pal
similarity index 100%
rename from graphics/naming_screen/pc_icon.pal
rename to graphics/naming_screen/menu.pal
diff --git a/graphics/naming_screen/menu.png b/graphics/naming_screen/menu.png
index e7c4374c7ef7dd0410bf01228e1dd117bce2aa15..5bdf0a3eee85cc000376bdd6736c9570a623f7cd 100644
GIT binary patch
delta 57
zcmdnSyp4H+zFu*0ad&s~nl(#~?%ne2-qoYe=3ITZ_u0353}A5eY|yiNQSY90e|vYd
M=hN#28)G9G0i8J^DF6Tf

delta 57
zcmdnSyp4H+zMiF}WpQya0|NYKV1Od8;_jsGCDm(=&N=&R%e`;zx3-mRjE!Uj0Q2w_
AuK)l5

diff --git a/graphics/naming_screen/ok_button.png b/graphics/naming_screen/ok_button.png
index 51acd15d1933f4c26581165324359fa51a6ab440..f8dafbf97b4dc70f1dc346359950776f2bd38f25 100644
GIT binary patch
delta 53
zcmbQr)WI~tNV~hc`RLv)&+c9ID(<dcb97Cy*VQ@2Npmcx?9JM{MB&-JC`&L<(|WRC
HV%BN^)j%3q

delta 66
zcmeBRn#wf6$fCHom;nL)GcZ7rS8;bz_mb*0N9UY<w&mV8_gmXafXWz4g8YIR9G=}s
In;5$q0Ki`uy#N3J

diff --git a/graphics/naming_screen/page_swap_button.png b/graphics/naming_screen/page_swap_button.png
index 6c8fa888dfce502040b03e397874a9eee236788d..2e5cabed0f1da67f52dfe4e71d8242089eaa2519 100644
GIT binary patch
delta 29
ncmV+&0OJ3i0g(ZaN)t+Ri(-qUd#uHr&E~Y;_D9;bbdhQ_%y17i

delta 42
zcmV+_0M-AI0iFSnN+4pKIeV;9l)Y-j=A6~;y|<N!;s5{u0d!JMQvg8b*k+MkG@d3C
A0ssI2

diff --git a/graphics/naming_screen/page_swap_frame.png b/graphics/naming_screen/page_swap_frame.png
index 1e8f409830c2d52e8e78829d0c11d66c3701ee47..bc3ff122b2ec8417c11a648c65a1ff28bc86b496 100644
GIT binary patch
delta 53
zcmeBT`pY=MNV~hc`RLv)&+c9ID(<dcb97Cy*VQ@2Npmcx?9JM{MB&-JC`&L<(|WRC
HV%7ox>I)jT

delta 66
zcmey%*u^x#$fCHom;nL)GcZ8WnqsfL%~4n96n{Ir<o~myQ>*Mw0hKY91o;IsI6S+N
IHZgVq0OX_@LjV8(

diff --git a/graphics/naming_screen/page_swap_lower.png b/graphics/naming_screen/page_swap_lower.png
index 741c5e5894bf6737e5b483daa9dabb86f355f6f5..5747c6265d651fb00fbb1255c26f9cb74534770d 100644
GIT binary patch
delta 58
zcmX@kxQlUuuEGERmX?;?-OWe$Zh3a^s#kG$^_rt=ioLGRDNdSWIc0Cw-X#jp?nMFB
N0D+p;lLZsAVgY%^9Torp

delta 71
zcmdnRc${&9t}O@0Jxi}GjzJ7Kz_WW-fie)%(XRY5ki%FK<QL4~@a#s~#MoE>9&r&!

diff --git a/graphics/naming_screen/page_swap_others.png b/graphics/naming_screen/page_swap_others.png
index 32afa52821f461a3579be4861d55b0861acf8140..8b5f55ce3b791307f1eb9292e1d00c0a566c0e62 100644
GIT binary patch
delta 9
QcmX@dc#v^I!o=J}02A5+;Q#;t

delta 20
bcmX@ec#d&G0vBURkY6x^!?PP{6Jt{VOS1>6

diff --git a/graphics/naming_screen/page_swap_upper.png b/graphics/naming_screen/page_swap_upper.png
index 68f0637b4e3cf8e3964605d951c63afa1bdafa53..35ff51d2003fb3a0614c1149c89069d60b7e63e0 100644
GIT binary patch
delta 9
QcmX@jxQ}r{!o=J-028MJ*Z=?k

delta 20
bcmdnTc$#rS0vBURkY6x^!?PP{6JrwrOFjpo

diff --git a/graphics/naming_screen/pc_icon_off.png b/graphics/naming_screen/pc_icon_off.png
index a24d40836350181d28495c818f999ae729b7a15d..1f4c65a4e7d3f9035f2f1b4cb428208d0a77cdb0 100644
GIT binary patch
delta 9
QcmX@hcz|(2!o=JJ029dr-T(jq

delta 20
bcmX@Wc$RTO0vBURkY6x^!?PP{6JwJBON<An

diff --git a/graphics/naming_screen/pc_icon_on.png b/graphics/naming_screen/pc_icon_on.png
index 1985816c39a5d3b4e203991623cc1099c696cb6a..8b9a2021e801c383e2334c1138d469b1657a442f 100644
GIT binary patch
delta 9
Qcmcb?c$#rS!o=Kc02G7+{{R30

delta 20
bcmX@jc!P050vBURkY6x^!?PP{6JzrLO*se1

diff --git a/graphics/naming_screen/underscore.png b/graphics/naming_screen/underscore.png
index 5d631ce995d13d7072e3241cb779aadd54d75f9f..58d78ce0869ca498cb182a588a109335fe587839 100644
GIT binary patch
delta 53
wcmbQn*vUA-NV~YWm;nL)GcZ6=(j3d`H9=GMW*vPt=jyw?+oyIsnwX^n0HgdAa{vGU

delta 66
zcmeBVoW?l8$fCQu`RLv)&+c9ID(<dcb97Cy*VQ@2Npmcx?9JM{MB&-JC`&L<(|WRi
Ufq{XsB*-tA!Qt7Bw284g05rZGrT_o{

diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 7ac567281..d2f5ab5c6 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -29,6 +29,7 @@ BATTLETERRAINGFXDIR := graphics/battle_terrain
 BERRYPOUCHGFXDIR := graphics/berry_pouch
 HALLOFFAMEGFXDIR := graphics/hall_of_fame
 MAPPREVIEWGFXDIR := graphics/map_preview
+NAMINGGFXDIR := graphics/naming_screen
 
 types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
 contest_types := cool beauty cute smart tough
@@ -654,3 +655,12 @@ $(MAPPREVIEWGFXDIR)/victory_road/tiles.4bpp: %.4bpp: %.png
 
 $(MAPPREVIEWGFXDIR)/viridian_forest/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 389
+
+$(NAMINGGFXDIR)/cursor.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 5
+
+$(NAMINGGFXDIR)/cursor_squished.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 5
+
+$(NAMINGGFXDIR)/cursor_filled.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 5
diff --git a/include/graphics.h b/include/graphics.h
index 63da53ca7..f26373307 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4909,7 +4909,7 @@ extern const u32 gNamingScreenKeyboardSymbols_Tilemap[];
 extern const u32 gNamingScreenMenu_Gfx[];
 extern const u16 gNamingScreenRival_Pal[];
 extern const u16 gNamingScreenKeyboard_Pal[];
-extern const u16 gNamingScreenInterface_Pal[6][16];
+extern const u16 gNamingScreenMenu_Pal[6][16];
 extern const u16 gNamingScreenBackButton_Gfx[];
 extern const u16 gNamingScreenOKButton_Gfx[];
 extern const u16 gNamingScreenPageSwapFrame_Gfx[];
diff --git a/src/graphics.c b/src/graphics.c
index a00c0525d..b7694f158 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1183,9 +1183,9 @@ const u32 gUnknown_8E97EC4[] = INCBIN_U32("graphics/interface/learn_move.bin.lz"
 
 const u16 gNamingScreenKeyboard_Pal[] = INCBIN_U16("graphics/naming_screen/keyboard.gbapal");
 const u16 gNamingScreenRival_Pal[]    = INCBIN_U16("graphics/naming_screen/rival.gbapal");
-const u16 gNamingScreenInterface_Pal[6][16] =
+const u16 gNamingScreenMenu_Pal[6][16] =
 {
-    INCBIN_U16("graphics/naming_screen/pc_icon.gbapal"),
+    INCBIN_U16("graphics/naming_screen/menu.gbapal"),
     INCBIN_U16("graphics/naming_screen/page_swap_upper.gbapal"),
     INCBIN_U16("graphics/naming_screen/page_swap_lower.gbapal"),
     INCBIN_U16("graphics/naming_screen/page_swap_others.gbapal"),
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 2e5bc08d5..57560c3d7 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -58,10 +58,10 @@ enum {
 };
 
 enum {
-    PALTAG_PC_ICON,
+    PALTAG_MENU, // Also the PC icon
     PALTAG_PAGE_SWAP_UPPER,
     PALTAG_PAGE_SWAP_LOWER,
-    PALTAG_PAGE_SWAP_OTHERS,
+    PALTAG_PAGE_SWAP_OTHERS, // Also the input arrow/underscore
     PALTAG_PAGE_SWAP,
     PALTAG_CURSOR,
     PALTAG_BACK_BUTTON,
@@ -782,7 +782,7 @@ static bool8 MainState_WaitPageSwap(void)
 
         sNamingScreen->state = STATE_HANDLE_INPUT;
         sNamingScreen->currentPage++;
-        sNamingScreen->currentPage %= 3;
+        sNamingScreen->currentPage %= KBPAGE_COUNT;
 
         if (onLastColumn)
         {
@@ -1872,7 +1872,7 @@ static void CreateHelperTasks(void)
 
 static void LoadPalettes(void)
 {
-    LoadPalette(gNamingScreenInterface_Pal, 0, sizeof(gNamingScreenInterface_Pal));
+    LoadPalette(gNamingScreenMenu_Pal, 0, sizeof(gNamingScreenMenu_Pal));
     LoadPalette(gNamingScreenKeyboard_Pal, 0xA0, 0x20);
     LoadPalette(stdpal_get(2), 0xB0, 0x20);
 }
@@ -2442,7 +2442,7 @@ static const struct SpriteTemplate sSpriteTemplate_Underscore = {
 
 static const struct SpriteTemplate sSpriteTemplate_PCIcon = {
     .tileTag = TAG_NONE,
-    .paletteTag = PALTAG_PC_ICON,
+    .paletteTag = PALTAG_MENU,
     .oam = &sOam_8x8,
     .anims = sAnims_PCIcon,
     .images = sImageTable_PCIcon,
@@ -2488,13 +2488,13 @@ static const struct SpriteSheet sSpriteSheets[] = {
 };
 
 static const struct SpritePalette sSpritePalettes[] = {
-    {gNamingScreenInterface_Pal[0], PALTAG_PC_ICON},
-    {gNamingScreenInterface_Pal[1], PALTAG_PAGE_SWAP_UPPER},
-    {gNamingScreenInterface_Pal[2], PALTAG_PAGE_SWAP_LOWER},
-    {gNamingScreenInterface_Pal[3], PALTAG_PAGE_SWAP_OTHERS},
-    {gNamingScreenInterface_Pal[4], PALTAG_PAGE_SWAP},
-    {gNamingScreenInterface_Pal[5], PALTAG_CURSOR},
-    {gNamingScreenInterface_Pal[4], PALTAG_BACK_BUTTON},
-    {gNamingScreenInterface_Pal[4], PALTAG_OK_BUTTON},
+    {gNamingScreenMenu_Pal[0], PALTAG_MENU},
+    {gNamingScreenMenu_Pal[1], PALTAG_PAGE_SWAP_UPPER},
+    {gNamingScreenMenu_Pal[2], PALTAG_PAGE_SWAP_LOWER},
+    {gNamingScreenMenu_Pal[3], PALTAG_PAGE_SWAP_OTHERS},
+    {gNamingScreenMenu_Pal[4], PALTAG_PAGE_SWAP},
+    {gNamingScreenMenu_Pal[5], PALTAG_CURSOR},
+    {gNamingScreenMenu_Pal[4], PALTAG_BACK_BUTTON},
+    {gNamingScreenMenu_Pal[4], PALTAG_OK_BUTTON},
     {} // terminator
 };