dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

battle setup review changes

Browse Source
This commit is contained in:
DizzyEggg
2017-12-16 01:15:19 +01:00
parent 44abbae60b
commit bb82032208
6 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_setup.c
View File

@@ -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;

2
src/recorded_battle.c
View File

@@ -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;

2
src/trainer_see.c
View File

@@ -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;