diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-10-31 14:22:51 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-31 14:22:51 -0400 |
commit | b1ea2592c30a2e5af547dfc69cef56eb65ae85ba (patch) | |
tree | a65d2af7712a2913afb72329215f2574d92d1668 /src/data | |
parent | b33db9b96cda2f03d10b9bfeec4e6ac8bc90da13 (diff) | |
parent | 67ce8c9cc2dc9d018cae17e71b46c2c999cb048a (diff) |
Merge branch 'master' into doc-partymenu
Diffstat (limited to 'src/data')
-rwxr-xr-x | src/data/field_event_obj/event_object_graphics_info_pointers.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h index 0b8aa79b2..661539d57 100755 --- a/src/data/field_event_obj/event_object_graphics_info_pointers.h +++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h @@ -489,11 +489,11 @@ const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = }; const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = { - &gEventObjectGraphicsInfo_Bard, - &gEventObjectGraphicsInfo_Hipster, - &gEventObjectGraphicsInfo_Trader, - &gEventObjectGraphicsInfo_Storyteller, - &gEventObjectGraphicsInfo_Giddy, - &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1, - &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2, + [MAUVILLE_MAN_BARD] = &gEventObjectGraphicsInfo_Bard, + [MAUVILLE_MAN_HIPSTER] = &gEventObjectGraphicsInfo_Hipster, + [MAUVILLE_MAN_TRADER] = &gEventObjectGraphicsInfo_Trader, + [MAUVILLE_MAN_STORYTELLER] = &gEventObjectGraphicsInfo_Storyteller, + [MAUVILLE_MAN_GIDDY] = &gEventObjectGraphicsInfo_Giddy, + [MAUVILLE_MAN_UNUSED1] = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1, + [MAUVILLE_MAN_UNUSED2] = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2, }; |