diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-09-30 16:41:16 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2017-09-30 16:41:16 -0700 |
commit | 4c5bfdc153a8484c00aae30ed22badf006d7f8d9 (patch) | |
tree | 47bfb4286c03f021d48ffadde5da675a9f903f61 /include/field_effect_helpers.h | |
parent | aaa09d735451cced915bc6bacfce45ced8e33fa1 (diff) | |
parent | f74d4742f597a423b7a8685d72c06597c8c78db7 (diff) |
Merge remote-tracking branch 'upstream/master' into name_labels
Diffstat (limited to 'include/field_effect_helpers.h')
-rw-r--r-- | include/field_effect_helpers.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index a1dd53a2b..7bba24fa6 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELD_EFFECT_HELPERS_H #define GUARD_FIELD_EFFECT_HELPERS_H +extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; + void sub_812869C(struct MapObject *); bool8 sub_81286C4(struct MapObject *); void oamc_shadow(struct Sprite *); @@ -26,6 +28,9 @@ void sub_8126BC4(u8 unk_1B, u8 r6, s16 x, s16 y); void sub_8127ED0(u8, u8); void sub_8127F28(u8, u8, s16); u8 sub_8128124(u8 id); -void ash(s16, s16, u16, u8); +void ash(s16, s16, u16, s16); +void SetUpReflection(struct MapObject *mapObj, struct Sprite *sprite, u8 a); +u32 oe_exec_and_other_stuff(u8 fieldEffectId, struct MapObject *mapObject); +u8 sub_8126FF0(u8, u8, u8, s16, s16); #endif // GUARD_FIELD_EFFECT_HELPERS_H |