Skip to content

Commit 81f3973

Browse files
committedNov 12, 2023
Moved files - spinda spots, jp fonts, redyellowgreen_frame.bin
1 parent 12a64fe commit 81f3973

10 files changed

+8
-7
lines changed
 
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

‎graphics/unused/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
redyellowgreen_frame.bin
-8 KB
Binary file not shown.

‎graphics_file_rules.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ JPCONTESTGFXDIR := graphics/contest/japanese
2121
POKEDEXGFXDIR := graphics/pokedex
2222
STARTERGFXDIR := graphics/starter_choose
2323
NAMINGGFXDIR := graphics/naming_screen
24-
SPINDAGFXDIR := graphics/spinda_spots
24+
SPINDAGFXDIR := graphics/pokemon/spinda/spots
2525

2626
types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
2727
contest_types := cool beauty cute smart tough
@@ -290,10 +290,10 @@ $(FONTGFXDIR)/short.fwjpnfont: $(FONTGFXDIR)/japanese_short.png
290290
$(FONTGFXDIR)/braille.fwjpnfont: $(FONTGFXDIR)/braille.png
291291
$(GFX) $< $@
292292

293-
$(FONTGFXDIR)/frlg_male.fwjpnfont: $(FONTGFXDIR)/japanese_frlg_male_font.png
293+
$(FONTGFXDIR)/frlg_male.fwjpnfont: $(FONTGFXDIR)/japanese_frlg_male.png
294294
$(GFX) $< $@
295295

296-
$(FONTGFXDIR)/frlg_female.fwjpnfont: $(FONTGFXDIR)/japanese_frlg_female_font.png
296+
$(FONTGFXDIR)/frlg_female.fwjpnfont: $(FONTGFXDIR)/japanese_frlg_female.png
297297
$(GFX) $< $@
298298

299299

‎src/pokemon.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1354,10 +1354,10 @@ static const u16 sHoennToNationalOrder[NUM_SPECIES - 1] =
13541354

13551355
const struct SpindaSpot gSpindaSpotGraphics[] =
13561356
{
1357-
{.x = 16, .y = 7, .image = INCBIN_U16("graphics/spinda_spots/spot_0.1bpp")},
1358-
{.x = 40, .y = 8, .image = INCBIN_U16("graphics/spinda_spots/spot_1.1bpp")},
1359-
{.x = 22, .y = 25, .image = INCBIN_U16("graphics/spinda_spots/spot_2.1bpp")},
1360-
{.x = 34, .y = 26, .image = INCBIN_U16("graphics/spinda_spots/spot_3.1bpp")}
1357+
{.x = 16, .y = 7, .image = INCBIN_U16("graphics/pokemon/spinda/spots/spot_0.1bpp")},
1358+
{.x = 40, .y = 8, .image = INCBIN_U16("graphics/pokemon/spinda/spots/spot_1.1bpp")},
1359+
{.x = 22, .y = 25, .image = INCBIN_U16("graphics/pokemon/spinda/spots/spot_2.1bpp")},
1360+
{.x = 34, .y = 26, .image = INCBIN_U16("graphics/pokemon/spinda/spots/spot_3.1bpp")}
13611361
};
13621362

13631363
#include "data/pokemon/item_effects.h"

0 commit comments

Comments
 (0)
Please sign in to comment.