Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add different Poke Balls to more Trainers (#8467)

Browse Source
This commit is contained in:
amiosi 2025-12-18 06:37:32 -05:00 committed by GitHub
parent e02fa053f6
commit 5cb1f2ff1a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/battle_main.c
View File

@ -305,7 +305,7 @@ const struct TrainerClass gTrainerClasses[TRAINER_CLASS_COUNT] =
{
[TRAINER_CLASS_PKMN_TRAINER_1] = { _("{PKMN} TRAINER") },
[TRAINER_CLASS_PKMN_TRAINER_2] = { _("{PKMN} TRAINER") },
[TRAINER_CLASS_HIKER] = { _("HIKER"), 10 },
[TRAINER_CLASS_HIKER] = { _("HIKER"), 10, B_TRAINER_CLASS_POKE_BALLS >= GEN_8 ? BALL_ULTRA : BALL_POKE },
[TRAINER_CLASS_TEAM_AQUA] = { _("TEAM AQUA") },
[TRAINER_CLASS_PKMN_BREEDER] = { _("{PKMN} BREEDER"), 10, B_TRAINER_CLASS_POKE_BALLS >= GEN_8 ? BALL_HEAL : BALL_FRIEND },
[TRAINER_CLASS_COOLTRAINER] = { _("COOLTRAINER"), 12, BALL_ULTRA },
@ -324,7 +324,7 @@ const struct TrainerClass gTrainerClasses[TRAINER_CLASS_COUNT] =
[TRAINER_CLASS_TUBER_F] = { _("TUBER"), 1 },
[TRAINER_CLASS_TUBER_M] = { _("TUBER"), 1 },
[TRAINER_CLASS_LADY] = { _("LADY"), 50 },
[TRAINER_CLASS_BEAUTY] = { _("BEAUTY"), 20 },
[TRAINER_CLASS_BEAUTY] = { _("BEAUTY"), 20, B_TRAINER_CLASS_POKE_BALLS >= GEN_8 ? BALL_GREAT : BALL_POKE },
[TRAINER_CLASS_RICH_BOY] = { _("RICH BOY"), 50 },
[TRAINER_CLASS_POKEMANIAC] = { _("POKéMANIAC"), 15 },
[TRAINER_CLASS_GUITARIST] = { _("GUITARIST"), 8 },
@ -335,13 +335,13 @@ const struct TrainerClass gTrainerClasses[TRAINER_CLASS_COUNT] =
[TRAINER_CLASS_PSYCHIC] = { _("PSYCHIC"), 6 },
[TRAINER_CLASS_GENTLEMAN] = { _("GENTLEMAN"), 20, BALL_LUXURY },
[TRAINER_CLASS_ELITE_FOUR] = { _("ELITE FOUR"), 25, BALL_ULTRA },
[TRAINER_CLASS_LEADER] = { _("LEADER"), 25 },
[TRAINER_CLASS_LEADER] = { _("LEADER"), 25, B_TRAINER_CLASS_POKE_BALLS >= GEN_8 ? BALL_ULTRA : BALL_POKE },
[TRAINER_CLASS_SCHOOL_KID] = { _("SCHOOL KID") },
[TRAINER_CLASS_SR_AND_JR] = { _("SR. AND JR."), 4 },
[TRAINER_CLASS_WINSTRATE] = { _("WINSTRATE"), 10 },
[TRAINER_CLASS_POKEFAN] = { _("POKéFAN"), 20 },
[TRAINER_CLASS_YOUNGSTER] = { _("YOUNGSTER"), 4 },
[TRAINER_CLASS_CHAMPION] = { _("CHAMPION"), 50 },
[TRAINER_CLASS_CHAMPION] = { _("CHAMPION"), 50, BALL_ULTRA },
[TRAINER_CLASS_FISHERMAN] = { _("FISHERMAN"), 10, B_TRAINER_CLASS_POKE_BALLS >= GEN_8 ? BALL_DIVE : BALL_LURE },
[TRAINER_CLASS_TRIATHLETE] = { _("TRIATHLETE"), 10 },
[TRAINER_CLASS_DRAGON_TAMER] = { _("DRAGON TAMER"), 12 },
@ -361,7 +361,7 @@ const struct TrainerClass gTrainerClasses[TRAINER_CLASS_COUNT] =
[TRAINER_CLASS_YOUNG_COUPLE] = { _("YOUNG COUPLE"), 8 },
[TRAINER_CLASS_OLD_COUPLE] = { _("OLD COUPLE"), 10 },
[TRAINER_CLASS_SIS_AND_BRO] = { _("SIS AND BRO"), 3 },
[TRAINER_CLASS_SALON_MAIDEN] = { _("SALON MAIDEN") },
[TRAINER_CLASS_SALON_MAIDEN] = { _("SALON MAIDEN"), 0, BALL_ULTRA },
[TRAINER_CLASS_DOME_ACE] = { _("DOME ACE") },
[TRAINER_CLASS_PALACE_MAVEN] = { _("PALACE MAVEN") },
[TRAINER_CLASS_ARENA_TYCOON] = { _("ARENA TYCOON") },