various matches / cleanup (#2271)

* cleanup various TUs * checkpoint * d_attention doc
2026-09-06 18:01:01 -04:00 · 2024-12-29 07:53:54 -08:00
parent a905280072
commit 3ea8ec11a5
62 changed files with 1865 additions and 2265 deletions
@@ -7,6 +7,7 @@
 #include "iterator.h"
 #include "string.h"
 #include "dol2asm.h"
+#include <algorithm.h>

 //
 // Types:
@@ -166,8 +167,7 @@ void JStudio::ctb::TControl::destroyObject_all() {
 }

 /* 80281190-80281230 27BAD0 00A0+00 1/1 0/0 0/0 .text getObject__Q37JStudio3ctb8TControlFPCvUl */
-// TPRObject_ID_equal issues
-#ifdef NONMATCHING
+// NONMATCHING - TPRObject_ID_equal issues
 JStudio::ctb::TObject* JStudio::ctb::TControl::getObject(void const* param_0, u32 param_1) {
    JGadget::TLinkList<TObject, -12>::iterator begin = mList.begin();
    JGadget::TLinkList<TObject, -12>::iterator end = mList.end();
@@ -177,11 +177,6 @@ JStudio::ctb::TObject* JStudio::ctb::TControl::getObject(void const* param_0, u3
    }
    return NULL;
 }
-#else
-JStudio::ctb::TObject* JStudio::ctb::TControl::getObject(void const* param_0, u32 param_1) {
-    // NONMATCHING
-}
-#endif

 /* 80281230-80281274 27BB70 0044+00 0/0 1/1 0/0 .text getObject_index__Q37JStudio3ctb8TControlFUl
 */
@@ -392,8 +392,7 @@ f64 interpolateValue_hermite(f64 c0, f64 c1, f64 x, f64 c2, f64 x2, f64 c3, f64

 /* 80281774-802817D8 27C0B4 0064+00 1/1 0/0 0/0 .text
 * interpolateValue_BSpline_uniform__Q27JStudio13functionvalueFddddd */
-// really minor regalloc.
-#ifdef NONMATCHING  
+// NONMATCHING - really minor regalloc.
 f64 interpolateValue_BSpline_uniform(f64 f1, f64 f2, f64 f3, f64 f4, f64 f5) {
    // pow3(1.0 - f1)
    f64 f6 = (1.0 - f1);
@@ -412,12 +411,6 @@ f64 interpolateValue_BSpline_uniform(f64 f1, f64 f2, f64 f3, f64 f4, f64 f5) {
    return temp5 + (temp * f2 + f8 * f5) * 0.5 +
           temp3;
 }
-#else
-f64 interpolateValue_BSpline_uniform(f64 param_0, f64 param_1, f64 param_2, f64 param_3,
-                                         f64 param_4) {
-    // NONMATCHING
-}
-#endif

 /* 802817D8-802818B8 27C118 00E0+00 1/1 0/0 0/0 .text
 * interpolateValue_BSpline_nonuniform__Q27JStudio13functionvalueFdPCdPCd */
@@ -790,8 +783,7 @@ void TFunctionValue_transition::prepare() {

 /* 802824F4-802826BC 27CE34 01C8+00 1/0 0/0 0/0 .text
 * getValue__Q27JStudio25TFunctionValue_transitionFd            */
-// regalloc. Maybe return value related.
-#ifdef NONMATCHING
+// NONMATCHING - regalloc. Maybe return value related.
 f64 TFunctionValue_transition::getValue(f64 param_1) {
    f64 progress = range_getParameter_progress(param_1);
    f64 dVar3 = range_getParameter_outside(progress);
@@ -830,11 +822,6 @@ f64 TFunctionValue_transition::getValue(f64 param_1) {
        }
    }
 }
-#else
-f64 TFunctionValue_transition::getValue(f64 param_0) {
-    // NONMATCHING
-}
-#endif

 TFunctionValue_list::TFunctionValue_list() : _44(NULL), uData_(0), _50(NAN), pfnUpdate_(NULL) {}

@@ -1307,4 +1294,4 @@ extern "C" void func_802838C8(void* _this,
                                  JStudio::TFunctionValue_hermite::TIterator_data_ param_2,
                                  f64 const& param_3, std::less<f64> param_4) {
    // NONMATCHING
-}
+}
@@ -302,7 +302,7 @@ namespace fvb {

 TObject::~TObject() {}

-#ifdef NONMATCHING
+// NONMATCHING
 void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
    ASSERT(pfv_ != 0);

@@ -449,14 +449,6 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
    JUT_EXPECT(pData == pNext);
    pfv_->prepare();
 }
-#else
-/* 80283FC8-802841EC 27E908 0224+00 2/1 0/0 0/0 .text
- * prepare__Q37JStudio3fvb7TObjectFRCQ47JStudio3fvb4data13TParse_TBlockPQ37JStudio3fvb8TControl */
-void TObject::prepare(data::TParse_TBlock const& param_0, TControl* param_1) {
-    // NONMATCHING
-}
-
-#endif
 namespace {

 TFunctionValue_composite::TData getCompositeData_raw_(const void* arg1) {
@@ -790,4 +782,4 @@ bool TParse::parseBlock_next(void const** ppData_inout, u32* puData_out, u32 fla
 }

 }  // namespace fvb
-}  // namespace JStudio
+}  // namespace JStudio
@@ -4,6 +4,8 @@
 //

 #include "JSystem/JStudio/JStudio/jstudio-math.h"
+#include "JSystem/JGeometry.h"
+#include "JSystem/TPosition3.hh"
 #include "dol2asm.h"
 #include "math.h"

@@ -41,8 +43,7 @@ SECTION_SDATA2 static u8 lit_489[4] = {
 };

 /* 802859DC-80285B44 28031C 0168+00 1/1 0/0 0/0 .text getRotation_xyz__Q27JStudio4mathFPA4_ffff */
-// regalloc
-#ifdef NONMATCHING
+// NONMATCHING - regalloc
 void JStudio::math::getRotation_xyz(MtxP param_1, f32 x, f32 y, f32 z) {
    x = DEG_TO_RAD(x);
    f32 cosx = cos(x);
@@ -71,11 +72,6 @@ void JStudio::math::getRotation_xyz(MtxP param_1, f32 x, f32 y, f32 z) {
    param_1[1][3] = 0.0f;
    param_1[2][3] = 0.0f;
 }
-#else
-void JStudio::math::getRotation_xyz(MtxP param_0, f32 param_1, f32 param_2, f32 param_3) {
-    // NONMATCHING
-}
-#endif

 /* 80285B44-80285BCC 280484 0088+00 0/0 2/2 0/0 .text
 * getTransformation_SRxyzT__Q27JStudio4mathFPA4_fRC3VecRC3VecRC3Vec */
@@ -115,8 +111,7 @@ SECTION_SDATA2 static f64 lit_628 = 57.29577951308232;

 /* 80285BCC-80285E0C 28050C 0240+00 0/0 2/2 0/0 .text
 * getFromTransformation_SRxyzT__Q27JStudio4mathFP3VecP3VecP3VecPA4_Cf */
-// getEulerXYZ is not inlined
-#ifdef NONMATCHING
+// NONMATCHING - getEulerXYZ is not inlined
 void JStudio::math::getFromTransformation_SRxyzT(Vec* param_1, Vec* param_2, Vec* param_3,
                                                     CMtxP param_4) {
    getFromTransformation_S(param_4, param_1);
@@ -145,9 +140,3 @@ void JStudio::math::getFromTransformation_SRxyzT(Vec* param_1, Vec* param_2, Vec
    param_2->y = local_a0.y;
    param_2->z = local_a0.z;
 }
-#else
-void JStudio::math::getFromTransformation_SRxyzT(Vec* param_0, Vec* param_1, Vec* param_2,
-                                                     CMtxP param_3) {
-    // NONMATCHING
-}
-#endif
@@ -1589,19 +1589,13 @@ void JStudio::TObject::forward_value(u32 param_0) {
 }

 /* 8028679C-802867D4 2810DC 0038+00 9/0 0/0 0/0 .text            do_begin__Q27JStudio7TObjectFv */
-#ifdef NONMATCHING
+// NONMATCHING
 void JStudio::TObject::do_begin() {
    TAdaptor* adaptor = getAdaptor();
    if (adaptor != NULL) {
        adaptor->adaptor_do_begin();
    }
 }
-#else
-// void JStudio::TObject::do_begin() {
-extern "C" void do_begin__Q27JStudio7TObjectFv() {
-    // NONMATCHING
-}
-#endif

 /* 802867D4-8028680C 281114 0038+00 9/0 0/0 0/0 .text            do_end__Q27JStudio7TObjectFv */
 void JStudio::TObject::do_end() {
@@ -1633,14 +1627,9 @@ JStudio::TObject::TObject(JStudio::stb::data::TParse_TBlock_object const& param_

 /* 802868B0-80286910 2811F0 0060+00 0/0 1/1 0/0 .text            __dt__Q27JStudio14TAdaptor_actorFv
 */
-#ifdef NONMATCHING
+// NONMATCHING
 JStudio::TAdaptor_actor::~TAdaptor_actor() {
 }
-#else
-JStudio::TAdaptor_actor::~TAdaptor_actor() {
-    // NONMATCHING
-}
-#endif

 /* 80286910-8028694C 281250 003C+00 0/0 1/1 0/0 .text
 * __ct__Q27JStudio13TObject_actorFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_actor
@@ -1686,13 +1675,8 @@ void JStudio::TObject_actor::do_paragraph(u32 param_0, void const* param_1, u32
 }

 /* 80286C9C-80286CFC 2815DC 0060+00 0/0 1/1 0/0 .text __dt__Q27JStudio21TAdaptor_ambientLightFv */
-#ifdef NONMATCHING
+// NONMATCHING
 JStudio::TAdaptor_ambientLight::~TAdaptor_ambientLight() {}
-#else
-JStudio::TAdaptor_ambientLight::~TAdaptor_ambientLight() {
-    // NONMATCHING
-}
-#endif

 /* 80286CFC-80286D38 28163C 003C+00 0/0 1/1 0/0 .text
 * __ct__Q27JStudio20TObject_ambientLightFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio21TAdaptor_ambientLight
@@ -1740,13 +1724,8 @@ void JStudio::TObject_ambientLight::do_paragraph(u32 param_0, void const* param_

 /* 80286E1C-80286E7C 28175C 0060+00 0/0 1/1 0/0 .text            __dt__Q27JStudio15TAdaptor_cameraFv
 */
-#ifdef NONMATCHING
+// NONMATCHING
 JStudio::TAdaptor_camera::~TAdaptor_camera() {}
-#else
-JStudio::TAdaptor_camera::~TAdaptor_camera() {
-    // NONMATCHING
-}
-#endif

 /* 80286E7C-80286EB8 2817BC 003C+00 0/0 1/1 0/0 .text
 * __ct__Q27JStudio14TObject_cameraFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio15TAdaptor_camera
@@ -1803,13 +1782,8 @@ void JStudio::TObject_camera::do_paragraph(u32 param_0, void const* param_1, u32
 }

 /* 8028717C-802871DC 281ABC 0060+00 0/0 1/1 0/0 .text            __dt__Q27JStudio12TAdaptor_fogFv */
-#ifdef NONMATCHING
+// NONMATCHING
 JStudio::TAdaptor_fog::~TAdaptor_fog() {}
-#else
-JStudio::TAdaptor_fog::~TAdaptor_fog() {
-    // NONMATCHING
-}
-#endif

 /* 802871DC-80287218 281B1C 003C+00 0/0 1/1 0/0 .text
 * __ct__Q27JStudio11TObject_fogFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio12TAdaptor_fog
@@ -1846,13 +1820,8 @@ void JStudio::TObject_fog::do_paragraph(u32 param_0, void const* param_1, u32 pa

 /* 80287308-80287368 281C48 0060+00 0/0 1/1 0/0 .text            __dt__Q27JStudio14TAdaptor_lightFv
 */
-#ifdef NONMATCHING
+// NONMATCHING
 JStudio::TAdaptor_light::~TAdaptor_light() {}
-#else
-JStudio::TAdaptor_light::~TAdaptor_light() {
-    // NONMATCHING
-}
-#endif

 /* 80287368-802873A4 281CA8 003C+00 0/0 1/1 0/0 .text
 * __ct__Q27JStudio13TObject_lightFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_light
@@ -1895,8 +1864,7 @@ JStudio::TObject_message::TObject_message(JStudio::stb::data::TParse_TBlock_obje

 /* 8028767C-8028770C 281FBC 0090+00 1/0 0/0 0/0 .text
 * do_paragraph__Q27JStudio15TObject_messageFUlPCvUl            */
-// param_1 &= 0x1f is out of place + unsure about the pmfn
-#ifdef NONMATCHING
+// NONMATCHING - param_1 &= 0x1f is out of place + unsure about the pmfn
 void JStudio::TObject_message::do_paragraph(u32 param_1, void const* param_2, u32 param_3) {
    TAdaptor* adaptor = getAdaptor();
    if (adaptor != NULL) {
@@ -1915,20 +1883,10 @@ void JStudio::TObject_message::do_paragraph(u32 param_1, void const* param_2, u3
    }

 }
-#else
-void JStudio::TObject_message::do_paragraph(u32 param_0, void const* param_1, u32 param_2) {
-    // NONMATCHING
-}
-#endif

 /* 8028770C-8028776C 28204C 0060+00 0/0 1/1 0/0 .text __dt__Q27JStudio17TAdaptor_particleFv */
-#ifdef NONMATCHING
+// NONMATCHING
 JStudio::TAdaptor_particle::~TAdaptor_particle() {}
-#else
-JStudio::TAdaptor_particle::~TAdaptor_particle() {
-    // NONMATCHING
-}
-#endif

 /* 8028776C-802877A8 2820AC 003C+00 0/0 1/1 0/0 .text
 * __ct__Q27JStudio16TObject_particleFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio17TAdaptor_particle
@@ -1944,13 +1902,8 @@ void JStudio::TObject_particle::do_paragraph(u32 param_0, void const* param_1, u

 /* 80287B3C-80287B9C 28247C 0060+00 0/0 1/1 0/0 .text            __dt__Q27JStudio14TAdaptor_soundFv
 */
-#ifdef NONMATCHING
+// NONMATCHING
 JStudio::TAdaptor_sound::~TAdaptor_sound() {}
-#else
-JStudio::TAdaptor_sound::~TAdaptor_sound() {
-    // NONMATCHING
-}
-#endif

 /* 80287B9C-80287BD8 2824DC 003C+00 0/0 1/1 0/0 .text
 * __ct__Q27JStudio13TObject_soundFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_sound
@@ -2376,4 +2329,4 @@ SECTION_DEAD static char const* const pad_8039AB82 = "\0\0\0\0\0";
 // extern u8 data_804511F8[8];
 // u8 data_804511F8[8];

-/* 8039AB78-8039AB78 0271D8 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+/* 8039AB78-8039AB78 0271D8 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
@@ -359,8 +359,7 @@ void TControl::destroyObject_all() {
 }

 /* 80289364-80289404 283CA4 00A0+00 1/1 0/0 0/0 .text getObject__Q37JStudio3stb8TControlFPCvUl */
-// TPRObject_ID_equal copy issue
-#ifdef NONMATCHING
+// NONMATCHING - TPRObject_ID_equal copy issue
 TObject* TControl::getObject(void const* param_0, u32 param_1) {
    JGadget::TLinkList<TObject, -12>::iterator begin = mObjectContainer.begin();
    JGadget::TLinkList<TObject, -12>::iterator end = mObjectContainer.end();
@@ -370,11 +369,6 @@ TObject* TControl::getObject(void const* param_0, u32 param_1) {
    }
    return NULL;
 }
-#else
-TObject* TControl::getObject(void const* param_0, u32 param_1) {
-    // NONMATCHING
-}
-#endif

 /* 80289404-802894B4 283D44 00B0+00 0/0 1/1 0/0 .text            reset__Q37JStudio3stb8TControlFv */
 void TControl::reset() {
@@ -388,8 +382,7 @@ void TControl::reset() {

 /* 802894B4-802895B4 283DF4 0100+00 0/0 2/2 0/0 .text            forward__Q37JStudio3stb8TControlFUl
 */
-// regalloc
-#ifdef NONMATCHING
+// NONMATCHING - regalloc
 u8 TControl::forward(u32 param_0) {
    _54 = mObject_control.getSuspend();
    u8 rv = mObject_control.forward(param_0);
@@ -411,11 +404,6 @@ u8 TControl::forward(u32 param_0) {
    setStatus_(uVar7 | (uVar6 << 0x10));
    return rv;
 }
-#else
-u8 TControl::forward(u32 param_0) {
-    // NONMATCHING
-}
-#endif

 TFactory::~TFactory() {}

@@ -545,4 +533,4 @@ extern "C" void func_80289928(void* _this,
                                  JGadget::TLinkList<JStudio::stb::TObject, 12>::iterator param_1,
                                  JStudio::object::TPRObject_ID_equal param_2) {
    // NONMATCHING
-}
+}
@@ -322,8 +322,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_prepare() {

 /* 8028A7B4-8028A8D8 2850F4 0124+00 1/0 0/0 0/0 .text
 * adaptor_do_begin__Q214JStudio_JStage14TAdaptor_actorFv       */
-// instruction order
-#ifdef NONMATCHING
+// NONMATCHING - instruction order
 void JStudio_JStage::TAdaptor_actor::adaptor_do_begin() {
    adaptor_object_begin_();
    JStage::TActor* pActor = get_pJSG_();
@@ -345,11 +344,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_begin() {
        pAnimOutput++;
    }
 }
-#else
-void JStudio_JStage::TAdaptor_actor::adaptor_do_begin() {
-    // NONMATCHING
-}
-#endif

 /* 8028A8D8-8028A92C 285218 0054+00 1/0 0/0 0/0 .text
 * adaptor_do_end__Q214JStudio_JStage14TAdaptor_actorFv         */
@@ -676,14 +670,9 @@ void JStudio_JStage::TAdaptor_actor::TVVOutput_ANIMATION_FRAME_::operator()(

 /* 8028B138-8028B198 285A78 0060+00 2/1 0/0 0/0 .text
 * __dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv */
-#ifdef NONMATCHING
+// NONMATCHING
 JStudio_JStage::TAdaptor_actor::TVVOutput_ANIMATION_FRAME_::~TVVOutput_ANIMATION_FRAME_() {
 }
-#else
-JStudio_JStage::TAdaptor_actor::TVVOutput_ANIMATION_FRAME_::~TVVOutput_ANIMATION_FRAME_() {
-    // NONMATCHING
-}
-#endif

 /* ############################################################################################## */
 /* 803C5864-803C5888 022984 0010+14 2/2 0/0 0/0 .data
@@ -731,4 +720,4 @@ extern "C" void func_8028B580(void* _this) {
 extern "C" void func_8028B5E0(void* _this, f32 param_0,
                                  JStudio::TAdaptor* param_1) /* const */ {
    // NONMATCHING
-}
+}
@@ -125,8 +125,7 @@ SECTION_SDATA2 static f32 lit_850 = 57.295780181884766f;

 /* 8028CCB0-8028CF68 2875F0 02B8+00 1/0 0/0 0/0 .text
 * adaptor_do_begin__Q214JStudio_JStage14TAdaptor_lightFv       */
-// regalloc
-#ifdef NONMATCHING
+// NONMATCHING - regalloc
 void JStudio_JStage::TAdaptor_light::adaptor_do_begin() {
    adaptor_object_begin_();
    JStage::TLight* pLightObj = get_pJSG_();
@@ -154,11 +153,6 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_begin() {
    VECAdd(&finalTransform->position, &finalTransform->direction, &VStack_c4);
    adaptor_setVariableValue_Vec(sauVariableValue_3_TARGET_POSITION_XYZ, VStack_c4);
 }
-#else
-void JStudio_JStage::TAdaptor_light::adaptor_do_begin() {
-    // NONMATCHING
-}
-#endif

 /* 8028CF68-8028CFBC 2878A8 0054+00 1/0 0/0 0/0 .text
 * adaptor_do_end__Q214JStudio_JStage14TAdaptor_lightFv         */
@@ -172,8 +166,7 @@ SECTION_SDATA2 static f32 lit_898 = 0.01745329238474369f;

 /* 8028CFBC-8028D18C 2878FC 01D0+00 1/0 0/0 0/0 .text
 * adaptor_do_update__Q214JStudio_JStage14TAdaptor_lightFUl     */
-// float regalloc
-#ifdef NONMATCHING
+// NONMATCHING - float regalloc
 void JStudio_JStage::TAdaptor_light::adaptor_do_update(u32 param_1) {
    JStage::TLight* lightObj = get_pJSG_();
    const JStudio::TObject* pObject = adaptor_getObject();
@@ -209,11 +202,6 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_update(u32 param_1) {
    lightObj->JSGSetDirection(pTrans->direction);
    pJSGObject_->JSGUpdate();
 }
-#else
-void JStudio_JStage::TAdaptor_light::adaptor_do_update(u32 param_0) {
-    // NONMATCHING
-}
-#endif

 /* 8028D18C-8028D1B0 287ACC 0024+00 1/0 0/0 0/0 .text
 * adaptor_do_data__Q214JStudio_JStage14TAdaptor_lightFPCvUlPCvUl */
@@ -263,4 +251,4 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_ENABLE(JStudio::data::TEOperatio
 void JStudio_JStage::TAdaptor_light::TVVOutput_direction_::operator()(
    f32 param_0, JStudio::TAdaptor* param_1) const {
    ((JStudio_JStage::TAdaptor_light*)param_1)->field_0x11c = field_0x8;
-}
+}