diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-29 01:47:36 -0400 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-08-29 01:47:36 -0400 |
commit | 038abf80ba30a277420e0381312c0cfc2296811e (patch) | |
tree | ab951530e74209c0da170bc74ddd8b5a456bab9a /src/pokemon_3.c | |
parent | d7ec1d234b260df869213e195055dd75bcbe5cf3 (diff) |
Give songs meaningful english names
Diffstat (limited to 'src/pokemon_3.c')
-rw-r--r-- | src/pokemon_3.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/pokemon_3.c b/src/pokemon_3.c index 393d76dbc..16c2f3738 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -1112,38 +1112,38 @@ void ClearBattleMonForms(void) u16 GetMUS_ForBattle(void) { if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) - return MUS_BATTLE34; + return MUS_VS_KYOGRE_GROUDON; if (gBattleTypeFlags & BATTLE_TYPE_REGI) - return MUS_BATTLE36; + return MUS_VS_REGI; if (gBattleTypeFlags & BATTLE_TYPE_LINK) - return MUS_BATTLE20; + return MUS_VS_TRAINER; if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) { switch (gTrainers[gTrainerBattleOpponent].trainerClass) { case 2: case 0x31: - return MUS_BATTLE30; + return MUS_VS_AQUA_MAGMA_LEADER; case 3: case 4: case 0x32: case 0x33: - return MUS_BATTLE31; + return MUS_VS_AQUA_MAGMA; case 0x19: - return MUS_BATTLE32; + return MUS_VS_GYM_LEADER; case 0x20: - return MUS_BATTLE33; + return MUS_VS_CHAMPION; case 0x2E: if (!StringCompare(gTrainers[gTrainerBattleOpponent].trainerName, BattleText_Wally)) - return MUS_BATTLE20; - return MUS_BATTLE35; + return MUS_VS_TRAINER; + return MUS_VS_RIVAL; case 0x18: - return MUS_BATTLE38; + return MUS_VS_ELITE_FOUR; default: - return MUS_BATTLE20; + return MUS_VS_TRAINER; } } - return MUS_BATTLE27; + return MUS_VS_WILD; } void sub_80408BC(void) |