diff options
| author | huderlem <huderlem@gmail.com> | 2019-10-19 07:41:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-19 07:41:06 -0500 |
| commit | 8b1df92aca6c9d0eb3bcd932be7795eda879c2a0 (patch) | |
| tree | ea3c4310109de5570adb2372836222f2904529f7 /src/battle_anim_effects_2.c | |
| parent | 7323b5b8481704a00d5dcefe54af1300b2ed04c1 (diff) | |
| parent | 19fb0fb2205cf719daeb705098c685e2062d3c83 (diff) | |
Merge pull request #840 from Sewef/patch-2
battle_anim_affects_1.c labels
Diffstat (limited to 'src/battle_anim_effects_2.c')
| -rwxr-xr-x | src/battle_anim_effects_2.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index 8b877bba4..d0f161f5b 100755 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -195,7 +195,7 @@ const struct SpriteTemplate gUnknown_08593304 = .anims = gUnknown_085932E4, .images = NULL, .affineAnims = gUnknown_08593300, - .callback = sub_80A77C8, + .callback = AnimSparklingParticle, }; const union AnimCmd gUnknown_0859331C[] = @@ -651,7 +651,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_859371C = .anims = gUnknown_08593718, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A77C8, + .callback = AnimSparklingParticle, }; const union AffineAnimCmd gUnknown_08593734[] = @@ -738,7 +738,7 @@ const struct SpriteTemplate gUnknown_0859381C = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gUnknown_08593810, - .callback = sub_80A77C8, + .callback = AnimSparklingParticle, }; //* const union AffineAnimCmd gUnknown_08593834[] = @@ -761,7 +761,7 @@ const struct SpriteTemplate gUnknown_08593850 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gUnknown_0859384C, - .callback = sub_80A77C8, + .callback = AnimSparklingParticle, }; const struct SpriteTemplate gUnknown_08593868 = @@ -868,7 +868,7 @@ const struct SpriteTemplate gUnknown_08593938 = .anims = gUnknown_08593934, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A77C8, + .callback = AnimSparklingParticle, }; const u16 gUnknown_08593950[] = @@ -1199,13 +1199,13 @@ const union AffineAnimCmd *const gUnknown_08593C00[] = gUnknown_08593BF0, }; -extern const union AnimCmd *const gUnknown_08592FCC[]; +extern const union AnimCmd *const gMusicNotesAnimTable[]; const struct SpriteTemplate gUnknown_08593C0C = { .tileTag = ANIM_TAG_MUSIC_NOTES_2, .paletteTag = ANIM_TAG_MUSIC_NOTES_2, .oam = &gOamData_AffineNormal_ObjNormal_16x16, - .anims = gUnknown_08592FCC, + .anims = gMusicNotesAnimTable, .images = NULL, .affineAnims = gUnknown_08593C00, .callback = sub_8106F60, @@ -1216,7 +1216,7 @@ const struct SpriteTemplate gUnknown_08593C24 = .tileTag = ANIM_TAG_MUSIC_NOTES_2, .paletteTag = ANIM_TAG_MUSIC_NOTES_2, .oam = &gOamData_AffineNormal_ObjNormal_16x16, - .anims = gUnknown_08592FCC, + .anims = gMusicNotesAnimTable, .images = NULL, .affineAnims = gUnknown_08593C00, .callback = sub_8106F00, @@ -1273,7 +1273,7 @@ void sub_8103498(struct Sprite *sprite) else battler = gBattleAnimTarget; - sub_810310C(battler, sprite); + SetSpriteNextToMonHead(battler, sprite); sprite->data[0] = 0; sprite->data[1] = 0; sprite->callback = sub_81034D8; @@ -2554,7 +2554,7 @@ void sub_81051C4(struct Sprite *sprite) gBattleAnimArgs[0] = sp0 - r4; } - sprite->callback = sub_80A77C8; + sprite->callback = AnimSparklingParticle; sprite->callback(sprite); } @@ -2661,7 +2661,7 @@ void sub_81054E8(struct Sprite *sprite) } StartSpriteAffineAnim(sprite, 1); - sprite->callback = sub_80A77C8; + sprite->callback = AnimSparklingParticle; sprite->callback(sprite); } |