Skip to content

Split acro bike & wheelie frames + merge walking & running incbins #2175

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Split acro bike & wheelie frames + merge walking & running incbins #2175

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
Binary file modified graphics/object_events/pics/people/brendan/acro_bike.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/object_events/pics/people/brendan/wheelie.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/object_events/pics/people/may/acro_bike.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/object_events/pics/people/may/wheelie.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions spritesheet_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ $(OBJEVENTGFXDIR)/people/brendan/mach_bike.4bpp: %.4bpp: %.png
$(OBJEVENTGFXDIR)/people/brendan/acro_bike.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4

$(OBJEVENTGFXDIR)/people/brendan/wheelie.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4

$(OBJEVENTGFXDIR)/people/brendan/fishing.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4

Expand Down Expand Up @@ -110,6 +113,9 @@ $(OBJEVENTGFXDIR)/people/may/mach_bike.4bpp: %.4bpp: %.png
$(OBJEVENTGFXDIR)/people/may/acro_bike.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4

$(OBJEVENTGFXDIR)/people/may/wheelie.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4

$(OBJEVENTGFXDIR)/people/may/fishing.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4

Expand Down
22 changes: 12 additions & 10 deletions src/data/object_events/object_event_graphics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const u32 gObjectEventPic_BrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/brendan/walking.4bpp");
const u32 gObjectEventPic_BrendanRunning[] = INCBIN_U32("graphics/object_events/pics/people/brendan/running.4bpp");
const u32 gObjectEventPic_BrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/brendan/walking.4bpp",
"graphics/object_events/pics/people/brendan/running.4bpp");
const u16 gObjectEventPal_Brendan[] = INCBIN_U16("graphics/object_events/palettes/brendan.gbapal");
const u32 gObjectEventPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/walking.4bpp");
const u32 gObjectEventPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/running.4bpp");
const u32 gObjectEventPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/walking.4bpp",
"graphics/object_events/pics/people/ruby_sapphire_brendan/running.4bpp");
const u16 gObjectEventPal_RubySapphireBrendan[] = INCBIN_U16("graphics/object_events/palettes/ruby_sapphire_brendan.gbapal");
const u16 gObjectEventPal_Null1[16] = {};
const u16 gObjectEventPal_Null2[16] = {};
Expand All @@ -24,20 +24,21 @@ const u16 gObjectEventPal_BridgeReflection[] = INCBIN_U16("graphics/object_event
const u32 gObjectEventPic_BrendanFieldMove[] = INCBIN_U32("graphics/object_events/pics/people/brendan/field_move.4bpp");
const u32 gObjectEventPic_BrendanSurfing[] = INCBIN_U32("graphics/object_events/pics/people/brendan/surfing.4bpp");
const u32 gObjectEventPic_BrendanMachBike[] = INCBIN_U32("graphics/object_events/pics/people/brendan/mach_bike.4bpp");
const u32 gObjectEventPic_BrendanAcroBike[] = INCBIN_U32("graphics/object_events/pics/people/brendan/acro_bike.4bpp");
const u32 gObjectEventPic_BrendanAcroBike[] = INCBIN_U32("graphics/object_events/pics/people/brendan/acro_bike.4bpp",
"graphics/object_events/pics/people/brendan/wheelie.4bpp");
const u32 gObjectEventPic_BrendanFishing[] = INCBIN_U32("graphics/object_events/pics/people/brendan/fishing.4bpp");
const u32 gObjectEventPic_BrendanWatering[] = INCBIN_U32("graphics/object_events/pics/people/brendan/watering.4bpp");
const u32 gObjectEventPic_BrendanDecorating[] = INCBIN_U32("graphics/object_events/pics/people/brendan/decorating.4bpp");
const u32 gObjectEventPic_MayDecorating[] = INCBIN_U32("graphics/object_events/pics/people/may/decorating.4bpp");
const u32 gObjectEventPic_BrendanUnderwater[] = INCBIN_U32("graphics/object_events/pics/people/brendan/underwater.4bpp");
const u32 gObjectEventPic_MayUnderwater[] = INCBIN_U32("graphics/object_events/pics/people/may/underwater.4bpp");
const u16 gObjectEventPal_PlayerUnderwater[] = INCBIN_U16("graphics/object_events/palettes/player_underwater.gbapal");
const u32 gObjectEventPic_MayNormal[] = INCBIN_U32("graphics/object_events/pics/people/may/walking.4bpp");
const u32 gObjectEventPic_MayRunning[] = INCBIN_U32("graphics/object_events/pics/people/may/running.4bpp");
const u32 gObjectEventPic_MayNormal[] = INCBIN_U32("graphics/object_events/pics/people/may/walking.4bpp",
"graphics/object_events/pics/people/may/running.4bpp");
const u16 gObjectEventPal_May[] = INCBIN_U16("graphics/object_events/palettes/may.gbapal");
const u16 gObjectEventPal_MayReflection[] = INCBIN_U16("graphics/object_events/palettes/may_reflection.gbapal");
const u32 gObjectEventPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/walking.4bpp");
const u32 gObjectEventPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/running.4bpp");
const u32 gObjectEventPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/walking.4bpp",
"graphics/object_events/pics/people/ruby_sapphire_may/running.4bpp");
const u16 gObjectEventPal_RubySapphireMay[] = INCBIN_U16("graphics/object_events/palettes/ruby_sapphire_may.gbapal");
const u16 gUnusedObjectEventPalette[] = INCBIN_U16("graphics/object_events/palettes/unused_palette.gbapal");
const u16 gObjectEventPal_Null16[16] = {};
Expand All @@ -55,7 +56,8 @@ const u16 gObjectEventPal_Null27[16] = {};
const u16 gObjectEventPal_Null28[16] = {};
const u16 gObjectEventPal_Null29[16] = {};
const u32 gObjectEventPic_MayMachBike[] = INCBIN_U32("graphics/object_events/pics/people/may/mach_bike.4bpp");
const u32 gObjectEventPic_MayAcroBike[] = INCBIN_U32("graphics/object_events/pics/people/may/acro_bike.4bpp");
const u32 gObjectEventPic_MayAcroBike[] = INCBIN_U32("graphics/object_events/pics/people/may/acro_bike.4bpp",
"graphics/object_events/pics/people/may/wheelie.4bpp");
const u32 gObjectEventPic_MaySurfing[] = INCBIN_U32("graphics/object_events/pics/people/may/surfing.4bpp");
const u32 gObjectEventPic_MayFieldMove[] = INCBIN_U32("graphics/object_events/pics/people/may/field_move.4bpp");
const u32 gObjectEventPic_MayFishing[] = INCBIN_U32("graphics/object_events/pics/people/may/fishing.4bpp");
Expand Down
36 changes: 18 additions & 18 deletions src/data/object_events/object_event_pic_tables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ static const struct SpriteFrameImage sPicTable_BrendanNormal[] = {
overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 6),
overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 7),
overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 8),
overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 0),
overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 1),
overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 2),
overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 3),
overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 4),
overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 5),
overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 6),
overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 7),
overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 8),
overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 9),
overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 10),
overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 11),
overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 12),
overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 13),
overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 14),
overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 15),
overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 16),
overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 17),
};

