summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_obj_lv6egate.cpp
diff options
context:
space:
mode:
authorMax Roncace <me@caseif.net>2026-02-28 15:13:57 -0500
committerGitHub <noreply@github.com>2026-02-28 12:13:57 -0800
commitebe7c7aabc32e0842aaaf1c5cf1ab6cf5737417f (patch)
tree25fb02da5b81be6ed97f3eccc2964a076d49daf4 /src/d/actor/d_a_obj_lv6egate.cpp
parentc900a043b89786d5e594ec883d9acd92e0db6bc7 (diff)
ShieldD: Clean up a bunch of 99% matching TUs (#3113)
* d_a_npc_ks debug code 100% * d_a_npc_rafrel debug code 100% * d_a_npc_inko minor improvements * d_a_npc_gro debug code 100% * d_a_npc_pachi_taro debug code 100% * d_a_npc_passer debug code 100% * d_a_npc_pachi_maro debug code 100% * d_a_npc_post debug code 100% * d_a_obj_bemos debug improvements * d_a_obj_scannon_ten debug code 100% * d_a_b_mgn debug code 100% * d_a_e_fb debug code 100% * d_a_e_gb debug code 100% * d_a_e_hz debug code 100% * d_a_e_cr_egg debug code 100% * d_a_e_md debug code 100% * d_a_e_wb debug code 100% * d_a_obj_mirror_6pole debug code 100% * d_a_obj_spinLift debug data fixes * d_a_obj_pdwall debug data fixes * d_a_obj_ss_drink debug code almost matching * d_a_obj_poFire debug code 100% * d_a_obj_picture debug code 100% * d_a_obj_dust debug code 100% * d_a_obj_fallobj debug code 100% * d_a_obj_itamato debug code almost matching * d_a_obj_syRock debug code 100% * d_a_obj_katatsumuri debug code 100% * d_a_obj_wood_statue debug code 100% * d_a_obj_lv6egate debug code 100% * d_a_tag_qs minor debug symbol fixes * d_a_obj_twGate debug code 100% * d_a_obj_lv6SwGate debug code 100% * d_a_obj_lv6swturn debug code 100% * d_a_obj_lv6Tenbin debug code 100% * d_a_obj_kwheel01 debug code 100% * Fix RTTI order regression (cM3dGCyl vs cBgS_*)
Diffstat (limited to 'src/d/actor/d_a_obj_lv6egate.cpp')
-rw-r--r--src/d/actor/d_a_obj_lv6egate.cpp26
1 files changed, 24 insertions, 2 deletions
diff --git a/src/d/actor/d_a_obj_lv6egate.cpp b/src/d/actor/d_a_obj_lv6egate.cpp
index 0b9e4b3d93..c123578767 100644
--- a/src/d/actor/d_a_obj_lv6egate.cpp
+++ b/src/d/actor/d_a_obj_lv6egate.cpp
@@ -9,7 +9,7 @@
static char* l_arcName = "LV6EGATE";
-static const int l_dzbidx = 3;
+const int l_dzbidx = 3;
int daObjLv6EGate_c::create1st() {
int phase_state = dComIfG_resLoad(this, l_arcName);
@@ -40,6 +40,22 @@ static const cull_box l_cull_box = {
{500.0f, 300.0f, 50.0f},
};
+static dCcD_SrcCyl l_cc_cyl_src = {
+ {
+ {0x0, {{0x0, 0x2, 0x0}, {0x400, 0x11}, 0x79}}, // mObj
+ {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
+ {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
+ {0x0}, // mGObjCo
+ }, // mObjInf
+ {
+ {
+ {0.0f, 0.0f, 0.0f}, // mCenter
+ 30.0f, // mRadius
+ 300.0f // mHeight
+ } // mCyl
+ }
+};
+
static dCcD_SrcCyl l_at_cyl_src = {
{
{0x0, {{0x100, 0x2, 0xd}, {0x400, 0x0}, 0x11}}, // mObj
@@ -56,6 +72,12 @@ static dCcD_SrcCyl l_at_cyl_src = {
}
};
+static u8 l_local_cyl[] = {
+ 0xC3, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x43, 0x91, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
int daObjLv6EGate_c::Create() {
fopAcM_SetMtx(this, field_0x5d8);
fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, l_cull_box.max.x, l_cull_box.max.y, l_cull_box.max.z);
@@ -151,7 +173,7 @@ int daObjLv6EGate_c::Execute(Mtx** param_0) {
cXyz cyl_pos;
f32 var_f31 = -280.0f;
- f32 temp_f30 = (330.0f - var_f31) * 0.125f;
+ f32 temp_f30 = (330.0f - var_f31) / 8.0f;
for (int i = 0; i < 8; i++) {
cXyz local_pos;
local_pos.x = var_f31;