From 0663510583c56d13e654cdb601999addb51b770c Mon Sep 17 00:00:00 2001 From: AgustinGDLV Date: Thu, 27 Oct 2022 19:52:52 -0700 Subject: [PATCH] merged regi battle type into BATTLE_TYPE_LEGENDARY --- include/constants/battle.h | 2 +- src/battle_setup.c | 2 +- src/pokemon.c | 20 ++++++++++++++++---- src/recorded_battle.c | 4 ++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/include/constants/battle.h b/include/constants/battle.h index 7c7dd0a47c..c4f68882e9 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -58,7 +58,7 @@ #define BATTLE_TYPE_EREADER_TRAINER (1 << 11) #define BATTLE_TYPE_RAID (1 << 12) #define BATTLE_TYPE_LEGENDARY (1 << 13) -#define BATTLE_TYPE_REGI (1 << 14) +#define BATTLE_TYPE_14 (1 << 14) #define BATTLE_TYPE_TWO_OPPONENTS (1 << 15) // Used in pokefirered as BATTLE_TYPE_GHOST. #define BATTLE_TYPE_DOME (1 << 16) // Used in pokefirered as BATTLE_TYPE_POKEDUDE. #define BATTLE_TYPE_PALACE (1 << 17) // Used in pokefirered as BATTLE_TYPE_WILD_SCRIPTED. diff --git a/src/battle_setup.c b/src/battle_setup.c index a5e7c142cd..c9cb84b69a 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -586,7 +586,7 @@ void StartRegiBattle(void) LockPlayerFieldControls(); gMain.savedCallback = CB2_EndScriptedWildBattle; - gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI; + gBattleTypeFlags = BATTLE_TYPE_LEGENDARY; species = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES); switch (species) diff --git a/src/pokemon.c b/src/pokemon.c index 1ab50666a6..245f6a81ea 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -7550,12 +7550,24 @@ u16 GetBattleBGM(void) { if (gBattleTypeFlags & BATTLE_TYPE_LEGENDARY) { - if (GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, NULL) == SPECIES_RAYQUAZA) + switch (GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, NULL)) + { + case SPECIES_RAYQUAZA: return MUS_VS_RAYQUAZA; - return MUS_VS_KYOGRE_GROUDON; + case SPECIES_KYOGRE: + case SPECIES_GROUDON: + return MUS_VS_KYOGRE_GROUDON; + case SPECIES_REGIROCK: + case SPECIES_REGICE: + case SPECIES_REGISTEEL: + case SPECIES_REGIGIGAS: + case SPECIES_REGIELEKI: + case SPECIES_REGIDRAGO: + return MUS_VS_REGI; + default: + return MUS_RG_VS_LEGEND; + } } - else if (gBattleTypeFlags & BATTLE_TYPE_REGI) - return MUS_VS_REGI; else if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) return MUS_VS_TRAINER; else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) diff --git a/src/recorded_battle.c b/src/recorded_battle.c index 772d39991e..9ac4a0fdc9 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -23,8 +23,8 @@ #define BATTLER_RECORD_SIZE 664 #define ILLEGAL_BATTLE_TYPES ((BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_FIRST_BATTLE \ | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_ROAMER | BATTLE_TYPE_EREADER_TRAINER \ - | BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI | BATTLE_TYPE_RECORDED \ - | BATTLE_TYPE_TRAINER_HILL | BATTLE_TYPE_SECRET_BASE)) + | BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_RECORDED | BATTLE_TYPE_TRAINER_HILL \ + | BATTLE_TYPE_SECRET_BASE | BATTLE_TYPE_RAID)) struct PlayerInfo {