diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-19 17:32:32 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-19 17:32:32 +0100 |
| commit | 5d5b4b853c3b79db2abc7f062105f4e1dcdfcea2 (patch) | |
| tree | 953062d60fe4180479ff83ec8ef9742f434637d5 /src/battle_anim_sound_tasks.c | |
| parent | 8a00334102f8dada18523bd3c2b57d0b68fbd6ce (diff) | |
| parent | 8f2ddf2997041bc813a32ac604002fcbb987e3a0 (diff) | |
Merge branch 'master' into frontier
Diffstat (limited to 'src/battle_anim_sound_tasks.c')
| -rw-r--r-- | src/battle_anim_sound_tasks.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c index b49a6d03f..07fb604b8 100644 --- a/src/battle_anim_sound_tasks.c +++ b/src/battle_anim_sound_tasks.c @@ -131,7 +131,7 @@ void sub_8158D8C(u8 taskId) if (IsContest()) { if (gBattleAnimArgs[0] == ANIM_ATTACKER) - species = gContestResources->field_18->unk0; + species = gContestResources->field_18->species; else DestroyAnimVisualTask(taskId); // UB: function should return upon destroying task. } @@ -177,7 +177,7 @@ void sub_8158E9C(u8 taskId) if (IsContest()) { if (gBattleAnimArgs[0] == ANIM_ATTACKER) - species = gContestResources->field_18->unk0; + species = gContestResources->field_18->species; else DestroyAnimVisualTask(taskId); // UB: function should return upon destroying task. } @@ -281,7 +281,7 @@ void sub_81590B8(u8 taskId) pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER); if (IsContest()) - species = gContestResources->field_18->unk0; + species = gContestResources->field_18->species; else species = gAnimBattlerSpecies[gBattleAnimAttacker]; |