diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-06 10:06:21 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-06 10:06:21 -0600 |
| commit | ccc5d27fcb8647225656b06a60a7d79ad0fa299f (patch) | |
| tree | e27f82eb3379f76720675dff72e1d89f63458799 /src/battle_main.c | |
| parent | 9adbb5d8719db5e60f0051b5a854deec09ae5860 (diff) | |
| parent | 258ec3162f981932a83d08e404f1944a12b3f952 (diff) | |
Merge pull request #376 from DizzyEggg/battle_frontier_2
Decompile part of battle_frontier_2
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; |