mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-11 11:32:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Document some player_main var names

Browse Source
This commit is contained in:
LagoLunatic
2024-06-07 13:54:03 -04:00
parent f8f84a2ac8
commit 17e4446179
3 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_player_HIO.h
+2 -2
View File
@@ -1460,9 +1460,9 @@ public:
class daPy_HIO_tact_c1 {
public:
/* 0x00 */ f32 field_0x0;
/* 0x00 */ f32 mAnmRate;
/* 0x04 */ f32 field_0x4;
/* 0x08 */ f32 field_0x8;
/* 0x08 */ f32 mRightArmAnmRate;
/* 0x0C */ f32 field_0xC;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ f32 field_0x14;
src/d/actor/d_a_player_main.cpp
+47 -47
View File
@@ -1746,7 +1746,7 @@ BOOL daPy_lk_c::changeDamageProc() {
BOOL r30;
int damage;
s32 r28 = dBgS_Attr_NORMAL_e;
s32 attribCode = dBgS_Attr_NORMAL_e;
if (checkNoResetFlg1(daPyFlg1_UNK4) || (
mAcch.ChkGroundHit() &&
@@ -1767,15 +1767,15 @@ BOOL daPy_lk_c::changeDamageProc() {
mCurrAttributeCode == dBgS_Attr_DAMAGE_e ||
mCurrAttributeCode == dBgS_Attr_ELECTRICITY_e
)) {
r28 = mCurrAttributeCode;
attribCode = mCurrAttributeCode;
} else {
for (int i = 0; r28 == dBgS_Attr_NORMAL_e && i < (s32)ARRAY_SIZE(mAcchCir); i++) {
r28 = checkWallAtributeDamage(&mAcchCir[i]);
for (int i = 0; attribCode == dBgS_Attr_NORMAL_e && i < (s32)ARRAY_SIZE(mAcchCir); i++) {
attribCode = checkWallAtributeDamage(&mAcchCir[i]);
}
}
}
if (r28 != dBgS_Attr_NORMAL_e) {
if (attribCode != dBgS_Attr_NORMAL_e) {
r30 = TRUE;
damage = 1;
} else {
@@ -1786,20 +1786,20 @@ BOOL daPy_lk_c::changeDamageProc() {
}
}
dCcG_At_Spl r27;
dCcG_At_Spl spl;
if (mCyl.ChkTgHit()) {
dCcD_GObjInf* gobj = mCyl.GetTgHitGObj();
if (gobj) {
r27 = gobj->GetAtSpl();
spl = gobj->GetAtSpl();
} else {
r27 = mStts.GetAtSpl();
spl = mStts.GetAtSpl();
}
} else {
r27 = dCcG_At_Spl_UNK0;
spl = dCcG_At_Spl_UNK0;
}
if (checkModeFlg(ModeFlg_04000000)) {
if (r30 || mCyl.ChkTgHit() && !checkSuccessGuard(r27)) {
if (r30 || mCyl.ChkTgHit() && !checkSuccessGuard(spl)) {
setDamagePoint(-damage);
mDamageWaitTimer = daPy_HIO_dam_c0::m.field_0x2;
@@ -1807,9 +1807,9 @@ BOOL daPy_lk_c::changeDamageProc() {
seStartOnlyReverb(JA_SE_LK_DAMAGE_NORMAL);
changePlayer(this);
if (mCyl.ChkTgHit() && !checkSuccessGuard(r27)) {
if (mCyl.ChkTgHit() && !checkSuccessGuard(spl)) {
setDamageEmitter();
} else if (r28 == dBgS_Attr_ELECTRICITY_e) {
} else if (attribCode == dBgS_Attr_ELECTRICITY_e) {
setDamageElecEmitter();
}
if (daPy_dmEcallBack_c::checkElec()) {
@@ -1853,7 +1853,7 @@ BOOL daPy_lk_c::changeDamageProc() {
freeRopeItem();
freeHookshotItem();
if (!checkSuccessGuard(r27)) {
if (!checkSuccessGuard(spl)) {
if (mEquipItem == daPyItem_BOKO_e) {
deleteEquipItem(FALSE);
}
@@ -1874,17 +1874,17 @@ BOOL daPy_lk_c::changeDamageProc() {
if (checkGrabWear() &&
mCyl.GetTgHitAc() && fopAcM_GetName(mCyl.GetTgHitAc()) == PROC_NZ &&
grabActor)
{
cXyz* r3 = getDamageVec(&mCyl);
grabActor->shape_angle.y = cM_atan2s(r3->x, r3->z);
grabActor
) {
cXyz* damageVec = getDamageVec(&mCyl);
grabActor->shape_angle.y = cM_atan2s(damageVec->x, damageVec->z);
grabActor->shape_angle.x = 0x2000;
return procLargeDamage_init(-4, 1, 0, 0);
}
if (r27 == 7 || r27 == 2 || r27 == 10) {
if (spl == 7 || spl == 2 || spl == 10) {
return procLargeDamage_init(-6, 0, 0, 0);
}
if (daPy_lk_c::checkPlayerFly() || r27 == 6 || r27 == 1 || r27 == 9) {
if (daPy_lk_c::checkPlayerFly() || spl == 6 || spl == 1 || spl == 9) {
return procLargeDamage_init(-1, 1, 0, 0);
}
if (checkNormalDamage(damage)) {
@@ -1916,7 +1916,7 @@ BOOL daPy_lk_c::changeDamageProc() {
}
setDamagePoint(-damage);
if (r28 == dBgS_Attr_ELECTRICITY_e) {
if (attribCode == dBgS_Attr_ELECTRICITY_e) {
setDamageElecEmitter();
if (procElecDamage_init(NULL)) {
return TRUE;
@@ -2951,13 +2951,13 @@ u32 daPy_lk_c::setParamData(int roomNo, int spawnType, int eventInfoIdx, int ext
}
/* 8012010C-8012024C .text checkLavaFace__9daPy_lk_cFP4cXyzi */
BOOL daPy_lk_c::checkLavaFace(cXyz* param_1, int attributeCode) {
BOOL daPy_lk_c::checkLavaFace(cXyz* oldPos, int attributeCode) {
if (mDemo.getDemoType() == 5) {
return FALSE;
}
if (param_1) {
cXyz pos(current.pos.x, param_1->y + 20.0f, current.pos.z);
if (oldPos != NULL) {
cXyz pos(current.pos.x, oldPos->y + 20.0f, current.pos.z);
mLavaGndChk.SetPos(&pos);
m35D4 = dComIfG_Bgsp()->GroundCross(&mLavaGndChk);
if (mAcch.GetGroundH() > m35D4) {
@@ -2971,7 +2971,7 @@ BOOL daPy_lk_c::checkLavaFace(cXyz* param_1, int attributeCode) {
}
if (attributeCode == dBgS_Attr_LAVA_e) {
if (param_1) {
if (oldPos != NULL) {
current.pos.y = m35D4;
}
if (checkBossGomaStage()) {
@@ -2992,7 +2992,7 @@ void daPy_lk_c::checkFallCode() {
}
/* 80120724-80120BBC .text startRestartRoom__9daPy_lk_cFUlifi */
BOOL daPy_lk_c::startRestartRoom(u32 param_1, int eventInfoIdx, f32 param_3, int i_point) {
BOOL daPy_lk_c::startRestartRoom(u32 mode, int eventInfoIdx, f32 param_3, int i_point) {
if (!checkNoResetFlg0(daPyFlg0_UNK4000) && (i_point != 0 || dComIfGp_event_compulsory(this))) {
mDemo.setOriginalDemoType();
if (i_point == 0) {
@@ -3015,7 +3015,7 @@ BOOL daPy_lk_c::startRestartRoom(u32 param_1, int eventInfoIdx, f32 param_3, int
if (stageType == dStageType_SEA_e && !dComIfGs_isEventBit(dSv_evtBit_c::RODE_KORL) &&
(current.roomNo == 11 || current.roomNo == 44) && dStage_chkPlayerId(0x80, current.roomNo))
{
dComIfGp_setNextStage(dComIfGp_getStartStageName(), 0x80, current.roomNo, -1, 0.0f, param_1);
dComIfGp_setNextStage(dComIfGp_getStartStageName(), 0x80, current.roomNo, -1, 0.0f, mode);
u32 roomParam = setParamData(-1, 0, eventInfoIdx, 0);
dComIfGs_setRestartRoomParam(roomParam);
mDoAud_seStart(JA_SE_FORCE_BACK);
@@ -3060,22 +3060,22 @@ BOOL daPy_lk_c::startRestartRoom(u32 param_1, int eventInfoIdx, f32 param_3, int
int sector_num = sector_z*7 + sector_x;
int scls_idx = subsector_x + (sector_num << 2) + (subsector_z << 1);
dStage_changeScene(scls_idx, 0.0f, param_1, -1);
dStage_changeScene(scls_idx, 0.0f, mode, -1);
} else {
if (mCurProc == daPyProc_DEMO_DEAD_e) {
dStage_changeScene(0, 0.0f, param_1, -1);
dStage_changeScene(0, 0.0f, mode, -1);
} else {
int roomNo = dComIfGs_getRestartRoomNo();
u32 roomParam = setParamData(roomNo, 0, eventInfoIdx, 0);
dStage_restartRoom(roomParam, param_1);
dStage_restartRoom(roomParam, mode);
mDoAud_seStart(JA_SE_FORCE_BACK);
}
return TRUE;
}
} else if (checkNoResetFlg0(daPyFlg0_DEKU_SP_RETURN_FLG)) {
dComIfGp_setNextStage(dComIfGp_getStartStageName(), i_point, 41, -1, 0.0f, param_1);
dComIfGp_setNextStage(dComIfGp_getStartStageName(), i_point, 41, -1, 0.0f, mode);
} else {
dComIfGp_setNextStage(dComIfGp_getStartStageName(), i_point, current.roomNo, -1, 0.0f, param_1);
dComIfGp_setNextStage(dComIfGp_getStartStageName(), i_point, current.roomNo, -1, 0.0f, mode);
}
if (mCurProc != daPyProc_DEMO_DEAD_e) {
@@ -3219,7 +3219,7 @@ BOOL daPy_lk_c::execute() {
dComIfG_Bgsp()->MoveBgCrrPos(mAcch.m_gnd, mAcch.ChkGroundHit(), &old.pos, NULL, NULL);
}
cXyz sp20 = old.pos;
cXyz oldPos = old.pos;
m34DE = shape_angle.y;
m35B4 = m35B0;
m34EA = m34DC;
@@ -3347,7 +3347,7 @@ BOOL daPy_lk_c::execute() {
mAcch.CrrPos(*dComIfG_Bgsp());
setWaterY();
autoGroundHit();
checkLavaFace(&sp20, dBgS_Attr_NORMAL_e);
checkLavaFace(&oldPos, dBgS_Attr_NORMAL_e);
if (checkModeFlg(ModeFlg_SWIM)) {
if (checkNoResetFlg0(daPyFlg0_UNK100) && !checkSwimFallCheck()) {
@@ -4465,18 +4465,18 @@ BOOL daPy_lk_c::setSingleMoveAnime(daPy_ANM anm, f32 rate, f32 start, s16 end, f
}
/* 80128494-801285F8 .text setActAnimeUpper__9daPy_lk_cFUsQ29daPy_lk_c10daPy_UPPERffsf */
BOOL daPy_lk_c::setActAnimeUpper(u16 r4, daPy_UPPER r29, f32 f28, f32 f29, s16 r30, f32 f30) {
J3DAnmTransform* r31 = getAnimeResource(&m_anm_heap_upper[r29], r4, 0x2400);
BOOL daPy_lk_c::setActAnimeUpper(u16 bckIdx, daPy_UPPER upperIdx, f32 rate, f32 start, s16 end, f32 f30) {
J3DAnmTransform* bck = getAnimeResource(&m_anm_heap_upper[upperIdx], bckIdx, 0x2400);
resetPriTextureAnime();
mAnmRatioUpper[r29].setAnmTransform(r31);
mAnmRatioUpper[r29].setRatio(1.0f);
if (r30 < 0) {
r30 = r31->getFrameMax();
mAnmRatioUpper[upperIdx].setAnmTransform(bck);
mAnmRatioUpper[upperIdx].setRatio(1.0f);
if (end < 0) {
end = bck->getFrameMax();
}
f32 f31 = f28 < 0.0f ? r30 - 0.001f : f29;
setFrameCtrl(&mFrameCtrlUpper[r29], r31->getAttribute(), f29, r30, f28, f31);
r31->setFrame(f31);
f32 frame = rate < 0.0f ? end - 0.001f : start;
setFrameCtrl(&mFrameCtrlUpper[upperIdx], bck->getAttribute(), start, end, rate, frame);
bck->setFrame(frame);
if (f30 >= 0.0f) {
m_old_fdata->initOldFrameMorf(f30, 2, 0x1D);
@@ -4486,15 +4486,15 @@ BOOL daPy_lk_c::setActAnimeUpper(u16 r4, daPy_UPPER r29, f32 f28, f32 f29, s16 r
}
/* 801285F8-801286C0 .text resetActAnimeUpper__9daPy_lk_cFQ29daPy_lk_c10daPy_UPPERf */
BOOL daPy_lk_c::resetActAnimeUpper(daPy_UPPER r4, f32 f31) {
BOOL daPy_lk_c::resetActAnimeUpper(daPy_UPPER upperIdx, f32 f31) {
if (checkDashDamageAnime()) {
mDamageWaitTimer = daPy_HIO_dam_c0::m.field_0x0;
}
mAnmRatioUpper[r4].setAnmTransform(NULL);
mAnmRatioUpper[r4].setRatio(0.0f);
m_anm_heap_upper[r4].mIdx = -1;
mFrameCtrlUpper[r4].init(0);
mAnmRatioUpper[upperIdx].setAnmTransform(NULL);
mAnmRatioUpper[upperIdx].setRatio(0.0f);
m_anm_heap_upper[upperIdx].mIdx = -1;
mFrameCtrlUpper[upperIdx].init(0);
if (f31 >= 0.0f) {
m_old_fdata->initOldFrameMorf(f31, 2, 0x1D);
}
src/d/actor/d_a_player_tact.inc
+33 -33
View File
@@ -253,10 +253,10 @@ BOOL daPy_lk_c::procTactWait_init(int r30) {
commonProcInit(daPyProc_TACT_WAIT_e);
daPy_matAnm_c::offMabaFlg();
daPy_matAnm_c::setMabaTimer(1);
setSingleMoveAnime(ANM_WAITTAKT, daPy_HIO_tact_c0::m.field_0x0, 0.0f, -1, daPy_HIO_tact_c0::m.field_0x4);
setActAnimeUpper(LKANM_BCK_WAITTAKT, UPPER_MOVE1_e, daPy_HIO_tact_c0::m.field_0x0, 0.0f, -1, -1.0f);
setSingleMoveAnime(ANM_WAITTAKT, daPy_HIO_tact_c0::m.mAnmRate, 0.0f, -1, daPy_HIO_tact_c0::m.field_0x4);
setActAnimeUpper(LKANM_BCK_WAITTAKT, UPPER_MOVE1_e, daPy_HIO_tact_c0::m.mAnmRate, 0.0f, -1, -1.0f);
mAnmRatioUpper[UPPER_MOVE1_e].setRatio(0.0f);
setActAnimeUpper(LKANM_BCK_WAITTAKT, UPPER_MOVE2_e, daPy_HIO_tact_c0::m.field_0x0, 0.0f, -1, -1.0f);
setActAnimeUpper(LKANM_BCK_WAITTAKT, UPPER_MOVE2_e, daPy_HIO_tact_c0::m.mAnmRate, 0.0f, -1, -1.0f);
mAnmRatioUpper[UPPER_MOVE2_e].setRatio(0.0f);
mVelocity = 0.0f;
m34D4 = 0;
@@ -362,37 +362,37 @@ BOOL daPy_lk_c::procTactWait() {
return TRUE;
}
int r31, r30;
int rightDir, leftDir;
if (m3570 != -5) {
r31 = mDoAud_getTactDirection(1, m34D4);
r30 = mDoAud_getTactDirection(0, m34D6);
rightDir = mDoAud_getTactDirection(1, m34D4);
leftDir = mDoAud_getTactDirection(0, m34D6);
mDoAud_tact_setVolume(m35B0 * cM_scos(m34DC));
} else {
r31 = m34D4;
r30 = m34D6;
rightDir = m34D4;
leftDir = m34D6;
}
m35A0 += 1.0f;
if (r31 != m34D4) {
if (m35A4 <= 0.0f || r31 != 0) {
setActAnimeUpper(getTactPlayRightArmAnm(r31), UPPER_MOVE1_e, daPy_HIO_tact_c0::m.field_0x8, 0.0f, -1, daPy_HIO_tact_c0::m.field_0xC);
if (rightDir != m34D4) {
if (m35A4 <= 0.0f || rightDir != 0) {
setActAnimeUpper(getTactPlayRightArmAnm(rightDir), UPPER_MOVE1_e, daPy_HIO_tact_c0::m.mRightArmAnmRate, 0.0f, -1, daPy_HIO_tact_c0::m.field_0xC);
if (r31 == 0 || r31 == 2 || r31 == 4) {
mFrameCtrlUpper[UPPER_MOVE1_e].setRate(daPy_HIO_tact_c0::m.field_0x0);
if (rightDir == 0 || rightDir == 2 || rightDir == 4) {
mFrameCtrlUpper[UPPER_MOVE1_e].setRate(daPy_HIO_tact_c0::m.mAnmRate);
mFrameCtrlUpper[UPPER_MOVE1_e].setFrame(mFrameCtrlUnder[UNDER_MOVE0_e].getFrame());
}
if (m34D4 == 4 || m34D4 == 2 || r31 == 4 || r31 == 2) {
if (m34D4 == 4 || m34D4 == 2 || rightDir == 4 || rightDir == 2) {
mDoAud_tact_reset();
mDoAud_tact_setBeat(r31);
mDoAud_tact_setBeat(rightDir);
m35A0 = 0.0f;
m34DA = 0;
m_old_fdata->initOldFrameMorf(5.0f, 0, 0x2A);
m3624 = 0;
m34D0 = -1;
}
m34D4 = r31;
m34D4 = rightDir;
mAnmRatioUpper[UPPER_MOVE1_e].setRatio(0.0f);
if (m34D4 != 0) {
@@ -405,20 +405,20 @@ BOOL daPy_lk_c::procTactWait() {
m35A4 = 2.0f;
}
if (r30 != m34D6) {
if (m35A8 <= 0.0f || r30 != 0) {
f32 f31;
if (leftDir != m34D6) {
if (m35A8 <= 0.0f || leftDir != 0) {
f32 rate;
if (m34D4 == 4) {
f31 = daPy_HIO_tact_c0::m.field_0x14;
rate = daPy_HIO_tact_c0::m.field_0x14;
} else if (m34D4 == 2) {
f31 = daPy_HIO_tact_c0::m.field_0x18;
rate = daPy_HIO_tact_c0::m.field_0x18;
} else {
f31 = daPy_HIO_tact_c0::m.field_0x10;
rate = daPy_HIO_tact_c0::m.field_0x10;
}
setActAnimeUpper(getTactPlayLeftArmAnm(r30), UPPER_MOVE2_e, f31, 0.0f, -1, daPy_HIO_tact_c0::m.field_0xC);
m34D6 = r30;
setActAnimeUpper(getTactPlayLeftArmAnm(leftDir), UPPER_MOVE2_e, rate, 0.0f, -1, daPy_HIO_tact_c0::m.field_0xC);
m34D6 = leftDir;
mAnmRatioUpper[UPPER_MOVE2_e].setRatio(0.0f);
mDoAud_tact_armSoundPlay(r30);
mDoAud_tact_armSoundPlay(leftDir);
if (m34D6 != 0) {
m35A8 = 2.0f;
}
@@ -592,7 +592,7 @@ BOOL daPy_lk_c::procTactPlay() {
msg_class* msg_p = fopMsgM_SearchByID(m3628);
if (msg_p == NULL || msg_p->mStatus == fopMsgStts_BOX_CLOSED_e) {
fopAc_ac_c* r5 = NULL;
fopAc_ac_c* tactZevPartner = NULL;
g_dComIfG_gameInfo.play.field_0x4947 = 0;
if (msg_p != NULL) {
@@ -601,7 +601,7 @@ BOOL daPy_lk_c::procTactPlay() {
}
if (mTactZevPartnerPID != fpcM_ERROR_PROCESS_ID_e && m34CC == m3570) {
r5 = fopAcM_SearchByID(mTactZevPartnerPID);
tactZevPartner = fopAcM_SearchByID(mTactZevPartnerPID);
}
if (m3574 == 0) {
@@ -609,7 +609,7 @@ BOOL daPy_lk_c::procTactPlay() {
return TRUE;
}
if (r5 != NULL) {
if (tactZevPartner != NULL) {
if (m3494 == 0) {
resetActAnimeUpper(UPPER_MOVE2_e, -1.0f);
dComIfGp_event_reset();
@@ -658,7 +658,7 @@ BOOL daPy_lk_c::procTactPlay() {
m34D0 = 1;
mDoAud_tact_reset();
setSingleMoveAnime(ANM_WAITTAKT, daPy_HIO_tact_c0::m.field_0x0, 0.0f, -1, 10.0f);
setSingleMoveAnime(ANM_WAITTAKT, daPy_HIO_tact_c0::m.mAnmRate, 0.0f, -1, 10.0f);
setTextureAnime(6, 0);
onModeFlg(ModeFlg_00000100);
offModeFlg(ModeFlg_00000400);
@@ -778,7 +778,7 @@ BOOL daPy_lk_c::procTactPlayOriginal_init() {
m34D0 = 0;
daPy_matAnm_c::offMabaFlg();
daPy_matAnm_c::setMabaTimer(1);
setSingleMoveAnime(ANM_WAITTAKT, daPy_HIO_tact_c0::m.field_0x0, 0.0f, -1, daPy_HIO_tact_c0::m.field_0x4);
setSingleMoveAnime(ANM_WAITTAKT, daPy_HIO_tact_c0::m.mAnmRate, 0.0f, -1, daPy_HIO_tact_c0::m.field_0x4);
m3570 = dComIfGp_event_getTactFreeMStick(m34D0);
setActAnimeUpper(getTactPlayRightArmAnm(m3570), UPPER_MOVE1_e, 0.0f, 0.0f, -1, -1.0f);
@@ -818,15 +818,15 @@ BOOL daPy_lk_c::procTactPlayOriginal() {
m34D6 = 0xF;
m3570 = dComIfGp_event_getTactFreeMStick(m34D0);
setActAnimeUpper(getTactPlayRightArmAnm(m3570), UPPER_MOVE1_e, daPy_HIO_tact_c0::m.field_0x8, 0.0f, -1, 5.0f);
setActAnimeUpper(getTactPlayRightArmAnm(m3570), UPPER_MOVE1_e, daPy_HIO_tact_c0::m.mRightArmAnmRate, 0.0f, -1, 5.0f);
mAnmRatioUpper[UPPER_MOVE1_e].setRatio(0.0f);
if (m3570 == 0 || m3570 == 2 || m3570 == 4) {
mFrameCtrlUpper[UPPER_MOVE1_e].setRate(daPy_HIO_tact_c0::m.field_0x0);
mFrameCtrlUpper[UPPER_MOVE1_e].setRate(daPy_HIO_tact_c0::m.mAnmRate);
mFrameCtrlUpper[UPPER_MOVE1_e].setFrame(mFrameCtrlUnder[UNDER_MOVE0_e].getFrame());
}
m3574 = dComIfGp_event_getTactFreeCStick(m34D0);
setActAnimeUpper(getTactPlayLeftArmAnm(m3574), UPPER_MOVE2_e, daPy_HIO_tact_c0::m.field_0x0, 0.0f, -1, 5.0f);
setActAnimeUpper(getTactPlayLeftArmAnm(m3574), UPPER_MOVE2_e, daPy_HIO_tact_c0::m.mAnmRate, 0.0f, -1, 5.0f);
mAnmRatioUpper[UPPER_MOVE2_e].setRatio(0.0f);
mFrameCtrlUpper[UPPER_MOVE2_e].setFrame(mFrameCtrlUnder[UNDER_MOVE0_e].getFrame());