mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-31 09:21:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

bpw partial cleanup, fix inline usage across several actors

Browse Source
This commit is contained in:
LagoLunatic
2025-09-18 20:17:27 -04:00
parent ae94c57e73
commit 048d242eef
54 changed files with 733 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1596,7 +1596,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_klft"),
ActorRel(NonMatching, "d_a_kmon"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_komore"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_lbridge"),
ActorRel(Matching, "d_a_lbridge"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_leaflift"),
ActorRel(NonMatching, "d_a_lstair"),
ActorRel(Matching, "d_a_machine"),
include/d/actor/d_a_bpw.h
+18 -1
View File
@@ -94,8 +94,9 @@ struct bpw_class {
/* 0x3FC */ fpc_ProcID m3FC;
/* 0x400 */ fpc_ProcID m400;
/* 0x404 */ fpc_ProcID m404;
#if VERSION > VERSION_DEMO
/* 0x408 */ s16 m408;
/* 0x40A */ u8 m40A[0x40C - 0x40A];
#endif
/* 0x40C */ cXyz m40C;
/* 0x418 */ cXyz m418;
/* 0x424 */ cXyz m424;
@@ -132,13 +133,29 @@ struct bpw_class {
/* 0x4AC */ int mChildPoeIds[15];
/* 0x4E8 */ u32 m4E8;
/* 0x4EC */ LIGHT_INFLUENCE m4EC;
#if VERSION == VERSION_DEMO
/* 0x508 */ JPABaseEmitter* m508_demo;
/* 0x50C */ JPABaseEmitter* m50C_demo;
/* 0x510 */ JPABaseEmitter* m510_demo;
#endif
/* 0x50C */ dPa_smokeEcallBack m50C;
#if VERSION == VERSION_DEMO
/* 0x534 */ JPABaseEmitter* m534_demo;
/* 0x538 */ JPABaseEmitter* m538_demo;
/* 0x53C */ JPABaseEmitter* m53C_demo;
/* 0x540 */ JPABaseEmitter* m540_demo;
#else
/* 0x52C */ dPa_followEcallBack m52C;
/* 0x540 */ dPa_followEcallBack m540;
#endif
/* 0x554 */ dPa_followEcallBack m554;
/* 0x568 */ dPa_followEcallBack mFire1Dousa_Pa_followEcallBack;
/* 0x57C */ dPa_followEcallBack mFire1Dousa_Pa_followEcallBack2;
/* 0x590 */ dPa_followEcallBack m590;
#if VERSION == VERSION_DEMO
/* 0x594 */ JPABaseEmitter* m594_demo;
/* 0x598 */ JPABaseEmitter* m598_demo;
#endif
/* 0x5A4 */ dPa_followEcallBack mFireDousa2_Pa_followEcallBack;
/* 0x5B8 */ dPa_followEcallBack mFireDousa2_Pa_followEcallBack2;
/* 0x5CC */ dPa_followEcallBack m5CC;
include/d/d_com_inf_game.h
+1 -1
View File
@@ -2667,7 +2667,7 @@ inline void dComIfGp_endMiniGame(u16 i_gameType) {
g_dComIfG_gameInfo.play.endMiniGame(i_gameType);
}
inline u8 dComIfGp_setMiniGameResult(u8 result) {
inline void dComIfGp_setMiniGameResult(u8 result) {
g_dComIfG_gameInfo.play.setMiniGameResult(result);
}
include/m_Do/m_Do_ext.h
+1 -2
View File
@@ -186,8 +186,7 @@ public:
int init(J3DModelData*, J3DAnmTransform*, int, int, f32, s16, s16, bool);
// TODO
void entry(J3DModel* i_model) {}
void entry(J3DModel* i_model) { entry(i_model, getFrame()); }
private:
/* 0x08 */ J3DAnmVisibilityFull* mpAnm;
src/d/actor/d_a_arrow_iceeff.cpp
+1 -1
View File
@@ -169,7 +169,7 @@ bool daArrow_Iceeff_c::_draw() {
else {
g_env_light.setLightTevColorType(mpModel, &tevStr);
J3DModelData* mdl_data = mpModel->getModelData();
mBck.entry(mdl_data, mBck.getFrame());
mBck.entry(mdl_data);
if(field_0xA3C == 1) {
mDoExt_modelUpdateDL(mpModel);
}
src/d/actor/d_a_arrow_lighteff.cpp
+2 -2
View File
@@ -251,8 +251,8 @@ bool daArrow_Lighteff_c::_draw() {
dComIfGd_setListMaskOff();
}
mBtk.entry(modelData, mBtk.getFrame());
mBrk.entry(modelData, mBrk.getFrame());
mBtk.entry(modelData);
mBrk.entry(modelData);
mDoExt_modelUpdateDL(field_0x298);
mBrk.remove(modelData);
mBtk.remove(modelData);
src/d/actor/d_a_bb.cpp
+2 -2
View File
@@ -2152,7 +2152,7 @@ void damage_check(bb_class* i_this) {
dComIfGp_particle_setToon(dPa_name::ID_COMMON_0438, &a_this->current.pos, &a_this->current.angle, NULL, 0xFF, NULL,
fopAcM_GetRoomNo(a_this), &a_this->tevStr.mColorK0, &a_this->tevStr.mColorK0);
i_this->mParticleCallBack.end();
i_this->mParticleCallBack.remove();
emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_0439, &a_this->current.pos, &a_this->current.angle, NULL, 0xFF, &i_this->mParticleCallBack,
fopAcM_GetRoomNo(a_this));
@@ -2514,7 +2514,7 @@ static BOOL daBb_Delete(bb_class* i_this) {
#if VERSION == VERSION_DEMO
l_bbHIO.removeHIO();
#endif
i_this->mParticleCallBack.end();
i_this->mParticleCallBack.remove();
enemy_fire_remove(&i_this->mEnemyFire);
#if VERSION > VERSION_DEMO
if (i_this->actor.heap != NULL) {
src/d/actor/d_a_bdk.cpp
+2 -2
View File
@@ -434,7 +434,7 @@ void kamen_draw(bdk_class* i_this) {
if (i_this->m8F8 <= 3) {
g_env_light.setLightTevColorType(kamen_model, &actor->tevStr);
i_this->bva->setFrame(kamen_pt[i_this->m8F8]);
i_this->bva->entry(kamen_model, i_this->bva->getFrame());
i_this->bva->entry(kamen_model);
mDoExt_modelUpdateDL(kamen_model);
}
}
@@ -1791,7 +1791,7 @@ void start(bdk_class* i_this) {
}
if (i_this->m2EC[0] == (s16)(REG8_S(8) + 5)) {
fopAcM_monsSeStart(actor, JA_SE_CV_DK_ENTER, 0);
i_this->m61B0.end();
i_this->m61B0.remove();
for (s32 i = 0; i < 2; i++) {
JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_SCENE_8158, &actor->current.pos, &actor->shape_angle, NULL,
0xFF, NULL, (s8)fopAcM_GetRoomNo(actor),
src/d/actor/d_a_bmd.cpp
+34 -30
View File
@@ -398,7 +398,7 @@ void eat(bmd_class* i_this) {
i_this->m302 = -1;
i_this->m308[0] = 0x3c;
i_this->mB74 = 0x96;
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
i_this->m940 = -0x4000;
i_this->m332 = 4;
i_this->m314 = 0;
@@ -840,7 +840,6 @@ void mk_voice_set(bmd_class* i_this, u32 param_2) {
/* 00002F40-0000330C .text mk_move__FP9bmd_class */
void mk_move(bmd_class* i_this) {
fopAc_ac_c* actor = &i_this->actor;
int iVar1;
JPABaseEmitter* pJVar3;
cXyz local_28;
@@ -1150,8 +1149,6 @@ void ride_call_back(dBgW* bgw, fopAc_ac_c* i_ac, fopAc_ac_c* i_pt) {
void demo_camera(bmd_class* i_this) {
/* Nonmatching - switch case, regalloc */
fopAc_ac_c* actor = &i_this->actor;
s16 sVar2;
int iVar6;
cXyz local_44;
cXyz local_50;
cXyz local_a4;
@@ -1160,6 +1157,7 @@ void demo_camera(bmd_class* i_this) {
fopAc_ac_c* player_actor = dComIfGp_getPlayer(0);
daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
switch (i_this->mB74) {
case 0:
break;
@@ -1169,7 +1167,7 @@ void demo_camera(bmd_class* i_this) {
actor->eventInfo.onCondition(dEvtCnd_UNK2_e);
i_this->mB76 = 0;
i_this->mB78 = 0;
break;
return;
}
i_this->mB74++;
camera_class* camera2 = dComIfGp_getCamera(0);
@@ -1259,7 +1257,7 @@ void demo_camera(bmd_class* i_this) {
player->voiceStart(0x2e);
}
if (i_this->mB78 != 0x1e) {
return;
break;
}
i_this->mB78 = 0;
i_this->mB74++;
@@ -1269,6 +1267,7 @@ void demo_camera(bmd_class* i_this) {
i_this->mB88 = actor->eyePos;
i_this->mB88.y += REG0_F(11) + 30.0f;
i_this->m2DC = 4;
// Fall-through
case 9:
cLib_addCalc2(&i_this->mB88.y, actor->eyePos.y + 30.0f, 0.2f, REG0_F(4) + 5.0f);
if (i_this->mB78 == 0x1e) {
@@ -1298,12 +1297,13 @@ void demo_camera(bmd_class* i_this) {
player->voiceStart(0x1d);
}
if (i_this->mB78 != 0x19) {
return;
break;
}
i_this->mB78 = 0;
i_this->mB74++;
i_this->mB88 = actor->eyePos;
i_this->mB88.y += REG0_F(11) + 30.0f;
// Fall-through
case 11:
i_this->mB7C.x = -139.0f;
i_this->mB7C.y = 125.0f;
@@ -1399,7 +1399,7 @@ void demo_camera(bmd_class* i_this) {
}
if (i_this->mB76 == 0x24e) {
i_this->mB74 = 0x96;
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
i_this->m332 = 7;
i_this->mMode = 0;
i_this->m302 = -1;
@@ -1414,21 +1414,24 @@ void demo_camera(bmd_class* i_this) {
g_dComIfG_gameInfo.save.getMemory().getBit().onStageBossDemo();
}
break;
case 100:
case 100: {
if (!actor->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(actor, dEvtFlag_STAFF_ALL_e, 0xFFFF, 0);
actor->eventInfo.onCondition(dEvtCnd_UNK2_e);
i_this->mB76 = 0;
i_this->mB78 = 0;
break;
}
i_this->mB74 = sVar2 + 1;
camera = dComIfGp_getCamera(0);
i_this->mB7C = camera->mLookat.mEye;
i_this->mB88 = camera->mLookat.mCenter;
i_this->mB74++;
camera_class* camera2 = dComIfGp_getCamera(0);
i_this->mB7C = camera2->mLookat.mEye;
i_this->mB88 = camera2->mLookat.mCenter;
camera->mCamera.Stop();
camera->mCamera.SetTrimSize(2);
i_this->mB9C = 55.0f;
player->changeOriginalDemo();
// Fall-through
}
case 101:
if ((i_this->mB78 >= 0x140) && (cLib_addCalc2(&i_this->mB9C, REG0_F(8) + 85.0f, 0.2f, 1.0f), i_this->mB78 == 0x140)) {
i_this->m2DC = 5;
@@ -1485,9 +1488,10 @@ void demo_camera(bmd_class* i_this) {
// Fall-through
}
case 103: {
iVar6 = (int)(i_this->mBA0 * 22384.0f);
cLib_addCalcAngleS2(&i_this->mB96, actor->shape_angle.y + REG0_S(2) + 0x5770, 0x10, iVar6);
cLib_addCalcAngleS2(&i_this->mB94, -5000, 0x10, (int)(i_this->mBA0 * 3000.0f));
s16 iVar6 = i_this->mBA0 * 22384.0f;
cLib_addCalcAngleS2(&i_this->mB96, (s16)(actor->shape_angle.y + REG0_S(2)) + 0x5770, 0x10, iVar6);
s16 r5 = i_this->mBA0 * 3000.0f;
cLib_addCalcAngleS2(&i_this->mB94, -5000, 0x10, r5);
cLib_addCalc2(&i_this->mBA4, 500.0f, 0.0625f, i_this->mBA0 * 1000.0f);
cLib_addCalc2(&i_this->mBA0, REG0_F(10) + 0.0048f, 0.1f, 4.8e-05f);
cMtx_YrotS(*calc_mtx, (int)i_this->mB96);
@@ -1498,10 +1502,10 @@ void demo_camera(bmd_class* i_this) {
MtxPosition(&local_44, &local_50);
i_this->mB7C = actor->current.pos + local_50;
i_this->mB88 = actor->current.pos;
i_this->mB88.y = i_this->mB88.y + REG0_S(3) + 100.0f;
i_this->mB88.y += REG0_S(3) + 100.0f;
if (i_this->mB76 == 800) {
i_this->mB74 = 0x96;
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
i_this->m314 = 0;
player->cancelOriginalDemo();
}
@@ -1515,14 +1519,16 @@ void demo_camera(bmd_class* i_this) {
break;
}
if (i_this->mB74 != 0) {
local_b0.x = i_this->mB7C.x + i_this->mBA8 * cM_ssin(i_this->mB78 * 0x3300);
local_b0.y = i_this->mB7C.y + i_this->mBA8 * cM_scos(i_this->mB78 * 0x3000);
f32 f1 = i_this->mBA8 * cM_ssin(i_this->mB78 * 0x3300);
f32 f2 = i_this->mBA8 * cM_scos(i_this->mB78 * 0x3000);
local_b0.x = i_this->mB7C.x + f1;
local_b0.y = i_this->mB7C.y + f2;
local_b0.z = i_this->mB7C.z;
local_a4.x = i_this->mB88.x + i_this->mBA8 * cM_ssin(i_this->mB78 * 0x3300);
local_a4.y = i_this->mB88.y + i_this->mBA8 * cM_scos(i_this->mB78 * 0x3000);
local_a4.x = i_this->mB88.x + f1;
local_a4.y = i_this->mB88.y + f2;
local_a4.z = i_this->mB88.z;
iVar6 = (int)(i_this->mBA8 * cM_scos(i_this->m2FE * 0x1c00) * 7.5f);
camera->mCamera.Set(local_a4, local_b0, (s16)iVar6, i_this->mB9C);
s16 iVar6 = i_this->mBA8 * cM_scos(i_this->m2FE * 0x1c00) * 7.5f;
camera->mCamera.Set(local_a4, local_b0, iVar6, i_this->mB9C);
cLib_addCalc0(&i_this->mBA8, 1.0f, (REG0_F(16) + 2.0f));
JUTReport(0x1e, 0x1ae, "K MAIN COUNT %d", (int)i_this->mB76);
JUTReport(0x19a, 0x1ae, "K SUB COUNT %d", (int)i_this->mB78);
@@ -1555,10 +1561,8 @@ void bmd_kankyo(bmd_class* i_this) {
/* 000055EC-00005BF4 .text daBmd_Execute__FP9bmd_class */
static BOOL daBmd_Execute(bmd_class* i_this) {
/* Nonmatching - "cMtx_YrotM" */
fopAc_ac_c* actor = &i_this->actor;
f32 fVar2;
f32 in_f4;
cXyz local_88;
#if VERSION > VERSION_DEMO
@@ -1600,7 +1604,7 @@ static BOOL daBmd_Execute(bmd_class* i_this) {
i_this->pm_bgw[5]->Move();
for (s32 i = 0; i < (s32)ARRAY_SIZE(i_this->m944); i++) {
MTXCopy(mDoMtx_stack_c::now, *calc_mtx);
cMtx_YrotM(*calc_mtx, 13107.2f + REG0_F(11));
cMtx_YrotM(*calc_mtx, (i * 13107.2f) + REG0_F(11));
MtxTrans((REG0_F(4) - 200.0f), 0.0f, 0.0f, true);
cMtx_ZrotM(*calc_mtx, i_this->m940);
MtxTrans(-(REG0_F(4) - 200.0f), (15.0f + REG0_F(5)), REG0_F(6), true);
@@ -1646,7 +1650,7 @@ static BOOL daBmd_Execute(bmd_class* i_this) {
i_this->mWindInfluence.mDir.x = 0.0f;
i_this->mWindInfluence.mDir.y = 1.0f;
i_this->mWindInfluence.mDir.z = 0.0f;
cLib_addCalc0(&i_this->mBD8, 50.0f, in_f4);
cLib_addCalc0(&i_this->mBD8, 1.0f, 50.0f);
i_this->mWindInfluence.mRadius = 2000.0f - i_this->mBD8;
if (i_this->mBD8 > 1.0f) {
i_this->mWindInfluence.mStrength = 1.0f;
@@ -1670,7 +1674,7 @@ static BOOL daBmd_Execute(bmd_class* i_this) {
}
mDoMtx_stack_c::transS(0.0f, 0.1f, 0.0f);
i_this->m2D0->setBaseTRMtx(mDoMtx_stack_c::get());
i_this->m2D4->getFrameCtrl()->setFrame(i_this->m2D8);
i_this->m2D4->setFrame(i_this->m2D8);
return TRUE;
}
@@ -1692,7 +1696,7 @@ static BOOL daBmd_Delete(bmd_class* i_this) {
}
}
for (s32 i = 0; i < (s32)ARRAY_SIZE(i_this->mA90); i++) {
i_this->mA90[i].end();
i_this->mA90[i].remove();
}
dKyw_pntwind_cut(&i_this->mWindInfluence);
mDoAud_seDeleteObject(&i_this->m2E0);
src/d/actor/d_a_bmdfoot.cpp
+6 -6
View File
@@ -102,7 +102,7 @@ void housi_off(bmdfoot_class* i_this) {
}
}
if (i_this->m4B0.getEmitter() != NULL) {
i_this->m4B0.end();
i_this->m4B0.remove();
}
}
@@ -329,7 +329,7 @@ s32 ug_move(bmdfoot_class* i_this) {
if ((fVar7 < 300.0f) || (i_this->mBC0 > REG14_F(15) + 3000.0f)) {
i_this->mBA8 = 10;
if (i_this->m4B0.getEmitter() != NULL) {
i_this->m4B0.end();
i_this->m4B0.remove();
}
uVar4 = 1;
}
@@ -695,11 +695,11 @@ static BOOL daBmdfoot_Delete(bmdfoot_class* i_this) {
mDoAud_seDeleteObject(&i_this->mAE8);
mDoAud_seDeleteObject(&i_this->mBAC);
for (s32 i = 0; i < (s32)ARRAY_SIZE(i_this->m41C); i++) {
i_this->m41C[i].end();
i_this->m41C[i].remove();
}
i_this->m458[0].end();
i_this->m458[1].end();
i_this->m4B0.end();
i_this->m458[0].remove();
i_this->m458[1].remove();
i_this->m4B0.remove();
boss = NULL;
return TRUE;
}
src/d/actor/d_a_boko.cpp
+1 -1
View File
@@ -819,7 +819,7 @@ static BOOL daBoko_IsDelete(daBoko_c* i_this) {
/* 00002A2C-00002AA4 .text bokoDelete__8daBoko_cFv */
BOOL daBoko_c::bokoDelete() {
mDoAud_seDeleteObject(&m2D0);
mParticleCallBack.end();
mParticleCallBack.remove();
dKy_plight_cut(&mLight);
dComIfG_resDelete(&mPhase, m_arc_name[fopAcM_GetParam(this)]);
return TRUE;
src/d/actor/d_a_bomb2.cpp
+4 -4
View File
@@ -617,8 +617,8 @@ namespace daBomb2 {
mBombTimer = attr().field_0xA;
f32 frame = 0x87 - attr().field_0xA;
mBck0.getFrameCtrl()->setFrame(frame);
mBrk0.getFrameCtrl()->setFrame(frame);
mBck0.setFrame(frame);
mBrk0.setFrame(frame);
}
}
@@ -1263,8 +1263,8 @@ namespace daBomb2 {
void Act_c::draw_nut() {
J3DModelData* mdlData = (J3DModelData*)mpModel->getModelData();
mBck0.entry(mdlData, mBck0.getFrame());
mBrk0.entry(mdlData, mBrk0.getFrame());
mBck0.entry(mdlData);
mBrk0.entry(mdlData);
dComIfGd_setListP1();
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();
src/d/actor/d_a_bpw.cpp
+495 -296
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_bst.cpp
+6 -7
View File
@@ -1174,15 +1174,14 @@ static void head_damage(bst_class* i_this) {
cLib_addCalc2(&bomb->current.pos.y, actor->current.pos.y + 90.0f + REG0_F(0xb), 1.0f, 30.0f);
cLib_addCalc2(&bomb->current.pos.z, actor->current.pos.z, 1.0f, 30.0f);
}
if (i_this->m10FC[0] == 0) {
anm_init(i_this, BST_BCK_BOM_NOMI, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mDamage++;
i_this->m2EE0[0] = dComIfGp_particle_set(dPa_name::ID_SCENE_81E3, &actor->current.pos);
fopAcM_seStart(actor, JA_SE_CM_BST_MOUTH_CLOSE, 0);
i_this->m10FC[0] = 0x3c;
} else {
if (i_this->m10FC[0] != 0) {
break;
}
anm_init(i_this, BST_BCK_BOM_NOMI, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mDamage++;
i_this->m2EE0[0] = dComIfGp_particle_set(dPa_name::ID_SCENE_81E3, &actor->current.pos);
fopAcM_seStart(actor, JA_SE_CM_BST_MOUTH_CLOSE, 0);
i_this->m10FC[0] = 0x3c;
// fallthrough
}
case 5:
src/d/actor/d_a_btd.cpp
+7 -4
View File
@@ -404,9 +404,12 @@ void startdemo(btd_class* i_this) {
i_this->m6E48 = 40.0f;
hahen_set2(i_this);
}
if (((i_this->m6E1A >= 0x46) && (i_this->m6E1A <= 0xC3)) && (i_this->m602E = 3, i_this->m6E1A >= 0x5A)) {
mDoAud_seStart(JA_SE_CM_BTD_HIFUKI, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
i_this->mKankyoState = 2;
if (((i_this->m6E1A >= 0x46) && (i_this->m6E1A <= 0xC3))) {
i_this->m602E = 3;
if (i_this->m6E1A >= 0x5A) {
mDoAud_seStart(JA_SE_CM_BTD_HIFUKI, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
i_this->mKankyoState = 2;
}
}
if (i_this->m6E1A >= 0x46) {
i_this->m602C = 3;
@@ -2122,7 +2125,7 @@ void demo_camera(btd_class* i_this) {
i_this->m6E16 = 0;
pcVar7->mCamera.Start();
pcVar7->mCamera.SetTrimSize(0);
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
fopAcM_OffStatus(i_this, fopAcStts_UNK4000_e);
break;
}
src/d/actor/d_a_bwd.cpp
+28 -25
View File
@@ -405,15 +405,18 @@ void start(bwd_class* i_this) {
if (i_this->m18AC == 0x28f) {
i_this->m1865 = 1;
}
if ((i_this->m18AC >= 600) && (i_this->m394C = 1, i_this->m18AC == 0x294)) {
i_this->m18AE = 0xB;
i_this->m18B0 = 0;
actor->current.pos.x = 0.0f;
actor->current.pos.y = ((l_HIO.m28 + -2000.0f) - 200.0f) + REG0_F(0xb);
actor->current.pos.z = 0.0f;
i_this->m18CC[1] = 0x28;
g_eff_on(i_this);
dComIfGp_getVibration().StopQuake(-1);
if (i_this->m18AC >= 600) {
i_this->m394C = 1;
if (i_this->m18AC == 0x294) {
i_this->m18AE = 0xB;
i_this->m18B0 = 0;
actor->current.pos.x = 0.0f;
actor->current.pos.y = ((l_HIO.m28 + -2000.0f) - 200.0f) + REG0_F(0xb);
actor->current.pos.z = 0.0f;
i_this->m18CC[1] = 0x28;
g_eff_on(i_this);
dComIfGp_getVibration().StopQuake(-1);
}
}
break;
}
@@ -715,7 +718,7 @@ void eat_attack(bwd_class* i_this) {
if (fVar1 >= 27.0f) {
if (((int)fVar1 == 0x1b) && (i_this->m3AE6 == 0)) {
i_this->m3AE6 = REG0_S(4) + 10;
i_this->m3978[3].end();
i_this->m3978[3].remove();
i_this->m3954.x = actor->current.pos.x;
i_this->m3954.z = actor->current.pos.z;
dComIfGp_particle_setToon(
@@ -743,7 +746,7 @@ void eat_attack(bwd_class* i_this) {
dComIfGp_particle_set(dPa_name::ID_SCENE_8250, &i_this->m3954, &actor->shape_angle);
if (i_this->m3AE8 == 0) {
i_this->m3AE8 = 0x3c;
i_this->m3978[4].end();
i_this->m3978[4].remove();
i_this->m3954.x = actor->current.pos.x;
i_this->m3954.z = actor->current.pos.z;
dComIfGp_particle_setToon(
@@ -788,7 +791,7 @@ void eat_attack(bwd_class* i_this) {
i_this->m3C20 = 0;
if (i_this->m3AEA == 0) {
i_this->m3AEA = 0x14;
i_this->m3978[5].end();
i_this->m3978[5].remove();
i_this->m3954.x = actor->current.pos.x;
i_this->m3954.z = actor->current.pos.z;
dComIfGp_particle_setToon(dPa_name::ID_SCENE_A24A, &i_this->m3954, NULL, NULL, eff_col.a, &i_this->m3978[5], (s8)actor->current.roomNo);
@@ -1065,7 +1068,7 @@ void end(bwd_class* i_this) {
fpcM_Search(ko_delete_sub, i_this);
if (i_this->m3AEC == 0) {
i_this->m3AEC = 0x28;
i_this->m3978[6].end();
i_this->m3978[6].remove();
i_this->m3954.x = actor->current.pos.x;
i_this->m3954.z = actor->current.pos.z;
dComIfGp_particle_setToon(
@@ -1824,7 +1827,7 @@ void demo_camera(bwd_class* i_this) {
break;
}
i_this->m3C1E = 0x96;
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
i_this->m3C1E = 0;
pcVar11->mCamera.Reset(i_this->m3C34, i_this->m3C28);
pcVar11->mCamera.Start();
@@ -2167,7 +2170,7 @@ static BOOL daBwd_Execute(bwd_class* i_this) {
if (i_this->m17E6[iVar19] >= 0x3b) {
i_this->m17E4[iVar8] = 0;
for (s32 j = 0; j < 3; j++) {
i_this->m3B54[j + iVar21].end();
i_this->m3B54[j + iVar21].remove();
}
}
break;
@@ -2207,11 +2210,11 @@ static BOOL daBwd_Execute(bwd_class* i_this) {
if (sVar2 != 0) {
if (sVar2 == 1) {
i_this->m3960++;
i_this->m3AF4.end();
i_this->m3AF4.remove();
dComIfGp_particle_set(dPa_name::ID_SCENE_824D, &i_this->m3954, &actor->shape_angle, NULL, 0xff, &i_this->m3AF4, (s8)actor->current.roomNo);
} else if (sVar2 < 0) {
i_this->m3960 = 0;
i_this->m3AF4.end();
i_this->m3AF4.remove();
} else {
mDoAud_seStart(JA_SE_CM_BWD_SAND_MOVE, &i_this->m3954, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
}
@@ -2220,9 +2223,9 @@ static BOOL daBwd_Execute(bwd_class* i_this) {
if (i_this->m3AE0[j] != 0) {
i_this->m3AE0[j]--;
if (i_this->m3AE0[j] == 0) {
i_this->m3978[j].end();
i_this->m3978[j].remove();
if (j < 2) {
i_this->m3AB8[j].end();
i_this->m3AB8[j].remove();
}
}
}
@@ -2302,14 +2305,14 @@ static BOOL daBwd_Delete(bwd_class* i_this) {
mDoAud_seDeleteObject(&center_pos);
mDoAud_seDeleteObject(&i_this->m3954);
for (s32 i = 0; i < (s32)ARRAY_SIZE(i_this->m3978); i++) {
i_this->m3978[i].end();
i_this->m3978[i].remove();
if (i < 2) {
i_this->m3AB8[i].end();
i_this->m3AB8[i].remove();
}
}
i_this->m3AF4.end();
i_this->m3AF4.remove();
for (s32 i = 0; i < (s32)ARRAY_SIZE(i_this->m3B54); i++) {
i_this->m3B54[i].end();
i_this->m3B54[i].remove();
}
return TRUE;
}
@@ -2350,10 +2353,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
0x11020203
);
i_this->m02C0 = pmVar1;
if ((i_this->m02C0 == NULL) || (pJVar4 = i_this->m02C0->getModel(), pJVar4 == NULL)) {
if ((i_this->m02C0 == NULL) || (i_this->m02C0->getModel() == NULL)) {
return FALSE;
}
pJVar4 = mDoExt_J3DModel__create(pJVar4->getModelData(), 0, 0x11020203);
pJVar4 = mDoExt_J3DModel__create(i_this->m02C0->getModel()->getModelData(), 0, 0x11020203);
i_this->m02CC = pJVar4;
if (i_this->m02CC == NULL) {
return FALSE;
src/d/actor/d_a_dk.cpp
+1 -1
View File
@@ -306,7 +306,7 @@ static BOOL daDk_IsDelete(dk_class*) {
/* 00000D10-00000D7C .text daDk_Delete__FP8dk_class */
static BOOL daDk_Delete(dk_class* a_this) {
dComIfG_resDelete(&a_this->mPhs, "Dk");
a_this->field_0xACC.end();
a_this->field_0xACC.remove();
mDoHIO_deleteChild(l_HIO.mNo);
return TRUE;
}
src/d/actor/d_a_dr2.cpp
+4 -4
View File
@@ -125,7 +125,7 @@ void iwa_draw(dr2_class* i_this) {
mDoExt_modelUpdateDL(i_this->unk_418);
if (i_this->unk_424 != 0) {
J3DModelData* modelData = i_this->unk_41C->getModelData();
i_this->unk_420->entry(modelData, i_this->unk_420->getFrame());
i_this->unk_420->entry(modelData);
g_env_light.setLightTevColorType(i_this->unk_41C, &i_this->actor.tevStr);
mDoExt_modelUpdateDL(i_this->unk_41C);
}
@@ -160,14 +160,14 @@ void yuka_draw(dr2_class* i_this) {
if (!i_this->unk_43C) {
g_env_light.setLightTevColorType(i_this->unk_428, &i_this->actor.tevStr);
modelData = i_this->unk_428->getModelData();
i_this->unk_430->entry(modelData, i_this->unk_430->getFrame());
i_this->unk_430->entry(modelData);
mDoExt_modelUpdateDL(i_this->unk_428);
} else {
g_env_light.setLightTevColorType(i_this->unk_42C, &i_this->actor.tevStr);
modelData = i_this->unk_42C->getModelData();
i_this->unk_434->entry(modelData, i_this->unk_434->getFrame());
i_this->unk_434->entry(modelData);
modelData = i_this->unk_42C->getModelData();
i_this->unk_438->entry(modelData, i_this->unk_438->getFrame());
i_this->unk_438->entry(modelData);
mDoExt_modelUpdateDL(i_this->unk_42C);
}
}
src/d/actor/d_a_esa.cpp
+2 -2
View File
@@ -160,7 +160,7 @@ void esa_1_move(esa_class* i_this) {
i_this->mTimer[0] = 10000;
}
i_this->field_0x2A4.end();
i_this->field_0x2A4.remove();
i_this->current.pos.y = daSea_calcWave(i_this->current.pos.x, i_this->current.pos.z);
if(i_this->mTimer[0] == 0) {
@@ -219,7 +219,7 @@ static BOOL daEsa_IsDelete(esa_class* i_this) {
/* 800E89C0-800E89E8 .text daEsa_Delete__FP9esa_class */
static BOOL daEsa_Delete(esa_class* i_this) {
i_this->field_0x2A4.end();
i_this->field_0x2A4.remove();
return true;
}
src/d/actor/d_a_fganon.cpp
+56 -64
View File
@@ -250,15 +250,14 @@ void shot(fganon_class* i_this) {
cLib_addCalcAngleS2(&i_this->shape_angle.y, fopAcM_searchPlayerAngleY(actor), 10, 0x400);
switch(i_this->mMode) {
case 0: {
if (!i_this->m408) {
anm_init(i_this, FGANON_BCK_TAME1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mMode++;
i_this->m3A4[0] = 40;
fopAcM_monsSeStart(actor, JA_SE_CV_PG_EBALL_MAKE_S, 0);
// Fall-through
} else {
if (i_this->m408) {
break;
}
anm_init(i_this, FGANON_BCK_TAME1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mMode++;
i_this->m3A4[0] = 40;
fopAcM_monsSeStart(actor, JA_SE_CV_PG_EBALL_MAKE_S, 0);
// Fall-through
}
case 1: {
if (i_this->m3A4[0] == 30) {
@@ -611,15 +610,14 @@ void shot2(fganon_class* i_this) {
}
case 2: {
fopAcM_seStart(i_this, JA_SE_CM_PG_EBALL_MAKING_L, 0);
if (i_this->m3A4[0] == 0) {
anm_init(i_this, FGANON_BCK_NAGERU_S1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mMode++;
i_this->mEmitters2[0] = dComIfGp_particle_set(dPa_name::ID_SCENE_821C, &i_this->current.pos, NULL);
i_this->mEmitters2[1] = dComIfGp_particle_set(dPa_name::ID_SCENE_821D, &i_this->current.pos, NULL);
}
else {
if (i_this->m3A4[0] != 0) {
break;
}
anm_init(i_this, FGANON_BCK_NAGERU_S1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mMode++;
i_this->mEmitters2[0] = dComIfGp_particle_set(dPa_name::ID_SCENE_821C, &i_this->current.pos, NULL);
i_this->mEmitters2[1] = dComIfGp_particle_set(dPa_name::ID_SCENE_821D, &i_this->current.pos, NULL);
// Fall-through
}
case 3: {
if (mFrame == REG8_S(5) + 15) {
@@ -716,11 +714,8 @@ void spinattack2(fganon_class* i_this) {
i_this->mMode = 3;
i_this->speedF = 0.0f;
fopAcM_monsSeStart(i_this, JA_SE_CV_PG_EBALL_FIRE_S, 0);
break;
}
else {
break;
}
break;
}
case 3: {
if (mFrame == 14) {
@@ -944,49 +939,47 @@ void fail(fganon_class* i_this) {
break;
}
case 1: {
if (i_this->mpMorf->isStop()) {
i_this->mMode = 2;
i_this->m3A4[0] = 30;
dBgS_LinChk linChk;
cMtx_YrotS(*calc_mtx, i_this->home.angle.y);
cXyz offset;
offset.x = 0.0f;
offset.y = 0.0f;
offset.z = 10000.0f;
cXyz transformedPos;
MtxPosition(&offset, &transformedPos);
offset = i_this->home.pos;
offset.y += 100.0f;
transformedPos += offset;
linChk.Set(&offset, &transformedPos, a_this);
cMtx_copy(i_this->mpMorf->getModel()->getAnmMtx(0x18), *calc_mtx);
offset.x = 0.0f;
offset.y = 0.0f;
offset.z = 0.0f;
MtxPosition(&offset, &transformedPos);
if (dComIfG_Bgsp()->LineCross(&linChk)) {
offset = linChk.GetCross();
}
i_this->m6A0 = i_this->shape_angle.y - cM_atan2s(transformedPos.x - offset.x, transformedPos.z - offset.z) + 0x7058 + REG0_S(8);
i_this->m6A4 = REG0_S(5) + 0x80;
i_this->m6A8 = 100;
if (!i_this->mpMorf->isStop()) {
break;
}
else {
break;
i_this->mMode = 2;
i_this->m3A4[0] = 30;
dBgS_LinChk linChk;
cMtx_YrotS(*calc_mtx, i_this->home.angle.y);
cXyz offset;
offset.x = 0.0f;
offset.y = 0.0f;
offset.z = 10000.0f;
cXyz transformedPos;
MtxPosition(&offset, &transformedPos);
offset = i_this->home.pos;
offset.y += 100.0f;
transformedPos += offset;
linChk.Set(&offset, &transformedPos, a_this);
cMtx_copy(i_this->mpMorf->getModel()->getAnmMtx(0x18), *calc_mtx);
offset.x = 0.0f;
offset.y = 0.0f;
offset.z = 0.0f;
MtxPosition(&offset, &transformedPos);
if (dComIfG_Bgsp()->LineCross(&linChk)) {
offset = linChk.GetCross();
}
i_this->m6A0 = i_this->shape_angle.y - cM_atan2s(transformedPos.x - offset.x, transformedPos.z - offset.z) + 0x7058 + REG0_S(8);
i_this->m6A4 = REG0_S(5) + 0x80;
i_this->m6A8 = 100;
break;
}
case 2: {
if (i_this->m3A4[0] == 0) {
@@ -1865,14 +1858,13 @@ void demo_camera(fganon_class* i_this) {
}
case 54: {
cLib_addCalc2(&i_this->mB68.y, (i_this->eyePos.y - 30.0f) + REG0_F(11), 0.1f, 20.0f);
if (i_this->mB56 == 100) {
i_this->mB54 = 55;
player->changeDemoMode(daPy_demo_c::DEMO_LAROUND_e);
i_this->mB56 = 0;
}
else {
if (i_this->mB56 != 100) {
break;
}
i_this->mB54 = 55;
player->changeDemoMode(daPy_demo_c::DEMO_LAROUND_e);
i_this->mB56 = 0;
// Fall-through
}
case 55: {
if (i_this->mB56 == 20) {
src/d/actor/d_a_floor.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ void rideCallBack(dBgW*, fopAc_ac_c* i_this, fopAc_ac_c* i_other) {
/* 000000DC-0000012C .text Delete__9daFloor_cFv */
BOOL daFloor_c::Delete() {
mSmokeCallBack.end();
mSmokeCallBack.remove();
dComIfG_resDelete(&mPhs, m_arcname);
return TRUE;
}
src/d/actor/d_a_ghostship.cpp
+1 -1
View File
@@ -451,7 +451,7 @@ bool daGhostship_c::_draw() {
modelData->getMaterialNodePointer(i)->getTevKColor(3)->mColor.a = alpha;
}
mBtk.entry(modelData, mBtk.getFrame());
mBtk.entry(modelData);
mDoExt_modelUpdateDL(mpModel);
mBtk.remove(modelData);
src/d/actor/d_a_ki.cpp
+1 -1
View File
@@ -236,7 +236,7 @@ static BOOL daKi_Draw(ki_class* i_this) {
dComIfGd_setList();
} else {
J3DModelData* pModelData = pModel->getModelData();
i_this->m920->entry(pModelData, i_this->m920->getFrame());
i_this->m920->entry(pModelData);
dComIfGd_setListMaskOff();
i_this->mpMorf->entryDL();
src/d/actor/d_a_knob00.cpp
+1 -1
View File
@@ -807,7 +807,7 @@ BOOL daKnob00_c::draw() {
g_env_light.setLightTevColorType(mpModel2, &tevStr);
J3DModelData* modelData = mpModel->getModelData();
mBckAnm.entry(modelData, mBckAnm.getFrame());
mBckAnm.entry(modelData);
mpModel->calc();
mpModel2->setBaseTRMtx(mpModel->getAnmMtx(m_jnt));
mDoExt_modelUpdateDL(mpModel2);
src/d/actor/d_a_lbridge.cpp
+12 -7
View File
@@ -20,7 +20,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00000098-00000384 .text CreateHeap__11daLbridge_cFv */
BOOL daLbridge_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, GBRG00_BDL_GBRG00);
JUT_ASSERT(0xD6, modelData != NULL);
JUT_ASSERT(DEMO_SELECT(213, 214), modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000U, 0x11000223U);
@@ -29,14 +29,14 @@ BOOL daLbridge_c::CreateHeap() {
}
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, GBRG00_BTK_GBRG00);
JUT_ASSERT(0xE8, pbtk != NULL);
JUT_ASSERT(DEMO_SELECT(231, 232), pbtk != NULL);
if (!mBtkAnm.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) {
return FALSE;
}
J3DAnmColor* pbpk = (J3DAnmColor*)dComIfG_getObjectRes(m_arcname, GBRG00_BPK_GBRG00);
JUT_ASSERT(0xF6, pbpk != NULL);
JUT_ASSERT(DEMO_SELECT(245, 246), pbpk != NULL);
if (!mBpkAnm.init(modelData, pbpk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) {
return FALSE;
@@ -46,7 +46,7 @@ BOOL daLbridge_c::CreateHeap() {
mBpkAnm.setPlaySpeed(1.0f);
J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, GBRG00_BRK_GBRG00);
JUT_ASSERT(0x106, pbrk != NULL);
JUT_ASSERT(DEMO_SELECT(261, 262), pbrk != NULL);
if (!mBrkAnm.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) {
return FALSE;
@@ -168,7 +168,7 @@ void daLbridge_c::sw_check() {
u8 alpha;
if (!isSw) {
if (mBpkAnm.getFrame() == (f32)mBpkAnm.getFrameCtrl()->getStart()) {
if (mBpkAnm.getFrame() == mBpkAnm.getStartFrame()) {
fopAcM_offDraw(this);
}
@@ -300,11 +300,16 @@ bool daLbridge_c::_delete() {
bool isSw = fopAcM_isSwitch(this, mSwitchNo);
if ((mSwitchNo == 0xFF || isSw == true) && heap != NULL) {
if (
(mSwitchNo == 0xFF || isSw == true)
#if VERSION > VERSION_DEMO
&& heap != NULL
#endif
) {
dComIfG_Bgsp()->Release(mpBgW);
}
dComIfG_resDelete(&mPhs, m_arcname);
dComIfG_resDeleteDemo(&mPhs, m_arcname);
return TRUE;
}
src/d/actor/d_a_machine.cpp
+1 -1
View File
@@ -379,7 +379,7 @@ void daMachine_c::set_body() {
void daMachine_c::set_at() {
f32 f1 = 5.0f;
f32 f2 = 25.0f;
f32 frame = field_0xc04.getFrameCtrl()->getFrame();
f32 frame = field_0xc04.getFrame();
if (f1 < frame && f2 > frame) {
field_0xc6c.set(field_0xc3c[0][3],
field_0xc3c[1][3],
src/d/actor/d_a_npc_bmsw.cpp
+1 -1
View File
@@ -997,7 +997,7 @@ BOOL daNpc_Bmsw_c::shiwake_game_action(void*) {
dComIfGp_evmng_cutEnd(staff_id);
if (dComIfGp_evmng_endCheck(field_0x9D8)) {
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
s16 rupees = dComIfGp_getMiniGameRupee();
fpc_ProcID msg = daNpc_Bmsw_getGameEndMsg(rupees);
field_0x9C0 = msg;
src/d/actor/d_a_npc_btsw.cpp
+3 -3
View File
@@ -665,7 +665,7 @@ BOOL daNpc_Btsw_c::dummy_event_action(void*) {
if (dComIfGp_evmng_endCheck(field_0x9C8)) {
field_0x9C8 = -1;
field_0x9C7 = 3;
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
setAction(&daNpc_Btsw_c::wait_action, NULL);
}
@@ -833,7 +833,7 @@ BOOL daNpc_Btsw_c::shiwake_game_action(void*) {
} else if (dComIfG_getTimerPtr() == NULL) {
s32 staff_id = dComIfGp_evmng_getMyStaffId("Btsw");
dComIfGp_evmng_cutEnd(staff_id);
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
s16 rupees = dComIfGp_getMiniGameRupee();
field_0x9B0 = daNpc_Btsw_getGameEndMsg(rupees);
@@ -867,7 +867,7 @@ BOOL daNpc_Btsw_c::getdemo_action(void*) {
if (mActionStatus == ACTION_STARTING) {
mActionStatus++;
} else if (mActionStatus != ACTION_ENDING && dComIfGp_evmng_endCheck("GETMOTHERLETTER")) {
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
field_0x9C7 = 1;
field_0x9B0 = 0x1A9C;
src/d/actor/d_a_npc_cb1.cpp
+1 -1
View File
@@ -2972,7 +2972,7 @@ BOOL daNpc_Cb1_c::draw() {
}
else if(mpNutModel && isNut()) {
J3DModelData* pModelData = mpNutModel->getModelData();
mNutBckAnim.entry(pModelData, mNutBckAnim.getFrame());
mNutBckAnim.entry(pModelData);
g_env_light.setLightTevColorType(mpNutModel, &tevStr);
src/d/actor/d_a_npc_fa1.cpp
+1 -1
View File
@@ -906,7 +906,7 @@ void daNpc_Fa1_c::findPlayer() {
/* 800FD050-800FD0F0 .text _delete__11daNpc_Fa1_cFv */
BOOL daNpc_Fa1_c::_delete() {
mSparklePtclCallback.end();
mSparklePtclCallback.remove();
if (isTypeBaba()) {
dKy_efplight_cut(&mPointLight);
}
src/d/actor/d_a_npc_km1.cpp
+1 -1
View File
@@ -503,7 +503,7 @@ void daNpc_Km1_c::privateCut() {
/* 00001144-00001164 .text endEvent__11daNpc_Km1_cFv */
void daNpc_Km1_c::endEvent() {
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
field_0x7CB = 0xFF;
}
src/d/actor/d_a_npc_nz.cpp
+2 -2
View File
@@ -907,7 +907,7 @@ BOOL daNpc_Nz_c::createInit() {
/* 00002768-0000282C .text setSmokeParticle__10daNpc_Nz_cFv */
void daNpc_Nz_c::setSmokeParticle() {
if(field_0x914.getEmitter() != NULL) {
field_0x914.end();
field_0x914.remove();
}
if(field_0x914.getEmitter() == NULL) {
@@ -966,7 +966,7 @@ daNpc_Nz_c::daNpc_Nz_c() {
/* 00002E00-00002E6C .text _delete__10daNpc_Nz_cFv */
bool daNpc_Nz_c::_delete() {
if(field_0x914.getEmitter()) {
field_0x914.end();
field_0x914.remove();
}
dComIfG_resDelete(&mPhs1, m_arc_name);
src/d/actor/d_a_npc_os.cpp
+1 -1
View File
@@ -2079,7 +2079,7 @@ BOOL daNpc_Os_c::draw() {
g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
g_env_light.setLightTevColorType(pModel, &tevStr);
mBrkAnm.entry(pModelData, mBrkAnm.getFrame());
mBrkAnm.entry(pModelData);
mpMorf->entryDL();
mBrkAnm.remove(pModelData);
src/d/actor/d_a_obj_barrel2.cpp
+1 -1
View File
@@ -1096,7 +1096,7 @@ bool daObjBarrel2::Act_c::_draw() {
g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
g_env_light.setLightTevColorType(m298, &tevStr);
J3DModelData* mdl_data = m298->getModelData();
m29C->entry(mdl_data, m29C->getFrame());
m29C->entry(mdl_data);
mDoExt_modelUpdateDL(m298);
}
return TRUE;
src/d/actor/d_a_obj_canon.cpp
+2 -2
View File
@@ -496,7 +496,7 @@ bool daObj_Canon_c::_execute() {
if(field_0x470.getEmitter()) {
if(cLib_calcTimer(&field_0x484) == 0) {
field_0x470.end();
field_0x470.remove();
}
}
@@ -604,7 +604,7 @@ cPhs_State daObj_Canon_c::_create() {
/* 00001BEC-00001C50 .text _delete__13daObj_Canon_cFv */
bool daObj_Canon_c::_delete() {
dComIfG_resDelete(&mPhs, m_arc_name);
field_0x470.end();
field_0x470.remove();
#if VERSION > VERSION_DEMO
mDoAud_seDeleteObject(&field_0x450);
#endif
src/d/actor/d_a_obj_eskban.cpp
+1 -1
View File
@@ -168,7 +168,7 @@ daObjEskban::Act_c::Act_c() {}
/* 000009C0-00000A10 .text Delete__Q211daObjEskban5Act_cFv */
BOOL daObjEskban::Act_c::Delete() {
if (M_smoke) {
M_smoke->end();
M_smoke->remove();
M_smoke = NULL;
}
return TRUE;
src/d/actor/d_a_obj_figure.cpp
+1 -1
View File
@@ -614,7 +614,7 @@ BOOL daObjFigure_c::_draw() {
if(mbDisplay) {
if(mpBrkAnm) {
J3DModelData* pModelData2 = mpModel->getModelData();
mpBrkAnm->entry(pModelData2, mpBrkAnm->getFrame());
mpBrkAnm->entry(pModelData2);
}
mBtpAnm1.entry(pModelData, 1);
src/d/actor/d_a_obj_homensmoke.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ namespace daObjHomensmoke {
/* 0000048C-000004C8 .text _delete__Q215daObjHomensmoke5Act_cFv */
bool Act_c::_delete() {
if (mSmokeCb.getEmitter()) {
mSmokeCb.end();
mSmokeCb.remove();
}
return true;
}
src/d/actor/d_a_obj_ikada.cpp
+1 -1
View File
@@ -1244,7 +1244,7 @@ bool daObj_Ikada_c::_draw() {
if (mType == 4) {
J3DModelData* modelData = mpModel->getModelData();
mBckAnm.entry(modelData, mBckAnm.getFrame());
mBckAnm.entry(modelData);
mDoExt_modelUpdateDL(mpModel);
mpModel->getModelData()->getJointNodePointer(0)->setMtxCalc(NULL);
} else {
src/d/actor/d_a_obj_kanat.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ cPhs_State daObjKanat::Act_c::Mthd_Create() {
/* 000002EC-0000031C .text Delete__Q210daObjKanat5Act_cFv */
BOOL daObjKanat::Act_c::Delete() {
mSmokeCb.end();
mSmokeCb.remove();
return TRUE;
}
src/d/actor/d_a_obj_mkiek.cpp
+2 -2
View File
@@ -191,7 +191,7 @@ void daObjMkiek::Act_c::demo() {
return;
}
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
fopAcM_seStartCurrent(this, JA_SE_OBJ_L_WALL_BREAK, 0);
dComIfGp_getVibration().StartShock(4, -0x21, cXyz(0.0f, 1.0f, 0.0f));
fopAcM_delete(this);
@@ -230,7 +230,7 @@ BOOL daObjMkiek::Act_c::Draw() {
if (m458) {
g_env_light.setLightTevColorType(mpModelV, &tevStr);
J3DModelData* model_v_data = mpModelV->getModelData();
mBrkAnm.entry(model_v_data, mBrkAnm.getFrameCtrl()->getFrame());
mBrkAnm.entry(model_v_data);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModelV);
dComIfGd_setList();
src/d/actor/d_a_obj_movebox.cpp
+2 -2
View File
@@ -1534,14 +1534,14 @@ namespace daObjMovebox {
/* 00002A14-00002A74 .text eff_smoke_slip_end__Q212daObjMovebox5Act_cFv */
void Act_c::eff_smoke_slip_end() {
for (int i = 0; i < (int)ARRAY_SIZE(mSmokeCbs); i++) {
mSmokeCbs[i].end();
mSmokeCbs[i].remove();
}
}
/* 00002A74-00002AD4 .text eff_smoke_slip_remove__Q212daObjMovebox5Act_cFv */
void Act_c::eff_smoke_slip_remove() {
for (int i = 0; i < (int)ARRAY_SIZE(mSmokeCbs); i++) {
mSmokeCbs[i].end();
mSmokeCbs[i].remove();
}
}
src/d/actor/d_a_obj_rcloud.cpp
+1 -1
View File
@@ -220,7 +220,7 @@ bool daObjRcloud_c::_draw() {
g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
g_env_light.setLightTevColorType(mpModel, &tevStr);
J3DModelData* modelData = mpModel->getModelData();
mBtkAnm.entry(modelData, mBtkAnm.getFrame());
mBtkAnm.entry(modelData);
mpModel->calc();
mpModel->calcMaterial();
setTexMtx();
src/d/actor/d_a_obj_vmc.cpp
+1 -1
View File
@@ -200,7 +200,7 @@ bool daObjVmc::Act_c::_delete() {
dComIfG_Bgsp()->Release(mpBgBase);
if (mHasTreeBg == 1)
dComIfG_Bgsp()->Release(mpBgTree);
mSmoke.end();
mSmoke.remove();
dComIfG_resDeleteDemo(&mPhs, M_arcname);
return true;
}
src/d/actor/d_a_player_dproc.inc
+1 -2
View File
@@ -1249,8 +1249,7 @@ BOOL daPy_lk_c::dProcTalismanWait() {
mpEquipItemModel->setBaseTRMtx(mDoMtx_stack_c::get());
mSwordAnim.play();
J3DModelData* modelData = mpEquipItemModel->getModelData();
f32 frame = mSwordAnim.getFrameCtrl()->getFrame();
mSwordAnim.entry(modelData, frame);
mSwordAnim.entry(modelData);
mDoAud_seStart(JA_SE_OBJ_OMAMORI, pcVar1, 0, mReverb);
if (mDemo.getParam0() != 0) {
onModeFlg(ModeFlg_00000080);
src/d/actor/d_a_player_main.cpp
+5 -5
View File
@@ -5888,7 +5888,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_PROC proc) {
m33A8.end();
m32E4.end();
m32F0.end();
mSmokeEcallBack.end();
mSmokeEcallBack.remove();
if (!checkGrabWear()) {
m35D8 = 0.0f;
@@ -10132,9 +10132,9 @@ void daPy_lk_c::setCollision() {
mAtCyl.ResetAtHit();
mAtCyl.OffAtSetBit();
offNoResetFlg0(daPyFlg0_CUT_AT_FLG);
m331C.end();
m332C.end();
m333C.end();
m331C.remove();
m332C.remove();
m333C.remove();
}
if (fanWindCrashEffectDraw()) {
f32 fVar3 = mpYbafo00Btk->getFrame() + 1.0f;
@@ -11813,7 +11813,7 @@ BOOL daPy_lk_c::playerDelete() {
mFanSwingCb.deleteCallBack();
m338C.end();
m33A8.end();
m3280.end();
m3280.remove();
m334C.end();
m336C.end();
mSwimTailEcallBack[0].remove();
src/d/actor/d_a_player_particle.inc
+2 -2
View File
@@ -654,7 +654,7 @@ void daPy_lk_c::setWaterRipple() {
JPABaseEmitter* emitter = m3280.getEmitter();
if (emitter != NULL && ((emitter->mGlobalParticleScale.x < 0.8f && checkNoResetFlg0(daPyFlg0_UNK80)) || (emitter->mGlobalParticleScale.x > 0.8f && !checkNoResetFlg0(daPyFlg0_UNK80)))) {
m3280.end();
m3280.remove();
emitter = dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &current.pos, NULL, NULL, 0xFF, &m3280);
}
@@ -667,7 +667,7 @@ void daPy_lk_c::setWaterRipple() {
}
}
} else if (m3280.getEmitter() != NULL) {
m3280.end();
m3280.remove();
}
if (checkModeFlg(ModeFlg_SWIM)) {
src/d/actor/d_a_player_sword.inc
+1 -1
View File
@@ -1460,7 +1460,7 @@ BOOL daPy_lk_c::procCutTurn() {
if (frameCtrl.getFrame() > m35A0) {
m32F0.end();
mSmokeEcallBack.end();
mSmokeEcallBack.remove();
}
setSpecialBattle(1);
if (doTrigger() && dComIfGp_getDoStatus() == dActStts_PARRY_e) {
src/d/actor/d_a_ship.cpp
+3 -3
View File
@@ -2514,7 +2514,7 @@ BOOL daShip_c::procTalk() {
return procTurn_init();
}
mpHeadAnm->setPlaySpeed(-1.0f);
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
changeDemoEndProc();
return TRUE;
}
@@ -2601,7 +2601,7 @@ BOOL daShip_c::procTurn() {
if (m037A <= 0) {
camera->mCamera.Start();
camera->mCamera.Reset();
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
changeDemoEndProc();
m038E = 0;
onStateFlg(daSFLG_UNK100000_e);
@@ -2804,7 +2804,7 @@ BOOL daShip_c::procTactWarp() {
daTornado_c* mpTornado = (daTornado_c*)fopAcM_SearchByID(mTactWarpID);
if (mpTornado == NULL || fpcM_IsCreating(mTactWarpID)) {
if (mTactWarpID == fpcM_ERROR_PROCESS_ID_e) {
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
m1984.remove();
m1998.remove();
procPaddleMove_init();
src/d/actor/d_a_syan.cpp
+1 -1
View File
@@ -187,7 +187,7 @@ static BOOL daSyan_IsDelete(syan_class* i_this) {
static BOOL daSyan_Delete(syan_class* i_this) {
dComIfG_resDelete(&i_this->mPhs, "Syan");
for (s32 i = 0; i < (s32)ARRAY_SIZE(i_this->emtrCallBack); i++)
i_this->emtrCallBack[i].end();
i_this->emtrCallBack[i].remove();
return TRUE;
}
src/d/actor/d_a_tbox.cpp
+4 -7
View File
@@ -462,16 +462,14 @@ void daTbox_c::CreateInit() {
mOpenAnm.setPlaySpeed(0.0f);
if (checkOpen()) {
J3DFrameCtrl* frameCtrl = mOpenAnm.getFrameCtrl();
frameCtrl->setFrame(frameCtrl->getEnd());
mOpenAnm.setFrame(mOpenAnm.getEndFrame());
setAction(&daTbox_c::actionWait);
if (checkEnv()) {
mInvisibleScrollVal = 2.0f;
frameCtrl = mpAppearRegAnm->getFrameCtrl();
frameCtrl->setFrame(frameCtrl->getEnd());
mpAppearRegAnm->setFrame(mpAppearRegAnm->getEndFrame());
}
}
else {
@@ -490,8 +488,7 @@ void daTbox_c::CreateInit() {
mInvisibleScrollVal = 2.0f;
J3DFrameCtrl* frameCtrl = mpAppearRegAnm->getFrameCtrl();
frameCtrl->setFrame(frameCtrl->getEnd());
mpAppearRegAnm->setFrame(mpAppearRegAnm->getEndFrame());
}
else {
flagOn(daTboxFlg_UNK_04);
@@ -744,7 +741,7 @@ void daTbox_c::demoProcAppear() {
}
if (mAppearTimer == 0x04 && mSmokeCB.getEmitter() != NULL) {
mSmokeCB.end();
mSmokeCB.remove();
}
if (mAppearTimer != 0x00) {
src/d/actor/d_a_wall.cpp
+1 -1
View File
@@ -85,7 +85,7 @@ static dCcD_SrcTri l_tri_src = {
/* 00000078-00000100 .text _delete__8daWall_cFv */
bool daWall_c::_delete() {
mSmokeCb.end();
mSmokeCb.remove();
if (heap != NULL && mState == false)
dComIfG_Bgsp()->Release(mpBgW);
src/d/d_door.cpp
+1 -1
View File
@@ -417,7 +417,7 @@ void dDoor_smoke_c::smokeProc(dDoor_info_c* door) {
/* 8006C41C-8006C448 .text smokeEnd__13dDoor_smoke_cFv */
void dDoor_smoke_c::smokeEnd() {
mSmokeCb.end();
mSmokeCb.remove();
}
/* 8006C448-8006C478 .text keyResLoad__12dDoor_key2_cFv */
src/m_Do/m_Do_ext.cpp
+1 -3
View File
@@ -65,12 +65,10 @@ void mDoExt_setJ3DData(Mtx mtx, const J3DTransformInfo* transformInfo, u16 jnt_n
J3DSys::mParentS.z = transformInfo->mScale.z;
}
static void dummy1() {
static void dummy1(J3DJoint* joint, J3DAnmTransform* anmTransform) {
// Fix the weak function order of J3DAnmTransform::getTransform.
// There was most likely an unused function here that got stripped out.
j3dSys.setCurrentMtxCalc(NULL);
J3DJoint* joint;
J3DAnmTransform* anmTransform;
anmTransform->getTransform(0, &joint->getTransformInfo());
}