Sync field_effect_objects.h from Emerald

This commit is contained in:
PikalaxALT committed 2021-05-03 15:22:13 -04:00
1 parent 7f50753360
commit 014dd7f0be
18 files changed
+767 -712

No files matched your search

+4 -4
View File
@@ -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)
{