diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-09-04 19:44:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 19:44:33 -0400 |
| commit | 135ed6a1623ecda72ede79a12d2a8483231da95f (patch) | |
| tree | 66ee20f129d3b729b9ad557745665210f02825c8 /src/battle_controller_link_partner.c | |
| parent | 8324a355176b2edbc3ad4ab8aec03f3fc7eb0a8c (diff) | |
| parent | afb3472282c52746aaac52d1e361d0c9bdf31de3 (diff) | |
Merge pull request #1163 from GriffinRichards/doc-animthrow
Minor battle_anim_throw cleanup
Diffstat (limited to 'src/battle_controller_link_partner.c')
| -rw-r--r-- | src/battle_controller_link_partner.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 63aa6eaea..af81b06d5 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -359,10 +359,10 @@ static void sub_814B554(void) static void sub_814B5A8(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1) + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim) { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); @@ -380,7 +380,7 @@ static void sub_814B5A8(void) static void sub_814B69C(void) { - if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 + if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive) { TryShinyAnimation(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]); |