From 42cc81a0b9b984143aa564b205b4b3ae58ed6753 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Thu, 1 Apr 2021 20:26:21 -0600 Subject: [PATCH] DoBobbingFieldEffect declaration --- include/field_effect_helpers.h | 2 +- src/field_effect_helpers.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 9b7b6ffd5c..6ed0df4c35 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -7,7 +7,7 @@ // Exported ROM declarations u8 CreateWarpArrowSprite(void); -u8 sub_8155800(u8 oldSpriteId); +u8 DoBobbingFieldEffect(u8 oldSpriteId); void SetSurfBobState(u8 spriteId, u8 value); void SetSurfBobWhileFlyingOutState(u8 spriteId, u8 value); void SetSurfBobWhileFishingState(u8 spriteId, u8 value, s16 data1); diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index e8e3dd6fe3..d2cc1887a3 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -29,7 +29,7 @@ static void UpdateAshFieldEffect_Step2(struct Sprite *); static void SynchroniseSurfAnim(struct ObjectEvent *, struct Sprite *); static void sub_81556E8(struct ObjectEvent *, struct Sprite *); static void CreateBobbingEffect(struct ObjectEvent *, struct Sprite *, struct Sprite *); -static void sub_8155850(struct Sprite *); +static void BobbingEffectSpriteCallback(struct Sprite *); static u32 ShowDisguiseFieldEffect(u8, u8, u8); #define sReflectionObjEventId data[0] @@ -1088,14 +1088,14 @@ u8 DoBobbingFieldEffect(u8 oldSpriteId) spriteId = CreateSpriteAtEnd(&gDummySpriteTemplate, 0, 0, -1); sprite = &gSprites[spriteId]; - sprite->callback = sub_8155850; + sprite->callback = BobbingEffectSpriteCallback; sprite->invisible = TRUE; sprite->data[0] = oldSpriteId; sprite->data[1] = 1; return spriteId; } -static void sub_8155850(struct Sprite *sprite) +static void BobbingEffectSpriteCallback(struct Sprite *sprite) { struct Sprite *oldSprite;