summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/macros/music_voice.s108
-rw-r--r--data/music/music_pointers.s2
-rw-r--r--data/sound_data.s96
3 files changed, 133 insertions, 73 deletions
diff --git a/asm/macros/music_voice.s b/asm/macros/music_voice.s
new file mode 100644
index 000000000..0d3ac58e0
--- /dev/null
+++ b/asm/macros/music_voice.s
@@ -0,0 +1,108 @@
+ .macro voice_directsound base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release
+ .byte 0
+ _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
+ .endm
+
+ .macro voice_directsound_no_resample base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release
+ .byte 8
+ _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
+ .endm
+
+ .macro _voice_directsound base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release
+ .byte \base_midi_key
+ .byte 0
+ .if \pan != 0
+ .byte (0x80 | \pan)
+ .else
+ .byte 0
+ .endif
+ .4byte \sample_data_pointer
+ .byte \attack
+ .byte \decay
+ .byte \sustain
+ .byte \release
+ .endm
+
+ .macro voice_square_1 sweep, duty_cycle, attack, decay, sustain, release
+ _voice_square_1 1, \sweep, \duty_cycle, \attack, \decay, \sustain, \release
+ .endm
+
+ .macro voice_square_1_alt sweep, duty_cycle, attack, decay, sustain, release
+ _voice_square_1 9, \sweep, \duty_cycle, \attack, \decay, \sustain, \release
+ .endm
+
+ .macro _voice_square_1 type, sweep, duty_cycle, attack, decay, sustain, release
+ .byte \type, 60, 0
+ .byte \sweep
+ .byte (\duty_cycle & 0x3)
+ .byte 0, 0, 0
+ .byte (\attack & 0x7)
+ .byte (\decay & 0x7)
+ .byte (\sustain & 0xF)
+ .byte (\release & 0x7)
+ .endm
+
+ .macro voice_square_2 duty_cycle, attack, decay, sustain, release
+ _voice_square_2 2, \duty_cycle, \attack, \decay, \sustain, \release
+ .endm
+
+ .macro voice_square_2_alt duty_cycle, attack, decay, sustain, release
+ _voice_square_2 10, \duty_cycle, \attack, \decay, \sustain, \release
+ .endm
+
+ .macro _voice_square_2 type, duty_cycle, attack, decay, sustain, release
+ .byte \type, 60, 0, 0
+ .byte (\duty_cycle & 0x3)
+ .byte 0, 0, 0
+ .byte (\attack & 0x7)
+ .byte (\decay & 0x7)
+ .byte (\sustain & 0xF)
+ .byte (\release & 0x7)
+ .endm
+
+ .macro voice_programmable_wave wave_samples_pointer, attack, decay, sustain, release
+ _voice_programmable_wave 3, \wave_samples_pointer, \attack, \decay, \sustain, \release
+ .endm
+
+ .macro voice_programmable_wave_alt wave_samples_pointer, attack, decay, sustain, release
+ _voice_programmable_wave 11, \wave_samples_pointer, \attack, \decay, \sustain, \release
+ .endm
+
+ .macro _voice_programmable_wave type, wave_samples_pointer, attack, decay, sustain, release
+ .byte \type, 60, 0, 0
+ .4byte \wave_samples_pointer
+ .byte (\attack & 0x7)
+ .byte (\decay & 0x7)
+ .byte (\sustain & 0xF)
+ .byte (\release & 0x7)
+ .endm
+
+ .macro voice_noise period, attack, decay, sustain, release
+ _voice_noise 4, \period, \attack, \decay, \sustain, \release
+ .endm
+
+ .macro voice_noise_alt period, attack, decay, sustain, release
+ _voice_noise 12, \period, \attack, \decay, \sustain, \release
+ .endm
+
+ .macro _voice_noise type, period, attack, decay, sustain, release
+ .byte \type, 60, 0, 0
+ .byte (\period & 0x1)
+ .byte 0, 0, 0
+ .byte (\attack & 0x7)
+ .byte (\decay & 0x7)
+ .byte (\sustain & 0xF)
+ .byte (\release & 0x7)
+ .endm
+
+ .macro voice_keysplit voice_group_pointer, keysplit_table_pointer
+ .byte 0x40, 0, 0, 0
+ .4byte \voice_group_pointer
+ .4byte \keysplit_table_pointer
+ .endm
+
+ .macro voice_keysplit_all voice_group_pointer
+ .byte 0x80, 0, 0, 0
+ .4byte \voice_group_pointer
+ .4byte 0
+ .endm
diff --git a/data/music/music_pointers.s b/data/music/music_pointers.s
index 2052149d7..1b2f05ad9 100644
--- a/data/music/music_pointers.s
+++ b/data/music/music_pointers.s
@@ -1,4 +1,4 @@
-@ gSongTable
+gSongTable:: @ 845548C
.4byte Music0_Header
.byte 0, 0, 0, 0
diff --git a/data/sound_data.s b/data/sound_data.s
index cf6ca5a26..4c1887359 100644
--- a/data/sound_data.s
+++ b/data/sound_data.s
@@ -1,5 +1,7 @@
.section .rodata
+ .include "asm/macros/music_voice.s"
+
gUnknown_0842FC88:: @ 842FC88
@ Percussion 842FC88
.byte 0x80, 0, 0, 0
@@ -54,9 +56,7 @@ gUnknown_0842FC88:: @ 842FC88
.byte 0, 0, 15, 0
@ Direct Sound 842FCF4
- .byte 0x0, 0x3c, 0x0, 0x0
- .4byte DirectSoundWaveData_8456330
- .byte 255, 165, 51, 235
+ voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 51, 235
@ SquareWave1 842FD00
.byte 0x1, 0x3c, 0x0, 0x0
@@ -432,9 +432,7 @@ VoiceGroupTable_842FEF8: @ 842FEF8
.byte 0, 0, 15, 0
@ WaveMemory 842FFF4
- .byte 0x3, 0x3c, 0x0, 0x0
- .4byte ProgrammableWaveData_84553BC
- .byte 0, 7, 15, 1
+ voice_programmable_wave ProgrammableWaveData_84553BC, 0, 7, 15, 1
@ SquareWave1 8430000
.byte 0x1, 0x3c, 0x0, 0x0
@@ -479,9 +477,7 @@ VoiceGroupTable_842FEF8: @ 842FEF8
.byte 0, 1, 6, 0
@ WaveMemory 8430054
- .byte 0x3, 0x3c, 0x0, 0x0
- .4byte ProgrammableWaveData_84553DC
- .byte 0, 7, 15, 1
+ voice_programmable_wave ProgrammableWaveData_84553DC, 0, 7, 15, 1
@ SquareWave1 8430060
.byte 0x1, 0x3c, 0x0, 0x0
@@ -520,9 +516,7 @@ VoiceGroupTable_842FEF8: @ 842FEF8
.byte 0, 1, 6, 0
@ Direct Sound 84300A8
- .byte 0x8, 0x3c, 0x0, 0xc0
- .4byte DirectSoundWaveData_845AE14
- .byte 255, 0, 255, 242
+ voice_directsound_no_resample 60, 0x40, DirectSoundWaveData_845AE14, 255, 0, 255, 242
@ SquareWave1 84300B4
.byte 0x1, 0x3c, 0x0, 0x0
@@ -556,9 +550,7 @@ VoiceGroupTable_842FEF8: @ 842FEF8
.byte 255, 127, 0, 188
@ Direct Sound 84300FC
- .byte 0x0, 0x33, 0x0, 0xb1
- .4byte DirectSoundWaveData_845CAB0
- .byte 255, 216, 77, 204
+ voice_directsound 51, 0x31, DirectSoundWaveData_845CAB0, 255, 216, 77, 204
@ SquareWave1 8430108
.byte 0x1, 0x3c, 0x0, 0x0
@@ -4842,9 +4834,7 @@ VoiceGroupTable_8431F98: @ 8431F98
.byte 255, 127, 231, 127
@ WaveMemory 8432310
- .byte 0x3, 0x3c, 0x0, 0x0
- .4byte ProgrammableWaveData_84553BC
- .byte 0, 7, 15, 1
+ voice_programmable_wave ProgrammableWaveData_84553BC, 0, 7, 15, 1
@ SquareWave1 843231C
.byte 0x1, 0x3c, 0x0, 0x0
@@ -5773,9 +5763,7 @@ VoiceGroupTable_84326F4: @ 84326F4
.byte 255, 127, 231, 127
@ WaveMemory 8432A6C
- .byte 0x3, 0x3c, 0x0, 0x0
- .4byte ProgrammableWaveData_84553BC
- .byte 0, 7, 15, 0
+ voice_programmable_wave ProgrammableWaveData_84553BC, 0, 7, 15, 0
@ SquareWave1 8432A78
.byte 0x1, 0x3c, 0x0, 0x0
@@ -7119,9 +7107,7 @@ VoiceGroupTable_8433138: @ 8433138
.byte 0, 1, 7, 1
@ WaveMemory 8433504
- .byte 0xb, 0x3c, 0x0, 0x0
- .4byte ProgrammableWaveData_84553FC
- .byte 0, 7, 15, 2
+ voice_programmable_wave_alt ProgrammableWaveData_84553FC, 0, 7, 15, 2
@ SquareWave1 8433510
.byte 0x9, 0x3c, 0x0, 0x0
@@ -10856,9 +10842,7 @@ VoiceGroupTable_8434F14: @ 8434F14
.byte 0, 0, 15, 0
@ WaveMemory 8435280
- .byte 0x3, 0x3c, 0x0, 0x0
- .4byte ProgrammableWaveData_84553BC
- .byte 0, 7, 15, 0
+ voice_programmable_wave ProgrammableWaveData_84553BC, 0, 7, 15, 0
@ SquareWave1 843528C
.byte 0x1, 0x3c, 0x0, 0x0
@@ -11172,10 +11156,7 @@ VoiceGroupTable_8434F14: @ 8434F14
.byte 0, 0, 15, 0
@ Noise 84354FC
- .byte 0xc, 0x3c, 0x0, 0x0
- .byte 0
- .byte 0, 0, 0
- .byte 0, 4, 1, 4
+ voice_noise_alt 0, 0, 4, 1, 4
@ Noise 8435508
.byte 0xc, 0x3c, 0x0, 0x0
@@ -11519,9 +11500,7 @@ VoiceGroupTable_8435514: @ 8435514
.byte 0, 0, 15, 0
@ Key-Split 84357B4
- .byte 0x40, 0, 0, 0
- .4byte VoiceGroupTable_8430258
- .4byte KeySplitTable_84552B4
+ voice_keysplit VoiceGroupTable_8430258, KeySplitTable_84552B4
@ SquareWave1 84357C0
.byte 0x1, 0x3c, 0x0, 0x0
@@ -11681,9 +11660,7 @@ VoiceGroupTable_8435514: @ 8435514
VoiceGroupTable_84358F8: @ 84358F8
@ Percussion 84358F8
- .byte 0x80, 0, 0, 0
- .4byte VoiceGroupTable_842FEF8
- .4byte 0x00000000
+ voice_keysplit_all VoiceGroupTable_842FEF8
@ SquareWave1 8435904
.byte 0x1, 0x3c, 0x0, 0x0
@@ -13351,9 +13328,7 @@ VoiceGroupTable_84362B8: @ 84362B8
.byte 255, 127, 231, 127
@ WaveMemory 8436630
- .byte 0x3, 0x3c, 0x0, 0x0
- .4byte ProgrammableWaveData_84553BC
- .byte 0, 7, 15, 1
+ voice_programmable_wave ProgrammableWaveData_84553BC, 0, 7, 15, 1
@ SquareWave1 843663C
.byte 0x1, 0x3c, 0x0, 0x0
@@ -14661,9 +14636,7 @@ VoiceGroupTable_8436C9C: @ 8436C9C
.byte 0, 0, 15, 0
@ WaveMemory 8437080
- .byte 0x3, 0x3c, 0x0, 0x0
- .4byte ProgrammableWaveData_845544C
- .byte 0, 7, 15, 2
+ voice_programmable_wave ProgrammableWaveData_845544C, 0, 7, 15, 2
VoiceGroupTable_843708C: @ 843708C
@@ -15604,9 +15577,7 @@ VoiceGroupTable_8437488: @ 8437488
.byte 0, 0, 15, 0
@ WaveMemory 84377F4
- .byte 0x3, 0x3c, 0x0, 0x0
- .4byte ProgrammableWaveData_84553BC
- .byte 0, 7, 15, 0
+ voice_programmable_wave ProgrammableWaveData_84553BC, 0, 7, 15, 0
@ SquareWave1 8437800
.byte 0x1, 0x3c, 0x0, 0x0
@@ -25310,16 +25281,10 @@ VoiceGroupTable_843C444: @ 843C444
.byte 0, 0, 15, 0
@ SquareWave2 843C474
- .byte 0xa, 0x3c, 0x0, 0x0
- .byte 2
- .byte 0, 0, 0
- .byte 1, 4, 4, 2
+ voice_square_2_alt 2, 1, 4, 4, 2
@ SquareWave1 843C480
- .byte 0x9, 0x3c, 0x0, 0x0
- .byte 2
- .byte 0, 0, 0
- .byte 0, 3, 4, 1
+ voice_square_1_alt 0, 2, 0, 3, 4, 1
@ SquareWave2 843C48C
.byte 0xa, 0x3c, 0x0, 0x0
@@ -69256,16 +69221,10 @@ VoiceGroupTable_8451990: @ 8451990
.byte 0, 0, 15, 0
@ Noise 8451F24
- .byte 0x4, 0x3c, 0x0, 0x0
- .byte 0
- .byte 0, 0, 0
- .byte 0, 7, 15, 0
+ voice_noise 0, 0, 7, 15, 0
@ Noise 8451F30
- .byte 0x4, 0x3c, 0x0, 0x0
- .byte 0
- .byte 0, 0, 0
- .byte 2, 7, 15, 0
+ voice_noise 0, 2, 7, 15, 0
@ Noise 8451F3C
.byte 0xc, 0x3c, 0x0, 0x0
@@ -69376,16 +69335,10 @@ VoiceGroupTable_8451F90: @ 8451F90
.byte 0, 2, 0, 0
@ SquareWave1 8452020
- .byte 0x1, 0x3c, 0x0, 0x67
- .byte 3
- .byte 0, 0, 0
- .byte 2, 7, 0, 0
+ voice_square_1 0x67, 3, 2, 7, 0, 0
@ SquareWave2 845202C
- .byte 0x2, 0x3c, 0x0, 0x0
- .byte 3
- .byte 0, 0, 0
- .byte 2, 7, 0, 0
+ voice_square_2 3, 2, 7, 0, 0
@ Direct Sound 8452038
.byte 0x0, 0x3c, 0x0, 0x0
@@ -71114,8 +71067,7 @@ ProgrammableWaveData_845544C: @ 845544C
gMPlayTable:: @ 845545C
.incbin "baserom.gba", 0x0045545c, 0x30
-gSongTable:: @ 845548C
- .include "data/music/music_pointers.s"
+ .include "data/music/music_pointers.s" @ 845548C
BlankMusic_Header: @ 845632C
.byte 0 @ number of tracks
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-19 15:36:06 +0000