mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-23 06:54:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_player_pushpull.inc - Almost all matching except minor issues. (#728)

Browse Source 
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
This commit is contained in:
123456789758
2025-03-31 18:10:34 -04:00
committed by GitHub
parent 0b883c50c6
commit a69b604b01
4 changed files with 208 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_player.h
+1
View File
@@ -147,6 +147,7 @@ public:
daPyRFlg0_UNK1 = 0x00000001,
daPyRFlg0_UNK2 = 0x00000002,
daPyRFlg0_ROPE_GRAB_RIGHT_HAND = 0x00000004,
daPyRFlg0_UNK8 = 0x00000008,
daPyRFlg0_UNK10 = 0x00000010,
daPyRFlg0_GRAB_UP_END = 0x00000020,
daPyRFlg0_AUTO_JUMP_LAND = 0x00000040,
include/d/actor/d_a_player_main.h
+1 -1
View File
@@ -1600,7 +1600,7 @@ public:
BOOL procHammerFrontSwing();
BOOL procHammerFrontSwingEnd_init();
BOOL procHammerFrontSwingEnd();
void setPushPullKeepData(dBgW::PushPullLabel);
int setPushPullKeepData(dBgW::PushPullLabel);
BOOL procPushPullWait_init(int);
BOOL procPushPullWait();
BOOL procPushMove_init();
include/d/d_bg_w.h
+1
View File
@@ -19,6 +19,7 @@ typedef struct _GXColor GXColor;
class dBgW : public cBgW {
public:
enum PushPullLabel {
PP_UNK0_e = 0x00,
PP_UNK1_e = 0x01,
PP_UNK2_e = 0x02,
PP_UNK4_e = 0x04,
src/d/actor/d_a_player_pushpull.inc
+205 -14
View File
@@ -2,47 +2,238 @@
* d_a_player_pushpull.inc
*
* Code relating to pushing and pulling other actors.
*
* This file is not a standalone translation unit and is instead directly
*
* This file is not a standalone translation unit and is instead directly
* included into d_a_player_main.cpp.
*
* The original name of this file is not known, but a best guess was taken
*
* The original name of this file is not known, but a best guess was taken
* based on the original names of the functions it contains.
*/
#include "d/actor/d_a_player_HIO.h"
#include "d/actor/d_a_player_main.h"
/* 801514B0-80151644 .text setPushPullKeepData__9daPy_lk_cFQ24dBgW13PushPullLabel */
void daPy_lk_c::setPushPullKeepData(dBgW::PushPullLabel) {
/* Nonmatching */
/* 801514B0-80151644 .text
* setPushPullKeepData__9daPy_lk_cFQ24dBgW13PushPullLabel */
int daPy_lk_c::setPushPullKeepData(dBgW::PushPullLabel param_0) {
if (param_0 != dBgW::PP_UNK0_e) {
if (dComIfGs_getSelectEquip(2) == dItem_POWER_BRACELETS_e) {
cLib_onBit<dBgW::PushPullLabel>(param_0, dBgW::PP_UNK8_e);
}
if (m3570) {
cLib_onBit<dBgW::PushPullLabel>(param_0, dBgW::PP_UNK4_e);
}
}
fopAc_ac_c *pp_actor = dComIfG_Bgsp()->PushPullCallBack(
mPolyInfo, this, shape_angle.y, param_0);
if (pp_actor == NULL) {
return 0;
}
if (param_0 != dBgW::PP_UNK0_e) {
if (pp_actor->shape_angle.y != m34D4) {
cXyz local_28 = (current.pos - m370C);
mDoMtx_trans(mDoMtx_stack_c::now, m370C.x, m370C.y, m370C.z);
mDoMtx_YrotM(mDoMtx_stack_c::now, pp_actor->shape_angle.y - m34D4);
mDoMtx_multVec(mDoMtx_stack_c::now, &local_28, &current.pos);
s16 var_r28 = pp_actor->shape_angle.y - m34D4;
shape_angle.y += var_r28;
current.angle.y += var_r28;
}
current.pos.x += pp_actor->current.pos.x - m370C.x;
current.pos.z += pp_actor->current.pos.z - m370C.z;
}
m370C = pp_actor->current.pos;
m34D4 = pp_actor->shape_angle.y;
return true;
}
/* 80151644-801517C0 .text procPushPullWait_init__9daPy_lk_cFi */
BOOL daPy_lk_c::procPushPullWait_init(int) {
/* Nonmatching */
BOOL daPy_lk_c::procPushPullWait_init(int param_0) {
commonProcInit(daPyProc_PUSH_PULL_WAIT_e);
m3570 = param_0;
mVelocity = 0.0f;
if ((param_0 == 0) || (mEquipItem == daPyItem_NONE_e)) {
if (checkEquipAnime()) {
resetActAnimeUpper(UPPER_MOVE2_e, -1.0f);
}
daPy_matAnm_c::m_maba_flg = 0;
daPy_matAnm_c::m_maba_timer = 1;
setSingleMoveAnime(ANM_WAITPUSHPULL, daPy_HIO_pushpull_c0::m.field_0x0,
0.0f, -1, daPy_HIO_pushpull_c0::m.field_0x4);
m34D6 = 0;
} else {
setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC);
setAnimeUnequip();
m3598 = 0.0f;
m34D6 = 1;
}
if (param_0 != 0) {
m34D4 = m352C + 0x8000;
m370C.x = m3724.x + 40.0f * cM_ssin(m352C);
m370C.y = current.pos.y;
m370C.z = m3724.z + 40.0f * cM_scos(m352C);
}
dComIfGp_setPlayerStatus0(0, daPyStts0_UNK4000000_e);
return true;
}
/* 801517C0-8015198C .text procPushPullWait__9daPy_lk_cFv */
BOOL daPy_lk_c::procPushPullWait() {
/* Nonmatching */
/* Nonmatching - "sVar1" if statement */
dComIfGp_setRStatus(0x11);
setFrontWallType();
if (m34D6 != 0) {
if (m_anm_heap_upper[UPPER_MOVE2_e].mIdx == 0xffff) {
setSingleMoveAnime(ANM_WAITPUSHPULL,
daPy_HIO_pushpull_c0::m.field_0x0, 0.0f, -1,
daPy_HIO_pushpull_c0::m.field_0x4);
m34D6 = 0;
}
} else if ((spActionButton()) && (checkResetFlg0(daPyRFlg0_UNK8))) {
if (m3570 != 0) {
s16 sVar1 =
cLib_addCalcAngleS(&shape_angle.y, m34D4, 3, 0x800, 0x100);
current.angle.y = shape_angle.y;
f32 dVar2 =
cLib_addCalc(&current.pos.x, m370C.x, 0.5f, 10.0f, 1.0f);
f32 dVar3 =
cLib_addCalc(&current.pos.z, m370C.z, 0.5f, 10.0f, 1.0f);
if (((!sVar1) && ((float)(dVar2 + dVar3) < 5.0f)) &&
(m_anm_heap_upper[UPPER_MOVE2_e].mIdx == 0xffff)) {
current.pos.x = m370C.x;
current.pos.z = m370C.z;
m3570 = 0;
}
}
if (m3570 == 0) {
if (mStickDistance > 0.05f) {
int iVar1 = getDirectionFromShapeAngle();
if (iVar1 == 0) {
procPushMove_init();
} else if (iVar1 == 1) {
procPullMove_init();
}
} else {
setTextureAnime(mAnmDataTable[ANM_WAITPUSHPULL].mTexAnmIdx, 0);
}
}
} else {
checkNextMode(0);
}
return true;
}
/* 8015198C-80151A1C .text procPushMove_init__9daPy_lk_cFv */
BOOL daPy_lk_c::procPushMove_init() {
/* Nonmatching */
if (!setPushPullKeepData(dBgW::PP_UNK0_e)) {
return false;
} else {
commonProcInit(daPyProc_PUSH_MOVE_e);
setSingleMoveAnime(ANM_WALKPUSH, daPy_HIO_pushpull_c0::m.field_0x8,
0.0f, -1, daPy_HIO_pushpull_c0::m.field_0xC);
m3570 = 1;
dComIfGp_setPlayerStatus0(0, daPyStts0_UNK4000000_e);
}
return true;
}
/* 80151A1C-80151B38 .text procPushMove__9daPy_lk_cFv */
BOOL daPy_lk_c::procPushMove() {
/* Nonmatching */
dComIfGp_setRStatus(0x11);
int iVar1 = getDirectionFromShapeAngle();
setFrontWallType();
if ((!checkResetFlg0(daPyRFlg0_UNK8)) ||
((!spActionButton() && (!checkNoResetFlg0(daPyFlg0_PUSH_PULL_KEEP))))) {
checkNextMode(0);
} else {
if (!checkNoResetFlg0(daPyFlg0_PUSH_PULL_KEEP)) {
if (mStickDistance > 0.05f) {
if (iVar1 == 0) {
setPushPullKeepData(dBgW::PP_UNK1_e);
return true;
}
if (iVar1 == 1) {
return procPullMove_init();
}
}
return procPushPullWait_init(0);
}
if (m3570 != 0) {
voiceStart(19);
}
m3570 = 0;
setPushPullKeepData(dBgW::PP_UNK1_e);
}
return true;
}
/* 80151B38-80151BC8 .text procPullMove_init__9daPy_lk_cFv */
BOOL daPy_lk_c::procPullMove_init() {
/* Nonmatching */
if (!setPushPullKeepData(dBgW::PP_UNK0_e)) {
return false;
} else {
commonProcInit(daPyProc_PULL_MOVE_e);
setSingleMoveAnime(ANM_WALKPULL, daPy_HIO_pushpull_c0::m.field_0x10,
0.0f, -1, daPy_HIO_pushpull_c0::m.field_0x14);
m3570 = 1;
dComIfGp_setPlayerStatus0(0, daPyStts0_UNK4000000_e);
}
return true;
}
/* 80151BC8-80151E40 .text procPullMove__9daPy_lk_cFv */
BOOL daPy_lk_c::procPullMove() {
/* Nonmatching */
/* Nonmatching - floats */
dComIfGp_setRStatus(0x11);
int iVar1 = getDirectionFromShapeAngle();
setFrontWallType();
if ((!checkResetFlg0(daPyRFlg0_UNK8)) ||
((!spActionButton() && (!checkNoResetFlg0(daPyFlg0_PUSH_PULL_KEEP))))) {
checkNextMode(0);
} else {
if (!checkNoResetFlg0(daPyFlg0_PUSH_PULL_KEEP)) {
if (mStickDistance > 0.05f) {
if (iVar1 == 1) {
f32 dVar4 = cM_ssin(shape_angle.y);
f32 dVar5 = cM_scos(shape_angle.y);
cXyz local_3c;
cXyz local_48;
local_3c.x = current.pos.x;
local_3c.y = current.pos.y + 30.1f;
local_3c.z = current.pos.z;
local_48.x = local_3c.x - (dVar4 * 105.0f);
local_48.y = local_3c.y;
local_48.z = local_3c.z - (dVar5 * 105.0f);
mLinkLinChk.Set(&local_3c, &local_48, this);
if (dComIfG_Bgsp()->LineCross(&mLinkLinChk)) {
return true;
}
local_3c.y = current.pos.y + 89.9f;
local_48.y = local_3c.y;
mLinkLinChk.Set(&local_3c, &local_48, this);
if (dComIfG_Bgsp()->LineCross(&mLinkLinChk)) {
return true;
}
local_48.x += (dVar4 * 29.0f);
local_48.z += (dVar5 * 29.0f);
mGndChk.SetPos(&local_48);
dVar4 = dComIfG_Bgsp()->GroundCross(&mGndChk);
if (!((dVar4 - current.pos.y) < -30.1f)) {
setPushPullKeepData(dBgW::PP_UNK2_e);
}
return true;
}
if (iVar1 == 0) {
return procPushMove_init();
}
}
return procPushPullWait_init(0);
}
if (m3570 == 1) {
voiceStart(19);
}
m3570 = 0;
setPushPullKeepData(dBgW::PP_UNK2_e);
}
return true;
}