Merge pull request #127 from PikalaxALT/voice_group_dump

Dump remaining sound data

.gitattributes

@@ -15,6 +15,7 @@ Makefile text eol=lf
 
 *.png binary
 *.bin binary
+*.pcm binary
 
 *.h linguist-language=C
 *.inc linguist-language=Assembly

.gitignore

@@ -49,3 +49,4 @@ tools/br_ips/br_ips
 tools/br_ips/ips_patch
 types_*.taghl
 !.travis/calcrom/calcrom.pl
+!sound/programmable_wave_samples/*.pcm

ld_script.txt

@@ -524,7 +524,7 @@ SECTIONS {
         data/sound_data.o(.rodata);
     } =0
 
-    songs :
+    song_data :
     ALIGN(4)
     {
         sound/songs/midi/mus_dummy.o(.rodata);
@@ -787,16 +787,16 @@ SECTIONS {
         sound/songs/mus_fanfa1.o(.rodata);
         sound/songs/mus_fanfa4.o(.rodata);
         sound/songs/mus_fanfa5.o(.rodata);
-        sound/songs/mus_me_bachi.o(.rodata);
-        sound/songs/mus_me_waza.o(.rodata);
-        sound/songs/mus_me_kinomi.o(.rodata);
-        sound/songs/mus_me_shinka.o(.rodata);
-        sound/songs/mus_shinka.o(.rodata);
-        sound/songs/mus_battle32.o(.rodata);
-        sound/songs/mus_battle20.o(.rodata);
-        sound/songs/mus_p_school.o(.rodata);
-        sound/songs/mus_me_b_big.o(.rodata);
-        sound/songs/mus_me_b_small.o(.rodata);
+        sound/songs/midi/mus_me_bachi.o(.rodata);
+        sound/songs/midi/mus_me_waza.o(.rodata);
+        sound/songs/midi/mus_me_kinomi.o(.rodata);
+        sound/songs/midi/mus_me_shinka.o(.rodata);
+        sound/songs/midi/mus_shinka.o(.rodata);
+        sound/songs/midi/mus_battle32.o(.rodata);
+        sound/songs/midi/mus_battle20.o(.rodata);
+        sound/songs/midi/mus_p_school.o(.rodata);
+        sound/songs/midi/mus_me_b_big.o(.rodata);
+        sound/songs/midi/mus_me_b_small.o(.rodata);
         sound/songs/midi/mus_me_wasure.o(.rodata);
         sound/songs/midi/mus_me_zannen.o(.rodata);
         sound/songs/midi/mus_annai.o(.rodata);

songs.mk

@@ -10,10 +10,10 @@ $(MID_SUBDIR)/mus_annai.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G131 -V068
 
 $(MID_SUBDIR)/mus_battle20.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G119 -V080 -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G011 -V080 -P1
 
 $(MID_SUBDIR)/mus_battle32.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G120 -V080
+	$(MID) $< $@ -E -R$(STD_REVERB) -G010 -V080
 
 $(MID_SUBDIR)/mus_champ_r.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G154 -V090
@@ -49,13 +49,13 @@ $(MID_SUBDIR)/mus_fan6.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G179 -V094 -P5
 
 $(MID_SUBDIR)/mus_fanfa1.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_fanfa4.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_fanfa5.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_get_yasei.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G170 -V100
@@ -97,34 +97,34 @@ $(MID_SUBDIR)/mus_masara.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G159 -V100
 
 $(MID_SUBDIR)/mus_me_asa.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_b_big.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V100 -P5
 
 $(MID_SUBDIR)/mus_me_b_small.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V100 -P5
 
 $(MID_SUBDIR)/mus_me_bachi.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_kinomi.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_photo.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G180 -V100 -P5
 
 $(MID_SUBDIR)/mus_me_shinka.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G026 -V080 -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G009 -V080 -P1
 
 $(MID_SUBDIR)/mus_me_wasure.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_waza.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_zannen.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G164 -V071
@@ -169,7 +169,7 @@ $(MID_SUBDIR)/mus_otsukimi.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G147 -V090
 
 $(MID_SUBDIR)/mus_p_school.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G081 -V100 -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V100 -P1
 
 $(MID_SUBDIR)/mus_p_tower.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G165 -V090
@@ -205,7 +205,7 @@ $(MID_SUBDIR)/mus_sekaikan.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G182 -V088
 
 $(MID_SUBDIR)/mus_shinka.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G026 -V080 -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G009 -V080 -P1
 
 $(MID_SUBDIR)/mus_shion.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G139 -V090

sound/keysplit_tables.inc

@@ -0,0 +1,393 @@
+@ Due to the way mks4agb (Nintendo's tool) works, key split table labels can
+@ appear before the actual start of the key split table data. If you look at
+@ the first keysplit table (KeySplitTable1), you'll notice it's offset backwards
+@ by 36 bytes. This is because the key split tables don't map instruments
+@ for the entire note range (0-127)--they only map subsets, and the upper
+@ and lower ranges aren't necessarily 0 or 127.
+@
+@ For example if a key split table maps an note range of 10-20, then the key
+@ split table label will be offset 10 bytes before the actual key split data
+@ begins. Therefore, the notes naturally map to the key split table without
+@ any extra offset calculation.
+
+.set KeySplitTable1, . - 36
+	.byte 0  @ 36
+	.byte 0  @ 37
+	.byte 0  @ 38
+	.byte 0  @ 39
+	.byte 0  @ 40
+	.byte 0  @ 41
+	.byte 0  @ 42
+	.byte 0  @ 43
+	.byte 0  @ 44
+	.byte 0  @ 45
+	.byte 0  @ 46
+	.byte 0  @ 47
+	.byte 0  @ 48
+	.byte 0  @ 49
+	.byte 0  @ 50
+	.byte 0  @ 51
+	.byte 0  @ 52
+	.byte 0  @ 53
+	.byte 0  @ 54
+	.byte 1  @ 55
+	.byte 1  @ 56
+	.byte 1  @ 57
+	.byte 1  @ 58
+	.byte 1  @ 59
+	.byte 1  @ 60
+	.byte 1  @ 61
+	.byte 1  @ 62
+	.byte 1  @ 63
+	.byte 1  @ 64
+	.byte 1  @ 65
+	.byte 1  @ 66
+	.byte 1  @ 67
+	.byte 1  @ 68
+	.byte 1  @ 69
+	.byte 2  @ 70
+	.byte 2  @ 71
+	.byte 2  @ 72
+	.byte 2  @ 73
+	.byte 2  @ 74
+	.byte 2  @ 75
+	.byte 2  @ 76
+	.byte 2  @ 77
+	.byte 2  @ 78
+	.byte 2  @ 79
+	.byte 2  @ 80
+	.byte 2  @ 81
+	.byte 2  @ 82
+	.byte 2  @ 83
+	.byte 2  @ 84
+	.byte 2  @ 85
+	.byte 2  @ 86
+	.byte 2  @ 87
+	.byte 2  @ 88
+	.byte 2  @ 89
+	.byte 2  @ 90
+	.byte 3  @ 91
+	.byte 3  @ 92
+	.byte 3  @ 93
+	.byte 3  @ 94
+	.byte 3  @ 95
+	.byte 3  @ 96
+	.byte 3  @ 97
+	.byte 3  @ 98
+	.byte 3  @ 99
+	.byte 3  @ 100
+	.byte 3  @ 101
+	.byte 3  @ 102
+	.byte 3  @ 103
+	.byte 3  @ 104
+	.byte 3  @ 105
+	.byte 3  @ 106
+	.byte 3  @ 107
+
+.set KeySplitTable2, . - 36
+	.byte 0  @ 36
+	.byte 0  @ 37
+	.byte 0  @ 38
+	.byte 0  @ 39
+	.byte 0  @ 40
+	.byte 0  @ 41
+	.byte 0  @ 42
+	.byte 0  @ 43
+	.byte 0  @ 44
+	.byte 0  @ 45
+	.byte 0  @ 46
+	.byte 0  @ 47
+	.byte 0  @ 48
+	.byte 0  @ 49
+	.byte 0  @ 50
+	.byte 0  @ 51
+	.byte 0  @ 52
+	.byte 0  @ 53
+	.byte 0  @ 54
+	.byte 0  @ 55
+	.byte 0  @ 56
+	.byte 0  @ 57
+	.byte 0  @ 58
+	.byte 0  @ 59
+	.byte 0  @ 60
+	.byte 0  @ 61
+	.byte 0  @ 62
+	.byte 0  @ 63
+	.byte 0  @ 64
+	.byte 0  @ 65
+	.byte 0  @ 66
+	.byte 0  @ 67
+	.byte 0  @ 68
+	.byte 1  @ 69
+	.byte 1  @ 70
+	.byte 1  @ 71
+	.byte 1  @ 72
+	.byte 1  @ 73
+	.byte 1  @ 74
+	.byte 1  @ 75
+	.byte 1  @ 76
+	.byte 1  @ 77
+	.byte 1  @ 78
+	.byte 1  @ 79
+	.byte 1  @ 80
+	.byte 2  @ 81
+	.byte 2  @ 82
+	.byte 2  @ 83
+	.byte 2  @ 84
+	.byte 2  @ 85
+	.byte 2  @ 86
+	.byte 2  @ 87
+	.byte 2  @ 88
+	.byte 2  @ 89
+	.byte 2  @ 90
+	.byte 2  @ 91
+	.byte 2  @ 92
+	.byte 2  @ 93
+	.byte 2  @ 94
+	.byte 2  @ 95
+	.byte 2  @ 96
+	.byte 2  @ 97
+	.byte 2  @ 98
+	.byte 2  @ 99
+	.byte 2  @ 100
+	.byte 2  @ 101
+	.byte 2  @ 102
+	.byte 2  @ 103
+	.byte 2  @ 104
+	.byte 2  @ 105
+	.byte 2  @ 106
+	.byte 2  @ 107
+
+.set KeySplitTable3, . - 36
+	.byte 0  @ 36
+	.byte 0  @ 37
+	.byte 0  @ 38
+	.byte 0  @ 39
+	.byte 0  @ 40
+	.byte 0  @ 41
+	.byte 0  @ 42
+	.byte 0  @ 43
+	.byte 0  @ 44
+	.byte 0  @ 45
+	.byte 0  @ 46
+	.byte 0  @ 47
+	.byte 0  @ 48
+	.byte 0  @ 49
+	.byte 0  @ 50
+	.byte 0  @ 51
+	.byte 0  @ 52
+	.byte 0  @ 53
+	.byte 0  @ 54
+	.byte 0  @ 55
+	.byte 0  @ 56
+	.byte 0  @ 57
+	.byte 0  @ 58
+	.byte 0  @ 59
+	.byte 0  @ 60
+	.byte 0  @ 61
+	.byte 0  @ 62
+	.byte 0  @ 63
+	.byte 0  @ 64
+	.byte 0  @ 65
+	.byte 1  @ 66
+	.byte 1  @ 67
+	.byte 1  @ 68
+	.byte 1  @ 69
+	.byte 1  @ 70
+	.byte 1  @ 71
+	.byte 1  @ 72
+	.byte 1  @ 73
+	.byte 1  @ 74
+	.byte 1  @ 75
+	.byte 1  @ 76
+	.byte 1  @ 77
+	.byte 1  @ 78
+	.byte 1  @ 79
+	.byte 1  @ 80
+	.byte 1  @ 81
+	.byte 1  @ 82
+	.byte 1  @ 83
+	.byte 2  @ 84
+	.byte 2  @ 85
+	.byte 2  @ 86
+	.byte 2  @ 87
+	.byte 2  @ 88
+	.byte 2  @ 89
+	.byte 2  @ 90
+	.byte 2  @ 91
+	.byte 2  @ 92
+	.byte 2  @ 93
+	.byte 2  @ 94
+	.byte 2  @ 95
+	.byte 2  @ 96
+	.byte 2  @ 97
+	.byte 2  @ 98
+	.byte 2  @ 99
+	.byte 2  @ 100
+	.byte 2  @ 101
+	.byte 2  @ 102
+	.byte 2  @ 103
+	.byte 2  @ 104
+	.byte 2  @ 105
+	.byte 2  @ 106
+	.byte 2  @ 107
+
+.set KeySplitTable4, . - 24
+	.byte 0  @ 24
+	.byte 0  @ 25
+	.byte 0  @ 26
+	.byte 0  @ 27
+	.byte 0  @ 28
+	.byte 0  @ 29
+	.byte 0  @ 30
+	.byte 0  @ 31
+	.byte 0  @ 32
+	.byte 0  @ 33
+	.byte 0  @ 34
+	.byte 0  @ 35
+	.byte 0  @ 36
+	.byte 0  @ 37
+	.byte 0  @ 38
+	.byte 0  @ 39
+	.byte 0  @ 40
+	.byte 0  @ 41
+	.byte 1  @ 42
+	.byte 1  @ 43
+	.byte 1  @ 44
+	.byte 1  @ 45
+	.byte 1  @ 46
+	.byte 1  @ 47
+	.byte 1  @ 48
+	.byte 1  @ 49
+	.byte 1  @ 50
+	.byte 1  @ 51
+	.byte 1  @ 52
+	.byte 1  @ 53
+	.byte 1  @ 54
+	.byte 1  @ 55
+	.byte 1  @ 56
+	.byte 1  @ 57
+	.byte 1  @ 58
+	.byte 1  @ 59
+	.byte 1  @ 60
+	.byte 1  @ 61
+	.byte 1  @ 62
+	.byte 1  @ 63
+	.byte 1  @ 64
+	.byte 1  @ 65
+	.byte 1  @ 66
+	.byte 1  @ 67
+	.byte 1  @ 68
+	.byte 1  @ 69
+	.byte 1  @ 70
+	.byte 1  @ 71
+	.byte 1  @ 72
+	.byte 1  @ 73
+	.byte 1  @ 74
+	.byte 1  @ 75
+	.byte 1  @ 76
+	.byte 1  @ 77
+	.byte 1  @ 78
+	.byte 1  @ 79
+	.byte 1  @ 80
+	.byte 1  @ 81
+	.byte 1  @ 82
+	.byte 1  @ 83
+	.byte 1  @ 84
+	.byte 1  @ 85
+	.byte 1  @ 86
+	.byte 1  @ 87
+	.byte 1  @ 88
+	.byte 1  @ 89
+	.byte 1  @ 90
+	.byte 1  @ 91
+	.byte 1  @ 92
+	.byte 1  @ 93
+	.byte 1  @ 94
+	.byte 1  @ 95
+	.byte 1  @ 96
+	.byte 1  @ 97
+	.byte 1  @ 98
+	.byte 1  @ 99
+	.byte 1  @ 100
+	.byte 1  @ 101
+	.byte 1  @ 102
+	.byte 1  @ 103
+	.byte 1  @ 104
+	.byte 1  @ 105
+	.byte 1  @ 106
+	.byte 1  @ 107
+
+.set KeySplitTable5, . - 36
+	.byte 0  @ 36
+	.byte 0  @ 37
+	.byte 0  @ 38
+	.byte 0  @ 39
+	.byte 0  @ 40
+	.byte 0  @ 41
+	.byte 0  @ 42
+	.byte 0  @ 43
+	.byte 0  @ 44
+	.byte 0  @ 45
+	.byte 0  @ 46
+	.byte 0  @ 47
+	.byte 0  @ 48
+	.byte 0  @ 49
+	.byte 0  @ 50
+	.byte 0  @ 51
+	.byte 0  @ 52
+	.byte 0  @ 53
+	.byte 0  @ 54
+	.byte 0  @ 55
+	.byte 0  @ 56
+	.byte 0  @ 57
+	.byte 0  @ 58
+	.byte 0  @ 59
+	.byte 0  @ 60
+	.byte 0  @ 61
+	.byte 0  @ 62
+	.byte 0  @ 63
+	.byte 0  @ 64
+	.byte 0  @ 65
+	.byte 1  @ 66
+	.byte 1  @ 67
+	.byte 1  @ 68
+	.byte 1  @ 69
+	.byte 1  @ 70
+	.byte 1  @ 71
+	.byte 1  @ 72
+	.byte 1  @ 73
+	.byte 1  @ 74
+	.byte 1  @ 75
+	.byte 1  @ 76
+	.byte 1  @ 77
+	.byte 1  @ 78
+	.byte 1  @ 79
+	.byte 1  @ 80
+	.byte 1  @ 81
+	.byte 1  @ 82
+	.byte 1  @ 83
+	.byte 1  @ 84
+	.byte 1  @ 85
+	.byte 1  @ 86
+	.byte 1  @ 87
+	.byte 1  @ 88
+	.byte 1  @ 89
+	.byte 1  @ 90
+	.byte 1  @ 91
+	.byte 1  @ 92
+	.byte 1  @ 93
+	.byte 1  @ 94
+	.byte 1  @ 95
+	.byte 1  @ 96
+	.byte 1  @ 97
+	.byte 1  @ 98
+	.byte 1  @ 99
+	.byte 1  @ 100
+	.byte 1  @ 101
+	.byte 1  @ 102
+	.byte 1  @ 103
+	.byte 1  @ 104
+	.byte 1  @ 105
+	.byte 1  @ 106
+	.byte 1  @ 107

sound/programmable_wave_data.inc

@@ -0,0 +1,33 @@
+
+gProgrammableWaveData_84A31EC:: @ 84A31EC
+	.incbin "sound/programmable_wave_samples/84A31EC.pcm"
+
+gProgrammableWaveData_84A31FC:: @ 84A31FC
+	.incbin "sound/programmable_wave_samples/84A31FC.pcm"
+
+gProgrammableWaveData_84A320C:: @ 84A320C
+	.incbin "sound/programmable_wave_samples/84A320C.pcm"
+
+gProgrammableWaveData_84A321C:: @ 84A321C
+	.incbin "sound/programmable_wave_samples/84A321C.pcm"
+
+gProgrammableWaveData_84A322C:: @ 84A322C
+	.incbin "sound/programmable_wave_samples/84A322C.pcm"
+
+gProgrammableWaveData_84A323C:: @ 84A323C
+	.incbin "sound/programmable_wave_samples/84A323C.pcm"
+
+gProgrammableWaveData_84A324C:: @ 84A324C
+	.incbin "sound/programmable_wave_samples/84A324C.pcm"
+
+gProgrammableWaveData_84A325C:: @ 84A325C
+	.incbin "sound/programmable_wave_samples/84A325C.pcm"
+
+gProgrammableWaveData_84A326C:: @ 84A326C
+	.incbin "sound/programmable_wave_samples/84A326C.pcm"
+
+gProgrammableWaveData_84A327C:: @ 84A327C
+	.incbin "sound/programmable_wave_samples/84A327C.pcm"
+
+gProgrammableWaveData_84A328C:: @ 84A328C
+	.incbin "sound/programmable_wave_samples/84A328C.pcm"

sound/programmable_wave_samples/84A31EC.pcm

@@ -0,0 +1 @@
+
%巌�ﾉc
%巌�ﾉc

sound/programmable_wave_samples/84A31FC.pcm

@@ -0,0 +1 @@
+F莞�ｹu1F莞�ｹu1