From f99479e8a016cd95c4e5bb35193ffb61ba746500 Mon Sep 17 00:00:00 2001 From: Alejandro Javier Asenjo Nitti Date: Sat, 14 Oct 2023 04:10:34 -0300 Subject: more libultra symbols --- src/main/7D30.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/main') diff --git a/src/main/7D30.c b/src/main/7D30.c index 640e9fe6..3ffdb110 100644 --- a/src/main/7D30.c +++ b/src/main/7D30.c @@ -1,16 +1,16 @@ #include "common.h" -extern s64 D_800C7E10; +extern s64 osClockRate; extern s32 D_800E2128; -extern s32 func_800234B0(s32*, u8, s32, s32); -extern s32 func_800237B0(s32*, u8, s32); -extern s64 func_80023CF8(s64, s64); -extern s64 func_80023DF8(s64, s64); +extern s32 osEepromRead(s32*, u8, s32, s32); +extern s32 osEepromWrite(s32*, u8, s32); +extern s64 __ull_div(s64, s64); +extern s64 __ll_mul(s64, s64); extern void func_800070C8(s64); s32 func_80007130(s32 arg0, s32 arg1) { - if (func_800234B0(&D_800E2128, arg0, arg1, arg0) != 0) { + if (osEepromRead(&D_800E2128, arg0, arg1, arg0) != 0) { return -1; } else { return 0; @@ -22,12 +22,12 @@ s32 func_8000716C(s32 arg0, s32 arg1) { s64 temp_ret_2; s64 temp_ret_3; - if (func_800237B0(&D_800E2128, arg0, arg1) != 0) { + if (osEepromWrite(&D_800E2128, arg0, arg1) != 0) { return -1; } - temp_ret = func_80023CF8(D_800C7E10, 0x3D09); - temp_ret_2 = func_80023DF8(0x3A98, temp_ret); - temp_ret_3 = func_80023CF8(temp_ret_2, 0x40); + temp_ret = __ull_div(osClockRate, 0x3D09); + temp_ret_2 = __ll_mul(0x3A98, temp_ret); + temp_ret_3 = __ull_div(temp_ret_2, 0x40); func_800070C8(temp_ret_3); return 0; -- cgit v1.2.3