diff --git a/asm/non_matchings/menu/func_80080518.s b/asm/non_matchings/menu/func_80080518.s deleted file mode 100644 index 1616180c..00000000 --- a/asm/non_matchings/menu/func_80080518.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80080518 -/* 081118 80080518 3C014200 */ li $at, 0x42000000 # 32.000000 -/* 08111C 8008051C 44810000 */ mtc1 $at, $f0 -/* 081120 80080520 00000000 */ nop -/* 081124 80080524 46006102 */ mul.s $f4, $f12, $f0 -/* 081128 80080528 444EF800 */ cfc1 $t6, $31 -/* 08112C 8008052C 00000000 */ nop -/* 081130 80080530 35C10003 */ ori $at, $t6, 3 -/* 081134 80080534 38210002 */ xori $at, $at, 2 -/* 081138 80080538 44C1F800 */ ctc1 $at, $31 -/* 08113C 8008053C 3C01800E */ lui $at, %hi(D_800E1DC0) # $at, 0x800e -/* 081140 80080540 460021A4 */ cvt.w.s $f6, $f4 -/* 081144 80080544 44CEF800 */ ctc1 $t6, $31 -/* 081148 80080548 440F3000 */ mfc1 $t7, $f6 -/* 08114C 8008054C 46007202 */ mul.s $f8, $f14, $f0 -/* 081150 80080550 AC2F1DC0 */ sw $t7, %lo(D_800E1DC0)($at) -/* 081154 80080554 4458F800 */ cfc1 $t8, $31 -/* 081158 80080558 00000000 */ nop -/* 08115C 8008055C 37010003 */ ori $at, $t8, 3 -/* 081160 80080560 38210002 */ xori $at, $at, 2 -/* 081164 80080564 44C1F800 */ ctc1 $at, $31 -/* 081168 80080568 3C01800E */ lui $at, %hi(D_800E1DC4) # $at, 0x800e -/* 08116C 8008056C 460042A4 */ cvt.w.s $f10, $f8 -/* 081170 80080570 44195000 */ mfc1 $t9, $f10 -/* 081174 80080574 44D8F800 */ ctc1 $t8, $31 -/* 081178 80080578 03E00008 */ jr $ra -/* 08117C 8008057C AC391DC4 */ sw $t9, %lo(D_800E1DC4)($at) \ No newline at end of file diff --git a/src/menu.c b/src/menu.c index e505b410..385e51bf 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1710,7 +1710,12 @@ void func_8007FF88(void) { } GLOBAL_ASM("asm/non_matchings/menu/func_8007FFEC.s") -GLOBAL_ASM("asm/non_matchings/menu/func_80080518.s") + +void func_80080518(f32 arg0, f32 arg1) { + D_800E1DC0 = (s32) (arg0 * 32.0f); + D_800E1DC4 = (s32) (arg1 * 32.0f); +} + GLOBAL_ASM("asm/non_matchings/menu/func_80080580.s") GLOBAL_ASM("asm/non_matchings/menu/func_80080BC8.s")