4 files changed, 35 insertions, 32 deletions
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index e8c0d4463..4ecfaa27a 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -25,6 +25,27 @@ struct UnkStruct_083A3698
     u8 animPos[4];
 };
 
+#define GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN   (1 << 0)
+#define GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE    (1 << 1)
+#define GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN   (1 << 2)
+#define GROUND_EFFECT_FLAG_LONG_GRASS_ON_MOVE    (1 << 3)
+#define GROUND_EFFECT_FLAG_ICE_REFLECTION        (1 << 4)
+#define GROUND_EFFECT_FLAG_REFLECTION            (1 << 5)
+#define GROUND_EFFECT_FLAG_SHALLOW_FLOWING_WATER (1 << 6)
+#define GROUND_EFFECT_FLAG_SAND                  (1 << 7)
+#define GROUND_EFFECT_FLAG_DEEP_SAND             (1 << 8)
+#define GROUND_EFFECT_FLAG_RIPPLES               (1 << 9)
+#define GROUND_EFFECT_FLAG_PUDDLE                (1 << 10)
+#define GROUND_EFFECT_FLAG_SAND_PILE             (1 << 11)
+#define GROUND_EFFECT_FLAG_LAND_IN_TALL_GRASS    (1 << 12)
+#define GROUND_EFFECT_FLAG_LAND_IN_LONG_GRASS    (1 << 13)
+#define GROUND_EFFECT_FLAG_LAND_IN_SHALLOW_WATER (1 << 14)
+#define GROUND_EFFECT_FLAG_LAND_IN_DEEP_WATER    (1 << 15)
+#define GROUND_EFFECT_FLAG_LAND_ON_NORMAL_GROUND (1 << 16)
+#define GROUND_EFFECT_FLAG_SHORT_GRASS           (1 << 17)
+#define GROUND_EFFECT_FLAG_HOT_SPRINGS           (1 << 18)
+#define GROUND_EFFECT_FLAG_SEAWEED               (1 << 19)
+
 struct PairedPalettes
 {
     u16 tag;
@@ -140,8 +161,11 @@ u8 CreateCopySpriteAt(struct Sprite * sprite, s16 x, s16 y, u8 subpriority);
 u16 GetObjectPaletteTag(u8 paletteIndex);
 void SetSpritePosToMapCoords(s16 x, s16 y, s16 *x2, s16 *y2);
 void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible);
+bool8 AreZCoordsCompatible(u8, u8);
 u8 ZCoordToPriority(u8 z);
+void ObjectEventUpdateZCoord(struct ObjectEvent *pObject);
 void SetObjectSubpriorityByZCoord(u8 z, struct Sprite * sprite, u8 offset);
+bool8 IsZCoordMismatchAt(u8, s16, s16);
 void MakeObjectTemplateFromObjectEventGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables);
 u8 AddCameraObject(u8 trackedSpriteId);
 void UpdateObjectEventsForCameraUpdate(s16 x, s16 y);
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index e6e0538f6..9472f0b94 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -19,5 +19,8 @@ void sub_80DC478(u8, u8);
 void StartAshFieldEffect(s16, s16, u16, s16);
 void sub_80DCBB8(struct ObjectEvent *);
 bool8 sub_80DCBE0(struct ObjectEvent *);
+void SetUpReflection(struct ObjectEvent*, struct Sprite*, u8);
+u32 StartFieldEffectForObjectEvent(u8, struct ObjectEvent*);
+u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
 
 #endif //GUARD_FIELD_EFFECT_HELPERS_H
diff --git a/include/field_ground_effect.h b/include/field_ground_effect.h
deleted file mode 100644
index 1233dec69..000000000
--- a/include/field_ground_effect.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Created by scott on 9/6/2017.
-//
-
-#ifndef GUARD_FIELD_GROUND_EFFECT_H
-#define GUARD_FIELD_GROUND_EFFECT_H
-
-#include "global.h"
-
-// Exported type declarations
-
-// Exported RAM declarations
-
-// Exported ROM declarations
-void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8);
-void InitObjectPriorityByZCoord(struct Sprite *, u8);
-bool8 IsZCoordMismatchAt(u8, s16, s16);
-bool8 AreZCoordsCompatible(u8, u8);
-void ObjectEventUpdateSubpriority(struct ObjectEvent *, struct Sprite *);
-void DoGroundEffects_OnSpawn(struct ObjectEvent *, struct Sprite *);
-void DoGroundEffects_OnBeginStep(struct ObjectEvent *, struct Sprite *);
-void DoGroundEffects_OnFinishStep(struct ObjectEvent *, struct Sprite *);
-
-#endif //GUARD_FIELD_GROUND_EFFECT_H
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index be1dc57bc..af56ae2be 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -3,15 +3,15 @@
 
 #include "global.h"
 
