diff --git a/asm/nonmatchings/code_2d9a0_len_890/func_80052BC0.s b/asm/nonmatchings/code_2d9a0_len_890/func_80052BC0.s deleted file mode 100644 index 9f590f412f..0000000000 --- a/asm/nonmatchings/code_2d9a0_len_890/func_80052BC0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80052BC0 -/* 2DFC0 80052BC0 3C02B65C */ lui $v0, 0xb65c -/* 2DFC4 80052BC4 34426D59 */ ori $v0, $v0, 0x6d59 -/* 2DFC8 80052BC8 00820018 */ mult $a0, $v0 -/* 2DFCC 80052BCC 00002810 */ mfhi $a1 -/* 2DFD0 80052BD0 00A41821 */ addu $v1, $a1, $a0 -/* 2DFD4 80052BD4 00031B03 */ sra $v1, $v1, 0xc -/* 2DFD8 80052BD8 000427C3 */ sra $a0, $a0, 0x1f -/* 2DFDC 80052BDC 00641823 */ subu $v1, $v1, $a0 -/* 2DFE0 80052BE0 00031040 */ sll $v0, $v1, 1 -/* 2DFE4 80052BE4 00431021 */ addu $v0, $v0, $v1 -/* 2DFE8 80052BE8 000210C0 */ sll $v0, $v0, 3 -/* 2DFEC 80052BEC 00431023 */ subu $v0, $v0, $v1 -/* 2DFF0 80052BF0 03E00008 */ jr $ra -/* 2DFF4 80052BF4 000210C0 */ sll $v0, $v0, 3 diff --git a/src/audio.h b/src/audio.h index 231974e7fa..3d380fc3c7 100644 --- a/src/audio.h +++ b/src/audio.h @@ -201,7 +201,7 @@ typedef struct UnkAl30 { /* 0x2C */ s32* unk_2C; } UnkAl30; -typedef struct UnkAl48 { // TRack? +typedef struct UnkAl48 { // Track? /* 0x00 */ s32 unk_00; // pointer to something /* 0x04 */ f32 unk_04; /* 0x08 */ s32 unk_08; diff --git a/src/code_2d9a0_len_890.c b/src/code_2d9a0_len_890.c index 53f4b3b5f7..9f3dc87c4a 100644 --- a/src/code_2d9a0_len_890.c +++ b/src/code_2d9a0_len_890.c @@ -45,7 +45,9 @@ void func_80052B44(UnkAl48* arg0) { arg0->unk_43 |= 0x4; } -INCLUDE_ASM(s32, "code_2d9a0_len_890", func_80052BC0); +s32 func_80052BC0(s32 arg0) { + return (arg0 / 5750) * 0xB8; +} INCLUDE_ASM(void, "code_2d9a0_len_890", func_80052BF8, UnkAl48* arg0, s32* arg1);