diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /src/data/field_event_obj/event_object_graphics_info_pointers.h | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'src/data/field_event_obj/event_object_graphics_info_pointers.h')
| -rwxr-xr-x | src/data/field_event_obj/event_object_graphics_info_pointers.h | 5 |
1 files changed, 0 insertions, 5 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 3f726e30e..f57e294c3 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 @@ -1,6 +1,3 @@ -#ifndef GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H -#define GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H - const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing; @@ -500,5 +497,3 @@ const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[ &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1, &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2, }; - -#endif //GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H |