diff --git a/Makefile b/Makefile index a670a8c6b..f97b9e8db 100644 --- a/Makefile +++ b/Makefile @@ -93,6 +93,7 @@ $(B_DIR)/lib/ultra/audio/cseq.o: OPT_LVL := -g $(B_DIR)/lib/ultra/audio/csplayer.o: OPT_LVL := -g $(B_DIR)/lib/ultra/audio/event.o: OPT_LVL := -g $(B_DIR)/lib/ultra/audio/heap.o: OPT_LVL := -g +$(B_DIR)/lib/ultra/audio/syndelete.o: OPT_LVL := -g $(B_DIR)/lib/ultra/audio/synsetpriority.o: OPT_LVL := -g $(B_DIR)/lib/ultra/gu/align.o: OPT_LVL := -O3 $(B_DIR)/lib/ultra/gu/frustum.o: OPT_LVL := -O3 diff --git a/ld/libfiles.ntsc-beta.inc b/ld/libfiles.ntsc-beta.inc index 245a04dd6..83286e410 100644 --- a/ld/libfiles.ntsc-beta.inc +++ b/ld/libfiles.ntsc-beta.inc @@ -75,7 +75,7 @@ build/ROMID/lib/lib_39be0.o (section); \ build/ROMID/lib/lib_39c80.o (section); \ build/ROMID/lib/lib_39f70.o (section); \ - build/ROMID/lib/lib_39fc0.o (section); \ + build/ROMID/lib/ultra/audio/syndelete.o (section); \ build/ROMID/lib/lib_39fe0.o (section); \ build/ROMID/lib/lib_3a100.o (section); \ build/ROMID/lib/lib_3c430.o (section); \ diff --git a/ld/libfiles.ntsc-final.inc b/ld/libfiles.ntsc-final.inc index 81bad4432..d0c41983d 100644 --- a/ld/libfiles.ntsc-final.inc +++ b/ld/libfiles.ntsc-final.inc @@ -73,7 +73,7 @@ build/ROMID/lib/lib_39be0.o (section); \ build/ROMID/lib/lib_39c80.o (section); \ build/ROMID/lib/lib_39f70.o (section); \ - build/ROMID/lib/lib_39fc0.o (section); \ + build/ROMID/lib/ultra/audio/syndelete.o (section); \ build/ROMID/lib/lib_39fe0.o (section); \ build/ROMID/lib/lib_3a100.o (section); \ build/ROMID/lib/lib_3c430.o (section); \ diff --git a/ld/libfiles.pal-final.inc b/ld/libfiles.pal-final.inc index 3d2265480..cffda8ca3 100644 --- a/ld/libfiles.pal-final.inc +++ b/ld/libfiles.pal-final.inc @@ -73,7 +73,7 @@ build/ROMID/lib/lib_39be0.o (section); \ build/ROMID/lib/lib_39c80.o (section); \ build/ROMID/lib/lib_39f70.o (section); \ - build/ROMID/lib/lib_39fc0.o (section); \ + build/ROMID/lib/ultra/audio/syndelete.o (section); \ build/ROMID/lib/lib_39fe0.o (section); \ build/ROMID/lib/lib_3a100.o (section); \ build/ROMID/lib/lib_3c430.o (section); \ diff --git a/src/lib/lib_39fc0.c b/src/lib/lib_39fc0.c deleted file mode 100644 index 65706d0cd..000000000 --- a/src/lib/lib_39fc0.c +++ /dev/null @@ -1,16 +0,0 @@ -#include -#include "constants.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -GLOBAL_ASM( -glabel n_alSynDelete -/* 39fc0: 3c0e8006 */ lui $t6,%hi(alGlobals) -/* 39fc4: 8dcef114 */ lw $t6,%lo(alGlobals)($t6) -/* 39fc8: adc00000 */ sw $zero,0x0($t6) -/* 39fcc: 03e00008 */ jr $ra -/* 39fd0: 00000000 */ nop -/* 39fd4: 03e00008 */ jr $ra -/* 39fd8: 00000000 */ nop -); diff --git a/src/lib/ultra/audio/syndelete.c b/src/lib/ultra/audio/syndelete.c new file mode 100644 index 000000000..266d16057 --- /dev/null +++ b/src/lib/ultra/audio/syndelete.c @@ -0,0 +1,10 @@ +#include +#include "constants.h" +#include "bss.h" +#include "data.h" +#include "types.h" + +void n_alSynDelete(void) +{ + alGlobals->drvr.head = NULL; +}