From dc59d5ac4fb0deeaf4068f91126a1e1835067299 Mon Sep 17 00:00:00 2001
From: hjk321 <37224753+hjk321@users.noreply.github.com>
Date: Sat, 10 Apr 2021 20:12:35 -0500
Subject: [PATCH] Document and index fame_checker and field_effects gfx

---
 graphics/fame_checker/bg.png                  | Bin 906 -> 955 bytes
 graphics/fame_checker/bill.pal                |  19 ------------------
 graphics/fame_checker/cursor.pal              |  19 ------------------
 graphics/fame_checker/daisy.pal               |  19 ------------------
 graphics/fame_checker/mr_fuji.pal             |  19 ------------------
 graphics/fame_checker/prof_oak.pal            |  19 ------------------
 graphics/fame_checker/spinning_pokeball.pal   |  19 ------------------
 graphics/fame_checker/spinning_pokeball.png   | Bin 297 -> 284 bytes
 graphics/field_effects/flash_effect_tiles.png | Bin 199 -> 258 bytes
 .../{unk_83CA770.png => new_game_oak.png}     | Bin
 .../{unk_83CAF90.png => pokeball.png}         | Bin 168 -> 155 bytes
 graphics/field_effects/unk_83CAFB0.pal        |  19 ------------------
 src/field_effect.c                            |  12 +++++------
 13 files changed, 6 insertions(+), 139 deletions(-)
 delete mode 100644 graphics/fame_checker/bill.pal
 delete mode 100644 graphics/fame_checker/cursor.pal
 delete mode 100644 graphics/fame_checker/daisy.pal
 delete mode 100644 graphics/fame_checker/mr_fuji.pal
 delete mode 100644 graphics/fame_checker/prof_oak.pal
 delete mode 100644 graphics/fame_checker/spinning_pokeball.pal
 rename graphics/field_effects/{unk_83CA770.png => new_game_oak.png} (100%)
 rename graphics/field_effects/{unk_83CAF90.png => pokeball.png} (51%)
 delete mode 100644 graphics/field_effects/unk_83CAFB0.pal

