diff --git a/songs.mk b/songs.mk index eb04ab6c06..565f75d8ee 100644 --- a/songs.mk +++ b/songs.mk @@ -43,7 +43,7 @@ $(MID_SUBDIR)/mus_b_pike.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G112 -V092 $(MID_SUBDIR)/mus_vs_johto_trainer.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G119 -V090 -P1 + $(MID) $< $@ -E -R$(STD_REVERB) -G119 -V110 -P1 $(MID_SUBDIR)/mus_vs_johto_wild.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G117 -V090 -P1 @@ -55,16 +55,16 @@ $(MID_SUBDIR)/mus_vs_rocket.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G118 -V080 -P1 $(MID_SUBDIR)/mus_vs_johto_leader.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G120 -V090 -P1 + $(MID) $< $@ -E -R$(STD_REVERB) -G120 -V115 -P1 $(MID_SUBDIR)/mus_vs_champion.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G121 -V080 -P1 + $(MID) $< $@ -E -R$(STD_REVERB) -G158 -V110 -P1 $(MID_SUBDIR)/mus_vs_kyogre_groudon.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G123 -V080 -P1 $(MID_SUBDIR)/mus_vs_rival.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G124 -V090 -P1 + $(MID) $< $@ -E -R$(STD_REVERB) -G124 -V110 -P1 $(MID_SUBDIR)/mus_vs_regi.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G122 -V080 -P1 diff --git a/sound/songs/midi/mus_vs_champion.mid b/sound/songs/midi/mus_vs_champion.mid index b16580d66a..b98f958dbc 100644 Binary files a/sound/songs/midi/mus_vs_champion.mid and b/sound/songs/midi/mus_vs_champion.mid differ diff --git a/sound/songs/midi/mus_vs_johto_leader.mid b/sound/songs/midi/mus_vs_johto_leader.mid index 45db2da4b2..155942c7e9 100644 Binary files a/sound/songs/midi/mus_vs_johto_leader.mid and b/sound/songs/midi/mus_vs_johto_leader.mid differ diff --git a/sound/songs/midi/mus_vs_johto_trainer.mid b/sound/songs/midi/mus_vs_johto_trainer.mid index fabebd97d2..dd71b9b051 100644 Binary files a/sound/songs/midi/mus_vs_johto_trainer.mid and b/sound/songs/midi/mus_vs_johto_trainer.mid differ diff --git a/sound/songs/midi/mus_vs_rival.mid b/sound/songs/midi/mus_vs_rival.mid index 8eef39e37f..ea34b572d1 100644 Binary files a/sound/songs/midi/mus_vs_rival.mid and b/sound/songs/midi/mus_vs_rival.mid differ diff --git a/sound/voicegroups/voicegroup119.inc b/sound/voicegroups/voicegroup119.inc index 4b9838526f..75d6bad2ed 100644 --- a/sound/voicegroups/voicegroup119.inc +++ b/sound/voicegroups/voicegroup119.inc @@ -21,7 +21,7 @@ voicegroup119:: @ 869AC70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8D94 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8DA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8DAC - voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8DB8 + voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 86A93B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8DC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8DD0 voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 86A8DDC @@ -36,7 +36,7 @@ voicegroup119:: @ 869AC70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8E48 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8E54 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8E60 - voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8E6C + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_unison_slap, 255, 165, 180, 216 @ 86A946C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8E78 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8E84 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A8E90 @@ -80,8 +80,8 @@ voicegroup119:: @ 869AC70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9058 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9064 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9070 - voice_square_2_alt 1, 0, 2, 7, 2 @ 8497A38 - voice_square_1_alt 0, 3, 0, 3, 6, 2 @ 8497A44 + voice_square_2_alt 3, 0, 4, 4, 4 @ 8497A38 + voice_square_1_alt 0, 1, 0, 2, 7, 2 @ 8497A44 voice_square_2_alt 3, 0, 2, 6, 5 @ 86A9094 voice_programmable_wave_alt ProgrammableWaveData_86B4890, 0, 3, 6, 5 @ 86A90A0 voice_programmable_wave_alt ProgrammableWaveData_86B4870, 0, 7, 15, 0 @ 86A92E0 @@ -126,6 +126,6 @@ voicegroup119:: @ 869AC70 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9280 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A928C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9298 - voice_noise_alt 0, 0, 2, 6, 2 @ 86A92A4 + voice_noise_alt 0, 0, 2, 6, 0 @ 86A92A4 voice_noise_alt 0, 0, 1, 6, 0 @ 86A92B0 diff --git a/sound/voicegroups/voicegroup124.inc b/sound/voicegroups/voicegroup124.inc index ba1e94e1b5..a81989d996 100644 --- a/sound/voicegroups/voicegroup124.inc +++ b/sound/voicegroups/voicegroup124.inc @@ -80,8 +80,8 @@ voicegroup124:: @ 869C2F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9058 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9064 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9070 - voice_square_2_alt 1, 0, 2, 7, 2 @ 8497A38 - voice_square_1_alt 0, 3, 0, 3, 6, 2 @ 8497A44 + voice_square_2_alt 3, 0, 4, 4, 4 @ 8497A38 + voice_square_1_alt 0, 1, 0, 2, 7, 2 @ 8497A44 voice_square_2_alt 3, 0, 2, 6, 5 @ 86A9094 voice_programmable_wave_alt ProgrammableWaveData_86B4890, 0, 3, 6, 5 @ 86A90A0 voice_programmable_wave_alt ProgrammableWaveData_86B4870, 0, 7, 15, 0 @ 86A92E0 @@ -126,6 +126,6 @@ voicegroup124:: @ 869C2F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9280 voice_square_1 0, 2, 0, 0, 15, 0 @ 86A928C voice_square_1 0, 2, 0, 0, 15, 0 @ 86A9298 - voice_noise_alt 0, 0, 2, 6, 2 @ 86A92A4 + voice_noise_alt 0, 0, 2, 6, 0 @ 86A92A4 voice_noise_alt 0, 0, 1, 6, 0 @ 86A92B0