begin decompiling field_ground_effect.c

3 files changed, 64 insertions, 126 deletions

diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s
index c853d8c50..8c22fa27f 100644
--- a/asm/field_ground_effect.s
+++ b/asm/field_ground_effect.s
@@ -6,132 +6,6 @@
 
 	.text
 
-	thumb_func_start GetAllGroundEffectFlags_OnSpawn
-GetAllGroundEffectFlags_OnSpawn: @ 80635F0
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl FieldObjectUpdateMetatileBehaviors
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_Reflection
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_TallGrassOnSpawn
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_LongGrassOnSpawn
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_SandHeap
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_ShallowFlowingWater
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_ShortGrass
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_HotSprings
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end GetAllGroundEffectFlags_OnSpawn
-
-	thumb_func_start GetAllGroundEffectFlags_OnBeginStep
-GetAllGroundEffectFlags_OnBeginStep: @ 8063638
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl FieldObjectUpdateMetatileBehaviors
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_Reflection
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_TallGrassOnBeginStep
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_LongGrassOnBeginStep
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_Tracks
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_SandHeap
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_ShallowFlowingWater
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_Puddle
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_ShortGrass
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_HotSprings
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end GetAllGroundEffectFlags_OnBeginStep
-
-	thumb_func_start GetAllGroundEffectFlags_OnFinishStep
-GetAllGroundEffectFlags_OnFinishStep: @ 8063690
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl FieldObjectUpdateMetatileBehaviors
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_ShallowFlowingWater
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_SandHeap
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_Puddle
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_Ripple
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_ShortGrass
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_HotSprings
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_Seaweed
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_JumpLanding
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end GetAllGroundEffectFlags_OnFinishStep
-
-	thumb_func_start FieldObjectUpdateMetatileBehaviors
-FieldObjectUpdateMetatileBehaviors: @ 80636E0
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0x14
-	ldrsh r0, [r4, r1]
-	movs r2, 0x16
-	ldrsh r1, [r4, r2]
-	bl MapGridGetMetatileBehaviorAt
-	strb r0, [r4, 0x1F]
-	movs r1, 0x10
-	ldrsh r0, [r4, r1]
-	movs r2, 0x12
-	ldrsh r1, [r4, r2]
-	bl MapGridGetMetatileBehaviorAt
-	strb r0, [r4, 0x1E]
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end FieldObjectUpdateMetatileBehaviors
-
 	thumb_func_start GetGroundEffectFlags_Reflection
 GetGroundEffectFlags_Reflection: @ 8063708
 	push {r4,r5,lr}
diff --git a/ld_script.txt b/ld_script.txt
index 40a1abe41..aa16920ca 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -72,6 +72,7 @@ SECTIONS {
         src/field_door.o(.text);
         src/field_player_avatar.o(.text);
         asm/field_map_obj.o(.text);
+        src/field_ground_effect.o(.text);
         asm/field_ground_effect.o(.text);
         src/map_obj_80643A4.o(.text);
         src/field_message_box.o(.text);
diff --git a/src/field_ground_effect.c b/src/field_ground_effect.c
new file mode 100644
index 000000000..e4742d384
--- /dev/null
+++ b/src/field_ground_effect.c
@@ -0,0 +1,63 @@
+#include "global.h"
+#include "asm_fieldmap.h"
+
+void FieldObjectUpdateMetatileBehaviors(struct MapObject *);
+void GetGroundEffectFlags_Reflection(struct MapObject *, u32 *);
+void GetGroundEffectFlags_TallGrassOnSpawn(struct MapObject *, u32 *);
+void GetGroundEffectFlags_TallGrassOnBeginStep(struct MapObject *, u32 *);
+void GetGroundEffectFlags_LongGrassOnSpawn(struct MapObject *, u32 *);
+void GetGroundEffectFlags_LongGrassOnBeginStep(struct MapObject *, u32 *);
+void GetGroundEffectFlags_Tracks(struct MapObject *, u32 *);
+void GetGroundEffectFlags_SandHeap(struct MapObject *, u32 *);
+void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject *, u32 *);
+void GetGroundEffectFlags_Puddle(struct MapObject *, u32 *);
+void GetGroundEffectFlags_Ripple(struct MapObject *, u32 *);
+void GetGroundEffectFlags_ShortGrass(struct MapObject *, u32 *);
+void GetGroundEffectFlags_HotSprings(struct MapObject *, u32 *);
+void GetGroundEffectFlags_Seaweed(struct MapObject *, u32 *);
+void GetGroundEffectFlags_JumpLanding(struct MapObject *, u32 *);
+
+void GetAllGroundEffectFlags_OnSpawn(struct MapObject *mapObj, u32 *flags)
+{
+    FieldObjectUpdateMetatileBehaviors(mapObj);
+    GetGroundEffectFlags_Reflection(mapObj, flags);
+    GetGroundEffectFlags_TallGrassOnSpawn(mapObj, flags);
+    GetGroundEffectFlags_LongGrassOnSpawn(mapObj, flags);
+    GetGroundEffectFlags_SandHeap(mapObj, flags);
+    GetGroundEffectFlags_ShallowFlowingWater(mapObj, flags);
+    GetGroundEffectFlags_ShortGrass(mapObj, flags);
+    GetGroundEffectFlags_HotSprings(mapObj, flags);
+}
+
+void GetAllGroundEffectFlags_OnBeginStep(struct MapObject *mapObj, u32 *flags)
+{
+    FieldObjectUpdateMetatileBehaviors(mapObj);
+    GetGroundEffectFlags_Reflection(mapObj, flags);
+    GetGroundEffectFlags_TallGrassOnBeginStep(mapObj, flags);
+    GetGroundEffectFlags_LongGrassOnBeginStep(mapObj, flags);
+    GetGroundEffectFlags_Tracks(mapObj, flags);
+    GetGroundEffectFlags_SandHeap(mapObj, flags);
+    GetGroundEffectFlags_ShallowFlowingWater(mapObj, flags);
+    GetGroundEffectFlags_Puddle(mapObj, flags);
+    GetGroundEffectFlags_ShortGrass(mapObj, flags);
+    GetGroundEffectFlags_HotSprings(mapObj, flags);
+}
+
+void GetAllGroundEffectFlags_OnFinishStep(struct MapObject *mapObj, u32 *flags)
+{
+    FieldObjectUpdateMetatileBehaviors(mapObj);
+    GetGroundEffectFlags_ShallowFlowingWater(mapObj, flags);
+    GetGroundEffectFlags_SandHeap(mapObj, flags);
+    GetGroundEffectFlags_Puddle(mapObj, flags);
+    GetGroundEffectFlags_Ripple(mapObj, flags);
+    GetGroundEffectFlags_ShortGrass(mapObj, flags);
+    GetGroundEffectFlags_HotSprings(mapObj, flags);
+    GetGroundEffectFlags_Seaweed(mapObj, flags);
+    GetGroundEffectFlags_JumpLanding(mapObj, flags);
+}
+
+void FieldObjectUpdateMetatileBehaviors(struct MapObject *mapObj)
+{
+    mapObj->mapobj_unk_1F = MapGridGetMetatileBehaviorAt(mapObj->coords3.x, mapObj->coords3.y);
+    mapObj->mapobj_unk_1E = MapGridGetMetatileBehaviorAt(mapObj->coords2.x, mapObj->coords2.y);
+}