Merge pull request #1953 from Icedude907/move-files

Moved files - spinda spots, jp fonts, redyellowgreen_frame.bin
pret · Nov 20, 2023 · b302291 · b302291
2 parents 758f744 + 81f3973
commit b302291
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 7 deletions.
diff --git a/graphics/fonts/japanese_frlg_female_font.png → graphics/fonts/japanese_frlg_female.png b/graphics/fonts/japanese_frlg_female_font.png → graphics/fonts/japanese_frlg_female.png
diff --git a/graphics/fonts/japanese_frlg_male_font.png → graphics/fonts/japanese_frlg_male.png b/graphics/fonts/japanese_frlg_male_font.png → graphics/fonts/japanese_frlg_male.png
diff --git a/graphics/spinda_spots/spot_0.png → graphics/pokemon/spinda/spots/spot_0.png b/graphics/spinda_spots/spot_0.png → graphics/pokemon/spinda/spots/spot_0.png
diff --git a/graphics/spinda_spots/spot_1.png → graphics/pokemon/spinda/spots/spot_1.png b/graphics/spinda_spots/spot_1.png → graphics/pokemon/spinda/spots/spot_1.png
diff --git a/graphics/spinda_spots/spot_2.png → graphics/pokemon/spinda/spots/spot_2.png b/graphics/spinda_spots/spot_2.png → graphics/pokemon/spinda/spots/spot_2.png
diff --git a/graphics/spinda_spots/spot_3.png → graphics/pokemon/spinda/spots/spot_3.png b/graphics/spinda_spots/spot_3.png → graphics/pokemon/spinda/spots/spot_3.png
diff --git a/graphics/unused/.gitignore b/graphics/unused/.gitignore
@@ -0,0 +1 @@
+redyellowgreen_frame.bin
diff --git a/graphics/unused/redyellowgreen_frame.bin b/graphics/unused/redyellowgreen_frame.bin
diff --git 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
@@ -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"