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

use internal song names

Browse Source
This commit is contained in:
sceptillion
2017-12-21 23:46:19 -08:00
parent 44415f1bbe
commit 96511dc214
595 changed files with 1452 additions and 1653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokemon_3.c
+14 -14
View File
@@ -1145,11 +1145,11 @@ void ClearBattleMonForms(void)
u16 GetBattleBGM(void)
{
if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON)
return BGM_BATTLE34;
return MUS_BATTLE34;
if (gBattleTypeFlags & BATTLE_TYPE_REGI)
return BGM_BATTLE36;
return MUS_BATTLE36;
if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
return BGM_BATTLE20;
return MUS_BATTLE20;
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
{
u8 trainerClass;
@@ -1165,24 +1165,24 @@ u16 GetBattleBGM(void)
{
case TRAINER_CLASS_AQUA_LEADER:
case TRAINER_CLASS_MAGMA_LEADER:
return BGM_BATTLE30;
return MUS_BATTLE30;
case TRAINER_CLASS_TEAM_AQUA:
case TRAINER_CLASS_TEAM_MAGMA:
case TRAINER_CLASS_AQUA_ADMIN:
case TRAINER_CLASS_MAGMA_ADMIN:
return BGM_BATTLE31;
return MUS_BATTLE31;
case TRAINER_CLASS_LEADER:
return BGM_BATTLE32;
return MUS_BATTLE32;
case TRAINER_CLASS_CHAMPION:
return BGM_BATTLE33;
return MUS_BATTLE33;
case TRAINER_CLASS_PKMN_TRAINER_3:
if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
return BGM_BATTLE35;
return MUS_BATTLE35;
if (!StringCompare(gTrainers[gTrainerBattleOpponent_A].trainerName, gText_BattleWallyName))
return BGM_BATTLE20;
return BGM_BATTLE35;
return MUS_BATTLE20;
return MUS_BATTLE35;
case TRAINER_CLASS_ELITE_FOUR:
return BGM_BATTLE38;
return MUS_BATTLE38;
case TRAINER_CLASS_SALON_MAIDEN:
case TRAINER_CLASS_DOME_ACE:
case TRAINER_CLASS_PALACE_MAVEN:
@@ -1190,12 +1190,12 @@ u16 GetBattleBGM(void)
case TRAINER_CLASS_FACTORY_HEAD:
case TRAINER_CLASS_PIKE_QUEEN:
case TRAINER_CLASS_PYRAMID_KING:
return BGM_BATTLE_FRONTIER_BRAIN;
return MUS_VS_FRONT;
default:
return BGM_BATTLE20;
return MUS_BATTLE20;
}
}
return BGM_BATTLE27;
return MUS_BATTLE27;
}
void PlayBattleBGM(void)