From 81f397360e391507534b154e4f976c2b99c09731 Mon Sep 17 00:00:00 2001
From: Icedude907 <34080011+Icedude907@users.noreply.github.com>
Date: Sun, 12 Nov 2023 14:28:11 +1300
Subject: [PATCH] Moved files - spinda spots, jp fonts,
 redyellowgreen_frame.bin

---
 ..._female_font.png => japanese_frlg_female.png} | Bin
 ...frlg_male_font.png => japanese_frlg_male.png} | Bin
 .../spinda/spots}/spot_0.png                     | Bin
 .../spinda/spots}/spot_1.png                     | Bin
 .../spinda/spots}/spot_2.png                     | Bin
 .../spinda/spots}/spot_3.png                     | Bin
 graphics/unused/.gitignore                       |   1 +
 graphics/unused/redyellowgreen_frame.bin         | Bin 8192 -> 0 bytes
 graphics_file_rules.mk                           |   6 +++---
 src/pokemon.c                                    |   8 ++++----
 10 files changed, 8 insertions(+), 7 deletions(-)
 rename graphics/fonts/{japanese_frlg_female_font.png => japanese_frlg_female.png} (100%)
 rename graphics/fonts/{japanese_frlg_male_font.png => japanese_frlg_male.png} (100%)
 rename graphics/{spinda_spots => pokemon/spinda/spots}/spot_0.png (100%)
 rename graphics/{spinda_spots => pokemon/spinda/spots}/spot_1.png (100%)
 rename graphics/{spinda_spots => pokemon/spinda/spots}/spot_2.png (100%)
 rename graphics/{spinda_spots => pokemon/spinda/spots}/spot_3.png (100%)
 create mode 100644 graphics/unused/.gitignore
 delete mode 100644 graphics/unused/redyellowgreen_frame.bin

diff --git a/graphics/fonts/japanese_frlg_female_font.png b/graphics/fonts/japanese_frlg_female.png
similarity index 100%
rename from graphics/fonts/japanese_frlg_female_font.png
rename to graphics/fonts/japanese_frlg_female.png
diff --git a/graphics/fonts/japanese_frlg_male_font.png b/graphics/fonts/japanese_frlg_male.png
similarity index 100%
rename from graphics/fonts/japanese_frlg_male_font.png
rename to graphics/fonts/japanese_frlg_male.png
diff --git a/graphics/spinda_spots/spot_0.png b/graphics/pokemon/spinda/spots/spot_0.png
similarity index 100%
rename from graphics/spinda_spots/spot_0.png
rename to graphics/pokemon/spinda/spots/spot_0.png
diff --git a/graphics/spinda_spots/spot_1.png b/graphics/pokemon/spinda/spots/spot_1.png
similarity index 100%
rename from graphics/spinda_spots/spot_1.png
rename to graphics/pokemon/spinda/spots/spot_1.png
diff --git a/graphics/spinda_spots/spot_2.png b/graphics/pokemon/spinda/spots/spot_2.png
similarity index 100%
rename from graphics/spinda_spots/spot_2.png
rename to graphics/pokemon/spinda/spots/spot_2.png
diff --git a/graphics/spinda_spots/spot_3.png b/graphics/pokemon/spinda/spots/spot_3.png
similarity index 100%
rename from graphics/spinda_spots/spot_3.png
rename to graphics/pokemon/spinda/spots/spot_3.png
diff --git a/graphics/unused/.gitignore b/graphics/unused/.gitignore
new file mode 100644
index 0000000000..b929a6cae7
--- /dev/null
+++ b/graphics/unused/.gitignore
@@ -0,0 +1 @@
+redyellowgreen_frame.bin
\ No newline at end of file
diff --git a/graphics/unused/redyellowgreen_frame.bin b/graphics/unused/redyellowgreen_frame.bin
deleted file mode 100644
index 6852998fb85d057fa16a892b867f0343b6764ec7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8192
zcmeI!+X{m)5CqV9D7fD5|NpC{<jGWKg-}xCxZs0fOgxE3;QXlI*LgBr_0tuLU+7(V
z26%UWi&j95xEl8OXruhMNBd$o$elN<oobAYUw&zR%vNm@C|#g~U(CQycPxIP_uuAw
zGJ*l08tM2ak`Fc$-G6fDdmEe@>Hc%{3u4D}*?zg_@9F)gu3!3ct5E`l3oKZj+Ni*e
z*{PlGf6B{`3;g%`S!{J`qyJBO|M=|B;PapAPd{#Ilz;>zAOQ(TKmrnwz)c0-iL^Nf

diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 090620ebe8..92cc3338dc 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -21,7 +21,7 @@ JPCONTESTGFXDIR := graphics/contest/japanese
 POKEDEXGFXDIR := graphics/pokedex
 STARTERGFXDIR := graphics/starter_choose
 NAMINGGFXDIR := graphics/naming_screen
-SPINDAGFXDIR := graphics/spinda_spots
+SPINDAGFXDIR := graphics/pokemon/spinda/spots
 
 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
@@ -290,10 +290,10 @@ $(FONTGFXDIR)/short.fwjpnfont: $(FONTGFXDIR)/japanese_short.png
 $(FONTGFXDIR)/braille.fwjpnfont: $(FONTGFXDIR)/braille.png
 	$(GFX) $< $@
 
-$(FONTGFXDIR)/frlg_male.fwjpnfont: $(FONTGFXDIR)/japanese_frlg_male_font.png
+$(FONTGFXDIR)/frlg_male.fwjpnfont: $(FONTGFXDIR)/japanese_frlg_male.png
 	$(GFX) $< $@
 
-$(FONTGFXDIR)/frlg_female.fwjpnfont: $(FONTGFXDIR)/japanese_frlg_female_font.png
+$(FONTGFXDIR)/frlg_female.fwjpnfont: $(FONTGFXDIR)/japanese_frlg_female.png
 	$(GFX) $< $@
 
 
diff --git a/src/pokemon.c b/src/pokemon.c
index d3a570e72f..6ee052fda5 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -1354,10 +1354,10 @@ static const u16 sHoennToNationalOrder[NUM_SPECIES - 1] =
 
 const struct SpindaSpot gSpindaSpotGraphics[] =
 {
-    {.x = 16, .y = 7, .image = INCBIN_U16("graphics/spinda_spots/spot_0.1bpp")},
-    {.x = 40, .y = 8, .image = INCBIN_U16("graphics/spinda_spots/spot_1.1bpp")},
-    {.x = 22, .y = 25, .image = INCBIN_U16("graphics/spinda_spots/spot_2.1bpp")},
-    {.x = 34, .y = 26, .image = INCBIN_U16("graphics/spinda_spots/spot_3.1bpp")}
+    {.x = 16, .y =  7, .image = INCBIN_U16("graphics/pokemon/spinda/spots/spot_0.1bpp")},
+    {.x = 40, .y =  8, .image = INCBIN_U16("graphics/pokemon/spinda/spots/spot_1.1bpp")},
+    {.x = 22, .y = 25, .image = INCBIN_U16("graphics/pokemon/spinda/spots/spot_2.1bpp")},
+    {.x = 34, .y = 26, .image = INCBIN_U16("graphics/pokemon/spinda/spots/spot_3.1bpp")}
 };
 
 #include "data/pokemon/item_effects.h"