Merge branch 'master' into contest_link_80C2020

1 files changed, 24 insertions, 24 deletions

diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index 7bba24fa6..8462b6ff8 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -3,34 +3,34 @@
 
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
 
-void sub_812869C(struct MapObject *);
-bool8 sub_81286C4(struct MapObject *);
-void oamc_shadow(struct Sprite *);
+void sub_812869C(struct EventObject *);
+bool8 sub_81286C4(struct EventObject *);
+void UpdateShadowFieldEffect(struct Sprite *);
 void sub_8087638(struct Sprite *);
 void sub_808788C(struct Sprite *);
-void sub_8127334(struct Sprite *);
-void sub_8127584(struct Sprite *);
-void sub_81276B4(struct Sprite *);
-void sub_8127A7C(struct Sprite *);
-void sub_8127D84(struct Sprite *);
-void sub_8127F7C(struct Sprite *);
-void sub_81282E0(struct Sprite *);
-void sub_8128410(struct Sprite *);
-void sub_81285AC(struct Sprite *);
-void sub_8128774(struct Sprite *);
-void sub_81287C4(struct Sprite *);
-void sub_8128800(struct Sprite *);
-void unc_grass_normal(struct Sprite *);
-void unc_grass_tall(struct Sprite *);
-u8 sub_8126B54(void);
-void objid_set_invisible(u8);
-void sub_8126BC4(u8 unk_1B, u8 r6, s16 x, s16 y);
+void UpdateShortGrassFieldEffect(struct Sprite *);
+void UpdateFootprintsTireTracksFieldEffect(struct Sprite *);
+void UpdateSplashFieldEffect(struct Sprite *);
+void UpdateHotSpringsWaterFieldEffect(struct Sprite *);
+void UpdateAshFieldEffect(struct Sprite *);
+void UpdateSurfBlobFieldEffect(struct Sprite *);
+void UpdateSandPileFieldEffect(struct Sprite *);
+void UpdateBubblesFieldEffect(struct Sprite *);
+void UpdateDisguiseFieldEffect(struct Sprite *);
+void UpdateSparkleFieldEffect(struct Sprite *);
+void UpdateJumpLandingFieldEffect(struct Sprite *);
+void WaitFieldEffectSpriteAnim(struct Sprite *);
+void UpdateTallGrassFieldEffect(struct Sprite *);
+void UpdateLongGrassFieldEffect(struct Sprite *);
+u8 CreateWarpArrowSprite(void);
+void SetSpriteInvisible(u8);
+void ShowWarpArrowSprite(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, 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);
+void StartAshFieldEffect(s16, s16, u16, s16);
+void InitObjectReflectionSprite(struct EventObject *eventObj, struct Sprite *sprite, u8 a);
+u32 StartFieldEffectForEventObject(u8 fieldEffectId, struct EventObject *eventObject);
+u8 FindTallGrassFieldEffectSpriteId(u8, u8, u8, s16, s16);
 
 #endif // GUARD_FIELD_EFFECT_HELPERS_H