diff options
| author | garak <garakmon@gmail.com> | 2018-12-03 16:58:28 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-12-03 16:58:28 -0500 |
| commit | 2c14d6ee6c40f4b7e5cd9366080ce911d67be718 (patch) | |
| tree | 4a70ca275a2f161d2d23f63d0608f92d8ea08acb /src/battle_main.c | |
| parent | d6a88e0eaa7d74f187fb27f8a376203f40537340 (diff) | |
| parent | d9a5de5317d4589b139f9532a7e8bf3b851e673f (diff) | |
fix merge conflicts
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 8bdd2220b..de0becd2a 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -451,10 +451,10 @@ const struct TrainerMoney gTrainerMoneyTable[] = {TRAINER_CLASS_AROMA_LADY, 10}, {TRAINER_CLASS_RUIN_MANIAC, 15}, {TRAINER_CLASS_INTERVIEWER, 12}, - {TRAINER_CLASS_TUBER_1, 1}, - {TRAINER_CLASS_TUBER_2, 1}, + {TRAINER_CLASS_TUBER_F, 1}, + {TRAINER_CLASS_TUBER_M, 1}, {TRAINER_CLASS_SIS_AND_BRO, 3}, - {TRAINER_CLASS_COOLTRAINER_1, 12}, + {TRAINER_CLASS_COOLTRAINER, 12}, {TRAINER_CLASS_HEX_MANIAC, 6}, {TRAINER_CLASS_LADY, 50}, {TRAINER_CLASS_BEAUTY, 20}, |