From d781c0572c37daf973e98e44bad0e7b9698038ab Mon Sep 17 00:00:00 2001 From: gijs Date: Fri, 20 Oct 2023 17:06:25 +0200 Subject: [PATCH] Rename `func_80089A10` to `nuGfxTaskAllEndWait` --- include/common.h | 2 -- linker_scripts/symbols/addr.txt | 1 + src/_ob_past_brick.c | 2 +- src/_ob_unusual_spiders.c | 2 +- src/main.c | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/common.h b/include/common.h index 20f9438..ba44715 100644 --- a/include/common.h +++ b/include/common.h @@ -183,8 +183,6 @@ extern void nuPiInit(); extern void __set_black(); extern void __calls_osViBlack(bool black); -extern void func_80089A10(); - extern void __osViSwapBuffer_3(void** buffers); extern s32 func_80089CF8(s16 arg0, s32 arg1); diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index 85cc003..a7dd365 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -42,6 +42,7 @@ nuGfxTaskMgrInit = 0x80089660; gfxThread = 0x8008AFE0; nuGfxSwapCfbFuncSet = 0x800899D0; nuGfxTaskStart = 0x80089804; // rom:0x19C04 +nuGfxTaskAllEndWait = 0x80089A10; obCurrentTime = 0x800C47D0; diff --git a/src/_ob_past_brick.c b/src/_ob_past_brick.c index fdf3c69..1c92e3d 100644 --- a/src/_ob_past_brick.c +++ b/src/_ob_past_brick.c @@ -185,7 +185,7 @@ INCLUDE_ASM(const s32, "_ob_past_brick", func_80089990); // void func_80089990(void (*arg0)(s32)) { // s32 mask; -// func_80089A10(); +// nuGfxTaskAllEndWait(); // mask = osSetIntMask(OS_IM_NONE); // nuGfxFunc = arg0; // osSetIntMask(mask); diff --git a/src/_ob_unusual_spiders.c b/src/_ob_unusual_spiders.c index f1c1e59..4268f75 100644 --- a/src/_ob_unusual_spiders.c +++ b/src/_ob_unusual_spiders.c @@ -21,6 +21,6 @@ void nuGfxInitEX2(void) { gSPEndDisplayList(ptr++); nuGfxTaskStart(list, sizeof(Gfx) * 3, 0, 0); - func_80089A10(); + nuGfxTaskAllEndWait(); } diff --git a/src/main.c b/src/main.c index 7053f03..918cad6 100644 --- a/src/main.c +++ b/src/main.c @@ -378,7 +378,7 @@ u8 func_8007338C(void) { } void func_80073398(void) { - func_80089A10(); + nuGfxTaskAllEndWait(); func_8007328C(); D_800A8213 = 0; D_800A8212 = 0;