diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-20 21:03:24 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-08-20 21:03:24 -0400 |
| commit | ee72696b5340b5578941aeb5d03bca6099e26538 (patch) | |
| tree | b74eaac85f4a63addeffecf5f061a86f964fa863 /sound | |
| parent | d356e35b648c6689155c9cbd2d23ea8bede8f097 (diff) | |
Sync encounter musics with encounter music types
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/song_table.inc | 8 | ||||
| -rw-r--r-- | sound/songs/midi/mus_encounter_cool.mid (renamed from sound/songs/midi/mus_encounter_cooltrainer.mid) | bin | 12647 -> 12647 bytes | |||
| -rw-r--r-- | sound/songs/midi/mus_encounter_intense.mid (renamed from sound/songs/midi/mus_encounter_psychic.mid) | bin | 6372 -> 6372 bytes | |||
| -rw-r--r-- | sound/songs/midi/mus_encounter_rich.mid (renamed from sound/songs/midi/mus_encounter_gentleman.mid) | bin | 3891 -> 3891 bytes | |||
| -rw-r--r-- | sound/songs/midi/mus_encounter_suspicious.mid (renamed from sound/songs/midi/mus_encounter_hex_maniac.mid) | bin | 6230 -> 6230 bytes |
5 files changed, 4 insertions, 4 deletions
diff --git a/sound/song_table.inc b/sound/song_table.inc index 8ad178f92..ef5b4b48e 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -398,7 +398,7 @@ gSongTable:: @ 86B49F0 song mus_link_contest_p2, 0, 0 song mus_link_contest_p3, 0, 0 song mus_link_contest_p4, 0, 0 - song mus_encounter_gentleman, 0, 0 + song mus_encounter_rich, 0, 0 song mus_verdanturf, 0, 0 song mus_rustboro, 0, 0 song mus_poke_center, 0, 0 @@ -417,14 +417,14 @@ gSongTable:: @ 86B49F0 song mus_title, 0, 0 song mus_intro, 0, 0 song mus_encounter_may, 0, 0 - song mus_encounter_psychic, 0, 0 - song mus_encounter_cooltrainer, 0, 0 + song mus_encounter_intense, 0, 0 + song mus_encounter_cool, 0, 0 song mus_route113, 0, 0 song mus_encounter_aqua, 0, 0 song mus_follow_me, 0, 0 song mus_encounter_brendan, 0, 0 song mus_ever_grande, 0, 0 - song mus_encounter_hex_maniac, 0, 0 + song mus_encounter_suspicious, 0, 0 song mus_victory_aqua_magma, 0, 0 song mus_cable_car, 0, 0 song mus_game_corner, 0, 0 diff --git a/sound/songs/midi/mus_encounter_cooltrainer.mid b/sound/songs/midi/mus_encounter_cool.mid Binary files differindex c1a75663b..c1a75663b 100644 --- a/sound/songs/midi/mus_encounter_cooltrainer.mid +++ b/sound/songs/midi/mus_encounter_cool.mid diff --git a/sound/songs/midi/mus_encounter_psychic.mid b/sound/songs/midi/mus_encounter_intense.mid Binary files differindex 6b217a1fa..6b217a1fa 100644 --- a/sound/songs/midi/mus_encounter_psychic.mid +++ b/sound/songs/midi/mus_encounter_intense.mid diff --git a/sound/songs/midi/mus_encounter_gentleman.mid b/sound/songs/midi/mus_encounter_rich.mid Binary files differindex 913a4f89a..913a4f89a 100644 --- a/sound/songs/midi/mus_encounter_gentleman.mid +++ b/sound/songs/midi/mus_encounter_rich.mid diff --git a/sound/songs/midi/mus_encounter_hex_maniac.mid b/sound/songs/midi/mus_encounter_suspicious.mid Binary files differindex c9942e907..c9942e907 100644 --- a/sound/songs/midi/mus_encounter_hex_maniac.mid +++ b/sound/songs/midi/mus_encounter_suspicious.mid |