diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-29 12:30:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-29 12:30:47 -0400 |
| commit | 200c82e01a94dbe535e6ed8768d8afad4444d4d2 (patch) | |
| tree | f24a08bde3371b5e66d13abe203aa745c1e72e27 /src | |
| parent | 75ae00beff77e166c4ae573300ed5cb31175e8ac (diff) | |
| parent | 55f9028383b7effda0a5a84e2c09ef80ae9316cc (diff) | |
Merge pull request #317 from GriffinRichards/fix-spritelayout
Reorient object event sprites to horizontal
Diffstat (limited to 'src')
| -rw-r--r-- | src/data/object_events/object_event_graphics.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 53490bab7..87451cae1 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -22,8 +22,8 @@ const u16 gUnknown_835E968[] = INCBIN_U16("graphics/object_events/palettes/1.gba const u16 gUnknown_835E988[] = INCBIN_U16("graphics/object_events/palettes/2.gbapal"); const u32 gObjectEventPic_RedItem[] = INCBIN_U32("graphics/object_events/pics/people/red_item.4bpp"); const u32 gObjectEventPic_GreenItem[] = INCBIN_U32("graphics/object_events/pics/people/green_item.4bpp"); -const u32 gObjectEventPic_MaleSurfing[] = INCBIN_U32("graphics/object_events/pics/people/male_surf.4bpp"); -const u32 gObjectEventPic_FemaleSurfing[] = INCBIN_U32("graphics/object_events/pics/people/female_surf.4bpp"); +const u32 gObjectEventPic_RedSurf[] = INCBIN_U32("graphics/object_events/pics/people/red_surf.4bpp"); +const u32 gObjectEventPic_GreenSurf[] = INCBIN_U32("graphics/object_events/pics/people/green_surf.4bpp"); const u32 gObjectEventPic_RedBike[] = INCBIN_U32("graphics/object_events/pics/people/red_bike.4bpp"); const u32 gObjectEventPic_RedVSSeekerBike[] = INCBIN_U32("graphics/object_events/pics/people/red_vs_seeker_bike.4bpp"); const u32 gObjectEventPic_GreenBike[] = INCBIN_U32("graphics/object_events/pics/people/green_bike.4bpp"); @@ -191,9 +191,9 @@ const u32 gUnknown_8398068[] = INCBIN_U32("graphics/object_events/pics/effects/s const u32 gUnknown_83980A8[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_large.4bpp"); const u32 gUnknown_8398128[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_extra_large.4bpp"); const u32 filler_8398188[0x48] = {}; -const u16 gUnknown_8398648[] = INCBIN_U16("graphics/object_events/pics/misc/fldeff_cut.4bpp"); -const u32 gUnknown_8398668[] = INCBIN_U32("graphics/object_events/pics/misc/fldeff_cut.4bpp"); -const u16 gUnknown_8398688[] = INCBIN_U16("graphics/object_events/pics/misc/fldeff_cut.gbapal"); +const u16 gUnknown_8398648[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); +const u32 gUnknown_8398668[] = INCBIN_U32("graphics/field_effects/fldeff_cut.4bpp"); +const u16 gUnknown_8398688[] = INCBIN_U16("graphics/field_effects/fldeff_cut.gbapal"); const u32 gUnknown_83986A8[] = INCBIN_U32("graphics/object_events/pics/unknown/83986A8.4bpp"); const u32 gUnknown_8398928[] = INCBIN_U32("graphics/object_events/pics/unknown/8398928.4bpp"); const u32 gUnknown_8398BA8[] = INCBIN_U32("graphics/object_events/pics/unknown/8398BA8.4bpp"); |