some more cleanup

zeldaret · Oct 18, 2024 · 54b48f1 · 54b48f1
1 parent d8882b2
commit 54b48f1
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 3,813 deletions.
diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp
diff --git a/src/d/actor/d_a_alink_crawl.inc b/src/d/actor/d_a_alink_crawl.inc
@@ -287,8 +287,7 @@ int daAlink_c::procCrawlMove() {
 }
 
 /* 800F99FC-800F9ABC 0F433C 00C0+00 1/1 0/0 0/0 .text procCrawlAutoMoveInit__9daAlink_cFiP4cXyz */
-// r30 / r31 swap
-#ifdef NONMATCHING
+// NONMATCHING - r30 / r31 swap
 int daAlink_c::procCrawlAutoMoveInit(int param_0, cXyz* param_1) {
     BOOL var_r30 = dComIfGp_checkPlayerStatus0(0, 0x2000);
     commonProcInit(PROC_CRAWL_AUTO_MOVE);
@@ -309,12 +308,6 @@ int daAlink_c::procCrawlAutoMoveInit(int param_0, cXyz* param_1) {
 
     return 1;
 }
-#else
-int daAlink_c::procCrawlAutoMoveInit(int param_0, cXyz* param_1) {
-    // NONMATCHING
-    return 0;
-}
-#endif
 
 /* 800F9ABC-800F9D7C 0F43FC 02C0+00 1/0 0/0 0/0 .text            procCrawlAutoMove__9daAlink_cFv */
 int daAlink_c::procCrawlAutoMove() {

diff --git a/src/d/actor/d_a_alink_demo.inc b/src/d/actor/d_a_alink_demo.inc
@@ -828,8 +828,7 @@ void daAlink_c::resetSpecialEvent() {
 }
 
 /* 80117CF8-801180EC 112638 03F4+00 4/4 0/0 0/0 .text            endDemoMode__9daAlink_cFv */
-// one wrong branch
-#ifdef NONMATCHING
+// NONMATCHING - one wrong branch
 void daAlink_c::endDemoMode() {
     BOOL temp_r30 = checkFlyAtnWait();
     endHighModel();
@@ -925,15 +924,9 @@ void daAlink_c::endDemoMode() {
         }
     }
 }
-#else
-void daAlink_c::endDemoMode() {
-    // NONMATCHING
-}
-#endif
 
 /* 801180EC-80118170 112A2C 0084+00 2/2 0/0 0/0 .text            getDemoLookActor__9daAlink_cFv */
-// weird gameinfo load
-#ifdef NONMATCHING
+// NONMATCHING - weird gameinfo load
 fopAc_ac_c* daAlink_c::getDemoLookActor() {
     if (mDemo.getParam0() == 1) {
         return dComIfGp_event_getPt1();
@@ -947,11 +940,6 @@ fopAc_ac_c* daAlink_c::getDemoLookActor() {
 
     return NULL;
 }
-#else
-fopAc_ac_c* daAlink_c::getDemoLookActor() {
-    // NONMATCHING
-}
-#endif
 
 /* 80118170-801181A0 112AB0 0030+00 4/4 0/0 0/0 .text            checkFlyAtnWait__9daAlink_cFv */
 BOOL daAlink_c::checkFlyAtnWait() {
@@ -1261,8 +1249,7 @@ void daAlink_c::setHighModelBck(mDoExt_bckAnm* i_bck, u16 i_anmID) {
 
 /* 801190A4-80119134 1139E4 0090+00 1/1 0/0 0/0 .text            setHighModelFaceBtk__9daAlink_cFUs
  */
-// extra mr
-#ifdef NONMATCHING
+// NONMATCHING - extra mr
 void daAlink_c::setHighModelFaceBtk(u16 i_anmID) {
     J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectIDRes(
         dStage_roomControl_c::getDemoArcName(), i_anmID);
@@ -1275,16 +1262,10 @@ void daAlink_c::setHighModelFaceBtk(u16 i_anmID) {
         field_0x068c = btk;
     }
 }
-#else
-void daAlink_c::setHighModelFaceBtk(u16 param_0) {
-    // NONMATCHING
-}
-#endif
 
 /* 80119134-801191C4 113A74 0090+00 1/1 0/0 0/0 .text
  * setDemoBrk__9daAlink_cFPP15J3DAnmTevRegKeyP8J3DModelUs       */
-// extra mr
-#ifdef NONMATCHING
+// NONMATCHING - extra mr
 void daAlink_c::setDemoBrk(J3DAnmTevRegKey** param_0, J3DModel* param_1, u16 i_anmID) {
     J3DAnmTevRegKey* brk =
         (J3DAnmTevRegKey*)dComIfG_getObjectIDRes(dStage_roomControl_c::getDemoArcName(), i_anmID);
@@ -1297,11 +1278,6 @@ void daAlink_c::setDemoBrk(J3DAnmTevRegKey** param_0, J3DModel* param_1, u16 i_a
         *param_0 = brk;
     }
 }
-#else
-void daAlink_c::setDemoBrk(J3DAnmTevRegKey** param_0, J3DModel* param_1, u16 param_2) {
-    // NONMATCHING
-}
-#endif
 
 /* 801191C4-80119464 113B04 02A0+00 1/1 0/0 0/0 .text
  * setStickAnmData__9daAlink_cFP10J3DAnmBaseiiUsi               */

diff --git a/src/d/actor/d_a_alink_guard.inc b/src/d/actor/d_a_alink_guard.inc
@@ -246,7 +246,7 @@ void daAlink_c::setGuardSe(dCcD_GObjInf* i_objinf) {
 }
 
 /* 800DD1D4-800DD3E4 0D7B14 0210+00 1/1 0/0 0/0 .text setSmallGuard__9daAlink_cFP12dCcD_GObjInf */
-#ifdef NONMATCHING
+// NONMATCHING
 void daAlink_c::setSmallGuard(dCcD_GObjInf* i_objinf) {
     setUpperAnimeBase(0x16);
     cXyz* dmg_vec = (cXyz*)getDamageVec(i_objinf);
@@ -264,11 +264,6 @@ void daAlink_c::setSmallGuard(dCcD_GObjInf* i_objinf) {
     s16 min = -max;
     mBodyAngle.x = cLib_minMaxLimit<s16>(cM_atan2s(dmg_vec->y, dmg_vec->absXZ()), min, max);
 }
-#else
-void daAlink_c::setSmallGuard(dCcD_GObjInf* param_0) {
-    // NONMATCHING
-}
-#endif
 
 /* 800DD3E4-800DD894 0D7D24 04B0+00 1/1 0/0 0/0 .text
  * procGuardSlipInit__9daAlink_cFiP12dCcD_GObjInf               */

diff --git a/src/d/actor/d_a_alink_horse.inc b/src/d/actor/d_a_alink_horse.inc
@@ -81,8 +81,7 @@ int daAlink_c::getReinRideDirection() {
 
 /* 800EC8F8-800ECA3C 0E7238 0144+00 1/1 0/0 0/0 .text            checkReinRideBgCheck__9daAlink_cFv
  */
-// issue with sp38 member setting
-#ifdef NONMATCHING
+// NONMATCHING - issue with sp38 member setting
 int daAlink_c::checkReinRideBgCheck() {
     int direction = getReinRideDirection();
 
@@ -130,12 +129,6 @@ int daAlink_c::checkReinRideBgCheck() {
 
     return 1;
 }
-#else
-int daAlink_c::checkReinRideBgCheck() {
-    // NONMATCHING
-    return 0;
-}
-#endif
 
 /* 800ECA3C-800ECAAC 0E737C 0070+00 3/3 0/0 0/0 .text commonInitForceRideRein__9daAlink_cFv */
 void daAlink_c::commonInitForceRideRein() {
@@ -679,8 +672,7 @@ int daAlink_c::setSyncHorse(int param_0) {
 
 
 /* 800EE64C-800EE918 0E8F8C 02CC+00 1/1 0/0 0/0 .text            setSyncBoar__9daAlink_cFi */
-// regalloc, equivalent?
-#ifdef NONMATCHING
+// NONMATCHING - regalloc, equivalent? NONMATCHING
 int daAlink_c::setSyncBoar(int param_0) {
     e_wb_class* e_wb_p = static_cast<e_wb_class*>(mRideAcKeep.getActor());
     BOOL mode_1 = checkModeFlg(1);
@@ -741,12 +733,6 @@ int daAlink_c::setSyncBoar(int param_0) {
 
     return 1;
 }
-#else
-int daAlink_c::setSyncBoar(int param_0) {
-    // NONMATCHING
-    return 0;
-}
-#endif
 
 /* 800EE918-800EEAE8 0E9258 01D0+00 12/12 0/0 0/0 .text            setSyncRide__9daAlink_cFi */
 int daAlink_c::setSyncRide(int param_0) {
@@ -839,8 +825,7 @@ int daAlink_c::setRideSubjectAngle(s16 param_0) {
 }
 
 /* 800EF050-800EF0E8 0E9990 0098+00 7/7 0/0 0/0 .text setBodyAngleRideReadyAnime__9daAlink_cFv */
-// missing mr, probably issue with cLib_minMaxLimit implementation
-#ifdef NONMATCHING
+// NONMATCHING - missing mr, probably issue with cLib_minMaxLimit implementation
 void daAlink_c::setBodyAngleRideReadyAnime() {
     setBodyAngleXReadyAnime(0);
 
@@ -855,11 +840,6 @@ void daAlink_c::setBodyAngleRideReadyAnime() {
 
     daPy_addCalcShort(&mBodyAngle.y, angle, 4, 0xC00, 0x180);
 }
-#else
-void daAlink_c::setBodyAngleRideReadyAnime() {
-    // NONMATCHING
-}
-#endif
 
 /* 800EF0E8-800EF198 0E9A28 00B0+00 1/1 0/0 0/0 .text
  * checkHorseGetOffWallCheck__9daAlink_cFP4cXyzP4cXyzs          */
@@ -996,20 +976,13 @@ int daAlink_c::checkNextActionHorse() {
 }
 
 /* 800EF598-800EF6B0 0E9ED8 0118+00 2/2 0/0 0/0 .text            checkHorseGetOff__9daAlink_cFv */
-// regalloc
-#ifdef NONMATCHING
+// NONMATCHING - regalloc
 BOOL daAlink_c::checkHorseGetOff() {
     return (checkHorseRide() && dComIfGp_getHorseActor() != NULL &&
             dComIfGp_getHorseActor()->checkGetOff()) ||
            (checkBoarRide() && static_cast<e_wb_class*>(mRideAcKeep.getActor()) != NULL &&
             static_cast<e_wb_class*>(mRideAcKeep.getActor())->checkGetOff());
 }
-#else
-BOOL daAlink_c::checkHorseGetOff() {
-    // NONMATCHING
-    return 0;
-}
-#endif
 
 /* 800EF6B0-800EF884 0E9FF0 01D4+00 3/3 0/0 0/0 .text checkHorseGetOffAndSetDoStatus__9daAlink_cFv
  */

diff --git a/src/d/actor/d_a_alink_link.inc b/src/d/actor/d_a_alink_link.inc
@@ -3881,41 +3881,6 @@ static int daAlink_Draw(daAlink_c* i_this) {
     return i_this->draw();
 }
 
-/* ############################################################################################## */
-/* 803B3580-803B3590 0106A0 0010+00 3/3 0/0 0/0 .data            __vt__15daAlink_sight_c */
-SECTION_DATA extern void* __vt__15daAlink_sight_c[4] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)draw__15daAlink_sight_cFv,
-    (void*)__dt__15daAlink_sight_cFv,
-};
-
-/* 803B3590-803B35A0 0106B0 0010+00 4/4 0/0 0/0 .data            __vt__20daAlink_lockCursor_c */
-SECTION_DATA extern void* __vt__20daAlink_lockCursor_c[4] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)draw__20daAlink_lockCursor_cFv,
-    (void*)__dt__20daAlink_lockCursor_cFv,
-};
-
-/* 803B35A0-803B35B4 0106C0 0014+00 3/3 0/0 0/0 .data            __vt__14daAlink_blur_c */
-SECTION_DATA extern void* __vt__14daAlink_blur_c[5] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)entry__9J3DPacketFP13J3DDrawBuffer,
-    (void*)draw__14daAlink_blur_cFv,
-    (void*)__dt__14daAlink_blur_cFv,
-};
-
-/* 803B35B4-803B35C8 0106D4 0014+00 3/3 0/0 0/0 .data __vt__29dAlink_bottleWaterPcallBack_c */
-SECTION_DATA extern void* __vt__29dAlink_bottleWaterPcallBack_c[5] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__29dAlink_bottleWaterPcallBack_cFv,
-    (void*)execute__29dAlink_bottleWaterPcallBack_cFP14JPABaseEmitterP15JPABaseParticle,
-    (void*)draw__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle,
-};
-
 /* 800CD7AC-800CE208 0C80EC 0A5C+00 1/1 0/0 0/0 .text            __dt__9daAlink_cFv */
 daAlink_c::~daAlink_c() {
     dComIfGp_clearPlayerStatus0(0, ~0x400030);
@@ -5021,42 +4986,12 @@ extern "C" void __dt__16daAlink_matAnm_cFv() {
     // NONMATCHING
 }
 
-/* ############################################################################################## */
-/* 803B35C8-803B35EC 0106E8 0024+00 2/2 5/5 0/0 .data            __vt__12dBgS_ObjAcch */
-SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__12dBgS_ObjAcchFv,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)func_801446DC,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)func_801446D4,
-};
-
 /* 800D0C6C-800D0CDC 0CB5AC 0070+00 3/2 0/0 0/0 .text            __dt__12dBgS_ObjAcchFv */
 // dBgS_ObjAcch::~dBgS_ObjAcch() {
 extern "C" void __dt__12dBgS_ObjAcchFv() {
     // NONMATCHING
 }
 
-/* ############################################################################################## */
-/* 803B35EC-803B3610 01070C 0014+10 3/3 0/0 0/0 .data            __vt__Q29daAlink_c14hsChainShape_c
- */
-SECTION_DATA extern void* __vt__Q29daAlink_c14hsChainShape_c[5 + 4 /* padding */] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)entry__9J3DPacketFP13J3DDrawBuffer,
-    (void*)draw__Q29daAlink_c14hsChainShape_cFv,
-    (void*)__dt__Q29daAlink_c14hsChainShape_cFv,
-    /* padding */
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-};
-
 /* 800D0CDC-800D0D38 0CB61C 005C+00 1/0 0/0 0/0 .text __dt__Q29daAlink_c14hsChainShape_cFv */
 extern "C" void __dt__Q29daAlink_c14hsChainShape_cFv() {
     // NONMATCHING

diff --git a/src/d/actor/d_a_alink_swim.inc b/src/d/actor/d_a_alink_swim.inc
@@ -129,7 +129,7 @@ void daAlink_c::setWaterInAnmRate(daPy_frameCtrl_c* i_frameCtrl, f32 i_rate) {
 }
 
 /* 80101D70-801023E4 0FC6B0 0674+00 2/2 0/0 0/0 .text            swimBgCheck__9daAlink_cFf */
-#ifdef NONMATCHING
+// NONMATCHING
 void daAlink_c::swimBgCheck(f32 param_0) {
     offNoResetFlg1(FLG1_UNK_20000000);
 
@@ -205,11 +205,6 @@ void daAlink_c::swimBgCheck(f32 param_0) {
         field_0x3092 = cM_atan2s(-fvar14, -fvar15);
     }
 }
-#else
-void daAlink_c::swimBgCheck(f32 param_0) {
-    // NONMATCHING
-}
-#endif
 
 /* 801023E4-801029C8 0FCD24 05E4+00 3/3 0/0 0/0 .text            setSpeedAndAngleSwim__9daAlink_cFv
  */
@@ -841,8 +836,7 @@ int daAlink_c::procSwimHookshotMove() {
 
 /* 8010519C-80105728 0FFADC 058C+00 1/1 0/0 0/0 .text
  * procSwimDamageInit__9daAlink_cFP12dCcD_GObjInf               */
-// instruction block order issue
-#ifdef NONMATCHING
+// NONMATCHING - instruction block order issue
 int daAlink_c::procSwimDamageInit(dCcD_GObjInf* param_0) {
     seStartOnlyReverb(Z2SE_AL_DAMAGE_NORMAL);
     dComIfGp_getVibration().StartShock(2, 31, cXyz(0.0f, 1.0f, 0.0f));
@@ -921,12 +915,6 @@ int daAlink_c::procSwimDamageInit(dCcD_GObjInf* param_0) {
 
     return 1;
 }
-#else
-int daAlink_c::procSwimDamageInit(dCcD_GObjInf* param_0) {
-    // NONMATCHING
-    return 0;
-}
-#endif
 
 /* 80105728-801058A0 100068 0178+00 1/0 0/0 0/0 .text            procSwimDamage__9daAlink_cFv */
 int daAlink_c::procSwimDamage() {

diff --git a/src/d/actor/d_a_alink_whistle.inc b/src/d/actor/d_a_alink_whistle.inc
@@ -176,8 +176,7 @@ int daAlink_c::procGrassWhistleWaitInit(int param_0, int param_1, int param_2, s
 
 /* 80111CA4-80111FF0 10C5E4 034C+00 1/0 0/0 0/0 .text            procGrassWhistleWait__9daAlink_cFv
  */
-// small regalloc
-#ifdef NONMATCHING
+// NONMATCHING - small regalloc
 int daAlink_c::procGrassWhistleWait() {
     if (mProcVar5.field_0x3012 != 0) {
         if (checkEndMessage(field_0x32cc)) {
@@ -270,12 +269,6 @@ int daAlink_c::procGrassWhistleWait() {
 
     return 1;
 }
-#else
-int daAlink_c::procGrassWhistleWait() {
-    // NONMATCHING
-    return 0;
-}
-#endif
 
 /* 80111FF0-801120C8 10C930 00D8+00 2/2 0/0 0/0 .text procCoHorseCallWaitInit__9daAlink_cFi */
 int daAlink_c::procCoHorseCallWaitInit(int param_0) {