diff options
| author | garak <garakmon@gmail.com> | 2018-10-19 16:05:14 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-10-19 16:05:14 -0400 |
| commit | 38fcc46abb36df72512f4b532d1379dab1c13af6 (patch) | |
| tree | df44258d7b5a65d2a75a146c7c01b6c683b023f9 /src/battle_anim_sound_tasks.c | |
| parent | 901f3ff55715ec6bdeda5c711e7e73b4c38ab55a (diff) | |
| parent | 95d8815721321f08714b97c59a97de3a59f1e0c7 (diff) | |
Merge remote-tracking branch 'upstream/master' into pan-constants
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 fd1afb7b8..7b8eb4ed7 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->field_0; + species = gContestResources->field_18->unk0; 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->field_0; + species = gContestResources->field_18->unk0; 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->field_0; + species = gContestResources->field_18->unk0; else species = gAnimBattlerSpecies[gBattleAnimAttacker]; |