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_3.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_3.c')
| -rwxr-xr-x | src/battle_anim_effects_3.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index 4981a3d2c..3da849412 100755 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -24,7 +24,7 @@ #include "constants/species.h" #include "constants/weather.h" -extern const struct SpriteTemplate gUnknown_08593114; +extern const struct SpriteTemplate gThoughtBubbleSpriteTemplate; void sub_815A0D4(struct Sprite *); void sub_815A1B0(struct Sprite *); @@ -144,7 +144,7 @@ const struct SpriteTemplate gUnknown_085CE020 = .anims = gUnknown_085CE01C, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A77C8, + .callback = AnimSparklingParticle, }; const struct SpriteTemplate gUnknown_085CE038 = @@ -190,7 +190,7 @@ const struct SpriteTemplate gUnknown_085CE07C = .anims = gUnknown_085CE078, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A77C8, + .callback = AnimSparklingParticle, }; const struct SpriteTemplate gUnknown_085CE094 = @@ -502,7 +502,7 @@ const struct SpriteTemplate gUnknown_085CE338 = .anims = gUnknown_085CE334, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A77C8, + .callback = AnimSparklingParticle, }; const union AffineAnimCmd gUnknown_085CE350[] = @@ -1929,7 +1929,7 @@ static void sub_815B054(u8 taskId) } y = task->data[3] + task->data[5]; - spriteId = CreateSprite(&gUnknown_08593114, x, y, 6 - task->data[1]); + spriteId = CreateSprite(&gThoughtBubbleSpriteTemplate, x, y, 6 - task->data[1]); PlaySE12WithPanning(SE_W118, BattleAnimAdjustPanning(-64)); if (spriteId != MAX_SPRITES) @@ -1982,7 +1982,7 @@ static void sub_815B054(u8 taskId) case 4: for (i = 0, j = 0; i < MAX_SPRITES; i++) { - if (gSprites[i].template == &gUnknown_08593114) + if (gSprites[i].template == &gThoughtBubbleSpriteTemplate) { gSprites[i].data[0] = taskId; gSprites[i].data[1] = 6; |