Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-10-02 14:57:55 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed compile

Browse Source
This commit is contained in:
Eduardo Quezada
2024-01-22 13:46:32 -03:00
parent 19b4731c3b
commit ea10a1dc55
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spritesheet_rules.mk
View File

@@ -1409,10 +1409,10 @@ $(OBJEVENTGFXDIR)/pokemon/unown/y/follower.4bpp: %.4bpp: %.png
$(OBJEVENTGFXDIR)/pokemon/unown/z/follower.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OBJEVENTGFXDIR)/pokemon/unown/exclamation/follower.4bpp: %.4bpp: %.png
$(OBJEVENTGFXDIR)/pokemon/unown/exclamation_mark/follower.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OBJEVENTGFXDIR)/pokemon/unown/question/follower.4bpp: %.4bpp: %.png
$(OBJEVENTGFXDIR)/pokemon/unown/question_mark/follower.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OBJEVENTGFXDIR)/pokemon/wobbuffet/follower.4bpp: %.4bpp: %.png
@@ -3140,7 +3140,7 @@ $(OBJEVENTGFXDIR)/pokemon/palossand/follower.4bpp: %.4bpp: %.png
$(OBJEVENTGFXDIR)/pokemon/pyukumuku/follower.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OBJEVENTGFXDIR)/pokemon/typenull/follower.4bpp: %.4bpp: %.png
$(OBJEVENTGFXDIR)/pokemon/type_null/follower.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OBJEVENTGFXDIR)/pokemon/silvally/follower.4bpp: %.4bpp: %.png

6
src/data/object_events/object_event_graphics.h
View File

@@ -589,8 +589,8 @@ const u32 gObjectEventPic_Unown_W[] = INCBIN_COMP("graphics/object_events/pics/p
const u32 gObjectEventPic_Unown_X[] = INCBIN_COMP("graphics/object_events/pics/pokemon/unown/x/follower.4bpp");
const u32 gObjectEventPic_Unown_Y[] = INCBIN_COMP("graphics/object_events/pics/pokemon/unown/y/follower.4bpp");
const u32 gObjectEventPic_Unown_Z[] = INCBIN_COMP("graphics/object_events/pics/pokemon/unown/z/follower.4bpp");
const u32 gObjectEventPic_UnownExclamation[] = INCBIN_COMP("graphics/object_events/pics/pokemon/unown/exclamation/follower.4bpp");
const u32 gObjectEventPic_UnownQuestion[] = INCBIN_COMP("graphics/object_events/pics/pokemon/unown/question/follower.4bpp");
const u32 gObjectEventPic_UnownExclamation[] = INCBIN_COMP("graphics/object_events/pics/pokemon/unown/exclamation_mark/follower.4bpp");
const u32 gObjectEventPic_UnownQuestion[] = INCBIN_COMP("graphics/object_events/pics/pokemon/unown/question_mark/follower.4bpp");
const u32 gObjectEventPic_Wobbuffet[] = INCBIN_COMP("graphics/object_events/pics/pokemon/wobbuffet/follower.4bpp");
const u32 gObjectEventPic_Girafarig[] = INCBIN_COMP("graphics/object_events/pics/pokemon/girafarig/follower.4bpp");
const u32 gObjectEventPic_Pineco[] = INCBIN_COMP("graphics/object_events/pics/pokemon/pineco/follower.4bpp");
@@ -1174,7 +1174,7 @@ const u32 gObjectEventPic_Golisopod[] = INCBIN_COMP("graphics/object_events/pics
const u32 gObjectEventPic_Sandygast[] = INCBIN_COMP("graphics/object_events/pics/pokemon/sandygast/follower.4bpp");
const u32 gObjectEventPic_Palossand[] = INCBIN_COMP("graphics/object_events/pics/pokemon/palossand/follower.4bpp");
const u32 gObjectEventPic_Pyukumuku[] = INCBIN_COMP("graphics/object_events/pics/pokemon/pyukumuku/follower.4bpp");
const u32 gObjectEventPic_Typenull[] = INCBIN_COMP("graphics/object_events/pics/pokemon/typenull/follower.4bpp");
const u32 gObjectEventPic_Typenull[] = INCBIN_COMP("graphics/object_events/pics/pokemon/type_null/follower.4bpp");
const u32 gObjectEventPic_Silvally[] = INCBIN_COMP("graphics/object_events/pics/pokemon/silvally/follower.4bpp");
const u32 gObjectEventPic_Minior[] = INCBIN_COMP("graphics/object_events/pics/pokemon/minior/follower.4bpp");
const u32 gObjectEventPic_Komala[] = INCBIN_COMP("graphics/object_events/pics/pokemon/komala/follower.4bpp");