summaryrefslogtreecommitdiff
path: root/src/d
diff options
context:
space:
mode:
Diffstat (limited to 'src/d')
-rw-r--r--src/d/actor/d_a_npc_ls1.cpp496
-rw-r--r--src/d/d_npc.cpp4
2 files changed, 367 insertions, 133 deletions
diff --git a/src/d/actor/d_a_npc_ls1.cpp b/src/d/actor/d_a_npc_ls1.cpp
index 44d93a4b..82fd6d00 100644
--- a/src/d/actor/d_a_npc_ls1.cpp
+++ b/src/d/actor/d_a_npc_ls1.cpp
@@ -297,7 +297,7 @@ bool daNpc_Ls1_c::createInit() {
attention_info.distances[fopAc_Attn_TYPE_TALK_e] = 0xA9;
attention_info.distances[fopAc_Attn_TYPE_SPEAK_e] = 0xA9;
gravity = 0.0f;
- mBckResIndex = 0xE;
+ mBckNum = BCKNUM_NULL_e;
bool init_result;
switch (mType) {
@@ -349,7 +349,7 @@ bool daNpc_Ls1_c::createInit() {
/* 00000C6C-00000D48 .text play_animation__11daNpc_Ls1_cFv */
void daNpc_Ls1_c::play_animation() {
u32 snd_id = 0;
- if (mBtkResIDIndex == 0 && m838 == true) {
+ if (mBtkNum == 0 && m838 == true) {
setEyeCtrl();
} else {
clrEyeCtrl();
@@ -399,7 +399,7 @@ void daNpc_Ls1_c::setMtx(bool i_setEyePos) {
}
/* 00000EF0-00000F04 .text bckResID__11daNpc_Ls1_cFi */
-int daNpc_Ls1_c::bckResID(int i_bckResIDIndex) {
+int daNpc_Ls1_c::bckResID(int i_bckNum) {
static const int a_resID_tbl[] = {
dRes_ID_LS_BCK_LS_WAIT01_e,
dRes_ID_LS_BCK_LS_WAIT02_e,
@@ -414,13 +414,13 @@ int daNpc_Ls1_c::bckResID(int i_bckResIDIndex) {
dRes_ID_LS_BCK_LS_WAIT07_e,
dRes_ID_LS_BCK_LS_TALK01_e,
dRes_ID_LS_BCK_LS_DEMOWAIT_e,
- dRes_ID_LS_BCK_LS_DEMOLOOK_e
+ dRes_ID_LS_BCK_LS_DEMOLOOK_e,
};
- return a_resID_tbl[i_bckResIDIndex];
+ return a_resID_tbl[i_bckNum];
}
/* 00000F04-00000F18 .text btpResID__11daNpc_Ls1_cFi */
-int daNpc_Ls1_c::btpResID(int i_btpResIDIndex) {
+int daNpc_Ls1_c::btpResID(int i_btpNum) {
static const int a_resID_tbl[] = {
dRes_ID_LS_BTP_FUAN_e,
dRes_ID_LS_BTP_MABA_e,
@@ -432,39 +432,40 @@ int daNpc_Ls1_c::btpResID(int i_btpResIDIndex) {
dRes_ID_LS_BTP_OKORI_e,
dRes_ID_LS_BTP_WARAI_e,
dRes_ID_LS_BTP_LS_DEMOLOOK_e,
- dRes_ID_LS_BTP_LS_DEMOWAIT_e
+ dRes_ID_LS_BTP_LS_DEMOWAIT_e,
};
- return a_resID_tbl[i_btpResIDIndex];
+ return a_resID_tbl[i_btpNum];
}
/* 00000F18-00000F2C .text btkResID__11daNpc_Ls1_cFi */
-int daNpc_Ls1_c::btkResID(int i_btkResIDIndex) {
+int daNpc_Ls1_c::btkResID(int i_btkNum) {
static const int a_resID_tbl[] = {
dRes_ID_LS_BTK_LS_e,
dRes_ID_LS_BTK_LS_DEMOLOOK_e,
- dRes_ID_LS_BTK_LS_DEMOWAIT_e
+ dRes_ID_LS_BTK_LS_DEMOWAIT_e,
};
- return a_resID_tbl[i_btkResIDIndex];
+ return a_resID_tbl[i_btkNum];
}
/* 00000F2C-00001030 .text setBtp__11daNpc_Ls1_cFScb */
-bool daNpc_Ls1_c::setBtp(s8 i_btpResIDIndex, bool i_bModify) {
+bool daNpc_Ls1_c::setBtp(s8 i_btpNum, bool i_bModify) {
J3DModel* morf_model_p = mpMorf->getModel();
- if (i_btpResIDIndex < 0) {
+ if (i_btpNum < 0) {
return false;
}
- J3DAnmTexPattern* a_btp = (J3DAnmTexPattern*) dComIfG_getObjectIDRes(mArcName, btpResID(i_btpResIDIndex));
+ J3DAnmTexPattern* a_btp = (J3DAnmTexPattern*) dComIfG_getObjectIDRes(mArcName, btpResID(i_btpNum));
JUT_ASSERT(DEMO_SELECT(0x301, 0x302), a_btp != NULL);
- mBtpResIDIndex = i_btpResIDIndex;
+ mBtpNum = i_btpNum;
mBtpFrame = 0;
mTimer1 = 0;
return mBtpAnm.init(
morf_model_p->getModelData(),
a_btp, TRUE,
- 0, 1.0f, 0, -1,
+ J3DFrameCtrl::EMode_NONE,
+ 1.0f, 0, -1,
i_bModify, 0
) != 0;
}
@@ -480,23 +481,24 @@ void daNpc_Ls1_c::setMat() {
}
/* 000010B0-000011CC .text setBtk__11daNpc_Ls1_cFScb */
-bool daNpc_Ls1_c::setBtk(s8 i_btkResIDIndex, bool i_bModify) {
+bool daNpc_Ls1_c::setBtk(s8 i_btkNum, bool i_bModify) {
J3DModel* morf_model_p = mpMorf->getModel();
- if (i_btkResIDIndex < 0) {
+ if (i_btkNum < 0) {
return false;
}
- J3DAnmTextureSRTKey* a_btk = (J3DAnmTextureSRTKey *) dComIfG_getObjectIDRes(mArcName, btkResID(i_btkResIDIndex));
+ J3DAnmTextureSRTKey* a_btk = (J3DAnmTextureSRTKey *) dComIfG_getObjectIDRes(mArcName, btkResID(i_btkNum));
JUT_ASSERT(DEMO_SELECT(0x32B, 0x32C), a_btk != NULL);
- mBtkResIDIndex = i_btkResIDIndex;
+ mBtkNum = i_btkNum;
mBtkFrame = 0;
if (mBtkAnm.init(
morf_model_p->getModelData(),
a_btk, TRUE,
- 0, 1.0f, 0, -1,
+ J3DFrameCtrl::EMode_NONE,
+ 1.0f, 0, -1,
i_bModify, 0
) != 0) {
if (!i_bModify) {
@@ -509,25 +511,35 @@ bool daNpc_Ls1_c::setBtk(s8 i_btkResIDIndex, bool i_bModify) {
}
/* 000011CC-00001238 .text init_texPttrnAnm__11daNpc_Ls1_cFScb */
-bool daNpc_Ls1_c::init_texPttrnAnm(s8 i_resIndex, bool i_bModify) {
- static const u8 a_btk_num_tbl[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2
- };
-
- if (setBtp(i_resIndex, i_bModify) == false) {
+bool daNpc_Ls1_c::init_texPttrnAnm(s8 i_btpNum, bool i_bModify) {
+ if (setBtp(i_btpNum, i_bModify) == false) {
return false;
}
- return setBtk(a_btk_num_tbl[i_resIndex], i_bModify);
+ // Maps BTP num -> BTK num
+ static const u8 a_btk_num_tbl[] = {
+ BTKNUM_DEFAULT_e,
+ BTKNUM_DEFAULT_e,
+ BTKNUM_DEFAULT_e,
+ BTKNUM_DEFAULT_e,
+ BTKNUM_DEFAULT_e,
+ BTKNUM_DEFAULT_e,
+ BTKNUM_DEFAULT_e,
+ BTKNUM_DEFAULT_e,
+ BTKNUM_DEFAULT_e,
+ BTKNUM_DEMOLOOK_e,
+ BTKNUM_DEMOWAIT_e,
+ };
+ return setBtk(a_btk_num_tbl[i_btpNum], i_bModify);
}
/* 00001238-000012D4 .text play_btp_anm__11daNpc_Ls1_cFv */
void daNpc_Ls1_c::play_btp_anm() {
u8 frame_max = mBtpAnm.getBtpAnm()->getFrameMax();
- if (mBtpResIDIndex != 1 || cLib_calcTimer(&mTimer1) == 0) {
+ if (mBtpNum != BTPNUM_MABA_e || cLib_calcTimer(&mTimer1) == 0) {
mBtpFrame++;
if (mBtpFrame >= frame_max) {
- if (mBtpResIDIndex != 1) {
+ if (mBtpNum != BTPNUM_MABA_e) {
mBtpFrame = frame_max;
} else {
mTimer1 = cLib_getRndValue(60, 90);
@@ -584,64 +596,184 @@ void daNpc_Ls1_c::play_btk_anm() {
}
/* 000014E8-00001584 .text setAnm_anm__11daNpc_Ls1_cFPQ211daNpc_Ls1_c9anm_prm_c */
-void daNpc_Ls1_c::setAnm_anm(daNpc_Ls1_c::anm_prm_c* i_anmPrmP) {
- if (i_anmPrmP->mBckResIndex < 0 || mBckResIndex == i_anmPrmP->mBckResIndex) {
+void daNpc_Ls1_c::setAnm_anm(anm_prm_c* i_anmPrmP) {
+ if (i_anmPrmP->bckNum < 0 || mBckNum == i_anmPrmP->bckNum) {
return;
}
dNpc_setAnmIDRes(
- mpMorf,
- i_anmPrmP->mLoopMode,
- i_anmPrmP->mMorf,
- i_anmPrmP->mSpeed,
- bckResID(i_anmPrmP->mBckResIndex),
- -1,
+ mpMorf,
+ i_anmPrmP->loopMode,
+ i_anmPrmP->morf,
+ i_anmPrmP->speed,
+ bckResID(i_anmPrmP->bckNum),
+ -1,
mArcName
);
- mBckResIndex = i_anmPrmP->mBckResIndex;
+ mBckNum = i_anmPrmP->bckNum;
mbMorfAnimStopped = false;
m831 = 0;
mPrevMorfFrame = 0.0f;
}
/* 00001584-000015F4 .text setAnm_NUM__11daNpc_Ls1_cFii */
-void daNpc_Ls1_c::setAnm_NUM(int i_anmPrmIndex, int param_2) {
+void daNpc_Ls1_c::setAnm_NUM(int i_anmNum, BOOL param_2) {
static anm_prm_c a_anm_prm_tbl[14] = {
- { 0, 1, 8.0f, 1.0f, 2 },
- { 1, 1, 8.0f, 1.0f, 0 },
- { 2, 1, 8.0f, 1.0f, 2 },
- { 3, 1, 8.0f, 1.0f, 2 },
- { 4, 1, 8.0f, 1.0f, 2 },
- { 5, 1, 8.0f, 1.0f, 2 },
- { 6, 1, 8.0f, 1.0f, 0 },
- { 7, 1, 8.0f, 1.0f, 0 },
- { 8, 6, 8.0f, 1.0f, 2 },
- { 9, 4, 8.0f, 1.0f, 0 },
- { 10, 1, 8.0f, 1.0f, 2 },
- { 11, 1, 8.0f, 1.0f, 2 },
- { 12, 10, 8.0f, 1.0f, 2 },
- { 13, 10, 8.0f, 1.0f, 0 }
+ {
+ /* bckNum */ BCKNUM_WAIT01_e,
+ /* btpNum */ BTPNUM_MABA_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT02_e,
+ /* btpNum */ BTPNUM_MABA_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_NONE
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT03_e,
+ /* btpNum */ BTPNUM_MABA_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT04_e,
+ /* btpNum */ BTPNUM_MABA_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT05_e,
+ /* btpNum */ BTPNUM_MABA_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT06_e,
+ /* btpNum */ BTPNUM_MABA_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_WATASU_e,
+ /* btpNum */ BTPNUM_MABA_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_NONE
+ },
+ {
+ /* bckNum */ BCKNUM_FURIMUKI_e,
+ /* btpNum */ BTPNUM_MABA_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_NONE
+ },
+ {
+ /* bckNum */ BCKNUM_NOZOKU_e,
+ /* btpNum */ BTPNUM_NOZOKU_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_GET_e,
+ /* btpNum */ BTPNUM_GET_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_NONE
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT07_e,
+ /* btpNum */ BTPNUM_MABA_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_TALK01_e,
+ /* btpNum */ BTPNUM_MABA_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_DEMOWAIT_e,
+ /* btpNum */ BTPNUM_DEMOWAIT_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_DEMOLOOK_e,
+ /* btpNum */ BTPNUM_DEMOWAIT_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_NONE
+ },
};
- if (param_2 != 0) {
- init_texPttrnAnm(a_anm_prm_tbl[i_anmPrmIndex].mResIndex, true);
+ if (param_2) {
+ init_texPttrnAnm(a_anm_prm_tbl[i_anmNum].btpNum, true);
}
- setAnm_anm(&a_anm_prm_tbl[i_anmPrmIndex]);
+ setAnm_anm(&a_anm_prm_tbl[i_anmNum]);
}
/* 000015F4-00001660 .text setAnm__11daNpc_Ls1_cFv */
void daNpc_Ls1_c::setAnm() {
static anm_prm_c a_anm_prm_tbl[6] = {
- { -1, -1, 0.0f, 0.0f, -1 },
- { 0, 1, 8.0f, 1.0f, 2 },
- { 5, 1, 8.0f, 1.0f, 2 },
- { 10, 2, 8.0f, 1.0f, 2 },
- { 5, 1, 8.0f, 1.0f, 2 },
- { -1, -1, 0.0f, 0.0f, -1 }
+ {
+ /* bckNum */ -1,
+ /* btpNum */ -1,
+ /* morf */ 0.0f,
+ /* speed */ 0.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_NULL
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT01_e,
+ /* btpNum */ BTPNUM_MABA_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT06_e,
+ /* btpNum */ BTPNUM_MABA_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT07_e,
+ /* btpNum */ BTPNUM_FUAN02_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT06_e,
+ /* btpNum */ BTPNUM_MABA_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ -1,
+ /* btpNum */ -1,
+ /* morf */ 0.0f,
+ /* speed */ 0.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_NULL
+ },
};
- init_texPttrnAnm(a_anm_prm_tbl[m851].mResIndex, true);
+ init_texPttrnAnm(a_anm_prm_tbl[m851].btpNum, true);
setAnm_anm(&a_anm_prm_tbl[m851]);
}
@@ -649,16 +781,16 @@ void daNpc_Ls1_c::setAnm() {
void daNpc_Ls1_c::chngAnmTag() {
switch (mMesgAnimeTag) {
case 0:
- init_texPttrnAnm(8, 1);
+ init_texPttrnAnm(BTPNUM_WARAI_e, true);
return;
case 11:
- init_texPttrnAnm(3, 1);
+ init_texPttrnAnm(BTPNUM_KIZUKU_e, true);
return;
case 12:
- init_texPttrnAnm(5, 1);
+ init_texPttrnAnm(BTPNUM_NGWARAI_e, true);
return;
case 13:
- init_texPttrnAnm(0, 1);
+ init_texPttrnAnm(BTPNUM_FUAN_e, true);
case 0xFF:
return;
}
@@ -686,7 +818,7 @@ void daNpc_Ls1_c::ctrlAnmTag() {
/* 0000171C-00001820 .text chngAnmAtr__11daNpc_Ls1_cFUc */
void daNpc_Ls1_c::chngAnmAtr(u8 param_1) {
if ((m84B == 3 || m84B == 5) && (param_1 == 3 || param_1 == 5)) {
- init_texPttrnAnm(8, true);
+ init_texPttrnAnm(BTPNUM_WARAI_e, true);
m84B = param_1;
return;
}
@@ -696,7 +828,7 @@ void daNpc_Ls1_c::chngAnmAtr(u8 param_1) {
}
m84B = param_1;
- setAnm_ATR(1);
+ setAnm_ATR(TRUE);
switch (param_1) {
case 1:
@@ -728,13 +860,13 @@ void daNpc_Ls1_c::ctrlAnmAtr() {
case 1:
if (cLib_calcTimer(&mTimer2) == 0) {
m84B = 2;
- setAnm_ATR(1);
+ setAnm_ATR(TRUE);
}
break;
case 2:
if (mbMorfAnimStopped) {
m84B = 1;
- setAnm_ATR(1);
+ setAnm_ATR(TRUE);
}
break;
case 3:
@@ -753,7 +885,7 @@ void daNpc_Ls1_c::ctrlAnmAtr() {
default:
break;
}
- setAnm_ATR(0);
+ setAnm_ATR(FALSE);
}
break;
case 7:
@@ -768,27 +900,27 @@ void daNpc_Ls1_c::ctrlAnmAtr() {
if (mbMorfAnimStopped && (cLib_calcTimer(&mTimer2) == 0)) {
switch (m84B) {
case 12:
- if (mBckResIndex != 10) {
- setAnm_NUM(10,1);
- init_texPttrnAnm(2,true);
+ if (mBckNum != BCKNUM_WAIT07_e) {
+ setAnm_NUM(ANMNUM_WAIT07_e, TRUE);
+ init_texPttrnAnm(BTPNUM_FUAN02_e, true);
}
break;
case 14:
- if (mBckResIndex != 5) {
- setAnm_NUM(5,1);
- init_texPttrnAnm(8, true);
+ if (mBckNum != BCKNUM_WAIT06_e) {
+ setAnm_NUM(ANMNUM_WAIT06_e, TRUE);
+ init_texPttrnAnm(BTPNUM_WARAI_e, true);
}
break;
case 15:
- if(mBckResIndex != 11) {
- setAnm_NUM(0xB,1);
- init_texPttrnAnm(8, true);
+ if(mBckNum != BCKNUM_TALK01_e) {
+ setAnm_NUM(BCKNUM_TALK01_e, TRUE);
+ init_texPttrnAnm(BTPNUM_WARAI_e, true);
}
break;
case 16:
- if (mBckResIndex != 4) {
- setAnm_NUM(4,1);
- init_texPttrnAnm(8, true);
+ if (mBckNum != BCKNUM_WAIT05_e) {
+ setAnm_NUM(BCKNUM_WAIT05_e, TRUE);
+ init_texPttrnAnm(BTPNUM_WARAI_e, true);
}
break;
default:
@@ -802,29 +934,131 @@ void daNpc_Ls1_c::ctrlAnmAtr() {
}
/* 00001A60-00001ACC .text setAnm_ATR__11daNpc_Ls1_cFi */
-void daNpc_Ls1_c::setAnm_ATR(int param_1) {
+void daNpc_Ls1_c::setAnm_ATR(BOOL param_1) {
static anm_prm_c a_anm_prm_tbl[17] = {
- { 5, 1, 8.0f, 1.0f, 2 },
- { 0, 1, 8.0f, 1.0f, 2 },
- { 1, 1, 8.0f, 1.0f, 0 },
- { 2, 8, 8.0f, 1.0f, 2 },
- { 3, 2, 8.0f, 1.0f, 2 },
- { 4, 8, 8.0f, 1.0f, 2 },
- { 7, 1, 8.0f, 1.0f, 0 },
- { 6, 8, 8.0f, 1.0f, 0 },
- { 8, 6, 8.0f, 1.0f, 2 },
- { 9, 4, 8.0f, 1.0f, 0 },
- { 10, 0, 8.0f, 1.0f, 2 },
- { 10, 2, 8.0f, 1.0f, 2 },
- { 3, 2, 8.0f, 1.0f, 2 },
- { 5, 8, 8.0f, 1.0f, 2 },
- { 11, 8, 8.0f, 1.0f, 2 },
- { 3, 8, 8.0f, 1.0f, 2 },
- { 11, 8, 8.0f, 1.0f, 2 }
+ {
+ /* bckNum */ BCKNUM_WAIT06_e,
+ /* btpNum */ BTPNUM_MABA_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT01_e,
+ /* btpNum */ BTPNUM_MABA_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT02_e,
+ /* btpNum */ BTPNUM_MABA_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_NONE
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT03_e,
+ /* btpNum */ BTPNUM_WARAI_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT04_e,
+ /* btpNum */ BTPNUM_FUAN02_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT05_e,
+ /* btpNum */ BTPNUM_WARAI_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_FURIMUKI_e,
+ /* btpNum */ BTPNUM_MABA_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_NONE
+ },
+ {
+ /* bckNum */ BCKNUM_WATASU_e,
+ /* btpNum */ BTPNUM_WARAI_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_NONE
+ },
+ {
+ /* bckNum */ BCKNUM_NOZOKU_e,
+ /* btpNum */ BTPNUM_NOZOKU_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_GET_e,
+ /* btpNum */ BTPNUM_GET_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_NONE
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT07_e,
+ /* btpNum */ BTPNUM_FUAN_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT07_e,
+ /* btpNum */ BTPNUM_FUAN02_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT04_e,
+ /* btpNum */ BTPNUM_FUAN02_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT06_e,
+ /* btpNum */ BTPNUM_WARAI_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_TALK01_e,
+ /* btpNum */ BTPNUM_WARAI_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_WAIT04_e,
+ /* btpNum */ BTPNUM_WARAI_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
+ {
+ /* bckNum */ BCKNUM_TALK01_e,
+ /* btpNum */ BTPNUM_WARAI_e,
+ /* morf */ 8.0f,
+ /* speed */ 1.0f,
+ /* loopMode */ J3DFrameCtrl::EMode_LOOP
+ },
};
- if (param_1 != 0) {
- init_texPttrnAnm(a_anm_prm_tbl[m84B].mResIndex, true);
+ if (param_1) {
+ init_texPttrnAnm(a_anm_prm_tbl[m84B].btpNum, true);
}
setAnm_anm(&a_anm_prm_tbl[m84B]);
@@ -982,7 +1216,7 @@ void daNpc_Ls1_c::checkOrder() {
break;
case 2:
mTelescopeScale = 0.0f;
- setAnm_NUM(9, 1);
+ setAnm_NUM(ANMNUM_GET_e, TRUE);
break;
}
m850 = 0;
@@ -1275,12 +1509,12 @@ void daNpc_Ls1_c::cut_init_WAI(int param_1) {
/* 0000276C-000027C0 .text cut_move_WAI__11daNpc_Ls1_cFv */
bool daNpc_Ls1_c::cut_move_WAI() {
- if (mBckResIndex != 1) {
+ if (mBckNum != BCKNUM_WAIT02_e) {
return TRUE;
}
if (mbMorfAnimStopped) {
- setAnm_NUM(0, 1);
+ setAnm_NUM(ANMNUM_WAIT01_e, TRUE);
return TRUE;
}
@@ -1290,13 +1524,13 @@ bool daNpc_Ls1_c::cut_move_WAI() {
/* 000027C0-00002828 .text cut_init_ANM_CHG__11daNpc_Ls1_cFi */
void daNpc_Ls1_c::cut_init_ANM_CHG(int param_1) {
int* anm_no_p = (int*)dComIfGp_evmng_getMyIntegerP(param_1, "AnmNo");
- int anm_no = mBckResIndex;
+ int anm_no = mBckNum;
if (anm_no_p) {
anm_no = *anm_no_p;
}
- setAnm_NUM(anm_no, 1);
+ setAnm_NUM(anm_no, TRUE);
}
/* 00002828-00002830 .text cut_move_ANM_CHG__11daNpc_Ls1_cFv */
@@ -1700,16 +1934,16 @@ BOOL daNpc_Ls1_c::wait_1() {
m853 = 0;
- if (mBckResIndex == 0) {
+ if (mBckNum == BCKNUM_WAIT01_e) {
if (cLib_calcTimer(&mTimer5) == 0) {
- setAnm_NUM(1, 1);
+ setAnm_NUM(ANMNUM_WAIT02_e, TRUE);
}
return true;
}
if (mbMorfAnimStopped) {
mTimer5 = cLib_getRndValue(60, 90);
- setAnm_NUM(0, 1);
+ setAnm_NUM(ANMNUM_WAIT01_e, TRUE);
}
return true;
@@ -1721,14 +1955,14 @@ BOOL daNpc_Ls1_c::wait_2() {
cLib_addCalcAngleS(&current.angle.y, m7A0.y, 4, 0x800, 0x80);
- if (current.angle.y == m7A0.y && mBckResIndex != 0) {
- setAnm_NUM(0, 1);
+ if (current.angle.y == m7A0.y && mBckNum != BCKNUM_WAIT01_e) {
+ setAnm_NUM(ANMNUM_WAIT01_e, TRUE);
}
if (m83F) {
if (chk_talk()) {
setStt(5);
- setAnm_NUM(5,1);
+ setAnm_NUM(ANMNUM_WAIT06_e, TRUE);
m853 = 1;
m_jnt.offBackBoneLock();
m840 = 0;
@@ -1756,8 +1990,8 @@ BOOL daNpc_Ls1_c::wait_2() {
if (m833 != 0) {
cXyz base_pos(20.0f, 0.0f, 50.0f);
if (m833 >= 4) {
- if (mBtpResIDIndex != 2) {
- init_texPttrnAnm(2, true);
+ if (mBtpNum != BTPNUM_FUAN02_e) {
+ init_texPttrnAnm(BTPNUM_FUAN02_e, true);
}
if (cLib_calcTimer(&mTimer3) != 0) {
m853 = 1;
@@ -1772,7 +2006,7 @@ BOOL daNpc_Ls1_c::wait_2() {
m838 = true;
return TRUE;
} else {
- if (mbAttention && mBckResIndex == 0) {
+ if (mbAttention && mBckNum == BCKNUM_WAIT01_e) {
m853 = 1;
return TRUE;
} else {
@@ -1941,9 +2175,9 @@ BOOL daNpc_Ls1_c::demo_action1(void* param_1) {
switch (m856) {
case 0:
if (mType == 1) {
- setAnm_NUM(12, 1);
+ setAnm_NUM(ANMNUM_DEMOWAIT_e, TRUE);
} else {
- setAnm_NUM(5, 1);
+ setAnm_NUM(ANMNUM_WAIT06_e, TRUE);
}
m856++;
break;
@@ -1963,8 +2197,8 @@ bool daNpc_Ls1_c::demo() {
if (demoActorID == 0) {
if (m841) {
if (mType == 3) {
- mBckResIndex = 14;
- setAnm_NUM(5, 1);
+ mBckNum = BCKNUM_NULL_e;
+ setAnm_NUM(ANMNUM_WAIT06_e, TRUE);
}
m841 = false;
}
@@ -1996,13 +2230,13 @@ bool daNpc_Ls1_c::demo() {
J3DAnmTexPattern* demo_btp_p = demo_actor_p->getP_BtpData(mArcName);
if (demo_btp_p) {
mBtpAnm.init(
- mpMorf->getModel()->getModelData(),
- demo_btp_p, 1,
- J3DFrameCtrl::EMode_NONE,
- 1.0f, 0, -1,
+ mpMorf->getModel()->getModelData(),
+ demo_btp_p, TRUE,
+ J3DFrameCtrl::EMode_NONE,
+ 1.0f, 0, -1,
true, 0
);
- mBtpResIDIndex = 11;
+ mBtpNum = BTPNUM_NULL_e;
mBtpFrame = 0;
}
@@ -2019,12 +2253,12 @@ bool daNpc_Ls1_c::demo() {
if (demo_btk_p) {
mBtkAnm.init(
mpMorf->getModel()->getModelData(),
- demo_btk_p, true,
+ demo_btk_p, TRUE,
J3DFrameCtrl::EMode_NONE,
1.0f, 0, -1,
true, 0
);
- mBtkResIDIndex = 3;
+ mBtkNum = BTKNUM_NULL_e;
mBtkFrame = 0;
}
@@ -2287,7 +2521,7 @@ BOOL daNpc_Ls1_c::bodyCreateHeap() {
}
}
- if (!init_texPttrnAnm(0, false)) {
+ if (!init_texPttrnAnm(BTPNUM_FUAN_e, false)) {
mpMorf = NULL;
return FALSE;
}
diff --git a/src/d/d_npc.cpp b/src/d/d_npc.cpp
index 138d6cb6..bf360140 100644
--- a/src/d/d_npc.cpp
+++ b/src/d/d_npc.cpp
@@ -538,7 +538,7 @@ void dNpc_EventCut_c::setActorInfo2(char* staffName, fopNpc_npc_c* pActor) {
}
/* 8021B9D8-8021BABC .text dNpc_setAnmIDRes__FP14mDoExt_McaMorfiffiiPCc */
-bool dNpc_setAnmIDRes(mDoExt_McaMorf* pMorf, int loopMode, float morf, float speed, int animResId, int soundResId, const char* arcName) {
+bool dNpc_setAnmIDRes(mDoExt_McaMorf* pMorf, int loopMode, f32 morf, f32 speed, int animResId, int soundResId, const char* arcName) {
void* pSoundAnimRes = NULL;
bool ret = false;
@@ -622,7 +622,7 @@ cXyz dNpc_playerEyePos(f32 offsetY) {
}
/* 8021BDE8-8021BEC4 .text dNpc_calc_DisXZ_AngY__F4cXyz4cXyzPfPs */
-void dNpc_calc_DisXZ_AngY(cXyz param_1, cXyz param_2, float* param_3, s16* param_4) {
+void dNpc_calc_DisXZ_AngY(cXyz param_1, cXyz param_2, f32* param_3, s16* param_4) {
cXyz diff;
diff.x = param_2.x - param_1.x;
diff.z = param_2.z - param_1.z;
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 04:40:21 +0000