diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:15:19 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:15:19 +0100 |
| commit | bb82032208a328a9332839f55df92c9b73d2c5a0 (patch) | |
| tree | 750088b7e97b3554eabba767ab7440a5637ff873 /src | |
| parent | 44abbae60b6a39e2a1432426005e1860be196abb (diff) | |
battle setup review changes
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_setup.c | 4 | ||||
| -rw-r--r-- | src/recorded_battle.c | 2 | ||||
| -rw-r--r-- | src/trainer_see.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 774aba9b2..dbb20b148 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -528,8 +528,8 @@ void BattleSetup_StartLegendaryBattle(void) CreateBattleStartTask(B_TRANSITION_GROUDON, BGM_BATTLE34); break; case SPECIES_KYOGRE: - gBattleTypeFlags |= BATTLE_TYPE_KYORGE; - CreateBattleStartTask(B_TRANSITION_KYORGE, BGM_BATTLE34); + gBattleTypeFlags |= BATTLE_TYPE_KYOGRE; + CreateBattleStartTask(B_TRANSITION_KYOGRE, BGM_BATTLE34); break; case SPECIES_RAYQUAZA: gBattleTypeFlags |= BATTLE_TYPE_RAYQUAZA; diff --git a/src/recorded_battle.c b/src/recorded_battle.c index 4f3fe4ab9..c88229c61 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -19,7 +19,7 @@ | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_ROAMER | BATTLE_TYPE_EREADER_TRAINER \ | BATTLE_TYPE_KYOGRE_GROUDON | BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI \ | BATTLE_TYPE_RECORDED | BATTLE_TYPE_x4000000 | BATTLE_TYPE_SECRET_BASE \ - | BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYORGE | BATTLE_TYPE_RAYQUAZA)) + | BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYOGRE | BATTLE_TYPE_RAYQUAZA)) extern u32 gBattleTypeFlags; extern u16 gTrainerBattleOpponent_A; diff --git a/src/trainer_see.c b/src/trainer_see.c index c469e11ed..b30f27347 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -28,7 +28,7 @@ bool8 CheckForTrainersWantingBattle(void) retVal = CheckIfTrainerWantsBattle(i); if (retVal == 2) - break; // two trainers has been found + break; // two trainers have been found if (retVal == 0) // no trainers continue; |