Merge branch 'master' of https://github.com/CrashOveride95/ultrasm64

Makefile

@@ -515,7 +515,7 @@ $(BUILD_DIR)/asm/boot.o:              $(IPL3_RAW_FILES)
 $(BUILD_DIR)/src/game/crash_screen.o: $(CRASH_TEXTURE_C_FILES)
 $(BUILD_DIR)/src/game/version.o:      $(BUILD_DIR)/src/game/version_data.h
 $(BUILD_DIR)/lib/rsp.o:               $(BUILD_DIR)/rsp/rspboot.bin $(BUILD_DIR)/rsp/fast3d.bin $(BUILD_DIR)/rsp/audio.bin
-$(SOUND_BIN_DIR)/sound_data.o:        $(SOUND_BIN_DIR)/sound_data.ctl.inc.c $(SOUND_BIN_DIR)/sound_data.tbl.inc.c $(SOUND_BIN_DIR)/sequences.bin.inc.c $(SOUND_BIN_DIR)/bank_sets.inc.c
+$(SOUND_BIN_DIR)/sound_data.o:        $(SOUND_BIN_DIR)/sound_data.ctl $(SOUND_BIN_DIR)/sound_data.tbl $(SOUND_BIN_DIR)/sequences.bin $(SOUND_BIN_DIR)/bank_sets
 $(BUILD_DIR)/levels/scripts.o:        $(BUILD_DIR)/include/level_headers.h
 
 ifeq ($(VERSION),sh)

sound/sound_data.c

@@ -1,17 +0,0 @@
-unsigned char gSoundDataADSR[] = {
-#include "sound/sound_data.ctl.inc.c"
-};
-
-unsigned char gSoundDataRaw[] = {
-#include "sound/sound_data.tbl.inc.c"
-};
-
-unsigned char gMusicData[] = {
-#include "sound/sequences.bin.inc.c"
-};
-
-#ifndef VERSION_SH
-unsigned char gBankSetsData[] = {
-#include "sound/bank_sets.inc.c"
-};
-#endif

sound/sound_data.s

@@ -0,0 +1,21 @@
+.include "macros.inc"
+
+.section .data
+
+glabel gSoundDataADSR
+.incbin "sound/sound_data.ctl"
+.balign 16
+
+glabel gSoundDataRaw
+.incbin "sound/sound_data.tbl"
+.balign 16
+
+glabel gMusicData
+.incbin "sound/sequences.bin"
+.balign 16
+
+#ifndef VERSION_SH
+glabel gBankSetsData
+.incbin "sound/bank_sets"
+.balign 16
+#endif