diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-06-13 13:40:57 -0400 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-06-13 13:40:57 -0400 |
| commit | e2eb17dcbd8f9021b7e9fc805c8c03fac6b3b255 (patch) | |
| tree | 5705aaca2ef0713f55ca22a4a814161e26aa4582 /src/battle_anim_status_effects.c | |
| parent | 1ce33843b645e3139bd414c2d048c628967f4e07 (diff) | |
| parent | f75c048434d5dc7538e628206c29a0730404db81 (diff) | |
Merge branch 'master' of https://github.com/pret/pokefirered
Diffstat (limited to 'src/battle_anim_status_effects.c')
| -rw-r--r-- | src/battle_anim_status_effects.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_anim_status_effects.c b/src/battle_anim_status_effects.c index 4eb475a5c..23dc0461e 100644 --- a/src/battle_anim_status_effects.c +++ b/src/battle_anim_status_effects.c @@ -68,7 +68,7 @@ static const union AnimCmd *const sSpriteAnimTable_83BF430[] = sUnknown_83BF428 }; -const struct SpriteTemplate gSpriteTemplate_83BF434 = +const struct SpriteTemplate gWeatherBallUpSpriteTemplate = { .tileTag = ANIM_TAG_WEATHER_BALL, .paletteTag = ANIM_TAG_WEATHER_BALL, @@ -79,7 +79,7 @@ const struct SpriteTemplate gSpriteTemplate_83BF434 = .callback = sub_807729C, }; -const struct SpriteTemplate gSpriteTemplate_83BF44C = +const struct SpriteTemplate gWeatherBallNormalDownSpriteTemplate = { .tileTag = ANIM_TAG_WEATHER_BALL, .paletteTag = ANIM_TAG_WEATHER_BALL, @@ -87,7 +87,7 @@ const struct SpriteTemplate gSpriteTemplate_83BF44C = .anims = sSpriteAnimTable_83BF430, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8077350, + .callback = AnimWeatherBallDown, }; static const union AnimCmd sUnknown_83BF464[] = @@ -343,7 +343,7 @@ static void sub_8078380(struct Sprite *sprite) } } -void sub_80783FC(u8 taskId) +void AnimTask_FrozenIceCube(u8 taskId) { s16 x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) - 32; s16 y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) - 36; |