diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index 1d868b16..60b04acc 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -171,6 +171,9 @@ lib/egg/prim/eggAssert.cpp: .data start:0x8056EC88 end:0x8056ED00 .sbss start:0x805767F8 end:0x80576808 +lib/egg/gfx/eggCamera.cpp: + .text start:0x8049C5C0 end:0x8049CAC8 + Runtime/__init_cpp_exceptions.cpp: .text start:0x804C71A8 end:0x804C7218 .ctors start:0x804DB640 end:0x804DB644 rename:.ctors$10 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 8b6c1a21..1b469cea 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -26363,7 +26363,7 @@ allocate__Q23EGG32TBufferFii = .text:0x8049AA30; // typ 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 -frsqrt__Q23EGG7MathFf = .text:0x8049AB60; // type:function size:0x50 +sqrt__Q23EGG7MathFf = .text:0x8049AB60; // type:function size:0x50 sin__Q23EGG7MathFf = .text:0x8049ABB0; // type:function size:0x24 cos__Q23EGG7MathFf = .text:0x8049ABE0; // type:function size:0x24 acos__Q23EGG7MathFf = .text:0x8049AC10; // type:function size:0x24 @@ -26383,8 +26383,8 @@ 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 -egg_quatf_squareNorm = .text:0x8049B450; // type:function size:0x30 -egg_quatf_normalize = .text:0x8049B480; // type:function size:0x74 +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 diff --git a/include/lib/egg/math/eggMath.h b/include/lib/egg/math/eggMath.h index 794ee60a..299d5b93 100644 --- a/include/lib/egg/math/eggMath.h +++ b/include/lib/egg/math/eggMath.h @@ -8,7 +8,7 @@ namespace EGG template class Math { public: - static T frsqrt(T); + static T sqrt(T); static T sin(T); static T cos(T); static T acos(T); @@ -16,7 +16,7 @@ public: }; // f32 impls -// /* 8049ab60 */ Math::frsqrt(f32); +// /* 8049ab60 */ Math::sqrt(f32); // /* 8049abb0 */ Math::sin(f32); // /* 8049abe0 */ Math::cos(f32); // /* 8049ac10 */ Math::acos(f32); diff --git a/include/lib/egg/prim/eggAssert.h b/include/lib/egg/prim/eggAssert.h index be9404ca..86a05ff5 100644 --- a/include/lib/egg/prim/eggAssert.h +++ b/include/lib/egg/prim/eggAssert.h @@ -10,8 +10,8 @@ namespace Assert { /* 8049bf90 */ void wait(u32 time); -/* 8049c010 */ void assert_printf(); -/* 8049c010 */ void report(); +/* 8049c010 */ void system_print(); +/* 8049c010 */ void system_report(); /* 8049c0a0 */ s32 getPeriodPos(char*); /* 8049c100 */ char* getMapSymbol(); /* 8049c150 */ bool isOutsideMEM1(u32 addr);