Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Moved files - spinda spots, jp fonts, redyellowgreen_frame.bin #1953

Merged
merged 1 commit into from
Nov 20, 2023
Merged

Moved files - spinda spots, jp fonts, redyellowgreen_frame.bin #1953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 graphics/fonts/japanese_frlg_female_font.png → graphics/fonts/japanese_frlg_female.png
View file
Open in desktop
File renamed without changes
0 graphics/fonts/japanese_frlg_male_font.png → graphics/fonts/japanese_frlg_male.png
View file
Open in desktop
File renamed without changes
0 graphics/spinda_spots/spot_0.png → graphics/pokemon/spinda/spots/spot_0.png
View file
Open in desktop
File renamed without changes
0 graphics/spinda_spots/spot_1.png → graphics/pokemon/spinda/spots/spot_1.png
View file
Open in desktop
File renamed without changes
0 graphics/spinda_spots/spot_2.png → graphics/pokemon/spinda/spots/spot_2.png
View file
Open in desktop
File renamed without changes
0 graphics/spinda_spots/spot_3.png → graphics/pokemon/spinda/spots/spot_3.png
View file
Open in desktop
File renamed without changes
1 change: 1 addition & 0 deletions graphics/unused/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
redyellowgreen_frame.bin
Binary file removed graphics/unused/redyellowgreen_frame.bin
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions graphics_file_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) $< $@


Expand Down
8 changes: 4 additions & 4 deletions src/pokemon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down