diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-31 13:42:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 13:42:52 -0400 |
| commit | 69ce45f71f49c859ca7adc07902842503c07d405 (patch) | |
| tree | 06f27893dcbc5a32d898325df733bf33d1aabae6 /src/battle_main.c | |
| parent | d7ec1d234b260df869213e195055dd75bcbe5cf3 (diff) | |
| parent | ed714f1d4910e6107f684a0f27566a0fe7c6ec6f (diff) | |
Merge pull request #799 from GriffinRichards/rename-songs
Give songs meaningful english names
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 061d1f102..80e6167c3 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1189,7 +1189,7 @@ void sub_800FE20(struct Sprite *sprite) { StartSpriteAffineAnim(sprite, 1); sprite->callback = sub_800FDB0; - PlaySE(SE_BT_START); + PlaySE(SE_MUGSHOT); } void sub_800FE40(u8 taskId) @@ -4948,7 +4948,7 @@ void HandleEndTurn_BattleWon(void) { case TRAINER_CLASS_ELITE_FOUR: case TRAINER_CLASS_CHAMPION: - PlayBGM(MUS_KACHI5); + PlayBGM(MUS_VICTORY_LEAGUE); break; case TRAINER_CLASS_TEAM_AQUA: case TRAINER_CLASS_TEAM_MAGMA: @@ -4956,13 +4956,13 @@ void HandleEndTurn_BattleWon(void) case TRAINER_CLASS_AQUA_LEADER: case TRAINER_CLASS_MAGMA_ADMIN: case TRAINER_CLASS_MAGMA_LEADER: - PlayBGM(MUS_KACHI4); + PlayBGM(MUS_VICTORY_AQUA_MAGMA); break; case TRAINER_CLASS_LEADER: - PlayBGM(MUS_KACHI3); + PlayBGM(MUS_VICTORY_GYM_LEADER); break; default: - PlayBGM(MUS_KACHI1); + PlayBGM(MUS_VICTORY_TRAINER); break; } } @@ -5625,7 +5625,7 @@ void HandleAction_GoNear(void) void HandleAction_SafriZoneRun(void) { gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; - PlaySE(SE_NIGERU); + PlaySE(SE_FLEE); gCurrentTurnActionNumber = gBattlersCount; gBattleOutcome = B_OUTCOME_RAN; } |