diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-19 00:07:56 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-19 00:07:56 -0500 |
| commit | d6d315d8179347ac21634034fdc9ed08796d7eb4 (patch) | |
| tree | a09a4021a7f73f75d9839186a802c335156dd71f /src/battle_2.c | |
| parent | a5498843faacb5ec40fd48771573c998198f16af (diff) | |
| parent | 5dc8beb034e70b4e1eba61cca4009d5e06356605 (diff) | |
Merge branch 'master' into link
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 ffec02d17..3692e618f 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -143,7 +143,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; @@ -2804,7 +2803,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; @@ -3921,7 +3920,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 |