ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1204 from Kurausukun/rename-2

Browse Source 
one more instrument
This commit is contained in:
GriffinR 2020-09-23 23:39:12 -04:00 committed by GitHub
commit 541eff3c73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/direct_sound_data.inc
View File

@ -143,8 +143,8 @@ DirectSoundWaveData_ethnic_flavours_atarigane::
.incbin "sound/direct_sound_samples/ethnic_flavours_atarigane.bin"
.align 2
DirectSoundWaveData_unknown_taiko::
.incbin "sound/direct_sound_samples/unknown_taiko.bin"
DirectSoundWaveData_sc88pro_taiko::
.incbin "sound/direct_sound_samples/sc88pro_taiko.bin"
.align 2
DirectSoundWaveData_ethnic_flavours_kotsuzumi::

0
sound/direct_sound_samples/unknown_taiko.aif → sound/direct_sound_samples/sc88pro_taiko.aif
View File

6
sound/voicegroups/voicegroup003.inc
View File

@ -33,10 +33,10 @@ voicegroup003:: @ 86763D0
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676538
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676544
voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 8676550
voice_directsound 63, 64, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 0 @ 867655C
voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0 @ 867655C
voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 8676568
voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 8676574
voice_directsound_no_resample 60, 64, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 0 @ 8676580
voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0 @ 8676580
voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 @ 867658C
voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 @ 8676598
voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 @ 86765A4
@ -50,7 +50,7 @@ voicegroup003:: @ 86763D0
voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676604
voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676610
voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 867661C
voice_directsound 64, 104, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 235 @ 8676628
voice_directsound 64, 104, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 235 @ 8676628
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676634
voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 8676640
voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 867664C

6
sound/voicegroups/voicegroup004.inc
View File

@ -33,7 +33,7 @@ voicegroup004:: @ 8676658
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86767C0
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86767CC
voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 86767D8
voice_directsound 63, 64, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 0 @ 86767E4
voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0 @ 86767E4
voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 86767F0
voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 86767FC
voice_directsound 62, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 @ 8676808
@ -50,7 +50,7 @@ voicegroup004:: @ 8676658
voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 867688C
voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 8676898
voice_directsound 56, 89, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86768A4
voice_directsound 64, 104, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 235 @ 86768B0
voice_directsound 64, 104, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 235 @ 86768B0
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86768BC
voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 86768C8
voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 86768D4
@ -87,7 +87,7 @@ voicegroup004:: @ 8676658
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676A48
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8676A54
voice_directsound 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 8676A60
voice_directsound 63, 64, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 0 @ 8676A6C
voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0 @ 8676A6C
voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 8676A78
voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 8676A84

2
sound/voicegroups/voicegroup129.inc
View File

@ -116,7 +116,7 @@ voicegroup129:: @ 86A0154
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A06A0
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A06AC
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A06B8
voice_directsound 60, 0, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 0 @ 86A06C4
voice_directsound 60, 0, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0 @ 86A06C4
voice_directsound 60, 0, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 86A06D0
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A06DC
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86A06E8

2
sound/voicegroups/voicegroup177.inc
View File

@ -87,7 +87,7 @@ voicegroup177:: @ 86B0378
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0768
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B0774
voice_directsound_no_resample 64, 64, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 86B0780
voice_directsound 63, 64, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 0 @ 86B078C
voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0 @ 86B078C
voice_directsound 50, 64, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 86B0798
voice_directsound 64, 64, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 86B07A4

2
sound/voicegroups/voicegroup190.inc
View File

@ -87,4 +87,4 @@ voicegroup190:: @ 86B429C
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B468C
voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 86B4698
voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 86B46A4
voice_directsound 63, 64, DirectSoundWaveData_unknown_taiko, 255, 0, 255, 0 @ 86B46B0
voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0 @ 86B46B0