diff options
| author | garak <garakmon@gmail.com> | 2018-12-19 21:35:32 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-12-19 21:35:32 -0500 |
| commit | af208a6bbb671cbf471d08856994470e707c5051 (patch) | |
| tree | 9a57703eecf8c18f444454f2fae8f5dccf19d408 /src/data/field_event_obj/field_effect_objects.h | |
| parent | 7e170a06cc3155a6a8785af0b910434e5ab43d2b (diff) | |
| parent | f801eed3a84862d88af0d5e43c6b6754e36001f2 (diff) | |
Merge branch 'fldeff' of https://github.com/garakmon/pokeemerald into fldeff
Diffstat (limited to 'src/data/field_event_obj/field_effect_objects.h')
| -rwxr-xr-x | src/data/field_event_obj/field_effect_objects.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/field_event_obj/field_effect_objects.h index 82fde1769..a3944de36 100755 --- a/src/data/field_event_obj/field_effect_objects.h +++ b/src/data/field_event_obj/field_effect_objects.h @@ -1,6 +1,3 @@ -#ifndef GUARD_FIELD_EFFECT_OBJECTS_H -#define GUARD_FIELD_EFFECT_OBJECTS_H - const struct SpritePalette gFieldEffectObjectPaletteInfo0 = {gFieldEffectObjectPalette0, 0x1004}; const struct SpritePalette gFieldEffectObjectPaletteInfo1 = {gFieldEffectObjectPalette1, 0x1005}; @@ -993,5 +990,3 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_Rayquaza[] = { const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80}; const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gEventObjectPalette2, 0x1011}; - -#endif //GUARD_FIELD_EFFECT_OBJECTS_H |