diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-03-24 20:36:52 -0400 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-03-24 20:36:52 -0400 |
commit | d50ce487768da819b17f0f9bc87ab7a6a27c2385 (patch) | |
tree | 07b859bbb2b637fd1fc024352b40ad436e61ebbf /src | |
parent | 936529b3cb48f9602ccf8b03368817f6e2ba898d (diff) |
Move field effect object template pointers to src
Diffstat (limited to 'src')
-rw-r--r-- | src/data/field_effects/field_effect_object_template_pointers.h | 74 | ||||
-rw-r--r-- | src/event_object_movement.c | 4 |
2 files changed, 76 insertions, 2 deletions
diff --git a/src/data/field_effects/field_effect_object_template_pointers.h b/src/data/field_effects/field_effect_object_template_pointers.h new file mode 100644 index 000000000..39321bb3d --- /dev/null +++ b/src/data/field_effects/field_effect_object_template_pointers.h @@ -0,0 +1,74 @@ +const struct SpriteTemplate gUnknown_83A537C; +const struct SpriteTemplate gUnknown_83A5394; +const struct SpriteTemplate gUnknown_83A53AC; +const struct SpriteTemplate gUnknown_83A53C4; +const struct SpriteTemplate gUnknown_83A5420; +const struct SpriteTemplate gUnknown_83A5488; +const struct SpriteTemplate gUnknown_83A54E4; +const struct SpriteTemplate gUnknown_83A556C; +const struct SpriteTemplate gUnknown_83A5604; +const struct SpriteTemplate gUnknown_83A5648; +const struct SpriteTemplate gUnknown_83A5698; +const struct SpriteTemplate gUnknown_83A56F4; +const struct SpriteTemplate gUnknown_83A583C; +const struct SpriteTemplate gUnknown_83A589C; +const struct SpriteTemplate gUnknown_83A58E0; +const struct SpriteTemplate gUnknown_83A593C; +const struct SpriteTemplate gUnknown_83A59A4; +const struct SpriteTemplate gUnknown_83A5A30; +const struct SpriteTemplate gUnknown_83A5A88; +const struct SpriteTemplate gUnknown_83A5AD8; +const struct SpriteTemplate gUnknown_83A5B74; +const struct SpriteTemplate gUnknown_83A5C34; +const struct SpriteTemplate gUnknown_83A5750; +const struct SpriteTemplate gUnknown_83A5CB4; +const struct SpriteTemplate gUnknown_83A5D34; +const struct SpriteTemplate gUnknown_83A5E00; +const struct SpriteTemplate gUnknown_83A57EC; +const struct SpriteTemplate gUnknown_83A5D84; +const struct SpriteTemplate gUnknown_83A5B1C; +const struct SpriteTemplate gUnknown_83A5E38; +const struct SpriteTemplate gUnknown_83A5E64; +const struct SpriteTemplate gUnknown_83A5EC0; +const struct SpriteTemplate gUnknown_83A5F24; +const struct SpriteTemplate gUnknown_83A5FA4; +const struct SpriteTemplate gUnknown_83A5FE0; + +const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = { + &gUnknown_83A537C, + &gUnknown_83A5394, + &gUnknown_83A53AC, + &gUnknown_83A53C4, + &gUnknown_83A5420, + &gUnknown_83A5488, + &gUnknown_83A54E4, + &gUnknown_83A556C, + &gUnknown_83A5604, + &gUnknown_83A5648, + &gUnknown_83A5698, + &gUnknown_83A56F4, + &gUnknown_83A583C, + &gUnknown_83A589C, + &gUnknown_83A58E0, + &gUnknown_83A593C, + &gUnknown_83A59A4, + &gUnknown_83A5A30, + &gUnknown_83A5A88, + &gUnknown_83A5AD8, + &gUnknown_83A5B74, + &gUnknown_83A5C34, + NULL, + &gUnknown_83A5750, + &gUnknown_83A5CB4, + &gUnknown_83A5D34, + &gUnknown_83A5E00, + &gUnknown_83A57EC, + &gUnknown_83A5D84, + &gUnknown_83A5B1C, + &gUnknown_83A5E38, + &gUnknown_83A5E64, + &gUnknown_83A5EC0, + &gUnknown_83A5F24, + &gUnknown_83A5FA4, + &gUnknown_83A5FE0, +}; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index a52d556f3..87e78ed92 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -884,8 +884,8 @@ extern const u32 gUnknown_8394E28[]; #define OBJ_EVENT_PAL_TAG_34 0x1123 #define OBJ_EVENT_PAL_TAG_NONE 0x11FF -/*#include "data/object_events/object_event_graphics_info_pointers.h" -#include "data/field_effects/field_effect_object_template_pointers.h"*/ +/*#include "data/object_events/object_event_graphics_info_pointers.h"*/ +#include "data/field_effects/field_effect_object_template_pointers.h" #include "data/object_events/object_event_pic_tables.h" #include "data/object_events/object_event_anims.h" #include "data/object_events/base_oam.h" |