diff --git a/include/common.h b/include/common.h index d68da16..78cdb1f 100644 --- a/include/common.h +++ b/include/common.h @@ -129,7 +129,6 @@ extern void* musCurrentPtrBank; extern void* D_800B1828; extern s32 D_800E8B14; -extern s32 __SCREEN_IS_NOT_BLACK; extern s32 D_A9EF0; extern s32 D_800C4B30; @@ -138,7 +137,6 @@ extern OSMesgQueue MQ_800BE030; extern OSMesg OSMESG_800BE048[0x32]; extern OSThread THREAD_CONTROLLER; -extern s32 __SCREEN_IS_NOT_BLACK; extern OSMesg D_800BBE60[8]; extern OSMesgQueue MQ_CONTROLLER; diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index 62b47f0..dbe06f9 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -22,6 +22,7 @@ gFrameBuf0 = 0x8038F800; gFrameBuf1 = 0x803B5000; gFrameBuf2 = 0x803DA800; rdpstateinit_dl = 0x800A9EF0; // rom:0x3A2F0 +nuGfxDisplay = 0x800C4BD8; nuBoot = 0x8007F880; nuScCreateScheduler = 0x80088C50; // rom:0x19050 @@ -726,7 +727,6 @@ osClockRate = 0x800ABAC0; // type:u64 osPiRawStartDma = 0x800997F0; osEPiRawStartDma = 0x8008BA50; -__SCREEN_IS_NOT_BLACK = 0x800C4BD8; __calls_osViBlack = 0x80089BE4; __MAIN_START_BUT_CHECK = 0x800E79B0; // size:0x14 diff --git a/src/_ob_icy_coast.c b/src/_ob_icy_coast.c index b54e3a2..47ab9a2 100644 --- a/src/_ob_icy_coast.c +++ b/src/_ob_icy_coast.c @@ -1,8 +1,9 @@ #include "common.h" +#include "nu/nusys.h" void func_80089C50(void) { - __SCREEN_IS_NOT_BLACK = 0x80; + nuGfxDisplay = NU_GFX_DISPLAY_ON_TRIGGER; } /* 1A060 80089C60 */ diff --git a/src/black.c b/src/black.c index 6f9b740..326d30d 100644 --- a/src/black.c +++ b/src/black.c @@ -4,7 +4,7 @@ /* 19FC0 80089BC0 */ void nuGfxDisplayOff() { - __SCREEN_IS_NOT_BLACK = 0; + nuGfxDisplay = NU_GFX_DISPLAY_OFF; __calls_osViBlack(true); }