diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
| commit | 5a2d676e71b720e752ca8a624a5795b3b1d7eb6c (patch) | |
| tree | 6ef755064008dfae8ce2942dc2762670cdabe815 /src/post_battle_event_funcs.c | |
| parent | 5007d279fea5326b41b877703c74fcaa56223364 (diff) | |
| parent | 22931846d680de2bc585093678db3f5721aab891 (diff) | |
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
Diffstat (limited to 'src/post_battle_event_funcs.c')
| -rw-r--r-- | src/post_battle_event_funcs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c index 3cbf6ecd2..4fa5d1b21 100644 --- a/src/post_battle_event_funcs.c +++ b/src/post_battle_event_funcs.c @@ -9,6 +9,7 @@ #include "tv.h" #include "constants/heal_locations.h" #include "constants/flags.h" +#include "constants/tv.h" int GameClear(void) { @@ -76,9 +77,9 @@ int GameClear(void) } } - if (ribbonCounts[0].count > 4) + if (ribbonCounts[0].count > NUM_CUTIES_RIBBONS) { - sub_80EE4DC(&gPlayerParty[ribbonCounts[0].partyIndex], MON_DATA_CHAMPION_RIBBON); + TryPutSpotTheCutiesOnAir(&gPlayerParty[ribbonCounts[0].partyIndex], MON_DATA_CHAMPION_RIBBON); } } @@ -86,7 +87,7 @@ int GameClear(void) return 0; } -bool8 sp0C8_whiteout_maybe(void) +bool8 SetCB2WhiteOut(void) { SetMainCallback2(CB2_WhiteOut); return FALSE; |