diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-26 10:49:17 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-26 11:51:43 +0800 |
| commit | 0ae4d58e985dcc3d265ea30505f439c34eab21ab (patch) | |
| tree | 286f735ca16bd576926197f4f6a80ab6f0c24dc4 /src/battle_setup.c | |
| parent | d99119bad5d71d356d3f5492a3df02bf64075178 (diff) | |
resolve more review comments
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index e4b8914e5..98437e279 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -620,13 +620,13 @@ static u8 GetTrainerBattleTransition(void) return B_TRANSITION_BLUE; if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_ELITE_FOUR_2) { - if (gTrainerBattleOpponent_A == 410 || gTrainerBattleOpponent_A == 735) // TODO: replace these with enums + if (gTrainerBattleOpponent_A == TRAINER_ELITE_FOUR_LORELEI || gTrainerBattleOpponent_A == TRAINER_ELITE_FOUR_LORELEI_2) return B_TRANSITION_LORELEI; - if (gTrainerBattleOpponent_A == 411 || gTrainerBattleOpponent_A == 736) + if (gTrainerBattleOpponent_A == TRAINER_ELITE_FOUR_BRUNO || gTrainerBattleOpponent_A == TRAINER_ELITE_FOUR_BRUNO_2) return B_TRANSITION_BRUNO; - if (gTrainerBattleOpponent_A == 412 || gTrainerBattleOpponent_A == 737) + if (gTrainerBattleOpponent_A == TRAINER_ELITE_FOUR_AGATHA || gTrainerBattleOpponent_A == TRAINER_ELITE_FOUR_AGATHA_2) return B_TRANSITION_AGATHA; - if (gTrainerBattleOpponent_A == 413 || gTrainerBattleOpponent_A == 738) + if (gTrainerBattleOpponent_A == TRAINER_ELITE_FOUR_LANCE || gTrainerBattleOpponent_A == TRAINER_ELITE_FOUR_LANCE_2) return B_TRANSITION_LANCE; return B_TRANSITION_BLUE; } @@ -997,7 +997,8 @@ void PlayTrainerEncounterMusic(void) { u16 music; - if ((u8)(gUnknown_203ADFA - 2) > 1 + if (gUnknown_203ADFA != 2 + && gUnknown_203ADFA != 3 && sTrainerBattleMode != TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC && sTrainerBattleMode != TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC) { |