diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-31 13:42:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 13:42:41 -0400 |
| commit | 4cf09577950db22d7f0acf6ede45b8dca1c97156 (patch) | |
| tree | cb094078122b217fc67e2285614b79c6e83eaf88 /src/battle_setup.c | |
| parent | c5839905a1259fd7e843c0ffa1ce2470d40b76ae (diff) | |
| parent | bb56d4a3f4cab33f899646e0630282fc6176a9c9 (diff) | |
Merge pull request #356 from GriffinRichards/rename-songs
Give songs meaningful english names
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index b54696247..8ee061361 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -250,7 +250,7 @@ void StartRoamerBattle(void) StopPlayerAvatar(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = BATTLE_TYPE_ROAMER; - CreateBattleStartTask(GetWildBattleTransition(), MUS_VS_DEN); + CreateBattleStartTask(GetWildBattleTransition(), MUS_VS_LEGEND); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); } @@ -344,20 +344,20 @@ void StartLegendaryBattle(void) switch (species) { case SPECIES_MEWTWO: - CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_MYU2); + CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_MEWTWO); break; case SPECIES_DEOXYS: - CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_DEO); + CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_DEOXYS); break; case SPECIES_MOLTRES: case SPECIES_ARTICUNO: case SPECIES_ZAPDOS: case SPECIES_HO_OH: case SPECIES_LUGIA: - CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_DEN); + CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_LEGEND); break; default: - CreateBattleStartTask(B_TRANSITION_BLUR, MUS_BATTLE20); + CreateBattleStartTask(B_TRANSITION_BLUR, MUS_RS_VS_TRAINER); break; } IncrementGameStat(GAME_STAT_TOTAL_BATTLES); @@ -370,9 +370,9 @@ void StartGroudonKyogreBattle(void) gMain.savedCallback = CB2_EndScriptedWildBattle; gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON; if (gGameVersion == VERSION_FIRE_RED) - CreateBattleStartTask(B_TRANSITION_BLACK_DOODLES, MUS_BATTLE20); + CreateBattleStartTask(B_TRANSITION_BLACK_DOODLES, MUS_RS_VS_TRAINER); else // pointless, exactly the same - CreateBattleStartTask(B_TRANSITION_BLACK_DOODLES, MUS_BATTLE20); + CreateBattleStartTask(B_TRANSITION_BLACK_DOODLES, MUS_RS_VS_TRAINER); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); } @@ -382,7 +382,7 @@ void StartRegiBattle(void) ScriptContext2_Enable(); gMain.savedCallback = CB2_EndScriptedWildBattle; gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI; - CreateBattleStartTask(B_TRANSITION_BLUR, MUS_BATTLE20); + CreateBattleStartTask(B_TRANSITION_BLUR, MUS_RS_VS_TRAINER); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); } @@ -1003,7 +1003,7 @@ void PlayTrainerEncounterMusic(void) case TRAINER_ENCOUNTER_MUSIC_FEMALE: case TRAINER_ENCOUNTER_MUSIC_GIRL: case TRAINER_ENCOUNTER_MUSIC_TWINS: - music = MUS_SHOUJO; + music = MUS_ENCOUNTER_GIRL; break; case TRAINER_ENCOUNTER_MUSIC_MALE: case TRAINER_ENCOUNTER_MUSIC_INTENSE: @@ -1013,10 +1013,10 @@ void PlayTrainerEncounterMusic(void) case TRAINER_ENCOUNTER_MUSIC_HIKER: case TRAINER_ENCOUNTER_MUSIC_INTERVIEWER: case TRAINER_ENCOUNTER_MUSIC_RICH: - music = MUS_SHOUNEN; + music = MUS_ENCOUNTER_BOY; break; default: - music = MUS_ROCKET; + music = MUS_ENCOUNTER_ROCKET; break; } PlayNewMapMusic(music); |