diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index 1f4d5219..a5193539 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -34,6 +34,10 @@ d/a/obj/d_a_obj_base.cpp: .text start:0x8002DE40 end:0x8002F300 .data start:0x805015B8 end:0x80501638 +d/a/e/d_a_e_base.cpp: + .text start:0x8002F300 end:0x80030CB0 + .ctors start:0x804DB664 end:0x804DB668 + d/d_base.cpp: .text start:0x80050800 end:0x80050A14 .data start:0x80503380 end:0x805033D0 @@ -60,6 +64,11 @@ toBeSorted/bitwise_flag_helper.cpp: rvl/CX/cx.c: .text start:0x803CEE90 end:0x803D0B20 +nw4r/db/db_directPrint.cpp: + .text start:0x804342A0 end:0x80434EA0 + .sbss start:0x805765E8 end:0x805765F0 + .bss start:0x80636B80 end:0x80636BA4 + egg/core/eggArchive.cpp: .text start:0x80493510 end:0x80494254 .data start:0x8056E820 end:0x8056E830 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 66011aaa..134541b6 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -22184,12 +22184,12 @@ fn_803B79A0 = .text:0x803B79A0; // type:function size:0x84 fn_803B7A30 = .text:0x803B7A30; // type:function size:0x10 __VISetRGBModeImm = .text:0x803B7A40; // type:function size:0x48 scope:global fn_803B7A90 = .text:0x803B7A90; // type:function size:0x4AC -fn_803B7F40 = .text:0x803B7F40; // type:function size:0x2C -fn_803B7F70 = .text:0x803B7F70; // type:function size:0x34 -fn_803B7FB0 = .text:0x803B7FB0; // type:function size:0xCC -fn_803B8080 = .text:0x803B8080; // type:function size:0x188 -fn_803B8210 = .text:0x803B8210; // type:function size:0xF8 -fn_803B8310 = .text:0x803B8310; // type:function size:0xC8 +PSMTXIdentity = .text:0x803B7F40; // type:function size:0x2C +PSMTXCopy = .text:0x803B7F70; // type:function size:0x34 +PSMTXConcat = .text:0x803B7FB0; // type:function size:0xCC +PSMTXConcatArray = .text:0x803B8080; // type:function size:0x188 +PSMTXInverse = .text:0x803B8210; // type:function size:0xF8 +PSMTXInvXpose = .text:0x803B8310; // type:function size:0xC8 fn_803B83E0 = .text:0x803B83E0; // type:function size:0x7C fn_803B8460 = .text:0x803B8460; // type:function size:0xB0 fn_803B8510 = .text:0x803B8510; // type:function size:0x12C @@ -24139,17 +24139,17 @@ fn_80433D10 = .text:0x80433D10; // type:function size:0x4D8 fn_804341F0 = .text:0x804341F0; // type:function size:0x18 fn_80434210 = .text:0x80434210; // type:function size:0x84 DirectPrint_Init__Q24nw4r2dbFv = .text:0x804342A0; // type:function size:0xB4 -fn_80434360 = .text:0x80434360; // type:function size:0x28 -fn_80434390 = .text:0x80434390; // type:function size:0x190 -fn_80434520 = .text:0x80434520; // type:function size:0x34 -fn_80434560 = .text:0x80434560; // type:function size:0x14 -fn_80434580 = .text:0x80434580; // type:function size:0xD0 -fn_80434650 = .text:0x80434650; // type:function size:0x70 -fn_804346C0 = .text:0x804346C0; // type:function size:0xE4 -fn_804347B0 = .text:0x804347B0; // type:function size:0x154 -fn_80434910 = .text:0x80434910; // type:function size:0xDC -fn_804349F0 = .text:0x804349F0; // type:function size:0x2C0 -fn_80434CB0 = .text:0x80434CB0; // type:function size:0x1EC +DirectPrint_IsActive__Q24nw4r2dbFv = .text:0x80434360; // type:function size:0x28 +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__Q24nw4r2dbFiibPCce = .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 +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 @@ -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 sqrt__Q23EGG7MathFf = .text:0x8049AB60; // type:function size:0x50 sin__Q23EGG7MathFf = .text:0x8049ABB0; // type:function size:0x24 cos__Q23EGG7MathFf = .text:0x8049ABE0; // type:function size:0x24 @@ -26372,28 +26372,28 @@ inverseTo__Q23EGG9Matrix34fCFRQ23EGG9Matrix34f = .text:0x8049AC70; // type:funct inverseTransposeTo__Q23EGG9Matrix34fCFRQ23EGG9Matrix34f = .text:0x8049AC80; // type:function size:0x4 makeIdentity__Q23EGG9Matrix34fFv = .text:0x8049AC90; // type:function size:0x40 __ct__Q23EGG9Matrix34fFffffffffffff = .text:0x8049ACD0; // type:function size:0x44 -egg_matrix_makeSQ = .text:0x8049AD20; // type:function size:0xB8 -egg_matrix_makeQ = .text:0x8049ADE0; // type:function size:0xB0 -egg_matrix_makeQ2 = .text:0x8049AE90; // type:function size:0xB0 -egg_matrix_toQuat = .text:0x8049AF40; // type:function size:0x310 -egg_matrix_slerpTo = .text:0x8049B250; // type:function size:0x78 -egg_matrix_setAxisRotation = .text:0x8049B2D0; // type:function size:0x3C -loadPosMtx__Q23EGG9Matrix34fFUl = .text:0x8049B310; // type:function size:0x4 -egg_matrix_multiplyTo = .text:0x8049B320; // type:function size:0x4 -__sinit_eggMatrix_cpp = .text:0x8049B330; // type:function size:0x58 -egg_quatf_Quatf = .text:0x8049B390; // type:function size:0x14 -egg_quatf_setAxisRotation = .text:0x8049B3B0; // type:function size:0x98 +makeQT__Q23EGG9Matrix34fFRCQ23EGG5QuatfRCQ23EGG8Vector3f = .text:0x8049AD20; // type:function size:0xB8 +makeQ__Q23EGG9Matrix34fFRCQ23EGG5Quatf = .text:0x8049ADE0; // type:function size:0xB0 +fromQuat__Q23EGG9Matrix34fFRCQ23EGG5Quatf = .text:0x8049AE90; // type:function size:0xB0 +toQuat__Q23EGG9Matrix34fCFRQ23EGG5Quatf = .text:0x8049AF40; // type:function size:0x310 +slerpTo__Q23EGG9Matrix34fCFRCQ23EGG9Matrix34fRQ23EGG9Matrix34ff = .text:0x8049B250; // type:function size:0x78 +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 +set__Q23EGG5QuatfFffff = .text:0x8049B390; // type:function size:0x14 +setAxisRotation__Q23EGG5QuatfFRCQ23EGG8Vector3ff = .text:0x8049B3B0; // type:function size:0x98 norm__Q23EGG5QuatfFv = .text:0x8049B450; // type:function size:0x30 normalise__Q23EGG5QuatfFv = .text:0x8049B480; // type:function size:0x74 -egg_quatf_conjugate = .text:0x8049B500; // type:function size:0x48 -egg_quatf_someVectorRotationThing = .text:0x8049B550; // type:function size:0x2A4 -egg_quatf_slerpTo = .text:0x8049B800; // type:function size:0x1C4 -egg_quatf_slerp2 = .text:0x8049B9D0; // type:function size:0x1DC -egg_quatf_makeVectorRotation = .text:0x8049BBB0; // type:function size:0x104 +conjugate__Q23EGG5QuatfFv = .text:0x8049B500; // type:function size:0x48 +rotateVector__Q23EGG5QuatfFRCQ23EGG8Vector3f = .text:0x8049B550; // type:function size:0x2A4 +slerpTo__Q23EGG5QuatfCFRCQ23EGG5QuatffRQ23EGG5Quatf = .text:0x8049B800; // type:function size:0x1C4 +limitSlerpTo__Q23EGG5QuatfCFRCQ23EGG5QuatfffRQ23EGG5Quatf = .text:0x8049B9D0; // type:function size:0x1DC +makeVectorRotation__Q23EGG5QuatfFRQ23EGG8Vector3fRQ23EGG8Vector3f = .text:0x8049BBB0; // type:function size:0x104 normalise__Q23EGG8Vector3fFv = .text:0x8049BCC0; // type:function size:0x84 -setLength__Q23EGG8Vector3fFPQ23EGG8Vector3ff = .text:0x8049BD50; // type:function size:0xB8 +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 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 @@ -40819,7 +40819,7 @@ lbl_805765D8 = .sbss:0x805765D8; // type:object size:0x4 data:4byte lbl_805765DC = .sbss:0x805765DC; // type:object size:0x4 lbl_805765E0 = .sbss:0x805765E0; // type:object size:0x1 data:byte lbl_805765E1 = .sbss:0x805765E1; // type:object size:0x7 data:byte -lbl_805765E8 = .sbss:0x805765E8; // type:object size:0x8 data:4byte +sInitialized__Q24nw4r2db = .sbss:0x805765E8; // type:object size:0x4 data:4byte lbl_805765F0 = .sbss:0x805765F0; // type:object size:0x4 data:4byte lbl_805765F4 = .sbss:0x805765F4; // type:object size:0x1 data:byte lbl_805765F8 = .sbss:0x805765F8; // type:object size:0x8 @@ -40899,13 +40899,13 @@ lbl_805767B0 = .sbss:0x805767B0; // type:object size:0x4 data:4byte lbl_805767B4 = .sbss:0x805767B4; // type:object size:0x4 data:4byte lbl_805767B8 = .sbss:0x805767B8; // type:object size:0x1 data:byte lbl_805767BC = .sbss:0x805767BC; // type:object size:0x4 data:4byte -lbl_805767C0 = .sbss:0x805767C0; // type:object size:0x8 data:float -lbl_805767C8 = .sbss:0x805767C8; // type:object size:0x8 data:float -lbl_805767D0 = .sbss:0x805767D0; // type:object size:0x8 data:float -lbl_805767D8 = .sbss:0x805767D8; // type:object size:0x8 data:2byte -lbl_805767E0 = .sbss:0x805767E0; // type:object size:0x8 data:2byte -lbl_805767E8 = .sbss:0x805767E8; // type:object size:0x8 data:2byte -lbl_805767F0 = .sbss:0x805767F0; // type:object size:0x8 data:2byte +zero__Q23EGG8Vector2f = .sbss:0x805767C0; // type:object size:0x8 data:float +ex__Q23EGG8Vector2f = .sbss:0x805767C8; // type:object size:0x8 data:float +ey__Q23EGG8Vector2f = .sbss:0x805767D0; // type:object size:0x8 data:float +zero__Q23EGG8Vector3s = .sbss:0x805767D8; // type:object size:0x6 data:2byte +ex__Q23EGG8Vector3s = .sbss:0x805767E0; // type:object size:0x6 data:2byte +ey__Q23EGG8Vector3s = .sbss:0x805767E8; // type:object size:0x6 data:2byte +ez__Q23EGG8Vector3s = .sbss:0x805767F0; // type:object size:0x6 data:2byte lbl_805767F8 = .sbss:0x805767F8; // type:object size:0x4 data:4byte lbl_805767FC = .sbss:0x805767FC; // type:object size:0x4 data:4byte lbl_80576800 = .sbss:0x80576800; // type:object size:0x4 data:4byte @@ -49288,8 +49288,8 @@ lbl_80636B38 = .bss:0x80636B38; // type:object size:0x20 data:byte lbl_80636B58 = .bss:0x80636B58; // type:object size:0x10 data:4byte lbl_80636B68 = .bss:0x80636B68; // type:object size:0xC lbl_80636B74 = .bss:0x80636B74; // type:object size:0xC -lbl_80636B80 = .bss:0x80636B80; // type:object size:0x10 data:4byte -lbl_80636B90 = .bss:0x80636B90; // type:object size:0x18 data:byte +sFrameBufferInfo__Q24nw4r2db = .bss:0x80636B80; // type:object size:0x10 data:4byte +sFrameBufferColor__Q24nw4r2db = .bss:0x80636B90; // type:object size:0x14 data:byte lbl_80636BA8 = .bss:0x80636BA8; // type:object size:0x18 lbl_80636BC0 = .bss:0x80636BC0; // type:object size:0x400 lbl_80636FC0 = .bss:0x80636FC0; // type:object size:0x360 @@ -49347,7 +49347,10 @@ lbl_80673B10 = .bss:0x80673B10; // type:object size:0x10 lbl_80673B20 = .bss:0x80673B20; // type:object size:0x20 lbl_80673B40 = .bss:0x80673B40; // type:object size:0x10C0 data:4byte lbl_80674C00 = .bss:0x80674C00; // type:object size:0x30 -lbl_80674C30 = .bss:0x80674C30; // type:object size:0x30 data:float +zero__Q23EGG8Vector3f = .bss:0x80674C30; // type:object size:0xC data:float +ex__Q23EGG8Vector3f = .bss:0x80674C3C; // type:object size:0xC data:float +ey__Q23EGG8Vector3f = .bss:0x80674C48; // type:object size:0xC data:float +ez__Q23EGG8Vector3f = .bss:0x80674C54; // type:object size:0xC data:float lbl_80674C60 = .bss:0x80674C60; // type:object size:0x108 lbl_80674D68 = .bss:0x80674D68; // type:object size:0x90 lbl_80674DF8 = .bss:0x80674DF8; // type:object size:0x30 data:float