diff --git a/graphics/object_events/pics/people/brendan/acro_bike.png b/graphics/object_events/pics/people/brendan/acro_bike.png index 183e2b7c9574..85a2998963ce 100644 Binary files a/graphics/object_events/pics/people/brendan/acro_bike.png and b/graphics/object_events/pics/people/brendan/acro_bike.png differ diff --git a/graphics/object_events/pics/people/brendan/wheelie.png b/graphics/object_events/pics/people/brendan/wheelie.png new file mode 100644 index 000000000000..0563f8eee95c Binary files /dev/null and b/graphics/object_events/pics/people/brendan/wheelie.png differ diff --git a/graphics/object_events/pics/people/may/acro_bike.png b/graphics/object_events/pics/people/may/acro_bike.png index 81a35b75a6da..dff26a7591d0 100644 Binary files a/graphics/object_events/pics/people/may/acro_bike.png and b/graphics/object_events/pics/people/may/acro_bike.png differ diff --git a/graphics/object_events/pics/people/may/wheelie.png b/graphics/object_events/pics/people/may/wheelie.png new file mode 100644 index 000000000000..fcfbfe84cb6b Binary files /dev/null and b/graphics/object_events/pics/people/may/wheelie.png differ diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index 87293669c74a..c9c10e65ef0c 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -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 @@ -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 diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 6ee56cc78e1c..288d2a160d23 100755 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -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] = {}; @@ -24,7 +24,8 @@ 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"); @@ -32,12 +33,12 @@ const u32 gObjectEventPic_MayDecorating[] = INCBIN_U32("graphics/object_events/p 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] = {}; @@ -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"); diff --git a/src/data/object_events/object_event_pic_tables.h b/src/data/object_events/object_event_pic_tables.h index 1b8c9c727a2d..da08df71a58a 100755 --- a/src/data/object_events/object_event_pic_tables.h +++ b/src/data/object_events/object_event_pic_tables.h @@ -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[] = { @@ -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[] = {