mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-01 09:47:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update all code to use the new enum formats

Browse Source
This commit is contained in:
LagoLunatic
2026-05-29 15:45:57 -04:00
parent 5ac87a6885
commit bae595b973
299 changed files with 5151 additions and 5134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_player_main.h
+15 -15
View File
@@ -10,8 +10,8 @@
#include "d/d_bg_w.h"
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_player_HIO.h"
#include "d/res/res_link.h" // IWYU pragma: export
#include "d/res/res_lkanm.h"
#include "res/Object/Link.h" // IWYU pragma: export
#include "res/Object/LkAnm.h"
class mDoExt_MtxCalcOldFrame;
@@ -1808,23 +1808,23 @@ public:
BOOL checkNoUpperAnime() const { return m_anm_heap_upper[UPPER_MOVE2_e].mIdx == 0xFFFF; }
BOOL checkGrabAnime() const { return checkGrabAnimeLight() || checkGrabAnimeHeavy(); };
BOOL checkGrabAnimeLight() const { return checkUpperAnime(LKANM_BCK_GRABWAIT); };
BOOL checkGrabAnimeHeavy() const { return checkUpperAnime(LKANM_BCK_GRABWAITB); };
BOOL checkBoomerangCatchAnime() const { return checkUpperAnime(LKANM_BCK_BOOMCATCH); };
BOOL checkBoomerangThrowAnime() const { return checkUpperAnime(LKANM_BCK_BOOMTHROW); };
BOOL checkBoomerangReadyAnime() const { return checkUpperAnime(LKANM_BCK_BOOMWAIT); };
BOOL checkHookshotReadyAnime() const { return checkUpperAnime(LKANM_BCK_HOOKSHOTWAIT); }
BOOL checkDashDamageAnime() const { return checkUpperAnime(LKANM_BCK_DAMDASH); }
BOOL checkBowReloadAnime() const { return checkUpperAnime(LKANM_BCK_ARROWRELORD); }
BOOL checkBowShootAnime() const { return checkUpperAnime(LKANM_BCK_ARROWSHOOT); }
BOOL checkBowWaitAnime() const { return checkUpperAnime(LKANM_BCK_BOWWAIT); }
BOOL checkGrabAnimeLight() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_GRABWAIT_e); };
BOOL checkGrabAnimeHeavy() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_GRABWAITB_e); };
BOOL checkBoomerangCatchAnime() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_BOOMCATCH_e); };
BOOL checkBoomerangThrowAnime() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_BOOMTHROW_e); };
BOOL checkBoomerangReadyAnime() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_BOOMWAIT_e); };
BOOL checkHookshotReadyAnime() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_HOOKSHOTWAIT_e); }
BOOL checkDashDamageAnime() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_DAMDASH_e); }
BOOL checkBowReloadAnime() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_ARROWRELORD_e); }
BOOL checkBowShootAnime() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_ARROWSHOOT_e); }
BOOL checkBowWaitAnime() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_BOWWAIT_e); }
BOOL checkGuardSlip() const {
return mCurProc == daPyProc_GUARD_SLIP_e ||
mCurProc == daPyProc_CROUCH_DEFENSE_SLIP_e;
}
BOOL checkUpperGuardAnime() const {
return checkUpperAnime(LKANM_BCK_ATNG) ||
checkUpperAnime(LKANM_BCK_ATNGHAM);
return checkUpperAnime(dRes_INDEX_LKANM_BCK_ATNG_e) ||
checkUpperAnime(dRes_INDEX_LKANM_BCK_ATNGHAM_e);
}
s16 checkTinkleShield() const { return mTinkleShieldTimer; }
@@ -1979,7 +1979,7 @@ public:
virtual BOOL checkGrabBarrel() { return checkGrabBarrelSearch(1); }
virtual u32 checkPlayerNoDraw() { return dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_SUBJECT_e) || checkNoResetFlg0(daPyFlg0_NO_DRAW); }
virtual BOOL checkRopeTag() { return mActorKeepEquip.getActor() == NULL; }
virtual BOOL checkRopeReadyAnime() const { return checkUpperAnime(LKANM_BCK_ROPETHROWWAIT); }
virtual BOOL checkRopeReadyAnime() const { return checkUpperAnime(dRes_INDEX_LKANM_BCK_ROPETHROWWAIT_e); }
virtual void voiceStart(u32);
virtual void setOutPower(f32, s16, int);
virtual void onFrollCrashFlg(u32 param_1) { m3620 = param_1; onNoResetFlg0(daPyFlg0_UNK8); }
include/d/d_com_inf_game.h
+1 -1
View File
@@ -18,7 +18,7 @@
#include "d/d_demo.h"
#include "d/d_timer.h"
#include "d/res/res_always.h" // IWYU pragma: export
#include "res/Object/Always.h" // IWYU pragma: export
class JKRArchive;
class JKRAramBlock;
include/d/d_name.h
+1
View File
@@ -12,6 +12,7 @@ public:
};
class dDlst_NameIN_c : public dDlst_base_c {
public:
virtual ~dDlst_NameIN_c() {}
void draw();
};
src/d/actor/d_a_acorn_leaf.cpp
+3 -3
View File
@@ -11,7 +11,7 @@
#include "JSystem/J3DGraphAnimator/J3DModel.h"
#include "d/actor/d_a_tsubo.h"
#include "d/actor/d_a_player.h"
#include "d/res/res_vigah.h"
#include "res/Object/VigaH.h"
static cXyz acorn_offset(0.0f, 15.0f, 0.0f);
@@ -64,7 +64,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_actor) {
/* 0000010C-00000258 .text CreateHeap__9daAleaf_cFv */
BOOL daAleaf_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(daAleaf_c::m_arcname, VIGAH_BDL_VIGAH);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(daAleaf_c::m_arcname, dRes_INDEX_VIGAH_BDL_VIGAH_e);
JUT_ASSERT(DEMO_SELECT(258, 262), modelData != NULL);
unk_298 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
@@ -72,7 +72,7 @@ BOOL daAleaf_c::CreateHeap() {
return FALSE;
}
J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(daAleaf_c::m_arcname, VIGAH_BCK_VIGAH);
J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(daAleaf_c::m_arcname, dRes_INDEX_VIGAH_BCK_VIGAH_e);
JUT_ASSERT(DEMO_SELECT(273, 277), pbck != NULL);
if (!unk_408.init(modelData, pbck, true, J3DFrameCtrl::EMode_RESET)) {
src/d/actor/d_a_agb.cpp
+3 -3
View File
@@ -6,7 +6,7 @@
#include "d/dolzel.h" // IWYU pragma: keep
#include "d/actor/d_a_agb.h"
#include "d/d_msg.h"
#include "d/res/res_agb.h"
#include "res/Object/Agb.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "JSystem/JUtility/JUTGba.h"
@@ -1745,7 +1745,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
/* 800D396C-800D3B58 .text createHeap__7daAgb_cFv */
BOOL daAgb_c::createHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Agb", AGB_BDL_AGBCURSOR);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Agb", dRes_INDEX_AGB_BDL_AGBCURSOR_e);
JUT_ASSERT(VERSION_SELECT(2960, 2960, 3277, 3286), modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
@@ -1753,7 +1753,7 @@ BOOL daAgb_c::createHeap() {
return FALSE;
}
J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Agb", AGB_BRK_AGBCURSOR);
J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Agb", dRes_INDEX_AGB_BRK_AGBCURSOR_e);
if (!mBrk.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, TRUE)) {
return FALSE;
}
src/d/actor/d_a_am.cpp
+27 -27
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_am.h"
#include "d/res/res_am.h"
#include "res/Object/Am.h"
#include "f_op/f_op_actor_mng.h"
#include "JSystem/J3DGraphAnimator/J3DNode.h"
#include "SSystem/SComponent/c_xyz.h"
@@ -244,7 +244,7 @@ static BOOL medama_atari_check(am_class* i_this) {
switch (hitObj->GetAtType()) {
case AT_TYPE_GRAPPLING_HOOK:
if (i_this->mCurrBckIdx != AM_BCK_SLEEP && i_this->mCurrBckIdx != AM_BCK_SLEEP_LOOP) {
if (i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_SLEEP_e && i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_SLEEP_LOOP_e) {
if (actor->stealItemLeft > 0) {
actor->max_health = 10;
actor->health = 10;
@@ -285,8 +285,8 @@ static BOOL medama_atari_check(am_class* i_this) {
case AT_TYPE_ICE_ARROW:
fopAcM_seStart(actor, JA_SE_LK_MS_WEP_HIT, 0x42);
ret = true;
if (i_this->mCurrBckIdx == AM_BCK_SLEEP || i_this->mCurrBckIdx == AM_BCK_SLEEP_LOOP) {
anm_init(i_this, AM_BCK_OKIRU, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
if (i_this->mCurrBckIdx == dRes_INDEX_AM_BCK_SLEEP_e || i_this->mCurrBckIdx == dRes_INDEX_AM_BCK_SLEEP_LOOP_e) {
anm_init(i_this, dRes_INDEX_AM_BCK_OKIRU_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
actor->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e;
i_this->mNeedleCyl.OnAtSPrmBit(cCcD_AtSPrm_Set_e);
i_this->mNeedleCyl.OnAtHitBit();
@@ -373,8 +373,8 @@ static BOOL bomb_nomi_check(am_class* i_this) {
fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
i_this->mStts.Move();
if (i_this->mCurrBckIdx != AM_BCK_OPEN && i_this->mCurrBckIdx != AM_BCK_OPEN_LOOP &&
i_this->mCurrBckIdx != AM_BCK_DAMAGE && i_this->mCurrBckIdx != AM_BCK_DAMAGE_LOOP)
if (i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_OPEN_e && i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_OPEN_LOOP_e &&
i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_DAMAGE_e && i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_DAMAGE_LOOP_e)
{
return FALSE;
}
@@ -458,7 +458,7 @@ static BOOL Line_check(am_class* i_this, cXyz destPos) {
static void medama_move(am_class* i_this) {
fopAc_ac_c* actor = &i_this->actor;
daPy_py_c* player = daPy_getPlayerActorClass();
if (i_this->mCurrBckIdx == AM_BCK_SLEEP || i_this->mCurrBckIdx == AM_BCK_SLEEP_LOOP) {
if (i_this->mCurrBckIdx == dRes_INDEX_AM_BCK_SLEEP_e || i_this->mCurrBckIdx == dRes_INDEX_AM_BCK_SLEEP_LOOP_e) {
i_this->mEyeRot.setall(0);
return;
}
@@ -494,7 +494,7 @@ static void action_dousa(am_class* i_this) {
for (int i = 0; i < ARRAY_SIZE(i_this->mCountUpTimers); i++) {
i_this->mCountUpTimers[i] = 0;
}
anm_init(i_this, AM_BCK_SLEEP_LOOP, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM_BCK_SLEEP_LOOP_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mMode += 1;
// Fall-through
case 1: {
@@ -512,7 +512,7 @@ static void action_dousa(am_class* i_this) {
}
#endif
if (Line_check(i_this, player->current.pos)) {
anm_init(i_this, AM_BCK_OKIRU, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM_BCK_OKIRU_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
fopAcM_monsSeStart(actor, JA_SE_CV_AM_AWAKE, 0);
actor->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e;
i_this->mNeedleCyl.OnAtSetBit();
@@ -529,12 +529,12 @@ static void action_dousa(am_class* i_this) {
i_this->mMode += 1;
// Fall-through
case 3:
if (i_this->mCurrBckIdx != AM_BCK_CLOSE && i_this->mCurrBckIdx != AM_BCK_CLOSE_LOOP) {
if (i_this->mCurrBckIdx != AM_BCK_DAMAGE_END) {
if (i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_CLOSE_e && i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_CLOSE_LOOP_e) {
if (i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_DAMAGE_END_e) {
fopAcM_seStart(actor, JA_SE_CM_AM_NEEDLE_OUT, 0);
fopAcM_seStart(actor, JA_SE_CM_AM_MOUTH_CLOSE, 0);
}
anm_init(i_this, AM_BCK_CLOSE, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM_BCK_CLOSE_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mCountDownTimers[2] = 6;
}
i_this->mTargetAngleY = fopAcM_searchPlayerAngleY(actor);
@@ -589,9 +589,9 @@ static void action_dousa(am_class* i_this) {
i_this->mMode += 1;
break;
case 6:
if (i_this->mCurrBckIdx == AM_BCK_CLOSE) {
if (i_this->mCurrBckIdx == dRes_INDEX_AM_BCK_CLOSE_e) {
if (i_this->mpMorf->isStop()) {
anm_init(i_this, AM_BCK_CLOSE_LOOP, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM_BCK_CLOSE_LOOP_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
}
if (!i_this->mAcch.ChkGroundHit()) {
@@ -619,7 +619,7 @@ static void action_dousa(am_class* i_this) {
if (i_this->mCountUpTimers[0] > 2) {
i_this->mCountDownTimers[0] = 100;
i_this->mCountUpTimers[0] = 0;
anm_init(i_this, AM_BCK_DAMAGE, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM_BCK_DAMAGE_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
fopAcM_seStart(actor, JA_SE_CM_AM_NEEDLE_IN, 0);
fopAcM_seStart(actor, JA_SE_CM_AM_MOUTH_OPEN, 0);
fopAcM_monsSeStart(actor, JA_SE_CV_AM_OPEN_MOUTH, 0);
@@ -666,7 +666,7 @@ static void action_dousa(am_class* i_this) {
}
break;
case MODE_DOUSA_SLEEP_INIT:
anm_init(i_this, AM_BCK_SLEEP, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM_BCK_SLEEP_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
fopAcM_seStart(actor, JA_SE_CM_AM_NEEDLE_IN, 0);
i_this->mNeedleCyl.OffAtSetBit();
i_this->mNeedleCyl.OffAtSetBit();
@@ -710,7 +710,7 @@ static void action_modoru_move(am_class* i_this) {
fopAc_ac_c* actor = &i_this->actor;
switch (i_this->mMode) {
case MODE_MODORU_MOVE_INIT: {
anm_init(i_this, AM_BCK_CLOSE_LOOP, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM_BCK_CLOSE_LOOP_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mNeedleCyl.OnAtSetBit();
i_this->mNeedleCyl.OnAtHitBit();
actor->gravity = -11.0f;
@@ -779,10 +779,10 @@ static void action_handou_move(am_class* i_this) {
actor->speedF = 40.0f;
}
i_this->mTargetAngleY = actor->current.angle.y;
if (i_this->mCurrBckIdx != AM_BCK_CLOSE && i_this->mCurrBckIdx != AM_BCK_CLOSE_LOOP) {
if (i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_CLOSE_e && i_this->mCurrBckIdx != dRes_INDEX_AM_BCK_CLOSE_LOOP_e) {
fopAcM_seStart(actor, JA_SE_CM_AM_NEEDLE_OUT, 0);
fopAcM_seStart(actor, JA_SE_CM_AM_MOUTH_CLOSE, 0);
anm_init(i_this, AM_BCK_CLOSE, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM_BCK_CLOSE_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
}
i_this->mMode += 1;
// Fall-through
@@ -813,7 +813,7 @@ static void action_itai_move(am_class* i_this) {
actor->current.angle.y = fopAcM_searchPlayerAngleY(actor);
i_this->mTargetAngleY = actor->current.angle.y;
fopAcM_seStart(actor, JA_SE_CM_AM_NEEDLE_IN, 0);
anm_init(i_this, AM_BCK_DAMAGE, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM_BCK_DAMAGE_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mMode += 1;
// Fall-through
case 41:
@@ -823,14 +823,14 @@ static void action_itai_move(am_class* i_this) {
}
i_this->mCountDownTimers[0] = 100;
actor->speedF = 0.0f;
anm_init(i_this, AM_BCK_DAMAGE_LOOP, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM_BCK_DAMAGE_LOOP_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mMode += 1;
break;
case 42:
if (i_this->mCountDownTimers[0] != 0) {
break;
}
anm_init(i_this, AM_BCK_DAMAGE_END, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM_BCK_DAMAGE_END_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
fopAcM_seStart(actor, JA_SE_CM_AM_NEEDLE_OUT, 0);
fopAcM_seStart(actor, JA_SE_CM_AM_MOUTH_CLOSE, 0);
i_this->mMode += 1;
@@ -853,7 +853,7 @@ static void action_itai_move(am_class* i_this) {
0xB9, &i_this->mSmokeCbs[3], fopAcM_GetRoomNo(actor)
);
fopAcM_seStart(actor, JA_SE_CM_AM_MOUTH_CLOSE, 0);
anm_init(i_this, AM_BCK_BOM_NOMI, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM_BCK_BOM_NOMI_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
mDoAud_onEnemyDamage();
i_this->mEyeRot.setall(0);
i_this->mNeedleCyl.OffAtSetBit();
@@ -907,7 +907,7 @@ static void action_itai_move(am_class* i_this) {
if (i_this->mCountDownTimers[0] != 0) {
break;
}
anm_init(i_this, AM_BCK_DEAD, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM_BCK_DEAD_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTHFLASH00, &i_this->mWaistPos);
dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTHHAHEN00, &i_this->mWaistPos);
@@ -1002,7 +1002,7 @@ static BOOL daAM_Execute(am_class* i_this) {
}
if (i_this->mAction != ACTION_ITAI_MOVE && i_this->mSpawnPosY - 1500.0f > actor->current.pos.y) {
anm_init(i_this, AM_BCK_DEAD, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM_BCK_DEAD_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTHFLASH00, &i_this->mWaistPos);
dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTHHAHEN00, &i_this->mWaistPos);
@@ -1121,9 +1121,9 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
am_class* a_this = (am_class*)i_this;
a_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("AM", AM_BDL_AM),
(J3DModelData*)dComIfG_getObjectRes("AM", dRes_INDEX_AM_BDL_AM_e),
NULL, NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("AM", AM_BCK_SLEEP_LOOP),
(J3DAnmTransformKey*)dComIfG_getObjectRes("AM", dRes_INDEX_AM_BCK_SLEEP_LOOP_e),
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1,
NULL,
0x00000000,
src/d/actor/d_a_am2.cpp
+25 -25
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_am2.h"
#include "d/res/res_am2.h"
#include "res/Object/Am2.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_bg_s_lin_chk.h"
#include "d/d_s_play.h"
@@ -149,7 +149,7 @@ static BOOL medama_atari_check(am2_class* i_this) {
cXyz hitPos = *i_this->mEyeSph.GetTgHitPosP();
if (hitObj->ChkAtType(AT_TYPE_GRAPPLING_HOOK)) {
if (i_this->mCurrBckIdx != AM2_BCK_SLEEP) {
if (i_this->mCurrBckIdx != dRes_INDEX_AM2_BCK_SLEEP_e) {
if (actor->stealItemLeft > 0) {
s8 origHealth = actor->health;
actor->health = 10;
@@ -177,8 +177,8 @@ static BOOL medama_atari_check(am2_class* i_this) {
if (hitObj->ChkAtType(AT_TYPE_NORMAL_ARROW | AT_TYPE_FIRE_ARROW | AT_TYPE_ICE_ARROW)) {
ret = true;
if (i_this->mCurrBckIdx == AM2_BCK_SLEEP) {
anm_init(i_this, AM2_BCK_WAIT, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
if (i_this->mCurrBckIdx == dRes_INDEX_AM2_BCK_SLEEP_e) {
anm_init(i_this, dRes_INDEX_AM2_BCK_WAIT_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
actor->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e;
fopAcM_OnStatus(actor, fopAcStts_SHOWMAP_e);
i_this->mNeedleCyl.OnAtSetBit();
@@ -483,8 +483,8 @@ static void action_dousa(am2_class* i_this) {
i_this->mCountUpTimers[i] = 0;
}
i_this->mAcchRadius = 80.0f + REG8_F(11);
if (i_this->mCurrBckIdx != AM2_BCK_WAIT) {
anm_init(i_this, AM2_BCK_WAIT, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
if (i_this->mCurrBckIdx != dRes_INDEX_AM2_BCK_WAIT_e) {
anm_init(i_this, dRes_INDEX_AM2_BCK_WAIT_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
}
i_this->mMode++;
// Fall-through
@@ -496,7 +496,7 @@ static void action_dousa(am2_class* i_this) {
if (Line_check(i_this, centerPos)) {
actor->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e;
fopAcM_OnStatus(actor, fopAcStts_SHOWMAP_e);
anm_init(i_this, AM2_BCK_START, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM2_BCK_START_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
fopAcM_monsSeStart(actor, JA_SE_CV_AM2_AWAKE, 0);
i_this->mEyeSph.OnTgSetBit();
i_this->mWeakSph.OnTgSetBit();
@@ -530,8 +530,8 @@ static void action_dousa(am2_class* i_this) {
i_this->mTargetAngleY = fopAcM_searchPlayerAngleY(actor);
actor->gravity = -3.0f;
actor->speed.y = 12.0f;
if (i_this->mCurrBckIdx != AM2_BCK_JUMP) {
anm_init(i_this, AM2_BCK_JUMP, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
if (i_this->mCurrBckIdx != dRes_INDEX_AM2_BCK_JUMP_e) {
anm_init(i_this, dRes_INDEX_AM2_BCK_JUMP_e, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
i_this->mMode++;
}
@@ -585,7 +585,7 @@ static void action_dousa(am2_class* i_this) {
}
break;
case 6:
anm_init(i_this, AM2_BCK_SLEEP, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM2_BCK_SLEEP_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
fopAcM_seStart(actor, JA_SE_CM_AM2_SPIKE_IN, 0);
i_this->mWeakSph.OffTgSetBit();
i_this->mWeakSph.ClrTgHit();
@@ -648,7 +648,7 @@ static void action_mahi(am2_class* i_this) {
actor->speedF = 20.0f;
fopAcM_seStart(actor, JA_SE_CM_AM2_SPIKE_IN, 0);
anm_init(i_this, AM2_BCK_DAMAGE, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM2_BCK_DAMAGE_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mMode++;
break;
@@ -658,7 +658,7 @@ static void action_mahi(am2_class* i_this) {
if (i_this->mpMorf->isStop()) {
actor->speedF = 0.0f;
i_this->mCountDownTimers[2] = 20*30;
anm_init(i_this, AM2_BCK_MAHI, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM2_BCK_MAHI_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mMode++;
}
}
@@ -813,8 +813,8 @@ static void action_mahi(am2_class* i_this) {
}
if (i_this->mCountDownTimers[2] == 0) {
if (i_this->mCurrBckIdx != AM2_BCK_BURUBURU) {
anm_init(i_this, AM2_BCK_BURUBURU, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
if (i_this->mCurrBckIdx != dRes_INDEX_AM2_BCK_BURUBURU_e) {
anm_init(i_this, dRes_INDEX_AM2_BCK_BURUBURU_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mCountDownTimers[3] = 20*30;
cLib_offBit<u32>(actor->attention_info.flags, fopAc_Attn_ACTION_CARRY_e);
fopAcM_seStart(actor, JA_SE_CM_AM2_RECOVER, 0);
@@ -861,7 +861,7 @@ static void action_itai(am2_class* i_this) {
dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTH2WEAKPOINT00, &i_this->mWeakPos, &actor->shape_angle);
if (actor->health > 0) {
anm_init(i_this, AM2_BCK_DAMAGE, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM2_BCK_DAMAGE_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
if (i_this->mCountDownTimers[2] > 5) {
actor->speedF = 5.0f;
}
@@ -879,7 +879,7 @@ static void action_itai(am2_class* i_this) {
i_this->mAction = ACTION_DOUSA;
i_this->mMode = 3;
} else {
anm_init(i_this, AM2_BCK_MAHI, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM2_BCK_MAHI_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mAction = ACTION_MAHI;
i_this->mMode = 12;
}
@@ -890,7 +890,7 @@ static void action_itai(am2_class* i_this) {
i_this->mWeakSph.OffTgSetBit();
i_this->mEyeSph.ClrTgHit();
i_this->mWeakSph.ClrTgHit();
anm_init(i_this, AM2_BCK_DEAD1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM2_BCK_DEAD1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mMode++;
break;
case 23:
@@ -904,7 +904,7 @@ static void action_itai(am2_class* i_this) {
actor->speedF = 10.0f;
i_this->mCountDownTimers[0] = 100;
actor->current.angle.y = fopAcM_searchPlayerAngleY(actor);
anm_init(i_this, AM2_BCK_DEAD2, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM2_BCK_DEAD2_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mMode++;
// Fall-through
case 24:
@@ -934,7 +934,7 @@ static void action_itai(am2_class* i_this) {
}
if (i_this->mCountDownTimers[0] == 0) {
anm_init(i_this, AM2_BCK_DEAD3, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM2_BCK_DEAD3_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
fopAcM_seStart(actor, JA_SE_CM_AM2_BEF_EXPLODE, 0);
actor->speedF = 0.0f;
@@ -961,7 +961,7 @@ static void action_itai(am2_class* i_this) {
if (naraku_check(i_this)) {
if (i_this->mbNotInHomeRoom || actor->health <= 0) {
if (i_this->mMode != 25) {
anm_init(i_this, AM2_BCK_DEAD3, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM2_BCK_DEAD3_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
fopAcM_seStart(actor, JA_SE_CM_AM2_BEF_EXPLODE, 0);
actor->speedF = 0.0f;
i_this->mMode = 25;
@@ -1031,7 +1031,7 @@ static void action_modoru_move(am2_class* i_this) {
i_this->mInAbyssTimer = 0;
i_this->mbMadeWaterSplash = false;
i_this->mRippleCb.remove();
anm_init(i_this, AM2_BCK_WAIT, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_AM2_BCK_WAIT_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
fopAcM_seStart(actor, JA_SE_CM_AM2_WTR_RECOVER, 0);
i_this->mMode++;
// Fall-through
@@ -1204,9 +1204,9 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
am2_class* a_this = (am2_class*)i_this;
a_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("AM2", AM2_BDL_AM2),
(J3DModelData*)dComIfG_getObjectRes("AM2", dRes_INDEX_AM2_BDL_AM2_e),
NULL, NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("AM2", AM2_BCK_WAIT),
(J3DAnmTransformKey*)dComIfG_getObjectRes("AM2", dRes_INDEX_AM2_BCK_WAIT_e),
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1,
NULL,
0x00000000,
@@ -1219,14 +1219,14 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
a_this->mpBtkAnm = new mDoExt_btkAnm();
if (!a_this->mpBtkAnm) { return FALSE; }
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("AM2", AM2_BTK_AM2);
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("AM2", dRes_INDEX_AM2_BTK_AM2_e);
int ret = a_this->mpBtkAnm->init(model->getModelData(), pbtk, TRUE, J3DFrameCtrl::EMode_LOOP);
if (!ret) { return FALSE; }
if (!a_this->mpBtkAnm) { return FALSE; }
a_this->mpBrkAnm = new mDoExt_brkAnm();
if (!a_this->mpBrkAnm) { return FALSE; }
J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("AM2", AM2_BRK_AM2);
J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("AM2", dRes_INDEX_AM2_BRK_AM2_e);
ret = a_this->mpBrkAnm->init(model->getModelData(), pbrk, TRUE, J3DFrameCtrl::EMode_LOOP);
if (!ret) { return FALSE; }
if (!a_this->mpBrkAnm) { return FALSE; }
src/d/actor/d_a_amiprop.cpp
+3 -3
View File
@@ -11,7 +11,7 @@
#if VERSION > VERSION_DEMO
#include "d/d_vibration.h"
#endif
#include "d/res/res_hami1.h"
#include "res/Object/Hami1.h"
static dCcD_SrcCyl l_cyl_src = {
// dCcD_SrcGObjInf
@@ -74,7 +74,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 000000F4-00000244 .text CreateHeap__11daAmiProp_cFv */
BOOL daAmiProp_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(daAmiProp_c::m_arcname, HAMI1_BDL_HAMI1);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(daAmiProp_c::m_arcname, dRes_INDEX_HAMI1_BDL_HAMI1_e);
JUT_ASSERT(DEMO_SELECT(250, 255), modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
@@ -87,7 +87,7 @@ BOOL daAmiProp_c::CreateHeap() {
mpBgW = new dBgW();
if (mpBgW != NULL) {
cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(daAmiProp_c::m_arcname, HAMI1_DZB_HAMI1);
cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(daAmiProp_c::m_arcname, dRes_INDEX_HAMI1_DZB_HAMI1_e);
if (mpBgW->Set(dzb, cBgW::MOVE_BG_e, &unk_40C) == true) {
return FALSE;
}
src/d/actor/d_a_arrow.cpp
+3 -3
View File
@@ -13,7 +13,7 @@
#include "d/actor/d_a_pz.h"
#include "d/d_jnt_hit.h"
#include "d/d_s_play.h"
#include "d/res/res_link.h"
#include "res/Object/Link.h"
s16 daArrow_c::m_count;
@@ -87,9 +87,9 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
BOOL daArrow_c::_createHeap() {
u16 modelFileIndex;
if (mArrowType == TYPE_LIGHT) {
modelFileIndex = LINK_BDL_ARROWGLITTER;
modelFileIndex = dRes_INDEX_LINK_BDL_ARROWGLITTER_e;
} else {
modelFileIndex = LINK_BDL_ARROW;
modelFileIndex = dRes_INDEX_LINK_BDL_ARROW_e;
}
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, modelFileIndex);
JUT_ASSERT(190, modelData != NULL);
src/d/actor/d_a_arrow_iceeff.cpp
+3 -3
View File
@@ -20,7 +20,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
BOOL daArrow_Iceeff_c::CreateHeap() {
J3DModelData* modelData;
if(field_0xA38 == 0) {
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", LINK_BDL_GICER00));
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_GICER00_e));
JUT_ASSERT(87, modelData != NULL);
for(int i = 0; i < 30; i++) {
field_0x298[i] = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
@@ -30,14 +30,14 @@ BOOL daArrow_Iceeff_c::CreateHeap() {
}
}
else {
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", LINK_BDL_GICER01));
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_GICER01_e));
JUT_ASSERT(98, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if(mpModel == NULL) {
return false;
}
J3DAnmTransform* bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Link", LINK_BCK_GICER01));
J3DAnmTransform* bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BCK_GICER01_e));
JUT_ASSERT(107, bck != NULL);
if(!mBck.init(modelData, bck, true, J3DFrameCtrl::EMode_NONE)) {
return false;
src/d/actor/d_a_arrow_lighteff.cpp
+9 -9
View File
@@ -80,13 +80,13 @@ BOOL daArrow_Lighteff_c::CreateHeap() {
J3DModelData* modelData;
if(field_0x2E8 == 1) {
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", LINK_BDL_GARWFI00));
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_GARWFI00_e));
}
else if(field_0x2E8 == 2) {
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", LINK_BDL_GARWFI01));
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_GARWFI01_e));
}
else {
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", LINK_BDL_GARWG00));
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_GARWG00_e));
}
JUT_ASSERT(187, modelData != NULL);
@@ -99,16 +99,16 @@ BOOL daArrow_Lighteff_c::CreateHeap() {
J3DAnmTextureSRTKey* btk;
J3DAnmTevRegKey* brk;
if(field_0x2E8 == 1) {
btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Link", LINK_BTK_GARWFI00));
brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Link", LINK_BRK_GARWFI00));
btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BTK_GARWFI00_e));
brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BRK_GARWFI00_e));
}
else if(field_0x2E8 == 2) {
btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Link", LINK_BTK_GARWFI01));
brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Link", LINK_BRK_GARWFI01));
btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BTK_GARWFI01_e));
brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BRK_GARWFI01_e));
}
else {
btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Link", LINK_BTK_GARWG00));
brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Link", LINK_BRK_GARWG00));
btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BTK_GARWG00_e));
brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BRK_GARWG00_e));
}
JUT_ASSERT(216, btk != NULL);
src/d/actor/d_a_atdoor.cpp
+3 -3
View File
@@ -6,7 +6,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_atdoor.h"
#include "d/d_com_inf_game.h"
#include "d/res/res_atdoor.h"
#include "res/Object/Atdoor.h"
enum Action_e {
ACT_WAIT_e = 0,
@@ -30,7 +30,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 000000A4-000001E8 .text CreateHeap__10daAtdoor_cFv */
BOOL daAtdoor_c::CreateHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(daAtdoor_c::M_arcname, ATDOOR_BDL_SDOOR01));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(daAtdoor_c::M_arcname, dRes_INDEX_ATDOOR_BDL_SDOOR01_e));
JUT_ASSERT(112, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
@@ -43,7 +43,7 @@ BOOL daAtdoor_c::CreateHeap() {
return FALSE;
}
cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(daAtdoor_c::M_arcname, ATDOOR_DZB_SDOOR01);
cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(daAtdoor_c::M_arcname, dRes_INDEX_ATDOOR_DZB_SDOOR01_e);
if (dzb == NULL) {
return FALSE;
}
src/d/actor/d_a_auction.cpp
+2 -2
View File
@@ -9,7 +9,7 @@
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_player_main.h"
#include "d/d_camera.h"
#include "d/res/res_pspl.h"
#include "res/Object/Pspl.h"
#include "m_Do/m_Do_controller_pad.h"
#include "d/d_auction_screen.h"
@@ -244,7 +244,7 @@ cPhs_State daAuction_c::_create() {
/* 000006F4-00000770 .text createHeap__11daAuction_cFv */
BOOL daAuction_c::createHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectIDRes("Pspl", PSPL_BDL_PSPL));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectIDRes("Pspl", dRes_ID_PSPL_BDL_PSPL_e));
if (modelData == NULL) {
return FALSE;
src/d/actor/d_a_bb.cpp
+51 -51
View File
@@ -9,7 +9,7 @@
#include "d/d_cc_d.h"
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include "d/res/res_bb.h"
#include "res/Object/Bb.h"
#include "d/d_kankyo.h"
#include "f_op/f_op_kankyo_mng.h"
#include "d/d_snap.h"
@@ -119,7 +119,7 @@ static f32 tial_scale[] = {
0.25f, 0.275f, 0.2875f, 0.3f, 0.325f, 0.375f, 0.4625f, 0.575f, 0.8f,
};
static u16 bb_tex_anm_idx[] = {
BB_BTP_TATACK, BB_BTP_TCLOSE, BB_BTP_TDAMAGE, BB_BTP_TKAIJO, BB_BTP_TMABATAKI, BB_BTP_TOPEN,
dRes_INDEX_BB_BTP_TATACK_e, dRes_INDEX_BB_BTP_TCLOSE_e, dRes_INDEX_BB_BTP_TDAMAGE_e, dRes_INDEX_BB_BTP_TKAIJO_e, dRes_INDEX_BB_BTP_TMABATAKI_e, dRes_INDEX_BB_BTP_TOPEN_e,
};
static u16 bb_tex_max_frame[] = {
5, 3, 40, 5, 7, 3,
@@ -732,14 +732,14 @@ void bb_path_move(bb_class* i_this) {
frame = i_this->mpMorf->getFrame();
if (a_this->current.pos.y > i_this->unk_2F4.y && frame == (REG0_S(0) + 9)) {
i_this->unk_2F0 = 1;
anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, BB_BAS_FLY02);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, REG0_F(0) + 12.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e);
}
break;
case 1:
if (a_this->current.pos.y <= i_this->unk_2F4.y) {
i_this->unk_2F0 = 0;
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 5.0f, 2, l_bbHIO.unk_24, dRes_INDEX_BB_BAS_FLY01_e);
}
break;
@@ -921,7 +921,7 @@ void bb_path_move(bb_class* i_this) {
case 25:
r29 = 1;
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 5.0f, 2, l_bbHIO.unk_24, dRes_INDEX_BB_BAS_FLY01_e);
i_this->unk_2F1 = -1;
i_this->unk_310 = REG0_F(4) * 10.0f + 5000.0f;
i_this->unk_300 = 25.0f;
@@ -957,7 +957,7 @@ void bb_auto_move(bb_class* i_this) {
if ((i_this->unk_318[0] == 0) && (frame == REG0_S(0) + 9)) {
i_this->unk_2F0 = 1;
i_this->unk_318[0] = cM_rndF(200.0) + 50.0f;
anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, BB_BAS_FLY02);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, REG0_F(0) + 12.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e);
}
break;
@@ -965,7 +965,7 @@ void bb_auto_move(bb_class* i_this) {
if ((i_this->unk_318[0] == 0) && (i_this->actor.current.pos.y < i_this->unk_2F4.y)) {
i_this->unk_2F0 = 0;
i_this->unk_318[0] = cM_rndF(60.0) + 20.0f;
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 5.0f, 2, l_bbHIO.unk_24, dRes_INDEX_BB_BAS_FLY01_e);
}
break;
@@ -977,7 +977,7 @@ void bb_auto_move(bb_class* i_this) {
if (frame == 0x22) {
i_this->unk_2F0 = 0;
i_this->unk_318[0] = cM_rndF(60.0f) + 20.0f;
anm_init(i_this, BB_BCK_FLY01, 0.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 0.0f, 2, l_bbHIO.unk_24, dRes_INDEX_BB_BAS_FLY01_e);
}
break;
}
@@ -1041,11 +1041,11 @@ void bb_auto_move(bb_class* i_this) {
if (i_this->unk_2F1 == 10) {
if (sqrt < l_bbHIO.unk_50) {
i_this->unk_2F1 = 11;
anm_init(i_this, BB_BCK_FLY03, 10.0f, 0, 1.0f, BB_BAS_FLY03);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY03_e, 10.0f, 0, 1.0f, dRes_INDEX_BB_BAS_FLY03_e);
}
} else if (sqrt < REG0_F(9) * 10.0f + 300.0f) {
i_this->unk_2F1 = 20;
anm_init(i_this, BB_BCK_LAND01, 5.0f, 2, l_bbHIO.unk_44, BB_BAS_LAND01);
anm_init(i_this, dRes_INDEX_BB_BCK_LAND01_e, 5.0f, 2, l_bbHIO.unk_44, dRes_INDEX_BB_BAS_LAND01_e);
i_this->unk_2F0 = 10;
i_this->actor.speed.y = 0.0f;
i_this->unk_354 = 0;
@@ -1078,7 +1078,7 @@ void bb_auto_move(bb_class* i_this) {
i_this->unk_2F1 = 25;
} else if (i_this->mAcch.ChkGroundHit()) {
i_this->actor.speed.y = -0.5f;
anm_init(i_this, BB_BCK_LAND02, 5.0f, 0, l_bbHIO.unk_48, BB_BAS_LAND02);
anm_init(i_this, dRes_INDEX_BB_BCK_LAND02_e, 5.0f, 0, l_bbHIO.unk_48, dRes_INDEX_BB_BAS_LAND02_e);
i_this->unk_2F1 = 22;
i_this->unk_318[2] = 50;
}
@@ -1108,7 +1108,7 @@ void bb_auto_move(bb_class* i_this) {
i_this->unk_2F4.z = ac->current.pos.z;
i_this->unk_310 = 1000.0f;
i_this->unk_308 = 1.0f;
anm_init(i_this, BB_BCK_WALK, 5.0f, 2, 1.0f, BB_BAS_WALK);
anm_init(i_this, dRes_INDEX_BB_BCK_WALK_e, 5.0f, 2, 1.0f, dRes_INDEX_BB_BAS_WALK_e);
} else {
i_this->unk_2F1 = 0x19;
}
@@ -1128,7 +1128,7 @@ void bb_auto_move(bb_class* i_this) {
i_this->unk_2F1 = 21;
i_this->unk_318[2] = cM_rndF(50.0f) + 50.0f;
anm_init(i_this, BB_BCK_EAT, 5.0f, 0, 1.0f, BB_BAS_EAT);
anm_init(i_this, dRes_INDEX_BB_BCK_EAT_e, 5.0f, 0, 1.0f, dRes_INDEX_BB_BAS_EAT_e);
i_this->unk_2F1 = 24;
}
@@ -1152,14 +1152,14 @@ void bb_auto_move(bb_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->unk_2F1 = 21;
i_this->unk_318[2] = cM_rndF(50.0f);
anm_init(i_this, BB_BCK_WAIT, 5.0f, 2, 1.0f, BB_BAS_WAIT);
anm_init(i_this, dRes_INDEX_BB_BCK_WAIT_e, 5.0f, 2, 1.0f, dRes_INDEX_BB_BAS_WAIT_e);
}
break;
}
case 25:
r29 = 1;
i_this->unk_2F1 = 0;
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 5.0f, 2, l_bbHIO.unk_24, dRes_INDEX_BB_BAS_FLY01_e);
i_this->unk_310 = REG0_F(4) * 10.0f + 2000.0f;
i_this->unk_300 = 25.0f;
i_this->unk_304 = 1.0f;
@@ -1203,7 +1203,7 @@ void bb_auto_move(bb_class* i_this) {
}
i_this->unk_2F0 = 0;
i_this->unk_318[0] = cM_rndF(60.0f) + 20.0f;
anm_init(i_this, BB_BCK_FLY01, 3.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 3.0f, 2, l_bbHIO.unk_24, dRes_INDEX_BB_BAS_FLY01_e);
if (i_this->unk_2DA != 0xFF) {
i_this->unk_35D = i_this->unk_2DA + 1;
path_check(i_this);
@@ -1263,14 +1263,14 @@ void bb_kamome_attack(bb_class* i_this) {
s32 frame = i_this->mpMorf->getFrame();
if ((i_this->actor.current.pos.y > i_this->unk_2F4.y) && (frame == REG0_S(0) + 9)) {
i_this->unk_2F0 = 1;
anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, BB_BAS_FLY02);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, REG0_F(0) + 12.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e);
}
break;
}
case 1: {
if (i_this->actor.current.pos.y <= i_this->unk_2F4.y) {
i_this->unk_2F0 = 0;
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 5.0f, 2, l_bbHIO.unk_24, dRes_INDEX_BB_BAS_FLY01_e);
}
break;
}
@@ -1281,7 +1281,7 @@ void bb_kamome_attack(bb_class* i_this) {
switch (i_this->unk_2F1) {
case 0:
anm_init(i_this, BB_BCK_FLY02, 10.0f, 2, 1.0f, BB_BAS_FLY02);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, 10.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e);
i_this->unk_2F1 = 1;
case 1: {
@@ -1352,7 +1352,7 @@ void bb_atack_move(bb_class* i_this) {
i_this->unk_C7C = 0;
i_this->unk_318[5] = (cM_rndF(30.0f) + 20.0f) * l_bbHIO.unk_20;
anm_init(i_this, BB_BCK_FLYB01, 10.0f, 2, l_bbHIO.unk_28, BB_BAS_FLYB01);
anm_init(i_this, dRes_INDEX_BB_BCK_FLYB01_e, 10.0f, 2, l_bbHIO.unk_28, dRes_INDEX_BB_BAS_FLYB01_e);
i_this->unk_308 = 0.0f;
i_this->unk_30C = 0.0f;
@@ -1378,7 +1378,7 @@ void bb_atack_move(bb_class* i_this) {
i_this->unk_308 = 0.0f;
i_this->unk_300 = 30.0f;
i_this->unk_304 = 1.0f;
anm_init(i_this, BB_BCK_FLY02, 10.0f, 2, 1.0f, BB_BAS_FLY02);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, 10.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e);
case 1:
case 2:
@@ -1396,7 +1396,7 @@ void bb_atack_move(bb_class* i_this) {
if (std::sqrtf(x * x + y * y + z * z) < l_bbHIO.unk_50) {
i_this->unk_2F1 = 2;
anm_init(i_this, BB_BCK_FLY03, 10.0f, 0, 1.0f, BB_BAS_FLY03);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY03_e, 10.0f, 0, 1.0f, dRes_INDEX_BB_BAS_FLY03_e);
kuti_open(i_this, 0x15, JA_SE_CV_BB_FIND);
}
} else {
@@ -1425,7 +1425,7 @@ void bb_atack_move(bb_class* i_this) {
i_this->unk_308 = 0.0f;
i_this->unk_30C = 0.0f;
anm_init(i_this, BB_BCK_FLYB01, 5.0f, 2, l_bbHIO.unk_28, BB_BAS_FLYB01);
anm_init(i_this, dRes_INDEX_BB_BCK_FLYB01_e, 5.0f, 2, l_bbHIO.unk_28, dRes_INDEX_BB_BAS_FLYB01_e);
kuti_open(i_this, 0x30, JA_SE_CV_BB_NORMAL);
}
break;
@@ -1471,7 +1471,7 @@ void bb_atack_move(bb_class* i_this) {
if (i_this->unk_33C > ((REG0_F(5) * 10.0f + 200.0f)) && i_this->unk_33C < (REG0_F(6) * 10.0f + 350.0f)) {
i_this->unk_2F1 = 5;
i_this->unk_318[0] = l_bbHIO.unk_32;
anm_init(i_this, BB_BCK_FLYB01, 2.0f, 2, l_bbHIO.unk_34, BB_BAS_FLYB01);
anm_init(i_this, dRes_INDEX_BB_BCK_FLYB01_e, 2.0f, 2, l_bbHIO.unk_34, dRes_INDEX_BB_BAS_FLYB01_e);
tex_anm_set(i_this, 0);
}
}
@@ -1493,7 +1493,7 @@ void bb_atack_move(bb_class* i_this) {
if (i_this->unk_318[0] == 0) {
i_this->unk_2F1 = 6;
anm_init(i_this, BB_BCK_ATACK01, 2.0f, 0, l_bbHIO.unk_2C, BB_BAS_ATACK01);
anm_init(i_this, dRes_INDEX_BB_BCK_ATACK01_e, 2.0f, 0, l_bbHIO.unk_2C, dRes_INDEX_BB_BAS_ATACK01_e);
i_this->unk_2F4.x = player_actor->current.pos.x;
i_this->unk_2F4.y = player_actor->current.pos.y + 100.0f;
@@ -1524,7 +1524,7 @@ void bb_atack_move(bb_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->unk_2F1 = 4;
anm_init(i_this, BB_BCK_FLYB01, 3.0f, 2, l_bbHIO.unk_28, BB_BAS_FLYB01);
anm_init(i_this, dRes_INDEX_BB_BCK_FLYB01_e, 3.0f, 2, l_bbHIO.unk_28, dRes_INDEX_BB_BAS_FLYB01_e);
i_this->unk_318[5] = l_bbHIO.unk_20 * (cM_rndF(30.0f) + 20.0f);
i_this->unk_308 = 0.0f;
@@ -1546,7 +1546,7 @@ void bb_atack_move(bb_class* i_this) {
i_this->unk_2F1 = 10;
i_this->unk_318[0] = l_bbHIO.unk_30;
anm_init(i_this, BB_BCK_GUSYA01, 0.0f, 0, l_bbHIO.unk_38, BB_BAS_GUSYA01);
anm_init(i_this, dRes_INDEX_BB_BCK_GUSYA01_e, 0.0f, 0, l_bbHIO.unk_38, dRes_INDEX_BB_BAS_GUSYA01_e);
i_this->unk_300 = REG0_F(7);
i_this->unk_304 = 1.0f;
a_this->speedF = -20.0f;
@@ -1568,7 +1568,7 @@ void bb_atack_move(bb_class* i_this) {
if (i_this->mpMorf->isStop() && (i_this->unk_2F1 == 10)) {
i_this->unk_2F1 = 11;
anm_init(i_this, BB_BCK_FURA01, 0.0f, 2, l_bbHIO.unk_3C, BB_BAS_FURA01);
anm_init(i_this, dRes_INDEX_BB_BCK_FURA01_e, 0.0f, 2, l_bbHIO.unk_3C, dRes_INDEX_BB_BAS_FURA01_e);
}
if ((i_this->unk_2F1 == 11) && ((i_this->unk_318[0] & 7) == 5)) {
@@ -1579,7 +1579,7 @@ void bb_atack_move(bb_class* i_this) {
i_this->unk_2F1 = 4;
i_this->unk_318[5] = l_bbHIO.unk_20 * (cM_rndF(30.0f) + 20.0f);
anm_init(i_this, BB_BCK_FLYB01, 10.0f, 2, l_bbHIO.unk_28, BB_BAS_FLYB01);
anm_init(i_this, dRes_INDEX_BB_BCK_FLYB01_e, 10.0f, 2, l_bbHIO.unk_28, dRes_INDEX_BB_BAS_FLYB01_e);
i_this->unk_308 = 0.0f;
i_this->unk_30C = 0.0f;
@@ -1605,14 +1605,14 @@ void bb_atack_move(bb_class* i_this) {
if ((i_this->unk_2DD == 4) || (i_this->unk_2DD == 7)) {
i_this->unk_2F1 = 10;
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 5.0f, 2, l_bbHIO.unk_24, dRes_INDEX_BB_BAS_FLY01_e);
} else {
i_this->unk_2F1 = 0;
i_this->unk_318[0] = 0;
i_this->unk_318[1] = 0;
i_this->unk_2F0 = 1;
anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, BB_BAS_FLY02);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, REG0_F(0) + 12.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e);
a_this->speedF = 0.0f;
i_this->unk_2F4.y = player_actor->current.pos.y + 500.0f;
@@ -1668,7 +1668,7 @@ void bb_wait_move(bb_class* i_this) {
i_this->unk_2F1 = 0;
case 0:
anm_init(i_this, BB_BCK_WAIT, 1.0f, 2, 1.0f, BB_BAS_WAIT);
anm_init(i_this, dRes_INDEX_BB_BCK_WAIT_e, 1.0f, 2, 1.0f, dRes_INDEX_BB_BAS_WAIT_e);
i_this->unk_2F1 = 1;
i_this->unk_318[0] = 100;
@@ -1695,7 +1695,7 @@ void bb_wait_move(bb_class* i_this) {
break;
}
i_this->unk_2F1 = 3;
anm_init(i_this, BB_BCK_FLY01, 5.0f , 2, l_bbHIO.unk_24 * 1.5f, BB_BAS_FLY01);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 5.0f , 2, l_bbHIO.unk_24 * 1.5f, dRes_INDEX_BB_BAS_FLY01_e);
i_this->unk_318[0] = REG0_S(0) + 70;
case 3:
@@ -1754,11 +1754,11 @@ void bb_wait_move(bb_class* i_this) {
} else if (i_this->unk_2F1 == 11) {
if (sqrt < l_bbHIO.unk_50) {
i_this->unk_2F1 = 12;
anm_init(i_this, BB_BCK_FLY03, 10.0f, 0, 1.0f, BB_BAS_FLY03);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY03_e, 10.0f, 0, 1.0f, dRes_INDEX_BB_BAS_FLY03_e);
}
} else if (i_this->unk_2F1 == 12 && sqrt < REG0_F(9) * 10.0f + 300.0f) {
i_this->unk_2F1 = 20;
anm_init(i_this, BB_BCK_LAND01, 5.0f, 2, l_bbHIO.unk_44, BB_BAS_LAND01);
anm_init(i_this, dRes_INDEX_BB_BCK_LAND01_e, 5.0f, 2, l_bbHIO.unk_44, dRes_INDEX_BB_BAS_LAND01_e);
i_this->unk_2F0 = 10;
i_this->actor.speed.y = 0.0f;
i_this->unk_354 = 0;
@@ -1788,7 +1788,7 @@ void bb_wait_move(bb_class* i_this) {
i_this->actor.current.pos.y = i_this->actor.home.pos.y;
i_this->actor.speed.y = -0.5;
if (old_354 > l_bbHIO.unk_40) {
anm_init(i_this, BB_BCK_LAND02, 5.0f, 0, l_bbHIO.unk_48, BB_BAS_LAND02);
anm_init(i_this, dRes_INDEX_BB_BCK_LAND02_e, 5.0f, 0, l_bbHIO.unk_48, dRes_INDEX_BB_BAS_LAND02_e);
i_this->unk_2F1 = -1;
}
}
@@ -1830,7 +1830,7 @@ void bb_su_wait_move(bb_class* i_this) {
i_this->unk_2F1 = 0;
case 0:
anm_init(i_this, BB_BCK_WAIT, 1.0f, 2, 1.0f, BB_BAS_WAIT);
anm_init(i_this, dRes_INDEX_BB_BCK_WAIT_e, 1.0f, 2, 1.0f, dRes_INDEX_BB_BAS_WAIT_e);
i_this->unk_2F1 = 1;
i_this->unk_318[0] = 100;
@@ -1857,7 +1857,7 @@ void bb_su_wait_move(bb_class* i_this) {
break;
}
i_this->unk_2F1 = 3;
anm_init(i_this, BB_BCK_FLY01, 5.0f , 2, l_bbHIO.unk_24 * 1.5f, BB_BAS_FLY01);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 5.0f , 2, l_bbHIO.unk_24 * 1.5f, dRes_INDEX_BB_BAS_FLY01_e);
i_this->unk_318[0] = REG0_S(0) + 70;
case 3:
@@ -1916,11 +1916,11 @@ void bb_su_wait_move(bb_class* i_this) {
} else if (i_this->unk_2F1 == 11) {
if (sqrt < l_bbHIO.unk_50) {
i_this->unk_2F1 = 12;
anm_init(i_this, BB_BCK_FLY03, 10.0f, 0, 1.0f, BB_BAS_FLY03);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY03_e, 10.0f, 0, 1.0f, dRes_INDEX_BB_BAS_FLY03_e);
}
} else if (i_this->unk_2F1 == 12 && sqrt < REG0_F(9) * 10.0f + 300.0f) {
i_this->unk_2F1 = 20;
anm_init(i_this, BB_BCK_LAND01, 5.0f, 2, l_bbHIO.unk_44, BB_BAS_LAND01);
anm_init(i_this, dRes_INDEX_BB_BCK_LAND01_e, 5.0f, 2, l_bbHIO.unk_44, dRes_INDEX_BB_BAS_LAND01_e);
i_this->unk_2F0 = 10;
i_this->actor.speed.y = 0.0f;
i_this->unk_354 = 0;
@@ -1950,7 +1950,7 @@ void bb_su_wait_move(bb_class* i_this) {
i_this->actor.current.pos.y = i_this->actor.home.pos.y;
i_this->actor.speed.y = -0.5;
if (old_354 > l_bbHIO.unk_40) {
anm_init(i_this, BB_BCK_LAND02, 5.0f, 0, l_bbHIO.unk_48, BB_BAS_LAND02);
anm_init(i_this, dRes_INDEX_BB_BCK_LAND02_e, 5.0f, 0, l_bbHIO.unk_48, dRes_INDEX_BB_BAS_LAND02_e);
i_this->unk_2F1 = -1;
}
}
@@ -1984,7 +1984,7 @@ void bb_key_move(bb_class* i_this) {
if (!CPad_CHECK_HOLD_B(0) && frame == REG0_S(0) + 9) {
i_this->unk_2F0 = 1;
anm_init(i_this, BB_BCK_FLY02, REG0_F(0) + 12.0f, 2, 1.0f, BB_BAS_FLY02);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, REG0_F(0) + 12.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e);
}
break;
}
@@ -1999,7 +1999,7 @@ void bb_key_move(bb_class* i_this) {
if (CPad_CHECK_HOLD_B(0)) {
i_this->unk_2F0 = 0;
anm_init(i_this, BB_BCK_FLY01, 5.0f, 2, l_bbHIO.unk_24, BB_BAS_FLY01);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY01_e, 5.0f, 2, l_bbHIO.unk_24, dRes_INDEX_BB_BAS_FLY01_e);
fopAcM_monsSeStart(&i_this->actor, JA_SE_CV_BB_NORMAL, 0);
}
break;
@@ -2086,7 +2086,7 @@ void damage_check(bb_class* i_this) {
i_this->mEnemyIce.mFreezeDuration = REG0_S(3) + 300;
i_this->unk_2DD = 3;
i_this->unk_2F1 = 0;
anm_init(i_this, BB_BCK_DAMAGEP, 0.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BB_BCK_DAMAGEP_e, 0.0f, 0, 1.0f, -1);
} else {
i_this->mEnemyIce.mLightShrinkTimer = 1;
}
@@ -2196,7 +2196,7 @@ void damage_check(bb_class* i_this) {
}
i_this->unk_C7C = 1;
anm_init(i_this, BB_BCK_DAMAGEP, 0.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BB_BCK_DAMAGEP_e, 0.0f, 0, 1.0f, -1);
}
}
@@ -2336,7 +2336,7 @@ static BOOL daBb_Execute(bb_class* i_this) {
if (i_this->unk_2DF != 0) {
switch (i_this->unk_2DF) {
case 1:
anm_init(i_this, BB_BCK_FLYC, 1.0f, 2, l_bbHIO.unk_4C, BB_BAS_FLYC);
anm_init(i_this, dRes_INDEX_BB_BCK_FLYC_e, 1.0f, 2, l_bbHIO.unk_4C, dRes_INDEX_BB_BAS_FLYC_e);
i_this->unk_2DF = 2;
break;
@@ -2375,7 +2375,7 @@ static BOOL daBb_Execute(bb_class* i_this) {
if (i_this->unk_2E0 != 0) {
i_this->unk_2DF = 0;
anm_init(i_this, BB_BCK_FLY02, 12.0f, 2, 1.0f, BB_BAS_FLY02);
anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, 12.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e);
dr->mAction = 31;
ac->speedF = 40.0f;
}
@@ -2530,12 +2530,12 @@ static BOOL useHeapInit(fopAc_ac_c* ac) {
bb_class* i_this = (bb_class*)ac;
i_this->mpMorf = new mDoExt_McaMorf(
static_cast<J3DModelData*>(dComIfG_getObjectRes("Bb", BB_BDL_BB)),
static_cast<J3DModelData*>(dComIfG_getObjectRes("Bb", dRes_INDEX_BB_BDL_BB_e)),
NULL,
NULL,
static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Bb", BB_BCK_FLY02)),
static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Bb", dRes_INDEX_BB_BCK_FLY02_e)),
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1,
dComIfG_getObjectRes("Bb", BB_BAS_FLY02),
dComIfG_getObjectRes("Bb", dRes_INDEX_BB_BAS_FLY02_e),
0x80000,
0x37221203
);
@@ -2544,7 +2544,7 @@ static BOOL useHeapInit(fopAc_ac_c* ac) {
return FALSE;
}
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Bb", BB_BDL_BB_TAIL));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Bb", dRes_INDEX_BB_BDL_BB_TAIL_e));
JUT_ASSERT(DEMO_SELECT(4508, 4535), modelData != NULL);
for (s32 i = 0; i < 9; i++) {
src/d/actor/d_a_bdk.cpp
+97 -97
View File
@@ -4,7 +4,7 @@
*/
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/res/res_bdk.h"
#include "res/Object/Bdk.h"
#include "d/actor/d_a_bdk.h"
#include "d/actor/d_a_player.h"
#include "d/d_bg_s_movebg_actor.h"
@@ -239,13 +239,13 @@ static BOOL nodeCallBack(J3DNode* node, int calcTiming) {
bdk_class* bdk = (bdk_class*)model->getUserArea();
if (bdk != NULL) {
MTXCopy(model->getAnmMtx(jnt_no), *calc_mtx);
if (jnt_no == JNT_J_DK_KUBI1) {
if (jnt_no == DK_JNT_J_DK_KUBI1_e) {
cMtx_YrotM(*calc_mtx, bdk->mF14);
cMtx_XrotM(*calc_mtx, bdk->mF12);
model->setAnmMtx(jnt_no, *calc_mtx);
MTXCopy(*calc_mtx, J3DSys::mCurrentMtx);
} else if (jnt_no >= JNT_J_DK_TOSAKA_A1 && JNT_J_DK_TOSAKA_B2 >= jnt_no) {
if (jnt_no >= JNT_J_DK_TOSAKA_B1) {
} else if (jnt_no >= DK_JNT_J_DK_TOSAKA_A1_e && DK_JNT_J_DK_TOSAKA_B2_e >= jnt_no) {
if (jnt_no >= DK_JNT_J_DK_TOSAKA_B1_e) {
cMtx_YrotM(*calc_mtx, bdk->m112E + bdk->m1120 + bdk->m1124);
cMtx_ZrotM(*calc_mtx, bdk->m112C + bdk->m1122 + bdk->m1126);
} else {
@@ -418,7 +418,7 @@ static void kamen_draw(bdk_class* i_this) {
fVar3 = REG8_F(18) + 1.20f;
}
MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_ATAMA1), *calc_mtx);
MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_ATAMA1_e), *calc_mtx);
cMtx_YrotM(*calc_mtx, sVar1 + 0x4000);
cMtx_ZrotM(*calc_mtx, sVar2 + -0x4000);
MtxTrans(0.0f, 40.0f, 125.0f, TRUE);
@@ -595,7 +595,7 @@ static void up_fly(bdk_class* i_this) {
u8 pos_flag = 0;
switch (i_this->mState) {
case 0:
anm_init(i_this, BDK_BCK_TOBITATU1, 5.0f, 0, 1.0f, BDK_BAS_TOBITATU1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_TOBITATU1_e, 5.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_TOBITATU1_e, 0);
i_this->m2618 = 0x19;
cMtx_YrotS(*calc_mtx, actor->current.angle.y);
diff.x = 0.0f;
@@ -649,7 +649,7 @@ static void fly(bdk_class* i_this) {
case 0:
break;
case -1:
anm_init(i_this, BDK_BCK_FLY1, 10.0f, 2, 1.0f, BDK_BAS_FLY1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_FLY1_e, 10.0f, 2, 1.0f, dRes_INDEX_BDK_BAS_FLY1_e, 0);
i_this->m2CA = 0;
break;
default:
@@ -791,12 +791,12 @@ static void landing(bdk_class* i_this) {
diff1 = i_this->m2CC - actor->current.pos;
if (diff1.abs() < 1300.0f) {
i_this->mState = 2;
anm_init(i_this, BDK_BCK_TYAKUTI1, 15.0f, 0, 0.001f, BDK_BAS_TYAKUTI1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_TYAKUTI1_e, 15.0f, 0, 0.001f, dRes_INDEX_BDK_BAS_TYAKUTI1_e, 0);
i_this->m2E0 = 1.0f;
pos_flag = 1;
} else {
if (i_this->m2EC[0] == 1) {
anm_init(i_this, BDK_BCK_KAKKU1, 30.0f, 2, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_KAKKU1_e, 30.0f, 2, 1.0f, -1, 0);
}
}
break;
@@ -832,7 +832,7 @@ static void landing(bdk_class* i_this) {
actor->speed.x = 0.0f;
actor->speed.y = -10.0f;
if (i_this->mState == 3) {
anm_init(i_this, BDK_BCK_TYAKUTI1, 5.0f, 0, 1.0f, BDK_BAS_TYAKUTI1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_TYAKUTI1_e, 5.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_TYAKUTI1_e, 0);
i_this->mState = 4;
eff_hane_num = 10;
dComIfGp_getVibration().StartShock(DEMO_SELECT(REG6_S(2), REG0_S(2)) + 5, -0x21, cXyz(0.0f, 1.0f, 0.0f));
@@ -905,7 +905,7 @@ static void wait(bdk_class* i_this) {
i_this->m2592 = 0;
break;
}
anm_init(i_this, BDK_BCK_WAIT1, 10.0f, 2, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_WAIT1_e, 10.0f, 2, 1.0f, -1, 0);
i_this->mState = 1;
i_this->m2EC[0] = cM_rndF(30.0f) + 40.0f;
i_this->m2CA = 0;
@@ -923,19 +923,19 @@ static void wait(bdk_class* i_this) {
if (angle > 0x800) {
if (i_this->m2CA != 1) {
i_this->m2CA = 1;
anm_init(i_this, BDK_BCK_SENKAI_L1, 10.0f, 2, 1.0f, BDK_BAS_SENKAI_L1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_SENKAI_L1_e, 10.0f, 2, 1.0f, dRes_INDEX_BDK_BAS_SENKAI_L1_e, 0);
i_this->m2EC[1] = 0x14;
}
} else {
if (angle < -0x800) {
if (i_this->m2CA != 2) {
i_this->m2CA = 2;
anm_init(i_this, BDK_BCK_SENKAI_R1, 10.0f, 2, 1.0f, BDK_BAS_SENKAI_R1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_SENKAI_R1_e, 10.0f, 2, 1.0f, dRes_INDEX_BDK_BAS_SENKAI_R1_e, 0);
i_this->m2EC[1] = 0x14;
}
} else if (i_this->m2CA != 3) {
i_this->m2CA = 3;
anm_init(i_this, BDK_BCK_WAIT1, 10.0f, 2, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_WAIT1_e, 10.0f, 2, 1.0f, -1, 0);
i_this->m2EC[1] = 0x14;
}
}
@@ -972,7 +972,7 @@ static void wait(bdk_class* i_this) {
i_this->mState = 0;
} else if (dist < DEMO_SELECT(REG12_F(15), REG0_F(15)) + 1300.0f) {
i_this->mState = 2;
anm_init(i_this, BDK_BCK_WALK1, 3.0f, 2, l_HIO.m01C, BDK_BAS_WALK1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_WALK1_e, 3.0f, 2, l_HIO.m01C, dRes_INDEX_BDK_BAS_WALK1_e, 0);
i_this->m2E0 = 0.0f;
actor->speedF = 0.0f;
} else {
@@ -996,7 +996,7 @@ static void wait(bdk_class* i_this) {
}
break;
case 5:
anm_init(i_this, BDK_BCK_JUMP1, 5.0f, 0, 0.0f, BDK_BAS_JUMP1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_JUMP1_e, 5.0f, 0, 0.0f, dRes_INDEX_BDK_BAS_JUMP1_e, 0);
i_this->mState = 6;
fopAcM_GetSpeed_p(actor)->y = REG8_F(9) + 50.0f;
actor->speedF = 0.0f;
@@ -1004,7 +1004,7 @@ static void wait(bdk_class* i_this) {
case 6:
i_this->m2DC = 700.0f;
if (fopAcM_GetSpeed_p(actor)->y < 0.0f && fopAcM_GetPosition_p(actor)->y < i_this->mAcch.GetGroundH() + 5.0f) {
anm_init(i_this, BDK_BCK_JUMP1, 2.0f, 0, 1.0f, BDK_BAS_JUMP1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_JUMP1_e, 2.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_JUMP1_e, 0);
i_this->mState = 7;
}
break;
@@ -1033,7 +1033,7 @@ static void jump(bdk_class* i_this) {
switch (i_this->mState) {
case 0:
anm_init(i_this, BDK_BCK_TOBITATU1, 5.0f, 0, 1.0f, BDK_BAS_TOBITATU1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_TOBITATU1_e, 5.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_TOBITATU1_e, 0);
i_this->m2618 = 0x19;
i_this->mState = 1;
i_this->m2CC = player->current.pos;
@@ -1062,7 +1062,7 @@ static void jump(bdk_class* i_this) {
actor->speed.y = 0.0f;
}
if (i_this->m2EC[0] == 0) {
anm_init(i_this, BDK_BCK_TYAKUTI1, 15.0f, 0, 0.001f, BDK_BAS_TYAKUTI1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_TYAKUTI1_e, 15.0f, 0, 0.001f, dRes_INDEX_BDK_BAS_TYAKUTI1_e, 0);
i_this->mAction = ACTION_LANDING;
i_this->mState = 3;
}
@@ -1084,7 +1084,7 @@ static void jida_attack(bdk_class* i_this) {
switch (i_this->mState) {
case 0:
anm_init(i_this, BDK_BCK_JIDANDA1, 10.0f, 2, 1.0f, BDK_BAS_JIDANDA1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_JIDANDA1_e, 10.0f, 2, 1.0f, dRes_INDEX_BDK_BAS_JIDANDA1_e, 0);
i_this->mState = 1;
i_this->m2EC[0] = (s16)cM_rndF(5.0f) * 0x18;
// Fall-through
@@ -1158,7 +1158,7 @@ static void kuti_attack(bdk_class* i_this) {
i_this->m1134 = 2500;
switch (i_this->mState) {
case 0:
anm_init(i_this, BDK_BCK_ATTACK1, 5.0f, 0, 1.0f, BDK_BAS_ATTACK1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_ATTACK1_e, 5.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_ATTACK1_e, 0);
i_this->mState = 2;
fopAcM_monsSeStart(actor, JA_SE_CV_DK_ATTACK, 0);
break;
@@ -1190,7 +1190,7 @@ static void kuti_attack(bdk_class* i_this) {
bVar2 = 1;
}
if (i_this->mpMorf->isStop()) {
anm_init(i_this, BDK_BCK_NUKENAI1, 2.0f, 0, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_NUKENAI1_e, 2.0f, 0, 1.0f, -1, 0);
i_this->mState = 5;
i_this->m2EC[0] = cM_rndF(60.0f) + 90.0f;
@@ -1228,7 +1228,7 @@ static void kuti_attack(bdk_class* i_this) {
if (i_this->m2EC[0] == 0) {
bVar1 = 1;
} else {
anm_init(i_this, BDK_BCK_NUKENAI1, 2.0f, 0, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_NUKENAI1_e, 2.0f, 0, 1.0f, -1, 0);
i_this->mState = 5;
fopAcM_seStart(actor, JA_SE_CM_DK_JITABATA, 0);
fopAcM_monsSeStart(actor, JA_SE_CV_DK_NUKEZU, 0);
@@ -1240,7 +1240,7 @@ static void kuti_attack(bdk_class* i_this) {
break;
}
if (i_this->m2EC[2] == 1 || bVar1 != 0) {
anm_init(i_this, BDK_BCK_NUKU1, 1.0f, 0, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_NUKU1_e, 1.0f, 0, 1.0f, -1, 0);
i_this->mState = 3;
fopAcM_seStart(actor, JA_SE_CM_DK_PULL_UP_HEAD, 0);
fopAcM_monsSeStart(actor, JA_SE_CV_DK_NUKERU, 0);
@@ -1349,7 +1349,7 @@ static void fly_attack(bdk_class* i_this) {
i_this->m2EC[0] = 0x28;
eff_hane_set(i_this, &i_this->m1168, 10, 0);
} else if (i_this->m2EC[0] == 1) {
anm_init(i_this, BDK_BCK_KAKKU1, 30.0f, 2, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_KAKKU1_e, 30.0f, 2, 1.0f, -1, 0);
}
break;
case 2:
@@ -1368,7 +1368,7 @@ static void fly_attack(bdk_class* i_this) {
}
break;
case 10:
anm_init(i_this, BDK_BCK_DAMAGE4, 2.0f, 0, 1.0f, -1, 1);
anm_init(i_this, dRes_INDEX_BDK_BCK_DAMAGE4_e, 2.0f, 0, 1.0f, -1, 1);
i_this->mState = 0xB;
actor->speed.y = 0.0f;
i_this->m2EC[0] = REG0_S(5) + 0x28;
@@ -1390,7 +1390,7 @@ static void fly_attack(bdk_class* i_this) {
(s8)fopAcM_GetRoomNo(actor)
);
if (emitter) {
emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_MABUTA));
emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_MABUTA_e));
}
}
emitter = dComIfGp_particle_set(
@@ -1405,13 +1405,13 @@ static void fly_attack(bdk_class* i_this) {
&actor->tevStr.mColorK0
);
if (emitter) {
emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_MUNE2));
emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_MUNE2_e));
}
// Fall-through
case 0xB:
actor->current.pos.y += actor->speed.y;
if (i_this->mpMorf->isStop()) {
anm_init(i_this, BDK_BCK_PIKUPIKU1, 5.0f, 2, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_PIKUPIKU1_e, 5.0f, 2, 1.0f, -1, 0);
}
if (i_this->m2EC[0] == 0) {
actor->speed.y -= (0.5f + REG0_F(7));
@@ -1420,7 +1420,7 @@ static void fly_attack(bdk_class* i_this) {
i_this->mState = 0xC;
i_this->m2D8 = actor->current.angle.y + 0x8000;
i_this->m2EC[0] = REG0_S(8) + 0x28;
anm_init(i_this, BDK_BCK_FLY2, 5.0f, 2, 2.0f, BDK_BAS_FLY2, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_FLY2_e, 5.0f, 2, 2.0f, dRes_INDEX_BDK_BAS_FLY2_e, 0);
}
}
break;
@@ -1470,7 +1470,7 @@ static void wind_attack(bdk_class* i_this) {
cXyz offset;
switch (i_this->mState) {
case 0:
anm_init(i_this, BDK_BCK_TOBITATU1, 5.0f, 0, 1.0f, BDK_BAS_TOBITATU1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_TOBITATU1_e, 5.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_TOBITATU1_e, 0);
i_this->m2618 = 0x19;
i_this->mState++;
i_this->m2CC = actor->current.pos;
@@ -1484,7 +1484,7 @@ static void wind_attack(bdk_class* i_this) {
break;
case 2:
if (i_this->mpMorf->isStop()) {
anm_init(i_this, BDK_BCK_FLY2, 5.0f, 2, 2.0f, BDK_BAS_FLY2, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_FLY2_e, 5.0f, 2, 2.0f, dRes_INDEX_BDK_BAS_FLY2_e, 0);
i_this->mState = 3;
i_this->m2EC[0] = 200;
}
@@ -1622,7 +1622,7 @@ static void damage_check(bdk_class* i_this) {
i_this->m1136 = cM_atan2s(actor->eyePos.x - player->current.pos.x, actor->eyePos.z - player->current.pos.z);
if (i_this->mAction == ACTION_KUTI_ATTACK && i_this->m1150.y < 10000.0f) {
anm_init(i_this, BDK_BCK_DAMAGE1, 2.0f, 0, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_DAMAGE1_e, 2.0f, 0, 1.0f, -1, 0);
i_this->mState = 10;
i_this->m2594++;
if (6 <= i_this->m2594) {
@@ -1634,17 +1634,17 @@ static void damage_check(bdk_class* i_this) {
if (i_this->m2586 != 0) {
if (i_this->mAction == ACTION_KUTI_ATTACK) {
i_this->mAction = ACTION_WAIT;
anm_init(i_this, BDK_BCK_WAIT1, 10.0f, 2, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_WAIT1_e, 10.0f, 2, 1.0f, -1, 0);
i_this->mState = 1;
i_this->m2EC[0] = cM_rndF(30.0f) + 30.0f;
i_this->m2EC[1] = i_this->m2EC[0];
i_this->m2CA = 0;
}
anm_init(i_this, BDK_BCK_DAMAGE3, 2.0f, 0, 1.0f, -1, 1);
anm_init(i_this, dRes_INDEX_BDK_BCK_DAMAGE3_e, 2.0f, 0, 1.0f, -1, 1);
sVar1 = 1;
} else {
anm_init(i_this, BDK_BCK_DAMAGE2, 2.0f, 0, 1.0f, BDK_BAS_DAMAGE2, 1);
anm_init(i_this, dRes_INDEX_BDK_BCK_DAMAGE2_e, 2.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_DAMAGE2_e, 1);
sVar1 = 1;
}
}
@@ -1665,7 +1665,7 @@ static void damage_check(bdk_class* i_this) {
&actor->tevStr.mColorK0
);
if (emitter) {
emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_MUNE2));
emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_MUNE2_e));
}
}
}
@@ -1717,7 +1717,7 @@ static void kamen_demo(bdk_class* i_this) {
i_this->m1134 = 0;
switch (i_this->mState) {
case 0:
anm_init(i_this, BDK_BCK_NUKENAI1, 0.0f, 0, 0.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_NUKENAI1_e, 0.0f, 0, 0.0f, -1, 0);
i_this->mState = 1;
i_this->m25A0 = 1;
fopAcM_OnStatus(actor, fopAcStts_UNK4000_e);
@@ -1733,7 +1733,7 @@ static void kamen_demo(bdk_class* i_this) {
pos.y = 0.0f;
pos.z = 0.0f;
MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_ATAMA1), *calc_mtx);
MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_ATAMA1_e), *calc_mtx);
MtxPosition(&pos, &i_this->m910[i]);
i_this->m9A0[i].y = actor->shape_angle.y;
i_this->m9A0[i].x = REG0_S(6) + 0x3625;
@@ -1766,7 +1766,7 @@ static void kamen_demo(bdk_class* i_this) {
if (i_this->m25A6 >= 0x6E && REG8_S(8) == 0) {
i_this->m25A0 = 150;
i_this->mAction = ACTION_KUTI_ATTACK;
anm_init(i_this, BDK_BCK_NUKENAI1, 2.0f, 0, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_NUKENAI1_e, 2.0f, 0, 1.0f, -1, 0);
i_this->mState = 5;
i_this->m2EC[0] = cM_rndF(120.0f) + 30.0f;
mDoAud_bgmStart(JA_BGM_UNK_110);
@@ -1816,7 +1816,7 @@ static void start(bdk_class* i_this) {
i_this->m2F6 = REG0_S(6) + 0x19;
actor->current.pos.y = DEMO_SELECT(REG13_F(10), REG0_F(10)) + 8500.0f;
actor->speed.y = DEMO_SELECT(REG13_F(12), REG0_F(12)) + 80.0f;
anm_init(i_this, BDK_BCK_S_DEMO1, 5.0f, 2, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_S_DEMO1_e, 5.0f, 2, 1.0f, -1, 0);
fopAcM_seStart(actor, JA_SE_CM_DK_ROUND_UP, 0);
dComIfGp_particle_set(
@@ -1839,7 +1839,7 @@ static void start(bdk_class* i_this) {
if (i_this->m25D8 != 0) {
i_this->m25D8 = 0;
i_this->mState = 3;
anm_init(i_this, BDK_BCK_S_DEMO2, 5.0f, 0, 1.0f, BDK_BAS_S_DEMO2, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_S_DEMO2_e, 5.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_S_DEMO2_e, 0);
i_this->m2EC[0] = 0x2D;
}
break;
@@ -1865,7 +1865,7 @@ static void start(bdk_class* i_this) {
);
if (emitter) {
emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_MUNE2));
emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_MUNE2_e));
}
}
}
@@ -1889,19 +1889,19 @@ static void end(bdk_class* i_this) {
switch (i_this->mState) {
case 0:
anm_init(i_this, BDK_BCK_LAST_DAMAGE1, 2.0f, 0, 1.0f, BDK_BAS_LAST_DAMAGE1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_LAST_DAMAGE1_e, 2.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_LAST_DAMAGE1_e, 0);
i_this->mState = 5;
i_this->m2EC[0] = 0xB3;
particle_id = dPa_name::ID_IT_SN_DK_LASTDMG_HANE_W00;
break;
case 1:
anm_init(i_this, BDK_BCK_LAST_DAMAGE3, 2.0f, 0, 1.0f, BDK_BAS_LAST_DAMAGE3, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_LAST_DAMAGE3_e, 2.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_LAST_DAMAGE3_e, 0);
i_this->mState = 5;
i_this->m2EC[0] = 0xB3;
particle_id = dPa_name::ID_IT_SN_DK_LASTDMG_HANE_W02;
break;
case 2:
anm_init(i_this, BDK_BCK_LAST_DAMAGE2, 2.0f, 0, 1.0f, BDK_BAS_LAST_DAMAGE2, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_LAST_DAMAGE2_e, 2.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_LAST_DAMAGE2_e, 0);
i_this->mState = 5;
i_this->m2EC[0] = 0;
particle_id = dPa_name::ID_IT_SN_DK_LASTDMG_HANE_W01;
@@ -1909,7 +1909,7 @@ static void end(bdk_class* i_this) {
case 5:
if (i_this->mpMorf->isStop()) {
i_this->mState = 6;
anm_init(i_this, BDK_BCK_DEATH1, 2.0f, 2, 1.0f, BDK_BAS_DEATH1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_DEATH1_e, 2.0f, 2, 1.0f, dRes_INDEX_BDK_BAS_DEATH1_e, 0);
i_this->m2EC[0] = DEMO_SELECT(REG6_S(3), REG0_S(3)) + 300;
for (s32 i = 0; i <= 1; i++) {
@@ -1940,7 +1940,7 @@ static void end(bdk_class* i_this) {
for (s32 i = 0; i <= 1; i++) {
JPABaseEmitter* emitter = i_this->m6100[i];
if (emitter) {
emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_HANE_L2 + i * 0xA)); // j_dk_hane_l2 joint, j_dk_hane_r2 joint
emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_HANE_L2_e + i * 0xA)); // j_dk_hane_l2 joint, j_dk_hane_r2 joint
}
}
if (i_this->m2EC[0] == 0xAA) {
@@ -1952,7 +1952,7 @@ static void end(bdk_class* i_this) {
cLib_addCalcAngleS2(&actor->current.angle.y, -8000, 0x10, 0x80);
if (i_this->m2EC[0] == 0x3C) {
fopAcM_seStart(actor, JA_SE_CV_DK_DIE, 0);
anm_init(i_this, BDK_BCK_DEATH2, 5.0f, 0, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_DEATH2_e, 5.0f, 0, 1.0f, -1, 0);
}
if (i_this->m2EC[0] == 0 && DEMO_SELECT(REG6_S(4), REG0_S(4)) == 0) {
i_this->mState = 7;
@@ -2020,7 +2020,7 @@ static void end(bdk_class* i_this) {
&actor->tevStr.mColorK0
);
if (emitter) {
emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_MUNE2));
emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_MUNE2_e));
}
for (s32 i = 0; i <= 1; i++) {
JPABaseEmitter* emitter = dComIfGp_particle_set(
@@ -2036,7 +2036,7 @@ static void end(bdk_class* i_this) {
);
if (emitter) {
emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_HANE_L2 + i * 0xA)); // j_dk_hane_l2 joint, j_dk_hane_r2 joint
emitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_HANE_L2_e + i * 0xA)); // j_dk_hane_l2 joint, j_dk_hane_r2 joint
}
}
}
@@ -2070,7 +2070,7 @@ static void t_fly(bdk_class* i_this) {
switch (i_this->mState) {
case -10:
anm_init(i_this, BDK_BCK_TOBITATU1, 5.0f, 0, 1.0f, BDK_BAS_TOBITATU1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_TOBITATU1_e, 5.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_TOBITATU1_e, 0);
i_this->mState++;
break;
case -9:
@@ -2080,20 +2080,20 @@ static void t_fly(bdk_class* i_this) {
break;
case 0:
fopAcM_OffStatus(actor, fopAcStts_UNK4000_e);
anm_init(i_this, BDK_BCK_FLY2, 5.0f, 2, 1.0f, BDK_BAS_FLY2, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_FLY2_e, 5.0f, 2, 1.0f, dRes_INDEX_BDK_BAS_FLY2_e, 0);
i_this->mState++;
// Fall-through
case 1:
if (bdkobj) {
i_this->m2CC = bdkobj->current.pos;
anm_init(i_this, BDK_BCK_ATTACK_T1, 5.0f, 0, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_ATTACK_T1_e, 5.0f, 0, 1.0f, -1, 0);
i_this->mState++;
fopAcM_monsSeStart(actor, JA_SE_CV_DK_ATTACK, 0);
i_this->mp2598 = bdkobj;
} else {
i_this->m2CC = player->current.pos;
if (i_this->m2EC[0] == 0) {
anm_init(i_this, BDK_BCK_ATTACK_T2, 5.0f, 0, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_ATTACK_T2_e, 5.0f, 0, 1.0f, -1, 0);
i_this->mState = 10;
fopAcM_monsSeStart(actor, JA_SE_CV_DK_ATTACK, 0);
fopAcM_seStart(actor, JA_SE_CM_DK_FOOT_ATTACK, 0);
@@ -2175,7 +2175,7 @@ static void t_landing(bdk_class* i_this) {
i_this->mF10 = 1;
switch (i_this->mState) {
case 0:
anm_init(i_this, BDK_BCK_TOBITATU_T1, 5.0f, 2, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_TOBITATU_T1_e, 5.0f, 2, 1.0f, -1, 0);
i_this->mState++;
break;
case 1:
@@ -2224,14 +2224,14 @@ static void t_lastattack(bdk_class* i_this) {
case 0:
actor->speed.y = DEMO_SELECT(REG13_F(6), REG0_F(6)) + 80.0f;
i_this->mState++;
anm_init(i_this, BDK_BCK_TYAKUTI_T1, 10.0f, 0, 0.001f, BDK_BAS_TYAKUTI_T1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_TYAKUTI_T1_e, 10.0f, 0, 0.001f, dRes_INDEX_BDK_BAS_TYAKUTI_T1_e, 0);
break;
case 1:
if (!(s8)isfalling) {
break;
}
anm_init(i_this, BDK_BCK_TYAKUTI_T1, 1.0f, 0, 1.0f, BDK_BAS_TYAKUTI_T1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_TYAKUTI_T1_e, 1.0f, 0, 1.0f, dRes_INDEX_BDK_BAS_TYAKUTI_T1_e, 0);
i_this->mState++;
dComIfGp_getVibration().StartShock(DEMO_SELECT(REG6_S(2), REG0_S(2)) + 5, -0x21, cXyz(0.0f, 1.0f, 0.0f));
dComIfGp_particle_set(
@@ -2256,13 +2256,13 @@ static void t_lastattack(bdk_class* i_this) {
break;
case 2:
if (i_this->mpMorf->isStop()) {
anm_init(i_this, BDK_BCK_WAIT_T1, 5.0, 2, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_WAIT_T1_e, 5.0, 2, 1.0f, -1, 0);
i_this->mState++;
}
break;
case 3:
if (i_this->m2EC[0] == 0 && fopAcM_searchActorDistance(actor, daPy_getPlayerActorClass()) < REG0_F(13) + 700.0f) {
anm_init(i_this, BDK_BCK_ATTACK_T3, 5.0f, 0, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_ATTACK_T3_e, 5.0f, 0, 1.0f, -1, 0);
fopAcM_monsSeStart(actor, JA_SE_CV_DK_ATTACK, 0);
i_this->mState = 4;
}
@@ -2279,7 +2279,7 @@ static void t_lastattack(bdk_class* i_this) {
eff_hane_set(i_this, &i_this->m1168, 5, 0);
}
if (i_this->mpMorf->isStop()) {
anm_init(i_this, BDK_BCK_WAIT_T1, 5.0f, 2, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_WAIT_T1_e, 5.0f, 2, 1.0f, -1, 0);
i_this->mState = 3;
i_this->m2EC[0] = cM_rndF(100.0f) + 100.0f;
}
@@ -2301,7 +2301,7 @@ static void t_down(bdk_class* i_this) {
switch (i_this->mState) {
case 0:
anm_init(i_this, BDK_BCK_TO_DAMAGE_T1, 2.0f, 0, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_TO_DAMAGE_T1_e, 2.0f, 0, 1.0f, -1, 0);
i_this->mState++;
i_this->m2EC[0] = REG0_S(6) + 0x50;
i_this->m2EC[1] = REG0_S(7) + 0x50;
@@ -2322,7 +2322,7 @@ static void t_down(bdk_class* i_this) {
case 1:
case 2:
if (i_this->mpMorf->isStop()) {
anm_init(i_this, BDK_BCK_DAMAGE_T1, 2.0f, 2, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_DAMAGE_T1_e, 2.0f, 2, 1.0f, -1, 0);
}
cLib_addCalc2(&actor->current.pos.x, center_pos.x, 0.2f, REG0_F(4) + 10.0f);
cLib_addCalc2(&actor->current.pos.z, center_pos.z, 0.2f, REG0_F(4) + 10.0f);
@@ -2331,7 +2331,7 @@ static void t_down(bdk_class* i_this) {
cLib_addCalcAngleS2(&i_this->m259E, 1, 1, 2);
#endif
if (i_this->m2EC[1] == 1) {
anm_init(i_this, BDK_BCK_RAKKA_T1, DEMO_SELECT(REG13_F(6), REG0_F(6)) + 20.0f, 2, 1.0f, -1, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_RAKKA_T1_e, DEMO_SELECT(REG13_F(6), REG0_F(6)) + 20.0f, 2, 1.0f, -1, 0);
#if VERSION > VERSION_DEMO
i_this->m259E = 1;
#else
@@ -2460,7 +2460,7 @@ static void col_set(bdk_class* i_this) {
i_this->m1168 = actor->current.pos;
i_this->m1168.y += 380.0f;
model = i_this->mpMorf->getModel();
MTXCopy(model->getAnmMtx(JNT_J_DK_ATAMA1), *calc_mtx);
MTXCopy(model->getAnmMtx(DK_JNT_J_DK_ATAMA1_e), *calc_mtx);
offset.x = REG8_F(0) + 40.0f;
offset.y = REG8_F(1);
@@ -2475,7 +2475,7 @@ static void col_set(bdk_class* i_this) {
i_this->m1144 = i_this->m1150;
MtxPosition(&offset, &i_this->m1150);
if (i_this->m2584 == 1) {
MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_AGO), *calc_mtx);
MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_AGO_e), *calc_mtx);
offset.x = REG8_F(3) + 120.0f;
offset.y = REG8_F(4);
offset.z = REG8_F(5);
@@ -2509,10 +2509,10 @@ static void col_set(bdk_class* i_this) {
for (s32 i = 0; i < 2; i++) {
if (i == 0) {
model = i_this->mpMorf->getModel();
MTXCopy(model->getAnmMtx(JNT_J_DK_ASHI_L3), *calc_mtx);
MTXCopy(model->getAnmMtx(DK_JNT_J_DK_ASHI_L3_e), *calc_mtx);
} else {
model = i_this->mpMorf->getModel();
MTXCopy(model->getAnmMtx(JNT_J_DK_ASHI_R3), *calc_mtx);
MTXCopy(model->getAnmMtx(DK_JNT_J_DK_ASHI_R3_e), *calc_mtx);
}
if (i_this->mAction == ACTION_T_LASTATTACK) {
i_this->mFootCCSph[i].SetR(DEMO_SELECT(REG12_F(8), REG0_F(8)) + 300.0f);
@@ -2990,7 +2990,7 @@ static void demo_camera(bdk_class* i_this) {
cLib_addCalc2(&i_this->m25B4.z, i_this->m1150.z, 0.1f, 50.0f);
if (i_this->mpMorf->isStop()) {
anm_init(i_this, BDK_BCK_FLY3, 1.0f, 2, 1.0f, BDK_BAS_FLY3, 0);
anm_init(i_this, dRes_INDEX_BDK_BCK_FLY3_e, 1.0f, 2, 1.0f, dRes_INDEX_BDK_BAS_FLY3_e, 0);
player->changeDemoMode(daPy_demo_c::DEMO_A_WAIT_e);
player->changeDemoParam0(2);
}
@@ -3579,7 +3579,7 @@ static BOOL daBdk_Execute(bdk_class* i_this) {
}
actor->shape_angle.y = actor->current.angle.y;
actor->shape_angle.z = actor->current.angle.z;
MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(JNT_J_DK_ATAMA1), *calc_mtx);
MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(DK_JNT_J_DK_ATAMA1_e), *calc_mtx);
offset.x = DEMO_SELECT(REG6_F(10), REG0_F(10)) + 120.0f;
offset.y = 0.0f;
@@ -3704,16 +3704,16 @@ static BOOL daBdk_Delete(bdk_class* i_this) {
static BOOL useHeapInit(fopAc_ac_c* i_actor) {
bdk_class* i_this = (bdk_class*)i_actor;
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Bdk", BDK_BDL_DK),
(J3DModelData*)dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BDL_DK_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bdk", BDK_BCK_FLY1),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BCK_FLY1_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
-1,
1,
dComIfG_getObjectRes("Bdk", BDK_BAS_FLY1),
dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BAS_FLY1_e),
0x80000,
0x11000022
);
@@ -3723,8 +3723,8 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
}
for (u16 i = 0; i < i_this->mpMorf->getModel()->getModelData()->getJointNum(); i++) {
if (i == JNT_J_DK_KUBI1 || (JNT_J_DK_TOSAKA_A1 <= i && i <= JNT_J_DK_TOSAKA_B2) || i == JNT_J_DK_O_LA2 || i == JNT_J_DK_O_LB2 || i == JNT_J_DK_O_RA2 ||
i == JNT_J_DK_O_RB2)
if (i == DK_JNT_J_DK_KUBI1_e || (DK_JNT_J_DK_TOSAKA_A1_e <= i && i <= DK_JNT_J_DK_TOSAKA_B2_e) || i == DK_JNT_J_DK_O_LA2_e || i == DK_JNT_J_DK_O_LB2_e || i == DK_JNT_J_DK_O_RA2_e ||
i == DK_JNT_J_DK_O_RB2_e)
{
i_this->mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
}
@@ -3737,13 +3737,13 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
return FALSE;
}
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", BDK_BDL_DK_KAMEN4);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BDL_DK_KAMEN4_e);
i_this->mp8F0 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
if (!i_this->mp8F0) {
return FALSE;
}
static u16 kamen_break_bdl[] = {BDK_BDL_BUHINA, BDK_BDL_BUHINB, BDK_BDL_BUHINC, BDK_BDL_BUHIND};
static u16 kamen_break_bdl[] = {dRes_INDEX_BDK_BDL_BUHINA_e, dRes_INDEX_BDK_BDL_BUHINB_e, dRes_INDEX_BDK_BDL_BUHINC_e, dRes_INDEX_BDK_BDL_BUHIND_e};
for (s32 i = 0; i < 0x4; i++) {
i_this->m8FC[i] = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes("Bdk", kamen_break_bdl[i]), 0x80000, 0x11000022);
@@ -3755,14 +3755,14 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
i_this->bva = new mDoExt_bvaAnm();
JUT_ASSERT(DEMO_SELECT(0x1831, 0x1864), i_this->bva);
s32 bva = i_this->bva->init(i_this->mp8F0, (J3DAnmVisibilityFull*)dComIfG_getObjectRes("Bdk", BDK_BVA_HIBIWARE1), 1, J3DFrameCtrl::EMode_NONE);
s32 bva = i_this->bva->init(i_this->mp8F0, (J3DAnmVisibilityFull*)dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BVA_HIBIWARE1_e), 1, J3DFrameCtrl::EMode_NONE);
#if VERSION > VERSION_DEMO
if (bva == 0) {
return FALSE;
}
#endif
modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", BDK_BDL_DK_TAIL);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BDL_DK_TAIL_e);
JUT_ASSERT(DEMO_SELECT(0x183D, 0x1878), modelData != NULL);
for (int i = 0; i < 4; i++) {
@@ -3778,9 +3778,9 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
for (s32 i = 0; i < 0x28; i++) {
if (i == 0x27) {
modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", BDK_BDL_GROCK00);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BDL_GROCK00_e);
} else if (i < 0x27) {
modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", BDK_BDL_GHANE00);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BDL_GHANE00_e);
}
JUT_ASSERT(DEMO_SELECT(0x185B, 0x189C), modelData != NULL);
i_this->m261C[i].m044 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
@@ -3789,7 +3789,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
}
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", BDK_BDL_S_TSHUTTER);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BDL_S_TSHUTTER_e);
JUT_ASSERT(DEMO_SELECT(0x1868, 0x18A9), modelData != NULL);
for (s32 i = 0; i < 3; i++) {
@@ -3802,12 +3802,12 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
if (i_this->mp63BC[i] == NULL) {
return FALSE;
}
if (i_this->mp63BC[i]->Set((cBgD_t*)(dComIfG_getObjectRes("Bdk", BDK_DZB_S_TSHUTTER)), dBgW::MOVE_BG_e, &i_this->m632C[i]) == TRUE) {
if (i_this->mp63BC[i]->Set((cBgD_t*)(dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_DZB_S_TSHUTTER_e)), dBgW::MOVE_BG_e, &i_this->m632C[i]) == TRUE) {
return FALSE;
}
i_this->mp63BC[i]->SetCrrFunc(dBgS_MoveBGProc_Typical);
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", BDK_BDL_S_TTOGE);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_BDL_S_TTOGE_e);
JUT_ASSERT(DEMO_SELECT(0x1883, 0x18C4), modelData != NULL);
i_this->mp62D8 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
@@ -3818,7 +3818,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
i_this->pm_bgw = new dBgW();
JUT_ASSERT(DEMO_SELECT(0x188D, 0x18CE), i_this->pm_bgw != NULL);
i_this->pm_bgw->Set((cBgD_t*)(dComIfG_getObjectRes("Bdk", BDK_DZB_S_TTOGE)), dBgW::MOVE_BG_e, &i_this->m62DC);
i_this->pm_bgw->Set((cBgD_t*)(dComIfG_getObjectRes("Bdk", dRes_INDEX_BDK_DZB_S_TTOGE_e)), dBgW::MOVE_BG_e, &i_this->m62DC);
i_this->pm_bgw->SetCrrFunc(dBgS_MoveBGProc_Typical);
static Vec kosi1_offset[] = {{0.0f, 0.0f, 0.0f}};
@@ -3849,73 +3849,73 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
static __jnt_hit_data_c search_data[] = {
{
/* mShapeType */ JntHitType_SPH_e,
/* mJointIndex */ JNT_J_DK_KOSI,
/* mJointIndex */ DK_JNT_J_DK_KOSI_e,
/* mRadius */ 132.0f,
/* mpOffsets */ kosi1_offset,
},
{
/* mShapeType */ JntHitType_SPH_e,
/* mJointIndex */ JNT_J_DK_MUNE1,
/* mJointIndex */ DK_JNT_J_DK_MUNE1_e,
/* mRadius */ 140.0f,
/* mpOffsets */ mune1_offset,
},
{
/* mShapeType */ JntHitType_SPH_e,
/* mJointIndex */ JNT_J_DK_MUNE2,
/* mJointIndex */ DK_JNT_J_DK_MUNE2_e,
/* mRadius */ 148.0f,
/* mpOffsets */ mune2_offset,
},
{
/* mShapeType */ JntHitType_SPH_e,
/* mJointIndex */ JNT_J_DK_MUNE2,
/* mJointIndex */ DK_JNT_J_DK_MUNE2_e,
/* mRadius */ 112.0f,
/* mpOffsets */ mune3_offset,
},
{
/* mShapeType */ JntHitType_CYL_e,
/* mJointIndex */ JNT_J_DK_KUBI1,
/* mJointIndex */ DK_JNT_J_DK_KUBI1_e,
/* mRadius */ 85.0f,
/* mpOffsets */ kubi1_offset,
},
{
/* mShapeType */ JntHitType_SPH_DELETE_e,
/* mJointIndex */ JNT_J_DK_ATAMA1,
/* mJointIndex */ DK_JNT_J_DK_ATAMA1_e,
/* mRadius */ 90.0f,
/* mpOffsets */ atama_offset,
},
{
/* mShapeType */ JntHitType_SPH_e,
/* mJointIndex */ JNT_J_DK_TUBASA_L1,
/* mJointIndex */ DK_JNT_J_DK_TUBASA_L1_e,
/* mRadius */ 100.0f,
/* mpOffsets */ tubasaL1_0_offset,
},
{
/* mShapeType */ JntHitType_CYL_e,
/* mJointIndex */ JNT_J_DK_TUBASA_L1,
/* mJointIndex */ DK_JNT_J_DK_TUBASA_L1_e,
/* mRadius */ 55.0f,
/* mpOffsets */ tubasaL1_1_offset,
},
{
/* mShapeType */ JntHitType_CYL2_e,
/* mJointIndex */ JNT_J_DK_TUBASA_L1,
/* mJointIndex */ DK_JNT_J_DK_TUBASA_L1_e,
/* mRadius */ 110.0f,
/* mpOffsets */ tubasaL1_2_offset,
},
{
/* mShapeType */ JntHitType_SPH_e,
/* mJointIndex */ JNT_J_DK_TUBASA_R1,
/* mJointIndex */ DK_JNT_J_DK_TUBASA_R1_e,
/* mRadius */ 100.0f,
/* mpOffsets */ tubasaR1_0_offset,
},
{
/* mShapeType */ JntHitType_CYL_e,
/* mJointIndex */ JNT_J_DK_TUBASA_R1,
/* mJointIndex */ DK_JNT_J_DK_TUBASA_R1_e,
/* mRadius */ 55.0f,
/* mpOffsets */ tubasaR1_1_offset,
},
{
/* mShapeType */ JntHitType_CYL2_e,
/* mJointIndex */ JNT_J_DK_TUBASA_R1,
/* mJointIndex */ DK_JNT_J_DK_TUBASA_R1_e,
/* mRadius */ 110.0f,
/* mpOffsets */ tubasaR1_2_offset,
},
src/d/actor/d_a_bdkobj.cpp
+8 -8
View File
@@ -12,7 +12,7 @@
#include "d/d_cc_uty.h"
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include "d/res/res_bdkobj.h"
#include "res/Object/Bdkobj.h"
#include "f_op/f_op_actor_mng.h"
#include "f_op/f_op_camera.h"
#include "m_Do/m_Do_mtx.h"
@@ -454,14 +454,14 @@ static BOOL daBdkobj_Delete(bdkobj_class* i_this) {
return TRUE;
}
static u16 bdl_data[] = {
BDKOBJ_BDL_S_TBLOCK,
BDKOBJ_BDL_S_TPOLE,
BDKOBJ_BDL_S_TOWER_BRIDGE,
dRes_INDEX_BDKOBJ_BDL_S_TBLOCK_e,
dRes_INDEX_BDKOBJ_BDL_S_TPOLE_e,
dRes_INDEX_BDKOBJ_BDL_S_TOWER_BRIDGE_e,
};
static u16 hahen_bdl_data[] = {
BDKOBJ_BDL_SHAHENS,
BDKOBJ_BDL_SHAHENL,
BDKOBJ_BDL_GWOOD00,
dRes_INDEX_BDKOBJ_BDL_SHAHENS_e,
dRes_INDEX_BDKOBJ_BDL_SHAHENL_e,
dRes_INDEX_BDKOBJ_BDL_GWOOD00_e,
};
/* 000022E8-000024C8 .text useHeapInit__FP10fopAc_ac_c */
@@ -480,7 +480,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
i_this->pm_bgw = new dBgW();
JUT_ASSERT(DEMO_SELECT(781, 801), i_this->pm_bgw != NULL);
cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes("Bdkobj", BDKOBJ_DZB_S_TOWER_BRIDGE);
cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes("Bdkobj", dRes_INDEX_BDKOBJ_DZB_S_TOWER_BRIDGE_e);
if (i_this->pm_bgw->Set(dzb, cBgW::MOVE_BG_e, &i_this->mMtx) == TRUE) {
return FALSE;
}
src/d/actor/d_a_beam.cpp
+5 -5
View File
@@ -7,7 +7,7 @@
#include "d/actor/d_a_beam.h"
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_hot_floor.h"
#include "d/res/res_ylesr00.h"
#include "res/Object/Ylesr00.h"
#include "d/d_cc_d.h"
#include "d/d_lib.h"
#include "d/d_particle.h"
@@ -126,19 +126,19 @@ static BOOL CheckCreateHeap(fopAc_ac_c* a_this) {
/* 000003D0-00000688 .text CreateHeap__8daBeam_cFv */
BOOL daBeam_c::CreateHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, YLESR00_INDEX_BMD_YLESR00));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, dRes_INDEX_YLESR00_BMD_YLESR00_e));
JUT_ASSERT(304, modelData != NULL);
M_mdl = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
JUT_ASSERT(306, M_mdl != NULL);
M_bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(M_arcname, YLESR00_INDEX_BCK_YLESR00));
M_bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(M_arcname, dRes_INDEX_YLESR00_BCK_YLESR00_e));
JUT_ASSERT(310, M_bck != NULL);
M_brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(M_arcname, YLESR00_INDEX_BRK_YLESR00));
M_brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(M_arcname, dRes_INDEX_YLESR00_BRK_YLESR00_e));
JUT_ASSERT(314, M_brk != NULL);
M_btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(M_arcname, YLESR00_INDEX_BTK_YLESR00));
M_btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(M_arcname, dRes_INDEX_YLESR00_BTK_YLESR00_e));
JUT_ASSERT(318, M_brk != NULL);
BOOL tmp1 = mBckAnm.init(modelData, M_bck, false, J3DFrameCtrl::EMode_LOOP);
src/d/actor/d_a_bflower.cpp
+15 -15
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_bflower.h"
#include "d/res/res_vbakh.h"
#include "res/Object/VbakH.h"
#include "d/d_com_inf_game.h"
#include "d/actor/d_a_player_main.h"
#include "d/actor/d_a_bomb2.h"
@@ -116,7 +116,7 @@ BOOL daBFlower_c::CreateHeap() {
mState = daBFlower_c::STATE_LIVE_E;
}
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arcname, VBAKH_BDL_VBAKH));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arcname, dRes_INDEX_VBAKH_BDL_VBAKH_e));
JUT_ASSERT(0x1B2, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
@@ -124,7 +124,7 @@ BOOL daBFlower_c::CreateHeap() {
return FALSE;
}
J3DAnmTransform* pbck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_arcname, VBAKH_BCK_VBAHX));
J3DAnmTransform* pbck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_arcname, dRes_INDEX_VBAKH_BCK_VBAHX_e));
JUT_ASSERT(0x1C3, pbck != NULL);
if (!mBck1.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_RESET)) {
@@ -132,7 +132,7 @@ BOOL daBFlower_c::CreateHeap() {
}
mBck1.setFrame(mBck1.getEndFrame());
J3DAnmTevRegKey* pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_arcname, VBAKH_BRK_VBAHX));
J3DAnmTevRegKey* pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_arcname, dRes_INDEX_VBAKH_BRK_VBAHX_e));
JUT_ASSERT(0x1D9, pbrk != NULL);
if (!mBrk1.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_NONE)) {
@@ -140,7 +140,7 @@ BOOL daBFlower_c::CreateHeap() {
}
mBrk1.setPlaySpeed(0.0f);
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arcname, VBAKH_BDL_VBAKM));
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arcname, dRes_INDEX_VBAKH_BDL_VBAKM_e));
JUT_ASSERT(0x1E7, modelData != NULL);
mpModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
@@ -148,7 +148,7 @@ BOOL daBFlower_c::CreateHeap() {
return FALSE;
}
pbck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_arcname, VBAKH_BCK_VBAMX));
pbck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_arcname, dRes_INDEX_VBAKH_BCK_VBAMX_e));
JUT_ASSERT(0x1F7, pbck != NULL);
if (!mBck2.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_NONE)) {
@@ -156,7 +156,7 @@ BOOL daBFlower_c::CreateHeap() {
}
mBck2.setPlaySpeed(0.0f);
pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_arcname, VBAKH_BRK_VBAMX));
pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_arcname, dRes_INDEX_VBAKH_BRK_VBAMX_e));
JUT_ASSERT(0x208, pbrk != NULL);
if (!mBrk2.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_NONE)) {
@@ -225,7 +225,7 @@ int daBFlower_c::init_bck_anm(s16 param) {
m55C = param;
J3DModelData* pModelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arcname, VBAKH_BDL_VBAKH));
J3DModelData* pModelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arcname, dRes_INDEX_VBAKH_BDL_VBAKH_e));
J3DAnmTransform* pBck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_arcname, param));
return mBck1.init(pModelData, pBck, TRUE, J3DFrameCtrl::EMode_RESET, 1.0f, 0, -1, true);
@@ -293,12 +293,12 @@ BOOL daBFlower_c::actLive() {
f32 tmp = cLib_addCalc(&mBombScale.z, 1.0f, 0.05f, 0.1f, 0.05f);
if (m5B8 != 0 && tmp == 0.0f) {
init_bck_anm(VBAKH_BCK_VBAKH);
init_bck_anm(dRes_INDEX_VBAKH_BCK_VBAKH_e);
}
// Play animation if player walks by bomb flower
if (dist < 50.0f && std::abs(mPrevPlayerDist - dist) > 2.0f && std::abs(player->current.pos.y - current.pos.y) < 10.0f) {
init_bck_anm(VBAKH_BCK_VBAKH);
init_bck_anm(dRes_INDEX_VBAKH_BCK_VBAKH_e);
}
// Play animation if player dropped held actor near bomb flower?
@@ -307,7 +307,7 @@ BOOL daBFlower_c::actLive() {
if (pActor != NULL) {
if ((pActor->current.pos - current.pos).absXZ() < 70.0f) {
init_bck_anm(VBAKH_BCK_VBAKH);
init_bck_anm(dRes_INDEX_VBAKH_BCK_VBAKH_e);
}
}
}
@@ -372,7 +372,7 @@ BOOL daBFlower_c::actLive() {
daPy_getPlayerLinkActorClass()->exchangeGrabActor(mpBombActor);
}
init_bck_anm(VBAKH_BCK_VBAKH);
init_bck_anm(dRes_INDEX_VBAKH_BCK_VBAKH_e);
}
if (m58C != 0 && tmp > 0.0f) {
@@ -396,12 +396,12 @@ BOOL daBFlower_c::actDead() {
// Play animation if player walks by bomb flower
if (dist < 50.0f && std::abs(mPrevPlayerDist - dist) > 2.0f) {
init_bck_anm(VBAKH_BCK_VBAHX);
init_bck_anm(dRes_INDEX_VBAKH_BCK_VBAHX_e);
}
if (mAnimTimer == 0) {
mAnimTimer = cM_rndF(100.0f) + 100.0f;
init_bck_anm(VBAKH_BCK_VBAHX);
init_bck_anm(dRes_INDEX_VBAKH_BCK_VBAHX_e);
}
mBrk1.setPlaySpeed(0.0f);
@@ -414,7 +414,7 @@ BOOL daBFlower_c::actDead() {
mState = daBFlower_c::STATE_LIVE_E;
fopAcM_onSwitch(this, mSwitchNo);
init_bck_anm(VBAKH_BCK_VBAKH);
init_bck_anm(dRes_INDEX_VBAKH_BCK_VBAKH_e);
mBrk1.setPlaySpeed(1.0f);
mBrk2.setPlaySpeed(1.0f);
mBck2.setPlaySpeed(1.0f);
src/d/actor/d_a_bgn.cpp
+15 -15
View File
@@ -16,7 +16,7 @@
#include "d/d_meter.h"
#include "d/d_s_play.h"
#include "d/d_snap.h"
#include "d/res/res_bgn.h"
#include "res/Object/Bgn.h"
#include "dolphin/gf/GFGeometry.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_cc_d.h"
@@ -3426,10 +3426,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
bgn_class* i_this = (bgn_class*)a_this;
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_HEAD1),
(J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_HEAD1_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", BGN_BCK_BGN_HEAD1),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BCK_BGN_HEAD1_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
@@ -3444,12 +3444,12 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
}
i_this->mHeadParts[0].mpPartModel = i_this->mpMorf->getModel();
i_this->mHeadParts[0].m0D2 = 16;
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_MAIN1);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_MAIN1_e);
i_this->mpChestModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (i_this->mpChestModel == NULL) {
return FALSE;
}
bodyModelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_BODY1);
bodyModelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_BODY1_e);
if (!part_init(&i_this->mPelvisParts[0], bodyModelData)) {
return FALSE;
}
@@ -3480,12 +3480,12 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
}
i_this->mTailParts[i].m0D2 = 11 - i;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_JYAKUTENA);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_JYAKUTENA_e);
i_this->mpJyakutenAModel = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203));
if (i_this->mpJyakutenAModel == NULL) {
return FALSE;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_JYAKUTENB);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_JYAKUTENB_e);
i_this->mpJyakutenBModel = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203));
if (i_this->mpJyakutenBModel == NULL) {
return FALSE;
@@ -3496,11 +3496,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
#endif
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BRK_BGN_JYAKUTENBC, BGN_BRK_BGN_JYAKUTENB));
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BRK_BGN_JYAKUTENBC_e, dRes_INDEX_BGN_BRK_BGN_JYAKUTENB_e));
if (!i_this->mJyakutenBBrkAnm->init(modelData, pBrk, true, J3DFrameCtrl::EMode_LOOP)) {
return FALSE;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_JYAKUTENC);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_JYAKUTENC_e);
i_this->mpJyakutenCModel = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203));
if (i_this->mpJyakutenCModel == NULL) {
return FALSE;
@@ -3511,25 +3511,25 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
#endif
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BRK_BGN_JYAKUTENBC, BGN_BRK_BGN_JYAKUTENC));
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BRK_BGN_JYAKUTENBC_e, dRes_INDEX_BGN_BRK_BGN_JYAKUTENC_e));
if (!i_this->mJyakutenCBrkAnm->init(modelData, pBrk, true, J3DFrameCtrl::EMode_LOOP)) {
return FALSE;
}
pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", BGN_BTI_NOT_CUT1);
pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_NOT_CUT1_e);
if (!i_this->mRedRopeMat.init(1, 0x3C, pBti, 1)) {
return FALSE;
}
pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", BGN_BTI_HIMO);
pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_HIMO_e);
if (!i_this->mBlueRopeMat.init(8, 0x3C, pBti, 1)) {
return FALSE;
}
#if VERSION > VERSION_DEMO
pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", BGN_BTI_NOT_CUT1);
pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_NOT_CUT1_e);
if (!i_this->mDefeatCSRopeMat.init(1, 0x3C, pBti, 1)) {
return FALSE;
}
#endif
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_R0E_A);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_R0E_A_e);
JUT_ASSERT(DEMO_SELECT(6628, 7026), modelData != NULL);
i_this->mpWater0Model = mDoExt_J3DModel__create(modelData, 0x80000, 0x31000000);
if (i_this->mpWater0Model == NULL) {
@@ -3539,7 +3539,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
if (i_this->mpWater1Model == NULL) {
return FALSE;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_R00);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_R00_e);
i_this->mpRoomReflectionModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
JUT_ASSERT(DEMO_SELECT(6654, 7052), modelData != NULL);
if (i_this->mpRoomReflectionModel == NULL) {
src/d/actor/d_a_bgn2.cpp
+22 -22
View File
@@ -10,7 +10,7 @@
#include "d/actor/d_a_player.h"
#include "d/d_cc_d.h"
#include "d/d_s_play.h"
#include "d/res/res_bgn.h"
#include "res/Object/Bgn.h"
class daBgn2_HIO_c : public JORReflexible {
public:
@@ -287,13 +287,13 @@ static s32 pos_move(bgn2_class* i_this) {
static void start(bgn2_class* i_this) {
switch (i_this->m0314) {
case 0:
anm_init(i_this, BGN_BCK_DERU1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_DERU1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m0314 = 1;
// fallthrough
case 1:
if (i_this->mpBodyMorf->isStop()) {
i_this->m0312 = 1;
anm_init(i_this, BGN_BCK_RAKKA1, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_RAKKA1_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m0314 = 1;
}
break;
@@ -325,7 +325,7 @@ static void plesattack(bgn2_class* i_this) {
break;
}
i_this->m2E82 = 0;
anm_init(i_this, BGN_BCK_RAKKA1, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_RAKKA1_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m0314 = 1;
if (actor->health == 3) {
i_this->m0330[0] = l_HIO.m1E;
@@ -337,7 +337,7 @@ static void plesattack(bgn2_class* i_this) {
}
case 1:
if (i_this->mpBodyMorf->isStop()) {
anm_init(i_this, BGN_BCK_RAKKA2, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_RAKKA2_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m0314 = 2;
}
// fallthrough
@@ -349,7 +349,7 @@ static void plesattack(bgn2_class* i_this) {
i_this->m2E79 = 1;
if (checkGround(i_this)) {
ki_set(i_this);
anm_init(i_this, BGN_BCK_SETTI1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_SETTI1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m0314 = 3;
dComIfGp_getVibration().StartShock(REG0_S(2) + 5, -0x21, cXyz(0.0f, 1.0f, 0.0f));
sVar6 = actor->health;
@@ -401,7 +401,7 @@ static void jumpattack(bgn2_class* i_this) {
pBrk = i_this->mpBodyMorf->getModel();
switch (i_this->m0314) {
case 0:
anm_init(i_this, BGN_BCK_JUMP1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_JUMP1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m0314 = 1;
// fallthrough
case 1:
@@ -494,7 +494,7 @@ static void damage(bgn2_class* i_this) {
i_this->mpHeadMorf->play(&actor->current.pos, 0, 0);
switch (i_this->m0314) {
case 0:
anm_init(i_this, BGN_BCK_DAMAGE1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_DAMAGE1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m0314 = 1;
// fallthrough
case 1:
@@ -530,7 +530,7 @@ static void hensin(bgn2_class* i_this) {
switch (i_this->m0314) {
#if VERSION == VERSION_DEMO
case 0:
anm_init(i_this, BGN_BCK_WAIT2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_WAIT2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m0314 = 1;
i_this->m0330[0] = 0x96;
bgn->mCSMode = 10;
@@ -538,7 +538,7 @@ static void hensin(bgn2_class* i_this) {
case 1:
#else
case 0:
anm_init(i_this, BGN_BCK_SETTI1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_SETTI1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m0314 = 1;
bgn->mCSMode = 10;
actor->speed.y = REG8_F(0xc) + 50.0f;
@@ -547,7 +547,7 @@ static void hensin(bgn2_class* i_this) {
case 1:
if (i_this->m0330[0] == 0) {
i_this->m0314 = 2;
anm_init(i_this, BGN_BCK_WAIT2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_WAIT2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m0330[0] = REG8_S(5) + 0x5a;
actor->speed.y = 0.0f;
}
@@ -560,7 +560,7 @@ static void hensin(bgn2_class* i_this) {
if (i_this->m0330[0] == 0) {
i_this->m0314 = 5;
i_this->m0330[0] = 0x46;
anm_init(i_this, BGN_BCK_MODORU1, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BGN_BCK_MODORU1_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
fopAcM_seStart(actor, JA_SE_CM_BGN_T_TO_M_1, 0);
}
break;
@@ -1079,10 +1079,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
bgn2_class* i_this = (bgn2_class*)a_this;
i_this->mpHeadMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_HEAD1),
(J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_HEAD1_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", BGN_BCK_BGN_HEAD1),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BCK_BGN_HEAD1_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
@@ -1096,10 +1096,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
i_this->mpBodyMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_KUMO1),
(J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_KUMO1_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", BGN_BCK_WAIT1),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BCK_WAIT1_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
@@ -1112,12 +1112,12 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
if ((i_this->mpBodyMorf == NULL) || (i_this->mpBodyMorf->getModel() == NULL)) {
return FALSE;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BDL_BGN_JYAKUTENA, BGN_BDL_BGN_JYAKUTENA2));
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BDL_BGN_JYAKUTENA_e, dRes_INDEX_BGN_BDL_BGN_JYAKUTENA2_e));
i_this->mpJyakutenModel[2] = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203));
if (i_this->mpJyakutenModel[2] == NULL) {
return FALSE;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BDL_BGN_JYAKUTENB, BGN_BDL_BGN_JYAKUTENB2));
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BDL_BGN_JYAKUTENB_e, dRes_INDEX_BGN_BDL_BGN_JYAKUTENB2_e));
i_this->mpJyakutenModel[1] = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203));
if (i_this->mpJyakutenModel[1] == NULL) {
return FALSE;
@@ -1128,11 +1128,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
#endif
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BRK_BGN_JYAKUTENBC, BGN_BRK_BGN_JYAKUTENB2));
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BRK_BGN_JYAKUTENBC_e, dRes_INDEX_BGN_BRK_BGN_JYAKUTENB2_e));
if (!i_this->mJyakutenBBrkAnm->init(modelData, pBrk, true, J3DFrameCtrl::EMode_LOOP)) {
return FALSE;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BDL_BGN_JYAKUTENC, BGN_BDL_BGN_JYAKUTENC2));
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BDL_BGN_JYAKUTENC_e, dRes_INDEX_BGN_BDL_BGN_JYAKUTENC2_e));
i_this->mpJyakutenModel[0] = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203));
if (i_this->mpJyakutenModel[0] == NULL) {
return FALSE;
@@ -1143,11 +1143,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
#endif
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BRK_BGN_JYAKUTENBC, BGN_BRK_BGN_JYAKUTENC2));
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BRK_BGN_JYAKUTENBC_e, dRes_INDEX_BGN_BRK_BGN_JYAKUTENC2_e));
if (!i_this->mJyakutenCBrkAnm->init(modelData, pBrk, true, J3DFrameCtrl::EMode_LOOP)) {
return FALSE;
}
pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", BGN_BTI_NOT_CUT1);
pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_NOT_CUT1_e);
if (!i_this->mRedRopeMat.init(1, 0x3C, pBti, 1)) {
return FALSE;
}
src/d/actor/d_a_bgn3.cpp
+10 -10
View File
@@ -10,7 +10,7 @@
#include "d/actor/d_a_player.h"
#include "d/d_cc_d.h"
#include "d/d_s_play.h"
#include "d/res/res_bgn.h"
#include "res/Object/Bgn.h"
class daBgn3_HIO_c : public JORReflexible {
public:
@@ -1154,10 +1154,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
bgn3_class* i_this = (bgn3_class*)a_this;
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_HEAD1),
(J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_HEAD1_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", BGN_BCK_BGN_HEAD1),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BCK_BGN_HEAD1_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
@@ -1170,7 +1170,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
if ((i_this->mpMorf == NULL) || (i_this->mpMorf->getModel() == NULL)) {
return FALSE;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", BGN_BDL_BGN_DEKU1);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BDL_BGN_DEKU1_e);
i_this->m002CC = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (i_this->m002CC == NULL) {
return FALSE;
@@ -1187,12 +1187,12 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return false;
}
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BDL_BGN_JYAKUTENA, BGN_BDL_BGN_JYAKUTENA3));
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BDL_BGN_JYAKUTENA_e, dRes_INDEX_BGN_BDL_BGN_JYAKUTENA3_e));
i_this->mpJyakutenAModel = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203));
if (i_this->mpJyakutenAModel == NULL) {
return FALSE;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BDL_BGN_JYAKUTENB, BGN_BDL_BGN_JYAKUTENB3));
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BDL_BGN_JYAKUTENB_e, dRes_INDEX_BGN_BDL_BGN_JYAKUTENB3_e));
i_this->mpJyakutenBModel = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203));
if (i_this->mpJyakutenBModel == NULL) {
return FALSE;
@@ -1203,11 +1203,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
#endif
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BRK_BGN_JYAKUTENBC, BGN_BRK_BGN_JYAKUTENB3));
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BRK_BGN_JYAKUTENBC_e, dRes_INDEX_BGN_BRK_BGN_JYAKUTENB3_e));
if (!i_this->mJyakutenBBrkAnm->init(modelData, pBrk, true, J3DFrameCtrl::EMode_LOOP)) {
return FALSE;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BDL_BGN_JYAKUTENC, BGN_BDL_BGN_JYAKUTENC3));
modelData = (J3DModelData*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BDL_BGN_JYAKUTENC_e, dRes_INDEX_BGN_BDL_BGN_JYAKUTENC3_e));
i_this->mpJyakutenCModel = mDoExt_J3DModel__create(modelData, DEMO_SELECT(0x80000, 0), DEMO_SELECT(0x11000022, 0x11020203));
if (i_this->mpJyakutenCModel == NULL) {
return FALSE;
@@ -1218,11 +1218,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
#endif
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(BGN_BRK_BGN_JYAKUTENBC, BGN_BRK_BGN_JYAKUTENC3));
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bgn", DEMO_SELECT(dRes_INDEX_BGN_BRK_BGN_JYAKUTENBC_e, dRes_INDEX_BGN_BRK_BGN_JYAKUTENC3_e));
if (!i_this->mJyakutenCBrkAnm->init(modelData, pBrk, true, J3DFrameCtrl::EMode_LOOP)) {
return FALSE;
}
pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", BGN_BTI_NOT_CUT1);
pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_NOT_CUT1_e);
if (!i_this->mRedRopeMat.init(1, 0x3c, pBti, 1)) {
return FALSE;
}
src/d/actor/d_a_bita.cpp
+5 -5
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_bita.h"
#include "d/res/res_bita.h"
#include "res/Object/Bita.h"
#include "f_op/f_op_actor_mng.h"
#include "f_op/f_op_camera.h"
#include "d/d_bg_s_movebg_actor.h"
@@ -17,10 +17,10 @@
static btd_class* btd = NULL;
static u32 ita_bmd[] = { BITA_BDL_MBIT1, BITA_BDL_MBIT2 };
static u32 ita_dzb[] = { BITA_DZB_MBIT1, BITA_DZB_MBIT2 };
static u32 ita_Ef_bmd[] = { BITA_BDL_EF_BTDITA0, BITA_BDL_EF_BTDITA1 };
static u32 ita_Ef[] = { BITA_BRK_EF_BTDITA0, BITA_BRK_EF_BTDITA1 };
static u32 ita_bmd[] = { dRes_INDEX_BITA_BDL_MBIT1_e, dRes_INDEX_BITA_BDL_MBIT2_e };
static u32 ita_dzb[] = { dRes_INDEX_BITA_DZB_MBIT1_e, dRes_INDEX_BITA_DZB_MBIT2_e };
static u32 ita_Ef_bmd[] = { dRes_INDEX_BITA_BDL_EF_BTDITA0_e, dRes_INDEX_BITA_BDL_EF_BTDITA1_e };
static u32 ita_Ef[] = { dRes_INDEX_BITA_BRK_EF_BTDITA0_e, dRes_INDEX_BITA_BRK_EF_BTDITA1_e };
/* 00000078-000000C4 .text b_a_sub__FPvPv */
static void* b_a_sub(void* search, void* user) {
src/d/actor/d_a_bk.cpp
+131 -131
View File
@@ -6,7 +6,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_bk.h"
#include "d/d_bg_s_gnd_chk.h"
#include "d/res/res_bk.h"
#include "res/Object/Bk.h"
#include "f_op/f_op_actor_mng.h"
#include "f_op/f_op_camera.h"
#include "d/d_com_inf_game.h"
@@ -47,21 +47,21 @@ struct attack_info_s {
};
static attack_info_s attack1_info[] = {
{ BK_BCK_BK_ATTACK1, 1.2f, BK_BAS_BK_ATTACK1 },
{ BK_BCK_BK_ATTACK2, 1.0f, BK_BAS_BK_ATTACK2 },
{ BK_BCK_BK_ATTACK3, 1.0f, BK_BAS_BK_ATTACK3 },
{ dRes_INDEX_BK_BCK_BK_ATTACK1_e, 1.2f, dRes_INDEX_BK_BAS_BK_ATTACK1_e },
{ dRes_INDEX_BK_BCK_BK_ATTACK2_e, 1.0f, dRes_INDEX_BK_BAS_BK_ATTACK2_e },
{ dRes_INDEX_BK_BCK_BK_ATTACK3_e, 1.0f, dRes_INDEX_BK_BAS_BK_ATTACK3_e },
};
static attack_info_s jattack1_info[] = {
{ BK_BCK_BK_JATTACK1, 1.0f, -1 },
{ BK_BCK_BK_JATTACK2, 1.0f, BK_BAS_BK_JATTACK2 },
{ BK_BCK_BK_JATTACK3, 1.0f, BK_BAS_BK_JATTACK3 },
{ dRes_INDEX_BK_BCK_BK_JATTACK1_e, 1.0f, -1 },
{ dRes_INDEX_BK_BCK_BK_JATTACK2_e, 1.0f, dRes_INDEX_BK_BAS_BK_JATTACK2_e },
{ dRes_INDEX_BK_BCK_BK_JATTACK3_e, 1.0f, dRes_INDEX_BK_BAS_BK_JATTACK3_e },
};
static attack_info_s kattack1_info[] = {
{ BK_BCK_BK_KERI1, 1.0f, BK_BAS_BK_KERI1 },
{ BK_BCK_BK_KERI2, 1.0f, BK_BAS_BK_KERI2 },
{ -BK_BTP_TMABATAKI, 1.0f, 0 }, // TODO: why is bckFileIdx negative and soundFileIdx zero? bug?
{ dRes_INDEX_BK_BCK_BK_KERI1_e, 1.0f, dRes_INDEX_BK_BAS_BK_KERI1_e },
{ dRes_INDEX_BK_BCK_BK_KERI2_e, 1.0f, dRes_INDEX_BK_BAS_BK_KERI2_e },
{ -dRes_INDEX_BK_BTP_TMABATAKI_e, 1.0f, 0 }, // TODO: why is bckFileIdx negative and soundFileIdx zero? bug?
};
static attack_info_s* attack_info[] = {
@@ -79,7 +79,7 @@ static s8 joint_check[] = {
/* 000000EC-00000234 .text anm_init__FP8bk_classifUcfi */
static void anm_init(bk_class* i_this, int bckFileIdx, f32 morf, u8 loopMode, f32 speed, int soundFileIdx) {
if (i_this->dr.mAction == 19 && bckFileIdx != BK_BCK_BK_OTISOU1 && bckFileIdx != BK_BCK_BK_OTISOU2) {
if (i_this->dr.mAction == 19 && bckFileIdx != dRes_INDEX_BK_BCK_BK_OTISOU1_e && bckFileIdx != dRes_INDEX_BK_BCK_BK_OTISOU2_e) {
return;
}
if (soundFileIdx >= 0) {
@@ -936,11 +936,11 @@ static BOOL daBk_player_way_check(bk_class* i_this) {
/* 00003A5C-00003B2C .text wait_set__FP8bk_class */
static void wait_set(bk_class* i_this) {
if (i_this->m0B30 != 0 || i_this->m11F3 != 0) {
anm_init(i_this, BK_BCK_BK_KYORO1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_KYORO1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_KYORO1_e);
} else if (i_this->dr.mAction >= 4) {
anm_init(i_this, BK_BCK_BK_KYORO1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_KYORO1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_KYORO1_e);
} else {
anm_init(i_this, BK_BCK_BK_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_KYORO2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_KYORO2_e);
}
i_this->m0300[1] = 40.0f + cM_rndF(60.0f);
}
@@ -948,11 +948,11 @@ static void wait_set(bk_class* i_this) {
/* 00003B2C-00003C34 .text walk_set__FP8bk_class */
static void walk_set(bk_class* i_this) {
if (i_this->m0B30 != 0 || i_this->m1214 != 0) {
anm_init(i_this, BK_BCK_BK_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK_e);
} else if (i_this->m11F3 == 0) {
anm_init(i_this, BK_BCK_BK_NIGERU, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_NIGERU);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_NIGERU_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_NIGERU_e);
} else {
anm_init(i_this, BK_BCK_BK_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK_e);
}
if (i_this->m0B30 == 0 && i_this->m121F != 0) {
fopAcM_monsSeStart(i_this, JA_SE_CV_BK_LOST_BOKO, 0);
@@ -962,7 +962,7 @@ static void walk_set(bk_class* i_this) {
/* 00003C34-00003C74 .text fight_run_set__FP8bk_class */
static void fight_run_set(bk_class* i_this) {
anm_init(i_this, BK_BCK_BK_RUN, 10.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m070, BK_BAS_BK_RUN);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_RUN_e, 10.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m070, dRes_INDEX_BK_BAS_BK_RUN_e);
}
/* 00003C74-00004104 .text path_check__FP8bk_classUc */
@@ -1214,7 +1214,7 @@ static void stand(bk_class* i_this) {
switch (i_this->dr.mMode) {
case -20:
fopAcM_OnStatus(i_this, fopAcStts_UNK4000_e);
anm_init(i_this, BK_BCK_BK_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WAIT);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_WAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WAIT_e);
i_this->dr.mMode = -19;
i_this->m0300[1] = 20;
#if VERSION > VERSION_DEMO
@@ -1244,14 +1244,14 @@ static void stand(bk_class* i_this) {
i_this->dr.mMode = 1;
if (i_this->m02DC != 0) {
if (cM_rndF(1.0f) < 0.5f) {
anm_init(i_this, BK_BCK_BK_NOZOKU, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_NOZOKU_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m0300[1] = 200.0f + cM_rndF(200.0f);
} else {
anm_init(i_this, BK_BCK_BK_TATAKU, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_TATAKU_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m0300[1] = 100.0f + cM_rndF(100.0f);
}
} else {
anm_init(i_this, BK_BCK_BK_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WAIT);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_WAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WAIT_e);
}
i_this->m121E++;
// Fall-through
@@ -1261,7 +1261,7 @@ static void stand(bk_class* i_this) {
cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->home.angle.y, 2, 0x800);
i_this->speedF = 0.0f;
if (i_this->m0300[1] == 0) {
anm_init(i_this, BK_BCK_BK_NOBI, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_NOBI);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_NOBI_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_NOBI_e);
fopAcM_monsSeStart(i_this, JA_SE_CV_BK_NOBI, 0);
if (i_this->m121E < 3) {
i_this->dr.mMode = 2;
@@ -1282,7 +1282,7 @@ static void stand(bk_class* i_this) {
r28 = true;
i_this->m02CA = 2;
if (i_this->mpMorf->isStop()) {
anm_init(i_this, BK_BCK_BK_SLEEP, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_SLEEP);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_SLEEP_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_SLEEP_e);
i_this->m0300[1] = l_bkHIO.m108 + cM_rndF(l_bkHIO.m10A - l_bkHIO.m108);
i_this->dr.mMode += 1;
}
@@ -1291,17 +1291,17 @@ static void stand(bk_class* i_this) {
r28 = true;
i_this->m02CA = 2;
if (i_this->m0300[1] == 0) {
anm_init(i_this, BK_BCK_BK_NOBI, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_NOBI);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_NOBI_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_NOBI_e);
fopAcM_monsSeStart(i_this, JA_SE_CV_BK_NOBI, 0);
i_this->dr.mMode = 2;
}
break;
case 10:
if (i_this->m0300[1] == 30) {
anm_init(i_this, BK_BCK_BK_BIKKURI, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_BIKKURI_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
}
if (i_this->m0300[1] == 0) {
anm_init(i_this, BK_BCK_BK_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_KYORO2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_KYORO2_e);
i_this->dr.mMode = 11;
i_this->m0300[3] = 30.0f + cM_rndF(30.0f);
}
@@ -1323,7 +1323,7 @@ static void stand(bk_class* i_this) {
}
break;
case 50:
anm_init(i_this, BK_BCK_BK_KYORO1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_KYORO1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_KYORO1_e);
i_this->dr.mMode += 1;
i_this->m0300[1] = 50;
// Fall-through
@@ -1333,7 +1333,7 @@ static void stand(bk_class* i_this) {
r28 = true;
}
if (i_this->m0300[1] == 0) {
anm_init(i_this, BK_BCK_BK_RUN, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_RUN);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_RUN_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_RUN_e);
i_this->dr.mMode += 1;
i_this->m0300[2] = 60;
}
@@ -1355,7 +1355,7 @@ static void stand(bk_class* i_this) {
}
i_this->speed.y = 100.0f + REG0_F(16);
anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e);
fopAcM_monsSeStart(i_this, JA_SE_CV_BK_JUMP, 0);
i_this->dr.mMode = 53;
}
@@ -1366,7 +1366,7 @@ static void stand(bk_class* i_this) {
if (!i_this->dr.mAcch.ChkGroundHit()) {
break;
}
anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP2_e);
i_this->dr.mMode += 1;
break;
case 54:
@@ -1408,7 +1408,7 @@ static void stand(bk_class* i_this) {
i_this->dr.mMode = 0;
} else {
i_this->dr.mMode = 20;
anm_init(i_this, BK_BCK_BK_BIKKURI, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_BIKKURI_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m0300[1] = 30;
fopAcM_monsSeStart(i_this, JA_SE_CV_BK_FOUND_LINK, 0);
}
@@ -1487,10 +1487,10 @@ static void stand2(bk_class* i_this) {
i_this->m0B7B = 1;
s16 r28 = i_this->m1224 - i_this->m1228;
if (i_this->m122A >= 0 && r28 < 0) {
anm_init(i_this, BK_BCK_BK_MIGIROT, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_MIGIROT_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
if (i_this->m122A <= 0 && r28 > 0) {
anm_init(i_this, BK_BCK_BK_HIDARIROT, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_HIDARIROT_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
i_this->m122A = r28;
i_this->m1228 = i_this->m1224;
@@ -1504,10 +1504,10 @@ static void stand2(bk_class* i_this) {
case 10:
i_this->m0B7B = 1;
if (i_this->m0300[1] == 30) {
anm_init(i_this, BK_BCK_BK_BIKKURI, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_BIKKURI_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
}
if (i_this->m0300[1] == 0) {
anm_init(i_this, BK_BCK_BK_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_KYORO2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_KYORO2_e);
i_this->dr.mMode = 11;
i_this->m0300[3] = 30.0f + cM_rndF(30.0f);
}
@@ -1530,14 +1530,14 @@ static void stand2(bk_class* i_this) {
}
break;
case 50:
anm_init(i_this, BK_BCK_BK_KYORO1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_KYORO1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_KYORO1_e);
i_this->dr.mMode += 1;
i_this->m0300[1] = 50;
// Fall-through
case 51:
i_this->speedF = 0.0f;
if (i_this->m0300[1] == 0) {
anm_init(i_this, BK_BCK_BK_RUN, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_RUN);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_RUN_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_RUN_e);
i_this->dr.mMode += 1;
path_check(i_this, 1);
if (i_this->m1216 >= 4) {
@@ -1599,7 +1599,7 @@ temp_568:
i_this->dr.mMode = 0;
} else {
i_this->dr.mMode = 20;
anm_init(i_this, BK_BCK_BK_BIKKURI, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_BIKKURI_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m0300[1] = 30;
fopAcM_monsSeStart(i_this, JA_SE_CV_BK_FOUND_LINK, 0);
}
@@ -1623,7 +1623,7 @@ static void path_run(bk_class* i_this) {
switch (i_this->dr.mMode) {
case 0:
anm_init(i_this, BK_BCK_BK_RUN, 10.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m070, BK_BAS_BK_RUN);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_RUN_e, 10.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m070, dRes_INDEX_BK_BAS_BK_RUN_e);
i_this->dr.mMode = 1;
// Fall-through
case 1:
@@ -1666,7 +1666,7 @@ static void path_run(bk_class* i_this) {
i_this->speedF = l_bkHIO.m054;
if (i_this->m0300[2] == 0) {
i_this->m0300[2] = cM_rndF(100.0f) + 50.0f;
anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e);
i_this->m120C = 1;
i_this->m1210 = 0;
}
@@ -1675,7 +1675,7 @@ static void path_run(bk_class* i_this) {
case 0:
i_this->speedF = l_bkHIO.m054 * 1.2f;
if (i_this->dr.mAcch.ChkGroundHit() && i_this->mpMorf->isStop()) {
anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP2_e);
i_this->m1210 = 1;
i_this->m034C = l_bkHIO.m00C + 2;
i_this->m034E = 4;
@@ -1685,14 +1685,14 @@ static void path_run(bk_class* i_this) {
i_this->speedF = 0.0f;
if (i_this->dr.mAcch.ChkGroundHit() && i_this->mpMorf->isStop()) {
i_this->m1210 = 0;
anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e);
i_this->speed.y = cM_rndF(REG8_F(7) + 10.0f) + 65.0f + REG8_F(8);
fopAcM_monsSeStart(i_this, JA_SE_CV_BK_JUMP, 0);
}
if (i_this->m0300[2] == 0) {
i_this->m0300[2] = cM_rndF(100.0f) + 50.0f;
anm_init(i_this, BK_BCK_BK_RUN, 10.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m070, BK_BAS_BK_RUN);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_RUN_e, 10.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m070, dRes_INDEX_BK_BAS_BK_RUN_e);
i_this->m120C = 0;
}
break;
@@ -1817,7 +1817,7 @@ static void fight_run(bk_class* i_this) {
i_this->m1212++;
if (daBk_player_way_check(i_this) && (i_this->m1212 & 0x30) && !r29) {
if (i_this->m120C != 0) {
anm_init(i_this, BK_BCK_BK_RUN, 10.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m070, BK_BAS_BK_RUN);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_RUN_e, 10.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m070, dRes_INDEX_BK_BAS_BK_RUN_e);
i_this->m120C = 0;
}
if (i_this->mPlayerDistance < l_bkHIO.m02C) {
@@ -1839,11 +1839,11 @@ static void fight_run(bk_class* i_this) {
case 0:
i_this->m1210 = 1;
cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->dr.m4D0, 2, 0x2000);
anm_init(i_this, BK_BCK_BK_JUMP2, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP2_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP2_e);
break;
case 1:
if (i_this->dr.mAcch.ChkGroundHit() && i_this->mpMorf->isStop()) {
anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP2_e);
i_this->m1210 = 2;
i_this->m034C = l_bkHIO.m00C + 2;
i_this->m034E = 4;
@@ -1854,7 +1854,7 @@ static void fight_run(bk_class* i_this) {
cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->dr.m4D0, 2, 0x2000);
if (i_this->dr.mAcch.ChkGroundHit() && i_this->mpMorf->isStop()) {
i_this->m1210 = 1;
anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e);
i_this->speed.y = 65.0f + cM_rndF(10.0f + REG8_F(7)) + REG8_F(8);
if ((i_this->m02DD & 0xC) == 0) {
s16 temp = cM_rndFX(3000.0f + REG6_F(13));
@@ -1885,9 +1885,9 @@ static void fight_run(bk_class* i_this) {
}
if ((i_this->m02DD & 0xC) == 0 && std::fabsf(stickPosX) > 0.1f) {
if (i_this->m0B30 != 0 || i_this->m11F3 != 0) {
anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK2_e);
} else {
anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK2_e);
}
if (stickPosX > 0.0f) {
i_this->dr.mMode = 5;
@@ -1896,16 +1896,16 @@ static void fight_run(bk_class* i_this) {
}
} else if (i_this->mPlayerDistance < l_bkHIO.m030) {
if (i_this->m0B30 != 0 || i_this->m11F3 != 0) {
anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK2_e);
} else {
anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK2_e);
}
i_this->dr.mMode = 4;
} else {
if (i_this->m0B30 != 0 || i_this->m11F3 != 0) {
anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK2_e);
} else {
anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK2_e);
}
i_this->dr.mMode = 3;
}
@@ -1915,7 +1915,7 @@ static void fight_run(bk_class* i_this) {
cLib_addCalc2(&i_this->speedF, l_bkHIO.m060, 1.0f, 20.0f);
if (r29) {
i_this->speed.y = 100.0f + REG0_F(16);
anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e);
fopAcM_monsSeStart(i_this, JA_SE_CV_BK_JUMP, 0);
i_this->dr.mMode = 33;
break;
@@ -1926,7 +1926,7 @@ static void fight_run(bk_class* i_this) {
break;
case 33:
if (i_this->dr.mAcch.ChkGroundHit()) {
anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP2_e);
i_this->dr.mMode++;
}
break;
@@ -1946,9 +1946,9 @@ static void fight_run(bk_class* i_this) {
}
i_this->dr.mMode = 3;
if (i_this->m0B30 != 0 || i_this->m11F3 != 0) {
anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK2_e);
} else {
anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WALK2_e);
}
break;
case 5:
@@ -2033,7 +2033,7 @@ static void fight_run(bk_class* i_this) {
if ((ground_4_check(i_this, 4, i_this->current.angle.y, 200.0f) & 0xD) == 0) {
i_this->dr.mAction = 5;
attack_set(i_this, 1);
anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e);
i_this->dr.mMode = -10;
i_this->speedF = -60.0f + REG0_F(3);
i_this->speed.y = 80.0f + REG0_F(4);
@@ -2153,7 +2153,7 @@ static void fight(bk_class* i_this) {
switch (i_this->dr.mMode) {
case -10:
if (i_this->dr.mAcch.ChkGroundHit()) {
anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP2_e);
i_this->dr.mMode = -9;
i_this->speedF = 0.0f;
}
@@ -2162,7 +2162,7 @@ static void fight(bk_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->dr.mMode = 1;
i_this->m0300[2] = 8;
anm_init(i_this, BK_BCK_BK_JATTACK1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JATTACK1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->speedF = 80.0f + REG0_F(5);
i_this->speed.y = 115.0f + REG0_F(6);
goto temp_1B8;
@@ -2366,7 +2366,7 @@ static void p_lost(bk_class* i_this) {
// Fall-through
case 0:
i_this->dr.mMode = 1;
anm_init(i_this, BK_BCK_BK_KYORO2, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_KYORO2_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_KYORO2_e);
i_this->speedF = 0.0f;
i_this->m0300[1] = 30.0f + cM_rndF(30.0f);
// Fall-through
@@ -2410,7 +2410,7 @@ static void b_nige(bk_class* i_this) {
switch (i_this->dr.mMode) {
case 0:
i_this->dr.mMode = 1;
anm_init(i_this, BK_BCK_BK_HAKKEN, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_HAKKEN);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_HAKKEN_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_HAKKEN_e);
fopAcM_monsSeStart(i_this, JA_SE_CV_BK_FOUND_LINK, 0);
i_this->m0300[1] = 20;
// Fall-through
@@ -2419,7 +2419,7 @@ static void b_nige(bk_class* i_this) {
cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->dr.m4D0 + 0x8000, 2, 0x3000);
if (i_this->m0300[1] == 0) {
i_this->dr.mMode = 2;
anm_init(i_this, BK_BCK_BK_NIGERU, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_NIGERU);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_NIGERU_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_NIGERU_e);
fopAcM_monsSeStart(i_this, JA_SE_CV_BK_LOST_BOKO, 0);
}
break;
@@ -2430,7 +2430,7 @@ static void b_nige(bk_class* i_this) {
cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->dr.m4D0, 4, 0x1000);
if (std::sqrtf(sp10.x*sp10.x + sp10.z*sp10.z) > 800.0f) {
i_this->dr.mMode = 3;
anm_init(i_this, BK_BCK_BK_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WAIT);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_WAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_WAIT_e);
}
break;
case 3:
@@ -2453,7 +2453,7 @@ static void defence(bk_class* i_this) {
switch (i_this->dr.mMode) {
case 0:
i_this->dr.mMode = 1;
anm_init(i_this, BK_BCK_BK_BOUGYO1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_BOUGYO1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->speedF = 0.0f;
// Fall-through
case 1:
@@ -2477,7 +2477,7 @@ static void defence(bk_class* i_this) {
static void oshi(bk_class* i_this) {
i_this->dr.mAction = 5;
attack_set(i_this, 1);
anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e);
i_this->dr.mMode = -10;
i_this->speedF = -90.0f + REG6_F(10);
i_this->speed.y = 85.0f + REG6_F(11);
@@ -2497,11 +2497,11 @@ static void hukki(bk_class* i_this) {
switch (i_this->dr.mMode) {
case 10:
anm_init(i_this, BK_BCK_BK_OKIRUA, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_OKIRUA);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_OKIRUA_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_OKIRUA_e);
i_this->m0300[2] = 15;
goto temp_194;
case 12:
anm_init(i_this, BK_BCK_BK_OKIRUU, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_OKIRUU);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_OKIRUU_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_OKIRUU_e);
i_this->m0300[2] = 15 + REG0_S(5);
temp_194:
i_this->speedF = 0.0f;
@@ -2668,7 +2668,7 @@ static void yogan_fail(bk_class* i_this) {
switch (i_this->dr.mMode) {
case 0:
anm_init(i_this, BK_BCK_BK_NIGERU, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_NIGERU);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_NIGERU_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_NIGERU_e);
i_this->dr.mMode = 1;
i_this->speed.y = 190.0f + REG0_F(19);
fopAcM_monsSeStart(i_this, JA_SE_CV_BK_SURPRISE, 0);
@@ -2711,7 +2711,7 @@ static void water_fail(bk_class* i_this) {
switch (i_this->dr.mMode) {
case 0:
anm_init(i_this, BK_BCK_BK_NIGERU, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_NIGERU);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_NIGERU_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_NIGERU_e);
i_this->dr.mMode = 1;
fopAcM_monsSeStart(actor, JA_SE_CV_BK_SURPRISE, 0);
i_this->dr.m458.y = 0.0f;
@@ -2763,7 +2763,7 @@ static void wepon_search(bk_class* i_this) {
case -1:
i_this->dr.mMode = 0;
i_this->m11F3 = 0;
anm_init(i_this, BK_BCK_BK_HAKKEN, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_HAKKEN);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_HAKKEN_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_HAKKEN_e);
if (f31 < 900.0f) {
i_this->m0300[1] = 20;
} else {
@@ -2779,7 +2779,7 @@ static void wepon_search(bk_class* i_this) {
if (i_this->mpMorf->isStop() || i_this->m0300[1] == 0) {
i_this->dr.mMode = 1;
i_this->m030A = l_bkHIO.m08E;
anm_init(i_this, BK_BCK_BK_RUN, 3.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m074, BK_BAS_BK_RUN);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_RUN_e, 3.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m074, dRes_INDEX_BK_BAS_BK_RUN_e);
i_this->m02CE = 0;
}
}
@@ -2791,7 +2791,7 @@ static void wepon_search(bk_class* i_this) {
cLib_addCalcAngleS2(&actor->current.angle.y, i_this->dr.m4D0, 4, 0x1000);
if (f31 < REG8_F(2) + 150.0f) {
i_this->dr.mMode = 2;
anm_init(i_this, BK_BCK_BK_CATCH, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_CATCH);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_CATCH_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_CATCH_e);
i_this->m0300[1] = 29;
} else {
if (i_this->m030A == 0) {
@@ -2801,7 +2801,7 @@ static void wepon_search(bk_class* i_this) {
} else if (i_this->dr.mAcch.ChkGroundHit() && i_this->dr.mAcch.ChkWallHit()) {
if (i_this->m02CE < 2) {
actor->speed.y = 100.0f + REG0_F(16);
anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e);
fopAcM_monsSeStart(actor, JA_SE_CV_BK_JUMP, 0);
i_this->dr.mMode = 5;
i_this->m02CE++;
@@ -2871,7 +2871,7 @@ static void wepon_search(bk_class* i_this) {
case 5:
actor->speedF = l_bkHIO.m05C * 0.5f;
if (i_this->dr.mAcch.ChkGroundHit()) {
anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP2_e);
i_this->dr.mMode++;
}
break;
@@ -2879,7 +2879,7 @@ static void wepon_search(bk_class* i_this) {
actor->speedF = 0.0f;
if (i_this->mpMorf->isStop()) {
i_this->dr.mMode = 1;
anm_init(i_this, BK_BCK_BK_RUN, 3.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m074, BK_BAS_BK_RUN);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_RUN_e, 3.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m074, dRes_INDEX_BK_BAS_BK_RUN_e);
}
break;
}
@@ -2896,10 +2896,10 @@ static void d_dozou(bk_class* i_this) {
i_this->dr.mMode = 1;
i_this->dr.mStts.Init(0xFF, 0xFF, i_this);
if (i_this->m02B5 == 0) {
anm_init(i_this, BK_BCK_BK_ATTACK2, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, BK_BAS_BK_ATTACK2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_ATTACK2_e, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, dRes_INDEX_BK_BAS_BK_ATTACK2_e);
i_this->mpMorf->setFrame(0.0f);
} else {
anm_init(i_this, BK_BCK_BK_NOBI, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, BK_BAS_BK_NOBI);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_NOBI_e, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, dRes_INDEX_BK_BAS_BK_NOBI_e);
i_this->mpMorf->setFrame(27.0f);
}
// Fall-through
@@ -2942,11 +2942,11 @@ static void carry_drop(bk_class* i_this) {
case 0:
dComIfGs_onEventBit(dSv_event_flag_c::UNK_0004);
i_this->dr.mMode = 1;
anm_init(i_this, BK_BCK_BK_KOUKA, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_KOUKA_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
// Fall-through
case 1:
if (i_this->dr.mAcch.ChkGroundHit()) {
anm_init(i_this, BK_BCK_BK_TYAKU, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_TYAKU_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->dr.mMode = 2;
i_this->m034C = l_bkHIO.m00C + 15;
i_this->m034E = 3;
@@ -2961,7 +2961,7 @@ static void carry_drop(bk_class* i_this) {
cLib_addCalcAngleS2(&i_this->shape_angle.z, 0, 1, 0x1000);
cLib_addCalc0(&i_this->speedF, 1.0f, 1.0f);
if (i_this->mpMorf->isStop()) {
anm_init(i_this, BK_BCK_BK_KIME, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_KIME_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->dr.mMode = 3;
fopAcM_monsSeStart(actor, JA_SE_CV_BK_SURPRISE, 0);
}
@@ -2982,7 +2982,7 @@ static void d_mahi(bk_class* i_this) {
switch (i_this->dr.mMode) {
case 0:
i_this->dr.mMode = 1;
anm_init(i_this, BK_BCK_BK_SUWARI, 20.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_SUWARI);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_SUWARI_e, 20.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_SUWARI_e);
i_this->m0300[0] = 100;
// Fall-through
case 1:
@@ -3019,16 +3019,16 @@ static void tubo_wait(bk_class* i_this) {
case 0:
if (i_this->m0300[0] != 0) {
i_this->m0300[0] = REG0_S(3) + 30;
anm_init(i_this, BK_BCK_BK_SUWARI, 0.0f, J3DFrameCtrl::EMode_NONE, 0.01f, BK_BAS_BK_SUWARI);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_SUWARI_e, 0.0f, J3DFrameCtrl::EMode_NONE, 0.01f, dRes_INDEX_BK_BAS_BK_SUWARI_e);
i_this->dr.mMode = 20;
} else {
if (i_this->mType == 3) {
anm_init(i_this, BK_BCK_BK_JATTACK1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JATTACK1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->dr.mMode = 1;
actor->speed.y = REG0_F(8) + 120.0f;
actor->speedF = REG0_F(9) + 40.0f;
} else {
anm_init(i_this, BK_BCK_BK_JUMP1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e);
i_this->dr.mMode = 10;
actor->speed.y = REG8_F(8) + 120.0f;
actor->speedF = REG8_F(9) + 40.0f;
@@ -3044,7 +3044,7 @@ static void tubo_wait(bk_class* i_this) {
case 1:
if (i_this->dr.mAcch.ChkGroundHit()) {
i_this->dr.mMode = 2;
anm_init(i_this, BK_BCK_BK_JATTACK2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JATTACK2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JATTACK2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JATTACK2_e);
fopAcM_monsSeStart(actor, JA_SE_CV_BK_ATTACK_L, 0);
}
break;
@@ -3052,12 +3052,12 @@ static void tubo_wait(bk_class* i_this) {
r28 = true;
if (i_this->mpMorf->isStop()) {
i_this->dr.mMode = 11;
anm_init(i_this, BK_BCK_BK_JATTACK3, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JATTACK3);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JATTACK3_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JATTACK3_e);
}
break;
case 10:
if (i_this->m0300[0] == 0 && i_this->dr.mAcch.ChkGroundHit()) {
anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP2_e);
i_this->dr.mMode = 11;
i_this->m034C = l_bkHIO.m00C + 6;
i_this->m034E = 3;
@@ -3073,7 +3073,7 @@ static void tubo_wait(bk_class* i_this) {
case 20:
if (i_this->m0300[0] != 0) {
if (i_this->m0300[0] == 1) {
anm_init(i_this, BK_BCK_BK_SUWARI, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_SUWARI);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_SUWARI_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_SUWARI_e);
}
} else if (i_this->mpMorf->isStop()) {
i_this->dr.mAction = 0;
@@ -3112,7 +3112,7 @@ static void z_demo_1(bk_class* i_this) {
i_this->m0300[0] = 90;
}
i_this->dr.mMode = 1;
anm_init(i_this, BK_BCK_BK_TUTUKU1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_TUTUKU1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_TUTUKU1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_TUTUKU1_e);
}
break;
case 1:
@@ -3133,7 +3133,7 @@ static void z_demo_1(bk_class* i_this) {
i_this->m0300[0] = 180;
}
i_this->dr.mMode = 2;
anm_init(i_this, BK_BCK_BK_TUTUKU2, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_TUTUKU2_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
break;
case 2:
@@ -3145,7 +3145,7 @@ static void z_demo_1(bk_class* i_this) {
i_this->m0300[0] = 150;
}
i_this->dr.mMode = 0;
anm_init(i_this, BK_BCK_BK_TUTUKU3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_TUTUKU3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
break;
}
@@ -3163,7 +3163,7 @@ static void z_demo_1(bk_class* i_this) {
i_this->mType = 0;
i_this->dr.mAction = 1;
i_this->dr.mMode = 20;
anm_init(i_this, BK_BCK_BK_BIKKURI, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_BIKKURI_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m0300[1] = 30;
fopAcM_monsSeStart(actor, JA_SE_CV_BK_FOUND_LINK, 0);
}
@@ -3188,7 +3188,7 @@ static void b_hang(bk_class* i_this) {
i_this->dr.m71E = 5;
switch (i_this->dr.mMode) {
case 0:
anm_init(i_this, BK_BCK_BK_OTISOU1, REG12_F(9) + 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_OTISOU1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_OTISOU1_e, REG12_F(9) + 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_BK_BAS_BK_OTISOU1_e);
i_this->dr.mMode = 1;
i_this->dr.m798 = 0.0f;
i_this->m0300[0] = 100;
@@ -3202,7 +3202,7 @@ static void b_hang(bk_class* i_this) {
i_this->m0336 = 2;
}
if (i_this->m0300[0] == 0) {
anm_init(i_this, BK_BCK_BK_OTISOU2, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_OTISOU2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_OTISOU2_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_OTISOU2_e);
i_this->dr.mMode = 2;
}
break;
@@ -3264,14 +3264,14 @@ static void rope_on(bk_class* i_this) {
switch (i_this->dr.mMode) {
case 0:
i_this->speedF = 0.0f;
anm_init(i_this, BK_BCK_BK_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, BK_BAS_BK_KYORO2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_KYORO2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, dRes_INDEX_BK_BAS_BK_KYORO2_e);
i_this->dr.mMode = 1;
i_this->m0300[0] = 40;
// Fall-through
case 1:
if (i_this->m0300[0] == 0) {
i_this->dr.mMode = 2;
anm_init(i_this, BK_BCK_BK_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, BK_BAS_BK_WALK);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, dRes_INDEX_BK_BAS_BK_WALK_e);
}
break;
case 2: {
@@ -3280,12 +3280,12 @@ static void rope_on(bk_class* i_this) {
cLib_addCalcAngleS2(&i_this->current.angle.y, targetAngle, 4, 0x1000);
if (i_this->dr.mAcch.ChkWallHit()) {
i_this->speed.y = 100.0f + REG0_F(16);
anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP1_e);
fopAcM_monsSeStart(i_this, JA_SE_CV_BK_JUMP, 0);
i_this->dr.mMode = 3;
}
if (fopAcM_searchPlayerDistance(i_this) < 200.0f) {
anm_init(i_this, BK_BCK_BK_SUWARI, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_SUWARI);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_SUWARI_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_SUWARI_e);
i_this->dr.mMode = 5;
}
break;
@@ -3293,7 +3293,7 @@ static void rope_on(bk_class* i_this) {
case 3:
i_this->speedF = 35.0f;
if (i_this->dr.mAcch.ChkGroundHit()) {
anm_init(i_this, BK_BCK_BK_JUMP2, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_JUMP2_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_JUMP2_e);
i_this->dr.mMode = 4;
}
break;
@@ -3301,14 +3301,14 @@ static void rope_on(bk_class* i_this) {
i_this->speedF = 0.0f;
if (i_this->mpMorf->isStop()) {
i_this->dr.mMode = 2;
anm_init(i_this, BK_BCK_BK_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, BK_BAS_BK_WALK);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, dRes_INDEX_BK_BAS_BK_WALK_e);
}
break;
case 5:
i_this->speedF = 0.0f;
if (fopAcM_searchPlayerDistance(i_this) > 250.0f) {
i_this->dr.mMode = 2;
anm_init(i_this, BK_BCK_BK_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, BK_BAS_BK_WALK);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_WALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, dRes_INDEX_BK_BAS_BK_WALK_e);
}
break;
}
@@ -3708,7 +3708,7 @@ static void damage_check(bk_class* i_this) {
i_this->dr.m424 |= 0x20;
i_this->dr.m428 = 23.0f;
cMtx_YrotS(*calc_mtx, i_this->m0332);
anm_init(i_this, BK_BCK_BK_AOMUKE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_AOMUKE);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_AOMUKE_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_AOMUKE_e);
i_this->dr.m48A = 10;
i_this->dr.m474 = REG0_F(14) + 5000.0f;
i_this->dr.m70E = 7;
@@ -4018,7 +4018,7 @@ static void demo_camera(bk_class* i_this) {
}
if (i_this->m1236 == 5) {
anm_init(i_this, BK_BCK_BK_BIKKURI, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_BIKKURI_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
}
if (i_this->m1236 >= 35) {
@@ -4311,14 +4311,14 @@ static BOOL daBk_Execute(bk_class* i_this) {
i_this->m11FC = fpcM_ERROR_PROCESS_ID_e;
switch (r3) {
case 1:
anm_init(i_this, BK_BCK_BK_AOMUKE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_AOMUKE);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_AOMUKE_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_AOMUKE_e);
if (i_this->m0B30 != 0) {
i_this->m0B34 = 1;
}
i_this->dr.mAction = 0;
break;
case 2:
anm_init(i_this, BK_BCK_BK_UTUBUSE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_UTUBUSE);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_UTUBUSE_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_UTUBUSE_e);
break;
case 5:
if (i_this->dr.mAction != 4 && i_this->dr.mAction != 11) {
@@ -4349,7 +4349,7 @@ static BOOL daBk_Execute(bk_class* i_this) {
i_this->dr.m4C8[2] = l_bkHIO.m08C;
break;
case 30:
anm_init(i_this, BK_BCK_BK_AOMUKE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_AOMUKE);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_AOMUKE_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_BK_BAS_BK_AOMUKE_e);
if (i_this->m0B30 != 0) {
i_this->m0B34 = 1;
}
@@ -4529,11 +4529,11 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
bk_class* i_this = (bk_class*)i_actor;
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Bk", BK_BDL_BK),
(J3DModelData*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BDL_BK_e),
NULL, NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bk", BK_BCK_BK_SUWARI),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BCK_BK_SUWARI_e),
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1,
dComIfG_getObjectRes("Bk", BK_BAS_BK_SUWARI),
dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BAS_BK_SUWARI_e),
0x00080000,
0x37221203
);
@@ -4555,9 +4555,9 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
}
if (i_this->m02DC != 0) {
i_this->m1230 = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", BK_BMT_PINK);
i_this->m1230 = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMT_PINK_e);
} else if (i_this->m02D4 != 0) {
i_this->m1230 = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", BK_BMT_GREEN);
i_this->m1230 = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMT_GREEN_e);
}
i_this->m02C4 = new mDoExt_btpAnm();
@@ -4568,7 +4568,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
// TODO: Check what happens when this bug occurs.
return cPhs_ERROR_e;
}
J3DAnmTexPattern* btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Bk", BK_BTP_TMABATAKI);
J3DAnmTexPattern* btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BTP_TMABATAKI_e);
if (!i_this->m02C4->init(model->getModelData(), btp, TRUE, J3DFrameCtrl::EMode_NONE)) {
// Bug: Same as above.
// TODO check this case as well.
@@ -4576,13 +4576,13 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
}
J3DModelData* modelData;
modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BMD_BK_KB);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMD_BK_KB_e);
JUT_ASSERT(VERSION_SELECT(9459, 9398, 9418, 9418), modelData != NULL);
if (i_this->m02D5 & 0x40) {
J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", BK_BMT_BK_KEN);
J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMT_BK_KEN_e);
modelData->setMaterialTable(bmt, J3DMatCopyFlag_Material);
} else {
J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", BK_BMT_BK_BOKO);
J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMT_BK_BOKO_e);
modelData->setMaterialTable(bmt, J3DMatCopyFlag_Material);
}
i_this->m02E8 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
@@ -4594,13 +4594,13 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
i_this->m02E8->setBaseScale(i_this->scale);
if (i_this->m02D4 != 0) {
modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BMD_BK_TATE);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMD_BK_TATE_e);
i_this->m02D0 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
JUT_ASSERT(VERSION_SELECT(9486, 9425, 9445, 9445), modelData != NULL);
}
if (i_this->m02DC != 0) {
modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BDL_BOUEN);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BDL_BOUEN_e);
i_this->m02D8 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
JUT_ASSERT(VERSION_SELECT(9496, 9434, 9454, 9454), modelData != NULL);
}
@@ -4795,11 +4795,11 @@ static cPhs_State daBk_Create(fopAc_ac_c* i_actor) {
}
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Bk", BK_BDL_BK),
(J3DModelData*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BDL_BK_e),
NULL, NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bk", BK_BCK_BK_SUWARI),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BCK_BK_SUWARI_e),
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1,
dComIfG_getObjectRes("Bk", BK_BAS_BK_SUWARI),
dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BAS_BK_SUWARI_e),
0x00080000,
0x37221203
);
@@ -4818,28 +4818,28 @@ static cPhs_State daBk_Create(fopAc_ac_c* i_actor) {
}
if (i_this->m02DC != 0) {
i_this->m1230 = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", BK_BMT_PINK);
i_this->m1230 = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMT_PINK_e);
} else if (i_this->m02D4 != 0) {
i_this->m1230 = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", BK_BMT_GREEN);
i_this->m1230 = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMT_GREEN_e);
}
i_this->m02C4 = new mDoExt_btpAnm();
if (i_this->m02C4 == NULL) {
return cPhs_ERROR_e;
}
J3DAnmTexPattern* btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Bk", BK_BTP_TMABATAKI);
J3DAnmTexPattern* btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BTP_TMABATAKI_e);
if (!i_this->m02C4->init(model->getModelData(), btp, TRUE, J3DFrameCtrl::EMode_NONE)) {
return cPhs_ERROR_e;
}
J3DModelData* modelData;
modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BMD_BK_KB);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMD_BK_KB_e);
JUT_ASSERT(VERSION_SELECT(9459, 9398, 9418, 9418), modelData != NULL);
if (i_this->m02D5 & 0x40) {
J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", BK_BMT_BK_KEN);
J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMT_BK_KEN_e);
modelData->setMaterialTable(bmt, J3DMatCopyFlag_Material);
} else {
J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", BK_BMT_BK_BOKO);
J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMT_BK_BOKO_e);
modelData->setMaterialTable(bmt, J3DMatCopyFlag_Material);
}
i_this->m02E8 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
@@ -4850,13 +4850,13 @@ static cPhs_State daBk_Create(fopAc_ac_c* i_actor) {
}
if (i_this->m02D4 != 0) {
modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BMD_BK_TATE);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BMD_BK_TATE_e);
i_this->m02D0 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
JUT_ASSERT(VERSION_SELECT(9486, 9425, 9445, 9445), modelData != NULL);
}
if (i_this->m02DC != 0) {
modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BDL_BOUEN);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", dRes_INDEX_BK_BDL_BOUEN_e);
i_this->m02D8 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
JUT_ASSERT(VERSION_SELECT(9496, 9434, 9454, 9454), modelData != NULL);
}
@@ -5046,7 +5046,7 @@ static cPhs_State daBk_Create(fopAc_ac_c* i_actor) {
i_this->dr.mAction = 29;
i_this->dr.mMaxFallDistance = 300.0f;
} else if (i_this->mType == 5) {
anm_init(i_this, BK_BCK_BK_HAKOBI, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BK_BCK_BK_HAKOBI_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->dr.mAction = 30;
i_this->dr.mMaxFallDistance = 100000.0f;
} else if (i_this->mType == 2 || i_this->mType == 3) {
src/d/actor/d_a_bmd.cpp
+50 -50
View File
@@ -10,7 +10,7 @@
#include "d/d_camera.h"
#include "d/d_kankyo_wether.h"
#include "d/d_lib.h"
#include "d/res/res_bmd.h"
#include "res/Object/Bmd.h"
#include "d/d_cc_d.h"
#include "d/d_s_play.h"
#include "d/d_snap.h"
@@ -160,7 +160,7 @@ void damage(bmd_class* i_this) {
i_this->m332 = 3;
}
if (actor->current.pos.y <= i_this->m328 + 5.0f) {
anm_init(i_this, BMD_BCK_HANA_OTIRU, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_OTIRU_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m304 = 1;
i_this->m302 = 2;
i_this->m93C = fopAcM_searchPlayerAngleY(actor);
@@ -192,7 +192,7 @@ void damage(bmd_class* i_this) {
i_this->mBD8 = 2000.0f;
}
if (i_this->mpBodyMorf->isStop()) {
anm_init(i_this, BMD_BCK_HIRAKU_WAIT, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMD_BCK_HIRAKU_WAIT_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m302 = 3;
i_this->m308[0] = l_HIO.m14;
i_this->m940 = 0;
@@ -205,7 +205,7 @@ void damage(bmd_class* i_this) {
i_this->mB71 = 2;
if (i_this->m308[0] == 0) {
i_this->m302 = 4;
anm_init(i_this, BMD_BCK_HANA_TOJIRU, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_TOJIRU_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m304 = 2;
mDoAud_seStart(JA_SE_CM_BKM_FLW_WAVING, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
}
@@ -306,7 +306,7 @@ void damage(bmd_class* i_this) {
if ((bVar1) && (fopAcM_searchPlayerDistance(actor) < (REG8_F(8) + 200.0f))) {
i_this->mMode = 5;
i_this->m302 = 0;
anm_init(i_this, BMD_BCK_HANA_TOJIRU, 1.0f, J3DFrameCtrl::EMode_NONE, 5.0f, -1);
anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_TOJIRU_e, 1.0f, J3DFrameCtrl::EMode_NONE, 5.0f, -1);
}
#endif
}
@@ -333,7 +333,7 @@ void eat(bmd_class* i_this) {
cLib_addCalcAngleS2(&i_this->m940, -0x4000, 1, 0x1000);
if (i_this->mpBodyMorf->isStop()) {
i_this->m302 = 2;
anm_init(i_this, BMD_BCK_HANA_EAT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_EAT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m308[0] = 0x32;
if (dComIfGp_getStartStageName()[0] == 'X') {
mDoAud_bgmStart(JA_BGM_PAST_BKM);
@@ -348,7 +348,7 @@ void eat(bmd_class* i_this) {
return;
}
i_this->m302 = 3;
anm_init(i_this, BMD_BCK_HANA_HAKIDASU, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_HAKIDASU_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
fopAcM_seStart(player_actor, JA_SE_CM_BKM_LINK_OUT, 0);
return;
case 3:
@@ -427,8 +427,8 @@ void start(bmd_class* i_this) {
i_this->m310 = 8;
switch (i_this->m302) {
case 0:
anm_init(i_this, BMD_BCK_HIRAKU_WAIT, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mpHeadMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_START1), J3DFrameCtrl::EMode_LOOP, 1.0f, 1.0f, 0.0f, -1.0f, NULL);
anm_init(i_this, dRes_INDEX_BMD_BCK_HIRAKU_WAIT_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mpHeadMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_START1_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 1.0f, 0.0f, -1.0f, NULL);
i_this->m302 = 1;
i_this->m304 = 2;
i_this->m2DC = 1;
@@ -473,11 +473,11 @@ void start(bmd_class* i_this) {
i_this->mBDC = 1.0f;
}
if (i_this->mB76 == 0x78) {
anm_init(i_this, BMD_BCK_HANA_START1, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_START1_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
mDoAud_seStart(JA_SE_CM_BKM_FLW_WAVING, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
}
if (i_this->mB76 == 0x96) {
anm_init(i_this, BMD_BCK_HANA_START2, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_START2_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mBD8 = 2000.0f;
mDoAud_seStart(JA_SE_CM_BKM_FLW_TO_BUD, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
}
@@ -489,7 +489,7 @@ void start(bmd_class* i_this) {
move1(i_this);
}
if (i_this->mB76 == 0xbe) {
anm_init(i_this, BMD_BCK_HANA_WAIT, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_WAIT_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
}
if (i_this->mB76 == 0xd2) {
@@ -527,7 +527,7 @@ void end(bmd_class* i_this) {
#if VERSION > VERSION_DEMO
mDoAud_bgmStreamPrepare(JA_STRM_BOSS_CLEAR);
#endif
anm_init(i_this, BMD_BCK_HANA_DEAD1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_DEAD1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m302 = 1;
i_this->m332 = 8;
i_this->m314 = 30000;
@@ -540,11 +540,11 @@ void end(bmd_class* i_this) {
player->changeDemoMode(daPy_demo_c::DEMO_UNK_029_e);
}
if (i_this->mB76 == REG0_S(4) + 0x17c) {
anm_init(i_this, BMD_BCK_HANA_DEAD2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_DEAD2_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
fopAcM_seStartCurrent(actor, JA_SE_CM_BKM_END_FLW_WAVING, 0);
}
if (i_this->mB76 == REG0_S(5) + 0x1c2) {
anm_init(i_this, BMD_BCK_HANA_DEAD3, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_DEAD3_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
fopAcM_seStartCurrent(actor, JA_SE_CM_BKM_END_FLW_LIFTUP, 0);
i_this->mBD8 = 2000.0f;
i_this->m332 = 9;
@@ -635,7 +635,7 @@ void core_move(bmd_class* i_this) {
case 0:
break;
case 1:
i_this->mpHeadMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_DAMAGE), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL);
i_this->mpHeadMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_DAMAGE_e), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL);
i_this->m306 = 2;
i_this->m918 = 0;
i_this->m91C = REG0_F(9) + 6000.0f;
@@ -645,13 +645,13 @@ void core_move(bmd_class* i_this) {
if (std::fabsf(i_this->m91C) < 200.0f) {
i_this->m306 = 0;
i_this->mpHeadMorf->setAnm(
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_WAIT), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_WAIT_e), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL
);
}
break;
case 100:
i_this->mpHeadDeadMorf->setAnm(
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_DEAD1), J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f, 0.0f, -1.0f, NULL
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_DEAD1_e), J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f, 0.0f, -1.0f, NULL
);
i_this->m306 = 0x65;
i_this->m924 = actor->current.pos;
@@ -677,7 +677,7 @@ void core_move(bmd_class* i_this) {
i_this->m306 = 0x66;
mDoAud_bgmStreamPlay();
i_this->mpHeadDeadMorf->setAnm(
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_DEAD2), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_DEAD2_e), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL
);
i_this->m930.y = 0.0f;
i_this->m930.z = 0.0f;
@@ -695,7 +695,7 @@ void core_move(bmd_class* i_this) {
i_this->mA8C = 3;
if (i_this->mpHeadDeadMorf->isStop()) {
i_this->mpHeadDeadMorf->setAnm(
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_NDEAD1), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_NDEAD1_e), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL
);
i_this->m306 = 0x67;
i_this->m930.z = 10.0f;
@@ -713,7 +713,7 @@ void core_move(bmd_class* i_this) {
goto temp_884;
}
i_this->mpHeadDeadMorf->setAnm(
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_NDEAD2), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_NDEAD2_e), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL
);
i_this->m306 = 0x68;
goto temp_884;
@@ -727,7 +727,7 @@ void core_move(bmd_class* i_this) {
goto temp_884;
}
i_this->mpHeadDeadMorf->setAnm(
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_LDEAD), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_LDEAD_e), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL
);
i_this->m306 = 0x69;
i_this->m930.z = 0.0f;
@@ -849,7 +849,7 @@ void mk_move(bmd_class* i_this) {
case 1:
if (i_this->m308[3] == 0) {
i_this->mpMakarMorf->setAnm(
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_CALL_01), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_CALL_01_e), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL
);
i_this->m308[3] = (s16)(cM_rndF(90.0f) + 60.0f);
i_this->m2DC = 2;
@@ -859,7 +859,7 @@ void mk_move(bmd_class* i_this) {
case 2:
if (i_this->m308[3] == 0) {
i_this->mpMakarMorf->setAnm(
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_CALL_02), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_CALL_02_e), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL
);
i_this->m308[3] = (s16)(cM_rndF(90.0f) + 60.0f);
i_this->m2DC = 1;
@@ -868,20 +868,20 @@ void mk_move(bmd_class* i_this) {
break;
case 3:
i_this->mpMakarMorf->setAnm(
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_CALL_01), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_CALL_01_e), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL
);
i_this->m2DC = 10;
mk_voice_set(i_this, JA_SE_CV_CB_HELP);
break;
case 4:
i_this->mpMakarMorf->setAnm(
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_CALL_03), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_CALL_03_e), J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f, 0.0f, -1.0f, NULL
);
i_this->m2DC = 10;
mk_voice_set(i_this, JA_SE_CV_CB_HELP);
break;
case 5:
i_this->mpMakarMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_DROP), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL);
i_this->mpMakarMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_DROP_e), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL);
i_this->m2DC = 6;
break;
case 6:
@@ -942,7 +942,7 @@ void wait(bmd_class* i_this) {
if (i_this->m308[0] == 0) {
i_this->m302 = 0;
i_this->m304 = 0;
anm_init(i_this, BMD_BCK_HANA_WAIT, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_WAIT_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
mDoAud_seStart(JA_SE_CM_BKM_VINE_OUT, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
i_this->m308[3] = 0x5a;
}
@@ -1039,14 +1039,14 @@ void attack_2(bmd_class* i_this) {
i_this->m302 = 1;
i_this->m332 = 2;
i_this->m334 = 10;
anm_init(i_this, BMD_BCK_HANA_ATTACK, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_ATTACK_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
break;
case 1:
if (i_this->m334 == 0) {
i_this->m332 = 0;
i_this->mMode = 0;
i_this->m302 = 0;
anm_init(i_this, BMD_BCK_HANA_WAIT, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMD_BCK_HANA_WAIT_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
break;
}
@@ -1274,7 +1274,7 @@ void demo_camera(bmd_class* i_this) {
cLib_addCalc2(&i_this->mB88.y, actor->eyePos.y + 30.0f, 0.2f, REG0_F(4) + 5.0f);
if (i_this->mB78 == 0x1e) {
i_this->mpHeadMorf->setAnm(
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_NEW_SDEMO1), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_NEW_SDEMO1_e), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL
);
mDoAud_seStart(JA_SE_CM_BKM_CORE_ENTER, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
fopAcM_monsSeStart(actor, JA_SE_CV_BKM_ENTER, 0);
@@ -1284,7 +1284,7 @@ void demo_camera(bmd_class* i_this) {
i_this->mB78 = 0;
i_this->mB74++;
i_this->mpHeadMorf->setAnm(
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_NEW_SDEMO2), J3DFrameCtrl::EMode_LOOP, 1.0f, 1.0f, 0.0f, -1.0f, NULL
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_NEW_SDEMO2_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 1.0f, 0.0f, -1.0f, NULL
);
}
}
@@ -1317,7 +1317,7 @@ void demo_camera(bmd_class* i_this) {
i_this->mB88.z = 104.0f;
if (i_this->mB78 == 0x1e) {
i_this->mpHeadMorf->setAnm(
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_NEW_SDEMO3), J3DFrameCtrl::EMode_NONE, REG0_F(16) + 4.0f, 1.0f, 0.0f, -1.0f, NULL
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_NEW_SDEMO3_e), J3DFrameCtrl::EMode_NONE, REG0_F(16) + 4.0f, 1.0f, 0.0f, -1.0f, NULL
);
}
if (i_this->mB78 > 0x1b) {
@@ -1327,7 +1327,7 @@ void demo_camera(bmd_class* i_this) {
i_this->m2DC = 0;
mk_voice_set(i_this, 0x48c6);
i_this->mpHeadMorf->setAnm(
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_NEW_SDEMO4), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_NEW_SDEMO4_e), J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL
);
i_this->mB88 = actor->eyePos;
i_this->mB88.y += REG0_F(15) + 60.0f;
@@ -1364,7 +1364,7 @@ void demo_camera(bmd_class* i_this) {
i_this->mB78 = REG0_S(6);
i_this->m302 = 3;
i_this->mpHeadMorf->setAnm(
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_START3), J3DFrameCtrl::EMode_LOOP, 1.0f, 1.0f, 0.0f, -1.0f, NULL
(J3DAnmTransform*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_START3_e), J3DFrameCtrl::EMode_LOOP, 1.0f, 1.0f, 0.0f, -1.0f, NULL
);
i_this->m308[0] = 10;
fopAcM_monsSeStart(actor, JA_SE_CV_BKM_LAUGH, 0);
@@ -1710,10 +1710,10 @@ static BOOL daBmd_Delete(bmd_class* i_this) {
/* 00005CF4-000064C0 .text useHeapInit__FP9bmd_class */
BOOL useHeapInit(bmd_class* i_this) {
i_this->mpBodyMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Bmd", BMD_BMD_BKM),
(J3DModelData*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BMD_BKM_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bmd", BMD_BCK_HANA_WAIT),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_HANA_WAIT_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
@@ -1737,7 +1737,7 @@ BOOL useHeapInit(bmd_class* i_this) {
if (i_this->mpBrkAnm == NULL) {
return FALSE;
}
J3DAnmTevRegKey* pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bmd", BMD_BRK_BKM);
J3DAnmTevRegKey* pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BRK_BKM_e);
if (!i_this->mpBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE)) {
return FALSE;
}
@@ -1745,15 +1745,15 @@ BOOL useHeapInit(bmd_class* i_this) {
if (i_this->mpBtkAnm == NULL) {
return FALSE;
}
J3DAnmTextureSRTKey* pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bmd", BMD_BTK_BKM);
J3DAnmTextureSRTKey* pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BTK_BKM_e);
if (!i_this->mpBtkAnm->init(model->getModelData(), pBtk, true, J3DFrameCtrl::EMode_NONE)) {
return FALSE;
}
i_this->mpHeadMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Bmd", BMD_BMD_BKM_COA),
(J3DModelData*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BMD_BKM_COA_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_WAIT),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_WAIT_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
@@ -1772,10 +1772,10 @@ BOOL useHeapInit(bmd_class* i_this) {
model->getModelData()->getJointNodePointer(uVar16)->setCallBack(core_nodeCallBack);
}
i_this->mpHeadDeadMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Bmd", BMD_BMD_BKM_COA_DEADMODEL),
(J3DModelData*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BMD_BKM_COA_DEADMODEL_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bmd", BMD_BCK_COA_DEAD1),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_COA_DEAD1_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
@@ -1795,7 +1795,7 @@ BOOL useHeapInit(bmd_class* i_this) {
return FALSE;
}
#endif
i_this->pm_bgw[5]->Set((cBgD_t*)dComIfG_getObjectRes("Bmd", BMD_DZB_COLL1), dBgW::MOVE_BG_e, &i_this->mA34);
i_this->pm_bgw[5]->Set((cBgD_t*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_DZB_COLL1_e), dBgW::MOVE_BG_e, &i_this->mA34);
i_this->pm_bgw[5]->SetCrrFunc(dBgS_MoveBGProc_Typical);
i_this->pm_bgw[5]->SetRideCallback(ride_call_back);
#if VERSION < VERSION_USA
@@ -1811,7 +1811,7 @@ BOOL useHeapInit(bmd_class* i_this) {
return FALSE;
}
#endif
i_this->pm_bgw[i]->Set((cBgD_t*)dComIfG_getObjectRes("Bmd", BMD_DZB_COLL2), dBgW::MOVE_BG_e, &i_this->m944[i]);
i_this->pm_bgw[i]->Set((cBgD_t*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_DZB_COLL2_e), dBgW::MOVE_BG_e, &i_this->m944[i]);
i_this->pm_bgw[i]->SetCrrFunc(dBgS_MoveBGProc_Typical);
i_this->pm_bgw[i]->SetRideCallback(ride_call_back);
#if VERSION < VERSION_USA
@@ -1821,10 +1821,10 @@ BOOL useHeapInit(bmd_class* i_this) {
#endif
}
i_this->mpMakarMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Bmd", BMD_BMD_CB),
(J3DModelData*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BMD_CB_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bmd", BMD_BCK_CALL_01),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BCK_CALL_01_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
@@ -1837,12 +1837,12 @@ BOOL useHeapInit(bmd_class* i_this) {
if (i_this->mpMakarMorf->getModel() == NULL) {
return FALSE;
}
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Bmd", BMD_BMD_CB_FACE);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BMD_CB_FACE_e);
i_this->mpMakarFaceModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (i_this->mpMakarFaceModel == NULL) {
return FALSE;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bmd", BMD_BDL_R00_EF);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BDL_R00_EF_e);
i_this->mpR00_EFModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (i_this->mpR00_EFModel == NULL) {
return FALSE;
@@ -1851,7 +1851,7 @@ BOOL useHeapInit(bmd_class* i_this) {
if (i_this->mpR00_EFBrk == NULL) {
return FALSE;
}
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bmd", BMD_BRK_R00_EF);
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bmd", dRes_INDEX_BMD_BRK_R00_EF_e);
if (!i_this->mpR00_EFBrk->init(modelData, pBrk, true, J3DFrameCtrl::EMode_NONE, 0.0f)) {
BOOL ret = FALSE;
return ret;
src/d/actor/d_a_bmdfoot.cpp
+21 -21
View File
@@ -6,7 +6,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_bmdfoot.h"
#include "d/actor/d_a_player.h"
#include "d/res/res_bmdfoot.h"
#include "res/Object/Bmdfoot.h"
#include "d/actor/d_a_bmd.h"
#include "d/d_s_play.h"
#include "m_Do/m_Do_ext.h"
@@ -137,7 +137,7 @@ void wait(bmdfoot_class* i_this) {
break;
case 0:
i_this->m2BC++;
anm_init(i_this, BMDFOOT_BCK_ASI_WAIT, 50.0f, J3DFrameCtrl::EMode_LOOP, cM_rndF(0.2f) + 0.9f, -1);
anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_WAIT_e, 50.0f, J3DFrameCtrl::EMode_LOOP, cM_rndF(0.2f) + 0.9f, -1);
i_this->m2C0[0] = cM_rndF(150.0f) + 100.0f;
i_this->m3EC = cM_rndFX(32768.0f);
for (int i = 2; i <= ARRAY_SSIZE(i_this->m3A4); i++) {
@@ -188,7 +188,7 @@ void attack_1(bmdfoot_class* i_this) {
case 1:
i_this->mBC4 = 0.0f;
if (i_this->m2C0[0] == 0) {
anm_init(i_this, BMDFOOT_BCK_ASI_ATTACK1, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_ATTACK1_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m2BC++;
i_this->mBD0 = 0x1e;
}
@@ -198,7 +198,7 @@ void attack_1(bmdfoot_class* i_this) {
i_this->mBD0 = 0x1e;
}
if (i_this->mpBodyVineMorf->isStop()) {
anm_init(i_this, BMDFOOT_BCK_ASI_ATTACK_LOOP, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_ATTACK_LOOP_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m2C0[0] = 0x3c;
i_this->m2BC++;
}
@@ -212,7 +212,7 @@ void attack_1(bmdfoot_class* i_this) {
cLib_addCalc0(&i_this->m2CC[i].z, 0.1f, 0.05f);
}
if (i_this->m2C0[0] == 0) {
anm_init(i_this, BMDFOOT_BCK_ASI_ATTACK2, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_ATTACK2_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m2BC++;
i_this->m2C0[0] = REG14_S(2) + 0x1c;
mDoAud_seStart(JA_SE_CM_BKM_ATKVINE_PREP, &i_this->mAE8, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
@@ -342,7 +342,7 @@ void attack_2(bmdfoot_class* i_this) {
case 1:
i_this->mBC4 = 0.0f;
if (i_this->m2C0[0] == 0) {
anm_init(i_this, BMDFOOT_BCK_ASI_UMARU, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_UMARU_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m2BC++;
i_this->m2C0[0] = 5;
i_this->mBD0 = 0x1e;
@@ -358,7 +358,7 @@ void attack_2(bmdfoot_class* i_this) {
mDoAud_seStart(JA_SE_CM_BKM_ATKVINE_IN_G, &i_this->mAE8, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
}
if (i_this->mpBodyVineMorf->isStop()) {
anm_init(i_this, BMDFOOT_BCK_ASI_UMARU_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_UMARU_WAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m2BC++;
i_this->mBA8 = 1;
}
@@ -366,7 +366,7 @@ void attack_2(bmdfoot_class* i_this) {
case 3:
mDoAud_seStart(JA_SE_CM_BKM_ATKVINE_DIG, &i_this->mBAC, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
if (ug_move(i_this)) {
pBck = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdfoot", BMDFOOT_BCK_ASI_DATTACK1);
pBck = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdfoot", dRes_INDEX_BMDFOOT_BCK_ASI_DATTACK1_e);
i_this->mpFloorVineMorf->setAnm(pBck, J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL);
i_this->m2BC++;
}
@@ -381,7 +381,7 @@ void attack_2(bmdfoot_class* i_this) {
}
ug_move(i_this);
if (i_this->mpFloorVineMorf->isStop()) {
pBck = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdfoot", BMDFOOT_BCK_ASI_DATTACK2);
pBck = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdfoot", dRes_INDEX_BMDFOOT_BCK_ASI_DATTACK2_e);
i_this->mpFloorVineMorf->setAnm(pBck, J3DFrameCtrl::EMode_LOOP, 1.0f, 1.0f, 0.0f, -1.0f, NULL);
i_this->m2C0[0] = 0xb4;
i_this->m2BC++;
@@ -398,7 +398,7 @@ void attack_2(bmdfoot_class* i_this) {
dComIfG_Ccsp()->Set(&i_this->mSph[i]);
}
if (i_this->m2C0[0] == 0) {
pBck = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdfoot", BMDFOOT_BCK_ASI_DATTACK3);
pBck = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdfoot", dRes_INDEX_BMDFOOT_BCK_ASI_DATTACK3_e);
i_this->mpFloorVineMorf->setAnm(pBck, J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f, NULL);
i_this->m2BC++;
}
@@ -417,7 +417,7 @@ void attack_2(bmdfoot_class* i_this) {
mDoAud_seStart(JA_SE_CM_BKM_ATKVINE_IN_G2, &i_this->mBAC, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
}
if (i_this->mpFloorVineMorf->isStop()) {
anm_init(i_this, BMDFOOT_BCK_ASI_NUKU, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_NUKU_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m2BC++;
i_this->mBA8 = 0;
mDoAud_seStart(JA_SE_CM_BKM_ATKVINE_OUT_G2, &i_this->mAE8, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
@@ -457,7 +457,7 @@ void damage(bmdfoot_class* i_this) {
switch (i_this->m2BC) {
case 0:
anm_init(i_this, BMDFOOT_BCK_ASI_NOBIKIRU, 40.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_NOBIKIRU_e, 40.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m2BC++;
i_this->m2C0[0] = 0x1e;
i_this->m3EC = cM_rndFX(32768.0f);
@@ -499,13 +499,13 @@ void start(bmdfoot_class* i_this) {
case 1:
if (i_this->m2C0[0] == 0) {
i_this->mBC8 = 1;
anm_init(i_this, BMDFOOT_BCK_ASI_START1, 1.0f, J3DFrameCtrl::EMode_NONE, cM_rndF(0.2f) + 0.9f, -1);
anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_START1_e, 1.0f, J3DFrameCtrl::EMode_NONE, cM_rndF(0.2f) + 0.9f, -1);
i_this->m2BC = 2;
}
break;
case 2:
if (i_this->mpBodyVineMorf->isStop()) {
anm_init(i_this, BMDFOOT_BCK_ASI_START2, 30.0f, J3DFrameCtrl::EMode_LOOP, cM_rndF(0.2f) + 0.9f, -1);
anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_START2_e, 30.0f, J3DFrameCtrl::EMode_LOOP, cM_rndF(0.2f) + 0.9f, -1);
i_this->m2BC = 3;
}
break;
@@ -528,10 +528,10 @@ void end(bmdfoot_class* i_this) {
i_this->m3A4[i] = 0;
}
if (boss->mB76 == 2) {
anm_init(i_this, BMDFOOT_BCK_ASI_DEAD_LOOP, 30.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_DEAD_LOOP_e, 30.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
if (boss->mB76 == REG8_S(8) + 0x17c) {
anm_init(i_this, BMDFOOT_BCK_ASI_DEAD, 30.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BMDFOOT_BCK_ASI_DEAD_e, 30.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
}
}
@@ -683,10 +683,10 @@ static BOOL daBmdfoot_Delete(bmdfoot_class* i_this) {
/* 000026B0-000029B4 .text useHeapInit__FP13bmdfoot_class */
int useHeapInit(bmdfoot_class* i_this) {
i_this->mpBodyVineMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Bmdfoot", BMDFOOT_BMD_ASI),
(J3DModelData*)dComIfG_getObjectRes("Bmdfoot", dRes_INDEX_BMDFOOT_BMD_ASI_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bmdfoot", BMDFOOT_BCK_ASI_WAIT),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bmdfoot", dRes_INDEX_BMDFOOT_BCK_ASI_WAIT_e),
J3DFrameCtrl::EMode_LOOP,
cM_rndF(0.2f) + 0.9f,
0,
@@ -712,7 +712,7 @@ int useHeapInit(bmdfoot_class* i_this) {
}
i_this->btk = new mDoExt_btkAnm();
JUT_ASSERT(DEMO_SELECT(1416, 1426), i_this->btk);
J3DAnmTextureSRTKey* pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bmdfoot", BMDFOOT_BTK_ASI);
J3DAnmTextureSRTKey* pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bmdfoot", dRes_INDEX_BMDFOOT_BTK_ASI_e);
#if VERSION == VERSION_DEMO
i_this->btk->init(model->getModelData(), pBtk, true, J3DFrameCtrl::EMode_NONE);
#else
@@ -722,10 +722,10 @@ int useHeapInit(bmdfoot_class* i_this) {
#endif
i_this->mpFloorVineMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Bmdfoot", BMDFOOT_BMD_ASI),
(J3DModelData*)dComIfG_getObjectRes("Bmdfoot", dRes_INDEX_BMDFOOT_BMD_ASI_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bmdfoot", BMDFOOT_BCK_ASI_WAIT),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bmdfoot", dRes_INDEX_BMDFOOT_BCK_ASI_WAIT_e),
J3DFrameCtrl::EMode_LOOP,
cM_rndF(0.2f) + 0.9f,
0,
src/d/actor/d_a_bmdhand.cpp
+6 -6
View File
@@ -6,7 +6,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_bmdhand.h"
#include "d/d_s_play.h"
#include "d/res/res_bmdhand.h"
#include "res/Object/Bmdhand.h"
#include "d/actor/d_a_bmd.h"
#include "d/d_cc_d.h"
@@ -317,7 +317,7 @@ void start_control2(bmdhand_class* i_this) {
void hand_close(bmdhand_class* i_this) {
J3DAnmTransform* pAnimRes;
pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdhand", BMDHAND_BCK_FOOK_TOJIRU);
pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdhand", dRes_INDEX_BMDHAND_BCK_FOOK_TOJIRU_e);
i_this->mpMorf->setAnm(pAnimRes, 0, REG0_F(6) + 5.0f, 1.0f, 0.0f, -1.0f, NULL);
}
@@ -325,7 +325,7 @@ void hand_close(bmdhand_class* i_this) {
void hand_open(bmdhand_class* i_this) {
J3DAnmTransform* pAnimRes;
pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdhand", BMDHAND_BCK_FOOK_HIRAKU);
pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes("Bmdhand", dRes_INDEX_BMDHAND_BCK_FOOK_HIRAKU_e);
i_this->mpMorf->setAnm(pAnimRes, 0, REG0_F(6) + 5.0f, 1.0f, 0.0f, -1.0f, NULL);
}
@@ -723,10 +723,10 @@ static BOOL daBmdhand_Delete(bmdhand_class* i_this) {
/* 000030C4-00003210 .text useHeapInit__FP13bmdhand_class */
static BOOL useHeapInit(bmdhand_class* i_this) {
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Bmdhand", BMDHAND_BMD_BKM_FOOK),
(J3DModelData*)dComIfG_getObjectRes("Bmdhand", dRes_INDEX_BMDHAND_BMD_BKM_FOOK_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bmdhand", BMDHAND_BCK_FOOK_HIRAKU),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bmdhand", dRes_INDEX_BMDHAND_BCK_FOOK_HIRAKU_e),
J3DFrameCtrl::EMode_NONE,
1.0f,
0,
@@ -744,7 +744,7 @@ static BOOL useHeapInit(bmdhand_class* i_this) {
return FALSE;
}
#endif
ResTIMG* pBti = (ResTIMG*)dComIfG_getObjectRes("Bmdhand", BMDHAND_BTI_SYOKUSYU_UE);
ResTIMG* pBti = (ResTIMG*)dComIfG_getObjectRes("Bmdhand", dRes_INDEX_BMDHAND_BTI_SYOKUSYU_UE_e);
if (!i_this->mLineMat.init(1, 20, pBti, 1)) {
return FALSE;
}
src/d/actor/d_a_boko.cpp
+8 -8
View File
@@ -6,12 +6,12 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_boko.h"
#include "d/actor/d_a_player.h"
#include "d/res/res_boko.h"
#include "d/res/res_nata.h"
#include "d/res/res_club.h"
#include "d/res/res_tkwn.h"
#include "d/res/res_spear.h"
#include "d/res/res_pgsw.h"
#include "res/Object/Boko.h"
#include "res/Object/Nata.h"
#include "res/Object/Club.h"
#include "res/Object/Tkwn.h"
#include "res/Object/Spear.h"
#include "res/Object/Pgsw.h"
#include "d/d_com_inf_game.h"
#include "d/d_bg_s_lin_chk.h"
#include "d/d_s_play.h"
@@ -845,7 +845,7 @@ static BOOL daBoko_createHeap(fopAc_ac_c* i_this) {
/* 00002AE8-00002CFC .text createHeap__8daBoko_cFv */
BOOL daBoko_c::createHeap() {
static const int model_idx[] = {BOKO_BDL_BOKO, NATA_BDL_BK_NATA, CLUB_BDL_ST_BUKI, TKWN_BDL_TN_KEN1, SPEAR_BDL_MO_YARI, PGSW_BDL_BPG_KEN1};
static const int model_idx[] = {dRes_INDEX_BOKO_BDL_BOKO_e, dRes_INDEX_NATA_BDL_BK_NATA_e, dRes_INDEX_CLUB_BDL_ST_BUKI_e, dRes_INDEX_TKWN_BDL_TN_KEN1_e, dRes_INDEX_SPEAR_BDL_MO_YARI_e, dRes_INDEX_PGSW_BDL_BPG_KEN1_e};
u32 type = fopAcM_GetParam(this);
if (type >= Type_COUNT_e) {
@@ -874,7 +874,7 @@ BOOL daBoko_c::createHeap() {
} else if (type == 5 &&
!mBrkAnm.init(
modelData,
static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Pgsw", PGSW_BRK_KIERU_KEN1)),
static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Pgsw", dRes_INDEX_PGSW_BRK_KIERU_KEN1_e)),
true, J3DFrameCtrl::EMode_NONE
))
{
src/d/actor/d_a_bomb2.cpp
+4 -4
View File
@@ -10,7 +10,7 @@
#include "d/d_a_obj.h"
#include "d/d_kankyo_wether.h"
#include "d/d_com_inf_game.h"
#include "d/res/res_vbakh.h"
#include "res/Object/VbakH.h"
#include "f_op/f_op_camera.h"
#include "f_op/f_op_kankyo_mng.h"
#include "m_Do/m_Do_mtx.h"
@@ -263,15 +263,15 @@ namespace daBomb2 {
bool Act_c::create_heap_nut() {
const char* resName = attr().resName;
J3DModelData* mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(attr().resName, VBAKH_BDL_VBAKM));
J3DModelData* mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(attr().resName, dRes_INDEX_VBAKH_BDL_VBAKM_e));
JUT_ASSERT(0x303, mdl_data != NULL);
mpModel = mDoExt_J3DModel__create(mdl_data, 0x80000, 0x11000022);
J3DAnmTransform* bck_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(resName, VBAKH_BCK_VBAKM));
J3DAnmTransform* bck_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(resName, dRes_INDEX_VBAKH_BCK_VBAKM_e));
JUT_ASSERT(0x30D, bck_data != NULL);
int temp = mBck0.init(mdl_data, bck_data, true, J3DFrameCtrl::EMode_NONE);
J3DAnmTevRegKey* brk_data = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(resName, VBAKH_BRK_VBAKM));
J3DAnmTevRegKey* brk_data = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(resName, dRes_INDEX_VBAKH_BRK_VBAKM_e));
JUT_ASSERT(0x314, brk_data != NULL);
int temp3 = mBrk0.init(mdl_data, brk_data, true, J3DFrameCtrl::EMode_NONE);
src/d/actor/d_a_bomb3.inc
+8 -8
View File
@@ -14,7 +14,7 @@
#include "f_op/f_op_kankyo_mng.h"
#include "m_Do/m_Do_mtx.h"
#include "m_Do/m_Do_lib.h"
#include "d/res/res_vbakh.h"
#include "res/Object/VbakH.h"
namespace {
enum AttrSt_e {
@@ -1316,30 +1316,30 @@ static BOOL daBomb_Delete(daBomb_c* i_this) {
BOOL daBomb_c::createHeap() {
BOOL ret;
if(mType == 1) {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BDL_VBAKM));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_attrType[mType].resName, dRes_INDEX_VBAKH_BDL_VBAKM_e));
JUT_ASSERT(DEMO_SELECT(2416, 2469), modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
J3DAnmTransform* bck0_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BCK_VBAMX));
J3DAnmTransform* bck0_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_attrType[mType].resName, dRes_INDEX_VBAKH_BCK_VBAMX_e));
JUT_ASSERT(DEMO_SELECT(2425, 2478), bck0_data != NULL);
int temp = mBck0.init(modelData, bck0_data, true, J3DFrameCtrl::EMode_NONE);
J3DAnmTransform* bck1_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BCK_VBAKM));
J3DAnmTransform* bck1_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_attrType[mType].resName, dRes_INDEX_VBAKH_BCK_VBAKM_e));
JUT_ASSERT(DEMO_SELECT(2431, 2484), bck1_data != NULL);
int temp2 = mBck1.init(modelData, bck1_data, true, J3DFrameCtrl::EMode_NONE);
J3DAnmTevRegKey* brk0_data = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BRK_VBAMX));
J3DAnmTevRegKey* brk0_data = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_attrType[mType].resName, dRes_INDEX_VBAKH_BRK_VBAMX_e));
JUT_ASSERT(DEMO_SELECT(2438, 2491), brk0_data != NULL);
int temp3 = mBrk0.init(modelData, brk0_data, true, J3DFrameCtrl::EMode_NONE);
J3DAnmTevRegKey* brk1_data = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BRK_VBAKM));
J3DAnmTevRegKey* brk1_data = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_attrType[mType].resName, dRes_INDEX_VBAKH_BRK_VBAKM_e));
JUT_ASSERT(DEMO_SELECT(2444, 2497), brk1_data != NULL);
int temp4 = mBrk1.init(modelData, brk1_data, true, J3DFrameCtrl::EMode_NONE);
return mpModel && temp && temp2 && temp3 && temp4;
}
else {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_attrType[mType].resName, LINK_BDL_BOMB));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_attrType[mType].resName, dRes_INDEX_LINK_BDL_BOMB_e));
JUT_ASSERT(DEMO_SELECT(2457, 2510), modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
@@ -1347,7 +1347,7 @@ BOOL daBomb_c::createHeap() {
return false;
}
else {
J3DAnmTransform* bck0_data = (J3DAnmTransform*)dComIfG_getObjectRes(m_attrType[mType].resName, LINK_BCK_BOMB);
J3DAnmTransform* bck0_data = (J3DAnmTransform*)dComIfG_getObjectRes(m_attrType[mType].resName, dRes_INDEX_LINK_BCK_BOMB_e);
int temp = mBck0.init(modelData, bck0_data, false, J3DFrameCtrl::EMode_LOOP);
return temp ? TRUE : FALSE;
src/d/actor/d_a_boomerang.cpp
+4 -4
View File
@@ -9,7 +9,7 @@
#include "d/d_cc_d.h"
#include "d/d_material.h"
#include "d/actor/d_a_player_main.h"
#include "d/res/res_link.h"
#include "res/Object/Link.h"
#include "dolphin/gf/GF.h"
#include "f_op/f_op_camera.h"
#include "f_op/f_op_camera_mng.h"
@@ -743,7 +743,7 @@ static BOOL daBoomerang_Delete(daBoomerang_c*) {
/* 800E2C00-800E2CC8 .text createHeap__13daBoomerang_cFv */
BOOL daBoomerang_c::createHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Link", LINK_BDL_BOOMERANG);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_BOOMERANG_e);
JUT_ASSERT(VERSION_SELECT(1543, 1539, 1546, 1546), modelData != NULL);
@@ -812,7 +812,7 @@ cPhs_State daBoomerang_c::create() {
}
{
ResTIMG* tmp_img = (ResTIMG*)dComIfG_getObjectRes("Link", LINK_BTI_BLUR);
ResTIMG* tmp_img = (ResTIMG*)dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BTI_BLUR_e);
JUT_ASSERT(VERSION_SELECT(1626, 1622, 1629, 1629), tmp_img != NULL);
@@ -820,7 +820,7 @@ cPhs_State daBoomerang_c::create() {
}
{
ResTIMG* tmp_img = (ResTIMG*)dComIfG_getObjectRes("Link", LINK_BTI_ROCK_MARK);
ResTIMG* tmp_img = (ResTIMG*)dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BTI_ROCK_MARK_e);
JUT_ASSERT(VERSION_SELECT(1634, 1630, 1637, 1637), tmp_img != NULL);
src/d/actor/d_a_bpw.cpp
+78 -78
View File
@@ -9,7 +9,7 @@
#include "d/actor/d_a_pw.h"
#include "d/d_lib.h"
#include "d/d_snap.h"
#include "d/res/res_bpw.h"
#include "res/Object/Bpw.h"
#include "d/d_cc_d.h"
#include "d/d_s_play.h"
#include "f_op/f_op_camera.h"
@@ -463,15 +463,15 @@ BOOL body_atari_check(bpw_class* i_this) {
player->getCutType() == daPy_py_c::CUT_TYPE_CUT_KESA)
{
i_this->mHitType = 2;
anm_init(i_this, BPW_BCK_BOYON_L1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_BOYON_L1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
} else {
anm_init(i_this, BPW_BCK_BOYON_S1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_BOYON_S1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
}
break;
case AT_TYPE_HOOKSHOT:
fopAcM_seStart(actor, JA_SE_LK_MS_WEP_HIT, 0x44);
i_this->mHitType = 0xc;
anm_init(i_this, BPW_BCK_BOYON_S1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_BOYON_S1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
break;
case AT_TYPE_WIND:
bVar2 = true;
@@ -487,7 +487,7 @@ BOOL body_atari_check(bpw_class* i_this) {
case AT_TYPE_STALFOS_MACE:
case AT_TYPE_BOKO_STICK:
fopAcM_seStart(actor, JA_SE_LK_W_WEP_HIT, 0x44);
anm_init(i_this, BPW_BCK_BOYON_S1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_BOYON_S1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
break;
case AT_TYPE_SKULL_HAMMER:
fopAcM_seStart(actor, JA_SE_LK_HAMMER_HIT, 0x44);
@@ -495,21 +495,21 @@ BOOL body_atari_check(bpw_class* i_this) {
if (player->getCutType() == daPy_py_c::CUT_TYPE_HAMMER_SIDESWING) {
i_this->mHitType = 9;
}
anm_init(i_this, BPW_BCK_BOYON_L1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_BOYON_L1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
break;
case AT_TYPE_BOMB:
i_this->mHitType = 7;
anm_init(i_this, BPW_BCK_BOYON_L1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_BOYON_L1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
break;
case AT_TYPE_ICE_ARROW:
i_this->mHitType = 6;
fopAcM_seStart(actor, JA_SE_LK_MS_WEP_HIT, 0x44);
anm_init(i_this, BPW_BCK_BOYON_S1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_BOYON_S1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
break;
case AT_TYPE_LIGHT_ARROW:
i_this->mHitType = 11;
fopAcM_seStart(actor, JA_SE_LK_MS_WEP_HIT, 0x44);
anm_init(i_this, BPW_BCK_BOYON_S1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_BOYON_S1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
break;
case AT_TYPE_FIRE_ARROW:
case AT_TYPE_FIRE:
@@ -519,7 +519,7 @@ BOOL body_atari_check(bpw_class* i_this) {
default:
i_this->mHitType = 0;
fopAcM_seStart(actor, JA_SE_LK_MS_WEP_HIT, 0x44);
anm_init(i_this, BPW_BCK_BOYON_S1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_BOYON_S1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
break;
}
if (!bVar2) {
@@ -762,20 +762,20 @@ void noroi_brk_check(bpw_class* i_this, u8 param_2) {
case 0:
if (i_this->m3E2 != 2) {
i_this->m3E2 = 2;
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_NOROI_S1);
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_NOROI_S1_e);
i_this->mpCurseStartBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0);
}
break;
case 1:
if (i_this->m3E2 == 2) {
i_this->m3E2 = 1;
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_NOROI_E1);
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_NOROI_E1_e);
i_this->mpCurseEndBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0);
}
break;
case 2:
i_this->m3E2 = 0;
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_DEFAULT);
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_DEFAULT_e);
i_this->mpDefaultBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0);
break;
}
@@ -819,7 +819,7 @@ void next_status_clear(bpw_class* i_this, u8 param_2) {
if (i_this->m3E1 != 0) {
J3DModel* model = i_this->mpMorf->getModel();
i_this->m3E1 = 0;
J3DAnmTevRegKey* pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_DEFAULT);
J3DAnmTevRegKey* pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_DEFAULT_e);
i_this->mpDefaultBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0);
}
if (i_this->mAttWaitTimer == 0) {
@@ -1069,7 +1069,7 @@ void action_dousa(bpw_class* i_this) {
i_this->mSomeCountdownTimers[i + 10] = 0;
}
if (i_this->m3F8 != 0x2a) {
anm_init(i_this, BPW_BCK_WAIT1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_WAIT1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
i_this->mSomeCountdownTimers[0] = 10;
i_this->mSomeCountdownTimers[0] += (int)cM_rndF(i_this->mSomeCountdownTimers[0]);
@@ -1100,7 +1100,7 @@ void action_dousa(bpw_class* i_this) {
i_this->m488 = 5.0f;
}
if (i_this->m3F8 != 0x1d) {
anm_init(i_this, BPW_BCK_MOVEF1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_MOVEF1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
i_this->mActionState++;
case 3:
@@ -1134,7 +1134,7 @@ void action_dousa(bpw_class* i_this) {
}
break;
case 4:
anm_init(i_this, BPW_BCK_MOVEB1, REG12_F(0) + 15.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_MOVEB1_e, REG12_F(0) + 15.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mSomeCountdownTimers[0] = (s16)(int)(REG12_F(1) + 40.0f);
noroi_brk_check(i_this, 0);
fopAcM_monsSeStart(actor, JA_SE_CV_BPW_CURSE, 0);
@@ -1146,7 +1146,7 @@ void action_dousa(bpw_class* i_this) {
actor->speedF = REG8_F(12) + 75.0f;
i_this->m488 = REG8_F(13) + 2.0f;
i_this->m490 = 0.0f;
anm_init(i_this, BPW_BCK_MOVES1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_MOVES1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mActionState++;
// fallthrough
@@ -1189,7 +1189,7 @@ void action_dousa(bpw_class* i_this) {
i_this->mSomeCountdownTimers[i + 10] = 0;
}
if (i_this->m3F8 != 0x2a) {
anm_init(i_this, BPW_BCK_WAIT1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_WAIT1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
i_this->mActionState++;
case 0xb:
@@ -1206,7 +1206,7 @@ void action_dousa(bpw_class* i_this) {
if (i_this->m47E >= 0x95) {
i_this->m47E = 0x96;
i_this->m480 = 0x96;
anm_init(i_this, BPW_BCK_HIROU1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_HIROU1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1);
kantera_pos_search(i_this);
i_this->mActionState++;
}
@@ -1273,7 +1273,7 @@ void action_kougeki(bpw_class* i_this) {
i_this->mSomeCountdownTimers[i + 10] = 0;
}
if (i_this->m3F8 != 0x2b) {
anm_init(i_this, BPW_BCK_WARAU1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_WARAU1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
i_this->m47A = 0x500;
i_this->m4A0 = 0.0f;
@@ -1310,7 +1310,7 @@ void action_kougeki(bpw_class* i_this) {
case 0x28:
if (i_this->mSomeCountdownTimers[2] != 0)
break;
anm_init(i_this, BPW_BCK_SUIKOMU1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_SUIKOMU1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mSomeCountdownTimers[0] = 30;
i_this->mSomeCountdownTimers[0] += (int)cM_rndF(i_this->mSomeCountdownTimers[0]);
#if VERSION == VERSION_DEMO
@@ -1362,7 +1362,7 @@ void action_kougeki(bpw_class* i_this) {
#else
i_this->m540.remove();
#endif
anm_init(i_this, BPW_BCK_IKI1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_IKI1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mActionState++;
}
break;
@@ -1395,7 +1395,7 @@ void action_kougeki(bpw_class* i_this) {
);
}
#endif
anm_init(i_this, BPW_BCK_IKI_WAIT1, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_IKI_WAIT1_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mActionState++;
}
break;
@@ -1433,7 +1433,7 @@ void action_kougeki(bpw_class* i_this) {
break;
}
case 0x32:
anm_init(i_this, BPW_BCK_SUIKOMU1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_SUIKOMU1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mSomeCountdownTimers[0] = 0x4b;
i_this->mSomeCountdownTimers[1] = (s16)(int)(REG8_F(2) + 20.0f);
i_this->mKankyouHendouState = 2;
@@ -1458,7 +1458,7 @@ void action_kougeki(bpw_class* i_this) {
player->setOutPower(10.0f, fopAcM_searchPlayerAngleY(actor) + 0x8000, 1);
}
} else {
anm_init(i_this, BPW_BCK_HONOO1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_HONOO1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mActionState++;
}
break;
@@ -1478,7 +1478,7 @@ void action_kougeki(bpw_class* i_this) {
i_this->m47A = 0x300;
i_this->mSomeCountdownTimers[5] = 0;
GOUEN_FIRE_HIT = 0;
anm_init(i_this, BPW_BCK_HONOO_WAIT1, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_HONOO_WAIT1_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mActionState++;
}
}
@@ -1526,7 +1526,7 @@ void action_kougeki(bpw_class* i_this) {
i_this->mSomeCountdownTimers[5] = 0;
i_this->mAttWaitTimer = 2;
if (i_this->m3F8 != 5) {
anm_init(i_this, BPW_BCK_ATTACK_KAN1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_ATTACK_KAN1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
fopAcM_monsSeStart(actor, JA_SE_CV_BPW_ATTACK, 0);
}
i_this->mActionState++;
@@ -1586,7 +1586,7 @@ void action_karada_taore(bpw_class* i_this) {
i_this->mSomeCountdownTimers[i + 10] = 0;
}
if (i_this->m3F8 != 0x28) {
anm_init(i_this, BPW_BCK_TAME1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_TAME1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1);
}
fopAcM_monsSeStart(actor, JA_SE_CV_BPW_CURSE, 0);
noroi_brk_check(i_this, 0);
@@ -1618,7 +1618,7 @@ void action_karada_taore(bpw_class* i_this) {
break;
case 0x48:
if ((i_this->mpMorf->isStop()) && (i_this->m3F8 != 0x19)) {
anm_init(i_this, BPW_BCK_JUMP1, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_JUMP1_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mAttWaitTimer = 0;
i_this->mActionState++;
}
@@ -1637,7 +1637,7 @@ void action_karada_taore(bpw_class* i_this) {
i_this->m4A4 = 100.0f;
search_get_skull(i_this, 2);
actor->gravity = -3.0f;
anm_init(i_this, BPW_BCK_PRESS1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_PRESS1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m3E8 = 2;
i_this->mSomeCountdownTimers[6] = (s16)(int)(REG21_F(0) + 20.0f);
i_this->mFire1DousaPos = actor->current.pos;
@@ -1693,7 +1693,7 @@ void action_karada_taore(bpw_class* i_this) {
actor->speed.setall(0.0f);
actor->speedF = 0.0f;
noroi_brk_check(i_this, 0);
anm_init(i_this, BPW_BCK_SONOBA_PRESS1, REG12_F(2) + 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_SONOBA_PRESS1_e, REG12_F(2) + 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
fopAcM_monsSeStart(actor, JA_SE_CV_BPW_CURSE, 0);
actor->speedF = DEMO_SELECT(REG11_F(12) + 14.75f, 14.75f);
i_this->mAttWaitTimer = 0;
@@ -1735,7 +1735,7 @@ void action_karada_taore(bpw_class* i_this) {
break;
case 0x4f:
if (i_this->mSomeCountdownTimers[0] == 0) {
anm_init(i_this, BPW_BCK_SONOBA_PRESS2, REG12_F(2) + 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_SONOBA_PRESS2_e, REG12_F(2) + 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mActionState = 0x4c;
}
// fallthrough
@@ -1777,7 +1777,7 @@ void action_damage(bpw_class* i_this) {
i_this->m480 = 200;
actor->speedF = 0.0f;
i_this->m490 = 0.0f;
anm_init(i_this, BPW_BCK_HIT1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_HIT1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mSomeCountdownTimers[9] = 0;
i_this->m476 = fopAcM_searchPlayerAngleY(actor);
actor->current.angle.y = i_this->m476;
@@ -1798,7 +1798,7 @@ void action_damage(bpw_class* i_this) {
if (i_this->m3E1 == 0) {
i_this->m3E1 = 1;
i_this->m3E2 = 0;
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_HIT);
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_HIT_e);
i_this->mpLightStunBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, 0);
}
}
@@ -1811,9 +1811,9 @@ void action_damage(bpw_class* i_this) {
if (((i_this->mAttWaitTimer == 1) || (i_this->mAttWaitTimer == 2)) || (i_this->mAttWaitTimer == 0)) {
i_this->mAttWaitTimer = 3;
}
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_HIRARU1);
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_HIRARU1_e);
i_this->mpLightFreezeBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0);
anm_init(i_this, BPW_BCK_DOSUN1, 0.0f, J3DFrameCtrl::EMode_NONE, 0.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_DOSUN1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 0.0f, -1);
i_this->m4A0 = 50.0f;
i_this->mBodyAtSph.ClrAtSet();
i_this->mBodyAtSph.ClrAtSet();
@@ -1826,11 +1826,11 @@ void action_damage(bpw_class* i_this) {
i_this->mActionState = 0x14;
}
if (i_this->m3F8 != 0x2a) {
anm_init(i_this, BPW_BCK_WAIT1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_WAIT1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
if (i_this->m3E1 != 0) {
i_this->m3E1 = 0;
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_DEFAULT);
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_DEFAULT_e);
i_this->mpDefaultBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0);
}
}
@@ -1856,7 +1856,7 @@ void action_damage(bpw_class* i_this) {
#if VERSION > VERSION_DEMO
i_this->mSomeCountdownTimers[1] = 0;
#endif
anm_init(i_this, BPW_BCK_DOSUN1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_DOSUN1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
actor->gravity = 0.0f;
}
}
@@ -1864,14 +1864,14 @@ void action_damage(bpw_class* i_this) {
case 0x53:
if (i_this->m3F8 != 0xc) {
if (i_this->mpMorf->isStop()) {
anm_init(i_this, BPW_BCK_DOSUN_WAIT1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_DOSUN_WAIT1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mSomeCountdownTimers[1] = DEMO_SELECT(240, 450);
cLib_onBit<u32>(actor->attention_info.flags, fopAc_Attn_ACTION_CARRY_e);
i_this->m684 = actor->shape_angle.y;
}
}
if (fopAcM_checkCarryNow(actor)) {
anm_init(i_this, BPW_BCK_JITA1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_JITA1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mBodyCoSph.ClrCoSet();
i_this->m3AC.y = 300.0f;
actor->current.angle.y = player->shape_angle.y;
@@ -1919,7 +1919,7 @@ void action_damage(bpw_class* i_this) {
i_this->m49C = 300.0f;
i_this->mBodyCoSph.OnCoSetBit();
fopAcM_monsSeStart(actor, JA_SE_CV_BPW_THROWN, 0);
anm_init(i_this, BPW_BCK_TAMA1, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_TAMA1_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mActionState = ACTION_STATE_DAMAGE_THROWN;
} else if (i_this->mSomeCountdownTimers[1] == 1) {
fopAcM_cancelCarryNow(actor);
@@ -1965,7 +1965,7 @@ void action_damage(bpw_class* i_this) {
actor->speedF = REG12_F(6) + 20.0f;
i_this->m490 = REG12_F(6) + 20.0f;
i_this->m47A = 0;
anm_init(i_this, BPW_BCK_DOSUN1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_DOSUN1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mActionState++;
break;
case 0x5b:
@@ -1990,7 +1990,7 @@ void action_damage(bpw_class* i_this) {
i_this->m47A = 0;
actor->gravity = -3.0f;
actor->speed.y = 70.0f;
anm_init(i_this, BPW_BCK_DAMAGE1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_DAMAGE1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mActionState++;
break;
case ACTION_STATE_DAMAGE_HIT:
@@ -2108,7 +2108,7 @@ void action_bunri_dousa(bpw_class* i_this) {
}
i_this->m47C = 0;
#endif
anm_init(i_this, BPW_BCK_CORE1, DEMO_SELECT(REG11_F(0), 0.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_CORE1_e, DEMO_SELECT(REG11_F(0), 0.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mBodyAtSph.OffAtSPrmBit(cCcD_TgSPrm_Set_e);
i_this->mBodyAtSph.ClrAtSet();
i_this->mBodyCoSph.OffTgSetBit();
@@ -2180,7 +2180,7 @@ void action_bunri_dousa(bpw_class* i_this) {
}
player->changeOriginalDemo();
player->changeDemoMode(daPy_demo_c::DEMO_N_WAIT_e);
anm_init(i_this, BPW_BCK_CORE1, DEMO_SELECT(REG11_F(0), 0.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_CORE1_e, DEMO_SELECT(REG11_F(0), 0.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
camera->mCamera.Stop();
camera->mCamera.SetTrimSize(2);
i_this->m440 = 50.0f;
@@ -2230,7 +2230,7 @@ void action_bunri_dousa(bpw_class* i_this) {
}
if (i_this->m3F8 == 9) {
if (i_this->mpMorf->isStop()) {
anm_init(i_this, BPW_BCK_CORE1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_CORE1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
fopAcM_seStart(actor, JA_SE_OBJ_BPW_MASK_LAUGH, 0);
}
@@ -2239,11 +2239,11 @@ void action_bunri_dousa(bpw_class* i_this) {
sp70.z = 1625.0f;
player->setPlayerPosAndAngle(&sp70, fopAcM_searchActorAngleY(player, actor));
if (i_this->m464 != 0) {
anm_init(i_this, BPW_BCK_CORE_NIGE1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_CORE_NIGE1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m464 = 0;
}
if ((i_this->mSomeCountdownTimers[1] == 1) || (i_this->m462 >= actor->health)) {
anm_init(i_this, BPW_BCK_CORE_NIGE1, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_CORE_NIGE1_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mSomeCountdownTimers[0] = 30;
i_this->mActionState++;
}
@@ -2259,7 +2259,7 @@ void action_bunri_dousa(bpw_class* i_this) {
break;
}
REG20_S(0) = 0;
anm_init(i_this, BPW_BCK_HUKKATU1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_HUKKATU1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_NONE, 1.0f, -1);
fopAcM_seStart(actor, JA_SE_CM_BPW_MASK_TO_BPW, 0);
i_this->mActionState++;
#if VERSION > VERSION_DEMO
@@ -2299,7 +2299,7 @@ void action_bunri_dousa(bpw_class* i_this) {
break;
}
REG20_S(0) = 0;
anm_init(i_this, BPW_BCK_WAIT1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_WAIT1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mSomeCountdownTimers[0] = DEMO_SELECT(REG11_F(10) + 20.0f, 0x14);
i_this->mActionState++;
}
@@ -2351,7 +2351,7 @@ void action_bunri_dousa(bpw_class* i_this) {
i_this->m3E6 = 0;
i_this->m3E5 = 0;
actor->scale.setall(0.0f);
anm_init(i_this, BPW_BCK_CORE1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_CORE1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
if (i_this->m3FC != fpcM_ERROR_PROCESS_ID_e) {
fopAc_ac_c* i_actor = fopAcM_SearchByID(i_this->m3FC);
fopAcM_createDisappear(i_actor, &i_actor->current.pos, 5, daDisItem_NONE3_e, 0xFF);
@@ -2521,7 +2521,7 @@ void action_bunri_dousa(bpw_class* i_this) {
}
}
if (i_this->mSomeCountdownTimers[4] == 1) {
anm_init(i_this, BPW_BCK_KYORO_GARN1, 8.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_KYORO_GARN1_e, 8.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
}
if (i_this->mSomeCountdownTimers[1] != 0) {
break;
@@ -2571,7 +2571,7 @@ void action_bunri_dousa(bpw_class* i_this) {
break;
}
REG20_S(0) = 0;
anm_init(i_this, BPW_BCK_CORE_NIGE1, 8.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_CORE_NIGE1_e, 8.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mSomeCountdownTimers[0] = 4;
i_this->mActionState++;
#if VERSION > VERSION_DEMO
@@ -2666,7 +2666,7 @@ void action_bunri_dousa(bpw_class* i_this) {
fopAcM_seStart(actor, JA_SE_OBJ_BPW_LIGHT_ON, 0);
i_this->mKankyouHendouState = 3;
i_this->mSomeCountdownTimers[5] = 0;
anm_init(i_this, BPW_BCK_GATAGATA1, REG12_F(10) + 8.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_GATAGATA1_e, REG12_F(10) + 8.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
if (actor->current.pos.y > 2000.0f) {
actor->speedF = 0.0f;
@@ -2977,7 +2977,7 @@ void action_start_demo(bpw_class* i_this) {
camera->mCamera.SetTrimSize(2);
i_this->m440 = REG6_F(0) + 55.0f;
i_this->mSomeCountdownTimers[0] = (s16)(int)(REG9_F(0) + 40.0f);
anm_init(i_this, BPW_BCK_CORE1, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_CORE1_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mActionState++;
}
// Fall-through
@@ -3135,7 +3135,7 @@ void action_start_demo(bpw_class* i_this) {
case 0xd0:
if (i_this->m3F8 == 9) {
if (i_this->mpMorf->isStop()) {
anm_init(i_this, BPW_BCK_CORE1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_CORE1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
cLib_addCalc2(&i_this->m3AC.y, REG18_F(12) + 100.0f, 1.0f, REG18_F(13) + 10.0f);
fopAcM_seStart(actor, JA_SE_OBJ_BPW_MASK_LAUGH, 0);
@@ -3143,7 +3143,7 @@ void action_start_demo(bpw_class* i_this) {
cLib_addCalc2(&i_this->m3AC.y, 140.0f, 1.0f, REG18_F(13) + 10.0f);
}
if (i_this->m464 != 0) {
anm_init(i_this, BPW_BCK_CORE_NIGE1, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_CORE_NIGE1_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m464 = 0;
}
if (i_this->m462 < 0xf)
@@ -3199,10 +3199,10 @@ void action_start_demo(bpw_class* i_this) {
if (i_this->mSomeCountdownTimers[0] != 0) {
break;
}
anm_init(i_this, BPW_BCK_OPENING1, REG18_F(7) + 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_OPENING1_e, REG18_F(7) + 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
bpw_class* lantern = (bpw_class*)fopAcM_SearchByID(i_this->m3FC);
if (lantern != NULL) {
anm_init(lantern, BPW_BCK_OPENING_KAN1, REG18_F(7) + 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(lantern, dRes_INDEX_BPW_BCK_OPENING_KAN1_e, REG18_F(7) + 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
}
i_this->mFire1DousaPos = i_this->m3B8;
i_this->mFire1DousaRot = actor->shape_angle;
@@ -3269,10 +3269,10 @@ void action_start_demo(bpw_class* i_this) {
i_this->m554.remove();
#endif
i_this->mSomeCountdownTimers[0] = (s16)(int)(REG6_F(5) + 40.0f);
anm_init(i_this, BPW_BCK_OPENING2, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_OPENING2_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
bpw_class* lantern = (bpw_class*)fopAcM_SearchByID(i_this->m3FC);
if (lantern != NULL) {
anm_init(lantern, BPW_BCK_OPENING_KAN2, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(lantern, dRes_INDEX_BPW_BCK_OPENING_KAN2_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
i_this->mActionState++;
// Fall-through
@@ -3295,7 +3295,7 @@ void action_start_demo(bpw_class* i_this) {
dComIfGp_getVibration().StopQuake(0x20);
bpw_class* lantern = (bpw_class*)fopAcM_SearchByID(i_this->m3FC);
if (lantern != NULL) {
anm_init(lantern, BPW_BCK_KAN_DEFAULT1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(lantern, dRes_INDEX_BPW_BCK_KAN_DEFAULT1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
}
i_this->mSomeCountdownTimers[1] = 0;
i_this->m3F6 = 4;
@@ -3985,7 +3985,7 @@ void torituki_execute(bpw_class* i_this) {
cLib_addCalc2(&actor->scale.x, 0.4f, 1.0f, 0.1f);
actor->scale.y = actor->scale.z = actor->scale.x;
if (!(actor->scale.x < 0.3f)) {
anm_init(i_this, BPW_BCK_TORITUKI1, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_TORITUKI1_e, DEMO_SELECT(REG11_F(0) + 15.0f, 15.0f), J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mSomeCountdownTimers[8] = DEMO_SELECT(0xD2, 0x96);
actor->scale.setall(0.4f);
i_this->mActionState++;
@@ -4237,10 +4237,10 @@ static BOOL boss_useHeapInit(fopAc_ac_c* a_this) {
bpw_class* i_this = (bpw_class*)a_this;
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("BPW", BPW_BDL_BPW),
(J3DModelData*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BDL_BPW_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("BPW", BPW_BCK_WAIT1),
(J3DAnmTransformKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BCK_WAIT1_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
@@ -4262,7 +4262,7 @@ static BOOL boss_useHeapInit(fopAc_ac_c* a_this) {
if (i_this->mpLightFreezeBrkAnm == NULL) {
return FALSE;
}
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_HIRARU1);
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_HIRARU1_e);
if (!i_this->mpLightFreezeBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE)) {
return FALSE;
}
@@ -4270,7 +4270,7 @@ static BOOL boss_useHeapInit(fopAc_ac_c* a_this) {
if (i_this->mpLightStunBrkAnm == NULL) {
return FALSE;
}
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_HIT);
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_HIT_e);
if (!i_this->mpLightStunBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_LOOP)) {
return FALSE;
}
@@ -4278,7 +4278,7 @@ static BOOL boss_useHeapInit(fopAc_ac_c* a_this) {
if (i_this->mpCurseStartBrkAnm == NULL) {
return FALSE;
}
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_NOROI_S1);
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_NOROI_S1_e);
if (!i_this->mpCurseStartBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE)) {
return FALSE;
}
@@ -4286,7 +4286,7 @@ static BOOL boss_useHeapInit(fopAc_ac_c* a_this) {
if (i_this->mpCurseEndBrkAnm == NULL) {
return FALSE;
}
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_NOROI_E1);
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_NOROI_E1_e);
if (!i_this->mpCurseEndBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE)) {
return FALSE;
}
@@ -4294,7 +4294,7 @@ static BOOL boss_useHeapInit(fopAc_ac_c* a_this) {
if (i_this->mpDefaultBrkAnm == NULL) {
return FALSE;
}
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_DEFAULT);
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_DEFAULT_e);
if (!i_this->mpDefaultBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_LOOP)) {
return FALSE;
}
@@ -4395,7 +4395,7 @@ static BOOL kantera_useHeapInit(fopAc_ac_c* a_this) {
bpw_class* i_this = (bpw_class*)a_this;
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("BPW", BPW_BDL_BPW_KAN1), NULL, NULL, NULL, J3DFrameCtrl::EMode_RESET, 1.0f, 0, -1, 1, NULL, 0x80000, 0x37441422
(J3DModelData*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BDL_BPW_KAN1_e), NULL, NULL, NULL, J3DFrameCtrl::EMode_RESET, 1.0f, 0, -1, 1, NULL, 0x80000, 0x37441422
);
if ((i_this->mpMorf == NULL) || (i_this->mpMorf->getModel() == NULL)) {
return FALSE;
@@ -4409,7 +4409,7 @@ static BOOL kantera_useHeapInit(fopAc_ac_c* a_this) {
if (i_this->mpLanternGlowBrkAnm == NULL) {
return FALSE;
}
J3DAnmTevRegKey* pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_BPW_KAN1);
J3DAnmTevRegKey* pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BRK_BPW_KAN1_e);
if (!i_this->mpLanternGlowBrkAnm->init(model->getModelData(), pBrk, true, J3DFrameCtrl::EMode_LOOP)) {
return FALSE;
}
@@ -4468,7 +4468,7 @@ static BOOL fire_useHeapInit(fopAc_ac_c* a_this) {
bpw_class* i_this = (bpw_class*)a_this;
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("BPW", BPW_BDL_BPW_KAN1), NULL, NULL, NULL, J3DFrameCtrl::EMode_RESET, 1.0f, 0, -1, 1, NULL, 0x80000, 0x37441422
(J3DModelData*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BDL_BPW_KAN1_e), NULL, NULL, NULL, J3DFrameCtrl::EMode_RESET, 1.0f, 0, -1, 1, NULL, 0x80000, 0x37441422
);
if ((i_this->mpMorf == NULL) || (i_this->mpMorf->getModel() == NULL)) {
return FALSE;
@@ -4522,10 +4522,10 @@ static BOOL tori_useHeapInit(fopAc_ac_c* a_this) {
bpw_class* i_this = (bpw_class*)a_this;
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("BPW", BPW_BDL_BPW),
(J3DModelData*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BDL_BPW_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("BPW", BPW_BCK_TORITUKI1),
(J3DAnmTransformKey*)dComIfG_getObjectRes("BPW", dRes_INDEX_BPW_BCK_TORITUKI1_e),
J3DFrameCtrl::EMode_RESET,
1.0f,
0,
@@ -4657,7 +4657,7 @@ static cPhs_State daBPW_Create(fopAc_ac_c* a_this) {
fopAcM_OnStatus(a_this, fopAcStts_UNK4000_e);
if ((dComIfGp_getStartStageName()[0] != 'X') && (REG0_S(9) != 0 || (!dComIfGs_isStageBossDemo()))) {
i_this->m3E7 = 1;
anm_init(i_this, BPW_BCK_OPENING_KAN1, REG18_F(4), J3DFrameCtrl::EMode_NONE, 0.0f, -1);
anm_init(i_this, dRes_INDEX_BPW_BCK_OPENING_KAN1_e, REG18_F(4), J3DFrameCtrl::EMode_NONE, 0.0f, -1);
}
i_this->m498 = 0.0f;
i_this->m49C = 200.0f;
src/d/actor/d_a_branch.cpp
+13 -12
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_branch.h"
#include "d/res/res_kwood_00.h"
#include "res/Object/Kwood_00.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_mtx.h"
@@ -13,9 +13,9 @@
#include "JSystem/J3DGraphBase/J3DMaterial.h"
static u16 anim_table[] = {
KWOOD_00_BCK_SWING02, KWOOD_00_BAS_SWING02,
KWOOD_00_BCK_SWING, KWOOD_00_BAS_SWING,
KWOOD_00_BCK_BREAK, KWOOD_00_BAS_BREAK,
dRes_ID_KWOOD_00_BCK_SWING02_e, dRes_ID_KWOOD_00_BAS_SWING02_e,
dRes_ID_KWOOD_00_BCK_SWING_e, dRes_ID_KWOOD_00_BAS_SWING_e,
dRes_ID_KWOOD_00_BCK_BREAK_e, dRes_ID_KWOOD_00_BAS_BREAK_e,
};
char daBranch_c::m_arcname[] = "Kwood_00";
@@ -39,12 +39,12 @@ void daBranch_c::set_mtx() {
}
/* 00000128-000001E4 .text set_anim__10daBranch_cFiii */
void daBranch_c::set_anim(int i_animIdx, int i_bckIdx, int i_basIdx) {
if (i_bckIdx > 0 && i_basIdx > 0) {
void daBranch_c::set_anim(int i_animIdx, int i_bckId, int i_basId) {
if (i_bckId > 0 && i_basId > 0) {
mAnims[i_animIdx]->setAnm(
static_cast<J3DAnmTransform*>(dComIfG_getObjectIDRes(m_arcname, i_bckIdx)),
static_cast<J3DAnmTransform*>(dComIfG_getObjectIDRes(m_arcname, i_bckId)),
-1, 0.0f, 1.0f, 0.0f, -1.0f,
dComIfG_getObjectIDRes(m_arcname, i_basIdx)
dComIfG_getObjectIDRes(m_arcname, i_basId)
);
}
}
@@ -55,7 +55,8 @@ void daBranch_c::demoPlay(mDoExt_McaMorf* morf) {
this,
dDemo_actor_c::ENABLE_ANM_e,
morf, m_arcname,
ARRAY_SIZE(anim_table) / 2, anim_table
ARRAY_SIZE(anim_table) / 2,
anim_table
);
}
@@ -67,9 +68,9 @@ BOOL daBranch_c::solidHeapCB(fopAc_ac_c* i_this) {
/* 00000248-0000049C .text CreateHeap__10daBranch_cFv */
BOOL daBranch_c::CreateHeap() {
int bmd[] = { KWOOD_00_BMD_WS, KWOOD_00_BMD_WB };
int bck[] = { KWOOD_00_BCK_SWING02, KWOOD_00_BCK_BREAK };
int bas[] = { KWOOD_00_BAS_SWING02, KWOOD_00_BAS_BREAK };
int bmd[] = { dRes_ID_KWOOD_00_BMD_WS_e, dRes_ID_KWOOD_00_BMD_WB_e };
int bck[] = { dRes_ID_KWOOD_00_BCK_SWING02_e, dRes_ID_KWOOD_00_BCK_BREAK_e };
int bas[] = { dRes_ID_KWOOD_00_BAS_SWING02_e, dRes_ID_KWOOD_00_BAS_BREAK_e };
BOOL status = TRUE;
src/d/actor/d_a_bridge.cpp
+9 -9
View File
@@ -9,7 +9,7 @@
#include "d/d_cc_d.h"
#include "d/d_path.h"
#include "d/d_com_inf_game.h"
#include "d/res/res_bridge.h"
#include "res/Object/Bridge.h"
#include "d/d_bg_w_sv.h"
#include "d/d_s_play.h"
#include "d/d_cc_uty.h"
@@ -1314,7 +1314,7 @@ void CreateInit(fopAc_ac_c* a_this) {
/* 00003E00-00004310 .text CallbackCreateHeap__FP10fopAc_ac_c */
static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) {
static const s32 bridge_bmd[] = { BRIDGE_BDL_OBM_BRIDGE, BRIDGE_BDL_OBM_BRIDGE2 };
static const s32 bridge_bmd[] = { dRes_INDEX_BRIDGE_BDL_OBM_BRIDGE_e, dRes_INDEX_BRIDGE_BDL_OBM_BRIDGE2_e };
bridge_class* i_this = (bridge_class*)a_this;
@@ -1328,7 +1328,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) {
J3DModelData* modelData2;
if (modelNum == 1) {
modelData2 = (J3DModelData*)dComIfG_getObjectRes("Bridge", BRIDGE_BDL_OBM_CHAIN1);
modelData2 = (J3DModelData*)dComIfG_getObjectRes("Bridge", dRes_INDEX_BRIDGE_BDL_OBM_CHAIN1_e);
JUT_ASSERT(DEMO_SELECT(2340, 2342), modelData2 != NULL);
}
@@ -1360,9 +1360,9 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) {
BOOL res;
if (i_this->mTypeBits & 8) {
res = pBr->mLineMat1.init(4, 5, (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXM_ROPE1), 1);
res = pBr->mLineMat1.init(4, 5, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_TXM_ROPE1_e), 1);
} else {
res = pBr->mLineMat1.init(4, 5, (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_ROPE), 1);
res = pBr->mLineMat1.init(4, 5, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), 1);
}
if (!res) {
@@ -1374,9 +1374,9 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) {
if (i == 0) {
BOOL res;
if (i_this->mTypeBits & 8) {
res = i_this->mLineMat.init(2, 14, (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_TXM_ROPE1), 0);
res = i_this->mLineMat.init(2, 14, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_TXM_ROPE1_e), 0);
} else {
res = i_this->mLineMat.init(2, 14, (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_ROPE), 0);
res = i_this->mLineMat.init(2, 14, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), 0);
}
if (!res) {
@@ -1411,7 +1411,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) {
}
if ((i_this->mTypeBits & 1) == 1) {
cBgD_t* cBgD = (cBgD_t*)dComIfG_getObjectRes("Bridge", BRIDGE_DZB_MBRDG2);
cBgD_t* cBgD = (cBgD_t*)dComIfG_getObjectRes("Bridge", dRes_INDEX_BRIDGE_DZB_MBRDG2_e);
#if VERSION == VERSION_DEMO
i_this->mpBgW->Set(cBgD, 0);
#else
@@ -1420,7 +1420,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) {
}
#endif
} else {
cBgD_t* cBgD = (cBgD_t*)dComIfG_getObjectRes("Bridge", BRIDGE_DZB_MBRDG);
cBgD_t* cBgD = (cBgD_t*)dComIfG_getObjectRes("Bridge", dRes_INDEX_BRIDGE_DZB_MBRDG_e);
#if VERSION == VERSION_DEMO
i_this->mpBgW->Set(cBgD, 0);
#else
src/d/actor/d_a_bst.cpp
+65 -65
View File
@@ -12,7 +12,7 @@
#include "d/d_cc_uty.h"
#include "d/d_meter.h"
#include "d/d_snap.h"
#include "d/res/res_bst.h"
#include "res/Object/Bst.h"
#include "d/d_s_play.h"
#include "d/d_com_inf_game.h"
#include "f_op/f_op_camera.h"
@@ -47,12 +47,12 @@ static fpc_ProcID msg;
static s8 msg_end;
static u8 hio_set;
static daBst_HIO_c l_HIO;
static u16 set_bdl_d[3] = {BST_BDL_BST, BST_BDL_LHAND, BST_BDL_RHAND};
static u16 set_za_bdl[3] = {BST_BDL_MUNE, BST_BDL_UDEL, BST_BDL_UDER};
static u16 set_bck_d[3] = {BST_BCK_BST_SLEEP, BST_BCK_LH_SLEEP, BST_BCK_RH_SLEEP};
static u16 fly_bck_d[] = {BST_BCK_BST_FLY, BST_BCK_LH_FLY, BST_BCK_RH_FLY};
static u16 damage_bck_d[] = {BST_BCK_BST_FLY, BST_BCK_LH_DAMAGE, BST_BCK_RH_DAMAGE};
static u16 down_bck_d[] = {BST_BCK_BST_FLY, BST_BCK_LH_DOWN, BST_BCK_RH_DOWN};
static u16 set_bdl_d[3] = {dRes_INDEX_BST_BDL_BST_e, dRes_INDEX_BST_BDL_LHAND_e, dRes_INDEX_BST_BDL_RHAND_e};
static u16 set_za_bdl[3] = {dRes_INDEX_BST_BDL_MUNE_e, dRes_INDEX_BST_BDL_UDEL_e, dRes_INDEX_BST_BDL_UDER_e};
static u16 set_bck_d[3] = {dRes_INDEX_BST_BCK_BST_SLEEP_e, dRes_INDEX_BST_BCK_LH_SLEEP_e, dRes_INDEX_BST_BCK_RH_SLEEP_e};
static u16 fly_bck_d[] = {dRes_INDEX_BST_BCK_BST_FLY_e, dRes_INDEX_BST_BCK_LH_FLY_e, dRes_INDEX_BST_BCK_RH_FLY_e};
static u16 damage_bck_d[] = {dRes_INDEX_BST_BCK_BST_FLY_e, dRes_INDEX_BST_BCK_LH_DAMAGE_e, dRes_INDEX_BST_BCK_RH_DAMAGE_e};
static u16 down_bck_d[] = {dRes_INDEX_BST_BCK_BST_FLY_e, dRes_INDEX_BST_BCK_LH_DOWN_e, dRes_INDEX_BST_BCK_RH_DOWN_e};
/* 00000110-00000174 .text message_set__FP9bst_classUl */
static BOOL message_set(bst_class* i_this, unsigned long msg_no) {
@@ -243,8 +243,8 @@ static void pos_move(bst_class* i_this, u8 param_2) {
actor->current.pos += actor->speed;
}
static u16 start_bck_d[] = {BST_BCK_BST_START, BST_BCK_LH_START, BST_BCK_RH_START};
static u16 start2_bck_d[] = {0, BST_BCK_LH_START2, BST_BCK_RH_START2};
static u16 start_bck_d[] = {dRes_INDEX_BST_BCK_BST_START_e, dRes_INDEX_BST_BCK_LH_START_e, dRes_INDEX_BST_BCK_RH_START_e};
static u16 start2_bck_d[] = {0, dRes_INDEX_BST_BCK_LH_START2_e, dRes_INDEX_BST_BCK_RH_START2_e};
static u16 start_smoke_name[] = {dPa_name::ID_AK_ST_BSTSTARTSMOKEHEAD00, dPa_name::ID_AK_ST_BSTSTARTSMOKELHAND00, dPa_name::ID_AK_ST_BSTSTARTSMOKERHAND00};
/* 00000B1C-00000E58 .text stay__FP9bst_class */
@@ -307,10 +307,10 @@ static void stay(bst_class* i_this) {
}
}
static u16 fly_btk_d[] = {BST_BTK_BST, BST_BTK_LHAND, BST_BTK_RHAND};
static u16 fly_brk_d[] = {BST_BRK_BST, BST_BRK_LHAND, BST_BRK_RHAND};
static u16 damage_btk_d[] = {BST_BTK_BST_DAMAGE, BST_BTK_LH_DAMAGE, BST_BTK_RH_DAMAGE};
static u16 damage_brk_d[] = {BST_BRK_BST_DAMAGE, BST_BRK_LH_DAMAGE, BST_BRK_RH_DAMAGE};
static u16 fly_btk_d[] = {dRes_INDEX_BST_BTK_BST_e, dRes_INDEX_BST_BTK_LHAND_e, dRes_INDEX_BST_BTK_RHAND_e};
static u16 fly_brk_d[] = {dRes_INDEX_BST_BRK_BST_e, dRes_INDEX_BST_BRK_LHAND_e, dRes_INDEX_BST_BRK_RHAND_e};
static u16 damage_btk_d[] = {dRes_INDEX_BST_BTK_BST_DAMAGE_e, dRes_INDEX_BST_BTK_LH_DAMAGE_e, dRes_INDEX_BST_BTK_RH_DAMAGE_e};
static u16 damage_brk_d[] = {dRes_INDEX_BST_BRK_BST_DAMAGE_e, dRes_INDEX_BST_BRK_LH_DAMAGE_e, dRes_INDEX_BST_BRK_RH_DAMAGE_e};
/* 00000E58-000014E8 .text fly__FP9bst_class */
static void fly(bst_class* i_this) {
@@ -409,7 +409,7 @@ static void fly(bst_class* i_this) {
}
}
static u16 downa_bck_d[] = {BST_BCK_BST_FLY, BST_BCK_LH_GOO, BST_BCK_RH_GOO};
static u16 downa_bck_d[] = {dRes_INDEX_BST_BCK_BST_FLY_e, dRes_INDEX_BST_BCK_LH_GOO_e, dRes_INDEX_BST_BCK_RH_GOO_e};
/* 000014E8-00001C14 .text down_attack__FP9bst_class */
static void down_attack(bst_class* i_this) {
@@ -520,7 +520,7 @@ static void down_attack(bst_class* i_this) {
}
}
static u16 paa_bck_d[] = {0, BST_BCK_LH_PAA, BST_BCK_RH_PAA};
static u16 paa_bck_d[] = {0, dRes_INDEX_BST_BCK_LH_PAA_e, dRes_INDEX_BST_BCK_RH_PAA_e};
/* 00001C14-000023C8 .text paa_attack__FP9bst_class */
static void paa_attack(bst_class* i_this) {
@@ -652,7 +652,7 @@ static void paa_attack(bst_class* i_this) {
}
}
static u16 awasu_bck_d[] = {0, BST_BCK_LH_AWASE, BST_BCK_RH_AWASU};
static u16 awasu_bck_d[] = {0, dRes_INDEX_BST_BCK_LH_AWASE_e, dRes_INDEX_BST_BCK_RH_AWASU_e};
/* 00002404-00002E08 .text kumi_attack__FP9bst_class */
static void kumi_attack(bst_class* i_this) {
@@ -875,8 +875,8 @@ static void harai_attack(bst_class* i_this) {
pos_move(i_this, cVar3);
}
static u16 sleep_btk_d[] = {BST_BCK_BST_SLEEP, BST_BTK_LH_END, BST_BTK_RH_END};
static u16 sleep_brk_d[] = {BST_BRK_BST, BST_BRK_LH_END, BST_BRK_RH_END};
static u16 sleep_btk_d[] = {dRes_INDEX_BST_BCK_BST_SLEEP_e, dRes_INDEX_BST_BTK_LH_END_e, dRes_INDEX_BST_BTK_RH_END_e};
static u16 sleep_brk_d[] = {dRes_INDEX_BST_BRK_BST_e, dRes_INDEX_BST_BRK_LH_END_e, dRes_INDEX_BST_BRK_RH_END_e};
/* 0000318C-00003470 .text sleep__FP9bst_class */
static void sleep(bst_class* i_this) {
@@ -964,13 +964,13 @@ static void beam_attack(bst_class* i_this) {
switch (i_this->mDamage) {
case 0:
i_this->mDamage++;
anm_init(i_this, BST_BCK_BEAM_MAE, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BST_BCK_BEAM_MAE_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
fopAcM_seStart(actor, JA_SE_CM_BST_MOUTH_OPEN, 0);
break;
case 1:
if (i_this->m02B8->isStop()) {
i_this->mDamage++;
anm_init(i_this, BST_BCK_BEAM_TAME, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BST_BCK_BEAM_TAME_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m10FC[0] = 0x2d;
for (s32 i = 0; i < 2; i++) {
i_this->m2ED8[i] = dComIfGp_particle_set(charge_e_name[i], &actor->current.pos);
@@ -988,7 +988,7 @@ static void beam_attack(bst_class* i_this) {
}
}
i_this->mDamage++;
anm_init(i_this, BST_BCK_BEAM, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BST_BCK_BEAM_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m10FC[0] = REG0_S(4) + 50;
}
break;
@@ -1122,9 +1122,9 @@ static void head_damage(bst_class* i_this) {
i_this->m10FC[0] = 40;
actor->speedF = 0.0f;
actor->speed.y = 0.0f;
J3DAnmTevRegKey* key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_BST_END);
J3DAnmTevRegKey* key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_BST_END_e);
i_this->mpTevRegAnimator->init(i_this->m02B8->getModel()->getModelData(), key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE);
J3DAnmTextureSRTKey* srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_BST_END);
J3DAnmTextureSRTKey* srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_BST_END_e);
i_this->mpTexMtxAnimator->init(i_this->m02B8->getModel()->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE);
fopAcM_seStart(actor, JA_SE_CM_BST_HEAD_EYE_CLOSE, 0);
mDoAud_bgmStart(JA_BGM_UNK_123);
@@ -1151,7 +1151,7 @@ static void head_damage(bst_class* i_this) {
i_this->m112A = REG0_S(7) + 4;
mDoAud_seStart(JA_SE_CM_BST_HEAD_FALL, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
mDoAud_seStart(JA_SE_CM_BST_MOUTH_OPEN, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
anm_init(i_this, BST_BCK_KUTI_OPEN, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BST_BCK_KUTI_OPEN_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mDamage++;
actor->speed.y = 0.0f;
}
@@ -1159,7 +1159,7 @@ static void head_damage(bst_class* i_this) {
break;
case 2:
if (i_this->m02B8->isStop()) {
anm_init(i_this, BST_BCK_KUTI_OPEN_LOOP, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BST_BCK_KUTI_OPEN_LOOP_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m10FC[0] = 300;
i_this->mDamage++;
}
@@ -1192,7 +1192,7 @@ static void head_damage(bst_class* i_this) {
if (i_this->m10FC[0] != 0) {
break;
}
anm_init(i_this, BST_BCK_BOM_NOMI, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BST_BCK_BOM_NOMI_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mDamage++;
i_this->m2EE0[0] = dComIfGp_particle_set(dPa_name::ID_AK_SN_BSTBOMBFLASH00, &actor->current.pos);
fopAcM_seStart(actor, JA_SE_CM_BST_MOUTH_CLOSE, 0);
@@ -1220,7 +1220,7 @@ static void head_damage(bst_class* i_this) {
i_this->m2E9A = 50;
i_this->mActionType = bst_class::ACTION_END_DEMO_e;
i_this->mDamage = 0;
anm_init(i_this, BST_BCK_BST_DEAD, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BST_BCK_BST_DEAD_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
hand[0]->mActionType = bst_class::ACTION_END_DEMO_e;
hand[0]->mDamage = 10;
hand[1]->mActionType = bst_class::ACTION_END_DEMO_e;
@@ -1229,7 +1229,7 @@ static void head_damage(bst_class* i_this) {
mDoAud_bgmStop(30);
mDoAud_bgmStreamPrepare(JA_STRM_BST_CLEAR);
} else {
anm_init(i_this, BST_BCK_BOM_BAKUHATU, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BST_BCK_BOM_BAKUHATU_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mDamage++;
}
fopAcM_seStart(actor, JA_SE_CM_BST_EXPLODE, 0);
@@ -1552,7 +1552,7 @@ static void hana_demo(bst_class* i_this) {
i_this->m10FC[0] = 40;
actor->speedF = 0.0f;
actor->speed.y = 0.0f;
anm_init(i_this, BST_BCK_HANA_DEMO, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BST_BCK_HANA_DEMO_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m2E9A = 1;
fopAcM_seStartCurrent(actor, JA_SE_CM_BST_HAND_STRAIN, 0);
// fallthrough
@@ -1620,7 +1620,7 @@ static void end_demo(bst_class* i_this) {
}
break;
case 2:
anm_init(i_this, BST_BCK_BST_HIRAKU, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BST_BCK_BST_HIRAKU_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mDamage++;
i_this->m2EF4 = dComIfGp_particle_set(dPa_name::ID_AK_SN_BSTHALO00, &actor->current.pos);
if (i_this->m2EF4 != NULL) {
@@ -1789,17 +1789,17 @@ static void main_cont(bst_class* i_this) {
hand[1]->mDamage = 0;
hand[0]->mDamage = 0;
i_this->m2E7C = 10;
J3DAnmTevRegKey* key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_UDEL);
J3DAnmTevRegKey* key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_UDEL_e);
hand[0]->mpBrkAnm->init(hand[0]->m02C8->getModelData(), key, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE);
J3DAnmTextureSRTKey* srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_UDEL);
J3DAnmTextureSRTKey* srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_UDEL_e);
hand[0]->mpBtkAnm->init(hand[0]->m02C8->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE);
key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_UDER);
key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_UDER_e);
hand[1]->mpBrkAnm->init(hand[1]->m02C8->getModelData(), key, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE);
srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_UDER);
srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_UDER_e);
hand[1]->mpBtkAnm->init(hand[1]->m02C8->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE);
key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_MUNE);
key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_MUNE_e);
boss->mpBrkAnm->init(boss->m02C8->getModelData(), key, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE);
srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_MUNE);
srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_MUNE_e);
boss->mpBtkAnm->init(boss->m02C8->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE);
i_this->mBombArrowDropTimer = 400;
i_this->m2FE0->setPlaySpeed(1.0f);
@@ -2003,29 +2003,29 @@ static void beam_move(bst_class* i_this) {
/* 00007CF0-0000815C .text end_brkbtk_set__FP9bst_class */
static void end_brkbtk_set(bst_class* i_this) {
J3DAnmTevRegKey* tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_LH_END);
J3DAnmTevRegKey* tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_LH_END_e);
hand[0]->mpTevRegAnimator->init(hand[0]->m02B8->getModel()->getModelData(), tev_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE);
J3DAnmTextureSRTKey* srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_LH_END);
J3DAnmTextureSRTKey* srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_LH_END_e);
hand[0]->mpTexMtxAnimator->init(hand[0]->m02B8->getModel()->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE);
tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_RH_END);
tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_RH_END_e);
hand[1]->mpTevRegAnimator->init(hand[1]->m02B8->getModel()->getModelData(), tev_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE);
srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_RH_END);
srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_RH_END_e);
hand[1]->mpTexMtxAnimator->init(hand[1]->m02B8->getModel()->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE);
tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_BST_END);
tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_BST_END_e);
boss->mpTevRegAnimator->init(boss->m02B8->getModel()->getModelData(), tev_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE);
srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_BST_END);
srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_BST_END_e);
boss->mpTexMtxAnimator->init(boss->m02B8->getModel()->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE);
tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_UDEL_END);
tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_UDEL_END_e);
hand[0]->mpBrkAnm->init(hand[0]->m02C8->getModelData(), tev_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE);
srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_UDEL_END);
srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_UDEL_END_e);
hand[0]->mpBtkAnm->init(hand[0]->m02C8->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE);
tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_UDER_END);
tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_UDER_END_e);
hand[1]->mpBrkAnm->init(hand[1]->m02C8->getModelData(), tev_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE);
srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_UDER_END);
srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_UDER_END_e);
hand[1]->mpBtkAnm->init(hand[1]->m02C8->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE);
tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_MUNE_END);
tev_key = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_MUNE_END_e);
boss->mpBrkAnm->init(boss->m02C8->getModelData(), tev_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE);
srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_MUNE_END);
srt_key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_MUNE_END_e);
boss->mpBtkAnm->init(boss->m02C8->getModelData(), srt_key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, FALSE);
}
@@ -2263,17 +2263,17 @@ void demo_camera(bst_class* i_this) {
i_this->m2EA0.x -= REG0_F(1) + 500.0f;
i_this->m2EA0.y += REG0_F(2) + 100.0f;
i_this->m2EC8 = REG0_F(4) + 75.0f;
pJVar7 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_UDEL);
pJVar7 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_UDEL_e);
hand[0]->mpBrkAnm->init(hand[0]->m02C8->getModelData(), pJVar7, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE);
pJVar8 = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_UDEL);
pJVar8 = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_UDEL_e);
hand[0]->mpBtkAnm->init(hand[0]->m02C8->getModelData(), pJVar8, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE);
pJVar7 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_UDER);
pJVar7 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_UDER_e);
hand[1]->mpBrkAnm->init(hand[1]->m02C8->getModelData(), pJVar7, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE);
pJVar8 = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_UDER);
pJVar8 = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_UDER_e);
hand[1]->mpBtkAnm->init(hand[1]->m02C8->getModelData(), pJVar8, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE);
pJVar7 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_MUNE);
pJVar7 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_MUNE_e);
boss->mpBrkAnm->init(boss->m02C8->getModelData(), pJVar7, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE);
pJVar8 = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_MUNE);
pJVar8 = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_MUNE_e);
boss->mpBtkAnm->init(boss->m02C8->getModelData(), pJVar8, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE);
i_this->mBombArrowDropTimer = 500;
}
@@ -2490,7 +2490,7 @@ void demo_camera(bst_class* i_this) {
break;
case 56:
if (i_this->msFrameCount == REG0_S(4) + 50) {
anm_init(i_this, BST_BCK_HANA_DEMO, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BST_BCK_HANA_DEMO_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
mDoAud_seStart(JA_SE_CM_BST_HAND_STRAIN, &actor->current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
#if VERSION > VERSION_DEMO
i_this->m2E98 = 1;
@@ -2817,10 +2817,10 @@ static BOOL daBst_Delete(bst_class* i_this) {
return TRUE;
}
static u16 set_btk_d[3] = {BST_BTK_BST_START, BST_BTK_LH_START, BST_BTK_RH_START};
static u16 set_brk_d[3] = {BST_BRK_BST_START, BST_BRK_LH_START, BST_BRK_RH_START};
static u16 set_za_btk_d[3] = {BST_BTK_MUNE_START, BST_BTK_UDEL_START, BST_BTK_UDER_START};
static u16 set_za_brk_d[3] = {BST_BRK_MUNE_START, BST_BRK_UDEL_START, BST_BRK_UDER_START};
static u16 set_btk_d[3] = {dRes_INDEX_BST_BTK_BST_START_e, dRes_INDEX_BST_BTK_LH_START_e, dRes_INDEX_BST_BTK_RH_START_e};
static u16 set_brk_d[3] = {dRes_INDEX_BST_BRK_BST_START_e, dRes_INDEX_BST_BRK_LH_START_e, dRes_INDEX_BST_BRK_RH_START_e};
static u16 set_za_btk_d[3] = {dRes_INDEX_BST_BTK_MUNE_START_e, dRes_INDEX_BST_BTK_UDEL_START_e, dRes_INDEX_BST_BTK_UDER_START_e};
static u16 set_za_brk_d[3] = {dRes_INDEX_BST_BRK_MUNE_START_e, dRes_INDEX_BST_BRK_UDEL_START_e, dRes_INDEX_BST_BRK_UDER_START_e};
/* 0000AADC-0000B2D0 .text useHeapInit__FP10fopAc_ac_c */
static BOOL useHeapInit(fopAc_ac_c* a_this) {
@@ -2883,14 +2883,14 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
}
J3DModelData* modelData;
if (i_this->mBstPartType == bst_class::Type_HEAD_e) {
modelData = (J3DModelData*)dComIfG_getObjectRes("Bst", BST_BDL_TAMA);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BDL_TAMA_e);
for (s32 i = 0; i < (s32)ARRAY_SIZE(i_this->m0390); i++) {
i_this->m0390[i] = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (i_this->m0390[i] == NULL) {
return FALSE;
}
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bst", BST_BDL_HBSITA1);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BDL_HBSITA1_e);
i_this->m2FD0 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (i_this->m2FD0 == NULL) {
return FALSE;
@@ -2899,7 +2899,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
if (i_this->m2FD4 == NULL) {
return FALSE;
}
res = i_this->m2FD4->init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_HBSITA1), TRUE, J3DFrameCtrl::EMode_LOOP);
res = i_this->m2FD4->init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BTK_HBSITA1_e), TRUE, J3DFrameCtrl::EMode_LOOP);
if (res == 0) {
return FALSE;
}
@@ -2908,12 +2908,12 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
res = i_this->m2FD8->init(
modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_HBSITA1), TRUE, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, false, FALSE
modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_HBSITA1_e), TRUE, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, false, FALSE
);
if (res == 0) {
return FALSE;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bst", BST_BDL_HBYOKO1);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BDL_HBYOKO1_e);
i_this->m2FDC = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (i_this->m2FDC == NULL) {
return FALSE;
@@ -2923,7 +2923,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
res = i_this->m2FE0->init(
modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", BST_BRK_HBYOKO1), TRUE, J3DFrameCtrl::EMode_LOOP, 0.0f, 0, -1, false, FALSE
modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", dRes_INDEX_BST_BRK_HBYOKO1_e), TRUE, J3DFrameCtrl::EMode_LOOP, 0.0f, 0, -1, false, FALSE
);
if (res == 0) {
return FALSE;
src/d/actor/d_a_btd.cpp
+71 -71
View File
@@ -13,7 +13,7 @@
#include "d/actor/d_a_kui.h"
#include "d/actor/d_a_btd.h"
#include "d/actor/d_a_ykgr.h"
#include "d/res/res_btd.h"
#include "res/Object/Btd.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_graphic.h"
#include "d/d_cc_d.h"
@@ -316,8 +316,8 @@ static void hahen_set2(btd_class* i_this) {
/* 00000C14-00000D84 .text hahen_set_s__FP9btd_classP4cXyzP5csXyz */
static void hahen_set_s(btd_class* i_this, cXyz* param_2, csXyz* param_3) {
fopAc_ac_c* actor = &i_this->actor;
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Always", ALWAYS_BDL_MPI_KOISHI));
J3DAnmTexPattern* anmTexPattern = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes("Always", ALWAYS_BTP_MPI_KOISHI));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BDL_MPI_KOISHI_e));
J3DAnmTexPattern* anmTexPattern = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTP_MPI_KOISHI_e));
JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_M_BTDMODELROCK00, param_2, param_3);
if (emitter != NULL) {
JGeometry::TVec3<f32> scale(4.0f, 4.0f, 4.0f);
@@ -387,7 +387,7 @@ static void startdemo(btd_class* i_this) {
break;
case 1:
i_this->mKankyoState = 8;
anm_init(i_this, BTD_BCK_SSTART, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_SSTART_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
actor->current.pos.y = actor->home.pos.y;
i_this->mGohmaState = 2;
fopAcM_monsSeStart(actor, JA_SE_CV_BTD_ENTER, 0);
@@ -481,16 +481,16 @@ static void damage_check(btd_class* i_this) {
i_this->mGohmaState = 10;
i_this->mTotalDamage = 0;
} else {
u32 anm = BTD_BCK_HIT_M;
u32 anm = dRes_INDEX_BTD_BCK_HIT_M_e;
if (atInfo.mResultingAttackType == 1) {
s16 angle = fopAcM_searchPlayerAngleY(actor);
angle = angle - actor->current.angle.y;
if ((angle > -0x100) && (angle < 0x100)) {
anm = BTD_BCK_HIT_M;
anm = dRes_INDEX_BTD_BCK_HIT_M_e;
} else if (angle > 0) {
anm = BTD_BCK_HIT_R;
anm = dRes_INDEX_BTD_BCK_HIT_R_e;
} else {
anm = BTD_BCK_HIT_L;
anm = dRes_INDEX_BTD_BCK_HIT_L_e;
}
}
anm_init(i_this, anm, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
@@ -571,7 +571,7 @@ static void damage(btd_class* i_this)
static s32 damage(btd_class* i_this)
#endif
{
static s32 hibi_brk[] = {BTD_BRK_HIBI01, BTD_BRK_HIBI02, BTD_BRK_HIBI03};
static s32 hibi_brk[] = {dRes_INDEX_BTD_BRK_HIBI01_e, dRes_INDEX_BTD_BRK_HIBI02_e, dRes_INDEX_BTD_BRK_HIBI03_e};
static u16 hibi_eff_name[] = {dPa_name::ID_AK_SN_BTDCRACKSHELL00, dPa_name::ID_AK_SN_BTDCRACKSHELL01, dPa_name::ID_AK_SN_BTDCRACKSHELL02};
static u16 hahen_eff_name[] = {
dPa_name::ID_AK_SN_BTDBREAKSHELLARML,
@@ -614,11 +614,11 @@ static s32 damage(btd_class* i_this)
#endif
switch (i_this->mGohmaState) {
case 0:
anm_init(i_this, BTD_BCK_DAMAGE1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_DAMAGE1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mGohmaState++;
case 1:
if (morf->isStop()) {
anm_init(i_this, BTD_BCK_DAMAGE2, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_DAMAGE2_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mStunTimer = l_HIO.m0C;
i_this->mGohmaState++;
}
@@ -632,12 +632,12 @@ static s32 damage(btd_class* i_this)
break;
case 3:
if (morf->isStop()) {
anm_init(i_this, BTD_BCK_DAMAGE2, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_DAMAGE2_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mGohmaState = 2;
}
break;
case 10:
anm_init(i_this, BTD_BCK_DAMAGE3, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_DAMAGE3_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mGohmaState++;
fopAcM_monsSeStart(actor, JA_SE_CV_BTD_AFT_DAMAGE, 0);
case 0xb:
@@ -648,13 +648,13 @@ static s32 damage(btd_class* i_this)
}
break;
case 0x14:
anm_init(i_this, BTD_BCK_SIZUMU1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_SIZUMU1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mGohmaState++;
i_this->m6E7C = 0.0f;
break;
case 0x15:
if (morf->isStop()) {
anm_init(i_this, BTD_BCK_SIZUMU2, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_SIZUMU2_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m02EC[0] = (REG0_S(7) + 0x14) * 5;
i_this->mGohmaState++;
@@ -691,7 +691,7 @@ static s32 damage(btd_class* i_this)
if (i_this->m6190 >= 3) {
i_this->mGohmaState = 0x28;
} else {
anm_init(i_this, BTD_BCK_SIZUMU3, 15.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_SIZUMU3_e, 15.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mGohmaState++;
static_center_pos.setall(0.0f);
mDoAud_seStart(JA_SE_CM_BTD_INTO_MAGMA_N, &static_center_pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
@@ -713,7 +713,7 @@ static s32 damage(btd_class* i_this)
case 0x1e:
i_this->m6E88 = 0;
if (i_this->m02EC[0] == 0) {
anm_init(i_this, BTD_BCK_MOTIAGE1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_MOTIAGE1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mGohmaState++;
i_this->m02F6 = 0;
mDoAud_seStart(JA_SE_CM_BTD_ENT_BLAST, &static_center_pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
@@ -731,7 +731,7 @@ static s32 damage(btd_class* i_this)
i_this->m6E7C = 0.0f;
}
if (morf->isStop()) {
anm_init(i_this, BTD_BCK_MOTIAGE2, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_MOTIAGE2_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mGohmaState++;
mDoAud_seStart(JA_SE_CM_BTD_LIFT_UP, &static_center_pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
i_this->m6E7C = 0.0f;
@@ -740,7 +740,7 @@ static s32 damage(btd_class* i_this)
case 0x20:
i_this->m6E88 = 0;
if (morf->isStop()) {
anm_init(i_this, BTD_BCK_MOTIAGE3, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_MOTIAGE3_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
dr2_class* tmp = (dr2_class*)dr2;
mDoAud_seStart(JA_SE_CM_BTD_JUMP_DOWN, &tmp->unk_4A8, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
dComIfGp_particle_set(dPa_name::ID_AK_SN_BTDSPLASHMAGMA00, &actor->current.pos, &actor->current.angle);
@@ -761,7 +761,7 @@ static s32 damage(btd_class* i_this)
}
break;
case 0x28:
anm_init(i_this, BTD_BCK_WARERU1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_WARERU1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mGohmaState++;
fopAcM_seStart(actor, JA_SE_CM_BTD_FALL_FWD, 0);
mDoAud_bgmStop(30);
@@ -817,7 +817,7 @@ static s32 damage(btd_class* i_this)
fopAcM_seStart(actor, JA_SE_CM_BTD_BRK_SHIELD_L, 0);
fopAcM_monsSeStart(actor, JA_SE_CV_BTD_AFT_DAMAGE, 0);
i_this->m02E0 = 1;
anm_init(i_this, BTD_BCK_WARERU2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_WARERU2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mGohmaState++;
}
break;
@@ -877,7 +877,7 @@ static void end(btd_class* i_this) {
mDoAud_bgmStop(30);
} else {
i_this->mGohmaState = 0x33;
anm_init(i_this, BTD_BCK_DEAD, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_DEAD_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m6E16 = 100;
i_this->m6E1A = 0;
i_this->m6E18 = 0;
@@ -885,13 +885,13 @@ static void end(btd_class* i_this) {
mDoAud_bgmStop(20);
mDoAud_bgmStreamPrepare(JA_STRM_BOSS_CLEAR);
model = morf->getModel();
J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Btd", BTD_BMT_DEADA);
J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BMT_DEADA_e);
model->getModelData()->setMaterialTable(bmt, J3DMatCopyFlag_Material);
i_this->brkS->init(
model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", BTD_BRK_DEADA), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0
model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BRK_DEADA_e), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0
);
i_this->btkS->init(
model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", BTD_BTK_DEADA), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0
model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BTK_DEADA_e), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0
);
wave_set(i_this);
}
@@ -950,11 +950,11 @@ static void end(btd_class* i_this) {
if (i_this->m02EC[0] == 0xf1) {
model = morf->getModel();
i_this->brkS->init(
model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", BTD_BRK_DEADB), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0
model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BRK_DEADB_e), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0
);
i_this->btkS->init(
model->getModelData(),
(J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", BTD_BTK_DEADB),
(J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BTK_DEADB_e),
true,
J3DFrameCtrl::EMode_NONE,
1.0f,
@@ -1085,7 +1085,7 @@ static void wait(btd_class* i_this) {
}
switch (i_this->mGohmaState) {
case 0:
anm_init(i_this, BTD_BCK_WAIT1, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_WAIT1_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mGohmaState++;
case 1:
if ((uVar5 < 0x1800) && (i_this->m02EC[0] == 0)) {
@@ -1133,7 +1133,7 @@ static void wait(btd_class* i_this) {
i_this->m5E94 = 0x100;
if ((uVar5 >= 0x6000) && (i_this->m02EC[1] == 0)) {
i_this->mGohmaState = 2;
anm_init(i_this, BTD_BCK_KYORO, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_KYORO_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m02EC[0] = 0x96;
} else if (bVar8) {
if ((kui != NULL) && (kui->health == 3)) {
@@ -1152,7 +1152,7 @@ static void wait(btd_class* i_this) {
}
break;
case 10:
anm_init(i_this, BTD_BCK_UEMUKI_WAIT, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_UEMUKI_WAIT_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mGohmaState++;
i_this->m02EC[0] = 300;
i_this->m02EC[1] = (s16)(cM_rndF(80.0f) + 90.0f);
@@ -1175,7 +1175,7 @@ static void wait(btd_class* i_this) {
}
break;
case 0x14:
anm_init(i_this, BTD_BCK_YOKO_WAIT, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_YOKO_WAIT_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mGohmaState++;
i_this->m02EC[0] = 0x96;
case 0x15:
@@ -1192,7 +1192,7 @@ static void wait(btd_class* i_this) {
}
}
static s32 jab_bck[] = {BTD_BCK_RJAB1, BTD_BCK_RJAB2, BTD_BCK_RJAB3, 0, 0, BTD_BCK_LJAB1, BTD_BCK_LJAB2, BTD_BCK_LJAB3};
static s32 jab_bck[] = {dRes_INDEX_BTD_BCK_RJAB1_e, dRes_INDEX_BTD_BCK_RJAB2_e, dRes_INDEX_BTD_BCK_RJAB3_e, 0, 0, dRes_INDEX_BTD_BCK_LJAB1_e, dRes_INDEX_BTD_BCK_LJAB2_e, dRes_INDEX_BTD_BCK_LJAB3_e};
/* 00003BCC-00003E64 .text jab_attack__FP9btd_class */
static void jab_attack(btd_class* i_this) {
@@ -1238,16 +1238,16 @@ static void jab_attack(btd_class* i_this) {
}
static s32 punch_bck[] = {
BTD_BCK_RATTACK1,
BTD_BCK_RATTACK2,
BTD_BCK_RATTACK3,
BTD_BCK_RATTACK4,
BTD_BCK_RATTACK5,
BTD_BCK_LATTACK1,
BTD_BCK_LATTACK2,
BTD_BCK_LATTACK3,
BTD_BCK_LATTACK4,
BTD_BCK_LATTACK5
dRes_INDEX_BTD_BCK_RATTACK1_e,
dRes_INDEX_BTD_BCK_RATTACK2_e,
dRes_INDEX_BTD_BCK_RATTACK3_e,
dRes_INDEX_BTD_BCK_RATTACK4_e,
dRes_INDEX_BTD_BCK_RATTACK5_e,
dRes_INDEX_BTD_BCK_LATTACK1_e,
dRes_INDEX_BTD_BCK_LATTACK2_e,
dRes_INDEX_BTD_BCK_LATTACK3_e,
dRes_INDEX_BTD_BCK_LATTACK4_e,
dRes_INDEX_BTD_BCK_LATTACK5_e
};
/* 00003E64-00004418 .text punch_attack__FP9btd_class */
@@ -1423,7 +1423,7 @@ static void fire_attack(btd_class* i_this) {
i_this->m5E86 = 2;
switch (i_this->mGohmaState) {
case 0:
anm_init(i_this, BTD_BCK_FATTACK1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_FATTACK1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mGohmaState++;
i_this->m02EC[0] = 0x28;
i_this->m6E7C = 0.0f;
@@ -1436,7 +1436,7 @@ static void fire_attack(btd_class* i_this) {
fopAcM_monsSeStart(actor, JA_SE_CV_BTD_BEF_FIRE, 0);
}
if (morf->isStop()) {
anm_init(i_this, BTD_BCK_FATTACK2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_FATTACK2_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mGohmaState++;
}
break;
@@ -1444,10 +1444,10 @@ static void fire_attack(btd_class* i_this) {
if (morf->isStop()) {
if (i_this->m02E0 != 0) {
i_this->mGohmaState = 6;
anm_init(i_this, BTD_BCK_HASAMI_ATTACK, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_HASAMI_ATTACK_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
fopAcM_monsSeStart(actor, JA_SE_CM_MAGTAIL_ATTACK, 0);
} else {
anm_init(i_this, BTD_BCK_FATTACK3, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_FATTACK3_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m02EC[0] = l_HIO.m2C * 9;
i_this->mGohmaState = 3;
}
@@ -1462,11 +1462,11 @@ static void fire_attack(btd_class* i_this) {
i_this->m6028[0] = REG0_S(6) + 0x14;
if (i_this->m02EC[0] == 0) {
if (i_this->m02E0 != 0) {
anm_init(i_this, BTD_BCK_HASAMI_ATTACK, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_HASAMI_ATTACK_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mGohmaState = 5;
fopAcM_monsSeStart(actor, JA_SE_CM_MAGTAIL_ATTACK, 0);
} else {
anm_init(i_this, BTD_BCK_FATTACK4, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_FATTACK4_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mGohmaState++;
i_this->m02EC[0] = REG0_S(3) + 0x19;
mDoAud_seStart(JA_SE_CM_BTD_WIND_BEF_FIRE, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
@@ -1508,7 +1508,7 @@ static void fire_attack(btd_class* i_this) {
case 5:
i_this->m5E84 = 3;
if (morf->isStop()) {
anm_init(i_this, BTD_BCK_FATTACK4, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_FATTACK4_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mGohmaState = 4;
i_this->m02EC[0] = REG0_S(3) + 0x19;
mDoAud_seStart(JA_SE_CM_BTD_WIND_BEF_FIRE, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
@@ -1517,7 +1517,7 @@ static void fire_attack(btd_class* i_this) {
case 6:
i_this->m5E84 = 3;
if (morf->isStop()) {
anm_init(i_this, BTD_BCK_FATTACK3, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_FATTACK3_e, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m02EC[0] = (s16)(l_HIO.m2C << 2);
i_this->mGohmaState = 3;
}
@@ -1538,13 +1538,13 @@ static void up_fire_attack(btd_class* i_this) {
i_this->m5E86 = 3;
switch (i_this->mGohmaState) {
case 0:
anm_init(i_this, BTD_BCK_UE_KAEN1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_UE_KAEN1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mGohmaState++;
i_this->m02EC[0] = 0x28;
break;
case 1:
if (morf->isStop()) {
anm_init(i_this, BTD_BCK_UE_KAEN2, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_UE_KAEN2_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m02EC[0] = l_HIO.m2C * 9;
i_this->mGohmaState++;
}
@@ -1555,7 +1555,7 @@ static void up_fire_attack(btd_class* i_this) {
i_this->m6028[1] = 1;
i_this->m6028[0] = REG0_S(6) + 0x14;
if (i_this->m02EC[0] == 0) {
anm_init(i_this, BTD_BCK_UE_KAEN3, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_UE_KAEN3_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mGohmaState++;
i_this->m02EC[0] = REG0_S(3) + 0x19;
mDoAud_seStart(JA_SE_CM_BTD_WIND_BEF_FIRE, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
@@ -1608,13 +1608,13 @@ static void yoko_fire_attack(btd_class* i_this) {
i_this->m5E86 = 1;
switch (i_this->mGohmaState) {
case 0:
anm_init(i_this, BTD_BCK_YOKO_KAEN1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_YOKO_KAEN1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mGohmaState++;
i_this->m02EC[0] = 0x28;
break;
case 1:
if (morf->isStop()) {
anm_init(i_this, BTD_BCK_YOKO_KAEN2, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_YOKO_KAEN2_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m02EC[0] = l_HIO.m2C * 7;
i_this->mGohmaState++;
}
@@ -1625,7 +1625,7 @@ static void yoko_fire_attack(btd_class* i_this) {
i_this->m6028[1] = 1;
i_this->m6028[0] = REG0_S(6) + 0x14;
if (i_this->m02EC[0] == 0) {
anm_init(i_this, BTD_BCK_YOKO_KAEN3, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BTD_BCK_YOKO_KAEN3_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mGohmaState++;
i_this->m02EC[0] = REG0_S(3) + 0x19;
mDoAud_seStart(JA_SE_CM_BTD_WIND_BEF_FIRE, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
@@ -2620,10 +2620,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
btd_class* i_this = (btd_class*)a_this;
i_this->mpPhase1Morf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Btd", BTD_BMD_BTD),
(J3DModelData*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BMD_BTD_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Btd", BTD_BCK_WAIT1),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BCK_WAIT1_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
@@ -2645,7 +2645,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
pModel = i_this->mpPhase1Morf->getModel();
i_this->btk = new mDoExt_btkAnm();
JUT_ASSERT(DEMO_SELECT(5327, 5370), i_this->btk);
pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", BTD_BTK_BTD);
pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BTK_BTD_e);
#if VERSION == VERSION_DEMO
i_this->btk->init(pModel->getModelData(), pBtk, true, J3DFrameCtrl::EMode_LOOP);
#else
@@ -2655,7 +2655,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
#endif
i_this->brk = new mDoExt_brkAnm();
JUT_ASSERT(DEMO_SELECT(5337, 5390), i_this->brk);
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", BTD_BRK_BTD);
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BRK_BTD_e);
#if VERSION == VERSION_DEMO
i_this->brk->init(pModel->getModelData(), pBrk, true, J3DFrameCtrl::EMode_LOOP);
#else
@@ -2664,10 +2664,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
}
#endif
i_this->mpPhase2Morf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Btd", BTD_BMD_SOTAI),
(J3DModelData*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BMD_SOTAI_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Btd", BTD_BCK_WAIT1),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BCK_WAIT1_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
@@ -2689,7 +2689,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
pModel = i_this->mpPhase2Morf->getModel();
i_this->btkS = new mDoExt_btkAnm();
JUT_ASSERT(DEMO_SELECT(5370, 5432), i_this->btkS);
pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", BTD_BTK_DEADA);
pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BTK_DEADA_e);
#if VERSION == VERSION_DEMO
i_this->btkS->init(pModel->getModelData(), pBtk, true, J3DFrameCtrl::EMode_NONE);
#else
@@ -2697,11 +2697,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
#endif
pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", BTD_BTK_SOTAI);
pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BTK_SOTAI_e);
i_this->btkS->init(pModel->getModelData(), pBtk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, 0);
i_this->brkS = new mDoExt_brkAnm();
JUT_ASSERT(DEMO_SELECT(5390, 5463), i_this->brkS);
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", BTD_BRK_DEADA);
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BRK_DEADA_e);
#if VERSION == VERSION_DEMO
i_this->brkS->init(pModel->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE);
#else
@@ -2709,10 +2709,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
#endif
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", BTD_BRK_SOTAI);
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BRK_SOTAI_e);
i_this->brkS->init(pModel->getModelData(), pBrk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, 0);
i_this->mpDeadHeadMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Btd", BTD_BMD_NAMAKUBI), NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203
(J3DModelData*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BMD_NAMAKUBI_e), NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203
);
if ((i_this->mpDeadHeadMorf == NULL) || (i_this->mpDeadHeadMorf->getModel() == NULL)) {
return FALSE;
@@ -2722,7 +2722,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
if (i_this->mpDeadHeadBtkAnm == NULL) {
return FALSE;
}
pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", BTD_BTK_NAMAKUBI);
pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BTK_NAMAKUBI_e);
if (!i_this->mpDeadHeadBtkAnm->init(pModel->getModelData(), pBtk, true, J3DFrameCtrl::EMode_NONE)) {
return FALSE;
}
@@ -2730,12 +2730,12 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
if (i_this->mpDeadHeadBrkAnm == NULL) {
return FALSE;
}
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", BTD_BRK_NAMAKUBI);
pBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BRK_NAMAKUBI_e);
if (!i_this->mpDeadHeadBrkAnm->init(pModel->getModelData(), pBrk, true, J3DFrameCtrl::EMode_NONE)) {
return FALSE;
}
modelDataA = (J3DModelData*)dComIfG_getObjectRes("Btd", BTD_BMD_HAHENA);
modelDataB = (J3DModelData*)dComIfG_getObjectRes("Btd", BTD_BMD_KAMENA);
modelDataA = (J3DModelData*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BMD_HAHENA_e);
modelDataB = (J3DModelData*)dComIfG_getObjectRes("Btd", dRes_INDEX_BTD_BMD_KAMENA_e);
JUT_ASSERT(DEMO_SELECT(5460, 5544), modelDataA && modelDataB);
for (s32 i = 0; i < ARRAY_SSIZE(i_this->hahen); i++) {
if (i < 5) {
src/d/actor/d_a_bwd.cpp
+40 -40
View File
@@ -13,7 +13,7 @@
#include "d/d_s_play.h"
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_snap.h"
#include "d/res/res_bwd.h"
#include "res/Object/Bwd.h"
#include "f_op/f_op_camera.h"
#include "m_Do/m_Do_graphic.h"
#include "JSystem/JUtility/JUTReport.h"
@@ -439,7 +439,7 @@ void wait(bwd_class* i_this) {
i_this->m18B0++;
case 1:
if (i_this->m18CC[0] == 0) {
anm_init(i_this, BWD_BCK_BWD_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_WAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m18B0++;
mDoAud_seStart(JA_SE_CM_BWD_OUT_SAND_2, &i_this->m3954, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
} else {
@@ -512,7 +512,7 @@ void sita_hit(bwd_class* i_this) {
i_this->m17C4 = 200;
switch (i_this->m18B0) {
case 0:
anm_init(i_this, BWD_BCK_BWD_NUKARERU, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_NUKARERU_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m18B0++;
i_this->m1BAC = 1.0f;
// fallthrough
@@ -520,7 +520,7 @@ void sita_hit(bwd_class* i_this) {
if (!i_this->mpHeadMorf->isStop()) {
break;
}
anm_init(i_this, BWD_BCK_BWD_NUKARERU_LOOP, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_NUKARERU_LOOP_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m18B0++;
break;
case 2:
@@ -558,7 +558,7 @@ void sita_hit(bwd_class* i_this) {
#if VERSION > VERSION_DEMO
dScnPly_ply_c::setPauseTimer(4);
#endif
anm_init(i_this, BWD_BCK_BWD_DAMAGE1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_DAMAGE1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m18B0++;
i_this->m1BB1 = 0;
i_this->m1BB4 = 0;
@@ -569,7 +569,7 @@ void sita_hit(bwd_class* i_this) {
if (!i_this->mpHeadMorf->isStop()) {
break;
}
anm_init(i_this, BWD_BCK_BWD_DAMAGE2, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_DAMAGE2_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m18B0++;
i_this->m18CC[0] = 300;
i_this->m3954.x = actor->current.pos.x;
@@ -681,7 +681,7 @@ void eat_attack(bwd_class* i_this) {
bVar2 = false;
switch (i_this->m18B0) {
case 0:
anm_init(i_this, BWD_BCK_BWD_ATTACK, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_ATTACK_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m18B0++;
i_this->m3954.x = actor->current.pos.x;
i_this->m3954.z = actor->current.pos.z;
@@ -711,7 +711,7 @@ void eat_attack(bwd_class* i_this) {
}
}
if (bVar2) {
anm_init(i_this, BWD_BCK_BWD_ATTACK_EAT, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_ATTACK_EAT_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m18B0 = 5;
i_this->m18CC[0] = 0x96;
i_this->m3C1E++;
@@ -731,7 +731,7 @@ void eat_attack(bwd_class* i_this) {
mDoAud_seStart(JA_SE_CM_BWD_MOUTH_CLOSE_2, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
} else {
if (i_this->mpHeadMorf->isStop()) {
anm_init(i_this, BWD_BCK_BWD_ATTACK_SHIPPAI, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_ATTACK_SHIPPAI_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
mDoAud_seStart(JA_SE_CM_BWD_MOUTH_CLOSE_2, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
i_this->m18B0++;
}
@@ -813,7 +813,7 @@ void fly(bwd_class* i_this) {
switch (i_this->m18B0) {
case 0:
if (i_this->m18CC[1] == 0) {
anm_init(i_this, BWD_BCK_BWD_FLY, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_FLY_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m18B0 = 1;
i_this->m18B4.x = actor->current.pos.x;
i_this->m18B4.y = l_HIO.m28 + (cM_rndFX(800.0f) + 2000.0f);
@@ -859,14 +859,14 @@ void fly(bwd_class* i_this) {
if (i_this->m18CC[1] == 0) {
i_this->m18B0 = 2;
i_this->m18CC[0] = 0x96;
anm_init(i_this, BWD_BCK_BWD_JATTACK1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_JATTACK1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
mDoAud_seStart(JA_SE_CV_BWD_GO_UNDER_G, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
}
break;
case 2:
mDoAud_seStart(JA_SE_CM_BWD_FLYING, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
if (i_this->mpHeadMorf->isStop()) {
anm_init(i_this, BWD_BCK_BWD_JATTACK2, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_JATTACK2_e, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
i_this->m18B4 = player->eyePos;
local_48 = i_this->m18B4 - actor->current.pos;
@@ -874,7 +874,7 @@ void fly(bwd_class* i_this) {
i_this->m18B0 = 3;
i_this->m18B4.y -= 10000.0f;
i_this->m18CC[0] = 200;
anm_init(i_this, BWD_BCK_BWD_JATTACK3, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_JATTACK3_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
}
cLib_addCalc2(&i_this->m18C4, REG0_F(15) + 800.0f, 1.0f, 10.0f);
break;
@@ -912,7 +912,7 @@ void s_fly(bwd_class* i_this) {
switch (i_this->m18B0) {
case 0:
if (i_this->m18CC[1] == 0) {
anm_init(i_this, BWD_BCK_BWD_FLY, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_FLY_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m18B0 = 1;
i_this->m18B4.x = 0.0f;
i_this->m18B4.y = l_HIO.m28 + 3000.0f;
@@ -949,7 +949,7 @@ void s_fly(bwd_class* i_this) {
if (i_this->m3C24 == 3) {
i_this->m18B0 = 2;
i_this->m18CC[0] = 0x96;
anm_init(i_this, BWD_BCK_BWD_JATTACK1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_JATTACK1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
mDoAud_seStart(JA_SE_CV_BWD_GO_UNDER_G, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
} else {
i_this->m18B4.x = target_x[i_this->m3C24];
@@ -965,7 +965,7 @@ void s_fly(bwd_class* i_this) {
case 2:
mDoAud_seStart(JA_SE_CM_BWD_FLYING, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
if (i_this->mpHeadMorf->isStop()) {
anm_init(i_this, BWD_BCK_BWD_JATTACK2, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_JATTACK2_e, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
i_this->m18B4.x = 0.0f;
i_this->m18B4.y = 800.0f;
@@ -975,7 +975,7 @@ void s_fly(bwd_class* i_this) {
i_this->m18B0 = 3;
i_this->m18B4.y -= 10000.0f;
i_this->m18CC[0] = 200;
anm_init(i_this, BWD_BCK_BWD_JATTACK3, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_JATTACK3_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
}
cLib_addCalc2(&i_this->m18C4, REG0_F(15) + 800.0f, 1.0f, 10.0f);
break;
@@ -1033,7 +1033,7 @@ void end(bwd_class* i_this) {
#if VERSION != VERSION_DEMO && VERSION != VERSION_USA
mDoAud_bgmStreamPrepare(JA_STRM_BWD_CLEAR);
#endif
anm_init(i_this, BWD_BCK_BWD_DEAD1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_DEAD1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m18B0 = 1;
i_this->m3C1E = 100;
actor->current.angle.y = 0;
@@ -1073,7 +1073,7 @@ void end(bwd_class* i_this) {
#if VERSION == VERSION_USA
mDoAud_bgmStreamPrepare(JA_STRM_BWD_CLEAR);
#endif
anm_init(i_this, BWD_BCK_BWD_DEAD2, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_DEAD2_e, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
actor->current.pos.y = -2000.0f;
for (int i = 0; i < ARRAY_SSIZE(i_this->m0508); i++) {
i_this->m0508[i] = actor->current.pos;
@@ -1125,7 +1125,7 @@ void end(bwd_class* i_this) {
case 23:
i_this->m1BB6 = 2;
if (i_this->m18CC[0] == 0x14) {
anm_init(i_this, BWD_BCK_BWD_DEAD3, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWD_BCK_BWD_DEAD3_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m02C8 = 1.0f;
}
if (((i_this->m18CC[0] == 0) && ((i_this->m18AC & 3) == 0)) && (i_this->m0414 < 0x14)) {
@@ -2077,13 +2077,13 @@ static BOOL daBwd_Execute(bwd_class* i_this) {
}
}
if (i_this->m17E6[i] == 0xb4) {
pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bwd", BWD_BTK_TAKI_WAIT);
pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BTK_TAKI_WAIT_e);
i_this->m17F4[i]->init(i_this->m17EC[i]->getModelData(), pBtk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, 0);
i_this->m17E4[i] = 3;
}
break;
case 4:
pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bwd", BWD_BTK_TAKI_END);
pBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BTK_TAKI_END_e);
if (i_this->m17F4[i]->init(i_this->m17EC[i]->getModelData(), pBtk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0) == 1) {
i_this->m17E4[i] = 5;
i_this->m17E6[i] = 0;
@@ -2233,20 +2233,20 @@ static BOOL daBwd_Delete(bwd_class* i_this) {
/* 00008E0C-000096D8 .text useHeapInit__FP10fopAc_ac_c */
static BOOL useHeapInit(fopAc_ac_c* a_this) {
static int taki_bdl[] = {BWD_BDL_HTAKI1, BWD_BDL_HTAKI2};
static int s_bdl[] = {BWD_BDL_GSP00, BWD_BDL_GSP01};
static int s_btk[] = {BWD_BTK_GSP00, BWD_BTK_GSP01};
static int s_brk[] = {BWD_BRK_GSP00, BWD_BRK_GSP01};
static int s_bck[] = {BWD_BCK_GSP00, BWD_BCK_GSP01};
static int taki_bdl[] = {dRes_INDEX_BWD_BDL_HTAKI1_e, dRes_INDEX_BWD_BDL_HTAKI2_e};
static int s_bdl[] = {dRes_INDEX_BWD_BDL_GSP00_e, dRes_INDEX_BWD_BDL_GSP01_e};
static int s_btk[] = {dRes_INDEX_BWD_BTK_GSP00_e, dRes_INDEX_BWD_BTK_GSP01_e};
static int s_brk[] = {dRes_INDEX_BWD_BRK_GSP00_e, dRes_INDEX_BWD_BRK_GSP01_e};
static int s_bck[] = {dRes_INDEX_BWD_BCK_GSP00_e, dRes_INDEX_BWD_BCK_GSP01_e};
bwd_class* i_this = (bwd_class*)a_this;
J3DModelData* modelData;
u16 fileIndex;
i_this->mpHeadMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Bwd", BWD_BDL_BWD),
(J3DModelData*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BDL_BWD_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bwd", BWD_BCK_BWD_WAIT),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BCK_BWD_WAIT_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
@@ -2266,7 +2266,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
i_this->mpHeadBrkAnm = new mDoExt_brkAnm();
if (!i_this->mpHeadBrkAnm->init(
i_this->mpHeadMorf->getModel()->getModelData(),
(J3DAnmTevRegKey*)dComIfG_getObjectRes("Bwd", BWD_BRK_BWD),
(J3DAnmTevRegKey*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BRK_BWD_e),
true,
J3DFrameCtrl::EMode_NONE,
1.0f,
@@ -2278,22 +2278,22 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
{
return FALSE;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", BWD_BDL_BERO);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BDL_BERO_e);
for (int i = 0; i < 30; i++) {
if (i == 29) {
modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", BWD_BDL_BERO_SAKI);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BDL_BERO_SAKI_e);
}
i_this->mTongueSegments[i].m00 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (i_this->mTongueSegments[i].m00 == 0) {
return FALSE;
}
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", BWD_BDL_BWD_SHIPPOA);
fileIndex = BWD_BRK_BWD_SHIPPOA;
modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BDL_BWD_SHIPPOA_e);
fileIndex = dRes_INDEX_BWD_BRK_BWD_SHIPPOA_e;
for (int i = 0; i < 20; i++) {
if (i == 0x13) {
modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", BWD_BDL_BWD_SHIPPOB);
fileIndex = BWD_BRK_BWD_SHIPPOB;
modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BDL_BWD_SHIPPOB_e);
fileIndex = dRes_INDEX_BWD_BRK_BWD_SHIPPOB_e;
}
i_this->mpBodyModel[i] = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (i_this->mpBodyModel[i] == 0) {
@@ -2308,7 +2308,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", BWD_BDL_HTRYF1);
modelData = (J3DModelData*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BDL_HTRYF1_e);
JUT_ASSERT(VERSION_SELECT(4466, 4524, 4548, 4548), modelData != NULL);
i_this->mpTriforcePlatformModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (i_this->mpTriforcePlatformModel == NULL) {
@@ -2318,7 +2318,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
if (i_this->mpBgW2 == NULL) {
return FALSE;
}
if (i_this->mpBgW2->Set((cBgD_t*)dComIfG_getObjectRes("Bwd", BWD_DZB_HTRYF1), dBgW::MOVE_BG_e, &i_this->mBgwMtx2) == 1) {
if (i_this->mpBgW2->Set((cBgD_t*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_DZB_HTRYF1_e), dBgW::MOVE_BG_e, &i_this->mBgwMtx2) == 1) {
return FALSE;
}
i_this->mpBgW2->SetCrrFunc(dBgS_MoveBGProc_Typical);
@@ -2327,7 +2327,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
if (i_this->mpBgW1[i] == 0) {
return FALSE;
}
if (i_this->mpBgW1[i]->Set((cBgD_t*)dComIfG_getObjectRes("Bwd", BWD_DZB_HTAKI1), dBgW::MOVE_BG_e, &i_this->mBgwMtx1[i]) == 1) {
if (i_this->mpBgW1[i]->Set((cBgD_t*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_DZB_HTAKI1_e), dBgW::MOVE_BG_e, &i_this->mBgwMtx1[i]) == 1) {
return FALSE;
}
i_this->mpBgW1[i]->SetCrrFunc(dBgS_MoveBGProc_Typical);
@@ -2341,7 +2341,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
if (i_this->m17F4[i] == 0) {
return FALSE;
}
if (!i_this->m17F4[i]->init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bwd", BWD_BTK_TAKI_START), true, J3DFrameCtrl::EMode_NONE)) {
if (!i_this->m17F4[i]->init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bwd", dRes_INDEX_BWD_BTK_TAKI_START_e), true, J3DFrameCtrl::EMode_NONE)) {
return FALSE;
}
}
src/d/actor/d_a_bwdg.cpp
+3 -3
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_bwdg.h"
#include "d/res/res_bwdg.h"
#include "res/Object/Bwdg.h"
#include "d/d_bg_w_hf.h"
#include "d/d_com_inf_game.h"
#include "d/actor/d_a_bwd.h"
@@ -207,8 +207,8 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
}
if (!i_this->mpBgW->Set(
(cBgD_t*)dComIfG_getObjectRes("Bwdg", BWDG_DZB_HSAND1),
(u16*)dComIfG_getObjectRes("Bwdg", BWDG_DAT_GRIDIDX),
(cBgD_t*)dComIfG_getObjectRes("Bwdg", dRes_INDEX_BWDG_DZB_HSAND1_e),
(u16*)dComIfG_getObjectRes("Bwdg", dRes_INDEX_BWDG_DAT_GRIDIDX_e),
130.0f, 0x40, 0x40, 0
)) {
return TRUE;
src/d/actor/d_a_bwds.cpp
+32 -32
View File
@@ -10,8 +10,8 @@
#include "d/d_cc_d.h"
#include "d/d_s_play.h"
#include "m_Do/m_Do_mtx.h"
#include "d/res/res_bwds.h"
#include "d/res/res_bwd.h"
#include "res/Object/Bwds.h"
#include "res/Object/Bwd.h"
#include "d/actor/d_a_player.h"
enum ActionStatus {
@@ -231,7 +231,7 @@ static void ug_move(bwds_class* i_this) {
s16 sVar5 = 0;
switch (i_this->m02F8) {
case -10:
anm_init(i_this, BWDS_BCK_KOBOSS_PAKUPAKU, 2.0f, 2, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_PAKUPAKU_e, 2.0f, 2, 1.0f, -1);
i_this->m02F8 = 3;
i_this->m030C = REG0_F(3) + 3000.0f;
actor->speedF = l_HIO.m010;
@@ -253,7 +253,7 @@ static void ug_move(bwds_class* i_this) {
fopAcM_seStart(actor, JA_SE_CV_BWD_C_ATTACK, 0);
break;
case 0:
anm_init(i_this, BWDS_BCK_KOBOSS_CLOSE, 2.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_CLOSE_e, 2.0f, 0, 1.0f, -1);
actor->current.pos.y = i_this->m0504;
i_this->m02F8++;
actor->shape_angle.z = 0;
@@ -276,7 +276,7 @@ static void ug_move(bwds_class* i_this) {
sVar5 = fVar1 * cM_ssin(i_this->m02F4 * (REG0_S(3) + 0x514));
if (fVar8 < 600.0f + REG0_F(12)) {
anm_init(i_this, BWDS_BCK_KOBOSS_PAKUPAKU, 2.0f, 2, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_PAKUPAKU_e, 2.0f, 2, 1.0f, -1);
i_this->m02F8++;
actor->speedF = l_HIO.m010;
actor->speed.y = REG0_F(13) + 50.0f;
@@ -375,7 +375,7 @@ static void hook_on(bwds_class* i_this) {
i_this->m031E = 3;
switch (i_this->m02F8) {
case 0:
anm_init(i_this, BWDS_BCK_KOBOSS_CLOSE, 2.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_CLOSE_e, 2.0f, 0, 1.0f, -1);
i_this->m02F8++;
local_34 = player->eyePos - actor->eyePos;
@@ -398,7 +398,7 @@ static void hook_chance(bwds_class* i_this) {
i_this->m0670[0].OnCoSetBit();
switch (i_this->m02F8) {
case 0:
anm_init(i_this, BWDS_BCK_KOBOSS_PAKUPAKU, 2.0f, 2, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_PAKUPAKU_e, 2.0f, 2, 1.0f, -1);
i_this->m02F8++;
i_this->m0314[0] = l_HIO.m014;
// FALL-THROUGH
@@ -419,9 +419,9 @@ static void hook_chance(bwds_class* i_this) {
i_this->m0502 = cM_rndFX(REG0_F(5) + 2500.0f);
if (cM_rndF(1.0f) < 0.5f) {
if (cM_rndF(1.0f) < 0.5f) {
anm_init(i_this, BWDS_BCK_KOBOSS_CLOSE, 5.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_CLOSE_e, 5.0f, 0, 1.0f, -1);
} else {
anm_init(i_this, BWDS_BCK_KOBOSS_PAKUPAKU, 5.0f, 2, 1.0f, -1);
anm_init(i_this, dRes_INDEX_BWDS_BCK_KOBOSS_PAKUPAKU_e, 5.0f, 2, 1.0f, -1);
}
}
}
@@ -832,48 +832,48 @@ static BOOL daBwds_Delete(bwds_class* i_this) {
return TRUE;
}
static u16 body_bdl[] = {
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_BODY,
BWDS_BDL_KOBOSS_SHIPPO,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_BODY_e,
dRes_INDEX_BWDS_BDL_KOBOSS_SHIPPO_e,
};
/* 00003278-00003634 .text useHeapInit__FP10fopAc_ac_c */
static BOOL useHeapInit(fopAc_ac_c* i_actor) {
static u32 s_bdl[] = {
BWD_BDL_GSP00,
BWD_BDL_GSP01,
dRes_INDEX_BWD_BDL_GSP00_e,
dRes_INDEX_BWD_BDL_GSP01_e,
};
static u32 s_btk[] = {
BWD_BTK_GSP00,
BWD_BTK_GSP01,
dRes_INDEX_BWD_BTK_GSP00_e,
dRes_INDEX_BWD_BTK_GSP01_e,
};
static u32 s_brk[] = {
BWD_BRK_GSP00,
BWD_BRK_GSP01,
dRes_INDEX_BWD_BRK_GSP00_e,
dRes_INDEX_BWD_BRK_GSP01_e,
};
static u32 s_bck[] = {
BWD_BCK_GSP00,
BWD_BCK_GSP01,
dRes_INDEX_BWD_BCK_GSP00_e,
dRes_INDEX_BWD_BCK_GSP01_e,
};
J3DModelData* modelData;
J3DModel* model;
bwds_class* i_this = (bwds_class*)i_actor;
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Bwds", BWDS_BDL_KOBOSS_HEAD),
(J3DModelData*)dComIfG_getObjectRes("Bwds", dRes_INDEX_BWDS_BDL_KOBOSS_HEAD_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bwds", BWDS_BCK_KOBOSS_CLOSE),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Bwds", dRes_INDEX_BWDS_BCK_KOBOSS_CLOSE_e),
J3DFrameCtrl::EMode_NONE,
1.0f,
0,
src/d/actor/d_a_canon.cpp
+11 -11
View File
@@ -9,7 +9,7 @@
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_bomb.h"
#include "d/actor/d_a_sea.h"
#include "d/res/res_bomber.h"
#include "res/Object/Bomber.h"
#include "m_Do/m_Do_ext.h"
#include "d/d_2dnumber.h"
#include "d/d_kankyo.h"
@@ -496,7 +496,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* a_this) {
/* 00001A38-00001E04 .text CreateHeap__9daCanon_cFv */
BOOL daCanon_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, BOMBER_INDEX_BDL_VCANK);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_BOMBER_BDL_VCANK_e);
JUT_ASSERT(823, modelData != NULL);
mpModel1 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
@@ -504,7 +504,7 @@ BOOL daCanon_c::CreateHeap() {
return FALSE;
}
J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes(M_arcname, BOMBER_INDEX_BMD_AISI);
J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_BOMBER_BMD_AISI_e);
JUT_ASSERT(831, modelData2 != NULL);
s8 cVar10 = modelData->getJointName()->getIndex("canon");
@@ -515,8 +515,8 @@ BOOL daCanon_c::CreateHeap() {
return FALSE;
}
ResTIMG* pRVar3 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_BOMB_01);
ResTIMG* pRVar4 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_BOMB_02);
ResTIMG* pRVar3 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_BOMB_01_e);
ResTIMG* pRVar4 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_BOMB_02_e);
for (s32 i = 0; i < ARRAY_SSIZE(m584); i++) {
m584[i] = new dDlst_2DObject_c();
@@ -529,8 +529,8 @@ BOOL daCanon_c::CreateHeap() {
}
}
ResTIMG* pRVar5 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_SHIP_NODAMAGE);
ResTIMG* pRVar6 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_HUNE_DAMAGE);
ResTIMG* pRVar5 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_SHIP_NODAMAGE_e);
ResTIMG* pRVar6 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_HUNE_DAMAGE_e);
// Bug: m5AC only has 5 elements, copy-paste mistake.
for (s32 i = 0; i < ARRAY_SSIZE(m584); i++) {
@@ -544,10 +544,10 @@ BOOL daCanon_c::CreateHeap() {
}
}
ResTIMG* pRVar7 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_RULE);
ResTIMG* pRVar8 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_BATTERY);
ResTIMG* pRVar9 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_BATTERY_BASE);
ResTIMG* pRVar10 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_RUPY_NUM_DEGREE);
ResTIMG* pRVar7 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_RULE_e);
ResTIMG* pRVar8 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_BATTERY_e);
ResTIMG* pRVar9 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_BATTERY_BASE_e);
ResTIMG* pRVar10 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_RUPY_NUM_DEGREE_e);
m5C0 = new dDlst_2DBattery_c();
if (m5C0 == NULL) {
src/d/actor/d_a_cc.cpp
+56 -56
View File
@@ -8,7 +8,7 @@
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_bomb.h"
#include "d/actor/d_a_bomb2.h"
#include "d/res/res_cc.h"
#include "res/Object/Cc.h"
#include "d/d_s_play.h"
#include "d/d_snap.h"
#include "d/d_com_inf_game.h"
@@ -182,7 +182,7 @@ static BOOL daCC_Draw(cc_class* i_this) {
if (i_this->m2F9 == 0) {
f32 fVar2 = 36.0f;
if ((i_this->m320 == CC_BCK_TACHI2HUSE) || (i_this->m320 == CC_BCK_HUSE_WALK)) {
if ((i_this->m320 == dRes_INDEX_CC_BCK_TACHI2HUSE_e) || (i_this->m320 == dRes_INDEX_CC_BCK_HUSE_WALK_e)) {
fVar2 = 50.0f;
}
@@ -763,9 +763,9 @@ void action_nomal_move(cc_class* i_this) {
i_this->mCyl.OffTgSetBit();
i_this->mCyl.ClrCoSet();
i_this->mCyl.ClrTgHit();
anm_init(i_this, CC_BCK_START, 0.0f, 0, 0.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_START_e, 0.0f, 0, 0.0f, -1);
if (i_this->mBehaviorType == 0) {
anm_init(i_this, CC_BCK_TSTART01, 0.0f, 0, 0.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_TSTART01_e, 0.0f, 0, 0.0f, -1);
}
i_this->m2F5++;
@@ -773,11 +773,11 @@ void action_nomal_move(cc_class* i_this) {
if (fopAcM_searchPlayerDistance(&i_this->actor) < i_this->mNoticeRange) {
fopAcM_OnStatus(&i_this->actor, fopAcStts_SHOWMAP_e);
if (i_this->mBehaviorType == 1) {
anm_init(i_this, CC_BCK_TSTART01, 0.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_TSTART01_e, 0.0f, 0, 1.0f, -1);
i_this->m2F5 = 2;
} else {
fopAcM_seStart(&i_this->actor, JA_SE_CM_CC_ENTER_GND, 0);
anm_init(i_this, CC_BCK_START, 0.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_START_e, 0.0f, 0, 1.0f, -1);
i_this->m2F9 = 0;
i_this->actor.gravity = -3.0f;
i_this->m2F5 = 3;
@@ -802,7 +802,7 @@ void action_nomal_move(cc_class* i_this) {
cc_eff_set(i_this, 1);
i_this->actor.shape_angle.x = 0;
i_this->actor.speed.y = 0.0f;
anm_init(i_this, CC_BCK_TSTART02, 0.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_TSTART02_e, 0.0f, 0, 1.0f, -1);
i_this->m2F5 = 3;
i_this->mCyl.OnTgSetBit();
i_this->actor.attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e;
@@ -831,8 +831,8 @@ void action_nomal_move(cc_class* i_this) {
i_this->m34E[0] += i_this->m34E[1];
denki_start(i_this);
if (i_this->m320 != CC_BCK_TACHI_WALK) {
anm_init(i_this, CC_BCK_TACHI_WALK, 2.0f, 2, 1.0f, -1);
if (i_this->m320 != dRes_INDEX_CC_BCK_TACHI_WALK_e) {
anm_init(i_this, dRes_INDEX_CC_BCK_TACHI_WALK_e, 2.0f, 2, 1.0f, -1);
}
fopAcM_seStart(&i_this->actor, JA_SE_CM_CC_MOVE_STAND, 0);
@@ -873,7 +873,7 @@ void action_nomal_move(cc_class* i_this) {
AT_TYPE_LIGHT_ARROW | AT_TYPE_LIGHT | AT_TYPE_GRAPPLING_HOOK
);
i_this->mCyl.OffCoSetBit();
anm_init(i_this, CC_BCK_TACHI2HUSE, 2.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_TACHI2HUSE_e, 2.0f, 0, 1.0f, -1);
i_this->m2F5++;
break;
@@ -888,7 +888,7 @@ void action_nomal_move(cc_class* i_this) {
break;
}
anm_init(i_this, CC_BCK_HUSE_WALK, 0.0f, 2, 1.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_HUSE_WALK_e, 0.0f, 2, 1.0f, -1);
i_this->m2F5++;
case 8:
@@ -911,7 +911,7 @@ void action_nomal_move(cc_class* i_this) {
case 10:
i_this->mCyl.SetTgType(~(AT_TYPE_UNK400000 | AT_TYPE_UNK20000 | AT_TYPE_WATER));
anm_init(i_this, CC_BCK_HUSE2TACHI, 0.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_HUSE2TACHI_e, 0.0f, 0, 1.0f, -1);
fopAcM_seStart(&i_this->actor, JA_SE_CM_CC_LIE_TO_STAND, 0);
i_this->m2F5++;
break;
@@ -969,8 +969,8 @@ void action_oyogu(cc_class* i_this) {
fopAcM_seStart(a_this, JA_SE_CM_CC_STAND_TO_LIE, 0);
if (i_this->m320 != CC_BCK_TACHI2HUSE) {
anm_init(i_this, CC_BCK_TACHI2HUSE, 2.0f, 0, 1.0f, -1);
if (i_this->m320 != dRes_INDEX_CC_BCK_TACHI2HUSE_e) {
anm_init(i_this, dRes_INDEX_CC_BCK_TACHI2HUSE_e, 2.0f, 0, 1.0f, -1);
}
a_this->speedF = 0.0f;
@@ -983,9 +983,9 @@ void action_oyogu(cc_class* i_this) {
i_this->m2F5++;
case 0x15:
if (i_this->m320 == CC_BCK_TACHI2HUSE) {
if (i_this->m320 == dRes_INDEX_CC_BCK_TACHI2HUSE_e) {
if (i_this->m2B4->isStop()) {
anm_init(i_this, CC_BCK_HUSE_WALK, 0.0, 2, 1.0, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_HUSE_WALK_e, 0.0, 2, 1.0, -1);
}
}
@@ -1056,7 +1056,7 @@ void action_attack_move(cc_class* i_this) {
i_this->mCyl.OnCoSetBit();
fopAcM_monsSeStart(&i_this->actor, JA_SE_CV_CC_ATTACK, 0);
i_this->m306 = 0;
anm_init(i_this, CC_BCK_ATACK01, 0.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_ATACK01_e, 0.0f, 0, 1.0f, -1);
i_this->m2F5++;
case 0x1F:
@@ -1071,7 +1071,7 @@ void action_attack_move(cc_class* i_this) {
i_this->actor.current.angle.y = fopAcM_searchPlayerAngleY(&i_this->actor);
i_this->mCyl.OnAtSPrmBit(cCcD_AtSPrm_Set_e);
i_this->mCyl.OnAtHitBit();
anm_init(i_this, CC_BCK_ATACK02, 0.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_ATACK02_e, 0.0f, 0, 1.0f, -1);
fopAcM_seStart(&i_this->actor, JA_SE_CM_CC_ATTACK, 0);
i_this->actor.speedF = 18.0f;
i_this->actor.gravity = -3.0f;
@@ -1097,7 +1097,7 @@ void action_attack_move(cc_class* i_this) {
cc_eff_set(i_this, 1);
i_this->actor.speedF = 0.0f;
anm_init(i_this, CC_BCK_ATACK03, 0.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_ATACK03_e, 0.0f, 0, 1.0f, -1);
i_this->m2F5++;
}
break;
@@ -1165,7 +1165,7 @@ void action_damage_move(cc_class* i_this) {
}
denki_end(i_this);
anm_init(i_this, CC_BCK_TACHI2HUSE, 0.0f, 0, 0.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_TACHI2HUSE_e, 0.0f, 0, 0.0f, -1);
i_this->mCyl.SetTgType(~(AT_TYPE_UNK400000 | AT_TYPE_UNK20000 | AT_TYPE_WATER));
@@ -1199,7 +1199,7 @@ void action_damage_move(cc_class* i_this) {
case 4:
case 9:
anm_init(i_this, CC_BCK_MAHI, 0.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_MAHI_e, 0.0f, 0, 1.0f, -1);
dComIfGp_particle_set(dPa_name::ID_IT_JN_PIYOHIT00, &a_this->attention_info.position);
i_this->m32C = 0.0f;
i_this->m330 = 0.0f;
@@ -1291,7 +1291,7 @@ void action_damage_move(cc_class* i_this) {
case 0x2b:
if (i_this->m34E[4] <= 1) {
anm_init(i_this, CC_BCK_HUKKATSU, 0.0f, 2, 1.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_HUKKATSU_e, 0.0f, 2, 1.0f, -1);
i_this->m34E[4] = 0x3c;
i_this->m34E[4] += REG8_S(6);
i_this->m2F5++;
@@ -1310,7 +1310,7 @@ void action_damage_move(cc_class* i_this) {
case 0x2d:
i_this->m301 = 1;
i_this->m2D8->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("CC", CC_BCK_CC_PTCL), 0, 0.0f, 1.0f, 0.0f, -1.0f, NULL);
i_this->m2D8->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BCK_CC_PTCL_e), 0, 0.0f, 1.0f, 0.0f, -1.0f, NULL);
pJVar6 = dComIfGp_particle_set(dPa_name::ID_AK_SN_CCSPLIT00, &a_this->attention_info.position, &a_this->current.angle);
if (pJVar6 != NULL) {
@@ -1338,7 +1338,7 @@ void action_damage_move(cc_class* i_this) {
i_this->m301 = 0;
i_this->mStts.SetWeight(0x32);
i_this->mCyl.SetTgType(~(AT_TYPE_UNK400000 | AT_TYPE_UNK20000 | AT_TYPE_WATER));
anm_init(i_this, CC_BCK_HUSE2TACHI, 0.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_HUSE2TACHI_e, 0.0f, 0, 1.0f, -1);
fopAcM_seStart(a_this, JA_SE_CM_CC_LIE_TO_STAND, 0);
a_this->shape_angle.y = fopAcM_searchPlayerAngleY(a_this);
@@ -1409,7 +1409,7 @@ void action_dead_move(cc_class* i_this) {
fopAcM_seStart(a_this, JA_SE_CM_CC_DIE_SWING, 0);
fopAcM_monsSeStart(a_this, JA_SE_CV_CC_DIE, 0);
i_this->m2BC->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("CC", CC_BCK_CC_BETA), 0, 0.0f, 1.0f, 0.0f, -1.0f, NULL);
i_this->m2BC->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BCK_CC_BETA_e), 0, 0.0f, 1.0f, 0.0f, -1.0f, NULL);
a_this->speedF = 0.0f;
a_this->speed.x = 0.0f;
a_this->speed.y = 0.0f;
@@ -1536,7 +1536,7 @@ void deku_ret_demo(cc_class* i_this) {
case 3:
if (i_this->m34E[5] == 0) {
anm_init(i_this, CC_BCK_START, 0.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_START_e, 0.0f, 0, 1.0f, -1);
DEMO_RET_START_FLAG = 2;
i_this->m34E[5] = 0x50;
if (DEMO_SHORT_CUT_FLAG != 0) {
@@ -1585,13 +1585,13 @@ void action_noboru(cc_class* i_this) {
i_this->m3BA = -0x4000;
i_this->m2FB = 0;
a_this->attention_info.flags = 0;
anm_init(i_this, CC_BCK_DEKU_START, 0.0f, 0, 0.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_DEKU_START_e, 0.0f, 0, 0.0f, -1);
i_this->m2F5++;
case 0x3d:
if (i_this->m2FB >= 1) {
fopAcM_seStart(a_this, JA_SE_CM_CC_ENTER_GND, 0);
anm_init(i_this, CC_BCK_DEKU_START, 0.0, 0, 1.0, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_DEKU_START_e, 0.0, 0, 1.0, -1);
i_this->m2F5++;
}
break;
@@ -1601,7 +1601,7 @@ void action_noboru(cc_class* i_this) {
break;
}
i_this->m344 = cM_rndF(43.0f);
anm_init(i_this, CC_BCK_TACHI_WALK, 1.0f, 2, 1.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_TACHI_WALK_e, 1.0f, 2, 1.0f, -1);
i_this->m2F5++;
case 0x3f:
@@ -1613,7 +1613,7 @@ void action_noboru(cc_class* i_this) {
break;
}
anm_init(i_this, CC_BCK_ATACK01, 0.0, 0, 1.0, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_ATACK01_e, 0.0, 0, 1.0, -1);
i_this->m2F5 = i_this->m2F5 + 1;
case 0x40:
@@ -1627,7 +1627,7 @@ void action_noboru(cc_class* i_this) {
case 0x41:
fopAcM_monsSeStart(a_this, JA_SE_CV_CC_ATTACK, 0);
anm_init(i_this, CC_BCK_ATACK02, 0.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_ATACK02_e, 0.0f, 0, 1.0f, -1);
i_this->m3BA = 0;
a_this->current.angle.x = 0;
a_this->current.angle.y = 0;
@@ -1638,7 +1638,7 @@ void action_noboru(cc_class* i_this) {
a_this->shape_angle.z = a_this->current.angle.z;
i_this->m2FB = 3;
anm_init(i_this, CC_BCK_ATACK02, 0.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_ATACK02_e, 0.0f, 0, 1.0f, -1);
fopAcM_seStart(a_this, JA_SE_CM_CC_ATTACK, 0);
a_this->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e;
@@ -1656,7 +1656,7 @@ void action_noboru(cc_class* i_this) {
case 0x42:
if (i_this->mAcch.ChkGroundHit()) {
anm_init(i_this, CC_BCK_ATACK03, 0.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_ATACK03_e, 0.0f, 0, 1.0f, -1);
fopAcM_seStart(a_this, JA_SE_CM_CC_LANDING, dComIfG_Bgsp()->GetMtrlSndId(i_this->mAcch.m_gnd));
cc_eff_set(i_this, 1);
@@ -1687,8 +1687,8 @@ void action_noboru(cc_class* i_this) {
DEMO_SELECT(i_this->m368, i_this->m390).remove();
a_this->attention_info.flags = 0;
if (i_this->m320 != CC_BCK_TACHI_WALK) {
anm_init(i_this, CC_BCK_TACHI2HUSE, 0.0f, 0, 0.0f, -1);
if (i_this->m320 != dRes_INDEX_CC_BCK_TACHI_WALK_e) {
anm_init(i_this, dRes_INDEX_CC_BCK_TACHI2HUSE_e, 0.0f, 0, 0.0f, -1);
}
fopAcM_seStart(a_this, JA_SE_CM_CC_STAND_TO_LIE, 0);
@@ -1725,7 +1725,7 @@ void action_noboru(cc_class* i_this) {
if (i_this->m2FD != 0) {
i_this->m34E[0] = 0x3c;
}
anm_init(i_this, CC_BCK_START, 0.0f, 0, 0.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_START_e, 0.0f, 0, 0.0f, -1);
i_this->m2FB = 4;
i_this->m3BA = -0x4000;
i_this->m2F5++;
@@ -1734,7 +1734,7 @@ void action_noboru(cc_class* i_this) {
if (DEMO_RET_START_FLAG == 2) {
fopAcM_seStart(a_this, JA_SE_CM_CC_LIE_TO_STAND, 0);
i_this->m334 = 1.0;
anm_init(i_this, CC_BCK_START, 0.0f, 0, 1.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_START_e, 0.0f, 0, 1.0f, -1);
i_this->m2F5 = 0x3e;
}
@@ -1748,8 +1748,8 @@ void action_noboru(cc_class* i_this) {
case 0x47:
deku_ret_demo(i_this);
if (DEMO_RET_START_FLAG >= 2 && i_this->m320 == CC_BCK_START && i_this->m2B4->isStop()) {
anm_init(i_this, CC_BCK_TACHI_WALK, 1.0f, 2, 1.0f, -1);
if (DEMO_RET_START_FLAG >= 2 && i_this->m320 == dRes_INDEX_CC_BCK_START_e && i_this->m2B4->isStop()) {
anm_init(i_this, dRes_INDEX_CC_BCK_TACHI_WALK_e, 1.0f, 2, 1.0f, -1);
}
}
@@ -1770,7 +1770,7 @@ void action_up_check(cc_class* i_this) {
i_this->mCyl.OnTgShield();
i_this->mCyl.OnTgSetBit();
i_this->mCyl.SetTgType(~(AT_TYPE_UNK400000 | AT_TYPE_UNK20000 | AT_TYPE_WATER));
anm_init(i_this, CC_BCK_MAHI, 0.0f, 0, 0.0f, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_MAHI_e, 0.0f, 0, 0.0f, -1);
#if VERSION > VERSION_DEMO
i_this->m2F9 = 0;
#endif
@@ -2055,7 +2055,7 @@ void action_tubo_search(cc_class* i_this) {
i_this->mCyl.OnAtVsBitSet(cCcD_TgSPrm_IsOther_e);
i_this->mCyl.OffAtVsBitSet(cCcD_TgSPrm_IsPlayer_e);
anm_init(i_this, CC_BCK_HUSE2TACHI, 0.0, 0, 1.0, -1);
anm_init(i_this, dRes_INDEX_CC_BCK_HUSE2TACHI_e, 0.0, 0, 1.0, -1);
fopAcM_seStart(&i_this->actor, JA_SE_CM_CC_LIE_TO_STAND, 0);
denki_start(i_this);
i_this->actor.gravity = -3.0;
@@ -2316,7 +2316,7 @@ static BOOL daCC_Execute(cc_class* i_this) {
i_this->mCyl.SetC(i_this->actor.current.pos);
f32 fVar8 = 100.0f;
if (i_this->m320 == CC_BCK_HUSE_WALK) {
if (i_this->m320 == dRes_INDEX_CC_BCK_HUSE_WALK_e) {
fVar8 = 30.0f;
}
i_this->mCyl.SetH(fVar8);
@@ -2365,15 +2365,15 @@ static BOOL daCC_Delete(cc_class* i_this) {
static BOOL useHeapInit(fopAc_ac_c* a_this) {
cc_class* i_this = (cc_class*)a_this;
s32 fileIndex = CC_BCK_START;
s32 fileIndex = dRes_INDEX_CC_BCK_START_e;
if (i_this->mBehaviorType == 1) {
fileIndex = CC_BCK_TSTART01;
fileIndex = dRes_INDEX_CC_BCK_TSTART01_e;
} else if (i_this->mBehaviorType == 2) {
fileIndex = CC_BCK_HUSE2TACHI;
fileIndex = dRes_INDEX_CC_BCK_HUSE2TACHI_e;
}
i_this->m2B4 = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("CC", CC_BMD_CC),
(J3DModelData*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BMD_CC_e),
NULL,
NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("CC", fileIndex),
@@ -2406,14 +2406,14 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
}
if (!i_this->m2B8->init(
model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", CC_BRK_CC), true, J3DFrameCtrl::EMode_NONE
model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BRK_CC_e), true, J3DFrameCtrl::EMode_NONE
))
{
return FALSE;
}
i_this->m2C4 = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("CC", CC_BDL_CC_IWA), NULL, NULL, NULL, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, 1, NULL, 0, 0x11020203
(J3DModelData*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BDL_CC_IWA_e), NULL, NULL, NULL, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, 1, NULL, 0, 0x11020203
);
if (i_this->m2C4 == NULL || i_this->m2C4->getModel() == NULL) {
@@ -2427,7 +2427,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
}
if (!i_this->m2C8->init(
model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", CC_BRK_CC_IWA01), true, J3DFrameCtrl::EMode_NONE
model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BRK_CC_IWA01_e), true, J3DFrameCtrl::EMode_NONE
))
{
return FALSE;
@@ -2439,7 +2439,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
}
if (!i_this->m2CC->init(
model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", CC_BRK_CC_IWA02), true, J3DFrameCtrl::EMode_NONE
model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BRK_CC_IWA02_e), true, J3DFrameCtrl::EMode_NONE
))
{
return FALSE;
@@ -2451,7 +2451,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
}
if (!i_this->m2D0->init(
model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("CC", CC_BTK_CC_IWA01), true, J3DFrameCtrl::EMode_NONE
model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BTK_CC_IWA01_e), true, J3DFrameCtrl::EMode_NONE
))
{
return FALSE;
@@ -2463,14 +2463,14 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
}
if (!i_this->m2D4->init(
model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("CC", CC_BTK_CC_IWA02), true, J3DFrameCtrl::EMode_NONE
model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BTK_CC_IWA02_e), true, J3DFrameCtrl::EMode_NONE
))
{
return FALSE;
}
i_this->m2BC = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("CC", CC_BDL_CC_BETA), NULL, NULL, NULL, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, 1, NULL, 0, 0x11020203
(J3DModelData*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BDL_CC_BETA_e), NULL, NULL, NULL, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, 1, NULL, 0, 0x11020203
);
if (i_this->m2BC == NULL || i_this->m2BC->getModel() == NULL) {
@@ -2484,17 +2484,17 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
}
if (!i_this->m2C0->init(
model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", CC_BRK_CC_BETA), true, J3DFrameCtrl::EMode_NONE
model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BRK_CC_BETA_e), true, J3DFrameCtrl::EMode_NONE
))
{
return FALSE;
}
i_this->m2D8 = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("CC", CC_BDL_CC_PTCL),
(J3DModelData*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BDL_CC_PTCL_e),
NULL,
NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("CC", CC_BCK_CC_PTCL),
(J3DAnmTransform*)dComIfG_getObjectRes("CC", dRes_INDEX_CC_BCK_CC_PTCL_e),
J3DFrameCtrl::EMode_NONE,
1.0f,
1,
src/d/actor/d_a_coming3.cpp
+4 -4
View File
@@ -8,7 +8,7 @@
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_sea.h"
#include "d/actor/d_a_obj_barrel2.h"
#include "d/res/res_always.h"
#include "res/Object/Always.h"
#include "d/d_bg_s_gnd_chk.h"
#include "d/d_bg_s_wtr_chk.h"
@@ -334,8 +334,8 @@ void daComing3::Act_c::eff_break_tsubo() {
J3DAnmTexPattern* texPattern;
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_MPM_TUBO);
texPattern = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", ALWAYS_BTP_MPM_TUBO);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BDL_MPM_TUBO_e);
texPattern = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTP_MPM_TUBO_e);
JPABaseEmitter* baseEmitter = (JPABaseEmitter*)dComIfGp_particle_set(dPa_name::ID_AK_JN_M_TUBOHAHEN, &sp1C, NULL, &sp34);
if (baseEmitter != NULL) {
@@ -422,7 +422,7 @@ BOOL daComing3::Act_c::solidHeapCB(fopAc_ac_c* a_this) {
/* 00001804-000018CC .text create_heap__Q29daComing35Act_cFv */
bool daComing3::Act_c::create_heap() {
J3DModelData* mdl_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, ALWAYS_BDL_OBM_KOTUBO1);
J3DModelData* mdl_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_ALWAYS_BDL_OBM_KOTUBO1_e);
JUT_ASSERT(846, mdl_data != NULL);
unk_440 = mDoExt_J3DModel__create(mdl_data, 0, 0x11020203);
src/d/actor/d_a_dai.cpp
+2 -2
View File
@@ -7,7 +7,7 @@
#include "d/actor/d_a_dai.h"
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_dai_item.h"
#include "d/res/res_fdai.h"
#include "res/Object/Fdai.h"
#include "d/d_item.h"
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
@@ -63,7 +63,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* a_this) {
/* 000000E4-000001A0 .text CreateHeap__7daDai_cFv */
BOOL daDai_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, FDAI_BDL_FDAI);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_FDAI_BDL_FDAI_e);
JUT_ASSERT(415, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
src/d/actor/d_a_dai_item.cpp
+28 -28
View File
@@ -8,37 +8,37 @@
#include "SSystem/SComponent/c_math.h"
#include "d/d_kankyo_wether.h"
#include "d/d_s_play.h"
#include "d/res/res_fdai.h"
#include "d/res/res_cloth.h"
#include "res/Object/Fdai.h"
#include "res/Object/Cloth.h"
const char daStandItem_c::m_arcname[] = "Fdai";
const s16 daStandItem_c::m_bmdidx[] = {
FDAI_BDL_FOBJ00, /* dItemNo_TOWN_FLOWER_e */
FDAI_BDL_FOBJ01, /* dItemNo_SEA_FLOWER_e */
FDAI_BDL_FOBJ02, /* dItemNo_EXOTIC_FLOWER_e */
FDAI_BDL_FOBJ03, /* dItemNo_HEROS_FLAG_e */
FDAI_BDL_FOBJ04, /* dItemNo_BIG_CATCH_FLAG_e */
FDAI_BDL_FOBJ05, /* dItemNo_BIG_SALE_FLAG_e */
FDAI_BDL_FOBJ06, /* dItemNo_PINWHEEL_e */
FDAI_BDL_FOBJ07, /* dItemNo_SICKLE_MOON_FLAG_e */
FDAI_BDL_FOBJ08, /* dItemNo_SKULL_TOWER_IDOL_e */
FDAI_BDL_FOBJ09, /* dItemNo_FOUNTAIN_IDOL_e */
FDAI_BDL_FOBJ10, /* dItemNo_POSTMAN_STATUE_e */
FDAI_BDL_FOBJ11, /* dItemNo_SHOP_GURU_STATUE_e */
dRes_INDEX_FDAI_BDL_FOBJ00_e, /* dItemNo_TOWN_FLOWER_e */
dRes_INDEX_FDAI_BDL_FOBJ01_e, /* dItemNo_SEA_FLOWER_e */
dRes_INDEX_FDAI_BDL_FOBJ02_e, /* dItemNo_EXOTIC_FLOWER_e */
dRes_INDEX_FDAI_BDL_FOBJ03_e, /* dItemNo_HEROS_FLAG_e */
dRes_INDEX_FDAI_BDL_FOBJ04_e, /* dItemNo_BIG_CATCH_FLAG_e */
dRes_INDEX_FDAI_BDL_FOBJ05_e, /* dItemNo_BIG_SALE_FLAG_e */
dRes_INDEX_FDAI_BDL_FOBJ06_e, /* dItemNo_PINWHEEL_e */
dRes_INDEX_FDAI_BDL_FOBJ07_e, /* dItemNo_SICKLE_MOON_FLAG_e */
dRes_INDEX_FDAI_BDL_FOBJ08_e, /* dItemNo_SKULL_TOWER_IDOL_e */
dRes_INDEX_FDAI_BDL_FOBJ09_e, /* dItemNo_FOUNTAIN_IDOL_e */
dRes_INDEX_FDAI_BDL_FOBJ10_e, /* dItemNo_POSTMAN_STATUE_e */
dRes_INDEX_FDAI_BDL_FOBJ11_e, /* dItemNo_SHOP_GURU_STATUE_e */
};
const s16 daStandItem_c::m_bckidx[] = {
FDAI_BCK_FOBJ00, /* dItemNo_TOWN_FLOWER_e */
FDAI_BCK_FOBJ01, /* dItemNo_SEA_FLOWER_e */
FDAI_BCK_FOBJ02, /* dItemNo_EXOTIC_FLOWER_e */
dRes_INDEX_FDAI_BCK_FOBJ00_e, /* dItemNo_TOWN_FLOWER_e */
dRes_INDEX_FDAI_BCK_FOBJ01_e, /* dItemNo_SEA_FLOWER_e */
dRes_INDEX_FDAI_BCK_FOBJ02_e, /* dItemNo_EXOTIC_FLOWER_e */
-1, /* dItemNo_HEROS_FLAG_e */
-1, /* dItemNo_BIG_CATCH_FLAG_e */
FDAI_BCK_FOBJ05, /* dItemNo_BIG_SALE_FLAG_e */
dRes_INDEX_FDAI_BCK_FOBJ05_e, /* dItemNo_BIG_SALE_FLAG_e */
-1, /* dItemNo_PINWHEEL_e */
FDAI_BCK_FOBJ07, /* dItemNo_SICKLE_MOON_FLAG_e */
FDAI_BCK_FOBJ08, /* dItemNo_SKULL_TOWER_IDOL_e */
FDAI_BCK_FOBJ09, /* dItemNo_FOUNTAIN_IDOL_e */
FDAI_BCK_FOBJ10, /* dItemNo_POSTMAN_STATUE_e */
FDAI_BCK_FOBJ11, /* dItemNo_SHOP_GURU_STATUE_e */
dRes_INDEX_FDAI_BCK_FOBJ07_e, /* dItemNo_SICKLE_MOON_FLAG_e */
dRes_INDEX_FDAI_BCK_FOBJ08_e, /* dItemNo_SKULL_TOWER_IDOL_e */
dRes_INDEX_FDAI_BCK_FOBJ09_e, /* dItemNo_FOUNTAIN_IDOL_e */
dRes_INDEX_FDAI_BCK_FOBJ10_e, /* dItemNo_POSTMAN_STATUE_e */
dRes_INDEX_FDAI_BCK_FOBJ11_e, /* dItemNo_SHOP_GURU_STATUE_e */
};
const u16 daStandItem_c::m_heapsize[] = {
0x2000, /* dItemNo_TOWN_FLOWER_e */
@@ -263,10 +263,10 @@ BOOL daStandItem_c::CreateHeap() {
};
u32 clothTimgRes[] = {
FDAI_BTI_FTEX03,
FDAI_BTI_FTEX04,
FDAI_BTI_FTEX05,
FDAI_BTI_FTEX07,
dRes_INDEX_FDAI_BTI_FTEX03_e,
dRes_INDEX_FDAI_BTI_FTEX04_e,
dRes_INDEX_FDAI_BTI_FTEX05_e,
dRes_INDEX_FDAI_BTI_FTEX07_e,
};
switch (mItemNo) {
@@ -286,7 +286,7 @@ BOOL daStandItem_c::CreateHeap() {
}
ResTIMG* clothTimg = (ResTIMG*)dComIfG_getObjectRes(m_arcname, clothTimgRes[mClothType]);
ResTIMG* clothToonTimg = (ResTIMG*)dComIfG_getObjectRes("Cloth", CLOTH_BTI_CLOTHTOON);
ResTIMG* clothToonTimg = (ResTIMG*)dComIfG_getObjectRes("Cloth", dRes_INDEX_CLOTH_BTI_CLOTHTOON_e);
mpCloth = clothFunc[mClothType](clothTimg, clothToonTimg, &tevStr, VobjFlagPosTbl[mClothType]);
if (mpCloth == NULL)
return FALSE;
src/d/actor/d_a_daiocta.cpp
+19 -19
View File
@@ -15,7 +15,7 @@
#include "d/d_lib.h"
#include "d/d_s_play.h"
#include "d/d_snap.h"
#include "d/res/res_daiocta.h"
#include "res/Object/Daiocta.h"
static daDaiocta_HIO_c l_HIO;
@@ -268,16 +268,16 @@ BOOL daDaiocta_c::createAwaHeap() {
J3DAnmTextureSRTKey* btk;
J3DAnmTevRegKey* brk;
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BDL_GAWA00));
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BDL_GAWA00_e));
JUT_ASSERT(516, modelData != NULL);
bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BCK_GAWA00));
bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BCK_GAWA00_e));
JUT_ASSERT(520, bck != NULL);
btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BTK_GAWA00));
btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BTK_GAWA00_e));
JUT_ASSERT(524, btk != NULL);
brk = static_cast<J3DAnmTevRegKey *>(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BRK_GAWA00));
brk = static_cast<J3DAnmTevRegKey *>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BRK_GAWA00_e));
JUT_ASSERT(528, brk != NULL);
@@ -309,7 +309,7 @@ BOOL daDaiocta_c::createAwaHeap() {
/* 000009B8-00000ABC .text createSuikomiHeap__11daDaiocta_cFv */
BOOL daDaiocta_c::createSuikomiHeap() {
J3DModelData* modelData = (J3DModelData * ) dComIfG_getObjectRes(m_arc_name, DAIOCTA_BDL_GDO_SUI00);
J3DModelData* modelData = (J3DModelData * ) dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BDL_GDO_SUI00_e);
JUT_ASSERT(551, modelData != NULL);
// "suikomi" translates to suction
@@ -319,8 +319,8 @@ BOOL daDaiocta_c::createSuikomiHeap() {
return FALSE;
}
if (!dLib_brkInit(modelData, &mBrkAnm2, m_arc_name, DAIOCTA_BRK_GDO_SUI00) ||
!dLib_btkInit(modelData, &mBtkAnm, m_arc_name, DAIOCTA_BTK_GDO_SUI00)) {
if (!dLib_brkInit(modelData, &mBrkAnm2, m_arc_name, dRes_INDEX_DAIOCTA_BRK_GDO_SUI00_e) ||
!dLib_btkInit(modelData, &mBtkAnm, m_arc_name, dRes_INDEX_DAIOCTA_BTK_GDO_SUI00_e)) {
return FALSE;
}
@@ -329,10 +329,10 @@ BOOL daDaiocta_c::createSuikomiHeap() {
/* 00000ABC-00000C04 .text createBodyHeap__11daDaiocta_cFv */
BOOL daDaiocta_c::createBodyHeap() {
J3DModelData* modelData = (J3DModelData *) dComIfG_getObjectRes(m_arc_name, DAIOCTA_BDL_DO_MAIN1);
J3DModelData* modelData = (J3DModelData *) dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BDL_DO_MAIN1_e);
JUT_ASSERT(579, modelData != NULL);
if (!dLib_brkInit(modelData, &mBrkAnm1, m_arc_name, DAIOCTA_BRK_WAIT1)) {
if (!dLib_brkInit(modelData, &mBrkAnm1, m_arc_name, dRes_INDEX_DAIOCTA_BRK_WAIT1_e)) {
return FALSE;
}
@@ -1069,10 +1069,10 @@ void daDaiocta_c::modeDemoInit() {
setEffect(dPa_name::ID_IT_SN_DO_SUIKOMIC00);
J3DModelData* model_data_p = mpSuikomiModel->getModelData();
J3DAnmTevRegKey* brk = static_cast<J3DAnmTevRegKey *>(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BRK_GDO_SUI00));
J3DAnmTevRegKey* brk = static_cast<J3DAnmTevRegKey *>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BRK_GDO_SUI00_e));
JUT_ASSERT(VERSION_SELECT(1334, 1340, 1350, 1350), brk != NULL);
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey *>(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BTK_GDO_SUI00));
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey *>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BTK_GDO_SUI00_e));
JUT_ASSERT(VERSION_SELECT(1337, 1343, 1353, 1353), btk != NULL);
mBrkAnm2.init(
@@ -1349,13 +1349,13 @@ void daDaiocta_c::setAnm() {
}
static const s32 a_brk_anm_idx_tbl[] = {
DAIOCTA_BRK_WAIT1,
DAIOCTA_BRK_DAMAGE1,
DAIOCTA_BRK_DAMAGE2,
DAIOCTA_BRK_DEATH1,
DAIOCTA_BRK_SUIKOMU1,
DAIOCTA_BRK_DEATH2,
DAIOCTA_BRK_HAKIDASU1
dRes_INDEX_DAIOCTA_BRK_WAIT1_e,
dRes_INDEX_DAIOCTA_BRK_DAMAGE1_e,
dRes_INDEX_DAIOCTA_BRK_DAMAGE2_e,
dRes_INDEX_DAIOCTA_BRK_DEATH1_e,
dRes_INDEX_DAIOCTA_BRK_SUIKOMU1_e,
dRes_INDEX_DAIOCTA_BRK_DEATH2_e,
dRes_INDEX_DAIOCTA_BRK_HAKIDASU1_e
};
static const s32 a_brk_anm_prm_tbl[] = {
src/d/actor/d_a_daiocta_eye.cpp
+8 -8
View File
@@ -11,7 +11,7 @@
#include "d/d_bg_s_func.h"
#include "d/d_cc_d.h"
#include "d/d_lib.h"
#include "d/res/res_daiocta.h"
#include "res/Object/Daiocta.h"
const s32 daDaiocta_Eye_c::m_heapsize = 2848;
const char daDaiocta_Eye_c::m_arc_name[] = "daiocta";
@@ -115,7 +115,7 @@ BOOL daDaiocta_Eye_c::_createHeap() {
}
};
J3DModelData* modelData = static_cast<J3DModelData *>(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BDL_DO_EYE1));
J3DModelData* modelData = static_cast<J3DModelData *>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BDL_DO_EYE1_e));
JUT_ASSERT(0xE9, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222);
@@ -126,7 +126,7 @@ BOOL daDaiocta_Eye_c::_createHeap() {
mpModel->setUserArea((u32)this);
mpBrk = static_cast<J3DAnmTevRegKey *>(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BRK_DAMAGE_EYE_A1));
mpBrk = static_cast<J3DAnmTevRegKey *>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BRK_DAMAGE_EYE_A1_e));
if (!mpBrk) {
return FALSE;
@@ -142,7 +142,7 @@ BOOL daDaiocta_Eye_c::_createHeap() {
return FALSE;
}
mpBtk = static_cast<J3DAnmTextureSRTKey *>(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BTK_DAMAGE_EYE_A1));
mpBtk = static_cast<J3DAnmTextureSRTKey *>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BTK_DAMAGE_EYE_A1_e));
if (!mpBtk) {
return FALSE;
@@ -291,13 +291,13 @@ void daDaiocta_Eye_c::modeDamageInit() {
mbIsDamaged = true;
J3DModelData* model_data_p = mpModel->getModelData();
mpBrk = (J3DAnmTevRegKey *) dComIfG_getObjectRes(m_arc_name, DAIOCTA_BRK_DAMAGE_EYE_A1);
mpBrk = (J3DAnmTevRegKey *) dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BRK_DAMAGE_EYE_A1_e);
mBrkAnm.init(
model_data_p, mpBrk, TRUE,
J3DFrameCtrl::EMode_NONE, 1.0f,
0, -1, true, FALSE
);
mpBtk = (J3DAnmTextureSRTKey *) dComIfG_getObjectRes(m_arc_name, DAIOCTA_BTK_DAMAGE_EYE_A1);
mpBtk = (J3DAnmTextureSRTKey *) dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BTK_DAMAGE_EYE_A1_e);
mBtkAnm.init(
model_data_p, mpBtk, TRUE,
J3DFrameCtrl::EMode_NONE, 1.0f,
@@ -336,13 +336,13 @@ void daDaiocta_Eye_c::modeDeathInit() {
mMode = MODE_DEATH;
mbIsDamaged = true;
mEyeScale.setall(1.0f);
mpBrk = (J3DAnmTevRegKey *) dComIfG_getObjectRes(m_arc_name, DAIOCTA_BRK_DAMAGE_EYE_B1);
mpBrk = (J3DAnmTevRegKey *) dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BRK_DAMAGE_EYE_B1_e);
mBrkAnm.init(
mpModel->getModelData(), mpBrk, TRUE,
J3DFrameCtrl::EMode_NONE, 1.0f,
0, -1, true, FALSE
);
mpBtk = (J3DAnmTextureSRTKey *) dComIfG_getObjectRes(m_arc_name, DAIOCTA_BTK_DAMAGE_EYE_B1);
mpBtk = (J3DAnmTextureSRTKey *) dComIfG_getObjectRes(m_arc_name, dRes_INDEX_DAIOCTA_BTK_DAMAGE_EYE_B1_e);
mBtkAnm.init(
mpModel->getModelData(), mpBtk, TRUE,
J3DFrameCtrl::EMode_NONE, 1.0f,
src/d/actor/d_a_deku_item.cpp
+4 -4
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_deku_item.h"
#include "d/res/res_deku.h"
#include "res/Object/Deku.h"
#include "d/d_com_inf_game.h"
const char daDekuItem_c::m_arcname[] = "Deku";
@@ -59,7 +59,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 000000F0-000002C8 .text CreateHeap__12daDekuItem_cFv */
BOOL daDekuItem_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, DEKU_BDL_VLFDM);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_DEKU_BDL_VLFDM_e);
JUT_ASSERT(0xF4, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203U);
@@ -68,14 +68,14 @@ BOOL daDekuItem_c::CreateHeap() {
return FALSE;
}
J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, DEKU_BCK_VLFDK);
J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_DEKU_BCK_VLFDK_e);
JUT_ASSERT(0x103, pbck != NULL);
if (!mBck1.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_LOOP)) {
return FALSE;
}
pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, DEKU_BCK_VLFDM);
pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_DEKU_BCK_VLFDM_e);
JUT_ASSERT(0x110, pbck != NULL);
if (!mBck2.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_NONE)) {
src/d/actor/d_a_demo_dk.cpp
+7 -7
View File
@@ -8,7 +8,7 @@
#include "f_op/f_op_actor_mng.h"
#include "d/d_com_inf_game.h"
#include "m_Do/m_Do_ext.h"
#include "d/res/res_demo_dk.h"
#include "res/Object/Demo_Dk.h"
/* 00000078-000000E8 .text daDEMO_DK_Draw__FP13demo_dk_class */
static BOOL daDEMO_DK_Draw(demo_dk_class* i_this) {
@@ -39,10 +39,10 @@ void mode_wait(demo_dk_class* i_this) {
}
if (i_this->unk_2C0 == 0 && cM_rnd() < tmp) {
anm_init(i_this, DEMO_DK_BCK_DK_L_AKUBI1, 5.0f, 0, 1.0f, 0);
anm_init(i_this, dRes_INDEX_DEMO_DK_BCK_DK_L_AKUBI1_e, 5.0f, 0, 1.0f, 0);
i_this->unk_2B6 = 1;
} else {
anm_init(i_this, DEMO_DK_BCK_DK_L_WAIT1, 0.0f, 0, 1.0f, 0);
anm_init(i_this, dRes_INDEX_DEMO_DK_BCK_DK_L_WAIT1_e, 0.0f, 0, 1.0f, 0);
}
}
}
@@ -50,7 +50,7 @@ void mode_wait(demo_dk_class* i_this) {
/* 000002EC-00000378 .text mode_akubi__FP13demo_dk_class */
void mode_akubi(demo_dk_class* i_this) {
if (i_this->mpMorf->isStop()) {
anm_init(i_this, DEMO_DK_BCK_DK_L_WAIT1, 5.0f, 0, 2.0f, 0);
anm_init(i_this, dRes_INDEX_DEMO_DK_BCK_DK_L_WAIT1_e, 5.0f, 0, 2.0f, 0);
i_this->unk_2C0 = 3;
i_this->unk_2B6 = 0;
}
@@ -109,9 +109,9 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
demo_dk_class* i_this = (demo_dk_class*)a_this;
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("DEMO_DK", DEMO_DK_BMD_DK_L),
(J3DModelData*)dComIfG_getObjectRes("DEMO_DK", dRes_INDEX_DEMO_DK_BMD_DK_L_e),
NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("DEMO_DK", DEMO_DK_BCK_DK_L_WAIT1),
(J3DAnmTransform*)dComIfG_getObjectRes("DEMO_DK", dRes_INDEX_DEMO_DK_BCK_DK_L_WAIT1_e),
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0, 0x11020203);
if (i_this->mpMorf == NULL || i_this->mpMorf->getModel() == NULL) {
@@ -141,7 +141,7 @@ static cPhs_State daDEMO_DK_Create(fopAc_ac_c* a_this) {
a_this->scale.x = 1.0f;
a_this->scale.y = 1.0f;
a_this->scale.z = 1.0f;
anm_init(i_this, DEMO_DK_BCK_DK_L_WAIT1, 0.0f, 0, 1.0f, 0);
anm_init(i_this, dRes_INDEX_DEMO_DK_BCK_DK_L_WAIT1_e, 0.0f, 0, 1.0f, 0);
}
return ret;
}
src/d/actor/d_a_demo_kmm.cpp
+5 -5
View File
@@ -8,7 +8,7 @@
#include "f_op/f_op_actor_mng.h"
#include "d/d_com_inf_game.h"
#include "m_Do/m_Do_ext.h"
#include "d/res/res_demo_kmm.h"
#include "res/Object/Demo_Kmm.h"
const char daDemo_Kmm_c::M_arcname[] = "Demo_Kmm";
@@ -19,11 +19,11 @@ static BOOL CheckCreateHeap(fopAc_ac_c* a_this) {
/* 00000098-00000190 .text CreateHeap__12daDemo_Kmm_cFv */
BOOL daDemo_Kmm_c::CreateHeap() {
mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectIDRes(M_arcname, DEMO_KMM_BMD_KA), NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203);
mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectIDRes(M_arcname, dRes_ID_DEMO_KMM_BMD_KA_e), NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203);
if (mpMorf == NULL || mpMorf->getModel() == NULL) {
return FALSE;
}
setAnime(DEMO_KMM_BCK_KA_WAIT1, J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f);
setAnime(dRes_ID_DEMO_KMM_BCK_KA_WAIT1_e, J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f);
return TRUE;
}
@@ -37,8 +37,8 @@ void daDemo_Kmm_c::calcMtx() {
}
/* 00000228-000002D0 .text setAnime__12daDemo_Kmm_cFiiff */
void daDemo_Kmm_c::setAnime(int animIdx, int loopMode, float morf, float playSpeed) {
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectIDRes(M_arcname, animIdx), loopMode, morf, playSpeed, 0.0f, -1.0f, NULL);
void daDemo_Kmm_c::setAnime(int animId, int loopMode, f32 morf, f32 playSpeed) {
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectIDRes(M_arcname, animId), loopMode, morf, playSpeed, 0.0f, -1.0f, NULL);
}
/* 000002D0-00000308 .text CreateInit__12daDemo_Kmm_cFv */
src/d/actor/d_a_dk.cpp
+5 -5
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_dk.h"
#include "d/res/res_dk.h"
#include "res/Object/Dk.h"
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include "m_Do/m_Do_ext.h"
@@ -311,10 +311,10 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
dk_class* a_this = (dk_class*)i_this;
mDoExt_McaMorf* morf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectIDRes("Dk", DK_BDL_DK),
(J3DModelData*)dComIfG_getObjectIDRes("Dk", dRes_ID_DK_BDL_DK_e),
NULL,
NULL,
(J3DAnmTransform*)dComIfG_getObjectIDRes("Dk", DK_BCK_FLY1),
(J3DAnmTransform*)dComIfG_getObjectIDRes("Dk", dRes_ID_DK_BCK_FLY1_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
@@ -337,7 +337,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
}
a_this->field_0x2B8->getModel()->setUserArea((u32) a_this);
J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectIDRes("Dk", DK_BDL_DK_KAMEN);
J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectIDRes("Dk", dRes_ID_DK_BDL_DK_KAMEN_e);
a_this->mpModelKamen = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020002);
#if VERSION > VERSION_DEMO
if (a_this->mpModelKamen == NULL) {
@@ -345,7 +345,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
}
#endif
modelData = (J3DModelData*) dComIfG_getObjectIDRes("Dk", DK_BDL_DK_TAIL);
modelData = (J3DModelData*) dComIfG_getObjectIDRes("Dk", dRes_ID_DK_BDL_DK_TAIL_e);
JUT_ASSERT(DEMO_SELECT(817, 819), modelData != NULL);
for (s32 i = 0; i < 4; i++) {
src/d/actor/d_a_door10.cpp
+3 -3
View File
@@ -7,7 +7,7 @@
#include "d/actor/d_a_door10.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_com_inf_game.h"
#include "d/res/res_doorbs.h"
#include "res/Object/DoorBs.h"
/* 00000078-000000C8 .text chkMakeKey__10daDoor10_cFv */
s32 daDoor10_c::chkMakeKey() {
@@ -302,9 +302,9 @@ BOOL daDoor10_c::CreateHeap() {
cBgD_t* cBgD;
if (m364 != 0) {
if (m364 == 4) {
cBgD = (cBgD_t*)dComIfG_getObjectRes("DoorBs", DOORBS_DZB_DOOR20_D);
cBgD = (cBgD_t*)dComIfG_getObjectRes("DoorBs", dRes_INDEX_DOORBS_DZB_DOOR20_D_e);
} else {
cBgD = (cBgD_t*)dComIfG_getObjectRes("DoorBs", DOORBS_DZB_DOOR20_K);
cBgD = (cBgD_t*)dComIfG_getObjectRes("DoorBs", dRes_INDEX_DOORBS_DZB_DOOR20_K_e);
}
} else {
cBgD = (cBgD_t*)dComIfG_getStageRes("Stage", getDzbName());
src/d/actor/d_a_door12.cpp
+7 -7
View File
@@ -6,7 +6,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_door12.h"
#include "d/actor/d_a_player.h"
#include "d/res/res_door12.h"
#include "res/Object/door12.h"
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
@@ -319,7 +319,7 @@ char* daDoor12_c::getArcName() {
/* 000009B0-000009E0 .text getBdlLf__10daDoor12_cFv */
s32 daDoor12_c::getBdlLf() {
static s32 bldLf_table[] = {
DOOR12_BDL_DOOR12_GL, DOOR12_BDL_DOOR12M_L, DOOR12_BDL_DOOR12B_L, DOOR12_BDL_DOOR12_GR, DOOR12_BDL_DOOR12M_R, DOOR12_BDL_DOOR12B_R
dRes_INDEX_DOOR12_BDL_DOOR12_GL_e, dRes_INDEX_DOOR12_BDL_DOOR12M_L_e, dRes_INDEX_DOOR12_BDL_DOOR12B_L_e, dRes_INDEX_DOOR12_BDL_DOOR12_GR_e, dRes_INDEX_DOOR12_BDL_DOOR12M_R_e, dRes_INDEX_DOOR12_BDL_DOOR12B_R_e
};
return bldLf_table[getShapeType()];
}
@@ -327,7 +327,7 @@ s32 daDoor12_c::getBdlLf() {
/* 000009E0-00000A10 .text getBdlRt__10daDoor12_cFv */
s32 daDoor12_c::getBdlRt() {
static s32 bldRf_table[] = {
DOOR12_BDL_DOOR12_GR, DOOR12_BDL_DOOR12M_R, DOOR12_BDL_DOOR12B_R, DOOR12_BDL_DOOR12_GL, DOOR12_BDL_DOOR12M_L, DOOR12_BDL_DOOR12B_L
dRes_INDEX_DOOR12_BDL_DOOR12_GR_e, dRes_INDEX_DOOR12_BDL_DOOR12M_R_e, dRes_INDEX_DOOR12_BDL_DOOR12B_R_e, dRes_INDEX_DOOR12_BDL_DOOR12_GL_e, dRes_INDEX_DOOR12_BDL_DOOR12M_L_e, dRes_INDEX_DOOR12_BDL_DOOR12B_L_e
};
return bldRf_table[getShapeType()];
}
@@ -336,16 +336,16 @@ s32 daDoor12_c::getBdlRt() {
s32 daDoor12_c::getDzb() {
switch (getShapeType()) {
case 2:
return DOOR12_DZB_DOOR12_B;
return dRes_INDEX_DOOR12_DZB_DOOR12_B_e;
case 3:
case 4:
return DOOR12_DZB_DOOR12_G;
return dRes_INDEX_DOOR12_DZB_DOOR12_G_e;
case 5:
return DOOR12_DZB_DOOR12_B;
return dRes_INDEX_DOOR12_DZB_DOOR12_B_e;
}
return DOOR12_DZB_DOOR12_G;
return dRes_INDEX_DOOR12_DZB_DOOR12_G_e;
}
/* 00000A6C-00000ACC .text openWide__10daDoor12_cFv */
src/d/actor/d_a_dr.cpp
+10 -10
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_dr.h"
#include "d/res/res_dr.h"
#include "res/Object/Dr.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_mtx.h"
@@ -71,14 +71,14 @@ static void move(dr_class* i_this) {
switch (i_this->mMode) {
case 0:
isIdle = true;
anm_init(i_this, DR_BCK_DR_WAIT1, l_HIO.mWait1Morf, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_DR_BCK_DR_WAIT1_e, l_HIO.mWait1Morf, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mMode++;
i_this->mCountDownTimers[0] = (s16)(200.0f + cM_rndF(200.0f));
break;
case 1:
isIdle = true;
if (i_this->mCountDownTimers[0] == 0) {
anm_init(i_this, DR_BCK_DR_AKUBI1, l_HIO.mAkubi1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, DR_BAS_AKUBI1);
anm_init(i_this, dRes_INDEX_DR_BCK_DR_AKUBI1_e, l_HIO.mAkubi1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_DR_BAS_AKUBI1_e);
i_this->mMode++;
}
break;
@@ -89,7 +89,7 @@ static void move(dr_class* i_this) {
}
break;
case 10:
anm_init(i_this, DR_BCK_DR_BIKU1, l_HIO.mBiku1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, DR_BAS_BIKU1);
anm_init(i_this, dRes_INDEX_DR_BCK_DR_BIKU1_e, l_HIO.mBiku1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_DR_BAS_BIKU1_e);
i_this->mMode++;
i_this->mCountDownTimers[0] = l_HIO.m0E;
i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_DRPAINBIKU00, &i_this->current.pos);
@@ -109,11 +109,11 @@ static void move(dr_class* i_this) {
if (i_this->mCountDownTimers[0] != 0) {
if (cM_rndF(1.0f) < 0.5f) {
anm_init(i_this, DR_BCK_DR_ABARE1, l_HIO.mAbare1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, DR_BAS_ABARE1);
anm_init(i_this, dRes_INDEX_DR_BCK_DR_ABARE1_e, l_HIO.mAbare1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_DR_BAS_ABARE1_e);
i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_DRPAINABARE00, &i_this->current.pos);
i_this->mCountDownTimers[1] = 500;
} else {
anm_init(i_this, DR_BCK_DR_ABARE2, l_HIO.mAbare2Morf, J3DFrameCtrl::EMode_NONE, 1.0f, DR_BAS_ABARE2);
anm_init(i_this, dRes_INDEX_DR_BCK_DR_ABARE2_e, l_HIO.mAbare2Morf, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_DR_BAS_ABARE2_e);
cXyz rootPos;
cXyz offset(0.0f, 0.0f, 0.0f);
@@ -126,7 +126,7 @@ static void move(dr_class* i_this) {
i_this->mCountDownTimers[1] = 0;
}
} else {
anm_init(i_this, DR_BCK_DR_HO1, l_HIO.mHo1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_DR_BCK_DR_HO1_e, l_HIO.mHo1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_DRPAINHO00, &i_this->current.pos);
i_this->mMode++;
}
@@ -226,11 +226,11 @@ static BOOL createHeap(fopAc_ac_c* i_actor) {
dr_class* i_this = (dr_class*)i_actor;
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Dr", DR_BMD_DR1),
(J3DModelData*)dComIfG_getObjectRes("Dr", dRes_INDEX_DR_BMD_DR1_e),
NULL, NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Dr", DR_BCK_DR_BIKU1),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Dr", dRes_INDEX_DR_BCK_DR_BIKU1_e),
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, 1,
dComIfG_getObjectRes("Dr", DR_BAS_BIKU1),
dComIfG_getObjectRes("Dr", dRes_INDEX_DR_BAS_BIKU1_e),
0x00000000,
0x11020203
);
src/d/actor/d_a_dr2.cpp
+15 -15
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_dr2.h"
#include "d/res/res_dr2.h"
#include "res/Object/Dr2.h"
#include "m_Do/m_Do_ext.h"
#include "d/d_bg_w.h"
#include "d/d_s_play.h"
@@ -530,7 +530,7 @@ void dr_move(dr2_class* i_this) {
case 0:
if (i_this->unk_50C) {
i_this->unk_4C6 = 0;
J3DAnmTransform* pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes("Dr2", DR2_BCK_DR_BOSS_DEMO1);
J3DAnmTransform* pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BCK_DR_BOSS_DEMO1_e);
i_this->mpMorf2->setAnm(pAnimRes, 0, 1.0f, 1.0f, 0.0f, -1.0f, NULL);
i_this->unk_4C4 = 1;
}
@@ -649,7 +649,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
dr2_class* i_this = (dr2_class*)a_this;
i_this->mpMorf1 = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_DR_SIPPO),
(J3DModelData*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BMD_DR_SIPPO_e),
NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203
);
@@ -662,7 +662,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
}
i_this->mpMorf1->getModel()->setUserArea((u32)i_this);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BDL_IWA00);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BDL_IWA00_e);
JUT_ASSERT(DEMO_SELECT(1347, 1361), modelData != NULL);
i_this->unk_418 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
@@ -670,7 +670,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_GAN_MAGMA);
modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BMD_GAN_MAGMA_e);
JUT_ASSERT(DEMO_SELECT(1356, 1370), modelData != NULL);
i_this->unk_41C = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
@@ -683,7 +683,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
J3DAnmTextureSRTKey* srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", DR2_BTK_GAN_MAGMA);
J3DAnmTextureSRTKey* srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BTK_GAN_MAGMA_e);
BOOL init = i_this->unk_420->init(i_this->unk_41C->getModelData(), srtKey, true, J3DFrameCtrl::EMode_NONE);
#if VERSION > VERSION_DEMO
if (!init) {
@@ -701,15 +701,15 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
}
}
i_this->mpMorf2 = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_DR),
NULL, NULL, (J3DAnmTransformKey*)dComIfG_getObjectRes("Dr2", DR2_BCK_DR_BOSS_DEMO1),
i_this->mpMorf2 = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BMD_DR_e),
NULL, NULL, (J3DAnmTransformKey*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BCK_DR_BOSS_DEMO1_e),
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203);
if (i_this->mpMorf2 == NULL || i_this->mpMorf2->getModel() == NULL) {
return FALSE;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_MBYO1);
modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BMD_MBYO1_e);
JUT_ASSERT(DEMO_SELECT(1405, 1429), modelData != NULL);
i_this->unk_428 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
@@ -717,7 +717,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_MBYO2);
modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BMD_MBYO2_e);
JUT_ASSERT(DEMO_SELECT(1412, 1436), modelData != NULL);
i_this->unk_42C = mDoExt_J3DModel__create(modelData,0,0x11020203);
@@ -730,7 +730,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", DR2_BTK_MBYO1);
srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BTK_MBYO1_e);
if (!i_this->unk_430->init(i_this->unk_428->getModelData(), srtKey, true, J3DFrameCtrl::EMode_LOOP)) {
return FALSE;
}
@@ -740,7 +740,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", DR2_BTK_MBYO2);
srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BTK_MBYO2_e);
if (!i_this->unk_434->init(i_this->unk_42C->getModelData(), srtKey, true, J3DFrameCtrl::EMode_NONE)) {
return FALSE;
}
@@ -750,7 +750,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
J3DAnmTevRegKey* tevRegKey = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dr2", DR2_BRK_MBYO2);
J3DAnmTevRegKey* tevRegKey = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BRK_MBYO2_e);
if (!i_this->unk_438->init(i_this->unk_42C->getModelData(), tevRegKey, true, J3DFrameCtrl::EMode_NONE)) {
return FALSE;
}
@@ -765,11 +765,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
cBgD_t* cBgD = (cBgD_t*)dComIfG_getObjectRes("Dr2", DR2_DZB_MBYO1);
cBgD_t* cBgD = (cBgD_t*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_DZB_MBYO1_e);
i_this->mpBgW1->Set(cBgD, dBgW::MOVE_BG_e, &i_this->unk_440);
i_this->mpBgW1->SetCrrFunc(dBgS_MoveBGProc_Typical);
cBgD = (cBgD_t*)dComIfG_getObjectRes("Dr2", DR2_DZB_MBYO2);
cBgD = (cBgD_t*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_DZB_MBYO2_e);
i_this->mpBgW2->Set(cBgD, dBgW::MOVE_BG_e, &i_this->unk_470);
i_this->mpBgW2->SetCrrFunc(dBgS_MoveBGProc_Typical);
src/d/actor/d_a_ep.cpp
+4 -4
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_ep.h"
#include "d/res/res_ep.h"
#include "res/Object/Ep.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_com_inf_game.h"
@@ -508,9 +508,9 @@ static BOOL daEp_CreateHeap(fopAc_ac_c* a_this) {
J3DModelData* modelData;
if (i_this->mbHasObm == 0) {
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Ep", EP_BDL_VKTSD));
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Ep", dRes_INDEX_EP_BDL_VKTSD_e));
} else {
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Ep", EP_BDL_OBM_SHOKUDAI1));
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Ep", dRes_INDEX_EP_BDL_OBM_SHOKUDAI1_e));
}
JUT_ASSERT(DEMO_SELECT(996, 997), modelData != NULL);
@@ -524,7 +524,7 @@ static BOOL daEp_CreateHeap(fopAc_ac_c* a_this) {
}
if (i_this->mbHasGa != 0) {
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Ep", EP_BDL_EP_GA));
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Ep", dRes_INDEX_EP_BDL_EP_GA_e));
JUT_ASSERT(DEMO_SELECT(1007, 1010), modelData != NULL);
for (s32 i = 0; i < 2; i++) {
src/d/actor/d_a_esa.cpp
+2 -2
View File
@@ -12,7 +12,7 @@
#include "d/d_s_play.h"
#include "d/d_com_inf_game.h"
#include "d/d_bg_s_func.h"
#include "d/res/res_link.h"
#include "res/Object/Link.h"
#include "f_op/f_op_actor_mng.h"
/* 800E7E60-800E7EA8 .text daEsa_Draw__FP9esa_class */
@@ -226,7 +226,7 @@ static BOOL daEsa_Delete(esa_class* i_this) {
static BOOL daEsa_CreateHeap(fopAc_ac_c* i_actor) {
esa_class* i_this = static_cast<esa_class*>(i_actor);
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", LINK_BDL_ESA));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_ESA_e));
JUT_ASSERT(0x1E8, modelData != NULL);
i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
src/d/actor/d_a_fallrock.cpp
+4 -4
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_fallrock.h"
#include "d/res/res_always.h"
#include "res/Object/Always.h"
#include "d/d_com_inf_game.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
@@ -53,7 +53,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00000098-00000140 .text CreateHeap__12daFallRock_cFv */
BOOL daFallRock_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(m_arcname, ALWAYS_BDL_KROCK_00);
J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(m_arcname, dRes_INDEX_ALWAYS_BDL_KROCK_00_e);
JUT_ASSERT(DEMO_SELECT(159, 161), modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000,0x11020002);
@@ -255,9 +255,9 @@ void daFallRock_c::setParticle(int param_1, cXyz* pos) {
);
J3DModelData* modelData = (J3DModelData*)
dComIfG_getObjectRes(m_arcname, ALWAYS_BDL_MPI_KOISHI);
dComIfG_getObjectRes(m_arcname, dRes_INDEX_ALWAYS_BDL_MPI_KOISHI_e);
J3DAnmTexPattern* anmTexPattern = (J3DAnmTexPattern*)
dComIfG_getObjectRes(m_arcname, ALWAYS_BTP_MPI_KOISHI);
dComIfG_getObjectRes(m_arcname, dRes_INDEX_ALWAYS_BTP_MPI_KOISHI_e);
JPABaseEmitter* emitter = (JPABaseEmitter*)dComIfGp_particle_set(
dPa_name::ID_IT_JN_M_STS_HAHEN,
src/d/actor/d_a_fan.cpp
+9 -9
View File
@@ -5,9 +5,9 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_fan.h"
#include "d/res/res_hsen1.h"
#include "d/res/res_hsen3.h"
#include "d/res/res_yaflw00.h"
#include "res/Object/Hsen1.h"
#include "res/Object/Hsen3.h"
#include "res/Object/Yaflw00.h"
#include "f_op/f_op_kankyo_mng.h"
#include "d/d_com_inf_game.h"
#include "d/d_level_se.h"
@@ -16,8 +16,8 @@
const char* daFan_c::m_arcname[3] = { "Hsen1", "Hsen1", "Hsen3", };
const char daFan_c::m_arcname2[8] = "Yaflw00";
const s16 daFan_c::m_bdlidx[3] = { HSEN1_BDL_HSEN1, HSEN1_BDL_HSEN1, HSEN3_BDL_HSEN3, };
const s16 daFan_c::m_dzbidx[3] = { HSEN1_DZB_HSEN1, HSEN1_DZB_HSEN1, HSEN3_DZB_HSEN3, };
const s16 daFan_c::m_bdlidx[3] = { dRes_INDEX_HSEN1_BDL_HSEN1_e, dRes_INDEX_HSEN1_BDL_HSEN1_e, dRes_INDEX_HSEN3_BDL_HSEN3_e, };
const s16 daFan_c::m_dzbidx[3] = { dRes_INDEX_HSEN1_DZB_HSEN1_e, dRes_INDEX_HSEN1_DZB_HSEN1_e, dRes_INDEX_HSEN3_DZB_HSEN3_e, };
const f32 daFan_c::m_wind_length[3] = { 1600.0f, 1600.0f, 1220.0f, };
const f32 daFan_c::m_wind_r[3] = { 120.0f, 120.0f, 780.0f, };
const Vec daFan_c::m_wind_model_scale[3] = { { 1.0f, 1.6f, 1.0f, }, { 1.0f, 1.6f, 1.0f, }, { 3.0f, 2.9f, 3.0f, }, };
@@ -78,23 +78,23 @@ BOOL daFan_c::CreateHeap() {
return FALSE;
mModel->setUserArea((u32)this);
modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BDL_YAFLW00);
modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname2, dRes_INDEX_YAFLW00_BDL_YAFLW00_e);
JUT_ASSERT(0x17f, modelData != NULL);
mWindModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222);
if (mWindModel == NULL)
return FALSE;
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BTK_YAFLW00_01);
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, dRes_INDEX_YAFLW00_BTK_YAFLW00_01_e);
JUT_ASSERT(400, pbtk != NULL);
if (!mWindBtkAnm0.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0,-1, false, 0))
return FALSE;
pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BTK_YAFLW00_02);
pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, dRes_INDEX_YAFLW00_BTK_YAFLW00_02_e);
JUT_ASSERT(0x19c, pbtk != NULL);
if (!mWindBtkAnm1.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0,-1, false, 0))
return FALSE;
J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BCK_YAFLW00);
J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname2, dRes_INDEX_YAFLW00_BCK_YAFLW00_e);
JUT_ASSERT(0x1a9, pbck != NULL);
if (!mWindBckAnm.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0,-1, false))
return FALSE;
src/d/actor/d_a_ff.cpp
+3 -3
View File
@@ -10,7 +10,7 @@
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include "m_Do/m_Do_lib.h"
#include "d/res/res_ff.h"
#include "res/Object/Ff.h"
static s32 ff_count = 0;
@@ -250,8 +250,8 @@ static BOOL daFf_Delete(ff_class* i_this) {
/* 000011AC-0000138C .text useHeapInit__FP10fopAc_ac_c */
static BOOL useHeapInit(fopAc_ac_c* i_this) {
static u32 ho_bmd[] = {FF_BMD_HO, FF_BMD_HOP};
static u32 ho_brk[] = {FF_BRK_HO, FF_BRK_HOP};
static u32 ho_bmd[] = {dRes_INDEX_FF_BMD_HO_e, dRes_INDEX_FF_BMD_HOP_e};
static u32 ho_brk[] = {dRes_INDEX_FF_BRK_HO_e, dRes_INDEX_FF_BRK_HOP_e};
ff_class* a_this = (ff_class*)i_this;
for (int i = 0; i < 2; i++) {
src/d/actor/d_a_fganon.cpp
+53 -53
View File
@@ -15,8 +15,8 @@
#include "d/d_meter.h"
#include "d/d_s_play.h"
#include "d/d_snap.h"
#include "d/res/res_fganon.h"
#include "d/res/res_pgsw.h"
#include "res/Object/Fganon.h"
#include "res/Object/Pgsw.h"
#include "f_op/f_op_camera.h"
fganon_class* master;
@@ -102,9 +102,9 @@ static BOOL daFganon_Draw(fganon_class* i_this) {
/* Appear Animation 1 */
void deru_brk(fganon_class* i_this) {
fopAc_ac_c* a_this = &i_this->actor;
J3DAnmTevRegKey* ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_DERU_MAIN1);
J3DAnmTevRegKey* ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_DERU_MAIN1_e);
i_this->mpBrkAnm1->init(i_this->mpMorf->getModel()->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0);
ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_DERU_KEN1);
ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_DERU_KEN1_e);
i_this->mpBrkAnm2->init(i_this->mpKenModel->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0);
fopAcM_seStart(a_this, JA_SE_CM_PG_APPEAR, 0);
i_this->mbIsMaterialized = TRUE;
@@ -116,12 +116,12 @@ void kieru_brk(fganon_class* i_this, unsigned char param_2) {
fopAc_ac_c* a_this = &i_this->actor;
J3DAnmTevRegKey* ptrkAnm;
if ((param_2 == 0) || (param_2 == 1)) {
ptrkAnm = (J3DAnmTevRegKey *)(J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_KIERU_MAIN1);
ptrkAnm = (J3DAnmTevRegKey *)(J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_KIERU_MAIN1_e);
i_this->mpBrkAnm1->init(i_this->mpMorf->getModel()->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0);
fopAcM_seStart(a_this, JA_SE_CM_PG_DISAPPEAR, 0);
}
if ((param_2 == 0) || (param_2 == 2)) {
ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Pgsw", PGSW_BRK_KIERU_KEN1);
ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Pgsw", dRes_INDEX_PGSW_BRK_KIERU_KEN1_e);
i_this->mpBrkAnm2->init(i_this->mpKenModel->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0);
}
i_this->mbIsMaterialized = FALSE;
@@ -131,9 +131,9 @@ void kieru_brk(fganon_class* i_this, unsigned char param_2) {
/* Appear Animation 2 */
void deru_brk2(fganon_class* i_this) {
fopAc_ac_c* a_this = &i_this->actor;
J3DAnmTevRegKey* ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_DERU_MAIN2);
J3DAnmTevRegKey* ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_DERU_MAIN2_e);
i_this->mpBrkAnm1->init(i_this->mpMorf->getModel()->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0);
ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_DERU_KEN2);
ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_DERU_KEN2_e);
i_this->mpBrkAnm2->init(i_this->mpKenModel->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0);
fopAcM_seStart(a_this, JA_SE_CM_PG_APPEAR, 0);
i_this->mbIsMaterialized = TRUE;
@@ -144,9 +144,9 @@ void deru_brk2(fganon_class* i_this) {
void kieru_brk2(fganon_class* i_this) {
fopAc_ac_c* a_this = &i_this->actor;
J3DAnmTevRegKey* ptrkAnm;
ptrkAnm = (J3DAnmTevRegKey *)(J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_KIERU_MAIN2);
ptrkAnm = (J3DAnmTevRegKey *)(J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_KIERU_MAIN2_e);
i_this->mpBrkAnm1->init(i_this->mpMorf->getModel()->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0);
ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_KIERU_KEN2);
ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_KIERU_KEN2_e);
i_this->mpBrkAnm2->init(i_this->mpKenModel->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0);
fopAcM_seStart(a_this, JA_SE_CM_PG_DISAPPEAR, 0);
i_this->mbIsMaterialized = FALSE;
@@ -203,18 +203,18 @@ void fly(fganon_class* i_this) {
a_this->current.pos.y = player->current.pos.y + l_HIO.m10;
a_this->shape_angle.y = fopAcM_searchPlayerAngleY(a_this);
i_this->mMode = 1;
anm_init(i_this, FGANON_BCK_WAIT1, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m3A4[1] = 60;
break;
case 0:
anm_init(i_this, FGANON_BCK_WAIT1, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mMode++;
i_this->m3A0 = 0.0f;
i_this->m3A4[1] = (short)(cM_rndF(50.0f) + 50.0f);
// Fall-through
case 1:
if (i_this->m68A == 1) {
anm_init(i_this, FGANON_BCK_WAIT1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
cMtx_YrotS(*calc_mtx, i_this->m398);
cXyz offset;
@@ -261,7 +261,7 @@ void shot(fganon_class* i_this) {
if (i_this->m408) {
break;
}
anm_init(i_this, FGANON_BCK_TAME1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_TAME1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mMode++;
i_this->m3A4[0] = 40;
fopAcM_monsSeStart(a_this, JA_SE_CV_PG_EBALL_MAKE_S, 0);
@@ -275,7 +275,7 @@ void shot(fganon_class* i_this) {
fopAcM_seStart(a_this, JA_SE_CM_PG_EBALL_MAKING_S, 0);
}
if (i_this->m3A4[0] == 0) {
anm_init(i_this, FGANON_BCK_NAGERU1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_NAGERU1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mMode++;
fopAcM_monsSeStart(a_this, JA_SE_CV_PG_EBALL_FIRE_S, 0);
fopAcM_seStart(a_this, JA_SE_CM_PG_EBALL_FIRE_S, 0);
@@ -290,7 +290,7 @@ void shot(fganon_class* i_this) {
i_this->m689 = 0;
}
if (i_this->mpMorf->isStop()) {
anm_init(i_this, FGANON_BCK_WAIT1, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mMode++;
}
// Fall-through
@@ -301,10 +301,10 @@ void shot(fganon_class* i_this) {
if (local_34.abs() < DEMO_SELECT(REG6_F(1), REG0_F(1)) + (i_this->m404 * (DEMO_SELECT(REG6_F(0), REG0_F(0)) + 10.0f) + 400.0f)) {
if (i_this->m689 == 0) {
if (cM_rndF(1.0f) < 0.5f) {
anm_init(i_this, FGANON_BCK_TENNISLR1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_TENNISLR1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
}
else {
anm_init(i_this, FGANON_BCK_TENNISRL1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_TENNISRL1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
}
i_this->mMode++;
fopAcM_monsSeStart(a_this, JA_SE_CV_PG_REFLECT_EBALL, 0);
@@ -329,7 +329,7 @@ void shot(fganon_class* i_this) {
}
if (i_this->mpMorf->isStop() || ((i_this->m2BC >= 1) && (i_this->mpMorf->getFrame() >= 20.0f)))
{
anm_init(i_this, FGANON_BCK_WAIT1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mMode = 3;
}
// Fall-through
@@ -371,7 +371,7 @@ void spinattack(fganon_class* i_this) {
linChk.Set(&player->eyePos, &a_this->current.pos, a_this);
if (!dComIfG_Bgsp()->LineCross(&linChk)) {
a_this->current.pos.y -= 100.0f;
anm_init(i_this, FGANON_BCK_WAIT1, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mMode = 2;
i_this->m3A4[0] = 30;
deru_brk(i_this);
@@ -384,7 +384,7 @@ void spinattack(fganon_class* i_this) {
}
case 2: {
if (i_this->m3A4[0] == 0) {
anm_init(i_this, FGANON_BCK_KAITEN1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_KAITEN1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mMode = 3;
a_this->speedF = 0.0f;
fopAcM_monsSeStart(a_this, JA_SE_CV_PG_EBALL_FIRE_S, 0);
@@ -439,18 +439,18 @@ void fly2(fganon_class* i_this) {
a_this->current.pos.y = player->current.pos.y + l_HIO.m18;
a_this->shape_angle.y = fopAcM_searchPlayerAngleY(a_this);
i_this->mMode = 1;
anm_init(i_this, FGANON_BCK_WAIT1, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m3A4[1] = 40;
break;
case 0:
anm_init(i_this, FGANON_BCK_WAIT1, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mMode++;
i_this->m3A0 = 0.0f;
i_this->m3A4[1] = (short)(cM_rndF(50.0f) + 50.0f);
// Fall-through
case 1:
if (i_this->m68A == 1) {
anm_init(i_this, FGANON_BCK_WAIT1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
cMtx_YrotS(*calc_mtx, i_this->m398);
cXyz offset;
@@ -583,7 +583,7 @@ void shot2(fganon_class* i_this) {
int frame = i_this->mpMorf->getFrame();
switch(i_this->mMode) {
case 0: {
anm_init(i_this, FGANON_BCK_TAME_S1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_TAME_S1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
#if VERSION > VERSION_DEMO
for (int i = 0; i < 2; i++) {
if (i_this->mEmitters2[i] != NULL) {
@@ -606,7 +606,7 @@ void shot2(fganon_class* i_this) {
}
}
if (i_this->mpMorf->isStop()) {
anm_init(i_this, FGANON_BCK_TAME_S2, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_TAME_S2_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m3A4[0] = l_HIO.m3C;
i_this->mMode++;
for (int i = 0; i < 2; i++) {
@@ -627,7 +627,7 @@ void shot2(fganon_class* i_this) {
if (i_this->m3A4[0] != 0) {
break;
}
anm_init(i_this, FGANON_BCK_NAGERU_S1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_NAGERU_S1_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mMode++;
i_this->mEmitters2[0] = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGTHROWDARKBALLL00, &a_this->current.pos, NULL);
i_this->mEmitters2[1] = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGTHROWDARKBALLR00, &a_this->current.pos, NULL);
@@ -667,7 +667,7 @@ void shot2(fganon_class* i_this) {
}
case 4: {
if (i_this->m68A == 1) {
anm_init(i_this, FGANON_BCK_WAIT1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
if (i_this->m3A4[0] == 0) {
i_this->mAction = 9;
@@ -710,7 +710,7 @@ void spinattack2(fganon_class* i_this) {
cXyz transformedPos;
MtxPosition(&offset, &transformedPos);
a_this->current.pos = player->current.pos + transformedPos;
anm_init(i_this, FGANON_BCK_KAITEN_S1, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_KAITEN_S1_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mMode = 2;
deru_brk(i_this);
i_this->m38C = player->current.pos;
@@ -723,7 +723,7 @@ void spinattack2(fganon_class* i_this) {
cXyz local_e4;
local_e4 = i_this->m38C - a_this->current.pos;
if (local_e4.abs() < l_HIO.m38) {
anm_init(i_this, FGANON_BCK_KAITEN1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_KAITEN1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mMode = 3;
a_this->speedF = 0.0f;
fopAcM_monsSeStart(a_this, JA_SE_CV_PG_EBALL_FIRE_S, 0);
@@ -743,7 +743,7 @@ void spinattack2(fganon_class* i_this) {
if (i_this->m68F == 0) {
i_this->mMode = 4;
i_this->m3A4[0] = 40;
anm_init(i_this, FGANON_BCK_WAIT1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
else {
i_this->mAction = 2;
@@ -769,7 +769,7 @@ void down(fganon_class* i_this) {
fopAc_ac_c* a_this = &i_this->actor;
switch(i_this->mMode) {
case 0: {
anm_init(i_this, FGANON_BCK_DAMAGE1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_DAMAGE1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mMode++;
a_this->speed.y = 0.0f;
}
@@ -778,7 +778,7 @@ void down(fganon_class* i_this) {
if (i_this->mAcch.ChkGroundHit()) {
if (i_this->mpMorf->isStop()) {
i_this->mMode++;
anm_init(i_this, FGANON_BCK_TYAKUTI1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_TYAKUTI1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
}
}
i_this->m3A4[0] = l_HIO.m48;
@@ -787,7 +787,7 @@ void down(fganon_class* i_this) {
case 2: {
if (i_this->mpMorf->isStop()) {
i_this->mMode++;
anm_init(i_this, FGANON_BCK_DOWN1, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_DOWN1_e, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
break;
}
@@ -798,7 +798,7 @@ void down(fganon_class* i_this) {
break;
}
case 10: {
anm_init(i_this, FGANON_BCK_DAMAGE2, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_DAMAGE2_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mMode = 2;
}
default:
@@ -946,7 +946,7 @@ void fail(fganon_class* i_this) {
case 0: {
kieru_brk(i_this, 1);
i_this->mMode = 1;
anm_init(i_this, FGANON_BCK_DAMAGE2, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_DAMAGE2_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
break;
}
case 1: {
@@ -1120,7 +1120,7 @@ void start(fganon_class* i_this) {
if (distXZ < i_this->m2BD * 10.0f) {
i_this->mB54 = 1;
i_this->mMode = 1;
anm_init(i_this, FGANON_BCK_WAIT1, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_WAIT1_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
mDoAud_bgmAllMute(30);
}
break;
@@ -1130,7 +1130,7 @@ void start(fganon_class* i_this) {
break;
}
case 2: {
anm_init(i_this, FGANON_BCK_WARAU1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_WARAU1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
fopAcM_monsSeStart(a_this, JA_SE_CV_PG_LAUGH_2, 0);
i_this->mMode = 3;
break;
@@ -1138,7 +1138,7 @@ void start(fganon_class* i_this) {
case 4: {
i_this->mMode = 5;
i_this->m3A4[0] = DEMO_SELECT(REG17_S(0), REG0_S(0)) + 0x50;
anm_init(i_this, FGANON_BCK_TAME1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_TAME1_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
}
case 5: {
if (i_this->m3A4[0] == (s16)(DEMO_SELECT(REG17_S(0), REG0_S(0)) + 0x4B)) {
@@ -1177,7 +1177,7 @@ void end(fganon_class* i_this) {
switch(i_this->mMode) {
case 0: {
i_this->mMode = 1;
anm_init(i_this, FGANON_BCK_LAST_DAMAGE1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_LAST_DAMAGE1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mB54 = 50;
dComIfGs_onEventBit(dSv_event_flag_c::UNK_3F20); // PG_DEFEATED? It appears further down in `energy_ball_move`
break;
@@ -1189,14 +1189,14 @@ void end(fganon_class* i_this) {
}
case 2: {
deru_brk(i_this);
anm_init(i_this, FGANON_BCK_WARAU1, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_WARAU1_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
fopAcM_monsSeStart(a_this, JA_SE_CV_PG_LAUGH_2, 0);
i_this->mMode = 3;
break;
}
case 4: {
deru_brk(i_this);
anm_init(i_this, FGANON_BCK_SARU1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_SARU1_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mMode = 5;
a_this->speed.y = 0.0f;
fopAcM_seStart(a_this, JA_SE_CM_PG_END_1, 0);
@@ -1229,7 +1229,7 @@ void last_end(fganon_class* i_this) {
switch(i_this->mMode) {
case 0: {
i_this->mMode = 1;
anm_init(i_this, FGANON_BCK_MOGAKU1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_MOGAKU1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mB54 = 100;
i_this->m3C0 = 10000.0f;
i_this->m3A4[0] = REG0_S(4) + 25;
@@ -1397,7 +1397,7 @@ void damage_check(fganon_class* i_this) {
if (atInfo.mpActor && (fopAcM_GetName(atInfo.mpActor) == fpcNm_FGMAHOU_e)) {
i_this->m670++;
anm_init(i_this, FGANON_BCK_DAMAGE1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_DAMAGE1_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m3A4[0] = 60;
@@ -2395,7 +2395,7 @@ static BOOL daFganon_Execute(fganon_class* i_this) {
if (((((i_this->mAction == 5) || (i_this->mAction == 9)) || (i_this->mAction == 7)) || (i_this->mAction == 10)) && ((i_this->m68B != 0 && (i_this->m68A == 0)))) {
i_this->m68B = 0;
anm_init(i_this, FGANON_BCK_WARAU1, 6.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_FGANON_BCK_WARAU1_e, 6.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m68A = 60;
fopAcM_monsSeStart(a_this, JA_SE_CV_PG_LAUGH_3, 0);
}
@@ -2658,8 +2658,8 @@ static BOOL daFganon_Delete(fganon_class* i_this) {
static BOOL useHeapInit(fopAc_ac_c* i_act) {
fganon_class* i_this = (fganon_class*)i_act;
i_this->mpMorf = new mDoExt_McaMorf((J3DModelData *)dComIfG_getObjectRes("Fganon", FGANON_BDL_BPG), NULL, NULL,
(J3DAnmTransformKey *)dComIfG_getObjectRes("Fganon", FGANON_BCK_WAIT1),
i_this->mpMorf = new mDoExt_McaMorf((J3DModelData *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BDL_BPG_e), NULL, NULL,
(J3DAnmTransformKey *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BCK_WAIT1_e),
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0, 0x11020203);
if (i_this->mpMorf == NULL || i_this->mpMorf->getModel() == NULL)
@@ -2671,7 +2671,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) {
int brk1_res = i_this->mpBrkAnm1->init(
i_this->mpMorf->getModel()->getModelData(),
(J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", FGANON_BRK_DERU_MAIN1),
(J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_DERU_MAIN1_e),
TRUE,
J3DFrameCtrl::EMode_NONE,
1.0f,
@@ -2684,7 +2684,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) {
return FALSE;
J3DModelData* pModelData;
pModelData = (J3DModelData *)dComIfG_getObjectRes("Pgsw", PGSW_BDL_BPG_KEN1);
pModelData = (J3DModelData *)dComIfG_getObjectRes("Pgsw", dRes_INDEX_PGSW_BDL_BPG_KEN1_e);
i_this->mpKenModel = mDoExt_J3DModel__create(pModelData, 0, 0x11020203);
if (i_this->mpKenModel == NULL)
return FALSE;
@@ -2695,12 +2695,12 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) {
return FALSE;
int brk2_res = i_this->mpBrkAnm2->init(
pModelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", FGANON_BRK_DERU_KEN1), TRUE, J3DFrameCtrl::EMode_NONE
pModelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_DERU_KEN1_e), TRUE, J3DFrameCtrl::EMode_NONE
);
if (brk2_res == 0)
return FALSE;
pModelData = (J3DModelData *)dComIfG_getObjectRes("Fganon", FGANON_BDL_YDKBL00);
pModelData = (J3DModelData *)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BDL_YDKBL00_e);
i_this->mpEnergySphereModel = mDoExt_J3DModel__create(pModelData, 0, 0x11020203);
if (i_this->mpEnergySphereModel == NULL)
return FALSE;
@@ -2710,7 +2710,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) {
return FALSE;
int btk_res = i_this->mpBtkAnm->init(
pModelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Fganon", FGANON_BTK_YDKBL00), TRUE, J3DFrameCtrl::EMode_LOOP
pModelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BTK_YDKBL00_e), TRUE, J3DFrameCtrl::EMode_LOOP
);
if (btk_res == 0)
return FALSE;
@@ -2720,7 +2720,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) {
return FALSE;
int brk3_res = i_this->mpBrkAnm3->init(
pModelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", FGANON_BRK_YDKBL00), TRUE, J3DFrameCtrl::EMode_NONE
pModelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_YDKBL00_e), TRUE, J3DFrameCtrl::EMode_NONE
);
if (brk3_res == 0)
return FALSE;
src/d/actor/d_a_fgmahou.cpp
+4 -4
View File
@@ -9,7 +9,7 @@
#include "d/d_s_play.h"
#include "d/d_particle_name.h"
#include "d/actor/d_a_fganon.h"
#include "d/res/res_fganon.h"
#include "res/Object/Fganon.h"
/* 00000078-000000E4 .text daFgmahou_Draw__FP13fgmahou_class */
static BOOL daFgmahou_Draw(fgmahou_class* i_this) {
@@ -302,7 +302,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
fgmahou_class* i_this = static_cast<fgmahou_class*>(a_this);
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Fganon", FGANON_BDL_YDKSP00),
(J3DModelData*)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BDL_YDKSP00_e),
NULL, NULL,
NULL,
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1,
@@ -321,7 +321,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
if(i_this->mpBtk == NULL) {
return FALSE;
}
if(!i_this->mpBtk->init(pModelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Fganon", FGANON_BTK_YDKSP00), true, J3DFrameCtrl::EMode_LOOP)) {
if(!i_this->mpBtk->init(pModelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BTK_YDKSP00_e), true, J3DFrameCtrl::EMode_LOOP)) {
return FALSE;
}
@@ -329,7 +329,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
if(i_this->mpBrk == NULL) {
return FALSE;
}
if(!i_this->mpBrk->init(pModelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", FGANON_BRK_YDKSP00), true, J3DFrameCtrl::EMode_NONE)) {
if(!i_this->mpBrk->init(pModelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", dRes_INDEX_FGANON_BRK_YDKSP00_e), true, J3DFrameCtrl::EMode_NONE)) {
return FALSE;
}
i_this->mpBrk->setFrame(6.999f);
src/d/actor/d_a_floor.cpp
+3 -3
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_floor.h"
#include "d/res/res_hhyu1.h"
#include "res/Object/Hhyu1.h"
#include "d/d_com_inf_game.h"
#include "d/actor/d_a_player.h"
#include "m_Do/m_Do_mtx.h"
@@ -35,7 +35,7 @@ BOOL daFloor_c::Delete() {
/* 0000012C-000001E8 .text CreateHeap__9daFloor_cFv */
BOOL daFloor_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, HHYU1_BDL_HHYU1);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_HHYU1_BDL_HHYU1_e);
JUT_ASSERT(0xc1, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
if (mpModel == NULL)
@@ -62,7 +62,7 @@ cPhs_State daFloor_c::_create() {
cPhs_State rt = dComIfG_resLoad(&mPhs, m_arcname);
if (rt == cPhs_COMPLEATE_e) {
if (!MoveBGCreate(m_arcname, HHYU1_DZB_HHYU1, NULL, 0x8A0))
if (!MoveBGCreate(m_arcname, dRes_INDEX_HHYU1_DZB_HHYU1_e, NULL, 0x8A0))
return cPhs_ERROR_e;
}
return rt;
src/d/actor/d_a_fm.cpp
+18 -18
View File
@@ -17,7 +17,7 @@
#include "d/actor/d_a_npc_md.h"
#include "d/d_s_play.h"
#include "d/d_a_obj.h"
#include "d/res/res_fm.h"
#include "res/Object/fm.h"
#include "d/actor/d_a_player_main_data.h"
@@ -366,7 +366,7 @@ BOOL daFm_c::_createHeap() {
/* 00000718-0000086C .text holeCreateHeap__6daFm_cFv */
bool daFm_c::holeCreateHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, FM_BDL_YPIT00));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_FM_BDL_YPIT00_e));
JUT_ASSERT(0x2C7, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x19001222);
@@ -374,7 +374,7 @@ bool daFm_c::holeCreateHeap() {
return false;
}
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, FM_BTK_YPIT00));
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_FM_BTK_YPIT00_e));
JUT_ASSERT(0x2D0, btk != NULL);
if(!mBtkAnm.init(modelData, btk, TRUE, J3DFrameCtrl::EMode_LOOP)) {
@@ -386,7 +386,7 @@ bool daFm_c::holeCreateHeap() {
/* 0000086C-000009CC .text bodyCreateHeap__6daFm_cFv */
bool daFm_c::bodyCreateHeap() {
J3DModelData* fmModelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, FM_BDL_FM));
J3DModelData* fmModelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_FM_BDL_FM_e));
JUT_ASSERT(0x2DD, fmModelData != NULL);
mpMorf = new mDoExt_McaMorf(
@@ -397,7 +397,7 @@ bool daFm_c::bodyCreateHeap() {
NULL,
J3DFrameCtrl::EMode_NULL,
#else
static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes(m_arc_name, FM_BCK_MODORU)),
static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_FM_BCK_MODORU_e)),
J3DFrameCtrl::EMode_LOOP,
#endif
@@ -2478,19 +2478,19 @@ void daFm_c::modeProc(daFm_c::Proc_e proc, int newMode) {
/* 00006D8C-00006DE8 .text setAnm__6daFm_cFScb */
void daFm_c::setAnm(s8 anmPrmIdx, bool param_2) {
static const int a_anm_bcks_tbl[] = {
FM_BCK_WAIT,
FM_BCK_DERU,
FM_BCK_MODORU,
FM_BCK_TUKAMU,
FM_BCK_TUKAMU2WAIT,
FM_BCK_HIKIKOMU,
FM_BCK_DAMAGE,
FM_BCK_TUMAMIWAIT,
FM_BCK_ASITUKAMI,
FM_BCK_NAGERU,
FM_BCK_YAYU,
FM_BCK_MAHI,
FM_BCK_KUSIZASI
dRes_INDEX_FM_BCK_WAIT_e,
dRes_INDEX_FM_BCK_DERU_e,
dRes_INDEX_FM_BCK_MODORU_e,
dRes_INDEX_FM_BCK_TUKAMU_e,
dRes_INDEX_FM_BCK_TUKAMU2WAIT_e,
dRes_INDEX_FM_BCK_HIKIKOMU_e,
dRes_INDEX_FM_BCK_DAMAGE_e,
dRes_INDEX_FM_BCK_TUMAMIWAIT_e,
dRes_INDEX_FM_BCK_ASITUKAMI_e,
dRes_INDEX_FM_BCK_NAGERU_e,
dRes_INDEX_FM_BCK_YAYU_e,
dRes_INDEX_FM_BCK_MAHI_e,
dRes_INDEX_FM_BCK_KUSIZASI_e
};
static const dLib_anm_prm_c a_anm_prm_tbl[] = {
src/d/actor/d_a_ghostship.cpp
+7 -7
View File
@@ -5,13 +5,13 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_ghostship.h"
#include "d/res/res_ayush.h"
#include "res/Object/Ayush.h"
#include "SSystem/SComponent/c_math.h"
#include "m_Do/m_Do_mtx.h"
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include "d/d_kankyo_wether.h"
#include "d/res/res_cloth.h"
#include "res/Object/Cloth.h"
const u32 daGhostship_c::m_heapsize = 0x1EA0;
const char daGhostship_c::m_arc_name[] = "Ayush";
@@ -31,7 +31,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
/* 00000118-0000032C .text _createHeap__13daGhostship_cFv */
BOOL daGhostship_c::_createHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BDL_AYUSH));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_AYUSH_BDL_AYUSH_e));
JUT_ASSERT(DEMO_SELECT(80, 88), modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
@@ -39,16 +39,16 @@ BOOL daGhostship_c::_createHeap() {
return false;
}
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BTK_AYUSH));
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_AYUSH_BTK_AYUSH_e));
JUT_ASSERT(DEMO_SELECT(87, 95), btk != NULL);
if(!mBtk.init(modelData, btk, true, J3DFrameCtrl::EMode_LOOP)) {
return false;
}
ResTIMG* res1 = static_cast<ResTIMG*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BTI_B_GSHIP_HATA));
ResTIMG* res2 = static_cast<ResTIMG*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BTI_B_GSHIP_HO));
ResTIMG* res3 = static_cast<ResTIMG*>(dComIfG_getObjectRes(m_cloth_arc_name, CLOTH_BTI_CLOTHTOON));
ResTIMG* res1 = static_cast<ResTIMG*>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_AYUSH_BTI_B_GSHIP_HATA_e));
ResTIMG* res2 = static_cast<ResTIMG*>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_AYUSH_BTI_B_GSHIP_HO_e));
ResTIMG* res3 = static_cast<ResTIMG*>(dComIfG_getObjectRes(m_cloth_arc_name, dRes_INDEX_CLOTH_BTI_CLOTHTOON_e));
mpCloth = dCloth_packetXlu_create(res1, res3, 5, 5, 700.0f, 350.0f, &tevStr, 0);
mpCloth2 = dCloth_packetXlu_create(res2, res3, 6, 6, 1800.0f, 1000.0f, &tevStr, 0);
src/d/actor/d_a_goal_flag.cpp
+6 -6
View File
@@ -11,9 +11,9 @@
#if VERSION == VERSION_DEMO
#include "d/d_s_play.h"
#endif
#include "d/res/res_cloth.h"
#include "d/res/res_gflag.h"
#include "d/res/res_tgflag.h"
#include "res/Object/Cloth.h"
#include "res/Object/Gflag.h"
#include "res/Object/Tgflag.h"
#include "d/d_path.h"
#include "assets/l_txa_dummy_hataTEX.h"
@@ -138,8 +138,8 @@ void daGFlag_packet_c::setTexObj(u8 i_arcIdx) {
"Tgflag"
};
static const int index_tbl[] = {
GFLAG_BTI_B_FRAGGAIKOT,
TGFLAG_BTI_B_FRAGTORI
dRes_INDEX_GFLAG_BTI_B_FRAGGAIKOT_e,
dRes_INDEX_TGFLAG_BTI_B_FRAGTORI_e
};
// index_tbl likely existed in this function but passing
// an element of it into getObjectRes breaks the match
@@ -170,7 +170,7 @@ void daGFlag_packet_c::setTexObj(u8 i_arcIdx) {
/* 00000210-00000330 .text setToonTexObj__16daGFlag_packet_cFv */
void daGFlag_packet_c::setToonTexObj() {
ResTIMG* tex_info_p = (ResTIMG*) dComIfG_getObjectRes("Cloth", CLOTH_BTI_CLOTHTOON);
ResTIMG* tex_info_p = (ResTIMG*) dComIfG_getObjectRes("Cloth", dRes_INDEX_CLOTH_BTI_CLOTHTOON_e);
GXBool mipmap_cnt_over_one = GXBool(tex_info_p->mipmapCount > 1);
GXInitTexObj(
&mToonTexObj,
src/d/actor/d_a_himo2.cpp
+5 -5
View File
@@ -14,7 +14,7 @@
#include "d/d_com_inf_game.h"
#include "d/d_cc_d.h"
#include "d/d_s_play.h"
#include "d/res/res_link.h"
#include "res/Object/Link.h"
#include "f_op/f_op_camera.h"
#include "m_Do/m_Do_controller_pad.h"
#include "m_Do/m_Do_graphic.h"
@@ -1766,21 +1766,21 @@ static int CallbackCreateHeap(fopAc_ac_c* i_this) {
J3DModelData* modelData;
himo2_class* a_this = (himo2_class*)i_this;
pRVar1 = (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_ROPE);
pRVar1 = (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e);
if (!a_this->m1F30.init(1, 200, pRVar1, 0)) {
return FALSE;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Link", LINK_BDL_ROPEEND);
modelData = (J3DModelData*)dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_ROPEEND_e);
JUT_ASSERT(DEMO_SELECT(3833, 3933), modelData != NULL);
a_this->m24B0 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (a_this->m24B0 == NULL) {
return FALSE;
}
pRVar1 = (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_ROPE);
pRVar1 = (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e);
if (!a_this->m1F98.init(5, 0x20, pRVar1, 0)) {
return FALSE;
}
pRVar1 = (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_ROPE);
pRVar1 = (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e);
if (!a_this->m1FD8.init(1, 16, pRVar1, 0)) {
return FALSE;
}
src/d/actor/d_a_himo3.cpp
+9 -9
View File
@@ -6,12 +6,12 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_himo3.h"
#include "d/actor/d_a_player.h"
#include "d/res/res_always.h"
#include "res/Object/Always.h"
#if VERSION > VERSION_DEMO
#include "d/res/res_bgn.h"
#include "res/Object/Bgn.h"
#endif
#include "d/res/res_link.h"
#include "d/res/res_himo3.h"
#include "res/Object/Link.h"
#include "res/Object/Himo3.h"
#include "d/d_s_play.h"
#include "d/d_com_inf_game.h"
#include "d/d_kankyo_wether.h"
@@ -614,18 +614,18 @@ static BOOL daHimo3_Delete(himo3_class* i_this) {
/* 00001AE0-00001DD4 .text useHeapInit__FP11himo3_class */
cPhs_State useHeapInit(himo3_class* i_this) {
fopAc_ac_c* actor = &i_this->actor;
static int hook_bmd[] = {HIMO3_BMD_SLAMP_00, LINK_BDL_ROPEEND, HIMO3_BMD_SLAMP_00, HIMO3_BMD_SLAMP_00, HIMO3_BMD_SLAMP_00};
static int hook_bmd[] = {dRes_INDEX_HIMO3_BMD_SLAMP_00_e, dRes_INDEX_LINK_BDL_ROPEEND_e, dRes_INDEX_HIMO3_BMD_SLAMP_00_e, dRes_INDEX_HIMO3_BMD_SLAMP_00_e, dRes_INDEX_HIMO3_BMD_SLAMP_00_e};
#if VERSION == VERSION_DEMO
if (!i_this->mLineMat.init(1, 200, (ResTIMG*)dComIfG_getObjectRes("Always", i_this->m0298 == 0xf ? ALWAYS_BTI_TXM_ROPE1 : ALWAYS_BTI_ROPE), 0)) {
if (!i_this->mLineMat.init(1, 200, (ResTIMG*)dComIfG_getObjectRes("Always", i_this->m0298 == 0xf ? dRes_INDEX_ALWAYS_BTI_TXM_ROPE1_e : dRes_INDEX_ALWAYS_BTI_ROPE_e), 0)) {
return cPhs_ERROR_e;
}
#else
if (i_this->m0298 == 0xf) {
if (!i_this->mLineMat.init(1, 200, (ResTIMG*)dComIfG_getObjectRes("Bgn", BGN_BTI_NOT_CUT1), 0)) {
if (!i_this->mLineMat.init(1, 200, (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_NOT_CUT1_e), 0)) {
return cPhs_ERROR_e;
}
} else if (!i_this->mLineMat.init(1, 200, (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_ROPE), 0)) {
} else if (!i_this->mLineMat.init(1, 200, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), 0)) {
return cPhs_ERROR_e;
}
#endif
@@ -647,7 +647,7 @@ cPhs_State useHeapInit(himo3_class* i_this) {
}
if (i_this->m0298 == 0) {
modelData = (J3DModelData*)dComIfG_getObjectRes("Himo3", HIMO3_BMD_H3_GA);
modelData = (J3DModelData*)dComIfG_getObjectRes("Himo3", dRes_INDEX_HIMO3_BMD_H3_GA_e);
JUT_ASSERT(DEMO_SELECT(1264, 1298), modelData != NULL);
s32 tmp = 0;
src/d/actor/d_a_hmlif.cpp
+7 -7
View File
@@ -5,9 +5,9 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_hmlif.h"
#include "d/res/res_hmlif.h"
#include "d/res/res_hyuf1.h"
#include "d/res/res_hyuf2.h"
#include "res/Object/Hmlif.h"
#include "res/Object/Hyuf1.h"
#include "res/Object/Hyuf2.h"
#include "d/d_path.h"
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
@@ -31,10 +31,10 @@ const f32 daHmlif_c::m_speed[] = {
25.0f,
26.666666f,
};
const s16 daHmlif_c::m_bmdidx[] = {HMLIF_BDL_HMLIF, HYUF1_BDL_HYUF1, HYUF2_BDL_HYUF2};
const s16 daHmlif_c::m_dzbidx[] = {HMLIF_DZB_HMLIF, HYUF1_DZB_HYUF1, HYUF2_DZB_HYUF2};
const s16 daHmlif_c::m_btpidx[] = {-1, HYUF1_BTP_HYUF1, HYUF2_BTP_HYUF2};
const s16 daHmlif_c::m_brkidx[] = {HMLIF_BRK_HMLIF, HYUF1_BRK_HYUF1, -1};
const s16 daHmlif_c::m_bmdidx[] = {dRes_INDEX_HMLIF_BDL_HMLIF_e, dRes_INDEX_HYUF1_BDL_HYUF1_e, dRes_INDEX_HYUF2_BDL_HYUF2_e};
const s16 daHmlif_c::m_dzbidx[] = {dRes_INDEX_HMLIF_DZB_HMLIF_e, dRes_INDEX_HYUF1_DZB_HYUF1_e, dRes_INDEX_HYUF2_DZB_HYUF2_e};
const s16 daHmlif_c::m_btpidx[] = {-1, dRes_INDEX_HYUF1_BTP_HYUF1_e, dRes_INDEX_HYUF2_BTP_HYUF2_e};
const s16 daHmlif_c::m_brkidx[] = {dRes_INDEX_HMLIF_BRK_HMLIF_e, dRes_INDEX_HYUF1_BRK_HYUF1_e, -1};
const f32 daHmlif_c::m_cull_box[][6] = {
{-200.0f, -100.0f, -200.0f, 200.0f, 50.0f, 200.0f},
src/d/actor/d_a_hys.cpp
+4 -4
View File
@@ -5,18 +5,18 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_hys.h"
#include "d/res/res_hys.h"
#include "res/Object/Hys.h"
#include "d/d_com_inf_game.h"
#include "m_Do/m_Do_mtx.h"
const char* daHys_c::m_arcname[2] = {"Hys", "Hys"};
/* Model file indexes. */
const s16 daHys_c::m_bdlidx[2] = {HYS_BDL_HYS, HYS_BDL_HYS};
const s16 daHys_c::m_bdlidx[2] = {dRes_INDEX_HYS_BDL_HYS_e, dRes_INDEX_HYS_BDL_HYS_e};
/* Texture animation file indexes. */
const s16 daHys_c::m_btpidx[2] = {HYS_BTP_HYS, HYS_BTP_HYS};
const s16 daHys_c::m_btpidx[2] = {dRes_INDEX_HYS_BTP_HYS_e, dRes_INDEX_HYS_BTP_HYS_e};
/* Collision mesh file indexes. */
const s16 daHys_c::m_dzbidx[2] = {HYS_DZB_HYS, HYS_DZB_HYS};
const s16 daHys_c::m_dzbidx[2] = {dRes_INDEX_HYS_DZB_HYS_e, dRes_INDEX_HYS_DZB_HYS_e};
const u32 daHys_c::m_heapsize[2] = {0xA00, 0xA00};
const f32 daHys_c::m_tg_r[2] = {35.0f, 70.0f};
src/d/actor/d_a_ib.cpp
+5 -5
View File
@@ -422,24 +422,24 @@ cPhs_State daIball_c::_daIball_create() {
/* 800F489C-800F4B40 .text CreateHeap__9daIball_cFv */
BOOL daIball_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, ALWAYS_BDL_IB);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_ALWAYS_BDL_IB_e);
JUT_ASSERT(DEMO_SELECT(1133, 1135), modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222);
if (!mpModel) { return FALSE; }
J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, ALWAYS_BCK_START);
J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_ALWAYS_BCK_START_e);
JUT_ASSERT(DEMO_SELECT(1150, 1152), pbck != NULL);
int ret = mBckAnm.init(modelData, pbck, 1, J3DFrameCtrl::EMode_NONE);
if (!ret) { return FALSE; }
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, ALWAYS_BTK_IB);
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_ALWAYS_BTK_IB_e);
JUT_ASSERT(DEMO_SELECT(1162, 1164), pbtk != NULL);
ret = mBtkAnm.init(modelData, pbtk, 1, J3DFrameCtrl::EMode_LOOP);
if (!ret) { return FALSE; }
int brkIds[ARRAY_SIZE(mBrkAnm)] = {
ALWAYS_BRK_IB_01,
ALWAYS_BRK_IB_02,
dRes_INDEX_ALWAYS_BRK_IB_01_e,
dRes_INDEX_ALWAYS_BRK_IB_02_e,
};
J3DAnmTevRegKey* pbrk;
for (int i = 0; i < (int)ARRAY_SIZE(mBrkAnm); i++) {
src/d/actor/d_a_ikari.cpp
+11 -11
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_ikari.h"
#include "d/res/res_ikari.h"
#include "res/Object/Ikari.h"
#include "d/d_kankyo_wether.h"
#include "d/d_s_play.h"
#include "m_Do/m_Do_mtx.h"
@@ -36,17 +36,17 @@ void daIkari_c::setMtx() {
BOOL daIkari_c::_createHeap() {
static int ikari_bdl[5] = {
#if VERSION == VERSION_DEMO
IKARI_BMD_S_IKARI2,
IKARI_BMD_S_IKARI2,
IKARI_BMD_S_IKARI2,
IKARI_BMD_S_IKARI3,
IKARI_BMD_S_IKARI4,
dRes_INDEX_IKARI_BMD_S_IKARI2_e,
dRes_INDEX_IKARI_BMD_S_IKARI2_e,
dRes_INDEX_IKARI_BMD_S_IKARI2_e,
dRes_INDEX_IKARI_BMD_S_IKARI3_e,
dRes_INDEX_IKARI_BMD_S_IKARI4_e,
#else
IKARI_BDL_S_IKARI2,
IKARI_BDL_S_IKARI2,
IKARI_BDL_S_IKARI2,
IKARI_BDL_S_IKARI3,
IKARI_BDL_S_IKARI4,
dRes_INDEX_IKARI_BDL_S_IKARI2_e,
dRes_INDEX_IKARI_BDL_S_IKARI2_e,
dRes_INDEX_IKARI_BDL_S_IKARI2_e,
dRes_INDEX_IKARI_BDL_S_IKARI3_e,
dRes_INDEX_IKARI_BDL_S_IKARI4_e,
#endif
};
src/d/actor/d_a_jbo.cpp
+6 -6
View File
@@ -9,7 +9,7 @@
#include "d/d_com_inf_game.h"
#include "d/d_kankyo.h"
#include "d/d_s_play.h"
#include "d/res/res_jbo.h"
#include "res/Object/Jbo.h"
#include "f_op/f_op_actor_mng.h"
#define JUMP_ANIMATION_TIME 70
@@ -76,7 +76,7 @@ void jbo_move(jbo_class* i_this) {
switch (i_this->mMode) {
case daJbo_Mode_IDLE_e: {
if (dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK80_e) && i_this->mCoSph.ChkCoHit()) {
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("JBO", JBO_BCK_IN1);
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("JBO", dRes_INDEX_JBO_BCK_IN1_e);
i_this->mpMorf->setAnm(anm, J3DFrameCtrl::EMode_NONE, 0.0, 1.0, 0.0, -1.0, NULL);
fopAcM_seStart(actor, JA_SE_OBJ_JFLOWER_IN, 0);
dComIfGp_setItemMagicCount(4);
@@ -93,7 +93,7 @@ void jbo_move(jbo_class* i_this) {
player->onForceVomitJump();
}
if (dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK80000000_e)) {
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("JBO", JBO_BCK_OUT1);
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("JBO", dRes_INDEX_JBO_BCK_OUT1_e);
i_this->mpMorf->setAnm(anm, J3DFrameCtrl::EMode_NONE, 0.0, 1.0, 0.0, -1.0, NULL);
fopAcM_seStart(actor, JA_SE_OBJ_JFLOWER_OUT, 0);
i_this->mAnimationSpeed = 0;
@@ -161,10 +161,10 @@ static BOOL daJBO_Delete(jbo_class* i_this) {
static BOOL useHeapInit(fopAc_ac_c* i_this) {
jbo_class* a_this = (jbo_class*)i_this;
mDoExt_McaMorf* morf = new mDoExt_McaMorf(
(J3DModelData *)dComIfG_getObjectRes("JBO", JBO_BMD_JH),
(J3DModelData *)dComIfG_getObjectRes("JBO", dRes_INDEX_JBO_BMD_JH_e),
/*callback1=*/ NULL,
/*callback2=*/ NULL,
(J3DAnmTransformKey *)dComIfG_getObjectRes("JBO", JBO_BCK_IN1),
(J3DAnmTransformKey *)dComIfG_getObjectRes("JBO", dRes_INDEX_JBO_BCK_IN1_e),
J3DFrameCtrl::EMode_RESET,
0.0f,
0,
@@ -241,7 +241,7 @@ static cPhs_State daJBO_Create(fopAc_ac_c* i_this) {
a_this->mCoSph.ClrCoSet();
}
if (a_this->mType == daJbo_Type_POPS_UP_e) {
J3DAnmTransform* pAnimRes = (J3DAnmTransform*) dComIfG_getObjectRes("JBO", JBO_BCK_UMARERU1);
J3DAnmTransform* pAnimRes = (J3DAnmTransform*) dComIfG_getObjectRes("JBO", dRes_INDEX_JBO_BCK_UMARERU1_e);
a_this->mpMorf->setAnm(pAnimRes, J3DFrameCtrl::EMode_NONE, 0.0, 1.0, 0.0, -1.0, NULL);
fopAcM_seStart(i_this, JA_SE_CM_BV_BASE_POPUP, 0);
a_this->mMode = daJbo_Mode_SPAWN_e;
src/d/actor/d_a_kaji.cpp
+4 -4
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_kaji.h"
#include "d/res/res_kaji.h"
#include "res/Object/Kaji.h"
#include "f_op/f_op_actor_mng.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "m_Do/m_Do_mtx.h"
@@ -24,15 +24,15 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00000098-000001F4 .text CreateHeap__8daKaji_cFv */
BOOL daKaji_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, KAJI_INDEX_BDL_ASODA);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_KAJI_BDL_ASODA_e);
JUT_ASSERT(0x55, modelData != NULL);
mpMorf = new mDoExt_McaMorf(
modelData,
NULL, NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Kaji", KAJI_INDEX_BCK_KJ_WAIT),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Kaji", dRes_INDEX_KAJI_BCK_KJ_WAIT_e),
J3DFrameCtrl::EMode_LOOP, 0.0f, 0, -1, 1,
dComIfG_getObjectRes("Kaji", KAJI_INDEX_BAS_KJ_WAIT),
dComIfG_getObjectRes("Kaji", dRes_INDEX_KAJI_BAS_KJ_WAIT_e),
0x00080000,
0x11000002
);
src/d/actor/d_a_kamome.cpp
+53 -53
View File
@@ -7,7 +7,7 @@
#include "d/actor/d_a_kamome.h"
#include "d/actor/d_a_esa.h"
#include "d/actor/d_a_sea.h"
#include "d/res/res_kamome.h"
#include "res/Object/Kamome.h"
#include "m_Do/m_Do_ext.h"
#include "d/d_snap.h"
#include "d/d_com_inf_game.h"
@@ -46,9 +46,9 @@ static s32 ko_count;
/* 000000EC-000001E4 .text anm_init__FP12kamome_classifUcfi */
void anm_init(kamome_class* i_this, int anmResIdx, float morf, unsigned char loopMode, float speed, int soundAnmResIdx) {
if (REG0_S(3) == 0x23) {
anmResIdx = KAMOME_BCK_KA_LAND1;
anmResIdx = dRes_INDEX_KAMOME_BCK_KA_LAND1_e;
} else if (REG0_S(3) == 0x24) {
anmResIdx = KAMOME_BCK_KA_FLY1;
anmResIdx = dRes_INDEX_KAMOME_BCK_KA_FLY1_e;
}
i_this->mpMorf->setAnm(
(J3DAnmTransform*)dComIfG_getObjectRes("Kamome", anmResIdx), loopMode, morf, speed, 0.0f, -1.0f, dComIfG_getObjectRes("Kamome", soundAnmResIdx)
@@ -320,7 +320,7 @@ void kamome_heisou_move(kamome_class* i_this) {
frame = i_this->mpMorf->getFrame();
if ((i_this->mTimers[0] == 0) && (frame == REG0_S(0) + 9)) {
i_this->mAnimState = 1;
anm_init(i_this, KAMOME_BCK_KA_WAIT1, REG0_F(0) + 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT1);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, REG0_F(0) + 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e);
}
break;
@@ -328,11 +328,11 @@ void kamome_heisou_move(kamome_class* i_this) {
if ((i_this->mGlobalTimer & 0x3fU) == 0 && cM_rndF(1.0f) < 0.5f) {
i_this->mGlobalTimer = (s16)cM_rndF(10000.0f);
i_this->mAnimState = 2;
anm_init(i_this, KAMOME_BCK_KA_SING1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_SING1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
} else if ((i_this->mTimers[0] == 0) && (a_this->current.pos.y < i_this->mTargetPos.y)) {
i_this->mAnimState = 0;
i_this->mTimers[0] = cM_rndF(60.0f) + 20.0f;
anm_init(i_this, KAMOME_BCK_KA_WAIT2, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT2);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e);
}
break;
@@ -344,7 +344,7 @@ void kamome_heisou_move(kamome_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->mAnimState = 1;
anm_init(i_this, KAMOME_BCK_KA_WAIT1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT1);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e);
}
break;
}
@@ -437,7 +437,7 @@ void kamome_path_move(kamome_class* i_this) {
if ((a_this->current.pos.y > i_this->mTargetPos.y) && (frame == REG0_S(0) + 9)) {
i_this->mAnimState = 1;
i_this->mTimers[0] = cM_rndF(200.0f) + 50.0f;
anm_init(i_this, KAMOME_BCK_KA_WAIT1, REG0_F(0) + 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT1);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, REG0_F(0) + 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e);
}
break;
@@ -445,10 +445,10 @@ void kamome_path_move(kamome_class* i_this) {
if (((i_this->mGlobalTimer & 0x3f) == 0) && cM_rndF(1.0) < 0.5f) {
i_this->mGlobalTimer = (s16)cM_rndF(10000.0f);
i_this->mAnimState = 2;
anm_init(i_this, KAMOME_BCK_KA_SING1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_SING1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
} else if (a_this->current.pos.y <= i_this->mTargetPos.y) {
i_this->mAnimState = 0;
anm_init(i_this, KAMOME_BCK_KA_WAIT2, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT2);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e);
}
break;
@@ -461,7 +461,7 @@ void kamome_path_move(kamome_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->mAnimState = 1;
i_this->mTimers[0] = cM_rndF(100.0f) + 20.0f;
anm_init(i_this, KAMOME_BCK_KA_WAIT1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT1);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e);
}
break;
@@ -471,7 +471,7 @@ void kamome_path_move(kamome_class* i_this) {
case 19:
if (i_this->mpMorf->isStop()) {
i_this->mAnimState = 0;
anm_init(i_this, KAMOME_BCK_KA_WAIT2, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT2);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e);
}
break;
@@ -563,7 +563,7 @@ void kamome_path_move(kamome_class* i_this) {
if (std::sqrtf(SQUARE(x) + SQUARE(y) + SQUARE(z)) < REG6_F(9) * 10.0f + 300.0f) {
i_this->mMoveState = 0x14;
anm_init(i_this, KAMOME_BCK_KA_LAND1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, KAMOME_BAS_KA_LAND1);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_LAND1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_KAMOME_BAS_KA_LAND1_e);
i_this->mAnimState = 10;
a_this->speed.y = 0.0f;
i_this->m2FC = a_this->current.angle.y + (s16)cM_rndFX(15000.0f);
@@ -592,7 +592,7 @@ void kamome_path_move(kamome_class* i_this) {
}
if (i_this->mpMorf->isStop()) {
anm_init(i_this, KAMOME_BCK_KA_WAIT3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0);
}
if (i_this->mTimers[2] == 0) {
@@ -626,12 +626,12 @@ void kamome_path_move(kamome_class* i_this) {
i_this->mTargetPos = pdVar8->m_position;
if (pdVar8->mArg3 == 2) {
i_this->mMoveState = 0x19;
anm_init(i_this, KAMOME_BCK_KA_FLY1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, KAMOME_BAS_KA_FLY1);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_FLY1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_KAMOME_BAS_KA_FLY1_e);
} else {
i_this->mMoveState = 0x17;
i_this->mRotVel = 2500.0f;
i_this->mRotVelFade = 1.0f;
anm_init(i_this, KAMOME_BCK_KA_MOVE1, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_MOVE1);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_MOVE1_e, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_MOVE1_e);
}
}
i_this->mVelocityFwdTarget = 0.0f;
@@ -663,11 +663,11 @@ void kamome_path_move(kamome_class* i_this) {
pdVar8 += i_this->mCurPointIdx;
if (cM_rndF(1.0f) < 0.5f) {
i_this->mMoveState = 0x13;
anm_init(i_this, KAMOME_BCK_KA_SING2, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_SING2_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
} else {
i_this->mMoveState = 0x16;
if (pdVar8->mArg3 == 3) {
anm_init(i_this, KAMOME_BCK_KA_WAIT3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0);
i_this->mTimers[2] = cM_rndF(50.0f) + 50.0f;
}
}
@@ -721,7 +721,7 @@ void kamome_auto_move(kamome_class* i_this) {
frame = i_this->mpMorf->getFrame();
if ((i_this->mTimers[0] == 0) && (frame == REG0_S(0) + 9)) {
i_this->mAnimState = 1;
anm_init(i_this, KAMOME_BCK_KA_WAIT1, REG0_F(0) + 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT1);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, REG0_F(0) + 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e);
}
break;
@@ -729,11 +729,11 @@ void kamome_auto_move(kamome_class* i_this) {
if ((i_this->mGlobalTimer & 0x3f) == 0 && cM_rndF(1.0) < 0.5f) {
i_this->mGlobalTimer = (s16)cM_rndF(10000.0f);
i_this->mAnimState = 2;
anm_init(i_this, KAMOME_BCK_KA_SING1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_SING1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
} else if ((i_this->mTimers[0] == 0) && (a_this->current.pos.y < i_this->mTargetPos.y)) {
i_this->mAnimState = 0;
i_this->mTimers[0] = cM_rndF(60.0f) + 20.0f;
anm_init(i_this, KAMOME_BCK_KA_WAIT2, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT2);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e);
}
break;
@@ -745,7 +745,7 @@ void kamome_auto_move(kamome_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->mAnimState = 1;
anm_init(i_this, KAMOME_BCK_KA_WAIT1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT1);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e);
}
break;
@@ -756,7 +756,7 @@ void kamome_auto_move(kamome_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->mAnimState = 0;
i_this->mTimers[0] = cM_rndF(60.0f) + 20.0f;
anm_init(i_this, KAMOME_BCK_KA_WAIT2, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT2);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e);
}
case 20:
@@ -815,7 +815,7 @@ void kamome_auto_move(kamome_class* i_this) {
z = i_this->mTargetPos.z - a_this->current.pos.z;
if (std::sqrtf(SQUARE(x) + SQUARE(y) + SQUARE(z)) < REG6_F(9) * 10.0f + 300.0f) {
i_this->mMoveState = 0x14;
anm_init(i_this, KAMOME_BCK_KA_LAND1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, KAMOME_BAS_KA_LAND1);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_LAND1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_KAMOME_BAS_KA_LAND1_e);
i_this->mAnimState = 10;
a_this->speed.y = 0.0f;
i_this->m2FC = a_this->current.angle.y + (s16)cM_rndFX(15000.0f);
@@ -847,7 +847,7 @@ void kamome_auto_move(kamome_class* i_this) {
}
if (i_this->mpMorf->isStop()) {
anm_init(i_this, KAMOME_BCK_KA_WAIT3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0);
}
if (i_this->mTimers[2] == 0) {
@@ -860,7 +860,7 @@ void kamome_auto_move(kamome_class* i_this) {
pfVar4 = search_esa(i_this);
if (pfVar4 == NULL) {
i_this->mMoveState = 0x19;
anm_init(i_this, KAMOME_BCK_KA_FLY1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, KAMOME_BAS_KA_FLY1);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_FLY1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_KAMOME_BAS_KA_FLY1_e);
} else {
i_this->mEsaProcID = fopAcM_GetID(pfVar4);
i_this->mMoveState = 0x16;
@@ -878,10 +878,10 @@ void kamome_auto_move(kamome_class* i_this) {
if (pfVar4 != NULL) {
i_this->mTargetPos.x = pfVar4->current.pos.x;
i_this->mTargetPos.z = pfVar4->current.pos.z;
anm_init(i_this, KAMOME_BCK_KA_MOVE1, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_MOVE1);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_MOVE1_e, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_MOVE1_e);
} else {
i_this->mMoveState = 0x19;
anm_init(i_this, KAMOME_BCK_KA_FLY1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, KAMOME_BAS_KA_FLY1);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_FLY1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_KAMOME_BAS_KA_FLY1_e);
}
}
break;
@@ -891,7 +891,7 @@ void kamome_auto_move(kamome_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->mMoveState = 0x15;
i_this->mTimers[2] = cM_rndF(30.0f) + 20.0f;
anm_init(i_this, KAMOME_BCK_KA_WAIT3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0);
}
i_this->mVelocityFwdTarget = 0.0f;
a_this->speedF = 0.0f;
@@ -913,13 +913,13 @@ void kamome_auto_move(kamome_class* i_this) {
x = i_this->mTargetPos.x - a_this->current.pos.x;
z = i_this->mTargetPos.z - a_this->current.pos.z;
if (std::sqrtf(SQUARE(x) + SQUARE(z)) < 85.0f) {
anm_init(i_this, KAMOME_BCK_KA_EAT1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_EAT1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
i_this->mMoveState = 0x18;
}
if (i_this->mAcch.ChkWallHit()) {
i_this->mMoveState = 0x19;
anm_init(i_this, KAMOME_BCK_KA_FLY1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, KAMOME_BAS_KA_FLY1);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_FLY1_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_KAMOME_BAS_KA_FLY1_e);
}
}
break;
@@ -939,11 +939,11 @@ void kamome_auto_move(kamome_class* i_this) {
if (i_this->mpMorf->isStop()) {
if (cM_rndF(1.0f) < 0.2f) {
i_this->mMoveState = 0x13;
anm_init(i_this, KAMOME_BCK_KA_SING2, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_SING2_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
} else {
i_this->mMoveState = 0x15;
i_this->mTimers[2] = cM_rndF(20.0f);
anm_init(i_this, KAMOME_BCK_KA_WAIT3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0);
}
}
break;
@@ -993,7 +993,7 @@ void kamome_auto_move(kamome_class* i_this) {
}
i_this->mAnimState = 0;
i_this->mTimers[0] = cM_rndF(60.0f) + 20.0f;
anm_init(i_this, KAMOME_BCK_KA_WAIT2, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.5f, KAMOME_BAS_KA_WAIT2);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.5f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e);
if (i_this->mPathIdx != 0xff) {
i_this->mbUsePathMovement = i_this->mPathIdx + 1;
i_this->mTimers[3] = cM_rndF(250.0f) + 250.0f;
@@ -1029,7 +1029,7 @@ void kamome_imouto_move(kamome_class* i_this) {
frame = i_this->mpMorf->getFrame();
if ((i_this->mTimers[0] == 0) && (frame == REG0_S(0) + 9)) {
i_this->mAnimState = 1;
anm_init(i_this, KAMOME_BCK_KA_WAIT1, REG0_F(0) + 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT1);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, REG0_F(0) + 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e);
}
break;
@@ -1037,11 +1037,11 @@ void kamome_imouto_move(kamome_class* i_this) {
if ((i_this->mGlobalTimer & 0x3f) == 0 && (cM_rndF(1.0f) < 0.5f)) {
i_this->mGlobalTimer = (s16)cM_rndF(10000.0f);
i_this->mAnimState = 2;
anm_init(i_this, KAMOME_BCK_KA_SING1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_SING1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
} else if ((i_this->mTimers[0] == 0) && (a_this->current.pos.y < i_this->mTargetPos.y)) {
i_this->mAnimState = 0;
i_this->mTimers[0] = cM_rndF(60.0f) + 20.0f;
anm_init(i_this, KAMOME_BCK_KA_WAIT2, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT2);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e);
}
break;
@@ -1053,7 +1053,7 @@ void kamome_imouto_move(kamome_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->mAnimState = 1;
anm_init(i_this, KAMOME_BCK_KA_WAIT1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT1);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e);
}
break;
@@ -1064,7 +1064,7 @@ void kamome_imouto_move(kamome_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->mAnimState = 0;
i_this->mTimers[0] = cM_rndF(60.0f) + 20.0f;
anm_init(i_this, KAMOME_BCK_KA_WAIT2, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_WAIT2);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e);
}
break;
case 20:
@@ -1125,7 +1125,7 @@ void kamome_imouto_move(kamome_class* i_this) {
f32 fVar10 = i_this->mTargetPos.z - a_this->current.pos.z;
if (std::sqrtf(SQUARE(fVar11) + SQUARE(fVar9) + SQUARE(fVar10)) < REG6_F(9) * 10.0f + 300.0f) {
i_this->mMoveState = 0x14;
anm_init(i_this, KAMOME_BCK_KA_LAND1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, KAMOME_BAS_KA_LAND1);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_LAND1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_KAMOME_BAS_KA_LAND1_e);
i_this->mAnimState = 10;
a_this->speed.y = 0.0f;
i_this->m2FC = a_this->current.angle.y + (s32)cM_rndFX(15000.0f);
@@ -1156,7 +1156,7 @@ void kamome_imouto_move(kamome_class* i_this) {
}
if (i_this->mpMorf->isStop()) {
anm_init(i_this, KAMOME_BCK_KA_WAIT3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0);
}
if (i_this->mTimers[2] == 0) {
@@ -1180,7 +1180,7 @@ void kamome_imouto_move(kamome_class* i_this) {
i_this->mMoveState = 0x17;
i_this->mTargetPos.x = i_this->mpTargetActor->current.pos.x + cM_rndFX(REG0_F(8) + 150.0f);
i_this->mTargetPos.z = i_this->mpTargetActor->current.pos.z + cM_rndFX(REG0_F(8) + 150.0f);
anm_init(i_this, KAMOME_BCK_KA_MOVE1, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, KAMOME_BAS_KA_MOVE1);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_MOVE1_e, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_KAMOME_BAS_KA_MOVE1_e);
}
break;
@@ -1189,7 +1189,7 @@ void kamome_imouto_move(kamome_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->mMoveState = 0x15;
i_this->mTimers[2] = cM_rndF(30.0f) + 20.0f;
anm_init(i_this, KAMOME_BCK_KA_WAIT3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0);
}
i_this->mVelocityFwdTarget = 0.0f;
a_this->speedF = 0.0f;
@@ -1210,7 +1210,7 @@ void kamome_imouto_move(kamome_class* i_this) {
f32 fVar11 = i_this->mTargetPos.x - a_this->current.pos.x;
f32 fVar9 = i_this->mTargetPos.z - a_this->current.pos.z;
if ((std::sqrtf(SQUARE(fVar11) + SQUARE(fVar9)) < 85.0f) || ((i_this->mAcch.ChkWallHit()) || i_this->mSph.ChkCoHit())) {
anm_init(i_this, KAMOME_BCK_KA_EAT1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_EAT1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
i_this->mMoveState = 0x18;
}
}
@@ -1223,11 +1223,11 @@ void kamome_imouto_move(kamome_class* i_this) {
if (i_this->mpMorf->isStop()) {
if (cM_rndF(1.0f) < 0.2f) {
i_this->mMoveState = 0x13;
anm_init(i_this, KAMOME_BCK_KA_SING2, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_SING2_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
} else {
i_this->mMoveState = 0x15;
i_this->mTimers[2] = cM_rndF(20.0f);
anm_init(i_this, KAMOME_BCK_KA_WAIT3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0);
}
}
break;
@@ -1274,7 +1274,7 @@ void kamome_imouto_move(kamome_class* i_this) {
i_this->mMoveState = 0;
i_this->mAnimState = 0;
i_this->mTimers[0] = cM_rndF(60.0f) + 20.0f;
anm_init(i_this, KAMOME_BCK_KA_WAIT2, 3.0, J3DFrameCtrl::EMode_LOOP, 1.5f, KAMOME_BAS_KA_WAIT2);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 3.0, J3DFrameCtrl::EMode_LOOP, 1.5f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e);
if (i_this->mPathIdx != 0xff) {
i_this->mbUsePathMovement = i_this->mPathIdx + 1;
@@ -1311,14 +1311,14 @@ void kamome_imouto2_move(kamome_class* i_this) {
case 0:
i_this->m2AB = 1;
if (i_this->mTimers[1] == 0) {
anm_init(i_this, KAMOME_BCK_KA_EAT1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_EAT1_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, 0);
i_this->mMoveState++;
}
break;
case 1:
if (i_this->mpMorf->isStop()) {
anm_init(i_this, KAMOME_BCK_KA_WAIT3, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT3_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, 0);
i_this->mTimers[1] = cM_rndF(50.0f) + 50.0f;
i_this->mMoveState--;
}
@@ -1356,7 +1356,7 @@ static BOOL daKamome_Execute(kamome_class* i_this) {
if (i_this->mSwitchNo != 0) {
if (dComIfGs_isSwitch(i_this->mSwitchNo - 1, fopAcM_GetRoomNo(&i_this->actor))) {
i_this->mSwitchNo = 0;
anm_init(i_this, KAMOME_BCK_KA_WAIT2, 1.0f, J3DFrameCtrl::EMode_LOOP, cM_rndF(0.5f) + 1.0f, KAMOME_BAS_KA_WAIT2);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 1.0f, J3DFrameCtrl::EMode_LOOP, cM_rndF(0.5f) + 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e);
i_this->mTimers[0] = cM_rndF(60.0f) + 40.0f;
i_this->mVelocityFwdTarget = 30.0f;
i_this->actor.speedF = 30.0f;
@@ -1427,16 +1427,16 @@ static BOOL createHeap(fopAc_ac_c* a_this) {
kamome_class* i_this = (kamome_class*)a_this;
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Kamome", KAMOME_BDL_KA),
(J3DModelData*)dComIfG_getObjectRes("Kamome", dRes_INDEX_KAMOME_BDL_KA_e),
NULL,
NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("Kamome", KAMOME_BCK_KA_WAIT1),
(J3DAnmTransform*)dComIfG_getObjectRes("Kamome", dRes_INDEX_KAMOME_BCK_KA_WAIT1_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
-1,
1,
dComIfG_getObjectRes("Kamome", KAMOME_BAS_KA_WAIT1),
dComIfG_getObjectRes("Kamome", dRes_INDEX_KAMOME_BAS_KA_WAIT1_e),
0x80000,
0x11000022
);
src/d/actor/d_a_kamome2.cpp
+6 -6
View File
@@ -1,6 +1,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_kamome2.h"
#include "d/res/res_kamome.h"
#include "res/Object/Kamome.h"
#include "m_Do/m_Do_ext.h"
#include "d/d_camera.h"
#include "d/d_meter.h"
@@ -86,7 +86,7 @@ static void key_move(kamome2_class* i_this) {
i_this->m2C0 = unused_4207[0];
if (!CPad_CHECK_HOLD_A(0) && iVar1 == REG0_S(0) + 9) {
i_this->m2AC = 1;
anm_init(i_this, KAMOME_BCK_KA_WAIT1, REG0_F(0) + 12.0f, 2, 1.0f, KAMOME_BAS_KA_WAIT1);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, REG0_F(0) + 12.0f, 2, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e);
}
break;
@@ -101,7 +101,7 @@ static void key_move(kamome2_class* i_this) {
if (CPad_CHECK_HOLD_A(0)) {
i_this->m2AC = 0;
anm_init(i_this, KAMOME_BCK_KA_WAIT2, 5.0f, 2, 1.0f, KAMOME_BAS_KA_WAIT2);
anm_init(i_this, dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, 5.0f, 2, 1.0f, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e);
fopAcM_seStart(&i_this->actor, JA_SE_CV_KAMOME, 0);
}
break;
@@ -263,16 +263,16 @@ static BOOL daKamome2_Delete(kamome2_class* i_this) {
static BOOL useHeapInit(fopAc_ac_c* a_this) {
kamome2_class* i_this = (kamome2_class*)a_this;
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Kamome", KAMOME_BDL_KA),
(J3DModelData*)dComIfG_getObjectRes("Kamome", dRes_INDEX_KAMOME_BDL_KA_e),
NULL,
NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("Kamome", KAMOME_BCK_KA_WAIT1),
(J3DAnmTransform*)dComIfG_getObjectRes("Kamome", dRes_INDEX_KAMOME_BCK_KA_WAIT1_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
-1,
0x1,
(void*)dComIfG_getObjectRes("Kamome", KAMOME_BAS_KA_WAIT1),
(void*)dComIfG_getObjectRes("Kamome", dRes_INDEX_KAMOME_BAS_KA_WAIT1_e),
0x80000,
0x11000002
);
src/d/actor/d_a_kanban.cpp
+12 -12
View File
@@ -15,7 +15,7 @@
#include "f_op/f_op_actor_mng.h"
#include "f_op/f_op_kankyo_mng.h"
#include "d/d_com_inf_game.h"
#include "d/res/res_kanban.h"
#include "res/Object/Kanban.h"
class daKanban_HIO_c : public mDoHIO_entry_c {
public:
@@ -1008,17 +1008,17 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
for (s32 i = 0; i < 11; i++, uVar5 >>= 1) {
if (!i_this->m290 || (uVar5 & 1)) {
static s32 kanban_bdl[] = {
KANBAN_BDL_KANBAN,
KANBAN_BDL_KANBAN_01,
KANBAN_BDL_KANBAN_02,
KANBAN_BDL_KANBAN_03,
KANBAN_BDL_KANBAN_04,
KANBAN_BDL_KANBAN_05,
KANBAN_BDL_KANBAN_06,
KANBAN_BDL_KANBAN_07,
KANBAN_BDL_KANBAN_08,
KANBAN_BDL_KANBAN_09,
KANBAN_BDL_KANBAN_10,
dRes_INDEX_KANBAN_BDL_KANBAN_e,
dRes_INDEX_KANBAN_BDL_KANBAN_01_e,
dRes_INDEX_KANBAN_BDL_KANBAN_02_e,
dRes_INDEX_KANBAN_BDL_KANBAN_03_e,
dRes_INDEX_KANBAN_BDL_KANBAN_04_e,
dRes_INDEX_KANBAN_BDL_KANBAN_05_e,
dRes_INDEX_KANBAN_BDL_KANBAN_06_e,
dRes_INDEX_KANBAN_BDL_KANBAN_07_e,
dRes_INDEX_KANBAN_BDL_KANBAN_08_e,
dRes_INDEX_KANBAN_BDL_KANBAN_09_e,
dRes_INDEX_KANBAN_BDL_KANBAN_10_e,
};
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kanban", kanban_bdl[i]);
src/d/actor/d_a_kantera.cpp
+6 -6
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_kantera.h"
#include "d/res/res_kantera.h"
#include "res/Object/Kantera.h"
#include "d/d_kankyo.h"
#include "d/d_s_play.h"
#include "d/d_com_inf_game.h"
@@ -285,7 +285,7 @@ static BOOL daKantera_Delete(kantera_class* i_this) {
static BOOL daKantera_CreateHeap(fopAc_ac_c* a_this) {
kantera_class* i_this = (kantera_class*)a_this;
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Kantera", KANTERA_BMD_MK_KANTERA));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Kantera", dRes_INDEX_KANTERA_BMD_MK_KANTERA_e));
JUT_ASSERT(1014, modelData != NULL);
i_this->mpModel1 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
@@ -293,7 +293,7 @@ static BOOL daKantera_CreateHeap(fopAc_ac_c* a_this) {
return FALSE;
}
J3DAnmTevRegKey* anm_res_brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Kantera", KANTERA_BRK_MK_KANTERA));
J3DAnmTevRegKey* anm_res_brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Kantera", dRes_INDEX_KANTERA_BRK_MK_KANTERA_e));
JUT_ASSERT(1036, anm_res_brk != NULL);
i_this->mpBrkAnm1 = new mDoExt_brkAnm();
@@ -305,7 +305,7 @@ static BOOL daKantera_CreateHeap(fopAc_ac_c* a_this) {
return FALSE;
}
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Kantera", KANTERA_BMD_LF));
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Kantera", dRes_INDEX_KANTERA_BMD_LF_e));
JUT_ASSERT(1048, modelData != NULL);
i_this->mpModel2 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
@@ -313,7 +313,7 @@ static BOOL daKantera_CreateHeap(fopAc_ac_c* a_this) {
return FALSE;
}
anm_res_brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Kantera", KANTERA_BRK_LF));
anm_res_brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Kantera", dRes_INDEX_KANTERA_BRK_LF_e));
JUT_ASSERT(1058, anm_res_brk != NULL);
i_this->mpBrkAnm2 = new mDoExt_brkAnm();
@@ -325,7 +325,7 @@ static BOOL daKantera_CreateHeap(fopAc_ac_c* a_this) {
return FALSE;
}
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Kantera", KANTERA_BMD_GA));
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Kantera", dRes_INDEX_KANTERA_BMD_GA_e));
JUT_ASSERT(1125, modelData != NULL);
for (s32 i = 0; i < ARRAY_SSIZE(i_this->mGa); i++) {
src/d/actor/d_a_ki.cpp
+23 -23
View File
@@ -13,7 +13,7 @@
#include "d/d_path.h"
#include "d/d_snap.h"
#include "d/d_material.h"
#include "d/res/res_ki.h"
#include "res/Object/Ki.h"
#include "m_Do/m_Do_hostIO.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_cc_uty.h"
@@ -88,7 +88,7 @@ static kiHIO_c l_kiHIO;
static s32 ki_all_count;
static s32 ki_fight_count;
static u16 ki_tex_anm_idx[] = {KI_BTP_AKE1, KI_BTP_TOJI1, KI_BTP_METOJI1, KI_BTP_GURU1};
static u16 ki_tex_anm_idx[] = {dRes_INDEX_KI_BTP_AKE1_e, dRes_INDEX_KI_BTP_TOJI1_e, dRes_INDEX_KI_BTP_METOJI1_e, dRes_INDEX_KI_BTP_GURU1_e};
static u16 ki_tex_max_frame[] = { 2, 2, 3, 2 };
static u8 ki_tex_loop[] = { 0, 0, 0, 0 };
@@ -287,7 +287,7 @@ void ki_wait_move(ki_class* i_this) {
switch(i_this->mBehaviorType) {
case 0:
anm_init(i_this, KI_BCK_WAIT1, 10.0f, 2, 1.0f, KI_BAS_WAIT1);
anm_init(i_this, dRes_INDEX_KI_BCK_WAIT1_e, 10.0f, 2, 1.0f, dRes_INDEX_KI_BAS_WAIT1_e);
i_this->mBehaviorType = 1;
tex_anm_set(i_this, 2);
@@ -353,7 +353,7 @@ void ki_wait_move(ki_class* i_this) {
if (sp58.abs() < 100.0f) {
i_this->mBehaviorType = 0xb;
i_this->mTimers[0] = 0x32;
anm_init(i_this, KI_BCK_WAIT1, 10.0f, 2, 1.0f, KI_BAS_WAIT1);
anm_init(i_this, dRes_INDEX_KI_BCK_WAIT1_e, 10.0f, 2, 1.0f, dRes_INDEX_KI_BAS_WAIT1_e);
}
break;
@@ -382,7 +382,7 @@ void ki_fly_move(ki_class* i_this) {
switch (i_this->mBehaviorType) {
case 0:
anm_init(i_this, KI_BCK_FLY1, 10.0f, 2, l_kiHIO.m08, KI_BAS_FLY1);
anm_init(i_this, dRes_INDEX_KI_BCK_FLY1_e, 10.0f, 2, l_kiHIO.m08, dRes_INDEX_KI_BAS_FLY1_e);
i_this->mBehaviorType = 1;
tex_anm_set(i_this, 0);
i_this->mPosMoveTarget = l_kiHIO.m28;
@@ -432,7 +432,7 @@ void ki_fire_set_move(ki_class* i_this) {
case 0:
a_this->speedF = REG8_F(8) + 35.0f + cM_rndF(10.0f);
a_this->speed.y = REG8_F(9) + 97.0f + cM_rndF(30.0f);
anm_init(i_this, KI_BCK_WAIT1, 1.0f, 2, 1.0f, KI_BAS_WAIT1);
anm_init(i_this, dRes_INDEX_KI_BCK_WAIT1_e, 1.0f, 2, 1.0f, dRes_INDEX_KI_BAS_WAIT1_e);
i_this->mBehaviorType = 1;
i_this->m91C = dComIfGp_particle_set(dPa_name::ID_IT_SN_FIREK_FIRE_A, &a_this->current.pos, NULL, NULL, 0xFF, &i_this->m908);
@@ -454,7 +454,7 @@ void ki_fire_set_move(ki_class* i_this) {
break;
case 10:
anm_init(i_this, KI_BCK_FLY1, 10.0f, 2, l_kiHIO.m08, KI_BAS_FLY1);
anm_init(i_this, dRes_INDEX_KI_BCK_FLY1_e, 10.0f, 2, l_kiHIO.m08, dRes_INDEX_KI_BAS_FLY1_e);
i_this->mBehaviorType = 0xb;
i_this->mTimers[1] = 100;
@@ -503,7 +503,7 @@ void ki_atack_move(ki_class* i_this) {
switch(i_this->mBehaviorType) {
case 0:
anm_init(i_this, KI_BCK_FLY1, 10.0f, 2, l_kiHIO.m08, KI_BAS_FLY1);
anm_init(i_this, dRes_INDEX_KI_BCK_FLY1_e, 10.0f, 2, l_kiHIO.m08, dRes_INDEX_KI_BAS_FLY1_e);
i_this->mBehaviorType = 1;
tex_anm_set(i_this, 0);
i_this->mTimers[0] = l_kiHIO.m50 + cM_rndF(std::fabsf(l_kiHIO.m4E - l_kiHIO.m50));
@@ -519,7 +519,7 @@ void ki_atack_move(ki_class* i_this) {
cLib_addCalcAngleS2(&a_this->shape_angle.y, a_this->current.angle.y, 2, 0x1000);
if (sp24.abs() < 300.0f) {
i_this->mBehaviorType = 10;
anm_init(i_this, KI_BCK_FLY2, 5.0f, 2, l_kiHIO.m14, KI_BAS_FLY2);
anm_init(i_this, dRes_INDEX_KI_BCK_FLY2_e, 5.0f, 2, l_kiHIO.m14, dRes_INDEX_KI_BAS_FLY2_e);
i_this->mPosMoveDist = 0.0f;
}
break;
@@ -536,7 +536,7 @@ void ki_atack_move(ki_class* i_this) {
if (cM_rndF(1.0f) < tmp) {
i_this->mBehaviorType = 3;
anm_init(i_this, KI_BCK_ATTACK1, 5.0f, 2, l_kiHIO.m18, KI_BAS_ATTACK1);
anm_init(i_this, dRes_INDEX_KI_BCK_ATTACK1_e, 5.0f, 2, l_kiHIO.m18, dRes_INDEX_KI_BAS_ATTACK1_e);
i_this->mPosMove = player->current.pos;
i_this->mPosMove.y += 80.0f;
a_this->current.angle.y = fopAcM_searchPlayerAngleY(a_this);
@@ -594,14 +594,14 @@ void ki_atack_move(ki_class* i_this) {
}
if (i_this->mTimers[1] == 0) {
anm_init(i_this, KI_BCK_FLY1, 5.0f, 2, l_kiHIO.m08, KI_BAS_FLY1);
anm_init(i_this, dRes_INDEX_KI_BCK_FLY1_e, 5.0f, 2, l_kiHIO.m08, dRes_INDEX_KI_BAS_FLY1_e);
i_this->mBehaviorType = 1;
}
cLib_addCalcAngleS2(&a_this->shape_angle.y, a_this->current.angle.y, 2, 0x2000);
if (i_this->m580.ChkAtHit() || i_this->mDamageSphere.ChkCoHit()) {
anm_init(i_this, KI_BCK_FLY2, 2.0f, 2, l_kiHIO.m14, KI_BAS_FLY2);
anm_init(i_this, dRes_INDEX_KI_BCK_FLY2_e, 2.0f, 2, l_kiHIO.m14, dRes_INDEX_KI_BAS_FLY2_e);
i_this->mBehaviorType = 4;
i_this->mTimers[1] = 30;
a_this->speedF = -15.0f;
@@ -612,7 +612,7 @@ void ki_atack_move(ki_class* i_this) {
case 4:
if (i_this->mTimers[1] == 0) {
anm_init(i_this, KI_BCK_FLY1, 3.0f, 2, l_kiHIO.m08, KI_BAS_FLY1);
anm_init(i_this, dRes_INDEX_KI_BCK_FLY1_e, 3.0f, 2, l_kiHIO.m08, dRes_INDEX_KI_BAS_FLY1_e);
i_this->mBehaviorType = 1;
}
break;
@@ -683,7 +683,7 @@ void ki_atack_move(ki_class* i_this) {
a_this->home.pos = linChk.GetCross();
a_this->home.pos.y -= 30.0f;
i_this->mBehaviorType = 10;
anm_init(i_this, KI_BCK_FLY1, 5.0f, 2, l_kiHIO.m08, KI_BAS_FLY1);
anm_init(i_this, dRes_INDEX_KI_BCK_FLY1_e, 5.0f, 2, l_kiHIO.m08, dRes_INDEX_KI_BAS_FLY1_e);
} else {
i_this->mTimers[0] = 50;
i_this->mBehaviorType = 1;
@@ -742,7 +742,7 @@ void ki_damage_move(ki_class* i_this) {
switch (i_this->mBehaviorType) {
case 0:
anm_init(i_this, KI_BCK_DAMAGE1, 2.0f, 0, 1.0f, KI_BAS_DAMAGE1);
anm_init(i_this, dRes_INDEX_KI_BCK_DAMAGE1_e, 2.0f, 0, 1.0f, dRes_INDEX_KI_BAS_DAMAGE1_e);
tex_anm_set(i_this, 3);
i_this->mBehaviorType = 1;
@@ -761,7 +761,7 @@ void ki_damage_move(ki_class* i_this) {
if (i_this->m31C >= l_kiHIO.m3C) {
i_this->mBehaviorType = 2;
i_this->mTimers[0] = 0x32;
anm_init(i_this, KI_BCK_BITA1, 1.0f, 0, 1.0f, KI_BAS_BITA1);
anm_init(i_this, dRes_INDEX_KI_BCK_BITA1_e, 1.0f, 0, 1.0f, dRes_INDEX_KI_BAS_BITA1_e);
tex_anm_set(i_this, 3);
i_this->actor.speed.y = 0.0f;
csXyz shapeAngle = i_this->actor.shape_angle;
@@ -1209,11 +1209,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
if (i_this->mDamageType == 0) {
i_this->actor.gbaName = 0x17;
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Ki", KI_BDL_KI),
(J3DModelData*)dComIfG_getObjectRes("Ki", dRes_INDEX_KI_BDL_KI_e),
NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("Ki", KI_BCK_WAIT1),
(J3DAnmTransform*)dComIfG_getObjectRes("Ki", dRes_INDEX_KI_BCK_WAIT1_e),
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1,
dComIfG_getObjectRes("Ki", KI_BAS_WAIT1),
dComIfG_getObjectRes("Ki", dRes_INDEX_KI_BAS_WAIT1_e),
0x80000, 0x37221203
);
#if VERSION == VERSION_DEMO
@@ -1227,11 +1227,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
} else {
i_this->actor.gbaName = 6;
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Ki", KI_BDL_FK),
(J3DModelData*)dComIfG_getObjectRes("Ki", dRes_INDEX_KI_BDL_FK_e),
NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("Ki", KI_BCK_WAIT1),
(J3DAnmTransform*)dComIfG_getObjectRes("Ki", dRes_INDEX_KI_BCK_WAIT1_e),
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1,
dComIfG_getObjectRes("Ki", KI_BAS_WAIT1),
dComIfG_getObjectRes("Ki", dRes_INDEX_KI_BAS_WAIT1_e),
0x80000, 0x37221203
);
@@ -1251,7 +1251,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
if (!i_this->m920->init(model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Ki", KI_BTK_FK), true, J3DFrameCtrl::EMode_LOOP)) {
if (!i_this->m920->init(model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Ki", dRes_INDEX_KI_BTK_FK_e), true, J3DFrameCtrl::EMode_LOOP)) {
return FALSE;
}
}
src/d/actor/d_a_kita.cpp
+3 -3
View File
@@ -11,7 +11,7 @@
#include "d/d_bg_w.h"
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include "d/res/res_kita.h"
#include "res/Object/kita.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
#include "f_op/f_op_actor_mng.h"
@@ -367,7 +367,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* i_this) {
BOOL ret;
kita_class* actor = static_cast<kita_class*>(i_this);
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Kita", KITA_BDL_VHLIF_00));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Kita", dRes_INDEX_KITA_BDL_VHLIF_00_e));
actor->mModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if(actor->mModel == NULL){
@@ -377,7 +377,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* i_this) {
JUT_ASSERT(DEMO_SELECT(928, 946), modelData != NULL);
actor->pm_bgw = new dBgW();
JUT_ASSERT(DEMO_SELECT(933, 951), actor->pm_bgw != NULL);
actor->pm_bgw->Set(static_cast<cBgD_t*>(dComIfG_getObjectRes("Kita", KITA_DZB_HLIF_00)), cBgW::MOVE_BG_e, &actor->mBgwMtx);
actor->pm_bgw->Set(static_cast<cBgD_t*>(dComIfG_getObjectRes("Kita", dRes_INDEX_KITA_DZB_HLIF_00_e)), cBgW::MOVE_BG_e, &actor->mBgwMtx);
actor->pm_bgw->SetCrrFunc(dBgS_MoveBGProc_Typical);
actor->pm_bgw->SetRideCallback(ride_call_back);
ret = TRUE;
src/d/actor/d_a_kmon.cpp
+3 -3
View File
@@ -25,21 +25,21 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00000138-00000324 .text CreateHeap__8daKmon_cFv */
BOOL daKmon_c::CreateHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(daKmon_c::m_arcname, ALWAYS_BDL_VBELL));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(daKmon_c::m_arcname, dRes_INDEX_ALWAYS_BDL_VBELL_e));
JUT_ASSERT(166, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (mpModel == NULL) {
return FALSE;
}
J3DAnmTextureSRTKey* pbtk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(daKmon_c::m_arcname, ALWAYS_BTK_VBELL));
J3DAnmTextureSRTKey* pbtk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(daKmon_c::m_arcname, dRes_INDEX_ALWAYS_BTK_VBELL_e));
JUT_ASSERT(176, pbtk != NULL);
if (!mBtkAnm.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP)) {
return FALSE;
}
mBtkAnm.setPlaySpeed(1.0);
J3DAnmTransform* pbck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(daKmon_c::m_arcname, ALWAYS_BCK_VBELL));
J3DAnmTransform* pbck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(daKmon_c::m_arcname, dRes_INDEX_ALWAYS_BCK_VBELL_e));
JUT_ASSERT(188, pbck != NULL);
if (!mBckAnm.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_LOOP)) {
return FALSE;
src/d/actor/d_a_kn.cpp
+10 -10
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_kn.h"
#include "d/res/res_kn.h"
#include "res/Object/Kn.h"
#include "d/d_s_play.h"
#include "d/d_snap.h"
#include "d/d_com_inf_game.h"
@@ -139,7 +139,7 @@ void kn_move(kn_class* i_this) {
switch (i_this->m2BD) {
#if VERSION == VERSION_DEMO
case Mode_0_e:
anm_init(i_this, KN_BCK_WALK, 5.0f, 2, 1.0f, -1);
anm_init(i_this, dRes_INDEX_KN_BCK_WALK_e, 5.0f, 2, 1.0f, -1);
i_this->m2CC = -25.0f;
i_this->actor.current.angle.z = -0x2000;
i_this->m2BD++;
@@ -160,9 +160,9 @@ void kn_move(kn_class* i_this) {
#endif
case Mode_10_e:
if (cM_rnd() < 0.5f) {
anm_init(i_this, KN_BCK_WAIT01, 5.0f, 2, 1.0f, -1);
anm_init(i_this, dRes_INDEX_KN_BCK_WAIT01_e, 5.0f, 2, 1.0f, -1);
} else {
anm_init(i_this, KN_BCK_WAIT02, 5.0f, 2, 1.0f, -1);
anm_init(i_this, dRes_INDEX_KN_BCK_WAIT02_e, 5.0f, 2, 1.0f, -1);
}
i_this->m2D2 = 0x800;
i_this->m2CA = cM_rndF(2.0f) + 1.0f;
@@ -183,7 +183,7 @@ void kn_move(kn_class* i_this) {
break;
case Mode_12_e:
anm_init(i_this, KN_BCK_WALK, 5.0f, 2, 1.0f, -1);
anm_init(i_this, dRes_INDEX_KN_BCK_WALK_e, 5.0f, 2, 1.0f, -1);
i_this->m2D0 = i_this->actor.current.angle.y + cM_rndFX(10752.0f);
i_this->m2E8 = f26;
if (cM_rnd() < 0.5f) {
@@ -246,7 +246,7 @@ void kn_move(kn_class* i_this) {
i_this->m2E4 = 0.0;
i_this->m2C0 = 0;
i_this->m2C2[0] = 0x14;
anm_init(i_this, KN_BCK_PATA, 5.0f, 2, 1.0f, -1);
anm_init(i_this, dRes_INDEX_KN_BCK_PATA_e, 5.0f, 2, 1.0f, -1);
i_this->m2BD++;
case Mode_16_e:
@@ -277,7 +277,7 @@ void kn_move(kn_class* i_this) {
} else {
shibuki_set(i_this);
}
anm_init(i_this, KN_BCK_PATA, 5.0f, 2, 1.0f, -1);
anm_init(i_this, dRes_INDEX_KN_BCK_PATA_e, 5.0f, 2, 1.0f, -1);
i_this->m2BD = Mode_17_e;
}
}
@@ -296,7 +296,7 @@ void kn_move(kn_class* i_this) {
break;
case Mode_18_e:
anm_init(i_this, KN_BCK_WALK, 5.0f, 2, 2.0f, -1);
anm_init(i_this, dRes_INDEX_KN_BCK_WALK_e, 5.0f, 2, 2.0f, -1);
i_this->m2E8 = 40.0;
i_this->m2C2[0] = 0;
i_this->m2C2[1] = 0;
@@ -490,10 +490,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
kn_class* i_this = (kn_class*)a_this;
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("KN", KN_BDL_KN),
(J3DModelData*)dComIfG_getObjectRes("KN", dRes_INDEX_KN_BDL_KN_e),
NULL,
NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("KN", KN_BCK_PATA),
(J3DAnmTransform*)dComIfG_getObjectRes("KN", dRes_INDEX_KN_BCK_PATA_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
src/d/actor/d_a_knob00.cpp
+13 -13
View File
@@ -9,7 +9,7 @@
#include "d/actor/d_a_obj_pirateship.h"
#include "d/actor/d_a_npc_mt.h"
#include "d/d_kankyo.h"
#include "d/res/res_knob.h"
#include "res/Object/Knob.h"
#include "m_Do/m_Do_graphic.h"
#include "d/d_com_inf_game.h"
#include "ctype.h"
@@ -32,7 +32,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* a_this) {
/* 000000D4-000003B8 .text CreateHeap__10daKnob00_cFv */
BOOL daKnob00_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, KNOB_BDL_DOOR);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_KNOB_BDL_DOOR_e);
JUT_ASSERT(VERSION_SELECT(145, 145, 163, 163), modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
@@ -51,7 +51,7 @@ BOOL daKnob00_c::CreateHeap() {
mDoMtx_stack_c::YrotM(current.angle.y);
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
J3DAnmTransform* anmTransform = (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, KNOB_BCK_DOOROPENADOOR);
J3DAnmTransform* anmTransform = (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_KNOB_BCK_DOOROPENADOOR_e);
if (!mBckAnm.init(modelData, anmTransform, true, J3DFrameCtrl::EMode_NONE)) {
#if VERSION == VERSION_DEMO
return cPhs_ERROR_e;
@@ -66,35 +66,35 @@ BOOL daKnob00_c::CreateHeap() {
s32 fileIndex;
switch (getShapeType()) {
case 1:
fileIndex = KNOB_BDL_DOOR_B;
fileIndex = dRes_INDEX_KNOB_BDL_DOOR_B_e;
break;
case 2:
fileIndex = KNOB_BDL_DOOR_C;
fileIndex = dRes_INDEX_KNOB_BDL_DOOR_C_e;
break;
case 3:
fileIndex = KNOB_BDL_DOOR_D;
fileIndex = dRes_INDEX_KNOB_BDL_DOOR_D_e;
break;
case 4:
fileIndex = KNOB_BDL_DOOR_E;
fileIndex = dRes_INDEX_KNOB_BDL_DOOR_E_e;
break;
case 5:
fileIndex = KNOB_BDL_DOOR_F;
fileIndex = dRes_INDEX_KNOB_BDL_DOOR_F_e;
break;
case 6:
fileIndex = KNOB_BDL_DOOR_G;
fileIndex = dRes_INDEX_KNOB_BDL_DOOR_G_e;
break;
case 7:
fileIndex = KNOB_BDL_DOOR_H;
fileIndex = dRes_INDEX_KNOB_BDL_DOOR_H_e;
break;
default:
fileIndex = KNOB_BDL_DOOR_A;
fileIndex = dRes_INDEX_KNOB_BDL_DOOR_A_e;
break;
}
@@ -113,7 +113,7 @@ BOOL daKnob00_c::CreateHeap() {
return FALSE;
}
cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes(M_arcname, KNOB_DZB_DOOR);
cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_KNOB_DZB_DOOR_e);
if (bgd == NULL) {
return FALSE;
@@ -208,7 +208,7 @@ BOOL daKnob00_c::msgDoor() {
/* 000005DC-000006F0 .text openInit__10daKnob00_cFi */
void daKnob00_c::openInit(int arg1) {
static s32 bck_table[] = { KNOB_BCK_DOOROPENADOOR, KNOB_BCK_DOOROPENBDOOR, KNOB_BCK_DOOROPENADOOR, KNOB_BCK_DOOROPENBDOOR };
static s32 bck_table[] = { dRes_INDEX_KNOB_BCK_DOOROPENADOOR_e, dRes_INDEX_KNOB_BCK_DOOROPENBDOOR_e, dRes_INDEX_KNOB_BCK_DOOROPENADOOR_e, dRes_INDEX_KNOB_BCK_DOOROPENBDOOR_e };
J3DModelData* modelData = mpModel->getModelData();
s32 iVar2 = mBckAnm.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, bck_table[arg1]), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true);
src/d/actor/d_a_kokiie.cpp
+3 -3
View File
@@ -9,7 +9,7 @@
#include "d/d_s_play.h"
#include "d/d_com_inf_game.h"
#include "d/d_bg_s_movebg_actor.h"
#include "d/res/res_kokiie.h"
#include "res/Object/Kokiie.h"
#include "f_op/f_op_actor_mng.h"
#include "f_op/f_op_camera.h"
#include "JSystem/JUtility/JUTReport.h"
@@ -354,7 +354,7 @@ static BOOL daKokiie_Delete(kokiie_class* i_this) {
static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) {
kokiie_class* actor = (kokiie_class*)a_this;
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kokiie", KOKIIE_BDL_KOKI_00);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kokiie", dRes_INDEX_KOKIIE_BDL_KOKI_00_e);
actor->mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (actor->mpModel == NULL) {
return FALSE;
@@ -365,7 +365,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) {
actor->pm_bgw = new dBgW();
JUT_ASSERT(DEMO_SELECT(929, 950), actor->pm_bgw != NULL);
actor->pm_bgw->Set((cBgD_t*)dComIfG_getObjectRes("Kokiie", KOKIIE_DZB_KOKI_00), dBgW::MOVE_BG_e, &actor->m340);
actor->pm_bgw->Set((cBgD_t*)dComIfG_getObjectRes("Kokiie", dRes_INDEX_KOKIIE_DZB_KOKI_00_e), dBgW::MOVE_BG_e, &actor->m340);
actor->pm_bgw->SetCrrFunc(dBgS_MoveBGProc_Typical);
return TRUE;
}
src/d/actor/d_a_komore.cpp
+3 -3
View File
@@ -6,7 +6,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_komore.h"
#include "d/d_com_inf_game.h"
#include "d/res/res_frlt.h"
#include "res/Object/frLt.h"
const char daKomore::Act_c::M_arcname[] = "frLt";
@@ -20,7 +20,7 @@ bool daKomore::Act_c::create_heap() {
J3DModelData* mdl_data;
J3DAnmTextureSRTKey* btk_data;
mdl_data = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, FRLT_BDL_YFRLT00));
mdl_data = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, dRes_INDEX_FRLT_BDL_YFRLT00_e));
JUT_ASSERT(0x66, mdl_data != NULL);
@@ -28,7 +28,7 @@ bool daKomore::Act_c::create_heap() {
mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11020203);
}
btk_data = (J3DAnmTextureSRTKey*)(dComIfG_getObjectRes(M_arcname, FRLT_BTK_YFRLT00));
btk_data = (J3DAnmTextureSRTKey*)(dComIfG_getObjectRes(M_arcname, dRes_INDEX_FRLT_BTK_YFRLT00_e));
JUT_ASSERT(0x6d, btk_data != NULL);
src/d/actor/d_a_ks.cpp
+7 -7
View File
@@ -11,7 +11,7 @@
#include "d/d_snap.h"
#include "d/actor/d_a_player_main.h"
#include "d/actor/d_a_gm.h"
#include "d/res/res_ks.h"
#include "res/Object/Ks.h"
static int KS_ALL_COUNT = 0;
static int KUTTUKU_ALL_COUNT = 0;
@@ -1509,7 +1509,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) {
ks_class* i_this = (ks_class*)i_act;
i_this->mpBodyMorf = new mDoExt_McaMorf((J3DModelData *)dComIfG_getObjectRes("KS", KS_BDL_KS_BODY), NULL, NULL, NULL,
i_this->mpBodyMorf = new mDoExt_McaMorf((J3DModelData *)dComIfG_getObjectRes("KS", dRes_INDEX_KS_BDL_KS_BODY_e), NULL, NULL, NULL,
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203);
if (i_this->mpBodyMorf == NULL || i_this->mpBodyMorf->getModel() == NULL)
return FALSE;
@@ -1519,12 +1519,12 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) {
if (i_this->mpBodyBrkAnm == NULL)
return FALSE;
if (i_this->mpBodyBrkAnm->init(bodyModel->getModelData(), (J3DAnmTevRegKey *)dComIfG_getObjectRes("KS", KS_BRK_KS_BODY), TRUE, J3DFrameCtrl::EMode_NONE) == 0)
if (i_this->mpBodyBrkAnm->init(bodyModel->getModelData(), (J3DAnmTevRegKey *)dComIfG_getObjectRes("KS", dRes_INDEX_KS_BRK_KS_BODY_e), TRUE, J3DFrameCtrl::EMode_NONE) == 0)
return FALSE;
i_this->mpEyeMorf = new mDoExt_McaMorf((J3DModelData *)dComIfG_getObjectRes("KS", KS_BDL_KS_EYE), NULL, NULL,
(J3DAnmTransformKey *)dComIfG_getObjectRes("KS", KS_BCK_MABATAKI),
i_this->mpEyeMorf = new mDoExt_McaMorf((J3DModelData *)dComIfG_getObjectRes("KS", dRes_INDEX_KS_BDL_KS_EYE_e), NULL, NULL,
(J3DAnmTransformKey *)dComIfG_getObjectRes("KS", dRes_INDEX_KS_BCK_MABATAKI_e),
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, 1, NULL, 0, 0x11020203);
if (i_this->mpEyeMorf == NULL || i_this->mpEyeMorf->getModel() == NULL)
@@ -1535,14 +1535,14 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) {
if (i_this->mpEyeBtkAnm == NULL)
return FALSE;
if (i_this->mpEyeBtkAnm->init(eyeModel->getModelData(), (J3DAnmTextureSRTKey *)dComIfG_getObjectRes("KS", KS_BTK_KS_EYE), TRUE, J3DFrameCtrl::EMode_NONE) == 0)
if (i_this->mpEyeBtkAnm->init(eyeModel->getModelData(), (J3DAnmTextureSRTKey *)dComIfG_getObjectRes("KS", dRes_INDEX_KS_BTK_KS_EYE_e), TRUE, J3DFrameCtrl::EMode_NONE) == 0)
return FALSE;
i_this->mpEyeBrkAnm = new mDoExt_brkAnm();
if (i_this->mpEyeBrkAnm == NULL)
return FALSE;
if (i_this->mpEyeBrkAnm->init(eyeModel->getModelData(), (J3DAnmTevRegKey *)dComIfG_getObjectRes("KS", KS_BRK_KS_EYE), TRUE, J3DFrameCtrl::EMode_NONE) == 0) {
if (i_this->mpEyeBrkAnm->init(eyeModel->getModelData(), (J3DAnmTevRegKey *)dComIfG_getObjectRes("KS", dRes_INDEX_KS_BRK_KS_EYE_e), TRUE, J3DFrameCtrl::EMode_NONE) == 0) {
return FALSE;
}
return TRUE;
src/d/actor/d_a_kt.cpp
+3 -3
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_kt.h"
#include "d/res/res_kt.h"
#include "res/Object/Kt.h"
#include "d/d_bg_s_gnd_chk.h"
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
@@ -315,10 +315,10 @@ static BOOL daKt_Delete(kt_class* i_this) {
static BOOL daKt_solidHeapCB(fopAc_ac_c* i_ac) {
kt_class* i_this = (kt_class*)i_ac;
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kt", KT_INDEX_BMD_KT_MODEL);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kt", dRes_INDEX_KT_BMD_KT_MODEL_e);
i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x10000, 0x11020203);
J3DModelData* modelDataWing = (J3DModelData*)dComIfG_getObjectRes("Kt", KT_INDEX_BMD_KT_HANE);
J3DModelData* modelDataWing = (J3DModelData*)dComIfG_getObjectRes("Kt", dRes_INDEX_KT_BMD_KT_HANE_e);
i_this->mpModelWing = mDoExt_J3DModel__create(modelDataWing, 0x10000, 0x11020203);
return modelData != NULL && modelDataWing != NULL && i_this->mpModel != NULL && i_this->mpModelWing != NULL;
src/d/actor/d_a_kui.cpp
+6 -6
View File
@@ -12,7 +12,7 @@
#include "d/d_com_inf_game.h"
#include "d/d_kankyo_rain.h"
#include "d/d_s_play.h"
#include "d/res/res_kui.h"
#include "res/Object/Kui.h"
#include "f_op/f_op_camera.h"
#include "f_op/f_op_actor_mng.h"
#include "f_pc/f_pc_executor.h"
@@ -409,7 +409,7 @@ static BOOL daKui_CreateHeap(fopAc_ac_c* a_this) {
if (i_this->type == 3) {
// Bell body
modelData = (J3DModelData*)dComIfG_getObjectRes("Kui", KUI_BDL_HKANE1);
modelData = (J3DModelData*)dComIfG_getObjectRes("Kui", dRes_INDEX_KUI_BDL_HKANE1_e);
JUT_ASSERT(0x353, modelData != NULL);
i_this->mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
@@ -418,7 +418,7 @@ static BOOL daKui_CreateHeap(fopAc_ac_c* a_this) {
}
// Bell handle
modelData = (J3DModelData*)dComIfG_getObjectRes("Kui", KUI_BDL_HKANE2);
modelData = (J3DModelData*)dComIfG_getObjectRes("Kui", dRes_INDEX_KUI_BDL_HKANE2_e);
JUT_ASSERT(0x35F, modelData != NULL);
i_this->mpModel2 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
@@ -427,7 +427,7 @@ static BOOL daKui_CreateHeap(fopAc_ac_c* a_this) {
}
} else {
// Rope
modelData = (J3DModelData*)dComIfG_getObjectRes("Kui", KUI_BDL_OBI_ROPETAG);
modelData = (J3DModelData*)dComIfG_getObjectRes("Kui", dRes_INDEX_KUI_BDL_OBI_ROPETAG_e);
JUT_ASSERT(0x36B, modelData != NULL);
i_this->mpModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
@@ -437,7 +437,7 @@ static BOOL daKui_CreateHeap(fopAc_ac_c* a_this) {
if (i_this->type == 2 || i_this->type == 4) {
// Rope swing attachment
modelData = (J3DModelData*)dComIfG_getObjectRes("Kui", KUI_BDL_MROPESW);
modelData = (J3DModelData*)dComIfG_getObjectRes("Kui", dRes_INDEX_KUI_BDL_MROPESW_e);
JUT_ASSERT(0x377, modelData != NULL);
i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
@@ -453,7 +453,7 @@ static BOOL daKui_CreateHeap(fopAc_ac_c* a_this) {
return FALSE;
}
cBgD_t* pData = (cBgD_t*)dComIfG_getObjectRes("Kui", KUI_DZB_OBI_ROPETAG);
cBgD_t* pData = (cBgD_t*)dComIfG_getObjectRes("Kui", dRes_INDEX_KUI_DZB_OBI_ROPETAG_e);
if (i_this->field_0x2D8->Set(pData, cBgW::MOVE_BG_e, &i_this->field_0x2A8) == true) {
return FALSE;
}
src/d/actor/d_a_kytag03.cpp
+2 -2
View File
@@ -7,13 +7,13 @@
#include "d/actor/d_a_kytag03.h"
#include "d/d_com_inf_game.h"
#include "d/d_kankyo.h"
#include "d/res/res_m_door.h"
#include "res/Object/M_door.h"
/* 00000078-0000015C .text useHeapInit__FP10fopAc_ac_c */
static BOOL useHeapInit(fopAc_ac_c* i_ac) {
kytag03_class* i_this = (kytag03_class*)i_ac;
i_this->mpModel = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("M_DOOR", M_DOOR_BDL_MYAMIF),
(J3DModelData*)dComIfG_getObjectRes("M_DOOR", dRes_INDEX_M_DOOR_BDL_MYAMIF_e),
NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 0.0f, 0, -1, 1, NULL, 0x0, 0x11020203
);
src/d/actor/d_a_lamp.cpp
+2 -2
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_lamp.h"
#include "d/res/res_lamp.h"
#include "res/Object/Lamp.h"
#include "d/d_com_inf_game.h"
#include "m_Do/m_Do_mtx.h"
@@ -123,7 +123,7 @@ static BOOL daLamp_Delete(lamp_class* i_this) {
/* 00000678-0000073C .text useHeapInit__FP10lamp_class */
static BOOL useHeapInit(lamp_class* i_this) {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Lamp", LAMP_BMD_LAMP_00));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Lamp", dRes_INDEX_LAMP_BMD_LAMP_00_e));
JUT_ASSERT(0x170, modelData != NULL);
i_this->mModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
src/d/actor/d_a_lbridge.cpp
+6 -6
View File
@@ -6,7 +6,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_lbridge.h"
#include "d/d_com_inf_game.h"
#include "d/res/res_gbrg00.h"
#include "res/Object/Gbrg00.h"
const char daLbridge_c::m_arcname[] = "Gbrg00";
@@ -17,7 +17,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);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GBRG00_BDL_GBRG00_e);
JUT_ASSERT(DEMO_SELECT(213, 214), modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000U, 0x11000223U);
@@ -26,14 +26,14 @@ BOOL daLbridge_c::CreateHeap() {
return FALSE;
}
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, GBRG00_BTK_GBRG00);
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GBRG00_BTK_GBRG00_e);
JUT_ASSERT(DEMO_SELECT(231, 232), pbtk != NULL);
if (!mBtkAnm.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP)) {
return FALSE;
}
J3DAnmColor* pbpk = (J3DAnmColor*)dComIfG_getObjectRes(m_arcname, GBRG00_BPK_GBRG00);
J3DAnmColor* pbpk = (J3DAnmColor*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GBRG00_BPK_GBRG00_e);
JUT_ASSERT(DEMO_SELECT(245, 246), pbpk != NULL);
if (!mBpkAnm.init(modelData, pbpk, TRUE, J3DFrameCtrl::EMode_NONE)) {
@@ -43,7 +43,7 @@ BOOL daLbridge_c::CreateHeap() {
mBpkAnm.setFrame(0.0f);
mBpkAnm.setPlaySpeed(1.0f);
J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, GBRG00_BRK_GBRG00);
J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GBRG00_BRK_GBRG00_e);
JUT_ASSERT(DEMO_SELECT(261, 262), pbrk != NULL);
if (!mBrkAnm.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP)) {
@@ -55,7 +55,7 @@ BOOL daLbridge_c::CreateHeap() {
mpBgW = new dBgW();
if (mpBgW != NULL) {
if (mpBgW->Set((cBgD_t*)dComIfG_getObjectRes(m_arcname, GBRG00_DZB_HHASHI1), cBgW::MOVE_BG_e, &mMtx) == true) {
if (mpBgW->Set((cBgD_t*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GBRG00_DZB_HHASHI1_e), cBgW::MOVE_BG_e, &mMtx) == true) {
return FALSE;
} else {
return TRUE;
src/d/actor/d_a_leaflift.cpp
+3 -3
View File
@@ -9,7 +9,7 @@
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_com_inf_game.h"
#include "d/d_lib.h"
#include "d/res/res_olift.h"
#include "res/Object/Olift.h"
#include "m_Do/m_Do_ext.h"
static dCcD_SrcCyl l_cyl_src = {
@@ -79,7 +79,7 @@ static void rideCallBack(dBgW* param1, fopAc_ac_c* i_this, fopAc_ac_c* i_other);
/* 000001E0-00000338 .text CreateHeap__9daLlift_cFv */
BOOL daLlift_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData *)dComIfG_getObjectRes(m_arcname, OLIFT_BDL_OLIFT);
J3DModelData* modelData = (J3DModelData *)dComIfG_getObjectRes(m_arcname, dRes_INDEX_OLIFT_BDL_OLIFT_e);
JUT_ASSERT(DEMO_SELECT(327, 334), modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
@@ -90,7 +90,7 @@ BOOL daLlift_c::CreateHeap() {
mpModel->setUserArea((u32)this);
mpBgW = new dBgW();
if (mpBgW) {
cBgD_t* pData = (cBgD_t *)dComIfG_getObjectRes(m_arcname, OLIFT_DZB_OLIFT);
cBgD_t* pData = (cBgD_t *)dComIfG_getObjectRes(m_arcname, dRes_INDEX_OLIFT_DZB_OLIFT_e);
if (mpBgW->Set(pData, cBgW::MOVE_BG_e, &mMtx) == 1) {
return FALSE;
}
src/d/actor/d_a_lwood.cpp
+3 -3
View File
@@ -7,7 +7,7 @@
#include "d/actor/d_a_lwood.h"
#include "d/d_a_obj.h"
#include "d/d_com_inf_game.h"
#include "d/res/res_lwood.h"
#include "res/Object/Lwood.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_graphic.h"
@@ -20,7 +20,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00000098-00000194 .text CreateHeap__9daLwood_cFv */
BOOL daLwood_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, LWOOD_BDL_ALWD);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_LWOOD_BDL_ALWD_e);
JUT_ASSERT(0xb9, modelData != NULL);
mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
if (mModel == NULL)
@@ -28,7 +28,7 @@ BOOL daLwood_c::CreateHeap() {
mModel->setUserArea((u32)this);
setMoveBGMtx();
cBgD_t* bgp = (cBgD_t*)dComIfG_getObjectRes(m_arcname, LWOOD_DZB_ALWD);
cBgD_t* bgp = (cBgD_t*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_LWOOD_DZB_ALWD_e);
mpBgW = dBgW_NewSet(bgp, dBgW::MOVE_BG_e, &mtx);
if (mpBgW == NULL)
return FALSE;
src/d/actor/d_a_machine.cpp
+3 -3
View File
@@ -9,7 +9,7 @@
#include "f_op/f_op_actor_mng.h"
#include "d/d_com_inf_game.h"
#include "m_Do/m_Do_ext.h"
#include "d/res/res_hkikai1.h"
#include "res/Object/Hkikai1.h"
static dCcD_SrcSph l_sph_src_at = {
// dCcD_SrcGObjInf
@@ -90,14 +90,14 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
BOOL daMachine_c::CreateHeap() {
BOOL success;
J3DModelData * modelData = (J3DModelData *)dComIfG_getObjectRes(m_arcname, HKIKAI1_BDL_HKIKAI1);
J3DModelData * modelData = (J3DModelData *)dComIfG_getObjectRes(m_arcname, dRes_INDEX_HKIKAI1_BDL_HKIKAI1_e);
JUT_ASSERT(DEMO_SELECT(340, 345), modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222);
if(mpModel == NULL) {
success = false;
} else{
J3DAnmTransform * pbck = (J3DAnmTransform *)dComIfG_getObjectRes(m_arcname, HKIKAI1_BCK_HKIKAI1);
J3DAnmTransform * pbck = (J3DAnmTransform *)dComIfG_getObjectRes(m_arcname, dRes_INDEX_HKIKAI1_BCK_HKIKAI1_e);
JUT_ASSERT(DEMO_SELECT(356, 361), pbck != NULL)
int initRet = field_0xc04.init(modelData,pbck, true, 0,1.0f,0,-1,false);
src/d/actor/d_a_majuu_flag.cpp
+8 -8
View File
@@ -8,10 +8,10 @@
#include "d/d_com_inf_game.h"
#include "d/d_kankyo_wether.h"
#include "d/d_s_play.h"
#include "d/res/res_cloth.h"
#include "d/res/res_matif.h"
#include "d/res/res_vsvfg.h"
#include "d/res/res_xhcf.h"
#include "res/Object/Cloth.h"
#include "res/Object/Matif.h"
#include "res/Object/Vsvfg.h"
#include "res/Object/Xhcf.h"
#include "dolphin/gx/GXTexture.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_graphic.h"
@@ -993,11 +993,11 @@ static cPhs_State daMajuu_Flag_Create(fopAc_ac_c* a_this) {
if (i_this->mTexType != 0) {
if (i_this->mTexType == 1) {
texInfo = (ResTIMG*)dComIfG_getObjectRes("Matif", MATIF_BTI_FLAG_MATI);
texInfo = (ResTIMG*)dComIfG_getObjectRes("Matif", dRes_INDEX_MATIF_BTI_FLAG_MATI_e);
} else if (i_this->mTexType == 2) {
texInfo = (ResTIMG*)dComIfG_getObjectRes("Vsvfg", VSVFG_BTI_VSVFG);
texInfo = (ResTIMG*)dComIfG_getObjectRes("Vsvfg", dRes_INDEX_VSVFG_BTI_VSVFG_e);
} else if (i_this->mTexType == 3) {
texInfo = (ResTIMG*)dComIfG_getObjectRes("Xhcf", XHCF_BTI_X_HC_FLAG00);
texInfo = (ResTIMG*)dComIfG_getObjectRes("Xhcf", dRes_INDEX_XHCF_BTI_X_HC_FLAG00_e);
}
mip = GXBool(texInfo->mipmapCount > 1);
GXInitTexObj(
@@ -1026,7 +1026,7 @@ static cPhs_State daMajuu_Flag_Create(fopAc_ac_c* a_this) {
GXInitTexObjLOD(i_this->mPacket.getImageTexObj(), GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, 0, 0, GX_ANISO_1);
}
texInfo = (ResTIMG*)dComIfG_getObjectRes("Cloth", CLOTH_BTI_CLOTHTOON);
texInfo = (ResTIMG*)dComIfG_getObjectRes("Cloth", dRes_INDEX_CLOTH_BTI_CLOTHTOON_e);
mip = GXBool(texInfo->mipmapCount > 1);
GXInitTexObj(
i_this->mPacket.getToonTexObj(),
src/d/actor/d_a_mbdoor.cpp
+12 -12
View File
@@ -5,8 +5,8 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_mbdoor.h"
#include "d/res/res_mbdoor.h"
#include "d/res/res_gbdoor.h"
#include "res/Object/Mbdoor.h"
#include "res/Object/Gbdoor.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_com_inf_game.h"
#include "m_Do/m_Do_ext.h"
@@ -54,9 +54,9 @@ const char* daMbdoor_c::getArcName() {
u32 daMbdoor_c::getFuBdl() {
switch (getShapeType()) {
case 1:
return GBDOOR_BDL_V_GBDFU;
return dRes_INDEX_GBDOOR_BDL_V_GBDFU_e;
default:
return MBDOOR_BDL_S_MBDFU;
return dRes_INDEX_MBDOOR_BDL_S_MBDFU_e;
}
}
@@ -64,9 +64,9 @@ u32 daMbdoor_c::getFuBdl() {
u32 daMbdoor_c::getLBdl() {
switch (getShapeType()) {
case 1:
return GBDOOR_BDL_V_GBD_L;
return dRes_INDEX_GBDOOR_BDL_V_GBD_L_e;
default:
return MBDOOR_BDL_S_MBD_L;
return dRes_INDEX_MBDOOR_BDL_S_MBD_L_e;
}
}
@@ -74,9 +74,9 @@ u32 daMbdoor_c::getLBdl() {
u32 daMbdoor_c::getRBdl() {
switch (getShapeType()) {
case 1:
return GBDOOR_BDL_V_GBD_R;
return dRes_INDEX_GBDOOR_BDL_V_GBD_R_e;
default:
return MBDOOR_BDL_S_MBD_R;
return dRes_INDEX_MBDOOR_BDL_S_MBD_R_e;
}
}
@@ -84,9 +84,9 @@ u32 daMbdoor_c::getRBdl() {
u32 daMbdoor_c::getToBdl() {
switch (getShapeType()) {
case 1:
return GBDOOR_BDL_V_GBDTO;
return dRes_INDEX_GBDOOR_BDL_V_GBDTO_e;
default:
return MBDOOR_BDL_S_MBDTO;
return dRes_INDEX_MBDOOR_BDL_S_MBDTO_e;
}
}
@@ -94,9 +94,9 @@ u32 daMbdoor_c::getToBdl() {
u32 daMbdoor_c::getDzb() {
switch (getShapeType()) {
case 1:
return GBDOOR_DZB_GBD;
return dRes_INDEX_GBDOOR_DZB_GBD_e;
default:
return MBDOOR_DZB_S_MBDFU;
return dRes_INDEX_MBDOOR_DZB_S_MBDFU_e;
}
}
src/d/actor/d_a_mdoor.cpp
+5 -5
View File
@@ -7,7 +7,7 @@
#include "d/actor/d_a_mdoor.h"
#include "d/d_bg_w.h"
#include "d/d_com_inf_game.h"
#include "d/res/res_mdoor.h"
#include "res/Object/Mdoor.h"
#include "f_op/f_op_actor_mng.h"
const char daMdoor_c::M_arcname[] = "Mdoor";
@@ -44,13 +44,13 @@ BOOL daMdoor_c::CreateHeap() {
switch (getShapeType()) {
case 1:
modelRes = MDOOR_BDL_MORI2;
bgdRes = MDOOR_DZB_MORI2;
modelRes = dRes_INDEX_MDOOR_BDL_MORI2_e;
bgdRes = dRes_INDEX_MDOOR_DZB_MORI2_e;
break;
default:
modelRes = MDOOR_BDL_MORI1;
bgdRes = MDOOR_DZB_MORI1;
modelRes = dRes_INDEX_MDOOR_BDL_MORI1_e;
bgdRes = dRes_INDEX_MDOOR_DZB_MORI1_e;
break;
}
src/d/actor/d_a_mflft.cpp
+5 -5
View File
@@ -5,8 +5,8 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_mflft.h"
#include "d/res/res_mflft.h"
#include "d/res/res_always.h"
#include "res/Object/Mflft.h"
#include "res/Object/Always.h"
#include "d/d_bg_w.h"
#include "d/d_com_inf_game.h"
#include "d/d_bg_s_movebg_actor.h"
@@ -543,7 +543,7 @@ static BOOL daMflft_Delete(mflft_class* i_this) {
static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) {
mflft_class* actor = (mflft_class*)a_this;
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Mflft", MFLFT_BDL_MFLFT);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Mflft", dRes_INDEX_MFLFT_BDL_MFLFT_e);
actor->mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (actor->mpModel == NULL) {
return FALSE;
@@ -554,10 +554,10 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) {
actor->pm_bgw = new dBgW();
JUT_ASSERT(DEMO_SELECT(1047, 1058), actor->pm_bgw != NULL);
actor->pm_bgw->Set((cBgD_t*)dComIfG_getObjectRes("Mflft", MFLFT_DZB_MFLFT), dBgW::MOVE_BG_e, &actor->m700);
actor->pm_bgw->Set((cBgD_t*)dComIfG_getObjectRes("Mflft", dRes_INDEX_MFLFT_DZB_MFLFT_e), dBgW::MOVE_BG_e, &actor->m700);
actor->pm_bgw->SetCrrFunc(dBgS_MoveBGProc_Typical);
actor->pm_bgw->SetRideCallback(ride_call_back);
if (!actor->mLineMat.init(6, 10, (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_ROPE), 1)) {
if (!actor->mLineMat.init(6, 10, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), 1)) {
return FALSE;
}
return TRUE;
src/d/actor/d_a_mo2.cpp
+81 -81
View File
@@ -16,7 +16,7 @@
#include "d/d_s_play.h"
#include "d/d_material.h"
#include "d/d_snap.h"
#include "d/res/res_mo2.h"
#include "res/Object/Mo2.h"
#include "f_op/f_op_camera.h"
#include "m_Do/m_Do_controller_pad.h"
@@ -70,39 +70,39 @@ struct attack_info_s {
};
static attack_info_s Atsuki_info[] = {
{MO2_BCK_ATSUKI01, 1.0f, MO2_BAS_ATSUKI01},
{MO2_BCK_ATSUKI02, 1.0f, MO2_BAS_ATSUKI02},
{MO2_BCK_ATSUKI03, 1.0f, MO2_BAS_ATSUKI03},
{dRes_INDEX_MO2_BCK_ATSUKI01_e, 1.0f, dRes_INDEX_MO2_BAS_ATSUKI01_e},
{dRes_INDEX_MO2_BCK_ATSUKI02_e, 1.0f, dRes_INDEX_MO2_BAS_ATSUKI02_e},
{dRes_INDEX_MO2_BCK_ATSUKI03_e, 1.0f, dRes_INDEX_MO2_BAS_ATSUKI03_e},
};
static attack_info_s Atate_info[] = {
{MO2_BCK_ATATE01, 1.0f, MO2_BAS_ATATE01},
{MO2_BCK_ATATE02, 1.0f, MO2_BAS_ATATE02},
{MO2_BCK_ATATE03, 1.0f, MO2_BAS_ATATE03},
{dRes_INDEX_MO2_BCK_ATATE01_e, 1.0f, dRes_INDEX_MO2_BAS_ATATE01_e},
{dRes_INDEX_MO2_BCK_ATATE02_e, 1.0f, dRes_INDEX_MO2_BAS_ATATE02_e},
{dRes_INDEX_MO2_BCK_ATATE03_e, 1.0f, dRes_INDEX_MO2_BAS_ATATE03_e},
};
static attack_info_s Akaiten_info[] = {
{MO2_BCK_AKAITEN01, 1.0f, MO2_BAS_AKAITEN01},
{MO2_BCK_AKAITEN02, 1.0f, MO2_BAS_AKAITEN02},
{MO2_BCK_AKAITEN03, 1.0f, MO2_BAS_AKAITEN03},
{dRes_INDEX_MO2_BCK_AKAITEN01_e, 1.0f, dRes_INDEX_MO2_BAS_AKAITEN01_e},
{dRes_INDEX_MO2_BCK_AKAITEN02_e, 1.0f, dRes_INDEX_MO2_BAS_AKAITEN02_e},
{dRes_INDEX_MO2_BCK_AKAITEN03_e, 1.0f, dRes_INDEX_MO2_BAS_AKAITEN03_e},
};
static attack_info_s Ahazushi_info[] = {
{MO2_BCK_AHAZUSHI01, 1.0f, MO2_BAS_AHAZUSHI01},
{MO2_BCK_AHAZUSHI02, 1.0f, MO2_BAS_AHAZUSHI02},
{MO2_BCK_AHAZUSHI03, 1.0f, MO2_BAS_AHAZUSHI03},
{dRes_INDEX_MO2_BCK_AHAZUSHI01_e, 1.0f, dRes_INDEX_MO2_BAS_AHAZUSHI01_e},
{dRes_INDEX_MO2_BCK_AHAZUSHI02_e, 1.0f, dRes_INDEX_MO2_BAS_AHAZUSHI02_e},
{dRes_INDEX_MO2_BCK_AHAZUSHI03_e, 1.0f, dRes_INDEX_MO2_BAS_AHAZUSHI03_e},
};
static attack_info_s Najab_info[] = {
{MO2_BCK_NAJAB, 1.0f, MO2_BAS_NAJAB},
{MO2_BCK_NAJAB, 1.0f, MO2_BAS_NAJAB},
{MO2_BCK_NAJAB, 1.0f, MO2_BAS_NAJAB},
{dRes_INDEX_MO2_BCK_NAJAB_e, 1.0f, dRes_INDEX_MO2_BAS_NAJAB_e},
{dRes_INDEX_MO2_BCK_NAJAB_e, 1.0f, dRes_INDEX_MO2_BAS_NAJAB_e},
{dRes_INDEX_MO2_BCK_NAJAB_e, 1.0f, dRes_INDEX_MO2_BAS_NAJAB_e},
};
static attack_info_s Nabigpunch_info[] = {
{MO2_BCK_NABIGPUNCH01, 1.0f, MO2_BAS_NABIGPUNCH01},
{MO2_BCK_NABIGPUNCH02, 1.0f, MO2_BAS_NABIGPUNCH02},
{MO2_BCK_NABIGPUNCH03, 1.0f, MO2_BAS_NABIGPUNCH03},
{dRes_INDEX_MO2_BCK_NABIGPUNCH01_e, 1.0f, dRes_INDEX_MO2_BAS_NABIGPUNCH01_e},
{dRes_INDEX_MO2_BCK_NABIGPUNCH02_e, 1.0f, dRes_INDEX_MO2_BAS_NABIGPUNCH02_e},
{dRes_INDEX_MO2_BCK_NABIGPUNCH03_e, 1.0f, dRes_INDEX_MO2_BAS_NABIGPUNCH03_e},
};
static attack_info_s* attack_info[] = {
@@ -1064,18 +1064,18 @@ static s32 daMo2_player_way_check(mo2_class* i_this) {
static void wait_set(mo2_class* i_this) {
if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) {
if (i_this->mMode == 1) {
anm_init(i_this, MO2_BCK_KWAIT, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_KWAIT);
anm_init(i_this, dRes_INDEX_MO2_BCK_KWAIT_e, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_KWAIT_e);
i_this->m05A4[1] = cM_rndF(100.0f) + 100.0f;
return;
}
anm_init(i_this, MO2_BCK_WAIT, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_WAIT);
anm_init(i_this, dRes_INDEX_MO2_BCK_WAIT_e, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_WAIT_e);
i_this->m05A4[1] = cM_rndF(60.0f) + 40.0f;
return;
}
if (i_this->mDamageReaction.mAction >= ACTION_FIGHT_RUN) {
anm_init(i_this, MO2_BCK_NBWAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_NBWAIT);
anm_init(i_this, dRes_INDEX_MO2_BCK_NBWAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_NBWAIT_e);
} else {
anm_init(i_this, MO2_BCK_SKYORO, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_SKYORO);
anm_init(i_this, dRes_INDEX_MO2_BCK_SKYORO_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_SKYORO_e);
}
i_this->m05A4[1] = cM_rndF(30.0f) + 50.0f;
}
@@ -1084,25 +1084,25 @@ static void wait_set(mo2_class* i_this) {
static void walk_set(mo2_class* i_this) {
if (i_this->mbHasInnateWeapon != 0) {
if (i_this->mMode == 1) {
anm_init(i_this, MO2_BCK_KWALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_KWALK);
anm_init(i_this, dRes_INDEX_MO2_BCK_KWALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_KWALK_e);
return;
}
anm_init(i_this, MO2_BCK_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_WALK);
anm_init(i_this, dRes_INDEX_MO2_BCK_WALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_WALK_e);
return;
}
if (i_this->m2943 == 0) {
anm_init(i_this, MO2_BCK_NWALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_NWALK);
anm_init(i_this, dRes_INDEX_MO2_BCK_NWALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_NWALK_e);
} else {
anm_init(i_this, MO2_BCK_NYWALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_NYWALK);
anm_init(i_this, dRes_INDEX_MO2_BCK_NYWALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_NYWALK_e);
}
}
/* 0000410C-00004170 .text fight_run_set__FP9mo2_class */
static void fight_run_set(mo2_class* i_this) {
if (i_this->mbHasInnateWeapon != 0) {
anm_init(i_this, MO2_BCK_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, MO2_BAS_WALK);
anm_init(i_this, dRes_INDEX_MO2_BCK_WALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, dRes_INDEX_MO2_BAS_WALK_e);
} else {
anm_init(i_this, MO2_BCK_SWALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_SWALK);
anm_init(i_this, dRes_INDEX_MO2_BCK_SWALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_SWALK_e);
}
}
@@ -1416,7 +1416,7 @@ static void jyunkai(mo2_class* i_this) {
if (point->mArg3 == 7 || point->mArg3 == 8) {
i_this->mDamageReaction.mMode = 4;
i_this->m05A4[1] = cM_rndF(100.0f) + 100.0f;
anm_init(i_this, MO2_BCK_KKEIKAI, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_KKEIKAI);
anm_init(i_this, dRes_INDEX_MO2_BCK_KKEIKAI_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_KKEIKAI_e);
if (point->mArg3 == 7) {
i_this->mDamageReaction.m4D0 += -0x4000;
} else {
@@ -1541,7 +1541,7 @@ static void fight_run(mo2_class* i_this) {
if (daMo2_player_way_check(i_this)) {
if (i_this->m2964 > 0x14) {
i_this->m2964 = 0;
anm_init(i_this, MO2_BCK_GAKEDEMO, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_MO2_BCK_GAKEDEMO_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m05B0 = cM_rndF(10.0f) + 15.0f;
}
if (i_this->m05B0 == 1) {
@@ -1555,7 +1555,7 @@ static void fight_run(mo2_class* i_this) {
} else {
if (i_this->m2964 == 0 && i_this->mbHasInnateWeapon != 0) {
i_this->m2964 = 1;
anm_init(i_this, MO2_BCK_DASH, 5.0f, J3DFrameCtrl::EMode_LOOP, l_mo2HIO.m070, MO2_BAS_DASH);
anm_init(i_this, dRes_INDEX_MO2_BCK_DASH_e, 5.0f, J3DFrameCtrl::EMode_LOOP, l_mo2HIO.m070, dRes_INDEX_MO2_BAS_DASH_e);
}
if (i_this->m2964 != 0) {
i_this->m2964 = i_this->m2964 + 1;
@@ -1576,9 +1576,9 @@ static void fight_run(mo2_class* i_this) {
} else {
if (std::fabsf(dVar9) > 0.1f) {
if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) {
anm_init(i_this, MO2_BCK_BWALKLR, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_BWALKLR);
anm_init(i_this, dRes_INDEX_MO2_BCK_BWALKLR_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_BWALKLR_e);
} else {
anm_init(i_this, MO2_BCK_NBWALKLR, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_NBWALKLR);
anm_init(i_this, dRes_INDEX_MO2_BCK_NBWALKLR_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_NBWALKLR_e);
}
if (dVar9 > 0.0f) {
i_this->mDamageReaction.mMode = 5;
@@ -1588,16 +1588,16 @@ static void fight_run(mo2_class* i_this) {
} else {
if (i_this->m05C0 < l_mo2HIO.m034) {
if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) {
anm_init(i_this, MO2_BCK_BWALKFB, 10.0f, J3DFrameCtrl::EMode_LOOP, -1.0f, MO2_BAS_BWALKFB);
anm_init(i_this, dRes_INDEX_MO2_BCK_BWALKFB_e, 10.0f, J3DFrameCtrl::EMode_LOOP, -1.0f, dRes_INDEX_MO2_BAS_BWALKFB_e);
} else {
anm_init(i_this, MO2_BCK_NBWALKFB, 10.0f, J3DFrameCtrl::EMode_LOOP, -1.0f, MO2_BAS_NBWALKFB);
anm_init(i_this, dRes_INDEX_MO2_BCK_NBWALKFB_e, 10.0f, J3DFrameCtrl::EMode_LOOP, -1.0f, dRes_INDEX_MO2_BAS_NBWALKFB_e);
}
i_this->mDamageReaction.mMode = 4;
} else {
if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) {
anm_init(i_this, MO2_BCK_BWALKFB, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_BWALKFB);
anm_init(i_this, dRes_INDEX_MO2_BCK_BWALKFB_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_BWALKFB_e);
} else {
anm_init(i_this, MO2_BCK_NBWALKFB, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_NBWALKFB);
anm_init(i_this, dRes_INDEX_MO2_BCK_NBWALKFB_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_NBWALKFB_e);
}
i_this->mDamageReaction.mMode = 3;
}
@@ -1620,9 +1620,9 @@ static void fight_run(mo2_class* i_this) {
} else {
i_this->mDamageReaction.mMode = 3;
if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) {
anm_init(i_this, MO2_BCK_BWALKFB, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_BWALKFB);
anm_init(i_this, dRes_INDEX_MO2_BCK_BWALKFB_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_BWALKFB_e);
} else {
anm_init(i_this, MO2_BCK_NBWALKFB, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_NBWALKFB);
anm_init(i_this, dRes_INDEX_MO2_BCK_NBWALKFB_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_NBWALKFB_e);
}
}
break;
@@ -2029,7 +2029,7 @@ static void nage(mo2_class* i_this) {
{
i_this->m05A4[1] = l_mo2HIO.m00A + l_mo2HIO.m00C;
i_this->m05A4[2] = l_mo2HIO.m00C;
anm_init(i_this, MO2_BCK_KKEIKAI, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_KKEIKAI);
anm_init(i_this, dRes_INDEX_MO2_BCK_KKEIKAI_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_KKEIKAI_e);
i_this->mDamageReaction.mMode = -9;
i_this->mDamageReaction.m713 = 0;
i_this->m05A4[0] = REG0_S(7) + 0xf;
@@ -2062,7 +2062,7 @@ static void nage(mo2_class* i_this) {
maxSpeed = 0;
if (i_this->m05A4[1] == 0) {
i_this->mDamageReaction.mMode = 1;
anm_init(i_this, MO2_BCK_KWALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, MO2_BAS_KWALK);
anm_init(i_this, dRes_INDEX_MO2_BCK_KWALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, dRes_INDEX_MO2_BAS_KWALK_e);
}
actor->speedF = 0.0f;
break;
@@ -2070,7 +2070,7 @@ static void nage(mo2_class* i_this) {
cLib_addCalc2(&actor->speedF, l_mo2HIO.m058, 1.0f, 20.0f);
if (i_this->m05C0 < l_mo2HIO.m030) {
i_this->mDamageReaction.mMode = 2;
anm_init(i_this, MO2_BCK_KNAGE, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_KNAGE);
anm_init(i_this, dRes_INDEX_MO2_BCK_KNAGE_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_KNAGE_e);
}
break;
case 2:
@@ -2112,7 +2112,7 @@ static void p_lost(mo2_class* i_this) {
switch (i_this->mDamageReaction.mMode) {
case -10:
if (i_this->mDamageReaction.m470 < 200.0f) {
anm_init(i_this, MO2_BCK_UKYADEMO, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_MO2_BCK_UKYADEMO_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mDamageReaction.mMode = -9;
tex_anm_set(i_this, 4);
i_this->m05A4[1] = 0x23;
@@ -2131,7 +2131,7 @@ static void p_lost(mo2_class* i_this) {
case 0:
i_this->mDamageReaction.mMode = 1;
tex_anm_set(i_this, 4);
anm_init(i_this, MO2_BCK_BKYORO, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_BKYORO);
anm_init(i_this, dRes_INDEX_MO2_BCK_BKYORO_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_BKYORO_e);
break;
case 1:
actor->speedF = 0.0f;
@@ -2172,7 +2172,7 @@ static void b_nige(mo2_class* i_this) {
switch (i_this->mDamageReaction.mMode) {
case 0:
i_this->mDamageReaction.mMode = 1;
anm_init(i_this, MO2_BCK_SHAKKEN, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_SHAKKEN);
anm_init(i_this, dRes_INDEX_MO2_BCK_SHAKKEN_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_SHAKKEN_e);
i_this->m05A4[1] = 0x14;
// Fall-through
case 1:
@@ -2180,7 +2180,7 @@ static void b_nige(mo2_class* i_this) {
cLib_addCalcAngleS2(&actor->current.angle.y, i_this->mDamageReaction.m4D0 + 0x8000, 2, 0x3000);
if (i_this->m05A4[1] == 0) {
i_this->mDamageReaction.mMode = 2;
anm_init(i_this, MO2_BCK_NWALK, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_NWALK);
anm_init(i_this, dRes_INDEX_MO2_BCK_NWALK_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_NWALK_e);
}
break;
case 2:
@@ -2190,7 +2190,7 @@ static void b_nige(mo2_class* i_this) {
cLib_addCalcAngleS2(&actor->current.angle.y, i_this->mDamageReaction.m4D0, 4, 0x1000);
if (std::sqrtf(SQUARE(local_10.x) + SQUARE(local_10.z)) > 800.0f) {
i_this->mDamageReaction.mMode = 3;
anm_init(i_this, MO2_BCK_NBWAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_NBWAIT);
anm_init(i_this, dRes_INDEX_MO2_BCK_NBWAIT_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_NBWAIT_e);
}
break;
case 3:
@@ -2216,7 +2216,7 @@ static void defence(mo2_class* i_this) {
switch (i_this->mDamageReaction.mMode) {
case 0:
i_this->mDamageReaction.mMode = 1;
anm_init(i_this, MO2_BCK_BWALKFB, 5.0f, J3DFrameCtrl::EMode_NONE, -1.0f, MO2_BAS_BWALKFB);
anm_init(i_this, dRes_INDEX_MO2_BCK_BWALKFB_e, 5.0f, J3DFrameCtrl::EMode_NONE, -1.0f, dRes_INDEX_MO2_BAS_BWALKFB_e);
i_this->m05A4[1] = REG6_S(3) + 0x1e;
tex_anm_set(i_this, 4);
actor->speedF = -20.0f;
@@ -2246,7 +2246,7 @@ static void oshi(mo2_class* i_this) {
switch (i_this->mDamageReaction.mMode) {
case 0:
i_this->mDamageReaction.mMode = 1;
anm_init(i_this, MO2_BCK_ADOTSUKI, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_ADOTSUKI);
anm_init(i_this, dRes_INDEX_MO2_BCK_ADOTSUKI_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_ADOTSUKI_e);
tex_anm_set(i_this, 4);
actor->speedF = 0.0f;
// Fall-through
@@ -2277,11 +2277,11 @@ static void hukki(mo2_class* i_this) {
i_this->m05B4 = 2;
switch (i_this->mDamageReaction.mMode) {
case 10:
anm_init(i_this, MO2_BCK_OKIRUA, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_OKIRUA);
anm_init(i_this, dRes_INDEX_MO2_BCK_OKIRUA_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_OKIRUA_e);
i_this->m05A4[2] = 0xF;
goto LAB_806ae194;
case 12:
anm_init(i_this, MO2_BCK_OKIRUU, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_OKIRUU);
anm_init(i_this, dRes_INDEX_MO2_BCK_OKIRUU_e, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_OKIRUU_e);
i_this->m05A4[2] = REG0_S(5) + 0xF;
LAB_806ae194:
tex_anm_set(i_this, 5);
@@ -2432,7 +2432,7 @@ static void yogan_fail(mo2_class* i_this) {
actor->speedF = 0.0f;
switch (i_this->mDamageReaction.mMode) {
case 0:
anm_init(i_this, MO2_BCK_AWATEDEMO, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_MO2_BCK_AWATEDEMO_e, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->mDamageReaction.mMode = 1;
actor->speed.y = REG0_F(0x13) + 190.0f;
fopAcM_monsSeStart(actor, JA_SE_CV_MO_ALERT, 0);
@@ -2485,7 +2485,7 @@ static void wepon_search(mo2_class* i_this) {
case -1:
i_this->mDamageReaction.mMode = 0;
i_this->m2943 = 0;
anm_init(i_this, MO2_BCK_SHAKKEN, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_SHAKKEN);
anm_init(i_this, dRes_INDEX_MO2_BCK_SHAKKEN_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_SHAKKEN_e);
if (dVar9 < 900.0f) {
i_this->m05A4[1] = 0x14;
} else {
@@ -2502,7 +2502,7 @@ static void wepon_search(mo2_class* i_this) {
if (i_this->mpMorf->isStop() || i_this->m05A4[1] == 0) {
i_this->mDamageReaction.mMode = 1;
i_this->m05AE = l_mo2HIO.m08A;
anm_init(i_this, MO2_BCK_SWALK, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_SWALK);
anm_init(i_this, dRes_INDEX_MO2_BCK_SWALK_e, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_SWALK_e);
}
}
break;
@@ -2512,14 +2512,14 @@ static void wepon_search(mo2_class* i_this) {
i_this->m05F2 = 4;
cLib_addCalcAngleS2(&actor->current.angle.y, i_this->mDamageReaction.m4D0, 4, 0x1000);
if (ground_4_check(i_this, 1, actor->current.angle.y, 300.0f)) {
anm_init(i_this, MO2_BCK_GAKEDEMO, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_MO2_BCK_GAKEDEMO_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->mDamageReaction.mMode = 3;
i_this->m05A4[1] = 0x1e;
i_this->m2943 = 1;
} else {
if (dVar9 < 300.0f) {
i_this->mDamageReaction.mMode = 2;
anm_init(i_this, MO2_BCK_SCATCH, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_SCATCH);
anm_init(i_this, dRes_INDEX_MO2_BCK_SCATCH_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_SCATCH_e);
i_this->m05A4[1] = 0x1d;
} else {
if (i_this->m05AE == 0 || i_this->mDamageReaction.mAcch.ChkWallHit()) {
@@ -2607,7 +2607,7 @@ static void hip_damage(mo2_class* i_this) {
switch (i_this->mDamageReaction.mMode) {
case 0:
i_this->mDamageReaction.mMode = 1;
anm_init(i_this, MO2_BCK_HIPDMG01, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_HIPDMG01);
anm_init(i_this, dRes_INDEX_MO2_BCK_HIPDMG01_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_HIPDMG01_e);
actor->speedF = REG6_F(0) + 100.0f;
i_this->m05A4[0] = 0xF;
i_this->m05F0 = l_mo2HIO.m024 + 3;
@@ -2617,7 +2617,7 @@ static void hip_damage(mo2_class* i_this) {
cLib_addCalc2(&actor->speedF, 0.0f, 1.0f, REG6_F(1) + 10.0f);
if (i_this->m05A4[0] == 0) {
i_this->mDamageReaction.mMode = 2;
anm_init(i_this, MO2_BCK_HIPDMG02, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_HIPDMG02);
anm_init(i_this, dRes_INDEX_MO2_BCK_HIPDMG02_e, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_HIPDMG02_e);
i_this->m05A4[0] = 0x3c;
i_this->mDamageReaction.m4D0 = actor->current.angle.y + 0x8000;
}
@@ -2649,7 +2649,7 @@ static void d_mahi(mo2_class* i_this) {
switch (i_this->mDamageReaction.mMode) {
case 0:
i_this->mDamageReaction.mMode = 1;
anm_init(i_this, MO2_BCK_KOKERUF, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_KOKERUF);
anm_init(i_this, dRes_INDEX_MO2_BCK_KOKERUF_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_KOKERUF_e);
i_this->m05A4[0] = 100;
// Fall-through
case 1:
@@ -2679,7 +2679,7 @@ static void d_sit(mo2_class* i_this) {
switch (i_this->mDamageReaction.mMode) {
case 0:
i_this->mDamageReaction.mMode = 1;
anm_init(i_this, MO2_BCK_KOKERUF, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_KOKERUF);
anm_init(i_this, dRes_INDEX_MO2_BCK_KOKERUF_e, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_KOKERUF_e);
i_this->m05A4[0] = 0x32;
// Fall-through
case 1:
@@ -2706,10 +2706,10 @@ static void d_dozou(mo2_class* i_this) {
i_this->mDamageReaction.mMode = 1;
i_this->mDamageReaction.mStts.Init(0xFF, 0xFF, actor);
if (i_this->mFrozenInTimePose == 0) {
anm_init(i_this, MO2_BCK_TACKLEDEMO, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, -1);
anm_init(i_this, dRes_INDEX_MO2_BCK_TACKLEDEMO_e, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, -1);
i_this->mpMorf->setFrame(3.0f);
} else {
anm_init(i_this, MO2_BCK_WALK, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, MO2_BAS_WALK);
anm_init(i_this, dRes_INDEX_MO2_BCK_WALK_e, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, dRes_INDEX_MO2_BAS_WALK_e);
i_this->mpMorf->setFrame(37.0f);
}
// Fall-through
@@ -2750,10 +2750,10 @@ static void carry_drop(mo2_class* i_this) {
switch (i_this->mDamageReaction.mMode) {
case 0:
i_this->mDamageReaction.mMode = 1;
anm_init(i_this, MO2_BCK_JSTART, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_JSTART);
anm_init(i_this, dRes_INDEX_MO2_BCK_JSTART_e, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_JSTART_e);
case 1:
if (i_this->mDamageReaction.mAcch.ChkGroundHit()) {
anm_init(i_this, MO2_BCK_JEND, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_JEND);
anm_init(i_this, dRes_INDEX_MO2_BCK_JEND_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_JEND_e);
i_this->mDamageReaction.mMode = 2;
i_this->m05F0 = l_mo2HIO.m024 + 6;
i_this->m05F2 = 3;
@@ -2788,14 +2788,14 @@ static void e3_demo(mo2_class* i_this) {
camera->mCamera.SetTrimSize(2);
switch (i_this->mDamageReaction.mMode) {
case 0:
anm_init(i_this, MO2_BCK_UKYADEMO, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
anm_init(i_this, dRes_INDEX_MO2_BCK_UKYADEMO_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
i_this->m05A4[1] = 0x19;
i_this->mDamageReaction.mMode = 1;
dMeter_mtrHide();
i_this->m2A4C = 200;
case 1:
if (i_this->m05A4[1] == 0) {
anm_init(i_this, MO2_BCK_SWALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_SWALK);
anm_init(i_this, dRes_INDEX_MO2_BCK_SWALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_SWALK_e);
i_this->mDamageReaction.mMode = 2;
if (alerm_set == 0) {
mDoAud_seStart(JA_SE_MAJUTOU_ALERM);
@@ -2809,7 +2809,7 @@ static void e3_demo(mo2_class* i_this) {
cLib_addCalc2(&actor->speedF, l_mo2HIO.m058, 1.0f, 20.0f);
if (i_this->m05C0 < l_mo2HIO.m030 || ground_4_check(i_this, 1, actor->current.angle.y, 100.0f)) {
i_this->mDamageReaction.mMode = 3;
anm_init(i_this, MO2_BCK_KNAGE, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_KNAGE);
anm_init(i_this, dRes_INDEX_MO2_BCK_KNAGE_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_KNAGE_e);
}
break;
case 3:
@@ -2821,7 +2821,7 @@ static void e3_demo(mo2_class* i_this) {
}
if (i_this->mpMorf->isStop()) {
i_this->mDamageReaction.mMode = 4;
anm_init(i_this, MO2_BCK_SWALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_SWALK);
anm_init(i_this, dRes_INDEX_MO2_BCK_SWALK_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_SWALK_e);
}
break;
}
@@ -2829,7 +2829,7 @@ static void e3_demo(mo2_class* i_this) {
cLib_addCalc2(&actor->speedF, l_mo2HIO.m058, 1.0f, 20.0f);
if (fopAcM_searchPlayerDistance(actor) < 250.0f || ground_4_check(i_this, 1, actor->current.angle.y, 100.0f)) {
i_this->mDamageReaction.mMode = 5;
anm_init(i_this, MO2_BCK_WAITDEMO, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
anm_init(i_this, dRes_INDEX_MO2_BCK_WAITDEMO_e, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
i_this->m05A4[1] = 0x1E;
mDoAud_seStop(JA_SE_MAJUTOU_ALERM, 30);
player->changeOriginalDemo();
@@ -3215,7 +3215,7 @@ static u8 damage_check(mo2_class* i_this) {
i_this->mDamageReaction.m424 |= 0x20;
i_this->mDamageReaction.m428 = 23.0f;
cMtx_YrotS(*calc_mtx, i_this->m05D6);
anm_init(i_this, MO2_BCK_PAOMUKE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_PAOMUKE);
anm_init(i_this, dRes_INDEX_MO2_BCK_PAOMUKE_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_PAOMUKE_e);
i_this->mDamageReaction.m48A = 10;
i_this->mDamageReaction.m474 = 5000.0f;
i_this->mDamageReaction.m70E = 7;
@@ -3515,14 +3515,14 @@ static BOOL daMo2_Execute(mo2_class* i_this) {
i_this->m2954 = fpcM_ERROR_PROCESS_ID_e;
switch (r3) {
case 1:
anm_init(i_this, MO2_BCK_PAOMUKE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_PAOMUKE);
anm_init(i_this, dRes_INDEX_MO2_BCK_PAOMUKE_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_PAOMUKE_e);
if (i_this->mbHasInnateWeapon != 0 && (actor->health <= 0 || r23 >= 4 || cM_rndF(1.0f) < 0.5f)) {
i_this->mSpawnWeaponActor = 1;
}
i_this->mDamageReaction.mAction = ACTION_JYUNKAI;
break;
case 2:
anm_init(i_this, MO2_BCK_PUTSUBUSE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_PUTSUBUSE);
anm_init(i_this, dRes_INDEX_MO2_BCK_PUTSUBUSE_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_PUTSUBUSE_e);
break;
case 5:
if ((i_this->mMode != 1 || rouya_mode == 0) &&
@@ -3557,7 +3557,7 @@ static BOOL daMo2_Execute(mo2_class* i_this) {
i_this->mDamageReaction.m4C8[2] = l_mo2HIO.m088;
break;
case 0x1E:
anm_init(i_this, MO2_BCK_PAOMUKE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_PAOMUKE);
anm_init(i_this, dRes_INDEX_MO2_BCK_PAOMUKE_e, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, dRes_INDEX_MO2_BAS_PAOMUKE_e);
if (i_this->mbHasInnateWeapon != 0) {
i_this->mSpawnWeaponActor = 1;
}
@@ -3847,16 +3847,16 @@ static BOOL createHeap(fopAc_ac_c* a_this) {
mo2_class* i_this = (mo2_class*)a_this;
i_this->mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Mo2", MO2_BDL_MO),
(J3DModelData*)dComIfG_getObjectRes("Mo2", dRes_INDEX_MO2_BDL_MO_e),
NULL,
NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes("Mo2", MO2_BCK_WAIT),
(J3DAnmTransformKey*)dComIfG_getObjectRes("Mo2", dRes_INDEX_MO2_BCK_WAIT_e),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
-1,
1,
dComIfG_getObjectRes("Mo2", MO2_BAS_WAIT),
dComIfG_getObjectRes("Mo2", dRes_INDEX_MO2_BAS_WAIT_e),
0x00080000,
0x37441422
);
@@ -3876,7 +3876,7 @@ static BOOL createHeap(fopAc_ac_c* a_this) {
}
}
if (i_this->mMode != 1) {
i_this->m2A50 = (J3DMaterialTable*)dComIfG_getObjectRes("Mo2", MO2_BMT_MO_GREEN);
i_this->m2A50 = (J3DMaterialTable*)dComIfG_getObjectRes("Mo2", dRes_INDEX_MO2_BMT_MO_GREEN_e);
}
J3DAnmTexPattern* btp = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes("Mo2", mo2_tex_anm_idx[3]));
JUT_ASSERT(DEMO_SELECT(8843, 8863), btp);
@@ -3884,9 +3884,9 @@ static BOOL createHeap(fopAc_ac_c* a_this) {
return FALSE;
}
i_this->m3Dline.init(16, 10, 0);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Mo2", MO2_BMD_KB);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Mo2", dRes_INDEX_MO2_BMD_KB_e);
JUT_ASSERT(DEMO_SELECT(8881, 8901), modelData != NULL);
J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Mo2", MO2_BMT_MO_BLUR);
J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Mo2", dRes_INDEX_MO2_BMT_MO_BLUR_e);
modelData->setMaterialTable(bmt, J3DMatCopyFlag_Material);
i_this->m058C = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (i_this->m058C == NULL) {
@@ -4153,7 +4153,7 @@ static cPhs_State daMo2_Create(fopAc_ac_c* a_this) {
a_this->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e;
}
if (i_this->mMode == 5) {
anm_init(i_this, MO2_BCK_BB_FLY, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_BB_FLY);
anm_init(i_this, dRes_INDEX_MO2_BCK_BB_FLY_e, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, dRes_INDEX_MO2_BAS_BB_FLY_e);
i_this->mDamageReaction.mAction = ACTION_CARRY;
i_this->mDamageReaction.mMaxFallDistance = 100000.0f;
}
src/d/actor/d_a_mozo.cpp
+5 -5
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_mozo.h"
#include "d/res/res_mozo.h"
#include "res/Object/Mozo.h"
#include "f_op/f_op_actor_mng.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "d/d_com_inf_game.h"
@@ -104,13 +104,13 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 000007AC-00000A24 .text CreateHeap__8daMozo_cFv */
BOOL daMozo_c::CreateHeap() {
J3DModelData* mdlData = (J3DModelData*)dComIfG_getObjectRes("Mozo", MOZO_INDEX_BDL_MOZ);
J3DModelData* mdlData = (J3DModelData*)dComIfG_getObjectRes("Mozo", dRes_INDEX_MOZO_BDL_MOZ_e);
mDoExt_McaMorf* newMorf = new mDoExt_McaMorf(
mdlData,
0,
0,
static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Mozo", MOZO_INDEX_BCK_MOZ)),
static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Mozo", dRes_INDEX_MOZO_BCK_MOZ_e)),
J3DFrameCtrl::EMode_LOOP,
1.0f,
0,
@@ -123,10 +123,10 @@ BOOL daMozo_c::CreateHeap() {
mAnimMorf = newMorf;
m_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Mozo", MOZO_INDEX_BRK_MOZ);
m_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Mozo", dRes_INDEX_MOZO_BRK_MOZ_e);
JUT_ASSERT(0x16A, m_brk != NULL);
m_btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Mozo", MOZO_INDEX_BTK_MOZ);
m_btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Mozo", dRes_INDEX_MOZO_BTK_MOZ_e);
JUT_ASSERT(0x16D, m_btk != NULL);
int brkInitResult = mBrkAnm.init(mdlData, m_brk, true, J3DFrameCtrl::EMode_NONE);
src/d/actor/d_a_msw.cpp
+4 -4
View File
@@ -5,7 +5,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_msw.h"
#include "d/res/res_msw.h"
#include "res/Object/Msw.h"
#include "d/d_bg_s_movebg_actor.h"
#include "m_Do/m_Do_ext.h"
#include "d/d_com_inf_game.h"
@@ -210,14 +210,14 @@ static BOOL daMsw_Delete(msw_class* i_this) {
BOOL daMsw_CreateInit(fopAc_ac_c* i_this) {
msw_class* pActor = static_cast<msw_class*>(i_this);
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Msw", MSW_BDL_MSWNG));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Msw", dRes_INDEX_MSW_BDL_MSWNG_e));
pActor->mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (pActor->mpModel == NULL) {
return FALSE;
}
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Msw", MSW_BDL_OBM_CHAIN1));
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Msw", dRes_INDEX_MSW_BDL_OBM_CHAIN1_e));
JUT_ASSERT(DEMO_SELECT(519, 523), modelData != NULL);
for (int chainIdx = 0; chainIdx < 4; chainIdx++) {
@@ -233,7 +233,7 @@ BOOL daMsw_CreateInit(fopAc_ac_c* i_this) {
return FALSE;
}
cBgD_t* pBgd = static_cast<cBgD_t*>(dComIfG_getObjectRes("Msw", MSW_DZB_MSWING));
cBgD_t* pBgd = static_cast<cBgD_t*>(dComIfG_getObjectRes("Msw", dRes_INDEX_MSW_DZB_MSWING_e));
BOOL error = pActor->mpBgW->Set(pBgd, cBgW::MOVE_BG_e, &pActor->mMtx);
if (error == TRUE) {
src/d/actor/d_a_mtoge.cpp
+3 -3
View File
@@ -6,7 +6,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_mtoge.h"
#include "d/d_com_inf_game.h"
#include "d/res/res_mtoge.h"
#include "res/Object/Mtoge.h"
#include "f_op/f_op_actor_mng.h"
const char daMtoge_c::M_arcname[] = "Mtoge";
@@ -31,7 +31,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 000000A4-000001E8 .text CreateHeap__9daMtoge_cFv */
BOOL daMtoge_c::CreateHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, MTOGE_BMD_S_MTOGE));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, dRes_INDEX_MTOGE_BMD_S_MTOGE_e));
JUT_ASSERT(0x70, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203U);
@@ -45,7 +45,7 @@ BOOL daMtoge_c::CreateHeap() {
if (!mpBgW)
return FALSE;
cBgD_t* pData = (cBgD_t*)dComIfG_getObjectRes(M_arcname, MTOGE_DZB_S_MTOGE);
cBgD_t* pData = (cBgD_t*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_MTOGE_DZB_S_MTOGE_e);
if (!pData) {
return FALSE;

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