From 7987a3fc72ffef2641914971b8c0f8146f09fa35 Mon Sep 17 00:00:00 2001 From: gijs Date: Fri, 20 Oct 2023 17:05:29 +0200 Subject: [PATCH] Rename `__something_display_list` to `nuGfxTaskStart` --- include/common.h | 1 - linker_scripts/symbols/addr.txt | 2 +- src/_ob_past_brick.c | 2 +- src/_ob_unusual_spiders.c | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/common.h b/include/common.h index e82469e..20f9438 100644 --- a/include/common.h +++ b/include/common.h @@ -183,7 +183,6 @@ extern void nuPiInit(); extern void __set_black(); extern void __calls_osViBlack(bool black); -extern void __something_display_list(Gfx*, s32, s32, s32); extern void func_80089A10(); extern void __osViSwapBuffer_3(void** buffers); diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index 4748baf..85cc003 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -41,6 +41,7 @@ nuGfxThreadStart = 0x8008B0B0; nuGfxTaskMgrInit = 0x80089660; gfxThread = 0x8008AFE0; nuGfxSwapCfbFuncSet = 0x800899D0; +nuGfxTaskStart = 0x80089804; // rom:0x19C04 obCurrentTime = 0x800C47D0; @@ -247,7 +248,6 @@ LIGHTS_801869A0 = 0x801869A0; // rom:0x5C8A0 size:40 __SOMETHING_FRAMEBUFFERS = 0x800A9EE0; // rom:0x3A2E0 size:0xC -__something_display_list = 0x80089804; // rom:0x19C04 __SOMETHING_WITH_GFX = 0x800E9BE0; // size:0x18 __MAYBE_DISPLAY_LIST = 0x801B8430; // rom:0x1EE930 diff --git a/src/_ob_past_brick.c b/src/_ob_past_brick.c index 2c1f06e..fdf3c69 100644 --- a/src/_ob_past_brick.c +++ b/src/_ob_past_brick.c @@ -177,7 +177,7 @@ INCLUDE_ASM(const s32, "_ob_past_brick", __thread_80089540); INCLUDE_ASM(const s32, "_ob_past_brick", nuGfxTaskMgrInit); -INCLUDE_ASM(const s32, "_ob_past_brick", __something_display_list); +INCLUDE_ASM(const s32, "_ob_past_brick", nuGfxTaskStart); INCLUDE_ASM(const s32, "_ob_past_brick", func_80089990); diff --git a/src/_ob_unusual_spiders.c b/src/_ob_unusual_spiders.c index c059e19..f1c1e59 100644 --- a/src/_ob_unusual_spiders.c +++ b/src/_ob_unusual_spiders.c @@ -20,7 +20,7 @@ void nuGfxInitEX2(void) { gDPFullSync(ptr++); gSPEndDisplayList(ptr++); - __something_display_list(list, sizeof(Gfx) * 3, 0, 0); + nuGfxTaskStart(list, sizeof(Gfx) * 3, 0, 0); func_80089A10(); }