Merge branch 'main' of https://github.com/zeldaret/tww into agb

src/SSystem/SComponent/c_angle.cpp

@@ -326,7 +326,7 @@ void cSGlobe::Polar(cSPolar* csp) const {
 }
 
 /* 80254864-80254890       .text Invert__7cSGlobeFv */
-cXyz cSGlobe::Norm() const {
-    cSGlobe glob(1.0f, mAzimuth, mInclination);
-    return glob.Xyz();
+cSGlobe& cSGlobe::Invert() {
+    mRadius = -mRadius;
+    return Formal();
 }

src/SSystem/SComponent/c_bg_s_gnd_chk.cpp

@@ -10,5 +10,5 @@
 cBgS_GndChk::cBgS_GndChk() {
     m_pos = cXyz::Zero;
     SetActorPid(0xFFFFFFFF);
-    mFlags = 2;
+    mFlags = 3;
 }

src/SSystem/SComponent/c_lib.cpp

@@ -366,7 +366,7 @@ s32 cLib_distanceAngleS(s16 x, s16 y) {
     return abs(static_cast<s16>(x - y));
 }
 
-static Mtx mtx[10];
+Mtx mtx[10];
 
 Mtx* calc_mtx = mtx;
 

src/SSystem/SComponent/c_m3d_g_sph.cpp

@@ -13,18 +13,19 @@
 #define CHECK_VEC3_RANGE(line, v) JUT_ASSERT(line, -1.0e32f < v.x && v.x < 1.0e32f && -1.0e32f < v.y && v.y < 1.0e32f && -1.0e32f < v.z && v.z < 1.0e32f)
 
 /* 8025238C-80252624       .text SetC__8cM3dGSphFRC4cXyz */
-void cM3dGSph::SetC(const cXyz& pos) {
-    CHECK_FLOAT_CLASS(21, pos.x);
-    CHECK_FLOAT_CLASS(22, pos.y);
-    CHECK_FLOAT_CLASS(23, pos.z);
-    CHECK_VEC3_RANGE(26, pos);
-    mCenter = pos;
+void cM3dGSph::SetC(const cXyz& p) {
+    CHECK_FLOAT_CLASS(18, p.x);
+    CHECK_FLOAT_CLASS(19, p.y);
+    CHECK_FLOAT_CLASS(20, p.z);
+    CHECK_VEC3_RANGE(23, p);
+    mCenter = p;
 }
 
 /* 80252624-80252750       .text SetR__8cM3dGSphFf */
 void cM3dGSph::SetR(float r) {
     CHECK_FLOAT_CLASS(32, r);
     CHECK_FLOAT_RANGE(33, r);
+    mRadius = r;
 }
 
 /* 80252750-8025277C       .text cross__8cM3dGSphCFPC8cM3dGSphP4cXyz */

src/SSystem/SComponent/c_xyz.cpp

@@ -153,3 +153,7 @@ bool cXyz::isZero(void) const {
     return fabsf(this->x) < 3.8146972e-06f && fabsf(this->y) < 3.8146972e-06f &&
            fabsf(this->z) < 3.8146972e-06f;
 }
+
+// Unused, but must be in .rodata to match
+static const char * fmt0 = "[%f %f %f]\n";
+static const char * fmt1 = "%s=[%f %f %f]\n";