From bf062f5547dd77d73617e99df58c998f5806252e Mon Sep 17 00:00:00 2001 From: Kurausukun Date: Sun, 14 Feb 2021 03:51:38 -0500 Subject: [LEAK-INFORMED] fix battle dome fakematching yes they actually fucking did this --- src/battle_dome.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/battle_dome.c b/src/battle_dome.c index 780721768..a9065d6bc 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -5774,6 +5774,8 @@ static void InitRandomTourneyTreeResults(void) int monTypesBits; int trainerId; int monId; + int zero1; + int zero2; u8 lvlMode; u16 *statSums; int *statValues; @@ -5789,12 +5791,11 @@ static void InitRandomTourneyTreeResults(void) statValues = AllocZeroed(sizeof(int) * NUM_STATS); lvlMode = gSaveBlock2Ptr->frontier.lvlMode; gSaveBlock2Ptr->frontier.lvlMode = FRONTIER_LVL_50; - // This one, I'd like to call a 'C fakematching'. - { - u8 one; - gSaveBlock2Ptr->frontier.domeLvlMode = (one = 1); - gSaveBlock2Ptr->frontier.domeBattleMode = one; - } + zero1 = 0; + zero2 = 0; + + gSaveBlock2Ptr->frontier.domeLvlMode = tmp1 + 1; + gSaveBlock2Ptr->frontier.domeBattleMode = tmp2 + 1; for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) { -- cgit v1.2.3 From 6b5db889dd7cb7d32c2fbe12e81a52fd33455088 Mon Sep 17 00:00:00 2001 From: Kurausukun Date: Sun, 14 Feb 2021 03:57:50 -0500 Subject: [LEAK-INFORMED] remove fakematching comment it is in fact not a fakematch --- src/contest_painting.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/contest_painting.c b/src/contest_painting.c index 1602eb94f..94cb02dfe 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -165,7 +165,6 @@ const u16 gUnknown_085B0838[] = {RGB(0, 0, 0), RGB(0, 0, 0)}; void SetContestWinnerForPainting(int contestWinnerId) { - // probably fakematching u8 *ptr1 = &gUnknown_02039F5D; u8 *ptr2 = &gUnknown_02039F5C; gCurContestWinner = gSaveBlock1Ptr->contestWinners[contestWinnerId - 1]; -- cgit v1.2.3 From 7c4116b32adda7452b8a5fa49ca04fb5f61c02aa Mon Sep 17 00:00:00 2001 From: Kurausukun Date: Sun, 14 Feb 2021 04:01:20 -0500 Subject: fix indentation --- src/contest_painting.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/contest_painting.c b/src/contest_painting.c index 94cb02dfe..fecca1226 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -167,9 +167,9 @@ void SetContestWinnerForPainting(int contestWinnerId) { u8 *ptr1 = &gUnknown_02039F5D; u8 *ptr2 = &gUnknown_02039F5C; - gCurContestWinner = gSaveBlock1Ptr->contestWinners[contestWinnerId - 1]; - *ptr1 = contestWinnerId - 1; - *ptr2 = FALSE; + gCurContestWinner = gSaveBlock1Ptr->contestWinners[contestWinnerId - 1]; + *ptr1 = contestWinnerId - 1; + *ptr2 = FALSE; } void CB2_ContestPainting(void) -- cgit v1.2.3 From 10e430ae1596da8c34a6f697d3ee7854dd7e868f Mon Sep 17 00:00:00 2001 From: Kurausukun Date: Sun, 14 Feb 2021 04:03:53 -0500 Subject: oops --- src/battle_dome.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/battle_dome.c b/src/battle_dome.c index a9065d6bc..cce3aaccd 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -5794,8 +5794,8 @@ static void InitRandomTourneyTreeResults(void) zero1 = 0; zero2 = 0; - gSaveBlock2Ptr->frontier.domeLvlMode = tmp1 + 1; - gSaveBlock2Ptr->frontier.domeBattleMode = tmp2 + 1; + gSaveBlock2Ptr->frontier.domeLvlMode = zero1 + 1; + gSaveBlock2Ptr->frontier.domeBattleMode = zero2 + 1; for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) { -- cgit v1.2.3