diff --git a/include/functions.h b/include/functions.h index 8bac62abfd..069ee6b62f 100644 --- a/include/functions.h +++ b/include/functions.h @@ -268,7 +268,7 @@ u32 __osGetSR(void); // func_8008A5C0 void __osSetSR(u32 value); // func_8008A5D0 void osWritebackDCache(void *vaddr, s32 nbytes); // func_8008A5E0 void func_8008A660(void); // func_8008A660 -void func_8008A6FC(void); // func_8008A6FC +void osInitialize(void); // func_8008A6FC void func_8008A9A8(void); // func_8008A9A8 // UNK_RET func_8008AA10(UNK_ARGS); void guPerspectiveF(float* mf[4], u16* perspNorm, float fovy, float aspect, float near, float far, float scale); // func_8008AA50 diff --git a/include/variables.h b/include/variables.h index 1cc284f3ea..0686ceff5e 100644 --- a/include/variables.h +++ b/include/variables.h @@ -346,9 +346,9 @@ //extern UNK_TYPE D_00ABFC00; //extern UNK_TYPE D_00AC0000; //extern UNK_TYPE D_00AC0480; -extern UNK_TYPE D_00AC4000; +extern UNK_TYPE D_00AC4000; // D_00AC4000 //extern UNK_TYPE D_00ACA000; -extern UNK_TYPE D_00ACC000; +extern UNK_TYPE D_00ACC000; // D_00ACC000 //extern UNK_TYPE D_00AD1000; //extern UNK_TYPE D_00B3B000; extern UNK_TYPE D_00B3C000; // D_00B3C000 @@ -1860,9 +1860,12 @@ extern UNK_TYPE D_00C7A4E0; // D_00C7A4E0 //extern UNK_TYPE D_47803510; //extern UNK_TYPE D_80000000; extern UNK_TYPE osTvType; // D_80000300 -//extern UNK_TYPE D_80000308; -extern UNK_TYPE D_8000030C; // D_8000030C -extern UNK_TYPE D_80000318; // D_80000318 +extern UNK_TYPE osRomType; // D_80000304 +extern UNK_TYPE osRomBase; // D_80000308 +extern UNK_TYPE osResetType; // D_8000030C +extern UNK_TYPE osCicId; // D_80000310 +extern UNK_TYPE osVersion; // D_80000314 +extern UNK_TYPE osMemSize; // D_80000318 extern UNK_TYPE D_8000031C; // D_8000031C extern UNK_TYPE D_80000500; // D_80000500 extern UNK_TYPE D_80025D00; // D_80025D00 @@ -2400,7 +2403,7 @@ extern s800E03A0 D_801B9F20; // D_801B9F20 //extern UNK_TYPE D_801BDB00; //extern UNK_TYPE D_801BDB08; //extern UNK_TYPE D_801BDB18; -extern u8 D_801BDB30[]; +extern u8 D_801BDB30[]; // D_801BDB30 //extern UNK_TYPE D_801BDB90; //extern UNK_TYPE D_801BDB94; //extern UNK_TYPE D_801BDB98; diff --git a/src/boot_O2_g3/boot_0x80080060.c b/src/boot_O2_g3/boot_0x80080060.c index b02f416179..651584f8d7 100644 --- a/src/boot_O2_g3/boot_0x80080060.c +++ b/src/boot_O2_g3/boot_0x80080060.c @@ -3,7 +3,7 @@ UNK_RET func_80080060(void) { func_80085320(&D_80099500, &D_80099AF0, &D_80099EF0, 0, -1, &D_80098190); - D_80000318 = func_8008D350(); + osMemSize = func_8008D350(); func_800818F4(); osInitialize(); osUnmapTLBAll(); diff --git a/undef.txt b/undef.txt index 7b1be2f985..20dcf4a3d0 100644 --- a/undef.txt +++ b/undef.txt @@ -1851,9 +1851,12 @@ D_46FFCED0 = 0x46FFCED0; D_47803510 = 0x47803510; D_80000000 = 0x80000000; osTvType = 0x80000300; -D_80000308 = 0x80000308; -D_8000030C = 0x8000030C; -D_80000318 = 0x80000318; +osRomType = 0x80000304; +osRomBase = 0x80000308; +osResetType = 0x8000030C; +osCicId = 0x80000310; +osVersion = 0x80000314; +osMemSize = 0x80000318; D_8000031C = 0x8000031C; D_80000500 = 0x80000500; D_80025D00 = 0x80025D00; diff --git a/variables.py b/variables.py index 5dadc2b2f2..8fea117730 100644 --- a/variables.py +++ b/variables.py @@ -3,11 +3,15 @@ known_vars = { 0x00ACC000:("","UNK_TYPE",False), # this seems low 0x00B3C000:("","UNK_TYPE",False), # this seems low 0x00C7A4E0:("","UNK_TYPE",False), # this seems low - 0x80000300:("osTvType","UNK_TYPE",False), # this seems low, but maybe it's set on boot? - 0x8000030C:("","UNK_TYPE",False), # this seems low - 0x80000318:("","UNK_TYPE",False), # this seems low - 0x8000031C:("","UNK_TYPE",False), # this seems low - 0x80000500:("","UNK_TYPE",False), # this seems low + 0x80000300:("osTvType","UNK_TYPE",False), + 0x80000304:("osRomType","UNK_TYPE",False), + 0x80000308:("osRomBase","UNK_TYPE",False), + 0x8000030C:("osResetType","UNK_TYPE",False), + 0x80000310:("osCicId","UNK_TYPE",False), + 0x80000314:("osVersion","UNK_TYPE",False), + 0x80000318:("osMemSize","UNK_TYPE",False), + 0x8000031C:("","UNK_TYPE",False), + 0x80000500:("","UNK_TYPE",False), 0x80025D00:("","UNK_TYPE",False), 0x80096B20:("","u8",False), 0x80096B24:("","u8*",False),