From da970294babe91e9c2c2b7617440be9b13225016 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 18 Oct 2021 20:05:08 +1000 Subject: [PATCH] Decompile func00033ec4 --- src/include/lib/lib_317f0.h | 2 +- src/lib/lib_317f0.c | 27 ++++----------------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/src/include/lib/lib_317f0.h b/src/include/lib/lib_317f0.h index dc0ea7d99..001452b15 100644 --- a/src/include/lib/lib_317f0.h +++ b/src/include/lib/lib_317f0.h @@ -21,7 +21,7 @@ u32 func00033cf0(void); u32 func00033db0(void); u32 func00033dd8(void); void audioPostEvent(struct audiohandle *handle, s16 type, s32 data); -u16 func00033ec4(s32 arg0); +u16 func00033ec4(u8 index); u32 func00033f08(void); u32 func00033f24(void); void func00033f44(u8 index, u16 volume); diff --git a/src/lib/lib_317f0.c b/src/lib/lib_317f0.c index 41426ac43..6541cc6b7 100644 --- a/src/lib/lib_317f0.c +++ b/src/lib/lib_317f0.c @@ -1214,29 +1214,10 @@ void audioPostEvent(struct audiohandle *handle, s16 type, s32 data) } } -GLOBAL_ASM( -glabel func00033ec4 -/* 33ec4: 27bdfff8 */ addiu $sp,$sp,-8 -/* 33ec8: 308400ff */ andi $a0,$a0,0xff -/* 33ecc: 3c0e800a */ lui $t6,%hi(var8009c334) -/* 33ed0: 8dcec334 */ lw $t6,%lo(var8009c334)($t6) -/* 33ed4: 11c00005 */ beqz $t6,.L00033eec -/* 33ed8: 00000000 */ nop -/* 33edc: 00047840 */ sll $t7,$a0,0x1 -/* 33ee0: 01cfc021 */ addu $t8,$t6,$t7 -/* 33ee4: 10000002 */ b .L00033ef0 -/* 33ee8: 87050000 */ lh $a1,0x0($t8) -.L00033eec: -/* 33eec: 00002825 */ or $a1,$zero,$zero -.L00033ef0: -/* 33ef0: 10000003 */ b .L00033f00 -/* 33ef4: 30a2ffff */ andi $v0,$a1,0xffff -/* 33ef8: 10000001 */ b .L00033f00 -/* 33efc: 00000000 */ nop -.L00033f00: -/* 33f00: 03e00008 */ jr $ra -/* 33f04: 27bd0008 */ addiu $sp,$sp,0x8 -); +u16 func00033ec4(u8 index) +{ + return var8009c334 ? var8009c334[index] : 0; +} #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM(