diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-01-09 15:49:02 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2022-01-10 13:48:08 -0500 |
| commit | 08a18d6e32d5e9d02c42eed46ef7356c3ad41df7 (patch) | |
| tree | 44d3ad18d681d6e3328c411cf8fc7e23cbd9a2f6 /src/quest_log_events.c | |
| parent | d0c79e4e479d633b65cb5a821de882416946a975 (diff) | |
Sync/update trainer classes
Diffstat (limited to 'src/quest_log_events.c')
| -rw-r--r-- | src/quest_log_events.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/quest_log_events.c b/src/quest_log_events.c index 8fe66e183..e805b5f2e 100644 --- a/src/quest_log_events.c +++ b/src/quest_log_events.c @@ -14,7 +14,7 @@ #include "region_map.h" #include "strings.h" #include "constants/maps.h" -#include "constants/trainer_classes.h" +#include "constants/trainers.h" #include "constants/items.h" #include "constants/region_map_sections.h" @@ -338,10 +338,10 @@ static bool8 ShouldRegisterEvent_HandleBeatStoryTrainer(u16 eventId, const u16 * if (eventId == QL_EVENT_DEFEATED_TRAINER) { u8 trainerClass = gTrainers[*eventData].trainerClass; - if ( trainerClass == CLASS_RIVAL - || trainerClass == CLASS_RIVAL_2 - || trainerClass == CLASS_CHAMPION_2 - || trainerClass == CLASS_BOSS) + if (trainerClass == TRAINER_CLASS_RIVAL_EARLY + || trainerClass == TRAINER_CLASS_RIVAL_LATE + || trainerClass == TRAINER_CLASS_CHAMPION + || trainerClass == TRAINER_CLASS_BOSS) return FALSE; return TRUE; } @@ -1680,9 +1680,9 @@ static const u16 *BufferQuestLogText_DefeatedTrainer(const u16 *eventData) GetMapNameGeneric(gStringVar1, r6[0]); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); - if (gTrainers[r5[2]].trainerClass == CLASS_RIVAL - || gTrainers[r5[2]].trainerClass == CLASS_RIVAL_2 - || gTrainers[r5[2]].trainerClass == CLASS_CHAMPION_2) + if (gTrainers[r5[2]].trainerClass == TRAINER_CLASS_RIVAL_EARLY + || gTrainers[r5[2]].trainerClass == TRAINER_CLASS_RIVAL_LATE + || gTrainers[r5[2]].trainerClass == TRAINER_CLASS_CHAMPION) DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, GetExpandedPlaceholder(PLACEHOLDER_ID_RIVAL)); else DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gTrainers[r5[2]].trainerName); |