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_subsprites.h | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'src/data/field_event_obj/event_object_subsprites.h')
| -rwxr-xr-x | src/data/field_event_obj/event_object_subsprites.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/data/field_event_obj/event_object_subsprites.h b/src/data/field_event_obj/event_object_subsprites.h index db5fddf1e..5da262731 100755 --- a/src/data/field_event_obj/event_object_subsprites.h +++ b/src/data/field_event_obj/event_object_subsprites.h @@ -1,6 +1,3 @@ -#ifndef GUARD_EVENT_OBJECT_SUBSPRITES_H -#define GUARD_EVENT_OBJECT_SUBSPRITES_H - const struct Subsprite gEventObjectSpriteOamTable_16x16_0[] = { { -8, -8, 0, 1, 0, 2} }; @@ -338,5 +335,3 @@ const struct SubspriteTable gEventObjectSpriteOamTables_SubmarineShadow[] = { {16, gEventObjectSpriteOamTable_SubmarineShadow_3}, {16, gEventObjectSpriteOamTable_SubmarineShadow_3} }; - -#endif //GUARD_EVENT_OBJECT_SUBSPRITES_H |