summaryrefslogtreecommitdiff
path: root/src/battle_anim_effects_3.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-08-20 16:03:47 -0400
committerGitHub <noreply@github.com>2020-08-20 16:03:47 -0400
commit6c34effda93c67a37895e79b684b31b3cb9a2a88 (patch)
treeb7373ea86cb3249a39b92b2aa417023b330ce92c /src/battle_anim_effects_3.c
parentfadb72696fafe58d210e6d5af480067f08e9fd04 (diff)
parentfa29ff98a342f4f434b96d4e04f47e25ca865512 (diff)
Merge pull request #1138 from GriffinRichards/doc-contest
Document contest
Diffstat (limited to 'src/battle_anim_effects_3.c')
-rwxr-xr-xsrc/battle_anim_effects_3.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index fd68bbd37..afdc90049 100755
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -2297,7 +2297,7 @@ void AnimTask_TransformMon(u8 taskId)
LoadBgTiles(1, animBg.bgTiles, 0x800, animBg.tilesOffset);
if (IsContest())
{
- if (IsSpeciesNotUnown(gContestResources->field_18->species) != IsSpeciesNotUnown(gContestResources->field_18->unk2))
+ if (IsSpeciesNotUnown(gContestResources->moveAnim->species) != IsSpeciesNotUnown(gContestResources->moveAnim->targetSpecies))
{
bgTilemap = (u16 *)animBg.bgTilemap;
for (i = 0; i < 8; i++)
@@ -2319,7 +2319,7 @@ void AnimTask_TransformMon(u8 taskId)
}
}
- if (IsSpeciesNotUnown(gContestResources->field_18->unk2))
+ if (IsSpeciesNotUnown(gContestResources->moveAnim->targetSpecies))
gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].affineAnims = gUnknown_082FF6C0;
else
gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].affineAnims = gUnknown_082FF694;
@@ -3196,10 +3196,10 @@ void AnimTask_RolePlaySilhouette(u8 taskId)
GetAnimBattlerSpriteId(ANIM_ATTACKER);
if (IsContest())
{
- isBackPic = 1;
- personality = gContestResources->field_18->unk10;
- otId = gContestResources->field_18->unkC;
- species = gContestResources->field_18->unk2;
+ isBackPic = TRUE;
+ personality = gContestResources->moveAnim->targetPersonality;
+ otId = gContestResources->moveAnim->otId;
+ species = gContestResources->moveAnim->targetSpecies;
xOffset = 20;
priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker);
}
@@ -5031,9 +5031,9 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
case 1:
if (IsContest())
{
- personality = gContestResources->field_18->unk8;
- otId = gContestResources->field_18->unkC;
- species = gContestResources->field_18->species;
+ personality = gContestResources->moveAnim->personality;
+ otId = gContestResources->moveAnim->otId;
+ species = gContestResources->moveAnim->species;
subpriority = GetBattlerSpriteSubpriority(gBattleAnimAttacker);
isBackPic = 0;
x = -32;