diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index d3d477f4..7869e513 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -28185,17 +28185,17 @@ roomStageHandlers = .rodata:0x804E0C00; // type:object size:0x10 scope:local stageRoomHandlers = .rodata:0x804E0C10; // type:object size:0x10 scope:local roomHandlers = .rodata:0x804E0C20; // type:object size:0x60 scope:local roomReactivateHandlers = .rodata:0x804E0C80; // type:object size:0x18 scope:local -lbl_804E0C98 = .rodata:0x804E0C98; // type:object size:0x3C -lbl_804E0CD4 = .rodata:0x804E0CD4; // type:object size:0x3C -lbl_804E0D10 = .rodata:0x804E0D10; // type:object size:0x3C -lbl_804E0D4C = .rodata:0x804E0D4C; // type:object size:0x3C -lbl_804E0D88 = .rodata:0x804E0D88; // type:object size:0x3C -lbl_804E0DC4 = .rodata:0x804E0DC4; // type:object size:0x3C -lbl_804E0E00 = .rodata:0x804E0E00; // type:object size:0x3C -lbl_804E0E3C = .rodata:0x804E0E3C; // type:object size:0x3C -lbl_804E0E78 = .rodata:0x804E0E78; // type:object size:0x3C -lbl_804E0EB4 = .rodata:0x804E0EB4; // type:object size:0x3C -lbl_804E0EF0 = .rodata:0x804E0EF0; // type:object size:0x28 +gRMO_Pal60_608x456Prog_16x9 = .rodata:0x804E0C98; // type:object size:0x3C +gRMO_Pal60_608x456IntDf_16x9 = .rodata:0x804E0CD4; // type:object size:0x3C +gRMO_Pal50_608x456IntDf_16x9 = .rodata:0x804E0D10; // type:object size:0x3C +gRMO_Ntsc_608x456Prog_16x9 = .rodata:0x804E0D4C; // type:object size:0x3C +gRMO_Ntsc_608x456IntDf_16x9 = .rodata:0x804E0D88; // type:object size:0x3C +gRMO_Pal60_608x456Prog_4x3 = .rodata:0x804E0DC4; // type:object size:0x3C +gRMO_Pal60_608x456IntDf_4x3 = .rodata:0x804E0E00; // type:object size:0x3C +gRMO_Pal50_608x456IntDf_4x3 = .rodata:0x804E0E3C; // type:object size:0x3C +gRMO_Ntsc_608x456Prog_4x3 = .rodata:0x804E0E78; // type:object size:0x3C +gRMO_Ntsc_608x456IntDf_4x3 = .rodata:0x804E0EB4; // type:object size:0x3C +gSysRenderModeObjSet = .rodata:0x804E0EF0; // type:object size:0x28 @LOCAL@ModeProc__Q26dReset8Manage_cFv@procs = .rodata:0x804E0F18; // type:object size:0x48 scope:local @LOCAL@ModeRequest__Q26dReset8Manage_cFQ36dReset8Manage_c6Mode_e@procs = .rodata:0x804E0F60; // type:object size:0x48 scope:local sInfos = .rodata:0x804E0FA8; // type:object size:0x246C scope:local data:4byte diff --git a/src/d/d_sys.cpp b/src/d/d_sys.cpp index 36231399..f768f656 100644 --- a/src/d/d_sys.cpp +++ b/src/d/d_sys.cpp @@ -50,6 +50,16 @@ #include "rvl/OS.h" #include "rvl/WPAD.h" +// TODO Replace with proper import + names +extern u32 lbl_80574FA0; +extern u32 lbl_80574FA4; + +System SysConfig; + +System *dSys_c::ms_configuration_p; +EGG::Heap *dSys_c::ms_RootHeapMem1; +EGG::Heap *dSys_c::ms_RootHeapMem2; + namespace dSystem { void *s_OrgMEM1ArenaLo; @@ -394,16 +404,6 @@ void System::initialize() { mHeap::setCurrentHeap(mHeap::g_assertHeap); } -System SysConfig; - -System *dSys_c::ms_configuration_p; -EGG::Heap *dSys_c::ms_RootHeapMem1; -EGG::Heap *dSys_c::ms_RootHeapMem2; - -// TODO Replace with proper import + names -extern u32 lbl_80574FA0; -extern u32 lbl_80574FA4; - dSndMgr_c *dSys_c::initAudioMgr(EGG::Heap *heap) { dSndMgr_c *audioMgr;