From c6ba5302add305af7a76d43d2292ab2fde8d9566 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sun, 11 May 2025 18:54:37 -0700 Subject: [PATCH] More KOR splits --- config/GM8E01_48/splits.txt | 59 ++++++++ config/GM8E01_48/symbols.txt | 268 +++++++++++++++++------------------ configure.py | 8 +- 3 files changed, 197 insertions(+), 138 deletions(-) diff --git a/config/GM8E01_48/splits.txt b/config/GM8E01_48/splits.txt index 100790c5..ae94c6ec 100644 --- a/config/GM8E01_48/splits.txt +++ b/config/GM8E01_48/splits.txt @@ -16,6 +16,65 @@ Sections: MetroTRK/mslsupp.c: .text start:0x80003640 end:0x80003658 +Kyoto/Input/DolphinIController.cpp: + .text start:0x8034F124 end:0x8034F1D0 + .rodata start:0x803D8338 end:0x803D8340 + .data start:0x803EF780 end:0x803EF7A0 + .sdata2 start:0x805AE648 end:0x805AE658 + +Kyoto/Input/CDolphinController.cpp: + .text start:0x8034F1D0 end:0x8034FA40 + .data start:0x803EF7A0 end:0x803EF7D8 + .sbss start:0x805A92A8 end:0x805A92B0 + .sdata2 start:0x805AE658 end:0x805AE690 + +Kyoto/DolphinCDvdFile.cpp: + .text start:0x8034FA40 end:0x803506D4 + .rodata start:0x803D8340 end:0x803D8350 + .sdata start:0x805A8690 end:0x805A86A0 + .sbss start:0x805A92B0 end:0x805A92B8 + +Kyoto/Alloc/CMediumAllocPool.cpp: + .text start:0x803506D4 end:0x80350FB8 + .rodata start:0x803D8350 end:0x803D8358 + .sbss start:0x805A92B8 end:0x805A92C0 + +Kyoto/Alloc/CSmallAllocPool.cpp: + .text start:0x80350FB8 end:0x803512CC + +Kyoto/Alloc/CGameAllocator.cpp: + .text start:0x803512CC end:0x803527FC + .rodata start:0x803D8358 end:0x803D8408 + .data start:0x803EF7D8 end:0x803EF818 + .sbss start:0x805A92C0 end:0x805A92D0 + .sdata2 start:0x805AE690 end:0x805AE698 + +Kyoto/Animation/DolphinCSkinnedModel.cpp: + .text start:0x803527FC end:0x80353A88 + .ctors start:0x803CB464 end:0x803CB468 + .rodata start:0x803D8408 end:0x803D8410 + .data start:0x803EF818 end:0x803EF828 + .bss start:0x804BFCA0 end:0x8053FCF0 + .sbss start:0x805A92D0 end:0x805A92E8 + +Kyoto/Animation/DolphinCSkinRules.cpp: + .text start:0x80353A88 end:0x80354968 + .rodata start:0x803D8410 end:0x803D8418 + .data start:0x803EF828 end:0x803EF838 + .sdata start:0x805A86A0 end:0x805A86B0 + .sbss start:0x805A92E8 end:0x805A9318 + +Kyoto/Graphics/DolphinCVirtualBone.cpp: + .text start:0x80354968 end:0x803552B4 + .sdata2 start:0x805AE698 end:0x805AE6A0 + +Kyoto/Graphics/DolphinCModel.cpp: + .text start:0x803552B4 end:0x80356694 + .rodata start:0x803D8418 end:0x803D8420 + .data start:0x803EF838 end:0x803EF848 + .sdata start:0x805A86B0 end:0x805A86B8 + .sbss start:0x805A9318 end:0x805A9330 + Kyoto/Text/CStringTable.cpp: .text start:0x80356694 end:0x80356AA0 .rodata start:0x803D8420 end:0x803D8438 diff --git a/config/GM8E01_48/symbols.txt b/config/GM8E01_48/symbols.txt index 7b363666..a8fe4978 100644 --- a/config/GM8E01_48/symbols.txt +++ b/config/GM8E01_48/symbols.txt @@ -5711,7 +5711,7 @@ fn_800C34BC = .text:0x800C34BC; // type:function size:0x50 fn_800C350C = .text:0x800C350C; // type:function size:0x64 fn_800C3570 = .text:0x800C3570; // type:function size:0x64 fn_800C35D4 = .text:0x800C35D4; // type:function size:0xEC -fn_800C36C0 = .text:0x800C36C0; // type:function size:0xB4 +__ct__Q210IAllocator8SMetricsFRCQ210IAllocator8SMetrics = .text:0x800C36C0; // type:function size:0xB4 fn_800C3774 = .text:0x800C3774; // type:function size:0x9C fn_800C3810 = .text:0x800C3810; // type:function size:0xFC fn_800C390C = .text:0x800C390C; // type:function size:0x6C @@ -14728,27 +14728,27 @@ fn_8034ECB8 = .text:0x8034ECB8; // type:function size:0x1E8 fn_8034EEA0 = .text:0x8034EEA0; // type:function size:0x108 fn_8034EFA8 = .text:0x8034EFA8; // type:function size:0x108 fn_8034F0B0 = .text:0x8034F0B0; // type:function size:0x74 -fn_8034F124 = .text:0x8034F124; // type:function size:0x54 -fn_8034F178 = .text:0x8034F178; // type:function size:0x48 -fn_8034F1C0 = .text:0x8034F1C0; // type:function size:0x10 -fn_8034F1D0 = .text:0x8034F1D0; // type:function size:0x38 -fn_8034F208 = .text:0x8034F208; // type:function size:0x30 -fn_8034F238 = .text:0x8034F238; // type:function size:0x10 -fn_8034F248 = .text:0x8034F248; // type:function size:0x14 -fn_8034F25C = .text:0x8034F25C; // type:function size:0x8 -fn_8034F264 = .text:0x8034F264; // type:function size:0x3C -fn_8034F2A0 = .text:0x8034F2A0; // type:function size:0x68 -fn_8034F308 = .text:0x8034F308; // type:function size:0xD0 -fn_8034F3D8 = .text:0x8034F3D8; // type:function size:0x1AC -fn_8034F584 = .text:0x8034F584; // type:function size:0xA8 -fn_8034F62C = .text:0x8034F62C; // type:function size:0x190 -fn_8034F7BC = .text:0x8034F7BC; // type:function size:0x34 -fn_8034F7F0 = .text:0x8034F7F0; // type:function size:0xA8 -fn_8034F898 = .text:0x8034F898; // type:function size:0x60 -fn_8034F8F8 = .text:0x8034F8F8; // type:function size:0xA4 -fn_8034F99C = .text:0x8034F99C; // type:function size:0x80 -__ct__17CControllerButtonFv = .text:0x8034FA1C; // type:function size:0x14 -__ct__15CControllerAxisFv = .text:0x8034FA30; // type:function size:0x10 +Create__11IControllerFRC10COsContext = .text:0x8034F124; // type:function size:0x54 +__dt__11IControllerFv = .text:0x8034F178; // type:function size:0x48 +__ct__11IControllerFv = .text:0x8034F1C0; // type:function size:0x10 +GetAnalogStickMaxValue__18CDolphinControllerCF8EJoyAxis = .text:0x8034F1D0; // type:function size:0x38 +SetMotorState__18CDolphinControllerF7EIOPort11EMotorState = .text:0x8034F208; // type:function size:0x30 +GetControllerType__18CDolphinControllerCFi = .text:0x8034F238; // type:function size:0x10 +GetGamepadData__18CDolphinControllerFi = .text:0x8034F248; // type:function size:0x14 +GetDeviceCount__18CDolphinControllerCFv = .text:0x8034F25C; // type:function size:0x8 +ProcessAnalogButton__18CDolphinControllerFfR15CControllerAxis = .text:0x8034F264; // type:function size:0x3C +ProcessDigitalButton__18CDolphinControllerFiR17CControllerButtonUs = .text:0x8034F2A0; // type:function size:0x68 +ProcessButtons__18CDolphinControllerFi = .text:0x8034F308; // type:function size:0xD0 +ProcessAxis__18CDolphinControllerFi8EJoyAxis = .text:0x8034F3D8; // type:function size:0x1AC +ProcessInputData__18CDolphinControllerFv = .text:0x8034F584; // type:function size:0xA8 +ReadDevices__18CDolphinControllerFv = .text:0x8034F62C; // type:function size:0x190 +Poll__18CDolphinControllerFv = .text:0x8034F7BC; // type:function size:0x34 +Initialize__18CDolphinControllerFv = .text:0x8034F7F0; // type:function size:0xA8 +__dt__18CDolphinControllerFv = .text:0x8034F898; // type:function size:0x60 +__ct__18CDolphinControllerFv = .text:0x8034F8F8; // type:function size:0xA4 +__ct__22CControllerGamepadDataFv = .text:0x8034F99C; // type:function size:0x80 scope:weak +__ct__17CControllerButtonFv = .text:0x8034FA1C; // type:function size:0x14 scope:weak +__ct__15CControllerAxisFv = .text:0x8034FA30; // type:function size:0x10 scope:weak UpdateFilePos__8CDvdFileFi = .text:0x8034FA40; // type:function size:0x2C CalcFileOffset__8CDvdFileFi11ESeekOrigin = .text:0x8034FA6C; // type:function size:0x4C internalCallback__8CDvdFileFlP11DVDFileInfo = .text:0x8034FAB8; // type:function size:0x28 @@ -14759,67 +14759,67 @@ SyncSeekRead__8CDvdFileFPvUi11ESeekOrigini = .text:0x8034FC98; // type:function SyncRead__8CDvdFileFPvUi = .text:0x8034FD7C; // type:function size:0x28 __dt__8CDvdFileFv = .text:0x8034FDA4; // type:function size:0xC0 __ct__8CDvdFileFPCc = .text:0x8034FE64; // type:function size:0xBC -fn_8034FF20 = .text:0x8034FF20; // type:function size:0x3C -fn_8034FF5C = .text:0x8034FF5C; // type:function size:0x1B4 -fn_80350110 = .text:0x80350110; // type:function size:0xD4 -fn_803501E4 = .text:0x803501E4; // type:function size:0x64 -fn_80350248 = .text:0x80350248; // type:function size:0x88 -fn_803502D0 = .text:0x803502D0; // type:function size:0x120 -fn_803503F0 = .text:0x803503F0; // type:function size:0x160 -fn_80350550 = .text:0x80350550; // type:function size:0x6C -fn_803505BC = .text:0x803505BC; // type:function size:0x6C -fn_80350628 = .text:0x80350628; // type:function size:0x24 -fn_8035064C = .text:0x8035064C; // type:function size:0x38 -fn_80350684 = .text:0x80350684; // type:function size:0x50 -fn_803506D4 = .text:0x803506D4; // type:function size:0x70 -fn_80350744 = .text:0x80350744; // type:function size:0x5C -fn_803507A0 = .text:0x803507A0; // type:function size:0x13C -fn_803508DC = .text:0x803508DC; // type:function size:0xE0 -fn_803509BC = .text:0x803509BC; // type:function size:0x80 -fn_80350A3C = .text:0x80350A3C; // type:function size:0x64 -fn_80350AA0 = .text:0x80350AA0; // type:function size:0x84 -fn_80350B24 = .text:0x80350B24; // type:function size:0x5C -fn_80350B80 = .text:0x80350B80; // type:function size:0x28 -fn_80350BA8 = .text:0x80350BA8; // type:function size:0xF4 -fn_80350C9C = .text:0x80350C9C; // type:function size:0x2C -fn_80350CC8 = .text:0x80350CC8; // type:function size:0x2C -fn_80350CF4 = .text:0x80350CF4; // type:function size:0x2C -fn_80350D20 = .text:0x80350D20; // type:function size:0xAC -fn_80350DCC = .text:0x80350DCC; // type:function size:0xA4 -fn_80350E70 = .text:0x80350E70; // type:function size:0x14 -fn_80350E84 = .text:0x80350E84; // type:function size:0x74 -fn_80350EF8 = .text:0x80350EF8; // type:function size:0x2C -fn_80350F24 = .text:0x80350F24; // type:function size:0x94 -fn_80350FB8 = .text:0x80350FB8; // type:function size:0x94 -fn_8035104C = .text:0x8035104C; // type:function size:0x118 -fn_80351164 = .text:0x80351164; // type:function size:0x100 -fn_80351264 = .text:0x80351264; // type:function size:0x68 -fn_803512CC = .text:0x803512CC; // type:function size:0x10 -fn_803512DC = .text:0x803512DC; // type:function size:0x3C -fn_80351318 = .text:0x80351318; // type:function size:0x74 -fn_8035138C = .text:0x8035138C; // type:function size:0xA4 -fn_80351430 = .text:0x80351430; // type:function size:0x60 -fn_80351490 = .text:0x80351490; // type:function size:0x38 -fn_803514C8 = .text:0x803514C8; // type:function size:0xE0 -fn_803515A8 = .text:0x803515A8; // type:function size:0x18C -fn_80351734 = .text:0x80351734; // type:function size:0x64 -fn_80351798 = .text:0x80351798; // type:function size:0xC -fn_803517A4 = .text:0x803517A4; // type:function size:0x4 -fn_803517A8 = .text:0x803517A8; // type:function size:0x2C -fn_803517D4 = .text:0x803517D4; // type:function size:0x2C -fn_80351800 = .text:0x80351800; // type:function size:0x94 -fn_80351894 = .text:0x80351894; // type:function size:0x1C0 -fn_80351A54 = .text:0x80351A54; // type:function size:0xA8 -fn_80351AFC = .text:0x80351AFC; // type:function size:0xBC -fn_80351BB8 = .text:0x80351BB8; // type:function size:0x21C -fn_80351DD4 = .text:0x80351DD4; // type:function size:0x68 -fn_80351E3C = .text:0x80351E3C; // type:function size:0x128 -fn_80351F64 = .text:0x80351F64; // type:function size:0x3A8 -fn_8035230C = .text:0x8035230C; // type:function size:0x44 -fn_80352350 = .text:0x80352350; // type:function size:0x388 -fn_803526D8 = .text:0x803526D8; // type:function size:0x88 -fn_80352760 = .text:0x80352760; // type:function size:0x94 -fn_803527F4 = .text:0x803527F4; // type:function size:0x8 +StallForARAMFile__8CDvdFileFv = .text:0x8034FF20; // type:function size:0x3C +StartARAMFileLoad__8CDvdFileFv = .text:0x8034FF5C; // type:function size:0x1B4 +IsARAMFileLoaded__8CDvdFileFv = .text:0x80350110; // type:function size:0xD4 +PopARAMFileLoad__8CDvdFileFv = .text:0x803501E4; // type:function size:0x64 +PushARAMFileLoad__8CDvdFileFv = .text:0x80350248; // type:function size:0x88 +TryARAMFile__8CDvdFileFv = .text:0x803502D0; // type:function size:0x120 +PingARAMTransfer__8CDvdFileFv = .text:0x803503F0; // type:function size:0x160 +HandleDVDInterrupt__8CDvdFileFv = .text:0x80350550; // type:function size:0x6C +HandleARAMInterrupt__8CDvdFileFv = .text:0x803505BC; // type:function size:0x6C +ARAMARAMXferCallback__8CDvdFileFUl = .text:0x80350628; // type:function size:0x24 +DVDARAMXferCallback__8CDvdFileFlP11DVDFileInfo = .text:0x8035064C; // type:function size:0x38 +DecodeARAMFile__FPCc = .text:0x80350684; // type:function size:0x50 +InitBookKeeping__18SMediumAllocPuddleFPUcUs = .text:0x803506D4; // type:function size:0x70 +GetBlockOffset__18SMediumAllocPuddleFPCvPCv = .text:0x80350744; // type:function size:0x5C +Free__18SMediumAllocPuddleFPCv = .text:0x803507A0; // type:function size:0x13C +FindFreeEntry__18SMediumAllocPuddleFUi = .text:0x803508DC; // type:function size:0xE0 +FindFree__18SMediumAllocPuddleFUi = .text:0x803509BC; // type:function size:0x80 +__dt__18SMediumAllocPuddleFv = .text:0x80350A3C; // type:function size:0x64 +__ct__18SMediumAllocPuddleFUiPvb = .text:0x80350AA0; // type:function size:0x84 +AddPuddle__16CMediumAllocPoolFUiPvb = .text:0x80350B24; // type:function size:0x5C +push_back__Q24rstl53list<18SMediumAllocPuddle,Q24rstl17rmemory_allocator>FRC18SMediumAllocPuddle = .text:0x80350B80; // type:function size:0x28 +do_insert_before__Q24rstl53list<18SMediumAllocPuddle,Q24rstl17rmemory_allocator>FPQ34rstl53list<18SMediumAllocPuddle,Q24rstl17rmemory_allocator>4nodeRC18SMediumAllocPuddle = .text:0x80350BA8; // type:function size:0xF4 +GetNumBlocksAvailable__16CMediumAllocPoolFv = .text:0x80350C9C; // type:function size:0x2C +GetTotalEntries__16CMediumAllocPoolFv = .text:0x80350CC8; // type:function size:0x2C +GetNumAllocs__16CMediumAllocPoolFv = .text:0x80350CF4; // type:function size:0x2C +Free__16CMediumAllocPoolFPCv = .text:0x80350D20; // type:function size:0xAC +Alloc__16CMediumAllocPoolFUi = .text:0x80350DCC; // type:function size:0xA4 +HasPuddles__16CMediumAllocPoolCFv = .text:0x80350E70; // type:function size:0x14 +ClearPuddles__16CMediumAllocPoolFv = .text:0x80350E84; // type:function size:0x74 +__ct__16CMediumAllocPoolFv = .text:0x80350EF8; // type:function size:0x2C +do_erase__Q24rstl53list<18SMediumAllocPuddle,Q24rstl17rmemory_allocator>FPQ34rstl53list<18SMediumAllocPuddle,Q24rstl17rmemory_allocator>4node = .text:0x80350F24; // type:function size:0x94 +Free__15CSmallAllocPoolFPCv = .text:0x80350FB8; // type:function size:0x94 +Alloc__15CSmallAllocPoolFUi = .text:0x8035104C; // type:function size:0x118 +FindFree__15CSmallAllocPoolFi = .text:0x80351164; // type:function size:0x100 +__ct__15CSmallAllocPoolFUiPvPv = .text:0x80351264; // type:function size:0x68 +OffsetFakeStatics__14CGameAllocatorFi = .text:0x803512CC; // type:function size:0x10 +GetLargestFreeChunk__14CGameAllocatorCFv = .text:0x803512DC; // type:function size:0x3C +DumpAllocations__14CGameAllocatorCFv = .text:0x80351318; // type:function size:0x74 +RemoveFreeEntryFromFreeList__14CGameAllocatorFPQ214CGameAllocator12SGameMemInfo = .text:0x8035138C; // type:function size:0xA4 +AddFreeEntryToFreeList__14CGameAllocatorFPQ214CGameAllocator12SGameMemInfo = .text:0x80351430; // type:function size:0x60 +GetFreeBinEntryForSize__14CGameAllocatorFUi = .text:0x80351490; // type:function size:0x38 +EnumAllocations__14CGameAllocatorCFPFRCQ210IAllocator10SAllocInfoPCv_CbPCvb = .text:0x803514C8; // type:function size:0xE0 +GetMetrics__14CGameAllocatorCFv = .text:0x803515A8; // type:function size:0x18C +GetAllocInfo__14CGameAllocatorCFPCv = .text:0x80351734; // type:function size:0x64 +SetOutOfMemoryCallback__14CGameAllocatorFPFPCvUi_CbPCv = .text:0x80351798; // type:function size:0xC +ReleaseAllSecondary__14CGameAllocatorFv = .text:0x803517A4; // type:function size:0x4 +FreeSecondary__14CGameAllocatorFPCv = .text:0x803517A8; // type:function size:0x2C +AllocSecondary__14CGameAllocatorFUlQ210IAllocator5EHintQ210IAllocator6EScopeQ210IAllocator5ETypeRC10CCallStack = .text:0x803517D4; // type:function size:0x2C +ReleaseAll__14CGameAllocatorFv = .text:0x80351800; // type:function size:0x94 +FreeNormalAllocation__14CGameAllocatorFPCv = .text:0x80351894; // type:function size:0x1C0 +Free__14CGameAllocatorFPCv = .text:0x80351A54; // type:function size:0xA8 +UpdateAllocDebugStats__14CGameAllocatorFUiUiUi = .text:0x80351AFC; // type:function size:0xBC +FixupAllocPtrs__14CGameAllocatorFPQ214CGameAllocator12SGameMemInfoUiUiQ210IAllocator5EHintRC10CCallStack = .text:0x80351BB8; // type:function size:0x21C +FindFreeBlockFromTopOfHeap__14CGameAllocatorFUi = .text:0x80351DD4; // type:function size:0x68 +FindFreeBlock__14CGameAllocatorFUi = .text:0x80351E3C; // type:function size:0x128 +Alloc__14CGameAllocatorFUlQ210IAllocator5EHintQ210IAllocator6EScopeQ210IAllocator5ETypeRC10CCallStack = .text:0x80351F64; // type:function size:0x3A8 +Shutdown__14CGameAllocatorFv = .text:0x8035230C; // type:function size:0x44 +Initialize__14CGameAllocatorFR10COsContext = .text:0x80352350; // type:function size:0x388 +__dt__14CGameAllocatorFv = .text:0x803526D8; // type:function size:0x88 +__ct__14CGameAllocatorFv = .text:0x80352760; // type:function size:0x94 +GetMemInfoFromBlockPtr__14CGameAllocatorCFPCv = .text:0x803527F4; // type:function size:0x8 fn_803527FC = .text:0x803527FC; // type:function size:0xA0 fn_8035289C = .text:0x8035289C; // type:function size:0xC fn_803528A8 = .text:0x803528A8; // type:function size:0xC @@ -14838,12 +14838,12 @@ fn_803532B4 = .text:0x803532B4; // type:function size:0x15C fn_80353410 = .text:0x80353410; // type:function size:0xE8 fn_803534F8 = .text:0x803534F8; // type:function size:0xD4 fn_803535CC = .text:0x803535CC; // type:function size:0xD4 -fn_803536A0 = .text:0x803536A0; // type:function size:0xA0 -fn_80353740 = .text:0x80353740; // type:function size:0x154 -fn_80353894 = .text:0x80353894; // type:function size:0x7C -fn_80353910 = .text:0x80353910; // type:function size:0x80 -fn_80353990 = .text:0x80353990; // type:function size:0x78 -fn_80353A08 = .text:0x80353A08; // type:function size:0x80 +DelSkinnedRef__8SkinningFv = .text:0x803536A0; // type:function size:0xA0 +AddSkinnedRef__8SkinningFv = .text:0x80353740; // type:function size:0x154 +do_erase__Q24rstl53list<18SSkinnedAllocation,Q24rstl17rmemory_allocator>FPQ34rstl53list<18SSkinnedAllocation,Q24rstl17rmemory_allocator>4node = .text:0x80353894; // type:function size:0x7C +__sinit_DolphinCSkinnedModel_cpp = .text:0x80353910; // type:function size:0x80 +__dt__Q24rstl53list<18SSkinnedAllocation,Q24rstl17rmemory_allocator>Fv = .text:0x80353990; // type:function size:0x78 +__dt__Q24rstl34optional_object<15CCircularBuffer>Fv = .text:0x80353A08; // type:function size:0x80 fn_80353A88 = .text:0x80353A88; // type:function size:0xFC fn_80353B84 = .text:0x80353B84; // type:function size:0xFC fn_80353C80 = .text:0x80353C80; // type:function size:0x30 @@ -14859,11 +14859,11 @@ fn_80354144 = .text:0x80354144; // type:function size:0x9C fn_803541E0 = .text:0x803541E0; // type:function size:0x128 fn_80354308 = .text:0x80354308; // type:function size:0x6C fn_80354374 = .text:0x80354374; // type:function size:0xF0 -fn_80354464 = .text:0x80354464; // type:function size:0x70 -fn_803544D4 = .text:0x803544D4; // type:function size:0x19C +__ct__10CSkinRulesFR12CInputStream = .text:0x80354464; // type:function size:0x70 +__ct__Q24rstl49vector<12CVirtualBone,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator = .text:0x803544D4; // type:function size:0x19C fn_80354670 = .text:0x80354670; // type:function size:0x3C fn_803546AC = .text:0x803546AC; // type:function size:0x24 -fn_803546D0 = .text:0x803546D0; // type:function size:0x90 +StreamFloatToShort__FR12CInputStream = .text:0x803546D0; // type:function size:0x90 fn_80354760 = .text:0x80354760; // type:function size:0x140 fn_803548A0 = .text:0x803548A0; // type:function size:0xC8 fn_80354968 = .text:0x80354968; // type:function size:0x11C @@ -14913,9 +14913,9 @@ fn_80356510 = .text:0x80356510; // type:function size:0xD0 fn_803565E0 = .text:0x803565E0; // type:function size:0x4C fn_8035662C = .text:0x8035662C; // type:function size:0x68 FStringTableFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer = .text:0x80356694; // type:function size:0x64 -__ct<12CStringTable>__16CFactoryFnReturnFP12CStringTable = .text:0x803566F8; // type:function size:0xD0 -GetIObjObjectFor__22TToken<12CStringTable>FRCQ24rstl24auto_ptr<12CStringTable> = .text:0x803567C8; // type:function size:0x2C -GetNewDerivedObject__40TObjOwnerDerivedFromIObj<12CStringTable>FRCQ24rstl24auto_ptr<12CStringTable> = .text:0x803567F4; // type:function size:0x9C +__ct<12CStringTable>__16CFactoryFnReturnFP12CStringTable = .text:0x803566F8; // type:function size:0xD0 scope:local +GetIObjObjectFor__22TToken<12CStringTable>FRCQ24rstl24auto_ptr<12CStringTable> = .text:0x803567C8; // type:function size:0x2C scope:weak +GetNewDerivedObject__40TObjOwnerDerivedFromIObj<12CStringTable>FRCQ24rstl24auto_ptr<12CStringTable> = .text:0x803567F4; // type:function size:0x9C scope:weak GetString__12CStringTableCFi = .text:0x80356890; // type:function size:0x34 __ct__12CStringTableFR12CInputStream = .text:0x803568C4; // type:function size:0x1DC GetValue__14CVEAngleSphereCFiR9CVector3fR9CVector3f = .text:0x80356AA0; // type:function size:0x294 @@ -14967,10 +14967,10 @@ __ct__10CARAMTokenFRC10CARAMToken = .text:0x80358B60; // type:function size:0x80 __ct__10CARAMTokenFPvUii = .text:0x80358BE0; // type:function size:0xB0 __ct__10CARAMTokenFv = .text:0x80358C90; // type:function size:0x68 FMidiDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer = .text:0x80358CF8; // type:function size:0x64 -__ct__16CFactoryFnReturnFPQ212CMidiManager9CMidiData = .text:0x80358D5C; // type:function size:0xDC -__dt__52TObjOwnerDerivedFromIObjFv = .text:0x80358E38; // type:function size:0xB8 -GetIObjObjectFor__34TTokenFRCQ24rstl36auto_ptr = .text:0x80358EF0; // type:function size:0x2C -GetNewDerivedObject__52TObjOwnerDerivedFromIObjFRCQ24rstl36auto_ptr = .text:0x80358F1C; // type:function size:0x9C +__ct__16CFactoryFnReturnFPQ212CMidiManager9CMidiData = .text:0x80358D5C; // type:function size:0xDC scope:local +__dt__52TObjOwnerDerivedFromIObjFv = .text:0x80358E38; // type:function size:0xB8 scope:weak +GetIObjObjectFor__34TTokenFRCQ24rstl36auto_ptr = .text:0x80358EF0; // type:function size:0x2C scope:weak +GetNewDerivedObject__52TObjOwnerDerivedFromIObjFRCQ24rstl36auto_ptr = .text:0x80358F1C; // type:function size:0x9C scope:weak __ct__Q212CMidiManager9CMidiDataFR12CInputStream = .text:0x80358FB8; // type:function size:0x118 LocateHandle__12CMidiManagerFv = .text:0x803590D0; // type:function size:0xE4 StopAll__12CMidiManagerFv = .text:0x803591B4; // type:function size:0x7C @@ -14986,7 +14986,7 @@ GetAudioSysHandle__Q212CMidiManager12CMidiWrapperCFv = .text:0x803594D8; // type GetManagerHandle__Q212CMidiManager12CMidiWrapperCFv = .text:0x803594E0; // type:function size:0x8 __ct__Q212CMidiManager12CMidiWrapperFv = .text:0x803594E8; // type:function size:0x18 __sinit_CMidiManager_cpp = .text:0x80359500; // type:function size:0x3C scope:local -__dt__Q24rstl49reserved_vectorFv = .text:0x8035953C; // type:function size:0x94 +__dt__Q24rstl49reserved_vectorFv = .text:0x8035953C; // type:function size:0x94 scope:weak CalculateBaseline__13CFontImageDefFv = .text:0x803595D0; // type:function size:0xB8 IsLoaded__13CFontImageDefCFv = .text:0x80359688; // type:function size:0x40 __ct__13CFontImageDefFRCQ24rstl54vector<17TToken<8CTexture>,Q24rstl17rmemory_allocator>fRC9CVector2f = .text:0x803596C8; // type:function size:0x110 @@ -17897,14 +17897,14 @@ lbl_803D8218 = .rodata:0x803D8218; // type:object size:0x8 lbl_803D8220 = .rodata:0x803D8220; // type:object size:0x100 lbl_803D8320 = .rodata:0x803D8320; // type:object size:0x10 lbl_803D8330 = .rodata:0x803D8330; // type:object size:0x8 -lbl_803D8338 = .rodata:0x803D8338; // type:object size:0x8 -lbl_803D8340 = .rodata:0x803D8340; // type:object size:0x10 +@stringBase0 = .rodata:0x803D8338; // type:object size:0x7 scope:local data:string_table +@stringBase0 = .rodata:0x803D8340; // type:object size:0xD scope:local data:string_table lbl_803D8350 = .rodata:0x803D8350; // type:object size:0x8 lbl_803D8358 = .rodata:0x803D8358; // type:object size:0xB0 lbl_803D8408 = .rodata:0x803D8408; // type:object size:0x8 lbl_803D8410 = .rodata:0x803D8410; // type:object size:0x8 lbl_803D8418 = .rodata:0x803D8418; // type:object size:0x8 -skInvalidString = .rodata:0x803D8420; // type:object size:0x10 data:wstring +skInvalidString = .rodata:0x803D8420; // type:object size:0x10 scope:local data:wstring @stringBase0 = .rodata:0x803D8430; // type:object size:0x7 scope:local data:string_table lbl_803D8438 = .rodata:0x803D8438; // type:object size:0x8 lbl_803D8440 = .rodata:0x803D8440; // type:object size:0x8 @@ -18039,7 +18039,7 @@ lbl_803D9F90 = .data:0x803D9F90; // type:object size:0x20 lbl_803D9FB0 = .data:0x803D9FB0; // type:object size:0x6C jumptable_803DA01C = .data:0x803DA01C; // type:object size:0xA0 scope:local lbl_803DA0C0 = .data:0x803DA0C0; // type:object size:0x38 -lbl_803DA0F8 = .data:0x803DA0F8; // type:object size:0x1C +__vt__11CDvdRequest = .data:0x803DA0F8; // type:object size:0x1C lbl_803DA114 = .data:0x803DA114; // type:object size:0x38 lbl_803DA14C = .data:0x803DA14C; // type:object size:0x3C lbl_803DA188 = .data:0x803DA188; // type:object size:0x10 @@ -18667,8 +18667,8 @@ lbl_803ED5D0 = .data:0x803ED5D0; // type:object size:0x1C lbl_803ED5EC = .data:0x803ED5EC; // type:object size:0x1C lbl_803ED608 = .data:0x803ED608; // type:object size:0x60 lbl_803ED668 = .data:0x803ED668; // type:object size:0x10 -lbl_803ED678 = .data:0x803ED678; // type:object size:0x1C -lbl_803ED694 = .data:0x803ED694; // type:object size:0x1C +__vt__15CARAMDvdRequest = .data:0x803ED678; // type:object size:0x1C +__vt__15CRealDvdRequest = .data:0x803ED694; // type:object size:0x1C lbl_803ED6B0 = .data:0x803ED6B0; // type:object size:0x20 lbl_803ED6D0 = .data:0x803ED6D0; // type:object size:0x20 lbl_803ED6F0 = .data:0x803ED6F0; // type:object size:0x20 @@ -18689,7 +18689,7 @@ lbl_803EDA28 = .data:0x803EDA28; // type:object size:0x20 data:4byte jumptable_803EDA48 = .data:0x803EDA48; // type:object size:0x20 scope:local jumptable_803EDA68 = .data:0x803EDA68; // type:object size:0x2C scope:local jumptable_803EDA94 = .data:0x803EDA94; // type:object size:0x2C scope:local -lbl_803EDAC0 = .data:0x803EDAC0; // type:object size:0x40 +__vt__10IAllocator = .data:0x803EDAC0; // type:object size:0x40 lbl_803EDB00 = .data:0x803EDB00; // type:object size:0x10 lbl_803EDB10 = .data:0x803EDB10; // type:object size:0x10 lbl_803EDB20 = .data:0x803EDB20; // type:object size:0x10 @@ -18819,10 +18819,10 @@ lbl_803EF710 = .data:0x803EF710; // type:object size:0x30 jumptable_803EF740 = .data:0x803EF740; // type:object size:0x20 scope:local lbl_803EF760 = .data:0x803EF760; // type:object size:0x10 lbl_803EF770 = .data:0x803EF770; // type:object size:0x10 -lbl_803EF780 = .data:0x803EF780; // type:object size:0x20 -lbl_803EF7A0 = .data:0x803EF7A0; // type:object size:0x18 data:2byte -lbl_803EF7B8 = .data:0x803EF7B8; // type:object size:0x20 -lbl_803EF7D8 = .data:0x803EF7D8; // type:object size:0x40 +__vt__11IController = .data:0x803EF780; // type:object size:0x20 +mButtonMapping = .data:0x803EF7A0; // type:object size:0x18 scope:local data:2byte +__vt__18CDolphinController = .data:0x803EF7B8; // type:object size:0x20 +__vt__14CGameAllocator = .data:0x803EF7D8; // type:object size:0x40 lbl_803EF818 = .data:0x803EF818; // type:object size:0x10 lbl_803EF828 = .data:0x803EF828; // type:object size:0x10 lbl_803EF838 = .data:0x803EF838; // type:object size:0x10 @@ -21330,9 +21330,9 @@ lbl_805A8688 = .sdata:0x805A8688; // type:object size:0x1 lbl_805A8689 = .sdata:0x805A8689; // type:object size:0x1 lbl_805A868A = .sdata:0x805A868A; // type:object size:0x1 lbl_805A868B = .sdata:0x805A868B; // type:object size:0x5 -lbl_805A8690 = .sdata:0x805A8690; // type:object size:0x4 data:4byte -lbl_805A8694 = .sdata:0x805A8694; // type:object size:0x4 data:4byte -lbl_805A8698 = .sdata:0x805A8698; // type:object size:0x8 data:4byte +@120 = .sdata:0x805A8690; // type:object size:0x4 scope:local data:4byte +@123 = .sdata:0x805A8694; // type:object size:0x4 scope:local data:4byte +@164 = .sdata:0x805A8698; // type:object size:0x4 scope:local data:4byte lbl_805A86A0 = .sdata:0x805A86A0; // type:object size:0x4 data:4byte lbl_805A86A4 = .sdata:0x805A86A4; // type:object size:0x1 data:byte lbl_805A86A8 = .sdata:0x805A86A8; // type:object size:0x4 data:4byte @@ -22008,10 +22008,10 @@ lbl_805A9298 = .sbss:0x805A9298; // type:object size:0x4 data:4byte lbl_805A929C = .sbss:0x805A929C; // type:object size:0x4 data:4byte lbl_805A92A0 = .sbss:0x805A92A0; // type:object size:0x1 data:byte lbl_805A92A1 = .sbss:0x805A92A1; // type:object size:0x7 data:byte -lbl_805A92A8 = .sbss:0x805A92A8; // type:object size:0x1 data:byte -lbl_805A92A9 = .sbss:0x805A92A9; // type:object size:0x7 data:byte -lbl_805A92B0 = .sbss:0x805A92B0; // type:object size:0x8 data:4byte -lbl_805A92B8 = .sbss:0x805A92B8; // type:object size:0x8 data:4byte +sIsInitialized$4 = .sbss:0x805A92A8; // type:object size:0x1 scope:local data:byte +init$5 = .sbss:0x805A92A9; // type:object size:0x1 scope:local data:byte +sFirstARAM = .sbss:0x805A92B0; // type:object size:0x4 scope:local data:4byte +gMediumAllocPtr__16CMediumAllocPool = .sbss:0x805A92B8; // type:object size:0x4 data:4byte lbl_805A92C0 = .sbss:0x805A92C0; // type:object size:0x4 data:4byte lbl_805A92C4 = .sbss:0x805A92C4; // type:object size:0x4 data:4byte lbl_805A92C8 = .sbss:0x805A92C8; // type:object size:0x1 data:byte @@ -22035,7 +22035,7 @@ lbl_805A9308 = .sbss:0x805A9308; // type:object size:0x4 data:4byte lbl_805A930C = .sbss:0x805A930C; // type:object size:0x4 data:4byte lbl_805A9310 = .sbss:0x805A9310; // type:object size:0x4 data:4byte lbl_805A9314 = .sbss:0x805A9314; // type:object size:0x4 data:4byte -lbl_805A9318 = .sbss:0x805A9318; // type:object size:0x4 data:4byte +sTotalMemory__6CModel = .sbss:0x805A9318; // type:object size:0x4 data:4byte lbl_805A931C = .sbss:0x805A931C; // type:object size:0x4 data:4byte lbl_805A9320 = .sbss:0x805A9320; // type:object size:0x4 data:4byte lbl_805A9324 = .sbss:0x805A9324; // type:object size:0x4 data:4byte @@ -26637,21 +26637,21 @@ lbl_805AE638 = .sdata2:0x805AE638; // type:object size:0x1 data:byte lbl_805AE639 = .sdata2:0x805AE639; // type:object size:0x1 data:byte lbl_805AE63C = .sdata2:0x805AE63C; // type:object size:0x4 data:4byte lbl_805AE640 = .sdata2:0x805AE640; // type:object size:0x8 data:4byte -lbl_805AE648 = .sdata2:0x805AE648; // type:object size:0x4 align:4 data:float -lbl_805AE64C = .sdata2:0x805AE64C; // type:object size:0x4 align:4 data:float -lbl_805AE650 = .sdata2:0x805AE650; // type:object size:0x4 align:4 data:float -lbl_805AE654 = .sdata2:0x805AE654; // type:object size:0x4 align:4 data:float -lbl_805AE658 = .sdata2:0x805AE658; // type:object size:0x4 data:4byte -lbl_805AE65C = .sdata2:0x805AE65C; // type:object size:0x4 data:4byte -lbl_805AE660 = .sdata2:0x805AE660; // type:object size:0x4 data:4byte -lbl_805AE664 = .sdata2:0x805AE664; // type:object size:0x4 data:4byte -lbl_805AE668 = .sdata2:0x805AE668; // type:object size:0x4 align:4 data:float -lbl_805AE66C = .sdata2:0x805AE66C; // type:object size:0x4 align:4 data:float -lbl_805AE670 = .sdata2:0x805AE670; // type:object size:0x4 align:4 data:float -lbl_805AE674 = .sdata2:0x805AE674; // type:object size:0x4 align:4 data:float -lbl_805AE678 = .sdata2:0x805AE678; // type:object size:0x8 align:8 data:double -lbl_805AE680 = .sdata2:0x805AE680; // type:object size:0x4 align:4 data:float -lbl_805AE688 = .sdata2:0x805AE688; // type:object size:0x8 align:8 data:double +kAbsoluteMinimum__11IController = .sdata2:0x805AE648; // type:object size:0x4 align:4 data:float +kAbsoluteMaximum__11IController = .sdata2:0x805AE64C; // type:object size:0x4 align:4 data:float +kRelativeMinimum__11IController = .sdata2:0x805AE650; // type:object size:0x4 align:4 data:float +kRelativeMaximum__11IController = .sdata2:0x805AE654; // type:object size:0x4 align:4 data:float +skTypeUnknown__18CDolphinController = .sdata2:0x805AE658; // type:object size:0x4 data:4byte +skTypeStandard__18CDolphinController = .sdata2:0x805AE65C; // type:object size:0x4 data:4byte +skTypeGBA__18CDolphinController = .sdata2:0x805AE660; // type:object size:0x4 data:4byte +skTypeWavebird__18CDolphinController = .sdata2:0x805AE664; // type:object size:0x4 data:4byte +@142 = .sdata2:0x805AE668; // type:object size:0x4 scope:local align:4 data:float +@143 = .sdata2:0x805AE66C; // type:object size:0x4 scope:local align:4 data:float +@144 = .sdata2:0x805AE670; // type:object size:0x4 scope:local align:4 data:float +@160 = .sdata2:0x805AE674; // type:object size:0x4 scope:local align:4 data:float +@186 = .sdata2:0x805AE678; // type:object size:0x8 scope:local align:8 data:double +@213 = .sdata2:0x805AE680; // type:object size:0x4 scope:local align:4 data:float +@215 = .sdata2:0x805AE688; // type:object size:0x8 scope:local align:8 data:double lbl_805AE690 = .sdata2:0x805AE690; // type:object size:0x8 align:4 data:float lbl_805AE698 = .sdata2:0x805AE698; // type:object size:0x8 align:4 data:float lbl_805AE6A0 = .sdata2:0x805AE6A0; // type:object size:0x4 align:4 data:float diff --git a/configure.py b/configure.py index c58bf1e9..247776c5 100755 --- a/configure.py +++ b/configure.py @@ -1046,11 +1046,11 @@ config.libs = [ Object(NonMatching, "Kyoto/Audio/DolphinCAudioGroupSet.cpp"), Object(NonMatching, "Kyoto/Audio/DolphinCAudioSys.cpp"), Object(NonMatching, "Kyoto/DolphinCMemoryCardSys.cpp"), - Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Input/DolphinIController.cpp"), - Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Input/CDolphinController.cpp"), - Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/DolphinCDvdFile.cpp"), + Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/Input/DolphinIController.cpp"), + Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/Input/CDolphinController.cpp"), + Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/DolphinCDvdFile.cpp"), Object(NonMatching, "Kyoto/Alloc/CMediumAllocPool.cpp"), - Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Alloc/CSmallAllocPool.cpp"), + Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/Alloc/CSmallAllocPool.cpp"), Object(NonMatching, "Kyoto/Alloc/CGameAllocator.cpp"), Object(NonMatching, "Kyoto/Animation/DolphinCSkinnedModel.cpp"), Object(NonMatching, "Kyoto/Animation/DolphinCSkinRules.cpp"),