diff --git a/include/common.h b/include/common.h index 2e957ec..671a122 100644 --- a/include/common.h +++ b/include/common.h @@ -613,6 +613,4 @@ extern void obSetCurrentTime(u32 time); extern u32 obGetCurrentTime(); extern f32 obGetCurrentTimeF(); -extern Gfx DISPLAY_LIST_800A9EF0[]; - #endif \ No newline at end of file diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index 6cb2eea..6a1e3e4 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -18,6 +18,10 @@ nuGfxZBuffer = 0x800C4B20; nuGfxUcode = 0x800C4CE0; nugfx_ucode = 0x800A9EB0; FrameBuf = 0x800A9EE0; // rom:0x3A2E0 size:0xC +gFrameBuf0 = 0x8038F800; +gFrameBuf1 = 0x803B5000; +gFrameBuf2 = 0x803DA800; +rdpstateinit_dl = 0x800A9EF0; // rom:0x3A2F0 nuBoot = 0x8007F880; nuScCreateScheduler = 0x80088C50; // rom:0x19050 @@ -154,7 +158,6 @@ DISPLAY_LIST_80186BD0 = 0x80186BD0; // rom:0x5CAD0 DISPLAY_LIST_80186D90 = 0x80186D90; // rom:0x5CC90 DISPLAY_LIST_80186E70 = 0x80186E70; // rom:0x5CD70 -DISPLAY_LIST_800A9EF0 = 0x800A9EF0; // rom:0x3A2F0 DISPLAY_LIST_80186C60 = 0x80186C60; // rom:0x5CB60 DISPLAY_LIST_80186D00 = 0x80186D00; // rom:0x5CC00 DISPLAY_LIST_80186DD0 = 0x80186DD0; // rom:0x5CCD0 diff --git a/src/_ob_unusual_spiders.c b/src/_ob_unusual_spiders.c index bbf1346..c95438f 100644 --- a/src/_ob_unusual_spiders.c +++ b/src/_ob_unusual_spiders.c @@ -4,24 +4,25 @@ extern u16* FrameBuf[3]; extern NUUcode nugfx_ucode; +extern Gfx rdpstateinit_dl[]; /* 1A5B0 8008A1B0 */ void nuGfxInitEX2(void) { - Gfx list[257]; - Gfx* ptr = list; + Gfx gfx[257]; + Gfx* ptr = gfx; nuGfxThreadStart(); nuGfxSetCfb(FrameBuf, NU_GFX_FRAMEBUFFER_NUM); nuGfxSetZBuffer(NU_GFX_ZBUFFER_ADDR); nuGfxSwapCfbFuncSet(nuGfxSwapCfb); - nuGfxUcode = &nugfx_ucode; + nuGfxSetUcode(&nugfx_ucode); nuGfxTaskMgrInit(); - gSPDisplayList(ptr++, &D_A9EF0); + gSPDisplayList(ptr++, OS_K0_TO_PHYSICAL(&rdpstateinit_dl)); gDPFullSync(ptr++); gSPEndDisplayList(ptr++); - nuGfxTaskStart(list, sizeof(Gfx) * 3, 0, 0); + nuGfxTaskStart(gfx, sizeof(Gfx) * 3, NU_GFX_UCODE_F3DEX, NU_SC_NOSWAPBUFFER); nuGfxTaskAllEndWait(); } diff --git a/src/gfx/_ob_saucy_hose.c b/src/gfx/_ob_saucy_hose.c index 9ce8b07..efc17fc 100644 --- a/src/gfx/_ob_saucy_hose.c +++ b/src/gfx/_ob_saucy_hose.c @@ -3,7 +3,7 @@ #include "common.h" /* 3A2F0 800A9EF0 */ -Gfx DISPLAY_LIST_800A9EF0[] = { +Gfx rdpstateinit_dl[] = { gsDPSetEnvColor(0x00, 0x00, 0x00, 0x00), gsDPSetPrimColor(0, 0, 0x00, 0x00, 0x00, 0x00), gsDPSetBlendColor(0x00, 0x00, 0x00, 0x00),