format

2026-06-04 02:47:02 -04:00 · 2022-06-01 04:23:39 -07:00
parent 3f22fa4483
commit 32cea78625
121 changed files with 1936 additions and 4957 deletions
@@ -28036,7 +28036,7 @@ asm void daAlink_c::hookshotAtHitCallBack(dCcD_GObjInf* param_0, fopAc_ac_c* par
 /* 8010859C-801085BC 102EDC 0020+00 1/1 0/0 0/0 .text
 * daAlink_hookshotAtHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void daAlink_hookshotAtHitCallBack(fopAc_ac_c* player, dCcD_GObjInf* param_1,
-                                              fopAc_ac_c* param_2, dCcD_GObjInf* param_3) {
+                                          fopAc_ac_c* param_2, dCcD_GObjInf* param_3) {
    ((daAlink_c*)player)->hookshotAtHitCallBack(param_1, param_2, param_3);
 }

@@ -28051,7 +28051,8 @@ cXyz* daAlink_c::getHookshotTopPos() {

 /* 80108600-80108668 102F40 0068+00 1/0 0/0 0/0 .text checkHookshotReturnMode__9daAlink_cCFv */
 bool daAlink_c::checkHookshotReturnMode() const {
-    return checkHookshotItem(mEquipItem) && (mHookshotMode == 4 || mHookshotMode == 5 || mHookshotMode == 6);
+    return checkHookshotItem(mEquipItem) &&
+           (mHookshotMode == 4 || mHookshotMode == 5 || mHookshotMode == 6);
 }

 /* 80108668-801086DC 102FA8 0074+00 1/0 0/0 0/0 .text checkHookshotShootReturnMode__9daAlink_cCFv
@@ -28121,7 +28122,8 @@ void daAlink_c::changeHookshotDrawModel() {

 /* 801088A0-801088C8 1031E0 0028+00 6/6 0/0 0/0 .text checkHookshotRoofLv7Boss__9daAlink_cFv */
 BOOL daAlink_c::checkHookshotRoofLv7Boss() {
-    return mCargoCarryActor.getActor() != NULL && fopAcM_GetName(mCargoCarryActor.getActor()) == PROC_B_DR;
+    return mCargoCarryActor.getActor() != NULL &&
+           fopAcM_GetName(mCargoCarryActor.getActor()) == PROC_B_DR;
 }

 /* 801088C8-80108980 103208 00B8+00 2/2 0/0 0/0 .text            checkChaseHookshot__9daAlink_cFv */
@@ -28138,7 +28140,9 @@ BOOL daAlink_c::checkChaseHookshot() {

    if (mTargetedActor != NULL) {
        s16 actorName = fopAcM_GetName(mTargetedActor);
-        return field_0x2804 == mTargetedActor && (checkBossOctaIealRoom() || actorName == PROC_Obj_FallObj || actorName == PROC_B_DR || actorName == PROC_E_PH);
+        return field_0x2804 == mTargetedActor &&
+               (checkBossOctaIealRoom() || actorName == PROC_Obj_FallObj ||
+                actorName == PROC_B_DR || actorName == PROC_E_PH);
    }

    return false;
@@ -28186,7 +28190,8 @@ bool daAlink_c::setHookshotCarryOffset(unsigned int actorID, cXyz const* offset)
    if (i_dComIfGp_checkPlayerStatus1(0, 0x10000)) {
        fopAc_ac_c* carryActor = mCargoCarryActor.getActor();

-        if (carryActor != NULL && fopAcM_checkHookCarryNow(carryActor) && actorID == mCargoCarryActor.getID()) {
+        if (carryActor != NULL && fopAcM_checkHookCarryNow(carryActor) &&
+            actorID == mCargoCarryActor.getID()) {
            field_0x37c8 = *offset;
            return true;
        }
@@ -28204,7 +28209,7 @@ bool daAlink_c::setHookshotCarryOffset(unsigned int actorID, cXyz const* offset)
 /* 80108B34-80108DB4 103474 0280+00 1/1 0/0 0/0 .text            setHookshotModel__9daAlink_cFv */
 void daAlink_c::setHookshotModel() {
    J3DAnmTransform* bck = (J3DAnmTransform*)mAnmHeap9.loadDataIdx(0x17E);
-    
+
    JKRHeap* heap = setItemHeap();
    field_0x730.init(bck, 0, 2, lit_6040, 0, -1, false);

@@ -28263,7 +28268,8 @@ asm void daAlink_c::setHookshotSight() {

 /* 80108EEC-80108F64 10382C 0078+00 1/1 0/0 0/0 .text            cancelHookshotShot__9daAlink_cFv */
 void daAlink_c::cancelHookshotShot() {
-    if (checkHookshotItem(mEquipItem) && (mHookshotMode == 3 || mHookshotMode == 5 || mHookshotMode == 4)) {
+    if (checkHookshotItem(mEquipItem) &&
+        (mHookshotMode == 3 || mHookshotMode == 5 || mHookshotMode == 4)) {
        if (mActionID != 0xC5 && mActionID != 0xC6 && mActionID != 0xC4) {
            mHookshotMode = 6;
        }
@@ -28275,7 +28281,8 @@ void daAlink_c::cancelHookshotShot() {
 #ifdef NONMATCHING
 bool daAlink_c::cancelHookshotMove() {
    if (mFastShotTime == 0 && mHookshotMode == 0) {
-        if (checkHookshotAnime() && (mTargetedActor == NULL && !i_checkAttentionLock() || !itemButton())) {
+        if (checkHookshotAnime() &&
+            (mTargetedActor == NULL && !i_checkAttentionLock() || !itemButton())) {
            resetUpperAnime(UPPER_NOW, -1.0f);
            return 1;
        }
@@ -4,11 +4,11 @@
 //

 #include "d/a/d_a_npc.h"
+#include "d/d_procname.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 #include "m_Do/m_Do_mtx.h"
 #include "rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.h"
-#include "d/d_procname.h"

 //
 // Types:
@@ -1594,8 +1594,8 @@ J3DAnmColor* daNpcT_c::getColorAnmP(char const* arcName, int fileIdx) {

 /* 801481C0-80148204 142B00 0044+00 1/1 0/0 0/0 .text setBckAnm__8daNpcT_cFP15J3DAnmTransformfiiib
 */
-void daNpcT_c::setBckAnm(J3DAnmTransform* bck, f32 rate, int attr, int startF,
-                             int endF, bool modify) {
+void daNpcT_c::setBckAnm(J3DAnmTransform* bck, f32 rate, int attr, int startF, int endF,
+                         bool modify) {
    mBckAnm.init(bck, TRUE, attr, rate, startF, endF, modify);
 }

@@ -1603,13 +1603,13 @@ void daNpcT_c::setBckAnm(J3DAnmTransform* bck, f32 rate, int attr, int startF,
 * setMcaMorfAnm__8daNpcT_cFP18J3DAnmTransformKeyffiii          */
 // matches with literals
 #ifdef NONMATCHING
-int daNpcT_c::setMcaMorfAnm(J3DAnmTransformKey* bck, f32 morf, f32 frame, int mode,
-                                 int startF, int endF) {
+int daNpcT_c::setMcaMorfAnm(J3DAnmTransformKey* bck, f32 morf, f32 frame, int mode, int startF,
+                            int endF) {
    f32 start = startF;
    f32 end = endF;

    mMcaMorfAnm[0]->setAnm(bck, mode, frame, morf, start, end);
-    
+
    if (mMcaMorfAnm[1] != NULL) {
        mMcaMorfAnm[1]->setAnm(bck, mode, frame, morf, start, end);
    }
@@ -1621,7 +1621,7 @@ int daNpcT_c::setMcaMorfAnm(J3DAnmTransformKey* bck, f32 morf, f32 frame, int mo
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm int daNpcT_c::setMcaMorfAnm(J3DAnmTransformKey* param_0, f32 param_1, f32 param_2, int param_3,
-                                 int param_4, int param_5) {
+                                int param_4, int param_5) {
    nofralloc
 #include "asm/d/a/d_a_npc/setMcaMorfAnm__8daNpcT_cFP18J3DAnmTransformKeyffiii.s"
 }
@@ -1631,28 +1631,27 @@ asm int daNpcT_c::setMcaMorfAnm(J3DAnmTransformKey* param_0, f32 param_1, f32 pa
 /* 801482F8-80148338 142C38 0040+00 1/1 0/0 1/1 .text
 * setBtpAnm__8daNpcT_cFP16J3DAnmTexPatternP12J3DModelDatafi    */
 void daNpcT_c::setBtpAnm(J3DAnmTexPattern* param_0, J3DModelData* modelData, f32 param_2,
-                             int param_3) {
+                         int param_3) {
    mBtpAnm.init(modelData, param_0, 1, param_3, param_2, 0, -1);
 }

 /* 80148338-80148378 142C78 0040+00 1/1 0/0 6/6 .text
 * setBtkAnm__8daNpcT_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi */
 void daNpcT_c::setBtkAnm(J3DAnmTextureSRTKey* param_0, J3DModelData* modelData, f32 param_2,
-                             int param_3) {
+                         int param_3) {
    mBtkAnm.init(modelData, param_0, 1, param_3, param_2, 0, -1);
 }

 /* 80148378-801483B8 142CB8 0040+00 0/0 0/0 9/9 .text
 * setBrkAnm__8daNpcT_cFP15J3DAnmTevRegKeyP12J3DModelDatafi     */
 void daNpcT_c::setBrkAnm(J3DAnmTevRegKey* param_0, J3DModelData* modelData, f32 param_2,
-                             int param_3) {
+                         int param_3) {
    mBrkAnm.init(modelData, param_0, 1, param_3, param_2, 0, -1);
 }

 /* 801483B8-801483F8 142CF8 0040+00 0/0 0/0 2/2 .text
 * setBpkAnm__8daNpcT_cFP11J3DAnmColorP12J3DModelDatafi         */
-void daNpcT_c::setBpkAnm(J3DAnmColor* param_0, J3DModelData* modelData, f32 param_2,
-                             int param_3) {
+void daNpcT_c::setBpkAnm(J3DAnmColor* param_0, J3DModelData* modelData, f32 param_2, int param_3) {
    mBpkAnm.init(modelData, param_0, 1, param_3, param_2, 0, -1);
 }

@@ -1670,7 +1669,7 @@ int daNpcT_c::loadRes(s8 const* resNoList, char const** resNameList) {
        if (status == cPhs_COMPLEATE_e) {
            resLoad_cnt++;
        }
-        
+
        if (status == cPhs_ERROR_e || status == 3) {
            return cPhs_ERROR_e;
        }
@@ -1706,7 +1705,7 @@ int daNpcT_c::execute() {
    if (!evtProc()) {
        action();
    }
-    
+
    beforeMove();
    fopAcM_posMoveF(this, field_0x864.GetCCMoveP());
    field_0x68c.CrrPos(dComIfG_Bgsp());
@@ -1775,11 +1774,11 @@ SECTION_SDATA2 static f32 lit_5794 = 20.0f;
 // close. literals + few wrong areas
 #ifdef NONMATCHING
 int daNpcT_c::draw(int param_0, int param_1, f32 param_2, GXColorS10* color, f32 param_4,
-                        int param_5, int param_6, int param_7) {
+                   int param_5, int param_6, int param_7) {
    J3DModel* model = mMcaMorfAnm[0]->getModel();
    J3DModelData* modelData = model->getModelData();
    field_0xe34 = 1;
-    
+
    if (drawDbgInfo() || checkHide() || field_0xe2b) {
        return 1;
    }
@@ -1857,9 +1856,12 @@ int daNpcT_c::draw(int param_0, int param_1, f32 param_2, GXColorS10* color, f32

    if (param_6 == 0) {
        if (param_7 == 0) {
-            field_0xd94 = dComIfGd_setShadow(field_0xd94, 1, model, &mCurrent.mPosition, param_2, param_4, mCurrent.mPosition.y, field_0xdf4, field_0x930, &mTevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
+            field_0xd94 = dComIfGd_setShadow(
+                field_0xd94, 1, model, &mCurrent.mPosition, param_2, param_4, mCurrent.mPosition.y,
+                field_0xdf4, field_0x930, &mTevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
        } else {
-            dComIfGd_setSimpleShadow(&mCurrent.mPosition, field_0xdf4, param_4, field_0x930, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
+            dComIfGd_setSimpleShadow(&mCurrent.mPosition, field_0xdf4, param_4, field_0x930, 0,
+                                     1.0f, dDlst_shadowControl_c::getSimpleTex());
        }
    }

@@ -1871,7 +1873,7 @@ int daNpcT_c::draw(int param_0, int param_1, f32 param_2, GXColorS10* color, f32
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm int daNpcT_c::draw(int param_0, int param_1, f32 param_2, _GXColorS10* param_3, f32 param_4,
-                        int param_5, int param_6, int param_7) {
+                       int param_5, int param_6, int param_7) {
    nofralloc
 #include "asm/d/a/d_a_npc/draw__8daNpcT_cFiifP11_GXColorS10fiii.s"
 }
@@ -2107,7 +2109,7 @@ void daNpcT_c::setPos(cXyz i_pos) {
    i_pos.y += 300.0f;
    field_0x930.SetPos(&i_pos);
    i_pos.y = dComIfG_Bgsp().GroundCross(&field_0x930);
-    
+
    mCurrent.mPosition = i_pos;
    mNext.mPosition = mCurrent.mPosition;
 }
@@ -2137,7 +2139,7 @@ fopAc_ac_c* daNpcT_c::hitChk(dCcD_GObjInf* i_objInf, u32 param_1) {

    if (mTimer == 0) {
        fopAc_ac_c* hitAc = i_objInf->GetTgHitAc();
-        
+
        if (hitAc != NULL) {
            if (fopAcM_GetName(hitAc) == PROC_NPC_TK && param_1 & 1) {
                ((daNPC_TK_c*)hitAc)->setBump();
@@ -1147,12 +1147,10 @@ static asm void dungeonlight_init() {
 /* 8019EAA0-8019EBD0 1993E0 0130+00 1/1 0/0 0/0 .text            undwater_init__Fv */
 static void undwater_init() {
    J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes("Always", 0x1D);
-    g_env_light.field_0xf38 =
-        mDoExt_createSolidHeapFromGameToCurrent(0x600, 0x20);
+    g_env_light.field_0xf38 = mDoExt_createSolidHeapFromGameToCurrent(0x600, 0x20);

    if (g_env_light.field_0xf38 != NULL) {
-        g_env_light.field_0xf30 =
-            mDoExt_J3DModel__create(modelData2, 0x80000, 0x11020202);
+        g_env_light.field_0xf30 = mDoExt_J3DModel__create(modelData2, 0x80000, 0x11020202);

        if (g_env_light.field_0xf30 != NULL) {
            g_env_light.field_0x105c = new mDoExt_btkAnm();
@@ -1160,8 +1158,7 @@ static void undwater_init() {
            if (g_env_light.field_0x105c != NULL) {
                J3DAnmTextureSRTKey* key =
                    (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", 0x3C);
-                g_env_light
-                    .field_0x105c->init(modelData2, key, 1, 2, lit_4505, 0, -1);
+                g_env_light.field_0x105c->init(modelData2, key, 1, 2, lit_4505, 0, -1);
            }
        }
        mDoExt_restoreCurrentHeap();
@@ -4,11 +4,11 @@
 //

 #include "m_Do/m_Do_DVDError.h"
-#include "m_Do/m_Do_dvd_thread.h"
-#include "m_Do/m_Do_reset.h"
-#include "m_Do/m_Do_ext.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "m_Do/m_Do_dvd_thread.h"
+#include "m_Do/m_Do_ext.h"
+#include "m_Do/m_Do_reset.h"

 //
 // Declarations:
@@ -34,7 +34,8 @@ void mDoDvdErr_ThdInit() {
        OSThread* curThread = OSGetCurrentThread();
        s32 priority = OSGetThreadPriority(curThread);

-        OSCreateThread(&DvdErr_thread, mDoDvdErr_Watch, NULL, DvdErr_stack + sizeof(DvdErr_stack), sizeof(DvdErr_stack), priority - 3, 1);
+        OSCreateThread(&DvdErr_thread, mDoDvdErr_Watch, NULL, DvdErr_stack + sizeof(DvdErr_stack),
+                       sizeof(DvdErr_stack), priority - 3, 1);
        OSResumeThread(&DvdErr_thread);
        OSCreateAlarm(&Alarm);
        OSSetPeriodicAlarm(&Alarm, time, OS_BUS_CLOCK / 4, AlarmHandler);
@@ -4,17 +4,17 @@
 //

 #include "m_Do/m_Do_Reset.h"
-#include "m_Do/m_Do_DVDError.h"
-#include "m_Do/m_Do_Audio.h"
-#include "m_Do/m_Do_MemCard.h"
-#include "dol2asm.h"
-#include "dolphin/gx/GX.h"
-#include "dolphin/types.h"
+#include "JSystem/JAudio2/JASDvdThread.h"
 #include "JSystem/JUtility/JUTGamePad.h"
 #include "JSystem/JUtility/JUTVideo.h"
 #include "JSystem/JUtility/JUTXfb.h"
-#include "JSystem/JAudio2/JASDvdThread.h"
 #include "SSystem/SComponent/c_API_controller_pad.h"
+#include "dol2asm.h"
+#include "dolphin/gx/GX.h"
+#include "dolphin/types.h"
+#include "m_Do/m_Do_Audio.h"
+#include "m_Do/m_Do_DVDError.h"
+#include "m_Do/m_Do_MemCard.h"

 //
 // Forward References:
@@ -4,11 +4,11 @@
 //

 #include "m_Do/m_Do_audio.h"
+#include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 #include "m_Do/m_Do_Reset.h"
 #include "m_Do/m_Do_dvd_thread.h"
-#include "d/com/d_com_inf_game.h"

 //
 // Types:
@@ -156,7 +156,8 @@ static void mDoAud_Create() {
    }

    if (l_arcCommand == NULL) {
-        l_arcCommand = mDoDvdThd_mountXArchive_c::create("/Audiores/Seqs/Z2SoundSeqs.arc", 0, JKRArchive::MOUNT_DVD, NULL);
+        l_arcCommand = mDoDvdThd_mountXArchive_c::create("/Audiores/Seqs/Z2SoundSeqs.arc", 0,
+                                                         JKRArchive::MOUNT_DVD, NULL);

        if (l_arcCommand == NULL) {
            return;
@@ -166,7 +167,9 @@ static void mDoAud_Create() {
    if (l_affCommand->sync() && l_arcCommand->sync()) {
        if (g_mDoAud_audioHeap != NULL) {
            s32 groupID = JKRHeap::sCurrentHeap->changeGroupID(5);
-            (*(mDoAud_zelAudio_c*)g_mDoAud_zelAudio).mAudioMgr.init(g_mDoAud_audioHeap, 0xA00000, l_affCommand->getMemAddress(), l_arcCommand->getArchive());
+            (*(mDoAud_zelAudio_c*)g_mDoAud_zelAudio)
+                .mAudioMgr.init(g_mDoAud_audioHeap, 0xA00000, l_affCommand->getMemAddress(),
+                                l_arcCommand->getArchive());
            JKRHeap::sCurrentHeap->changeGroupID(groupID);
            g_mDoAud_audioHeap->adjustSize();
        } else {
@@ -174,7 +177,8 @@ static void mDoAud_Create() {
            OSReport_Error("ヒープ確保失敗につきオーディオ初期化できません\n");
        }

-        (*(mDoAud_zelAudio_c*)g_mDoAud_zelAudio).mAudioMgr.mStatusMgr.setEventBit(dComIfGs_getPEventBit());
+        (*(mDoAud_zelAudio_c*)g_mDoAud_zelAudio)
+            .mAudioMgr.mStatusMgr.setEventBit(dComIfGs_getPEventBit());
        (*(mDoAud_zelAudio_c*)g_mDoAud_zelAudio).reset();

        u32 soundMode = OSGetSoundMode();
@@ -3337,7 +3337,8 @@ extern "C" asm void func_80015034(void* _this, Vec const& param_0, f32 const (&p
 /* 8001505C-80015084 00F99C 0028+00 7/0 0/0 0/0 .text
 * init__73J3DMtxCalcNoAnm<27J3DMtxCalcCalcTransformMaya,24J3DMtxCalcJ3DSysInitMaya>FRC3VecRA3_A4_Cf
 */
-void J3DMtxCalcNoAnm<J3DMtxCalcCalcTransformMaya, J3DMtxCalcJ3DSysInitMaya>::init(Vec const& param_0, f32 const (&param_1)[3][4]) {
+void J3DMtxCalcNoAnm<J3DMtxCalcCalcTransformMaya, J3DMtxCalcJ3DSysInitMaya>::init(
+    Vec const& param_0, f32 const (&param_1)[3][4]) {
    J3DMtxCalcJ3DSysInitMaya::init(param_0, param_1);
 }

@@ -4,6 +4,7 @@
 //

 #include "m_Do/m_Do_main.h"
+#include "DynamicLink.h"
 #include "JSystem/JFramework/JFWSystem.h"
 #include "JSystem/JKernel/JKRAram.h"
 #include "JSystem/JUtility/JUTAssert.h"
@@ -18,7 +19,6 @@
 #include "m_Do/m_Do_dvd_thread.h"
 #include "m_Do/m_Do_graphic.h"
 #include "m_Do/m_Do_machine.h"
-#include "DynamicLink.h"

 //
 // Forward References:
@@ -389,7 +389,8 @@ bool Debug_console(u32 i_padNo) {
            console_scroll_init = 1;
        }

-        if (mDoCPd_c::getTrig(i_padNo) & CButton::Z && !(mDoCPd_c::getHold(i_padNo) & ~CButton::Z)) {
+        if (mDoCPd_c::getTrig(i_padNo) & CButton::Z &&
+            !(mDoCPd_c::getHold(i_padNo) & ~CButton::Z)) {
            console->setVisible(console->isVisible() == false);
            JUTAssertion::setMessageCount(0);
        }
@@ -440,9 +441,8 @@ bool Debug_console(u32 i_padNo) {
                JUTReport(30, 390, 1, "Press X+Y+START to CLEAR console.");
                JUTReport(30, 400, 1, "3DStick UP/Down to scroll");
                JUTReport(30, 410, 1, "Press A to output terminal from console.");
-                JUTReport(30, 420, 1, "SCROLL：%3d %3d %3d Output=%1x",
-                          console->getLineOffset(), console->getPositionX(),
-                          console->getPositionY(), console->getOutput());
+                JUTReport(30, 420, 1, "SCROLL：%3d %3d %3d Output=%1x", console->getLineOffset(),
+                          console->getPositionX(), console->getPositionY(), console->getOutput());
            } else {
                u32 pressButtons = mDoCPd_c::getTrig(i_padNo);

@@ -527,7 +527,8 @@ static void debug() {
        if (struct_80450B18) {
            if ((mDoCPd_c::getGamePad(PAD_3)->getButton() & ~CButton::Z) == CButton::L &&
                mDoCPd_c::getGamePad(PAD_3)->testTrigger(CButton::Z)) {
-                mDoMain::mHeapBriefType < 5 ? mDoMain::mHeapBriefType++ : mDoMain::mHeapBriefType = 1;
+                mDoMain::mHeapBriefType < 5 ? mDoMain::mHeapBriefType++ :
+                                              mDoMain::mHeapBriefType = 1;
            }

            debugDisplay();