diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h index 71651c6d0..b5973e3d2 100644 --- a/include/JSystem/J3DGraphAnimator/J3DModel.h +++ b/include/JSystem/J3DGraphAnimator/J3DModel.h @@ -40,7 +40,7 @@ public: mAnmVisibility = visibility; mbActive = 1; } - virtual ~J3DVisibilityManager(); + virtual ~J3DVisibilityManager() {} virtual void setVisibility(J3DModelData*); /* 0x04 */ J3DAnmVisibilityFull* mAnmVisibility; diff --git a/include/d/actor/d_a_bomb.h b/include/d/actor/d_a_bomb.h index 90b6a42b5..c41829548 100644 --- a/include/d/actor/d_a_bomb.h +++ b/include/d/actor/d_a_bomb.h @@ -57,7 +57,7 @@ class daBomb_c : public fopAc_ac_c { public: typedef bool(daBomb_c::*procFunc)(); - daBomb_c(); + daBomb_c() {} void draw_norm(); void draw_nut(); diff --git a/include/d/actor/d_a_magma.h b/include/d/actor/d_a_magma.h index 5447c0b73..137d72a7f 100644 --- a/include/d/actor/d_a_magma.h +++ b/include/d/actor/d_a_magma.h @@ -2,13 +2,14 @@ #define D_A_MAGMA_H #include "f_op/f_op_actor.h" +#include "f_op/f_op_actor_mng.h" #include "SSystem/SComponent/c_phase.h" class daMagma_c : public fopAc_ac_c { public: inline ~daMagma_c(); inline s32 create(); - inline s32 getPathNo(); + inline s32 getPathNo() { return fopAcM_GetParam(this); } public: /* 0x290 */ request_of_phase_process_class mPhs; diff --git a/include/d/actor/d_a_spotbox.h b/include/d/actor/d_a_spotbox.h index 3a954ac2d..e0f03e2a5 100644 --- a/include/d/actor/d_a_spotbox.h +++ b/include/d/actor/d_a_spotbox.h @@ -2,13 +2,14 @@ #define D_A_SPOTBOX_H #include "f_op/f_op_actor.h" +#include "f_op/f_op_actor_mng.h" class daSpotbox_c : public fopAc_ac_c { public: inline s32 create(); inline BOOL draw(); inline BOOL execute(); - inline u32 getType(); + inline u32 getType() { return fopAcM_GetParam(this) & 1; } public: /* 0x290 */ Mtx mMtx; diff --git a/src/JSystem/J3DGraphAnimator/J3DVisibility.cpp b/src/JSystem/J3DGraphAnimator/J3DVisibility.cpp index a9365b342..7eab654f4 100644 --- a/src/JSystem/J3DGraphAnimator/J3DVisibility.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DVisibility.cpp @@ -1,10 +1,13 @@ -/* +/** * J3DVisibility.cpp + * J3DU - Visibility */ + #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "JSystem/J3DGraphAnimator/J3DModelData.h" #include "JSystem/J3DGraphAnimator/J3DAnimation.h" +/* 802F36BC-802F377C .text setVisibility__20J3DVisibilityManagerFP12J3DModelData */ void J3DVisibilityManager::setVisibility(J3DModelData* pModel) { u8 visibility; @@ -20,5 +23,3 @@ void J3DVisibilityManager::setVisibility(J3DModelData* pModel) { } } } - -J3DVisibilityManager::~J3DVisibilityManager() {} diff --git a/src/JSystem/J3DGraphBase/J3DShape.cpp b/src/JSystem/J3DGraphBase/J3DShape.cpp index 76ed4ab02..6a6151769 100644 --- a/src/JSystem/J3DGraphBase/J3DShape.cpp +++ b/src/JSystem/J3DGraphBase/J3DShape.cpp @@ -17,7 +17,6 @@ extern void J3DFifoLoadPosMtxImm(Mtx, u32); extern void J3DFifoLoadNrmMtxImm(Mtx, u32); /* 802DD18C-802DD1FC .text initialize__8J3DShapeFv */ - void J3DShape::initialize() { mMaterial = NULL; mIndex = -1; diff --git a/src/JSystem/JFramework/JFWSystem.cpp b/src/JSystem/JFramework/JFWSystem.cpp index de8ad8226..9cf43ccad 100644 --- a/src/JSystem/JFramework/JFWSystem.cpp +++ b/src/JSystem/JFramework/JFWSystem.cpp @@ -42,6 +42,7 @@ JUTConsoleManager* JFWSystem::systemConsoleManager = 0; JUTConsole* JFWSystem::systemConsole = 0; bool JFWSystem::sInitCalled = false; +/* 80254DD0-80254E54 .text firstInit__9JFWSystemFv */ void JFWSystem::firstInit() { JUT_ASSERT(80, rootHeap == 0); @@ -53,6 +54,7 @@ void JFWSystem::firstInit() { return; } +/* 80254E54-802551C0 .text init__9JFWSystemFv */ void JFWSystem::init() { /* Nonmatching - regalloc */ JUT_ASSERT(101, sInitCalled == false); diff --git a/src/SSystem/SComponent/c_bg_w.cpp b/src/SSystem/SComponent/c_bg_w.cpp index 2844d6b22..a46e48671 100644 --- a/src/SSystem/SComponent/c_bg_w.cpp +++ b/src/SSystem/SComponent/c_bg_w.cpp @@ -619,7 +619,6 @@ void cBgW::CopyOldMtx() { /* 802493B4-80249584 .text Move__4cBgWFv */ void cBgW::Move() { - /* Nonmatching */ if (!ChkLock() && ChkMoveBg()) { if (!ChkNoCalcVtx()) { if (mMoveCounter >= 0xFF || @@ -656,7 +655,6 @@ void cBgW::Move() { /* 80249584-80249698 .text RwgShdwDraw__4cBgWFiP13cBgS_ShdwDraw */ void cBgW::RwgShdwDraw(int index, cBgS_ShdwDraw* shdw) { - /* Nonmatching */ while (true) { cBgW_RwgElm* rwg = &pm_rwg[index]; if (!ChkShdwDrawThrough(index, shdw->GetPolyPassChk())) { diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp index adb462f73..70d307deb 100644 --- a/src/d/actor/d_a_agbsw0.cpp +++ b/src/d/actor/d_a_agbsw0.cpp @@ -57,6 +57,7 @@ static dCcD_SrcCyl l_cyl_src = { }, }; +/* 00004838-00004B2C .text draw__10daAgbsw0_cFv */ BOOL daAgbsw0_c::draw() { u8 toCheck = getSw0(); u8 behavior = getType(); @@ -150,6 +151,7 @@ BOOL daAgbsw0_c::draw() { return true; } +/* 00004F80-00005458 .text create__10daAgbsw0_cFv */ int daAgbsw0_c::create() { u8 behavior = current.angle.z & 0xFF; u8 condition = getSw0(); @@ -300,6 +302,7 @@ BOOL daAgbsw0_c::execute() { agb_mail_struct daAgbsw0_c::mMail; u32 daAgbsw0_c::mSE; +/* 00000078-00000344 .text ExeSubA__10daAgbsw0_cFv */ BOOL daAgbsw0_c::ExeSubA() { u32 sw = getSw0(); s16 condition = getParamNo(); @@ -384,6 +387,7 @@ BOOL daAgbsw0_c::ExeSubA() { return true; } +/* 00000344-0000066C .text ExeSubAT__10daAgbsw0_cFv */ BOOL daAgbsw0_c::ExeSubAT() { u32 flag = getSw0(); s16 condition = getParamNo(); @@ -473,6 +477,7 @@ BOOL daAgbsw0_c::ExeSubAT() { return true; } +/* 0000066C-00000940 .text ExeSubA2__10daAgbsw0_cFv */ BOOL daAgbsw0_c::ExeSubA2() { u32 sw = getSw0(); s16 condition = getParamNo(); @@ -553,6 +558,7 @@ BOOL daAgbsw0_c::ExeSubA2() { return true; } +/* 00000940-00000AB4 .text ExeSubF__10daAgbsw0_cFv */ BOOL daAgbsw0_c::ExeSubF() { u32 sw = getSw0(); s16 condition = getParamNo(); @@ -588,6 +594,7 @@ BOOL daAgbsw0_c::ExeSubF() { return true; } +/* 00000AB4-00000E48 .text ExeSubF2__10daAgbsw0_cFv */ BOOL daAgbsw0_c::ExeSubF2() { u32 sw = getSw0(); s16 condition = getParamNo(); @@ -680,6 +687,7 @@ BOOL daAgbsw0_c::ExeSubF2() { return true; } +/* 00000E48-00000FE4 .text ExeSubM__10daAgbsw0_cFv */ BOOL daAgbsw0_c::ExeSubM() { u32 sw = getSw0(); if(sw != 0xFF && !fopAcM_isSwitch(this, sw)) { @@ -714,6 +722,7 @@ BOOL daAgbsw0_c::ExeSubM() { } } +/* 00001198-00001368 .text ExeSubM3__10daAgbsw0_cFv */ BOOL daAgbsw0_c::ExeSubM2() { if(dComIfGs_isEventBit(0x2D01)) { if(field_0x298 == 1) { @@ -755,6 +764,7 @@ BOOL daAgbsw0_c::ExeSubM2() { } } +/* 00001198-00001368 .text ExeSubM3__10daAgbsw0_cFv */ BOOL daAgbsw0_c::ExeSubM3() { if(dComIfGs_getTriforceNum() == 8) { if(field_0x298 == 1) { @@ -804,6 +814,7 @@ BOOL daAgbsw0_c::ExeSubM3() { #if VERSION == VERSION_JPN u32 daAgbsw0_c::TriforceCheck() #else +/* 00001368-000017B0 .text TriforceCheck__10daAgbsw0_cFP7daAgb_c */ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb) #endif { @@ -1010,6 +1021,7 @@ u16 daAgbsw0_c::DisposedMsg[] = { 0x005C, }; +/* 000017B0-00001AD0 .text ExeSubMW__10daAgbsw0_cFv */ BOOL daAgbsw0_c::ExeSubMW() { u8 sw = getSw0(); @@ -1068,6 +1080,7 @@ BOOL daAgbsw0_c::ExeSubMW() { return true; } +/* 00000344-0000066C .text ExeSubAT__10daAgbsw0_cFv */ BOOL daAgbsw0_c::ExeSubT() { u8 sw = getSw0(); @@ -1114,6 +1127,7 @@ BOOL daAgbsw0_c::ExeSubT() { return true; } +/* 00001CC8-00001FAC .text ExeSubS__10daAgbsw0_cFv */ BOOL daAgbsw0_c::ExeSubS() { u8 sw = getSw0(); u8 sw1 = getSw1(); @@ -1181,6 +1195,7 @@ BOOL daAgbsw0_c::ExeSubS() { return true; } +/* 00001FAC-000021EC .text ExeSubR__10daAgbsw0_cFv */ BOOL daAgbsw0_c::ExeSubR() { u8 sw = getSw0(); daAgb_c* agb = dComIfGp_getAgb(); @@ -1224,6 +1239,7 @@ BOOL daAgbsw0_c::ExeSubR() { return TRUE; } +/* 000021EC-00002A28 .text ExeSubB__10daAgbsw0_cFv */ BOOL daAgbsw0_c::ExeSubB() { u8 sw = getSw0(); s16 restriction = getParamNo(); @@ -1401,6 +1417,7 @@ BOOL daAgbsw0_c::ExeSubB() { return true; } +/* 00002A28-00002D90 .text ExeSubD__10daAgbsw0_cFv */ BOOL daAgbsw0_c::ExeSubD() { u8 sw = getSw0(); daAgb_c* agb = dComIfGp_getAgb(); @@ -1486,6 +1503,7 @@ BOOL daAgbsw0_c::ExeSubD() { return true; } +/* 00002D90-000030DC .text ExeSubFA__10daAgbsw0_cFv */ BOOL daAgbsw0_c::ExeSubFA() { u8 sw = getSw0(); s16 condition = getParamNo(); @@ -1587,6 +1605,7 @@ BOOL daAgbsw0_c::ExeSubFA() { return true; } +/* 000030DC-0000320C .text HitCheck__10daAgbsw0_cFP10fopAc_ac_c */ BOOL daAgbsw0_c::HitCheck(fopAc_ac_c* param_1) { if(mNonCircular == false) { f32 y_diff = param_1->current.pos.y - current.pos.y; @@ -1611,6 +1630,7 @@ BOOL daAgbsw0_c::HitCheck(fopAc_ac_c* param_1) { return false; } +/* 0000320C-00003344 .text HitCheck__10daAgbsw0_cF4cXyzf */ BOOL daAgbsw0_c::HitCheck(cXyz param_1, f32 param_2) { if(mNonCircular == false) { f32 y_diff = param_1.y - current.pos.y; @@ -1635,6 +1655,7 @@ BOOL daAgbsw0_c::HitCheck(cXyz param_1, f32 param_2) { return false; } +/* 00003344-0000476C .text MoveCheck__10daAgbsw0_cFs */ BOOL daAgbsw0_c::MoveCheck(s16 param_1) { switch(param_1) { case 1: @@ -2441,6 +2462,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) { return 1; } +/* 0000477C-00004818 .text MailSend__10daAgbsw0_cFUsUcUcUcUc */ void daAgbsw0_c::MailSend(u16 msgID, u8 reactType, u8 toCheck, u8 toSet, u8 sfx) { mMail.msgID = msgID; mMail.swToSet = toSet; @@ -2453,18 +2475,22 @@ void daAgbsw0_c::MailSend(u16 msgID, u8 reactType, u8 toCheck, u8 toSet, u8 sfx) mDoGac_SendDataSet((u32*)&mMail, 8, 5, 0); } +/* 00004818-00004838 .text daAgbsw0_Draw__FP10daAgbsw0_c */ static BOOL daAgbsw0_Draw(daAgbsw0_c* i_this) { return i_this->draw(); } +/* 00004B2C-00004CF8 .text daAgbsw0_Execute__FP10daAgbsw0_c */ static void daAgbsw0_Execute(daAgbsw0_c* i_this) { i_this->execute(); } -static bool daAgbsw0_IsDelete(daAgbsw0_c*) { - return true; +/* 00004CF8-00004D00 .text daAgbsw0_IsDelete__FP10daAgbsw0_c */ +static BOOL daAgbsw0_IsDelete(daAgbsw0_c*) { + return TRUE; } +/* 00004D00-00004E98 .text daAgbsw0_Delete__FP10daAgbsw0_c */ static BOOL daAgbsw0_Delete(daAgbsw0_c* i_this) { daAgb_c* agb = dComIfGp_getAgb(); u32 id = i_this->current.angle.z & 0xFF; @@ -2513,6 +2539,7 @@ static BOOL daAgbsw0_Delete(daAgbsw0_c* i_this) { return true; } +/* 00004E98-00004F80 .text daAgbsw0_Create__FP10fopAc_ac_c */ static int daAgbsw0_Create(fopAc_ac_c* i_this) { fopAcM_SetupActor(i_this, daAgbsw0_c); diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index 24f0fed77..70571d794 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_am.cpp -// +/** + * d_a_am.cpp + * Enemy - Armos Knight + */ #include "d/actor/d_a_am.h" #include "f_op/f_op_actor_mng.h" @@ -764,7 +764,6 @@ static void action_modoru_move(am_class* i_this) { /* 000028C4-00002A6C .text action_handou_move__FP8am_class */ static void action_handou_move(am_class* i_this) { - /* Nonmatching */ daPy_py_c* player = daPy_getPlayerActorClass(); switch (i_this->mState) { case 0x1E: diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index e6831e8c7..0ad39b67a 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_am2.cpp -// +/** + * d_a_am2.cpp + * Enemy - Armos + */ #include "d/actor/d_a_am2.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_andsw0.cpp b/src/d/actor/d_a_andsw0.cpp index cc7df24a3..044132450 100644 --- a/src/d/actor/d_a_andsw0.cpp +++ b/src/d/actor/d_a_andsw0.cpp @@ -19,10 +19,12 @@ enum { ACT_TIMER_SET = 30, }; +/* 00000078-00000080 .text daAndsw0_Draw__FP12andsw0_class */ static s32 daAndsw0_Draw(andsw0_class*) { return 1; } +/* 00000080-000003C4 .text daAndsw0_check__FP12andsw0_class */ static void daAndsw0_check(andsw0_class* i_this) { s32 numToCheck = i_this->mNumSwitchesToCheck; u32 switchToCheck; @@ -138,6 +140,7 @@ static void daAndsw0_check(andsw0_class* i_this) { static void* ac[7]; static s32 check_count; +/* 000003C4-0000044C .text bk_s_sub1__FPvPv */ static void* bk_s_sub1(void* i_this, void*) { if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_BK && (fopAcM_GetParam(i_this) & 0xF) == 7) { s32 count = check_count; //regswaps without this @@ -152,6 +155,7 @@ static void* bk_s_sub1(void* i_this, void*) { return 0; } +/* 0000044C-000004D4 .text bk_s_sub2__FPvPv */ static void* bk_s_sub2(void* i_this, void*) { if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_BK && (fopAcM_GetParam(i_this) & 0xF) == 4) { s32 count = check_count; //regswaps without this @@ -166,6 +170,7 @@ static void* bk_s_sub2(void* i_this, void*) { return 0; } +/* 000004D4-0000055C .text bk_s_sub3__FPvPv */ static void* bk_s_sub3(void* i_this, void*) { if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_BK && (fopAcM_GetParam(i_this) & 0xF) == 5) { s32 count = check_count; //regswaps without this @@ -180,6 +185,7 @@ static void* bk_s_sub3(void* i_this, void*) { return 0; } +/* 0000055C-000005D4 .text bb_s_sub__FPvPv */ static void* bb_s_sub(void* i_this, void*) { if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_BB) { s32 count = check_count; //regswaps without this @@ -194,6 +200,7 @@ static void* bb_s_sub(void* i_this, void*) { return 0; } +/* 000005D4-000006AC .text hajimari_actor_entry__FP12andsw0_class */ static s32 hajimari_actor_entry(andsw0_class* i_this) { for(int i = 0; i < 7; i++) { ac[i] = 0; @@ -215,6 +222,7 @@ static s32 hajimari_actor_entry(andsw0_class* i_this) { return 1; } +/* 000006AC-0000081C .text hajimarinomori_check__FP12andsw0_class */ static void hajimarinomori_check(andsw0_class* i_this) { fopAc_ac_c* actor = i_this; if (i_this->mBehaviorType == 0) { @@ -260,6 +268,7 @@ static void hajimarinomori_check(andsw0_class* i_this) { } } +/* 0000081C-00000914 .text event_start_check__FP12andsw0_class */ static void event_start_check(andsw0_class* i_this) { fopAc_ac_c* actor = i_this; switch (i_this->mEventState) { @@ -284,6 +293,7 @@ static void event_start_check(andsw0_class* i_this) { } } +/* 00000914-00000964 .text daAndsw0_Execute__FP12andsw0_class */ static s32 daAndsw0_Execute(andsw0_class* i_this) { event_start_check(i_this); if (i_this->mNumSwitchesToCheck == 0xFF) @@ -293,14 +303,17 @@ static s32 daAndsw0_Execute(andsw0_class* i_this) { return 1; } +/* 00000964-0000096C .text daAndsw0_IsDelete__FP12andsw0_class */ static s32 daAndsw0_IsDelete(andsw0_class*) { return 1; } +/* 0000096C-00000974 .text daAndsw0_Delete__FP12andsw0_class */ static s32 daAndsw0_Delete(andsw0_class*) { return 1; } +/* 00000974-00000A64 .text daAndsw0_Create__FP10fopAc_ac_c */ static s32 daAndsw0_Create(fopAc_ac_c* ac) { fopAcM_SetupActor(ac, andsw0_class); diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index 68ffbf878..79d435a53 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_bk.cpp -// +/** + * d_a_bk.cpp + * Enemy - Bokoblin / ボコちゃん (Boko-chan) + */ #include "d/actor/d_a_bk.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_bomb.cpp b/src/d/actor/d_a_bomb.cpp index 2a08ea90c..c86fc9096 100644 --- a/src/d/actor/d_a_bomb.cpp +++ b/src/d/actor/d_a_bomb.cpp @@ -1,6 +1,6 @@ -// -// Generated by dtk -// Translation Unit: d_a_bomb.cpp -// +/** + * d_a_bomb.cpp + * Bomb + */ #include "d/actor/d_a_bomb3.inc" diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index ee335ef68..96509e212 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_bomb2.cpp -// +/** + * d_a_bomb.cpp + * Bomb Flower Bomb + */ #include "d/actor/d_a_bomb2.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index c4f99ac54..d02429667 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -111,6 +111,7 @@ void daBomb_fuseSmokeEcallBack::executeAfter(JPABaseEmitter* emitter) { field_0x04 = temp2; } +/* 800D977C-800D97C4 .text execute__26daBomb_fuseSparksEcallBackFP14JPABaseEmitter */ void daBomb_fuseSparksEcallBack::execute(JPABaseEmitter* emitter) { f32 x = mpPos->x; f32 y = mpPos->y; @@ -128,6 +129,7 @@ void daBomb_fuseSparksEcallBack::execute(JPABaseEmitter* emitter) { } } +/* 800D97C4-800D9950 .text draw_norm__8daBomb_cFv */ void daBomb_c::draw_norm() { J3DAnmTevRegKey* bombBrk = daPy_getPlayerLinkActorClass()->getBombBrk(); s16 end = bombBrk->getFrameMax(); @@ -171,6 +173,7 @@ void daBomb_c::draw_nut() { dComIfGd_setList(); } +/* 800D9A48-800D9BC0 .text draw__8daBomb_cFv */ BOOL daBomb_c::draw() { if(chk_attrState(this, ATTR_STATE_20)) { return true; @@ -206,10 +209,12 @@ BOOL daBomb_c::draw() { return true; } +/* 800D9BC0-800D9BE0 .text daBomb_Draw__FP8daBomb_c */ static BOOL daBomb_Draw(daBomb_c* i_this) { return i_this->draw(); } +/* 800D9BE0-800D9C8C .text checkExplodeCc_norm__8daBomb_cFv */ bool daBomb_c::checkExplodeCc_norm() { bool explode = false; @@ -237,6 +242,7 @@ bool daBomb_c::checkExplodeCc_norm() { return explode; } +/* 800D9C8C-800D9DBC .text checkExplodeCc_nut__8daBomb_cFv */ bool daBomb_c::checkExplodeCc_nut() { bool explode = false; bool hit = false; @@ -280,6 +286,7 @@ bool daBomb_c::checkExplodeCc_nut() { return ret; } +/* 800D9DBC-800D9E80 .text checkExplodeCc_cannon__8daBomb_cFv */ bool daBomb_c::checkExplodeCc_cannon() { bool explode = false; @@ -309,6 +316,7 @@ bool daBomb_c::checkExplodeCc_cannon() { return explode; } +/* 800D9E80-800D9F30 .text checkExplodeCc__8daBomb_cFv */ bool daBomb_c::checkExplodeCc() { if(0 < mRestTime) { typedef bool(daBomb_c::*checkFunc)(); @@ -324,6 +332,7 @@ bool daBomb_c::checkExplodeCc() { return false; } +/* 800D9F30-800D9FAC .text checkExplodeTimer__8daBomb_cFv */ bool daBomb_c::checkExplodeTimer() { bool explode = false; if(!chk_attrState(this, ATTR_STATE_200)) { @@ -337,10 +346,12 @@ bool daBomb_c::checkExplodeTimer() { return explode; } +/* 800D9FAC-800DA004 .text checkExplode__8daBomb_cFv */ bool daBomb_c::checkExplode() { return checkExplodeCc() || checkExplodeTimer(); } +/* 800DA004-800DA098 .text checkExplodeBg_norm__8daBomb_cFv */ bool daBomb_c::checkExplodeBg_norm() { bool sink = chk_water_sink(); bool land = chk_water_land(); @@ -483,6 +494,7 @@ void daBomb_c::posMoveF() { } } +/* 800DA520-800DA574 .text bgCrrPos__8daBomb_cFv */ void daBomb_c::bgCrrPos() { mAcch.CrrPos(*dComIfG_Bgsp()); bgCrrPos_lava(); @@ -490,6 +502,7 @@ void daBomb_c::bgCrrPos() { setRoomInfo(); } +/* 800DA574-800DA5E0 .text bgCrrPos_lava__8daBomb_cFv */ void daBomb_c::bgCrrPos_lava() { cXyz temp(current.pos.x, old.pos.y + 1.0f, current.pos.z); mGndChk.SetPos(&temp); @@ -529,20 +542,24 @@ void daBomb_c::bgCrrPos_water() { mbWaterIn = r5; } +/* 800DA700-800DA708 .text chk_water_land__8daBomb_cFv */ bool daBomb_c::chk_water_land() { return field_0x560; } +/* 800DA708-800DA710 .text chk_water_in__8daBomb_cFv */ bool daBomb_c::chk_water_in() { return mbWaterIn; } +/* 800DA710-800DA768 .text chk_water_sink__8daBomb_cFv */ bool daBomb_c::chk_water_sink() { bool water = chk_water_in(); return water && field_0x554.y - current.pos.y > 30.0f; } +/* 800DA768-800DA794 .text chk_lava_hit__8daBomb_cFv */ bool daBomb_c::chk_lava_hit() { if(field_0x554.x == -1.0e9f) { return false; @@ -551,6 +568,7 @@ bool daBomb_c::chk_lava_hit() { return current.pos.y < field_0x554.x; } +/* 800DA794-800DA7CC .text chk_dead_zone__8daBomb_cFv */ bool daBomb_c::chk_dead_zone() { return mAcch.GetGroundH() == -1.0e9f && field_0x554.y == -1.0e9f && field_0x554.x == -1.0e9f; } @@ -610,6 +628,7 @@ void daBomb_c::set_real_shadow_flag() { model = r30 ? mpModel : NULL; } +/* 800DA9DC-800DAA60 .text setRoomInfo__8daBomb_cFv */ void daBomb_c::setRoomInfo() { s32 roomNo; if(mAcch.GetGroundH() != -1.0e9f) { @@ -625,6 +644,7 @@ void daBomb_c::setRoomInfo() { current.roomNo = roomNo; } +/* 800DAA60-800DAB28 .text makeFireEffect__8daBomb_cFR4cXyzR5csXyz */ void daBomb_c::makeFireEffect(cXyz& pos, csXyz& rotation) { camera_class* cam = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); @@ -642,6 +662,7 @@ void daBomb_c::makeFireEffect(cXyz& pos, csXyz& rotation) { dComIfGp_getVibration().StartShock(7, -0x21, cXyz(0.0f, 1.0f, 0.0f)); } +/* 800DAB28-800DAC40 .text makeWaterEffect__8daBomb_cFv */ void daBomb_c::makeWaterEffect() { if(field_0x77D == 0) { fopAcM_seStart(this, JA_SE_OBJ_BOMB_WATER, 0); @@ -664,6 +685,7 @@ void daBomb_c::makeWaterEffect() { } } +/* 800DAC40-800DAD6C .text setFuseEffect__8daBomb_cFv */ void daBomb_c::setFuseEffect() { if(field_0x77E == 0) { field_0x77E = 1; @@ -681,6 +703,7 @@ void daBomb_c::setFuseEffect() { } } +/* 800DAD6C-800DAE54 .text eff_explode_normal__8daBomb_cFPC5csXyz */ void daBomb_c::eff_explode_normal(const csXyz* rotation) { dComIfGp_particle_setP1(dPa_name::ID_COMMON_LIGHT_FLASH, ¤t.pos, rotation, &mScale); dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CLOUD, ¤t.pos, NULL, &mScale); @@ -688,6 +711,7 @@ void daBomb_c::eff_explode_normal(const csXyz* rotation) { dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_SMOKE_DEBRIS, ¤t.pos, NULL, &mScale); } +/* 800DAE54-800DAF94 .text eff_explode_cheap__8daBomb_cFPC5csXyz */ void daBomb_c::eff_explode_cheap(const csXyz* rotation) { JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_LIGHT_FLASH, ¤t.pos, rotation, &mScale); if(emitter) { @@ -710,6 +734,7 @@ void daBomb_c::eff_explode_cheap(const csXyz* rotation) { } } +/* 800DAF94-800DB024 .text eff_explode__8daBomb_cFv */ void daBomb_c::eff_explode() { camera_class* cam = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); csXyz rot; @@ -725,6 +750,7 @@ void daBomb_c::eff_explode() { } } +/* 800DB024-800DB630 .text procExplode_init__8daBomb_cFv */ int daBomb_c::procExplode_init() { camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.ForceLockOff(fopAcM_GetID(this)); @@ -891,6 +917,7 @@ bool daBomb_c::procExplode() { return true; } +/* 800DB880-800DB92C .text procCarry_init__8daBomb_cFv */ bool daBomb_c::procCarry_init() { if(chk_attrState(this, ATTR_STATE_100)) { setFuseEffect(); @@ -906,6 +933,7 @@ bool daBomb_c::procCarry_init() { return true; } +/* 800DB92C-800DB9DC .text procCarry__8daBomb_cFv */ bool daBomb_c::procCarry() { if(!fopAcM_checkCarryNow(this)) { if(speedF > 0.0f) { @@ -929,6 +957,7 @@ bool daBomb_c::procCarry() { } } +/* 800DB9DC-800DBA50 .text procWait_init__8daBomb_cFv */ bool daBomb_c::procWait_init() { mFunc = &daBomb_c::procWait; if(chk_attrState(this, ATTR_STATE_80)) { @@ -939,6 +968,7 @@ bool daBomb_c::procWait_init() { return true; } +/* 800DBA50-800DBBA0 .text procWait__8daBomb_cFv */ bool daBomb_c::procWait() { if(checkExplode()) { return true; @@ -983,12 +1013,14 @@ bool daBomb_c::procWait() { } } +/* 800DBBA0-800DBBC4 .text waitState_cannon__8daBomb_cFv */ bool daBomb_c::waitState_cannon() { se_cannon_fly_set(); return false; } +/* 800DBBC4-800DBC4C .text waitState_bomtyu__8daBomb_cFv */ void daBomb_c::waitState_bomtyu() { cLib_chaseF(&mScale.x, 1.0f, 0.05f); cLib_chaseF(&mScale.y, 1.0f, 0.05f); @@ -1001,6 +1033,7 @@ void daBomb_c::waitState_bomtyu() { } } +/* 800DBC4C-800DBC5C .text procSink__8daBomb_cFv */ bool daBomb_c::procSink() { field_0x781 = 1; @@ -1069,6 +1102,7 @@ BOOL daBomb_c::execute() { return true; } +/* 800DBF24-800DBF44 .text daBomb_Execute__FP8daBomb_c */ static BOOL daBomb_Execute(daBomb_c* i_this) { return i_this->execute(); } @@ -1135,6 +1169,7 @@ void daBomb_c::anm_play_nut() { } } +/* 800DC2D0-800DC384 .text set_mtx__8daBomb_cFv */ void daBomb_c::set_mtx() { mpModel->setBaseScale(mScale); mDoMtx_stack_c::transS(current.pos); @@ -1148,15 +1183,18 @@ void daBomb_c::set_mtx() { mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } +/* 800DC384-800DC3A4 .text init_mtx__8daBomb_cFv */ void daBomb_c::init_mtx() { set_mtx(); } +/* 800DC3A4-800DC400 .text se_cannon_fly_set__8daBomb_cFv */ void daBomb_c::se_cannon_fly_set() { mDoAud_seStart(JA_SE_LK_SHIP_CANNON_FLY, ¤t.pos); field_0x77F = 1; } +/* 800DC400-800DC44C .text se_cannon_fly_stop__8daBomb_cFv */ void daBomb_c::se_cannon_fly_stop() { if(field_0x77F) { mDoAud_seStopActor(¤t.pos, -1); @@ -1164,6 +1202,7 @@ void daBomb_c::se_cannon_fly_stop() { } } +/* 800DC44C-800DC568 .text eff_water_splash__8daBomb_cFv */ void daBomb_c::eff_water_splash() { cXyz pos(current.pos.x, field_0x554.y, current.pos.z); fopKyM_createWpillar(&pos, 0.5f, 0.75f, 0); @@ -1187,10 +1226,12 @@ void daBomb_c::eff_water_splash() { fopAcM_seStart(this, JA_SE_OBJ_FALL_WATER_S, mtrlSndId); } -static bool daBomb_IsDelete(daBomb_c*) { - return true; +/* 800DC568-800DC570 .text daBomb_IsDelete__FP8daBomb_c */ +static BOOL daBomb_IsDelete(daBomb_c*) { + return TRUE; } +/* 800DC570-800DC67C .text bombDelete__8daBomb_cFv */ bool daBomb_c::bombDelete() { if(mSmoke.mpEmitter) { mSmoke.mpEmitter->mpEmitterCallBack = 0; @@ -1220,11 +1261,13 @@ bool daBomb_c::bombDelete() { return true; } +/* 800DC67C-800DC6A0 .text daBomb_Delete__FP8daBomb_c */ static BOOL daBomb_Delete(daBomb_c* i_this) { i_this->bombDelete(); return true; } +/* 800DC6A0-800DCADC .text createHeap__8daBomb_cFv */ BOOL daBomb_c::createHeap() { BOOL ret; if(mType == 1) { @@ -1267,10 +1310,12 @@ BOOL daBomb_c::createHeap() { } } +/* 800DCADC-800DCAFC .text daBomb_createHeap__FP10fopAc_ac_c */ static BOOL daBomb_createHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); } +/* 800DCAFC-800DCC0C .text create__8daBomb_cFv */ int daBomb_c::create() { int state = prm_get_state(); if(state == 5 || state == 6) { @@ -1305,9 +1350,7 @@ int daBomb_c::create() { return status; } -/* 800DCC0C-800DCEBC .text __ct__8daBomb_cFv */ -daBomb_c::daBomb_c() {} - +/* 800DCEF8-800DCF18 .text daBomb_Create__FP10fopAc_ac_c */ static int daBomb_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } @@ -1344,6 +1387,7 @@ static dCcD_SrcSph l_sph_src = { }, }; +/* 800DCF18-800DD1A4 .text create_init__8daBomb_cFv */ void daBomb_c::create_init() { mCir.SetWall(30.0f, 30.0f); mAcch.Set(¤t.pos, &old.pos, this, 1, &mCir, &speed, ¤t.angle, &shape_angle); diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index e5baaf999..a877aa755 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_demo_item.cpp -// +/** + * d_a_demo_item.cpp + * Item - Cutscene Item + */ #include "d/actor/d_a_demo_item.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_dr.cpp b/src/d/actor/d_a_dr.cpp index c79690f30..fad4afeed 100644 --- a/src/d/actor/d_a_dr.cpp +++ b/src/d/actor/d_a_dr.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_dr.cpp -// +/** + * d_a_dr.cpp + * Valoo / ドラゴン (Dragon) + */ #include "d/actor/d_a_dr.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp index 9378a900c..ddf1137db 100644 --- a/src/d/actor/d_a_hookshot.cpp +++ b/src/d/actor/d_a_hookshot.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_hookshot.cpp -// +/** + * d_a_hookshot.cpp + * Hookshot + */ #include "d/actor/d_a_hookshot.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp index 5cbbbcb65..c3704efbb 100644 --- a/src/d/actor/d_a_item.cpp +++ b/src/d/actor/d_a_item.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_item.cpp -// +/** + * d_a_item.cpp + * Item - Field Item + */ #include "d/d_item.h" #include "d/d_item_data.h" diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp index c6e785022..5263084e1 100644 --- a/src/d/actor/d_a_itembase.cpp +++ b/src/d/actor/d_a_itembase.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_itembase.cpp -// +/** + * d_a_itembase.cpp + * Item - Base Item Class + */ #include "d/actor/d_a_itembase.h" #include "d/d_item.h" diff --git a/src/d/actor/d_a_ki.cpp b/src/d/actor/d_a_ki.cpp index ab6a0e86d..66704888c 100644 --- a/src/d/actor/d_a_ki.cpp +++ b/src/d/actor/d_a_ki.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_ki.cpp -// +/** + * d_a_ki.cpp + * Enemy - Keese / キース (Kiisu) + */ #include "d/actor/d_a_ki.h" #include "m_Do/m_Do_ext.h" diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index 501c342a8..5cb876ecf 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/src/d/actor/d_a_kytag04.cpp @@ -1,5 +1,6 @@ /** * d_a_kytag04.cpp + * Tag - Weather Tag 4 */ #include "d/actor/d_a_kytag04.h" @@ -8,6 +9,7 @@ #include "d/d_procname.h" #include "dolphin/types.h" +/* 00000078-00000080 .text daKytag04_Draw__FP13kytag04_class */ static BOOL daKytag04_Draw(kytag04_class*) { return TRUE; } diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index d9da620a9..10ebf493f 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_kytag05.cpp -// +/** + * d_a_kytag05.cpp + * Tag - Weather Tag 5 + */ #include "d/actor/d_a_kytag05.h" #include "JAZelAudio/JAIZelBasic.h" @@ -15,6 +15,7 @@ #include "m_Do/m_Do_audio.h" #include "d/d_procname.h" +/* 00000078-00000080 .text daKytag05_Draw__FP13kytag05_class */ static BOOL daKytag05_Draw(kytag05_class*) { return TRUE; } @@ -109,14 +110,17 @@ static BOOL daKytag05_Execute(kytag05_class* a_this) { return TRUE; } +/* 000003F4-000003FC .text daKytag05_IsDelete__FP13kytag05_class */ static BOOL daKytag05_IsDelete(kytag05_class*) { return TRUE; } +/* 000003FC-00000404 .text daKytag05_Delete__FP13kytag05_class */ static BOOL daKytag05_Delete(kytag05_class*) { return TRUE; } +/* 00000404-000004C0 .text daKytag05_Create__FP10fopAc_ac_c */ static int daKytag05_Create(fopAc_ac_c* i_this) { fopAcM_SetupActor(i_this, kytag05_class); kytag05_class *a_this = (kytag05_class*)i_this; diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index ede6b155d..e043363a5 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -1,5 +1,6 @@ /** * d_a_kytag06.cpp + * Tag - Weather Tag 6 */ #include "d/actor/d_a_kytag06.h" @@ -11,10 +12,12 @@ #include "d/d_procname.h" #include "dolphin/types.h" -static bool daKytag06_Draw(kytag06_class*) { - return true; +/* 00000078-00000080 .text daKytag06_Draw__FP13kytag06_class */ +static BOOL daKytag06_Draw(kytag06_class*) { + return TRUE; } +/* 00000080-00000194 .text daKytag06_Execute__FP13kytag06_class */ static BOOL daKytag06_Execute(kytag06_class* i_this) { f32 time; int date; @@ -44,14 +47,17 @@ static BOOL daKytag06_Execute(kytag06_class* i_this) { return TRUE; } +/* 00000194-0000019C .text daKytag06_IsDelete__FP13kytag06_class */ static BOOL daKytag06_IsDelete(kytag06_class*) { return true; } +/* 0000019C-000001A4 .text daKytag06_Delete__FP13kytag06_class */ static BOOL daKytag06_Delete(kytag06_class*) { return true; } +/* 000001A4-00000224 .text daKytag06_Create__FP10fopAc_ac_c */ static int daKytag06_Create(fopAc_ac_c* i_this) { kytag06_class* tag = (kytag06_class*)i_this; int var; diff --git a/src/d/actor/d_a_magma.cpp b/src/d/actor/d_a_magma.cpp index 036a0e833..af271d56f 100644 --- a/src/d/actor/d_a_magma.cpp +++ b/src/d/actor/d_a_magma.cpp @@ -14,10 +14,6 @@ daMagma_c::~daMagma_c() { dComIfG_resDelete(&mPhs, "Magma"); } -s32 daMagma_c::getPathNo() { - return fopAcM_GetParam(this); -} - s32 daMagma_c::create() { fopAcM_SetupActor(this, daMagma_c); diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp index 0e014b937..e3d755379 100644 --- a/src/d/actor/d_a_nh.cpp +++ b/src/d/actor/d_a_nh.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_nh.cpp -// +/** + * d_a_nh.cpp + * Forest Firely / 森のほたる (Mori no Hotaru) + */ #include "d/actor/d_a_nh.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_npc_cb1.cpp b/src/d/actor/d_a_npc_cb1.cpp index 3fd6f7047..862ad9ceb 100644 --- a/src/d/actor/d_a_npc_cb1.cpp +++ b/src/d/actor/d_a_npc_cb1.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_npc_cb1.cpp -// +/** + * d_a_npc_cb1.cpp + * Player - Makar + */ #include "d/actor/d_a_npc_cb1.h" #include "dolphin/types.h" diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index 31e253a17..316309657 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_npc_kamome.cpp -// +/** + * d_a_npc_kamome.cpp + * Player - Hyoi Seagull / かもめ (Kamome) + */ #include "d/actor/d_a_npc_kamome.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index b8cb56f72..2c3521525 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_npc_md.cpp -// +/** + * d_a_npc_md.cpp + * Player - Medli / リト族（メドリ） (Ritozoku (Medli)) + */ #include "d/actor/d_a_npc_md.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_doguu_demo.cpp b/src/d/actor/d_a_obj_doguu_demo.cpp index 26117f293..0f22e6c19 100644 --- a/src/d/actor/d_a_obj_doguu_demo.cpp +++ b/src/d/actor/d_a_obj_doguu_demo.cpp @@ -13,10 +13,12 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_mtx.h" +/* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { return ((daObjDoguuD_c*)i_this)->CreateHeap(); } +/* 00000098-00000214 .text CreateHeap__13daObjDoguuD_cFv */ BOOL daObjDoguuD_c::CreateHeap() { mUnusedParam = fopAcM_GetParam(this) & 0xFF; // Im not sure why this is here, none of the other // classes I looked at did this @@ -44,6 +46,7 @@ BOOL daObjDoguuD_c::CreateHeap() { return TRUE; } +/* 00000214-00000294 .text CreateInit__13daObjDoguuD_cFv */ void daObjDoguuD_c::CreateInit() { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -30000.0f, -5000.0f, -30000.0f, 30000.0f, 40000.0f, 30000.0f); @@ -52,6 +55,7 @@ void daObjDoguuD_c::CreateInit() { set_mtx(); } +/* 00000294-00000314 .text set_mtx__13daObjDoguuD_cFv */ void daObjDoguuD_c::set_mtx() { mpModel->setBaseScale(mScale); mDoMtx_stack_c::transS(current.pos); @@ -76,6 +80,7 @@ s32 daObjDoguuD_c::_create() { return ret; } +/* 00000314-000003BC .text daObjDoguuD_create__FPv */ static s32 daObjDoguuD_create(void* i_this) { return ((daObjDoguuD_c*)i_this)->_create(); } @@ -88,6 +93,7 @@ BOOL daObjDoguuD_c::_delete() { return TRUE; } +/* 000003BC-00000424 .text daObjDoguuD_Delete__FPv */ static BOOL daObjDoguuD_Delete(void* i_this) { return ((daObjDoguuD_c*)i_this)->_delete(); } @@ -101,6 +107,7 @@ BOOL daObjDoguuD_c::_draw() { return TRUE; } +/* 00000424-000004C8 .text daObjDoguuD_Draw__FPv */ static BOOL daObjDoguuD_Draw(void* i_this) { return ((daObjDoguuD_c*)i_this)->_draw(); } @@ -116,10 +123,12 @@ BOOL daObjDoguuD_c::_execute() { return TRUE; } +/* 000004C8-00000538 .text daObjDoguuD_Execute__FPv */ static BOOL daObjDoguuD_Execute(void* i_this) { return ((daObjDoguuD_c*)i_this)->_execute(); } +/* 00000538-00000540 .text daObjDoguuD_IsDelete__FPv */ static BOOL daObjDoguuD_IsDelete(void*) { return TRUE; } @@ -145,4 +154,4 @@ actor_process_profile_definition g_profile_Obj_DoguuD = { /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, /* CullType */ fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_pbka.cpp b/src/d/actor/d_a_obj_pbka.cpp index 806518847..012b88611 100644 --- a/src/d/actor/d_a_obj_pbka.cpp +++ b/src/d/actor/d_a_obj_pbka.cpp @@ -8,6 +8,7 @@ #include "m_Do/m_Do_mtx.h" #include "d/d_procname.h" +/* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static int CheckCreateHeap(fopAc_ac_c* i_this) { daObjPbka_c* a_this = (daObjPbka_c*)i_this; return a_this->CreateHeap(); @@ -24,6 +25,7 @@ BOOL daObjPbka_c::CreateHeap() { return TRUE; } +/* 0000015C-000001CC .text CreateInit__11daObjPbka_cFv */ void daObjPbka_c::CreateInit() { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f); @@ -31,6 +33,7 @@ void daObjPbka_c::CreateInit() { set_mtx(); } +/* 000001CC-0000024C .text set_mtx__11daObjPbka_cFv */ void daObjPbka_c::set_mtx() { J3DModel* model; model = mpModel; @@ -56,6 +59,7 @@ s32 daObjPbka_c::_create() { return phase_state; } +/* 0000024C-000002EC .text daObjPbka_Create__FPv */ static int daObjPbka_Create(void* i_this) { return static_cast(i_this)->_create(); } @@ -65,6 +69,7 @@ BOOL daObjPbka_c::_delete() { return TRUE; } +/* 000002EC-0000031C .text daObjPbka_Delete__FPv */ static BOOL daObjPbka_Delete(void* i_this) { static_cast(i_this)->_delete(); return TRUE; @@ -80,6 +85,7 @@ BOOL daObjPbka_c::_draw() { return TRUE; } +/* 0000031C-000003C0 .text daObjPbka_Draw__FPv */ static BOOL daObjPbka_Draw(void* i_this) { daObjPbka_c* a_this = (daObjPbka_c*)i_this; return a_this->_draw(); @@ -93,10 +99,12 @@ BOOL daObjPbka_c::_execute() { return TRUE; } +/* 000003C0-00000450 .text daObjPbka_Execute__FPv */ static BOOL daObjPbka_Execute(void* i_this) { return static_cast(i_this)->_execute(); } +/* 00000450-00000458 .text daObjPbka_IsDelete__FPv */ static BOOL daObjPbka_IsDelete(void*) { return TRUE; } diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index ffc409c9d..e2122800a 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_obj_toripost.cpp -// +/** + * d_a_obj_toripost.cpp + * Object - Rito Postbox + */ #include "d/actor/d_a_obj_toripost.h" #include "JSystem/JUtility/JUTAssert.h" @@ -77,36 +77,15 @@ static daObjTpost_HIO_c l_HIO; // need to figure out what's putting this data in front of a bunch of rels with the compiler-generated symbol names static Vec dummy = {1.0f, 1.0f, 1.0f}; static Vec dummy2 = {1.0f, 1.0f, 1.0f}; -static u8 dummy3[] = { - 2, - 0, - 2, - 1, - 0, - 0, - 0, - 0, - 0x40, - 8, - 0, - 0, - 0, - 0, - 0, - 0, - 0x3F, - 0xE0, - 0, - 0, - 0, - 0, - 0 -}; +static u8 dummy3[4] = {0x02, 0x00, 0x02, 0x01}; +static f64 dummy4[2] = {3.0, 0.5}; +/* 000000EC-0000010C .text createHeap_CB__FP10fopAc_ac_c */ static BOOL createHeap_CB(fopAc_ac_c* i_this) { return static_cast(i_this)->_createHeap(); } +/* 0000010C-0000022C .text _createHeap__12daObjTpost_cFv */ BOOL daObjTpost_c::_createHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, 9); JUT_ASSERT(132, modelData != 0); @@ -123,6 +102,7 @@ BOOL daObjTpost_c::_createHeap() { } } +/* 0000022C-00000280 .text __ct__16daObjTpost_HIO_cFv */ daObjTpost_HIO_c::daObjTpost_HIO_c() { field_0x04 = -1; debug_draw = false; @@ -135,6 +115,7 @@ daObjTpost_HIO_c::daObjTpost_HIO_c() { field_0x16 = 30; } +/* 00000280-000003D4 .text cutProc__12daObjTpost_cFv */ void daObjTpost_c::cutProc() { static char* action_table[3] = { "PRESENT", @@ -178,10 +159,12 @@ void daObjTpost_c::cutProc() { } } +/* 000003D4-000003D8 .text cutPresentStart__12daObjTpost_cFi */ void daObjTpost_c::cutPresentStart(int staffIdx) { return; } +/* 000003D8-00000474 .text cutPresentProc__12daObjTpost_cFi */ void daObjTpost_c::cutPresentProc(int staffIdx) { u32 itemPID = fopAcM_createItemForPresentDemo(¤t.pos, m_letter[mNumReadable].mItemNo); if(itemPID != fpcM_ERROR_PROCESS_ID_e) { @@ -193,6 +176,7 @@ void daObjTpost_c::cutPresentProc(int staffIdx) { } } +/* 00000474-00000500 .text cutSetAnmStart__12daObjTpost_cFi */ void daObjTpost_c::cutSetAnmStart(int staffIdx) { const char* name = dComIfGp_evmng_getMyStringP(staffIdx, "Name"); if(name != 0 && strcmp(name, "HAKIDASU") == 0) { @@ -203,6 +187,7 @@ void daObjTpost_c::cutSetAnmStart(int staffIdx) { } } +/* 00000500-00000560 .text cutSetAnmProc__12daObjTpost_cFi */ void daObjTpost_c::cutSetAnmProc(int staffIdx) { // Using the mDoExt_McaMorf::isStop inline causes regswap. // if(mMorf->isStop()) { @@ -214,10 +199,12 @@ void daObjTpost_c::cutSetAnmProc(int staffIdx) { } } +/* 00000560-00000580 .text cutDispLetterStart__12daObjTpost_cFi */ void daObjTpost_c::cutDispLetterStart(int staffIdx) { mCurrMsgNo = m_letter[mNumReadable].mMsgNo; } +/* 00000580-000005F4 .text cutDispLetterProc__12daObjTpost_cFi */ void daObjTpost_c::cutDispLetterProc(int staffIdx) { u16 mode = talk(0); if(mode == 5) { @@ -228,6 +215,7 @@ void daObjTpost_c::cutDispLetterProc(int staffIdx) { } } +/* 000005F4-00000650 .text deliverLetter__12daObjTpost_cFv */ void daObjTpost_c::deliverLetter() { switch(mPreItemNo) { case MAGYS_LETTER: @@ -239,6 +227,7 @@ void daObjTpost_c::deliverLetter() { } } +/* 00000650-000006C0 .text getReceiveLetterNum__12daObjTpost_cFv */ s16 daObjTpost_c::getReceiveLetterNum() { s16 num = 0; for(int i = 1; i < 0xD; i++) { @@ -250,6 +239,7 @@ s16 daObjTpost_c::getReceiveLetterNum() { return num; } +/* 000006C0-00000750 .text getReadableLetterNum__12daObjTpost_cFv */ s32 daObjTpost_c::getReadableLetterNum() { s32 num = 0; s32 startIdx = mNumReadable ? mNumReadable : 1; @@ -269,6 +259,7 @@ s32 daObjTpost_c::getReadableLetterNum() { return num; } +/* 00000750-000007B8 .text checkSendPrice__12daObjTpost_cFv */ u8 daObjTpost_c::checkSendPrice() { static const u8 pay_type[49] = { 02, @@ -330,6 +321,7 @@ u8 daObjTpost_c::checkSendPrice() { } } +/* 000007B8-0000092C .text getMsgXY__12daObjTpost_cFv */ int daObjTpost_c::getMsgXY() { s32 msgId; GXColor col = {0x00, 0x00, 0x00, 0x80}; @@ -366,6 +358,7 @@ int daObjTpost_c::getMsgXY() { return msgId; } +/* 0000092C-00000990 .text getMsgNormal__12daObjTpost_cFv */ int daObjTpost_c::getMsgNormal() { s32 msgId; if(field_0x8EB) { @@ -385,6 +378,7 @@ int daObjTpost_c::getMsgNormal() { return msgId; } +/* 00000990-000009EC .text getMsg__12daObjTpost_cFv */ u32 daObjTpost_c::getMsg() { if(dComIfGp_event_chkTalkXY()) { return getMsgXY(); @@ -394,6 +388,7 @@ u32 daObjTpost_c::getMsg() { } } +/* 000009EC-00000CF4 .text next_msgStatus__12daObjTpost_cFPUl */ u16 daObjTpost_c::next_msgStatus(u32* msgId) { static const u32 pay_msg_num[3] = { 0x0CEC, @@ -515,10 +510,12 @@ u16 daObjTpost_c::next_msgStatus(u32* msgId) { return status; } +/* 00000CF4-00000D38 .text checkTalk__12daObjTpost_cFv */ bool daObjTpost_c::checkTalk() { return fopAcM_searchPlayerDistanceXZ(this) < l_HIO.talk_distance; } +/* 00000D38-00000DC0 .text eventOrder__12daObjTpost_cFv */ void daObjTpost_c::eventOrder() { static char* a_demo_name_tbl[] = { "DEFAULT_POST" @@ -537,6 +534,7 @@ void daObjTpost_c::eventOrder() { } } +/* 00000DC0-00000E48 .text checkOrder__12daObjTpost_cFv */ void daObjTpost_c::checkOrder() { if(mEvtInfo.checkCommandDemoAccrpt()) { field_0x8F7 = 0; @@ -558,6 +556,7 @@ void daObjTpost_c::checkOrder() { return; } +/* 00000E48-00000EA4 .text setAttention__12daObjTpost_cFv */ void daObjTpost_c::setAttention() { mAttentionInfo.mPosition = current.pos; mAttentionInfo.mPosition.y += l_HIO.attn_pos_offset; @@ -565,6 +564,7 @@ void daObjTpost_c::setAttention() { mEyePos.y += l_HIO.eye_pos_offset; } +/* 00000EA4-0000100C .text setAnm__12daObjTpost_cFScb */ void daObjTpost_c::setAnm(s8 param_1, bool param_2) { static const int a_anm_bcks_tbl[] = { 0x04, @@ -634,6 +634,7 @@ void daObjTpost_c::setAnm(s8 param_1, bool param_2) { dLib_bcks_setAnm(m_arc_name, mMorf, &field_0x6C8, &field_0x6C9, &field_0x6CA, a_anm_bcks_tbl, a_anm_prm_tbl, param_2); } +/* 0000100C-00001094 .text setMtx__12daObjTpost_cFv */ void daObjTpost_c::setMtx() { J3DModel* pModel = mMorf->getModel(); pModel->setBaseScale(mScale); @@ -643,6 +644,7 @@ void daObjTpost_c::setMtx() { pModel->setBaseTRMtx(mDoMtx_stack_c::get()); } +/* 00001094-000010E0 .text modeWaitInit__12daObjTpost_cFv */ void daObjTpost_c::modeWaitInit() { field_0x8F0 = 1; if(mNumReadable) { @@ -653,6 +655,7 @@ void daObjTpost_c::modeWaitInit() { } } +/* 000010E0-00001188 .text modeWait__12daObjTpost_cFv */ void daObjTpost_c::modeWait() { if(mNumReadable) { setAnm(4, false); @@ -676,10 +679,12 @@ void daObjTpost_c::modeWait() { } } +/* 00001188-000011B0 .text modeTalkInit__12daObjTpost_cFv */ void daObjTpost_c::modeTalkInit() { setAnm(1, false); } +/* 000011B0-00001240 .text modeTalk__12daObjTpost_cFv */ void daObjTpost_c::modeTalk() { if(talk(1) == fopMsgStts_BOX_CLOSED_e) { if(field_0x8E9) { @@ -695,6 +700,7 @@ void daObjTpost_c::modeTalk() { } } +/* 00001240-0000129C .text modeTalkXYInit__12daObjTpost_cFv */ void daObjTpost_c::modeTalkXYInit() { setAnm(1, false); mPreItemNo = dComIfGp_event_getPreItemNo(); @@ -702,6 +708,7 @@ void daObjTpost_c::modeTalkXYInit() { field_0x8E0 = l_HIO.field_0x16; } +/* 0000129C-00001490 .text modeTalkXY__12daObjTpost_cFv */ void daObjTpost_c::modeTalkXY() { daPy_py_c* player = daPy_getPlayerActorClass(); if(field_0x6C9 == 3) { @@ -754,20 +761,24 @@ void daObjTpost_c::modeTalkXY() { } } +/* 00001490-000014D4 .text modeReceiveInit__12daObjTpost_cFv */ void daObjTpost_c::modeReceiveInit() { dComIfGp_event_reset(); field_0x8F7 = 3; setAnm(1, false); } +/* 000014D4-000014FC .text modeReceive__12daObjTpost_cFv */ void daObjTpost_c::modeReceive() { modeProc(PROC_INIT, 4); } +/* 000014FC-00001500 .text modeReceiveDemoInit__12daObjTpost_cFv */ void daObjTpost_c::modeReceiveDemoInit() { return; } +/* 00001500-000015D8 .text modeReceiveDemo__12daObjTpost_cFv */ void daObjTpost_c::modeReceiveDemo() { if(dComIfGp_evmng_endCheck("DEFAULT_POST")) { dLetter_read(m_letter[mNumReadable].mEventReg); @@ -787,6 +798,7 @@ void daObjTpost_c::modeReceiveDemo() { } } +/* 000015D8-00001758 .text modeProc__12daObjTpost_cFQ212daObjTpost_c6Proc_ei */ void daObjTpost_c::modeProc(daObjTpost_c::Proc_e proc, int newMode) { typedef void(daObjTpost_c::*mode_func_t)(void); struct mode_entry_t { @@ -832,6 +844,7 @@ void daObjTpost_c::modeProc(daObjTpost_c::Proc_e proc, int newMode) { } } +/* 00001758-000018CC .text _execute__12daObjTpost_cFv */ bool daObjTpost_c::_execute() { if(dComIfGs_isSymbol(1)) { mNumReadable = getReadableLetterNum(); @@ -868,10 +881,12 @@ bool daObjTpost_c::_execute() { return 0; } +/* 000018CC-000018D0 .text debugDraw__12daObjTpost_cFv */ void daObjTpost_c::debugDraw() { GXColor col = {0xFF, 0x00, 0x00, 0x80}; } +/* 000018D0-00001980 .text _draw__12daObjTpost_cFv */ bool daObjTpost_c::_draw() { if(l_HIO.debug_draw) { debugDraw(); @@ -886,6 +901,7 @@ bool daObjTpost_c::_draw() { return 1; } +/* 00001980-00001BA4 .text createInit__12daObjTpost_cFv */ void daObjTpost_c::createInit() { if(dComIfGs_isSymbol(2)) { dLetter_autoStock(0xB503); @@ -938,10 +954,12 @@ void daObjTpost_c::createInit() { mEventCut.setActorInfo2("Tpost", this); } +/* 00001BA4-00001BA8 .text getArg__12daObjTpost_cFv */ void daObjTpost_c::getArg() { return; } +/* 00001BA8-00001D88 .text _create__12daObjTpost_cFv */ int daObjTpost_c::_create() { fopAcM_SetupActor(this, daObjTpost_c); @@ -958,29 +976,35 @@ int daObjTpost_c::_create() { return step; } +/* 00002094-000020C4 .text _delete__12daObjTpost_cFv */ bool daObjTpost_c::_delete() { dComIfG_resDelete(&mPhs, m_arc_name); return true; } +/* 000020C4-000020E4 .text daObjTpostCreate__FPv */ static int daObjTpostCreate(void* i_this) { return static_cast(i_this)->_create(); } +/* 000020E4-00002108 .text daObjTpostDelete__FPv */ static BOOL daObjTpostDelete(void* i_this) { return static_cast(i_this)->_delete(); } +/* 00002108-0000212C .text daObjTpostExecute__FPv */ static BOOL daObjTpostExecute(void* i_this) { return static_cast(i_this)->_execute(); } +/* 0000212C-00002150 .text daObjTpostDraw__FPv */ static BOOL daObjTpostDraw(void* i_this) { return static_cast(i_this)->_draw(); } -static bool daObjTpostIsDelete(void*) { - return true; +/* 00002150-00002158 .text daObjTpostIsDelete__FPv */ +static BOOL daObjTpostIsDelete(void*) { + return TRUE; } diff --git a/src/d/actor/d_a_player_fan.inc b/src/d/actor/d_a_player_fan.inc index 4704e3b4f..b2ac5c17b 100644 --- a/src/d/actor/d_a_player_fan.inc +++ b/src/d/actor/d_a_player_fan.inc @@ -11,6 +11,9 @@ */ #include "d/actor/d_a_player_main.h" +#include "d/actor/d_a_player_HIO.h" + +char l_arcName[]; /* 8014BAA0-8014BAEC .text fanWindEffectDraw__9daPy_lk_cFv */ BOOL daPy_lk_c::fanWindEffectDraw() { diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index a9415712c..fa0d304ed 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -4262,6 +4262,7 @@ void daPy_lk_c::playerInit() { } } +/* 80125CC8-80125D30 .text phase_1__FP9daPy_lk_c */ int phase_1(daPy_lk_c* i_this) { dComIfGp_setPlayer(0, i_this); dComIfGp_setLinkPlayer(i_this); @@ -4276,6 +4277,7 @@ int phase_1(daPy_lk_c* i_this) { return cPhs_NEXT_e; } +/* 80125D30-80125DB4 .text phase_2__FP9daPy_lk_c */ int phase_2(daPy_lk_c* i_this) { int result; @@ -4308,10 +4310,12 @@ int daPy_lk_c::makeBgWait() { return cPhs_NEXT_e; } +/* 80127B50-80127B70 .text phase_3__FP9daPy_lk_c */ int phase_3(daPy_lk_c* i_this) { return i_this->makeBgWait(); } +/* 80127B70-80127BA0 .text daPy_Create__FP10fopAc_ac_c */ static s32 daPy_Create(fopAc_ac_c* i_this) { static int (*l_method[4])(daPy_lk_c*) = { phase_1, diff --git a/src/d/actor/d_a_race_item.cpp b/src/d/actor/d_a_race_item.cpp index 81ca7055a..90c2883c3 100644 --- a/src/d/actor/d_a_race_item.cpp +++ b/src/d/actor/d_a_race_item.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_race_item.cpp -// +/** + * d_a_race_item.cpp + * Item - Barrel Item + */ #include "d/actor/d_a_race_item.h" #include "d/d_com_inf_game.h" @@ -41,6 +41,7 @@ static dCcD_SrcCyl l_cyl_src = { }, }; +/* 00000078-000000F8 .text set_mtx__12daRaceItem_cFv */ void daRaceItem_c::set_mtx() { mpModel->setBaseScale(mScale); mDoMtx_stack_c::transS(current.pos); @@ -48,10 +49,12 @@ void daRaceItem_c::set_mtx() { mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } +/* 000000F8-0000012C .text Delete__12daRaceItem_cFv */ BOOL daRaceItem_c::Delete() { return DeleteBase(dItem_data::field_item_res[m_itemNo].mArc); } +/* 0000012C-00000318 .text create__12daRaceItem_cFv */ s32 daRaceItem_c::create() { fopAcM_SetupActor(this, daRaceItem_c); @@ -77,6 +80,7 @@ s32 daRaceItem_c::create() { } } +/* 00000540-000006A4 .text CreateInit__12daRaceItem_cFv */ BOOL daRaceItem_c::CreateInit() { set_mtx(); fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); @@ -104,20 +108,24 @@ BOOL daRaceItem_c::CreateInit() { return true; } +/* 000006A4-000006F0 .text checkGet__12daRaceItem_cFv */ void daRaceItem_c::checkGet() { if(field_0x644 == 1 && mCyl.ChkCoHit()) { normalItemGet(); } } +/* 000006F0-0000071C .text daRaceItem_Draw__FP12daRaceItem_c */ static BOOL daRaceItem_Draw(daRaceItem_c* i_this) { return i_this->draw(); } +/* 0000071C-0000073C .text daRaceItem_Execute__FP12daRaceItem_c */ static BOOL daRaceItem_Execute(daRaceItem_c* i_this) { return i_this->execute(); } +/* 0000073C-00000C44 .text execute__12daRaceItem_cFv */ BOOL daRaceItem_c::execute() { field_0x634++; animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f); @@ -241,14 +249,17 @@ BOOL daRaceItem_c::execute() { return true; } -static bool daRaceItem_IsDelete(daRaceItem_c*) { - return true; +/* 00000C44-00000C4C .text daRaceItem_IsDelete__FP12daRaceItem_c */ +static BOOL daRaceItem_IsDelete(daRaceItem_c*) { + return TRUE; } +/* 00000C4C-00000C6C .text daRaceItem_Delete__FP12daRaceItem_c */ static BOOL daRaceItem_Delete(daRaceItem_c* i_this) { return i_this->Delete(); } +/* 00000C6C-00000C8C .text daRaceItem_Create__FP10fopAc_ac_c */ static int daRaceItem_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index b47693a99..05af4fe3d 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_rd.cpp -// +/** + * d_a_rd.cpp + * Enemy - ReDead + */ #include "d/actor/d_a_rd.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_seatag.cpp b/src/d/actor/d_a_seatag.cpp index d2c2bad03..dd35cec67 100644 --- a/src/d/actor/d_a_seatag.cpp +++ b/src/d/actor/d_a_seatag.cpp @@ -5,27 +5,33 @@ #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" +/* 00000078-00000080 .text daSeatag_Draw__FP10daSeatag_c */ static BOOL daSeatag_Draw(daSeatag_c*) { return TRUE; } +/* 00000080-00000088 .text daSeatag_Execute__FP10daSeatag_c */ static BOOL daSeatag_Execute(daSeatag_c*) { return TRUE; } +/* 00000088-00000090 .text daSeatag_IsDelete__FP10daSeatag_c */ static BOOL daSeatag_IsDelete(daSeatag_c*) { return TRUE; } +/* 00000090-000000C0 .text daSeatag_Delete__FP10daSeatag_c */ static BOOL daSeatag_Delete(daSeatag_c* a_this) { a_this->~daSeatag_c(); return TRUE; } +/* 000000C0-00000110 .text daSeatag_Create__FP10fopAc_ac_c */ static int daSeatag_Create(fopAc_ac_c* a_this) { fopAcM_SetupActor(a_this, daSeatag_c); return cPhs_COMPLEATE_e; } + static actor_method_class l_daSeatag_Method = { (process_method_func)daSeatag_Create, (process_method_func)daSeatag_Delete, diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp index 224d5423f..5584e0fdf 100644 --- a/src/d/actor/d_a_ship.cpp +++ b/src/d/actor/d_a_ship.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_ship.cpp -// +/** + * d_a_ship.cpp + * King of Red Lions + */ #include "d/actor/d_a_ship.h" #include "dolphin/types.h" diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index bb8e62197..b19cfbbe3 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_shop_item.cpp -// +/** + * d_a_shop_item.cpp + * Item - Shop Item + */ #include "d/actor/d_a_shop_item.h" #include "f_op/f_op_actor_mng.h" @@ -52,6 +52,7 @@ enum FDAI_RES_FILE_ID { // IDs and indexes are synced const char daShopItem_c::m_cloth_arcname[] = "Cloth"; const f32 daShopItem_c::m_cullfar_max = 5000.0f; +/* 00000078-000000D8 .text getShopArcname__12daShopItem_cFv */ char* daShopItem_c::getShopArcname() { u8 type = fopAcM_GetParamBit(fopAcM_GetParam(this), 8, 4); if(type == 1 || (type == 0 && mModelType[m_itemNo] == 0x01)) { @@ -62,6 +63,7 @@ char* daShopItem_c::getShopArcname() { } } +/* 000000D8-00000140 .text getShopBmdIdx__12daShopItem_cFv */ s16 daShopItem_c::getShopBmdIdx() { u8 type = fopAcM_GetParamBit(fopAcM_GetParam(this), 8, 4); if(type == 1 || (type == 0 && mModelType[m_itemNo] == 0x01)) { @@ -72,6 +74,7 @@ s16 daShopItem_c::getShopBmdIdx() { } } +/* 00000140-00000240 .text CreateInit__12daShopItem_cFv */ void daShopItem_c::CreateInit() { fopAcM_SetMtx(this, field_0x64C); fopAcM_setCullSizeBox(this, -100.0f, 0.0f, -100.0f, 100.0f, 200.0f, 100.0f); @@ -94,6 +97,7 @@ void daShopItem_c::CreateInit() { mpModel->setUserArea(0); } +/* 00000240-000003BC .text clothCreate__12daShopItem_cFv */ BOOL daShopItem_c::clothCreate() { if(isUseClothPacket(m_itemNo)) { dCloth_packet_c::CreateFunc clothFunc[4] = { @@ -139,6 +143,7 @@ BOOL daShopItem_c::clothCreate() { return 1; } +/* 000003BC-000005A8 .text set_mtx__12daShopItem_cFv */ void daShopItem_c::set_mtx() { mpModel->setBaseScale(mScale); MTXTrans(mDoMtx_stack_c::get(), current.pos.x, current.pos.y, current.pos.z); @@ -172,6 +177,7 @@ void daShopItem_c::set_mtx() { } } +/* 000005A8-000005F8 .text _execute__12daShopItem_cFv */ bool daShopItem_c::_execute() { animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f); set_mtx(); @@ -179,6 +185,7 @@ bool daShopItem_c::_execute() { return true; } +/* 000005F8-00000694 .text _draw__12daShopItem_cFv */ bool daShopItem_c::_draw() { if(chkDraw() == 0) return 1; @@ -192,12 +199,14 @@ bool daShopItem_c::_draw() { return true; } +/* 00000694-0000070C .text settingBeforeDraw__12daShopItem_cFv */ void daShopItem_c::settingBeforeDraw() { if(isBomb(m_itemNo) || (m_itemNo == BOMB_BAG) || (m_itemNo == HUMMER) || m_itemNo == SMALL_KEY || m_itemNo == PRESIDENT_STATUE) { dDlst_texSpecmapST(&mEyePos, &mTevStr, mpModel->getModelData(), 1.0f); } } +/* 0000070C-000007A4 .text setTevStr__12daShopItem_cFv */ void daShopItem_c::setTevStr() { g_env_light.settingTevStruct(tevType, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(mpModel, &mTevStr); @@ -209,10 +218,12 @@ void daShopItem_c::setTevStr() { } +/* 000007A4-000007C4 .text daShopItem_Create__FPv */ static int daShopItem_Create(void* i_this) { return static_cast(i_this)->_create(); } +/* 000007C4-00000AA4 .text _create__12daShopItem_cFv */ int daShopItem_c::_create() { fopAcM_SetupActor(this, daShopItem_c); @@ -262,6 +273,7 @@ int daShopItem_c::_create() { return result; } +/* 00000CCC-00000D2C .text daShopItem_Delete__FPv */ static BOOL daShopItem_Delete(void* i_this) { daShopItem_c* inst = static_cast(i_this); @@ -273,16 +285,19 @@ static BOOL daShopItem_Delete(void* i_this) { return 1; } +/* 00000D2C-00000D50 .text daShopItem_Draw__FPv */ static BOOL daShopItem_Draw(void* i_this) { return static_cast(i_this)->_draw(); } +/* 00000D50-00000D74 .text daShopItem_Execute__FPv */ static BOOL daShopItem_Execute(void* i_this) { return static_cast(i_this)->_execute(); } -static bool daShopItem_IsDelete(void*) { - return true; +/* 00000D74-00000D7C .text daShopItem_IsDelete__FPv */ +static BOOL daShopItem_IsDelete(void*) { + return TRUE; } static actor_method_class daShopItemMethodTable = { diff --git a/src/d/actor/d_a_spotbox.cpp b/src/d/actor/d_a_spotbox.cpp index 3e342a232..4b551add9 100644 --- a/src/d/actor/d_a_spotbox.cpp +++ b/src/d/actor/d_a_spotbox.cpp @@ -38,10 +38,6 @@ BOOL daSpotbox_c::execute() { return TRUE; } -u32 daSpotbox_c::getType() { - return fopAcM_GetParam(this) & 1; -} - /* 00000078-000000C4 .text daSpotbox_Draw__FP11daSpotbox_c */ static BOOL daSpotbox_Draw(daSpotbox_c* i_this) { return ((daSpotbox_c*)i_this)->draw(); diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index 9cfc2ebd9..a8c49aaeb 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/src/d/actor/d_a_swc00.cpp @@ -8,6 +8,7 @@ #include "d/d_procname.h" #include "d/d_com_inf_game.h" +/* 00000078-00000180 .text daSwc00_Execute__FP11swc00_class */ static BOOL daSwc00_Execute(swc00_class* i_this) { s32 enable_sw = daSwc00_getSw2No(i_this); fopAc_ac_c* actor = i_this; @@ -31,14 +32,17 @@ static BOOL daSwc00_Execute(swc00_class* i_this) { return TRUE; } +/* 00000180-00000188 .text daSwc00_IsDelete__FP11swc00_class */ static BOOL daSwc00_IsDelete(swc00_class* i_this) { return TRUE; } +/* 00000188-00000190 .text daSwc00_Delete__FP11swc00_class */ static BOOL daSwc00_Delete(swc00_class* i_this) { return TRUE; } +/* 00000190-00000274 .text daSwc00_Create__FP10fopAc_ac_c */ static s32 daSwc00_Create(fopAc_ac_c* i_actor) { fopAcM_SetupActor(i_actor, swc00_class); diff --git a/src/d/actor/d_a_switem.cpp b/src/d/actor/d_a_switem.cpp index 71000a3d1..31f6f9820 100644 --- a/src/d/actor/d_a_switem.cpp +++ b/src/d/actor/d_a_switem.cpp @@ -79,7 +79,6 @@ s32 daSwItem_c::_create() { /* 00000408-000006DC .text _execute__10daSwItem_cFv */ bool daSwItem_c::_execute() { - /* Nonmatching */ bool triggered = false; if (mCyl.ChkTgHit()) { cCcD_Obj* obj = mCyl.GetTgHitObj(); diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index dee503fdf..fd9509a78 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -30,22 +30,27 @@ static u32 l_msgId; static msg_class* l_msg; static u8 msg_mode; +/* 00000078-00000084 .text getEventNo__11daTag_Msg_cFv */ u32 daTag_Msg_c::getEventNo() { return mBase.mParameters >> 0x18; } +/* 00000084-00000090 .text getSwbit__11daTag_Msg_cFv */ u32 daTag_Msg_c::getSwbit() { return mBase.mParameters >> 8 & 0xff; } +/* 00000090-0000009C .text getSwbit2__11daTag_Msg_cFv */ u32 daTag_Msg_c::getSwbit2() { return mBase.mParameters >> 0x10 & 0xff; } +/* 0000009C-000000A8 .text getType2__11daTag_Msg_cFv */ u32 daTag_Msg_c::getType2() { return mBase.mParameters >> 6 & 3; } +/* 000000A8-0000015C .text myDemoName__11daTag_Msg_cFv */ const char* daTag_Msg_c::myDemoName() { dStage_EventInfo_c *pEventInfo; u32 eventNo; @@ -62,14 +67,17 @@ const char* daTag_Msg_c::myDemoName() { return pEventInfo->events[eventNo].mName; } +/* 0000015C-00000168 .text getMessage__11daTag_Msg_cFv */ u16 daTag_Msg_c::getMessage() { return home.angle.x; } +/* 00000168-00000174 .text getEventFlag__11daTag_Msg_cFv */ u16 daTag_Msg_c::getEventFlag() { return home.angle.z; } +/* 00000174-0000021C .text arrivalTerms__11daTag_Msg_cFv */ BOOL daTag_Msg_c::arrivalTerms() { int swBit; u16 eventFlag; @@ -105,6 +113,7 @@ BOOL daTag_Msg_c::rangeCheck() { return FALSE; } +/* 000002FC-0000041C .text otherCheck__11daTag_Msg_cFv */ BOOL daTag_Msg_c::otherCheck() { s16 targetAngle = fopAcM_searchPlayerAngleY(this); daPy_lk_c* player = daPy_getPlayerLinkActorClass(); @@ -132,6 +141,7 @@ BOOL daTag_Msg_c::otherCheck() { return TRUE; } +/* 0000041C-0000065C .text daTag_Msg_actionEvent__FP11daTag_Msg_c */ static BOOL daTag_Msg_actionEvent(daTag_Msg_c* a_this) { int message = a_this->getMessage(); switch (msg_mode / 1) { @@ -181,6 +191,7 @@ static BOOL daTag_Msg_actionEvent(daTag_Msg_c* a_this) { return TRUE; } +/* 0000065C-00000754 .text daTag_Msg_actionHunt__FP11daTag_Msg_c */ static BOOL daTag_Msg_actionHunt(daTag_Msg_c* a_this) { u8 swBit; @@ -218,10 +229,12 @@ static BOOL daTag_Msg_actionArrival(daTag_Msg_c* a_this) { return TRUE; } +/* 000007B0-000007B8 .text daTag_Msg_actionWait__FP11daTag_Msg_c */ static BOOL daTag_Msg_actionWait(daTag_Msg_c*) { return TRUE; } +/* 000007B8-000007C0 .text daTag_Msg_Draw__FP11daTag_Msg_c */ static BOOL daTag_Msg_Draw(daTag_Msg_c*) { return TRUE; } @@ -260,19 +273,23 @@ s32 daTag_Msg_c::create() { return cPhs_COMPLEATE_e; } +/* 000007C0-000007FC .text daTag_Msg_Execute__FP11daTag_Msg_c */ static BOOL daTag_Msg_Execute(daTag_Msg_c* a_this) { return a_this->execute(); } +/* 000007FC-00000804 .text daTag_Msg_IsDelete__FP11daTag_Msg_c */ static BOOL daTag_Msg_IsDelete(daTag_Msg_c*) { return TRUE; } +/* 00000804-00000834 .text daTag_Msg_Delete__FP11daTag_Msg_c */ static BOOL daTag_Msg_Delete(daTag_Msg_c* a_this) { a_this->~daTag_Msg_c(); return TRUE; } +/* 00000834-00000964 .text daTag_Msg_Create__FP10fopAc_ac_c */ static s32 daTag_Msg_Create(fopAc_ac_c* i_this) { daTag_Msg_c* a_this = (daTag_Msg_c*)i_this; return a_this->create(); diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 3371162cf..549215068 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_tbox.cpp -// +/** + * d_a_tbox.cpp + * Treasure Chest / 宝箱 (Takarabako) + */ #include "d/actor/d_a_tbox.h" #include "JSystem/JUtility/JUTAssert.h" @@ -1105,6 +1105,7 @@ BOOL daTbox_c::actionGenocide() { return true; } +/* 00002C10-00002FB0 .text draw__8daTbox_cFv */ BOOL daTbox_c::draw() { u8 openFlag; diff --git a/src/d/actor/d_a_tn.cpp b/src/d/actor/d_a_tn.cpp index 44f5da1c9..59567f65e 100644 --- a/src/d/actor/d_a_tn.cpp +++ b/src/d/actor/d_a_tn.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_tn.cpp -// +/** + * d_a_tn.cpp + * Enemy - Darknut + */ #include "d/actor/d_a_tn.h" #include "m_Do/m_Do_ext.h" diff --git a/src/d/d_a_bomb_static.cpp b/src/d/d_a_bomb_static.cpp index 7367b1774..8681af84a 100644 --- a/src/d/d_a_bomb_static.cpp +++ b/src/d/d_a_bomb_static.cpp @@ -1,7 +1,7 @@ -// -// Generated by dtk -// Translation Unit: d_a_bomb_static.cpp -// +/** + * d_a_bomb_static.cpp + * Bomb - Static + */ #include "d/actor/d_a_bomb.h" #include "d/actor/d_a_bomb2.h" @@ -9,30 +9,35 @@ #define L_daBomb_Version 1 +/* 80067FA0-80067FD0 .text getBombRestTime__8daBomb_cFv */ s16 daBomb_c::getBombRestTime() { _prm_chk_version(); return mRestTime; } +/* 80067FD0-80068000 .text getBombCheck_Flag__8daBomb_cFv */ s16 daBomb_c::getBombCheck_Flag() { _prm_chk_version(); return field_0x6F1; } +/* 80068000-80068034 .text setBombCheck_Flag__8daBomb_cFv */ void daBomb_c::setBombCheck_Flag() { _prm_chk_version(); field_0x6F1 = true; } +/* 80068034-80068068 .text setBombFire_ON__8daBomb_cFv */ void daBomb_c::setBombFire_ON() { _prm_chk_version(); field_0x6F2 = true; } +/* 80068068-800680CC .text setBombNoHit__8daBomb_cFv */ void daBomb_c::setBombNoHit() { _prm_chk_version(); @@ -44,18 +49,21 @@ void daBomb_c::setBombNoHit() { field_0x6F3 = true; } +/* 800680CC-80068104 .text setBombOffCoSet__8daBomb_cFv */ void daBomb_c::setBombOffCoSet() { _prm_chk_version(); mSph.OffCoSPrmBit(CO_SPRM_SET); } +/* 80068104-8006813C .text setBombOnCoSet__8daBomb_cFv */ void daBomb_c::setBombOnCoSet() { _prm_chk_version(); mSph.OnCoSPrmBit(CO_SPRM_SET); } +/* 8006813C-800681CC .text setBombNoEff__8daBomb_cFv */ void daBomb_c::setBombNoEff() { _prm_chk_version(); @@ -72,86 +80,103 @@ void daBomb_c::setBombNoEff() { mSparks.mpEmitter = 0; } +/* 800681CC-80068208 .text setBombRestTime__8daBomb_cFs */ void daBomb_c::setBombRestTime(s16 time) { _prm_chk_version(); mRestTime = time; } +/* 80068208-80068244 .text setNoGravityTime__8daBomb_cFs */ void daBomb_c::setNoGravityTime(s16 time) { _prm_chk_version(); mNoGravityTime = time; } +/* 80068244-80068274 .text prm_make__8daBomb_cFQ28daBomb_c7State_ebb */ int daBomb_c::prm_make(daBomb_c::State_e state, bool param_1, bool param_2) { return (((param_2 ? 1 : 0) << 17) | (state | ((param_1 ? 1 : 0) << 16))) | 0x80000000; } +/* 80068274-800682C0 .text chk_state__8daBomb_cCFQ28daBomb_c7State_e */ bool daBomb_c::chk_state(daBomb_c::State_e state) const { _prm_chk_version(); return state == prm_get_state(); } +/* 800682C0-800682F0 .text change_state__8daBomb_cFQ28daBomb_c7State_e */ void daBomb_c::change_state(daBomb_c::State_e new_state) { mBase.mParameters = (mBase.mParameters & ~(((1 << PRM_STATE_W) - 1) << PRM_STATE_S)) | (new_state << PRM_STATE_S); // & 0xFF000000 _prm_chk_version(); } +/* 800682F0-8006832C .text prm_get_state__8daBomb_cCFv */ int daBomb_c::prm_get_state() const { _prm_chk_version(); return daObj::PrmAbstract(this, PRM_STATE_W, PRM_STATE_S); } +/* 8006832C-80068340 .text get_explode_instant__8daBomb_cCFv */ bool daBomb_c::get_explode_instant() const { return field_0x784 == true; } +/* 80068340-80068388 .text prm_get_cheapEff__8daBomb_cCFv */ bool daBomb_c::prm_get_cheapEff() const { _prm_chk_version(); return daObj::PrmAbstract(this, PRM_CHEAP_EFF_W, PRM_CHEAP_EFF_S); } +/* 80068388-800683D0 .text prm_get_angXZero__8daBomb_cCFv */ bool daBomb_c::prm_get_angXZero() const { _prm_chk_version(); return daObj::PrmAbstract(this, PRM_ANGXZERO_W, PRM_ANGXZERO_S); } +/* 800683D0-800683F8 .text prm_get_version__8daBomb_cCFv */ int daBomb_c::prm_get_version() const { return daObj::PrmAbstract(this, PRM_VERSION_W, PRM_VERSION_S); } +/* 800683F8-80068450 .text _prm_chk_version__8daBomb_cCFv */ void daBomb_c::_prm_chk_version() const { int ver = prm_get_version(); JUT_ASSERT(0xCE, ver == L_daBomb_Version); } +/* 80068450-80068488 .text remove_fuse_effect__Q27daBomb25Act_cFv */ void daBomb2::Act_c::remove_fuse_effect() { mSmoke.deleteCallBack(); mSparks.deleteCallBack(); } +/* 80068488-80068490 .text set_time__Q27daBomb25Act_cFi */ void daBomb2::Act_c::set_time(int time) { field_0x738 = time; } +/* 80068490-80068498 .text get_time__Q27daBomb25Act_cCFv */ int daBomb2::Act_c::get_time() const { return field_0x738; } +/* 80068498-800684A0 .text chk_eat__Q27daBomb25Act_cCFv */ bool daBomb2::Act_c::chk_eat() const { return field_0x745; } +/* 800684A0-800684AC .text set_eat__Q27daBomb25Act_cFv */ void daBomb2::Act_c::set_eat() { field_0x745 = true; } +/* 800684AC-800684E0 .text set_no_hit__Q27daBomb25Act_cFv */ void daBomb2::Act_c::set_no_hit() { mSph.OffTgSPrmBit(TG_SPRM_SET); mSph.OffCoSPrmBit(CO_SPRM_SET); @@ -159,6 +184,7 @@ void daBomb2::Act_c::set_no_hit() { mSph.ClrAtSet(); } +/* 800684E0-800684F4 .text chk_explode__Q27daBomb25Act_cFv */ bool daBomb2::Act_c::chk_explode() { return mState == 2; } diff --git a/src/d/d_a_ship_static.cpp b/src/d/d_a_ship_static.cpp index 755ed410d..74d2eabbb 100644 --- a/src/d/d_a_ship_static.cpp +++ b/src/d/d_a_ship_static.cpp @@ -1,8 +1,11 @@ -/* +/** * d_a_ship_static.cpp + * King of Red Lions - Static */ + #include "d/actor/d_a_ship.h" +/* 80067D94-80067E78 .text initStartPos__8daShip_cFPC4cXyzs */ void daShip_c::initStartPos(const cXyz* pos, short rotY) { current.pos = *pos; old.pos = *pos; @@ -21,4 +24,3 @@ void daShip_c::initStartPos(const cXyz* pos, short rotY) { m19AC.end(); m19C0.end(); } - diff --git a/src/d/d_a_shop_item_static.cpp b/src/d/d_a_shop_item_static.cpp index 9ddeb63fc..c0bde5883 100644 --- a/src/d/d_a_shop_item_static.cpp +++ b/src/d/d_a_shop_item_static.cpp @@ -521,18 +521,22 @@ const u8 daShopItem_c::mModelType[255] = { 2, }; +/* 800689F0-800689F8 .text getScaleP__12daShopItem_cFv */ cXyz* daShopItem_c::getScaleP() { return &mScale; } +/* 800689F8-80068A00 .text getRotateP__12daShopItem_cFv */ csXyz* daShopItem_c::getRotateP() { return ¤t.angle; } +/* 80068A00-80068A08 .text getPosP__12daShopItem_cFv */ cXyz* daShopItem_c::getPosP() { return ¤t.pos; } +/* 80068A08-80068A58 .text getCenter__12daShopItem_cFv */ cXyz daShopItem_c::getCenter() { f32 height; if(FLOWER_1 <= m_itemNo && m_itemNo <= PRESIDENT_STATUE) { diff --git a/src/d/d_detect.cpp b/src/d/d_detect.cpp index 8b27dcd2e..134d7c62b 100644 --- a/src/d/d_detect.cpp +++ b/src/d/d_detect.cpp @@ -103,7 +103,7 @@ bool dDetect_c::chk_quake_area(const cXyz* pos) const { /* 8009C32C-8009C588 .text search_tag_light__9dDetect_cFPvPv */ void* dDetect_c::search_tag_light(void* i_proc, void* i_pos) { - /* Nonmatching */ + /* Nonmatching - chk_inside */ if (fopAc_IsActor(i_proc) && fopAcM_GetProfName(i_proc) == PROC_Tag_Light) { daTagLight::Act_c* light = (daTagLight::Act_c*)i_proc; const cXyz* pos = (const cXyz*)i_pos; diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 33b4ea571..ed7a273c6 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -2126,6 +2126,7 @@ dDlst_list_c::dDlst_list_c() { mpSpotModel = NULL; } +/* 80083668-800836E0 .text J3DDrawBuffer__create__FUl */ static J3DDrawBuffer * J3DDrawBuffer__create(u32 size) { J3DDrawBuffer * buffer = new J3DDrawBuffer(); if (buffer != NULL) { diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index 508149382..8a7970a3a 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -427,6 +427,7 @@ BOOL dEvent_manager_c::getIsAddvance(int staffIdx) { return mList.getStaffP(staffIdx)->mAdvance; } +/* 8007473C-80074824 .text dEvmng_strcmp__FPCcPc */ int dEvmng_strcmp(const char* s1, char* s2) { /* Nonmatching */ u32 len1 = strlen(s1); diff --git a/src/d/d_npc.cpp b/src/d/d_npc.cpp index 264ed3ba9..a4f110b48 100644 --- a/src/d/d_npc.cpp +++ b/src/d/d_npc.cpp @@ -294,6 +294,7 @@ bool dNpc_PathRun_c::decIdx() { return ret; } +/* 8021B0F0-8021B134 .text decIdxLoop__14dNpc_PathRun_cFv */ bool dNpc_PathRun_c::decIdxLoop() { bool ret = true; @@ -308,6 +309,7 @@ bool dNpc_PathRun_c::decIdxLoop() { return ret; } +/* 8021B134-8021B1B0 .text decIdxAuto__14dNpc_PathRun_cFv */ bool dNpc_PathRun_c::decIdxAuto() { bool hitEnd = true; @@ -330,6 +332,7 @@ bool dNpc_PathRun_c::decIdxAuto() { return hitEnd; } +/* 8021B1B0-8021B224 .text nextIdx__14dNpc_PathRun_cFv */ bool dNpc_PathRun_c::nextIdx() { bool hitEnd; @@ -349,6 +352,7 @@ bool dNpc_PathRun_c::nextIdx() { return hitEnd; } +/* 8021B224-8021B298 .text nextIdxAuto__14dNpc_PathRun_cFv */ bool dNpc_PathRun_c::nextIdxAuto() { bool hitEnd; @@ -368,6 +372,7 @@ bool dNpc_PathRun_c::nextIdxAuto() { return hitEnd; } +/* 8021B298-8021B328 .text absIdx__14dNpc_PathRun_cFUcUc */ s32 dNpc_PathRun_c::absIdx(u8 startIdx, u8 lastIdx) { if(mPath == 0) { return 0; @@ -389,6 +394,7 @@ s32 dNpc_PathRun_c::absIdx(u8 startIdx, u8 lastIdx) { return diff_1; } +/* 8021B328-8021B348 .text maxPoint__14dNpc_PathRun_cFv */ u8 dNpc_PathRun_c::maxPoint() { u8 max = 0xFF; if(mPath != 0) { @@ -398,6 +404,7 @@ u8 dNpc_PathRun_c::maxPoint() { return max; } +/* 8021B348-8021B384 .text pointArg__14dNpc_PathRun_cFUc */ u8 dNpc_PathRun_c::pointArg(u8 idx) { u8 arg = 0; if(mPath != 0 && idx < (u8)mPath->m_num) { @@ -513,6 +520,7 @@ bool dNpc_PathRun_c::chkInside(cXyz* param_1) { #include "d/d_npc_event_cut.inc" +/* 8021B95C-8021B998 .text setActorInfo__15dNpc_EventCut_cFPcP10fopAc_ac_c */ void dNpc_EventCut_c::setActorInfo(char* staffName, fopAc_ac_c* pActor) { mpEvtStaffName = staffName; mpActor = pActor; @@ -522,6 +530,7 @@ void dNpc_EventCut_c::setActorInfo(char* staffName, fopAc_ac_c* pActor) { mCurActIdx = -1; } +/* 8021B998-8021B9D8 .text setActorInfo2__15dNpc_EventCut_cFPcP12fopNpc_npc_c */ void dNpc_EventCut_c::setActorInfo2(char* staffName, fopNpc_npc_c* pActor) { mpEvtStaffName = staffName; mpActor = pActor; @@ -532,6 +541,7 @@ void dNpc_EventCut_c::setActorInfo2(char* staffName, fopNpc_npc_c* pActor) { mCurActIdx = -1; } +/* 8021B9D8-8021BABC .text dNpc_setAnmIDRes__FP14mDoExt_McaMorfiffiiPCc */ bool dNpc_setAnmIDRes(mDoExt_McaMorf* pMorf, int loopMode, float morf, float speed, int animResId, int soundResId, const char* arcName) { void* pSoundAnimRes = 0; bool ret = false; @@ -570,6 +580,7 @@ bool dNpc_setAnmFNDirect(mDoExt_McaMorf* pMorf, int loopMode, f32 morf, f32 spee return ret; } +/* 8021BBA8-8021BC8C .text dNpc_setAnm__FP14mDoExt_McaMorfiffiiPCc */ bool dNpc_setAnm(mDoExt_McaMorf* pMorf, int loopMode, f32 morf, f32 speed, int animFileIdx, int soundFileIdx, const char* arcName) { void* pSoundAnimRes = 0; bool ret = false; @@ -588,6 +599,7 @@ bool dNpc_setAnm(mDoExt_McaMorf* pMorf, int loopMode, f32 morf, f32 speed, int a return ret; } +/* 8021BC8C-8021BD2C .text dNpc_setShadowModel__FP8J3DModelP12J3DModelDataP8J3DModel */ void dNpc_setShadowModel(J3DModel* param_1, J3DModelData* param_2, J3DModel* param_3) { for(int i = 0; i < param_2->getWEvlpMtxNum(); i++) { mDoMtx_copy(param_3->mpWeightEnvMtx[i], param_1->mpWeightEnvMtx[i]); @@ -597,6 +609,7 @@ void dNpc_setShadowModel(J3DModel* param_1, J3DModelData* param_2, J3DModel* par } } +/* 8021BD2C-8021BDE8 .text dNpc_playerEyePos__Ff */ cXyz dNpc_playerEyePos(f32 offsetY) { daPy_py_c* pPlayer = daPy_getPlayerActorClass(); cXyz pos = pPlayer->getHeadTopPos(); @@ -628,6 +641,7 @@ void dNpc_calc_DisXZ_AngY(cXyz param_1, cXyz param_2, float* param_3, s16* param } } +/* 8021BEC4-8021BF30 .text dNpc_chkArasoi__Fv */ bool dNpc_chkArasoi() { return dComIfGs_isEventBit(0x1220) && !dComIfGs_isEventBit(0x1808); } @@ -641,6 +655,7 @@ bool dNpc_chkLetterPassed() { return ret; } +/* 8021BF98-8021C010 .text setCollision__12fopNpc_npc_cFff */ void fopNpc_npc_c::setCollision(f32 radius, f32 height) { mCyl.SetC(current.pos); mCyl.SetR(radius); @@ -648,6 +663,7 @@ void fopNpc_npc_c::setCollision(f32 radius, f32 height) { dComIfG_Ccsp()->Set(&mCyl); } +/* 8021C010-8021C120 .text talk__12fopNpc_npc_cFi */ u16 fopNpc_npc_c::talk(int param_1) { u16 status = 0xFF; @@ -683,6 +699,7 @@ u16 fopNpc_npc_c::talk(int param_1) { return status; } +/* 8021C120-8021C238 .text dNpc_setAnm_2__FP14mDoExt_McaMorfiffiiPCc */ bool dNpc_setAnm_2(mDoExt_McaMorf* pMorf, int loopMode, f32 morf, f32 speed, int animFileIdx, int soundFileIdx, const char* arcName) { if(0 <= soundFileIdx) { void* pSoundAnimRes = dComIfG_getObjectRes(arcName, soundFileIdx); @@ -748,6 +765,7 @@ void dNpc_HeadAnm_c::swing_horizone() { } } +/* 8021C55C-8021C5D8 .text move__14dNpc_HeadAnm_cFv */ void dNpc_HeadAnm_c::move() { if(mFunc) { (this->*mFunc)(); @@ -782,6 +800,7 @@ void dNpc_JntCtrl_c::turn_fromBackbone2Head(s16 param_1, s16* param_2, s16* para } } +/* 8021C6D8-8021C780 .text turn_fromHead2Backbone__14dNpc_JntCtrl_cFsPsPs */ void dNpc_JntCtrl_c::turn_fromHead2Backbone(s16 param_1, s16* param_2, s16* param_3) { *param_2 = 0; if(!mbHeadLock) { @@ -796,6 +815,7 @@ void dNpc_JntCtrl_c::turn_fromHead2Backbone(s16 param_1, s16* param_2, s16* para } } +/* 8021C780-8021C7D0 .text follow_current__14dNpc_JntCtrl_cFPss */ s16 dNpc_JntCtrl_c::follow_current(s16* pAngle, s16 diff) { s16 angle = *pAngle; *pAngle -= diff; diff --git a/src/d/d_npc_event_cut.inc b/src/d/d_npc_event_cut.inc index 8b83d24ff..aa08dbc97 100644 --- a/src/d/d_npc_event_cut.inc +++ b/src/d/d_npc_event_cut.inc @@ -6,6 +6,7 @@ #include "d/d_com_inf_game.h" #include "d/d_event_manager.h" +/* 8021CC4C-8021CED0 .text cutProc__15dNpc_EventCut_cFv */ bool dNpc_EventCut_c::cutProc() { static char* action_table[] = { "WAIT", @@ -80,6 +81,7 @@ bool dNpc_EventCut_c::cutProc() { } } +/* 8021CED0-8021CF3C .text cutWaitStart__15dNpc_EventCut_cFv */ void dNpc_EventCut_c::cutWaitStart() { u32* timer = dComIfGp_evmng_getMyIntegerP(mEvtStaffId, "Timer"); if(timer) { @@ -90,12 +92,14 @@ void dNpc_EventCut_c::cutWaitStart() { } } +/* 8021CF3C-8021CF88 .text cutWaitProc__15dNpc_EventCut_cFv */ void dNpc_EventCut_c::cutWaitProc() { if(cLib_calcTimer(&mTimer) == 0) { dComIfGp_evmng_cutEnd(mEvtStaffId); } } +/* 8021CF88-8021D1C8 .text cutTurnToActorStart__15dNpc_EventCut_cFv */ void dNpc_EventCut_c::cutTurnToActorStart() { mpActorName = dComIfGp_evmng_getMyStringP(mEvtStaffId, "ActorName"); @@ -166,6 +170,7 @@ void dNpc_EventCut_c::cutTurnToActorStart() { field_0x44 = 0; } +/* 8021D1C8-8021D51C .text cutTurnToActorProc__15dNpc_EventCut_cFv */ void dNpc_EventCut_c::cutTurnToActorProc() { if(mSetId != 0) { mTargetActorPos.set(0.0f, 0.0f, 0.0f); @@ -232,6 +237,7 @@ void dNpc_EventCut_c::cutTurnToActorProc() { field_0x44 = fabsf(tAngle - mpActor->current.angle.y); } +/* 8021D51C-8021D730 .text cutMoveToActorStart__15dNpc_EventCut_cFv */ void dNpc_EventCut_c::cutMoveToActorStart() { mpActorName = dComIfGp_evmng_getMyStringP(mEvtStaffId, "ActorName"); u32* set = dComIfGp_evmng_getMyIntegerP(mEvtStaffId, "SetId"); @@ -336,6 +342,7 @@ void dNpc_EventCut_c::cutMoveToActorProc() { } } +/* 8021D9DC-8021DC7C .text findActorCallBack__15dNpc_EventCut_cFP10fopAc_ac_cPv */ fopAc_ac_c* dNpc_EventCut_c::findActorCallBack(fopAc_ac_c* pActor, void* pData) { dNpc_EventCut_c* cut = static_cast(pData); @@ -380,6 +387,7 @@ fopAc_ac_c* dNpc_EventCut_c::findActorCallBack(fopAc_ac_c* pActor, void* pData) return 0; } +/* 8021DC7C-8021DE2C .text cutTurnToPosStart__15dNpc_EventCut_cFv */ void dNpc_EventCut_c::cutTurnToPosStart() { cXyz* pos = dComIfGp_evmng_getMyXyzP(mEvtStaffId, "Pos"); if(pos) { @@ -432,6 +440,7 @@ void dNpc_EventCut_c::cutTurnToPosStart() { field_0x44 = 0; } +/* 8021DE2C-8021DFB0 .text cutTurnToPosProc__15dNpc_EventCut_cFv */ void dNpc_EventCut_c::cutTurnToPosProc() { s16 tAngle = cLib_targetAngleY(&mpActor->current.pos, &mPos); mbAttention = 1; @@ -466,6 +475,7 @@ void dNpc_EventCut_c::cutTurnToPosProc() { field_0x44 = fabsf(tAngle - mpActor->current.angle.y); } +/* 8021DFB0-8021E168 .text cutMoveToPosStart__15dNpc_EventCut_cFv */ void dNpc_EventCut_c::cutMoveToPosStart() { cXyz* pos = dComIfGp_evmng_getMyXyzP(mEvtStaffId, "Pos"); f32* speed = dComIfGp_evmng_getMyFloatP(mEvtStaffId, "Speed"); @@ -543,6 +553,7 @@ void dNpc_EventCut_c::cutMoveToPosProc() { } } +/* 8021E4C0-8021E58C .text cutTalkMsgProc__15dNpc_EventCut_cFv */ void dNpc_EventCut_c::cutTalkMsgStart() { if(mpTalkActor != 0) { u32* attn = dComIfGp_evmng_getMyIntegerP(mEvtStaffId, "Attention"); @@ -572,6 +583,7 @@ void dNpc_EventCut_c::cutTalkMsgStart() { } } +/* 8021E444-8021E4C0 .text cutContinueTalkStart__15dNpc_EventCut_cFv */ void dNpc_EventCut_c::cutContinueTalkStart() { if(mpTalkActor != 0) { u32* endMsg = dComIfGp_evmng_getMyIntegerP(mEvtStaffId, "end_num"); @@ -584,6 +596,7 @@ void dNpc_EventCut_c::cutContinueTalkStart() { } } +/* 8021E338-8021E444 .text cutTalkMsgStart__15dNpc_EventCut_cFv */ void dNpc_EventCut_c::cutTalkMsgProc() { if(mpTalkActor == 0 || field_0x52 == 0) { dComIfGp_evmng_cutEnd(mEvtStaffId); diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index 4abb4a763..67ae4e274 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -56,7 +56,6 @@ static s32 phase_3(char*) { /* 8022F9BC-8022F9FC .text resLoad__FP30request_of_phase_process_classPc */ s32 resLoad(request_of_phase_process_class* param_1, char* param_2) { - /* Nonmatching */ static cPhs__Handler l_method[] = { (cPhs__Handler)phase_1, (cPhs__Handler)phase_2, diff --git a/src/d/d_shop.cpp b/src/d/d_shop.cpp index 189506b0b..017511af8 100644 --- a/src/d/d_shop.cpp +++ b/src/d/d_shop.cpp @@ -1236,7 +1236,6 @@ s16 dShop_get_next_select(int param_1, ShopItems_c* shopItems) { /* 80060138-80060154 .text setItemSetDataList__11ShopItems_cFv */ void ShopItems_c::setItemSetDataList() { - /* Nonmatching */ mpItemSetList = Item_set_data_tbl[mItemSetListGlobalIdx]; } diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 02c8c7b54..4c0ab03d0 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -603,7 +603,6 @@ void mDoExt_backupMatBlock_c::store(J3DMaterial* i_material) { /* 800101BC-8001084C .text restore__23mDoExt_backupMatBlock_cFP11J3DMaterial */ void mDoExt_backupMatBlock_c::restore(J3DMaterial* i_material) { - /* Nonmatching */ J3DColorBlock* colorBlock = i_material->getColorBlock(); colorBlock->setColorChanNum(mColorChanNum); for (u32 i = 0; i < 2; i++) { diff --git a/src/m_Do/m_Do_gba_com.cpp b/src/m_Do/m_Do_gba_com.cpp index 4205511ff..57b283317 100644 --- a/src/m_Do/m_Do_gba_com.cpp +++ b/src/m_Do/m_Do_gba_com.cpp @@ -694,6 +694,7 @@ void mDoGaC_agbCom_c::mDoGaC_ReadResult() { } } +/* 8001BA34-8001BA68 .text BigLittleChange__FUl */ u32 BigLittleChange(u32 param_0) { u32 big = param_0; u32 little; diff --git a/src/m_Do/m_Do_mtx.cpp b/src/m_Do/m_Do_mtx.cpp index 14a12517b..fa1c82f89 100644 --- a/src/m_Do/m_Do_mtx.cpp +++ b/src/m_Do/m_Do_mtx.cpp @@ -194,7 +194,6 @@ void mDoMtx_lookAt(Mtx mtx, const Vec* param_1, const Vec* param_2, s16 param_3) /* 8000D148-8000D284 .text mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs */ void mDoMtx_lookAt(Mtx mtx, const Vec* param_1, const Vec* param_2, const Vec* param_3, s16 param_4) { - /* Nonmatching */ cXyz local_4c(*(cXyz*)param_1); cXyz local_58(*(cXyz*)param_2); cXyz local_64(*(cXyz*)param_3); @@ -221,7 +220,6 @@ void mDoMtx_concatProjView(const Mtx44 a, const Mtx b, Mtx44 c) { /* 8000D388-8000D530 .text mDoMtx_inverseTranspose__FPA4_CfPA4_f */ bool mDoMtx_inverseTranspose(const Mtx a, Mtx b) { - /* Nonmatching */ f32 var1 = a[0][0] * a[1][1] * a[2][2] + a[0][1] * a[1][2] * a[2][0] + a[0][2] * a[1][0] * a[2][1] - a[2][0] * a[1][1] * a[0][2] - a[1][0] * a[0][1] * a[2][2] - a[0][0] * a[2][1] * a[1][2];