diff --git a/.clang-format b/.clang-format index 4cbd422a..884e5c20 100644 --- a/.clang-format +++ b/.clang-format @@ -24,7 +24,7 @@ BreakBeforeBinaryOperators: None BreakBeforeBraces: Attach BreakBeforeTernaryOperators: False BreakStringLiterals: True -ColumnLimit: 100 +ColumnLimit: 120 ContinuationIndentWidth: 8 IncludeBlocks: Preserve IndentAccessModifiers: False diff --git a/.vscode/settings.json b/.vscode/settings.json index 9a75dccb..c96be5c0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,31 @@ { - "clangd.fallbackFlags": [ - "-I${workspaceFolder}/include", - "-I${workspaceFolder}/include/lib", - ] -} \ No newline at end of file + "[c]": { + "files.encoding": "utf8", + "editor.defaultFormatter": "xaver.clang-format" + }, + "[cpp]": { + "files.encoding": "utf8", + "editor.defaultFormatter": "xaver.clang-format" + }, + "[python]": { + "editor.defaultFormatter": "ms-python.black-formatter" + }, + "files.insertFinalNewline": true, + "files.trimFinalNewlines": true, + "search.useIgnoreFiles": false, + "search.exclude": { + "build/*/config.json": true, + "build/**/*.MAP": true, + "build.ninja": true, + ".ninja_*": true, + "objdiff.json": true + }, + "files.associations": { + "*.inc": "cpp", + "xutility": "cpp", + "type_traits": "cpp", + "xtr1common": "cpp", + "limits": "cpp", + "utility": "cpp" + } +} diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index a5193539..b8873675 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -66,6 +66,8 @@ rvl/CX/cx.c: nw4r/db/db_directPrint.cpp: .text start:0x804342A0 end:0x80434EA0 + .rodata start:0x804F5D28 end:0x804F5FE0 + .data start:0x8056C000 end:0x8056C010 .sbss start:0x805765E8 end:0x805765F0 .bss start:0x80636B80 end:0x80636BA4 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 412f0ec6..6dd47b65 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -22202,30 +22202,30 @@ fn_803B8830 = .text:0x803B8830; // type:function size:0x58 fn_803B8890 = .text:0x803B8890; // type:function size:0xA4 fn_803B8940 = .text:0x803B8940; // type:function size:0x174 fn_803B8AC0 = .text:0x803B8AC0; // type:function size:0xA4 -fn_803B8B70 = .text:0x803B8B70; // type:function size:0xF8 -fn_803B8C70 = .text:0x803B8C70; // type:function size:0x88 -fn_803B8D00 = .text:0x803B8D00; // type:function size:0x54 -fn_803B8D60 = .text:0x803B8D60; // type:function size:0x8C -fn_803B8DF0 = .text:0x803B8DF0; // type:function size:0x54 -fn_803B8E50 = .text:0x803B8E50; // type:function size:0x88 -fn_803B8EE0 = .text:0x803B8EE0; // type:function size:0x9C -fn_803B8F80 = .text:0x803B8F80; // type:function size:0xEC -fn_803B9070 = .text:0x803B9070; // type:function size:0x98 -fn_803B9110 = .text:0x803B9110; // type:function size:0x24 -fn_803B9140 = .text:0x803B9140; // type:function size:0x24 -fn_803B9170 = .text:0x803B9170; // type:function size:0x1C -fn_803B9190 = .text:0x803B9190; // type:function size:0x88 -fn_803B9220 = .text:0x803B9220; // type:function size:0x44 -fn_803B9270 = .text:0x803B9270; // type:function size:0x18 -fn_803B9290 = .text:0x803B9290; // type:function size:0x44 -fn_803B92E0 = .text:0x803B92E0; // type:function size:0x20 -fn_803B9300 = .text:0x803B9300; // type:function size:0x3C -fn_803B9340 = .text:0x803B9340; // type:function size:0xD8 -fn_803B9420 = .text:0x803B9420; // type:function size:0xD4 -fn_803B9500 = .text:0x803B9500; // type:function size:0x28 -fn_803B9530 = .text:0x803B9530; // type:function size:0x54 -fn_803B9590 = .text:0x803B9590; // type:function size:0x1CC -fn_803B9760 = .text:0x803B9760; // type:function size:0x19C +C_MTXLightPerspective = .text:0x803B8B70; // type:function size:0xF8 +C_MTXLightOrtho = .text:0x803B8C70; // type:function size:0x88 +PSMTXMultVec = .text:0x803B8D00; // type:function size:0x54 +PSMTXMultVecArray = .text:0x803B8D60; // type:function size:0x8C +PSMTXMultVecSR = .text:0x803B8DF0; // type:function size:0x54 +PSMTXMultVecArraySR = .text:0x803B8E50; // type:function size:0x88 +C_MTXFrustum = .text:0x803B8EE0; // type:function size:0x9C +C_MTXPerspective = .text:0x803B8F80; // type:function size:0xEC +C_MTXOrtho = .text:0x803B9070; // type:function size:0x98 +PSVECAdd = .text:0x803B9110; // type:function size:0x24 +PSVECSubtract = .text:0x803B9140; // type:function size:0x24 +PSVECScale = .text:0x803B9170; // type:function size:0x1C +C_VECNormalize = .text:0x803B9190; // type:function size:0x88 +PSVECNormalize = .text:0x803B9220; // type:function size:0x44 +PSVECSquareMag = .text:0x803B9270; // type:function size:0x18 +PSVECMag = .text:0x803B9290; // type:function size:0x44 +PSVECDotProduct = .text:0x803B92E0; // type:function size:0x20 +PSVECCrossProduct = .text:0x803B9300; // type:function size:0x3C +C_VECHalfAngle = .text:0x803B9340; // type:function size:0xD8 +C_VECReflect = .text:0x803B9420; // type:function size:0xD4 +PSVECSquareDistance = .text:0x803B9500; // type:function size:0x28 +PSVECDistance = .text:0x803B9530; // type:function size:0x54 +C_QUATMtx = .text:0x803B9590; // type:function size:0x1CC +C_QUATSlerp = .text:0x803B9760; // type:function size:0x19C __GXDefaultTexRegionCallback = .text:0x803B9900; // type:function size:0xE4 __GXDefaultTlutRegionCallback = .text:0x803B99F0; // type:function size:0x24 __GXShutdown = .text:0x803B9A20; // type:function size:0x170 @@ -22434,20 +22434,20 @@ __GXSetMatrixIndex = .text:0x803C27A0; // type:function size:0x88 GXSetGPMetric = .text:0x803C2830; // type:function size:0x81C GXClearGPMetric = .text:0x803C3050; // type:function size:0x10 __DVDFSInit = .text:0x803C3060; // type:function size:0x30 scope:global -fn_803C3090 = .text:0x803C3090; // type:function size:0x308 -fn_803C33A0 = .text:0x803C33A0; // type:function size:0x68 -fn_803C3410 = .text:0x803C3410; // type:function size:0x120 -fn_803C3530 = .text:0x803C3530; // type:function size:0x24 -fn_803C3560 = .text:0x803C3560; // type:function size:0x114 -fn_803C3680 = .text:0x803C3680; // type:function size:0xD0 -fn_803C3750 = .text:0x803C3750; // type:function size:0x18 -fn_803C3770 = .text:0x803C3770; // type:function size:0x128 -fn_803C38A0 = .text:0x803C38A0; // type:function size:0x8 -fn_803C38B0 = .text:0x803C38B0; // type:function size:0x10C -fn_803C39C0 = .text:0x803C39C0; // type:function size:0x8C -fn_803C3A50 = .text:0x803C3A50; // type:function size:0x8 -fn_803C3A60 = .text:0x803C3A60; // type:function size:0xB4 -fn_803C3B20 = .text:0x803C3B20; // type:function size:0x4 +DVDConvertPathToEntrynum = .text:0x803C3090; // type:function size:0x308 +DVDFastOpen = .text:0x803C33A0; // type:function size:0x68 +DVDOpen = .text:0x803C3410; // type:function size:0x120 +DVDClose = .text:0x803C3530; // type:function size:0x24 +entryToPath = .text:0x803C3560; // type:function size:0x114 +DVDReadAsyncPrio = .text:0x803C3680; // type:function size:0xD0 +cbForReadAsync = .text:0x803C3750; // type:function size:0x18 +DVDReadPrio = .text:0x803C3770; // type:function size:0x128 +cbForReadSync = .text:0x803C38A0; // type:function size:0x8 +DVDOpenDir = .text:0x803C38B0; // type:function size:0x10C +DVDReadDir = .text:0x803C39C0; // type:function size:0x8C +DVDCloseDir = .text:0x803C3A50; // type:function size:0x8 +StampCommand = .text:0x803C3A60; // type:function size:0xB4 +defaultOptionalCommandChecker = .text:0x803C3B20; // type:function size:0x4 DVDInit = .text:0x803C3B30; // type:function size:0x154 scope:global fn_803C3C90 = .text:0x803C3C90; // type:function size:0x178 fn_803C3E10 = .text:0x803C3E10; // type:function size:0x184 @@ -24143,185 +24143,185 @@ DirectPrint_IsActive__Q24nw4r2dbFv = .text:0x80434360; // type:function size:0x2 DirectPrint_EraseXfb__Q24nw4r2dbFiiii = .text:0x80434390; // type:function size:0x190 DirectPrint_ChangeXfb__Q24nw4r2dbFPvUsUs = .text:0x80434520; // type:function size:0x34 DirectPrint_StoreCache__Q24nw4r2dbFv = .text:0x80434560; // type:function size:0x14 -DirectPrint_DrawString__Q24nw4r2dbFiiPCce = .text:0x80434580; // type:function size:0xD0 -DirectPrint_DrawString___Q24nw4r2dbFii = .text:0x80434650; // type:function size:0x70 -DirectPrint_DrawStringToXfb__Q34nw4r2db6detailFiiPCcP16__va_list_structbb = .text:0x804346C0; // type:function size:0xE4 +DirectPrint_Printf__Q24nw4r2dbFiiPCce = .text:0x80434580; // type:function size:0xD0 +DirectPrint_printfsub__Q24nw4r2dbFiiPCcP16__va_list_struct = .text:0x80434650; // type:function size:0x70 +DirectPrint_DrawString__Q24nw4r2dbFiibPCce = .text:0x804346C0; // type:function size:0xE4 DrawStringToXfb___Q24nw4r2dbFiiPCcbb = .text:0x804347B0; // type:function size:0x154 DrawStringLineToXfb___Q24nw4r2dbFiiPCci = .text:0x80434910; // type:function size:0xDC DrawCharToXfb___Q24nw4r2dbFiii = .text:0x804349F0; // type:function size:0x2C0 DirectPrint_SetupFB__Q34nw4r2db6detailFPC16_GXRenderModeObj = .text:0x80434CB0; // type:function size:0x1EC -fn_80434EA0 = .text:0x80434EA0; // type:function size:0xB0 -fn_80434F50 = .text:0x80434F50; // type:function size:0x1B0 -fn_80435100 = .text:0x80435100; // type:function size:0x30 -fn_80435130 = .text:0x80435130; // type:function size:0x1A4 -fn_804352E0 = .text:0x804352E0; // type:function size:0x7C -fn_80435360 = .text:0x80435360; // type:function size:0x3B8 -fn_80435720 = .text:0x80435720; // type:function size:0xD8 -fn_80435800 = .text:0x80435800; // type:function size:0x120 -fn_80435920 = .text:0x80435920; // type:function size:0x6C -fn_80435990 = .text:0x80435990; // type:function size:0xE8 -fn_80435A80 = .text:0x80435A80; // type:function size:0x13C -fn_80435BC0 = .text:0x80435BC0; // type:function size:0x84 -fn_80435C50 = .text:0x80435C50; // type:function size:0x190 -fn_80435DE0 = .text:0x80435DE0; // type:function size:0xE0 -fn_80435EC0 = .text:0x80435EC0; // type:function size:0x3B8 -fn_80436280 = .text:0x80436280; // type:function size:0x23C -fn_804364C0 = .text:0x804364C0; // type:function size:0x10C -fn_804365D0 = .text:0x804365D0; // type:function size:0x408 -fn_804369E0 = .text:0x804369E0; // type:function size:0x1C -fn_80436A00 = .text:0x80436A00; // type:function size:0x10 -fn_80436A10 = .text:0x80436A10; // type:function size:0x14 -fn_80436A30 = .text:0x80436A30; // type:function size:0x18 -fn_80436A50 = .text:0x80436A50; // type:function size:0x8C -fn_80436AE0 = .text:0x80436AE0; // type:function size:0x48 -fn_80436B30 = .text:0x80436B30; // type:function size:0xC -fn_80436B40 = .text:0x80436B40; // type:function size:0x8 -fn_80436B50 = .text:0x80436B50; // type:function size:0xFC -fn_80436C50 = .text:0x80436C50; // type:function size:0xC4 -fn_80436D20 = .text:0x80436D20; // type:function size:0xCC -fn_80436DF0 = .text:0x80436DF0; // type:function size:0x2DC -fn_804370D0 = .text:0x804370D0; // type:function size:0xD8 -fn_804371B0 = .text:0x804371B0; // type:function size:0xF8 -fn_804372B0 = .text:0x804372B0; // type:function size:0x104 -fn_804373C0 = .text:0x804373C0; // type:function size:0x10 -fn_804373D0 = .text:0x804373D0; // type:function size:0xAC -fn_80437480 = .text:0x80437480; // type:function size:0xA4 -fn_80437530 = .text:0x80437530; // type:function size:0x24 +RemoveConsoleFromList___Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead = .text:0x80434EA0; // type:function size:0xB0 +Console_Create__Q24nw4r2dbFPvUsUsUsUsUs = .text:0x80434F50; // type:function size:0x1B0 +Console_Destroy__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead = .text:0x80435100; // type:function size:0x30 +DoDrawConsole___Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadPQ34nw4r2ut17TextWriterBase = .text:0x80435130; // type:function size:0x1A4 +Console_DrawDirect__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead = .text:0x804352E0; // type:function size:0x7C +PrintToBuffer___Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadPCUc = .text:0x80435360; // type:function size:0x3B8 +Console_VFPrintf__Q24nw4r2dbFQ34nw4r2db17ConsoleOutputTypePQ44nw4r2db6detail11ConsoleHeadPCcP16__va_list_struct = .text:0x80435720; // type:function size:0xD8 +Console_Printf__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadPCce = .text:0x80435800; // type:function size:0x120 +Console_GetTotalLines__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead = .text:0x80435920; // type:function size:0x6C +Exception_Init__Q24nw4r2dbFv = .text:0x80435990; // type:function size:0xE8 +ErrorHandler___Q24nw4r2dbFUsP9OSContextUlUl = .text:0x80435A80; // type:function size:0x13C +RunThread___Q24nw4r2dbFPv = .text:0x80435BC0; // type:function size:0x84 +DumpException___Q24nw4r2dbFPCQ34nw4r2db22ExceptionCallbackParam = .text:0x80435C50; // type:function size:0x190 +Exception_Printf___Q24nw4r2dbFPCce = .text:0x80435DE0; // type:function size:0xE0 +PrintContext___Q24nw4r2dbFUsPC9OSContextUlUl = .text:0x80435EC0; // type:function size:0x3B8 +ShowMainInfo___Q24nw4r2dbFUsPC9OSContextUlUl = .text:0x80436280; // type:function size:0x23C +ShowGPRMap___Q24nw4r2dbFPC9OSContext = .text:0x804364C0; // type:function size:0x10C +ShowFloat___Q24nw4r2dbFPC9OSContext = .text:0x804365D0; // type:function size:0x408 +Exception_SetConsole__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadPC16_GXRenderModeObj = .text:0x804369E0; // type:function size:0x1C +Exception_GetConsole__Q24nw4r2dbFv = .text:0x80436A00; // type:function size:0x10 +Exception_SetUserCallback__Q24nw4r2dbFPFPQ44nw4r2db6detail11ConsoleHeadPv_bPv = .text:0x80436A10; // type:function size:0x14 +Exception_SetDisplayInfo__Q24nw4r2dbFUs = .text:0x80436A30; // type:function size:0x18 +MapFile_RegistOnDvd__Q24nw4r2dbFPvPCcPC12OSModuleInfo = .text:0x80436A50; // type:function size:0x8C +MapFile_Unregist__Q24nw4r2dbFPQ34nw4r2db7MapFile = .text:0x80436AE0; // type:function size:0x48 +MapFile_UnregistAll__Q24nw4r2dbFv = .text:0x80436B30; // type:function size:0xC +GetCharOnMem___Q24nw4r2dbFPCUc = .text:0x80436B40; // type:function size:0x8 +GetCharOnDvd___Q24nw4r2dbFPCUc = .text:0x80436B50; // type:function size:0xFC +SearchParam___Q24nw4r2dbFPUcUlUc = .text:0x80436C50; // type:function size:0xC4 +XStrToU32___Q24nw4r2dbFPCUc = .text:0x80436D20; // type:function size:0xCC +CopySymbol___Q24nw4r2dbFPCUcPUcUlUc = .text:0x80436DF0; // type:function size:0x2DC +QuerySymbolToMapFile___Q24nw4r2dbFPUcPC12OSModuleInfoUlPUcUl = .text:0x804370D0; // type:function size:0xD8 +QuerySymbolToSingleMapFile___Q24nw4r2dbFPQ34nw4r2db7MapFileUlPUcUl = .text:0x804371B0; // type:function size:0xF8 +MapFile_QuerySymbol__Q24nw4r2dbFUlPUcUl = .text:0x804372B0; // type:function size:0x104 +Assertion_SetConsole__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead = .text:0x804373C0; // type:function size:0x10 +FExp__Q34nw4r4math6detailFf = .text:0x804373D0; // type:function size:0xAC +FLog__Q34nw4r4math6detailFf = .text:0x80437480; // type:function size:0xA4 +FrSqrt__Q24nw4r4mathFf = .text:0x80437530; // type:function size:0x24 fn_80437560 = .text:0x80437560; // type:function size:0x4C -fn_804375B0 = .text:0x804375B0; // type:function size:0x78 -fn_80437630 = .text:0x80437630; // type:function size:0x68 -fn_804376A0 = .text:0x804376A0; // type:function size:0x70 -fn_80437710 = .text:0x80437710; // type:function size:0x1C0 -fn_804378D0 = .text:0x804378D0; // type:function size:0x40 -fn_80437910 = .text:0x80437910; // type:function size:0x40 -fn_80437950 = .text:0x80437950; // type:function size:0x24 -fn_80437980 = .text:0x80437980; // type:function size:0x34 -fn_804379C0 = .text:0x804379C0; // type:function size:0x20 -fn_804379E0 = .text:0x804379E0; // type:function size:0x54 -fn_80437A40 = .text:0x80437A40; // type:function size:0x6C -fn_80437AB0 = .text:0x80437AB0; // type:function size:0x168 -fn_80437C20 = .text:0x80437C20; // type:function size:0x90 -fn_80437CB0 = .text:0x80437CB0; // type:function size:0x34 -fn_80437CF0 = .text:0x80437CF0; // type:function size:0x44 -fn_80437D40 = .text:0x80437D40; // type:function size:0xB4 -fn_80437E00 = .text:0x80437E00; // type:function size:0xBC -fn_80437EC0 = .text:0x80437EC0; // type:function size:0x1D8 -fn_804380A0 = .text:0x804380A0; // type:function size:0xB4 -fn_80438160 = .text:0x80438160; // type:function size:0x6D8 -fn_80438840 = .text:0x80438840; // type:function size:0x268 -fn_80438AB0 = .text:0x80438AB0; // type:function size:0x27C -fn_80438D30 = .text:0x80438D30; // type:function size:0x70 -fn_80438DA0 = .text:0x80438DA0; // type:function size:0x1AC -fn_80438F50 = .text:0x80438F50; // type:function size:0x50 -fn_80438FA0 = .text:0x80438FA0; // type:function size:0x28 -fn_80438FD0 = .text:0x80438FD0; // type:function size:0x58 -fn_80439030 = .text:0x80439030; // type:function size:0x2C -fn_80439060 = .text:0x80439060; // type:function size:0x40 -fn_804390A0 = .text:0x804390A0; // type:function size:0x54 -fn_80439100 = .text:0x80439100; // type:function size:0xD8 -fn_804391E0 = .text:0x804391E0; // type:function size:0xD8 -fn_804392C0 = .text:0x804392C0; // type:function size:0x7C -fn_80439340 = .text:0x80439340; // type:function size:0x68 -fn_804393B0 = .text:0x804393B0; // type:function size:0x70 -fn_80439420 = .text:0x80439420; // type:function size:0x6C -fn_80439490 = .text:0x80439490; // type:function size:0x98 -fn_80439530 = .text:0x80439530; // type:function size:0x6C -fn_804395A0 = .text:0x804395A0; // type:function size:0x74 -fn_80439620 = .text:0x80439620; // type:function size:0x74 -fn_804396A0 = .text:0x804396A0; // type:function size:0x98 -fn_80439740 = .text:0x80439740; // type:function size:0x6C -fn_804397B0 = .text:0x804397B0; // type:function size:0x6C -fn_80439820 = .text:0x80439820; // type:function size:0x6C -fn_80439890 = .text:0x80439890; // type:function size:0x6C -fn_80439900 = .text:0x80439900; // type:function size:0x6C -fn_80439970 = .text:0x80439970; // type:function size:0x6C -fn_804399E0 = .text:0x804399E0; // type:function size:0x6C -fn_80439A50 = .text:0x80439A50; // type:function size:0x6C -fn_80439AC0 = .text:0x80439AC0; // type:function size:0x234 -fn_80439D00 = .text:0x80439D00; // type:function size:0x2C4 -fn_80439FD0 = .text:0x80439FD0; // type:function size:0x44 -fn_8043A020 = .text:0x8043A020; // type:function size:0x44 -fn_8043A070 = .text:0x8043A070; // type:function size:0x50 -fn_8043A0C0 = .text:0x8043A0C0; // type:function size:0x54 -fn_8043A120 = .text:0x8043A120; // type:function size:0x54 -fn_8043A180 = .text:0x8043A180; // type:function size:0x34 -fn_8043A1C0 = .text:0x8043A1C0; // type:function size:0x50 -fn_8043A210 = .text:0x8043A210; // type:function size:0x54 -fn_8043A270 = .text:0x8043A270; // type:function size:0x54 -fn_8043A2D0 = .text:0x8043A2D0; // type:function size:0x34 -fn_8043A310 = .text:0x8043A310; // type:function size:0x50 -fn_8043A360 = .text:0x8043A360; // type:function size:0x54 -fn_8043A3C0 = .text:0x8043A3C0; // type:function size:0x54 -fn_8043A420 = .text:0x8043A420; // type:function size:0x34 -fn_8043A460 = .text:0x8043A460; // type:function size:0x50 -fn_8043A4B0 = .text:0x8043A4B0; // type:function size:0x54 -fn_8043A510 = .text:0x8043A510; // type:function size:0x54 -fn_8043A570 = .text:0x8043A570; // type:function size:0x34 -fn_8043A5B0 = .text:0x8043A5B0; // type:function size:0x54 +SinFIdx__Q24nw4r4mathFf = .text:0x804375B0; // type:function size:0x78 +CosFIdx__Q24nw4r4mathFf = .text:0x80437630; // type:function size:0x68 +SinCosFIdx__Q24nw4r4mathFPfPff = .text:0x804376A0; // type:function size:0x70 +Atan2FIdx__Q24nw4r4mathFff = .text:0x80437710; // type:function size:0x1C0 +VEC3Maximize__Q24nw4r4mathFPQ34nw4r4math4VEC3PCQ34nw4r4math4VEC3PCQ34nw4r4math4VEC3 = .text:0x804378D0; // type:function size:0x40 +VEC3Minimize__Q24nw4r4mathFPQ34nw4r4math4VEC3PCQ34nw4r4math4VEC3PCQ34nw4r4math4VEC3 = .text:0x80437910; // type:function size:0x40 +MTX33Identity__Q24nw4r4mathFPQ34nw4r4math5MTX33 = .text:0x80437950; // type:function size:0x24 +MTX34ToMTX33__Q24nw4r4mathFPQ34nw4r4math5MTX33PCQ34nw4r4math5MTX34 = .text:0x80437980; // type:function size:0x34 +MTX34Zero__Q24nw4r4mathFPQ34nw4r4math5MTX34 = .text:0x804379C0; // type:function size:0x20 +MTX34Scale__Q24nw4r4mathFPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34PCQ34nw4r4math4VEC3 = .text:0x804379E0; // type:function size:0x54 +MTX34Trans__Q24nw4r4mathFPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34PCQ34nw4r4math4VEC3 = .text:0x80437A40; // type:function size:0x6C +MTX34RotXYZFIdx__Q24nw4r4mathFPQ34nw4r4math5MTX34fff = .text:0x80437AB0; // type:function size:0x168 +VEC3TransformNormal__Q24nw4r4mathFPQ34nw4r4math4VEC3PCQ34nw4r4math5MTX34PCQ34nw4r4math4VEC3 = .text:0x80437C20; // type:function size:0x90 +MTX44Identity__Q24nw4r4mathFPQ34nw4r4math5MTX44 = .text:0x80437CB0; // type:function size:0x34 +MTX44Copy__Q24nw4r4mathFPQ34nw4r4math5MTX44PCQ34nw4r4math5MTX44 = .text:0x80437CF0; // type:function size:0x44 +Set__Q34nw4r4math5PLANEFPCQ34nw4r4math4VEC3PCQ34nw4r4math4VEC3PCQ34nw4r4math4VEC3 = .text:0x80437D40; // type:function size:0xB4 +Set__Q34nw4r4math4AABBFPCQ34nw4r4math4VEC3Ui = .text:0x80437E00; // type:function size:0xBC +Set__Q34nw4r4math4AABBFPCQ34nw4r4math4AABBPCQ34nw4r4math5MTX34 = .text:0x80437EC0; // type:function size:0x1D8 +Set__Q34nw4r4math7FRUSTUMFffffRCQ34nw4r4math5MTX34 = .text:0x804380A0; // type:function size:0xB4 +Set__Q34nw4r4math7FRUSTUMFffffffRCQ34nw4r4math5MTX34 = .text:0x80438160; // type:function size:0x6D8 +DistSqPoint3ToSegment3__Q24nw4r4mathFPCQ34nw4r4math4VEC3PCQ34nw4r4math8SEGMENT3Pf = .text:0x80438840; // type:function size:0x268 +IntersectionSegment3Plane__Q24nw4r4mathFPCQ34nw4r4math8SEGMENT3PCQ34nw4r4math5PLANEPfPQ34nw4r4math4VEC3 = .text:0x80438AB0; // type:function size:0x27C +IntersectionAABB__Q24nw4r4mathFPCQ34nw4r4math4AABBPCQ34nw4r4math4AABB = .text:0x80438D30; // type:function size:0x70 +IntersectAABB_Ex__Q34nw4r4math7FRUSTUMCFPCQ34nw4r4math4AABB = .text:0x80438DA0; // type:function size:0x1AC +__eq__Q34nw4r3g3d7ResNameCFQ34nw4r3g3d7ResName = .text:0x80438F50; // type:function size:0x50 +ResWriteBPCmd__Q34nw4r3g3d6detailFPUcUl = .text:0x80438FA0; // type:function size:0x28 +ResWriteBPCmd__Q34nw4r3g3d6detailFPUcUlUl = .text:0x80438FD0; // type:function size:0x58 +ResWriteCPCmd__Q34nw4r3g3d6detailFPUcUcUl = .text:0x80439030; // type:function size:0x2C +ResWriteXFCmd__Q34nw4r3g3d6detailFPUcUsUl = .text:0x80439060; // type:function size:0x40 +ResWriteSSMask__Q34nw4r3g3d6detailFPUcUl = .text:0x804390A0; // type:function size:0x54 +Get__Q34nw4r3g3d6ResDicCFQ34nw4r3g3d7ResName = .text:0x80439100; // type:function size:0xD8 +Get__Q34nw4r3g3d6ResDicCFPCcUl = .text:0x804391E0; // type:function size:0xD8 +__vc__Q34nw4r3g3d6ResDicCFPCc = .text:0x804392C0; // type:function size:0x7C +__vc__Q34nw4r3g3d6ResDicCFQ34nw4r3g3d7ResName = .text:0x80439340; // type:function size:0x68 +GetIndex__Q34nw4r3g3d6ResDicCFQ34nw4r3g3d7ResName = .text:0x804393B0; // type:function size:0x70 +GetResMdl__Q34nw4r3g3d7ResFileCFPCc = .text:0x80439420; // type:function size:0x6C +GetResMdl__Q34nw4r3g3d7ResFileCFi = .text:0x80439490; // type:function size:0x98 +GetResMdlNumEntries__Q34nw4r3g3d7ResFileCFv = .text:0x80439530; // type:function size:0x6C +GetResPltt__Q34nw4r3g3d7ResFileCFQ34nw4r3g3d7ResName = .text:0x804395A0; // type:function size:0x74 +GetResTex__Q34nw4r3g3d7ResFileCFQ34nw4r3g3d7ResName = .text:0x80439620; // type:function size:0x74 +GetResTex__Q34nw4r3g3d7ResFileCFi = .text:0x804396A0; // type:function size:0x98 +GetResAnmChr__Q34nw4r3g3d7ResFileCFPCc = .text:0x80439740; // type:function size:0x6C +GetResAnmVis__Q34nw4r3g3d7ResFileCFPCc = .text:0x804397B0; // type:function size:0x6C +GetResAnmClr__Q34nw4r3g3d7ResFileCFPCc = .text:0x80439820; // type:function size:0x6C +GetResAnmTexPat__Q34nw4r3g3d7ResFileCFPCc = .text:0x80439890; // type:function size:0x6C +GetResAnmTexSrt__Q34nw4r3g3d7ResFileCFPCc = .text:0x80439900; // type:function size:0x6C +GetResAnmShp__Q34nw4r3g3d7ResFileCFPCc = .text:0x80439970; // type:function size:0x6C +GetResAnmScn__Q34nw4r3g3d7ResFileCFPCc = .text:0x804399E0; // type:function size:0x6C +GetExternalData__Q34nw4r3g3d7ResFileCFPCc = .text:0x80439A50; // type:function size:0x6C +Bind__Q34nw4r3g3d7ResFileFQ34nw4r3g3d7ResFile = .text:0x80439AC0; // type:function size:0x234 +Init__Q34nw4r3g3d7ResFileFv = .text:0x80439D00; // type:function size:0x2C4 +GetResByteCode__Q34nw4r3g3d6ResMdlCFPCc = .text:0x80439FD0; // type:function size:0x44 +GetResNode__Q34nw4r3g3d6ResMdlCFPCc = .text:0x8043A020; // type:function size:0x44 +GetResNode__Q34nw4r3g3d6ResMdlCFQ34nw4r3g3d7ResName = .text:0x8043A070; // type:function size:0x50 +GetResNode__Q34nw4r3g3d6ResMdlCFi = .text:0x8043A0C0; // type:function size:0x54 +GetResNode__Q34nw4r3g3d6ResMdlCFUl = .text:0x8043A120; // type:function size:0x54 +GetResNodeNumEntries__Q34nw4r3g3d6ResMdlCFv = .text:0x8043A180; // type:function size:0x34 +GetResVtxPos__Q34nw4r3g3d6ResMdlCFQ34nw4r3g3d7ResName = .text:0x8043A1C0; // type:function size:0x50 +GetResVtxPos__Q34nw4r3g3d6ResMdlCFi = .text:0x8043A210; // type:function size:0x54 +GetResVtxPos__Q34nw4r3g3d6ResMdlCFUl = .text:0x8043A270; // type:function size:0x54 +GetResVtxPosNumEntries__Q34nw4r3g3d6ResMdlCFv = .text:0x8043A2D0; // type:function size:0x34 +GetResVtxNrm__Q34nw4r3g3d6ResMdlCFQ34nw4r3g3d7ResName = .text:0x8043A310; // type:function size:0x50 +GetResVtxNrm__Q34nw4r3g3d6ResMdlCFi = .text:0x8043A360; // type:function size:0x54 +GetResVtxNrm__Q34nw4r3g3d6ResMdlCFUl = .text:0x8043A3C0; // type:function size:0x54 +GetResVtxNrmNumEntries__Q34nw4r3g3d6ResMdlCFv = .text:0x8043A420; // type:function size:0x34 +GetResVtxClr__Q34nw4r3g3d6ResMdlCFQ34nw4r3g3d7ResName = .text:0x8043A460; // type:function size:0x50 +GetResVtxClr__Q34nw4r3g3d6ResMdlCFi = .text:0x8043A4B0; // type:function size:0x54 +GetResVtxClr__Q34nw4r3g3d6ResMdlCFUl = .text:0x8043A510; // type:function size:0x54 +GetResVtxClrNumEntries__Q34nw4r3g3d6ResMdlCFv = .text:0x8043A570; // type:function size:0x34 +GetResVtxTexCoord__Q34nw4r3g3d6ResMdlCFi = .text:0x8043A5B0; // type:function size:0x54 fn_8043A610 = .text:0x8043A610; // type:function size:0x54 -fn_8043A670 = .text:0x8043A670; // type:function size:0x44 -fn_8043A6C0 = .text:0x8043A6C0; // type:function size:0x50 -fn_8043A710 = .text:0x8043A710; // type:function size:0x54 -fn_8043A770 = .text:0x8043A770; // type:function size:0x54 -fn_8043A7D0 = .text:0x8043A7D0; // type:function size:0x34 -fn_8043A810 = .text:0x8043A810; // type:function size:0x54 -fn_8043A870 = .text:0x8043A870; // type:function size:0x54 -fn_8043A8D0 = .text:0x8043A8D0; // type:function size:0x34 -fn_8043A910 = .text:0x8043A910; // type:function size:0x54 -fn_8043A970 = .text:0x8043A970; // type:function size:0x34 -fn_8043A9B0 = .text:0x8043A9B0; // type:function size:0x10C -fn_8043AAC0 = .text:0x8043AAC0; // type:function size:0x598 +GetResMat__Q34nw4r3g3d6ResMdlCFPCc = .text:0x8043A670; // type:function size:0x44 +GetResMat__Q34nw4r3g3d6ResMdlCFQ34nw4r3g3d7ResName = .text:0x8043A6C0; // type:function size:0x50 +GetResMat__Q34nw4r3g3d6ResMdlCFi = .text:0x8043A710; // type:function size:0x54 +GetResMat__Q34nw4r3g3d6ResMdlCFUl = .text:0x8043A770; // type:function size:0x54 +GetResMatNumEntries__Q34nw4r3g3d6ResMdlCFv = .text:0x8043A7D0; // type:function size:0x34 +GetResShp__Q34nw4r3g3d6ResMdlCFi = .text:0x8043A810; // type:function size:0x54 +GetResShp__Q34nw4r3g3d6ResMdlCFUl = .text:0x8043A870; // type:function size:0x54 +GetResShpNumEntries__Q34nw4r3g3d6ResMdlCFv = .text:0x8043A8D0; // type:function size:0x34 +GetResTexPlttInfoOffsetFromTexName__Q34nw4r3g3d6ResMdlCFi = .text:0x8043A910; // type:function size:0x54 +GetResTexPlttInfoOffsetFromTexNameNumEntries__Q34nw4r3g3d6ResMdlCFv = .text:0x8043A970; // type:function size:0x34 +Bind__Q34nw4r3g3d6ResMdlFQ34nw4r3g3d7ResFile = .text:0x8043A9B0; // type:function size:0x10C +Init__Q34nw4r3g3d6ResMdlFv = .text:0x8043AAC0; // type:function size:0x598 fn_8043B060 = .text:0x8043B060; // type:function size:0xA8 fn_8043B110 = .text:0x8043B110; // type:function size:0x1C fn_8043B130 = .text:0x8043B130; // type:function size:0x54 fn_8043B190 = .text:0x8043B190; // type:function size:0x40 fn_8043B1D0 = .text:0x8043B1D0; // type:function size:0x34 fn_8043B210 = .text:0x8043B210; // type:function size:0x34 -fn_8043B250 = .text:0x8043B250; // type:function size:0x204 -fn_8043B460 = .text:0x8043B460; // type:function size:0x26C -fn_8043B6D0 = .text:0x8043B6D0; // type:function size:0x48 -fn_8043B720 = .text:0x8043B720; // type:function size:0x5C -fn_8043B780 = .text:0x8043B780; // type:function size:0x64 +GXGetVtxAttrFmtv__Q34nw4r3g3d6ResShpCFP17_GXVtxAttrFmtList = .text:0x8043B250; // type:function size:0x204 +GXSetVtxAttrFmtv__Q34nw4r3g3d6ResShpFPC17_GXVtxAttrFmtList = .text:0x8043B460; // type:function size:0x26C +GetResVtxPos__Q34nw4r3g3d6ResShpCFv = .text:0x8043B6D0; // type:function size:0x48 +GetResVtxNrm__Q34nw4r3g3d6ResShpCFv = .text:0x8043B720; // type:function size:0x5C +GetResVtxClr__Q34nw4r3g3d6ResShpCFUl = .text:0x8043B780; // type:function size:0x64 fn_8043B7F0 = .text:0x8043B7F0; // type:function size:0x5C -fn_8043B850 = .text:0x8043B850; // type:function size:0x38C -fn_8043BBE0 = .text:0x8043BBE0; // type:function size:0xD8 -fn_8043BCC0 = .text:0x8043BCC0; // type:function size:0x64 -fn_8043BD30 = .text:0x8043BD30; // type:function size:0x18 -fn_8043BD50 = .text:0x8043BD50; // type:function size:0xB0 -fn_8043BE00 = .text:0x8043BE00; // type:function size:0xCC -fn_8043BED0 = .text:0x8043BED0; // type:function size:0x11C -fn_8043BFF0 = .text:0x8043BFF0; // type:function size:0x9C -fn_8043C090 = .text:0x8043C090; // type:function size:0x138 -fn_8043C1D0 = .text:0x8043C1D0; // type:function size:0x58 -fn_8043C230 = .text:0x8043C230; // type:function size:0x64 -fn_8043C2A0 = .text:0x8043C2A0; // type:function size:0x18 -fn_8043C2C0 = .text:0x8043C2C0; // type:function size:0x20 -fn_8043C2E0 = .text:0x8043C2E0; // type:function size:0x1C -fn_8043C300 = .text:0x8043C300; // type:function size:0x1C -fn_8043C320 = .text:0x8043C320; // type:function size:0x1C -fn_8043C340 = .text:0x8043C340; // type:function size:0x1C -fn_8043C360 = .text:0x8043C360; // type:function size:0x30 -fn_8043C390 = .text:0x8043C390; // type:function size:0x30 -fn_8043C3C0 = .text:0x8043C3C0; // type:function size:0x3C -fn_8043C400 = .text:0x8043C400; // type:function size:0x3C -fn_8043C440 = .text:0x8043C440; // type:function size:0x3C -fn_8043C480 = .text:0x8043C480; // type:function size:0x3C -fn_8043C4C0 = .text:0x8043C4C0; // type:function size:0x2C -fn_8043C4F0 = .text:0x8043C4F0; // type:function size:0x2C -fn_8043C520 = .text:0x8043C520; // type:function size:0x3C -fn_8043C560 = .text:0x8043C560; // type:function size:0x88 -fn_8043C5F0 = .text:0x8043C5F0; // type:function size:0x2C -fn_8043C620 = .text:0x8043C620; // type:function size:0x2C -fn_8043C650 = .text:0x8043C650; // type:function size:0x3C -fn_8043C690 = .text:0x8043C690; // type:function size:0x88 -fn_8043C720 = .text:0x8043C720; // type:function size:0xD4 -fn_8043C800 = .text:0x8043C800; // type:function size:0x7C -fn_8043C880 = .text:0x8043C880; // type:function size:0x78 -fn_8043C900 = .text:0x8043C900; // type:function size:0x5C -fn_8043C960 = .text:0x8043C960; // type:function size:0x14 -fn_8043C980 = .text:0x8043C980; // type:function size:0x14 -fn_8043C9A0 = .text:0x8043C9A0; // type:function size:0x14 -fn_8043C9C0 = .text:0x8043C9C0; // type:function size:0x34 +Init__Q34nw4r3g3d6ResShpFv = .text:0x8043B850; // type:function size:0x38C +CallPrePrimitiveDisplayList__Q34nw4r3g3d6ResShpCFbb = .text:0x8043BBE0; // type:function size:0xD8 +CallPrimitiveDisplayList__Q34nw4r3g3d6ResShpCFb = .text:0x8043BCC0; // type:function size:0x64 +DCStore__Q34nw4r3g3d6ResShpFb = .text:0x8043BD30; // type:function size:0x18 +GXGetTevAlphaIn__Q34nw4r3g3d6ResTevCF13_GXTevStageIDP14_GXTevAlphaArgP14_GXTevAlphaArgP14_GXTevAlphaArgP14_GXTevAlphaArg = .text:0x8043BD50; // type:function size:0xB0 +GXGetTevAlphaOp__Q34nw4r3g3d6ResTevCF13_GXTevStageIDP8_GXTevOpP10_GXTevBiasP11_GXTevScalePUcP11_GXTevRegID = .text:0x8043BE00; // type:function size:0xCC +GXSetTevOrder__Q34nw4r3g3d6ResTevF13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID = .text:0x8043BED0; // type:function size:0x11C +GXGetIndTexOrder__Q34nw4r3g3d6ResTevCF16_GXIndTexStageIDP13_GXTexCoordIDP11_GXTexMapID = .text:0x8043BFF0; // type:function size:0x9C +GXSetIndTexOrder__Q34nw4r3g3d6ResTevF16_GXIndTexStageID13_GXTexCoordID11_GXTexMapID = .text:0x8043C090; // type:function size:0x138 +CallDisplayList__Q34nw4r3g3d6ResTevCFb = .text:0x8043C1D0; // type:function size:0x58 +CopyTo__Q34nw4r3g3d6ResTevFPv = .text:0x8043C230; // type:function size:0x64 +DCStore__Q34nw4r3g3d6ResTevFb = .text:0x8043C2A0; // type:function size:0x18 +GetParent__Q34nw4r3g3d6ResMatFv = .text:0x8043C2C0; // type:function size:0x20 +DCStore__Q34nw4r3g3d9ResMatPixFb = .text:0x8043C2E0; // type:function size:0x1C +DCStore__Q34nw4r3g3d14ResMatTevColorFb = .text:0x8043C300; // type:function size:0x1C +DCStore__Q34nw4r3g3d20ResMatIndMtxAndScaleFb = .text:0x8043C320; // type:function size:0x1C +DCStore__Q34nw4r3g3d17ResMatTexCoordGenFb = .text:0x8043C340; // type:function size:0x1C +CallDisplayList__Q34nw4r3g3d9ResMatPixCFb = .text:0x8043C360; // type:function size:0x30 +CallDisplayList__Q34nw4r3g3d14ResMatTevColorCFb = .text:0x8043C390; // type:function size:0x30 +CopyTo__Q34nw4r3g3d9ResMatPixCFPv = .text:0x8043C3C0; // type:function size:0x3C +CopyTo__Q34nw4r3g3d14ResMatTevColorCFPv = .text:0x8043C400; // type:function size:0x3C +CopyTo__Q34nw4r3g3d20ResMatIndMtxAndScaleCFPv = .text:0x8043C440; // type:function size:0x3C +CopyTo__Q34nw4r3g3d17ResMatTexCoordGenCFPv = .text:0x8043C480; // type:function size:0x3C +GetTexObj__Q34nw4r3g3d9ResTexObjCF11_GXTexMapID = .text:0x8043C4C0; // type:function size:0x2C +GetTexObj__Q34nw4r3g3d9ResTexObjF11_GXTexMapID = .text:0x8043C4F0; // type:function size:0x2C +IsValidTexObj__Q34nw4r3g3d9ResTexObjCF11_GXTexMapID = .text:0x8043C520; // type:function size:0x3C +CopyTo__Q34nw4r3g3d9ResTexObjCFPv = .text:0x8043C560; // type:function size:0x88 +GetTlut__Q34nw4r3g3d10ResTlutObjCF7_GXTlut = .text:0x8043C5F0; // type:function size:0x2C +GetTlut__Q34nw4r3g3d10ResTlutObjF7_GXTlut = .text:0x8043C620; // type:function size:0x2C +IsValidTlut__Q34nw4r3g3d10ResTlutObjCF7_GXTlut = .text:0x8043C650; // type:function size:0x3C +CopyTo__Q34nw4r3g3d10ResTlutObjCFPv = .text:0x8043C690; // type:function size:0x88 +CopyTo__Q34nw4r3g3d9ResTexSrtCFPv = .text:0x8043C720; // type:function size:0xD4 +SetEffectMtx__Q34nw4r3g3d9ResTexSrtFUlPCQ34nw4r4math5MTX34 = .text:0x8043C800; // type:function size:0x7C +SetMapMode__Q34nw4r3g3d9ResTexSrtFUlUlii = .text:0x8043C880; // type:function size:0x78 +GetMapMode__Q34nw4r3g3d9ResTexSrtCFUlPUlPiPi = .text:0x8043C900; // type:function size:0x5C +GXSetNumTexGens__Q34nw4r3g3d10ResGenModeFUc = .text:0x8043C960; // type:function size:0x14 +GXSetNumTevStages__Q34nw4r3g3d10ResGenModeFUc = .text:0x8043C980; // type:function size:0x14 +GXSetCullMode__Q34nw4r3g3d10ResGenModeF11_GXCullMode = .text:0x8043C9A0; // type:function size:0x14 +CopyTo__Q34nw4r3g3d10ResGenModeCFPv = .text:0x8043C9C0; // type:function size:0x34 fn_8043CA00 = .text:0x8043CA00; // type:function size:0x1C fn_8043CA20 = .text:0x8043CA20; // type:function size:0x28 fn_8043CA50 = .text:0x8043CA50; // type:function size:0x20 @@ -25050,7 +25050,7 @@ ShutdownEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBus = .text:0x804641 AuxCallbackFunc__Q44nw4r3snd6detail9AxManagerFPvPv = .text:0x80464260; // type:function size:0x3DC PrepareReset__Q44nw4r3snd6detail9AxManagerFv = .text:0x80464640; // type:function size:0xC8 AiDmaCallbackFunc__Q44nw4r3snd6detail9AxManagerFv = .text:0x80464710; // type:function size:0x128 -__sinit_snd_AxManager_cpp = .text:0x80464840; // type:function size:0x40 +__sinit_\snd_AxManager_cpp = .text:0x80464840; // type:function size:0x40 scope:local __ct__Q44nw4r3snd6detail7AxVoiceFv = .text:0x80464880; // type:function size:0x44 __dt__Q44nw4r3snd6detail7AxVoiceFv = .text:0x804648D0; // type:function size:0x40 Setup__Q44nw4r3snd6detail7AxVoiceFPCvQ34nw4r3snd12SampleFormati = .text:0x80464910; // type:function size:0x80 @@ -25163,7 +25163,7 @@ DetachTempGeneralHandle__Q44nw4r3snd6detail10BasicSoundFv = .text:0x8046A2C0; // SetId__Q44nw4r3snd6detail10BasicSoundFUl = .text:0x8046A2D0; // type:function size:0x40 __dt__Q44nw4r3snd6detail10BasicSoundFv = .text:0x8046A310; // type:function size:0x40 GetRuntimeTypeInfo__Q44nw4r3snd6detail10BasicSoundCFv = .text:0x8046A350; // type:function size:0x8 -__sinit_snd_BasicSound_cpp = .text:0x8046A360; // type:function size:0xC +__sinit_\snd_BasicSound_cpp = .text:0x8046A360; // type:function size:0xC scope:local GetCoef__Q44nw4r3snd6detail15BiquadFilterLpfCFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef = .text:0x8046A370; // type:function size:0x88 GetCoef__Q44nw4r3snd6detail15BiquadFilterHpfCFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef = .text:0x8046A400; // type:function size:0x88 GetCoef__Q44nw4r3snd6detail18BiquadFilterBpf512CFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef = .text:0x8046A490; // type:function size:0x94 @@ -26275,11 +26275,11 @@ getTickPerFrame__Q23EGG7DisplayFv = .text:0x804975F0; // type:function size:0x4 beginFrame__Q23EGG7DisplayFv = .text:0x80497600; // type:function size:0xB8 beginRender__Q23EGG7DisplayFv = .text:0x804976C0; // type:function size:0x4 endRender__Q23EGG7DisplayFv = .text:0x804976D0; // type:function size:0x4 -endFrame__Q23EGG7DisplayFv = .text:0x804976E0; // type:function size:0x4 +endgFrame__Q23EGG7DisplayFv = .text:0x804976E0; // type:function size:0x4 preVRetrace__Q23EGG7DisplayFv = .text:0x804976F0; // type:function size:0xDC copyEFBtoXFB__Q23EGG7DisplayFv = .text:0x804977D0; // type:function size:0x9C calcFrequency__Q23EGG7DisplayFv = .text:0x80497870; // type:function size:0x84 -__sinit_\eggDisplay_cpp = .text:0x80497900; // type:function size:0x2C scope:global +__sinit_\eggDisplay_cpp = .text:0x80497900; // type:function size:0x2C scope:local __ct__Q23EGG10ColorFaderFffffQ34nw4r2ut5ColorQ33EGG5Fader7EStatus = .text:0x80497930; // type:function size:0xAC setFrame__Q23EGG10ColorFaderFUs = .text:0x804979E0; // type:function size:0x8 setColor__Q23EGG10ColorFaderFQ34nw4r2ut5Color = .text:0x804979F0; // type:function size:0x1C @@ -26362,7 +26362,7 @@ onAllocate__Q23EGG29TBufferFPQ23EGG4Heap = .text:0x8049AA2 allocate__Q23EGG32TBufferFii = .text:0x8049AA30; // type:function size:0x50 allocate__Q23EGG32TBufferFiPQ23EGG4Heapi = .text:0x8049AA80; // type:function size:0x74 onAllocate__Q23EGG32TBufferFPQ23EGG4Heap = .text:0x8049AB00; // type:function size:0x4 -__sinit_\eggController_cpp = .text:0x8049AB10; // type:function size:0x48 +__sinit_\eggController_cpp = .text:0x8049AB10; // type:function size:0x48 scope:local sqrt__Q23EGG7MathFf = .text:0x8049AB60; // type:function size:0x50 sin__Q23EGG7MathFf = .text:0x8049ABB0; // type:function size:0x24 cos__Q23EGG7MathFf = .text:0x8049ABE0; // type:function size:0x24 @@ -26380,7 +26380,7 @@ slerpTo__Q23EGG9Matrix34fCFRCQ23EGG9Matrix34fRQ23EGG9Matrix34ff = .text:0x8049B2 setAxisRotation__Q23EGG9Matrix34fFRCQ23EGG8Vector3ff = .text:0x8049B2D0; // type:function size:0x3C loadPosMtx__Q23EGG9Matrix34fFUi = .text:0x8049B310; // type:function size:0x4 multiplyTo__Q23EGG9Matrix34fCFRCQ23EGG9Matrix34fRQ23EGG9Matrix34f = .text:0x8049B320; // type:function size:0x4 -__sinit_\eggMatrix_cpp = .text:0x8049B330; // type:function size:0x58 +__sinit_\eggMatrix_cpp = .text:0x8049B330; // type:function size:0x58 scope:local set__Q23EGG5QuatfFffff = .text:0x8049B390; // type:function size:0x14 setAxisRotation__Q23EGG5QuatfFRCQ23EGG8Vector3ff = .text:0x8049B3B0; // type:function size:0x98 norm__Q23EGG5QuatfFv = .text:0x8049B450; // type:function size:0x30 @@ -26393,7 +26393,7 @@ makeVectorRotation__Q23EGG5QuatfFRQ23EGG8Vector3fRQ23EGG8Vector3f = .text:0x8049 normalise__Q23EGG8Vector3fFv = .text:0x8049BCC0; // type:function size:0x84 setLength__Q23EGG8Vector3fFRCQ23EGG8Vector3ff = .text:0x8049BD50; // type:function size:0xB8 setLength__Q23EGG8Vector3fFf = .text:0x8049BE10; // type:function size:0xA0 -__sinit_\eggVector_cpp = .text:0x8049BEB0; // type:function size:0xE0 +__sinit_\eggVector_cpp = .text:0x8049BEB0; // type:function size:0xE0 scope:local egg_assert_waittime = .text:0x8049BF90; // type:function size:0x78 egg_assert_vreport = .text:0x8049C010; // type:function size:0x4 egg_assert_report = .text:0x8049C020; // type:function size:0x80 @@ -26478,7 +26478,7 @@ DrawDL__Q23EGG6DrawGXFQ33EGG6DrawGX2DLRCQ34nw4r4math5MTX348_GXColor = .text:0x80 SetZMode__Q23EGG6DrawGXFQ33EGG6DrawGX5ZMode = .text:0x804A0B70; // type:function size:0x20 SetBlendMode__Q23EGG6DrawGXFQ33EGG6DrawGX5Blend = .text:0x804A0B90; // type:function size:0x24 CreateDisplayList__Q23EGG6DrawGXFPQ23EGG4Heap = .text:0x804A0BC0; // type:function size:0x5C -__sinit_eggDrawGX_cpp = .text:0x804A0C20; // type:function size:0x4 +__sinit_\eggDrawGX_cpp = .text:0x804A0C20; // type:function size:0x4 __ct__Q23EGG12DrawPathBaseFv = .text:0x804A0C30; // type:function size:0x58 createScnProc__Q23EGG12DrawPathBaseFP12MEMAllocator = .text:0x804A0C90; // type:function size:0x1B0 internalResetForDraw__Q23EGG12DrawPathBaseFv = .text:0x804A0E40; // type:function size:0x20 @@ -26561,7 +26561,7 @@ CalcMtxPerspective___Q23EGG7FrustumCFPQ34nw4r4math5MTX44 = .text:0x804A6490; // GetPerspectiveParam___Q23EGG7FrustumCFPf = .text:0x804A6520; // type:function size:0xBC GetOrthographicParam___Q23EGG7FrustumCFPf = .text:0x804A65E0; // type:function size:0xE0 GetOrthographicParam___Q23EGG7FrustumCFPfPfPfPf = .text:0x804A66C0; // type:function size:0x164 -__sinit_eggFrustum_cpp = .text:0x804A6830; // type:function size:0x24 +__sinit_\eggFrustum_cpp = .text:0x804A6830; // type:function size:0x24 FUN_804a6860 = .text:0x804A6860; // type:function size:0x104 FUN_804a6970 = .text:0x804A6970; // type:function size:0x34 FUN_804a69b0 = .text:0x804A69B0; // type:function size:0x1E8 @@ -26575,7 +26575,7 @@ __dt__Q33EGG9GfxEngine13ConfigurationFv = .text:0x804A75B0; // type:function siz __ct__Q33EGG9GfxEngine13ConfigurationFv = .text:0x804A75F0; // type:function size:0x154 beginDrawView__Q23EGG15GlobalDrawStateFUsRCQ34nw4r4math5MTX34RCQ23EGG6Screen = .text:0x804A7750; // type:function size:0x3C setDrawSettingGX__Q23EGG15GlobalDrawStateFbb = .text:0x804A7790; // type:function size:0x7C -__sinit_eggGlobalDrawState_cpp = .text:0x804A7810; // type:function size:0x4 +__sinit_\eggGlobalDrawState_cpp = .text:0x804A7810; // type:function size:0x4 getTexMtxID__Q23EGG9GXUtilityFi = .text:0x804A7820; // type:function size:0xC setScaleOffsetPerspective__Q23EGG9GXUtilityFPfffff = .text:0x804A7830; // type:function size:0x40 getTexObj__Q23EGG9GXUtilityFP9_GXTexObjRCQ23EGG7ResTIMG = .text:0x804A7870; // type:function size:0x100 @@ -26658,7 +26658,7 @@ SetBinaryInner__Q23EGG12LightTextureFRCQ33EGG29IBinary3Bin GetBinaryInner__Q23EGG12LightTextureCFPQ33EGG29IBinary3Bin = .text:0x804AD270; // type:function size:0x118 GetBinarySize__Q23EGG12LightTextureCFv = .text:0x804AD390; // type:function size:0x14 SetBinaryInner__Q23EGG29IBinaryFRCQ33EGG29IBinary3BinRCQ33EGG29IBinary3Binf = .text:0x804AD3B0; // type:function size:0x4 -__sinit_eggLightTexture_cpp = .text:0x804AD3C0; // type:function size:0x44 +__sinit_\eggLightTexture_cpp = .text:0x804AD3C0; // type:function size:0x44 @52@SetBinaryInner__Q23EGG12LightTextureFRCQ33EGG29IBinary3Bin = .text:0x804AD410; // type:function size:0x8 @52@GetBinaryInner__Q23EGG12LightTextureCFPQ33EGG29IBinary3Bin = .text:0x804AD420; // type:function size:0x8 @52@GetBinarySize__Q23EGG12LightTextureCFv = .text:0x804AD430; // type:function size:0x8 @@ -26742,9 +26742,9 @@ GetGlobalPos__Q23EGG6ScreenCFPfPf = .text:0x804B2D40; // type:function size:0xB0 SetTVMode__Q23EGG6ScreenFQ33EGG6Screen6TVMode = .text:0x804B2DF0; // type:function size:0xB0 SetTVModeDefault__Q23EGG6ScreenFv = .text:0x804B2EA0; // type:function size:0x34 FUN_804b2ee0 = .text:0x804B2EE0; // type:function size:0x14C -__sinit_eggScreen_cpp = .text:0x804B3030; // type:function size:0x84 +__sinit_\eggScreen_cpp = .text:0x804B3030; // type:function size:0x84 __ct__Q23EGG16ScreenEffectBaseFv = .text:0x804B30C0; // type:function size:0x18 -__sinit_eggScreenEffectBase_cpp = .text:0x804B30E0; // type:function size:0xC +__sinit_\eggScreenEffectBase_cpp = .text:0x804B30E0; // type:function size:0xC FUN_804b30f0 = .text:0x804B30F0; // type:function size:0x104 FUN_804b3200 = .text:0x804B3200; // type:function size:0xA8 FUN_804b32b0 = .text:0x804B32B0; // type:function size:0x454 @@ -29082,9 +29082,9 @@ lbl_804F5BB0 = .rodata:0x804F5BB0; // type:object size:0x28 lbl_804F5BD8 = .rodata:0x804F5BD8; // type:object size:0x100 lbl_804F5CD8 = .rodata:0x804F5CD8; // type:object size:0x10 lbl_804F5CE8 = .rodata:0x804F5CE8; // type:object size:0x40 data:4byte -lbl_804F5D28 = .rodata:0x804F5D28; // type:object size:0x80 -lbl_804F5DA8 = .rodata:0x804F5DA8; // type:object size:0x100 -lbl_804F5EA8 = .rodata:0x804F5EA8; // type:object size:0x138 +sAsciiTable__Q24nw4r2db = .rodata:0x804F5D28; // type:object size:0x80 scope:local +sFontData__Q24nw4r2db = .rodata:0x804F5DA8; // type:object size:0x100 scope:local +sFontData2__Q24nw4r2db = .rodata:0x804F5EA8; // type:object size:0x138 scope:local lbl_804F5FE0 = .rodata:0x804F5FE0; // type:object size:0x1010 lbl_804F6FF0 = .rodata:0x804F6FF0; // type:object size:0x20 lbl_804F7010 = .rodata:0x804F7010; // type:object size:0x40 diff --git a/configure.py b/configure.py index 54952295..cfa5fbe7 100644 --- a/configure.py +++ b/configure.py @@ -120,7 +120,7 @@ if not is_windows(): # Tool versions config.compilers_tag = "1" -config.dtk_tag = "v0.6.2" +config.dtk_tag = "v0.6.5" config.sjiswrap_tag = "v1.1.1" config.wibo_tag = "0.6.9" @@ -143,7 +143,7 @@ cflags_base = [ "-enum int", "-fp hardware", "-Cpp_exceptions off", - # "-W all", + "-W all", "-inline auto", "-maxerrors 1", "-nosyspath", diff --git a/include/egg/math/eggMatrix.h b/include/egg/math/eggMatrix.h index 4c38c30a..d15c6c08 100644 --- a/include/egg/math/eggMatrix.h +++ b/include/egg/math/eggMatrix.h @@ -9,8 +9,7 @@ namespace EGG { struct Matrix34f { Matrix34f() {} /* 8049acd0 */ - Matrix34f(f32 xx, f32 xy, f32 xz, f32 xw, f32 yx, f32 yy, f32 yz, f32 yw, f32 zx, f32 zy, - f32 zz, f32 zw); + Matrix34f(f32 xx, f32 xy, f32 xz, f32 xw, f32 yx, f32 yy, f32 yz, f32 yw, f32 zx, f32 zy, f32 zz, f32 zw); ////////////////////////////////////////////////////////////////////////////// f32 operator()(int i, int j) const { @@ -26,6 +25,8 @@ struct Matrix34f { return arr[i]; } + /* */ void rotateBaseX(Vector3f &, Matrix34f &); + /* */ void rotateVectorChange(Vector3f &, Vector3f &, Matrix34f &); /* 8049ac70 */ void inverseTo(Matrix34f &to) const; /* 8049ac80 */ void inverseTransposeTo(Matrix34f &to) const; /* 8049ac90 */ void makeIdentity(); @@ -41,7 +42,7 @@ struct Matrix34f { /* */ void makeT(const Vector3f &t); /* 8049ae90 */ void fromQuat(const Quatf &q); /* 8049af40 */ void toQuat(Quatf &q) const; - /* 8049b250 */ void slerpTo(const Matrix34f &, Matrix34f &, f32) const; + /* 8049b250 */ void slerpTo(const Matrix34f &, Matrix34f &, f32); /* */ void copyTo16(f32 *pf) const; /* 8049b2d0 */ void setAxisRotation(const Vector3f &, f32); /* */ Vector3f multVector(const Vector3f &vec) const; diff --git a/include/egg/math/eggQuat.h b/include/egg/math/eggQuat.h index bdd18ed8..542ecc0a 100644 --- a/include/egg/math/eggQuat.h +++ b/include/egg/math/eggQuat.h @@ -9,7 +9,7 @@ struct Quatf : Vector3f { Quatf() {} Quatf(f32 f, Vector3f v) : w(f), Vector3f(v) {} - // ~Quatf() {} + ~Quatf() {} friend Quatf operator*(const Quatf &q, const Vector3f &vec) { Vector3f crossed = q.cross(vec); @@ -46,13 +46,10 @@ struct Quatf : Vector3f { /* 8049bbb0 */ void makeVectorRotation(Vector3f &, Vector3f &); f32 dot(const Quatf &q) const { - return q.Vector3f::dot(q) + w * q.w; - } - f32 squaredLength() const { - return w * w + x * x + y * y + z * z; + return w * w + q.x * q.x + q.y * q.y + q.z * q.z; } f32 length() const { - return Math::sqrt(squaredLength()); + return Math::sqrt(dot(*this)); } void multScalar(f32 s) { w *= s; diff --git a/include/egg/math/eggVector.h b/include/egg/math/eggVector.h index e68059e6..b590324b 100644 --- a/include/egg/math/eggVector.h +++ b/include/egg/math/eggVector.h @@ -83,12 +83,11 @@ struct Vector3f : public nw4r::math::VEC3 { return x * v.x + y * v.y + z * v.z; } Vector3f cross(const Vector3f &b) const { // cross__Q23EGG8Vector3fCFRCQ23EGG8Vector3f - Vector3f v; + f32 _x = (y * b.z) - (z * b.y); f32 _y = (z * b.x) - (x * b.z); f32 _z = (x * b.y) - (y * b.x); - v.set(_x, _y, _z); - return v; + return Vector3f(_x, _y, _z); } f32 squaredLength() const { return (x * x + y * y + z * z); @@ -132,4 +131,4 @@ public: /* 805767f0 */ static const Vector3s ez; }; -} // namespace EGG \ No newline at end of file +} // namespace EGG diff --git a/src/egg/math/eggMatrix.cpp b/src/egg/math/eggMatrix.cpp index 2281b9af..a099e01c 100644 --- a/src/egg/math/eggMatrix.cpp +++ b/src/egg/math/eggMatrix.cpp @@ -1,5 +1,3 @@ -#pragma once - #include #include #include @@ -21,8 +19,7 @@ void Matrix34f::makeIdentity() { m[0][0] = 1.0f; } // namespace EGG -Matrix34f::Matrix34f(f32 xx, f32 xy, f32 xz, f32 xw, f32 yx, f32 yy, f32 yz, f32 yw, f32 zx, f32 zy, - f32 zz, f32 zw) { +Matrix34f::Matrix34f(f32 xx, f32 xy, f32 xz, f32 xw, f32 yx, f32 yy, f32 yz, f32 yw, f32 zx, f32 zy, f32 zz, f32 zw) { m[0][0] = xx; m[0][1] = xy; m[0][2] = xz; @@ -242,17 +239,17 @@ void Matrix34f::makeT(const Vector3f &t) { } void Matrix34f::fromQuat(const Quatf &q) { - m[0][0] = (1.0f - 2.0f * q.y * q.y - 2.0f * q.z * q.z); + m[0][0] = 1.0f - (2.0f * q.y * q.y) - (2.0f * q.z * q.z); m[0][1] = (2.0f * q.x * q.y) - (2.0f * q.w * q.z); m[0][2] = (2.0f * q.x * q.z) + (2.0f * q.w * q.y); m[1][0] = (2.0f * q.x * q.y) + (2.0f * q.w * q.z); - m[1][1] = (1.0f - 2.0f * q.x * q.x) - (2.0f * q.z * q.z); + m[1][1] = 1.0f - (2.0f * q.x * q.x) - (2.0f * q.z * q.z); m[1][2] = (2.0f * q.y * q.z) - (2.0f * q.w * q.x); m[2][0] = (2.0f * q.x * q.z) - (2.0f * q.w * q.y); m[2][1] = (2.0f * q.y * q.z) + (2.0f * q.w * q.x); - m[2][2] = (1.0f - 2.0f * q.x * q.x) - (2.0f * q.y * q.y); + m[2][2] = 1.0f - (2.0f * q.x * q.x) - (2.0f * q.y * q.y); m[2][3] = 0.0f; m[1][3] = 0.0f; @@ -335,7 +332,7 @@ void Matrix34f::toQuat(Quatf &q) const { q.multScalar(Math::inv(q.length())); } -void Matrix34f::slerpTo(const Matrix34f &m2, Matrix34f &out, f32 t) const { +void Matrix34f::slerpTo(const Matrix34f &m2, Matrix34f &out, f32 t) { Quatf q1, q2, q3; m2.toQuat(q1); toQuat(q2); @@ -365,7 +362,6 @@ void Matrix34f::multiplyTo(const Matrix34f &m2, Matrix34f &to) const { void Matrix34f::dump() {} -const Matrix34f Matrix34f::ident(1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, - 0.0f); +const Matrix34f Matrix34f::ident(1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f); } // namespace EGG diff --git a/src/egg/math/eggQuat.cpp b/src/egg/math/eggQuat.cpp index 066308b2..77eb58fc 100644 --- a/src/egg/math/eggQuat.cpp +++ b/src/egg/math/eggQuat.cpp @@ -212,23 +212,19 @@ void Quatf::limitSlerpTo(const Quatf &q2, f32 t, f32 t2, Quatf &out) const { /* 8049bbb0 */ void Quatf::makeVectorRotation(Vector3f &from, Vector3f &to) { - // f32 dot = from.dot(to); - Vector3f cross = from.cross(to); + f32 t0 = (from.dot(to) + 1) * 2.0f; - f32 t0 = (from.dot(to) + 1.0f) * 2.0f; - - f32 v = t0; - if (v <= 0.0f) { - v = 0.0f; + if (t0 < 0.0f) { + t0 = 0.0f; } - t0 = Math::sqrt(v); + const f32 s = Math::sqrt(t0); - if (t0 <= Math::epsilon()) { + if (s <= Math::epsilon()) { setUnit(); } else { - f32 inv = Math::inv(t0); - set(t0 * 0.5f, cross.x * inv, cross.y * inv, cross.z * inv); + const f32 inv = 1.0f / s; + set(s * 0.5f, cross.x * inv, cross.y * inv, cross.z * inv); } }