mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-16 20:27:36 -04:00
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_*)
This commit is contained in:
@@ -159,13 +159,13 @@ void daTenbin_c::rideCallBackRight(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c*
|
||||
daPy_py_c* player = dComIfGp_getLinkPlayer();
|
||||
if (fopAcM_GetName(i_act2) == PROC_SPINNER) {
|
||||
if (player->checkSpinnerRide()) {
|
||||
i_tenbin->field_0x5B2 += 2;
|
||||
i_tenbin->field_0x5B2 += (u16)2;
|
||||
}
|
||||
}
|
||||
if (fopAcM_GetName(i_act2) == PROC_ALINK && dComIfGp_checkPlayerStatus0(0, 0x100) == 0) {
|
||||
i_tenbin->field_0x5B2 += 2;
|
||||
i_tenbin->field_0x5B2 += (u16)2;
|
||||
if (player->checkBootsOrArmorHeavy()) {
|
||||
i_tenbin->field_0x5B2 += 60000;
|
||||
i_tenbin->field_0x5B2 += (u16)60000;
|
||||
}
|
||||
if (player->getGrabActorID() != -1) {
|
||||
fopAc_ac_c* found = fopAcM_SearchByID(player->getGrabActorID());
|
||||
@@ -178,7 +178,7 @@ void daTenbin_c::rideCallBackRight(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c*
|
||||
if (fopAcM_GetName(i_act2) == PROC_CSTATUE) {
|
||||
daCstatue_c* i_statue = (daCstatue_c*)i_act2;
|
||||
if (i_statue->checkNormalType()) {
|
||||
i_tenbin->field_0x5B2 += 4;
|
||||
i_tenbin->field_0x5B2 += (u16)4;
|
||||
} else if (fopAcM_GetID(i_statue) != i_tenbin->field_0x650) {
|
||||
i_tenbin->field_0x5B2++;
|
||||
}
|
||||
@@ -191,13 +191,13 @@ void daTenbin_c::rideCallBackLeft(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c*
|
||||
daPy_py_c* player = dComIfGp_getLinkPlayer();
|
||||
if (fopAcM_GetName(i_act2) == PROC_SPINNER) {
|
||||
if (player->checkSpinnerRide()) {
|
||||
i_tenbin->field_0x5B4 += 2;
|
||||
i_tenbin->field_0x5B4 += (u16)2;
|
||||
}
|
||||
}
|
||||
if (fopAcM_GetName(i_act2) == PROC_ALINK && dComIfGp_checkPlayerStatus0(0, 0x100) == 0) {
|
||||
i_tenbin->field_0x5B4 += 2;
|
||||
i_tenbin->field_0x5B4 += (u16)2;
|
||||
if (player->checkEquipHeavyBoots()) {
|
||||
i_tenbin->field_0x5B4 += 60000;
|
||||
i_tenbin->field_0x5B4 += (u16)60000;
|
||||
}
|
||||
if (player->getGrabActorID() != -1) {
|
||||
fopAc_ac_c* found = fopAcM_SearchByID(player->getGrabActorID());
|
||||
@@ -210,7 +210,7 @@ void daTenbin_c::rideCallBackLeft(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c*
|
||||
if (fopAcM_GetName(i_act2) == PROC_CSTATUE) {
|
||||
daCstatue_c* i_statue = (daCstatue_c*)i_act2;
|
||||
if (i_statue->checkNormalType()) {
|
||||
i_tenbin->field_0x5B4 += 4;
|
||||
i_tenbin->field_0x5B4 += (u16)4;
|
||||
} else if (fopAcM_GetID(i_statue) != i_tenbin->field_0x650) {
|
||||
i_tenbin->field_0x5B4++;
|
||||
}
|
||||
@@ -336,13 +336,13 @@ static int daTenbin_Execute(daTenbin_c* i_this) {
|
||||
}
|
||||
|
||||
static int daTenbin_Delete(daTenbin_c* i_this) {
|
||||
fpc_ProcID id = fopAcM_GetID(i_this);
|
||||
fopAcM_RegisterDeleteID(i_this, "daTenbin");
|
||||
return i_this->MoveBGDelete();
|
||||
}
|
||||
|
||||
static int daTenbin_Create(fopAc_ac_c* i_this) {
|
||||
daTenbin_c* this_tenbin = (daTenbin_c*)i_this;
|
||||
fpc_ProcID id = fopAcM_GetID(i_this);
|
||||
fopAcM_RegisterCreateID(i_this, "daTenbin");
|
||||
return this_tenbin->create();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user