Merge branch 'master' into doc-partymenu

2019-10-31 14:22:51 -04:00
parent b33db9b96c 67ce8c9cc2
commit b1ea2592c3
219 changed files with 7959 additions and 7663 deletions
--- a/src/frontier_util.c
+++ b/src/frontier_util.c
@@ -1889,11 +1889,11 @@ static void sub_81A3B64(void)

    points = gSaveBlock2Ptr->frontier.field_EBA;
    points += gUnknown_086118B4[challengeNum][facility][battleMode];
-    sub_80EED60(gUnknown_086118B4[challengeNum][facility][battleMode]);
+    IncrementDailyBattlePoints(gUnknown_086118B4[challengeNum][facility][battleMode]);
    if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN)
    {
        points += 10;
-        sub_80EED60(10);
+        IncrementDailyBattlePoints(10);
    }
    if (points > 0xFFFF)
        points = 0xFFFF;