Clean up/Dump sound/songs data

Makefile

@@ -107,11 +107,14 @@ MID_BUILDDIR = $(BUILD_DIR)/$(MID_SUBDIR)
 C_SOURCES   := $(wildcard src/*.c)
 ASM_SOURCES := $(wildcard asm/*.s data/*.s)
 C_ASM_SOURCES := $(wildcard src/*.s)
+SONG_SRCS := $(wildcard sound/songs/*.s)
 
 C_OBJECTS    := $(addprefix $(BUILD_DIR)/, $(C_SOURCES:%.c=%.o))
 ASM_OBJECTS  := $(addprefix $(BUILD_DIR)/, $(ASM_SOURCES:%.s=%.o))
 C_ASM_OBJECTS := $(addprefix $(BUILD_DIR)/, $(C_ASM_SOURCES:%.s=%.o))
-ALL_OBJECTS := $(C_OBJECTS) $(ASM_OBJECTS) $(C_ASM_OBJECTS)
+SONG_OBJS := $(addprefix $(BUILD_DIR)/, $(SONG_SRCS:%.s=%.o))
+
+ALL_OBJECTS := $(C_OBJECTS) $(ASM_OBJECTS) $(C_ASM_OBJECTS) $(SONG_OBJS)
 
 SUBDIRS := $(sort $(dir $(ALL_OBJECTS)))
 
@@ -236,6 +239,13 @@ $(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s
 $(ASM_BUILDDIR)/%.d: $(ASM_SUBDIR)/%.s
 	@$(call scaninc,$(INCLUDE_PATHS))
 
+$(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s
+	@$(CPP) -x assembler-with-cpp $(CPPFLAGS) $< -o $(SONG_BUILDDIR)/$*.s
+	$(AS) $(ASFLAGS) -o $@ $(SONG_BUILDDIR)/$*.s
+
+$(SONG_BUILDDIR)/%.d: $(SONG_SUBDIR)/%.s
+	@$(call scaninc,$(INCLUDE_PATHS))
+
 $(C_BUILDDIR)/%.o: $(C_SUBDIR)/%.s
 	@$(CPP) -x assembler-with-cpp $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.s
 	$(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s

VoiceDef.s

@@ -0,0 +1,20 @@
+.include "MPlayDef.s"
+
+.equ	DirectSound, 	0x00
+.equ	SquareWave1, 	0x01
+.equ	ProgNoise, 		0x04
+.equ	RoughNoise, 	0x01
+.equ    DirectSoundFix, 0x08
+.equ	ASquareWave1, 	0x09
+.equ    ASquareWave2, 	0x0A
+.equ    AProgWave, 		0x0B
+.equ 	AProgNoise, 	0x0C
+.equ 	KeySplit, 		0x40
+.equ 	DrumTable, 		0x80
+
+.equ 	FineNoise,	0x00
+
+.equ 	WaveDuty75, 0x03
+.equ 	WaveDuty50, 0x02
+.equ 	WaveDuty25, 0x01
+.equ 	WaveDuty12, 0x00