Merge branch 'master' into doc-dome

2020-01-08 01:15:36 -05:00
parent 017fa294b5 8b1595ebc3
commit e5df61e362
164 changed files with 6060 additions and 5867 deletions
@@ -89,7 +89,7 @@ static void InitPalaceChallenge(void)
    gSaveBlock2Ptr->frontier.challengeStatus = 0;
    gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0;
    gSaveBlock2Ptr->frontier.challengePaused = FALSE;
-    gSaveBlock2Ptr->frontier.field_CA9_b = 0;
+    gSaveBlock2Ptr->frontier.disableRecordBattle = FALSE;
    if (!(gSaveBlock2Ptr->frontier.winStreakActiveFlags & sWinStreakFlags[battleMode][lvlMode]))
        gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode] = 0;