diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 11:40:17 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 11:40:17 -0600 |
| commit | 9afe7a896e7bf9257d3c73c8fb592f0b9243d520 (patch) | |
| tree | 490f5c185053db27730eefe1f6764b406d4adfb2 /src/battle_main.c | |
| parent | 43a8534fced2c4327acdd8dc9690f5bc6751e2db (diff) | |
| parent | ccc5d27fcb8647225656b06a60a7d79ad0fa299f (diff) | |
Merge remote-tracking branch 'pret/master' into render_text
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 9f1ea3c01..e08e12194 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3027,7 +3027,7 @@ static void BattleStartClearSetData(void) if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && gSaveBlock2Ptr->optionsBattleSceneOff == TRUE) gHitMarker |= HITMARKER_NO_ANIMATIONS; } - else if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) && GetBattleStyleInRecordedBattle()) + else if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) && GetBattleSceneInRecordedBattle()) gHitMarker |= HITMARKER_NO_ANIMATIONS; gBattleScripting.battleStyle = gSaveBlock2Ptr->optionsBattleStyle; |