diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 05:43:06 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 05:43:06 -0500 |
| commit | ef67f2d33b45348d76d722f250cdbcc8485be264 (patch) | |
| tree | 2fb5d08a962dea3329bcd876ea2d237cf8c6d3c1 /src/battle_controller_player.c | |
| parent | 68cdd7b1cb5a293b3de42185fe17d85b4067b3ad (diff) | |
Merge master into ObjEvent rename and prune accidental inclusions
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 0bd1ea363..161df3b82 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -3093,7 +3093,7 @@ static void PlayerHandleCmd55(void) { sub_81851A8(&gBattleBufferA[gActiveBattler][4]); gBattleOutcome = gBattleBufferA[gActiveBattler][1]; - gSaveBlock2Ptr->frontier.field_CA9_b = gBattleBufferA[gActiveBattler][2]; + gSaveBlock2Ptr->frontier.disableRecordBattle = gBattleBufferA[gActiveBattler][2]; FadeOutMapMusic(5); BeginFastPaletteFade(3); PlayerBufferExecCompleted(); |