static const struct SpriteFrameImage sPicTable_BrendanMachBike[] = {
Expand Down Expand Up @@ -999,15 +999,15 @@ static const struct SpriteFrameImage sPicTable_MayNormal[] = {
overworld_frame(gObjectEventPic_MayNormal, 2, 4, 6),
overworld_frame(gObjectEventPic_MayNormal, 2, 4, 7),
overworld_frame(gObjectEventPic_MayNormal, 2, 4, 8),
overworld_frame(gObjectEventPic_MayRunning, 2, 4, 0),
overworld_frame(gObjectEventPic_MayRunning, 2, 4, 1),
overworld_frame(gObjectEventPic_MayRunning, 2, 4, 2),
overworld_frame(gObjectEventPic_MayRunning, 2, 4, 3),
overworld_frame(gObjectEventPic_MayRunning, 2, 4, 4),
overworld_frame(gObjectEventPic_MayRunning, 2, 4, 5),
overworld_frame(gObjectEventPic_MayRunning, 2, 4, 6),
overworld_frame(gObjectEventPic_MayRunning, 2, 4, 7),
overworld_frame(gObjectEventPic_MayRunning, 2, 4, 8),
overworld_frame(gObjectEventPic_MayNormal, 2, 4, 9),
overworld_frame(gObjectEventPic_MayNormal, 2, 4, 10),
overworld_frame(gObjectEventPic_MayNormal, 2, 4, 11),
overworld_frame(gObjectEventPic_MayNormal, 2, 4, 12),
overworld_frame(gObjectEventPic_MayNormal, 2, 4, 13),
overworld_frame(gObjectEventPic_MayNormal, 2, 4, 14),
overworld_frame(gObjectEventPic_MayNormal, 2, 4, 15),
overworld_frame(gObjectEventPic_MayNormal, 2, 4, 16),
overworld_frame(gObjectEventPic_MayNormal, 2, 4, 17),
};

static const struct SpriteFrameImage sPicTable_MayMachBike[] = {
Expand Down