ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-16 16:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

DoBobbingFieldEffect declaration

Browse Source
This commit is contained in:
ghoulslash 2021-04-01 20:26:21 -06:00
parent 09c5e27a90
commit 42cc81a0b9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/field_effect_helpers.h
View File

@ -7,7 +7,7 @@
// Exported ROM declarations // Exported ROM declarations
u8 CreateWarpArrowSprite(void); u8 CreateWarpArrowSprite(void);
u8 sub_8155800(u8 oldSpriteId); u8 DoBobbingFieldEffect(u8 oldSpriteId);
void SetSurfBobState(u8 spriteId, u8 value); void SetSurfBobState(u8 spriteId, u8 value);
void SetSurfBobWhileFlyingOutState(u8 spriteId, u8 value); void SetSurfBobWhileFlyingOutState(u8 spriteId, u8 value);
void SetSurfBobWhileFishingState(u8 spriteId, u8 value, s16 data1); void SetSurfBobWhileFishingState(u8 spriteId, u8 value, s16 data1);

6
src/field_effect_helpers.c
View File

@ -29,7 +29,7 @@ static void UpdateAshFieldEffect_Step2(struct Sprite *);
static void SynchroniseSurfAnim(struct ObjectEvent *, struct Sprite *); static void SynchroniseSurfAnim(struct ObjectEvent *, struct Sprite *);
static void sub_81556E8(struct ObjectEvent *, struct Sprite *); static void sub_81556E8(struct ObjectEvent *, struct Sprite *);
static void CreateBobbingEffect(struct ObjectEvent *, struct Sprite *, 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); static u32 ShowDisguiseFieldEffect(u8, u8, u8);
#define sReflectionObjEventId data[0] #define sReflectionObjEventId data[0]
@ -1088,14 +1088,14 @@ u8 DoBobbingFieldEffect(u8 oldSpriteId)
spriteId = CreateSpriteAtEnd(&gDummySpriteTemplate, 0, 0, -1); spriteId = CreateSpriteAtEnd(&gDummySpriteTemplate, 0, 0, -1);
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
sprite->callback = sub_8155850; sprite->callback = BobbingEffectSpriteCallback;
sprite->invisible = TRUE; sprite->invisible = TRUE;
sprite->data[0] = oldSpriteId; sprite->data[0] = oldSpriteId;
sprite->data[1] = 1; sprite->data[1] = 1;
return spriteId; return spriteId;
} }
static void sub_8155850(struct Sprite *sprite) static void BobbingEffectSpriteCallback(struct Sprite *sprite)
{ {
struct Sprite *oldSprite; struct Sprite *oldSprite;