-bool8 MetatileBehavior_UnusedReturnTrue(u8 metatileBehavior);
+bool8 MetatileBehavior_IsATile(u8 metatileBehavior);
 bool8 MetatileBehavior_IsJumpEast(u8 metatileBehavior);
 bool8 MetatileBehavior_IsJumpWest(u8 metatileBehavior);
 bool8 MetatileBehavior_IsJumpNorth(u8 metatileBehavior);
 bool8 MetatileBehavior_IsJumpSouth(u8 metatileBehavior);
 bool8 MetatileBehavior_IsPokeGrass(u8 metatileBehavior);
-bool8 MetatileBehavior_IsMB21OrSand(u8 metatileBehavior);
 bool8 MetatileBehavior_IsSandOrDeepSand(u8 metatileBehavior);
-bool8 MetatileBehavior_ReturnFalse(u8 metatileBehavior);
+bool8 MetatileBehavior_IsMB21OrWaterfallBottom(u8 metatileBehavior);
+bool8 MetatileBehavior_IsDeepSand(u8 metatileBehavior);
 bool8 MetatileBehavior_IsReflective(u8 metatileBehavior);
 bool8 MetatileBehavior_IsIce(u8 metatileBehavior);
 bool8 MetatileBehavior_IsWarpDoor(u8 metatileBehavior);
@@ -50,12 +50,12 @@ bool8 MetatileBehavior_IsSlideEast(u8 metatileBehavior);
 bool8 MetatileBehavior_IsCounter(u8 metatileBehavior);
 bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 tile, u8 playerDirection);
 bool8 MetatileBehavior_IsPC(u8 metatileBehavior);
-bool8 MetatileBehavior_IsPondWaterOrPuddle(u8 metatileBehavior);
+bool8 MetatileBehavior_HasRipples(u8 metatileBehavior);
 bool8 MetatileBehavior_IsPuddle(u8 metatileBehavior);
 bool8 MetatileBehavior_IsTallGrass_2(u8 metatileBehavior);
 bool8 MetatileBehavior_IsLongGrass(u8 metatileBehavior);
 bool8 MetatileBehavior_ReturnFalse_4(u8 metatileBehavior);
-bool8 MetatileBehavior_ReturnFalse_5(u8 metatileBehavior);
+bool8 MetatileBehavior_IsFootprints(u8 metatileBehavior);
 bool8 MetatileBehavior_IsBridge(u8 metatileBehavior);
 bool8 MetatileBehavior_GetBridgeType(u8 metatileBehavior);
 bool8 MetatileBehavior_UnusedIsMB_01(u8 metatileBehavior);
@@ -74,7 +74,7 @@ bool8 MetatileBehavior_IsEastBlocked(u8 metatileBehavior);
 bool8 MetatileBehavior_IsWestBlocked(u8 metatileBehavior);
 bool8 MetatileBehavior_IsNorthBlocked(u8 metatileBehavior);
 bool8 MetatileBehavior_IsSouthBlocked(u8 metatileBehavior);
-bool8 MetatileBehavior_ReturnFalse_8(u8 metatileBehavior);
+bool8 MetatileBehavior_IsShortGrass(u8 metatileBehavior);
 bool8 MetatileBehavior_IsHotSprings(u8 metatileBehavior);
 bool8 MetatileBehavior_IsWaterfall(u8 metatileBehavior);
 bool8 MetatileBehavior_ReturnFalse_9(u8 metatileBehavior);
@@ -82,7 +82,7 @@ bool8 MetatileBehavior_UnusedReturnFalse(u8 metatileBehavior);
 bool8 MetatileBehavior_UnusedReturnFalse_2(u8 metatileBehavior);
 bool8 MetatileBehavior_UnusedReturnFalse_3(u8 metatileBehavior);
 bool8 MetatileBehavior_UnusedReturnFalse_4(u8 metatileBehavior);
-bool8 MetatileBehavior_ReturnFalse_10(u8 metatileBehavior);
+bool8 MetatileBehavior_IsPacifidlogLog(u8 metatileBehavior);
 bool8 MetatileBehavior_ReturnFalse_11(u8 metatileBehavior);
 bool8 MetatileBehavior_IsRegionMap(u8 metatileBehavior);
 bool8 MetatileBehavior_UnusedReturnFalse_5(u8 metatileBehavior);
@@ -103,7 +103,7 @@ bool8 MetatileBehavior_ReturnFalse_15(u8 metatileBehavior);
 bool8 MetatileBehavior_ReturnFalse_16(u8 metatileBehavior);
 bool8 MetatileBehavior_ReturnFalse_17(u8 metatileBehavior);
 bool8 MetatileBehavior_ReturnFalse_18(u8 metatileBehavior);
-bool8 MetatileBehavior_IsMB22(u8 metatileBehavior);
+bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior);
 bool8 MetatileBehavior_IsMB0A(u8 metatileBehavior);
 bool8 MetatileBehavior_UnusedReturnFalse_9(u8 metatileBehavior);
 bool8 MetatileBehavior_IsBookshelf(u8 metatileBehavior);