mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-23 06:54:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Misc fixes (#2860)

Browse Source 
* 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
This commit is contained in:
LagoLunatic
2025-11-25 11:32:34 -05:00
committed by GitHub
parent cd3d634133
commit 2f2f37a734
156 changed files with 209 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/ShieldD/splits.txt
+2 -2
View File
@@ -884,7 +884,7 @@ CaptureScreen.cpp:
d/d_debug_viewer.cpp:
.text start:0x80119B80 end:0x8011A610
.ctors start:0x8062F83C end:0x8062F840
.sbss start:0x8074C848 end:0x8074C85C
.sbss start:0x8074C848 end:0x8074C858
.bss start:0x807B4F40 end:0x807B5EE0
d/d_debug_pad.cpp:
@@ -892,7 +892,7 @@ d/d_debug_pad.cpp:
.ctors start:0x8062F840 end:0x8062F844
.rodata start:0x80646EB8 end:0x80646EE0
.data start:0x806A3990 end:0x806A39D8
.sbss start:0x8074C85C end:0x8074C868
.sbss start:0x8074C858 end:0x8074C868
d/d_debug_camera.cpp:
.text start:0x8011AAC0 end:0x80122210
configure.py
+3 -3
View File
@@ -677,7 +677,7 @@ config.libs = [
Object(MatchingFor(ALL_GCN), "d/d_model.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_eye_hl.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_error_msg.cpp"),
Object(NonMatching, "d/d_debug_viewer.cpp"),
Object(Equivalent, "d/d_debug_viewer.cpp"), # debug weak func order
Object(NonMatching, "d/d_debug_camera.cpp"),
Object(NonMatching, "d/actor/d_a_alink.cpp"),
Object(MatchingFor(ALL_GCN), "d/actor/d_a_itembase.cpp"),
@@ -714,7 +714,7 @@ config.libs = [
Object(MatchingFor(ALL_GCN), "d/d_menu_map_common.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_menu_fishing.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_menu_fmap.cpp"),
Object(NonMatching, "d/d_menu_fmap_map.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_menu_fmap_map.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_menu_fmap2D.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_menu_insect.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_menu_item_explain.cpp"),
@@ -1042,7 +1042,7 @@ config.libs = [
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SoundObjMgr.cpp"),
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2Creature.cpp"),
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2LinkMgr.cpp"),
Object(NonMatching, "Z2AudioLib/Z2EnvSeMgr.cpp"),
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2EnvSeMgr.cpp"),
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2WolfHowlMgr.cpp"),
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SpeechMgr2.cpp"),
Object(NonMatching, "Z2AudioLib/Z2AudioMgr.cpp"),
include/JSystem/JAudio2/JAISound.h
+1 -1
View File
@@ -15,7 +15,7 @@ public:
JAISoundID(u32 pId) { mId.mFullId = pId; };
JAISoundID(JAISoundID const& other) { mId = other.mId; };
JAISoundID(JAISoundID const& other) { mId.mFullId = other.mId.mFullId; };
JAISoundID() {}
include/JSystem/JAudio2/JAUStreamAramMgr.h
+1
View File
@@ -6,6 +6,7 @@
#include "JSystem/JAudio2/JASHeapCtrl.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "bitset.h"
#include <stdint.h>
/**
* @ingroup jsystem-jaudio
include/JSystem/JGadget/linklist.h
+5 -1
View File
@@ -146,7 +146,11 @@ struct TLinkList : public TNodeLinkList {
friend bool operator!=(iterator a, iterator b) { return !(a == b); }
T* operator->() const { return Element_toValue(base.operator->()); }
T& operator*() const { return *operator->(); }
T& operator*() const {
T* p = operator->();
JUT_ASSERT(541, p!=NULL);
return *p;
}
typedef s32 difference_type;
typedef T value_type;
include/m_Do/m_Do_lib.h
+1 -1
View File
@@ -38,7 +38,7 @@ struct mDoLib_clipper {
};
void mDoLib_project(Vec* src, Vec* dst);
u8 mDoLib_setResTimgObj(ResTIMG const* res, GXTexObj* o_texObj, u32 tlut_name,
u32 mDoLib_setResTimgObj(ResTIMG const* res, GXTexObj* o_texObj, u32 tlut_name,
GXTlutObj* o_tlutObj);
void mDoLib_pos2camera(Vec* src, Vec* dst);
include/m_Do/m_Do_mtx.h
+1 -1
View File
@@ -37,7 +37,7 @@ inline void cMtx_scale(Mtx m, f32 x, f32 y, f32 z) {
}
inline void mDoMtx_multVec(CMtxP m, const Vec* src, Vec* dst) {
MTXMultVec(m, src, dst);
PSMTXMultVec(m, src, dst);
}
inline void mDoMtx_multVecArray(Mtx m, const Vec* src, Vec* dst, u32 count) {
src/JSystem/J2DGraph/J2DTextBoxEx.cpp
-2
View File
@@ -596,5 +596,3 @@ void J2DTextBoxEx::setAnimation(J2DAnmVtxColor* param_0) {
void J2DTextBoxEx::setAnimation(J2DAnmBase* anm) {
J2DPane::setAnimation(anm);
}
/* 803A1DF0-803A1DF0 02E450 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
-2
View File
@@ -116,5 +116,3 @@ void J3DClusterLoader_v15::readCluster(const J3DClusterBlock* block) {
DCStoreRange(arr, vtxPosSize);
}
/* 803A2098-803A2098 02E6F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
-2
View File
@@ -341,5 +341,3 @@ u32 J3DModelLoader::calcSizeMaterialDL(const J3DMaterialDLBlock* block, u32 flag
}
return size;
}
/* 803A20E8-803A20E8 02E748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/JSystem/J3DU/J3DUClipper.cpp
-2
View File
@@ -172,5 +172,3 @@ static char const* const stringBase_8039A9B8 = " J3DUClipper::mNear = %f";
/* 8039A9D1-8039A9F0 027031 0018+07 0/0 0/0 0/0 .rodata None */
static char const* const stringBase_8039A9D1 = " J3DUClipper::mFar = %f";
/* 8039A984-8039A984 026FE4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/JSystem/JAudio2/JASAiCtrl.cpp
-2
View File
@@ -364,5 +364,3 @@ void JASDriver::mixInterleaveTrack(s16* buffer, u32 param_1, MixCallback param_2
u32 JASDriver::getSubFrameCounter() {
return sSubFrameCounter;
}
/* 8039B2F0-8039B2F0 027950 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/JSystem/JAudio2/JASAudioThread.cpp
-2
View File
@@ -122,5 +122,3 @@ void JASAudioThread::DSPCallback(void*) {
}
}
}
/* 8039B338-8039B338 027998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/JSystem/JAudio2/JASTrack.cpp
+1 -1
View File
@@ -799,7 +799,7 @@ void JASTrack::TList::append(JASTrack* i_track) {
}
/* 8029301C-802930DC 28D95C 00C0+00 1/1 0/0 0/0 .text seqMain__Q28JASTrack5TListFv */
// NONMATCHING missing load instruction
// NONMATCHING - missing load instruction (matches debug, equivalent)
void JASTrack::TList::seqMain() {
iterator it, it2;
for (it = begin(); it != end(); it = it2) {
src/JSystem/JKernel/JKRAramStream.cpp
-1
View File
@@ -67,7 +67,6 @@ s32 JKRAramStream::readFromAram() {
}
/* ############################################################################################## */
/* 8039D120-8039D120 029780 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) {
u32 dstSize = command->mSize;
u32 offset = command->mOffset;
src/JSystem/JStudio/JStudio_JStage/object-light.cpp
+2 -1
View File
@@ -108,7 +108,7 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_update(u32 param_1) {
JStudio::TControl::TTransform_position_direction aTStack_1b0;
adaptor_getVariableValue_Vec(&VStack_198.position, sauVariableValue_3_POSITION_XYZ);
switch (field_0x11c) {
case 1:
case 1: {
f32 dVar10 = adaptor_getVariableValue(10)->getValue();
f32 dVar11 = adaptor_getVariableValue(11)->getValue();
f32 temp = MTXDegToRad(dVar11);
@@ -119,6 +119,7 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_update(u32 param_1) {
VStack_198.direction.y = sinVal;
VStack_198.direction.z = dVar12 * i_cosf(temp2);
break;
}
case 2:
Vec VStack_1c0;
adaptor_getVariableValue_Vec(&VStack_1c0, sauVariableValue_3_TARGET_POSITION_XYZ);
src/JSystem/JUtility/JUTResFont.cpp
-2
View File
@@ -468,5 +468,3 @@ int JUTResFont::convertSjis(int inChr, u16* inLead) const {
return tmp2 + (tmp - 0x88) * 0xbc + -0x5e + lead;
}
/* 8039D45C-8039D45C 029ABC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/Z2AudioLib/Z2AudioMgr.cpp
-1
View File
@@ -32,7 +32,6 @@ Z2AudioMgr::Z2AudioMgr() : mSoundStarter(true) {
/* 802CD34C-802CD7F8 2C7C8C 04AC+00 0/0 1/1 0/0 .text
* init__10Z2AudioMgrFP12JKRSolidHeapUlPvP10JKRArchive */
// NONMATCHING JASPoolAllocObject<_> locations
void Z2AudioMgr::init(JKRSolidHeap* param_0, u32 param_1, void* param_2, JKRArchive* param_3) {
JAU_JASInitializer stack_60;
stack_60.field_0x04 = param_1;
src/Z2AudioLib/Z2EnvSeMgr.cpp
+40 -43
View File
@@ -973,7 +973,6 @@ void Z2EnvSeMgr::setHyrulSewerOpen(bool param_0) {
}
/* 802C8300-802C8730 2C2C40 0430+00 2/1 1/1 0/0 .text startRiverSe__10Z2EnvSeMgrFSc */
// NONMATCHING JAISound stack issues
bool Z2EnvSeMgr::startRiverSe(s8 param_1) {
#ifdef DEBUG
char* spotName = sSpotName;
@@ -990,14 +989,7 @@ bool Z2EnvSeMgr::startRiverSe(s8 param_1) {
break;
}
case 8:
// fake match: should be 2000.0f according to debug, but that generates an extra entry in sdata2
if ((Z2GetStatusMgr()->mPolygonPosition.y >
#ifdef DEBUG
2000.0f
#else
-14500.0f
#endif
)) {
if ((Z2GetStatusMgr()->mPolygonPosition.y > 2000.0f)) {
break;
}
case 0x15:
@@ -1013,64 +1005,70 @@ bool Z2EnvSeMgr::startRiverSe(s8 param_1) {
if (mRiverSeMgr.getPosCount() < 0) {
return false;
}
JAISoundID aJStack_742 = 0xffffffff;
bool uVar8 = false;
f32 dVar16 = param_1 / 127.0f;
f32 dVar18 = field_0x1ac * mRiverSeMgr.getMaxVolume();
f32 dVar13 = mRiverSeMgr.getPanPower();
f32 dolbyPower = mRiverSeMgr.getDolbyPower();
f32 dVar17 = field_0x1b0;
f32 fArr0;
f32 fArr1;
f32 fArr2;
f32 fArr3;
JAISoundID sp3C = -1;
bool r30 = false;
f32 f31;
f32 f29;
f32 dolbyPower;
f32 f30;
f32 f27;
f27 = param_1 / 127.0f;
f31 = field_0x1ac * mRiverSeMgr.getMaxVolume();
f29 = mRiverSeMgr.getPanPower();
dolbyPower = mRiverSeMgr.getDolbyPower();
f30 = field_0x1b0;
f32 sp18;
f32 sp14;
f32 sp10;
f32 sp0C;
switch (field_0x188) {
case 0:
return false;
case 1:
aJStack_742 = Z2SE_ENV_RIVER_SMALL;
fArr3 = dolbyPower;
dVar18 *= Z2Calc::linearTransform(field_0x18c.calcNoise1f(), 0.0f, 1.0f, 0.7f, 1.0f,
sp3C = Z2SE_ENV_RIVER_SMALL;
sp18 = dolbyPower;
f31 *= Z2Calc::linearTransform(field_0x18c.calcNoise1f(), 0.0f, 1.0f, 0.7f, 1.0f,
true);
dVar17 *= Z2Calc::linearTransform(field_0x19c.calcNoise1f(), 0.0f, 1.0f, 0.8f, 1.1f,
f30 *= Z2Calc::linearTransform(field_0x19c.calcNoise1f(), 0.0f, 1.0f, 0.8f, 1.1f,
true);
uVar8 = field_0x180.startEnvSeLevel(aJStack_742, dVar16, dVar18, dVar13, dolbyPower, dVar17, 0);
r30 = field_0x180.startEnvSeLevel(sp3C, f27, f31, f29, dolbyPower, f30, 0);
break;
case 2:
aJStack_742 = Z2SE_ENV_RIVER_NORMAL;
sp3C = Z2SE_ENV_RIVER_NORMAL;
mRiverSeMgr.getMaxPowL();
mRiverSeMgr.getMaxPowR();
fArr2 = mRiverSeMgr.getDolbyPower();
uVar8 = field_0x180.startEnvSeLevel(aJStack_742, dVar16, dVar18, dVar13, dolbyPower, dVar17, 0);
sp14 = mRiverSeMgr.getDolbyPower();
r30 = field_0x180.startEnvSeLevel(sp3C, f27, f31, f29, dolbyPower, f30, 0);
break;
case 3:
if (field_0x1b8 > 0) {
dVar18 *= (field_0x1b8 + 50) / 150.0f;
f31 *= (field_0x1b8 + 50) / 150.0f;
} else {
if (field_0x1b8 < 0) {
dVar18 *= (field_0x1b8 + 150) / 150.0f;
f31 *= (field_0x1b8 + 150) / 150.0f;
} else {
dVar18 *= 0.3f;
f31 *= 0.3f;
}
}
aJStack_742 = Z2SE_ENV_SEWER;
fArr1 = dolbyPower;
dVar18 *= Z2Calc::linearTransform(field_0x18c.calcNoise1f(), 0.0f, 1.0f, 0.6f, 1.0f, true);
dVar17 *= Z2Calc::linearTransform(field_0x19c.calcNoise1f(), 0.0f, 1.0f, 0.8f, 1.0f, true);
uVar8 = field_0x180.startEnvSeLevel(aJStack_742, dVar16, dVar18, dVar13, dolbyPower, dVar17, 0);
sp3C = Z2SE_ENV_SEWER;
sp10 = dolbyPower;
f31 *= Z2Calc::linearTransform(field_0x18c.calcNoise1f(), 0.0f, 1.0f, 0.6f, 1.0f, true);
f30 *= Z2Calc::linearTransform(field_0x19c.calcNoise1f(), 0.0f, 1.0f, 0.8f, 1.0f, true);
r30 = field_0x180.startEnvSeLevel(sp3C, f27, f31, f29, dolbyPower, f30, 0);
break;
case 5:
aJStack_742 = Z2SE_ENV_SPIRIT_FOUNTAIN;
fArr0 = dolbyPower;
dVar18 *= Z2Calc::linearTransform(field_0x18c.calcNoise1f(), 0.0f, 1.0f, 0.6f, 1.0f, true);
dVar17 *= Z2Calc::linearTransform(field_0x19c.calcNoise1f(), 0.0f, 1.0f, 0.8f, 1.0f, true);
uVar8 = field_0x180.startEnvSeLevel(aJStack_742, dVar16, dVar18, dVar13, dolbyPower, dVar17, 0);
sp3C = Z2SE_ENV_SPIRIT_FOUNTAIN;
sp0C = dolbyPower;
f31 *= Z2Calc::linearTransform(field_0x18c.calcNoise1f(), 0.0f, 1.0f, 0.6f, 1.0f, true);
f30 *= Z2Calc::linearTransform(field_0x19c.calcNoise1f(), 0.0f, 1.0f, 0.8f, 1.0f, true);
r30 = field_0x180.startEnvSeLevel(sp3C, f27, f31, f29, dolbyPower, f30, 0);
break;
}
mRiverSeMgr.resetMultiSePos();
return uVar8;
return r30;
}
/* 802C8730-802C886C 2C3070 013C+00 1/1 1/1 0/0 .text initFallSe__10Z2EnvSeMgrFUcUcUcUc
@@ -1343,7 +1341,6 @@ f32 Z2EnvSeMgr::getFogDensity() {
}
/* 802C9400-802C950C 2C3D40 010C+00 0/0 0/0 1/1 .text startFogSe__10Z2EnvSeMgrFv */
// NONMATCHING fmuls reg order
bool Z2EnvSeMgr::startFogSe() {
bool iVar5 = false;
f32 dVar10 = field_0x2e8.calcNoise1f();
src/Z2AudioLib/Z2LinkMgr.cpp
-2
View File
@@ -546,7 +546,6 @@ Z2LinkSoundStarter::Z2LinkSoundStarter() : Z2SoundStarter(false) {}
/* 802C4928-802C4FFC 2BF268 06D4+00 2/0 0/0 0/0 .text
* startSound__18Z2LinkSoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f>UlfffffUl */
// NONMATCHING stack alloc
bool Z2LinkSoundStarter::startSound(JAISoundID i_soundID, JAISoundHandle* param_1,
JGeometry::TVec3<f32> const* param_2, u32 param_3,
f32 param_4, f32 param_5, f32 param_6, f32 param_7,
@@ -732,7 +731,6 @@ Z2RideSoundStarter::Z2RideSoundStarter(Z2CreatureRide* ride) : Z2SoundStarter(fa
/* 802C5284-802C54B8 2BFBC4 0234+00 2/0 0/0 0/0 .text
* startSound__18Z2RideSoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f>UlfffffUl */
// NONMATCHING regalloc / extra load
bool Z2RideSoundStarter::startSound(JAISoundID i_soundID, JAISoundHandle* param_1,
JGeometry::TVec3<f32> const* param_2, u32 param_3,
f32 param_4, f32 param_5, f32 param_6, f32 param_7,
src/Z2AudioLib/Z2SceneMgr.cpp
+5 -5
View File
@@ -187,7 +187,6 @@ void Z2SceneMgr::setFadeInStart(u8 param_0) {
}
/* 802B6AF8-802B995C 2B1438 2E64+00 8/0 1/1 0/0 .text setSceneName__10Z2SceneMgrFPcll */
// NONMATCHING JSULink<JAIStream>::getNext() inlining
void Z2SceneMgr::setSceneName(char* spotName, s32 room, s32 layer) {
JAISoundID bgm_id = -1;
JAISound* sound;
@@ -1982,9 +1981,12 @@ void Z2SceneMgr::load2ndDynamicWave() {
}
/* 802BA294-802BA56C 2B4BD4 02D8+00 1/0 2/2 0/0 .text sceneBgmStart__10Z2SceneMgrFv */
// NONMATCHING regalloc
// NONMATCHING - extra BGM_ID load
void Z2SceneMgr::sceneBgmStart() {
OS_REPORT("[Z2SceneMgr::sceneBgmStart] %08x", BGM_ID.mId.mFullId);
inGame = true;
BOOL r28 = FALSE;
setSceneExist(true);
Z2GetStatusMgr()->setPauseFlag(0);
@@ -1992,7 +1994,7 @@ void Z2SceneMgr::sceneBgmStart() {
return;
}
if (!BGM_ID.isAnonymous() && Z2GetStatusMgr()->getDemoStatus() != 11) {
if (!BGM_ID.isAnonymous() && !r28 && Z2GetStatusMgr()->getDemoStatus() != 11) {
bool var;
switch (BGM_ID.mId.mBytes.b0) {
case 1:
@@ -2144,5 +2146,3 @@ bool Z2SceneMgr::loadBgmWave(u32 wave) {
}
return false;
}
/* 8039BFA8-8039BFA8 028608 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/Z2AudioLib/Z2SeqMgr.cpp
-1
View File
@@ -512,7 +512,6 @@ void Z2SeqMgr::subBgmStop() {
/* 802AF9D0-802AFB94 2AA310 01C4+00 2/2 0/0 0/0 .text subBgmStopInner__8Z2SeqMgrFv */
// NONMATCHING regalloc
void Z2SeqMgr::subBgmStopInner() {
if (field_0xb8 == -1) {
return;
src/Z2AudioLib/Z2SoundMgr.cpp
-2
View File
@@ -385,5 +385,3 @@ bool Z2SoundMgr::isPlayingSoundID(JAISoundID i_soundID) {
}
return false;
}
/* 8039B9D0-8039B9D0 028030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/Z2AudioLib/Z2StatusMgr.cpp
-2
View File
@@ -334,5 +334,3 @@ void Z2StatusMgr::setCameraInWaterDepth(f32 depth) {
}
mUnderwaterDepth = depth;
}
/* 8039BC88-8039BC88 0282E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_alink.cpp
+32 -33
View File
@@ -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))
{
src/d/actor/d_a_alink_swim.inc
+1 -1
View File
@@ -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);
src/d/actor/d_a_arrow.cpp
+2 -2
View File
@@ -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 */
src/d/actor/d_a_boomerang.cpp
+1 -2
View File
@@ -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();
src/d/actor/d_a_coach_fire.cpp
-2
View File
@@ -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,
src/d/actor/d_a_door_shutter.cpp
-2
View File
@@ -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,
src/d/actor/d_a_e_gb.cpp
-2
View File
@@ -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,
src/d/actor/d_a_e_nz.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_e_oc.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_e_sh.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_e_yh.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_horse.cpp
+3 -3
View File
@@ -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();
}
src/d/actor/d_a_nbomb.cpp
+11 -11
View File
@@ -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,
src/d/actor/d_a_npc.cpp
+2 -2
View File
@@ -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;
}
src/d/actor/d_a_npc2.cpp
+1 -1
View File
@@ -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++) {
src/d/actor/d_a_npc_cd.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_npc_cd2.cpp
-2
View File
@@ -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 = {
src/d/actor/d_a_npc_cdn3.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_npc_chin.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_npc_fish.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_npc_ks.cpp
-2
View File
@@ -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,
src/d/actor/d_a_npc_mk.cpp
+5 -24
View File
@@ -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 */
src/d/actor/d_a_npc_p2.cpp
+5 -24
View File
@@ -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 */
src/d/actor/d_a_npc_seic.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_npc_seid.cpp
-2
View File
@@ -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,
src/d/actor/d_a_npc_taro.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_npc_worm.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_Turara.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_TvCdlst.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_Y_taihou.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_automata.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_avalanche.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_batta.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_bhbridge.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_bkdoor.cpp
-2
View File
@@ -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]);
src/d/actor/d_a_obj_bky_rock.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_bmWindow.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_bmshutter.cpp
+5 -13
View File
@@ -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 */
src/d/actor/d_a_obj_boumato.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_bubblePilar.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_cb.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_cblock.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_crvsteel.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_cwall.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_dmelevator.cpp
-1
View File
@@ -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 */
src/d/actor/d_a_obj_fallobj.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_fan.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_fchain.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_firepillar2.cpp
-3
View File
@@ -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 */
src/d/actor/d_a_obj_flag.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_flag2.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_flag3.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_gadget.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_gb.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_gomikabe.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_gra2.cpp
-2
View File
@@ -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,
src/d/actor/d_a_obj_gra_rock.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_groundwater.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_hhashi.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_hsTarget.cpp
-1
View File
@@ -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 */
src/d/actor/d_a_obj_ice_s.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_inobone.cpp
-1
View File
@@ -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 */
src/d/actor/d_a_obj_kago.cpp
-2
View File
@@ -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,
src/d/actor/d_a_obj_kazeneko.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_kbox.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_kita.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_kuwagata.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_kznkarm.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_ladder.cpp
-94
View File
@@ -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;
src/d/actor/d_a_obj_lbox.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_lv3saka00.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_lv4chandelier.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_lv6Tenbin.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_lv6swturn.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_master_sword.cpp
-2
View File
@@ -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 */
src/d/actor/d_a_obj_mhole.cpp
-2
View File
@@ -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 */

Some files were not shown because too many files have changed in this diff Show More