diff --git a/src/include/lib/lib_317f0.h b/src/include/lib/lib_317f0.h index 001452b15..2c13c9873 100644 --- a/src/include/lib/lib_317f0.h +++ b/src/include/lib/lib_317f0.h @@ -23,7 +23,7 @@ u32 func00033dd8(void); void audioPostEvent(struct audiohandle *handle, s16 type, s32 data); u16 func00033ec4(u8 index); u32 func00033f08(void); -u32 func00033f24(void); +ALMicroTime sndpGetCurTime(void); void func00033f44(u8 index, u16 volume); #endif diff --git a/src/lib/lib_317f0.c b/src/lib/lib_317f0.c index 16ac50640..961ed327d 100644 --- a/src/lib/lib_317f0.c +++ b/src/lib/lib_317f0.c @@ -1213,17 +1213,10 @@ glabel func00033f08 #endif #if VERSION >= VERSION_NTSC_1_0 -GLOBAL_ASM( -glabel func00033f24 -/* 33f24: 3c0e8006 */ lui $t6,%hi(g_SndPlayer) -/* 33f28: 8dcef12c */ lw $t6,%lo(g_SndPlayer)($t6) -/* 33f2c: 03e00008 */ jr $ra -/* 33f30: 8dc20050 */ lw $v0,0x50($t6) -/* 33f34: 03e00008 */ jr $ra -/* 33f38: 00000000 */ nop -/* 33f3c: 03e00008 */ jr $ra -/* 33f40: 00000000 */ nop -); +ALMicroTime sndpGetCurTime(void) +{ + return g_SndPlayer->curTime; +} #endif #if VERSION >= VERSION_NTSC_1_0 diff --git a/src/lib/snd.c b/src/lib/snd.c index a77a8181b..94e589844 100644 --- a/src/lib/snd.c +++ b/src/lib/snd.c @@ -2552,7 +2552,7 @@ glabel sndTick /* feb0: 00002025 */ or $a0,$zero,$zero /* feb4: 0c01210c */ jal osSetThreadPri /* feb8: 24450001 */ addiu $a1,$v0,0x1 -/* febc: 0c00cfc9 */ jal func00033f24 +/* febc: 0c00cfc9 */ jal sndpGetCurTime /* fec0: 00000000 */ nop /* fec4: 0c00cfc2 */ jal func00033f08 /* fec8: afa20060 */ sw $v0,0x60($sp) @@ -2900,7 +2900,7 @@ glabel sndTick /* feb0: 00002025 */ or $a0,$zero,$zero /* feb4: 0c01210c */ jal osSetThreadPri /* feb8: 24450001 */ addiu $a1,$v0,0x1 -/* febc: 0c00cfc9 */ jal func00033f24 +/* febc: 0c00cfc9 */ jal sndpGetCurTime /* fec0: 00000000 */ nop /* fec4: 0c00cfc2 */ jal func00033f08 /* fec8: afa20060 */ sw $v0,0x60($sp)