summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-10-21 16:24:43 -0500
committerDiegoisawesome <diego@domoreaweso.me>2018-10-21 16:24:43 -0500
commit32d2640dc728055923b0e6120277093fcae5e9c3 (patch)
treee665693eaebe86781a71f45cb418793ce9e758cb /src
parent97bbb326b8c94e0fc90bceb4e5dea1b80f86822f (diff)
Match GameClear (thanks Egg)
Diffstat (limited to 'src')
-rw-r--r--src/post_battle_event_funcs.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c
index 8df702570..f15396102 100644
--- a/src/post_battle_event_funcs.c
+++ b/src/post_battle_event_funcs.c
@@ -55,8 +55,8 @@ int GameClear(void)
&& !GetMonData(mon, MON_DATA_SANITY_BIT3)
&& !GetMonData(mon, MON_DATA_CHAMPION_RIBBON))
{
- val = TRUE;
- SetMonData(mon, MON_DATA_CHAMPION_RIBBON, &val);
+ u8 val[1] = {TRUE};
+ SetMonData(mon, MON_DATA_CHAMPION_RIBBON, val);
ribbonCounts[i].count = GetRibbonCount(mon);
ribbonGet = TRUE;
}
@@ -69,7 +69,7 @@ int GameClear(void)
for (i = 1; i < 6; i++)
{
- if (ribbonCounts[0].count > ribbonCounts[i].count)
+ if (ribbonCounts[i].count > ribbonCounts[0].count)
{
struct RibbonCounter prevBest = ribbonCounts[0];
ribbonCounts[0] = ribbonCounts[i];
@@ -86,3 +86,9 @@ int GameClear(void)
SetMainCallback2(CB2_DoHallOfFameScreen);
return 0;
}
+
+bool8 sp0C8_whiteout_maybe(void)
+{
+ SetMainCallback2(CB2_WhiteOut);
+ return FALSE;
+}