Document and index fame_checker and field_effects gfx

14 files changed, 6 insertions, 139 deletions

diff --git a/graphics/fame_checker/bg.png b/graphics/fame_checker/bg.png
index ed1a9a0f8..5116e4480 100644
--- a/graphics/fame_checker/bg.png
+++ b/graphics/fame_checker/bg.png
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 0d692439a..fbc8a1c09 100644
--- a/graphics/fame_checker/spinning_pokeball.png
+++ b/graphics/fame_checker/spinning_pokeball.png
diff --git a/graphics/field_effects/flash_effect_tiles.png b/graphics/field_effects/flash_effect_tiles.png
index 4079a5a84..05d4d3b2e 100644
--- a/graphics/field_effects/flash_effect_tiles.png
+++ b/graphics/field_effects/flash_effect_tiles.png
diff --git a/graphics/field_effects/unk_83CA770.png b/graphics/field_effects/new_game_oak.png
index d3ca87183..d3ca87183 100644
--- a/graphics/field_effects/unk_83CA770.png
+++ b/graphics/field_effects/new_game_oak.png
diff --git a/graphics/field_effects/pokeball.png b/graphics/field_effects/pokeball.png
new file mode 100644
index 000000000..eb2e56faf
--- /dev/null
+++ b/graphics/field_effects/pokeball.png
diff --git a/graphics/field_effects/unk_83CAF90.png b/graphics/field_effects/unk_83CAF90.png
deleted file mode 100644
index c6c456817..000000000
--- a/graphics/field_effects/unk_83CAF90.png
+++ /dev/null
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[] = {