From 6a14ae87edd676a64d159b02901aadaf2aaffd46 Mon Sep 17 00:00:00 2001 From: gijs Date: Thu, 19 Oct 2023 19:07:42 +0200 Subject: [PATCH] Rename `func_8009C7CC` to `obGetCurrentTime` and move definition to `common.h` --- include/common.h | 1 + linker_scripts/symbols/addr.txt | 1 + src/_ob_saucy_channel.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/common.h b/include/common.h index 0255b79..c60caba 100644 --- a/include/common.h +++ b/include/common.h @@ -633,5 +633,6 @@ extern OSMesgQueue MQ_800AF320; extern u32 obCurrentTime; extern void obSetCurrentTime(u32 time); +extern u32 obGetCurrentTime(); #endif \ No newline at end of file diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index a138d99..12aa235 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -1,5 +1,6 @@ obCurrentTime = 0x800C47D0; obSetCurrentTime = 0x8009C7C0; // rom:0x2CBC0 +obGetCurrentTime = 0x8009C7CC; // rom:0x2CBCC fchar = 0x800AEA80; // rom:0x3EE80 _Printf = 0x80099BE0; // rom:0x29FE0 diff --git a/src/_ob_saucy_channel.c b/src/_ob_saucy_channel.c index a5c139e..7b80184 100644 --- a/src/_ob_saucy_channel.c +++ b/src/_ob_saucy_channel.c @@ -5,4 +5,4 @@ void obSetCurrentTime(u32 time) { obCurrentTime = time; } -INCLUDE_ASM(const s32, "_ob_saucy_channel", func_8009C7CC); +INCLUDE_ASM(const s32, "_ob_saucy_channel", obGetCurrentTime);