mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 13:13:29 -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
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
);