mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-10 23:22:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_horse mostly done (#2284)

Browse Source 
* checkpoint

* d_a_horse mostly done

* some horse doc
This commit is contained in:
TakaRikka
2025-01-09 05:45:46 -08:00
committed by GitHub
parent 0cdacf4bff
commit 36daa25884
37 changed files with 5151 additions and 3078 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_alink.cpp
+7 -7
View File
@@ -13046,9 +13046,9 @@ BOOL daAlink_c::checkItemAction() {
if (mEquipItem == 0x103) {
daPy_frameCtrl_c* frame_ctrl = &mUpperFrameCtrl[2];
if ((checkUpperAnime(0x80) && frame_ctrl->getFrame() <= daAlinkHIO_cutDaL_c0::m.mCutAnm.mCheckFrame) ||
(checkUpperAnime(0x81) && frame_ctrl->getFrame() <= daAlinkHIO_cutDaR_c0::m.mCutAnm.mCheckFrame) ||
(checkUpperAnime(0x82) && frame_ctrl->getFrame() <= daAlinkHIO_cutDaCharge_c0::m.mCutAnm.mCheckFrame) ||
if ((checkUpperAnime(0x80) && frame_ctrl->getFrame() <= daAlinkHIO_cutDaL_c0::m.mCutAnm.mCancelFrame) ||
(checkUpperAnime(0x81) && frame_ctrl->getFrame() <= daAlinkHIO_cutDaR_c0::m.mCutAnm.mCancelFrame) ||
(checkUpperAnime(0x82) && frame_ctrl->getFrame() <= daAlinkHIO_cutDaCharge_c0::m.mCutAnm.mCancelFrame) ||
checkModeFlg(0x40000))
{
return false;
@@ -13791,25 +13791,25 @@ void daAlink_c::setItemAction() {
setCopyRodControllUpperSpeedRate();
}
} else if (checkBoomerangCatchAnime()) {
if (checkAnmEnd(frame_ctrl) || (checkInputOnR() && frame_ctrl->getFrame() > daAlinkHIO_boom_c0::m.mCatchAnm.mCheckFrame)) {
if (checkAnmEnd(frame_ctrl) || (checkInputOnR() && frame_ctrl->getFrame() > daAlinkHIO_boom_c0::m.mCatchAnm.mCancelFrame)) {
resetUpperAnime(UPPER_2, 3.0f);
} else if (frame_ctrl->getFrame() >= 20.0f) {
field_0x2f97 = 6;
}
} else if (checkBoomerangThrowAnime()) {
if (checkAnmEnd(frame_ctrl) || (checkInputOnR() && frame_ctrl->getFrame() > daAlinkHIO_boom_c0::m.mThrowAnm.mCheckFrame)) {
if (checkAnmEnd(frame_ctrl) || (checkInputOnR() && frame_ctrl->getFrame() > daAlinkHIO_boom_c0::m.mThrowAnm.mCancelFrame)) {
resetUpperAnime(UPPER_2, 3.0f);
} else if (frame_ctrl->checkPass(5.5f)) {
throwBoomerang();
}
} else if (checkCopyRodThrowAnime()) {
if (checkAnmEnd(frame_ctrl) || (checkInputOnR() && frame_ctrl->getFrame() > daAlinkHIO_boom_c0::m.mThrowAnm.mCheckFrame)) {
if (checkAnmEnd(frame_ctrl) || (checkInputOnR() && frame_ctrl->getFrame() > daAlinkHIO_boom_c0::m.mThrowAnm.mCancelFrame)) {
resetUpperAnime(UPPER_2, 3.0f);
} else if (frame_ctrl->checkPass(6.5f)) {
throwCopyRod();
}
} else if (checkKandelaarSwingAnime()) {
if (checkAnmEnd(frame_ctrl) || (checkInputOnR() && frame_ctrl->getFrame() > daAlinkHIO_kandelaar_c0::m.mShakeAnm.mCheckFrame)) {
if (checkAnmEnd(frame_ctrl) || (checkInputOnR() && frame_ctrl->getFrame() > daAlinkHIO_kandelaar_c0::m.mShakeAnm.mCancelFrame)) {
resetUpperAnime(UPPER_2, 3.0f);
}
} else if (checkEquipAnime()) {
src/d/actor/d_a_alink_boom.inc
+2 -2
View File
@@ -313,7 +313,7 @@ void daAlink_c::checkUpperItemActionBoomerangFly() {
/* 800E0BE4-800E0D8C 0DB524 01A8+00 4/4 0/0 0/0 .text checkNextActionBoomerang__9daAlink_cFv */
int daAlink_c::checkNextActionBoomerang() {
if ((checkBoomerangCatchAnime() &&
mUpperFrameCtrl[2].getFrame() <= daAlinkHIO_boom_c0::m.mCatchAnm.mCheckFrame) ||
mUpperFrameCtrl[2].getFrame() <= daAlinkHIO_boom_c0::m.mCatchAnm.mCancelFrame) ||
checkNoResetFlg1(FLG1_UNK_2)) {
return 0;
}
@@ -495,7 +495,7 @@ int daAlink_c::procBoomerangCatch() {
daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
onEndResetFlg0(ERFLG0_UNK_8000000);
if (frameCtrl->getFrame() > daAlinkHIO_boom_c0::m.mCatchAnm.mCheckFrame) {
if (frameCtrl->getFrame() > daAlinkHIO_boom_c0::m.mCatchAnm.mCancelFrame) {
onModeFlg(4);
}
src/d/actor/d_a_alink_bottle.inc
+3 -3
View File
@@ -604,7 +604,7 @@ int daAlink_c::procBottleSwingInit(fopAc_ac_c* param_0, int param_1) {
}
}
field_0x3478 = daAlinkHIO_bottle_c0::m.mScoopAnm.mCheckFrame;
field_0x3478 = daAlinkHIO_bottle_c0::m.mScoopAnm.mCancelFrame;
field_0x347c = 14.0f;
if (var_r31 != NULL) {
@@ -620,11 +620,11 @@ int daAlink_c::procBottleSwingInit(fopAc_ac_c* param_0, int param_1) {
}
} else if (temp_r3) {
setSingleAnimeParam(ANM_BOTTLE_SWING_DOWN, &daAlinkHIO_bottle_c0::m.mSwingDownAnm);
field_0x3478 = daAlinkHIO_bottle_c0::m.mSwingDownAnm.mCheckFrame;
field_0x3478 = daAlinkHIO_bottle_c0::m.mSwingDownAnm.mCancelFrame;
field_0x347c = 8.0f;
} else {
setSingleAnimeParam(ANM_BOTTLE_SWING, &daAlinkHIO_bottle_c0::m.mSwingSideAnm);
field_0x3478 = daAlinkHIO_bottle_c0::m.mSwingSideAnm.mCheckFrame;
field_0x3478 = daAlinkHIO_bottle_c0::m.mSwingSideAnm.mCancelFrame;
field_0x347c = 4.0f;
}
src/d/actor/d_a_alink_bow.inc
+1 -1
View File
@@ -424,7 +424,7 @@ BOOL daAlink_c::checkUpperItemActionBow() {
}
if (checkAnmEnd(&mUpperFrameCtrl[2]) ||
(mUpperFrameCtrl[2].getFrame() > daAlinkHIO_bow_c0::m.mShootAnm.mCheckFrame &&
(mUpperFrameCtrl[2].getFrame() > daAlinkHIO_bow_c0::m.mShootAnm.mCancelFrame &&
itemButton()))
{
setBowReadyAnime();
src/d/actor/d_a_alink_copyrod.inc
+3 -3
View File
@@ -251,7 +251,7 @@ void daAlink_c::checkUpperItemActionCopyRodFly() {
/* 800E1C44-800E1D6C 0DC584 0128+00 2/2 0/0 0/0 .text checkNextActionCopyRod__9daAlink_cFv */
int daAlink_c::checkNextActionCopyRod() {
if ((checkBoomerangCatchAnime() &&
mUpperFrameCtrl[2].getFrame() <= daAlinkHIO_boom_c0::m.mCatchAnm.mCheckFrame) ||
mUpperFrameCtrl[2].getFrame() <= daAlinkHIO_boom_c0::m.mCatchAnm.mCancelFrame) ||
checkNoResetFlg1(FLG1_UNK_10000)) {
return 0;
}
@@ -386,13 +386,13 @@ int daAlink_c::procCopyRodSwingInit() {
setSingleAnimeParam(ANM_COPYROD_SWING_LARGE, &daAlinkHIO_copyRod_c0::m.mBigSwingAnm);
field_0x3478 = 13.0f;
field_0x347c = 21.0f;
field_0x3480 = daAlinkHIO_copyRod_c0::m.mBigSwingAnm.mCheckFrame;
field_0x3480 = daAlinkHIO_copyRod_c0::m.mBigSwingAnm.mCancelFrame;
field_0x3484 = 27.0f;
} else {
setSingleAnimeParam(ANM_COPYROD_SWING, &daAlinkHIO_copyRod_c0::m.mSwingAnm);
field_0x3478 = 4.0f;
field_0x347c = 8.0f;
field_0x3480 = daAlinkHIO_copyRod_c0::m.mSwingAnm.mCheckFrame;
field_0x3480 = daAlinkHIO_copyRod_c0::m.mSwingAnm.mCancelFrame;
field_0x3484 = 14.0f;
}
src/d/actor/d_a_alink_crawl.inc
+5 -5
View File
@@ -482,10 +482,10 @@ int daAlink_c::procCrawlStartInit() {
current.pos.x = field_0x34ec.x + (35.0f * cM_ssin(field_0x306e));
current.pos.z = field_0x34ec.z + (35.0f * cM_scos(field_0x306e));
if (daAlinkHIO_crouch_c0::m.mCrawlStartAnm.mCheckFrame > daAlinkHIO_crouch_c0::m.mCrawlStartAnm.mEndFrame) {
if (daAlinkHIO_crouch_c0::m.mCrawlStartAnm.mCancelFrame > daAlinkHIO_crouch_c0::m.mCrawlStartAnm.mEndFrame) {
field_0x347c = daAlinkHIO_crouch_c0::m.mCrawlStartAnm.mEndFrame;
} else {
field_0x347c = daAlinkHIO_crouch_c0::m.mCrawlStartAnm.mCheckFrame;
field_0x347c = daAlinkHIO_crouch_c0::m.mCrawlStartAnm.mCancelFrame;
}
field_0x3478 = 1.0f / (field_0x347c - daAlinkHIO_crouch_c0::m.mCrawlStartAnm.mStartFrame);
@@ -819,8 +819,8 @@ int daAlink_c::procCrawlEndInit(int param_0, s16 param_1, s16 param_2) {
shape_angle.x = param_1;
shape_angle.z = param_2;
if (temp_r30->mCheckFrame > temp_r30->mStartFrame) {
field_0x347c = temp_r30->mCheckFrame;
if (temp_r30->mCancelFrame > temp_r30->mStartFrame) {
field_0x347c = temp_r30->mCancelFrame;
} else {
field_0x347c = temp_r30->mStartFrame;
}
@@ -841,7 +841,7 @@ int daAlink_c::procCrawlEnd() {
if (!checkNextActionFromCrouch(0)) {
procWaitInit();
}
} else if (frame_ctrl->getFrame() < daAlinkHIO_crouch_c0::m.mCrawlEndAnm.mCheckFrame) {
} else if (frame_ctrl->getFrame() < daAlinkHIO_crouch_c0::m.mCrawlEndAnm.mCancelFrame) {
checkNextActionFromCrouch(1);
}
src/d/actor/d_a_alink_cut.inc
+10 -10
View File
@@ -846,7 +846,7 @@ int daAlink_c::procCutNormalInit(int i_type) {
field_0x3480 *= mHeavySpeedMultiplier;
}
field_0x3484 = cutData->mCutAnm.mCheckFrame;
field_0x3484 = cutData->mCutAnm.mCancelFrame;
f32 morf;
if (!checkZoraWearAbility() && checkNoResetFlg0(FLG0_UNDERWATER)) {
@@ -1045,7 +1045,7 @@ int daAlink_c::procCutFinishInit(int i_type) {
daAlinkHIO_cut_c0::m.mSwordLength, daAlinkHIO_cut_c0::m.mSwordRadius);
field_0x32d0 = Z2SE_AL_SWORD_SWING_S;
} else {
field_0x3484 = cutData->mCutAnm.mCheckFrame;
field_0x3484 = cutData->mCutAnm.mCancelFrame;
mProcVar0.field_0x3008 = cutData->mStopTime;
setSwordAtParam(dCcG_At_Spl_UNK_1, 3, cutParams->m_atSe, (var_r30 ? TRUE : FALSE) + 3,
daAlinkHIO_cut_c0::m.mSwordLength, daAlinkHIO_cut_c0::m.mSwordRadius);
@@ -1267,7 +1267,7 @@ int daAlink_c::procCutFinishJumpUpLandInit() {
field_0x3484 = daAlinkHIO_cutFnJU_c0::m.mComboCheckFrame;
mProcVar0.field_0x3008 = daAlinkHIO_cutFnJU_c0::m.mComboStopTime;
} else {
field_0x3484 = daAlinkHIO_cutFnJU_c0::m.mLandAnm.mCheckFrame;
field_0x3484 = daAlinkHIO_cutFnJU_c0::m.mLandAnm.mCancelFrame;
mProcVar0.field_0x3008 = daAlinkHIO_cutFnJU_c0::m.mStopTime;
}
@@ -1338,13 +1338,13 @@ int daAlink_c::procCutReverseInit(daAlink_c::daAlink_ANM i_anmID) {
if (i_anmID == ANM_SHIELD_ATTACK_RECOIL) {
setSingleAnimeParam(i_anmID, &daAlinkHIO_guard_c0::m.mRecoilAnm);
mProcVar2.field_0x300c = 1;
field_0x3478 = daAlinkHIO_guard_c0::m.mRecoilAnm.mCheckFrame;
field_0x3478 = daAlinkHIO_guard_c0::m.mRecoilAnm.mCancelFrame;
field_0x2f98 = 2;
setUpperGuardAnime(-1.0f);
} else {
setSingleAnimeParam(i_anmID, &daAlinkHIO_cut_c0::m.mRecoilAnm);
mProcVar2.field_0x300c = 0;
field_0x3478 = daAlinkHIO_cut_c0::m.mRecoilAnm.mCheckFrame;
field_0x3478 = daAlinkHIO_cut_c0::m.mRecoilAnm.mCancelFrame;
field_0x2f98 = 4;
}
@@ -1509,7 +1509,7 @@ int daAlink_c::procCutJumpLand() {
{
procCutTurnInit(1, field_0x3198);
} else {
if (frameCtrl->getFrame() > daAlinkHIO_cutJump_c0::m.mLandAnm.mCheckFrame) {
if (frameCtrl->getFrame() > daAlinkHIO_cutJump_c0::m.mLandAnm.mCancelFrame) {
onModeFlg(4);
if (checkNextAction(1)) {
@@ -1569,7 +1569,7 @@ int daAlink_c::procCutTurnInit(int param_0, int param_1) {
mProcVar1.field_0x300a = 8;
}
field_0x3480 = anm_data->mCheckFrame;
field_0x3480 = anm_data->mCancelFrame;
resetCombo(1);
f32 morf;
@@ -2065,7 +2065,7 @@ int daAlink_c::procCutDownLand() {
seStartSwordCut(Z2SE_SWORD_STICK_PULLOUT);
}
if (frameCtrl_p->getFrame() > daAlinkHIO_cutDown_c0::m.mMissAnm.mCheckFrame) {
if (frameCtrl_p->getFrame() > daAlinkHIO_cutDown_c0::m.mMissAnm.mCancelFrame) {
onModeFlg(4);
checkNextAction(1);
}
@@ -2186,7 +2186,7 @@ int daAlink_c::procCutHeadLand() {
} else {
checkNextAction(0);
}
} else if (frameCtrl->getFrame() > daAlinkHIO_cutHead_c0::m.mLandAnm.mCheckFrame) {
} else if (frameCtrl->getFrame() > daAlinkHIO_cutHead_c0::m.mLandAnm.mCancelFrame) {
checkNextAction(1);
}
@@ -2366,7 +2366,7 @@ int daAlink_c::procCutLargeJumpLand() {
field_0x3198 != 2)
{
procCutTurnInit(1, field_0x3198);
} else if (frameCtrl->getFrame() > daAlinkHIO_cutLargeJump_c0::m.mLandAnm.mCheckFrame) {
} else if (frameCtrl->getFrame() > daAlinkHIO_cutLargeJump_c0::m.mLandAnm.mCancelFrame) {
checkNextAction(1);
} else if (frameCtrl->getFrame() < daAlinkHIO_cutLargeJump_c0::m.mLandAttackEndFrame) {
onResetFlg0(RFLG0_UNK_2);
src/d/actor/d_a_alink_damage.inc
+15 -15
View File
@@ -852,16 +852,16 @@ int daAlink_c::procDamageInit(dCcD_GObjInf* param_0, int param_1) {
int direction = getDirectionFromAngle(cM_atan2s(-sp88.x, -sp88.z));
if (direction == DIR_FORWARD) {
setSingleAnimeParam(ANM_DMG_SMALL_A, &daAlinkHIO_damNormal_c0::m.field_0x0);
field_0x3478 = daAlinkHIO_damNormal_c0::m.field_0x0.mCheckFrame;
field_0x3478 = daAlinkHIO_damNormal_c0::m.field_0x0.mCancelFrame;
} else if (direction == DIR_BACKWARD) {
setSingleAnimeParam(ANM_DMG_SMALL_B, &daAlinkHIO_damNormal_c0::m.field_0x14);
field_0x3478 = daAlinkHIO_damNormal_c0::m.field_0x14.mCheckFrame;
field_0x3478 = daAlinkHIO_damNormal_c0::m.field_0x14.mCancelFrame;
} else if (direction == DIR_LEFT) {
setSingleAnimeParam(ANM_DMG_SMALL_LEFT, &daAlinkHIO_damNormal_c0::m.field_0x28);
field_0x3478 = daAlinkHIO_damNormal_c0::m.field_0x28.mCheckFrame;
field_0x3478 = daAlinkHIO_damNormal_c0::m.field_0x28.mCancelFrame;
} else {
setSingleAnimeParam(ANM_DMG_SMALL_RIGHT, &daAlinkHIO_damNormal_c0::m.field_0x3C);
field_0x3478 = daAlinkHIO_damNormal_c0::m.field_0x3C.mCheckFrame;
field_0x3478 = daAlinkHIO_damNormal_c0::m.field_0x3C.mCancelFrame;
}
current.angle.y = var_r29->atan2sX_Z();
@@ -1271,7 +1271,7 @@ int daAlink_c::procLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16
setSingleAnimeBase(ANM_DMG_FBW);
field_0x32cc = 0x88;
field_0x3478 = var_r30->field_0x14.mCheckFrame;
field_0x3478 = var_r30->field_0x14.mCancelFrame;
field_0x3480 = 39.0f;
field_0x3484 = 1000.0f;
} else if (param_0 < 0) {
@@ -1289,7 +1289,7 @@ int daAlink_c::procLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16
var_f31 = 1.0f;
mProcVar0.field_0x3008 = -1;
field_0x3478 = var_r30->field_0x0.mCheckFrame;
field_0x3478 = var_r30->field_0x0.mCancelFrame;
field_0x3480 = 39.0f;
field_0x2f9d = 4;
field_0x3484 = 18.0f;
@@ -1304,7 +1304,7 @@ int daAlink_c::procLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16
var_r28 = ANM_DMG_LARGE_LAND;
var_f29 = 9.0f;
var_r27 = -1;
field_0x3478 = var_r30->field_0x14.mCheckFrame;
field_0x3478 = var_r30->field_0x14.mCancelFrame;
if (param_0 == -5 && mDemo.getParam1() > 0) {
mProcVar0.field_0x3008 = mDemo.getParam1();
@@ -1333,26 +1333,26 @@ int daAlink_c::procLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16
if (param_0 == 0x84) {
setSingleAnimeParam(ANM_DMG_LARGE_LAND, &var_r30->field_0x14);
field_0x3478 = var_r30->field_0x14.mCheckFrame;
field_0x3478 = var_r30->field_0x14.mCancelFrame;
mProcVar1.field_0x300a = 1;
field_0x3480 = 39.0f;
field_0x32cc = 0x88;
field_0x3484 = 9.0f;
} else if (param_0 == 0x85) {
setSingleAnimeParam(ANM_DMG_AIR_LEFT_LAND, &var_r30->field_0x28);
field_0x3478 = var_r30->field_0x28.mCheckFrame;
field_0x3478 = var_r30->field_0x28.mCancelFrame;
field_0x3480 = 29.0f;
field_0x32cc = 0x89;
field_0x3484 = 6.0f;
} else if (param_0 == 0x86) {
setSingleAnimeParam(ANM_DMG_AIR_RIGHT_LAND, &var_r30->field_0x3C);
field_0x3478 = var_r30->field_0x3C.mCheckFrame;
field_0x3478 = var_r30->field_0x3C.mCancelFrame;
field_0x3480 = 29.0f;
field_0x32cc = 0x8A;
field_0x3484 = 6.0f;
} else {
setSingleAnimeParam(ANM_DMG_AIR_LAND, &var_r30->field_0x0);
field_0x3478 = var_r30->field_0x0.mCheckFrame;
field_0x3478 = var_r30->field_0x0.mCancelFrame;
field_0x3480 = 39.0f;
field_0x32cc = 0x87;
field_0x3484 = 18.0f;
@@ -1547,10 +1547,10 @@ int daAlink_c::procCoPolyDamageInit() {
if (checkWolf()) {
setSingleAnimeWolfParam(WANM_DMG_SMALL, &daAlinkHIO_wlDamage_c0::m.field_0x14);
voiceStart(Z2SE_WL_V_DAMAGE);
field_0x3478 = daAlinkHIO_wlDamage_c0::m.field_0x14.mCheckFrame;
field_0x3478 = daAlinkHIO_wlDamage_c0::m.field_0x14.mCancelFrame;
} else {
setSingleAnimeParam(ANM_DMG, &daAlinkHIO_damage_c0::m.mFloorDmgAnm);
field_0x3478 = daAlinkHIO_damage_c0::m.mFloorDmgAnm.mCheckFrame;
field_0x3478 = daAlinkHIO_damage_c0::m.mFloorDmgAnm.mCancelFrame;
}
mNormalSpeed = 0.0f;
@@ -1627,7 +1627,7 @@ int daAlink_c::procLandDamage() {
if (field_0x3198 != 0) {
if (frameCtrl->checkAnmEnd()) {
checkNextAction(0);
} else if (frameCtrl->getFrame() > daAlinkHIO_damFall_c0::m.mStandAnm.mCheckFrame) {
} else if (frameCtrl->getFrame() > daAlinkHIO_damFall_c0::m.mStandAnm.mCancelFrame) {
onModeFlg(4);
checkNextAction(1);
}
@@ -1786,7 +1786,7 @@ int daAlink_c::procStEscape() {
if (frameCtrl->checkAnmEnd()) {
checkNextAction(0);
} else if (frameCtrl->getFrame() > daAlinkHIO_damCaught_c0::m.field_0x0.mCheckFrame) {
} else if (frameCtrl->getFrame() > daAlinkHIO_damCaught_c0::m.field_0x0.mCancelFrame) {
onModeFlg(4);
checkNextAction(1);
}
src/d/actor/d_a_alink_grab.inc
+11 -11
View File
@@ -780,7 +780,7 @@ int daAlink_c::procGrabReady() {
if (checkAnmEnd(&mUnderFrameCtrl[0])) {
if (field_0x3198 != 0) {
setSingleAnime(ANM_PICK_UP_LARGE_START, daAlinkHIO_grab_c0::m.field_0x78.mSpeed, daAlinkHIO_grab_c0::m.field_0x78.mStartFrame, daAlinkHIO_grab_c0::m.field_0x78.mCheckFrame, daAlinkHIO_grab_c0::m.field_0x78.mInterpolation);
setSingleAnime(ANM_PICK_UP_LARGE_START, daAlinkHIO_grab_c0::m.field_0x78.mSpeed, daAlinkHIO_grab_c0::m.field_0x78.mStartFrame, daAlinkHIO_grab_c0::m.field_0x78.mCancelFrame, daAlinkHIO_grab_c0::m.field_0x78.mInterpolation);
field_0x3198 = 0;
} else {
procGrabUpInit();
@@ -833,7 +833,7 @@ int daAlink_c::procGrabUp() {
return checkNextAction(0);
}
if (checkAnmEnd(temp_r29) || (checkInputOnR() && (temp_r29->getFrame() > daAlinkHIO_grab_c0::m.field_0x14.mCheckFrame))) {
if (checkAnmEnd(temp_r29) || (checkInputOnR() && (temp_r29->getFrame() > daAlinkHIO_grab_c0::m.field_0x14.mCancelFrame))) {
onResetFlg0(RFLG0_GRAB_UP_END);
if (fopAcM_CheckCarryType(temp_r3, fopAcM_CARRY(fopAcM_CARRY_UNK_40 | fopAcM_CARRY_HEAVY | fopAcM_CARRY_TYPE_1))) {
@@ -895,7 +895,7 @@ int daAlink_c::procGrabThrowInit(int param_0) {
if (checkGrabHeavyActor()) {
setSingleAnimeParam(ANM_THROW_HEAVY, &daAlinkHIO_grab_c0::m.field_0xC8);
field_0x343c = 14.0f;
field_0x347c = daAlinkHIO_grab_c0::m.field_0xC8.mCheckFrame;
field_0x347c = daAlinkHIO_grab_c0::m.field_0xC8.mCancelFrame;
mProcVar2.field_0x300c = 2;
} else if (checkGrabSideActor()) {
f32 var_f31;
@@ -908,12 +908,12 @@ int daAlink_c::procGrabThrowInit(int param_0) {
setSingleAnimeBaseSpeed(ANM_ATN_WAIT_RIGHT, var_f31, daAlinkHIO_basic_c0::m.mAnmBlendFactor);
setUpperAnimeParam(0x51, UPPER_0, &daAlinkHIO_grab_c0::m.field_0xB4);
field_0x343c = 4.0f;
field_0x347c = daAlinkHIO_grab_c0::m.field_0xB4.mCheckFrame;
field_0x347c = daAlinkHIO_grab_c0::m.field_0xB4.mCancelFrame;
mProcVar2.field_0x300c = 1;
} else {
setSingleAnimeParam(ANM_THROW, &daAlinkHIO_grab_c0::m.field_0x3C);
field_0x343c = 5.0f;
field_0x347c = daAlinkHIO_grab_c0::m.field_0x3C.mCheckFrame;
field_0x347c = daAlinkHIO_grab_c0::m.field_0x3C.mCancelFrame;
mProcVar2.field_0x300c = 0;
}
@@ -1143,7 +1143,7 @@ int daAlink_c::procGrabRebound() {
setWaterInAnmRate(temp_r30, daAlinkHIO_grab_c0::m.field_0x64.mSpeed);
field_0x3198 = 0;
}
} else if (checkAnmEnd(temp_r30) || (checkInputOnR() && (temp_r30->getFrame() > daAlinkHIO_grab_c0::m.field_0x64.mCheckFrame))) {
} else if (checkAnmEnd(temp_r30) || (checkInputOnR() && (temp_r30->getFrame() > daAlinkHIO_grab_c0::m.field_0x64.mCancelFrame))) {
initGrabNextMode();
}
@@ -1156,13 +1156,13 @@ int daAlink_c::procGrabStandInit() {
if (checkUnderMove0BckNoArc(ANM_CARRY)) {
setSingleAnime(ANM_CARRY, daAlinkHIO_grab_c0::m.field_0xA0.mSpeed, daAlinkHIO_grab_c0::m.field_0xA0.mStartFrame, (9.0f + daAlinkHIO_grab_c0::m.field_0xA0.mSpeed), 0.0f);
field_0x3478 = daAlinkHIO_grab_c0::m.field_0xA0.mCheckFrame;
field_0x3478 = daAlinkHIO_grab_c0::m.field_0xA0.mCancelFrame;
field_0x347c = 1.0f / (9.0f - daAlinkHIO_grab_c0::m.field_0xA0.mStartFrame);
mProcVar3.field_0x300e = 1;
setCarryArmAngle(1.0f, 0.0f);
} else {
setSingleAnimeParam(ANM_GRAB_UP_START, &daAlinkHIO_grab_c0::m.field_0x28);
field_0x3478 = daAlinkHIO_grab_c0::m.field_0x28.mCheckFrame;
field_0x3478 = daAlinkHIO_grab_c0::m.field_0x28.mCancelFrame;
mProcVar3.field_0x300e = 0;
}
@@ -1329,7 +1329,7 @@ int daAlink_c::procPickUp() {
}
} else if (checkAnmEnd(temp_r30)) {
checkNextAction(0);
} else if (temp_r30->getFrame() > daAlinkHIO_pickUp_c0::m.field_0x0.mCheckFrame) {
} else if (temp_r30->getFrame() > daAlinkHIO_pickUp_c0::m.field_0x0.mCancelFrame) {
onModeFlg(4);
checkNextAction(1);
} else if (temp_r30->checkPass(9.0f)) {
@@ -1388,7 +1388,7 @@ int daAlink_c::procPickPut() {
if (checkAnmEnd(temp_r28)) {
checkNextAction(0);
} else if (temp_r28->getFrame() < daAlinkHIO_pickUp_c0::m.field_0x14.mCheckFrame) {
} else if (temp_r28->getFrame() < daAlinkHIO_pickUp_c0::m.field_0x14.mCancelFrame) {
onModeFlg(4);
checkNextAction(1);
} else if (temp_r28->checkPass(9.0f)) {
@@ -1513,7 +1513,7 @@ int daAlink_c::procFmChainUp() {
setGrabStatus(0x96, 2);
setShapeAngleToAtnActor(0);
if (checkAnmEnd(temp_r29) || (checkInputOnR() && temp_r29->getFrame() > daAlinkHIO_fmChain_c0::m.field_0x0.mCheckFrame)) {
if (checkAnmEnd(temp_r29) || (checkInputOnR() && temp_r29->getFrame() > daAlinkHIO_fmChain_c0::m.field_0x0.mCancelFrame)) {
u8 temp_r27 = field_0x2fa3;
fopAc_ac_c* temp_r28 = field_0x2844.getActor();
src/d/actor/d_a_alink_guard.inc
+3 -3
View File
@@ -412,7 +412,7 @@ int daAlink_c::procGuardAttackInit() {
field_0x3484 = 1000.0f;
field_0x3488 = 1000.0f;
} else {
field_0x3484 = temp_r30->mAttackAnm.mCheckFrame;
field_0x3484 = temp_r30->mAttackAnm.mCancelFrame;
field_0x3488 = temp_r30->mSlashCheckFrame;
}
@@ -537,7 +537,7 @@ int daAlink_c::procGuardBreak() {
onEndResetFlg1(ERFLG1_UNK_20);
}
checkNextAction(0);
} else if (temp_r30->getFrame() > daAlinkHIO_guard_c0::m.mGuardBreakAnm.mCheckFrame) {
} else if (temp_r30->getFrame() > daAlinkHIO_guard_c0::m.mGuardBreakAnm.mCancelFrame) {
if (!checkGuardActionChange()) {
onEndResetFlg1(ERFLG1_UNK_20);
}
@@ -660,7 +660,7 @@ int daAlink_c::procTurnMove() {
procCutFinishJumpUpInit();
dComIfGp_setPlayerStatus0(0, 4);
} else {
if (temp_r30->getFrame() > daAlinkHIO_turnMove_c0::m.mTurnAnm.mCheckFrame) {
if (temp_r30->getFrame() > daAlinkHIO_turnMove_c0::m.mTurnAnm.mCancelFrame) {
onModeFlg(4);
if (checkNextAction(1)) {
src/d/actor/d_a_alink_hang.inc
+12 -12
View File
@@ -291,11 +291,11 @@ int daAlink_c::procHangStartInit() {
if (checkHangFootWall()) {
if (!hang_ready && cM_rnd() < 0.7f) {
setSingleAnimeParam(ANM_CLIMB_HANG_MISS, &daAlinkHIO_ladder_c0::m.field_0x14);
field_0x3478 = daAlinkHIO_ladder_c0::m.field_0x14.mCheckFrame;
field_0x3478 = daAlinkHIO_ladder_c0::m.field_0x14.mCancelFrame;
voiceStart(Z2SE_AL_V_FOOT_MISS);
} else {
setSingleAnimeParam(ANM_CLIMB_HANG, &daAlinkHIO_ladder_c0::m.field_0x0);
field_0x3478 = daAlinkHIO_ladder_c0::m.field_0x0.mCheckFrame;
field_0x3478 = daAlinkHIO_ladder_c0::m.field_0x0.mCancelFrame;
voiceStart(Z2SE_AL_V_JUMP_HANG);
}
@@ -303,7 +303,7 @@ int daAlink_c::procHangStartInit() {
field_0x2f93 = 0xFE;
} else {
setSingleAnimeParam(ANM_HANG_READY, &daAlinkHIO_wallCatch_c0::m.mGrabAAnm);
field_0x3478 = daAlinkHIO_wallCatch_c0::m.mGrabAAnm.mCheckFrame;
field_0x3478 = daAlinkHIO_wallCatch_c0::m.mGrabAAnm.mCancelFrame;
voiceStart(Z2SE_AL_V_JUMP_HANG);
}
@@ -417,7 +417,7 @@ int daAlink_c::procHangFallStart() {
BOOL bvar;
if (checkAnmEnd(frame_ctrl) ||
frame_ctrl->getFrame() > daAlinkHIO_wallFall_c0::m.mOneHandGrabAnm.mCheckFrame)
frame_ctrl->getFrame() > daAlinkHIO_wallFall_c0::m.mOneHandGrabAnm.mCancelFrame)
{
bvar = true;
} else {
@@ -467,7 +467,7 @@ int daAlink_c::procHangUp() {
}
return 1;
} else if (checkAnmEnd(frame_ctrl) ||
frame_ctrl->getFrame() > daAlinkHIO_wallFall_c0::m.mTwoHandGrabAnm.mCheckFrame)
frame_ctrl->getFrame() > daAlinkHIO_wallFall_c0::m.mTwoHandGrabAnm.mCancelFrame)
{
if (field_0x3198 == 0) {
procHangClimbInit(daAlinkHIO_wallCatch_c0::m.mClimbAnm.mStartFrame);
@@ -752,7 +752,7 @@ int daAlink_c::procHangClimb() {
if (checkAnmEnd(frameCtrl)) {
checkNextAction(0);
} else if (frameCtrl->getFrame() > daAlinkHIO_wallCatch_c0::m.mClimbAnm.mCheckFrame) {
} else if (frameCtrl->getFrame() > daAlinkHIO_wallCatch_c0::m.mClimbAnm.mCancelFrame) {
onModeFlg(4);
checkNextAction(1);
}
@@ -1134,7 +1134,7 @@ int daAlink_c::procBossBodyHang() {
}
field_0x3198 = 0x16C;
field_0x3478 = daAlinkHIO_cut_c0::m.mStabAnm.mCheckFrame;
field_0x3478 = daAlinkHIO_cut_c0::m.mStabAnm.mCancelFrame;
field_0x347c = 10.0f;
mProcVar4.field_0x3010 = 0;
mProcVar1.field_0x300a = 1;
@@ -2145,11 +2145,11 @@ int daAlink_c::procClimbUpStartInit(int param_0) {
if (param_0 || var_r29 || cM_rnd() < 0.3f) {
setSingleAnimeParam(ANM_CLIMB_HANG, &daAlinkHIO_ladder_c0::m.field_0x0);
field_0x3478 = daAlinkHIO_ladder_c0::m.field_0x0.mCheckFrame;
field_0x3478 = daAlinkHIO_ladder_c0::m.field_0x0.mCancelFrame;
voiceStart(Z2SE_AL_V_JUMP_HANG);
} else {
setSingleAnimeParam(ANM_CLIMB_HANG_MISS, &daAlinkHIO_ladder_c0::m.field_0x14);
field_0x3478 = daAlinkHIO_ladder_c0::m.field_0x14.mCheckFrame;
field_0x3478 = daAlinkHIO_ladder_c0::m.field_0x14.mCancelFrame;
voiceStart(Z2SE_AL_V_FOOT_MISS);
}
@@ -2226,11 +2226,11 @@ int daAlink_c::procClimbDownStartInit(s16 param_0) {
if (cM_rnd() < 0.7f) {
setSingleAnimeParam(ANM_CLIMB_HANG, &daAlinkHIO_ladder_c0::m.field_0x0);
field_0x3478 = daAlinkHIO_ladder_c0::m.field_0x0.mCheckFrame;
field_0x3478 = daAlinkHIO_ladder_c0::m.field_0x0.mCancelFrame;
mProcVar0.field_0x3008 = 0;
} else {
setSingleAnimeParam(ANM_CLIMB_HANG_MISS, &daAlinkHIO_ladder_c0::m.field_0x14);
field_0x3478 = daAlinkHIO_ladder_c0::m.field_0x14.mCheckFrame;
field_0x3478 = daAlinkHIO_ladder_c0::m.field_0x14.mCancelFrame;
mProcVar0.field_0x3008 = 1;
voiceStart(Z2SE_AL_V_FOOT_MISS);
}
@@ -2758,7 +2758,7 @@ int daAlink_c::procRoofHangStart() {
if (mProcVar0.field_0x3008 == 0 &&
(checkAnmEnd(frame_ctrl) ||
(checkInputOnR() &&
frame_ctrl->getFrame() > daAlinkHIO_roofHang_c0::m.field_0x0.mCheckFrame)))
frame_ctrl->getFrame() > daAlinkHIO_roofHang_c0::m.field_0x0.mCancelFrame)))
{
checkNextActionRoofHang();
} else if (checkAnmEnd(frame_ctrl)) {
src/d/actor/d_a_alink_hook.inc
+2 -2
View File
@@ -1813,7 +1813,7 @@ int daAlink_c::procHookshotRoofWait() {
daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
if (frameCtrl_p->checkAnmEnd() ||
((checkInputOnR() || mProcVar5.field_0x3012 != 0 || checkHookshotRoofLv7Boss()) &&
frameCtrl_p->getFrame() > daAlinkHIO_hookshot_c0::m.mRoofHangAnm.mCheckFrame))
frameCtrl_p->getFrame() > daAlinkHIO_hookshot_c0::m.mRoofHangAnm.mCancelFrame))
{
setHookshotRoofWaitAnime();
mProcVar2.field_0x300c = 1;
@@ -2090,7 +2090,7 @@ int daAlink_c::procHookshotWallWait() {
daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
if (frameCtrl_p->checkAnmEnd() ||
((checkInputOnR() || mProcVar5.field_0x3012 != 0) &&
frameCtrl_p->getFrame() > daAlinkHIO_hookshot_c0::m.mWallHangAnm.mCheckFrame))
frameCtrl_p->getFrame() > daAlinkHIO_hookshot_c0::m.mWallHangAnm.mCancelFrame))
{
setHookshotWallWaitAnime();
mProcVar2.field_0x300c = 1;
src/d/actor/d_a_alink_horse.inc
+2 -2
View File
@@ -2001,7 +2001,7 @@ int daAlink_c::procHorseCutInit() {
field_0x3478 = var_r29->mAttackStartFrame;
field_0x347c = var_r29->mAttackEndFrame;
field_0x3480 = var_r29->mAfterCutMorf;
field_0x3484 = var_r29->mCutAnm.mCheckFrame;
field_0x3484 = var_r29->mCutAnm.mCancelFrame;
if (checkBoarSingleBattle()) {
setSwordAtParam(dCcG_At_Spl_UNK_0, 1, 1, 2, daAlinkHIO_cut_c0::m.mSwordLengthHorsebackFight, daAlinkHIO_cut_c0::m.mSwordRadiusHorsebackFight);
@@ -2167,7 +2167,7 @@ int daAlink_c::procHorseCutTurn() {
procHorseWaitInit();
field_0x2060->initOldFrameMorf(4.0f, 0, 0x23);
} else {
if (temp_r30->getFrame() > daAlinkHIO_hoCutCharge_c0::m.field_0x28.mCheckFrame) {
if (temp_r30->getFrame() > daAlinkHIO_hoCutCharge_c0::m.field_0x28.mCancelFrame) {
if (orderTalk(1)) {
return 1;
}
src/d/actor/d_a_alink_hvyboots.inc
+1 -1
View File
@@ -303,7 +303,7 @@ int daAlink_c::procBootsEquip() {
}
offModeFlg(2);
} else if (frameCtrl_p->getFrame() > daAlinkHIO_magneBoots_c0::m.mEquipAnm.mCheckFrame) {
} else if (frameCtrl_p->getFrame() > daAlinkHIO_magneBoots_c0::m.mEquipAnm.mCancelFrame) {
onModeFlg(4);
checkNextAction(1);
} else if (frameCtrl_p->getFrame() >= 5.0f) {
src/d/actor/d_a_alink_ironball.inc
+1 -1
View File
@@ -1112,7 +1112,7 @@ int daAlink_c::procIronBallReturn() {
setIronBallWaitUpperAnime(1);
checkNextAction(0);
}
} else if (mItemVar0.field_0x3018 == 8 && frameCtrl->getFrame() > daAlinkHIO_ironBall_c0::m.mCatchAnm.mCheckFrame) {
} else if (mItemVar0.field_0x3018 == 8 && frameCtrl->getFrame() > daAlinkHIO_ironBall_c0::m.mCatchAnm.mCancelFrame) {
mItemVar0.field_0x3018 = 0;
setIronBallWaitUpperAnime(1);
src/d/actor/d_a_alink_kandelaar.inc
+2 -2
View File
@@ -398,12 +398,12 @@ int daAlink_c::procKandelaarSwingInit() {
fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchTagKtOnFire, NULL) != NULL))
{
setSingleAnimeParam(ANM_BOTTLE_SWING_DOWN, &daAlinkHIO_bottle_c0::m.mSwingDownAnm);
field_0x3478 = daAlinkHIO_bottle_c0::m.mSwingDownAnm.mCheckFrame;
field_0x3478 = daAlinkHIO_bottle_c0::m.mSwingDownAnm.mCancelFrame;
field_0x347c = 5.0f;
field_0x3480 = 12.0f;
} else {
setSingleAnimeParam(ANM_LANTERN_SWING, &daAlinkHIO_kandelaar_c0::m.mShakeAnm);
field_0x3478 = daAlinkHIO_kandelaar_c0::m.mShakeAnm.mCheckFrame;
field_0x3478 = daAlinkHIO_kandelaar_c0::m.mShakeAnm.mCancelFrame;
field_0x347c = 4.0f;
field_0x3480 = 11.0f;
}
src/d/actor/d_a_alink_link.inc
+13 -13
View File
@@ -537,7 +537,7 @@ int daAlink_c::procSideStepLandInit() {
if (field_0x2f98 == 1) {
field_0x2f9d = 4;
setSingleAnimeParam(ANM_BACK_JUMP_LAND, &daAlinkHIO_sideStep_c0::m.mBackLandAnm);
field_0x3478 = daAlinkHIO_sideStep_c0::m.mBackLandAnm.mCheckFrame;
field_0x3478 = daAlinkHIO_sideStep_c0::m.mBackLandAnm.mCancelFrame;
field_0x2f98 = 2;
mProcVar1.field_0x300a = 0;
field_0x2fb0 = 0;
@@ -554,7 +554,7 @@ int daAlink_c::procSideStepLandInit() {
}
setSingleAnimeParam(anm_id, &daAlinkHIO_sideStep_c0::m.mSideLandAnm);
field_0x3478 = daAlinkHIO_sideStep_c0::m.mSideLandAnm.mCheckFrame;
field_0x3478 = daAlinkHIO_sideStep_c0::m.mSideLandAnm.mCancelFrame;
mProcVar1.field_0x300a = 1;
field_0x2fb0 = 8;
field_0x2fcc = 0;
@@ -713,13 +713,13 @@ int daAlink_c::procSlideLandInit(int param_0) {
if (param_0 != 0) {
setSingleAnimeParam(ANM_SLIDE_FORWARD_END, &daAlinkHIO_slide_c0::m.mForwardLandAnm);
field_0x3478 = daAlinkHIO_slide_c0::m.mForwardLandAnm.mCheckFrame;
field_0x3478 = daAlinkHIO_slide_c0::m.mForwardLandAnm.mCancelFrame;
field_0x3198 = 1;
field_0x2f99 = 4;
field_0x3588 = l_waitBaseAnime;
} else {
setSingleAnimeParam(ANM_SLIDE_BACKWARD_END, &daAlinkHIO_slide_c0::m.mBackwardLandAnm);
field_0x3478 = daAlinkHIO_slide_c0::m.mBackwardLandAnm.mCheckFrame;
field_0x3478 = daAlinkHIO_slide_c0::m.mBackwardLandAnm.mCancelFrame;
field_0x3198 = 0;
}
@@ -844,7 +844,7 @@ int daAlink_c::procFrontRoll() {
checkNextAction(0);
}
} else if (frameCtrl_p->getFrame() > daAlinkHIO_frontRoll_c0::m.mRollAnm.mCheckFrame) {
} else if (frameCtrl_p->getFrame() > daAlinkHIO_frontRoll_c0::m.mRollAnm.mCancelFrame) {
onModeFlg(4);
cLib_chaseF(&mNormalSpeed, 0.0f, 2.5f);
@@ -937,7 +937,7 @@ int daAlink_c::procFrontRollCrash() {
if (!checkModeFlg(2)) {
if (frameCtrl->checkAnmEnd()) {
checkNextAction(0);
} else if (frameCtrl->getFrame() > daAlinkHIO_frontRoll_c0::m.mCrashAnm.mCheckFrame) {
} else if (frameCtrl->getFrame() > daAlinkHIO_frontRoll_c0::m.mCrashAnm.mCancelFrame) {
onModeFlg(4);
checkNextAction(1);
} else if (frameCtrl->getFrame() >= 18.0f) {
@@ -997,7 +997,7 @@ int daAlink_c::procFrontRollSuccess() {
if (frameCtrl->checkAnmEnd()) {
current.angle.y = shape_angle.y;
checkNextAction(0);
} else if (frameCtrl->getFrame() > daAlinkHIO_frontRoll_c0::m.mCrashHitAnm.mCheckFrame) {
} else if (frameCtrl->getFrame() > daAlinkHIO_frontRoll_c0::m.mCrashHitAnm.mCancelFrame) {
onModeFlg(4);
current.angle.y = shape_angle.y;
checkNextAction(1);
@@ -1092,10 +1092,10 @@ int daAlink_c::procSideRoll() {
checkNextAction(0);
}
} else if (mProcVar2.field_0x300c != 0 && !checkNotJumpSinkLimit() &&
frameCtrl_p->getFrame() > daAlinkHIO_turnMove_c0::m.mTurnAnm.mCheckFrame)
frameCtrl_p->getFrame() > daAlinkHIO_turnMove_c0::m.mTurnAnm.mCancelFrame)
{
procCutFinishJumpUpInit();
} else if (frameCtrl_p->getFrame() > daAlinkHIO_turnMove_c0::m.mTurnAnm.mCheckFrame) {
} else if (frameCtrl_p->getFrame() > daAlinkHIO_turnMove_c0::m.mTurnAnm.mCancelFrame) {
onModeFlg(4);
if (!checkNextAction(1)) {
cLib_chaseF(&mNormalSpeed, 0.0f, 7.5f);
@@ -1246,7 +1246,7 @@ int daAlink_c::procBackJumpLand() {
}
checkNextAction(0);
}
} else if (frameCtrl->getFrame() > daAlinkHIO_backJump_c0::m.mLandAnm.mCheckFrame) {
} else if (frameCtrl->getFrame() > daAlinkHIO_backJump_c0::m.mLandAnm.mCancelFrame) {
if (mEquipItem == 0x103 && (field_0x3198 != 2 || checkCutTurnInput())) {
return procCutTurnInit(1, field_0x3198);
}
@@ -1824,7 +1824,7 @@ int daAlink_c::procLand() {
if (frameCtrl->checkAnmEnd()) {
checkNextAction(0);
} else if (frameCtrl->getFrame() > daAlinkHIO_autoJump_c0::m.mLandAnm.mCheckFrame) {
} else if (frameCtrl->getFrame() > daAlinkHIO_autoJump_c0::m.mLandAnm.mCancelFrame) {
checkNextAction(1);
} else if (frameCtrl->checkPass(4.0f)) {
int var_r4;
@@ -1958,7 +1958,7 @@ int daAlink_c::procStepMove() {
return checkNextAction(0);
}
if (frameCtrl->getFrame() > daAlinkHIO_smallJump_c0::m.mStepLandAnm.mCheckFrame) {
if (frameCtrl->getFrame() > daAlinkHIO_smallJump_c0::m.mStepLandAnm.mCancelFrame) {
mNormalSpeed = field_0x3478;
if (checkNextAction(1)) {
@@ -2350,7 +2350,7 @@ int daAlink_c::procFloorDownRebound() {
if (frameCtrl->checkAnmEnd()) {
checkNextAction(0);
} else if (frameCtrl->getFrame() > daAlinkHIO_autoJump_c0::m.mLandAnm.mCheckFrame) {
} else if (frameCtrl->getFrame() > daAlinkHIO_autoJump_c0::m.mLandAnm.mCancelFrame) {
checkNextAction(1);
}
src/d/actor/d_a_alink_swim.inc
+6 -6
View File
@@ -970,7 +970,7 @@ int daAlink_c::procSwimUp() {
}
} else if (checkAnmEnd(frame_ctrl)) {
procSwimWaitInit(0);
} else if (frame_ctrl->getFrame() > daAlinkHIO_swim_c0::m.mResurfaceAnm.mCheckFrame &&
} else if (frame_ctrl->getFrame() > daAlinkHIO_swim_c0::m.mResurfaceAnm.mCancelFrame &&
checkInputOnR())
{
procSwimMoveInit();
@@ -1468,21 +1468,21 @@ int daAlink_c::procSwimDamageInit(dCcD_GObjInf* param_0) {
int dir = getDirectionFromAngle(cM_atan2s(-sp24.x, -sp24.z));
if (bvar4) {
setSingleAnimeParam(ANM_SWIM_DMG_FREEZE, &daAlinkHIO_damSwim_c0::m.field_0x64);
field_0x3478 = daAlinkHIO_damSwim_c0::m.field_0x64.mCheckFrame;
field_0x3478 = daAlinkHIO_damSwim_c0::m.field_0x64.mCancelFrame;
mProcVar0.field_0x3008 = 0;
mProcVar1.field_0x300a = 0;
} else if (dir == DIR_FORWARD) {
setSingleAnimeParam(ANM_SWIM_DMG_FRONT, &daAlinkHIO_damSwim_c0::m.field_0x0);
field_0x3478 = daAlinkHIO_damSwim_c0::m.field_0x0.mCheckFrame;
field_0x3478 = daAlinkHIO_damSwim_c0::m.field_0x0.mCancelFrame;
} else if (dir == DIR_BACKWARD) {
setSingleAnimeParam(ANM_SWIM_DMG_BACK, &daAlinkHIO_damSwim_c0::m.field_0x14);
field_0x3478 = daAlinkHIO_damSwim_c0::m.field_0x14.mCheckFrame;
field_0x3478 = daAlinkHIO_damSwim_c0::m.field_0x14.mCancelFrame;
} else if (dir == DIR_LEFT) {
setSingleAnimeParam(ANM_SWIM_DMG_LEFT, &daAlinkHIO_damSwim_c0::m.field_0x28);
field_0x3478 = daAlinkHIO_damSwim_c0::m.field_0x28.mCheckFrame;
field_0x3478 = daAlinkHIO_damSwim_c0::m.field_0x28.mCancelFrame;
} else {
setSingleAnimeParam(ANM_SWIM_DMG_RIGHT, &daAlinkHIO_damSwim_c0::m.field_0x3C);
field_0x3478 = daAlinkHIO_damSwim_c0::m.field_0x3C.mCheckFrame;
field_0x3478 = daAlinkHIO_damSwim_c0::m.field_0x3C.mCancelFrame;
}
mNormalSpeed = 0.0f;
src/d/actor/d_a_alink_wolf.inc
+46 -46
View File
@@ -2642,7 +2642,7 @@ int daAlink_c::procWolfDash() {
}
return checkNextActionWolf(0);
} else if (frameCtrl_p->getFrame() > daAlinkHIO_wlMove_c0::m.field_0x28.mCheckFrame) {
} else if (frameCtrl_p->getFrame() > daAlinkHIO_wlMove_c0::m.field_0x28.mCancelFrame) {
if (mProcVar3.field_0x300e != 0) {
return checkWolfAttackAction();
}
@@ -2714,7 +2714,7 @@ int daAlink_c::procWolfDashReverse() {
if (!checkModeFlg(0x2)) {
if (checkAnmEnd(frameCtrl_p)) {
checkNextActionWolf(0);
} else if (frameCtrl_p->getFrame() > daAlinkHIO_wlMove_c0::m.field_0x3C.mCheckFrame) {
} else if (frameCtrl_p->getFrame() > daAlinkHIO_wlMove_c0::m.field_0x3C.mCancelFrame) {
checkNextActionWolf(1);
}
} else if (mProcVar2.field_0x300c != 0) {
@@ -2939,14 +2939,14 @@ int daAlink_c::procWolfSideStepLandInit(s16 param_0) {
if (field_0x2f98 == 1) {
setSingleAnimeWolfParam(WANM_BACK_JUMP_END, &daAlinkHIO_wlSideStep_c0::m.field_0x3C);
field_0x3478 = daAlinkHIO_wlSideStep_c0::m.field_0x3C.mCheckFrame;
field_0x3478 = daAlinkHIO_wlSideStep_c0::m.field_0x3C.mCancelFrame;
field_0x2fcc = 10;
} else {
field_0x2fcc = 0;
setSingleAnimeWolfParam(field_0x2f98 == 2 ? WANM_SIDE_JUMP_LEFT_END :
WANM_SIDE_JUMP_RIGHT_END,
&daAlinkHIO_wlSideStep_c0::m.field_0x14);
field_0x3478 = daAlinkHIO_wlSideStep_c0::m.field_0x14.mCheckFrame;
field_0x3478 = daAlinkHIO_wlSideStep_c0::m.field_0x14.mCancelFrame;
}
mProcVar5.field_0x3012 = param_0;
@@ -3088,7 +3088,7 @@ int daAlink_c::procWolfBackJumpLand() {
} else {
checkNextActionWolf(0);
}
} else if (frameCtrl->getFrame() > daAlinkHIO_wlBackJump_c0::m.field_0x14.mCheckFrame) {
} else if (frameCtrl->getFrame() > daAlinkHIO_wlBackJump_c0::m.field_0x14.mCancelFrame) {
checkNextActionWolf(1);
}
@@ -3106,11 +3106,11 @@ int daAlink_c::procWolfHowlInit(int param_0) {
if (param_0 != 0) {
setSingleAnimeWolfParam(WANM_HOWL_SIT, &daAlinkHIO_wlHowl_c0::m.field_0x14);
onModeFlg(0x800000);
field_0x3478 = daAlinkHIO_wlHowl_c0::m.field_0x14.mCheckFrame;
field_0x3478 = daAlinkHIO_wlHowl_c0::m.field_0x14.mCancelFrame;
mProcVar3.field_0x300e = 1;
} else {
setSingleAnimeWolfParam(WANM_HOWL, &daAlinkHIO_wlHowl_c0::m.field_0x0);
field_0x3478 = daAlinkHIO_wlHowl_c0::m.field_0x0.mCheckFrame;
field_0x3478 = daAlinkHIO_wlHowl_c0::m.field_0x0.mCancelFrame;
mProcVar3.field_0x300e = 0;
}
@@ -3361,7 +3361,7 @@ int daAlink_c::procWolfLandInit() {
field_0x2f99 = 12;
setSingleAnimeWolfParam(WANM_JUMP_ATTACK_END, &daAlinkHIO_wlAutoJump_c0::m.field_0x14);
field_0x3478 = daAlinkHIO_wlAutoJump_c0::m.field_0x14.mCheckFrame;
field_0x3478 = daAlinkHIO_wlAutoJump_c0::m.field_0x14.mCancelFrame;
mProcVar2.field_0x300c = 1;
field_0x2f9d = 4;
@@ -3459,7 +3459,7 @@ int daAlink_c::procWolfStepMove() {
return checkNextActionWolf(0);
}
if (frameCtrl_p->getFrame() > daAlinkHIO_wlWallHang_c0::m.field_0x64.mCheckFrame) {
if (frameCtrl_p->getFrame() > daAlinkHIO_wlWallHang_c0::m.field_0x64.mCancelFrame) {
mNormalSpeed = field_0x3478;
if (checkNextActionWolf(1)) {
@@ -3624,7 +3624,7 @@ int daAlink_c::procWolfSlipTurnLand() {
if (frameCtrl->checkAnmEnd()) {
checkNextActionWolf(0);
} else if (frameCtrl->getFrame() > daAlinkHIO_wlMove_c0::m.field_0x14.mCheckFrame) {
} else if (frameCtrl->getFrame() > daAlinkHIO_wlMove_c0::m.field_0x14.mCancelFrame) {
checkNextActionWolf(1);
}
@@ -3750,7 +3750,7 @@ int daAlink_c::procWolfSlideLand() {
if (frameCtrl->checkAnmEnd()) {
current.angle.y = shape_angle.y;
checkNextActionWolf(0);
} else if (frameCtrl->getFrame() > daAlinkHIO_wlSlide_c0::m.field_0x28.mCheckFrame) {
} else if (frameCtrl->getFrame() > daAlinkHIO_wlSlide_c0::m.field_0x28.mCancelFrame) {
s16 old_angle = current.angle.y;
current.angle.y = shape_angle.y;
@@ -3846,7 +3846,7 @@ int daAlink_c::procWolfSlopeStart() {
if (frameCtrl->checkAnmEnd()) {
checkNextActionWolf(0);
} else if (frameCtrl->getFrame() > daAlinkHIO_wlSlide_c0::m.field_0x3C.mCheckFrame) {
} else if (frameCtrl->getFrame() > daAlinkHIO_wlSlide_c0::m.field_0x3C.mCancelFrame) {
if (!checkNextActionWolf(1)) {
field_0x2f99 = 5;
}
@@ -5043,7 +5043,7 @@ int daAlink_c::procWolfRopeSubjectivity() {
int daAlink_c::getWolfTagJumpTime() const {
int time;
if (mProcID == PROC_WOLF_TAG_JUMP) {
time = mProcVar0.field_0x3008 + (int)((daAlinkHIO_wlPoint_c0::m.field_0x28.mCheckFrame -
time = mProcVar0.field_0x3008 + (int)((daAlinkHIO_wlPoint_c0::m.field_0x28.mCancelFrame -
daAlinkHIO_wlPoint_c0::m.field_0x28.mStartFrame) /
daAlinkHIO_wlPoint_c0::m.field_0x28.mSpeed);
} else {
@@ -5182,7 +5182,7 @@ int daAlink_c::procWolfTagJump() {
mProcVar5.field_0x3012 = 1;
}
if (mProcVar5.field_0x3012 && (checkModeFlg(0x100) || checkAnmEnd(temp_r28) || temp_r28->getFrame() > daAlinkHIO_wlPoint_c0::m.field_0x28.mCheckFrame)) {
if (mProcVar5.field_0x3012 && (checkModeFlg(0x100) || checkAnmEnd(temp_r28) || temp_r28->getFrame() > daAlinkHIO_wlPoint_c0::m.field_0x28.mCancelFrame)) {
procWolfTagJumpInit(temp_r29);
} else if (checkAnmEnd(temp_r28)) {
onModeFlg(0x100);
@@ -5288,7 +5288,7 @@ int daAlink_c::procWolfTagJumpLand() {
onResetFlg0(RFLG0_UNK_20000);
field_0x3738 = *wljump_p->getLockPos();
if (frameCtrl_p->getFrame() > daAlinkHIO_wlPoint_c0::m.field_0x3C.mCheckFrame) {
if (frameCtrl_p->getFrame() > daAlinkHIO_wlPoint_c0::m.field_0x3C.mCancelFrame) {
setDoStatus(0x93);
if (doTrigger()) {
@@ -5304,7 +5304,7 @@ int daAlink_c::procWolfTagJumpLand() {
{
if (checkAnmEnd(frameCtrl_p)) {
checkNextActionWolf(0);
} else if (!(frameCtrl_p->getFrame() > daAlinkHIO_wlPoint_c0::m.field_0x3C.mCheckFrame) ||
} else if (!(frameCtrl_p->getFrame() > daAlinkHIO_wlPoint_c0::m.field_0x3C.mCancelFrame) ||
!checkNextActionWolf(1))
{
field_0x2f9d = 0x78;
@@ -5612,7 +5612,7 @@ int daAlink_c::procWolfHangWallCatch() {
onNoResetFlg1(FLG1_UNK_20);
}
} else if (mProcVar3.field_0x300e != 0 &&
frameCtrl_p->getFrame() > daAlinkHIO_wlWallHang_c0::m.field_0x14.mCheckFrame &&
frameCtrl_p->getFrame() > daAlinkHIO_wlWallHang_c0::m.field_0x14.mCancelFrame &&
checkNextActionWolf(1))
{
onNoResetFlg1(FLG1_UNK_20);
@@ -5736,16 +5736,16 @@ int daAlink_c::procWolfDamageInit(dCcD_GObjInf* param_0) {
int temp_r3 = getDirectionFromAngle(cM_atan2s(-sp8.x, -sp8.z));
if (temp_r3 == DIR_FORWARD) {
setSingleAnimeWolfParam(WANM_DMG_FRONT, &daAlinkHIO_wlDamNormal_c0::m.field_0x0);
field_0x3478 = daAlinkHIO_wlDamNormal_c0::m.field_0x0.mCheckFrame;
field_0x3478 = daAlinkHIO_wlDamNormal_c0::m.field_0x0.mCancelFrame;
} else if (temp_r3 == DIR_BACKWARD) {
setSingleAnimeWolfParam(WANM_DMG_BACK, &daAlinkHIO_wlDamNormal_c0::m.field_0x14);
field_0x3478 = daAlinkHIO_wlDamNormal_c0::m.field_0x14.mCheckFrame;
field_0x3478 = daAlinkHIO_wlDamNormal_c0::m.field_0x14.mCancelFrame;
} else if (temp_r3 == DIR_LEFT) {
setSingleAnimeWolfParam(WANM_DMG_LEFT, &daAlinkHIO_wlDamNormal_c0::m.field_0x28);
field_0x3478 = daAlinkHIO_wlDamNormal_c0::m.field_0x28.mCheckFrame;
field_0x3478 = daAlinkHIO_wlDamNormal_c0::m.field_0x28.mCancelFrame;
} else {
setSingleAnimeWolfParam(WANM_DMG_RIGHT, &daAlinkHIO_wlDamNormal_c0::m.field_0x3C);
field_0x3478 = daAlinkHIO_wlDamNormal_c0::m.field_0x3C.mCheckFrame;
field_0x3478 = daAlinkHIO_wlDamNormal_c0::m.field_0x3C.mCancelFrame;
}
setFaceBasicTexture(FTANM_UNK_90);
@@ -5865,7 +5865,7 @@ int daAlink_c::procWolfLargeDamageUpInit(int param_0, int param_1, s16 param_2,
var_f29 = 16.0f;
var_r27 = -1;
field_0x3478 = daAlinkHIO_wlDamLarge_c0::m.field_0x0.mCheckFrame;
field_0x3478 = daAlinkHIO_wlDamLarge_c0::m.field_0x0.mCancelFrame;
if (param_0 == -4) {
onNoResetFlg2(FLG2_UNK_1000);
@@ -5900,26 +5900,26 @@ int daAlink_c::procWolfLargeDamageUpInit(int param_0, int param_1, s16 param_2,
if (param_0 == 0x29) {
setSingleAnimeWolfParam(WANM_DMG_AIR_BACK_GETUP, &var_r30->field_0x14);
setFaceBasicTexture(FTANM_UNK_92);
field_0x3478 = var_r30->field_0x14.mCheckFrame;
field_0x3478 = var_r30->field_0x14.mCancelFrame;
field_0x347c = 16.0f;
field_0x3198 = 1;
field_0x3484 = 15.0;
} else if (param_0 == 0x2A) {
setSingleAnimeWolfParam(WANM_DMG_AIR_LEFT_GETUP, &var_r30->field_0x28);
setFaceBasicTexture(FTANM_UNK_93);
field_0x3478 = var_r30->field_0x28.mCheckFrame;
field_0x3478 = var_r30->field_0x28.mCancelFrame;
field_0x347c = 11.0f;
field_0x3484 = 13.0f;
} else if (param_0 == 0x2B) {
setSingleAnimeWolfParam(WANM_DMG_AIR_RIGHT_GETUP, &var_r30->field_0x3C);
setFaceBasicTexture(FTANM_UNK_93);
field_0x3478 = var_r30->field_0x3C.mCheckFrame;
field_0x3478 = var_r30->field_0x3C.mCancelFrame;
field_0x347c = 11.0f;
field_0x3484 = 13.0f;
} else {
setSingleAnimeWolfParam(WANM_DMG_AIR_FRONT_GETUP, &var_r30->field_0x0);
setFaceBasicTexture(FTANM_UNK_92);
field_0x3478 = var_r30->field_0x0.mCheckFrame;
field_0x3478 = var_r30->field_0x0.mCancelFrame;
field_0x347c = 9.0f;
field_0x3484 = 13.0f;
}
@@ -6058,7 +6058,7 @@ int daAlink_c::procWolfLandDamage() {
if (field_0x3198 != 0) {
if (frameCtrl->checkAnmEnd()) {
checkNextActionWolf(0);
} else if (frameCtrl->getFrame() > daAlinkHIO_wlDamFall_c0::m.field_0x14.mCheckFrame) {
} else if (frameCtrl->getFrame() > daAlinkHIO_wlDamFall_c0::m.field_0x14.mCancelFrame) {
checkNextActionWolf(1);
}
} else if (frameCtrl->checkAnmEnd()) {
@@ -6112,7 +6112,7 @@ int daAlink_c::procWolfScreamWait() {
if (frameCtrl->checkAnmEnd()) {
checkNextActionWolf(0);
} else if (frameCtrl->getFrame() > daAlinkHIO_wlDamLarge_c0::m.field_0x0.mCheckFrame) {
} else if (frameCtrl->getFrame() > daAlinkHIO_wlDamLarge_c0::m.field_0x0.mCancelFrame) {
checkNextActionWolf(1);
}
} else {
@@ -6256,7 +6256,7 @@ int daAlink_c::procWolfLieStart() {
checkNextActionWolfFromLie();
} else if (checkInputOnR() &&
(checkAnmEnd(frameCtrl_p) ||
frameCtrl_p->getFrame() > daAlinkHIO_wlLie_c0::m.field_0x14.mCheckFrame))
frameCtrl_p->getFrame() > daAlinkHIO_wlLie_c0::m.field_0x14.mCancelFrame))
{
procWolfLieMoveInit(0);
} else {
@@ -6690,7 +6690,7 @@ int daAlink_c::procWolfSwimUp() {
if (frameCtrl->checkAnmEnd()) {
procWolfSwimWaitInit(0);
} else if (checkInputOnR() &&
frameCtrl->getFrame() > daAlinkHIO_wlSwim_c0::m.field_0x0.mCheckFrame)
frameCtrl->getFrame() > daAlinkHIO_wlSwim_c0::m.field_0x0.mCancelFrame)
{
procWolfSwimMoveInit();
} else {
@@ -6880,7 +6880,7 @@ int daAlink_c::procWolfSwimEndWait() {
if (checkAnmEnd(frameCtrl_p)) {
checkNextActionWolf(0);
} else if (frameCtrl_p->getFrame() > daAlinkHIO_wlSwim_c0::m.field_0x14.mCheckFrame) {
} else if (frameCtrl_p->getFrame() > daAlinkHIO_wlSwim_c0::m.field_0x14.mCancelFrame) {
checkNextActionWolf(1);
}
@@ -7625,12 +7625,12 @@ int daAlink_c::procWolfJumpAttackSlideLandInit(int param_0, int param_1, int par
setSingleAnimeWolfParam(WANM_ATTACK_A_END_BACK, &daAlinkHIO_wlAtLand_c0::m.field_0x28);
mProcVar2.field_0x300c = 1;
field_0x3588.set(-l_wolfBaseAnime.x, l_wolfBaseAnime.y, -l_wolfBaseAnime.z);
field_0x3478 = daAlinkHIO_wlAtLand_c0::m.field_0x28.mCheckFrame;
field_0x3478 = daAlinkHIO_wlAtLand_c0::m.field_0x28.mCancelFrame;
} else {
setSingleAnimeWolfParam(WANM_ATTACK_A_END_FRONT, &daAlinkHIO_wlAtLand_c0::m.field_0x14);
mProcVar2.field_0x300c = 0;
field_0x3588 = l_wolfBaseAnime;
field_0x3478 = daAlinkHIO_wlAtLand_c0::m.field_0x14.mCheckFrame;
field_0x3478 = daAlinkHIO_wlAtLand_c0::m.field_0x14.mCancelFrame;
}
field_0x2f9d = 4;
@@ -7730,7 +7730,7 @@ int daAlink_c::procWolfJumpAttackNormalLand() {
if (frameCtrl->checkAnmEnd()) {
checkNextActionWolf(0);
} else if (frameCtrl->getFrame() > daAlinkHIO_wlAtLand_c0::m.field_0x0.mCheckFrame) {
} else if (frameCtrl->getFrame() > daAlinkHIO_wlAtLand_c0::m.field_0x0.mCancelFrame) {
if (mProcVar2.field_0x300c != 0) {
shape_angle.y -= -0x8000;
return procWolfJumpAttackInit(3);
@@ -7768,7 +7768,7 @@ int daAlink_c::procWolfWaitAttackInit(int i_attackType) {
if (mComboCutCount == 4) {
setCylAtParam(0x80000000, dCcG_At_Spl_UNK_1, 3, 4, 3, atk_hio->field_0x34,
atk_hio->field_0x38);
field_0x3478 = atk_hio->field_0x0.mCheckFrame;
field_0x3478 = atk_hio->field_0x0.mCancelFrame;
mProcVar0.field_0x3008 = atk_hio->field_0x14;
var_f2 = atk_hio->field_0x0.mStartFrame;
} else {
@@ -7932,7 +7932,7 @@ int daAlink_c::procWolfRollAttack() {
if (checkAnmEnd(frameCtrl_p)) {
checkNextActionWolf(0);
} else if (frameCtrl_p->getFrame() > daAlinkHIO_wlAtRoll_c0::m.field_0x0.mCheckFrame) {
} else if (frameCtrl_p->getFrame() > daAlinkHIO_wlAtRoll_c0::m.field_0x0.mCancelFrame) {
checkNextActionWolf(1);
} else if (mProcVar3.field_0x300e == 0 && frameCtrl_p->getFrame() >= 4.0f &&
frameCtrl_p->getFrame() < 13.0f)
@@ -8097,7 +8097,7 @@ int daAlink_c::procWolfDownAtMissLand() {
if (frameCtrl->checkAnmEnd()) {
checkNextActionWolf(0);
} else if (frameCtrl->getFrame() > daAlinkHIO_wlAtDown_c0::m.field_0x64.mCheckFrame) {
} else if (frameCtrl->getFrame() > daAlinkHIO_wlAtDown_c0::m.field_0x64.mCancelFrame) {
checkNextActionWolf(1);
} else if (frameCtrl->getFrame() >= 3.0f && frameCtrl->getFrame() < 8.0f) {
seStartMapInfoLevel(Z2SE_FN_WOLF_SLIP);
@@ -8151,11 +8151,11 @@ int daAlink_c::procWolfLockAttackInit(int param_0) {
}
f32 var_f29 = l_eyePosDelta.abs();
f32 var_f31 = var_f29 / daAlinkHIO_wlAtLock_c0::m.field_0x28.mCheckFrame;
f32 var_f31 = var_f29 / daAlinkHIO_wlAtLock_c0::m.field_0x28.mCancelFrame;
if (var_f31 < 1.0f)
var_f31 = 1.0f;
f32 var_f28 = daAlinkHIO_wlAtLock_c0::m.field_0x28.mCheckFrame / var_f29;
f32 var_f28 = daAlinkHIO_wlAtLock_c0::m.field_0x28.mCancelFrame / var_f29;
mNormalSpeed = var_f28 * l_eyePosDelta.absXZ();
setSpecialGravity((l_eyePosDelta.y * -2.0f) / (var_f31 * var_f31), maxFallSpeed, 0);
speed.y = -gravity * var_f31;
@@ -8339,7 +8339,7 @@ int daAlink_c::procWolfAttackReverse() {
if (checkAnmEnd(frameCtrl_p)) {
checkNextActionWolf(0);
} else if (frameCtrl_p->getFrame() > daAlinkHIO_wlAttack_c0::m.mLandAnm.mCheckFrame) {
} else if (frameCtrl_p->getFrame() > daAlinkHIO_wlAttack_c0::m.mLandAnm.mCancelFrame) {
checkNextActionWolf(1);
}
} else if ((mLinkAcch.ChkGroundHit() || checkEndResetFlg2(ERFLG2_UNK_100)) && checkModeFlg(2)) {
@@ -8531,12 +8531,12 @@ int daAlink_c::procWolfGrabUpInit() {
setSingleAnimeWolfParam(WANM_PICKUP_A, &daAlinkHIO_wlGrab_c0::m.field_0x0);
var_f31 = 120.0f;
field_0x3478 = 10.0f;
field_0x347c = daAlinkHIO_wlGrab_c0::m.field_0x0.mCheckFrame;
field_0x347c = daAlinkHIO_wlGrab_c0::m.field_0x0.mCancelFrame;
} else {
setSingleAnimeWolfParam(WANM_PICKUP_B, &daAlinkHIO_wlGrab_c0::m.field_0x28);
var_f31 = 80.0f;
field_0x3478 = 7.0f;
field_0x347c = daAlinkHIO_wlGrab_c0::m.field_0x28.mCheckFrame;
field_0x347c = daAlinkHIO_wlGrab_c0::m.field_0x28.mCancelFrame;
}
setGrabItemActor(field_0x27f4);
@@ -8615,11 +8615,11 @@ int daAlink_c::procWolfGrabPutInit() {
if (grab_obj) {
setSingleAnimeWolfParam(WANM_PICKUP_A, &daAlinkHIO_wlGrab_c0::m.field_0x14);
field_0x3478 = 10.0f;
field_0x347c = daAlinkHIO_wlGrab_c0::m.field_0x14.mCheckFrame;
field_0x347c = daAlinkHIO_wlGrab_c0::m.field_0x14.mCancelFrame;
} else {
setSingleAnimeWolfParam(WANM_PICKUP_B, &daAlinkHIO_wlGrab_c0::m.field_0x3C);
field_0x3478 = 7.0f;
field_0x347c = daAlinkHIO_wlGrab_c0::m.field_0x3C.mCheckFrame;
field_0x347c = daAlinkHIO_wlGrab_c0::m.field_0x3C.mCancelFrame;
}
mNormalSpeed = 0.0f;
@@ -8693,7 +8693,7 @@ int daAlink_c::procWolfGrabThrow() {
if (frameCtrl->checkAnmEnd()) {
checkNextActionWolf(0);
} else if (frameCtrl->getFrame() > daAlinkHIO_wlGrab_c0::m.field_0x50.mCheckFrame) {
} else if (frameCtrl->getFrame() > daAlinkHIO_wlGrab_c0::m.field_0x50.mCancelFrame) {
checkNextActionWolf(1);
}
@@ -8867,7 +8867,7 @@ int daAlink_c::procWolfChainUp() {
setWallGrabStatus(0x96, 2);
if (frameCtrl->checkAnmEnd() ||
(checkInputOnR() && frameCtrl->getFrame() > daAlinkHIO_wlGrab_c0::m.field_0x28.mCheckFrame))
(checkInputOnR() && frameCtrl->getFrame() > daAlinkHIO_wlGrab_c0::m.field_0x28.mCancelFrame))
{
u8 old_2fa3 = field_0x2fa3;
fopAc_ac_c* old_actor = field_0x2844.getActor();
src/d/actor/d_a_cow.cpp
+1 -1
View File
@@ -1808,7 +1808,7 @@ void daCow_c::action_enter() {
}
/* 8065CFBC-8065D03C 004ADC 0080+00 4/4 0/0 1/1 .text isAngry__7daCow_cFv */
void daCow_c::isAngry() {
bool daCow_c::isAngry() {
// NONMATCHING
}
src/d/actor/d_a_horse.cpp
+4468 -2695
View File
File diff suppressed because it is too large Load Diff