diff --git a/include/common.h b/include/common.h index ebefc5e..aed973f 100644 --- a/include/common.h +++ b/include/common.h @@ -194,8 +194,6 @@ extern void nuPiInit(); extern void __set_black(); extern void __calls_osViBlack(bool black); -extern void __start_thread_800B9C88(); - extern void __something_display_list(Gfx*, s32, s32, s32); extern void func_80089A10(); @@ -218,8 +216,6 @@ extern void func_8008A37C(); extern void func_8008B130(u8*); extern void func_8008B1D0(u8*); -extern void __thread_8008AFE0(void*); - extern void func_8008350C(); extern void func_8008B1D0(u8*); diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index 221cb1e..f2a090e 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -26,6 +26,10 @@ nuScResetClientMesgType = 0x800890E4; nuScWaitTaskReady = 0x8008949C; nuGfxSetCfb = 0x80089AB0; nuGfxInitEX2 = 0x8008A1B0; +nuGfxThreadStart = 0x8008B0B0; +nuGfxTaskMgrInit = 0x80089660; +gfxThread = 0x8008AFE0; + obCurrentTime = 0x800C47D0; obSetCurrentTime = 0x8009C7C0; // rom:0x2CBC0 @@ -866,8 +870,6 @@ __calls_romCopy_8009DE40 = 0x8009DE40; __load_and_unpack = 0x8009DF48; //__calls_romCopy_800EA488 = 0x800EA488; -nuGfxThreadStart = 0x8008B0B0; -__start_thread_800B9C88 = 0x80089660; magnitude = 0x8009C780; @@ -930,7 +932,6 @@ __MAYBE_SONG_800EB290 = 0x800EB290; // size:0x50 __MAYBE_SONG_ARRAY_800A8218 = 0x800A8218; // size:0x1C __initialize_song_mem = 0x80073FD4; -__thread_8008AFE0 = 0x8008AFE0; __thread_80089540 = 0x80089540; STR_INVALID_HEADER_LHA_FILE = 0x800AE108; diff --git a/src/_ob_grumpy_island.c b/src/_ob_grumpy_island.c index ec64252..1a39ea9 100644 --- a/src/_ob_grumpy_island.c +++ b/src/_ob_grumpy_island.c @@ -3,7 +3,7 @@ #include "nu/nusys.h" /* 1B3E0 8008AFE0 */ -void __thread_8008AFE0(void* arg0) { +void gfxThread(void* arg0) { NUScClient sp10; u16* sp20; s16 temp_v0; @@ -32,6 +32,6 @@ void __thread_8008AFE0(void* arg0) { } void nuGfxThreadStart(void) { - osCreateThread(&THREAD_800BE1C0, 4, __thread_8008AFE0, NULL, SP_THREAD_800BE1C0, 0x32); + osCreateThread(&THREAD_800BE1C0, 4, gfxThread, NULL, SP_THREAD_800BE1C0, 0x32); osStartThread(&THREAD_800BE1C0); } diff --git a/src/_ob_past_brick.c b/src/_ob_past_brick.c index 067ee55..0fc2a08 100644 --- a/src/_ob_past_brick.c +++ b/src/_ob_past_brick.c @@ -175,7 +175,7 @@ s32 nuScGetFrameRate() { INCLUDE_ASM(const s32, "_ob_past_brick", __thread_80089540); -INCLUDE_ASM(const s32, "_ob_past_brick", __start_thread_800B9C88); +INCLUDE_ASM(const s32, "_ob_past_brick", nuGfxTaskMgrInit); INCLUDE_ASM(const s32, "_ob_past_brick", __something_display_list); diff --git a/src/_ob_unusual_spiders.c b/src/_ob_unusual_spiders.c index 8963479..f793399 100644 --- a/src/_ob_unusual_spiders.c +++ b/src/_ob_unusual_spiders.c @@ -12,7 +12,7 @@ void nuGfxInitEX2(void) { D_800C4B20 = BOOT_ADDRESS_ULTRA; set_swap_buffer_func(__osViSwapBuffer_3); D_800C4CE0 = &D_800A9EB0; - __start_thread_800B9C88(); + nuGfxTaskMgrInit(); gSPDisplayList(ptr++, &D_A9EF0); gDPFullSync(ptr++);