FldEff_DeepSandFootprints

2 files changed, 32 insertions, 72 deletions

diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 20fafd213..ffc7b3e9f 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -6,64 +6,6 @@
 
 	.text
 
-	thumb_func_start FldEff_DeepSandFootprints
-FldEff_DeepSandFootprints: @ 812749C
-	push {r4,r5,lr}
-	ldr r4, _08127504 @ =gFieldEffectSpawnParams
-	adds r1, r4, 0x4
-	adds r0, r4, 0
-	movs r2, 0x8
-	movs r3, 0x8
-	bl sub_8060470
-	ldr r0, _08127508 @ =gFieldEffectObjectTemplatePointers
-	ldr r0, [r0, 0x5C]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	movs r3, 0x4
-	ldrsh r2, [r4, r3]
-	ldrb r3, [r4, 0x8]
-	bl CreateSpriteAtEnd
-	lsls r0, 24
-	lsrs r1, r0, 24
-	adds r5, r1, 0
-	cmp r1, 0x40
-	beq _081274FC
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0812750C @ =gSprites
-	adds r0, r1
-	adds r3, r0, 0
-	adds r3, 0x3E
-	ldrb r1, [r3]
-	movs r2, 0x2
-	orrs r1, r2
-	strb r1, [r3]
-	movs r1, 0x3
-	ldrb r2, [r4, 0xC]
-	ands r2, r1
-	lsls r2, 2
-	ldrb r3, [r0, 0x5]
-	movs r1, 0xD
-	negs r1, r1
-	ands r1, r3
-	orrs r1, r2
-	strb r1, [r0, 0x5]
-	movs r1, 0x18
-	strh r1, [r0, 0x3C]
-	ldrb r1, [r4, 0x10]
-	bl StartSpriteAnim
-_081274FC:
-	adds r0, r5, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08127504: .4byte gFieldEffectSpawnParams
-_08127508: .4byte gFieldEffectObjectTemplatePointers
-_0812750C: .4byte gSprites
-	thumb_func_end FldEff_DeepSandFootprints
-
 	thumb_func_start FldEff_BikeTireTracks
 FldEff_BikeTireTracks: @ 8127510
 	push {r4,r5,lr}
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index d9055f262..82b3ad25e 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -244,7 +244,7 @@ void sub_8126BC4(u8 spriteId, u8 animNum, s16 x, s16 y)
     }
 }
 
-bool8 FldEff_Shadow(void)
+u8 FldEff_Shadow(void)
 {
     u8 mapObjectId;
     const struct MapObjectGraphicsInfo *graphicsInfo;
@@ -261,7 +261,7 @@ bool8 FldEff_Shadow(void)
         gSprites[spriteId].data2 = gFieldEffectSpawnParams[2];
         gSprites[spriteId].data3 = (graphicsInfo->height >> 1) - gUnknown_08401E36[graphicsInfo->shadowSize];
     }
-    return FALSE;
+    return 0;
 }
 
 void oamc_shadow(struct Sprite *sprite)
@@ -288,7 +288,7 @@ void oamc_shadow(struct Sprite *sprite)
     }
 }
 
-bool8 FldEff_TallGrass(void)
+u8 FldEff_TallGrass(void)
 {
     s16 x;
     s16 y;
@@ -315,7 +315,7 @@ bool8 FldEff_TallGrass(void)
             SeekSpriteAnim(sprite, 4);
         }
     }
-    return FALSE;
+    return 0;
 }
 
 void unc_grass_normal(struct Sprite *sprite)
@@ -360,7 +360,7 @@ void unc_grass_normal(struct Sprite *sprite)
     }
 }
 
-bool8 FldEff_JumpTallGrass(void)
+u8 FldEff_JumpTallGrass(void)
 {
     u8 spriteId;
     struct Sprite *sprite;
@@ -375,7 +375,7 @@ bool8 FldEff_JumpTallGrass(void)
         sprite->data0 = gFieldEffectSpawnParams[2];
         sprite->data1 = 12;
     }
-    return FALSE;
+    return 0;
 }
 
 u8 sub_8126FF0(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y)
@@ -397,7 +397,7 @@ u8 sub_8126FF0(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y)
     return MAX_SPRITES;
 }
 
-bool8 FldEff_LongGrass(void)
+u8 FldEff_LongGrass(void)
 {
     s16 x;
     s16 y;
@@ -424,7 +424,7 @@ bool8 FldEff_LongGrass(void)
             SeekSpriteAnim(sprite, 6);
         }
     }
-    return FALSE;
+    return 0;
 }
 
 void unc_grass_tall(struct Sprite *sprite)
@@ -464,7 +464,7 @@ void unc_grass_tall(struct Sprite *sprite)
     }
 }
 
-bool8 FldEff_JumpLongGrass(void)
+u8 FldEff_JumpLongGrass(void)
 {
     u8 spriteId;
     struct Sprite *sprite;
@@ -479,10 +479,10 @@ bool8 FldEff_JumpLongGrass(void)
         sprite->data0 = gFieldEffectSpawnParams[2];
         sprite->data1 = 18;
     }
-    return FALSE;
+    return 0;
 }
 
-bool8 FldEff_ShortGrass(void)
+u8 FldEff_ShortGrass(void)
 {
     u8 mapObjectId;
     struct MapObject *mapObject;
@@ -503,7 +503,7 @@ bool8 FldEff_ShortGrass(void)
         sprite->data3 = gSprites[mapObject->spriteId].pos1.x;
         sprite->data4 = gSprites[mapObject->spriteId].pos1.y;
     }
-    return FALSE;
+    return 0;
 }
 
 void sub_8127334(struct Sprite *sprite)
@@ -542,7 +542,7 @@ void sub_8127334(struct Sprite *sprite)
     }
 }
 
-bool8 FldEff_SandFootprints(void)
+u8 FldEff_SandFootprints(void)
 {
     u8 spriteId;
     struct Sprite *sprite;
@@ -557,5 +557,23 @@ bool8 FldEff_SandFootprints(void)
         sprite->data7 = 13;
         StartSpriteAnim(sprite, gFieldEffectSpawnParams[4]);
     }
-    return FALSE;
+    return 0;
+}
+
+u8 FldEff_DeepSandFootprints(void)
+{
+    u8 spriteId;
+    struct Sprite *sprite;
+
+    sub_8060470((s16 *)&gFieldEffectSpawnParams[0], (s16 *)&gFieldEffectSpawnParams[1], 8, 8);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[23], gFieldEffectSpawnParams[0], gFieldEffectSpawnParams[1], gFieldEffectSpawnParams[2]);
+    if (spriteId != MAX_SPRITES)
+    {
+        sprite = &gSprites[spriteId];
+        sprite->coordOffsetEnabled = TRUE;
+        sprite->oam.priority = gFieldEffectSpawnParams[3];
+        sprite->data7 = 24;
+        StartSpriteAnim(sprite, gFieldEffectSpawnParams[4]);
+    }
+    return spriteId;
 }