mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-05-23 14:41:33 -04:00
E rd documentation (#3106)
* some e_rd doc * fix build * more doc * more doc * fix debug * fix debug for real * change some name * some rename * rename
This commit is contained in:
+60
-60
@@ -21,75 +21,75 @@ class e_rd_class {
|
||||
public:
|
||||
e_rd_class();
|
||||
|
||||
/* 0x0000 */ fopEn_enemy_c actor;
|
||||
/* 0x05AC */ request_of_phase_process_class mPhase;
|
||||
/* 0x05B4 */ s16 mMode;
|
||||
/* 0x05B6 */ u8 field_0x5b6;
|
||||
/* 0x05B7 */ u8 field_0x5b7;
|
||||
/* 0x05B8 */ u8 field_0x5b8;
|
||||
/* 0x0000 */ fopEn_enemy_c enemy;
|
||||
/* 0x05AC */ request_of_phase_process_class phase;
|
||||
/* 0x05B4 */ s16 mode;
|
||||
/* 0x05B6 */ u8 arg0;
|
||||
/* 0x05B7 */ u8 arg1;
|
||||
/* 0x05B8 */ u8 arg2;
|
||||
/* 0x05B9 */ u8 field_0x5b9;
|
||||
/* 0x05BA */ u8 field_0x5ba;
|
||||
/* 0x05BB */ u8 field_0x5bb;
|
||||
/* 0x05BC */ u8 field_0x5bc;
|
||||
/* 0x05BC */ u8 weapon_type;
|
||||
/* 0x05BD */ s8 field_0x5bd;
|
||||
/* 0x05C0 */ cXyz field_0x5c0;
|
||||
/* 0x05CC */ s16 field_0x5cc;
|
||||
/* 0x05D0 */ mDoExt_McaMorfSO* mpModelMorf;
|
||||
/* 0x05D4 */ Z2CreatureEnemy mSound;
|
||||
/* 0x0678 */ char* mResName;
|
||||
/* 0x067C */ int mAnmID;
|
||||
/* 0x05CC */ s16 target_ya;
|
||||
/* 0x05D0 */ mDoExt_McaMorfSO* anm_p;
|
||||
/* 0x05D4 */ Z2CreatureEnemy sound;
|
||||
/* 0x0678 */ char* resName;
|
||||
/* 0x067C */ int anm;
|
||||
/* 0x0680 */ int field_0x680;
|
||||
/* 0x0684 */ dJntCol_c mJntCol;
|
||||
/* 0x0694 */ J3DModel* field_0x694;
|
||||
/* 0x0698 */ mDoExt_McaMorfSO* mpMorfBowAnm;
|
||||
/* 0x0694 */ J3DModel* arrow;
|
||||
/* 0x0698 */ mDoExt_McaMorfSO* bow_anm;
|
||||
/* 0x069C */ mDoExt_McaMorf* mpMorfHornAnm;
|
||||
/* 0x06A0 */ s8 field_0x6a0;
|
||||
/* 0x06A4 */ cXyz field_0x6a4;
|
||||
/* 0x06B0 */ cXyz field_0x6b0;
|
||||
/* 0x06BC */ csXyz field_0x6bc;
|
||||
/* 0x06C2 */ s8 field_0x6c2;
|
||||
/* 0x06C2 */ s8 run_flag;
|
||||
/* 0x06C3 */ u8 field_0x6c3;
|
||||
/* 0x06C4 */ J3DModel* mpEyeModels[2];
|
||||
/* 0x06C4 */ J3DModel* eye_model[2];
|
||||
/* 0x06CC */ f32 field_0x6cc;
|
||||
/* 0x06D0 */ f32 field_0x6d0;
|
||||
/* 0x06D4 */ J3DModel* mpBossArmorParts[14];
|
||||
/* 0x06D4 */ J3DModel* armor_boss_part[14];
|
||||
/* 0x070C */ s8 field_0x70c[14];
|
||||
/* 0x071C */ cXyz field_0x71c[14];
|
||||
/* 0x07C4 */ cXyz field_0x7c4[14];
|
||||
/* 0x086C */ csXyz field_0x86c[14];
|
||||
/* 0x08C0 */ u32 field_0x8c0[14][3];
|
||||
/* 0x08C0 */ u32 armor_break_eff[14][3];
|
||||
/* 0x0968 */ s8 field_0x968;
|
||||
/* 0x096C */ f32 field_0x96c;
|
||||
/* 0x0970 */ s16 field_0x970;
|
||||
/* 0x0972 */ s16 mAction;
|
||||
/* 0x0974 */ s16 field_0x974;
|
||||
/* 0x0978 */ f32 mPlayerDistance;
|
||||
/* 0x097C */ s16 mPlayerAngleY;
|
||||
/* 0x0980 */ f32 field_0x980;
|
||||
/* 0x0984 */ f32 field_0x984;
|
||||
/* 0x0988 */ u32 mShadowKey;
|
||||
/* 0x098C */ fpc_ProcID mWbActorID;
|
||||
/* 0x0990 */ s16 field_0x990[4];
|
||||
/* 0x0998 */ s16 field_0x998;
|
||||
/* 0x0970 */ s16 counter;
|
||||
/* 0x0972 */ s16 action;
|
||||
/* 0x0974 */ s16 prev_action;
|
||||
/* 0x0978 */ f32 dis;
|
||||
/* 0x097C */ s16 angleY;
|
||||
/* 0x0980 */ f32 attack_range;
|
||||
/* 0x0984 */ f32 waterY;
|
||||
/* 0x0988 */ u32 shadow_key;
|
||||
/* 0x098C */ fpc_ProcID boar_id;
|
||||
/* 0x0990 */ s16 timer[4];
|
||||
/* 0x0998 */ s16 damage_timer;
|
||||
/* 0x099A */ s16 field_0x99a;
|
||||
/* 0x099C */ s16 field_0x99c;
|
||||
/* 0x099E */ s16 field_0x99e;
|
||||
/* 0x099C */ s16 yagura_timer;
|
||||
/* 0x099E */ s16 attack_timer;
|
||||
/* 0x09A0 */ s8 field_0x9a0;
|
||||
/* 0x09A1 */ s8 field_0x9a1;
|
||||
/* 0x09A1 */ s8 look_timer;
|
||||
/* 0x09A2 */ s8 field_0x9a2;
|
||||
/* 0x09A3 */ s8 field_0x9a3;
|
||||
/* 0x09A3 */ s8 arrow_flag;
|
||||
/* 0x09A4 */ s8 field_0x9a4;
|
||||
/* 0x09A5 */ u8 field_0x9a5;
|
||||
/* 0x09A6 */ s16 field_0x9a6;
|
||||
/* 0x09A6 */ s16 bow_shake_timer;
|
||||
/* 0x09A8 */ s16 field_0x9a8;
|
||||
/* 0x09AA */ u8 field_0x9aa;
|
||||
/* 0x09AB */ s8 field_0x9ab;
|
||||
/* 0x09AC */ s8 field_0x9ac;
|
||||
/* 0x09AD */ s8 field_0x9ad;
|
||||
/* 0x09B0 */ cXyz field_0x9b0;
|
||||
/* 0x09BC */ s8 field_0x9bc;
|
||||
/* 0x09BC */ s8 ride_mode;
|
||||
/* 0x09BD */ s8 field_0x9bd;
|
||||
/* 0x09BE */ s8 field_0x9be;
|
||||
/* 0x09BE */ s8 boar_stand;
|
||||
/* 0x09BF */ u8 field_0x9bf;
|
||||
/* 0x09C0 */ f32 field_0x9c0;
|
||||
/* 0x09C4 */ f32 field_0x9c4;
|
||||
@@ -99,16 +99,16 @@ public:
|
||||
/* 0x09CC */ s16 field_0x9cc;
|
||||
/* 0x09CE */ s16 field_0x9ce;
|
||||
/* 0x09D0 */ s16 field_0x9d0;
|
||||
/* 0x09D4 */ cXyz field_0x9d4;
|
||||
/* 0x09D4 */ cXyz eye;
|
||||
/* 0x09E0 */ cXyz field_0x9e0; // unused, dbg offset 0xa18
|
||||
/* 0x09EC */ f32 field_0x9ec;
|
||||
/* 0x09EC */ f32 jump_z;
|
||||
/* 0x09F0 */ f32 field_0x9f0;
|
||||
/* 0x09F4 */ s16 field_0x9f4;
|
||||
/* 0x09F6 */ s16 field_0x9f6;
|
||||
/* 0x09F8 */ s8 field_0x9f8;
|
||||
/* 0x09F8 */ s8 damage_flag;
|
||||
/* 0x09FC */ cXyz field_0x9fc; // unused, dbg offset 0xa34
|
||||
/* 0x0A08 */ u8 field_0xa08[0x0A0C - 0x0A08];
|
||||
/* 0x0A0C */ csXyz field_0xa0c;
|
||||
/* 0x0A0C */ csXyz jump_angle;
|
||||
/* 0x0A12 */ csXyz field_0xa12;
|
||||
/* 0x0A18 */ csXyz field_0xa18;
|
||||
/* 0x0A1E */ s8 field_0xa1e;
|
||||
@@ -139,37 +139,37 @@ public:
|
||||
/* 0x0AF8 */ s16 field_0xaf8;
|
||||
/* 0x0AFA */ s8 field_0xafa;
|
||||
/* 0x0AFB */ s8 field_0xafb;
|
||||
/* 0x0AFC */ dPath* mPath;
|
||||
/* 0x0AFC */ dPath* path;
|
||||
/* 0x0B00 */ s8 field_0xb00;
|
||||
/* 0x0B01 */ s8 field_0xb01;
|
||||
/* 0x0B04 */ dBgS_AcchCir mAcchCir;
|
||||
/* 0x0B44 */ dBgS_ObjAcch mObjAcch;
|
||||
/* 0x0B01 */ s8 path_dir;
|
||||
/* 0x0B04 */ dBgS_AcchCir AcchCir;
|
||||
/* 0x0B44 */ dBgS_ObjAcch ObjAcch;
|
||||
/* 0x0D1C */ dCcD_Stts mStts;
|
||||
/* 0x0D58 */ dCcD_Sph field_0xd58[3];
|
||||
/* 0x1100 */ dCcD_Sph field_0x1100;
|
||||
/* 0x1238 */ dCcU_AtInfo mAtInfo;
|
||||
/* 0x125C */ u8 field_0x125c;
|
||||
/* 0x0D58 */ dCcD_Sph cc_sph[3];
|
||||
/* 0x1100 */ dCcD_Sph at_sph;
|
||||
/* 0x1238 */ dCcU_AtInfo AtInfo;
|
||||
/* 0x125C */ u8 hio_set;
|
||||
/* 0x125D */ s8 field_0x125d;
|
||||
/* 0x1260 */ u32 field_0x1260;
|
||||
/* 0x1264 */ u32 field_0x1264;
|
||||
/* 0x1268 */ u32 field_0x1268[3];
|
||||
/* 0x1274 */ u32 field_0x1274[2];
|
||||
/* 0x1268 */ u32 enemy_downWtrA[3];
|
||||
/* 0x1274 */ u32 fire_eff[2];
|
||||
/* 0x127C */ cXyz field_0x127c;
|
||||
/* 0x1288 */ cXyz field_0x1288;
|
||||
/* 0x1294 */ s8 field_0x1294;
|
||||
/* 0x1295 */ s8 field_0x1295;
|
||||
/* 0x1295 */ s8 one_hit_kill;
|
||||
/* 0x1296 */ s8 field_0x1296;
|
||||
/* 0x1297 */ s8 field_0x1297;
|
||||
/* 0x1298 */ s8 field_0x1298;
|
||||
/* 0x1299 */ u8 field_0x1299;
|
||||
/* 0x129A */ s8 mBossMode; // 1: Eldin Field, 2 Eldin Bridge, 3 Lake Hylia Bridge, 4 ???
|
||||
/* 0x129A */ s8 actor_set; // 1: Eldin Field, 2 Eldin Bridge, 3 Lake Hylia Bridge, 4 ???
|
||||
/* 0x129B */ u8 field_0x129b;
|
||||
/* 0x129C */ s8 field_0x129c;
|
||||
/* 0x12A0 */ int field_0x12a0;
|
||||
/* 0x12A4 */ s16 mDemoMode;
|
||||
/* 0x12A6 */ s16 field_0x12a6;
|
||||
/* 0x12A8 */ cXyz mDemoCamEye;
|
||||
/* 0x12B4 */ cXyz mDemoCamCenter;
|
||||
/* 0x12A0 */ int sw;
|
||||
/* 0x12A4 */ s16 demo_mode;
|
||||
/* 0x12A6 */ s16 demo_timer;
|
||||
/* 0x12A8 */ cXyz demo_cam_eye;
|
||||
/* 0x12B4 */ cXyz demo_cam_center;
|
||||
/* 0x12C0 */ cXyz field_0x12c0;
|
||||
/* 0x12CC */ cXyz field_0x12cc;
|
||||
/* 0x12D8 */ cXyz field_0x12d8;
|
||||
@@ -177,11 +177,11 @@ public:
|
||||
/* 0x12F0 */ cXyz field_0x12f0;
|
||||
/* 0x12FC */ u8 field_0x12fc[0x1300 - 0x12fc];
|
||||
/* 0x1300 */ f32 field_0x1300;
|
||||
/* 0x1304 */ u8 mBlureRate;
|
||||
/* 0x1308 */ f32 mDemoCamFovy;
|
||||
/* 0x1304 */ u8 blurRate;
|
||||
/* 0x1308 */ f32 demo_cam_zoom;
|
||||
/* 0x130C */ f32 field_0x130c;
|
||||
/* 0x1310 */ u8 field_0x1310[0x131c - 0x1310];
|
||||
/* 0x131C */ dMsgFlow_c mMsgFlow;
|
||||
/* 0x131C */ dMsgFlow_c MsgFlow;
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(e_rd_class) == 0x1368);
|
||||
|
||||
+2746
-2745
File diff suppressed because it is too large
Load Diff
@@ -1297,8 +1297,8 @@ static void demo_camera(e_rdb_class* i_this) {
|
||||
if (i_this->field_0x10aa >= 40) {
|
||||
e_rd_class* bulblin_p = (e_rd_class*)fopAcM_SearchByName(PROC_E_RD);
|
||||
if (bulblin_p != NULL) {
|
||||
a_this->current.pos = bulblin_p->actor.current.pos;
|
||||
a_this->eyePos = bulblin_p->actor.eyePos;
|
||||
a_this->current.pos = bulblin_p->enemy.current.pos;
|
||||
a_this->eyePos = bulblin_p->enemy.eyePos;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+32
-32
@@ -398,9 +398,9 @@ static int daE_WB_Draw(e_wb_class* i_this) {
|
||||
e_rd_class* pfVar4 = (e_rd_class*)fopAcM_SearchByID(i_this->field_0x1434);
|
||||
|
||||
if ((i_this->mStatusFlags & 1) != 0) {
|
||||
if (pfVar4 && pfVar4->field_0x9bc == 2) {
|
||||
if (pfVar4 && pfVar4->ride_mode == 2) {
|
||||
if (i_this->field_0x7a2 == 0) {
|
||||
model = pfVar4->mpModelMorf->getModel();
|
||||
model = pfVar4->anm_p->getModel();
|
||||
cVar7 = 1;
|
||||
}
|
||||
} else {
|
||||
@@ -439,7 +439,7 @@ static int daE_WB_Draw(e_wb_class* i_this) {
|
||||
i_this->field_0x1438[0] = local_48;
|
||||
i_this->field_0x1438[1] = local_60;
|
||||
} else {
|
||||
if (pfVar4->mBossMode != 0) {
|
||||
if (pfVar4->actor_set != 0) {
|
||||
sp8 = 0xf;
|
||||
spc = 0x14;
|
||||
} else {
|
||||
@@ -1178,7 +1178,7 @@ static void e_wb_f_run(e_wb_class* i_this) {
|
||||
local_a4 = 0x200;
|
||||
}
|
||||
|
||||
if (local_90 != NULL && local_90->mAnmID == 0x27) {
|
||||
if (local_90 != NULL && local_90->anm == 0x27) {
|
||||
i_this->field_0x6d6 =
|
||||
(5000.0f + BREG_F(16)) * cM_ssin(i_this->field_0x68e * (1000 + BREG_S(7)));
|
||||
local_a4 = 0x400;
|
||||
@@ -2075,7 +2075,7 @@ static void e_wb_b_ikki2(e_wb_class* i_this) {
|
||||
if (local_a4 != -1 ) {
|
||||
int* p = dComIfGp_evmng_getMyIntegerP(local_a4, "action");
|
||||
if (p) {
|
||||
rider->mMode = 2;
|
||||
rider->mode = 2;
|
||||
i_this->mActionMode = -98;
|
||||
}
|
||||
}
|
||||
@@ -2808,7 +2808,7 @@ static void damage_check(e_wb_class* i_this) {
|
||||
i_this->mZ2Ride.startCreatureSound(Z2SE_EN_BB_RUNDOWN, 0, -1);
|
||||
|
||||
e_rd_class* rider = (e_rd_class*)fopAcM_SearchByID(i_this->field_0x1434);
|
||||
rider->field_0x998 = 20;
|
||||
rider->damage_timer = 20;
|
||||
} else {
|
||||
if (i_this->field_0x79d == 0 || i_this->mSpeedCapTimer == 0) {
|
||||
fopAc_ac_c* hit_actor =
|
||||
@@ -3103,7 +3103,7 @@ static void* s_rddel_sub(void* param_0, void* param_1) {
|
||||
UNUSED(param_1);
|
||||
if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_E_RD) {
|
||||
e_rd_class* rd = (e_rd_class*)param_0;
|
||||
if (rd->mBossMode == 0) {
|
||||
if (rd->actor_set == 0) {
|
||||
fopAcM_delete((fopAc_ac_c*)param_0);
|
||||
}
|
||||
}
|
||||
@@ -3115,8 +3115,8 @@ static int rd_count;
|
||||
static void* s_rdcount_sub(void* i_actor, void* i_data) {
|
||||
UNUSED(i_data);
|
||||
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD) {
|
||||
if (((e_rd_class*)i_actor)->mBossMode == 0 &&
|
||||
(((e_rd_class*)i_actor)->field_0x5b7 == 1 || ((e_rd_class*)i_actor)->field_0x5b7 == 2))
|
||||
if (((e_rd_class*)i_actor)->actor_set == 0 &&
|
||||
(((e_rd_class*)i_actor)->arg1 == 1 || ((e_rd_class*)i_actor)->arg1 == 2))
|
||||
{
|
||||
rd_count++;
|
||||
}
|
||||
@@ -3128,7 +3128,7 @@ static void* s_rddel2_sub(void* i_actor, void* i_data) {
|
||||
UNUSED(i_data);
|
||||
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD) {
|
||||
e_rd_class* rd = ((e_rd_class*)i_actor);
|
||||
fopAc_ac_c* r28 = fopAcM_SearchByID(rd->mWbActorID);
|
||||
fopAc_ac_c* r28 = fopAcM_SearchByID(rd->boar_id);
|
||||
if (r28 == i_data) {
|
||||
fopAcM_delete((fopAc_ac_c*)i_actor);
|
||||
}
|
||||
@@ -3341,7 +3341,7 @@ static s8 e_wb_c_run(e_wb_class* i_this) {
|
||||
turn_speed = 0x200;
|
||||
i_this->mTargetFacingAngle = cM_atan2s(sp94.x, sp94.z);
|
||||
|
||||
if (rider && rider->mAnmID == 0x27) {
|
||||
if (rider && rider->anm == 0x27) {
|
||||
ANGLE_ADD(i_this->mTargetFacingAngle,
|
||||
(BREG_F(16) + 5000.0f) * cM_ssin(i_this->field_0x68e * (BREG_S(7) + 1000)));
|
||||
turn_speed = 0x400;
|
||||
@@ -3681,8 +3681,8 @@ static void* s_rdArrowWait_sub(void* i_actor, void* i_data) {
|
||||
UNUSED(i_data);
|
||||
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD) {
|
||||
e_rd_class* a_this = static_cast<e_rd_class*>(i_actor);
|
||||
if (a_this->field_0x5bc == 2 || a_this->field_0x5bc == 3) {
|
||||
a_this->field_0x990[1] = cM_rndF(20.0) + 3.0f;
|
||||
if (a_this->weapon_type == 2 || a_this->weapon_type == 3) {
|
||||
a_this->timer[1] = cM_rndF(20.0) + 3.0f;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3869,16 +3869,16 @@ static void demo_camera(e_wb_class* i_this) {
|
||||
i_this->field_0x16a0 = 0;
|
||||
i_this->field_0x1714 = 55.0f + KREG_F(7);
|
||||
i_this->field_0x16a0 = 0;
|
||||
s16 sp16 = local_194->actor.shape_angle.y +
|
||||
(local_194->field_0xa0c.y - local_194->actor.shape_angle.y) / 2;
|
||||
s16 sp16 = local_194->enemy.shape_angle.y +
|
||||
(local_194->jump_angle.y - local_194->enemy.shape_angle.y) / 2;
|
||||
mDoMtx_stack_c::YrotS(sp16);
|
||||
local_3c.x = NREG_F(0);
|
||||
local_3c.y = NREG_F(1) + 500.0f;
|
||||
local_3c.z = NREG_F(2) - 500.0f;
|
||||
mDoMtx_stack_c::multVec(&local_3c, &i_this->field_0x16a4);
|
||||
i_this->field_0x16a4 += local_194->actor.current.pos;
|
||||
i_this->field_0x16a4 += local_194->enemy.current.pos;
|
||||
i_this->field_0x1710 = 10.0f;
|
||||
i_this->field_0x16bc = local_194->actor.current.pos;
|
||||
i_this->field_0x16bc = local_194->enemy.current.pos;
|
||||
i_this->field_0x16bc.y += 200.0f + KREG_F(11);
|
||||
daPy_getPlayerActorClass()->changeOriginalDemo();
|
||||
horse->changeOriginalDemo();
|
||||
@@ -3886,13 +3886,13 @@ static void demo_camera(e_wb_class* i_this) {
|
||||
// fallthrough
|
||||
case 0xb: {
|
||||
cLib_addCalc2(&i_this->field_0x1710, 1000.0f, 1.0f, 100.0f + KREG_F(10));
|
||||
cLib_addCalc2(&i_this->field_0x16bc.x, local_194->actor.current.pos.x, 0.5f + KREG_F(8),
|
||||
cLib_addCalc2(&i_this->field_0x16bc.x, local_194->enemy.current.pos.x, 0.5f + KREG_F(8),
|
||||
i_this->field_0x1710);
|
||||
cLib_addCalc2(&i_this->field_0x16bc.y, local_194->actor.current.pos.y + 200.0f + KREG_F(11),
|
||||
cLib_addCalc2(&i_this->field_0x16bc.y, local_194->enemy.current.pos.y + 200.0f + KREG_F(11),
|
||||
0.5f + KREG_F(8), i_this->field_0x1710);
|
||||
cLib_addCalc2(&i_this->field_0x16bc.z, local_194->actor.current.pos.z, 0.5f + KREG_F(8),
|
||||
cLib_addCalc2(&i_this->field_0x16bc.z, local_194->enemy.current.pos.z, 0.5f + KREG_F(8),
|
||||
i_this->field_0x1710);
|
||||
cLib_addCalc2(&i_this->field_0x16a4.x, local_194->actor.current.pos.x, 0.05f,
|
||||
cLib_addCalc2(&i_this->field_0x16a4.x, local_194->enemy.current.pos.x, 0.05f,
|
||||
12.0f + NREG_F(3));
|
||||
if (i_this->field_0x16a0 == 0x28) {
|
||||
if (a_this->shape_angle.y < 0x4000 && -0x4000 < a_this->shape_angle.y) {
|
||||
@@ -4169,7 +4169,7 @@ static void demo_camera(e_wb_class* i_this) {
|
||||
MtxPosition(&i_this->field_0x16c8, &i_this->field_0x16bc);
|
||||
i_this->field_0x16bc += a_this->current.pos;
|
||||
if (i_this->field_0x16a0 == 130) {
|
||||
local_194->mMode++;
|
||||
local_194->mode++;
|
||||
player->changeDemoParam2(0);
|
||||
}
|
||||
if (i_this->field_0x16a0 == 220) {
|
||||
@@ -4200,7 +4200,7 @@ static void demo_camera(e_wb_class* i_this) {
|
||||
MtxPosition(&i_this->field_0x16c8, &i_this->field_0x16bc);
|
||||
i_this->field_0x16bc += a_this->current.pos;
|
||||
if (i_this->field_0x16a0 == 20) {
|
||||
local_194->mMode++;
|
||||
local_194->mode++;
|
||||
}
|
||||
if (i_this->field_0x16a0 != (s16)(92 + KREG_S(8))) {
|
||||
break;
|
||||
@@ -4257,7 +4257,7 @@ static void demo_camera(e_wb_class* i_this) {
|
||||
i_this->field_0x16bc.set(-8416.0f, 345.0f, 6.0f);
|
||||
i_this->field_0x16a4.set(-8994.0f, 326.0f, 400.0f);
|
||||
i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_RDB_V_HOICK, -1);
|
||||
local_194->field_0x990[3] = 700;
|
||||
local_194->timer[3] = 700;
|
||||
}
|
||||
} break;
|
||||
case 0x26: {
|
||||
@@ -4809,25 +4809,25 @@ static void demo_camera(e_wb_class* i_this) {
|
||||
i_this->field_0x16a4.x += 100.0f + VREG_F(8);
|
||||
i_this->field_0x16a4.y += 600.0f + VREG_F(9);
|
||||
i_this->field_0x16a4.z += -500.0f + VREG_F(10);
|
||||
i_this->field_0x16bc = local_194->actor.current.pos;
|
||||
i_this->field_0x16bc.y = local_194->actor.current.pos.y + 100.0f + KREG_F(11);
|
||||
i_this->field_0x16bc = local_194->enemy.current.pos;
|
||||
i_this->field_0x16bc.y = local_194->enemy.current.pos.y + 100.0f + KREG_F(11);
|
||||
}
|
||||
// fallthrough
|
||||
case 0x5d: {
|
||||
if (local_194 != NULL) {
|
||||
cLib_addCalc2(&i_this->field_0x1710, 1000.0f, 1.0f, 100.0f + KREG_F(10));
|
||||
cLib_addCalc2(&i_this->field_0x16bc.x, local_194->actor.current.pos.x, 0.5f + KREG_F(8),
|
||||
cLib_addCalc2(&i_this->field_0x16bc.x, local_194->enemy.current.pos.x, 0.5f + KREG_F(8),
|
||||
i_this->field_0x1710);
|
||||
cLib_addCalc2(&i_this->field_0x16bc.y,
|
||||
local_194->actor.current.pos.y + 100.0f + KREG_F(11), 0.5f + KREG_F(8),
|
||||
local_194->enemy.current.pos.y + 100.0f + KREG_F(11), 0.5f + KREG_F(8),
|
||||
i_this->field_0x1710);
|
||||
cLib_addCalc2(&i_this->field_0x16bc.z, local_194->actor.current.pos.z, 0.5f + KREG_F(8),
|
||||
cLib_addCalc2(&i_this->field_0x16bc.z, local_194->enemy.current.pos.z, 0.5f + KREG_F(8),
|
||||
i_this->field_0x1710);
|
||||
cLib_addCalc2(&i_this->field_0x16a4.x, local_194->actor.current.pos.x - 10.0f, 0.05f,
|
||||
cLib_addCalc2(&i_this->field_0x16a4.x, local_194->enemy.current.pos.x - 10.0f, 0.05f,
|
||||
12.0f + NREG_F(3));
|
||||
if (i_this->field_0x16a0 >= 40) {
|
||||
if (i_this->field_0x16a0 == 40) {
|
||||
i_this->field_0x5c4 = local_194->actor.current.pos;
|
||||
i_this->field_0x5c4 = local_194->enemy.current.pos;
|
||||
}
|
||||
|
||||
for (int i = 0; i < 2; i++) {
|
||||
@@ -4857,7 +4857,7 @@ static void demo_camera(e_wb_class* i_this) {
|
||||
i_this->field_0x5c4 = i_this->field_0x16bc;
|
||||
i_this->field_0x1430 = 1;
|
||||
a_this->current.angle.y = player->shape_angle.y;
|
||||
fopAcM_delete(&local_194->actor);
|
||||
fopAcM_delete(&local_194->enemy);
|
||||
}
|
||||
}
|
||||
} break;
|
||||
|
||||
@@ -287,12 +287,12 @@ static void chain_control_01(obj_key_class* i_this) {
|
||||
MtxPosition(&spC4, &spB8);
|
||||
} else if (fopAcM_GetName(pparent) == PROC_E_RD) {
|
||||
e_rd_class* rd = (e_rd_class*)pparent;
|
||||
parent_model = rd->mpModelMorf->getModel();
|
||||
parent_model = rd->anm_p->getModel();
|
||||
|
||||
MTXCopy(parent_model->getAnmMtx(VREG_S(0) + 12), *calc_mtx);
|
||||
spC4.set(12.0f + VREG_F(0), -5.0f + VREG_F(1), VREG_F(2));
|
||||
MtxPosition(&spC4, &spB8);
|
||||
rd->actor.field_0x567 = 1;
|
||||
rd->enemy.field_0x567 = 1;
|
||||
} else if (fopAcM_GetName(pparent) == PROC_E_RDB) {
|
||||
e_rdb_class* rdb = (e_rdb_class*)pparent;
|
||||
parent_model = rdb->mpModelMorf->getModel();
|
||||
|
||||
Reference in New Issue
Block a user