diff --git a/graphics/fame_checker/bg.png b/graphics/fame_checker/bg.png
index ed1a9a0f89d6b90fe76de1d8110161cb23c9d03d..5116e448069fcffcf9ce0f8b7b55c7bee2d1b18d 100644
GIT binary patch
delta 944
zcmV;h15f;l2fGK58Gi!+007T@;<^9;05DKYR7LjQQvd&)_TEze?qdJ{)&Hz&-jquJ
z_THS7r0(Xl|Nqr{dwbQ@)&KwhYHDg2V#Ra+-DLm(14c<iK~z|U<(Iu~6G0Hi?`kBh
zP^7hTc5f;70G8tPRJPKg6h4=9=f`l3@&;7&7UBgWcmRaN1Am~%GL{>VmYLbF*^m43
z8B*|1;#=?S{C0MBcJ7iSAOU&;WuPae?CMoUQrDzTX8~lsz;Kl3*Jl7+^ahYR0HlEd
zWCpM$H3F`DK&F=PLIOUJ$x96M_X>c!1Pl214fIt4emsIcV{6_{cL;b7dQbp_bpdSp
z0>s}06r?47(0|y%7lxn?uv(Yv^{QCGby2|23cf&3u`WyOTbIlE{7o&OC}3m>X3$ua
zMOgp<Kd>7=+5uKLn10I(3An!m7g_=A62OuG)N_9c9cl?10=xq~goz|QSjIdsOAw+m
zl>x9^Xh3BQ5KwWL7$Ck22)H9aT(IxU1<!*;kOxbMVSgQ<%}MA9fEDxuZ0Z0p;TGXF
z%X3vs2UKuW;c*IJ6o6Ug0e)J5a0*yU4~BaKm=Iv!(F189etoI|q(iy`(W1v3UKxOj
ztJrRZT!CGKu~+7f7~rM}0QLvjBjgyo8bGQ5xC9HB2)n%lA%|pSWd8IF8XyD*2n$H9
zJqMWe4S(VQy<7NbGWNBA-(MVn-Ysz8kTn2gcpe|)9t`=zy#qjdklM6p0C-E#9ykt=
zG2cQC@Pep4&<;%WAUBDs0m_3^sFwh9WZg7w_P`9#ZFsTB-G1pLcE$6+1BC5i6j13w
z*p>x_0QNX{@jy0wK!+H}Koh{0v}zBg`jpvzntxIPOi^X0u^B+gW&kR0DgogVWV(9*
zYttM=H{X*$Edcz;cLCg(HY+-(0a)2<4@en+72YTy5_u0`OMes)+51F4P!daE$<q#S
z?aZhie~xVy(Q9F)5{`YRxr}0fvFHhyGyo<|fN29@+!x@)NC9S3J7DY?i~;~3ApxUl
zjekK1;NugY7#jE<xgNXuv>)GsX49S5KFo4d(0`oI{|x{SB5LQ4IS-)frjF7ssh*@3
zz&)q~4D`!^AD}7#^XxRhQT`wFRs&>%b$T<Puph7b-r$J$6frb%XK(=OUI_34qm4p<
zUdI0fumKGL@?JfF?M?vD_28C?h+V}2K`Djl3P3#{0NsB+5A^IO191CJ1^fYNx9;HU
Sn}d!30000<MNUMnLSTX@5~;!f

delta 894
zcmV-^1A+Xz2Z{%f8Gir(007;{O;i8?15rstK~z|U<(Iu~8bJ`pS4tX0EM(;YB1L(C
zM7%&0(WlBASgCmou1m>XVWqR6N^dOj0B4CF&Z2b@i%6;OGBf)%`*B}D;v#<=ZkgTr
z-R$h_9*7DgK$oBbbg5K4{47Z7TGdFL4N&+3$6cP^p8@c6GJk;710Wp?pfG?5sTJ_x
z0}3^T-xBbd{C;7g-_!uyDOkX#x1e_t@OljTfWFIax<SAf(3JuptPfy%DnR^AKuXH+
zjmD<FFa=G3`7D{u=II=+ixmFm@Bu98EJ@HdOS0widm|uCVPpbs&{!mCk^%tV(2Q^0
z0COBn|H+dCTz@}82%P|S3gAfqvRprcK}}&wfUlsdu#jW~Su6rG1tDrn835Tr18Q@C
zfSS$30P$5ozzqT7+Zon9Tktwq1a*)>4x0d7cEX7On89g)X%ir3#3jOOk>~0#J<x%p
z4j$(Ki~_LAJisdp5Y7SCF@pVt0c;3x(K7<+AYOiK0DqKw>Hz~i=J3h@bhwJiM93M~
zIT(O)cf<g9Z2<5eDvKP0R|6;&0H<I98x^r!COM=aC-c(JL=6yv1B3;X)}I4RehzVf
z$`wx0`ZoezymtV&T0#aeELs3EJ>zjaf<1q@_W<Y!N?R5!0B;I90w(}+=1a%{UJ`W#
zI)IHH<bM`XJwQcJ3iTzxY+1LA+aoXobQ``{<gQ%?NgFI$2Oc17@1ua)2*S2JPzYeR
zbDs!g!w2-pflM?3?2%R<!CG%JYo}XEfH_pzZfplou^E7>n_56P1zGMMK!(vRiEh1D
zOq~II%l84?nKnCgjsvh`uREY*0Cw<30g=pm0DpV*M*)$wuk-_@vIO=h=mxlV?x-Gr
z4xotWhp^HGXFt=u9D}c|+ut9sar*;6VDPne`-AaY-_RG}<VXQlYx~*1!7c!7eM7NZ
zH#md<K0Y9Z4zVfQh@GN1Tx@SatM$lh4_7%Vun*|h*gpW^MnsMLG3No)b?PLIs;c%T
zjduVZK@;Ghza01psspgdjspzj@1SoQAREl+-2sJmyz0Kg0Q=N|5<0neZ~&?=1bB(j
zP9Z=~<9`C!goXgw*9>5*699DIEfW$ctUlrZeZU+IKs_Hox1T2h4mt{e%Xci`57)q*
UpZ*^k8UO$Q07*qoM6N<$f;t6&I{*Lx

diff --git a/graphics/fame_checker/bill.pal b/graphics/fame_checker/bill.pal
deleted file mode 100644
index 485e27c48..000000000
--- a/graphics/fame_checker/bill.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 230 205
-230 189 156
-205 156 115
-106 74 57
-180 139 213
-139 98 172
-98 65 106
-213 189 131
-189 164 98
-139 123 74
-180 139 115
-156 106 82
-90 74 49
-255 255 255
-0 0 0
diff --git a/graphics/fame_checker/cursor.pal b/graphics/fame_checker/cursor.pal
deleted file mode 100644
index 212d9eb69..000000000
--- a/graphics/fame_checker/cursor.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-246 222 82
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-246 148 41
-255 82 0
diff --git a/graphics/fame_checker/daisy.pal b/graphics/fame_checker/daisy.pal
deleted file mode 100644
index adf46bf14..000000000
--- a/graphics/fame_checker/daisy.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-172 123 98
-213 172 115
-156 123 74
-90 82 65
-205 115 98
-164 213 156
-115 172 106
-90 123 82
-222 230 255
-164 172 197
-255 255 255
-0 0 0
diff --git a/graphics/fame_checker/mr_fuji.pal b/graphics/fame_checker/mr_fuji.pal
deleted file mode 100644
index e6dcabf2f..000000000
--- a/graphics/fame_checker/mr_fuji.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-115 90 65
-222 164 82
-180 139 65
-148 106 57
-172 164 189
-255 230 131
-230 205 106
-238 131 90
-90 90 106
-213 205 213
-255 255 255
-0 0 0
diff --git a/graphics/fame_checker/prof_oak.pal b/graphics/fame_checker/prof_oak.pal
deleted file mode 100644
index eb6f2f18b..000000000
--- a/graphics/fame_checker/prof_oak.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-106 74 74
-139 156 164
-205 164 205
-164 123 164
-82 82 57
-213 213 222
-123 123 82
-115 115 115
-197 189 131
-156 156 90
-255 255 255
-0 0 0
diff --git a/graphics/fame_checker/spinning_pokeball.pal b/graphics/fame_checker/spinning_pokeball.pal
deleted file mode 100644
index dac232f78..000000000
--- a/graphics/fame_checker/spinning_pokeball.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-106 106 106
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-139 139 139
-189 189 189
-205 205 205
-238 238 238
-230 230 230
-222 222 222
-180 180 180
-255 255 255
-106 106 106
diff --git a/graphics/fame_checker/spinning_pokeball.png b/graphics/fame_checker/spinning_pokeball.png
index 0d692439a4edc754c3211c5c2f5bbc3b11047edb..fbc8a1c099fa8e2f3d42e9cc152ee5766527dffc 100644
GIT binary patch
delta 9
QcmZ3<G>2(I!o=J?01@*8^Z)<=

delta 20
ccmbQkw32B;0vBURkY6x^!?PP{6Jz%S07kS2y#N3J

diff --git a/graphics/field_effects/flash_effect_tiles.png b/graphics/field_effects/flash_effect_tiles.png
index 4079a5a84d2facb8cc8e847d22cdb0cbe483c595..05d4d3b2e503b61a85f41d74b676a0afff76ac5a 100644
GIT binary patch
delta 241
zcmX@k*u*qJvYwfNfuVCj##|s}5a1KyI_2mZ0RaI81qDMxLq|u)prD|nq@?2F;^yY&
zDO08_S+ZoymMuq*9=&??>a%Ch{{R2~Zt7$!px$0j7sn8b-lLZiIU5WFj(%L7&>Fg-
zNi^&rR~Ul&viC8YaLRIpH{U<<8&xdlC=pnY#hxj`)?sjnW$hszZk33Ip*IrR57+Rh
z{}I~NB=^dY<uN;--ogO>KXHc>Dm403FaBsO|H^!Q`ls*;zV3$;Ew1SnSb84guY5CI
m(SD`leZ9=T)-UQqxy2{{*>|Ick=F$1G6qjqKbLh*2~7YDDQ5%#

delta 182
zcmZo-I?gyjvYr75W{Vy#22y>VE{-7<y+<zvayA%<v_6bJ$Q8DsNp#HyFcp>vVy!kf
zFIjGoXwiCbpZZV7mg1=#j5aX}%}vbQ>M{meZxRxkMcrCi(`H;buW&`V#mOqfwBjnC
zOiax~+Yf(5<~&+xF)iXM-=1vif?Cb`)+&Q8efLKZ{Rf_=1izhd{GY@p_2382Ivm;G
d58QuXdZ)P7HoX62`FfBOJzf1=);T3K0RZIGN`(Lb

diff --git a/graphics/field_effects/unk_83CA770.png b/graphics/field_effects/new_game_oak.png
similarity index 100%
rename from graphics/field_effects/unk_83CA770.png
rename to graphics/field_effects/new_game_oak.png
diff --git a/graphics/field_effects/unk_83CAF90.png b/graphics/field_effects/pokeball.png
similarity index 51%
rename from graphics/field_effects/unk_83CAF90.png
rename to graphics/field_effects/pokeball.png
index c6c456817b1a5b253d49a58609b396848d8ac50c..eb2e56fafe64bb0051072996ded1ffcf10a894da 100644
GIT binary patch
delta 9
QcmZ3%IGb@o!o*x_01;FJZvX%Q

delta 20
bcmbQuxPoy)0vBURkY6x^!?PP{6JzZFMd=4P

diff --git a/graphics/field_effects/unk_83CAFB0.pal b/graphics/field_effects/unk_83CAFB0.pal
deleted file mode 100644
index 5e2face1d..000000000
--- a/graphics/field_effects/unk_83CAFB0.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-255 255 255
-156 180 172
-106 115 115
-57 57 57
-156 24 24
-255 0 0
-255 123 123
-255 255 255
-82 82 106
-123 123 123
-255 255 255
-189 230 255
-164 197 230
-156 189 213
-90 131 180
diff --git a/src/field_effect.c b/src/field_effect.c
index 5942e68fd..c2b507882 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -59,10 +59,10 @@ static void SpriteCB_PokeballGlow(struct Sprite * sprite);
 static void SpriteCB_PokecenterMonitor(struct Sprite * sprite);
 static void SpriteCB_HallOfFameMonitor(struct Sprite * sprite);
 
-static const u16 sNewGameOakObjectSpriteTiles[] = INCBIN_U16("graphics/field_effects/unk_83CA770.4bpp");
-static const u16 sNewGameOakObjectPals[] = INCBIN_U16("graphics/field_effects/unk_83CAF70.gbapal");
-static const u16 sUnknown_83CAF90[] = INCBIN_U16("graphics/field_effects/unk_83CAF90.4bpp");
-static const u16 sUnknown_83CAFB0[] = INCBIN_U16("graphics/field_effects/unk_83CAFB0.gbapal");
+static const u16 sNewGameOakObjectSpriteTiles[] = INCBIN_U16("graphics/field_effects/new_game_oak.4bpp");
+static const u16 sNewGameOakObjectPals[] = INCBIN_U16("graphics/field_effects/new_game_oak.gbapal");
+static const u16 sPokeballGfx[] = INCBIN_U16("graphics/field_effects/pokeball.4bpp");
+static const u16 sPokeballPal[] = INCBIN_U16("graphics/field_effects/pokeball.gbapal");
 static const u16 sUnknown_83CAFD0[] = INCBIN_U16("graphics/field_effects/unk_83CAFD0.4bpp");
 static const u16 sUnknown_83CB3D0[] = INCBIN_U16("graphics/field_effects/unk_83CB3D0.gbapal");
 static const u16 sUnknown_83CB3F0[] = INCBIN_U16("graphics/field_effects/unk_83CB3F0.4bpp");
@@ -161,7 +161,7 @@ static const struct SpriteTemplate sNewGameOakObjectTemplate = {
 };
 
 const struct SpritePalette gUnknown_83CBE9C = {
-    sUnknown_83CAFB0, 4103
+    sPokeballPal, 4103
 };
 
 const struct SpritePalette gUnknown_83CBEA4 = {
@@ -185,7 +185,7 @@ static const struct OamData sOamData_83CBEAC = {
 };
 
 static const struct SpriteFrameImage sUnknown_83CBEB4[] = {
-    {sUnknown_83CAF90, 0x20}
+    {sPokeballGfx, 0x20}
 };
 
 static const struct SpriteFrameImage sUnknown_83CBEBC[] = {