diff options
author | camthesaxman <cameronghall@cox.net> | 2018-02-14 14:16:26 -0600 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2018-02-14 14:16:26 -0600 |
commit | fc0097606ddc8b90ed2c904baf01f5a699daa03b (patch) | |
tree | 7c380799b573fc5c977fe73da394cf2823cb8189 /src/battle/anim/bubble.c | |
parent | 1dd9be3869f99ae7256c6f7a04e78322d4f9a0cd (diff) | |
parent | 28987bb1cd0e6864257ff0434508dddcddb22e98 (diff) |
Merge branch 'master' into decompile_debug
Diffstat (limited to 'src/battle/anim/bubble.c')
-rw-r--r-- | src/battle/anim/bubble.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/anim/bubble.c b/src/battle/anim/bubble.c index 403003ce3..1252c1315 100644 --- a/src/battle/anim/bubble.c +++ b/src/battle/anim/bubble.c @@ -43,7 +43,7 @@ void sub_80D31C8(struct Sprite* sprite) sprite->data[3] = sprite->pos1.y; sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); - obj_translate_based_on_private_1_2_3_4(sprite); + InitAnimSpriteTranslationDeltas(sprite); newSpriteId = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy); sprite->data[5] = newSpriteId; @@ -69,7 +69,7 @@ static void sub_80D32E8(struct Sprite *sprite) u16 index = gSprites[spriteId].data[3]; sprite->data[0] = 1; - sub_8078B5C(sprite); + TranslateAnimSpriteByDeltas(sprite); sprite->pos2.x += Sin(index / 256, gSprites[spriteId].data[0]); sprite->pos2.y += Cos(index / 256, gSprites[spriteId].data[1]); |