diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-04-02 18:29:51 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-04-02 18:29:51 -0500 |
| commit | 181baf9fe561e893023f71a5793a8b1ac6d644d6 (patch) | |
| tree | 8ac4906fc6f70fb000fc3fbcd73a325dc6114d20 /src/battle_anim_effects_2.c | |
| parent | 1241700b204b9f450221299c6e837c0f522f60b2 (diff) | |
| parent | d8c9f1b30fb92289e7aa4d44dfcf1b2120bea8d6 (diff) | |
Merge remote-tracking branch 'upstream/master' into misc_docs
# Conflicts:
# src/field_weather_effect.c
Diffstat (limited to 'src/battle_anim_effects_2.c')
| -rwxr-xr-x | src/battle_anim_effects_2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index 80b3258b4..e3295acb8 100755 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -889,7 +889,7 @@ const struct SpriteTemplate gUnknown_08593958 = .callback = sub_8105DE8, }; -const struct SpriteTemplate gUnknown_08593970 = +const struct SpriteTemplate gMagentaHeartSpriteTemplate = { .tileTag = ANIM_TAG_MAGENTA_HEART, .paletteTag = ANIM_TAG_MAGENTA_HEART, @@ -3286,7 +3286,7 @@ static void sub_810627C(struct Sprite *sprite) } } -void sub_81062E8(u8 taskId) +void AnimTask_HeartsBackground(u8 taskId) { struct BattleAnimBgData animBg; |