From 5e8db8ae8b3ff7f729531150b59ba7b6384fa07f Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 27 Mar 2021 23:03:04 +1000 Subject: [PATCH] Decompile alSynSetPriority --- Makefile | 1 + ld/libfiles.ntsc-beta.inc | 1 + ld/libfiles.ntsc-final.inc | 1 + ld/libfiles.pal-final.inc | 1 + src/lib/lib_44bc0.c | 11 ----------- src/lib/ultra/audio/synsetpriority.c | 12 ++++++++++++ 6 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 src/lib/ultra/audio/synsetpriority.c diff --git a/Makefile b/Makefile index 02a17ed2c..5c0b02442 100644 --- a/Makefile +++ b/Makefile @@ -90,6 +90,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/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 $(B_DIR)/lib/ultra/gu/ortho.o: OPT_LVL := -O3 diff --git a/ld/libfiles.ntsc-beta.inc b/ld/libfiles.ntsc-beta.inc index dc9cb9713..a4c187390 100644 --- a/ld/libfiles.ntsc-beta.inc +++ b/ld/libfiles.ntsc-beta.inc @@ -91,6 +91,7 @@ build/ROMID/lib/lib_43dd0.o (section); \ build/ROMID/lib/lib_446d0.o (section); \ build/ROMID/lib/lib_44bc0.o (section); \ + build/ROMID/lib/ultra/audio/synsetpriority.o (section); \ build/ROMID/lib/lib_44f60.o (section); \ build/ROMID/lib/lib_45ed0.o (section); \ build/ROMID/lib/lib_461c0.o (section); \ diff --git a/ld/libfiles.ntsc-final.inc b/ld/libfiles.ntsc-final.inc index a506a5159..c119890ee 100644 --- a/ld/libfiles.ntsc-final.inc +++ b/ld/libfiles.ntsc-final.inc @@ -89,6 +89,7 @@ build/ROMID/lib/lib_43dd0.o (section); \ build/ROMID/lib/lib_446d0.o (section); \ build/ROMID/lib/lib_44bc0.o (section); \ + build/ROMID/lib/ultra/audio/synsetpriority.o (section); \ build/ROMID/lib/lib_44f60.o (section); \ build/ROMID/lib/lib_45ed0.o (section); \ build/ROMID/lib/lib_461c0.o (section); \ diff --git a/ld/libfiles.pal-final.inc b/ld/libfiles.pal-final.inc index a29fb081d..e566e4735 100644 --- a/ld/libfiles.pal-final.inc +++ b/ld/libfiles.pal-final.inc @@ -89,6 +89,7 @@ build/ROMID/lib/lib_43dd0.o (section); \ build/ROMID/lib/lib_446d0.o (section); \ build/ROMID/lib/lib_44bc0.o (section); \ + build/ROMID/lib/ultra/audio/synsetpriority.o (section); \ build/ROMID/lib/lib_44f60.o (section); \ build/ROMID/lib/lib_45ed0.o (section); \ build/ROMID/lib/lib_461c0.o (section); \ diff --git a/src/lib/lib_44bc0.c b/src/lib/lib_44bc0.c index dc2749f26..4155d9328 100644 --- a/src/lib/lib_44bc0.c +++ b/src/lib/lib_44bc0.c @@ -245,14 +245,3 @@ glabel func00044bc0 /* 44f38: 03e00008 */ jr $ra /* 44f3c: 00000000 */ nop ); - -GLOBAL_ASM( -glabel alSynSetPriority -/* 44f40: 00052c00 */ sll $a1,$a1,0x10 -/* 44f44: 00052c03 */ sra $a1,$a1,0x10 -/* 44f48: a4850016 */ sh $a1,0x16($a0) -/* 44f4c: 03e00008 */ jr $ra -/* 44f50: 00000000 */ nop -/* 44f54: 03e00008 */ jr $ra -/* 44f58: 00000000 */ nop -); diff --git a/src/lib/ultra/audio/synsetpriority.c b/src/lib/ultra/audio/synsetpriority.c new file mode 100644 index 000000000..728521a58 --- /dev/null +++ b/src/lib/ultra/audio/synsetpriority.c @@ -0,0 +1,12 @@ +#include +#include "constants.h" +#include "bss.h" +#include "lib/lib_37b00.h" +#include "lib/lib_3a100.h" +#include "data.h" +#include "types.h" + +void alSynSetPriority(ALVoice *voice, s16 priority) +{ + voice->priority = priority; +}