diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-19 22:58:13 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-19 22:58:13 +0100 |
| commit | ad3a97e178b93c38b1d43f8120449b042ac23a0e (patch) | |
| tree | 1c0e790d275ae85cc82360406fd2e655ae262d1f /src/battle_2.c | |
| parent | a3b5af17eabb255e983e61c6306e30f27de82524 (diff) | |
| parent | 5dc8beb034e70b4e1eba61cca4009d5e06356605 (diff) | |
berry blender merge conflicts
Diffstat (limited to 'src/battle_2.c')
| -rw-r--r-- | src/battle_2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/battle_2.c b/src/battle_2.c index 798fabf4b..2be6f9d77 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -142,7 +142,6 @@ extern u8 gLastUsedAbility; extern u8 gUnknown_0203CF00[]; extern const u8* gBattlescriptPtrsForSelection[BATTLE_BANKS_COUNT]; extern const u8* gBattlescriptCurrInstr; -extern u32 gBattlePalaceMoveSelectionRngValue; extern u8 gActionsByTurnOrder[BATTLE_BANKS_COUNT]; extern u8 gCurrentTurnActionNumber; extern u16 gDynamicBasePower; @@ -2803,7 +2802,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)) && sub_8185FB8()) + else if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) && GetBattleStyleInRecordedBattle()) gHitMarker |= HITMARKER_NO_ANIMATIONS; gBattleScripting.battleStyle = gSaveBlock2Ptr->optionsBattleStyle; @@ -3920,7 +3919,7 @@ static void HandleTurnActionSelectionState(void) switch (gBattleCommunication[gActiveBank]) { case STATE_TURN_START_RECORD: // recorded battle related on start of every turn - sub_8185FD0(); + RecordedBattle_CopyBankMoves(); gBattleCommunication[gActiveBank] = STATE_BEFORE_ACTION_CHOSEN; break; case STATE_BEFORE_ACTION_CHOSEN: // choose an action |