diff --git a/splat.yaml b/splat.yaml index 21141b8..712918e 100644 --- a/splat.yaml +++ b/splat.yaml @@ -133,8 +133,8 @@ segments: - [0x1BE50, asm, "libultra/io/epirawdma"] - [0x1C040, asm, "libultra/io/epidma"] - [0x1C0E0, c] - - [0x1C130, asm] - - [0x1C2B0, asm] + - [0x1C130, asm, "libultra/io/cartrominit"] + - [0x1C2B0, asm, "libultra/io/devmgr"] - [0x1C670, asm, "libultra/io/piacs"] - [0x1C760, asm, "libultra/io/pidma"] - [0x1C810, asm, "libultra/io/aigetlen"] @@ -236,7 +236,7 @@ segments: - [0x28FC0, asm, "libultra/gu/normalize"] - [0x29020, asm] - [0x29100, asm, "libultra/gu/translatef"] - - [0x29160, asm] + - [0x29160, asm, "libultra/os/exceptasm"] - [0x29AD0, asm, "libultra/os/disableint"] - [0x29AD0, asm] - [0x29B60, asm] @@ -252,7 +252,7 @@ segments: - [0x2AB20, asm, "libultra/os/setsr"] - [0x2AB30, asm] - [0x2AB40, asm, "libultra/io/sp"] - - [0x2AB60, asm, "libultra/io/spsetstat"] + - [0x2AB60, asm, "libultra/io/spsetstat"] - [0x2AB70, asm, "libultra/io/spsetpc"] - [0x2AC30, asm] - [0x2AC80, asm] @@ -261,7 +261,7 @@ segments: - [0x2AEA0, asm, "libultra/os/maptlbrdb"] - [0x2AF00, asm, "libultra/os/unmaptlball"] - [0x2AF50, asm, "libultra/io/vi"] - - [0x2B060, asm] + - [0x2B060, asm, "libultra/io/vigetcurrcontext"] - [0x2B070, asm, "libultra/io/pfschecker"] - [0x2B790, asm] - [0x2BA70, asm, "libc/xlitob"] @@ -293,14 +293,57 @@ segments: - [0x2DC80, asm] - [0x2DDF0, asm] - [0x2DE10, c] - - [0x2E450, data] - - [0x3A800, asm] - - [0x3A840, asm] - - [0x3AB10, asm] - - [0x3AB20, asm] - - [0x3AB90, asm] - - [0x3ABC0, asm] - + + - [0x2E450, rodata] + - [0x2F0B0, rodata] + - [0x2F180, rodata] + - [0x385C0, rodata] + - [0x38640, rodata] + - [0x38B50, rodata] + - [0x38CE0, rodata] + - [0x39AC0, rodata] + - [0x39B90, rodata] + - [0x39C10, rodata] + - [0x39C80, rodata] + - [0x39C90, rodata] + - [0x39CB0, rodata] + - [0x39F60, rodata] + - [0x39FA0, rodata] + - [0x39FB0, rodata] + - [0x3A0F0, rodata] + - [0x3A140, rodata] + - [0x3A250, rodata] + - [0x3A260, rodata] + - [0x3A270, rodata] + - [0x3A280, rodata] + - [0x3A2A0, rodata] + - [0x3A2B0, rodata] + - [0x3A3E0, rodata] + - [0x3A410, rodata] + - [0x3A440, rodata] + - [0x3A450, rodata] + - [0x3A490, rodata] + - [0x3A4A0, rodata] + - [0x3A4E0, rodata] + - [0x3A520, rodata] + - [0x3A690, rodata] + - [0x3A800, rodata] + - [0x3A830, rodata] + - [0x3A840, rodata] + - [0x3A850, rodata] + - [0x3A860, rodata] + - [0x3A9A0, rodata] + - [0x3A9F0, rodata] + - [0x3AB10, rodata] + - [0x3AB20, rodata] + - [0x3AB30, rodata] + - [0x3AB40, rodata] + - [0x3AB50, rodata] + - [0x3AB60, rodata] + - [0x3AB90, rodata] + - [0x3ABB0, rodata] + - [0x3ABC0, rodata] + - [0x3BEB0, rodata] - [0x3BEC0, rodata, "libultra/os/initialize"] - [0x3BEE0, rodata, "libultra/gu/rotate"] - [0x3BEF0, rodata] @@ -317,22 +360,39 @@ segments: - [0x3D990, rodata] - [0x3E100, rodata] - [0x3E330, rodata] - - [0x3E460, rodata] - - [0x3E7C0, rodata] - - [0x3E7D0, rodata] - - [0x3E7F0, rodata] + - [0x3E3E0, rodata] + - [0x3E460, rodata, FDC0] + # - [0x3E7A0, rodata] + - [0x3E7C0, rodata, 10110] + - [0x3E7D0, rodata, 10190] + - [0x3E7F0, rodata, 10CF0] + - [0x3E800, rodata, 11170] + - [0x3E810, rodata] - - [0x3E8F0, rodata] + # - [0x3E8F0, rodata] + - [0x3E900, rodata, 16100] + - [0x3E930, rodata] - - [0x3E9A0, rodata] - - [0x3E9B0, rodata] + - [0x3E9A0, rodata, 177B0] + - [0x3E9B0, rodata, 17990] - [0x3E9F0, rodata] - - [0x3EAC0, rodata] - - [0x3EB00, rodata] - - [0x3ECF0, rodata] - - [0x3ED40, rodata] - - [0x3EDF0, rodata] - - [0x3EE20, rodata] + - [0x3EA90, rodata, "libultra/io/devmgr"] + - [0x3EAB0, rodata, "libultra/io/aisetfreq"] + - [0x3EAC0, rodata, "libultra/audio/drvrNew"] + - [0x3EB00, rodata, "libultra/audio/env"] + - [0x3EBF0, rodata, "libultra/audio/resample"] + - [0x3EC20, rodata, "libultra/audio/reverb"] + - [0x3EC70, rodata, "libultra/audio/synthesizer"] + - [0x3EC90, rodata, "libultra/gu/cosf"] + # - [0x3ECF0, rodata] + - [0x3ED10, rodata, "libultra/gu/lookathil"] + - [0x3ED40, rodata, "libultra/gu/lookatref"] + - [0x3ED50, rodata, "libultra/gu/perspective"] + - [0x3ED90, rodata, "libultra/gu/sinf"] + - [0x3EDF0, rodata, "libultra/sched/sched"] + - [0x3EE10, rodata, "libultra/io/viswapcontext"] + + - [0x3EE20, rodata, "libultra/os/exceptasm"] - [0x3EE70, rodata] - [0x3EE80, rodata] - [0x3EEA0, rodata] @@ -961,8 +1021,8 @@ segments: - [0x1EFF50, rodata] - [0x1F0030, rodata] - [0x1F0040, rodata] - - [0x1F0970, rodata] - - [0x1F09F0, rodata] + - [0x1F0970, rodata, 1E3440] + - [0x1F09F0, rodata, 1E9E00] - { start: 0x1F0A30, type: bss, vram: 0x801BA530 } @@ -1004,7 +1064,7 @@ segments: - [0x213750, rodata] - [0x213760, rodata] - [0x213830, rodata] - - [0x213AE0, rodata] + - [0x213AE0, rodata, 20FDC0] - { start: 0x213B10, type: bss, vram: 0x801D0680 } @@ -1049,8 +1109,9 @@ segments: - [0x239BA0, rodata] - [0x239BE0, rodata] - - [0x239CA0, rodata] + - [0x239CA0, rodata, 22A280] - [0x239F50, rodata] + - [0x239FA0, rodata, 233210] - [0x23A3A0, bin] # Overlay here @@ -1077,16 +1138,17 @@ segments: - [0x25E2C0, rodata] - [0x25E340, rodata] - - [0x25E610, rodata] - - [0x25E9C0, rodata] + - [0x25E610, rodata, 2522E0] + - [0x25E9C0, rodata, 256410] - [0x25EBA0, rodata] - [0x25ED30, rodata] - [0x25ED80, rodata] - [0x25EDA0, rodata] - - [0x25EDC0, rodata] - - [0x25EE00, rodata] + - [0x25EDC0, rodata, 24BCA0] + - [0x25EE00, rodata, 24EA70] - [0x25EE10, rodata] - [0x25EE30, rodata] + - [0x25EE60, rodata, 25A0B0] - { start: 0x25EE90, type: bss, vram: 0x8020A2D0 } @@ -1150,13 +1212,14 @@ segments: - [0x275160, rodata] - [0x275180, rodata] - [0x2751A0, rodata] - - [0x2751C0, rodata] + - [0x2751C0, rodata, 26C1F0] - [0x275280, rodata] - [0x2752B0, rodata] - [0x2754C0, rodata] - [0x275530, rodata] - [0x275640, rodata] - [0x275650, rodata] + - [0x275670, rodata, 25A0B0] - [0x2756F0, rodata, 263190] - [0x275710, rodata, 2638D0] - [0x275720, rodata, 264FC0] diff --git a/symbol_addrs.txt b/symbol_addrs.txt index 6d50b67..c9e8720 100644 --- a/symbol_addrs.txt +++ b/symbol_addrs.txt @@ -634,7 +634,7 @@ __osDisableInt = 0x800996D0; __osRestoreInt = 0x80099740; __osPopThread = 0x8009952C; __osThreadTail = 0x800AA790; -__osContLastCmd = 0x800E79A8; +__osContLastCmd = 0x800E79A8; // type:u8 __osPackRequestData = 0x800906C0; __osContPifRam = 0x800C4A20; // size:0x40 __osContGetInitData = 0x8009060C; @@ -651,8 +651,8 @@ __osSiAccessQueue = 0x800E9BC8; __osViInit = 0x8009AB50; __osBaseCounter = 0x800C4814; __osCurrentTime = 0x800C4C40; // type:u64 -__osContinitialized = 0x800AA720; -__osMaxControllers = 0x800C4C1C; +__osContinitialized = 0x800AA720; // type:u32 +__osMaxControllers = 0x800C4C1C; // type:u8 __osSiCreateAccessQueue = 0x80094770; __osEepromTimerQ = 0x800E99D0; __osEepromTimerMsg = 0x800E79B8; @@ -669,7 +669,7 @@ osPiGetCmdQueue = 0x800998C0; __osPiCreateAccessQueue = 0x8008C270; __osPiRelAccess = 0x8008C330; __osPiGetAccess = 0x8008C2C4; -__osPiAccessQueueEnabled = 0x800AA440; +__osPiAccessQueueEnabled = 0x800AA440; // type:u32 __osPiAccessQueue = 0x800C4CC8; __osPiDevMgr = 0x800AA400; // size:0x1C