diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-22 20:07:46 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-22 21:02:25 -0500 |
| commit | e7cd8c59f4ca0f6c56a3b3782c21e896c203694e (patch) | |
| tree | 2daf951fe8064f06c06f0a0ec88c015845f1377e /src/battle_setup.c | |
| parent | d084a5ca84ec7062b8e546293e67202f2d2f4732 (diff) | |
Remove unused BF battle types, clarify Ghost battle type flags
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 a46191509..4859b9234 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) { |