diff options
| author | Carco_21 <144170194+carter-ktb21@users.noreply.github.com> | 2025-06-29 18:50:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-30 01:50:11 +0300 |
| commit | 844a554a3b006cf9f4f55c3d393d97676a468d6d (patch) | |
| tree | 0282dbe5569e395d1a209cc4f0744fc2e76f7baf /src/d/actor/d_a_b_zant.cpp | |
| parent | aff8180fcef7e86dbeb52779c79510f942372ca9 (diff) | |
Anm enum work (#2511)
* Added enums for b_gg, b_gos, and b_mgn
* Added enum for d_a_b_tn (might have more work for it)
* b_yo and b_zant enum work
* more enum work
* fixed mgn match break
Diffstat (limited to 'src/d/actor/d_a_b_zant.cpp')
| -rw-r--r-- | src/d/actor/d_a_b_zant.cpp | 451 |
1 files changed, 191 insertions, 260 deletions
diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index 4a322ca21e..e3ef04ab2e 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -17,111 +17,51 @@ #include "JSystem/JAudio2/JAUSectionHeap.h" #include <cmath.h> -/* ANIMATION IDS */ -#define ANM_DAMAGE_L_A 7 -#define ANM_DAMAGE_R_A 8 -#define ANM_DIE_DEMO 9 -#define ANM_FAINT 10 -#define ANM_FALL 11 -#define ANM_FLOAT_APPEAR 12 -#define ANM_FLOAT_APPEAR_SHORT 13 -#define ANM_FLOAT_APPEAR_WAIT 14 -#define ANM_FLOAT_DAMAGE_L 15 -#define ANM_FLOAT_DAMAGE_R 16 -#define ANM_FLOAT_REACTION 17 -#define ANM_FLOAT_WAIT 18 -#define ANM_FLOAT_WAIT_RETURN 19 -#define ANM_GROUND_REACTION 20 -#define ANM_HOOK_HIT 21 -#define ANM_HOOK_RELEASE 22 -#define ANM_HOOK_WAIT 23 -#define ANM_HUGE 24 -#define ANM_HUGE_LANDING 25 -#define ANM_JUMP_A 26 -#define ANM_JUMP_B 27 -#define ANM_LANDING 28 -#define ANM_LANDING_DAMAGE 29 -#define ANM_LANDING_WAIT 30 -#define ANM_LAST_DEMO 31 -#define ANM_LV1_FATIGUE 32 -#define ANM_LV1_JUMP_A 33 -#define ANM_LB1_JUMP_B 34 -#define ANM_MAGIC_SHOOT_A_A 35 -#define ANM_MAGIC_SHOOT_A_B 36 -#define ANM_MAGIC_SHOOT_A_B_A 37 -#define ANM_MAGIC_SHOOT_A_B_B 38 -#define ANM_MAGIC_SHOOT_A_B_C 39 -#define ANM_MAGIC_SHOOT_A_C 40 -#define ANM_MAGIC_SHOOT_A_D 41 -#define ANM_OP_1 42 -#define ANM_OP_2 43 -#define ANM_OP_3 44 -#define ANM_OP_RISE 45 -#define ANM_SHIND_L 46 -#define ANM_SHIND_R 47 -#define ANM_SPIN 48 -#define ANM_SWAMP_FALL_A 49 -#define ANM_SWAMP_FALL_B 50 -#define ANM_SWAMP_FALL_LOOP 51 -#define ANM_SWAMP_LANDING 52 -#define ANM_SWIM 53 -#define ANM_SW_ATTACK 54 -#define ANM_SW_ATTACK_B 55 -#define ANM_SW_DAMAGE_L 56 -#define ANM_SW_DAMAGE_R 57 -#define ANM_SW_FATIGUE 58 -#define ANM_SW_WAIT 59 -#define ANM_SW_WALK 60 -#define ANM_TRAMPLE_A 61 -#define ANM_TRAMPLE_B 62 -#define ANM_TRAMPLE_C 63 -#define ANM_TRAMPLE_D 64 -#define ANM_WAIT 65 - -/* JOINT IDS */ -#define JNT_CENTER 0 -#define JNT_BACKBONE 1 -#define JNT_NECK 2 -#define JNT_HEAD 3 -#define JNT_CHIN 4 -#define JNT_HELMET 5 -#define JNT_TONGUE1 6 -#define JNT_TONGUE2 7 -#define JNT_TONGUE3 8 -#define JNT_TONGUE4 9 -#define JNT_TONGUE5 10 -#define JNT_MOUTH 11 -#define JNT_SHOULDER_L 12 -#define JNT_ARM_L1 13 -#define JNT_ARM_L2 14 -#define JNT_ARM_L3 15 -#define JNT_ARM_L4 16 -#define JNT_HIRA_LB1 17 -#define JNT_HIRA_LB2 18 -#define JNT_HIRA_LF1 19 -#define JNT_HIRA_LF2 20 -#define JNT_SPAD_L 21 -#define JNT_SHOULDER_R 22 -#define JNT_ARM_R1 23 -#define JNT_ARM_R2 24 -#define JNT_ARM_R3 25 -#define JNT_ARM_R4 26 -#define JNT_HIRA_RB1 27 -#define JNT_HIRA_RB2 28 -#define JNT_HIRA_RF1 29 -#define JNT_HIRA_RF2 30 -#define JNT_SPAD_R 31 -#define JNT_WAIST 32 -#define JNT_LEG_L1 33 -#define JNT_LEG_L2 34 -#define JNT_FOOT_L 35 -#define JNT_LEG_R1 36 -#define JNT_LEG_R2 37 -#define JNT_FOOT_R 38 -#define JNT_TARE_B1 39 -#define JNT_TARE_B2 40 -#define JNT_TARE_F1 41 -#define JNT_TARE_F2 42 +enum Joint { + /* 0x00 */ JNT_CENTER, + /* 0x01 */ JNT_BACKBONE, + /* 0x02 */ JNT_NECK, + /* 0x03 */ JNT_HEAD, + /* 0x04 */ JNT_CHIN, + /* 0x05 */ JNT_HELMET, + /* 0x06 */ JNT_TONGUE1, + /* 0x07 */ JNT_TONGUE2, + /* 0x08 */ JNT_TONGE3, + /* 0x09 */ JNT_TONGUE4, + /* 0x0A */ JNT_TONGUE5, + /* 0x0B */ JNT_MOUTH, + /* 0x0C */ JNT_SHOULDERL, + /* 0x0D */ JNT_ARML1, + /* 0x0E */ JNT_ARML2, + /* 0x0F */ JNT_ARML3, + /* 0x10 */ JNT_ARML4, + /* 0x11 */ JNT_HIRALB1, + /* 0x12 */ JNT_HIRALB2, + /* 0x13 */ JNT_HIRALF1, + /* 0x14 */ JNT_HIRALF2, + /* 0x15 */ JNT_SPADL, + /* 0x16 */ JNT_SHOULDERR, + /* 0x17 */ JNT_ARMR1, + /* 0x18 */ JNT_ARMR2, + /* 0x19 */ JNT_ARMR3, + /* 0x1A */ JNT_ARMR4, + /* 0x1B */ JNT_HIRARB1, + /* 0x1C */ JNT_HIRARB2, + /* 0x1D */ JNT_HIRARF1, + /* 0x1E */ JNT_HIRARF2, + /* 0x1F */ JNT_SPADR, + /* 0x20 */ JNT_WAIST, + /* 0x21 */ JNT_LEGL1, + /* 0x22 */ JNT_LEGL2, + /* 0x23 */ JNT_FOOTL, + /* 0x24 */ JNT_LEGR1, + /* 0x25 */ JNT_LEGR2, + /* 0x26 */ JNT_FOOTR, + /* 0x27 */ JNT_TAREB1, + /* 0x28 */ JNT_TAREB2, + /* 0x29 */ JNT_TAREF1, + /* 0x2A */ JNT_TAREF2, +}; enum OPENING_MODE { MODE_START_DEMO, @@ -158,7 +98,7 @@ static u8 const lit_3757[12] = { UNK_REL_DATA namespace { -/* 8064EEAC-8064EEEC 000020 0040+00 0/1 0/0 0/0 .data cc_zant_src__24@unnamed@d_a_b_zant_cpp@ */ +/* 8064EEAC-8064EEEC 000020 0040+00 0/1 0/0 0/0 .data cc_zant_src__24@unnamed@d_a_b_zant_cpp@ */ dCcD_SrcSph cc_zant_src = { { {0x0, {{0x400, 0x1, 0x4}, {0xD8FBFDFF, 0x43}, 0x75}}, // mObj @@ -171,8 +111,7 @@ dCcD_SrcSph cc_zant_src = { } // mSphAttr }; -/* 8064EEEC-8064EF2C 000060 0040+00 0/1 0/0 0/0 .data - * cc_zant_sword_src__24@unnamed@d_a_b_zant_cpp@ */ +/* 8064EEEC-8064EF2C 000060 0040+00 0/1 0/0 0/0 .data cc_zant_sword_src__24@unnamed@d_a_b_zant_cpp@ */ dCcD_SrcSph cc_zant_sword_src = { { {0x0, {{0x400, 0x1, 0x4}, {0xD8FBFDFF, 0x0}, 0x0}}, // mObj @@ -185,8 +124,7 @@ dCcD_SrcSph cc_zant_sword_src = { } // mSphAttr }; -/* 8064EF2C-8064EF70 0000A0 0044+00 0/1 0/0 0/0 .data cc_zant_roll_src__24@unnamed@d_a_b_zant_cpp@ - */ +/* 8064EF2C-8064EF70 0000A0 0044+00 0/1 0/0 0/0 .data cc_zant_roll_src__24@unnamed@d_a_b_zant_cpp@ */ dCcD_SrcCyl cc_zant_roll_src = { { {0x0, {{0x400, 0x2, 0x4}, {0xD8FBFDFF, 0x42}, 0x74}}, // mObj @@ -201,8 +139,7 @@ dCcD_SrcCyl cc_zant_roll_src = { } // mCyl }; -/* 8064EF70-8064EFB0 0000E4 0040+00 0/1 0/0 0/0 .data cc_zant_foot_src__24@unnamed@d_a_b_zant_cpp@ - */ +/* 8064EF70-8064EFB0 0000E4 0040+00 0/1 0/0 0/0 .data cc_zant_foot_src__24@unnamed@d_a_b_zant_cpp@ */ dCcD_SrcSph cc_zant_foot_src = { { {0x0, {{0x0, 0x0, 0x0}, {0x400000, 0x3}, 0x0}}, // mObj @@ -215,8 +152,7 @@ dCcD_SrcSph cc_zant_foot_src = { } // mSphAttr }; -/* 8064EFB0-8064EFF0 000124 0040+00 0/1 0/0 0/0 .data - * cc_zant_foot_src2__24@unnamed@d_a_b_zant_cpp@ */ +/* 8064EFB0-8064EFF0 000124 0040+00 0/1 0/0 0/0 .data cc_zant_foot_src2__24@unnamed@d_a_b_zant_cpp@ */ dCcD_SrcSph cc_zant_foot_src2 = { { {0x0, {{0x400, 0x2, 0x1E}, {0xD8BBFDFF, 0x43}, 0x75}}, // mObj @@ -229,8 +165,7 @@ dCcD_SrcSph cc_zant_foot_src2 = { } // mSphAttr }; -/* 8064EFF0-8064F030 000164 0040+00 0/1 0/0 0/0 .data - * cc_zant_camera_src__24@unnamed@d_a_b_zant_cpp@ */ +/* 8064EFF0-8064F030 000164 0040+00 0/1 0/0 0/0 .data cc_zant_camera_src__24@unnamed@d_a_b_zant_cpp@ */ dCcD_SrcSph cc_zant_camera_src = { { {0x0, {{0x400, 0x2, 0x1E}, {0xD8BBFDFF, 0x0}, 0x5}}, // mObj @@ -243,8 +178,7 @@ dCcD_SrcSph cc_zant_camera_src = { } // mSphAttr }; -/* 8064F030-8064F038 0001A4 0007+01 4/4 0/0 0/0 .data warp_next_room__24@unnamed@d_a_b_zant_cpp@ - */ +/* 8064F030-8064F038 0001A4 0007+01 4/4 0/0 0/0 .data warp_next_room__24@unnamed@d_a_b_zant_cpp@ */ static s8 warp_next_room[] = { 50, 53, @@ -276,8 +210,7 @@ daB_ZANT_HIO_c::daB_ZANT_HIO_c() { mDisappearAnmSpeed = 0.5f; } -/* 8063E19C-8063E264 00017C 00C8+00 1/1 0/0 0/0 .text ctrlJoint__10daB_ZANT_cFP8J3DJointP8J3DModel - */ +/* 8063E19C-8063E264 00017C 00C8+00 1/1 0/0 0/0 .text ctrlJoint__10daB_ZANT_cFP8J3DJointP8J3DModel */ int daB_ZANT_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { u16 jnt_no = i_joint->getJntNo(); @@ -365,7 +298,7 @@ int daB_ZANT_c::draw() { if (mMahojinAnmMode != 0) { g_env_light.setLightTevColorType_MAJI(mpMahojinModel, &tevStr); - mpMahojinBrk->entry(mpMahojinModel->getModelData()); + mpMahojinEndBrk->entry(mpMahojinModel->getModelData()); mpMahojinBtk->entry(mpMahojinModel->getModelData()); mpMahojinStartBtk->entry(mpMahojinModel->getModelData()); @@ -1016,9 +949,9 @@ void daB_ZANT_c::setIceLandingEffect(BOOL i_landFootR) { cXyz particle_pos; if (!i_landFootR) { - mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOT_L)); + mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOTL)); } else { - mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOT_R)); + mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOTR)); } mDoMtx_stack_c::transM(10.0f, 0.0f, 0.0f); @@ -1091,14 +1024,12 @@ f32 daB_ZANT_c::getMagicSpeed() { return l_HIO.mBulletSpeed; } -/* 80640664-80640674 002644 0010+00 0/0 0/0 1/1 .text getMagicWaterSpeed__10daB_ZANT_cFv - */ +/* 80640664-80640674 002644 0010+00 0/0 0/0 1/1 .text getMagicWaterSpeed__10daB_ZANT_cFv */ f32 daB_ZANT_c::getMagicWaterSpeed() { return l_HIO.mBulletSpeedUnderwater; } -/* 80640674-80640C20 002654 05AC+00 1/1 0/0 0/0 .text executeSmallAttack__10daB_ZANT_cFv - */ +/* 80640674-80640C20 002654 05AC+00 1/1 0/0 0/0 .text executeSmallAttack__10daB_ZANT_cFv */ void daB_ZANT_c::executeSmallAttack() { cXyz sp44; s16 aim_target_angle = fopAcM_searchPlayerAngleY(this); @@ -1127,9 +1058,9 @@ void daB_ZANT_c::executeSmallAttack() { field_0x6fd = 0; if (field_0x711 != 0) { - setBck(ANM_MAGIC_SHOOT_A_B, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_MAGICSHOOTA_B, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); } else { - setBck(ANM_MAGIC_SHOOT_A_B_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_MAGICSHOOTA_B_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); } field_0x717 = 1; @@ -1153,9 +1084,9 @@ void daB_ZANT_c::executeSmallAttack() { } if (field_0x711 != 0) { - setBck(ANM_MAGIC_SHOOT_A_C, J3DFrameCtrl::EMode_LOOP, 3.0f, anm_speed); + setBck(BCK_ZAN_MAGICSHOOTA_C, J3DFrameCtrl::EMode_LOOP, 3.0f, anm_speed); } else { - setBck(ANM_MAGIC_SHOOT_A_B_B, J3DFrameCtrl::EMode_LOOP, 3.0f, anm_speed); + setBck(BCK_ZAN_MAGICSHOOTA_B_B, J3DFrameCtrl::EMode_LOOP, 3.0f, anm_speed); } mMode = 3; @@ -1167,9 +1098,9 @@ void daB_ZANT_c::executeSmallAttack() { if (mpModelMorf->checkFrame(3) || mpModelMorf->checkFrame(13)) { if (mpModelMorf->checkFrame(13)) { - mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_ARM_L4)); + mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_ARML4)); } else { - mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_ARM_R4)); + mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_ARMR4)); } mDoMtx_stack_c::multVecZero(&sp44); @@ -1192,9 +1123,9 @@ void daB_ZANT_c::executeSmallAttack() { mMode = 4; if (field_0x711 != 0) { - setBck(ANM_MAGIC_SHOOT_A_D, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_MAGICSHOOTA_D, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); } else { - setBck(ANM_MAGIC_SHOOT_A_B_C, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_MAGICSHOOTA_B_C, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); } field_0x717 = 0; @@ -1261,9 +1192,9 @@ void daB_ZANT_c::executeWarp() { if (mFightPhase != PHASE_MK && mFightPhase != PHASE_YO && mFightPhase != PHASE_LAST) { if (field_0x711 & 1) { - setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); } else { - setBck(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); } } @@ -1350,9 +1281,9 @@ void daB_ZANT_c::executeWarp() { } if (field_0x711 != 0) { - setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); } else { - setBck(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); } dComIfGp_particle_set(0x88FE, ¤t.pos, &shape_angle, NULL); @@ -1399,17 +1330,17 @@ void daB_ZANT_c::executeDamage() { if (mFightPhase == PHASE_OI) { if (mMode == 1) { - setBck(ANM_FLOAT_DAMAGE_L, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_FLOAT_DAMAGEL, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); } else { - setBck(ANM_FLOAT_DAMAGE_R, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_FLOAT_DAMAGER, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); } speed.y = 0.0f; speedF = 0.0f; } else if (mMode == 1) { - setBck(ANM_DAMAGE_L_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_DAMAGEL_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); } else { - setBck(ANM_DAMAGE_R_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_DAMAGER_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); } mSound.startCreatureVoice(Z2SE_EN_ZAN_V_DMG, -1); @@ -1436,7 +1367,7 @@ void daB_ZANT_c::executeConfuse() { speed.y = 0.0f; mMode = 1; - setBck(ANM_GROUND_REACTION, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_GROUND_REACTION, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mSound.startCreatureVoice(Z2SE_EN_ZAN_V_NO_DMG, -1); field_0x702 = 0; case 1: @@ -1445,7 +1376,7 @@ void daB_ZANT_c::executeConfuse() { } break; case 5: - setBck(ANM_FAINT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_FAINT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); speedF = 0.0f; speed.y = 0.0f; field_0x702 = 0; @@ -1485,7 +1416,7 @@ void daB_ZANT_c::executeOpening() { sp34.set(0.0f, 0.0f, -700.0f); player->setPlayerPosAndAngle(&sp34, 0, 0); - setBck(ANM_OP_1, J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f); + setBck(BCK_ZAN_OP_1, J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f); mMode = MODE_START_DEMO_WAIT; mModeTimer = 30; @@ -1512,7 +1443,7 @@ void daB_ZANT_c::executeOpening() { if (mModeTimer == 0) { mMode = MODE_MSG_1; - setBck(ANM_OP_2, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_OP_2, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mSound.startCreatureVoice(Z2SE_EN_ZAN_OP_V_WAKEUP, -1); } break; @@ -1527,7 +1458,7 @@ void daB_ZANT_c::executeOpening() { if (mpModelMorf->isStop()) { mMode = MODE_MSG_1_WAIT; mModeTimer = 20; - setBck(ANM_OP_3, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_OP_3, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); setZantMessage(0xE3B); // My god had only one wish... } break; @@ -1560,7 +1491,7 @@ void daB_ZANT_c::executeOpening() { break; case MODE_WARP_WAIT: if (mModeTimer == 0) { - setBck(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); player->changeDemoMode(0x48, 0, 0, 0); mMode = MODE_PAN_THRONE; mModeTimer = 105; @@ -1601,7 +1532,7 @@ void daB_ZANT_c::executeOpening() { break; case MODE_MSG_2: if (doZantMessage() == true) { - setBck(ANM_OP_RISE, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f); + setBck(BCK_ZAN_OP_RISE, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f); mMode = MODE_FLY_UP; mModeTimer = 90; mSound.startCreatureSound(Z2SE_EN_ZAN_OP_FLY, 0, -1); @@ -1629,7 +1560,7 @@ void daB_ZANT_c::executeOpening() { shape_angle.y = fopAcM_searchPlayerAngleY(this); shape_angle.x = -fopAcM_searchPlayerAngleX(this) * 0.5f; - setBck(ANM_OP_RISE, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_OP_RISE, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); sp34.x = -140.0f; sp34.y += 250.0f; @@ -1701,7 +1632,7 @@ void daB_ZANT_c::executeOpening() { calcRoomChangeCamera(0); if (mModeTimer == 0) { mMode = MODE_START_ROOM_CHANGE; - setBck(ANM_FLOAT_APPEAR, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f); + setBck(BCK_ZAN_FLOAT_APPEAR, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f); mSound.startCreatureSound(Z2SE_EN_ZAN_MAHOJIN_BB, 0, -1); field_0x714 = 1; mKankyoBlend = 0.0f; @@ -1723,7 +1654,7 @@ void daB_ZANT_c::executeOpening() { if (mpModelMorf->isStop()) { dComIfGp_getVibration().StopQuake(31); - setBck(ANM_FLOAT_APPEAR_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_FLOAT_APPEARWAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); mMode = MODE_ROOM_CHANGE; mModeTimer = l_HIO.mMahojinWaitTime; @@ -1770,7 +1701,7 @@ void daB_ZANT_c::executeOpening() { mMode = MODE_END_DEMO; field_0x714 = 0; mKankyoBlend = 0.0f; - setBck(ANM_FLOAT_WAIT_RETURN, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f); + setBck(BCK_ZAN_FLOAT_WAITRETURN, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f); mMahojinAnmMode = 4; } break; @@ -1809,7 +1740,7 @@ void daB_ZANT_c::executeFly() { switch (mMode) { case 0: setTgHitBit(TRUE); - setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); mModeTimer = 0; mMode = 1; gravity = 0.0f; @@ -1831,7 +1762,7 @@ void daB_ZANT_c::executeFly() { } break; case 10: - setBck(ANM_SWAMP_FALL_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_SWAMP_FALL_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mSound.startCreatureVoice(Z2SE_EN_ZAN_BB_V_FALL, -1); mMode = 11; @@ -1845,11 +1776,11 @@ void daB_ZANT_c::executeFly() { case 12: if (mMode == 11) { if (mpModelMorf->isStop()) { - setBck(ANM_SWAMP_FALL_LOOP, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_SWAMP_FALL_LOOP, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); mMode = 12; } } else if (speed.y < -10.0f) { - setBck(ANM_SWAMP_FALL_B, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_SWAMP_FALL_B, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mMode = 13; } case 13: @@ -1878,7 +1809,7 @@ void daB_ZANT_c::executeFly() { current.angle.y = (cM_rndFX(2.9f) * (f32)0x1000) - (f32)0x8000; mMode = 11; - setBck(ANM_SWAMP_FALL_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_SWAMP_FALL_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mSound.startCreatureVoice(Z2SE_EN_ZAN_BB_V_JUMP, -1); cXyz pos(current.pos.x, gnd_pos, current.pos.z); @@ -1892,7 +1823,7 @@ void daB_ZANT_c::executeFly() { } else { fopAcM_effSmokeSet1(&field_0x3894, &field_0x3898, ¤t.pos, NULL, 2.0f, &tevStr, 1); speedF = 0.0f; - setBck(ANM_SWAMP_LANDING, J3DFrameCtrl::EMode_NONE, 0.0f, 1.0f); + setBck(BCK_ZAN_SWAMP_LANDING, J3DFrameCtrl::EMode_NONE, 0.0f, 1.0f); mMode = 14; setTgHitBit(TRUE); setTgType(0xD8FBFDFF); @@ -1937,7 +1868,7 @@ void daB_ZANT_c::executeFlyGround() { } speed.y = 0.0f; speedF = 0.0f; - setBck(ANM_LV1_FATIGUE, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f); + setBck(BCK_ZAN_LV1_FATIGUE, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f); mMode = 1; field_0x702 = 0; mSound.startCreatureVoice(Z2SE_EN_ZAN_BB_V_ZEIZEI, -1); @@ -2015,7 +1946,7 @@ void daB_ZANT_c::executeHook() { field_0x705 = 0; field_0x706 = 0; - setBck(ANM_HOOK_HIT, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_HOOK_HIT, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mMode = 2; field_0x6ff++; break; @@ -2026,7 +1957,7 @@ void daB_ZANT_c::executeHook() { if (mpModelMorf->isStop()) { mMode = 3; - setBck(ANM_HOOK_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_HOOK_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); } case 3: if (!fopAcM_checkStatus(this, 0x100000)) { @@ -2054,7 +1985,7 @@ void daB_ZANT_c::executeWater() { field_0x6f0 = 0x78; field_0x705 = 1; attention_info.flags = 4; - setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); } else if (field_0x705 != 0) { if (((daB_ZANTZ_c*)pmobile)->getAppearMode() == 3) { mMode = 15; @@ -2293,7 +2224,7 @@ void daB_ZANT_c::executeSwim() { return; } - setBck(ANM_HOOK_RELEASE, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_HOOK_RELEASE, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mMode = 11; case 11: if (current.pos.y < 50.0f) { @@ -2307,7 +2238,7 @@ void daB_ZANT_c::executeSwim() { } break; case 0: - setBck(ANM_SWIM, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f); + setBck(BCK_ZAN_SWIM, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f); mpModelMorf->setFrame(10.0f); field_0x6cc = 0.0f; attention_info.flags = 4; @@ -2454,7 +2385,7 @@ void daB_ZANT_c::executeSwim() { break; } - if (checkBck(ANM_SWIM)) { + if (checkBck(BCK_ZAN_SWIM)) { if (mpModelMorf->checkFrame(12)) { mSound.startCreatureSound(Z2SE_EN_ZAN_OI_SWIM1, 0, -1); } else if (mpModelMorf->checkFrame(28)) { @@ -2472,7 +2403,7 @@ void daB_ZANT_c::executeSimaJump() { mBodySphCc[0].OnTgNoHitMark(); mBodySphCc[1].OnTgNoHitMark(); - setBck(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); if (mLastAction == ACT_SMALL_ATTACK) { field_0x702 = 0; @@ -2485,7 +2416,7 @@ void daB_ZANT_c::executeSimaJump() { } attention_info.flags = 4; - setBck(ANM_LV1_FATIGUE, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f); + setBck(BCK_ZAN_LV1_FATIGUE, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f); mSound.startCreatureVoice(Z2SE_EN_ZAN_MG_V_ZEIZEI, -1); return; } @@ -2560,7 +2491,7 @@ void daB_ZANT_c::executeSimaJump() { if (mMode == 1) { if (mAcch.ChkGroundHit() && field_0x6ec == 0) { - setBck(ANM_JUMP_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_JUMP_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mMode = 2; } } else if (mMode == 2) { @@ -2574,7 +2505,7 @@ void daB_ZANT_c::executeSimaJump() { } } else if (mMode == 3) { if (speed.y <= 0.0f) { - setBck(ANM_JUMP_B, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_JUMP_B, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mMode = 4; } } else if (mMode == 4) { @@ -2631,7 +2562,7 @@ void daB_ZANT_c::executeIceDemo() { mFootCc[iron_tg_cc[i]].OnTgIronBallRebound(); } - setBck(ANM_HUGE, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_HUGE, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); speedF = 0.0f; gravity = 0.0f; shape_angle.z = 0; @@ -2656,7 +2587,7 @@ void daB_ZANT_c::executeIceDemo() { case 2: cLib_chaseF(&speed.y, 50.0f, 5.0f); if (mpModelMorf->isStop()) { - setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); setActionMode(ACT_ICE_JUMP, 3); } break; @@ -2673,7 +2604,7 @@ void daB_ZANT_c::executeIceJump() { switch (mMode) { case 0: - setBck(ANM_HUGE_LANDING, J3DFrameCtrl::EMode_NONE, 3.0f, -1.0f); + setBck(BCK_ZAN_HUGE_LANDING, J3DFrameCtrl::EMode_NONE, 3.0f, -1.0f); mMode = 1; attention_info.flags = 0; field_0x70e = 0; @@ -2687,7 +2618,7 @@ void daB_ZANT_c::executeIceJump() { break; case 2: if (mpModelMorf->isStop()) { - setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); mMode = 3; } case 3: @@ -2724,14 +2655,14 @@ void daB_ZANT_c::executeIceJump() { speed.y = 0.0f; speedF = 0.0f; - setBck(ANM_HUGE_LANDING, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_HUGE_LANDING, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mSound.startCreatureVoice(Z2SE_EN_ZAN_YO_V_LAND, -1); - mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOT_L)); + mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOTL)); mDoMtx_stack_c::transM(10.0f, 0.0f, 0.0f); mDoMtx_stack_c::multVecZero(&sp50); - mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOT_R)); + mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOTR)); mDoMtx_stack_c::transM(10.0f, 0.0f, 0.0f); mDoMtx_stack_c::multVecZero(&sp5C); @@ -2745,9 +2676,9 @@ void daB_ZANT_c::executeIceJump() { case 5: case 6: if (field_0x70f == 0) { - mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOT_L)); + mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOTL)); } else { - mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOT_R)); + mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOTR)); } mDoMtx_stack_c::transM(10.0f, 0.0f, 0.0f); @@ -2874,19 +2805,19 @@ void daB_ZANT_c::executeIceStep() { switch (var_r28) { case 2: - setBck(ANM_TRAMPLE_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_TRAMPLEA, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mMode = 2; break; case 3: - setBck(ANM_TRAMPLE_C, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_TRAMPLEC, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mMode = 3; break; case 4: - setBck(ANM_TRAMPLE_B, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_TRAMPLEB, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mMode = 4; break; case 5: - setBck(ANM_TRAMPLE_D, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_TRAMPLED, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mMode = 5; break; } @@ -3065,9 +2996,9 @@ void daB_ZANT_c::executeIceDamage() { field_0x70e = 2; if (mMode == 0) { - setBck(ANM_SHIND_L, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f); + setBck(BCK_ZAN_SHIND_L, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f); } else { - setBck(ANM_SHIND_R, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f); + setBck(BCK_ZAN_SHIND_R, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f); } mFoot2Cc[0].OffAtSetBit(); @@ -3178,9 +3109,9 @@ void daB_ZANT_c::executeIceDamage() { } if (cM_rnd() < 0.5f) { - setBck(ANM_DAMAGE_L_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_DAMAGEL_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); } else { - setBck(ANM_DAMAGE_R_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_DAMAGER_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); } mSound.startCreatureVoice(Z2SE_EN_ZAN_V_DMG, -1); @@ -3197,7 +3128,7 @@ void daB_ZANT_c::executeIceDamage() { mModeTimer = 30; } - setBck(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); } break; case 12: @@ -3206,7 +3137,7 @@ void daB_ZANT_c::executeIceDamage() { } break; case 20: - setBck(ANM_GROUND_REACTION, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_GROUND_REACTION, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mSound.startCreatureVoice(Z2SE_EN_ZAN_V_NO_DMG, -1); mMode = 21; speed.y = 0.0f; @@ -3217,7 +3148,7 @@ void daB_ZANT_c::executeIceDamage() { } break; case 40: - setBck(ANM_FAINT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_FAINT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); mMode = 41; speed.y = 0.0f; speedF = 0.0f; @@ -3404,15 +3335,15 @@ void daB_ZANT_c::executeMonkey() { } setNextPillarPos(); - setBck(ANM_LV1_JUMP_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_LV1_JUMP_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mMode = 8; } else if (mLastAction == ACT_SMALL_ATTACK) { mMode = 5; - setBck(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); mModeTimer = 0; } else { mMode = 5; - setBck(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); } field_0x70b = cM_rndF(2.9f) + 3.0f; @@ -3433,12 +3364,12 @@ void daB_ZANT_c::executeMonkey() { field_0x711 = 0; setActionMode(ACT_WARP, 1); } else { - setBck(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); mMode = 2; } } else { mMode = 5; - setBck(ANM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); } } break; @@ -3458,7 +3389,7 @@ void daB_ZANT_c::executeMonkey() { cLib_addCalcAngleS2(&shape_angle.y, cLib_targetAngleY(¤t.pos, &field_0x6ac), 8, 0x800); if (mModeTimer == 0 && mAcch.ChkGroundHit()) { - setBck(ANM_LV1_JUMP_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_LV1_JUMP_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mMode = 8; } break; @@ -3485,7 +3416,7 @@ void daB_ZANT_c::executeMonkey() { } if (mModeTimer == 8) { - setBck(ANM_LB1_JUMP_B, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_LV1_JUMP_B, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); } if (mAcch.ChkGroundHit()) { @@ -3532,7 +3463,7 @@ void daB_ZANT_c::executeMonkeyFall() { mModeTimer = 30; } - setBck(ANM_FAINT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_FAINT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); mMode = 1; mBodySphCc[0].OffTgNoHitMark(); @@ -3545,7 +3476,7 @@ void daB_ZANT_c::executeMonkeyFall() { } break; case 10: - setBck(ANM_FALL, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_FALL, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mMode = 11; field_0x707 = 0; setTgHitBit(FALSE); @@ -3563,7 +3494,7 @@ void daB_ZANT_c::executeMonkeyFall() { speedF = 8.0f; current.angle.y = shape_angle.y + 0x8000; - setBck(ANM_LANDING, J3DFrameCtrl::EMode_NONE, 0.0f, 0.0f); + setBck(BCK_ZAN_LANDING, J3DFrameCtrl::EMode_NONE, 0.0f, 0.0f); mMode = 12; mBodySphCc[0].OnAtSetBit(); @@ -3605,7 +3536,7 @@ void daB_ZANT_c::executeMonkeyDamage() { return; } - setBck(ANM_LANDING_DAMAGE, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_LANDING_DAMAGE, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mSound.startCreatureVoice(Z2SE_EN_ZAN_V_DMG, -1); mMode = 1; field_0x702 = 0; @@ -3615,7 +3546,7 @@ void daB_ZANT_c::executeMonkeyDamage() { } if (mpModelMorf->isStop()) { - setBck(ANM_LANDING_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_LANDING_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); mMode = 10; } break; @@ -3628,7 +3559,7 @@ void daB_ZANT_c::executeMonkeyDamage() { field_0x6f0 = 30; } - setBck(ANM_LANDING_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_LANDING_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); mMode = 10; field_0x702 = 0; case 10: @@ -3823,7 +3754,7 @@ void daB_ZANT_c::executeLastStartDemo() { } else { camera->Stop(); camera->SetTrimSize(3); - setBck(ANM_LAST_DEMO, J3DFrameCtrl::EMode_NONE, 10.0f, 1.0f); + setBck(BCK_ZAN_LAST_DEMO, J3DFrameCtrl::EMode_NONE, 10.0f, 1.0f); mSound.startCreatureSound(Z2SE_EN_ZAN_CTL_OP, 0, -1); mpModelMorf->setPlaySpeed(0.0f); @@ -3935,7 +3866,7 @@ void daB_ZANT_c::executeLastAttack() { if (field_0x713 == 0) { mMode = 1; - setBck(ANM_SW_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_SW_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); mModeTimer = 60; } else { mMode = 5; @@ -3964,7 +3895,7 @@ void daB_ZANT_c::executeLastAttack() { if (fopAcM_searchPlayerDistance(this) < 800.0f || mModeTimer == 0) { mMode = 2; - setBck(ANM_SW_WALK, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_SW_WALK, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); } } break; @@ -3997,11 +3928,11 @@ void daB_ZANT_c::executeLastAttack() { break; case 5: if (field_0x713 == 0) { - setBck(ANM_SW_ATTACK, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_SW_ATTACK, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); mModeTimer = 200; speedF = 5.0f; } else { - setBck(ANM_SW_ATTACK_B, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_SW_ATTACKB, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); if (field_0x713 != 2) { mModeTimer = cM_rndF(60.0f) + 60.0f; @@ -4099,13 +4030,13 @@ void daB_ZANT_c::executeLastAttack() { mMode = 5; } else { mMode = 2; - setBck(ANM_SW_WALK, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_SW_WALK, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); } break; case 10: case 30: dComIfGs_onOneZoneSwitch(1, fopAcM_GetRoomNo(this)); - setBck(ANM_SPIN, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_SPIN, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); if (field_0x704 == 0) { if (field_0x713 != 2) { @@ -4287,7 +4218,7 @@ void daB_ZANT_c::executeLastAttack() { mRollCc.OffTgSetBit(); mRollCc.OffCoSetBit(); - setBck(ANM_SW_FATIGUE, J3DFrameCtrl::EMode_LOOP, 30.0f, 1.0f); + setBck(BCK_ZAN_SW_FATIGUE, J3DFrameCtrl::EMode_LOOP, 30.0f, 1.0f); mSound.startCreatureVoice(Z2SE_EN_ZAN_CTL_V_ZEIZEI, -1); mMode = 13; dComIfGs_offOneZoneSwitch(1, fopAcM_GetRoomNo(this)); @@ -4398,20 +4329,20 @@ void daB_ZANT_c::executeLastDamage() { field_0x702 = 0; if (mMode == 1) { - setBck(ANM_SW_DAMAGE_R, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_SW_DAMAGER, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); } else if (mMode == 2) { - setBck(ANM_SW_DAMAGE_L, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_SW_DAMAGEL, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); } else if (cM_rnd() < 0.5f) { - setBck(ANM_SW_DAMAGE_L, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_SW_DAMAGEL, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); } else { - setBck(ANM_SW_DAMAGE_R, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_SW_DAMAGER, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); } mSound.startCreatureVoice(Z2SE_EN_ZAN_V_DMG, -1); mMode = 5; case 5: { BOOL var_r28 = false; - if (checkBck(ANM_SW_DAMAGE_L)) { + if (checkBck(BCK_ZAN_SW_DAMAGEL)) { if (mpModelMorf->checkFrame(17)) { mSound.startCreatureVoice(Z2SE_EN_ZAN_V_DMG_JITANDA, -1); } @@ -4474,7 +4405,7 @@ void daB_ZANT_c::executeLastDamage() { } case 10: attention_info.flags = 4; - setBck(ANM_GROUND_REACTION, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_GROUND_REACTION, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mSound.startCreatureVoice(Z2SE_EN_ZAN_V_NO_DMG, -1); mMode = 11; speedF = 0.0f; @@ -4486,7 +4417,7 @@ void daB_ZANT_c::executeLastDamage() { } break; case 20: - setBck(ANM_FAINT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_FAINT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); speedF = 0.0f; speed.y = 0.0f; field_0x702 = 0; @@ -4532,7 +4463,7 @@ void daB_ZANT_c::executeLastEndDemo() { camera->Stop(); camera->SetTrimSize(3); - setBck(ANM_DIE_DEMO, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); + setBck(BCK_ZAN_DIE_DEMO, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); mSound.startCreatureSound(Z2SE_EN_ZAN_END, 0, -1); Z2GetAudioMgr()->bgmStop(30, 0); fpcM_Search(s_del_tp, this); @@ -4644,8 +4575,8 @@ void daB_ZANT_c::calcMahojinAnime() { case 1: mpMahojinStartBtk->setPlaySpeed(1.0f); mpMahojinStartBtk->setFrame(0); - mpMahojinBrk->setPlaySpeed(0.0f); - mpMahojinBrk->setFrame(0); + mpMahojinEndBrk->setPlaySpeed(0.0f); + mpMahojinEndBrk->setFrame(0); mMahojinAnmMode = 2; case 2: if (mpMahojinStartBtk->checkFrame(9)) { @@ -4659,10 +4590,10 @@ void daB_ZANT_c::calcMahojinAnime() { case 3: break; case 4: - mpMahojinBrk->setPlaySpeed(1.0f); + mpMahojinEndBrk->setPlaySpeed(1.0f); mMahojinAnmMode = 5; case 5: - if (mpMahojinBrk->isStop()) { + if (mpMahojinEndBrk->isStop()) { mMahojinAnmMode = 0; } break; @@ -4812,7 +4743,7 @@ void daB_ZANT_c::executeRoomChange() { mMode = 1; if (mFightPhase != PHASE_MK) { - setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); } dComIfGp_particle_set(0x88FE, ¤t.pos, &shape_angle, NULL); @@ -4839,7 +4770,7 @@ void daB_ZANT_c::executeRoomChange() { current.angle.y = 0x8000; shape_angle.y = 0x8000; - setBck(ANM_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_FLOAT_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); player->setPlayerPosAndAngle(&sp34, 0, 0); player->changeOriginalDemo(); @@ -4899,7 +4830,7 @@ void daB_ZANT_c::executeRoomChange() { if (mModeTimer == 0) { mMode = 14; - setBck(ANM_FLOAT_APPEAR_SHORT, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f); + setBck(BCK_ZAN_FLOAT_APPEARSHORT, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f); field_0x714 = 1; mKankyoBlend = 0.0f; @@ -4932,7 +4863,7 @@ void daB_ZANT_c::executeRoomChange() { if (mpModelMorf->isStop()) { dComIfGp_getVibration().StopQuake(0x1F); - setBck(ANM_FLOAT_APPEAR_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); + setBck(BCK_ZAN_FLOAT_APPEARWAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); mFightPhase++; if (mFightPhase >= PHASE_MAX) { @@ -4953,7 +4884,7 @@ void daB_ZANT_c::executeRoomChange() { field_0x714 = 0; mKankyoBlend = 0.0f; - setBck(ANM_FLOAT_WAIT_RETURN, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f); + setBck(BCK_ZAN_FLOAT_WAITRETURN, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f); mMahojinAnmMode = 4; } break; @@ -5190,7 +5121,7 @@ void daB_ZANT_c::action() { case PHASE_MG: break; case PHASE_YO: - if (checkBck(ANM_FLOAT_WAIT) && mpModelMorf->checkFrame(1)) { + if (checkBck(BCK_ZAN_FLOAT_WAIT) && mpModelMorf->checkFrame(1)) { mSound.startCreatureSound(Z2SE_EN_ZAN_YO_FLOAT_WAIT, 0, -1); } @@ -5307,11 +5238,11 @@ void daB_ZANT_c::mtx_set() { mpModelMorf->modelCalc(); if (mDrawSwords) { - mDoMtx_stack_c::copy(model->getAnmMtx(JNT_ARM_L3)); + mDoMtx_stack_c::copy(model->getAnmMtx(JNT_ARML3)); mDoMtx_stack_c::scaleM(mSwordSize, mSwordSize, mSwordSize); mpSwordLModel->setBaseTRMtx(mDoMtx_stack_c::get()); - mDoMtx_stack_c::copy(model->getAnmMtx(JNT_ARM_R3)); + mDoMtx_stack_c::copy(model->getAnmMtx(JNT_ARMR3)); mDoMtx_stack_c::scaleM(mSwordSize, mSwordSize, mSwordSize); mpSwordRModel->setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -5326,7 +5257,7 @@ void daB_ZANT_c::mtx_set() { mDoMtx_stack_c::scaleM(l_HIO.mMahojinSize, l_HIO.mMahojinSize, l_HIO.mMahojinSize); mpMahojinModel->setBaseTRMtx(mDoMtx_stack_c::get()); - mpMahojinBrk->play(); + mpMahojinEndBrk->play(); mpMahojinBtk->play(); mpMahojinStartBtk->play(); @@ -5368,14 +5299,14 @@ void daB_ZANT_c::cc_set() { mRollCc.SetH(250.0f); dComIfG_Ccsp()->Set(&mRollCc); - mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_ARM_L3)); + mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_ARML3)); mDoMtx_stack_c::transM(100.0f, 0.0f, 0.0f); mDoMtx_stack_c::multVecZero(¢er); mSwordCc[0].SetC(center); mSwordCc[0].SetR(50.0f); dComIfG_Ccsp()->Set(&mSwordCc[0]); - mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_ARM_R3)); + mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_ARMR3)); mDoMtx_stack_c::transM(-100.0f, 0.0f, 0.0f); mDoMtx_stack_c::multVecZero(¢er); mSwordCc[1].SetC(center); @@ -5394,14 +5325,14 @@ void daB_ZANT_c::cc_ice_set() { }; static dZantSph_c ice_sph_jnt[] = { - {JNT_FOOT_L, 10.0f, 15.0f}, - {JNT_LEG_L2, 20.0f, 20.0f}, - {JNT_LEG_L2, 0.0f, 25.0f}, - {JNT_LEG_L1, 20.0f, 30.0f}, - {JNT_FOOT_R, 10.0f, 15.0f}, - {JNT_LEG_R2, 20.0f, 20.0f}, - {JNT_LEG_R2, 0.0f, 25.0f}, - {JNT_LEG_R1, 20.0f, 30.0f}, + {JNT_FOOTL, 10.0f, 15.0f}, + {JNT_LEGL2, 20.0f, 20.0f}, + {JNT_LEGL2, 0.0f, 25.0f}, + {JNT_LEGL1, 20.0f, 30.0f}, + {JNT_FOOTR, 10.0f, 15.0f}, + {JNT_LEGR2, 20.0f, 20.0f}, + {JNT_LEGR2, 0.0f, 25.0f}, + {JNT_LEGR1, 20.0f, 30.0f}, {JNT_WAIST, 0.0f, 45.0f}, {JNT_BACKBONE, 20.0f, 45.0f}, {JNT_HEAD, 20.0f, 25.0f}, @@ -5412,11 +5343,11 @@ void daB_ZANT_c::cc_ice_set() { if (mAction == ACT_ICE_STEP || mAction == ACT_ICE_JUMP) { if (!dComIfGp_getAttention()->LockonTruth() || dComIfGp_getAttention()->LockonTarget(0) != this) { - mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOT_L)); + mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOTL)); mDoMtx_stack_c::transM(20.0f, 0.0f, 0.0f); mDoMtx_stack_c::multVecZero(&sp34); - mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOT_R)); + mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOTR)); mDoMtx_stack_c::transM(20.0f, 0.0f, 0.0f); mDoMtx_stack_c::multVecZero(&sp40); @@ -5443,9 +5374,9 @@ void daB_ZANT_c::cc_ice_set() { } } else { if (field_0x70d == 0) { - mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOT_L)); + mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOTL)); } else { - mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOT_R)); + mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOTR)); } mDoMtx_stack_c::transM(20.0f, 0.0f, 0.0f); @@ -5569,9 +5500,9 @@ static int daB_ZANT_Delete(daB_ZANT_c* i_this) { /* 8064DC04-8064E128 00FBE4 0524+00 1/1 0/0 0/0 .text CreateHeap__10daB_ZANT_cFv */ int daB_ZANT_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", 0x48); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", BMDR_ZAN); JUT_ASSERT(0, modelData != 0); - mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x12), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084); + mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_zan", BCK_ZAN_FLOAT_WAIT), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { return 0; } @@ -5581,17 +5512,17 @@ int daB_ZANT_c::CreateHeap() { model->getModelData()->getJointNodePointer(1)->setCallBack(JointCallBack); model->getModelData()->getJointNodePointer(2)->setCallBack(JointCallBack); - mpMahojinModel = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes("B_zan", 0x49), 0x80000, 0x11000284); + mpMahojinModel = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes("B_zan", BMDR_ZAN_MAHOJIN), 0x80000, 0x11000284); if (mpMahojinModel == NULL) { return 0; } - mpMahojinBrk = new mDoExt_brkAnm(); - if (mpMahojinBrk == NULL) { + mpMahojinEndBrk = new mDoExt_brkAnm(); + if (mpMahojinEndBrk == NULL) { return 0; } - if (!mpMahojinBrk->init(mpMahojinModel->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_zan", 0x4F), 1, 0, 1.0f, 0, -1)) { + if (!mpMahojinEndBrk->init(mpMahojinModel->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_zan", BRK_ZAN_MAHOJIN_END), 1, 0, 1.0f, 0, -1)) { return 0; } @@ -5600,7 +5531,7 @@ int daB_ZANT_c::CreateHeap() { return 0; } - if (!mpMahojinBtk->init(mpMahojinModel->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_zan", 0x53), 1, 2, 1.0f, 0, -1)) { + if (!mpMahojinBtk->init(mpMahojinModel->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_zan", BTK_ZAN_MAHOJIN), 1, 2, 1.0f, 0, -1)) { return 0; } @@ -5609,11 +5540,11 @@ int daB_ZANT_c::CreateHeap() { return 0; } - if (!mpMahojinStartBtk->init(mpMahojinModel->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_zan", 0x54), 1, 0, 1.0f, 0, -1)) { + if (!mpMahojinStartBtk->init(mpMahojinModel->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_zan", BTK_ZAN_MAHOJIN_START), 1, 0, 1.0f, 0, -1)) { return 0; } - mpMahojinModel2 = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes("B_zan", 0x49), 0x80000, 0x11000284); + mpMahojinModel2 = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes("B_zan", BMDR_ZAN_MAHOJIN), 0x80000, 0x11000284); if (mpMahojinModel2 == NULL) { return 0; } @@ -5623,7 +5554,7 @@ int daB_ZANT_c::CreateHeap() { return 0; } - if (!mpMahojinBrk2->init(mpMahojinModel2->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_zan", 0x4F), 1, 0, 0.0f, 0, -1)) { + if (!mpMahojinBrk2->init(mpMahojinModel2->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_zan", BRK_ZAN_MAHOJIN_END), 1, 0, 0.0f, 0, -1)) { return 0; } @@ -5632,18 +5563,18 @@ int daB_ZANT_c::CreateHeap() { return 0; } - if (!mpMahojinStartBtk2->init(mpMahojinModel2->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_zan", 0x54), 1, 0, 1.0f, 0, -1)) { + if (!mpMahojinStartBtk2->init(mpMahojinModel2->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_zan", BTK_ZAN_MAHOJIN_START), 1, 0, 1.0f, 0, -1)) { return 0; } - modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", 0x4A); + modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", BMDR_ZAN_SWORD_L); JUT_ASSERT(0, modelData != 0); mpSwordLModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpSwordLModel == NULL) { return 0; } - modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", 0x4B); + modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", BMDR_ZAN_SWORD_R); JUT_ASSERT(0, modelData != 0); mpSwordRModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpSwordRModel == NULL) { |
