diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-13 19:25:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-13 19:25:41 -0500 |
| commit | ff7e11c0b0b34fce0891b7bc1731971b2e0bfbc4 (patch) | |
| tree | daa010cdfdbf3fbf8868ac72d88fc40e2f332e28 /src/battle_tower.c | |
| parent | 7455bd9b9a6c02e5ff567400fde3ea6315be5837 (diff) | |
| parent | ef8370566f14c22b9927db09b8ff69a98049c796 (diff) | |
Merge branch 'master' into doc-scriptclean
Diffstat (limited to 'src/battle_tower.c')
| -rw-r--r-- | src/battle_tower.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/battle_tower.c b/src/battle_tower.c index 7b9842c48..a6e816b7d 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -30,6 +30,7 @@ #include "constants/moves.h" #include "constants/species.h" #include "constants/easy_chat.h" +#include "constants/tv.h" extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer[]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer[]; @@ -3026,9 +3027,9 @@ static void AwardBattleTowerRibbons(void) ribbons[i] = prevBest; } } - if (ribbons[0].count > 4) + if (ribbons[0].count > NUM_CUTIES_RIBBONS) { - sub_80EE4DC(&gSaveBlock1Ptr->playerParty[ribbons[0].partyIndex], ribbonType); + TryPutSpotTheCutiesOnAir(&gSaveBlock1Ptr->playerParty[ribbons[0].partyIndex], ribbonType); } } } |