diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-11-25 11:32:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-25 18:32:34 +0200 |
| commit | 2f2f37a7345d889aa1072b10e3a5022ad1bd15f1 (patch) | |
| tree | 5844529921578f759ec79e96769f8d809bc0c350 /src/d | |
| parent | cd3d634133040864768d9cc7364b02ce1f22e99b (diff) | |
Misc fixes (#2860)
* Misc matches
* Remove more old dol2asm stuff
* Remove dCcS::SetMass-related fakematches
No longer necessary with the PCH for some reason.
* Use attention types enum in more places
* Remove more dol2asm stuff
* Clean up matDL_dis.py
Diffstat (limited to 'src/d')
129 files changed, 92 insertions, 455 deletions
diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index 816f6fc908..7b87f4e843 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -5900,8 +5900,8 @@ void daAlink_c::setSwordAtCollision(int param_0) { mAtCyl.MoveCAt(sp74); } - g_dComIfG_gameInfo.play.mCcs.Set(&mAtCyl); - g_dComIfG_gameInfo.play.mCcs.SetMass(&mAtCyl, 1); + dComIfG_Ccsp()->Set(&mAtCyl); + dComIfG_Ccsp()->SetMass(&mAtCyl, 1); return; } @@ -5927,8 +5927,8 @@ void daAlink_c::setSwordAtCollision(int param_0) { mAtCps[2].SetAtVec(sp5C); for (int i = 0; i < 3; i++) { - g_dComIfG_gameInfo.play.mCcs.Set(&mAtCps[i]); - g_dComIfG_gameInfo.play.mCcs.SetMass(&mAtCps[i], 1); + dComIfG_Ccsp()->Set(&mAtCps[i]); + dComIfG_Ccsp()->SetMass(&mAtCps[i], 1); } } @@ -5995,8 +5995,8 @@ void daAlink_c::setWolfAtCollision() { if (mProcID == PROC_WOLF_ROLL_ATTACK) { mAtCyl.SetC(current.pos); - g_dComIfG_gameInfo.play.mCcs.Set(&mAtCyl); - g_dComIfG_gameInfo.play.mCcs.SetMass(&mAtCyl, 1); + dComIfG_Ccsp()->Set(&mAtCyl); + dComIfG_Ccsp()->SetMass(&mAtCyl, 1); } else { sp8.set(current.pos.x + field_0x3438 * cM_ssin(shape_angle.y), current.pos.y, current.pos.z + field_0x3438 * cM_scos(shape_angle.y)); @@ -6021,8 +6021,8 @@ void daAlink_c::setWolfAtCollision() { mAtCyl.MoveCAt(sp8); } - g_dComIfG_gameInfo.play.mCcs.Set(&mAtCyl); - g_dComIfG_gameInfo.play.mCcs.SetMass(&mAtCyl, 1); + dComIfG_Ccsp()->Set(&mAtCyl); + dComIfG_Ccsp()->SetMass(&mAtCyl, 1); } onNoResetFlg0(FLG0_UNK_40); @@ -6125,7 +6125,7 @@ void daAlink_c::setAtCollision() { mGuardAtCps.SetAtVec(spA4); dComIfG_Ccsp()->Set(&mGuardAtCps); - g_dComIfG_gameInfo.play.mCcs.mMass_Mng.Set(&mGuardAtCps, 1); + dComIfG_Ccsp()->SetMass(&mGuardAtCps, 1); } else { mGuardAtCps.ResetAtHit(); } @@ -6203,7 +6203,7 @@ void daAlink_c::setAtCollision() { } dComIfG_Ccsp()->Set(&field_0xFB8); - g_dComIfG_gameInfo.play.mCcs.mMass_Mng.Set(&field_0xFB8, 1); + dComIfG_Ccsp()->SetMass(&field_0xFB8, 1); } else { field_0xFB8.ResetAtHit(); } @@ -6218,7 +6218,7 @@ void daAlink_c::setAtCollision() { } dComIfG_Ccsp()->Set(&field_0xFB8); - g_dComIfG_gameInfo.play.mCcs.mMass_Mng.Set(&field_0xFB8, 1); + dComIfG_Ccsp()->SetMass(&field_0xFB8, 1); if (mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 7 || mItemVar0.field_0x3018 == 6) { field_0x1778.SetC(mIronBallCenterPos); @@ -6254,7 +6254,7 @@ void daAlink_c::setAtCollision() { spC8 = cXyz::Zero; field_0xFB8.SetAtVec(spC8); dComIfG_Ccsp()->Set(&field_0xFB8); - g_dComIfG_gameInfo.play.mCcs.mMass_Mng.Set(&field_0xFB8, 1); + dComIfG_Ccsp()->SetMass(&field_0xFB8, 1); decSwordBlur(); if (mProcID == PROC_BOARD_CUT_TURN) { @@ -6268,7 +6268,7 @@ void daAlink_c::setAtCollision() { spC8.set(current.pos.x, current.pos.y - 80.0f, current.pos.z); mAtCyl.SetC(spC8); dComIfG_Ccsp()->Set(&mAtCyl); - g_dComIfG_gameInfo.play.mCcs.mMass_Mng.Set(&mAtCyl, 1); + dComIfG_Ccsp()->SetMass(&mAtCyl, 1); decSwordBlur(); } else if (!checkNoResetFlg0(FLG0_UNK_40)) { setSwordAtCollision(1); @@ -6533,16 +6533,15 @@ void daAlink_c::setCollision() { field_0x306c = shape_angle.y + mBodyAngle.y; } - // fakematch, should be dComIfG_Ccsp() (same for rest of function) - g_dComIfG_gameInfo.play.mCcs.Set(&field_0x850[0]); - g_dComIfG_gameInfo.play.mCcs.SetMass(&field_0x850[0], 1); + dComIfG_Ccsp()->Set(&field_0x850[0]); + dComIfG_Ccsp()->SetMass(&field_0x850[0], 1); if (checkWolf()) { setWolfAtCollision(); for (i = 1; i < 3; i++) { - g_dComIfG_gameInfo.play.mCcs.Set(&field_0x850[i]); - g_dComIfG_gameInfo.play.mCcs.SetMass(&field_0x850[i], 1); + dComIfG_Ccsp()->Set(&field_0x850[i]); + dComIfG_Ccsp()->SetMass(&field_0x850[i], 1); } if (checkModeFlg(0x100000)) { @@ -6552,12 +6551,12 @@ void daAlink_c::setCollision() { field_0xFB8.OnCoSetBit(); } - g_dComIfG_gameInfo.play.mCcs.Set(&field_0xFB8); - g_dComIfG_gameInfo.play.mCcs.SetMass(&field_0xFB8, 1); + dComIfG_Ccsp()->Set(&field_0xFB8); + dComIfG_Ccsp()->SetMass(&field_0xFB8, 1); } else { for (i = 1; i < 3; i++) { - g_dComIfG_gameInfo.play.mCcs.Set(&field_0x850[i]); - g_dComIfG_gameInfo.play.mCcs.SetMass(&field_0x850[i], 1); + dComIfG_Ccsp()->Set(&field_0x850[i]); + dComIfG_Ccsp()->SetMass(&field_0x850[i], 1); } setAtCollision(); @@ -10224,15 +10223,15 @@ void daAlink_c::decideDoStatus() { } else if (mAttList != NULL) { s16 actor_name = fopAcM_GetName(field_0x27f4); - if (mAttList->mType == 5 || - (mAttList->mType == 6 && + if (mAttList->mType == fopAc_attn_DOOR_e || + (mAttList->mType == fopAc_attn_JUEL_e && (!checkWolf() || static_cast<daTbox_c*>(field_0x27f4)->checkSmallTbox()))) { setDoStatus(6); - } else if (mAttList->mType == 7 && actor_name == PROC_KYTAG05) { + } else if (mAttList->mType == fopAc_attn_ETC_e && actor_name == PROC_KYTAG05) { setDoStatus(0x89); } else if (checkWolf()) { - if (mAttList->mType == 4 && !fopAcM_checkCarryNow(field_0x27f4) && + if (mAttList->mType == fopAc_attn_CARRY_e && !fopAcM_checkCarryNow(field_0x27f4) && fopAcM_CheckCarryType(field_0x27f4, fopAcM_CARRY_LIGHT)) { if (actor_name == PROC_B_MGN) { @@ -10251,21 +10250,21 @@ void daAlink_c::decideDoStatus() { } else if (mTargetedActor != NULL && fopAcM_GetName(mTargetedActor) == PROC_B_MGN && mAttention->getActionBtnB() != NULL && - mAttention->getActionBtnB()->mType == 4 && + mAttention->getActionBtnB()->mType == fopAc_attn_CARRY_e && mAttention->getActionBtnB()->getActor() == mTargetedActor) { setDoStatus(0x91); } else if (mTargetedActor != NULL && fopAcM_GetName(mTargetedActor) == PROC_E_YM && mAttention->getActionBtnB() != NULL && - mAttention->getActionBtnB()->mType == 7 && + mAttention->getActionBtnB()->mType == fopAc_attn_ETC_e && mAttention->getActionBtnB()->getActor() == mTargetedActor) { onEndResetFlg1(ERFLG1_UNK_100000); if (mWolfEyeUp != 0) { setWolfDigStatus(2); } - } else if (mAttList->mType == 7 && field_0x27f4 != NULL) { + } else if (mAttList->mType == fopAc_attn_ETC_e && field_0x27f4 != NULL) { if (actor_name == PROC_Obj_Digpl || actor_name == PROC_Obj_Digholl || actor_name == PROC_Obj_DigSnow || actor_name == PROC_Obj_Lv4DigSand || actor_name == PROC_E_YM) @@ -10290,7 +10289,7 @@ void daAlink_c::decideDoStatus() { } else { setTalkStatus(); } - } else if (mAttList->mType == 7) { + } else if (mAttList->mType == fopAc_attn_ETC_e) { if ((!checkMagicArmorHeavy() && (actor_name == PROC_HORSE || actor_name == PROC_E_WB) && checkReinRideBgCheck()) || @@ -10311,11 +10310,11 @@ void daAlink_c::decideDoStatus() { } } else if (mTargetedActor != NULL && checkGoatCatchActor(mTargetedActor) && mAttention->getActionBtnB() != NULL && - mAttention->getActionBtnB()->mType == 4 && + mAttention->getActionBtnB()->mType == fopAc_attn_CARRY_e && mAttention->getActionBtnB()->getActor() == mTargetedActor) { setDoStatus(0x91); - } else if (mAttList->mType == 4) { + } else if (mAttList->mType == fopAc_attn_CARRY_e) { if (!fopAcM_checkCarryNow(field_0x27f4)) { if (checkGoatCatchActor(field_0x27f4)) { setDoStatus(0x91); @@ -11357,7 +11356,7 @@ int daAlink_c::checkNormalAction() { } if (dComIfGp_getDoStatus() == 6) { - if (mAttList->mType == 5) { + if (mAttList->mType == fopAc_attn_DOOR_e) { if (!checkStageName("F_SP103") || !fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchBouDoor, NULL)) { diff --git a/src/d/actor/d_a_alink_swim.inc b/src/d/actor/d_a_alink_swim.inc index 7f9557943b..0544dc834b 100644 --- a/src/d/actor/d_a_alink_swim.inc +++ b/src/d/actor/d_a_alink_swim.inc @@ -349,7 +349,7 @@ int daAlink_c::checkNextActionSwim() { return 1; } - if (mAttList != NULL && mAttList->mType == 7 && checkNoResetFlg0(FLG0_SWIM_UP) && + if (mAttList != NULL && mAttList->mType == fopAc_attn_ETC_e && checkNoResetFlg0(FLG0_SWIM_UP) && fopAcM_GetName(field_0x27f4) == PROC_CANOE) { setDoStatus(0x17); diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index b61474dc19..da9bbff24b 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -270,8 +270,8 @@ void daArrow_c::setArrowAt(f32 param_0) { static_cast<cM3dGCps*>(&field_0x688)->Set(current.pos, target, radius); field_0x688.CalcAtVec(); - g_dComIfG_gameInfo.play.mCcs.Set(&field_0x688); // fake match: debug rom shows dComIfG_Ccsp() - g_dComIfG_gameInfo.play.mCcs.SetMass(&field_0x688, 1); // fake match: debug rom shows dComIfG_Ccsp() + dComIfG_Ccsp()->Set(&field_0x688); + dComIfG_Ccsp()->SetMass(&field_0x688, 1); } /* 8049A9CC-8049AC84 000E4C 02B8+00 2/2 0/0 0/0 .text arrowShooting__9daArrow_cFv */ diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index b6d5bebc6d..d87fece442 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -1275,8 +1275,7 @@ int daBoomerang_c::procMove() { if (!dComIfGp_event_runCheck()) { dComIfG_Ccsp()->Set(&m_windAtCyl); - g_dComIfG_gameInfo.play.mCcs.mMass_Mng.Set(&m_windAtCyl, 1); - //dComIfG_Ccsp()->SetMass(&m_windAtCyl, 1); + dComIfG_Ccsp()->SetMass(&m_windAtCyl, 1); } else { m_atCps.ResetAtHit(); m_windAtCyl.ResetAtHit(); diff --git a/src/d/actor/d_a_coach_fire.cpp b/src/d/actor/d_a_coach_fire.cpp index a3b9906404..4257401594 100644 --- a/src/d/actor/d_a_coach_fire.cpp +++ b/src/d/actor/d_a_coach_fire.cpp @@ -172,8 +172,6 @@ static int daCoachFire_Create(fopAc_ac_c* i_this) { /* 80658454-8065845A 00006C 0006+00 0/0 0/0 0/0 .rodata None */ static char* stringBase_80658454 = "Coach"; -/* 80658454-80658454 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ - /* 8065845C-8065847C -00001 0020+00 1/0 0/0 0/0 .data l_daCoachFire_Method */ static actor_method_class l_daCoachFire_Method = { (process_method_func)daCoachFire_Create, (process_method_func)daCoachFire_Delete, diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index 25d3aa6e97..be9481839e 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -2239,8 +2239,6 @@ static int daDoor20_Create(fopAc_ac_c* i_this) { return static_cast<daDoor20_c*>(i_this)->create(); } -/* 804668D8-804668D8 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ - /* 804672A0-804672C0 -00001 0020+00 1/0 0/0 0/0 .data l_daDoor20_Method */ static actor_method_class l_daDoor20_Method = { (process_method_func)daDoor20_Create, (process_method_func)daDoor20_Delete, diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index a4a2057e76..94195620b5 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -1683,8 +1683,6 @@ static cPhs__Step daE_GB_Create(fopAc_ac_c* a_this) { /* 806C6B94-806C6D34 004F94 01A0+00 1/1 0/0 0/0 .text __ct__10e_gb_classFv */ e_gb_class::e_gb_class() {} -/* 806C76B8-806C76B8 0001D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ - /* 806C784C-806C786C -00001 0020+00 1/0 0/0 0/0 .data l_daE_GB_Method */ static actor_method_class l_daE_GB_Method = { (process_method_func)daE_GB_Create, diff --git a/src/d/actor/d_a_e_nz.cpp b/src/d/actor/d_a_e_nz.cpp index 487b69f71d..83b0af47af 100644 --- a/src/d/actor/d_a_e_nz.cpp +++ b/src/d/actor/d_a_e_nz.cpp @@ -785,5 +785,3 @@ extern actor_process_profile_definition g_profile_E_NZ = { fopAc_ENEMY_e, // mActorType fopAc_CULLBOX_0_e, // cullType }; - -/* 8072C240-8072C240 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_oc.cpp b/src/d/actor/d_a_e_oc.cpp index 76504b6759..98aeff4da2 100644 --- a/src/d/actor/d_a_e_oc.cpp +++ b/src/d/actor/d_a_e_oc.cpp @@ -2904,5 +2904,3 @@ extern actor_process_profile_definition g_profile_E_OC = { }; AUDIO_INSTANCES; - -/* 80735D0C-80735D0C 0001E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_sh.cpp b/src/d/actor/d_a_e_sh.cpp index 60654a9972..952f8316b4 100644 --- a/src/d/actor/d_a_e_sh.cpp +++ b/src/d/actor/d_a_e_sh.cpp @@ -1303,5 +1303,3 @@ extern actor_process_profile_definition g_profile_E_SH = { fopAc_ENEMY_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80791EC0-80791EC0 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_yh.cpp b/src/d/actor/d_a_e_yh.cpp index 6a276d0b05..4b62175f17 100644 --- a/src/d/actor/d_a_e_yh.cpp +++ b/src/d/actor/d_a_e_yh.cpp @@ -2305,5 +2305,3 @@ extern actor_process_profile_definition g_profile_E_YH = { fopAc_ENEMY_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 808043DC-808043DC 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index 6cb87bfd54..e60d571f64 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -2451,8 +2451,8 @@ void daHorse_c::setCollision() { dComIfG_Ccsp()->Set(&m_tgco_cyl[0]); dComIfG_Ccsp()->Set(&m_tgco_cyl[1]); dComIfG_Ccsp()->Set(&m_tgco_cyl[2]); - g_dComIfG_gameInfo.play.mCcs.SetMass(&m_tgco_cyl[0], 1); // fakematch - g_dComIfG_gameInfo.play.mCcs.SetMass(&m_tgco_cyl[2], 1); // fakematch + dComIfG_Ccsp()->SetMass(&m_tgco_cyl[0], 1); + dComIfG_Ccsp()->SetMass(&m_tgco_cyl[2], 1); dComIfG_Ccsp()->Set(&m_head_sph); dComIfG_Ccsp()->Set(&m_boar_cyl); @@ -2461,7 +2461,7 @@ void daHorse_c::setCollision() { if (checkResetStateFlg0(RFLG0_UNK_20)) { dComIfG_Ccsp()->Set(&m_at_cyl); - g_dComIfG_gameInfo.play.mCcs.SetMass(&m_at_cyl, 1); // fakematch + dComIfG_Ccsp()->SetMass(&m_at_cyl, 1); } else { m_at_cyl.ResetAtHit(); } diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp index 628d902772..96aa10addf 100644 --- a/src/d/actor/d_a_nbomb.cpp +++ b/src/d/actor/d_a_nbomb.cpp @@ -704,7 +704,7 @@ BOOL daNbomb_c::procExplodeInit() { mExplodeMode = 0; mExplosionStrength = 0.0f; - mProcFunc = &procExplode; + mProcFunc = &daNbomb_c::procExplode; speedF = 0.0f; speed = cXyz::Zero; @@ -717,8 +717,8 @@ BOOL daNbomb_c::procExplodeInit() { mCcSph.OnAtSetBit(); mCcSph.SetR(player->getBombAtR()); mCcSph.SetC(current.pos); - g_dComIfG_gameInfo.play.mCcs.Set(&mCcSph); - g_dComIfG_gameInfo.play.mCcs.SetMass(&mCcSph, 1); + dComIfG_Ccsp()->Set(&mCcSph); + dComIfG_Ccsp()->SetMass(&mCcSph, 1); mSound.startSound(sound, 0, mSoundReverb); @@ -779,8 +779,8 @@ BOOL daNbomb_c::procExplode() { if (mExTime > -3) { mCcSph.SetC(current.pos); - g_dComIfG_gameInfo.play.mCcs.Set(&mCcSph); - g_dComIfG_gameInfo.play.mCcs.SetMass(&mCcSph, 1); + dComIfG_Ccsp()->Set(&mCcSph); + dComIfG_Ccsp()->SetMass(&mCcSph, 1); } } else { dKy_actor_addcol_set(0, 0, 0, 0); @@ -792,7 +792,7 @@ BOOL daNbomb_c::procExplode() { /* 804C93E0-804C955C 002700 017C+00 6/6 0/0 0/0 .text procCarryInit__9daNbomb_cFv */ BOOL daNbomb_c::procCarryInit() { - mProcFunc = &procCarry; + mProcFunc = &daNbomb_c::procCarry; offStateFlg0(FLG0_UNK_10000); field_0xc20 = cXyz::Zero; @@ -898,7 +898,7 @@ BOOL daNbomb_c::procWaitInit() { onStateFlg0(FLG0_UNK_20000); } - mProcFunc = &procWait; + mProcFunc = &daNbomb_c::procWait; fopAcM_SetParam(this, PRM_BOMB_WAIT); mCcSph.OnCoSetBit(); return true; @@ -1097,7 +1097,7 @@ BOOL daNbomb_c::procWait() { /* 804CA268-804CA2EC 003588 0084+00 1/1 0/0 0/0 .text procFlowerWaitInit__9daNbomb_cFv */ BOOL daNbomb_c::procFlowerWaitInit() { - mProcFunc = &procFlowerWait; + mProcFunc = &daNbomb_c::procFlowerWait; mCcSph.OnCoSetBit(); mCcSph.OffTgSetBit(); @@ -1135,11 +1135,11 @@ BOOL daNbomb_c::procFlowerWait() { /* 804CA3B8-804CA4E0 0036D8 0128+00 2/2 0/0 0/0 .text * procBoomerangMoveInit__9daNbomb_cFP12dCcD_GObjInf */ BOOL daNbomb_c::procBoomerangMoveInit(dCcD_GObjInf* unused) { - if (mProcFunc == &procBoomerangMove) { + if (mProcFunc == &daNbomb_c::procBoomerangMove) { return false; } - mProcFunc = &procBoomerangMove; + mProcFunc = &daNbomb_c::procBoomerangMove; if (fopAcM_GetParam(this) == PRM_FLOWER_BOMB || fopAcM_GetParam(this) == PRM_ENEMY_BOMB_BOOMERANG) @@ -1211,7 +1211,7 @@ BOOL daNbomb_c::procBoomerangMove() { /* 804CA688-804CA780 0039A8 00F8+00 2/2 0/0 0/0 .text procInsectMoveInit__9daNbomb_cFv */ BOOL daNbomb_c::procInsectMoveInit() { - mProcFunc = &procInsectMove; + mProcFunc = &daNbomb_c::procInsectMove; fopAcM_SetParam(this, PRM_INSECT_BOMB_MOVE); mpBck->init((J3DAnmTransform*)dComIfG_getObjectRes(daAlink_c::getAlinkArcName(), 0x14), TRUE, diff --git a/src/d/actor/d_a_npc.cpp b/src/d/actor/d_a_npc.cpp index 51d04925c8..7c698c4451 100644 --- a/src/d/actor/d_a_npc.cpp +++ b/src/d/actor/d_a_npc.cpp @@ -2715,7 +2715,7 @@ BOOL daNpcT_chkDoBtnIsSpeak(fopAc_ac_c* i_actor_p) { for (int i = 0; i < dComIfGp_getAttention()->GetActionCount(); i++) { if (dComIfGp_getAttention()->ActionTarget(i) == i_actor_p && dComIfGp_getAttention()->getActionBtnB() != NULL && - dComIfGp_getAttention()->getActionBtnB()->mType == 3) + dComIfGp_getAttention()->getActionBtnB()->mType == fopAc_attn_SPEAK_e) { ret = TRUE; } @@ -2724,7 +2724,7 @@ BOOL daNpcT_chkDoBtnIsSpeak(fopAc_ac_c* i_actor_p) { for (int i = 0; i < dComIfGp_getAttention()->GetLockonCount(); i++) { if (dComIfGp_getAttention()->LockonTarget(i) == i_actor_p && dComIfGp_getAttention()->getActionBtnB() != NULL && - dComIfGp_getAttention()->getActionBtnB()->mType == 1) + dComIfGp_getAttention()->getActionBtnB()->mType == fopAc_attn_TALK_e) { ret = TRUE; } diff --git a/src/d/actor/d_a_npc2.cpp b/src/d/actor/d_a_npc2.cpp index ab7f5e60be..da210f9892 100644 --- a/src/d/actor/d_a_npc2.cpp +++ b/src/d/actor/d_a_npc2.cpp @@ -229,7 +229,7 @@ void daBaseNpc_lookat_c::limitter(s16 i_value, s16* o_value_p, s16 i_max, s16 i_ /* 8014DBB4-8014E634 1484F4 0A80+00 0/0 0/0 1/1 .text * calc__18daBaseNpc_lookat_cFP10fopAc_ac_cPA4_fs */ -// regalloc, equivalent ? +// NONMATCHING - regalloc, equivalent ? (matches debug) void daBaseNpc_lookat_c::calc(fopAc_ac_c* param_0, Mtx param_1, s16 param_2) { if (mpAttnPos == NULL) { for (int i = 0; i < 4; i++) { diff --git a/src/d/actor/d_a_npc_cd.cpp b/src/d/actor/d_a_npc_cd.cpp index 13c2241fcc..45418dfe1d 100644 --- a/src/d/actor/d_a_npc_cd.cpp +++ b/src/d/actor/d_a_npc_cd.cpp @@ -1264,5 +1264,3 @@ daNpcCd_HIO_c::daNpcCd_HIO_c() { memcpy(&field_0x1648[i].field_0x124, a_prmTbl_W + i * 0x40, 0x40); } } - -/* 80392FE8-80392FE8 01F648 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_cd2.cpp b/src/d/actor/d_a_npc_cd2.cpp index 594495344e..6c4ec73ca9 100644 --- a/src/d/actor/d_a_npc_cd2.cpp +++ b/src/d/actor/d_a_npc_cd2.cpp @@ -182,7 +182,6 @@ SECTION_RODATA static anmTblPrm const l_objTbl[13] = { {"object", 14}, {"object", 12}, {"object", 6}, {"object", 7}, {"object", 10}, {"object", 11}, {"object", 15}, {"object", 16}, }; -COMPILER_STRIP_GATE(0x80393520, &l_objTbl); /* 80393588-803935F0 -00001 0068+00 1/1 0/0 0/0 .rodata l_objTWTbl */ static anmTblPrm const l_objTWTbl[13] = { @@ -220,7 +219,6 @@ SECTION_RODATA static anmTblPrm const l_bckTbl_W[54] = { {"Wspecial", -1}, {"Wspecial", -1}, {"Wgeneral", 12}, {"Wgeneral", 3}, {"Wgeneral", 4}, {"Wgeneral", 5}, {"Wgeneral", 6}, {"Wgeneral", 9}, {"Wgeneral", 15}, }; -COMPILER_STRIP_GATE(0x803937A0, &l_bckTbl_W); /* 80393950-80393994 01FFB0 0044+00 0/0 0/0 4/4 .rodata m_cylDat__10daNpcCd2_c */ dCcD_SrcCyl const daNpcCd2_c::m_cylDat = { diff --git a/src/d/actor/d_a_npc_cdn3.cpp b/src/d/actor/d_a_npc_cdn3.cpp index 75c411c267..5bc4306d42 100644 --- a/src/d/actor/d_a_npc_cdn3.cpp +++ b/src/d/actor/d_a_npc_cdn3.cpp @@ -1887,5 +1887,3 @@ extern actor_process_profile_definition g_profile_NPC_CD3 = { fopAc_NPC_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 8097F5AC-8097F5AC 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_chin.cpp b/src/d/actor/d_a_npc_chin.cpp index 99be9d5381..08ea6594cf 100644 --- a/src/d/actor/d_a_npc_chin.cpp +++ b/src/d/actor/d_a_npc_chin.cpp @@ -2242,5 +2242,3 @@ extern actor_process_profile_definition g_profile_NPC_CHIN = { fopAc_NPC_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80991D40-80991D40 000448 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_fish.cpp b/src/d/actor/d_a_npc_fish.cpp index 642ca4d716..88d0851c1e 100644 --- a/src/d/actor/d_a_npc_fish.cpp +++ b/src/d/actor/d_a_npc_fish.cpp @@ -180,5 +180,3 @@ extern actor_process_profile_definition g_profile_NPC_FISH = { fopAc_ACTOR_e, fopAc_CULLBOX_6_e, }; - -/* 805424DC-805424DC 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index 073ae46c45..afefc43866 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -7557,8 +7557,6 @@ static int daNpc_Ks_Create(fopAc_ac_c* a_this) { AUDIO_INSTANCES; -/* 80A5E438-80A5E438 00053C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ - /* 80A5FD74-80A5FD94 -00001 0020+00 1/0 0/0 0/0 .data l_daNpc_Ks_Method */ static actor_method_class l_daNpc_Ks_Method = { (process_method_func)daNpc_Ks_Create, diff --git a/src/d/actor/d_a_npc_mk.cpp b/src/d/actor/d_a_npc_mk.cpp index 2aa588f10a..8bef4c26b2 100644 --- a/src/d/actor/d_a_npc_mk.cpp +++ b/src/d/actor/d_a_npc_mk.cpp @@ -8,25 +8,6 @@ #include "d/actor/d_a_npc_mk.h" #include "dol2asm.h" -// -// Forward References: -// - -extern "C" static bool daNpc_Mk_Create__FPv(); -extern "C" static bool daNpc_Mk_Delete__FPv(); -extern "C" static bool daNpc_Mk_Execute__FPv(); -extern "C" static bool daNpc_Mk_Draw__FPv(); -extern "C" static bool daNpc_Mk_IsDelete__FPv(); - -// -// External References: -// - - -// -// Declarations: -// - /* 80A73DD8-80A73DE0 000078 0008+00 1/0 0/0 0/0 .text daNpc_Mk_Create__FPv */ static bool daNpc_Mk_Create(void* param_0) { return true; @@ -55,11 +36,11 @@ static bool daNpc_Mk_IsDelete(void* param_0) { /* ############################################################################################## */ /* 80A73E08-80A73E28 -00001 0020+00 1/0 0/0 0/0 .data daNpc_Mk_MethodTable */ static actor_method_class daNpc_Mk_MethodTable = { - (process_method_func)daNpc_Mk_Create__FPv, - (process_method_func)daNpc_Mk_Delete__FPv, - (process_method_func)daNpc_Mk_Execute__FPv, - (process_method_func)daNpc_Mk_IsDelete__FPv, - (process_method_func)daNpc_Mk_Draw__FPv, + (process_method_func)daNpc_Mk_Create, + (process_method_func)daNpc_Mk_Delete, + (process_method_func)daNpc_Mk_Execute, + (process_method_func)daNpc_Mk_IsDelete, + (process_method_func)daNpc_Mk_Draw, }; /* 80A73E28-80A73E58 -00001 0030+00 0/0 0/0 1/0 .data g_profile_NPC_MK */ diff --git a/src/d/actor/d_a_npc_p2.cpp b/src/d/actor/d_a_npc_p2.cpp index 13d441122d..ace2324b63 100644 --- a/src/d/actor/d_a_npc_p2.cpp +++ b/src/d/actor/d_a_npc_p2.cpp @@ -8,25 +8,6 @@ #include "d/actor/d_a_npc_p2.h" #include "dol2asm.h" -// -// Forward References: -// - -extern "C" static bool daNpc_P2Create__FPv(); -extern "C" static bool daNpc_P2Delete__FPv(); -extern "C" static bool daNpc_P2Execute__FPv(); -extern "C" static bool daNpc_P2Draw__FPv(); -extern "C" static bool daNpc_P2IsDelete__FPv(); - -// -// External References: -// - - -// -// Declarations: -// - /* 80A92BF8-80A92C00 000078 0008+00 1/0 0/0 0/0 .text daNpc_P2Create__FPv */ static bool daNpc_P2Create(void* param_0) { return true; @@ -55,11 +36,11 @@ static bool daNpc_P2IsDelete(void* param_0) { /* ############################################################################################## */ /* 80A92C28-80A92C48 -00001 0020+00 1/0 0/0 0/0 .data daNpc_P2MethodTable */ static actor_method_class daNpc_P2MethodTable = { - (process_method_func)daNpc_P2Create__FPv, - (process_method_func)daNpc_P2Delete__FPv, - (process_method_func)daNpc_P2Execute__FPv, - (process_method_func)daNpc_P2IsDelete__FPv, - (process_method_func)daNpc_P2Draw__FPv, + (process_method_func)daNpc_P2Create, + (process_method_func)daNpc_P2Delete, + (process_method_func)daNpc_P2Execute, + (process_method_func)daNpc_P2IsDelete, + (process_method_func)daNpc_P2Draw, }; /* 80A92C48-80A92C78 -00001 0030+00 0/0 0/0 1/0 .data g_profile_NPC_P2 */ diff --git a/src/d/actor/d_a_npc_seic.cpp b/src/d/actor/d_a_npc_seic.cpp index 02d0e2926f..1cfb261bee 100644 --- a/src/d/actor/d_a_npc_seic.cpp +++ b/src/d/actor/d_a_npc_seic.cpp @@ -548,5 +548,3 @@ extern actor_process_profile_definition g_profile_NPC_SEIC = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80AC92C8-80AC92C8 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_seid.cpp b/src/d/actor/d_a_npc_seid.cpp index 9dd687fdd6..3be182d7f5 100644 --- a/src/d/actor/d_a_npc_seid.cpp +++ b/src/d/actor/d_a_npc_seid.cpp @@ -521,8 +521,6 @@ static int daNpc_seiD_IsDelete(void* param_1) { return 1; } -/* 80ACB408-80ACB408 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ - /* 80ACB520-80ACB540 -00001 0020+00 1/0 0/0 0/0 .data daNpc_seiD_MethodTable */ static actor_method_class daNpc_seiD_MethodTable = { (process_method_func)daNpc_seiD_Create, diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index def5334c13..aae3b7edf6 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -3492,5 +3492,3 @@ extern actor_process_profile_definition g_profile_NPC_TARO = { fopAc_NPC_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80571908-80571908 000240 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_worm.cpp b/src/d/actor/d_a_npc_worm.cpp index a2bd997c0a..9a74f2b8cf 100644 --- a/src/d/actor/d_a_npc_worm.cpp +++ b/src/d/actor/d_a_npc_worm.cpp @@ -436,5 +436,3 @@ extern actor_process_profile_definition g_profile_NPC_WORM = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_0_e, // cullType }; - -/* 80B2F124-80B2F124 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_Turara.cpp b/src/d/actor/d_a_obj_Turara.cpp index 2b286c3271..559ec37499 100644 --- a/src/d/actor/d_a_obj_Turara.cpp +++ b/src/d/actor/d_a_obj_Turara.cpp @@ -471,5 +471,3 @@ extern actor_process_profile_definition g_profile_Obj_Turara = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80B9E970-80B9E970 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_TvCdlst.cpp b/src/d/actor/d_a_obj_TvCdlst.cpp index aa93f07629..60e7e5bd84 100644 --- a/src/d/actor/d_a_obj_TvCdlst.cpp +++ b/src/d/actor/d_a_obj_TvCdlst.cpp @@ -267,5 +267,3 @@ extern actor_process_profile_definition g_profile_Obj_TvCdlst = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80B9F8F4-80B9F8F4 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_Y_taihou.cpp b/src/d/actor/d_a_obj_Y_taihou.cpp index 6b04b07cd1..10011c131e 100644 --- a/src/d/actor/d_a_obj_Y_taihou.cpp +++ b/src/d/actor/d_a_obj_Y_taihou.cpp @@ -448,5 +448,3 @@ extern actor_process_profile_definition g_profile_Obj_Ytaihou = { }; AUDIO_INSTANCES; - -/* 80BA11D4-80BA11D4 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_automata.cpp b/src/d/actor/d_a_obj_automata.cpp index 019fbbd186..d1702e892b 100644 --- a/src/d/actor/d_a_obj_automata.cpp +++ b/src/d/actor/d_a_obj_automata.cpp @@ -359,5 +359,3 @@ extern actor_process_profile_definition g_profile_OBJ_AUTOMATA = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80BA6CA4-80BA6CA4 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_avalanche.cpp b/src/d/actor/d_a_obj_avalanche.cpp index ee2d1b733c..cb3d556457 100644 --- a/src/d/actor/d_a_obj_avalanche.cpp +++ b/src/d/actor/d_a_obj_avalanche.cpp @@ -350,5 +350,3 @@ extern actor_process_profile_definition g_profile_Obj_Avalanche = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80BA7D3C-80BA7D3C 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_batta.cpp b/src/d/actor/d_a_obj_batta.cpp index bf1fdac4c4..2e8cdcdc54 100644 --- a/src/d/actor/d_a_obj_batta.cpp +++ b/src/d/actor/d_a_obj_batta.cpp @@ -750,5 +750,3 @@ extern actor_process_profile_definition g_profile_Obj_Batta = { fopAc_ENV_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80BACA64-80BACA64 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_bhbridge.cpp b/src/d/actor/d_a_obj_bhbridge.cpp index 13379e8826..47db20da01 100644 --- a/src/d/actor/d_a_obj_bhbridge.cpp +++ b/src/d/actor/d_a_obj_bhbridge.cpp @@ -236,5 +236,3 @@ extern actor_process_profile_definition g_profile_Obj_Bhbridge = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80BB5F84-80BB5F84 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_bkdoor.cpp b/src/d/actor/d_a_obj_bkdoor.cpp index fdbca940e9..41082386e8 100644 --- a/src/d/actor/d_a_obj_bkdoor.cpp +++ b/src/d/actor/d_a_obj_bkdoor.cpp @@ -83,8 +83,6 @@ int daObjBkDoor_c::Create() { } /* ############################################################################################## */ -/* 80579538-80579538 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ - /* 80578EA0-80578F20 000200 0080+00 1/0 0/0 0/0 .text CreateHeap__13daObjBkDoor_cFv */ int daObjBkDoor_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[mOrientation]); diff --git a/src/d/actor/d_a_obj_bky_rock.cpp b/src/d/actor/d_a_obj_bky_rock.cpp index 0982d2cad1..1e77ff84e5 100644 --- a/src/d/actor/d_a_obj_bky_rock.cpp +++ b/src/d/actor/d_a_obj_bky_rock.cpp @@ -488,5 +488,3 @@ extern actor_process_profile_definition g_profile_BkyRock = { fopAc_ENV_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80BB8014-80BB8014 000164 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_bmWindow.cpp b/src/d/actor/d_a_obj_bmWindow.cpp index 999eb2c215..7a3d745702 100644 --- a/src/d/actor/d_a_obj_bmWindow.cpp +++ b/src/d/actor/d_a_obj_bmWindow.cpp @@ -381,5 +381,3 @@ extern actor_process_profile_definition g_profile_Obj_BmWindow = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80BB9800-80BB9800 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_bmshutter.cpp b/src/d/actor/d_a_obj_bmshutter.cpp index 69ced83024..1232a8b1c7 100644 --- a/src/d/actor/d_a_obj_bmshutter.cpp +++ b/src/d/actor/d_a_obj_bmshutter.cpp @@ -10,10 +10,6 @@ #include "d/d_com_inf_game.h" #include "d/d_lib.h" -// -// External References: -// - static const char* l_arcName = "K_saku00"; static const f32 l_cull_box[6] = {-200.f, -100.f, -200.f, 200.f, 100.f, 200.f}; @@ -24,10 +20,6 @@ static const Vec l_check_area[4] = { -250.0, 0.0, 100.0, // unknown }; -// -// Declarations: -// - /* 80BB9A58-80BB9AE4 000078 008C+00 1/1 0/0 0/0 .text initBaseMtx__11daObjBmSh_cFv */ void daObjBmSh_c::initBaseMtx() { mModel->setBaseScale(scale); @@ -325,11 +317,11 @@ int daObjBmSh_Create(fopAc_ac_c* i_this) { /* 80BBA8F8-80BBA918 -00001 0020+00 1/0 0/0 0/0 .data l_daObjBmSh_Method */ static actor_method_class l_daObjBmSh_Method = { - (process_method_func)daObjBmSh_Create, // daObjBmSh_Create__FP10fopAc_ac_c - (process_method_func)daObjBmSh_Delete, // daObjBmSh_Delete__FP11daObjBmSh_c - (process_method_func)daObjBmSh_Execute, // daObjBmSh_Execute__FP11daObjBmSh_c - NULL, // - (process_method_func)daObjBmSh_Draw, // daObjBmSh_Draw__FP11daObjBmSh_c + (process_method_func)daObjBmSh_Create, + (process_method_func)daObjBmSh_Delete, + (process_method_func)daObjBmSh_Execute, + NULL, + (process_method_func)daObjBmSh_Draw, }; /* 80BBA918-80BBA948 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_BoomShutter */ diff --git a/src/d/actor/d_a_obj_boumato.cpp b/src/d/actor/d_a_obj_boumato.cpp index 62f0e8b64d..3d1c9a5790 100644 --- a/src/d/actor/d_a_obj_boumato.cpp +++ b/src/d/actor/d_a_obj_boumato.cpp @@ -392,5 +392,3 @@ extern actor_process_profile_definition g_profile_OBJ_BOUMATO = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80BBC518-80BBC518 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_bubblePilar.cpp b/src/d/actor/d_a_obj_bubblePilar.cpp index 7461143047..08aaf49592 100644 --- a/src/d/actor/d_a_obj_bubblePilar.cpp +++ b/src/d/actor/d_a_obj_bubblePilar.cpp @@ -264,5 +264,3 @@ extern actor_process_profile_definition g_profile_Obj_awaPlar = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80BC40B4-80BC40B4 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_cb.cpp b/src/d/actor/d_a_obj_cb.cpp index 275eeb179b..ca16c428c9 100644 --- a/src/d/actor/d_a_obj_cb.cpp +++ b/src/d/actor/d_a_obj_cb.cpp @@ -266,5 +266,3 @@ extern actor_process_profile_definition g_profile_OBJ_CB = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_0_e, // cullType }; - -/* 80BC584C-80BC584C 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_cblock.cpp b/src/d/actor/d_a_obj_cblock.cpp index 9a3ce450bc..da41606dd3 100644 --- a/src/d/actor/d_a_obj_cblock.cpp +++ b/src/d/actor/d_a_obj_cblock.cpp @@ -459,5 +459,3 @@ extern actor_process_profile_definition g_profile_Obj_ChainBlock = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80BC6AC8-80BC6AC8 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_crvsteel.cpp b/src/d/actor/d_a_obj_crvsteel.cpp index 1a45adba53..ba303f4be2 100644 --- a/src/d/actor/d_a_obj_crvsteel.cpp +++ b/src/d/actor/d_a_obj_crvsteel.cpp @@ -187,5 +187,3 @@ extern actor_process_profile_definition g_profile_Obj_CRVSTEEL = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80BD623C-80BD623C 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_cwall.cpp b/src/d/actor/d_a_obj_cwall.cpp index 4c22994727..c472ee8905 100644 --- a/src/d/actor/d_a_obj_cwall.cpp +++ b/src/d/actor/d_a_obj_cwall.cpp @@ -901,5 +901,3 @@ extern actor_process_profile_definition g_profile_Obj_ChainWall = { }; AUDIO_INSTANCES - -/* 80BDA0AC-80BDA0AC 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_dmelevator.cpp b/src/d/actor/d_a_obj_dmelevator.cpp index 3265ce166f..2087699c25 100644 --- a/src/d/actor/d_a_obj_dmelevator.cpp +++ b/src/d/actor/d_a_obj_dmelevator.cpp @@ -153,7 +153,6 @@ static const char* l_eventName = "ELEVATOR_MOVE"; /* 80BDF970-80BDF974 -00001 0004+00 0/1 0/0 0/0 .data l_eventName2 */ static const char* l_eventName2 = "ELEVATOR_MOVE2"; -/* 80BDF8EC-80BDF8EC 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ static const char* l_staffName = "dmele"; /* 80BDDEFC-80BDE0A4 00067C 01A8+00 1/0 0/0 0/0 .text Create__17daObjDmElevator_cFv */ diff --git a/src/d/actor/d_a_obj_fallobj.cpp b/src/d/actor/d_a_obj_fallobj.cpp index 0f924d8684..32007d9154 100644 --- a/src/d/actor/d_a_obj_fallobj.cpp +++ b/src/d/actor/d_a_obj_fallobj.cpp @@ -461,5 +461,3 @@ extern actor_process_profile_definition g_profile_Obj_FallObj = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80BE4B14-80BE4B14 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_fan.cpp b/src/d/actor/d_a_obj_fan.cpp index 396b885e48..aa81a16ffc 100644 --- a/src/d/actor/d_a_obj_fan.cpp +++ b/src/d/actor/d_a_obj_fan.cpp @@ -383,5 +383,3 @@ extern actor_process_profile_definition g_profile_Obj_Fan = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80BE5E58-80BE5E58 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_fchain.cpp b/src/d/actor/d_a_obj_fchain.cpp index 7df40339c5..bf3ac7eae9 100644 --- a/src/d/actor/d_a_obj_fchain.cpp +++ b/src/d/actor/d_a_obj_fchain.cpp @@ -347,5 +347,3 @@ extern actor_process_profile_definition g_profile_Obj_Fchain = { fopAc_ENV_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80BE74CC-80BE74CC 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_firepillar2.cpp b/src/d/actor/d_a_obj_firepillar2.cpp index d36c61673f..a6a2659982 100644 --- a/src/d/actor/d_a_obj_firepillar2.cpp +++ b/src/d/actor/d_a_obj_firepillar2.cpp @@ -555,6 +555,3 @@ extern actor_process_profile_definition g_profile_Obj_FirePillar2 = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - - -/* 80BEB51C-80BEB51C 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_flag.cpp b/src/d/actor/d_a_obj_flag.cpp index 8d10d8fce8..c00b8ee6a5 100644 --- a/src/d/actor/d_a_obj_flag.cpp +++ b/src/d/actor/d_a_obj_flag.cpp @@ -345,5 +345,3 @@ extern actor_process_profile_definition g_profile_Obj_Flag = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80BEC554-80BEC554 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_flag2.cpp b/src/d/actor/d_a_obj_flag2.cpp index 95b876f37a..526491796e 100644 --- a/src/d/actor/d_a_obj_flag2.cpp +++ b/src/d/actor/d_a_obj_flag2.cpp @@ -560,5 +560,3 @@ extern actor_process_profile_definition g_profile_Obj_Flag2 = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80BEE1E8-80BEE1E8 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_flag3.cpp b/src/d/actor/d_a_obj_flag3.cpp index 97b09f1bb3..4936b3efba 100644 --- a/src/d/actor/d_a_obj_flag3.cpp +++ b/src/d/actor/d_a_obj_flag3.cpp @@ -554,5 +554,3 @@ extern actor_process_profile_definition g_profile_Obj_Flag3 = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80BF0554-80BF0554 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_gadget.cpp b/src/d/actor/d_a_obj_gadget.cpp index b0c583f8b8..d16d1dbb5e 100644 --- a/src/d/actor/d_a_obj_gadget.cpp +++ b/src/d/actor/d_a_obj_gadget.cpp @@ -666,5 +666,3 @@ extern actor_process_profile_definition g_profile_OBJ_GADGET = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80BF4A24-80BF4A24 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_gb.cpp b/src/d/actor/d_a_obj_gb.cpp index 36352da273..252a2de83f 100644 --- a/src/d/actor/d_a_obj_gb.cpp +++ b/src/d/actor/d_a_obj_gb.cpp @@ -259,5 +259,3 @@ extern actor_process_profile_definition g_profile_OBJ_GB = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80BF6DEC-80BF6DEC 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_gomikabe.cpp b/src/d/actor/d_a_obj_gomikabe.cpp index 590ae92c7e..928637f7d6 100644 --- a/src/d/actor/d_a_obj_gomikabe.cpp +++ b/src/d/actor/d_a_obj_gomikabe.cpp @@ -443,5 +443,3 @@ extern actor_process_profile_definition g_profile_Obj_GOMIKABE = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80BFFCF4-80BFFCF4 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp index 876989986e..d2a59b8bf8 100644 --- a/src/d/actor/d_a_obj_gra2.cpp +++ b/src/d/actor/d_a_obj_gra2.cpp @@ -2239,8 +2239,6 @@ daObj_GrA_c::MotionFunc daObj_GrA_c::mFaceMotionList[14] = { &daObj_GrA_c::face999, }; -/* 80C0FE14-80C0FE14 000398 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ - /* 80C10734-80C10754 -00001 0020+00 1/0 0/0 0/0 .data daObj_GrA_MethodTable */ static actor_method_class daObj_GrA_MethodTable = { (process_method_func)daObj_GrA_Create, diff --git a/src/d/actor/d_a_obj_gra_rock.cpp b/src/d/actor/d_a_obj_gra_rock.cpp index 5b60a6fa46..68e81a8209 100644 --- a/src/d/actor/d_a_obj_gra_rock.cpp +++ b/src/d/actor/d_a_obj_gra_rock.cpp @@ -347,5 +347,3 @@ extern actor_process_profile_definition g_profile_Obj_GraRock = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C12440-80C12440 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_groundwater.cpp b/src/d/actor/d_a_obj_groundwater.cpp index 8ca9c0c65a..9ab20c8c10 100644 --- a/src/d/actor/d_a_obj_groundwater.cpp +++ b/src/d/actor/d_a_obj_groundwater.cpp @@ -391,5 +391,3 @@ extern actor_process_profile_definition g_profile_GRDWATER = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C149F4-80C149F4 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_hhashi.cpp b/src/d/actor/d_a_obj_hhashi.cpp index 0b2dbd0d7e..feb8095e5c 100644 --- a/src/d/actor/d_a_obj_hhashi.cpp +++ b/src/d/actor/d_a_obj_hhashi.cpp @@ -429,5 +429,3 @@ extern actor_process_profile_definition g_profile_Obj_HHASHI = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 805815AC-805815AC 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_hsTarget.cpp b/src/d/actor/d_a_obj_hsTarget.cpp index 8ec4c37061..672c0c146b 100644 --- a/src/d/actor/d_a_obj_hsTarget.cpp +++ b/src/d/actor/d_a_obj_hsTarget.cpp @@ -9,7 +9,6 @@ #include "d/d_com_inf_game.h" #include "d/d_procname.h" -/* 80C1F8B0-80C1F8B0 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ static const char* l_resNameIdx[2] = {"hsMato", "L7HsMato"}; /* 80C1F42C-80C1F448 0000EC 001C+00 1/1 0/0 0/0 .text __ct__16daHsTarget_HIO_cFv */ diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp index 165a02cf12..2283dbccae 100644 --- a/src/d/actor/d_a_obj_ice_s.cpp +++ b/src/d/actor/d_a_obj_ice_s.cpp @@ -317,5 +317,3 @@ extern actor_process_profile_definition g_profile_Obj_Ice_s = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C21B8C-80C21B8C 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_inobone.cpp b/src/d/actor/d_a_obj_inobone.cpp index 71340374a2..45977ab960 100644 --- a/src/d/actor/d_a_obj_inobone.cpp +++ b/src/d/actor/d_a_obj_inobone.cpp @@ -231,7 +231,6 @@ int daObjIBone_c::execute() { return 1; } -/* 80C281C4-80C281C4 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ static const char* l_effbmdName = "BreakBoarBone.bmd"; // unused /* 80C27E48-80C27FEC 000808 01A4+00 1/1 0/0 0/0 .text setBreakEffect__12daObjIBone_cFv */ diff --git a/src/d/actor/d_a_obj_kago.cpp b/src/d/actor/d_a_obj_kago.cpp index a8ae029198..9b1e7568cb 100644 --- a/src/d/actor/d_a_obj_kago.cpp +++ b/src/d/actor/d_a_obj_kago.cpp @@ -676,8 +676,6 @@ static int daObj_Kago_IsDelete(void* param_1) { AUDIO_INSTANCES; -/* 80C33D94-80C33D94 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ - /* 80C33E24-80C33E44 -00001 0020+00 1/0 0/0 0/0 .data daObj_Kago_MethodTable */ static actor_method_class daObj_Kago_MethodTable = { (process_method_func)daObj_Kago_Create, diff --git a/src/d/actor/d_a_obj_kazeneko.cpp b/src/d/actor/d_a_obj_kazeneko.cpp index 982f63ea36..8ed6e88cd4 100644 --- a/src/d/actor/d_a_obj_kazeneko.cpp +++ b/src/d/actor/d_a_obj_kazeneko.cpp @@ -264,5 +264,3 @@ extern actor_process_profile_definition g_profile_Obj_KazeNeko = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C3D474-80C3D474 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_kbox.cpp b/src/d/actor/d_a_obj_kbox.cpp index 3cf24e6818..5b9f102db6 100644 --- a/src/d/actor/d_a_obj_kbox.cpp +++ b/src/d/actor/d_a_obj_kbox.cpp @@ -568,5 +568,3 @@ extern actor_process_profile_definition g_profile_OBJ_KBOX = { }; AUDIO_INSTANCES; - -/* 80C3F108-80C3F108 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_kita.cpp b/src/d/actor/d_a_obj_kita.cpp index 38ec2485c0..fc51c96d32 100644 --- a/src/d/actor/d_a_obj_kita.cpp +++ b/src/d/actor/d_a_obj_kita.cpp @@ -297,5 +297,3 @@ extern actor_process_profile_definition g_profile_OBJ_KITA = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C45F80-80C45F80 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_kuwagata.cpp b/src/d/actor/d_a_obj_kuwagata.cpp index 484e3400c1..de05ee059c 100644 --- a/src/d/actor/d_a_obj_kuwagata.cpp +++ b/src/d/actor/d_a_obj_kuwagata.cpp @@ -954,5 +954,3 @@ extern actor_process_profile_definition g_profile_Obj_Kuw = { fopAc_ENV_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C4D58C-80C4D58C 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_kznkarm.cpp b/src/d/actor/d_a_obj_kznkarm.cpp index 68ca85e5f7..702db0affa 100644 --- a/src/d/actor/d_a_obj_kznkarm.cpp +++ b/src/d/actor/d_a_obj_kznkarm.cpp @@ -497,5 +497,3 @@ extern actor_process_profile_definition g_profile_Obj_KznkArm = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C50D90-80C50D90 000088 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp index ff937d5d34..426be1f87c 100644 --- a/src/d/actor/d_a_obj_ladder.cpp +++ b/src/d/actor/d_a_obj_ladder.cpp @@ -14,100 +14,6 @@ #include "dol2asm.h" #include "f_op/f_op_actor_mng.h" -// -// Forward References: -// - -extern "C" void CreateHeap__Q211daObjLadder5Act_cFv(); -extern "C" void Create__Q211daObjLadder5Act_cFv(); -extern "C" void Mthd_Create__Q211daObjLadder5Act_cFv(); -extern "C" void __dt__14dBgS_ObjGndChkFv(); -extern "C" bool Delete__Q211daObjLadder5Act_cFv(); -extern "C" void Mthd_Delete__Q211daObjLadder5Act_cFv(); -extern "C" void demo_end_reset__Q211daObjLadder5Act_cFv(); -extern "C" void mode_wait_init__Q211daObjLadder5Act_cFv(); -extern "C" void mode_wait__Q211daObjLadder5Act_cFv(); -extern "C" void mode_demoreq_init__Q211daObjLadder5Act_cFv(); -extern "C" void mode_demoreq__Q211daObjLadder5Act_cFv(); -extern "C" void mode_vib_init__Q211daObjLadder5Act_cFv(); -extern "C" void mode_vib__Q211daObjLadder5Act_cFv(); -extern "C" void mode_drop_init__Q211daObjLadder5Act_cFv(); -extern "C" void mode_drop__Q211daObjLadder5Act_cFv(); -extern "C" void mode_fell_init__Q211daObjLadder5Act_cFv(); -extern "C" void mode_fell__Q211daObjLadder5Act_cFv(); -extern "C" void set_mtx__Q211daObjLadder5Act_cFv(); -extern "C" void init_mtx__Q211daObjLadder5Act_cFv(); -extern "C" void Execute__Q211daObjLadder5Act_cFPPA3_A4_f(); -extern "C" void Draw__Q211daObjLadder5Act_cFv(); -extern "C" static void func_8058DC5C(); -extern "C" static void func_8058DC7C(); -extern "C" static void func_8058DC9C(); -extern "C" static void func_8058DCBC(); -extern "C" static void func_8058DCE8(); -extern "C" void func_8058DD14(void* _this, fopAc_ac_c const*, daObjLadder::Act_c::Prm_e, - daObjLadder::Act_c::Prm_e); -extern "C" static void func_8058DD30(); -extern "C" static void func_8058DD38(); -extern "C" static void func_8058DD40(); -extern "C" u8 const M_arcname__Q211daObjLadder5Act_c[5 + 3 /* padding */]; -extern "C" u8 M_tmp_mtx__Q211daObjLadder5Act_c[48]; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void push__14mDoMtx_stack_cFv(); -extern "C" void pop__14mDoMtx_stack_cFv(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void posMoveF_stream__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzff(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void reset__14dEvt_control_cFv(); -extern "C" void getEventData__16dEvent_manager_cFs(); -extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc(); -extern "C" void endCheck__16dEvent_manager_cFs(); -extern "C" void StartShock__12dVibration_cFii4cXyz(); -extern "C" void GroundCross__4cBgSFP11cBgS_GndChk(); -extern "C" void dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__11dBgS_GndChkFv(); -extern "C" void __dt__11dBgS_GndChkFv(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void dKy_pol_sound_get__FPC13cBgS_PolyInfo(); -extern "C" void SetPos__11cBgS_GndChkFPC4cXyz(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" f32 Zero__4cXyz[3]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - struct Attr { /* 0x00 */ f32 field_0x00; /* 0x04 */ f32 field_0x04; diff --git a/src/d/actor/d_a_obj_lbox.cpp b/src/d/actor/d_a_obj_lbox.cpp index 1566a43050..a92a40525f 100644 --- a/src/d/actor/d_a_obj_lbox.cpp +++ b/src/d/actor/d_a_obj_lbox.cpp @@ -240,5 +240,3 @@ extern actor_process_profile_definition g_profile_OBJ_LBOX = { /* 80C53F98-80C53FA0 000B18 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ /* 80C53FA0-80C53FA8 000B20 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ - -/* 80C53FFC-80C53FFC 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv3saka00.cpp b/src/d/actor/d_a_obj_lv3saka00.cpp index 3554fef182..c550e276fb 100644 --- a/src/d/actor/d_a_obj_lv3saka00.cpp +++ b/src/d/actor/d_a_obj_lv3saka00.cpp @@ -182,5 +182,3 @@ extern actor_process_profile_definition g_profile_Obj_Lv3R10Saka = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C5C3DC-80C5C3DC 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv4chandelier.cpp b/src/d/actor/d_a_obj_lv4chandelier.cpp index ccde7a1b31..d9ffab9240 100644 --- a/src/d/actor/d_a_obj_lv4chandelier.cpp +++ b/src/d/actor/d_a_obj_lv4chandelier.cpp @@ -928,5 +928,3 @@ extern actor_process_profile_definition g_profile_Obj_Lv4Chan = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C66984-80C66984 000124 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv6Tenbin.cpp b/src/d/actor/d_a_obj_lv6Tenbin.cpp index 76c2e9ea0b..d058f007dc 100644 --- a/src/d/actor/d_a_obj_lv6Tenbin.cpp +++ b/src/d/actor/d_a_obj_lv6Tenbin.cpp @@ -398,5 +398,3 @@ extern actor_process_profile_definition g_profile_Obj_Lv6Tenbin = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C779FC-80C779FC 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv6swturn.cpp b/src/d/actor/d_a_obj_lv6swturn.cpp index a044ec737f..89b608e14e 100644 --- a/src/d/actor/d_a_obj_lv6swturn.cpp +++ b/src/d/actor/d_a_obj_lv6swturn.cpp @@ -396,5 +396,3 @@ extern actor_process_profile_definition g_profile_Obj_Lv6SwTurn = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C846C4-80C846C4 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_master_sword.cpp b/src/d/actor/d_a_obj_master_sword.cpp index f8b9a69b2b..8b3c6c2f16 100644 --- a/src/d/actor/d_a_obj_master_sword.cpp +++ b/src/d/actor/d_a_obj_master_sword.cpp @@ -278,5 +278,3 @@ extern actor_process_profile_definition g_profile_Obj_MasterSword = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C91970-80C91970 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_mhole.cpp b/src/d/actor/d_a_obj_mhole.cpp index c7229120dd..af48ccf6a7 100644 --- a/src/d/actor/d_a_obj_mhole.cpp +++ b/src/d/actor/d_a_obj_mhole.cpp @@ -429,5 +429,3 @@ extern actor_process_profile_definition g_profile_Obj_MHole = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C93E00-80C93E00 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_mie.cpp b/src/d/actor/d_a_obj_mie.cpp index 2e0979e693..b8b632c61a 100644 --- a/src/d/actor/d_a_obj_mie.cpp +++ b/src/d/actor/d_a_obj_mie.cpp @@ -566,5 +566,3 @@ extern actor_process_profile_definition g_profile_OBJ_MIE = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C95B80-80C95B80 0000D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_msima.cpp b/src/d/actor/d_a_obj_msima.cpp index dfe736eb62..655cbae71e 100644 --- a/src/d/actor/d_a_obj_msima.cpp +++ b/src/d/actor/d_a_obj_msima.cpp @@ -557,5 +557,3 @@ extern actor_process_profile_definition g_profile_OBJ_MSIMA = { }; AUDIO_INSTANCES; - -/* 80C9CDEC-80C9CDEC 0000A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_nan.cpp b/src/d/actor/d_a_obj_nan.cpp index ed2870e42e..cf14cb6156 100644 --- a/src/d/actor/d_a_obj_nan.cpp +++ b/src/d/actor/d_a_obj_nan.cpp @@ -784,5 +784,3 @@ extern actor_process_profile_definition g_profile_Obj_Nan = { fopAc_ENV_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80CA32A0-80CA32A0 0000E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_octhashi.cpp b/src/d/actor/d_a_obj_octhashi.cpp index 013ab862e4..5b7f6d3cc6 100644 --- a/src/d/actor/d_a_obj_octhashi.cpp +++ b/src/d/actor/d_a_obj_octhashi.cpp @@ -25,7 +25,6 @@ const static dCcD_SrcSph ccSphSrc = { } // mSphAttr }; -/* 80CA6550-80CA6550 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ static char* l_arcName[1] = { "Octhashi" }; @@ -429,5 +428,3 @@ extern actor_process_profile_definition g_profile_OCTHASHI = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80CA6550-80CA6550 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_pdoor.cpp b/src/d/actor/d_a_obj_pdoor.cpp index 20ef8dda5a..ec7f42579e 100644 --- a/src/d/actor/d_a_obj_pdoor.cpp +++ b/src/d/actor/d_a_obj_pdoor.cpp @@ -321,6 +321,3 @@ extern actor_process_profile_definition g_profile_Obj_PushDoor = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - - -/* 80CAAB40-80CAAB40 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_pdtile.cpp b/src/d/actor/d_a_obj_pdtile.cpp index 1fc9aa43ae..9f6026e00f 100644 --- a/src/d/actor/d_a_obj_pdtile.cpp +++ b/src/d/actor/d_a_obj_pdtile.cpp @@ -570,5 +570,3 @@ extern actor_process_profile_definition g_profile_Obj_PDtile = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80CAC580-80CAC580 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_rfHole.cpp b/src/d/actor/d_a_obj_rfHole.cpp index 3386fe0408..7737f1d5ed 100644 --- a/src/d/actor/d_a_obj_rfHole.cpp +++ b/src/d/actor/d_a_obj_rfHole.cpp @@ -245,5 +245,3 @@ extern actor_process_profile_definition g_profile_Obj_RfHole = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80CB9AC0-80CB9AC0 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_riverrock.cpp b/src/d/actor/d_a_obj_riverrock.cpp index ccf74d1299..e1263128e7 100644 --- a/src/d/actor/d_a_obj_riverrock.cpp +++ b/src/d/actor/d_a_obj_riverrock.cpp @@ -367,5 +367,3 @@ extern actor_process_profile_definition g_profile_Obj_RIVERROCK = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80CBDB14-80CBDB14 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp index 71f56f73b5..a6a07a69c5 100644 --- a/src/d/actor/d_a_obj_roten.cpp +++ b/src/d/actor/d_a_obj_roten.cpp @@ -215,5 +215,3 @@ extern actor_process_profile_definition g_profile_OBJ_ROTEN = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80CC1440-80CC1440 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_rstair.cpp b/src/d/actor/d_a_obj_rstair.cpp index 5b4d6c90da..b4259f6b81 100644 --- a/src/d/actor/d_a_obj_rstair.cpp +++ b/src/d/actor/d_a_obj_rstair.cpp @@ -420,5 +420,3 @@ extern actor_process_profile_definition g_profile_Obj_RotStair = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80CC2730-80CC2730 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_sakuita.cpp b/src/d/actor/d_a_obj_sakuita.cpp index 0264a400e7..4b8d546494 100644 --- a/src/d/actor/d_a_obj_sakuita.cpp +++ b/src/d/actor/d_a_obj_sakuita.cpp @@ -254,5 +254,3 @@ extern actor_process_profile_definition g_profile_Obj_Sakuita = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80CC5114-80CC5114 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_sakuita_rope.cpp b/src/d/actor/d_a_obj_sakuita_rope.cpp index 922387d665..6e861fda1a 100644 --- a/src/d/actor/d_a_obj_sakuita_rope.cpp +++ b/src/d/actor/d_a_obj_sakuita_rope.cpp @@ -429,5 +429,3 @@ extern actor_process_profile_definition g_profile_Obj_ItaRope = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80CC6970-80CC6970 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index 74922ea69a..1a6dec64a5 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -416,6 +416,3 @@ extern actor_process_profile_definition g_profile_Obj_Shield = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - - -/* 80CD832C-80CD832C 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_smtile.cpp b/src/d/actor/d_a_obj_smtile.cpp index 1db646892d..1ffcc74ae4 100644 --- a/src/d/actor/d_a_obj_smtile.cpp +++ b/src/d/actor/d_a_obj_smtile.cpp @@ -366,5 +366,3 @@ extern actor_process_profile_definition g_profile_OBJ_SMTILE = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80CDE388-80CDE388 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp index aca7bc7554..1f320d33f0 100644 --- a/src/d/actor/d_a_obj_so.cpp +++ b/src/d/actor/d_a_obj_so.cpp @@ -1096,8 +1096,6 @@ static int daObj_So_Create(fopAc_ac_c* a_this) { return phase; } -/* 80CE3B60-80CE3B60 000178 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ - /* 80CE3BBC-80CE3BDC -00001 0020+00 1/0 0/0 0/0 .data l_daObj_So_Method */ static actor_method_class l_daObj_So_Method = { (process_method_func)daObj_So_Create, diff --git a/src/d/actor/d_a_obj_stone.cpp b/src/d/actor/d_a_obj_stone.cpp index b794371370..edf2a96a5c 100644 --- a/src/d/actor/d_a_obj_stone.cpp +++ b/src/d/actor/d_a_obj_stone.cpp @@ -1108,5 +1108,3 @@ extern actor_process_profile_definition g_profile_Obj_Stone = { fopAc_ACTOR_e, // mActorType fopAc_CULLSPHERE_CUSTOM_e, // cullType }; - -/* 80CECC3C-80CECC3C 000188 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_stoneMark.cpp b/src/d/actor/d_a_obj_stoneMark.cpp index d0057665ea..fa0dfa2aff 100644 --- a/src/d/actor/d_a_obj_stoneMark.cpp +++ b/src/d/actor/d_a_obj_stoneMark.cpp @@ -88,8 +88,6 @@ static int daObjSMark_Create(fopAc_ac_c* i_this) { return static_cast<daObjSMark_c*>(i_this)->create(); } -/* 8059A404-8059A404 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ - /* ############################################################################################## */ /* 8059A414-8059A434 -00001 0020+00 1/0 0/0 0/0 .data l_daObjSMark_Method */ static actor_method_class l_daObjSMark_Method = { diff --git a/src/d/actor/d_a_obj_sw.cpp b/src/d/actor/d_a_obj_sw.cpp index ba034382e1..7637841038 100644 --- a/src/d/actor/d_a_obj_sw.cpp +++ b/src/d/actor/d_a_obj_sw.cpp @@ -831,8 +831,6 @@ static int daObj_Sw_Create(fopAc_ac_c* a_this) { return phase; } -/* 80CF30EC-80CF30EC 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ - /* 80CF3210-80CF3230 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Sw_Method */ static actor_method_class l_daObj_Sw_Method = { (process_method_func)daObj_Sw_Create, (process_method_func)daObj_Sw_Delete, diff --git a/src/d/actor/d_a_obj_swBallA.cpp b/src/d/actor/d_a_obj_swBallA.cpp index be66337df2..96a2989e06 100644 --- a/src/d/actor/d_a_obj_swBallA.cpp +++ b/src/d/actor/d_a_obj_swBallA.cpp @@ -393,5 +393,3 @@ extern actor_process_profile_definition g_profile_Obj_SwBallA = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80CF4410-80CF4410 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_swBallB.cpp b/src/d/actor/d_a_obj_swBallB.cpp index 86f5ad2048..1f1e62e856 100644 --- a/src/d/actor/d_a_obj_swBallB.cpp +++ b/src/d/actor/d_a_obj_swBallB.cpp @@ -457,5 +457,3 @@ extern actor_process_profile_definition g_profile_Obj_SwBallB = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80CF5A14-80CF5A14 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_swhang.cpp b/src/d/actor/d_a_obj_swhang.cpp index 4143ada5c7..900c5abcda 100644 --- a/src/d/actor/d_a_obj_swhang.cpp +++ b/src/d/actor/d_a_obj_swhang.cpp @@ -559,5 +559,3 @@ extern actor_process_profile_definition g_profile_Obj_SwHang = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80CFD274-80CFD274 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_swturn.cpp b/src/d/actor/d_a_obj_swturn.cpp index 246ec9f490..c798bf71ce 100644 --- a/src/d/actor/d_a_obj_swturn.cpp +++ b/src/d/actor/d_a_obj_swturn.cpp @@ -487,6 +487,3 @@ extern actor_process_profile_definition g_profile_Obj_SwTurn = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - - -/* 80D020B8-80D020B8 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_tatigi.cpp b/src/d/actor/d_a_obj_tatigi.cpp index 578fca0fd7..a2f3ad0b48 100644 --- a/src/d/actor/d_a_obj_tatigi.cpp +++ b/src/d/actor/d_a_obj_tatigi.cpp @@ -242,5 +242,3 @@ extern actor_process_profile_definition g_profile_OBJ_TATIGI = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80D08620-80D08620 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_ten.cpp b/src/d/actor/d_a_obj_ten.cpp index ce6e576b2a..e5e1016315 100644 --- a/src/d/actor/d_a_obj_ten.cpp +++ b/src/d/actor/d_a_obj_ten.cpp @@ -863,5 +863,3 @@ extern actor_process_profile_definition g_profile_Obj_Ten = { fopAc_ENV_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80D0B9E4-80D0B9E4 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_thdoor.cpp b/src/d/actor/d_a_obj_thdoor.cpp index 204bb91496..6043b9eeca 100644 --- a/src/d/actor/d_a_obj_thdoor.cpp +++ b/src/d/actor/d_a_obj_thdoor.cpp @@ -414,5 +414,3 @@ extern actor_process_profile_definition g_profile_Obj_TDoor = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80D0E620-80D0E620 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp index 5126deb1b5..021339eaeb 100644 --- a/src/d/actor/d_a_obj_toby.cpp +++ b/src/d/actor/d_a_obj_toby.cpp @@ -748,5 +748,3 @@ extern actor_process_profile_definition g_profile_OBJ_TOBY = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80D156B8-80D156B8 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_tobyhouse.cpp b/src/d/actor/d_a_obj_tobyhouse.cpp index 8faf971065..8b9607a8ea 100644 --- a/src/d/actor/d_a_obj_tobyhouse.cpp +++ b/src/d/actor/d_a_obj_tobyhouse.cpp @@ -661,5 +661,3 @@ extern actor_process_profile_definition g_profile_Obj_TobyHouse = { }; AUDIO_INSTANCES; - -/* 80D177C0-80D177C0 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_togeTrap.cpp b/src/d/actor/d_a_obj_togeTrap.cpp index e5a6f496c1..69b6dd1158 100644 --- a/src/d/actor/d_a_obj_togeTrap.cpp +++ b/src/d/actor/d_a_obj_togeTrap.cpp @@ -350,5 +350,3 @@ extern actor_process_profile_definition g_profile_Obj_TogeTrap = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80D18F08-80D18F08 000070 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp index fea30f10c7..c89c57a537 100644 --- a/src/d/actor/d_a_obj_tombo.cpp +++ b/src/d/actor/d_a_obj_tombo.cpp @@ -739,5 +739,3 @@ extern actor_process_profile_definition g_profile_Obj_Tombo = { fopAc_ENV_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80D1B7E8-80D1B7E8 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_tp.cpp b/src/d/actor/d_a_obj_tp.cpp index 15beae19a7..18ee9213f6 100644 --- a/src/d/actor/d_a_obj_tp.cpp +++ b/src/d/actor/d_a_obj_tp.cpp @@ -524,5 +524,3 @@ extern actor_process_profile_definition g_profile_OBJ_TP = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80D1EE98-80D1EE98 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_twGate.cpp b/src/d/actor/d_a_obj_twGate.cpp index c250ab6877..691dc7608c 100644 --- a/src/d/actor/d_a_obj_twGate.cpp +++ b/src/d/actor/d_a_obj_twGate.cpp @@ -258,5 +258,3 @@ extern actor_process_profile_definition g_profile_Obj_TwGate = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80D20554-80D20554 00024C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_volcbom.cpp b/src/d/actor/d_a_obj_volcbom.cpp index 30cdce0bec..f11c0f6e80 100644 --- a/src/d/actor/d_a_obj_volcbom.cpp +++ b/src/d/actor/d_a_obj_volcbom.cpp @@ -971,6 +971,3 @@ extern actor_process_profile_definition g_profile_Obj_VolcanicBomb = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - - -/* 80D26C0C-80D26C0C 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_wdStick.cpp b/src/d/actor/d_a_obj_wdStick.cpp index beb2b209f2..0fad1b0cd1 100644 --- a/src/d/actor/d_a_obj_wdStick.cpp +++ b/src/d/actor/d_a_obj_wdStick.cpp @@ -562,5 +562,3 @@ extern actor_process_profile_definition g_profile_Obj_WdStick = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80D34210-80D34210 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_wflag.cpp b/src/d/actor/d_a_obj_wflag.cpp index b4361103b9..8296a14e4f 100644 --- a/src/d/actor/d_a_obj_wflag.cpp +++ b/src/d/actor/d_a_obj_wflag.cpp @@ -216,7 +216,6 @@ static int daObj_Wflag_Create(fopAc_ac_c* i_this) { return rv; } -/* 80D378C0-80D378C0 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ static actor_method_class l_daObj_Wflag_Method = { (process_method_func)daObj_Wflag_Create, (process_method_func)daObj_Wflag_Delete, diff --git a/src/d/actor/d_a_obj_wind_stone.cpp b/src/d/actor/d_a_obj_wind_stone.cpp index fcf169e47d..17e399fa20 100644 --- a/src/d/actor/d_a_obj_wind_stone.cpp +++ b/src/d/actor/d_a_obj_wind_stone.cpp @@ -54,7 +54,6 @@ int daWindStone_c::createHeap() { SECTION_RODATA static u8 const lit_3760[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(0x80D38608, &lit_3760); /* 80D37C20-80D37E2C 0002A0 020C+00 1/1 0/0 0/0 .text create__13daWindStone_cFv */ int daWindStone_c::create() { diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp index d08109428e..b20d921c13 100644 --- a/src/d/actor/d_a_obj_wood_statue.cpp +++ b/src/d/actor/d_a_obj_wood_statue.cpp @@ -531,5 +531,3 @@ extern actor_process_profile_definition g_profile_Obj_WoodStatue = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80D3B6D4-80D3B6D4 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_yel_bag.cpp b/src/d/actor/d_a_obj_yel_bag.cpp index 7945711335..21ee47accb 100644 --- a/src/d/actor/d_a_obj_yel_bag.cpp +++ b/src/d/actor/d_a_obj_yel_bag.cpp @@ -568,5 +568,3 @@ extern actor_process_profile_definition g_profile_OBJ_YBAG = { }; AUDIO_INSTANCES; - -/* 80D3DD6C-80D3DD6C 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_peru.cpp b/src/d/actor/d_a_peru.cpp index b766e0b8ab..64dfcb6534 100644 --- a/src/d/actor/d_a_peru.cpp +++ b/src/d/actor/d_a_peru.cpp @@ -1302,5 +1302,3 @@ extern actor_process_profile_definition g_profile_PERU = { fopAc_NPC_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80D4C1B0-80D4C1B0 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_ppolamp.cpp b/src/d/actor/d_a_ppolamp.cpp index a33bd82510..6eeca6dbad 100644 --- a/src/d/actor/d_a_ppolamp.cpp +++ b/src/d/actor/d_a_ppolamp.cpp @@ -216,5 +216,3 @@ extern actor_process_profile_definition g_profile_PPolamp = { }; AUDIO_INSTANCES; - -/* 80D4D2C8-80D4D2C8 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_spinner.cpp b/src/d/actor/d_a_spinner.cpp index 21c2d10272..5e817b955e 100644 --- a/src/d/actor/d_a_spinner.cpp +++ b/src/d/actor/d_a_spinner.cpp @@ -903,7 +903,7 @@ int daSpinner_c::execute() { mCyl.MoveCAt(current.pos); dComIfG_Ccsp()->Set(&mCyl); - g_dComIfG_gameInfo.play.mCcs.mMass_Mng.Set(&mCyl, 1); + dComIfG_Ccsp()->SetMass(&mCyl, 1); if (reflectAccept()) { if (mpPathMove != NULL) { diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index 219ca5dc6a..7cb3fda6ca 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/src/d/actor/d_a_swc00.cpp @@ -366,5 +366,3 @@ extern actor_process_profile_definition g_profile_SWC00 = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_0_e, // cullType }; - -/* 805A1DAC-805A1DAC 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_tag_TWgate.cpp b/src/d/actor/d_a_tag_TWgate.cpp index 8a7c2690d1..f3e52dfcc3 100644 --- a/src/d/actor/d_a_tag_TWgate.cpp +++ b/src/d/actor/d_a_tag_TWgate.cpp @@ -1121,5 +1121,3 @@ extern actor_process_profile_definition g_profile_Tag_TWGate = { fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, }; - -/* 80D55848-80D55848 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_tag_river_back.cpp b/src/d/actor/d_a_tag_river_back.cpp index d13889917b..004f366960 100644 --- a/src/d/actor/d_a_tag_river_back.cpp +++ b/src/d/actor/d_a_tag_river_back.cpp @@ -195,5 +195,3 @@ extern actor_process_profile_definition g_profile_Tag_RiverBack = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80D5F950-80D5F950 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_debug_viewer.cpp b/src/d/d_debug_viewer.cpp index 9f734dc355..f34328afc0 100644 --- a/src/d/d_debug_viewer.cpp +++ b/src/d/d_debug_viewer.cpp @@ -121,8 +121,8 @@ static bool reportOK() { static JUtility::TColor ShadowDarkColor(0, 0, 0, 0x80); static JUtility::TColor ShadowLightColor(0xFF, 0xFF, 0xFF, 0x80); -// NONMATCHING - string being put in stack instead of register int dDbVw_Report(int x, int y, char const* string, ...) { + string; char buffer[256]; if (reportOK()) { diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 60d5cb5606..b2ce06b7fe 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -23,12 +23,13 @@ jstudio_tAdaptor_message::~jstudio_tAdaptor_message() {} void jstudio_tAdaptor_message::adaptor_do_MESSAGE(JStudio::data::TEOperationData iType, const void* pContent, u32 uSize) { switch (iType) { - case JStudio::data::UNK_0x19: + case JStudio::data::UNK_0x19: { JUT_ASSERT(107, pContent!=NULL); JUT_ASSERT(108, uSize==4); u32 content = *(u32*)pContent; dMsgObject_setDemoMessage(content); break; + } default: #ifdef DEBUG JGadget_outMessage msg(JGadget_outMessage::warning, __FILE__, 124); @@ -281,7 +282,6 @@ static void* dDemo_getJaiPointer(char const* arcName, u32 anmID, int param_2, u1 /* 80038518-800387A8 032E58 0290+00 0/0 0/0 2/2 .text * dDemo_setDemoData__FP10fopAc_ac_cUcP14mDoExt_McaMorfPCciPUsUlSc */ -// NONMATCHING - reg alloc int dDemo_setDemoData(fopAc_ac_c* i_actor, u8 i_flags, mDoExt_McaMorf* i_morf, char const* i_arcName, int param_4, u16* param_5, u32 param_6, s8 i_reverb) { dDemo_actor_c* demo_actor = dDemo_c::getActor(i_actor->demoActorID); diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index b9640b2539..58ae8d335c 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -527,7 +527,6 @@ static BOOL forward_overhead_bg_chk(cXyz* ppos, f32 dist) { } /* 8005D18C-8005E8B0 057ACC 1724+00 0/0 1/1 0/0 .text dKyr_rain_move__Fv */ -// NONMATCHING reg alloc, equivalent? void dKyr_rain_move() { dKankyo_rain_Packet* rain_packet; camera_class* camera; @@ -5344,7 +5343,6 @@ void dKyr_odour_move() { } /* 8006BE0C-8006C790 06674C 0984+00 0/0 1/1 0/0 .text dKyr_odour_draw__FPA4_fPPUc */ -// NONMATCHING - regalloc void dKyr_odour_draw(Mtx drawMtx, u8** tex) { dScnKy_env_light_c* envlight = dKy_getEnvlight(); dKankyo_odour_Packet* odour_packet = envlight->mOdourData.mpOdourPacket; diff --git a/src/d/d_kantera_icon_meter.cpp b/src/d/d_kantera_icon_meter.cpp index 3c62e4dd82..dd1f387f33 100644 --- a/src/d/d_kantera_icon_meter.cpp +++ b/src/d/d_kantera_icon_meter.cpp @@ -75,5 +75,3 @@ void dDlst_KanteraIcon_c::draw() { /* 801AED1C-801AED64 1A965C 0048+00 1/0 0/0 0/0 .text __dt__19dDlst_KanteraIcon_cFv */ dDlst_KanteraIcon_c::~dDlst_KanteraIcon_c() {} - -/* 80394F50-80394F50 0215B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_menu_fmap_map.cpp b/src/d/d_menu_fmap_map.cpp index e49c9b9735..67e662224c 100644 --- a/src/d/d_menu_fmap_map.cpp +++ b/src/d/d_menu_fmap_map.cpp @@ -424,24 +424,31 @@ void dMenu_FmapMap_c::_delete() { const dMfm_HIO_prm_res_src_s dMfm_HIO_prm_res_src_s::m_other = {30}; /* 801CEE94-801CF0B4 1C97D4 0220+00 1/0 0/0 0/0 .text draw__15dMenu_FmapMap_cFv */ -// NONMATCHING instructions out of order void dMenu_FmapMap_c::draw() { - f32 fVar3 = mFlashTimer < dMfm_HIO_prm_res_src_s::m_other.mFlashDuration / 2 ? - (f32)(dMfm_HIO_prm_res_src_s::m_other.mFlashDuration / 2 - mFlashTimer) - / (f32)(dMfm_HIO_prm_res_src_s::m_other.mFlashDuration / 2) : - (f32)(mFlashTimer - dMfm_HIO_prm_res_src_s::m_other.mFlashDuration / 2) - / (f32)(dMfm_HIO_prm_res_src_s::m_other.mFlashDuration / 2); - setPointColor(1.0f - fVar3); + { int unused; } + + f32 f30 = 0.0f; + if (mFlashTimer < dMfm_HIO_prm_res_src_s::m_other.mFlashDuration / 2) { + f30 = + (int)(dMfm_HIO_prm_res_src_s::m_other.mFlashDuration / 2 - mFlashTimer) / + (f32)(int)(dMfm_HIO_prm_res_src_s::m_other.mFlashDuration / 2); + } else { + f30 = + (int)(mFlashTimer - dMfm_HIO_prm_res_src_s::m_other.mFlashDuration / 2) / + (f32)(int)(dMfm_HIO_prm_res_src_s::m_other.mFlashDuration / 2); + } + setPointColor(1.0f - f30); GXColor color; - f32 fVar4 = getRateWithFrameCount(m_res->field_0x168); - f32 fVar5 = cM_ssin(fVar4 * 0x10000 - 0x8000) * 0.5f + 0.5f; - twoColorLineInterporation(m_res->field_0xd8, m_res->field_0xdc, fVar5, color); + f32 f31; + f31 = getRateWithFrameCount(m_res->field_0x168); + f31 = cM_ssin(f31 * 0x10000 - 0x8000) * 0.5f + 0.5f; + twoColorLineInterporation(m_res->field_0xd8, m_res->field_0xdc, f31, color); setFmapPaletteColor(PALETTE_19, color); - f32 fVar6 = getRateWithFrameCount(m_res->field_0x16a); - f32 fVar7 = cM_ssin(fVar6 * 0x10000 - 0x8000) * 0.5f + 0.5f; - twoColorLineInterporation(m_res->field_0xe0, m_res->field_0xe4, fVar7, color); + f31 = getRateWithFrameCount(m_res->field_0x16a); + f31 = cM_ssin(f31 * 0x10000 - 0x8000) * 0.5f + 0.5f; + twoColorLineInterporation(m_res->field_0xe0, m_res->field_0xe4, f31, color); setFmapPaletteColor(PALETTE_1A, color); renderingMap(); diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index f421607502..547eb68a1d 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -415,7 +415,6 @@ int dMsgObject_c::_create(msg_class* param_1) { return 4; } -/* 80399660-80399660 025CC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ #pragma push #pragma force_active on SECTION_DEAD static char const* const stringBase_80399660 = "zel_00.bmg"; diff --git a/src/d/d_msg_scrn_howl.cpp b/src/d/d_msg_scrn_howl.cpp index eeb27a5892..33e10f425b 100644 --- a/src/d/d_msg_scrn_howl.cpp +++ b/src/d/d_msg_scrn_howl.cpp @@ -1094,6 +1094,3 @@ u8 dMsgScrnHowl_c::getGuideDataType(int param_0) { } return 0; } - - -/* 80399A20-80399A20 026080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_msg_scrn_item.cpp b/src/d/d_msg_scrn_item.cpp index 7fb6a43e63..8e29f2279a 100644 --- a/src/d/d_msg_scrn_item.cpp +++ b/src/d/d_msg_scrn_item.cpp @@ -697,5 +697,3 @@ bool dMsgScrnItem_c::isOugiID() { } return false; } - -/* 80399990-80399990 025FF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_msg_scrn_talk.cpp b/src/d/d_msg_scrn_talk.cpp index a693e07bf5..cd9f5131cd 100644 --- a/src/d/d_msg_scrn_talk.cpp +++ b/src/d/d_msg_scrn_talk.cpp @@ -549,6 +549,3 @@ void dMsgScrnTalk_c::fukiPosCalc(u8 param_1) { mpMg_c[1]->translate(local_b8.x + field_0xf4, local_b8.y); } } - - -/* 80399BB0-80399BB0 026210 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_msg_string_base.cpp b/src/d/d_msg_string_base.cpp index 253a87e781..cd1a506ab1 100644 --- a/src/d/d_msg_string_base.cpp +++ b/src/d/d_msg_string_base.cpp @@ -200,5 +200,3 @@ void dMsgStringBase_c::drawOutFontLocal(J2DTextBox* param_0, f32 param_1) { /* ############################################################################################## */ /* 80399CA3-80399CB0 026303 0008+05 0/0 0/0 0/0 .rodata None */ static char const* const stringBase_80399CA3 = "\x1B" "CR[%d]"; - -/* 80399C98-80399C98 0262F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ |