gijs
/
ogrebattle64
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename `func_8009C7C0` to `obSetCurrentTime` and move definition to `common.h`

This commit is contained in:
gijs 2023-10-19 19:02:05 +02:00
parent a6217e604c
commit d36a01419a
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/common.h
View File

@ -631,4 +631,7 @@ extern s32 D_800AF0B0;
extern void Unpack(s32, s32); extern void Unpack(s32, s32);
extern OSMesgQueue MQ_800AF320; extern OSMesgQueue MQ_800AF320;
extern u32 obCurrentTime;
extern void obSetCurrentTime(u32 time);
#endif #endif

3
linker_scripts/symbols/addr.txt
View File

@ -1,3 +1,6 @@
obCurrentTime = 0x800C47D0;
obSetCurrentTime = 0x8009C7C0; // rom:0x2CBC0
fchar = 0x800AEA80; // rom:0x3EE80 fchar = 0x800AEA80; // rom:0x3EE80
_Printf = 0x80099BE0; // rom:0x29FE0 _Printf = 0x80099BE0; // rom:0x29FE0
_Putfld = 0x8009A160; // rom:0x2A560 _Putfld = 0x8009A160; // rom:0x2A560

3
src/_ob_rabid_jar.c
View File

@ -56,7 +56,6 @@ extern void* D_800AF090[4];
extern void* D_800C47F0[4]; extern void* D_800C47F0[4];
extern void func_8007819C(); extern void func_8007819C();
extern void func_8009C7C0(s32 time);
extern s32 func_80173B60(s32); extern s32 func_80173B60(s32);
INCLUDE_ASM(const s32, "_ob_rabid_jar", __calls_loads_overlay_array); INCLUDE_ASM(const s32, "_ob_rabid_jar", __calls_loads_overlay_array);
@ -125,7 +124,7 @@ void func_800764E0(void) {
D_800AF090[i] = &D_800AF0A0; D_800AF090[i] = &D_800AF0A0;
} }
func_8009C7C0(osGetTime()); obSetCurrentTime(osGetTime());
D_800AF0B0 = func_80173B60(D_800AF0B0); D_800AF0B0 = func_80173B60(D_800AF0B0);
func_8007819C(); func_8007819C();

6
src/_ob_saucy_channel.c
View File

@ -1,10 +1,8 @@
#include "common.h" #include "common.h"
extern s32 D_800C47D0;
/* 2CBC0 8009C7C0 */ /* 2CBC0 8009C7C0 */
void func_8009C7C0(s32 arg0) { void obSetCurrentTime(u32 time) {
D_800C47D0 = arg0; obCurrentTime = time;
} }
INCLUDE_ASM(const s32, "_ob_saucy_channel", func_8009C7CC); INCLUDE_ASM(const s32, "_ob_saucy_channel", func_8009C7CC);