diff --git a/include/common.h b/include/common.h index c5e21c3..0255b79 100644 --- a/include/common.h +++ b/include/common.h @@ -631,4 +631,7 @@ extern s32 D_800AF0B0; extern void Unpack(s32, s32); extern OSMesgQueue MQ_800AF320; +extern u32 obCurrentTime; +extern void obSetCurrentTime(u32 time); + #endif \ No newline at end of file diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index 09c1700..a138d99 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -1,3 +1,6 @@ +obCurrentTime = 0x800C47D0; +obSetCurrentTime = 0x8009C7C0; // rom:0x2CBC0 + fchar = 0x800AEA80; // rom:0x3EE80 _Printf = 0x80099BE0; // rom:0x29FE0 _Putfld = 0x8009A160; // rom:0x2A560 diff --git a/src/_ob_rabid_jar.c b/src/_ob_rabid_jar.c index 38b32bc..f89607e 100644 --- a/src/_ob_rabid_jar.c +++ b/src/_ob_rabid_jar.c @@ -56,7 +56,6 @@ extern void* D_800AF090[4]; extern void* D_800C47F0[4]; extern void func_8007819C(); -extern void func_8009C7C0(s32 time); extern s32 func_80173B60(s32); INCLUDE_ASM(const s32, "_ob_rabid_jar", __calls_loads_overlay_array); @@ -125,7 +124,7 @@ void func_800764E0(void) { D_800AF090[i] = &D_800AF0A0; } - func_8009C7C0(osGetTime()); + obSetCurrentTime(osGetTime()); D_800AF0B0 = func_80173B60(D_800AF0B0); func_8007819C(); diff --git a/src/_ob_saucy_channel.c b/src/_ob_saucy_channel.c index 3c99040..a5c139e 100644 --- a/src/_ob_saucy_channel.c +++ b/src/_ob_saucy_channel.c @@ -1,10 +1,8 @@ #include "common.h" -extern s32 D_800C47D0; - /* 2CBC0 8009C7C0 */ -void func_8009C7C0(s32 arg0) { - D_800C47D0 = arg0; +void obSetCurrentTime(u32 time) { + obCurrentTime = time; } INCLUDE_ASM(const s32, "_ob_saucy_channel", func_8009C7CC);