diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-28 16:07:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 16:07:35 -0400 |
| commit | e9b734c1efd9ad8a079d9ca7c9ed65cff801be1c (patch) | |
| tree | 48a735f5fc6b6dca208d8f8cdbdacfa6f54a5f88 /src/battle_gfx_sfx_util.c | |
| parent | 5dfbdca6c7df39c8064a82aa1316d6380ccb0d85 (diff) | |
| parent | eb4bcc89cd149ae1a5e43f2aef0dddf5a69bb23c (diff) | |
Merge branch 'master' into doc-blender
Diffstat (limited to 'src/battle_gfx_sfx_util.c')
| -rw-r--r-- | src/battle_gfx_sfx_util.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 50a5f8ad5..1638e2f57 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -1014,15 +1014,12 @@ void BattleLoadSubstituteOrMonSpriteGfx(u8 battlerId, bool8 loadMonSprite) palOffset = (battlerId * 16) + 0x100; LoadCompressedPalette(gSubstituteDollPal, palOffset, 32); } - else + else if (!IsContest()) { - if (!IsContest()) - { - if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) - BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[battlerId]], battlerId); - else - BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[battlerId]], battlerId); - } + if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) + BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[battlerId]], battlerId); + else + BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[battlerId]], battlerId); } } |