diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-01-21 19:26:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-21 19:26:14 -0500 |
| commit | bef2668d8bf92f8d42e2d56b06260380d7175d93 (patch) | |
| tree | 688ee810f6df7c77f53f21eb23fcc059fb4f59d7 /src/trainer_card.c | |
| parent | 7fb97f9e2579b5b61c8c141d38c43ff07a24a393 (diff) | |
| parent | 08a18d6e32d5e9d02c42eed46ef7356c3ad41df7 (diff) | |
Merge pull request #481 from GriffinRichards/sync-classes
Sync/update trainer classes
Diffstat (limited to 'src/trainer_card.c')
| -rw-r--r-- | src/trainer_card.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/trainer_card.c b/src/trainer_card.c index ca4dbb314..2efd575e4 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -18,7 +18,7 @@ #include "new_menu_helpers.h" #include "constants/songs.h" #include "constants/game_stat.h" -#include "constants/facility_trainer_classes.h" +#include "constants/trainers.h" // Trainer Card Strings enum @@ -308,25 +308,25 @@ static const u8 sLinkTrainerPicFacilityClasses[GENDER_COUNT][NUM_LINK_TRAINER_CA { [MALE] = { - FACILITY_CLASS_COOLTRAINER_3, - FACILITY_CLASS_BLACK_BELT_2, - FACILITY_CLASS_CAMPER_2, - FACILITY_CLASS_YOUNGSTER_2, - FACILITY_CLASS_PSYCHIC_3, - FACILITY_CLASS_BUG_CATCHER_2, + FACILITY_CLASS_COOLTRAINER_M, + FACILITY_CLASS_BLACK_BELT, + FACILITY_CLASS_CAMPER, + FACILITY_CLASS_YOUNGSTER, + FACILITY_CLASS_PSYCHIC_M, + FACILITY_CLASS_BUG_CATCHER, FACILITY_CLASS_TAMER, FACILITY_CLASS_JUGGLER }, [FEMALE] = { - FACILITY_CLASS_COOLTRAINER_4, + FACILITY_CLASS_COOLTRAINER_F, FACILITY_CLASS_CHANNELER, - FACILITY_CLASS_PICNICKER_2, - FACILITY_CLASS_LASS_2, - FACILITY_CLASS_PSYCHIC_2, + FACILITY_CLASS_PICNICKER, + FACILITY_CLASS_LASS, + FACILITY_CLASS_RS_PSYCHIC_F, FACILITY_CLASS_BATTLE_GIRL, - FACILITY_CLASS_PKMN_BREEDER_2, - FACILITY_CLASS_BEAUTY_2 + FACILITY_CLASS_RS_PKMN_BREEDER_F, + FACILITY_CLASS_BEAUTY } }; |