diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-23 15:33:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-23 15:33:01 -0500 |
| commit | 85e5c57e8c86cca00e8bfc7d54e21d08c9e62e69 (patch) | |
| tree | 252bafc0e59e3531c80e3b25b0b0ede2e1373201 /src/battle_setup.c | |
| parent | 5435bc4325407969b00dba8c9623fbb4f02d8cd1 (diff) | |
| parent | a01d83a4341cd0cdad01fe2d0b96920301257f2a (diff) | |
Merge pull request #237 from GriffinRichards/sync-ai
Sync AI scripts
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 06f65dae2..102a1b969 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -301,7 +301,7 @@ void BattleSetup_StartScriptedWildBattle(void) { ScriptContext2_Enable(); gMain.savedCallback = CB2_EndScriptedWildBattle; - gBattleTypeFlags = BATTLE_TYPE_PALACE; + gBattleTypeFlags = BATTLE_TYPE_WILD_SCRIPTED; CreateBattleStartTask(GetWildBattleTransition(), 0); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); @@ -313,7 +313,7 @@ void ScrSpecial_StartMarowakBattle(void) gMain.savedCallback = CB2_EndMarowakBattle; if (CheckBagHasItem(ITEM_SILPH_SCOPE, 1)) { - gBattleTypeFlags = BATTLE_TYPE_GHOST | BATTLE_TYPE_LEGENDARY; + gBattleTypeFlags = BATTLE_TYPE_GHOST | BATTLE_TYPE_GHOST_UNVEILED; CreateMonWithGenderNatureLetter(gEnemyParty, SPECIES_MAROWAK, 30, 31, MON_FEMALE, NATURE_SERIOUS, 0); } else @@ -342,7 +342,7 @@ void Special_StartLegendaryBattle(void) ScriptContext2_Enable(); gMain.savedCallback = CB2_EndScriptedWildBattle; - gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_ARENA; + gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_LEGENDARY_FRLG; species = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES); switch (species) { |