summaryrefslogtreecommitdiff
path: root/src/field_effect_helpers.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-05-03 15:22:13 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2021-05-03 15:22:13 -0400
commit014dd7f0be6533cf08a137c7cba263edd01181fb (patch)
tree7d74f9bfb4a68861694cd8823a417abc10240624 /src/field_effect_helpers.c
parent7f5075336072486bc3261b20551f9a035768d42b (diff)
Sync field_effect_objects.h from Emerald
Diffstat (limited to 'src/field_effect_helpers.c')
-rw-r--r--src/field_effect_helpers.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index b10df5d1b..a311a10f9 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -1223,17 +1223,17 @@ u32 FldEff_BerryTreeGrowthSparkle(void)
u32 ShowTreeDisguiseFieldEffect(void)
{
- return ShowDisguiseFieldEffect(FLDEFF_TREE_DISGUISE, 24, 4);
+ return ShowDisguiseFieldEffect(FLDEFF_TREE_DISGUISE, FLDEFFOBJ_TREE_DISGUISE, 4);
}
u32 ShowMountainDisguiseFieldEffect(void)
{
- return ShowDisguiseFieldEffect(FLDEFF_MOUNTAIN_DISGUISE, 25, 3);
+ return ShowDisguiseFieldEffect(FLDEFF_MOUNTAIN_DISGUISE, FLDEFFOBJ_MOUNTAIN_DISGUISE, 3);
}
u32 ShowSandDisguiseFieldEffect(void)
{
- return ShowDisguiseFieldEffect(FLDEFF_SAND_DISGUISE, 28, 2);
+ return ShowDisguiseFieldEffect(FLDEFF_SAND_DISGUISE, FLDEFFOBJ_SAND_DISGUISE, 2);
}
static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum)
@@ -1356,7 +1356,7 @@ void UpdateSparkleFieldEffect(struct Sprite * sprite)
FieldEffectStop(sprite, FLDEFF_SPARKLE);
}
-void sub_80DCCE0(struct Sprite * sprite)
+void UpdateJumpImpactEffect(struct Sprite * sprite)
{
if (sprite->animEnded)
{