summaryrefslogtreecommitdiff
path: root/include/field_effect_helpers.h
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-11-11 15:42:40 -0800
committerMarcus Huderle <huderlem@gmail.com>2017-11-11 16:06:44 -0800
commit267ada5ce6e2876c4df64275da9ee879a385c6f6 (patch)
tree559417726bbd5f3b18c153c1435f872decfe18b1 /include/field_effect_helpers.h
parent20d00c58ef49fa88533fa07ab1801c381f02b7bf (diff)
parent67ad331441f29545b84d152cbbb4f188098a9c5a (diff)
Merge remote-tracking branch 'upstream/master' into 80c
Diffstat (limited to 'include/field_effect_helpers.h')
-rw-r--r--include/field_effect_helpers.h7
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