From 729f81babf0cad204ad260b236b22cd3531dd863 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Wed, 10 Dec 2025 17:31:47 -0500 Subject: [PATCH] Fix HIO load issues for d_a_player_main --- include/d/actor/d_a_player_HIO.h | 99 ++- include/d/actor/d_a_player_main.h | 37 +- src/d/actor/d_a_player_HIO_data.inc | 24 +- src/d/actor/d_a_player_battle.inc | 132 +-- src/d/actor/d_a_player_boomerang.inc | 36 +- src/d/actor/d_a_player_bottle.inc | 66 +- src/d/actor/d_a_player_bow.inc | 28 +- src/d/actor/d_a_player_climb.inc | 36 +- src/d/actor/d_a_player_crawl.inc | 48 +- src/d/actor/d_a_player_dproc.inc | 162 ++-- src/d/actor/d_a_player_fan.inc | 96 +- src/d/actor/d_a_player_food.inc | 18 +- src/d/actor/d_a_player_grab.inc | 154 ++-- src/d/actor/d_a_player_hammer.inc | 62 +- src/d/actor/d_a_player_hang.inc | 66 +- src/d/actor/d_a_player_hook.inc | 10 +- src/d/actor/d_a_player_ladder.inc | 24 +- src/d/actor/d_a_player_main.cpp | 1224 +++++++++++++------------- src/d/actor/d_a_player_particle.inc | 10 +- src/d/actor/d_a_player_pushpull.inc | 10 +- src/d/actor/d_a_player_rope.inc | 88 +- src/d/actor/d_a_player_ship.inc | 42 +- src/d/actor/d_a_player_swim.inc | 76 +- src/d/actor/d_a_player_sword.inc | 496 +++++------ src/d/actor/d_a_player_tact.inc | 38 +- src/d/actor/d_a_player_vomit.inc | 48 +- src/d/actor/d_a_player_weapon.inc | 92 +- src/d/actor/d_a_player_whide.inc | 106 +-- 28 files changed, 1698 insertions(+), 1630 deletions(-) diff --git a/include/d/actor/d_a_player_HIO.h b/include/d/actor/d_a_player_HIO.h index 6032adf6..f57b3649 100644 --- a/include/d/actor/d_a_player_HIO.h +++ b/include/d/actor/d_a_player_HIO.h @@ -544,6 +544,21 @@ public: class daPy_HIO_cut_c0 { public: + static daPy_HIO_cutA_c0 const mCutA; + static daPy_HIO_cutF_c0 const mCutF; + static daPy_HIO_cutR_c0 const mCutR; + static daPy_HIO_cutL_c0 const mCutL; + static daPy_HIO_cutEA_c0 const mCutEA; + static daPy_HIO_cutEB_c0 const mCutEB; + static daPy_HIO_cutExA_c0 const mCutExA; + static daPy_HIO_cutExB_c0 const mCutExB; + static daPy_HIO_cutExMJ_c0 const mCutExMJ; + static daPy_HIO_cutKesa_c0 const mCutKesa; + static daPy_HIO_cutTurn_c0 const mCutTurn; + static daPy_HIO_cutTurnR_c0 const mCutTurnR; + static daPy_HIO_cutRoll_c0 const mCutRoll; + static daPy_HIO_cutJump_c0 const mCutJump; + static daPy_HIO_cutBoko_c0 const mCutBoko; static daPy_HIO_cut_c1 const m; }; @@ -849,6 +864,21 @@ public: static daPy_HIO_b_verJump_c1 const m; }; +class daPy_HIO_battle_c1 { +public: + /* 0x00 */ f32 field_0x0; + /* 0x04 */ f32 field_0x4; +}; + +class daPy_HIO_battle_c0 { +public: + static daPy_HIO_b_jump_c0 const mBJump; + static daPy_HIO_b_roll_c0 const mBRoll; + static daPy_HIO_b_slide_c0 const mBSlide; + static daPy_HIO_b_verJump_c0 const mBVerJump; + static daPy_HIO_battle_c1 const m; +}; + class daPy_HIO_wall_c1 { public: /* 0x00 */ s16 field_0x0; @@ -1188,6 +1218,21 @@ public: static daPy_HIO_elecDamage_c1 const m; }; +class daPy_HIO_dam_c1 { +public: + /* 0x00 */ s16 field_0x0; + /* 0x02 */ s16 field_0x2; +}; + +class daPy_HIO_dam_c0 { +public: + static daPy_HIO_damage_c0 const mDamage; + static daPy_HIO_laDamage_c0 const mLaDamage; + static daPy_HIO_huDamage_c0 const mHuDamage; + static daPy_HIO_elecDamage_c0 const mElecDamage; + static daPy_HIO_dam_c1 const m; +}; + class daPy_HIO_slowJump_c1 { public: /* 0x00 */ s16 field_0x0; @@ -1600,6 +1645,17 @@ public: static daPy_HIO_food_c1 const m; }; +class daPy_HIO_magicShield_c1 { +public: + /* 0x00 */ s16 field_0x0; + /* 0x02 */ s16 field_0x2; +}; + +class daPy_HIO_magicShield_c0 { +public: + static daPy_HIO_magicShield_c1 const m; +}; + class daPy_HIO_item_c1 { public: /* 0x00 */ s16 field_0x0; @@ -1620,6 +1676,16 @@ public: class daPy_HIO_item_c0 { public: + static daPy_HIO_rope_c0 const mRope; + static daPy_HIO_boom_c0 const mBoom; + static daPy_HIO_fan_c0 const mFan; + static daPy_HIO_tact_c0 const mTact; + static daPy_HIO_ham_c0 const mHam; + static daPy_HIO_boots_c0 const mBoots; + static daPy_HIO_bottle_c0 const mBottle; + static daPy_HIO_bow_c0 const mBow; + static daPy_HIO_food_c0 const mFood; + static daPy_HIO_magicShield_c0 const mMagicShield; static daPy_HIO_item_c1 const m; }; @@ -1733,37 +1799,4 @@ public: static daPy_HIO_warp_c1 const m; }; -class daPy_HIO_battle_c1 { -public: - /* 0x00 */ f32 field_0x0; - /* 0x04 */ f32 field_0x4; -}; - -class daPy_HIO_battle_c0 { -public: - static daPy_HIO_battle_c1 const m; -}; - -class daPy_HIO_dam_c1 { -public: - /* 0x00 */ s16 field_0x0; - /* 0x02 */ s16 field_0x2; -}; - -class daPy_HIO_dam_c0 { -public: - static daPy_HIO_dam_c1 const m; -}; - -class daPy_HIO_magicShield_c1 { -public: - /* 0x00 */ s16 field_0x0; - /* 0x02 */ s16 field_0x2; -}; - -class daPy_HIO_magicShield_c0 { -public: - static daPy_HIO_magicShield_c1 const m; -}; - #endif /* D_A_PLAYER_HIO_H */ diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h index 79d0607d..058433d7 100644 --- a/include/d/actor/d_a_player_main.h +++ b/include/d/actor/d_a_player_main.h @@ -9,6 +9,7 @@ #include "d/d_drawlist.h" #include "d/d_bg_w.h" #include "d/actor/d_a_player.h" +#include "d/actor/d_a_player_HIO.h" #include "d/res/res_link.h" // IWYU pragma: export #include "d/res/res_lkanm.h" @@ -375,7 +376,41 @@ public: daPy_HIO_c(); public: - /* 0x00 */ u8 temp[0x3F - 0x00]; + daPy_HIO_basic_c0 mBasic; + daPy_HIO_move_c0 mMove; + daPy_HIO_atnMove_c0 mAtnMove; + daPy_HIO_atnMoveB_c0 mAtnMoveB; + daPy_HIO_turn_c0 mTurn; + daPy_HIO_cut_c0 mCut; + daPy_HIO_roll_c0 mRoll; + daPy_HIO_backJump_c0 mBackJump; + daPy_HIO_slip_c0 mSlip; + daPy_HIO_slide_c0 mSlide; + daPy_HIO_autoJump_c0 mAutoJump; + daPy_HIO_fall_c0 mFall; + daPy_HIO_swim_c0 mSwim; + daPy_HIO_battle_c0 mBattle; + daPy_HIO_wall_c0 mWall; + daPy_HIO_smallJump_c0 mSmallJump; + daPy_HIO_wallCatch_c0 mWallCatch; + daPy_HIO_hang_c0 mHang; + daPy_HIO_guard_c0 mGuard; + daPy_HIO_nockback_c0 mNockback; + daPy_HIO_iceSlip_c0 mIceSlip; + daPy_HIO_dam_c0 mDam; + daPy_HIO_slowJump_c0 mSlowJump; + daPy_HIO_sideStep_c0 mSideStep; + daPy_HIO_grab_c0 mGrab; + daPy_HIO_ladder_c0 mLadder; + daPy_HIO_crouch_c0 mCrouch; + daPy_HIO_pushpull_c0 mPushpull; + daPy_HIO_item_c0 mItem; + daPy_HIO_ship_c0 mShip; + daPy_HIO_restart_c0 mRestart; + daPy_HIO_holdup_c0 mHoldup; + daPy_HIO_vomit_c0 mVomit; + daPy_HIO_warp_c0 mWarp; + u8 pad[0x3F - 0x22]; }; // Size: 0x3F class daPy_lk_c : public daPy_py_c { diff --git a/src/d/actor/d_a_player_HIO_data.inc b/src/d/actor/d_a_player_HIO_data.inc index 0e1143d6..bd9faf4e 100644 --- a/src/d/actor/d_a_player_HIO_data.inc +++ b/src/d/actor/d_a_player_HIO_data.inc @@ -150,6 +150,10 @@ const daPy_HIO_b_verJump_c1 daPy_HIO_b_verJump_c0::m = { 4.0f, 8.0f, -7.0f, -10.0f, 1.0f, 2.0f, 0.0f, 5.5f, 25.0f, }; +const daPy_HIO_battle_c1 daPy_HIO_battle_c0::m = { + 0.0f, 1.5f, +}; + const daPy_HIO_wall_c1 daPy_HIO_wall_c0::m = { 10, 7, 14, 14, 28, 28, 1.3f, 1.1f, 1.6f, 1.8f, 0.8f, 0.9f, 3.0f, 0.0f, 1.0f, 1.0f, 5.0f, 5.0f, 5.0f, 5.0f, 5.0f, 5.0f, 5.0f, 8.5f, 25.0f, 0.9f, 0.9f, 1.0f, 0.98f, @@ -207,6 +211,10 @@ const daPy_HIO_elecDamage_c1 daPy_HIO_elecDamage_c0::m = { 0.0f, }; +const daPy_HIO_dam_c1 daPy_HIO_dam_c0::m = { + 30, 20, +}; + const daPy_HIO_slowJump_c1 daPy_HIO_slowJump_c0::m = { 19, 40, -2.0f, 16.25f, 10.5f, 0.9f, 0.0f, 15.0f, 5.0f, 2.0f, 0.8f, 0.0f, 5.0f, 25.0f, 100.0f, 6.0f, @@ -278,6 +286,10 @@ const daPy_HIO_food_c1 daPy_HIO_food_c0::m = { 17, 21, 0.6f, 0.0f, 4.0f, 1.1f, 2.0f, 4.0f, }; +const daPy_HIO_magicShield_c1 daPy_HIO_magicShield_c0::m = { + 60, 0, +}; + const daPy_HIO_item_c1 daPy_HIO_item_c0::m = { 15, 10, 7, 1.0f, 2.0f, 1.0f, 0.7f, 1.0f, 3.0f, 4.0f, 0.8f, 3.0f, 4.0f, 6.0f, }; @@ -303,15 +315,3 @@ const daPy_HIO_vomit_c1 daPy_HIO_vomit_c0::m = { const daPy_HIO_warp_c1 daPy_HIO_warp_c0::m = { 53, 12, 28, 4, 1.2f, 1.6f, 0.5f, 0.1f, 1.35f, }; - -const daPy_HIO_battle_c1 daPy_HIO_battle_c0::m = { - 0.0f, 1.5f, -}; - -const daPy_HIO_dam_c1 daPy_HIO_dam_c0::m = { - 30, 20, -}; - -const daPy_HIO_magicShield_c1 daPy_HIO_magicShield_c0::m = { - 60, 0, -}; diff --git a/src/d/actor/d_a_player_battle.inc b/src/d/actor/d_a_player_battle.inc index 136475c6..257f0fb2 100644 --- a/src/d/actor/d_a_player_battle.inc +++ b/src/d/actor/d_a_player_battle.inc @@ -44,7 +44,7 @@ void daPy_lk_c::setSpecialBattle(BOOL param_0) { if (enemy->getBtAttackType() == 0) { return; } - if (enemy->getBtStartFrame() - daPy_HIO_battle_c0::m.field_0x4 <= enemy->getBtNowFrame() && + if (enemy->getBtStartFrame() - m_HIO->mBattle.m.field_0x4 <= enemy->getBtNowFrame() && enemy->getBtNowFrame() < enemy->getBtEndFrame() && enemy->getBtMaxDis() > fopAcM_searchActorDistanceXZ(this, enemy)) { @@ -85,13 +85,13 @@ BOOL daPy_lk_c::procBtJump_init(fopEn_enemy_c* enemy) { cXyz local_34 = enemy->current.pos - current.pos; commonProcInit(daPyProc_BT_JUMP_e); - gravity = daPy_HIO_b_jump_c0::m.field_0x20; + gravity = m_HIO->mBattle.mBJump.m.field_0x20; setSingleMoveAnime( ANM_MJMP, - daPy_HIO_b_jump_c0::m.field_0x8, - daPy_HIO_b_jump_c0::m.field_0x14, + m_HIO->mBattle.mBJump.m.field_0x8, + m_HIO->mBattle.mBJump.m.field_0x14, -1, - daPy_HIO_b_jump_c0::m.field_0x10 + m_HIO->mBattle.mBJump.m.field_0x10 ); fVar1 = local_34.y + enemy->getBtHeight(); if (local_34.y + enemy->getBtHeight() < 30.0f) { @@ -109,7 +109,7 @@ BOOL daPy_lk_c::procBtJump_init(fopEn_enemy_c* enemy) { m370C.x = enemy->current.pos.x - enemy->getBtBodyR() * cM_ssin(enemy->shape_angle.y); m370C.y = enemy->current.pos.y; m370C.z = enemy->current.pos.z - enemy->getBtBodyR() * cM_scos(enemy->shape_angle.y); - if (daPy_HIO_b_jump_c0::m.field_0x18 <= 0.0f) { + if (m_HIO->mBattle.mBJump.m.field_0x18 <= 0.0f) { speed.y = m35A0; mVelocity = m35A4; mProcVar0.m3570 = 1; @@ -125,14 +125,14 @@ BOOL daPy_lk_c::procBtJump_init(fopEn_enemy_c* enemy) { /* 8013E72C-8013E860 .text procBtJump__9daPy_lk_cFv */ BOOL daPy_lk_c::procBtJump() { if (mProcVar0.m3570 == 0) { - if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= daPy_HIO_b_jump_c0::m.field_0x18) { + if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= m_HIO->mBattle.mBJump.m.field_0x18) { speed.y = m35A0; mVelocity = m35A4; mProcVar0.m3570 = 1; } } else { if (mAcch.ChkGroundHit()) { - return changeLandProc(daPy_HIO_b_jump_c0::m.field_0xC); + return changeLandProc(m_HIO->mBattle.mBJump.m.field_0xC); } if (mProcVar0.m3570 == 1) { m34D0++; @@ -142,7 +142,7 @@ BOOL daPy_lk_c::procBtJump() { } else { u32 uVar2 = cM_atan2s(mVelocity, -speed.y); f32 temp = cM_ssin(uVar2 * 2); - m34F2 = -daPy_HIO_b_jump_c0::m.field_0x6 * temp; + m34F2 = -m_HIO->mBattle.mBJump.m.field_0x6 * temp; setFallVoice(); } } @@ -154,17 +154,17 @@ BOOL daPy_lk_c::procBtJumpCut_init(cXyz* param_0) { commonProcInit(daPyProc_BT_JUMP_CUT_e); setSingleMoveAnime( ANM_MJMPC, - daPy_HIO_b_jump_c0::m.field_0x28, - daPy_HIO_b_jump_c0::m.field_0x30, - daPy_HIO_b_jump_c0::m.field_0x4, - daPy_HIO_b_jump_c0::m.field_0x2C + m_HIO->mBattle.mBJump.m.field_0x28, + m_HIO->mBattle.mBJump.m.field_0x30, + m_HIO->mBattle.mBJump.m.field_0x4, + m_HIO->mBattle.mBJump.m.field_0x2C ); if (checkNormalSwordEquip()) { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_MJMPCA)); } else { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_MJMPCMS)); } - m35EC = daPy_HIO_b_jump_c0::m.field_0x30; + m35EC = m_HIO->mBattle.mBJump.m.field_0x30; mVelocity = 0.0f; gravity = 0.0f; speed.y = 0.0f; @@ -181,14 +181,14 @@ BOOL daPy_lk_c::procBtJumpCut_init(cXyz* param_0) { /* 8013E9D4-8013EBD0 .text procBtJumpCut__9daPy_lk_cFv */ BOOL daPy_lk_c::procBtJumpCut() { m35EC = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame(); - if (speed.y < 0.0f && daPy_HIO_b_jump_c0::m.field_0x0 == 1) { + if (speed.y < 0.0f && m_HIO->mBattle.mBJump.m.field_0x0 == 1) { u32 uVar2 = cM_atan2s(mVelocity, -speed.y); f32 temp = cM_ssin(uVar2 * 2); - m34F2 = -daPy_HIO_b_jump_c0::m.field_0x6 * temp; + m34F2 = -m_HIO->mBattle.mBJump.m.field_0x6 * temp; } f32 frame = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame(); - if (frame >= daPy_HIO_b_jump_c0::m.field_0x44 && frame < daPy_HIO_b_jump_c0::m.field_0x48) { + if (frame >= m_HIO->mBattle.mBJump.m.field_0x44 && frame < m_HIO->mBattle.mBJump.m.field_0x48) { onResetFlg0(daPyRFlg0_UNK2); if (!checkNoResetFlg0(daPyFlg0_CUT_AT_FLG)) { onResetFlg0(daPyRFlg0_UNK1); @@ -197,17 +197,17 @@ BOOL daPy_lk_c::procBtJumpCut() { } if (mAcch.ChkGroundHit()) { - return changeLandProc(daPy_HIO_b_jump_c0::m.field_0xC); + return changeLandProc(m_HIO->mBattle.mBJump.m.field_0xC); } if (mProcVar0.m3570 == 0 && mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { - gravity = daPy_HIO_b_jump_c0::m.field_0x3C; - speed.y = daPy_HIO_b_jump_c0::m.field_0x34; - mVelocity = daPy_HIO_b_jump_c0::m.field_0x38; + gravity = m_HIO->mBattle.mBJump.m.field_0x3C; + speed.y = m_HIO->mBattle.mBJump.m.field_0x34; + mVelocity = m_HIO->mBattle.mBJump.m.field_0x38; mProcVar0.m3570 = 1; - } else if (mProcVar0.m3570 == 1 && speed.y < -gravity && daPy_HIO_b_jump_c0::m.field_0x0 == 1) { + } else if (mProcVar0.m3570 == 1 && speed.y < -gravity && m_HIO->mBattle.mBJump.m.field_0x0 == 1) { mProcVar0.m3570 = 2; - setSingleMoveAnime(ANM_JMPEDS, 0.0f, 0.0f, -1, daPy_HIO_b_jump_c0::m.field_0x40); + setSingleMoveAnime(ANM_JMPEDS, 0.0f, 0.0f, -1, m_HIO->mBattle.mBJump.m.field_0x40); offModeFlg(ModeFlg_00000400); setTextureAnime(0x37, 0); resetSeAnime(); @@ -223,9 +223,9 @@ BOOL daPy_lk_c::procBtSlide() { f32 dVar1 = cLib_addCalc( &mVelocity, 0.0f, - daPy_HIO_b_slide_c0::m.field_0x4, - daPy_HIO_b_slide_c0::m.field_0x8, - daPy_HIO_b_slide_c0::m.field_0xC + m_HIO->mBattle.mBSlide.m.field_0x4, + m_HIO->mBattle.mBSlide.m.field_0x8, + m_HIO->mBattle.mBSlide.m.field_0xC ); if (dVar1 <= 0.001f) { checkNextMode(0); @@ -256,10 +256,10 @@ BOOL daPy_lk_c::procBtRoll_init(fopEn_enemy_c* enemy) { } setSingleMoveAnime( anm, - daPy_HIO_b_roll_c0::m.field_0xC, - daPy_HIO_b_roll_c0::m.field_0x10, - daPy_HIO_b_roll_c0::m.field_0x6, - daPy_HIO_b_roll_c0::m.field_0x14 + m_HIO->mBattle.mBRoll.m.field_0xC, + m_HIO->mBattle.mBRoll.m.field_0x10, + m_HIO->mBattle.mBRoll.m.field_0x6, + m_HIO->mBattle.mBRoll.m.field_0x14 ); cXyz local_2c = current.pos - local_38; @@ -278,7 +278,7 @@ BOOL daPy_lk_c::procBtRoll_init(fopEn_enemy_c* enemy) { BOOL daPy_lk_c::procBtRoll() { s16 sVar1 = m34D4; cLib_addCalcAngleS( - &m34D4, 0, daPy_HIO_b_roll_c0::m.field_0x4, daPy_HIO_b_roll_c0::m.field_0x0, daPy_HIO_b_roll_c0::m.field_0x2 + &m34D4, 0, m_HIO->mBattle.mBRoll.m.field_0x4, m_HIO->mBattle.mBRoll.m.field_0x0, m_HIO->mBattle.mBRoll.m.field_0x2 ); s16 sVar3 = sVar1 - m34D4; @@ -296,7 +296,7 @@ BOOL daPy_lk_c::procBtRoll() { current.pos.x = local_28.x + m35A0 * cM_ssin(m34D6); current.pos.z = local_28.z + m35A0 * cM_scos(m34D6); shape_angle.y = m34D6 + 0x8000; - if (abs((int)sVar3) < daPy_HIO_b_roll_c0::m.field_0x2) { + if (abs((int)sVar3) < m_HIO->mBattle.mBRoll.m.field_0x2) { resetFootEffect(); } @@ -331,10 +331,10 @@ BOOL daPy_lk_c::procBtRollCut_init(cXyz* param_0) { setSingleMoveAnime( dVar4, - daPy_HIO_b_roll_c0::m.field_0x1C, - daPy_HIO_b_roll_c0::m.field_0x20, - daPy_HIO_b_roll_c0::m.field_0x8, - daPy_HIO_b_roll_c0::m.field_0x24 + m_HIO->mBattle.mBRoll.m.field_0x1C, + m_HIO->mBattle.mBRoll.m.field_0x20, + m_HIO->mBattle.mBRoll.m.field_0x8, + m_HIO->mBattle.mBRoll.m.field_0x24 ); if (checkNormalSwordEquip()) { @@ -343,12 +343,12 @@ BOOL daPy_lk_c::procBtRollCut_init(cXyz* param_0) { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_MROLLCMS)); } - m35EC = daPy_HIO_b_roll_c0::m.field_0x20; + m35EC = m_HIO->mBattle.mBRoll.m.field_0x20; m370C = *param_0; m34D4 = 0; - mVelocity = daPy_HIO_b_roll_c0::m.field_0x28; - speed.y = daPy_HIO_b_roll_c0::m.field_0x2C; - gravity = daPy_HIO_b_roll_c0::m.field_0x30; + mVelocity = m_HIO->mBattle.mBRoll.m.field_0x28; + speed.y = m_HIO->mBattle.mBRoll.m.field_0x2C; + gravity = m_HIO->mBattle.mBRoll.m.field_0x30; voiceStart(1); setExtraFinishCutAtParam(15); offNoResetFlg0(daPyFlg0_NO_FALL_VOICE); @@ -371,7 +371,7 @@ BOOL daPy_lk_c::procBtRollCut() { m34D4 = 1; onResetFlg0(daPyRFlg0_UNK2); } else if (m34D4 == 1) { - setSingleMoveAnime(ANM_JMPEDS, 0.0f, 0.0f, -1, daPy_HIO_b_roll_c0::m.field_0x38); + setSingleMoveAnime(ANM_JMPEDS, 0.0f, 0.0f, -1, m_HIO->mBattle.mBRoll.m.field_0x38); offModeFlg(ModeFlg_00000400); setTextureAnime(0x37, 0); resetSeAnime(); @@ -380,21 +380,21 @@ BOOL daPy_lk_c::procBtRollCut() { if (m34D4 > 1) { int iVar3 = mProcVar0.m3570; if ((iVar3 > 0 && m34EC < 0) || (iVar3 < 0 && m34EC > 0)) { - cLib_addCalcAngleS(&m34EC, -iVar3, 4, daPy_HIO_b_roll_c0::m.field_0xA, 0x200); + cLib_addCalcAngleS(&m34EC, -iVar3, 4, m_HIO->mBattle.mBRoll.m.field_0xA, 0x200); } else { - m34EC += iVar3 * daPy_HIO_b_roll_c0::m.field_0xA; + m34EC += iVar3 * m_HIO->mBattle.mBRoll.m.field_0xA; } } if (mAcch.ChkGroundHit()) { shape_angle.y = shape_angle.y + m34EC; current.angle.y = shape_angle.y; - return changeLandProc(daPy_HIO_autoJump_c0::m.field_0x24); + return changeLandProc(m_HIO->mAutoJump.m.field_0x24); } } else { onResetFlg0(daPyRFlg0_UNK2); } if (speed.y < -gravity) { - gravity = daPy_HIO_b_roll_c0::m.field_0x34; + gravity = m_HIO->mBattle.mBRoll.m.field_0x34; } setFallVoice(); return true; @@ -405,14 +405,14 @@ BOOL daPy_lk_c::procBtVerticalJump_init(fopEn_enemy_c* enemy) { commonProcInit(daPyProc_BT_VERTICAL_JUMP_e); setSingleMoveAnime( ANM_MSTEPOVER, - daPy_HIO_b_verJump_c0::m.field_0x8, - daPy_HIO_b_verJump_c0::m.field_0xC, - daPy_HIO_b_verJump_c0::m.field_0x0, - daPy_HIO_b_verJump_c0::m.field_0x10 + m_HIO->mBattle.mBVerJump.m.field_0x8, + m_HIO->mBattle.mBVerJump.m.field_0xC, + m_HIO->mBattle.mBVerJump.m.field_0x0, + m_HIO->mBattle.mBVerJump.m.field_0x10 ); mVelocity = 0.0f; - gravity = daPy_HIO_b_verJump_c0::m.field_0x14; - speed.y = daPy_HIO_b_verJump_c0::m.field_0x18; + gravity = m_HIO->mBattle.mBVerJump.m.field_0x14; + speed.y = m_HIO->mBattle.mBVerJump.m.field_0x18; offNoResetFlg0(daPyFlg0_NO_FALL_VOICE); current.angle.y = shape_angle.y; voiceStart(6); @@ -425,7 +425,7 @@ BOOL daPy_lk_c::procBtVerticalJump_init(fopEn_enemy_c* enemy) { BOOL daPy_lk_c::procBtVerticalJump() { setFallVoice(); if (mAcch.ChkGroundHit()) { - changeLandProc(daPy_HIO_autoJump_c0::m.field_0x24); + changeLandProc(m_HIO->mAutoJump.m.field_0x24); } else if (speed.y < -(gravity * 2.0f)) { procBtVerticalJumpCut_init(); } @@ -437,14 +437,14 @@ BOOL daPy_lk_c::procBtVerticalJumpCut_init() { commonProcInit(daPyProc_BT_VERTICAL_JUMP_CUT_e); setSingleMoveAnime( ANM_MSTEPOVERA, - daPy_HIO_b_verJump_c0::m.field_0x1C, - daPy_HIO_b_verJump_c0::m.field_0x20, - daPy_HIO_b_verJump_c0::m.field_0x2, - daPy_HIO_b_verJump_c0::m.field_0x24 + m_HIO->mBattle.mBVerJump.m.field_0x1C, + m_HIO->mBattle.mBVerJump.m.field_0x20, + m_HIO->mBattle.mBVerJump.m.field_0x2, + m_HIO->mBattle.mBVerJump.m.field_0x24 ); mpCutfBpk->setFrame(0.0f); mpCutfBtk->setFrame(0.0f); - gravity = daPy_HIO_b_verJump_c0::m.field_0x28; + gravity = m_HIO->mBattle.mBVerJump.m.field_0x28; setExtraFinishCutAtParam(16); dComIfGp_setPlayerStatus0(0, (daPyStts0_UNK2_e | daPyStts0_UNK400_e)); return true; @@ -470,7 +470,7 @@ BOOL daPy_lk_c::procBtVerticalJumpCut() { voiceStart(1); onResetFlg0(daPyRFlg0_UNK1); seStartSwordCut(JA_SE_LK_SW_KAZEKIRI_S); - gravity = daPy_HIO_b_verJump_c0::m.field_0x2C; + gravity = m_HIO->mBattle.mBVerJump.m.field_0x2C; } onResetFlg0(daPyRFlg0_UNK2); } @@ -483,19 +483,19 @@ BOOL daPy_lk_c::procBtVerticalJumpLand_init() { f32 fVar1 = m35F0 - current.pos.y; if (!dComIfGp_event_runCheck()) { - if (fVar1 >= 100.0f * daPy_HIO_fall_c0::m.field_0x10) { + if (fVar1 >= 100.0f * m_HIO->mFall.m.field_0x10) { setDamagePoint(-2.0f); - } else if (fVar1 >= 100.0f * daPy_HIO_fall_c0::m.field_0x14) { + } else if (fVar1 >= 100.0f * m_HIO->mFall.m.field_0x14) { setDamagePoint(-1.0f); } } commonProcInit(daPyProc_BT_VERTICAL_JUMP_LAND_e); setSingleMoveAnime( ANM_MSTEPOVERLAND, - daPy_HIO_b_verJump_c0::m.field_0x30, - daPy_HIO_b_verJump_c0::m.field_0x34, - daPy_HIO_b_verJump_c0::m.field_0x4, - daPy_HIO_b_verJump_c0::m.field_0x38 + m_HIO->mBattle.mBVerJump.m.field_0x30, + m_HIO->mBattle.mBVerJump.m.field_0x34, + m_HIO->mBattle.mBVerJump.m.field_0x4, + m_HIO->mBattle.mBVerJump.m.field_0x38 ); dComIfGp_getVibration().StartShock(6, -0x21, cXyz(0.0f, 1.0f, 0.0f)); if (!checkNoResetFlg0(daPyFlg0_UNK10000000)) { @@ -508,8 +508,8 @@ BOOL daPy_lk_c::procBtVerticalJumpLand_init() { BOOL daPy_lk_c::procBtVerticalJumpLand() { if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { procBackJump_init(); - mVelocity = daPy_HIO_b_verJump_c0::m.field_0x3C; - speed.y = daPy_HIO_b_verJump_c0::m.field_0x40; + mVelocity = m_HIO->mBattle.mBVerJump.m.field_0x3C; + speed.y = m_HIO->mBattle.mBVerJump.m.field_0x40; } return true; } diff --git a/src/d/actor/d_a_player_boomerang.inc b/src/d/actor/d_a_player_boomerang.inc index 13a808d6..6849cd81 100644 --- a/src/d/actor/d_a_player_boomerang.inc +++ b/src/d/actor/d_a_player_boomerang.inc @@ -76,10 +76,10 @@ BOOL daPy_lk_c::checkNextActionBoomerangReady() { setActAnimeUpper( LKANM_BCK_BOOMTHROW, UPPER_MOVE2_e, - daPy_HIO_boom_c0::m.field_0x4, - daPy_HIO_boom_c0::m.field_0x8, - daPy_HIO_boom_c0::m.field_0x0, - daPy_HIO_boom_c0::m.field_0xC + m_HIO->mItem.mBoom.m.field_0x4, + m_HIO->mItem.mBoom.m.field_0x8, + m_HIO->mItem.mBoom.m.field_0x0, + m_HIO->mItem.mBoom.m.field_0xC ); setPriTextureAnime(0x48, 0); return true; @@ -93,7 +93,7 @@ void daPy_lk_c::checkNextActionBoomerangFly() { checkNextActionBoomerangReady(); } else if (itemTrigger() && mEquipItem == getReadyItem()) { setActAnimeUpper( - LKANM_BCK_BOOMWAIT, UPPER_MOVE2_e, daPy_HIO_boom_c0::m.field_0x18, 0.0f, -1, daPy_HIO_basic_c0::m.field_0xC + LKANM_BCK_BOOMWAIT, UPPER_MOVE2_e, m_HIO->mItem.mBoom.m.field_0x18, 0.0f, -1, m_HIO->mBasic.m.field_0xC ); } } @@ -119,10 +119,10 @@ BOOL daPy_lk_c::changeBoomerangCatchProc() { setActAnimeUpper( LKANM_BCK_BOOMCATCH, UPPER_MOVE2_e, - daPy_HIO_boom_c0::m.field_0x20, - daPy_HIO_boom_c0::m.field_0x24, - daPy_HIO_boom_c0::m.field_0x2, - daPy_HIO_boom_c0::m.field_0x28 + m_HIO->mItem.mBoom.m.field_0x20, + m_HIO->mItem.mBoom.m.field_0x24, + m_HIO->mItem.mBoom.m.field_0x2, + m_HIO->mItem.mBoom.m.field_0x28 ); setPriTextureAnime(0x49, 0); seStartOnlyReverb(JA_SE_LK_BOOM_CATCH); @@ -146,7 +146,7 @@ BOOL daPy_lk_c::procBoomerangSubject_init() { mVelocity = 0.0f; setActAnimeUpper(LKANM_BCK_BOOMWAIT, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); - setSingleMoveAnime(ANM_ATNRS, 0.0f, 0.0f, -1, daPy_HIO_basic_c0::m.field_0xC); + setSingleMoveAnime(ANM_ATNRS, 0.0f, 0.0f, -1, m_HIO->mBasic.m.field_0xC); dComIfGp_setPlayerStatus0(0, daPyStts0_BOOMERANG_AIM_e); @@ -201,8 +201,8 @@ BOOL daPy_lk_c::procBoomerangMove_init() { mDirection = DIR_RIGHT; current.angle.y = shape_angle.y + -0x4000; } - setActAnimeUpper(LKANM_BCK_BOOMWAIT, UPPER_MOVE2_e, daPy_HIO_boom_c0::m.field_0x18, 0.0f, -1, -1.0f); - setBlendAtnMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setActAnimeUpper(LKANM_BCK_BOOMWAIT, UPPER_MOVE2_e, m_HIO->mItem.mBoom.m.field_0x18, 0.0f, -1, -1.0f); + setBlendAtnMoveAnime(m_HIO->mBasic.m.field_0xC); dComIfGp_setPlayerStatus0(0, daPyStts0_BOOMERANG_AIM_e); return true; } @@ -225,7 +225,7 @@ BOOL daPy_lk_c::procBoomerangMove() { onModeFlg(ModeFlg_00000001); if (mDirection != DIR_RIGHT) { mDirection = DIR_RIGHT; - fVar1 = daPy_HIO_basic_c0::m.field_0xC; + fVar1 = m_HIO->mBasic.m.field_0xC; } } else { offModeFlg(ModeFlg_00000001); @@ -246,10 +246,10 @@ BOOL daPy_lk_c::procBoomerangCatch_init() { commonProcInit(daPyProc_BOOMERANG_CATCH_e); setSingleMoveAnime( ANM_BOOMCATCH, - daPy_HIO_boom_c0::m.field_0x20, - daPy_HIO_boom_c0::m.field_0x24, - daPy_HIO_boom_c0::m.field_0x2, - daPy_HIO_boom_c0::m.field_0x28 + m_HIO->mItem.mBoom.m.field_0x20, + m_HIO->mItem.mBoom.m.field_0x24, + m_HIO->mItem.mBoom.m.field_0x2, + m_HIO->mItem.mBoom.m.field_0x28 ); offNoResetFlg0(daPyFlg0_UNK20); return true; @@ -260,7 +260,7 @@ BOOL daPy_lk_c::procBoomerangCatch() { if (checkAttentionLock()) { setSpeedAndAngleAtn(); } else { - setSpeedAndAngleNormal(daPy_HIO_move_c0::m.field_0x0); + setSpeedAndAngleNormal(m_HIO->mMove.m.field_0x0); } if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { resetActAnimeUpper(UPPER_MOVE2_e, -1.0f); diff --git a/src/d/actor/d_a_player_bottle.inc b/src/d/actor/d_a_player_bottle.inc index fc7ce981..7b600010 100644 --- a/src/d/actor/d_a_player_bottle.inc +++ b/src/d/actor/d_a_player_bottle.inc @@ -106,9 +106,9 @@ BOOL daPy_lk_c::procBottleDrink_init(u16 param_0) { setSingleMoveAnime( ANM_BINDRINKPRE, 1.0f, - daPy_HIO_bottle_c0::m.field_0x5C, - daPy_HIO_bottle_c0::m.field_0xC, - daPy_HIO_bottle_c0::m.field_0x60 + m_HIO->mItem.mBottle.m.field_0x5C, + m_HIO->mItem.mBottle.m.field_0xC, + m_HIO->mItem.mBottle.m.field_0x60 ); if (changeBottleDrinkFace(param_0)) { setTextureAnime(0x85, 0); @@ -133,7 +133,7 @@ BOOL daPy_lk_c::procBottleDrink() { u16 uVar1 = m_anm_heap_under[UNDER_MOVE0_e].mIdx; if (uVar1 == LKANM_BCK_BINDRINKPRE) { if (frameCtrl.getRate() < 0.01f) { - setSingleMoveAnime(ANM_BINDRINKING, daPy_HIO_bottle_c0::m.field_0x64, 0.0f, -1, 0.0f); + setSingleMoveAnime(ANM_BINDRINKING, m_HIO->mItem.mBottle.m.field_0x64, 0.0f, -1, 0.0f); if (changeBottleDrinkFace(mEquipItem)) { setTextureAnime(0x86, 0); } @@ -159,9 +159,9 @@ BOOL daPy_lk_c::procBottleDrink() { setSingleMoveAnime( ANM_BINDRINKAFTER, 1.0f, - daPy_HIO_bottle_c0::m.field_0x68, - daPy_HIO_bottle_c0::m.field_0xE, - daPy_HIO_bottle_c0::m.field_0x6C + m_HIO->mItem.mBottle.m.field_0x68, + m_HIO->mItem.mBottle.m.field_0xE, + m_HIO->mItem.mBottle.m.field_0x6C ); if (changeBottleDrinkFace(mEquipItem)) { setTextureAnime(0x87, 0); @@ -224,9 +224,9 @@ BOOL daPy_lk_c::procBottleOpen_init(u16 param_0) { setSingleMoveAnime( ANM_BINOPENPRE, 1.0f, - daPy_HIO_bottle_c0::m.field_0x3C, - daPy_HIO_bottle_c0::m.field_0x6, - daPy_HIO_bottle_c0::m.field_0x40 + m_HIO->mItem.mBottle.m.field_0x3C, + m_HIO->mItem.mBottle.m.field_0x6, + m_HIO->mItem.mBottle.m.field_0x40 ); keepItemData(); setBottleModel(param_0); @@ -259,17 +259,17 @@ BOOL daPy_lk_c::procBottleOpen() { setSingleMoveAnime( ANM_BINOPENB, 1.0f, - daPy_HIO_bottle_c0::m.field_0x50, - daPy_HIO_bottle_c0::m.field_0xA, - daPy_HIO_bottle_c0::m.field_0x54 + m_HIO->mItem.mBottle.m.field_0x50, + m_HIO->mItem.mBottle.m.field_0xA, + m_HIO->mItem.mBottle.m.field_0x54 ); } else { setSingleMoveAnime( ANM_BINOPENA, 1.0f, - daPy_HIO_bottle_c0::m.field_0x44, - daPy_HIO_bottle_c0::m.field_0x8, - daPy_HIO_bottle_c0::m.field_0x48 + m_HIO->mItem.mBottle.m.field_0x44, + m_HIO->mItem.mBottle.m.field_0x8, + m_HIO->mItem.mBottle.m.field_0x48 ); } } else if (frameCtrl.checkPass(32.0f)) { @@ -376,8 +376,8 @@ BOOL daPy_lk_c::procBottleOpen() { } setAtParam(AT_TYPE_WATER, 0, spl, 0, dCcG_AtHitMark_None_e, 0, 5.0f); } else if ( - (mEquipItem == dItem_FAIRY_BOTTLE_e && frameCtrl.getFrame() >= daPy_HIO_bottle_c0::m.field_0x58) || - (mEquipItem != dItem_FAIRY_BOTTLE_e && mEquipItem != dItem_FOREST_WATER_e && frameCtrl.getFrame() >= daPy_HIO_bottle_c0::m.field_0x4C) + (mEquipItem == dItem_FAIRY_BOTTLE_e && frameCtrl.getFrame() >= m_HIO->mItem.mBottle.m.field_0x58) || + (mEquipItem != dItem_FAIRY_BOTTLE_e && mEquipItem != dItem_FOREST_WATER_e && frameCtrl.getFrame() >= m_HIO->mItem.mBottle.m.field_0x4C) ) { mpBottleContentsModel = NULL; m34D8 = 1; @@ -445,21 +445,21 @@ BOOL daPy_lk_c::procBottleSwing_init(int param_0) { if (bVar1) { setSingleMoveAnime( ANM_BINSWINGU, - daPy_HIO_bottle_c0::m.field_0x20, - daPy_HIO_bottle_c0::m.field_0x24, - daPy_HIO_bottle_c0::m.field_0x2, - daPy_HIO_bottle_c0::m.field_0x2C + m_HIO->mItem.mBottle.m.field_0x20, + m_HIO->mItem.mBottle.m.field_0x24, + m_HIO->mItem.mBottle.m.field_0x2, + m_HIO->mItem.mBottle.m.field_0x2C ); - m35A0 = daPy_HIO_bottle_c0::m.field_0x28; + m35A0 = m_HIO->mItem.mBottle.m.field_0x28; } else { setSingleMoveAnime( ANM_BINSWINGS, - daPy_HIO_bottle_c0::m.field_0x10, - daPy_HIO_bottle_c0::m.field_0x14, - daPy_HIO_bottle_c0::m.field_0x0, - daPy_HIO_bottle_c0::m.field_0x1C + m_HIO->mItem.mBottle.m.field_0x10, + m_HIO->mItem.mBottle.m.field_0x14, + m_HIO->mItem.mBottle.m.field_0x0, + m_HIO->mItem.mBottle.m.field_0x1C ); - m35A0 = daPy_HIO_bottle_c0::m.field_0x18; + m35A0 = m_HIO->mItem.mBottle.m.field_0x18; } mProcVar0.m3570 = 0; m3574 = 0; @@ -508,7 +508,7 @@ BOOL daPy_lk_c::procBottleSwing() { if (m34D4 == 0) { offModeFlg(ModeFlg_00000400); onModeFlg(ModeFlg_00000100); - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); m34D4 = 1; } if (checkEndMessage(0x14a2)) { @@ -540,10 +540,10 @@ BOOL daPy_lk_c::procBottleGet_init() { commonProcInit(daPyProc_BOTTLE_GET_e); setSingleMoveAnime( ANM_BINGET, - daPy_HIO_bottle_c0::m.field_0x30, - daPy_HIO_bottle_c0::m.field_0x34, - daPy_HIO_bottle_c0::m.field_0x4, - daPy_HIO_bottle_c0::m.field_0x38 + m_HIO->mItem.mBottle.m.field_0x30, + m_HIO->mItem.mBottle.m.field_0x34, + m_HIO->mItem.mBottle.m.field_0x4, + m_HIO->mItem.mBottle.m.field_0x38 ); dComIfGp_setPlayerStatus1(0, daPyStts1_UNK1000_e); m3628 = fpcM_ERROR_PROCESS_ID_e; diff --git a/src/d/actor/d_a_player_bow.inc b/src/d/actor/d_a_player_bow.inc index 3a4af9eb..59cd7478 100644 --- a/src/d/actor/d_a_player_bow.inc +++ b/src/d/actor/d_a_player_bow.inc @@ -95,12 +95,12 @@ void daPy_lk_c::setBowReadyAnime() { LKANM_BCK_ARROWSHOOT, UPPER_MOVE2_e, 1.0f, - daPy_HIO_bow_c0::m.field_0x0 - 0.001f, - daPy_HIO_bow_c0::m.field_0x0, + m_HIO->mItem.mBow.m.field_0x0 - 0.001f, + m_HIO->mItem.mBow.m.field_0x0, 10.0f ); mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_ARROWSHOOTA)); - m35EC = daPy_HIO_bow_c0::m.field_0x0 - 0.001f; + m35EC = m_HIO->mItem.mBow.m.field_0x0 - 0.001f; setPriTextureAnime(0x70, 0); m355E = 10; seStartOnlyReverb(JA_SE_LK_ITEM_TAKEOUT); @@ -111,10 +111,10 @@ void daPy_lk_c::setBowReloadAnime() { setActAnimeUpper( LKANM_BCK_ARROWRELORD, UPPER_MOVE2_e, - daPy_HIO_bow_c0::m.field_0x10, - daPy_HIO_bow_c0::m.field_0x14, - daPy_HIO_bow_c0::m.field_0x2, - daPy_HIO_bow_c0::m.field_0x18 + m_HIO->mItem.mBow.m.field_0x10, + m_HIO->mItem.mBow.m.field_0x14, + m_HIO->mItem.mBow.m.field_0x2, + m_HIO->mItem.mBow.m.field_0x18 ); setPriTextureAnime(0x8d, 0); mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_ARROWRELORDA)); @@ -130,10 +130,10 @@ BOOL daPy_lk_c::checkNextActionBowReady() { setActAnimeUpper( LKANM_BCK_ARROWSHOOT, UPPER_MOVE2_e, - daPy_HIO_bow_c0::m.field_0x4, - daPy_HIO_bow_c0::m.field_0x8, - daPy_HIO_bow_c0::m.field_0x0, - daPy_HIO_bow_c0::m.field_0xC + m_HIO->mItem.mBow.m.field_0x4, + m_HIO->mItem.mBow.m.field_0x8, + m_HIO->mItem.mBow.m.field_0x0, + m_HIO->mItem.mBow.m.field_0xC ); setPriTextureAnime(0x70, 0); mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_ARROWSHOOTA)); @@ -244,7 +244,7 @@ BOOL daPy_lk_c::procBowSubject_init() { if (!checkBowAnime()) { setBowReadyAnime(); } - setSingleMoveAnime(ANM_ATNRS, 0.0f, 0.0f, -1, daPy_HIO_basic_c0::m.field_0xC); + setSingleMoveAnime(ANM_ATNRS, 0.0f, 0.0f, -1, m_HIO->mBasic.m.field_0xC); mVelocity = 0.0f; @@ -285,7 +285,7 @@ BOOL daPy_lk_c::procBowMove_init() { if (!checkBowAnime()) { setBowReadyAnime(); } - setBlendAtnMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendAtnMoveAnime(m_HIO->mBasic.m.field_0xC); dComIfGp_setPlayerStatus0(0, daPyStts0_BOW_AIM_e); return true; } @@ -305,7 +305,7 @@ BOOL daPy_lk_c::procBowMove() { onModeFlg(ModeFlg_00000001); if (mDirection != DIR_RIGHT) { mDirection = DIR_RIGHT; - fVar1 = daPy_HIO_basic_c0::m.field_0xC; + fVar1 = m_HIO->mBasic.m.field_0xC; } current.angle.y = shape_angle.y + -0x4000; } else { diff --git a/src/d/actor/d_a_player_climb.inc b/src/d/actor/d_a_player_climb.inc index 82de52bf..41f8cbfe 100644 --- a/src/d/actor/d_a_player_climb.inc +++ b/src/d/actor/d_a_player_climb.inc @@ -16,7 +16,7 @@ /* 80135B50-80135B74 .text getClimbMoveAnmSpeed__9daPy_lk_cFv */ f32 daPy_lk_c::getClimbMoveAnmSpeed() { - return getAnmSpeedStickRate(daPy_HIO_ladder_c0::m.field_0x34, daPy_HIO_ladder_c0::m.field_0x30); + return getAnmSpeedStickRate(m_HIO->mLadder.m.field_0x34, m_HIO->mLadder.m.field_0x30); } /* 80135B74-80135DA0 .text setClimbShapeOffset__9daPy_lk_cFv */ @@ -100,7 +100,7 @@ BOOL daPy_lk_c::setMoveBGCorrectClimb() { dComIfG_Bgsp()->MoveBgTransPos(mPolyInfo, true, ¤t.pos, ¤t.angle, &shape_angle); } if (checkNoResetFlg1(daPyFlg1_VINE_CATCH)) { - return procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + return procFall_init(1, m_HIO->mWallCatch.m.field_0x54); } if (mCurProc == daPyProc_CLIMB_DOWN_START_e && (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() > 0.01f)) { @@ -118,13 +118,13 @@ BOOL daPy_lk_c::setMoveBGCorrectClimb() { ((mCurProc == daPyProc_CLIMB_MOVE_UP_DOWN_e || mCurProc == daPyProc_CLIMB_MOVE_SIDE_e) && current.pos.y - 15.0f < mAcch.GetGroundH())) { - return procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + return procFall_init(1, m_HIO->mWallCatch.m.field_0x54); } cM3dGPla* triPla = dComIfG_Bgsp()->GetTriPla(mLinkLinChk); s16 uVar6 = cM_atan2s(triPla->GetNP()->x, triPla->GetNP()->z); if (cLib_distanceAngleS(uVar6, shape_angle.y) <= 0x549f) { - return procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + return procFall_init(1, m_HIO->mWallCatch.m.field_0x54); } current.pos.x = mLinkLinChk.GetCrossP()->x + 20.5f * cM_ssin(uVar6); @@ -197,9 +197,9 @@ void daPy_lk_c::checkBgClimbMove() { current.pos.x = local_5c.x - (dVar4 * dVar7); current.pos.y = dVar3; current.pos.z = local_5c.z - (dVar4 * dVar6); - procHangClimb_init(daPy_HIO_wallCatch_c0::m.field_0x2C); + procHangClimb_init(m_HIO->mWallCatch.m.field_0x2C); } else { - procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + procFall_init(1, m_HIO->mWallCatch.m.field_0x54); } } else { setClimbShapeOffset(); @@ -208,7 +208,7 @@ void daPy_lk_c::checkBgClimbMove() { /* 80136588-801365F4 .text procClimbUpStart_init_sub__9daPy_lk_cFv */ void daPy_lk_c::procClimbUpStart_init_sub() { - setSingleMoveAnime(ANM_LADDERUPST, daPy_HIO_ladder_c0::m.field_0x4, 0.0f, -1, daPy_HIO_ladder_c0::m.field_0x8); + setSingleMoveAnime(ANM_LADDERUPST, m_HIO->mLadder.m.field_0x4, 0.0f, -1, m_HIO->mLadder.m.field_0x8); mProcVar0.m3570 = 1; m34C2 = 4; dComIfGp_setPlayerStatus1(0, daPyStts1_UNK10000_e); @@ -227,7 +227,7 @@ BOOL daPy_lk_c::procClimbUpStart_init() { } procClimbUpStart_init_sub(); } else { - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); setAnimeUnequip(); mProcVar0.m3570 = 0; m3598 = 0.0f; @@ -263,7 +263,7 @@ BOOL daPy_lk_c::procClimbUpStart() { } if (doTrigger()) { m34C2 = 0; - procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + procFall_init(1, m_HIO->mWallCatch.m.field_0x54); } else { changeClimbMoveProc(1); } @@ -283,7 +283,7 @@ BOOL daPy_lk_c::procClimbDownStart_init(s16 param_0) { mVelocity = 0.0f; speedF = 0.0f; deleteEquipItem(TRUE); - setSingleMoveAnime(ANM_LADDERDWST, daPy_HIO_ladder_c0::m.field_0x14, 30.0f, -1, 3.0f); + setSingleMoveAnime(ANM_LADDERDWST, m_HIO->mLadder.m.field_0x14, 30.0f, -1, 3.0f); dComIfGp_setPlayerStatus1(0, daPyStts1_UNK10000_e); setOldRootQuaternion(0, -0x8000, 0); shape_angle.y = param_0 + 0x8000; @@ -308,7 +308,7 @@ BOOL daPy_lk_c::procClimbDownStart() { dComIfGp_setDoStatus(dActStts_LET_GO_e); if (doTrigger()) { m34C2 = 0; - procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + procFall_init(1, m_HIO->mWallCatch.m.field_0x54); } else { changeClimbMoveProc(1); } @@ -345,7 +345,7 @@ BOOL daPy_lk_c::procClimbMoveUpDown_init(int param_0) { dVar2 = ANM_LADDERLTOR; } } - setSingleMoveAnime(dVar2, dVar3, 0.0f, -1, daPy_HIO_ladder_c0::m.field_0x2C); + setSingleMoveAnime(dVar2, dVar3, 0.0f, -1, m_HIO->mLadder.m.field_0x2C); if (mDirection == DIR_FORWARD) { setTextureAnime(10, 0); } else { @@ -371,7 +371,7 @@ BOOL daPy_lk_c::procClimbMoveUpDown() { dComIfGp_setDoStatus(dActStts_LET_GO_e); if (doTrigger()) { m34C2 = 0; - procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + procFall_init(1, m_HIO->mWallCatch.m.field_0x54); } else if (std::fabsf(mFrameCtrlUnder[UNDER_MOVE0_e].getRate()) < 0.01f) { if (m34D0 != 0) { m34D0 = 0; @@ -414,9 +414,9 @@ BOOL daPy_lk_c::procClimbMoveSide_init(int param_0) { setSingleMoveAnime( dVar2, dVar4, - daPy_HIO_ladder_c0::m.field_0x38, - daPy_HIO_ladder_c0::m.field_0x0, - daPy_HIO_ladder_c0::m.field_0x3C + m_HIO->mLadder.m.field_0x38, + m_HIO->mLadder.m.field_0x0, + m_HIO->mLadder.m.field_0x3C ); gravity = 0.0f; speed.y = 0.0f; @@ -440,7 +440,7 @@ BOOL daPy_lk_c::procClimbMoveSide() { dComIfGp_setDoStatus(dActStts_LET_GO_e); if (doTrigger()) { m34C2 = 0; - procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + procFall_init(1, m_HIO->mWallCatch.m.field_0x54); } else if (std::fabsf(mFrameCtrlUnder[UNDER_MOVE0_e].getRate()) < 0.01f) { if (m34D0 != 0) { m34D0 = 0; @@ -456,7 +456,7 @@ BOOL daPy_lk_c::procClimbMoveSide() { mFrameCtrlUnder[UNDER_MOVE0_e].setRate(dVar5); cXyz local_28 = mRightHandPos - mLeftHandPos; dVar5 = local_28.absXZ(); - f32 fVar1 = std::fabsf(dVar5 - m35A0) * daPy_HIO_ladder_c0::m.field_0x40; + f32 fVar1 = std::fabsf(dVar5 - m35A0) * m_HIO->mLadder.m.field_0x40; f32 fVar2 = fVar1 * cM_ssin(m34D4); current.pos.y += fVar1 * cM_scos(m34D4); current.pos.x += fVar2 * cM_scos(shape_angle.y); diff --git a/src/d/actor/d_a_player_crawl.inc b/src/d/actor/d_a_player_crawl.inc index 562d6316..3a1fc9b0 100644 --- a/src/d/actor/d_a_player_crawl.inc +++ b/src/d/actor/d_a_player_crawl.inc @@ -22,7 +22,7 @@ f32 daPy_lk_c::getCrawlMoveAnmSpeed() { if (mProcVar0.m3570 != 0) { return getAnmSpeedStickRate(0.5f, 2.0f); } - return getAnmSpeedStickRate(daPy_HIO_crouch_c0::m.field_0x34, daPy_HIO_crouch_c0::m.field_0x30); + return getAnmSpeedStickRate(m_HIO->mCrouch.m.field_0x34, m_HIO->mCrouch.m.field_0x30); } /* 801387EC-80138868 .text getCrawlMoveSpeed__9daPy_lk_cFv */ @@ -31,7 +31,7 @@ f32 daPy_lk_c::getCrawlMoveSpeed() { if (fVar1 >= 17.0f) { fVar1 = fVar1 - 17.0f; } - return (daPy_HIO_crouch_c0::m.field_0x3C * mFrameCtrlUnder[UNDER_MOVE0_e].getRate()) * cM_fsin((M_PI / 17) * fVar1); + return (m_HIO->mCrouch.m.field_0x3C * mFrameCtrlUnder[UNDER_MOVE0_e].getRate()) * cM_fsin((M_PI / 17) * fVar1); } /* 80138868-801389D0 .text setCrawlMoveDirectionArrow__9daPy_lk_cFv */ @@ -270,14 +270,14 @@ BOOL daPy_lk_c::procCrawlStart_init() { m34C2 = 1; setSingleMoveAnime( ANM_LIE, - daPy_HIO_crouch_c0::m.field_0x20, - daPy_HIO_crouch_c0::m.field_0x24, - daPy_HIO_crouch_c0::m.field_0x6, - daPy_HIO_crouch_c0::m.field_0x2C + m_HIO->mCrouch.m.field_0x20, + m_HIO->mCrouch.m.field_0x24, + m_HIO->mCrouch.m.field_0x6, + m_HIO->mCrouch.m.field_0x2C ); mVelocity = 0.0f; current.angle.y = shape_angle.y; - m35A0 = 1.0f / (daPy_HIO_crouch_c0::m.field_0x28 - daPy_HIO_crouch_c0::m.field_0x24); + m35A0 = 1.0f / (m_HIO->mCrouch.m.field_0x28 - m_HIO->mCrouch.m.field_0x24); m35E4 = 0.0f; dComIfGp_setPlayerStatus0(0, daPyStts0_CRAWL_e); return true; @@ -286,7 +286,7 @@ BOOL daPy_lk_c::procCrawlStart_init() { /* 801394F0-80139640 .text procCrawlStart__9daPy_lk_cFv */ BOOL daPy_lk_c::procCrawlStart() { setDoStatusCrawl(); - m35E4 = 1.0f - m35A0 * ((daPy_HIO_crouch_c0::m.field_0x28) - mFrameCtrlUnder[UNDER_MOVE0_e].getFrame()); + m35E4 = 1.0f - m35A0 * ((m_HIO->mCrouch.m.field_0x28) - mFrameCtrlUnder[UNDER_MOVE0_e].getFrame()); cXyz local_20(l_crawl_front_offset.x, l_crawl_front_offset.y, l_crawl_front_offset.z * m35E4); cXyz afStack_2c; cXyz cStack_38; @@ -298,7 +298,7 @@ BOOL daPy_lk_c::procCrawlStart() { procCrawlEnd_init(0, shape_angle.x, shape_angle.z); } else if (mStickDistance > 0.05f && ((mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) || - (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_crouch_c0::m.field_0x28))) + (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mCrouch.m.field_0x28))) { procCrawlMove_init(shape_angle.x, shape_angle.z); } else { @@ -347,7 +347,7 @@ BOOL daPy_lk_c::procCrawlMove_init(s16 param_0, s16 param_1) { dVar4 *= -1.0f; } current.angle.y = shape_angle.y; - setSingleMoveAnime(ANM_LIEFORWARD, dVar4, 0.0f, -1, daPy_HIO_crouch_c0::m.field_0x38); + setSingleMoveAnime(ANM_LIEFORWARD, dVar4, 0.0f, -1, m_HIO->mCrouch.m.field_0x38); } else { onResetFlg0(daPyRFlg0_UNK1000); } @@ -490,9 +490,9 @@ BOOL daPy_lk_c::procCrawlMove() { cLib_addCalcAngleS( &shape_angle.y, m34E8, - daPy_HIO_crouch_c0::m.field_0x8, - daPy_HIO_crouch_c0::m.field_0xA, - daPy_HIO_crouch_c0::m.field_0xC + m_HIO->mCrouch.m.field_0x8, + m_HIO->mCrouch.m.field_0xA, + m_HIO->mCrouch.m.field_0xC ); if (shape_angle.y != r24) { @@ -686,22 +686,22 @@ BOOL daPy_lk_c::procCrawlEnd_init(int param_1, s16 param_2, s16 param_3) { current.angle.y = shape_angle.y; m34C2 = 1; if (param_1 != 0) { - fVar1 = daPy_HIO_crouch_c0::m.field_0x4C; + fVar1 = m_HIO->mCrouch.m.field_0x4C; } else { fVar1 = -1.0f; } setSingleMoveAnime( ANM_LIE, - daPy_HIO_crouch_c0::m.field_0x40, - daPy_HIO_crouch_c0::m.field_0x44, - daPy_HIO_crouch_c0::m.field_0xE, + m_HIO->mCrouch.m.field_0x40, + m_HIO->mCrouch.m.field_0x44, + m_HIO->mCrouch.m.field_0xE, fVar1 ); if (param_1 == 0) { - if (daPy_HIO_crouch_c0::m.field_0x44 > dVar4) { - dVar4 = daPy_HIO_crouch_c0::m.field_0x44; - } else if (daPy_HIO_crouch_c0::m.field_0xE <= dVar4) { - dVar4 = daPy_HIO_crouch_c0::m.field_0xE - 0.001f; + if (m_HIO->mCrouch.m.field_0x44 > dVar4) { + dVar4 = m_HIO->mCrouch.m.field_0x44; + } else if (m_HIO->mCrouch.m.field_0xE <= dVar4) { + dVar4 = m_HIO->mCrouch.m.field_0xE - 0.001f; } mFrameCtrlUnder[UNDER_MOVE0_e].setFrame(dVar4); mAnmRatioUnder[UNDER_MOVE0_e].getAnmTransform()->setFrame(dVar4); @@ -714,16 +714,16 @@ BOOL daPy_lk_c::procCrawlEnd_init(int param_1, s16 param_2, s16 param_3) { mVelocity = 0.0f; shape_angle.x = param_2; shape_angle.z = param_3; - m35A0 = 1.0f / (daPy_HIO_crouch_c0::m.field_0xE - daPy_HIO_crouch_c0::m.field_0x48); + m35A0 = 1.0f / (m_HIO->mCrouch.m.field_0xE - m_HIO->mCrouch.m.field_0x48); return true; } /* 8013A7C4-8013A85C .text procCrawlEnd__9daPy_lk_cFv */ BOOL daPy_lk_c::procCrawlEnd() { - m35E4 = m35A0 * (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() - daPy_HIO_crouch_c0::m.field_0x48); + m35E4 = m35A0 * (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() - m_HIO->mCrouch.m.field_0x48); if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() > -0.01f) { checkNextMode(0); - } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() < daPy_HIO_crouch_c0::m.field_0x48) { + } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() < m_HIO->mCrouch.m.field_0x48) { if (!checkNextMode(1)) { m34C2 = 1; } diff --git a/src/d/actor/d_a_player_dproc.inc b/src/d/actor/d_a_player_dproc.inc index 3e4117bc..5114ee3d 100644 --- a/src/d/actor/d_a_player_dproc.inc +++ b/src/d/actor/d_a_player_dproc.inc @@ -99,9 +99,9 @@ void daPy_lk_c::setShapeAngleToTalkActor() { cLib_addCalcAngleS( &shape_angle.y, target, - daPy_HIO_turn_c0::m.field_0x6, - daPy_HIO_turn_c0::m.field_0x8, - daPy_HIO_turn_c0::m.field_0xA + m_HIO->mTurn.m.field_0x6, + m_HIO->mTurn.m.field_0x8, + m_HIO->mTurn.m.field_0xA ); } } @@ -142,7 +142,7 @@ int daPy_lk_c::setTalkStartBack() { if (dComIfG_Bgsp()->GroundCross(&mGndChk) - current.pos.y >= -30.1f) { current.angle.y = cM_atan2s(sp24.x, sp24.z); mVelocity = 5.0f; - setSingleMoveAnime(ANM_WALK, -daPy_HIO_move_c0::m.field_0x44, 0.0f, -1, daPy_HIO_turn_c0::m.field_0x18); + setSingleMoveAnime(ANM_WALK, -m_HIO->mMove.m.field_0x44, 0.0f, -1, m_HIO->mTurn.m.field_0x18); return 1; } } @@ -357,9 +357,9 @@ BOOL daPy_lk_c::dProcTalk_init() { if (mProcVar0.m3570 == 0) { mVelocity = 0.0f; if (mDemo.getDemoMode() == 8) { - setSingleMoveAnime(ANM_WAITS, daPy_HIO_move_c0::m.field_0x38, 0.0f, -1, daPy_HIO_turn_c0::m.field_0x18); + setSingleMoveAnime(ANM_WAITS, m_HIO->mMove.m.field_0x38, 0.0f, -1, m_HIO->mTurn.m.field_0x18); } else { - setSingleMoveAnime(ANM_TALKA, daPy_HIO_turn_c0::m.field_0x14, 0.0f, -1, daPy_HIO_turn_c0::m.field_0x18); + setSingleMoveAnime(ANM_TALKA, m_HIO->mTurn.m.field_0x14, 0.0f, -1, m_HIO->mTurn.m.field_0x18); } m3574 = mDemo.getParam1(); if (m3574 == 1) { @@ -401,9 +401,9 @@ BOOL daPy_lk_c::dProcTalk() { current.pos.z = m370C.z; mProcVar0.m3570 = 0; if (mDemo.getDemoMode() == 8) { - setSingleMoveAnime(ANM_WAITS, daPy_HIO_move_c0::m.field_0x38, 0.0f, -1, daPy_HIO_turn_c0::m.field_0x18); + setSingleMoveAnime(ANM_WAITS, m_HIO->mMove.m.field_0x38, 0.0f, -1, m_HIO->mTurn.m.field_0x18); } else { - setSingleMoveAnime(ANM_TALKA, daPy_HIO_turn_c0::m.field_0x14, 0.0f, -1, daPy_HIO_turn_c0::m.field_0x18); + setSingleMoveAnime(ANM_TALKA, m_HIO->mTurn.m.field_0x14, 0.0f, -1, m_HIO->mTurn.m.field_0x18); } if (m3574 == 1) { setTextureAnime(145, 0); @@ -435,13 +435,13 @@ BOOL daPy_lk_c::dProcDamage_init() { commonProcInit(daPyProc_DEMO_DAMAGE_e); setSingleMoveAnime( ANM_DAMF, - daPy_HIO_damage_c0::m.field_0x14, - daPy_HIO_damage_c0::m.field_0x18, - daPy_HIO_damage_c0::m.field_0x0, - daPy_HIO_damage_c0::m.field_0x8 + m_HIO->mDam.mDamage.m.field_0x14, + m_HIO->mDam.mDamage.m.field_0x18, + m_HIO->mDam.mDamage.m.field_0x0, + m_HIO->mDam.mDamage.m.field_0x8 ); mVelocity = 0.0f; - m35A0 = M_PI / (daPy_HIO_damage_c0::m.field_0x0 - daPy_HIO_damage_c0::m.field_0x18); + m35A0 = M_PI / (m_HIO->mDam.mDamage.m.field_0x0 - m_HIO->mDam.mDamage.m.field_0x18); return true; } @@ -471,25 +471,25 @@ BOOL daPy_lk_c::dProcHoldup_init() { if (uVar1) { if (checkNoResetFlg0(daPyFlg0_UNK10000)) { dVar3 = ANM_WALLHOLDUPDW; - dVar6 = daPy_HIO_holdup_c0::m.field_0x30; - dVar5 = daPy_HIO_holdup_c0::m.field_0x34; - sVar2 = daPy_HIO_holdup_c0::m.field_0x6; - dVar4 = daPy_HIO_holdup_c0::m.field_0x38; + dVar6 = m_HIO->mHoldup.m.field_0x30; + dVar5 = m_HIO->mHoldup.m.field_0x34; + sVar2 = m_HIO->mHoldup.m.field_0x6; + dVar4 = m_HIO->mHoldup.m.field_0x38; } else { dVar3 = ANM_WALLHOLDUP; - dVar6 = daPy_HIO_holdup_c0::m.field_0x24; - dVar5 = daPy_HIO_holdup_c0::m.field_0x28; - sVar2 = daPy_HIO_holdup_c0::m.field_0x4; - dVar4 = daPy_HIO_holdup_c0::m.field_0x2C; + dVar6 = m_HIO->mHoldup.m.field_0x24; + dVar5 = m_HIO->mHoldup.m.field_0x28; + sVar2 = m_HIO->mHoldup.m.field_0x4; + dVar4 = m_HIO->mHoldup.m.field_0x2C; } onModeFlg(ModeFlg_WHIDE); setBgCheckParam(); } else { dVar3 = ANM_HOLDUP; - dVar6 = daPy_HIO_holdup_c0::m.field_0x18; - dVar5 = daPy_HIO_holdup_c0::m.field_0x1C; - sVar2 = daPy_HIO_holdup_c0::m.field_0x2; - dVar4 = daPy_HIO_holdup_c0::m.field_0x20; + dVar6 = m_HIO->mHoldup.m.field_0x18; + dVar5 = m_HIO->mHoldup.m.field_0x1C; + sVar2 = m_HIO->mHoldup.m.field_0x2; + dVar4 = m_HIO->mHoldup.m.field_0x20; } setSingleMoveAnime(dVar3, dVar6, dVar5, sVar2, dVar4); mVelocity = 0.0f; @@ -676,7 +676,7 @@ BOOL daPy_lk_c::dProcGetItem_init() { mProcVar0.m3570 = 0; onModeFlg(ModeFlg_00000400); } else { - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); setAnimeUnequip(); m3598 = 0.0f; mProcVar0.m3570 = 1; @@ -777,7 +777,7 @@ BOOL daPy_lk_c::dProcGetItem() { dComIfGp_evmng_cutEnd(mStaffIdx); item->dead(); m3574 = 1; - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); } } } else if (item != NULL && (fopAcM_GetName(item) == PROC_ITEM || (fopAcM_GetName(item) == PROC_Demo_Item))) { @@ -794,7 +794,7 @@ BOOL daPy_lk_c::dProcUnequip_init() { } commonProcInit(daPyProc_DEMO_UNEQUIP_e); mVelocity = 0.0f; - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); if (mEquipItem != daPyItem_NONE_e) { setAnimeUnequip(); m3598 = 0.0f; @@ -812,11 +812,11 @@ BOOL daPy_lk_c::dProcUnequip() { /* 8012ED74-8012EE0C .text dProcLavaDamage_init_sub__9daPy_lk_cFv */ void daPy_lk_c::dProcLavaDamage_init_sub() { - speed.y = daPy_HIO_restart_c0::m.field_0x8; + speed.y = m_HIO->mRestart.m.field_0x8; mProcVar0.m3570 = 0; voiceStart(4); seStartMapInfo(JA_SE_LK_FALL_MAGMA); - gravity = daPy_HIO_autoJump_c0::m.field_0xC; + gravity = m_HIO->mAutoJump.m.field_0xC; mDemo.setDemoType(5); dComIfGp_setPlayerStatus0(0, daPyStts0_UNK10000000_e); daPy_py_c::changePlayer(this); @@ -829,7 +829,7 @@ BOOL daPy_lk_c::dProcLavaDamage_init() { } commonProcInit(daPyProc_DEMO_LAVA_DAMAGE_e); mVelocity = 0.0f; - setSingleMoveAnime(ANM_LAVADAM, daPy_HIO_restart_c0::m.field_0x0, 0.0f, -1, daPy_HIO_restart_c0::m.field_0x4); + setSingleMoveAnime(ANM_LAVADAM, m_HIO->mRestart.m.field_0x0, 0.0f, -1, m_HIO->mRestart.m.field_0x4); m32E4.makeEmitter(dPa_name::ID_SCENE_8078, mpCLModel->getAnmMtx(0), ¤t.pos, NULL); if (dComIfGp_event_compulsory(this)) { dProcLavaDamage_init_sub(); @@ -931,7 +931,7 @@ void daPy_lk_c::dProcDead_init_sub() { void daPy_lk_c::dProcDead_init_sub2() { static const Vec ripple_scale = {0.75f, 0.75f, 0.75f}; - mFrameCtrlUnder[UNDER_MOVE0_e].setRate(daPy_HIO_restart_c0::m.field_0xC); + mFrameCtrlUnder[UNDER_MOVE0_e].setRate(m_HIO->mRestart.m.field_0xC); voiceStart(22); mDoAud_bgmStop(0); mDoAud_bgmStart(JA_BGM_DIE_LINK); @@ -975,7 +975,7 @@ BOOL daPy_lk_c::dProcDead_init() { commonProcInit(daPyProc_DEMO_DEAD_e); if (dComIfGp_event_compulsory(this)) { dProcDead_init_sub(); - dVar8 = daPy_HIO_restart_c0::m.field_0xC; + dVar8 = m_HIO->mRestart.m.field_0xC; } else { dVar8 = 0.0f; mProcVar0.m3570 = 1; @@ -1001,7 +1001,7 @@ BOOL daPy_lk_c::dProcDead_init() { onModeFlg(ModeFlg_02000000); } - setSingleMoveAnime(dVar6, dVar8, daPy_HIO_restart_c0::m.field_0x10, -1, daPy_HIO_restart_c0::m.field_0x14); + setSingleMoveAnime(dVar6, dVar8, m_HIO->mRestart.m.field_0x10, -1, m_HIO->mRestart.m.field_0x14); mDamageWaitTimer = 0; m35E4 = 0.0f; m35A0 = 1.0f; @@ -1121,10 +1121,10 @@ BOOL daPy_lk_c::dProcLookAround_init() { commonProcInit(daPyProc_DEMO_LOOK_AROUND_e); setSingleMoveAnime( ANM_COMEOUT, - daPy_HIO_holdup_c0::m.field_0xC, - daPy_HIO_holdup_c0::m.field_0x10, - daPy_HIO_holdup_c0::m.field_0x0, - daPy_HIO_holdup_c0::m.field_0x14 + m_HIO->mHoldup.m.field_0xC, + m_HIO->mHoldup.m.field_0x10, + m_HIO->mHoldup.m.field_0x0, + m_HIO->mHoldup.m.field_0x14 ); mVelocity = 0.0f; return true; @@ -1188,10 +1188,10 @@ BOOL daPy_lk_c::dProcTalismanPickup_init() { commonProcInit(daPyProc_DEMO_TALISMAN_PICKUP_e); setSingleMoveAnime( ANM_PICKUP, - daPy_HIO_holdup_c0::m.field_0x3C, - daPy_HIO_holdup_c0::m.field_0x40, - daPy_HIO_holdup_c0::m.field_0x8, - daPy_HIO_holdup_c0::m.field_0x44 + m_HIO->mHoldup.m.field_0x3C, + m_HIO->mHoldup.m.field_0x40, + m_HIO->mHoldup.m.field_0x8, + m_HIO->mHoldup.m.field_0x44 ); mVelocity = 0.0f; initShipRideUseItem(iVar2, 1); @@ -1220,7 +1220,7 @@ BOOL daPy_lk_c::dProcTalismanWait_init() { } int iVar2 = checkShipRideUseItem(1); commonProcInit(daPyProc_DEMO_TALISMAN_WAIT_e); - setSingleMoveAnime(ANM_WAITPICKUP, 1.0f, 0.0f, -1, daPy_HIO_holdup_c0::m.field_0x48); + setSingleMoveAnime(ANM_WAITPICKUP, 1.0f, 0.0f, -1, m_HIO->mHoldup.m.field_0x48); mVelocity = 0.0f; setTalismanModel(); m32E4.makeEmitter(dPa_name::ID_COMMON_03E9, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); @@ -1312,16 +1312,16 @@ BOOL daPy_lk_c::dProcTurnBack_init() { commonProcInit(daPyProc_DEMO_TURN_BACK_e); mVelocity = 0.0f; if (mActorKeepGrab.getActor() != NULL) { - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); m_pbCalc[PART_UPPER_e]->setRatio(2, 1.0f); mProcVar0.m3570 = 1; } else { setSingleMoveAnime( ANM_TURNBACK, - daPy_HIO_holdup_c0::m.field_0x4C, - daPy_HIO_holdup_c0::m.field_0x50, - daPy_HIO_holdup_c0::m.field_0xA, - daPy_HIO_holdup_c0::m.field_0x54 + m_HIO->mHoldup.m.field_0x4C, + m_HIO->mHoldup.m.field_0x50, + m_HIO->mHoldup.m.field_0xA, + m_HIO->mHoldup.m.field_0x54 ); mProcVar0.m3570 = 0; } @@ -1427,7 +1427,7 @@ BOOL daPy_lk_c::dProcLookWait_init() { } commonProcInit(daPyProc_DEMO_LOOK_WAIT_e); mVelocity = 0.0f; - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); current.angle.y = shape_angle.y; mDirection = DIR_NONE; initShipRideUseItem(iVar1, 0); @@ -1464,7 +1464,7 @@ BOOL daPy_lk_c::dProcPushPullWait_init() { } commonProcInit(daPyProc_DEMO_PUSH_PULL_WAIT_e); setSingleMoveAnime( - ANM_WAITPUSHPULL, daPy_HIO_pushpull_c0::m.field_0x0, 0.0f, -1, daPy_HIO_pushpull_c0::m.field_0x4 + ANM_WAITPUSHPULL, m_HIO->mPushpull.m.field_0x0, 0.0f, -1, m_HIO->mPushpull.m.field_0x4 ); mVelocity = 0.0f; dComIfGp_setPlayerStatus0(0, daPyStts0_UNK4000000_e); @@ -1483,7 +1483,7 @@ BOOL daPy_lk_c::dProcPushMove_init() { return false; } commonProcInit(daPyProc_DEMO_PUSH_MOVE_e); - setSingleMoveAnime(ANM_WALKPUSH, daPy_HIO_pushpull_c0::m.field_0x8, 0.0f, -1, daPy_HIO_pushpull_c0::m.field_0xC); + setSingleMoveAnime(ANM_WALKPUSH, m_HIO->mPushpull.m.field_0x8, 0.0f, -1, m_HIO->mPushpull.m.field_0xC); mVelocity = 0.0f; dComIfGp_setPlayerStatus0(0, daPyStts0_UNK4000000_e); voiceStart(19); @@ -1531,7 +1531,7 @@ BOOL daPy_lk_c::dProcDoorOpen() { mAcch.ClrWallNone(); mAcch.OffLineCheckNone(); dComIfGp_evmng_cutEnd(mStaffIdx); - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); mProcVar0.m3570 = 1; m3598 = 0.0f; } else { @@ -1555,10 +1555,10 @@ BOOL daPy_lk_c::dProcNod_init() { mVelocity = 0.0f; setSingleMoveAnime( ANM_SEYYES, - daPy_HIO_turn_c0::m.field_0x1C, - daPy_HIO_turn_c0::m.field_0x20, - daPy_HIO_turn_c0::m.field_0xC, - daPy_HIO_turn_c0::m.field_0x24 + m_HIO->mTurn.m.field_0x1C, + m_HIO->mTurn.m.field_0x20, + m_HIO->mTurn.m.field_0xC, + m_HIO->mTurn.m.field_0x24 ); dComIfGp_setPlayerStatus0(0, daPyStts0_UNK10_e); return true; @@ -1578,10 +1578,10 @@ BOOL daPy_lk_c::dProcNod() { void daPy_lk_c::dProcPresent_init_sub() { setSingleMoveAnime( ANM_PRESENTATIONA, - daPy_HIO_turn_c0::m.field_0x28, - daPy_HIO_turn_c0::m.field_0x2C, - daPy_HIO_turn_c0::m.field_0xE, - daPy_HIO_turn_c0::m.field_0x30 + m_HIO->mTurn.m.field_0x28, + m_HIO->mTurn.m.field_0x2C, + m_HIO->mTurn.m.field_0xE, + m_HIO->mTurn.m.field_0x30 ); onModeFlg(ModeFlg_00000400); if (!checkBottleItem(dComIfGp_event_getPreItemNo())) { @@ -1637,7 +1637,7 @@ BOOL daPy_lk_c::dProcPresent() { setSingleMoveAnime(ANM_PRESENTATIONAWAIT, 1.0f, 0.0f, -1, 3.0f); onModeFlg(ModeFlg_00000080 | ModeFlg_00000100); offModeFlg(ModeFlg_00000400); - } else if (mFrameCtrlUnder[UNDER_MOVE0_e].checkPass(daPy_HIO_turn_c0::m.field_0xE - 10.0f)) { + } else if (mFrameCtrlUnder[UNDER_MOVE0_e].checkPass(m_HIO->mTurn.m.field_0xE - 10.0f)) { if (checkBottleItem(dComIfGp_event_getPreItemNo())) { if (mEquipItem == daPyItem_NONE_e) { setBottleModel(dComIfGp_event_getPreItemNo()); @@ -1715,7 +1715,7 @@ BOOL daPy_lk_c::dProcStandItemPut_init() { angle = fopAcM_GetShapeAngle_p(this); } mProcVar0.m3570 = 1; - setSingleMoveAnime(ANM_GRABWAIT, daPy_HIO_grab_c0::m.field_0x78, 0.0f, -1, -1.0f); + setSingleMoveAnime(ANM_GRABWAIT, m_HIO->mGrab.m.field_0x78, 0.0f, -1, -1.0f); pfVar2 = (fopAc_ac_c*)fopAcM_fastCreate(PROC_STANDITEM, dComIfGp_event_getPreItemNo(), ¤t.pos, -1, angle); if (pfVar2 != NULL) { mActorKeepGrab.setData(pfVar2); @@ -1730,10 +1730,10 @@ BOOL daPy_lk_c::dProcStandItemPut() { if (m_old_fdata->getOldFrameRate() < 0.01f) { setSingleMoveAnime( ANM_GRABUP, - daPy_HIO_grab_c0::m.field_0x68, - daPy_HIO_grab_c0::m.field_0x6C, - daPy_HIO_grab_c0::m.field_0xC, - daPy_HIO_grab_c0::m.field_0x74 + m_HIO->mGrab.m.field_0x68, + m_HIO->mGrab.m.field_0x6C, + m_HIO->mGrab.m.field_0xC, + m_HIO->mGrab.m.field_0x74 ); mProcVar0.m3570 = 2; voiceStart(7); @@ -1758,7 +1758,7 @@ BOOL daPy_lk_c::dProcVorcanoFail_init() { mVelocity = 0.0f; speed.y = 18.0f; gravity = 0.0f; - setSingleMoveAnime(ANM_LAVADAM, daPy_HIO_restart_c0::m.field_0x0, 0.0f, -1, daPy_HIO_restart_c0::m.field_0x4); + setSingleMoveAnime(ANM_LAVADAM, m_HIO->mRestart.m.field_0x0, 0.0f, -1, m_HIO->mRestart.m.field_0x4); m32E4.makeEmitter(dPa_name::ID_SCENE_8078, mpCLModel->getAnmMtx(0), ¤t.pos, NULL); return true; } @@ -1900,7 +1900,7 @@ BOOL daPy_lk_c::dProcAgbUse_init() { keepItemData(); setAnimeEquipItem(); mVelocity = 0.0f; - setSingleMoveAnime(ANM_USETCEIVER, 1.0f, 0.0f, -1, daPy_HIO_basic_c0::m.field_0xC); + setSingleMoveAnime(ANM_USETCEIVER, 1.0f, 0.0f, -1, m_HIO->mBasic.m.field_0xC); seStartSystem(JA_SE_TALK_START); initShipRideUseItem(iVar2, 2); return true; @@ -2120,7 +2120,7 @@ BOOL daPy_lk_c::dProcGetDance() { pJVar3->mTranslate.z *= -1.0f; dComIfGp_evmng_cutEnd(mStaffIdx); m3574 = 1; - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); } return true; } @@ -2136,9 +2136,9 @@ BOOL daPy_lk_c::dProcBottleOpenFairy_init() { setSingleMoveAnime( ANM_BINOPENPRE, 1.0f, - daPy_HIO_bottle_c0::m.field_0x3C, - daPy_HIO_bottle_c0::m.field_0x6, - daPy_HIO_bottle_c0::m.field_0x40 + m_HIO->mItem.mBottle.m.field_0x3C, + m_HIO->mItem.mBottle.m.field_0x6, + m_HIO->mItem.mBottle.m.field_0x40 ); keepItemData(); setBottleModel(dItem_FAIRY_BOTTLE_e); @@ -2156,9 +2156,9 @@ BOOL daPy_lk_c::dProcBottleOpenFairy() { setSingleMoveAnime( ANM_BINOPENB, 1.0f, - daPy_HIO_bottle_c0::m.field_0x50, - daPy_HIO_bottle_c0::m.field_0xA, - daPy_HIO_bottle_c0::m.field_0x54 + m_HIO->mItem.mBottle.m.field_0x50, + m_HIO->mItem.mBottle.m.field_0xA, + m_HIO->mItem.mBottle.m.field_0x54 ); } else if (frameCtrl.checkPass(32.0f)) { m355E = 0; @@ -2168,7 +2168,7 @@ BOOL daPy_lk_c::dProcBottleOpenFairy() { dComIfGp_evmng_cutEnd(mStaffIdx); } else { if (mpBottleContentsModel != NULL) { - if (frameCtrl.getFrame() >= daPy_HIO_bottle_c0::m.field_0x58) { + if (frameCtrl.getFrame() >= m_HIO->mItem.mBottle.m.field_0x58) { mpBottleContentsModel = NULL; if (dComIfGp_event_getTalkXYBtn() == dTalkBtn_X_e) { dComIfGs_setEquipBottleItemEmpty(dItemBtn_X_e); @@ -2192,7 +2192,7 @@ BOOL daPy_lk_c::dProcWarpShort_init() { commonProcInit(daPyProc_DEMO_WARP_SHORT_e); setSingleMoveAnime(ANM_RISE, 1.0f, 0.0f, -1, 40.0f); gravity = mVelocity = 0.0f; - speed.y = daPy_HIO_warp_c0::m.field_0x10; + speed.y = m_HIO->mWarp.m.field_0x10; if (mEquipItem == daPyItem_BOKO_e) { deleteEquipItem(FALSE); } @@ -2201,9 +2201,9 @@ BOOL daPy_lk_c::dProcWarpShort_init() { /* 801324D0-80132534 .text dProcWarpShort__9daPy_lk_cFv */ BOOL daPy_lk_c::dProcWarpShort() { - speed.y += daPy_HIO_warp_c0::m.field_0x14; - if (speed.y > daPy_HIO_warp_c0::m.field_0x18) { - speed.y = daPy_HIO_warp_c0::m.field_0x18; + speed.y += m_HIO->mWarp.m.field_0x14; + if (speed.y > m_HIO->mWarp.m.field_0x18) { + speed.y = m_HIO->mWarp.m.field_0x18; } dComIfGp_evmng_cutEnd(mStaffIdx); return true; @@ -2330,7 +2330,7 @@ BOOL daPy_lk_c::dProcPowerUp() { } if (checkEndMessage(m3624)) { dComIfGp_evmng_cutEnd(mStaffIdx); - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); m3574 = 1; } } diff --git a/src/d/actor/d_a_player_fan.inc b/src/d/actor/d_a_player_fan.inc index 13ba6bbe..c4b1a3f9 100644 --- a/src/d/actor/d_a_player_fan.inc +++ b/src/d/actor/d_a_player_fan.inc @@ -157,9 +157,9 @@ void daPy_lk_c::setParachuteFanModel(f32 f31) { NULL, bck, J3DFrameCtrl::EMode_NONE, - daPy_HIO_fan_c0::m.field_0x20, + m_HIO->mItem.mFan.m.field_0x20, f31, - daPy_HIO_fan_c0::m.field_0x4, + m_HIO->mItem.mFan.m.field_0x4, 0, NULL, 0x00000000, @@ -183,16 +183,16 @@ BOOL daPy_lk_c::procFanSwing_init() { commonProcInit(daPyProc_FAN_SWING_e); setSingleMoveAnime( ANM_USEFANA, - daPy_HIO_fan_c0::m.field_0xC, - daPy_HIO_fan_c0::m.field_0x10, - daPy_HIO_fan_c0::m.field_0x2, - daPy_HIO_fan_c0::m.field_0x14 + m_HIO->mItem.mFan.m.field_0xC, + m_HIO->mItem.mFan.m.field_0x10, + m_HIO->mItem.mFan.m.field_0x2, + m_HIO->mItem.mFan.m.field_0x14 ); setFanModel(); mProcVar0.m3570 = 0; voiceStart(7); setAtParam(AT_TYPE_UNK2000000, 1, dCcG_At_Spl_UNK0, dCcG_SE_UNK4, dCcG_AtHitMark_Nrm_e, 0, 50.0f); - m35EC = daPy_HIO_fan_c0::m.field_0x10; + m35EC = m_HIO->mItem.mFan.m.field_0x10; if (setShapeFanLeaf()) { m34D0 = 1; seStartOnlyReverb(JA_SE_LK_FAN_PRE_SWING); @@ -235,9 +235,9 @@ BOOL daPy_lk_c::procFanSwing() { cLib_addCalc( &mVelocity, 0.0f, - daPy_HIO_move_c0::m.field_0x24, - daPy_HIO_move_c0::m.field_0x1C, - daPy_HIO_move_c0::m.field_0x20 + m_HIO->mMove.m.field_0x24, + m_HIO->mMove.m.field_0x1C, + m_HIO->mMove.m.field_0x20 ); } else if (mProcVar0.m3570 == 0) { if (m34D0 != 0) { @@ -332,12 +332,12 @@ BOOL daPy_lk_c::procFanGlide_init(int param_0) { commonProcInit(daPyProc_FAN_GLIDE_e); deleteEquipItem(FALSE); if (param_0 != 0) { - fVar1 = daPy_HIO_fan_c0::m.field_0x24; + fVar1 = m_HIO->mItem.mFan.m.field_0x24; } else { - fVar1 = daPy_HIO_fan_c0::m.field_0x28; + fVar1 = m_HIO->mItem.mFan.m.field_0x28; } setSingleMoveAnime( - ANM_USEFANB, daPy_HIO_fan_c0::m.field_0x20, fVar1, daPy_HIO_fan_c0::m.field_0x4, daPy_HIO_fan_c0::m.field_0x2C + ANM_USEFANB, m_HIO->mItem.mFan.m.field_0x20, fVar1, m_HIO->mItem.mFan.m.field_0x4, m_HIO->mItem.mFan.m.field_0x2C ); mEquipItem = daPyItem_UNK102_e; setParachuteFanModel(fVar1); @@ -352,12 +352,12 @@ BOOL daPy_lk_c::procFanGlide_init(int param_0) { m3730 = cXyz::Zero; voiceStart(5); seStartOnlyReverb(JA_SE_LK_FAN_CHUTE_OPEN); - m3574 = daPy_HIO_fan_c0::m.field_0x8; + m3574 = m_HIO->mItem.mFan.m.field_0x8; if (!checkHeavyStateOn()) { dComIfGp_setItemMagicCount(-1); } dComIfGp_setPlayerStatus1(0, daPyStts1_DEKU_LEAF_FLY_e); - m34D2 = daPy_HIO_fan_c0::m.field_0xA; + m34D2 = m_HIO->mItem.mFan.m.field_0xA; return true; } @@ -384,9 +384,9 @@ BOOL daPy_lk_c::procFanGlide() { if (frameCtrl.getFrame() > 2.0f || mProcVar0.m3570 != 0) { if (mAcch.ChkGroundHit()) { if (checkHeavyStateOn()) { - return changeLandProc(daPy_HIO_fan_c0::m.field_0x50); + return changeLandProc(m_HIO->mItem.mFan.m.field_0x50); } else { - return procLand_init(daPy_HIO_fan_c0::m.field_0x50, 1); + return procLand_init(m_HIO->mItem.mFan.m.field_0x50, 1); } } else if (checkJumpFlower() || checkJumpRideShip()) { return true; @@ -403,12 +403,12 @@ BOOL daPy_lk_c::procFanGlide() { if (m34D0 <= 0) { if (!checkHeavyStateOn()) { - maxFallSpeed = daPy_HIO_fan_c0::m.field_0x38; + maxFallSpeed = m_HIO->mItem.mFan.m.field_0x38; if (m34D0 == 0) { - speed.y = daPy_HIO_fan_c0::m.field_0x40; - mVelocity = daPy_HIO_fan_c0::m.field_0x48; + speed.y = m_HIO->mItem.mFan.m.field_0x40; + mVelocity = m_HIO->mItem.mFan.m.field_0x48; } else { - speed.y = daPy_HIO_fan_c0::m.field_0x44; + speed.y = m_HIO->mItem.mFan.m.field_0x44; } } m34D0 = 1; @@ -417,7 +417,7 @@ BOOL daPy_lk_c::procFanGlide() { m3574--; if (m3574 == 0 && dComIfGs_getMagic() >= 1) { dComIfGp_setItemMagicCount(-1); - m3574 = daPy_HIO_fan_c0::m.field_0x8; + m3574 = m_HIO->mItem.mFan.m.field_0x8; } } if (m34D2 == 0) { @@ -430,30 +430,30 @@ BOOL daPy_lk_c::procFanGlide() { if (swordTrigger()) { setAnimeEquipSword(0); } - return procFall_init(2, daPy_HIO_wallCatch_c0::m.field_0x54); + return procFall_init(2, m_HIO->mWallCatch.m.field_0x54); } if (speed.y < -gravity && !checkHeavyStateOn()) { - gravity = daPy_HIO_fan_c0::m.field_0x3C; - maxFallSpeed = daPy_HIO_fan_c0::m.field_0x38; + gravity = m_HIO->mItem.mFan.m.field_0x3C; + maxFallSpeed = m_HIO->mItem.mFan.m.field_0x38; } if (checkSetItemTrigger(dItem_DEKU_LEAF_e, 1) && frameCtrl.getRate() < 0.01f && mProcVar0.m3570 == 0) { setSingleMoveAnime( ANM_USEFANB, - daPy_HIO_fan_c0::m.field_0x20, - daPy_HIO_fan_c0::m.field_0x28, - daPy_HIO_fan_c0::m.field_0x4, - daPy_HIO_fan_c0::m.field_0x2C + m_HIO->mItem.mFan.m.field_0x20, + m_HIO->mItem.mFan.m.field_0x28, + m_HIO->mItem.mFan.m.field_0x4, + m_HIO->mItem.mFan.m.field_0x2C ); mpParachuteFanMorf->setAnm( getItemAnimeResource(LKANM_BCK_FANBA), 0, - daPy_HIO_fan_c0::m.field_0x2C, - daPy_HIO_fan_c0::m.field_0x20, - daPy_HIO_fan_c0::m.field_0x28, - daPy_HIO_fan_c0::m.field_0x4, + m_HIO->mItem.mFan.m.field_0x2C, + m_HIO->mItem.mFan.m.field_0x20, + m_HIO->mItem.mFan.m.field_0x28, + m_HIO->mItem.mFan.m.field_0x4, NULL ); - gravity = daPy_HIO_autoJump_c0::m.field_0xC; + gravity = m_HIO->mAutoJump.m.field_0xC; voiceStart(5); seStartOnlyReverb(JA_SE_LK_FAN_CHUTE_RISE); m353A = 5; @@ -470,7 +470,7 @@ BOOL daPy_lk_c::procFanGlide() { } } if (checkHeavyStateOn()) { - cLib_chaseF(&mVelocity, 0.0f, (0.1f * daPy_HIO_autoJump_c0::m.field_0x3C)); + cLib_chaseF(&mVelocity, 0.0f, (0.1f * m_HIO->mAutoJump.m.field_0x3C)); } f32 local_64; @@ -478,7 +478,7 @@ BOOL daPy_lk_c::procFanGlide() { int uVar6 = m34E8 - shape_angle.y; cLib_addCalc( &mVelocity, - (daPy_HIO_fan_c0::m.field_0x48 * mStickDistance) * cM_scos(uVar6), + (m_HIO->mItem.mFan.m.field_0x48 * mStickDistance) * cM_scos(uVar6), 0.5f, (0.1f + 0.4f * mStickDistance), 0.01f @@ -497,11 +497,11 @@ BOOL daPy_lk_c::procFanGlide() { local_64 = 1.0f; if (mProcVar0.m3570 == 0) { mProcVar0.m3570 = 1; - setSingleMoveAnime(ANM_USEFANB2, fVar1, 0.0f, -1, daPy_HIO_fan_c0::m.field_0x30); + setSingleMoveAnime(ANM_USEFANB2, fVar1, 0.0f, -1, m_HIO->mItem.mFan.m.field_0x30); mpParachuteFanMorf->setAnm( getItemAnimeResource(LKANM_BCK_FANB2A), 0, - daPy_HIO_fan_c0::m.field_0x30, + m_HIO->mItem.mFan.m.field_0x30, 1.0f, 0.0f, -1.0f, @@ -513,26 +513,26 @@ BOOL daPy_lk_c::procFanGlide() { if (local_64 >= 1.0f) { local_64 = 1.0f; } - local_54.x = local_64 * daPy_HIO_fan_c0::m.field_0x4C * local_60.x; + local_54.x = local_64 * m_HIO->mItem.mFan.m.field_0x4C * local_60.x; local_54.y = 0.5f * local_64 * local_60.y; - local_54.z = local_64 * daPy_HIO_fan_c0::m.field_0x4C * local_60.z; + local_54.z = local_64 * m_HIO->mItem.mFan.m.field_0x4C * local_60.z; dVar13 = 3.0f; if (mProcVar0.m3570 != 0) { mProcVar0.m3570 = 0; setSingleMoveAnime( ANM_USEFANB, - daPy_HIO_fan_c0::m.field_0x20, - daPy_HIO_fan_c0::m.field_0x4 - 0.001f, - daPy_HIO_fan_c0::m.field_0x4, - daPy_HIO_fan_c0::m.field_0x34 + m_HIO->mItem.mFan.m.field_0x20, + m_HIO->mItem.mFan.m.field_0x4 - 0.001f, + m_HIO->mItem.mFan.m.field_0x4, + m_HIO->mItem.mFan.m.field_0x34 ); mpParachuteFanMorf->setAnm( getItemAnimeResource(LKANM_BCK_FANBA), 0, - daPy_HIO_fan_c0::m.field_0x34, - daPy_HIO_fan_c0::m.field_0x20, - daPy_HIO_fan_c0::m.field_0x4 - 0.001f, - daPy_HIO_fan_c0::m.field_0x4, + m_HIO->mItem.mFan.m.field_0x34, + m_HIO->mItem.mFan.m.field_0x20, + m_HIO->mItem.mFan.m.field_0x4 - 0.001f, + m_HIO->mItem.mFan.m.field_0x4, NULL ); } diff --git a/src/d/actor/d_a_player_food.inc b/src/d/actor/d_a_player_food.inc index 8099a833..90950b02 100644 --- a/src/d/actor/d_a_player_food.inc +++ b/src/d/actor/d_a_player_food.inc @@ -92,10 +92,10 @@ BOOL daPy_lk_c::procFoodThrow_init() { daPy_matAnm_c::offMabaFlg(); setSingleMoveAnime( ANM_ESAMAKI, - daPy_HIO_food_c0::m.field_0x4, - daPy_HIO_food_c0::m.field_0x8, - daPy_HIO_food_c0::m.field_0x0, - daPy_HIO_food_c0::m.field_0xC + m_HIO->mItem.mFood.m.field_0x4, + m_HIO->mItem.mFood.m.field_0x8, + m_HIO->mItem.mFood.m.field_0x0, + m_HIO->mItem.mFood.m.field_0xC ); keepItemData(); @@ -181,10 +181,10 @@ BOOL daPy_lk_c::procFoodSet_init() { mVelocity = 0.0f; setSingleMoveAnime( ANM_SETHYOINOMI, - daPy_HIO_food_c0::m.field_0x10, - daPy_HIO_food_c0::m.field_0x14, - daPy_HIO_food_c0::m.field_0x2, - daPy_HIO_food_c0::m.field_0x18 + m_HIO->mItem.mFood.m.field_0x10, + m_HIO->mItem.mFood.m.field_0x14, + m_HIO->mItem.mFood.m.field_0x2, + m_HIO->mItem.mFood.m.field_0x18 ); keepItemData(); setHyoiModel(); @@ -221,7 +221,7 @@ BOOL daPy_lk_c::procFoodSet() { endDemoMode(); } else if (m34D0 == 0) { m34D0 = -1; - frameCtrl.setRate(-daPy_HIO_food_c0::m.field_0x10); + frameCtrl.setRate(-m_HIO->mItem.mFood.m.field_0x10); } else if (m34D0 > 0) { m34D0--; } diff --git a/src/d/actor/d_a_player_grab.inc b/src/d/actor/d_a_player_grab.inc index be5ef92f..b8461a46 100644 --- a/src/d/actor/d_a_player_grab.inc +++ b/src/d/actor/d_a_player_grab.inc @@ -195,7 +195,7 @@ void daPy_lk_c::freeGrabItem() { } mActorKeepGrab.clearData(); if (checkGrabAnime()) { - resetActAnimeUpper(UPPER_MOVE2_e, daPy_HIO_basic_c0::m.field_0xC); + resetActAnimeUpper(UPPER_MOVE2_e, m_HIO->mBasic.m.field_0xC); } field_0x2b0 = 0.0f; m35CC = 0.0f; @@ -313,14 +313,14 @@ BOOL daPy_lk_c::procGrabReady_init() { } setSingleMoveAnime( ANM_GRABP, - daPy_HIO_grab_c0::m.field_0x20, - daPy_HIO_grab_c0::m.field_0x24, - daPy_HIO_grab_c0::m.field_0x0, - daPy_HIO_grab_c0::m.field_0x28 + m_HIO->mGrab.m.field_0x20, + m_HIO->mGrab.m.field_0x24, + m_HIO->mGrab.m.field_0x0, + m_HIO->mGrab.m.field_0x28 ); mProcVar0.m3570 = 1; } else { - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); setAnimeUnequip(); mProcVar0.m3570 = 0; } @@ -366,16 +366,16 @@ BOOL daPy_lk_c::procGrabReady() { } else if (fopAcM_CheckStatus(grab_actor, fopAcStts_UNK10000_e | fopAcStts_UNK8000000_e)) { f32 fVar1; if (fopAcM_CheckStatus(grab_actor, fopAcStts_UNK8000000_e)) { - fVar1 = daPy_HIO_grab_c0::m.field_0xA4; + fVar1 = m_HIO->mGrab.m.field_0xA4; } else { - fVar1 = daPy_HIO_grab_c0::m.field_0xA8; + fVar1 = m_HIO->mGrab.m.field_0xA8; } setSingleMoveAnime( ANM_GRABNG, fVar1, - daPy_HIO_grab_c0::m.field_0x40, - daPy_HIO_grab_c0::m.field_0x10, - daPy_HIO_grab_c0::m.field_0x44 + m_HIO->mGrab.m.field_0x40, + m_HIO->mGrab.m.field_0x10, + m_HIO->mGrab.m.field_0x44 ); mProcVar0.m3570 = 2; } else { @@ -389,10 +389,10 @@ BOOL daPy_lk_c::procGrabReady() { } else if (mProcVar0.m3570 == 0 && checkNoUpperAnime()) { setSingleMoveAnime( ANM_GRABP, - daPy_HIO_grab_c0::m.field_0x20, - daPy_HIO_grab_c0::m.field_0x24, - daPy_HIO_grab_c0::m.field_0x0, - daPy_HIO_grab_c0::m.field_0x28 + m_HIO->mGrab.m.field_0x20, + m_HIO->mGrab.m.field_0x24, + m_HIO->mGrab.m.field_0x0, + m_HIO->mGrab.m.field_0x28 ); mProcVar0.m3570 = 1; } @@ -405,16 +405,16 @@ BOOL daPy_lk_c::procGrabUp_init() { fopAc_ac_c* grab_actor = mActorKeepGrab.getActor(); s16 sVar1; if (fopAcM_CheckStatus(grab_actor, fopAcStts_UNK10000_e | fopAcStts_UNK8000000_e)) { - sVar1 = daPy_HIO_grab_c0::m.field_0x12; + sVar1 = m_HIO->mGrab.m.field_0x12; } else { - sVar1 = daPy_HIO_grab_c0::m.field_0x2; + sVar1 = m_HIO->mGrab.m.field_0x2; } setSingleMoveAnime( ANM_GRABUP, - daPy_HIO_grab_c0::m.field_0x2C, - daPy_HIO_grab_c0::m.field_0x30, + m_HIO->mGrab.m.field_0x2C, + m_HIO->mGrab.m.field_0x30, sVar1, - daPy_HIO_grab_c0::m.field_0x38 + m_HIO->mGrab.m.field_0x38 ); m370C = mActorKeepGrab.getActor()->current.pos - m3748; m35C8 = m370C.absXZ() - 47.0f; @@ -445,7 +445,7 @@ BOOL daPy_lk_c::procGrabUp() { } else { initGrabNextMode(); } - } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_grab_c0::m.field_0x34) { + } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mGrab.m.field_0x34) { if (fopAcM_CheckStatus(grab_actor, fopAcStts_UNK10000_e | fopAcStts_UNK8000000_e)) { if (mStickDistance > 0.05f) { onResetFlg0(daPyRFlg0_GRAB_UP_END); @@ -472,13 +472,13 @@ BOOL daPy_lk_c::procGrabMiss_init() { commonProcInit(daPyProc_GRAB_MISS_e); setSingleMoveAnime( ANM_GRABNG, - daPy_HIO_grab_c0::m.field_0x3C, - daPy_HIO_grab_c0::m.field_0x40, - daPy_HIO_grab_c0::m.field_0x4, - daPy_HIO_grab_c0::m.field_0x44 + m_HIO->mGrab.m.field_0x3C, + m_HIO->mGrab.m.field_0x40, + m_HIO->mGrab.m.field_0x4, + m_HIO->mGrab.m.field_0x44 ); mProcVar0.m3570 = 0; - m34D0 = daPy_HIO_grab_c0::m.field_0x6; + m34D0 = m_HIO->mGrab.m.field_0x6; dComIfGs_onEventBit(dSv_event_flag_c::UNK_4020); return true; } @@ -495,10 +495,10 @@ BOOL daPy_lk_c::procGrabMiss() { } else { setSingleMoveAnime( ANM_GRABP, - daPy_HIO_grab_c0::m.field_0x48, - daPy_HIO_grab_c0::m.field_0x4C, - daPy_HIO_grab_c0::m.field_0x8, - daPy_HIO_grab_c0::m.field_0x54 + m_HIO->mGrab.m.field_0x48, + m_HIO->mGrab.m.field_0x4C, + m_HIO->mGrab.m.field_0x8, + m_HIO->mGrab.m.field_0x54 ); mProcVar0.m3570 = 1; freeGrabItem(); @@ -506,7 +506,7 @@ BOOL daPy_lk_c::procGrabMiss() { } } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() > -0.01f) { checkNextMode(0); - } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() < daPy_HIO_grab_c0::m.field_0x50) { + } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() < m_HIO->mGrab.m.field_0x50) { checkNextMode(1); } return true; @@ -521,19 +521,19 @@ BOOL daPy_lk_c::procGrabThrow_init(int param_0) { if (fopAcM_CheckStatus(mActorKeepGrab.getActor(), fopAcStts_UNK10000_e)) { setSingleMoveAnime( ANM_GRABRE, - daPy_HIO_grab_c0::m.field_0x94, - daPy_HIO_grab_c0::m.field_0x98, - daPy_HIO_grab_c0::m.field_0x1C, - daPy_HIO_grab_c0::m.field_0xA0 + m_HIO->mGrab.m.field_0x94, + m_HIO->mGrab.m.field_0x98, + m_HIO->mGrab.m.field_0x1C, + m_HIO->mGrab.m.field_0xA0 ); m3574 = 0; } else { setSingleMoveAnime( ANM_GRABTHROW, - daPy_HIO_grab_c0::m.field_0x58, - daPy_HIO_grab_c0::m.field_0x5C, - daPy_HIO_grab_c0::m.field_0xA, - daPy_HIO_grab_c0::m.field_0x64 + m_HIO->mGrab.m.field_0x58, + m_HIO->mGrab.m.field_0x5C, + m_HIO->mGrab.m.field_0xA, + m_HIO->mGrab.m.field_0x64 ); m3574 = 1; } @@ -549,26 +549,26 @@ BOOL daPy_lk_c::procGrabThrow() { fopAc_ac_c* grab_actor = mActorKeepGrab.getActor(); cLib_addCalc( - &mVelocity, 0.0f, daPy_HIO_move_c0::m.field_0x24, daPy_HIO_move_c0::m.field_0x1C, daPy_HIO_move_c0::m.field_0x20 + &mVelocity, 0.0f, m_HIO->mMove.m.field_0x24, m_HIO->mMove.m.field_0x1C, m_HIO->mMove.m.field_0x20 ); if (m3574 == 0) { if (frameCtrl.getRate() < 0.01f) { setSingleMoveAnime( ANM_GRABTHROW, - daPy_HIO_grab_c0::m.field_0x58, - daPy_HIO_grab_c0::m.field_0x5C, - daPy_HIO_grab_c0::m.field_0xA, - daPy_HIO_grab_c0::m.field_0x64 + m_HIO->mGrab.m.field_0x58, + m_HIO->mGrab.m.field_0x5C, + m_HIO->mGrab.m.field_0xA, + m_HIO->mGrab.m.field_0x64 ); m3574 = 1; } return true; } - if (frameCtrl.checkPass(daPy_HIO_grab_c0::m.field_0x8C) && grab_actor != NULL) { + if (frameCtrl.checkPass(m_HIO->mGrab.m.field_0x8C) && grab_actor != NULL) { grab_actor->current.angle.y = shape_angle.y; - grab_actor->speedF = daPy_HIO_grab_c0::m.field_0x84; - grab_actor->speed.y = daPy_HIO_grab_c0::m.field_0x88; + grab_actor->speedF = m_HIO->mGrab.m.field_0x84; + grab_actor->speed.y = m_HIO->mGrab.m.field_0x88; dComIfGp_getCamera(mCameraInfoIdx)->mCamera.ForceLockOn(mActorKeepGrab.getID()); if (fopAcM_CheckStatus(grab_actor, fopAcStts_UNK10000_e)) { voiceStart(18); @@ -586,7 +586,7 @@ BOOL daPy_lk_c::procGrabThrow() { setAnimeEquipSword(0); } checkNextMode(0); - } else if (frameCtrl.getFrame() > daPy_HIO_grab_c0::m.field_0x60) { + } else if (frameCtrl.getFrame() > m_HIO->mGrab.m.field_0x60) { if (mProcVar0.m3570 != 0) { mProcVar0.m3570 = 0; setAnimeEquipSword(0); @@ -605,15 +605,15 @@ BOOL daPy_lk_c::procGrabPut_init() { commonProcInit(daPyProc_GRAB_PUT_e); if (checkGrabWear()) { mProcVar0.m3570 = 1; - setSingleMoveAnime(ANM_GRABWAIT, daPy_HIO_grab_c0::m.field_0x78, 0.0f, -1, daPy_HIO_grab_c0::m.field_0x7C); + setSingleMoveAnime(ANM_GRABWAIT, m_HIO->mGrab.m.field_0x78, 0.0f, -1, m_HIO->mGrab.m.field_0x7C); } else { mProcVar0.m3570 = 0; setSingleMoveAnime( ANM_GRABUP, - daPy_HIO_grab_c0::m.field_0x68, - daPy_HIO_grab_c0::m.field_0x6C, - daPy_HIO_grab_c0::m.field_0xC, - daPy_HIO_grab_c0::m.field_0x74 + m_HIO->mGrab.m.field_0x68, + m_HIO->mGrab.m.field_0x6C, + m_HIO->mGrab.m.field_0xC, + m_HIO->mGrab.m.field_0x74 ); } mVelocity = 0.0f; @@ -645,10 +645,10 @@ BOOL daPy_lk_c::procGrabPut() { mProcVar0.m3570 = 0; setSingleMoveAnime( ANM_GRABUP, - daPy_HIO_grab_c0::m.field_0x68, - daPy_HIO_grab_c0::m.field_0x6C, - daPy_HIO_grab_c0::m.field_0xC, - daPy_HIO_grab_c0::m.field_0x74 + m_HIO->mGrab.m.field_0x68, + m_HIO->mGrab.m.field_0x6C, + m_HIO->mGrab.m.field_0xC, + m_HIO->mGrab.m.field_0x74 ); } else { return true; @@ -692,7 +692,7 @@ BOOL daPy_lk_c::procGrabPut() { } else { checkNextMode(0); } - } else if ((mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() < daPy_HIO_grab_c0::m.field_0x70) && checkNextMode(1)) { + } else if ((mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() < m_HIO->mGrab.m.field_0x70) && checkNextMode(1)) { grab_actor->speedF = 0.0f; freeGrabItem(); } @@ -707,12 +707,12 @@ BOOL daPy_lk_c::procGrabWait_init() { } commonProcInit(daPyProc_GRAB_WAIT_e); if (checkGrabSpecialHeavyState()) { - setSingleMoveAnime(ANM_GRABWAITB, daPy_HIO_grab_c0::m.field_0x90, 0.0f, -1, daPy_HIO_grab_c0::m.field_0x7C); + setSingleMoveAnime(ANM_GRABWAITB, m_HIO->mGrab.m.field_0x90, 0.0f, -1, m_HIO->mGrab.m.field_0x7C); if (!checkGrabAnime()) { setActAnimeUpper(LKANM_BCK_GRABWAITB, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); } } else { - setSingleMoveAnime(ANM_GRABWAIT, daPy_HIO_grab_c0::m.field_0x78, 0.0f, -1, daPy_HIO_grab_c0::m.field_0x7C); + setSingleMoveAnime(ANM_GRABWAIT, m_HIO->mGrab.m.field_0x78, 0.0f, -1, m_HIO->mGrab.m.field_0x7C); if (!checkGrabAnime()) { setActAnimeUpper(LKANM_BCK_GRABWAIT, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); } @@ -739,7 +739,7 @@ BOOL daPy_lk_c::procGrabWait() { if (checkAttentionLock()) { setSpeedAndAngleAtn(); } else { - setSpeedAndAngleNormal(daPy_HIO_move_c0::m.field_0x0); + setSpeedAndAngleNormal(m_HIO->mMove.m.field_0x0); } if (m35D8 <= -29.0f) { if ((mFrameCtrlUnder[UNDER_MOVE0_e].getRate() > 0.0f) && mProcVar0.m3570 == 0) { @@ -750,7 +750,7 @@ BOOL daPy_lk_c::procGrabWait() { } mFrameCtrlUnder[UNDER_MOVE0_e].setRate(0.0f); } else { - mFrameCtrlUnder[UNDER_MOVE0_e].setRate(daPy_HIO_grab_c0::m.field_0x78); + mFrameCtrlUnder[UNDER_MOVE0_e].setRate(m_HIO->mGrab.m.field_0x78); } if (checkNextMode(0)) { if (checkGrabAnime()) { @@ -761,7 +761,7 @@ BOOL daPy_lk_c::procGrabWait() { if (checkNoResetFlg1(daPyFlg1_UNK800000)) { fVar2 = -1.0f; } else { - fVar2 = daPy_HIO_basic_c0::m.field_0xC; + fVar2 = m_HIO->mBasic.m.field_0xC; } setBlendMoveAnime(fVar2); m_pbCalc[PART_UPPER_e]->setRatio(2, 1.0f); @@ -769,9 +769,9 @@ BOOL daPy_lk_c::procGrabWait() { onNoResetFlg1(daPyFlg1_UNK800000); } else if (checkNoResetFlg1(daPyFlg1_UNK800000)) { if (checkGrabSpecialHeavyState()) { - setSingleMoveAnime(ANM_GRABWAITB, daPy_HIO_grab_c0::m.field_0x90, 0.0f, -1, daPy_HIO_grab_c0::m.field_0x7C); + setSingleMoveAnime(ANM_GRABWAITB, m_HIO->mGrab.m.field_0x90, 0.0f, -1, m_HIO->mGrab.m.field_0x7C); } else { - setSingleMoveAnime(ANM_GRABWAIT, daPy_HIO_grab_c0::m.field_0x78, 0.0f, -1, daPy_HIO_grab_c0::m.field_0x7C); + setSingleMoveAnime(ANM_GRABWAIT, m_HIO->mGrab.m.field_0x78, 0.0f, -1, m_HIO->mGrab.m.field_0x7C); } m_pbCalc[PART_UPPER_e]->setRatio(2, 0.0f); m35A0 = 0.0f; @@ -783,7 +783,7 @@ BOOL daPy_lk_c::procGrabWait() { /* 8013C914-8013C9AC .text procGrabHeavyWait_init__9daPy_lk_cFv */ BOOL daPy_lk_c::procGrabHeavyWait_init() { commonProcInit(daPyProc_GRAB_HEAVY_WAIT_e); - setSingleMoveAnime(ANM_GRABWAITB, daPy_HIO_grab_c0::m.field_0x90, 0.0f, -1, daPy_HIO_grab_c0::m.field_0x7C); + setSingleMoveAnime(ANM_GRABWAITB, m_HIO->mGrab.m.field_0x90, 0.0f, -1, m_HIO->mGrab.m.field_0x7C); setActAnimeUpper(LKANM_BCK_GRABWAITB, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); m_pbCalc[PART_UPPER_e]->setRatio(2, 0.0f); current.angle.y = shape_angle.y; @@ -803,18 +803,18 @@ BOOL daPy_lk_c::procGrabHeavyWait() { cLib_addCalcAngleS( &shape_angle.y, m34E8, - daPy_HIO_grab_c0::m.field_0x16, - daPy_HIO_grab_c0::m.field_0x18, - daPy_HIO_grab_c0::m.field_0x1A + m_HIO->mGrab.m.field_0x16, + m_HIO->mGrab.m.field_0x18, + m_HIO->mGrab.m.field_0x1A ); s16 y_diff = shape_angle.y - current.angle.y; - m35A0 = y_diff / (f32)daPy_HIO_grab_c0::m.field_0x18; + m35A0 = y_diff / (f32)m_HIO->mGrab.m.field_0x18; current.angle.y = shape_angle.y; f32 fVar1; if (checkNoResetFlg1(daPyFlg1_UNK800000)) { fVar1 = -1.0f; } else { - fVar1 = daPy_HIO_basic_c0::m.field_0xC; + fVar1 = m_HIO->mBasic.m.field_0xC; } setBlendMoveAnime(fVar1); m_pbCalc[PART_UPPER_e]->setRatio(2, 1.0f); @@ -822,7 +822,7 @@ BOOL daPy_lk_c::procGrabHeavyWait() { } else { m35A0 = 0.0f; if (checkNoResetFlg1(daPyFlg1_UNK800000)) { - setSingleMoveAnime(ANM_GRABWAITB, daPy_HIO_grab_c0::m.field_0x90, 0.0f, -1, daPy_HIO_grab_c0::m.field_0x7C); + setSingleMoveAnime(ANM_GRABWAITB, m_HIO->mGrab.m.field_0x90, 0.0f, -1, m_HIO->mGrab.m.field_0x7C); m_pbCalc[PART_UPPER_e]->setRatio(2, 0.0f); offNoResetFlg1(daPyFlg1_UNK800000); } @@ -842,10 +842,10 @@ BOOL daPy_lk_c::procGrabRebound_init() { commonProcInit(daPyProc_GRAB_REBOUND_e); setSingleMoveAnime( ANM_GRABRE, - daPy_HIO_grab_c0::m.field_0x94, - daPy_HIO_grab_c0::m.field_0x98, - daPy_HIO_grab_c0::m.field_0xE, - daPy_HIO_grab_c0::m.field_0xA0 + m_HIO->mGrab.m.field_0x94, + m_HIO->mGrab.m.field_0x98, + m_HIO->mGrab.m.field_0xE, + m_HIO->mGrab.m.field_0xA0 ); return true; } @@ -863,7 +863,7 @@ BOOL daPy_lk_c::procGrabRebound() { if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { initGrabNextMode(); - } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_grab_c0::m.field_0x9C && + } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mGrab.m.field_0x9C && fopAcM_CheckStatus(grab_actor, fopAcStts_UNK10000_e)) { initGrabNextMode(); diff --git a/src/d/actor/d_a_player_hammer.inc b/src/d/actor/d_a_player_hammer.inc index 80180e52..5202957e 100644 --- a/src/d/actor/d_a_player_hammer.inc +++ b/src/d/actor/d_a_player_hammer.inc @@ -172,10 +172,10 @@ BOOL daPy_lk_c::procHammerSideSwing_init() { commonProcInit(daPyProc_HAMMER_SIDE_SWING_e); setSingleMoveAnime( ANM_HAMSWINGA, - daPy_HIO_ham_c0::m.field_0x8, - daPy_HIO_ham_c0::m.field_0xC, - daPy_HIO_ham_c0::m.field_0x0, - daPy_HIO_ham_c0::m.field_0x14 + m_HIO->mItem.mHam.m.field_0x8, + m_HIO->mItem.mHam.m.field_0xC, + m_HIO->mItem.mHam.m.field_0x0, + m_HIO->mItem.mHam.m.field_0x14 ); current.angle.y = shape_angle.y; mVelocity = 0.0f; @@ -184,7 +184,7 @@ BOOL daPy_lk_c::procHammerSideSwing_init() { setBlurPosResource(LKANM__HAMMERSIDE_POS); setAtParam(AT_TYPE_SKULL_HAMMER, 4, dCcG_At_Spl_UNK0, dCcG_SE_UNK5, dCcG_AtHitMark_Nrm_e, 17, 50.0f); mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_HAMSWINGAA)); - m35EC = daPy_HIO_ham_c0::m.field_0xC; + m35EC = m_HIO->mItem.mHam.m.field_0xC; return true; } @@ -197,7 +197,7 @@ BOOL daPy_lk_c::procHammerSideSwing() { checkNextMode(0); return true; } - if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_ham_c0::m.field_0x10) { + if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mItem.mHam.m.field_0x10) { f32 dVar4 = mVelocity; u8 orig_direction = mDirection; mVelocity = 0.0f; @@ -219,14 +219,14 @@ BOOL daPy_lk_c::procHammerSideSwing() { cLib_addCalcAngleS( &shape_angle.y, m34D4, - daPy_HIO_turn_c0::m.field_0x4, - daPy_HIO_turn_c0::m.field_0x0, - daPy_HIO_turn_c0::m.field_0x2 + m_HIO->mTurn.m.field_0x4, + m_HIO->mTurn.m.field_0x0, + m_HIO->mTurn.m.field_0x2 ); } current.angle.y = shape_angle.y; - if ((mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= daPy_HIO_ham_c0::m.field_0x18) && - (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() < daPy_HIO_ham_c0::m.field_0x1C)) + if ((mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= m_HIO->mItem.mHam.m.field_0x18) && + (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() < m_HIO->mItem.mHam.m.field_0x1C)) { if (!checkNoResetFlg0(daPyFlg0_CUT_AT_FLG)) { onResetFlg0(daPyRFlg0_UNK1); @@ -242,10 +242,10 @@ BOOL daPy_lk_c::procHammerFrontSwingReady_init() { commonProcInit(daPyProc_HAMMER_FRONT_SWING_READY_e); setSingleMoveAnime( ANM_HAMSWINGBPRE, - daPy_HIO_ham_c0::m.field_0x20, - daPy_HIO_ham_c0::m.field_0x24, - daPy_HIO_ham_c0::m.field_0x2, - daPy_HIO_ham_c0::m.field_0x28 + m_HIO->mItem.mHam.m.field_0x20, + m_HIO->mItem.mHam.m.field_0x24, + m_HIO->mItem.mHam.m.field_0x2, + m_HIO->mItem.mHam.m.field_0x28 ); current.angle.y = shape_angle.y; mVelocity = 0.0f; @@ -257,7 +257,7 @@ BOOL daPy_lk_c::procHammerFrontSwingReady_init() { setAtParam(AT_TYPE_SKULL_HAMMER, 4, dCcG_At_Spl_UNK0, dCcG_SE_UNK5, dCcG_AtHitMark_Nrm_e, 18, 50.0f); voiceStart(7); mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_HAMSWINGBPREA)); - m35EC = daPy_HIO_ham_c0::m.field_0x24; + m35EC = m_HIO->mItem.mHam.m.field_0x24; m355C = 0; return true; } @@ -275,9 +275,9 @@ BOOL daPy_lk_c::procHammerFrontSwingReady() { cLib_addCalcAngleS( &shape_angle.y, m34D4, - daPy_HIO_turn_c0::m.field_0x4, - daPy_HIO_turn_c0::m.field_0x0, - daPy_HIO_turn_c0::m.field_0x2 + m_HIO->mTurn.m.field_0x4, + m_HIO->mTurn.m.field_0x0, + m_HIO->mTurn.m.field_0x2 ); } current.angle.y = shape_angle.y; @@ -289,9 +289,9 @@ BOOL daPy_lk_c::procHammerFrontSwing_init() { commonProcInit(daPyProc_HAMMER_FRONT_SWING_e); setSingleMoveAnime( ANM_HAMSWINGBHIT, - 4.0f * daPy_HIO_ham_c0::m.field_0x2C, - daPy_HIO_ham_c0::m.field_0x30, - daPy_HIO_ham_c0::m.field_0x4, + 4.0f * m_HIO->mItem.mHam.m.field_0x2C, + m_HIO->mItem.mHam.m.field_0x30, + m_HIO->mItem.mHam.m.field_0x4, 0.0f ); current.angle.y = shape_angle.y; @@ -309,7 +309,7 @@ BOOL daPy_lk_c::procHammerFrontSwing_init() { onResetFlg0(daPy_RFLG0(daPyRFlg0_UNK1 | daPyRFlg0_UNK2)); m34D0 = 0; mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_HAMSWINGBHITA)); - m35EC = daPy_HIO_ham_c0::m.field_0x30; + m35EC = m_HIO->mItem.mHam.m.field_0x30; return true; } @@ -376,9 +376,9 @@ BOOL daPy_lk_c::procHammerFrontSwing() { cLib_addCalcAngleS( &shape_angle.y, m34D4, - daPy_HIO_turn_c0::m.field_0x4, - daPy_HIO_turn_c0::m.field_0x0, - daPy_HIO_turn_c0::m.field_0x2 + m_HIO->mTurn.m.field_0x4, + m_HIO->mTurn.m.field_0x0, + m_HIO->mTurn.m.field_0x2 ); } current.angle.y = shape_angle.y; @@ -391,10 +391,10 @@ BOOL daPy_lk_c::procHammerFrontSwingEnd_init() { commonProcInit(daPyProc_HAMMER_FRONT_SWING_END_e); setSingleMoveAnime( ANM_HAMSWINGBEND, - daPy_HIO_ham_c0::m.field_0x34, - daPy_HIO_ham_c0::m.field_0x38, - daPy_HIO_ham_c0::m.field_0x6, - daPy_HIO_ham_c0::m.field_0x40 + m_HIO->mItem.mHam.m.field_0x34, + m_HIO->mItem.mHam.m.field_0x38, + m_HIO->mItem.mHam.m.field_0x6, + m_HIO->mItem.mHam.m.field_0x40 ); current.angle.y = shape_angle.y; mVelocity = 0.0f; @@ -407,7 +407,7 @@ BOOL daPy_lk_c::procHammerFrontSwingEnd_init() { BOOL daPy_lk_c::procHammerFrontSwingEnd() { if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { return checkNextMode(0); - } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_ham_c0::m.field_0x3C) { + } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mItem.mHam.m.field_0x3C) { return checkNextMode(1); } else { return true; diff --git a/src/d/actor/d_a_player_hang.inc b/src/d/actor/d_a_player_hang.inc index bc9595d6..857fba64 100644 --- a/src/d/actor/d_a_player_hang.inc +++ b/src/d/actor/d_a_player_hang.inc @@ -16,7 +16,7 @@ /* 80133F1C-80133F40 .text getHangMoveAnmSpeed__9daPy_lk_cFv */ f32 daPy_lk_c::getHangMoveAnmSpeed() { - return getAnmSpeedStickRate(daPy_HIO_hang_c0::m.field_0x24, daPy_HIO_hang_c0::m.field_0x28); + return getAnmSpeedStickRate(m_HIO->mHang.m.field_0x24, m_HIO->mHang.m.field_0x28); } /* 80133F40-80133FB4 .text getHangDirectionFromAngle__9daPy_lk_cFv */ @@ -120,13 +120,13 @@ int daPy_lk_c::changeHangEndProc(int param_0) { m3588 = dBgS_Attr_UNK1B_e; } if (m35DC > mFootData[1].field_0x018.y + current.pos.y) { - return procLand_init(daPy_HIO_autoJump_c0::m.field_0x24, 0); + return procLand_init(m_HIO->mAutoJump.m.field_0x24, 0); } if (param_0 != 0) { dComIfGp_setDoStatus(dActStts_LET_GO_e); if (doTrigger()) { speed.y = 0.0f; - return procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + return procFall_init(1, m_HIO->mWallCatch.m.field_0x54); } } return false; @@ -204,10 +204,10 @@ BOOL daPy_lk_c::procHangStart_init() { mProcVar0.m3570 = sVar3; setSingleMoveAnime( ANM_VJMPCHA, - daPy_HIO_wallCatch_c0::m.field_0x44, - daPy_HIO_wallCatch_c0::m.field_0x4C, - daPy_HIO_wallCatch_c0::m.field_0x2, - daPy_HIO_wallCatch_c0::m.field_0x48 + m_HIO->mWallCatch.m.field_0x44, + m_HIO->mWallCatch.m.field_0x4C, + m_HIO->mWallCatch.m.field_0x2, + m_HIO->mWallCatch.m.field_0x48 ); current.pos = local_1c; shape_angle.y = m352C + 0x8000; @@ -226,11 +226,11 @@ BOOL daPy_lk_c::procHangStart() { } if (((mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) || - (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_wallCatch_c0::m.field_0x50)) && + (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mWallCatch.m.field_0x50)) && (mStickDistance > 0.05f || mProcVar0.m3570 != 0)) { if (getDirectionFromShapeAngle() == DIR_FORWARD || mProcVar0.m3570 != 0) { - procHangClimb_init(daPy_HIO_wallCatch_c0::m.field_0x2C); + procHangClimb_init(m_HIO->mWallCatch.m.field_0x2C); } } else { if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { @@ -311,11 +311,11 @@ BOOL daPy_lk_c::procHangFallStart_init(cM3dGPla* param_0) { if (mCurProc == daPyProc_FRONT_ROLL_e) { morf = 0.0f; } else { - morf = daPy_HIO_hang_c0::m.field_0x10; + morf = m_HIO->mHang.m.field_0x10; } commonProcInit(daPyProc_HANG_FALL_START_e); setSingleMoveAnime( - ANM_HANGING, daPy_HIO_hang_c0::m.field_0x4, daPy_HIO_hang_c0::m.field_0x8, daPy_HIO_hang_c0::m.field_0x0, morf + ANM_HANGING, m_HIO->mHang.m.field_0x4, m_HIO->mHang.m.field_0x8, m_HIO->mHang.m.field_0x0, morf ); mVelocity = 0.0f; speed.y = 0.0f; @@ -329,7 +329,7 @@ BOOL daPy_lk_c::procHangFallStart() { int iVar2; if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f || - mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_hang_c0::m.field_0xC) + mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mHang.m.field_0xC) { iVar2 = 1; } else { @@ -360,10 +360,10 @@ BOOL daPy_lk_c::procHangUp_init(int param_0) { commonProcInit(daPyProc_HANG_UP_e); setSingleMoveAnime( ANM_HANGUP, - daPy_HIO_hang_c0::m.field_0x14, - daPy_HIO_hang_c0::m.field_0x18, - daPy_HIO_hang_c0::m.field_0x2, - daPy_HIO_hang_c0::m.field_0x20 + m_HIO->mHang.m.field_0x14, + m_HIO->mHang.m.field_0x18, + m_HIO->mHang.m.field_0x2, + m_HIO->mHang.m.field_0x20 ); dComIfGp_setPlayerStatus0(0, daPyStts0_UNK100_e); mProcVar0.m3570 = param_0; @@ -382,10 +382,10 @@ BOOL daPy_lk_c::procHangUp() { } if ((mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) || - (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_hang_c0::m.field_0x1C)) + (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mHang.m.field_0x1C)) { if (mProcVar0.m3570 == 0) { - procHangClimb_init(daPy_HIO_wallCatch_c0::m.field_0x2C); + procHangClimb_init(m_HIO->mWallCatch.m.field_0x2C); } else if (changeHangMoveProc(mProcVar0.m3570)) { procHangMove_init(mProcVar0.m3570); } else { @@ -398,7 +398,7 @@ BOOL daPy_lk_c::procHangUp() { /* 80135094-80135140 .text procHangWait_init__9daPy_lk_cFv */ BOOL daPy_lk_c::procHangWait_init() { commonProcInit(daPyProc_HANG_WAIT_e); - setSingleMoveAnime(ANM_VJMPCHA, 0.0f, daPy_HIO_wallCatch_c0::m.field_0x2, -1, 5.0f); + setSingleMoveAnime(ANM_VJMPCHA, 0.0f, m_HIO->mWallCatch.m.field_0x2, -1, 5.0f); setTextureAnime(9, 0); mpSeAnmFrameCtrl = NULL; mVelocity = 0.0f; @@ -421,7 +421,7 @@ BOOL daPy_lk_c::procHangWait() { if (mStickDistance > 0.05f) { iVar2 = getHangDirectionFromAngle(); if (iVar2 == 0) { - procHangClimb_init(daPy_HIO_wallCatch_c0::m.field_0x2C); + procHangClimb_init(m_HIO->mWallCatch.m.field_0x2C); } else if (iVar2 != 1 && changeHangMoveProc(iVar2)) { s16 sVar1 = m34EC; procHangMove_init(iVar2); @@ -444,7 +444,7 @@ BOOL daPy_lk_c::procHangMove_init(int param_0) { current.angle.y = shape_angle.y + -0x4000; } f32 dVar3 = getHangMoveAnmSpeed(); - setSingleMoveAnime(dVar1, dVar3, 0.0f, -1, daPy_HIO_hang_c0::m.field_0x2C); + setSingleMoveAnime(dVar1, dVar3, 0.0f, -1, m_HIO->mHang.m.field_0x2C); dComIfGp_setPlayerStatus0(0, daPyStts0_UNK100_e); mVelocity = 0.0f; cXyz local_1c = mLeftHandPos - mRightHandPos; @@ -459,7 +459,7 @@ BOOL daPy_lk_c::procHangMove() { if (!changeHangEndProc(1)) { if (iVar7 == 0 && mStickDistance > 0.05f) { - procHangClimb_init(daPy_HIO_wallCatch_c0::m.field_0x2C); + procHangClimb_init(m_HIO->mWallCatch.m.field_0x2C); } else { J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e]; frameCtrl.setRate(getHangMoveAnmSpeed()); @@ -475,7 +475,7 @@ BOOL daPy_lk_c::procHangMove() { cXyz local_64 = mRightHandPos - mLeftHandPos; float dVar12 = local_64.absXZ(); if (changeHangMoveProc(4)) { - mVelocity = std::fabsf(dVar12 - m35A0) * daPy_HIO_hang_c0::m.field_0x30; + mVelocity = std::fabsf(dVar12 - m35A0) * m_HIO->mHang.m.field_0x30; float fVar1 = cM_ssin(shape_angle.y); float fVar2 = cM_scos(shape_angle.y); float dVar13 = cM_ssin(current.angle.y); @@ -542,10 +542,10 @@ BOOL daPy_lk_c::procHangClimb_init(f32 param_0) { commonProcInit(daPyProc_HANG_CLIMB_e); setSingleMoveAnime( ANM_VJMPCL, - daPy_HIO_wallCatch_c0::m.field_0x24, + m_HIO->mWallCatch.m.field_0x24, param_0, - daPy_HIO_wallCatch_c0::m.field_0x4, - daPy_HIO_wallCatch_c0::m.field_0x28 + m_HIO->mWallCatch.m.field_0x4, + m_HIO->mWallCatch.m.field_0x28 ); dComIfGp_setPlayerStatus0(0, daPyStts0_UNK200_e); mVelocity = 0.0f; @@ -557,7 +557,7 @@ BOOL daPy_lk_c::procHangClimb_init(f32 param_0) { BOOL daPy_lk_c::procHangClimb() { if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { checkNextMode(0); - } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_wallCatch_c0::m.field_0x38) { + } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mWallCatch.m.field_0x38) { checkNextMode(1); } return true; @@ -585,10 +585,10 @@ BOOL daPy_lk_c::procHangWallCatch_init() { commonProcInit(daPyProc_HANG_WALL_CATCH_e); setSingleMoveAnime( ANM_VJMPCHB, - daPy_HIO_wallCatch_c0::m.field_0x1C, - daPy_HIO_wallCatch_c0::m.field_0x34, - daPy_HIO_wallCatch_c0::m.field_0x0, - daPy_HIO_wallCatch_c0::m.field_0x20 + m_HIO->mWallCatch.m.field_0x1C, + m_HIO->mWallCatch.m.field_0x34, + m_HIO->mWallCatch.m.field_0x0, + m_HIO->mWallCatch.m.field_0x20 ); current.pos = local_1c; shape_angle.y = m352C + 0x8000; @@ -601,8 +601,8 @@ BOOL daPy_lk_c::procHangWallCatch_init() { /* 80135AE0-80135B50 .text procHangWallCatch__9daPy_lk_cFv */ BOOL daPy_lk_c::procHangWallCatch() { - if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f && !procHangClimb_init(daPy_HIO_wallCatch_c0::m.field_0x30)) { - return procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f && !procHangClimb_init(m_HIO->mWallCatch.m.field_0x30)) { + return procFall_init(1, m_HIO->mWallCatch.m.field_0x54); } else { return true; } diff --git a/src/d/actor/d_a_player_hook.inc b/src/d/actor/d_a_player_hook.inc index ccd1af9c..4da530ca 100644 --- a/src/d/actor/d_a_player_hook.inc +++ b/src/d/actor/d_a_player_hook.inc @@ -149,10 +149,10 @@ BOOL daPy_lk_c::checkNextActionHookshotReady() { current.angle.y = shape_angle.y + 0x4000; onModeFlg(ModeFlg_00000001); m3598 = 0.0f; - setBlendAtnMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendAtnMoveAnime(m_HIO->mBasic.m.field_0xC); mFrameCtrlUnder[UNDER_MOVE0_e].setRate(0.0f); mFrameCtrlUnder[UNDER_MOVE1_e].setRate(0.0f); - mFrameCtrlUpper[UPPER_MOVE0_e].setRate(daPy_HIO_atnMove_c0::m.field_0x24); + mFrameCtrlUpper[UPPER_MOVE0_e].setRate(m_HIO->mAtnMove.m.field_0x24); mFrameCtrlUpper[UPPER_MOVE1_e].setRate(0.0f); mFrameCtrlUpper[UPPER_MOVE2_e].setRate(0.0f); return true; @@ -205,7 +205,7 @@ BOOL daPy_lk_c::procHookshotSubject_init() { mVelocity = 0.0f; setActAnimeUpper(LKANM_BCK_HOOKSHOTWAIT, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); - setSingleMoveAnime(ANM_ATNLS, 0.0f, 0.0f, -1, daPy_HIO_basic_c0::m.field_0xC); + setSingleMoveAnime(ANM_ATNLS, 0.0f, 0.0f, -1, m_HIO->mBasic.m.field_0xC); dComIfGp_setPlayerStatus0(0, daPyStts0_HOOKSHOT_AIM_e); @@ -258,7 +258,7 @@ BOOL daPy_lk_c::procHookshotMove_init() { daHookshot_c* hookshot = (daHookshot_c*)mActorKeepEquip.getActor(); if (hookshot->checkWait()) { setActAnimeUpper(LKANM_BCK_HOOKSHOTWAIT, UPPER_MOVE2_e, 1.0f, 0.0f, -1, -1.0f); - setBlendAtnMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendAtnMoveAnime(m_HIO->mBasic.m.field_0xC); } dComIfGp_setPlayerStatus0(0, daPyStts0_HOOKSHOT_AIM_e); return true; @@ -287,7 +287,7 @@ BOOL daPy_lk_c::procHookshotMove() { onModeFlg(ModeFlg_00000001); if (mDirection != DIR_LEFT) { mDirection = DIR_LEFT; - fVar1 = daPy_HIO_basic_c0::m.field_0xC; + fVar1 = m_HIO->mBasic.m.field_0xC; } current.angle.y = shape_angle.y + 0x4000; } else { diff --git a/src/d/actor/d_a_player_ladder.inc b/src/d/actor/d_a_player_ladder.inc index ee41953c..cb8a5ea6 100644 --- a/src/d/actor/d_a_player_ladder.inc +++ b/src/d/actor/d_a_player_ladder.inc @@ -16,7 +16,7 @@ /* 80132F34-80132F58 .text getLadderMoveAnmSpeed__9daPy_lk_cFv */ f32 daPy_lk_c::getLadderMoveAnmSpeed() { - return getAnmSpeedStickRate(daPy_HIO_ladder_c0::m.field_0x28, daPy_HIO_ladder_c0::m.field_0x24); + return getAnmSpeedStickRate(m_HIO->mLadder.m.field_0x28, m_HIO->mLadder.m.field_0x24); } /* 80132F58-80133058 .text setLadderFootSe__9daPy_lk_cFv */ @@ -84,7 +84,7 @@ int daPy_lk_c::setMoveBGLadderCorrect() { cXyz local_18(m370C.x + cM_ssin(current.angle.y) * 50.0f, m370C.y, m370C.z + cM_scos(current.angle.y) * 50.0f); mLinkLinChk.Set(&m370C, &local_18, this); if ((!dComIfG_Bgsp()->LineCross(&mLinkLinChk)) || (dComIfG_Bgsp()->GetWallCode(mLinkLinChk) != 4)) { - return procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + return procFall_init(1, m_HIO->mWallCatch.m.field_0x54); } else { mPolyInfo = mLinkLinChk; return false; @@ -93,7 +93,7 @@ int daPy_lk_c::setMoveBGLadderCorrect() { /* 801333A8-80133414 .text procLadderUpStart_init_sub__9daPy_lk_cFv */ void daPy_lk_c::procLadderUpStart_init_sub() { - setSingleMoveAnime(ANM_LADDERUPST, daPy_HIO_ladder_c0::m.field_0x4, 0.0f, -1, daPy_HIO_ladder_c0::m.field_0x8); + setSingleMoveAnime(ANM_LADDERUPST, m_HIO->mLadder.m.field_0x4, 0.0f, -1, m_HIO->mLadder.m.field_0x8); mProcVar0.m3570 = 1; m34C2 = 4; dComIfGp_setPlayerStatus0(0, daPyStts0_UNK2000000_e); @@ -112,7 +112,7 @@ BOOL daPy_lk_c::procLadderUpStart_init() { } procLadderUpStart_init_sub(); } else { - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); setAnimeUnequip(); mProcVar0.m3570 = 0; m3598 = 0.0f; @@ -152,7 +152,7 @@ BOOL daPy_lk_c::procLadderUpStart() { } if (doTrigger()) { m34C2 = 0; - procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + procFall_init(1, m_HIO->mWallCatch.m.field_0x54); } else { changeLadderMoveProc(1); } @@ -175,7 +175,7 @@ BOOL daPy_lk_c::procLadderUpEnd_init(int param_0) { } else { dVar2 = ANM_LADDERUPEDR; } - setSingleMoveAnime(dVar2, daPy_HIO_ladder_c0::m.field_0xC, 0.0f, -1, daPy_HIO_ladder_c0::m.field_0x10); + setSingleMoveAnime(dVar2, m_HIO->mLadder.m.field_0xC, 0.0f, -1, m_HIO->mLadder.m.field_0x10); m34C2 = 7; gravity = 0.0f; speed.y = 0.0f; @@ -206,7 +206,7 @@ BOOL daPy_lk_c::procLadderUpEnd() { /* 801337B4-8013384C .text procLadderDownStart_init_sub__9daPy_lk_cFv */ void daPy_lk_c::procLadderDownStart_init_sub() { - setSingleMoveAnime(ANM_LADDERDWST, daPy_HIO_ladder_c0::m.field_0x14, 0.0f, -1, daPy_HIO_ladder_c0::m.field_0x18); + setSingleMoveAnime(ANM_LADDERDWST, m_HIO->mLadder.m.field_0x14, 0.0f, -1, m_HIO->mLadder.m.field_0x18); mProcVar0.m3570 = 1; m34C2 = 4; dComIfGp_setPlayerStatus0(0, daPyStts0_UNK2000000_e); @@ -230,7 +230,7 @@ BOOL daPy_lk_c::procLadderDownStart_init() { } procLadderDownStart_init_sub(); } else { - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); setAnimeUnequip(); mProcVar0.m3570 = 0; m3598 = 0.0f; @@ -263,7 +263,7 @@ BOOL daPy_lk_c::procLadderDownStart() { dComIfGp_setDoStatus(dActStts_LET_GO_e); if (doTrigger()) { m34C2 = 0; - procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + procFall_init(1, m_HIO->mWallCatch.m.field_0x54); } else { changeLadderMoveProc(1); } @@ -285,7 +285,7 @@ BOOL daPy_lk_c::procLadderDownEnd_init(int param_0) { } else { anm = ANM_LADDERDWEDR; } - setSingleMoveAnime(anm, daPy_HIO_ladder_c0::m.field_0x1C, 0.0f, -1, daPy_HIO_ladder_c0::m.field_0x20); + setSingleMoveAnime(anm, m_HIO->mLadder.m.field_0x1C, 0.0f, -1, m_HIO->mLadder.m.field_0x20); m34C2 = 7; gravity = 0.0f; dComIfGp_setPlayerStatus0(0, daPyStts0_UNK2000000_e); @@ -350,7 +350,7 @@ BOOL daPy_lk_c::procLadderMove_init(int param_0, int direction, cXyz* param_2) { m370C.z = m370C.z + -2.0f * cM_ssin(shape_angle.y); } - setSingleMoveAnime(anm, dVar4, 0.0f, -1, daPy_HIO_ladder_c0::m.field_0x2C); + setSingleMoveAnime(anm, dVar4, 0.0f, -1, m_HIO->mLadder.m.field_0x2C); mDirection = direction; if (direction == DIR_FORWARD) { setTextureAnime(10, 0); @@ -377,7 +377,7 @@ BOOL daPy_lk_c::procLadderMove() { if (doTrigger()) { m34C2 = 0; - procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + procFall_init(1, m_HIO->mWallCatch.m.field_0x54); } else if (std::fabsf(mFrameCtrlUnder[UNDER_MOVE0_e].getRate()) < 0.01f) { if (m34D0 > 0) { m34D0--; diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index 2bc5ac8d..b7144f8f 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -1594,7 +1594,7 @@ void daPy_lk_c::drawShadow() { { f1 = 1400.0f; } else { - f1 = daPy_HIO_basic_c0::m.field_0x10; + f1 = m_HIO->mBasic.m.field_0x10; } int iVar4 = dComIfGd_setShadow(m3614, 0, mpCLModel, &local_30, f1, 30.0f, current.pos.y, f31, mAcch.m_gnd, &tevStr, 0, 1.0f, @@ -2191,9 +2191,9 @@ void daPy_lk_c::setDoStatusBasic() { if (dComIfGp_getDoStatus() == dActStts_BLANK_e) { int direction = getDirectionFromShapeAngle(); if (checkHeavyStateOn()) { - fVar1 = daPy_HIO_basic_c0::m.field_0x1C * daPy_HIO_move_c0::m.field_0x80; + fVar1 = m_HIO->mBasic.m.field_0x1C * m_HIO->mMove.m.field_0x80; } else { - fVar1 = daPy_HIO_basic_c0::m.field_0x1C; + fVar1 = m_HIO->mBasic.m.field_0x1C; } if (checkAttentionLock() || (mActorKeepThrow.getActor() != NULL && mpAttnActorLockOn == mActorKeepThrow.getActor())) @@ -2332,7 +2332,7 @@ void daPy_lk_c::setNormalSpeedF(f32 param_1, f32 param_2, f32 param_3, f32 param } } if (abs(uVar2) < 0x4000) { - dVar10 *= (1.0f - cM_scos(uVar2) * daPy_HIO_basic_c0::m.field_0x14); + dVar10 *= (1.0f - cM_scos(uVar2) * m_HIO->mBasic.m.field_0x14); } } f32 temp_f3; @@ -2440,8 +2440,8 @@ void daPy_lk_c::posMoveFromFootPos() { f32 f30; f30 = std::abs(cM_scos(r3 & 0xFFFF)); f32 f1 = - ((speedF * (1.0f - daPy_HIO_swim_c0::m.field_0x60)) + daPy_HIO_swim_c0::m.field_0x60 * (speedF * f30)) / - (1.0f + (daPy_HIO_swim_c0::m.field_0x7C * getSwimTimerRate())); + ((speedF * (1.0f - m_HIO->mSwim.m.field_0x60)) + m_HIO->mSwim.m.field_0x60 * (speedF * f30)) / + (1.0f + (m_HIO->mSwim.m.field_0x7C * getSwimTimerRate())); speed.x = f1 * cM_ssin(current.angle.y); speed.z = f1 * cM_scos(current.angle.y); } else if (mCurProc != daPyProc_CUT_ROLL_e || !dComIfGp_event_runCheck() || @@ -2775,10 +2775,10 @@ void daPy_lk_c::setSpeedAndAngleNormal(s16 param_1) { bVar2 = false; dVar11 = mStickDistance * mStickDistance; if (checkHeavyStateOn()) { - dVar11 *= 1.0f / (daPy_HIO_move_c0::m.field_0x80 * daPy_HIO_move_c0::m.field_0x80); + dVar11 *= 1.0f / (m_HIO->mMove.m.field_0x80 * m_HIO->mMove.m.field_0x80); } if (checkGrabWear()) { - dVar11 *= 1.0f / (daPy_HIO_move_c0::m.field_0x74 * daPy_HIO_move_c0::m.field_0x74); + dVar11 *= 1.0f / (m_HIO->mMove.m.field_0x74 * m_HIO->mMove.m.field_0x74); } if ((!checkAttentionLock() && cLib_distanceAngleS(m34E8, current.angle.y) > 0x7800) && mCurProc != daPyProc_MOVE_TURN_e) @@ -2787,36 +2787,36 @@ void daPy_lk_c::setSpeedAndAngleNormal(s16 param_1) { return; } if (mCurProc == daPyProc_MOVE_e) { - if ((speedF / mMaxNormalSpeed > daPy_HIO_slip_c0::m.field_0x4) && + if ((speedF / mMaxNormalSpeed > m_HIO->mSlip.m.field_0x4) && getDirectionFromAngle(m34EA - m34DC) == DIR_BACKWARD) { return; } - if (speedF / mMaxNormalSpeed <= daPy_HIO_slip_c0::m.field_0x4) { - cLib_addCalcAngleS(¤t.angle.y, m34E8, daPy_HIO_move_c0::m.field_0x6, - param_1, daPy_HIO_move_c0::m.field_0x4); + if (speedF / mMaxNormalSpeed <= m_HIO->mSlip.m.field_0x4) { + cLib_addCalcAngleS(¤t.angle.y, m34E8, m_HIO->mMove.m.field_0x6, + param_1, m_HIO->mMove.m.field_0x4); return; } bVar2 = true; } else { - cLib_addCalcAngleS(¤t.angle.y, m34E8, daPy_HIO_move_c0::m.field_0x6, param_1, - daPy_HIO_move_c0::m.field_0x4); + cLib_addCalcAngleS(¤t.angle.y, m34E8, m_HIO->mMove.m.field_0x6, param_1, + m_HIO->mMove.m.field_0x4); } } else { if (dComIfGp_event_runCheck()) { sVar6 = param_1; - sVar7 = daPy_HIO_move_c0::m.field_0x4; + sVar7 = m_HIO->mMove.m.field_0x4; } else { sVar6 = param_1 * dVar11; if (sVar6 < 10) { sVar6 = 10; } - sVar7 = daPy_HIO_move_c0::m.field_0x4 * dVar11; + sVar7 = m_HIO->mMove.m.field_0x4 * dVar11; if (sVar7 < 1) { sVar7 = 1; } } - cLib_addCalcAngleS(¤t.angle.y, m34E8, daPy_HIO_move_c0::m.field_0x6, sVar6, + cLib_addCalcAngleS(¤t.angle.y, m34E8, m_HIO->mMove.m.field_0x6, sVar6, sVar7); } if (!bVar2) { @@ -2829,17 +2829,17 @@ void daPy_lk_c::setSpeedAndAngleNormal(s16 param_1) { dVar9 = 0.0f; } if (dComIfGp_event_runCheck()) { - dVar9 *= daPy_HIO_move_c0::m.field_0x14 * mStickDistance; + dVar9 *= m_HIO->mMove.m.field_0x14 * mStickDistance; } else { dVar10 = 0.5f - (0.5f * std::abs(mVelocity / mMaxNormalSpeed)); if (checkHeavyStateOn()) { - dVar10 *= daPy_HIO_move_c0::m.field_0x80; + dVar10 *= m_HIO->mMove.m.field_0x80; } if (checkGrabWear()) { - dVar10 *= daPy_HIO_move_c0::m.field_0x74; + dVar10 *= m_HIO->mMove.m.field_0x74; } if (mStickDistance > dVar10) { - dVar9 *= daPy_HIO_move_c0::m.field_0x14 * dVar11; + dVar9 *= m_HIO->mMove.m.field_0x14 * dVar11; } else { dVar9 = 0.0f; } @@ -2854,15 +2854,15 @@ void daPy_lk_c::setSpeedAndAngleNormal(s16 param_1) { mStickDistance > 0.05f) { sVar6 = shape_angle.y; - cLib_addCalcAngleS(&shape_angle.y, m34E8, daPy_HIO_move_c0::m.field_0x6, - (s16)(param_1 << 1), (s16)(daPy_HIO_move_c0::m.field_0x4 << 1)); + cLib_addCalcAngleS(&shape_angle.y, m34E8, m_HIO->mMove.m.field_0x6, + (s16)(param_1 << 1), (s16)(m_HIO->mMove.m.field_0x4 << 1)); sVar7 = current.angle.y; if ((s16)(sVar6 - sVar7) * (s16)(shape_angle.y - sVar7) <= 0) { shape_angle.y = sVar7; } } - setNormalSpeedF(dVar9, daPy_HIO_move_c0::m.field_0x24, daPy_HIO_move_c0::m.field_0x1C, - daPy_HIO_move_c0::m.field_0x20); + setNormalSpeedF(dVar9, m_HIO->mMove.m.field_0x24, m_HIO->mMove.m.field_0x1C, + m_HIO->mMove.m.field_0x20); } /* 8010A96C-8010AA90 .text setSpeedAndAngleAtn__9daPy_lk_cFv */ @@ -2871,7 +2871,7 @@ void daPy_lk_c::setSpeedAndAngleAtn() { f32 fVar2; if (mDirection == DIR_FORWARD) { - return setSpeedAndAngleNormal(daPy_HIO_move_c0::m.field_0x0); + return setSpeedAndAngleNormal(m_HIO->mMove.m.field_0x0); } else if (mDirection == DIR_BACKWARD) { return setSpeedAndAngleAtnBack(); } else { @@ -2881,17 +2881,17 @@ void daPy_lk_c::setSpeedAndAngleAtn() { mVelocity *= -1.0f; } sVar1 = current.angle.y; - cLib_addCalcAngleS(¤t.angle.y, m34E8, daPy_HIO_atnMove_c0::m.field_0x4, - daPy_HIO_atnMove_c0::m.field_0x0, daPy_HIO_atnMove_c0::m.field_0x2); - fVar2 = daPy_HIO_atnMove_c0::m.field_0x8 * mStickDistance * + cLib_addCalcAngleS(¤t.angle.y, m34E8, m_HIO->mAtnMove.m.field_0x4, + m_HIO->mAtnMove.m.field_0x0, m_HIO->mAtnMove.m.field_0x2); + fVar2 = m_HIO->mAtnMove.m.field_0x8 * mStickDistance * cM_scos(current.angle.y - sVar1); } else { fVar2 = 0.0f; } } shape_angle.y = m34E6; - return setNormalSpeedF(fVar2, daPy_HIO_atnMove_c0::m.field_0x18, - daPy_HIO_atnMove_c0::m.field_0x10, daPy_HIO_atnMove_c0::m.field_0x14); + return setNormalSpeedF(fVar2, m_HIO->mAtnMove.m.field_0x18, + m_HIO->mAtnMove.m.field_0x10, m_HIO->mAtnMove.m.field_0x14); } /* 8010AA90-8010AB84 .text setSpeedAndAngleAtnBack__9daPy_lk_cFv */ @@ -2905,20 +2905,20 @@ void daPy_lk_c::setSpeedAndAngleAtnBack() { s16 origAngleY = current.angle.y; cLib_addCalcAngleS( ¤t.angle.y, m34E8, - daPy_HIO_atnMoveB_c0::m.field_0x4, - daPy_HIO_atnMoveB_c0::m.field_0x0, - daPy_HIO_atnMoveB_c0::m.field_0x2 + m_HIO->mAtnMoveB.m.field_0x4, + m_HIO->mAtnMoveB.m.field_0x0, + m_HIO->mAtnMoveB.m.field_0x2 ); - f1 = (daPy_HIO_atnMoveB_c0::m.field_0x8 * mStickDistance) * cM_scos(current.angle.y - origAngleY); + f1 = (m_HIO->mAtnMoveB.m.field_0x8 * mStickDistance) * cM_scos(current.angle.y - origAngleY); } else { f1 = 0.0f; } shape_angle.y = m34E6; setNormalSpeedF( f1, - daPy_HIO_atnMoveB_c0::m.field_0x18, - daPy_HIO_atnMoveB_c0::m.field_0x10, - daPy_HIO_atnMoveB_c0::m.field_0x14 + m_HIO->mAtnMoveB.m.field_0x18, + m_HIO->mAtnMoveB.m.field_0x10, + m_HIO->mAtnMoveB.m.field_0x14 ); } @@ -2933,20 +2933,20 @@ void daPy_lk_c::setSpeedAndAngleAtnActor() { s16 origAngleY = current.angle.y; cLib_addCalcAngleS( ¤t.angle.y, m34E8, - daPy_HIO_atnMove_c0::m.field_0x4, - daPy_HIO_atnMove_c0::m.field_0x0, - daPy_HIO_atnMove_c0::m.field_0x2 + m_HIO->mAtnMove.m.field_0x4, + m_HIO->mAtnMove.m.field_0x0, + m_HIO->mAtnMove.m.field_0x2 ); - f1 = (daPy_HIO_atnMove_c0::m.field_0x8 * mStickDistance) * cM_scos(current.angle.y - origAngleY); + f1 = (m_HIO->mAtnMove.m.field_0x8 * mStickDistance) * cM_scos(current.angle.y - origAngleY); } else { f1 = 0.0f; } setShapeAngleToAtnActor(); setNormalSpeedF( f1, - daPy_HIO_atnMove_c0::m.field_0x18, - daPy_HIO_atnMove_c0::m.field_0x10, - daPy_HIO_atnMove_c0::m.field_0x14 + m_HIO->mAtnMove.m.field_0x18, + m_HIO->mAtnMove.m.field_0x10, + m_HIO->mAtnMove.m.field_0x14 ); } @@ -2994,14 +2994,14 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) { f32 f29; f32 f28; if (dComIfGp_event_runCheck() || checkPlayerDemoMode()) { - f29 = daPy_HIO_move_c0::m.field_0x44; - f28 = daPy_HIO_move_c0::m.field_0x64; + f29 = m_HIO->mMove.m.field_0x44; + f28 = m_HIO->mMove.m.field_0x64; } else if (checkHeavyStateOn()) { - f29 = daPy_HIO_move_c0::m.field_0x78; - f28 = daPy_HIO_move_c0::m.field_0x7C; + f29 = m_HIO->mMove.m.field_0x78; + f28 = m_HIO->mMove.m.field_0x7C; } else { - f29 = daPy_HIO_move_c0::m.field_0x40; - f28 = daPy_HIO_move_c0::m.field_0x60; + f29 = m_HIO->mMove.m.field_0x40; + f28 = m_HIO->mMove.m.field_0x60; } daPy_ANM r28 = ANM_WAITS; daPy_ANM r27; @@ -3018,14 +3018,14 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) { r27 = ANM_WALKHBOOTSKAZE; r26 = ANM_WALKHBOOTSKAZE; if (!checkNoResetFlg1(daPyFlg1_UNK1000000)) { - param_1 = daPy_HIO_basic_c0::m.field_0xC; + param_1 = m_HIO->mBasic.m.field_0xC; onNoResetFlg1(daPyFlg1_UNK1000000); } } else { r27 = ANM_WALKHBOOTS; r26 = ANM_WALKHBOOTS; if (checkNoResetFlg1(daPyFlg1_UNK1000000)) { - param_1 = daPy_HIO_basic_c0::m.field_0xC; + param_1 = m_HIO->mBasic.m.field_0xC; offNoResetFlg1(daPyFlg1_UNK1000000); } } @@ -3033,7 +3033,7 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) { r27 = ANM_WALKSLOPE; r26 = ANM_WALKSLOPE; if (!checkNoResetFlg1(daPyFlg1_UNK80)) { - param_1 = daPy_HIO_basic_c0::m.field_0xC; + param_1 = m_HIO->mBasic.m.field_0xC; onNoResetFlg1(daPyFlg1_UNK80); } } else { @@ -3045,18 +3045,18 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) { { r26 = ANM_DASHKAZE; if (!checkNoResetFlg1(daPyFlg1_UNK1000000)) { - param_1 = daPy_HIO_basic_c0::m.field_0xC; + param_1 = m_HIO->mBasic.m.field_0xC; onNoResetFlg1(daPyFlg1_UNK1000000); } } else { r26 = ANM_DASH; if (checkNoResetFlg1(daPyFlg1_UNK1000000)) { - param_1 = daPy_HIO_basic_c0::m.field_0xC; + param_1 = m_HIO->mBasic.m.field_0xC; offNoResetFlg1(daPyFlg1_UNK1000000); } } if (checkNoResetFlg1(daPyFlg1_UNK80)) { - param_1 = daPy_HIO_basic_c0::m.field_0xC; + param_1 = m_HIO->mBasic.m.field_0xC; offNoResetFlg1(daPyFlg1_UNK80); } } @@ -3082,14 +3082,14 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) { seStartMapInfo(JA_SE_LK_SLIP_SUS); if ((m34C3 != 9 && (bVar3)) || ((m34C3 != 10 && (!bVar3)))) { if (bVar3) { - setSingleMoveAnime(ANM_SLIPICE, daPy_HIO_iceSlip_c0::m.field_0x10, - daPy_HIO_iceSlip_c0::m.field_0x14, - daPy_HIO_iceSlip_c0::m.field_0x0, - daPy_HIO_iceSlip_c0::m.field_0x18); + setSingleMoveAnime(ANM_SLIPICE, m_HIO->mIceSlip.m.field_0x10, + m_HIO->mIceSlip.m.field_0x14, + m_HIO->mIceSlip.m.field_0x0, + m_HIO->mIceSlip.m.field_0x18); m34C3 = 9; } else { - setSingleMoveAnime(ANM_WAITQ, daPy_HIO_move_c0::m.field_0x84, 0.0f, -1, - daPy_HIO_basic_c0::m.field_0xC); + setSingleMoveAnime(ANM_WAITQ, m_HIO->mMove.m.field_0x84, 0.0f, -1, + m_HIO->mBasic.m.field_0xC); setTextureAnime(0x68, 0); m34C3 = 10; } @@ -3105,16 +3105,16 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) { m3598 = 0.0f; } else { if (m34C3 == 9) { - param_1 = daPy_HIO_basic_c0::m.field_0xC; + param_1 = m_HIO->mBasic.m.field_0xC; } - if (f30 < daPy_HIO_move_c0::m.field_0x2C || checkHeavyStateOn()) { + if (f30 < m_HIO->mMove.m.field_0x2C || checkHeavyStateOn()) { if (checkHeavyStateOn()) { - f25 = f30 / daPy_HIO_move_c0::m.field_0x80; + f25 = f30 / m_HIO->mMove.m.field_0x80; if (f25 > 0.55f) { r25 = true; } } else { - f25 = f30 / daPy_HIO_move_c0::m.field_0x2C; + f25 = f30 / m_HIO->mMove.m.field_0x2C; } r28 = ANM_WAITS; int r24; @@ -3126,9 +3126,9 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) { if (checkModeFlg(ModeFlg_00000001)) { if (checkAttentionLock()) { if (checkUpperGuardAnime()) { - setMoveAnime(0.0f, daPy_HIO_atnMove_c0::m.field_0x24, - daPy_HIO_atnMove_c0::m.field_0x28, ANM_ATNRS, ANM_ATNWRS, 2, - daPy_HIO_basic_c0::m.field_0xC); + setMoveAnime(0.0f, m_HIO->mAtnMove.m.field_0x24, + m_HIO->mAtnMove.m.field_0x28, ANM_ATNRS, ANM_ATNWRS, 2, + m_HIO->mBasic.m.field_0xC); return; } } @@ -3138,8 +3138,8 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) { !dComIfGp_event_runCheck()) { if (m_anm_heap_under[UNDER_MOVE0_e].mIdx != LKANM_BCK_WAITQ) { - setSingleMoveAnime(ANM_WAITQ, daPy_HIO_move_c0::m.field_0x84, f1, -1, - daPy_HIO_basic_c0::m.field_0xC); + setSingleMoveAnime(ANM_WAITQ, m_HIO->mMove.m.field_0x84, f1, -1, + m_HIO->mBasic.m.field_0xC); m34C3 = 2; } return; @@ -3156,28 +3156,28 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) { f25 = 1.0f; } if (!checkNoResetFlg1(daPyFlg1_UNK800000)) { - param_1 = daPy_HIO_basic_c0::m.field_0xC; + param_1 = m_HIO->mBasic.m.field_0xC; } onNoResetFlg1(daPyFlg1_UNK800000); - f29 = daPy_HIO_atnMove_c0::m.field_0x28; + f29 = m_HIO->mAtnMove.m.field_0x28; } else if (checkRestHPAnime()) { r28 = ANM_WAITB; - in_f27 = daPy_HIO_move_c0::m.field_0x3C; + in_f27 = m_HIO->mMove.m.field_0x3C; if (checkNoResetFlg1(daPyFlg1_UNK800000)) { - param_1 = daPy_HIO_basic_c0::m.field_0xC; + param_1 = m_HIO->mBasic.m.field_0xC; } offNoResetFlg1(daPyFlg1_UNK800000); } else { - in_f27 = daPy_HIO_move_c0::m.field_0x38; + in_f27 = m_HIO->mMove.m.field_0x38; if (checkNoResetFlg1(daPyFlg1_UNK800000)) { - param_1 = daPy_HIO_basic_c0::m.field_0xC; + param_1 = m_HIO->mBasic.m.field_0xC; } offNoResetFlg1(daPyFlg1_UNK800000); } } else { m3598 = (1.0f - ((1.0f - f28) * f25)); r24 = 1; - in_f27 = daPy_HIO_move_c0::m.field_0x38; + in_f27 = m_HIO->mMove.m.field_0x38; } setMoveAnime(f25, in_f27, f29, r28, r27, r24, param_1); if (r28 == ANM_WAITB && (!dComIfGp_event_runCheck() || mDemo.getDemoType() != 3) && @@ -3189,18 +3189,18 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) { voiceStart(20); } } - } else if (f30 < daPy_HIO_move_c0::m.field_0x30) { - f32 f1 = (f30 - daPy_HIO_move_c0::m.field_0x2C) / - (daPy_HIO_move_c0::m.field_0x30 - daPy_HIO_move_c0::m.field_0x2C); - setMoveAnime(f1, f29, daPy_HIO_move_c0::m.field_0x48, r27, r26, 1, param_1); + } else if (f30 < m_HIO->mMove.m.field_0x30) { + f32 f1 = (f30 - m_HIO->mMove.m.field_0x2C) / + (m_HIO->mMove.m.field_0x30 - m_HIO->mMove.m.field_0x2C); + setMoveAnime(f1, f29, m_HIO->mMove.m.field_0x48, r27, r26, 1, param_1); m3598 = (f28 * (1.0f - f1)); } else { f32 f1; if (f31 >= 169.0f) { - f1 = 1.7f * daPy_HIO_move_c0::m.field_0x48; + f1 = 1.7f * m_HIO->mMove.m.field_0x48; onResetFlg0(daPyRFlg0_UNK40000); } else { - f1 = daPy_HIO_move_c0::m.field_0x48; + f1 = m_HIO->mMove.m.field_0x48; } setMoveAnime(1.0f, f1, f1, r26, r26, 1, param_1); m3598 = 0.0f; @@ -3219,7 +3219,7 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) { } } if (m34C3 != 9 && m34C3 != 10) { - if (f30 > daPy_HIO_move_c0::m.field_0x34) { + if (f30 > m_HIO->mMove.m.field_0x34) { setHandModel(r26); } else if (f30 > 0.0f) { setHandModel(r27); @@ -3244,8 +3244,8 @@ void daPy_lk_c::setBlendAtnBackMoveAnime(f32 param_1) { } dVar7 = (std::abs(mVelocity * fVar1) / mMaxNormalSpeed); J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE1_e]; - if (dVar7 < daPy_HIO_atnMoveB_c0::m.field_0x1C) { - fVar1 = dVar7 / daPy_HIO_atnMoveB_c0::m.field_0x1C; + if (dVar7 < m_HIO->mAtnMoveB.m.field_0x1C) { + fVar1 = dVar7 / m_HIO->mAtnMoveB.m.field_0x1C; if (checkModeFlg(ModeFlg_00000001)) { iVar4 = 2; m3598 = 0.0f; @@ -3253,7 +3253,7 @@ void daPy_lk_c::setBlendAtnBackMoveAnime(f32 param_1) { iVar4 = 4; m3598 = 1.0f; } - setMoveAnime(fVar1, daPy_HIO_move_c0::m.field_0x38, daPy_HIO_atnMoveB_c0::m.field_0x24, + setMoveAnime(fVar1, m_HIO->mMove.m.field_0x38, m_HIO->mAtnMoveB.m.field_0x24, ANM_WAITS, ANM_ATNWB, iVar4, param_1); if (!checkModeFlg(ModeFlg_00000001)) { if (frameCtrl.checkPass(2.0f)) { @@ -3262,11 +3262,11 @@ void daPy_lk_c::setBlendAtnBackMoveAnime(f32 param_1) { onResetFlg0(daPyRFlg0_LEFT_FOOT_ON_GROUND); } } - } else if (dVar7 < daPy_HIO_atnMoveB_c0::m.field_0x20) { - fVar1 = (dVar7 - daPy_HIO_atnMoveB_c0::m.field_0x1C) / - (daPy_HIO_atnMoveB_c0::m.field_0x20 - daPy_HIO_atnMoveB_c0::m.field_0x1C); + } else if (dVar7 < m_HIO->mAtnMoveB.m.field_0x20) { + fVar1 = (dVar7 - m_HIO->mAtnMoveB.m.field_0x1C) / + (m_HIO->mAtnMoveB.m.field_0x20 - m_HIO->mAtnMoveB.m.field_0x1C); dVar6 = fVar1; - setMoveAnime(fVar1, daPy_HIO_atnMoveB_c0::m.field_0x24, daPy_HIO_atnMoveB_c0::m.field_0x28, + setMoveAnime(fVar1, m_HIO->mAtnMoveB.m.field_0x24, m_HIO->mAtnMoveB.m.field_0x28, ANM_ATNWB, ANM_ATNDB, 4, param_1); m3598 = 1.0f - dVar6; if (frameCtrl.checkPass(5.0f) || frameCtrl.checkPass(15.0f)) { @@ -3276,10 +3276,10 @@ void daPy_lk_c::setBlendAtnBackMoveAnime(f32 param_1) { } } else { if (m36A0.abs2XZ() >= SQUARE(7.0f)) { - fVar1 = 1.9f * daPy_HIO_atnMoveB_c0::m.field_0x28; + fVar1 = 1.9f * m_HIO->mAtnMoveB.m.field_0x28; onResetFlg0(daPyRFlg0_UNK40000); } else { - fVar1 = daPy_HIO_atnMoveB_c0::m.field_0x28; + fVar1 = m_HIO->mAtnMoveB.m.field_0x28; } setMoveAnime(1.0f, fVar1, fVar1, ANM_ATNDB, ANM_ATNDB, 4, dVar6); m3598 = 0.0f; @@ -3319,9 +3319,9 @@ void daPy_lk_c::setBlendAtnMoveAnime(f32 f30) { } } else if (mStickDistance > 0.05f) { if (mpAttnActorLockOn == NULL && - (fVar4 <= daPy_HIO_atnMoveB_c0::m.field_0x30 || (fVar4 >= daPy_HIO_atnMoveB_c0::m.field_0x2C))) + (fVar4 <= m_HIO->mAtnMoveB.m.field_0x30 || (fVar4 >= m_HIO->mAtnMoveB.m.field_0x2C))) { - if (fVar4 <= daPy_HIO_atnMoveB_c0::m.field_0x30) { + if (fVar4 <= m_HIO->mAtnMoveB.m.field_0x30) { mDirection = DIR_BACKWARD; } else { mDirection = DIR_FORWARD; @@ -3329,7 +3329,7 @@ void daPy_lk_c::setBlendAtnMoveAnime(f32 f30) { } else { if (uVar1 == DIR_BACKWARD || uVar1 == DIR_FORWARD) { mDirection = DIR_RIGHT; - mMaxNormalSpeed = daPy_HIO_atnMove_c0::m.field_0xC; + mMaxNormalSpeed = m_HIO->mAtnMove.m.field_0xC; } if (f2 > 0.0f) { mDirection = DIR_LEFT; @@ -3340,20 +3340,20 @@ void daPy_lk_c::setBlendAtnMoveAnime(f32 f30) { } u8 uVar2 = mDirection; if (uVar1 != uVar2) { - f30 = daPy_HIO_basic_c0::m.field_0xC; + f30 = m_HIO->mBasic.m.field_0xC; } if (uVar2 == DIR_BACKWARD) { - mMaxNormalSpeed = daPy_HIO_atnMoveB_c0::m.field_0xC; + mMaxNormalSpeed = m_HIO->mAtnMoveB.m.field_0xC; setBlendAtnBackMoveAnime(f30); } else if (uVar2 == DIR_FORWARD) { - mMaxNormalSpeed = daPy_HIO_move_c0::m.field_0x18; + mMaxNormalSpeed = m_HIO->mMove.m.field_0x18; setBlendMoveAnime(f30); } else { daPy_ANM dVar8; daPy_ANM dVar9; if (uVar2 != DIR_RIGHT && uVar2 != DIR_LEFT) { mDirection = DIR_RIGHT; - f30 = daPy_HIO_basic_c0::m.field_0xC; + f30 = m_HIO->mBasic.m.field_0xC; } J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE1_e]; f32 f29; @@ -3362,8 +3362,8 @@ void daPy_lk_c::setBlendAtnMoveAnime(f32 f30) { } else { f29 = 1.0f; } - if (f31 < daPy_HIO_atnMove_c0::m.field_0x1C) { - f32 f1 = f31 / daPy_HIO_atnMove_c0::m.field_0x1C; + if (f31 < m_HIO->mAtnMove.m.field_0x1C) { + f32 f1 = f31 / m_HIO->mAtnMove.m.field_0x1C; if (mDirection == DIR_LEFT) { dVar8 = ANM_ATNLS; dVar9 = ANM_ATNWLS; @@ -3378,13 +3378,13 @@ void daPy_lk_c::setBlendAtnMoveAnime(f32 f30) { iVar6 = 4; m3598 = 1.0f; } - f32 f2 = daPy_HIO_atnMove_c0::m.field_0x24; - f32 f3 = daPy_HIO_atnMove_c0::m.field_0x28 * f29; + f32 f2 = m_HIO->mAtnMove.m.field_0x24; + f32 f3 = m_HIO->mAtnMove.m.field_0x28 * f29; setMoveAnime(f1, f2, f3, dVar8, dVar9, iVar6, f30); } else { - if (f31 < daPy_HIO_atnMove_c0::m.field_0x20) { - f32 f28 = (f31 - daPy_HIO_atnMove_c0::m.field_0x1C) / - (daPy_HIO_atnMove_c0::m.field_0x20 - daPy_HIO_atnMove_c0::m.field_0x1C); + if (f31 < m_HIO->mAtnMove.m.field_0x20) { + f32 f28 = (f31 - m_HIO->mAtnMove.m.field_0x1C) / + (m_HIO->mAtnMove.m.field_0x20 - m_HIO->mAtnMove.m.field_0x1C); if (mDirection == DIR_LEFT) { dVar8 = ANM_ATNWLS; dVar9 = ANM_ATNDLS; @@ -3392,8 +3392,8 @@ void daPy_lk_c::setBlendAtnMoveAnime(f32 f30) { dVar8 = ANM_ATNWRS; dVar9 = ANM_ATNDRS; } - f32 f2 = daPy_HIO_atnMove_c0::m.field_0x28 * f29; - f32 f3 = daPy_HIO_atnMove_c0::m.field_0x2C * f29; + f32 f2 = m_HIO->mAtnMove.m.field_0x28 * f29; + f32 f3 = m_HIO->mAtnMove.m.field_0x2C * f29; setMoveAnime(f28, f2, f3, dVar8, dVar9, 4, f30); m3598 = 1.0f - (f28 * m3598); } else { @@ -3404,10 +3404,10 @@ void daPy_lk_c::setBlendAtnMoveAnime(f32 f30) { } f32 f2; if (m36A0.abs2XZ() >= SQUARE(7.0f)) { - f2 = 1.9f * daPy_HIO_atnMove_c0::m.field_0x2C; + f2 = 1.9f * m_HIO->mAtnMove.m.field_0x2C; onResetFlg0(daPyRFlg0_UNK40000); } else { - f2 = daPy_HIO_atnMove_c0::m.field_0x2C * f29; + f2 = m_HIO->mAtnMove.m.field_0x2C * f29; } setMoveAnime(1.0f, f2, f2, dVar9, dVar9, 4, f30); m3598 = 0.0f; @@ -3445,10 +3445,10 @@ void daPy_lk_c::setAnimeEquipSword(BOOL r4) { return; } m3562 = daPyItem_SWORD_e; - f32 rate = daPy_HIO_cut_c0::m.field_0x8; - f32 start = daPy_HIO_cut_c0::m.field_0xC; - s16 end = daPy_HIO_cut_c0::m.field_0x0; - f32 f3 = daPy_HIO_cut_c0::m.field_0x10; + f32 rate = m_HIO->mCut.m.field_0x8; + f32 start = m_HIO->mCut.m.field_0xC; + s16 end = m_HIO->mCut.m.field_0x0; + f32 f3 = m_HIO->mCut.m.field_0x10; setActAnimeUpper(LKANM_BCK_REST, UPPER_MOVE2_e, rate, start, end, f3); setPriTextureAnime(0x72, 0); dComIfGp_clearPlayerStatus0(0, daPyStts0_BOOMERANG_WAIT_e); @@ -3467,10 +3467,10 @@ void daPy_lk_c::setAnimeEquipSword(BOOL r4) { void daPy_lk_c::setAnimeEquipSingleItem(u16 bckIdx) { setActAnimeUpper( bckIdx, UPPER_MOVE2_e, - daPy_HIO_item_c0::m.field_0x14, - daPy_HIO_item_c0::m.field_0x18, - daPy_HIO_item_c0::m.field_0x2, - daPy_HIO_item_c0::m.field_0x1C + m_HIO->mItem.m.field_0x14, + m_HIO->mItem.m.field_0x18, + m_HIO->mItem.m.field_0x2, + m_HIO->mItem.m.field_0x1C ); setPriTextureAnime(0x74, 0); } @@ -3510,15 +3510,15 @@ void daPy_lk_c::setAnimeUnequipSword() { ModeFlg_CROUCH | ModeFlg_CRAWL ) || dComIfGp_event_runCheck() || checkPlayerDemoMode()) { - rate = daPy_HIO_cut_c0::m.field_0x20; - start = daPy_HIO_cut_c0::m.field_0x24; - end = daPy_HIO_cut_c0::m.field_0x4; - f3 = daPy_HIO_cut_c0::m.field_0x28; + rate = m_HIO->mCut.m.field_0x20; + start = m_HIO->mCut.m.field_0x24; + end = m_HIO->mCut.m.field_0x4; + f3 = m_HIO->mCut.m.field_0x28; } else { - rate = daPy_HIO_cut_c0::m.field_0x14; - start = daPy_HIO_cut_c0::m.field_0x18; - end = daPy_HIO_cut_c0::m.field_0x2; - f3 = daPy_HIO_cut_c0::m.field_0x1C; + rate = m_HIO->mCut.m.field_0x14; + start = m_HIO->mCut.m.field_0x18; + end = m_HIO->mCut.m.field_0x2; + f3 = m_HIO->mCut.m.field_0x1C; } setActAnimeUpper(LKANM_BCK_REST, UPPER_MOVE2_e, rate, start, end, f3); @@ -3541,16 +3541,16 @@ void daPy_lk_c::setAnimeUnequipItem(u16 i_itemNo) { } else if (checkBowItem(i_itemNo)) { setAnimeEquipSingleItem(LKANM_BCK_TAKER); } else if (i_itemNo == dItem_SKULL_HAMMER_e) { - f32 rate = daPy_HIO_item_c0::m.field_0x24; - f32 start = daPy_HIO_item_c0::m.field_0x28; - s16 end = daPy_HIO_item_c0::m.field_0x4; - f32 f3 = daPy_HIO_item_c0::m.field_0x2C; + f32 rate = m_HIO->mItem.m.field_0x24; + f32 start = m_HIO->mItem.m.field_0x28; + s16 end = m_HIO->mItem.m.field_0x4; + f32 f3 = m_HIO->mItem.m.field_0x2C; setActAnimeUpper(LKANM_BCK_TAKEBOTH, UPPER_MOVE2_e, rate, start, end, f3); } else { - f32 rate = daPy_HIO_item_c0::m.field_0x8; - f32 start = daPy_HIO_item_c0::m.field_0xC; - s16 end = daPy_HIO_item_c0::m.field_0x0; - f32 f3 = daPy_HIO_item_c0::m.field_0x10; + f32 rate = m_HIO->mItem.m.field_0x8; + f32 start = m_HIO->mItem.m.field_0xC; + s16 end = m_HIO->mItem.m.field_0x0; + f32 f3 = m_HIO->mItem.m.field_0x10; setActAnimeUpper(LKANM_BCK_TAKE, UPPER_MOVE2_e, rate, start, end, f3); setPriTextureAnime(0x73, 0); } @@ -3656,7 +3656,7 @@ void daPy_lk_c::setFallVoice() { -G_CM3D_F_INF == mAcch.GetGroundH()) && (m35F0 - current.pos.y > 500.0f)) { - if (current.pos.y - mAcch.GetGroundH() >= 100.0f * daPy_HIO_fall_c0::m.field_0x14) { + if (current.pos.y - mAcch.GetGroundH() >= 100.0f * m_HIO->mFall.m.field_0x14) { voiceStart(12); onNoResetFlg0(daPyFlg0_NO_FALL_VOICE); setTextureAnime(0x56, 0); @@ -3787,7 +3787,7 @@ BOOL daPy_lk_c::changeDragonShield(int param_1) { return true; } else if (dComIfGs_getMagic() != 0) { onNoResetFlg1(daPyFlg1_EQUIP_DRAGON_SHIELD); - m3548 = daPy_HIO_magicShield_c0::m.field_0x0; + m3548 = m_HIO->mItem.mMagicShield.m.field_0x0; mTinkleShieldTimer = 0; if (param_1 != 0) { dComIfGp_setItemMagicCount(-1); @@ -3939,22 +3939,22 @@ void daPy_lk_c::checkItemAction() { if (!(mStickDistance > 0.05f)) { return; } - if (!(frameCtrl.getFrame() > daPy_HIO_boom_c0::m.field_0x2C)) { + if (!(frameCtrl.getFrame() > m_HIO->mItem.mBoom.m.field_0x2C)) { return; } } - resetActAnimeUpper(UPPER_MOVE2_e, daPy_HIO_basic_c0::m.field_0xC); + resetActAnimeUpper(UPPER_MOVE2_e, m_HIO->mBasic.m.field_0xC); if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) { procShipPaddle_init(); } } else if (checkUpperAnime(LKANM_BCK_BOOMTHROW)) { if (frameCtrl.getRate() < 0.01f || ((mStickDistance > 0.05f && - (frameCtrl.getFrame() > daPy_HIO_boom_c0::m.field_0x10)))) + (frameCtrl.getFrame() > m_HIO->mItem.mBoom.m.field_0x10)))) { - resetActAnimeUpper(UPPER_MOVE2_e, daPy_HIO_basic_c0::m.field_0xC); + resetActAnimeUpper(UPPER_MOVE2_e, m_HIO->mBasic.m.field_0xC); } else { - if (frameCtrl.checkPass(daPy_HIO_boom_c0::m.field_0x14)) { + if (frameCtrl.checkPass(m_HIO->mItem.mBoom.m.field_0x14)) { throwBoomerang(); } } @@ -3962,7 +3962,7 @@ void daPy_lk_c::checkItemAction() { if (frameCtrl.getRate() < 0.01f) { mFrameCtrlUnder[UNDER_MOVE0_e].setRate(0.0f); mFrameCtrlUnder[UNDER_MOVE1_e].setRate(0.0f); - mFrameCtrlUpper[UPPER_MOVE0_e].setRate(daPy_HIO_atnMove_c0::m.field_0x24); + mFrameCtrlUpper[UPPER_MOVE0_e].setRate(m_HIO->mAtnMove.m.field_0x24); mFrameCtrlUpper[UPPER_MOVE1_e].setRate(0.0f); } } else if (checkEquipAnime()) { @@ -3970,18 +3970,18 @@ void daPy_lk_c::checkItemAction() { ((checkUpperAnime(LKANM_BCK_REST) && frameCtrl.checkPass(7.0f - frameCtrl.getRate())) || (checkUpperAnime(LKANM_BCK_TAKE) && frameCtrl.checkPass(7.0f - frameCtrl.getRate())) || (checkUpperAnime(LKANM_BCK_TAKEBOTH) && - frameCtrl.checkPass(daPy_HIO_item_c0::m.field_0x30 - frameCtrl.getRate())) || + frameCtrl.checkPass(m_HIO->mItem.m.field_0x30 - frameCtrl.getRate())) || (checkSingleItemEquipAnime() && - frameCtrl.checkPass(daPy_HIO_item_c0::m.field_0x20 - frameCtrl.getRate())))) + frameCtrl.checkPass(m_HIO->mItem.m.field_0x20 - frameCtrl.getRate())))) { seStartOnlyReverb(JA_SE_LK_SW_PUTIN_S); } if (std::fabsf(frameCtrl.getRate()) < 0.01f) { - resetActAnimeUpper(UPPER_MOVE2_e, daPy_HIO_basic_c0::m.field_0xC); + resetActAnimeUpper(UPPER_MOVE2_e, m_HIO->mBasic.m.field_0xC); } else if ((checkUpperAnime(LKANM_BCK_REST) && frameCtrl.checkPass(7.0f)) || (checkUpperAnime(LKANM_BCK_TAKE) && frameCtrl.checkPass(7.0f)) || - (checkUpperAnime(LKANM_BCK_TAKEBOTH) && frameCtrl.checkPass(daPy_HIO_item_c0::m.field_0x30)) || - (checkSingleItemEquipAnime() && frameCtrl.checkPass(daPy_HIO_item_c0::m.field_0x20))) + (checkUpperAnime(LKANM_BCK_TAKEBOTH) && frameCtrl.checkPass(m_HIO->mItem.m.field_0x30)) || + (checkSingleItemEquipAnime() && frameCtrl.checkPass(m_HIO->mItem.m.field_0x20))) { if ((mEquipItem != daPyItem_NONE_e && mEquipItem != daPyItem_SWORD_e) || (m3562 != daPyItem_NONE_e && m3562 != daPyItem_SWORD_e)) @@ -4336,7 +4336,7 @@ BOOL daPy_lk_c::checkNextActionFromButton() { if (!checkAttentionLock() && mStickDistance > 0.05f) { shape_angle.y = m34E8; } - return procFrontRoll_init(daPy_HIO_roll_c0::m.field_0xC); + return procFrontRoll_init(m_HIO->mRoll.m.field_0xC); } } if ((daPy_getPlayerActorClass() == this && !dComIfGp_event_runCheck()) && @@ -4371,13 +4371,13 @@ void daPy_lk_c::setShieldGuard() { freeGrabItem(); if (!checkUpperAnime(uVar3)) { resetActAnimeUpper(UPPER_MOVE2_e, -1.0f); - setActAnimeUpper(uVar3, UPPER_MOVE2_e, daPy_HIO_atnMove_c0::m.field_0x24, 0.0f, -1, - daPy_HIO_basic_c0::m.field_0xC); + setActAnimeUpper(uVar3, UPPER_MOVE2_e, m_HIO->mAtnMove.m.field_0x24, 0.0f, -1, + m_HIO->mBasic.m.field_0xC); } else { f32 dVar6 = 1.0f; if (local_18 < dVar6) { - if (daPy_HIO_basic_c0::m.field_0xC > 0.01f) { - cLib_chaseF(&local_18, dVar6, dVar6 / daPy_HIO_basic_c0::m.field_0xC); + if (m_HIO->mBasic.m.field_0xC > 0.01f) { + cLib_chaseF(&local_18, dVar6, dVar6 / m_HIO->mBasic.m.field_0xC); } else { local_18 = 1.0f; } @@ -4392,13 +4392,13 @@ void daPy_lk_c::setShieldGuard() { } } else { if (checkUpperGuardAnime()) { - if (daPy_HIO_basic_c0::m.field_0xC > 0.01f) { - cLib_chaseF(&local_18, 0.0f, 1.0f / daPy_HIO_basic_c0::m.field_0xC); + if (m_HIO->mBasic.m.field_0xC > 0.01f) { + cLib_chaseF(&local_18, 0.0f, 1.0f / m_HIO->mBasic.m.field_0xC); } else { local_18 = 0.0f; } if (local_18 <= 0.0f) { - resetActAnimeUpper(UPPER_MOVE2_e, daPy_HIO_basic_c0::m.field_0xC); + resetActAnimeUpper(UPPER_MOVE2_e, m_HIO->mBasic.m.field_0xC); } else { m_pbCalc[PART_UPPER_e]->setRatio(2, local_18); } @@ -4453,9 +4453,9 @@ BOOL daPy_lk_c::checkNextMode(int r29) { mDemo.getDemoMode() == daPy_demo_c::DEMO_A_WAIT_e; if (r24) { - mMaxNormalSpeed = daPy_HIO_atnMove_c0::m.field_0xC; + mMaxNormalSpeed = m_HIO->mAtnMove.m.field_0xC; } else { - mMaxNormalSpeed = daPy_HIO_move_c0::m.field_0x18; + mMaxNormalSpeed = m_HIO->mMove.m.field_0x18; } if (changeSlideProc()) { @@ -4509,7 +4509,7 @@ BOOL daPy_lk_c::checkNextMode(int r29) { } else if (cLib_distanceAngleS(m34E8, current.angle.y) > 0x7800 && mStickDistance > 0.05f) { - if ((speedF / mMaxNormalSpeed > daPy_HIO_slip_c0::m.field_0x4) && + if ((speedF / mMaxNormalSpeed > m_HIO->mSlip.m.field_0x4) && mCurrAttributeCode != dBgS_Attr_ICE_e && (!checkGrabAnime() && getDirectionFromAngle(m34EA - m34DC) == DIR_BACKWARD)) { @@ -4725,14 +4725,14 @@ void daPy_lk_c::setFrontWallType() { } } } - spA8.set(current.pos.x, current.pos.y + (0.1f + daPy_HIO_wallCatch_c0::m.field_0x18), current.pos.z); + spA8.set(current.pos.x, current.pos.y + (0.1f + m_HIO->mWallCatch.m.field_0x18), current.pos.z); sp9C.set(spA8.x + (dVar15 * (50.0f + dVar16)), spA8.y, spA8.z + (dVar14 * (50.0f + dVar16))); mLinkLinChk.Set(&spA8, &sp9C, this); cVar8 = dComIfG_Bgsp()->LineCross(&mLinkLinChk); if (cVar8 == 0) { mRoofChk.SetPos(current.pos); dVar12 = dComIfG_Bgsp()->RoofChk(&mRoofChk); - if ((dVar12 - current.pos.y) > 10.0f + daPy_HIO_wallCatch_c0::m.field_0x18) { + if ((dVar12 - current.pos.y) > 10.0f + m_HIO->mWallCatch.m.field_0x18) { cVar8 = 0; } else { cVar8 = 1; @@ -4756,7 +4756,7 @@ void daPy_lk_c::setFrontWallType() { } spA8.set( m3724.x - 15.0f * pVVar6->GetNP()->x, - current.pos.y + (daPy_HIO_wallCatch_c0::m.field_0x18 + 0.1f), + current.pos.y + (m_HIO->mWallCatch.m.field_0x18 + 0.1f), m3724.z - 15.0f * pVVar6->GetNP()->z ); mGndChk.SetPos(&spA8); @@ -4777,23 +4777,23 @@ void daPy_lk_c::setFrontWallType() { m3724 = sp3C; f32 fVar3 = m3724.y - current.pos.y; if (checkModeFlg(ModeFlg_SWIM)) { - if ((fVar3 <= 0.1f + daPy_HIO_swim_c0::m.field_0x6C) && fVar3 >= -5.0f) { + if ((fVar3 <= 0.1f + m_HIO->mSwim.m.field_0x6C) && fVar3 >= -5.0f) { mFrontWallType = 7; } } else if (checkModeFlg(ModeFlg_MIDAIR)) { if (((dVar16 - mAcch.GetGroundH()) > 125.0f) && (mCurProc != daPyProc_HOOKSHOT_FLY_e || fVar3 < 100.0f)) { mFrontWallType = 7; } - } else if (fVar3 >= 0.1f + daPy_HIO_wallCatch_c0::m.field_0x18) { + } else if (fVar3 >= 0.1f + m_HIO->mWallCatch.m.field_0x18) { // TODO? - } else if (!checkGrabAnime() || !(fVar3 >= 0.1f + daPy_HIO_wallCatch_c0::m.field_0xC)) { + } else if (!checkGrabAnime() || !(fVar3 >= 0.1f + m_HIO->mWallCatch.m.field_0xC)) { if (fVar3 < 27.09f) { return; - } else if (fVar3 < daPy_HIO_wallCatch_c0::m.field_0xC + 0.1f) { + } else if (fVar3 < m_HIO->mWallCatch.m.field_0xC + 0.1f) { mFrontWallType = 6; - } else if (fVar3 < daPy_HIO_wallCatch_c0::m.field_0x10 + 0.1f) { + } else if (fVar3 < m_HIO->mWallCatch.m.field_0x10 + 0.1f) { mFrontWallType = 7; - } else if (fVar3 < daPy_HIO_wallCatch_c0::m.field_0x14 + 0.1f) { + } else if (fVar3 < m_HIO->mWallCatch.m.field_0x14 + 0.1f) { mFrontWallType = 8; } else { mFrontWallType = 9; @@ -4835,7 +4835,7 @@ BOOL daPy_lk_c::changeFrontWallTypeProc() { fVar3 = cM_scos(m352C); iVar8 = (int)((current.pos.y - m3724.y) / 37.5f) - 1; if (iVar8 < 1) { - return procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + return procFall_init(1, m_HIO->mWallCatch.m.field_0x54); } shape_angle.y = m352C + 0x8000; current.angle.y = shape_angle.y; @@ -4885,7 +4885,7 @@ BOOL daPy_lk_c::changeFrontWallTypeProc() { current.pos.x = (m3724.x + 20.5f * fVar3) - fVar2; current.pos.y = m3724.y + 37.5f * iVar8; current.pos.z = (m3724.z + 20.5f * fVar2) + fVar3; - while (m35D0 - current.pos.y > daPy_HIO_swim_c0::m.field_0x24) { + while (m35D0 - current.pos.y > m_HIO->mSwim.m.field_0x24) { current.pos.y += 37.5f; } procLadderMove_init(1, 0, ¤t.pos); @@ -4903,12 +4903,12 @@ BOOL daPy_lk_c::changeFrontWallTypeProc() { } m3544 = sVar5 + 1; if (mFrontWallType == 6) { - if (m3544 > daPy_HIO_smallJump_c0::m.field_0x2) { + if (m3544 > m_HIO->mSmallJump.m.field_0x2) { return procSmallJump_init(0); } return false; } - if (m3544 > daPy_HIO_wallCatch_c0::m.field_0x8) { + if (m3544 > m_HIO->mWallCatch.m.field_0x8) { if (mFrontWallType == 7) { return procHangWallCatch_init(); } @@ -4935,7 +4935,7 @@ int daPy_lk_c::changeSlideProc() { return false; } } - if (cLib_distanceAngleS(sVar4, shape_angle.y) < daPy_HIO_slide_c0::m.field_0x8) { + if (cLib_distanceAngleS(sVar4, shape_angle.y) < m_HIO->mSlide.m.field_0x8) { return procSlideFront_init(sVar4); } else { return procSlideBack_init(sVar4); @@ -4967,9 +4967,9 @@ BOOL daPy_lk_c::changeLandProc(f32 param_1) { dVar7 = m35F0 - current.pos.y; if (mCurrAttributeCode != dBgS_Attr_GIANT_FLOWER_e && - ((dVar7 >= (100.0f * daPy_HIO_fall_c0::m.field_0x14)))) + ((dVar7 >= (100.0f * m_HIO->mFall.m.field_0x14)))) { - if (dVar7 >= (100.0f * daPy_HIO_fall_c0::m.field_0x10)) { + if (dVar7 >= (100.0f * m_HIO->mFall.m.field_0x10)) { return procLandDamage_init(2); } else { return procLandDamage_init(1); @@ -4990,13 +4990,13 @@ BOOL daPy_lk_c::changeLandProc(f32 param_1) { { voiceStart(7); if (direction == DIR_FORWARD) { - speedF = daPy_HIO_move_c0::m.field_0x18; - procFrontRoll_init(daPy_HIO_fall_c0::m.field_0x38); + speedF = m_HIO->mMove.m.field_0x18; + procFrontRoll_init(m_HIO->mFall.m.field_0x38); } else { procSideRoll_init(); } } else { - if (((dVar7 >= (0.5f * (daPy_HIO_fall_c0::m.field_0x14 * 100.0f))) && + if (((dVar7 >= (0.5f * (m_HIO->mFall.m.field_0x14 * 100.0f))) && !checkBossGomaStage()) && mCurrAttributeCode != dBgS_Attr_GIANT_FLOWER_e) { @@ -5047,11 +5047,11 @@ BOOL daPy_lk_c::checkNormalDamage(int param_1) { /* 80110448-801104E4 .text setDashDamage__9daPy_lk_cFv */ void daPy_lk_c::setDashDamage() { - setActAnimeUpper(LKANM_BCK_DAMDASH, UPPER_MOVE2_e, daPy_HIO_move_c0::m.field_0x48, 0.0f, -1, - daPy_HIO_basic_c0::m.field_0xC); + setActAnimeUpper(LKANM_BCK_DAMDASH, UPPER_MOVE2_e, m_HIO->mMove.m.field_0x48, 0.0f, -1, + m_HIO->mBasic.m.field_0xC); setPriTextureAnime(0x40, 0); mFrameCtrlUpper[UPPER_MOVE2_e].setFrame(mFrameCtrlUnder[UNDER_MOVE1_e].getFrame()); - mDamageWaitTimer = daPy_HIO_dam_c0::m.field_0x2; + mDamageWaitTimer = m_HIO->mDam.m.field_0x2; voiceStart(2); seStartOnlyReverb(JA_SE_LK_DAMAGE_NORMAL); } @@ -5097,7 +5097,7 @@ BOOL daPy_lk_c::changeDamageProc() { mDamageWaitTimer--; if (mDamageWaitTimer == 0) { if (checkDashDamageAnime()) { - resetActAnimeUpper(UPPER_MOVE2_e, daPy_HIO_basic_c0::m.field_0xC); + resetActAnimeUpper(UPPER_MOVE2_e, m_HIO->mBasic.m.field_0xC); } else if (checkModeFlg(ModeFlg_SWIM)) { resetPriTextureAnime(); } @@ -5187,7 +5187,7 @@ BOOL daPy_lk_c::changeDamageProc() { if (checkModeFlg(ModeFlg_04000000)) { if (r30 || (mCyl.ChkTgHit() && !checkSuccessGuard(spl))) { setDamagePoint(-damage); - mDamageWaitTimer = daPy_HIO_dam_c0::m.field_0x2; + mDamageWaitTimer = m_HIO->mDam.m.field_0x2; voiceStart(2); @@ -5333,7 +5333,7 @@ BOOL daPy_lk_c::changeAutoJumpProc() { mLavaGndChk.SetPos(¤t.pos); if (checkNoResetFlg0(daPyFlg0_HOVER_BOOTS)) { offNoResetFlg0(daPyFlg0_HOVER_BOOTS); - return procFall_init(2, daPy_HIO_wallCatch_c0::m.field_0x54); + return procFall_init(2, m_HIO->mWallCatch.m.field_0x54); } if (dVar11 < -30.1f) { @@ -5362,7 +5362,7 @@ BOOL daPy_lk_c::changeAutoJumpProc() { } dVar10 = mVelocity; if (dComIfGs_getLife() != 0 || dComIfGs_checkBottle(dItem_FAIRY_BOTTLE_e)) { - if (m357C != 3 && !checkGrabWear() && dVar10 >= daPy_HIO_autoJump_c0::m.field_0x14 && + if (m357C != 3 && !checkGrabWear() && dVar10 >= m_HIO->mAutoJump.m.field_0x14 && mStickDistance > 0.85f && cLib_distanceAngleS(sVar3, shape_angle.y) < 0x800) { if (pcVar4 != NULL) { @@ -5391,7 +5391,7 @@ BOOL daPy_lk_c::changeAutoJumpProc() { if (mCurProc == daPyProc_FRONT_ROLL_e) { fVar1 = 0.0f; } else { - fVar1 = daPy_HIO_wallCatch_c0::m.field_0x54; + fVar1 = m_HIO->mWallCatch.m.field_0x54; } dVar11 = fVar1; if (pcVar4 != NULL) { @@ -5402,7 +5402,7 @@ BOOL daPy_lk_c::changeAutoJumpProc() { current.pos.z = current.pos.z + 35.0f * dVar8; } } else { - dVar11 = daPy_HIO_wallCatch_c0::m.field_0x54; + dVar11 = m_HIO->mWallCatch.m.field_0x54; } if (mStaffIdx != -1 && dComIfGp_evmng_getMyIntegerP(mStaffIdx, "fall")) { return procFall_init(0, dVar11); @@ -5506,7 +5506,7 @@ BOOL daPy_lk_c::changeDemoProc() { return procBackJump_init(); } else if (demo_mode == daPy_demo_c::DEMO_PFALL_e) { onNoResetFlg0(daPyFlg0_UNK100000); - return procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + return procFall_init(1, m_HIO->mWallCatch.m.field_0x54); } else if (demo_mode == daPy_demo_c::DEMO_SFALL_e) { if (mCurProc == daPyProc_LAND_e) { return true; @@ -5579,7 +5579,7 @@ BOOL daPy_lk_c::changeDeadProc() { { return dProcDead_init(); } - return procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + return procFall_init(1, m_HIO->mWallCatch.m.field_0x54); } else { return false; } @@ -5633,7 +5633,7 @@ void daPy_lk_c::setOldRootQuaternion(s16 param_1, s16 param_2, s16 param_3) { BOOL daPy_lk_c::checkRestHPAnime() { if (!checkPlayerGuard() && checkNoUpperAnime() && mpAttnActorLockOn == NULL && ((mDemo.getDemoType() == 0 && !checkModeFlg(ModeFlg_IN_SHIP) && - dComIfGs_getLife() <= daPy_HIO_move_c0::m.field_0xE) || + dComIfGs_getLife() <= m_HIO->mMove.m.field_0xE) || mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_018_e)) { return true; @@ -5758,7 +5758,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_PROC proc) { setSmallFanModel(); } else if (mCurProc == daPyProc_FAN_GLIDE_e) { deleteEquipItem(FALSE); - maxFallSpeed = daPy_HIO_autoJump_c0::m.field_0x10; + maxFallSpeed = m_HIO->mAutoJump.m.field_0x10; setSmallFanModel(); mEquipItem = dItem_DEKU_LEAF_e; m35F0 = m3688.y; @@ -5766,7 +5766,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_PROC proc) { m34E0 = 0; m34E4 = 0; } else if (mCurProc == daPyProc_SLOW_FALL_e) { - maxFallSpeed = daPy_HIO_autoJump_c0::m.field_0x10; + maxFallSpeed = m_HIO->mAutoJump.m.field_0x10; } else if (mCurProc == daPyProc_DEMO_TOOL_e) { resetDemoAnime = TRUE; speed.y = 0.0f; @@ -5832,7 +5832,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_PROC proc) { dComIfGp_clearPlayerStatus0(0, ~(daPyStts0_BOOMERANG_WAIT_e | daPyStts0_UNK10_e)); dComIfGp_clearPlayerStatus1(0, ~(daPyStts1_SAIL_e | daPyStts1_UNK8000_e | daPyStts1_UNK40000_e) & 0x000FFFFF); - gravity = daPy_HIO_autoJump_c0::m.field_0xC; + gravity = m_HIO->mAutoJump.m.field_0xC; m34F2 = 0; m34F4 = 0; onResetFlg0(daPyRFlg0_UNK8000000); @@ -5927,7 +5927,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_PROC proc) { BOOL daPy_lk_c::procScope_init(int param_1) { commonProcInit(daPyProc_SCOPE_e); mVelocity = 0.0f; - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); current.angle.y = shape_angle.y; seStartSystem(JA_SE_ITM_SUBMENU_IN_1); offNoResetFlg0(daPyFlg0_SCOPE_CANCEL); @@ -5962,7 +5962,7 @@ BOOL daPy_lk_c::procSubjectivity_init(BOOL i_crouch) { setSubjectMode(); if(!i_crouch) { - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); } mProcVar0.m3570 = i_crouch; @@ -6001,7 +6001,7 @@ BOOL daPy_lk_c::procCall_init() { commonProcInit(daPyProc_CALL_e); mVelocity = 0.0f; daPy_matAnm_c::offMabaFlg(); - setSingleMoveAnime(ANM_YOBU, 1.0f, 0.0f, -1, daPy_HIO_basic_c0::m.field_0xC); + setSingleMoveAnime(ANM_YOBU, 1.0f, 0.0f, -1, m_HIO->mBasic.m.field_0xC); current.angle.y = shape_angle.y; if (mEquipItem == daPyItem_BOKO_e) { deleteEquipItem(FALSE); @@ -6038,7 +6038,7 @@ BOOL daPy_lk_c::procControllWait_init() { commonProcInit(daPyProc_CONTROLL_WAIT_e); mVelocity = 0.0f; daPy_matAnm_c::offMabaFlg(); - setSingleMoveAnime(ANM_NENRIKI, 1.0f, 0.0f, -1, daPy_HIO_basic_c0::m.field_0xC); + setSingleMoveAnime(ANM_NENRIKI, 1.0f, 0.0f, -1, m_HIO->mBasic.m.field_0xC); current.angle.y = shape_angle.y; deleteEquipItem(FALSE); initShipRideUseItem(iVar3, 2); @@ -6080,9 +6080,9 @@ BOOL daPy_lk_c::procWait_init() { if (iVar4 != 0 && iVar3 == 0) { s32 uVar2 = m_tex_anm_heap.mIdx == mTexAnmIndexTable[daPyFace_TMABAF].mBtpIdx; u16 uVar1 = m3530; - setSingleMoveAnime(ANM_WAITATOB, daPy_HIO_move_c0::m.field_0x68, - daPy_HIO_move_c0::m.field_0x6C, daPy_HIO_move_c0::m.field_0x10, - daPy_HIO_move_c0::m.field_0x70); + setSingleMoveAnime(ANM_WAITATOB, m_HIO->mMove.m.field_0x68, + m_HIO->mMove.m.field_0x6C, m_HIO->mMove.m.field_0x10, + m_HIO->mMove.m.field_0x70); if (uVar2 == 0) { onModeFlg(ModeFlg_00000400); offModeFlg(ModeFlg_00000100); @@ -6090,7 +6090,7 @@ BOOL daPy_lk_c::procWait_init() { setTextureAnime(0xe, uVar1); } } else { - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); } current.angle.y = shape_angle.y; mDirection = DIR_NONE; @@ -6123,13 +6123,13 @@ BOOL daPy_lk_c::procWait() { if (checkAttentionLock()) { setSpeedAndAngleAtn(); } else { - setSpeedAndAngleNormal(daPy_HIO_move_c0::m.field_0x0); + setSpeedAndAngleNormal(m_HIO->mMove.m.field_0x0); } m35A0 = 0.0f; if (!checkNextMode(0)) { if (m34C3 == 0) { if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f || !checkRestHPAnime()) { - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); offModeFlg(ModeFlg_00000400); onModeFlg(ModeFlg_00000100); } @@ -6138,9 +6138,9 @@ BOOL daPy_lk_c::procWait() { { s32 uVar3 = m_tex_anm_heap.mIdx == mTexAnmIndexTable[daPyFace_TMABAF].mBtpIdx; u16 uVar1 = m3530; - setSingleMoveAnime(ANM_WAITATOB, daPy_HIO_move_c0::m.field_0x68, - daPy_HIO_move_c0::m.field_0x6C, daPy_HIO_move_c0::m.field_0x10, - daPy_HIO_move_c0::m.field_0x70); + setSingleMoveAnime(ANM_WAITATOB, m_HIO->mMove.m.field_0x68, + m_HIO->mMove.m.field_0x6C, m_HIO->mMove.m.field_0x10, + m_HIO->mMove.m.field_0x70); if (uVar3 == 0) { onModeFlg(ModeFlg_00000400); offModeFlg(ModeFlg_00000100); @@ -6203,7 +6203,7 @@ BOOL daPy_lk_c::procFreeWait() { if (checkAttentionLock()) { setSpeedAndAngleAtn(); } else { - setSpeedAndAngleNormal(daPy_HIO_move_c0::m.field_0x0); + setSpeedAndAngleNormal(m_HIO->mMove.m.field_0x0); } if (mProcVar0.m3570 != 0) { if (mFrameCtrlUnder[UNDER_MOVE0_e].checkPass(168.0f)) { @@ -6227,20 +6227,20 @@ BOOL daPy_lk_c::procMove_init() { return false; } commonProcInit(daPyProc_MOVE_e); - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); m34D0 = 0x14; return true; } /* 80113628-801136D4 .text procMove__9daPy_lk_cFv */ BOOL daPy_lk_c::procMove() { - setSpeedAndAngleNormal(daPy_HIO_move_c0::m.field_0x0); + setSpeedAndAngleNormal(m_HIO->mMove.m.field_0x0); if (!checkNextMode(0) && !changeFrontWallTypeProc() && !checkIceSlipFall()) { if (mDemo.getDemoMode() == daPy_demo_c::DEMO_N_WALK_e) { // Fakematch? Regalloc doesn't match unless all three of these vars are given temps. f32 vel = mVelocity; f32 temp1 = mMaxNormalSpeed; - f32 temp2 = daPy_HIO_move_c0::m.field_0x2C; + f32 temp2 = m_HIO->mMove.m.field_0x2C; if (vel > temp1 * temp2) { vel = temp1 * temp2; mVelocity = vel; @@ -6257,7 +6257,7 @@ BOOL daPy_lk_c::procAtnMove_init() { return false; } commonProcInit(daPyProc_ATN_MOVE_e); - setBlendAtnMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendAtnMoveAnime(m_HIO->mBasic.m.field_0xC); m34D0 = 0x14; return true; } @@ -6290,9 +6290,9 @@ BOOL daPy_lk_c::procAtnActorWait_init() { mDirection = DIR_RIGHT; } if (checkAtnWaitAnime()) { - setBlendAtnMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendAtnMoveAnime(m_HIO->mBasic.m.field_0xC); } else { - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); } return true; } @@ -6316,7 +6316,7 @@ BOOL daPy_lk_c::procAtnActorMove_init() { return false; } commonProcInit(daPyProc_ATN_ACTOR_MOVE_e); - setBlendAtnMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendAtnMoveAnime(m_HIO->mBasic.m.field_0xC); m34D0 = 0x14; return true; } @@ -6343,11 +6343,11 @@ BOOL daPy_lk_c::procSideStep_init(int param_1) { dVar1 = ANM_ATNJR; current.angle.y = shape_angle.y + -0x4000; } - setSingleMoveAnime(dVar1, daPy_HIO_sideStep_c0::m.field_0xC, daPy_HIO_sideStep_c0::m.field_0x10, - daPy_HIO_sideStep_c0::m.field_0x4, daPy_HIO_sideStep_c0::m.field_0x14); - mVelocity = cM_scos(daPy_HIO_sideStep_c0::m.field_0x2) * daPy_HIO_sideStep_c0::m.field_0x8; - speed.y = cM_ssin(daPy_HIO_sideStep_c0::m.field_0x2) * daPy_HIO_sideStep_c0::m.field_0x8; - gravity = daPy_HIO_sideStep_c0::m.field_0x18; + setSingleMoveAnime(dVar1, m_HIO->mSideStep.m.field_0xC, m_HIO->mSideStep.m.field_0x10, + m_HIO->mSideStep.m.field_0x4, m_HIO->mSideStep.m.field_0x14); + mVelocity = cM_scos(m_HIO->mSideStep.m.field_0x2) * m_HIO->mSideStep.m.field_0x8; + speed.y = cM_ssin(m_HIO->mSideStep.m.field_0x2) * m_HIO->mSideStep.m.field_0x8; + gravity = m_HIO->mSideStep.m.field_0x18; mProcVar0.m3570 = 0; voiceStart(5); return true; @@ -6355,7 +6355,7 @@ BOOL daPy_lk_c::procSideStep_init(int param_1) { /* 80113AC4-80113BDC .text procSideStep__9daPy_lk_cFv */ BOOL daPy_lk_c::procSideStep() { - if (daPy_HIO_sideStep_c0::m.field_0x0 != 0) { + if (m_HIO->mSideStep.m.field_0x0 != 0) { if (mpAttnActorLockOn != NULL) { s16 sVar2 = fopAcM_searchActorAngleY(this, mpAttnActorLockOn); cLib_addCalcAngleS(&shape_angle.y, sVar2, 5, 0x5e8, 0x13c); @@ -6376,8 +6376,8 @@ BOOL daPy_lk_c::procSideStep() { if (checkFanGlideProc(0)) { return true; } - if (current.pos.y < m3688.y - daPy_HIO_sideStep_c0::m.field_0x30) { - procFall_init(2, daPy_HIO_sideStep_c0::m.field_0x2C); + if (current.pos.y < m3688.y - m_HIO->mSideStep.m.field_0x30) { + procFall_init(2, m_HIO->mSideStep.m.field_0x2C); } } checkItemChangeFromButton(); @@ -6395,9 +6395,9 @@ BOOL daPy_lk_c::procSideStepLand_init() { } else { dVar2 = ANM_ATNJRLAND; } - setSingleMoveAnime(dVar2, daPy_HIO_sideStep_c0::m.field_0x1C, - daPy_HIO_sideStep_c0::m.field_0x20, daPy_HIO_sideStep_c0::m.field_0x6, - daPy_HIO_sideStep_c0::m.field_0x24); + setSingleMoveAnime(dVar2, m_HIO->mSideStep.m.field_0x1C, + m_HIO->mSideStep.m.field_0x20, m_HIO->mSideStep.m.field_0x6, + m_HIO->mSideStep.m.field_0x24); m34BE = 3; onResetFlg0(daPyRFlg0_RIGHT_FOOT_ON_GROUND); onResetFlg0(daPyRFlg0_LEFT_FOOT_ON_GROUND); @@ -6414,7 +6414,7 @@ BOOL daPy_lk_c::procSideStepLand() { if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { checkNextMode(0); } else { - if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_sideStep_c0::m.field_0x28) { + if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mSideStep.m.field_0x28) { checkNextMode(1); } } @@ -6425,8 +6425,8 @@ BOOL daPy_lk_c::procSideStepLand() { BOOL daPy_lk_c::procCrouchDefense_init() { commonProcInit(daPyProc_CROUCH_DEFENSE_e); daPy_matAnm_c::offMabaFlg(); - setSingleMoveAnime(ANM_DIFENCE, daPy_HIO_crouch_c0::m.field_0x10, 0.0f, -1, - daPy_HIO_crouch_c0::m.field_0x14); + setSingleMoveAnime(ANM_DIFENCE, m_HIO->mCrouch.m.field_0x10, 0.0f, -1, + m_HIO->mCrouch.m.field_0x14); current.angle.y = shape_angle.y; m34D4 = 0; dComIfGp_setPlayerStatus1(0, daPyStts1_UNK80000_e); @@ -6442,8 +6442,8 @@ BOOL daPy_lk_c::procCrouchDefense() { return procSubjectivity_init(1); } } - cLib_addCalc(&mVelocity, 0.0f, daPy_HIO_move_c0::m.field_0x24, daPy_HIO_move_c0::m.field_0x1C, - daPy_HIO_move_c0::m.field_0x20); + cLib_addCalc(&mVelocity, 0.0f, m_HIO->mMove.m.field_0x24, m_HIO->mMove.m.field_0x1C, + m_HIO->mMove.m.field_0x20); if (checkAttentionLock() || !spActionButton()) { current.angle.y = shape_angle.y; mDirection = DIR_RIGHT; @@ -6453,13 +6453,13 @@ BOOL daPy_lk_c::procCrouchDefense() { f32 fVar1 = mStickDistance * cM_scos(uVar2); s16 sVar5; if (fVar1 >= 0.0f) { - sVar5 = daPy_HIO_crouch_c0::m.field_0x2 * fVar1; + sVar5 = m_HIO->mCrouch.m.field_0x2 * fVar1; } else { - sVar5 = daPy_HIO_crouch_c0::m.field_0x0 * fVar1; + sVar5 = m_HIO->mCrouch.m.field_0x0 * fVar1; } cLib_addCalcAngleS(&mBodyAngle.x, sVar5, 4, 0xc00, 0x180); cLib_addCalcAngleS(&mBodyAngle.y, - daPy_HIO_crouch_c0::m.field_0x4 * mStickDistance * cM_ssin(uVar2), 4, + m_HIO->mCrouch.m.field_0x4 * mStickDistance * cM_ssin(uVar2), 4, 0xc00, 0x180); } return true; @@ -6480,30 +6480,30 @@ BOOL daPy_lk_c::procCrouchDefenseSlip_init() { pfVar3->GetAtSpl() == dCcG_At_Spl_UNK7 ) ) { - setSingleMoveAnime(ANM_DIFENCEA, daPy_HIO_nockback_c0::m.field_0x8, - daPy_HIO_nockback_c0::m.field_0xC, daPy_HIO_nockback_c0::m.field_0x0, - daPy_HIO_nockback_c0::m.field_0x10); + setSingleMoveAnime(ANM_DIFENCEA, m_HIO->mNockback.m.field_0x8, + m_HIO->mNockback.m.field_0xC, m_HIO->mNockback.m.field_0x0, + m_HIO->mNockback.m.field_0x10); dVar5 = damage_vec->absXZ(); mVelocity = - (daPy_HIO_nockback_c0::m.field_0x18 * dVar5) + daPy_HIO_nockback_c0::m.field_0x14; - m34D0 = daPy_HIO_nockback_c0::m.field_0x2; - m35A0 = daPy_HIO_nockback_c0::m.field_0x1C; - m35A4 = daPy_HIO_nockback_c0::m.field_0x20; - m35A8 = daPy_HIO_nockback_c0::m.field_0x24; - m35AC = daPy_HIO_nockback_c0::m.field_0x28; + (m_HIO->mNockback.m.field_0x18 * dVar5) + m_HIO->mNockback.m.field_0x14; + m34D0 = m_HIO->mNockback.m.field_0x2; + m35A0 = m_HIO->mNockback.m.field_0x1C; + m35A4 = m_HIO->mNockback.m.field_0x20; + m35A8 = m_HIO->mNockback.m.field_0x24; + m35AC = m_HIO->mNockback.m.field_0x28; dVar5 = cM_rnd(); mProcVar0.m3570 = (dVar5 < 0.2f) ? 1 : 0; } else { - setSingleMoveAnime(ANM_DIFENCEA, daPy_HIO_guard_c0::m.field_0x4, - daPy_HIO_guard_c0::m.field_0x8, daPy_HIO_guard_c0::m.field_0x0, - daPy_HIO_guard_c0::m.field_0xC); + setSingleMoveAnime(ANM_DIFENCEA, m_HIO->mGuard.m.field_0x4, + m_HIO->mGuard.m.field_0x8, m_HIO->mGuard.m.field_0x0, + m_HIO->mGuard.m.field_0xC); dVar5 = damage_vec->absXZ(); - mVelocity = (daPy_HIO_guard_c0::m.field_0x14 * dVar5) + daPy_HIO_guard_c0::m.field_0x10; - m34D0 = daPy_HIO_guard_c0::m.field_0x2; - m35A0 = daPy_HIO_guard_c0::m.field_0x18; - m35A4 = daPy_HIO_guard_c0::m.field_0x1C; - m35A8 = daPy_HIO_guard_c0::m.field_0x20; - m35AC = daPy_HIO_guard_c0::m.field_0x24; + mVelocity = (m_HIO->mGuard.m.field_0x14 * dVar5) + m_HIO->mGuard.m.field_0x10; + m34D0 = m_HIO->mGuard.m.field_0x2; + m35A0 = m_HIO->mGuard.m.field_0x18; + m35A4 = m_HIO->mGuard.m.field_0x1C; + m35A8 = m_HIO->mGuard.m.field_0x20; + m35AC = m_HIO->mGuard.m.field_0x24; mProcVar0.m3570 = 0; } if (mEquipItem == dItem_SKULL_HAMMER_e) { @@ -6547,8 +6547,8 @@ BOOL daPy_lk_c::procCrouchDefenseSlip() { /* 801143D4-80114440 .text procCrouch_init__9daPy_lk_cFv */ BOOL daPy_lk_c::procCrouch_init() { commonProcInit(daPyProc_CROUCH_e); - setSingleMoveAnime(ANM_CROUCH, daPy_HIO_crouch_c0::m.field_0x18, 0.0f, -1, - daPy_HIO_crouch_c0::m.field_0x1C); + setSingleMoveAnime(ANM_CROUCH, m_HIO->mCrouch.m.field_0x18, 0.0f, -1, + m_HIO->mCrouch.m.field_0x1C); deleteEquipItem(FALSE); current.angle.y = shape_angle.y; return true; @@ -6569,8 +6569,8 @@ BOOL daPy_lk_c::procCrouch() { return procSubjectivity_init(1); } } - cLib_addCalc(&mVelocity, 0.0f, daPy_HIO_move_c0::m.field_0x24, daPy_HIO_move_c0::m.field_0x1C, - daPy_HIO_move_c0::m.field_0x20); + cLib_addCalc(&mVelocity, 0.0f, m_HIO->mMove.m.field_0x24, m_HIO->mMove.m.field_0x1C, + m_HIO->mMove.m.field_0x20); if (!spActionButton() || (checkAttentionLock() && dComIfGs_getSelectEquip(1) != dItem_NONE_e && checkGuardAccept())) { @@ -6605,8 +6605,8 @@ BOOL daPy_lk_c::procWaitTurn_init() { return false; } commonProcInit(daPyProc_WAIT_TURN_e); - setSingleMoveAnime(ANM_ROT, daPy_HIO_basic_c0::m.field_0x4, 0.0f, -1, - daPy_HIO_basic_c0::m.field_0xC); + setSingleMoveAnime(ANM_ROT, m_HIO->mBasic.m.field_0x4, 0.0f, -1, + m_HIO->mBasic.m.field_0xC); if (dComIfGp_event_runCheck()) { mVelocity = 0.0f; } @@ -6617,13 +6617,13 @@ BOOL daPy_lk_c::procWaitTurn_init() { /* 80114804-80114908 .text procWaitTurn__9daPy_lk_cFv */ BOOL daPy_lk_c::procWaitTurn() { - cLib_addCalc(&mVelocity, 0.0f, daPy_HIO_move_c0::m.field_0x24, daPy_HIO_move_c0::m.field_0x1C, - daPy_HIO_move_c0::m.field_0x20); + cLib_addCalc(&mVelocity, 0.0f, m_HIO->mMove.m.field_0x24, m_HIO->mMove.m.field_0x1C, + m_HIO->mMove.m.field_0x20); if (changeSlideProc()) { return true; } - s16 sVar1 = cLib_addCalcAngleS(&shape_angle.y, m34D4, daPy_HIO_turn_c0::m.field_0x4, - daPy_HIO_turn_c0::m.field_0x0, daPy_HIO_turn_c0::m.field_0x2); + s16 sVar1 = cLib_addCalcAngleS(&shape_angle.y, m34D4, m_HIO->mTurn.m.field_0x4, + m_HIO->mTurn.m.field_0x0, m_HIO->mTurn.m.field_0x2); current.angle.y = shape_angle.y; if (checkNextActionFromButton()) { return true; @@ -6648,17 +6648,17 @@ BOOL daPy_lk_c::procMoveTurn_init(int param_1) { return false; } commonProcInit(daPyProc_MOVE_TURN_e); - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); dComIfGp_setPlayerStatus0(0, daPyStts0_UNK800_e); if (param_1 != 0) { - m34D4 = (daPy_HIO_move_c0::m.field_0x0 * 4) + 0x4A56; - m34D6 = daPy_HIO_move_c0::m.field_0x0 * 2; + m34D4 = (m_HIO->mMove.m.field_0x0 * 4) + 0x4A56; + m34D6 = m_HIO->mMove.m.field_0x0 * 2; m34D0 = 2; current.angle.y = m34E8; mVelocity *= 0.5f; } else { - m34D4 = daPy_HIO_move_c0::m.field_0x0 * 2; - m34D6 = daPy_HIO_move_c0::m.field_0x0; + m34D4 = m_HIO->mMove.m.field_0x0 * 2; + m34D6 = m_HIO->mMove.m.field_0x0; m34D0 = 3; } return true; @@ -6666,7 +6666,7 @@ BOOL daPy_lk_c::procMoveTurn_init(int param_1) { /* 801149EC-80114A60 .text procMoveTurn__9daPy_lk_cFv */ BOOL daPy_lk_c::procMoveTurn() { - setSpeedAndAngleNormal(daPy_HIO_move_c0::m.field_0x0); + setSpeedAndAngleNormal(m_HIO->mMove.m.field_0x0); cLib_addCalcAngleS(&shape_angle.y, current.angle.y, m34D0, m34D4, m34D6); if (!checkNextMode(0)) { setBlendMoveAnime(-1.0f); @@ -6678,12 +6678,12 @@ BOOL daPy_lk_c::procMoveTurn() { BOOL daPy_lk_c::procSlip_init() { commonProcInit(daPyProc_SLIP_e); daPy_matAnm_c::offMabaFlg(); - setSingleMoveAnime(ANM_SLIP, daPy_HIO_slip_c0::m.field_0xC, 0.0f, -1, - daPy_HIO_slip_c0::m.field_0x1C); - mVelocity = speedF * daPy_HIO_slip_c0::m.field_0x8; - if (daPy_HIO_slip_c0::m.field_0x0 == 1) { + setSingleMoveAnime(ANM_SLIP, m_HIO->mSlip.m.field_0xC, 0.0f, -1, + m_HIO->mSlip.m.field_0x1C); + mVelocity = speedF * m_HIO->mSlip.m.field_0x8; + if (m_HIO->mSlip.m.field_0x0 == 1) { mVelocity = mMaxNormalSpeed; - } else if (daPy_HIO_slip_c0::m.field_0x0 == 2 && mVelocity > mMaxNormalSpeed) { + } else if (m_HIO->mSlip.m.field_0x0 == 2 && mVelocity > mMaxNormalSpeed) { mVelocity = mMaxNormalSpeed; } m34BE = 2; @@ -6693,8 +6693,8 @@ BOOL daPy_lk_c::procSlip_init() { /* 80114B28-80114D2C .text procSlip__9daPy_lk_cFv */ BOOL daPy_lk_c::procSlip() { - f32 dVar5 = cLib_addCalc(&mVelocity, 0.0f, daPy_HIO_slip_c0::m.field_0x18, - daPy_HIO_slip_c0::m.field_0x10, daPy_HIO_slip_c0::m.field_0x14); + f32 dVar5 = cLib_addCalc(&mVelocity, 0.0f, m_HIO->mSlip.m.field_0x18, + m_HIO->mSlip.m.field_0x10, m_HIO->mSlip.m.field_0x14); if (dVar5 <= 0.001f) { if (mStickDistance > 0.05f) { current.angle.y = shape_angle.y + 0x8000; @@ -6709,7 +6709,7 @@ BOOL daPy_lk_c::procSlip() { checkNextMode(0); return true; } else { - if (mVelocity < daPy_HIO_slip_c0::m.field_0x20) { + if (mVelocity < m_HIO->mSlip.m.field_0x20) { resetFootEffect(); } cXyz local_1c; @@ -6739,9 +6739,9 @@ BOOL daPy_lk_c::procSlideFront_init(s16 param_1) { commonProcInit(daPyProc_SLIDE_FRONT_e); m3526 = 8; current.angle.y = param_1; - setSingleMoveAnime(ANM_SLIDEF, daPy_HIO_slide_c0::m.field_0xC, daPy_HIO_slide_c0::m.field_0x10, - daPy_HIO_slide_c0::m.field_0x0, daPy_HIO_slide_c0::m.field_0x14); - mMaxNormalSpeed = daPy_HIO_slide_c0::m.field_0x44; + setSingleMoveAnime(ANM_SLIDEF, m_HIO->mSlide.m.field_0xC, m_HIO->mSlide.m.field_0x10, + m_HIO->mSlide.m.field_0x0, m_HIO->mSlide.m.field_0x14); + mMaxNormalSpeed = m_HIO->mSlide.m.field_0x44; m34BE = 4; dComIfGp_setPlayerStatus1(0, daPyStts1_UNK100_e); return true; @@ -6754,7 +6754,7 @@ BOOL daPy_lk_c::procSlideFront() { s16 iVar3 = cM_atan2s(pfVar2->GetNP()->x, pfVar2->GetNP()->z); cLib_addCalcAngleS(¤t.angle.y, iVar3, 4, 0x1000, 0x400); cLib_addCalcAngleS(&shape_angle.y, current.angle.y, 4, 0x1000, 0x400); - mVelocity += (1.0f + 0.5f * (1.0f - pfVar2->GetNP()->y)) * daPy_HIO_slide_c0::m.field_0x48 * + mVelocity += (1.0f + 0.5f * (1.0f - pfVar2->GetNP()->y)) * m_HIO->mSlide.m.field_0x48 * cM_scos(current.angle.y - iVar3); if (mVelocity > mMaxNormalSpeed) { mVelocity = mMaxNormalSpeed; @@ -6774,9 +6774,9 @@ BOOL daPy_lk_c::procSlideBack_init(s16 param_1) { commonProcInit(daPyProc_SLIDE_BACK_e); m3526 = 8; current.angle.y = param_1; - setSingleMoveAnime(ANM_SLIDEB, daPy_HIO_slide_c0::m.field_0x18, daPy_HIO_slide_c0::m.field_0x1C, - daPy_HIO_slide_c0::m.field_0x2, daPy_HIO_slide_c0::m.field_0x20); - mMaxNormalSpeed = daPy_HIO_slide_c0::m.field_0x44; + setSingleMoveAnime(ANM_SLIDEB, m_HIO->mSlide.m.field_0x18, m_HIO->mSlide.m.field_0x1C, + m_HIO->mSlide.m.field_0x2, m_HIO->mSlide.m.field_0x20); + mMaxNormalSpeed = m_HIO->mSlide.m.field_0x44; m34BE = 3; dComIfGp_setPlayerStatus1(0, daPyStts1_UNK200_e); return true; @@ -6789,7 +6789,7 @@ BOOL daPy_lk_c::procSlideBack() { s16 iVar3 = cM_atan2s(pfVar2->GetNP()->x, pfVar2->GetNP()->z); cLib_addCalcAngleS(¤t.angle.y, iVar3, 4, 0x1000, 0x400); cLib_addCalcAngleS(&shape_angle.y, current.angle.y + 0x8000, 4, 0x1000, 0x400); - mVelocity += (1.0f + 0.5f * (1.0f - pfVar2->GetNP()->y)) * daPy_HIO_slide_c0::m.field_0x48 * + mVelocity += (1.0f + 0.5f * (1.0f - pfVar2->GetNP()->y)) * m_HIO->mSlide.m.field_0x48 * cM_scos(current.angle.y - iVar3); if (mVelocity > mMaxNormalSpeed) { mVelocity = mMaxNormalSpeed; @@ -6804,9 +6804,9 @@ BOOL daPy_lk_c::procSlideBack() { /* 801150B0-80115118 .text procSlideFrontLand_init__9daPy_lk_cFv */ BOOL daPy_lk_c::procSlideFrontLand_init() { commonProcInit(daPyProc_SLIDE_FRONT_LAND_e); - setSingleMoveAnime(ANM_SLIDEFLAND, daPy_HIO_slide_c0::m.field_0x24, - daPy_HIO_slide_c0::m.field_0x28, daPy_HIO_slide_c0::m.field_0x4, - daPy_HIO_slide_c0::m.field_0x30); + setSingleMoveAnime(ANM_SLIDEFLAND, m_HIO->mSlide.m.field_0x24, + m_HIO->mSlide.m.field_0x28, m_HIO->mSlide.m.field_0x4, + m_HIO->mSlide.m.field_0x30); mVelocity *= 0.5f; return true; } @@ -6818,7 +6818,7 @@ BOOL daPy_lk_c::procSlideFrontLand() { current.angle.y = shape_angle.y; checkNextMode(0); } else { - if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_slide_c0::m.field_0x2C) { + if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mSlide.m.field_0x2C) { s16 sVar1 = current.angle.y; current.angle.y = shape_angle.y; if (!checkNextMode(1)) { @@ -6832,9 +6832,9 @@ BOOL daPy_lk_c::procSlideFrontLand() { /* 801151C8-80115220 .text procSlideBackLand_init__9daPy_lk_cFv */ BOOL daPy_lk_c::procSlideBackLand_init() { commonProcInit(daPyProc_SLIDE_BACK_LAND_e); - setSingleMoveAnime(ANM_SLIDEBLAND, daPy_HIO_slide_c0::m.field_0x34, - daPy_HIO_slide_c0::m.field_0x38, daPy_HIO_slide_c0::m.field_0x6, - daPy_HIO_slide_c0::m.field_0x40); + setSingleMoveAnime(ANM_SLIDEBLAND, m_HIO->mSlide.m.field_0x34, + m_HIO->mSlide.m.field_0x38, m_HIO->mSlide.m.field_0x6, + m_HIO->mSlide.m.field_0x40); return true; } @@ -6845,7 +6845,7 @@ BOOL daPy_lk_c::procSlideBackLand() { current.angle.y = shape_angle.y; checkNextMode(0); } else { - if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_slide_c0::m.field_0x3C) { + if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mSlide.m.field_0x3C) { s16 sVar1 = current.angle.y; current.angle.y = shape_angle.y; if (!checkNextMode(1)) { @@ -6859,19 +6859,19 @@ BOOL daPy_lk_c::procSlideBackLand() { /* 801152D0-80115478 .text procFrontRoll_init__9daPy_lk_cFf */ BOOL daPy_lk_c::procFrontRoll_init(f32 param_1) { commonProcInit(daPyProc_FRONT_ROLL_e); - setSingleMoveAnime(ANM_ROLLF, daPy_HIO_roll_c0::m.field_0x8, param_1, - daPy_HIO_roll_c0::m.field_0x0, daPy_HIO_roll_c0::m.field_0x14); - mVelocity = speedF * daPy_HIO_roll_c0::m.field_0x18 + daPy_HIO_roll_c0::m.field_0x1C; + setSingleMoveAnime(ANM_ROLLF, m_HIO->mRoll.m.field_0x8, param_1, + m_HIO->mRoll.m.field_0x0, m_HIO->mRoll.m.field_0x14); + mVelocity = speedF * m_HIO->mRoll.m.field_0x18 + m_HIO->mRoll.m.field_0x1C; if (checkHeavyStateOn()) { - mVelocity *= daPy_HIO_move_c0::m.field_0x80; + mVelocity *= m_HIO->mMove.m.field_0x80; } - if (mVelocity < daPy_HIO_roll_c0::m.field_0x20) { - mVelocity = daPy_HIO_roll_c0::m.field_0x20; + if (mVelocity < m_HIO->mRoll.m.field_0x20) { + mVelocity = m_HIO->mRoll.m.field_0x20; } else { - param_1 = daPy_HIO_roll_c0::m.field_0x1C + - daPy_HIO_move_c0::m.field_0x18 * daPy_HIO_roll_c0::m.field_0x18; + param_1 = m_HIO->mRoll.m.field_0x1C + + m_HIO->mMove.m.field_0x18 * m_HIO->mRoll.m.field_0x18; if (checkHeavyStateOn()) { - param_1 *= daPy_HIO_move_c0::m.field_0x80; + param_1 *= m_HIO->mMove.m.field_0x80; } if (mVelocity > param_1) { mVelocity = param_1; @@ -6879,7 +6879,7 @@ BOOL daPy_lk_c::procFrontRoll_init(f32 param_1) { } current.angle.y = shape_angle.y; if (mAcchCir[0].ChkWallHit() && - cLib_distanceAngleS(current.angle.y + 0x8000, mAcchCir[0].GetWallAngleY()) <= daPy_HIO_roll_c0::m.field_0x4) + cLib_distanceAngleS(current.angle.y + 0x8000, mAcchCir[0].GetWallAngleY()) <= m_HIO->mRoll.m.field_0x4) { mProcVar0.m3570 = 0; } else { @@ -6902,22 +6902,22 @@ BOOL daPy_lk_c::procFrontRoll() { } if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { if (mStickDistance <= 0.05f) { - mVelocity -= daPy_HIO_roll_c0::m.field_0x20; + mVelocity -= m_HIO->mRoll.m.field_0x20; } checkNextMode(0); } else { - if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_roll_c0::m.field_0x10) { + if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mRoll.m.field_0x10) { checkNextMode(1); } else { - if (speedF >= daPy_HIO_roll_c0::m.field_0x3C && + if (speedF >= m_HIO->mRoll.m.field_0x3C && !checkNoResetFlg1(daPyFlg1_UNK100000)) { if (checkNoResetFlg0(daPyFlg0_UNK8) || (mProcVar0.m3570 != 0 && mAcch.ChkWallHit() && mAcchCir[0].ChkWallHit() && cLib_distanceAngleS(current.angle.y + 0x8000, mAcchCir[0].GetWallAngleY()) <= - daPy_HIO_roll_c0::m.field_0x4 && - mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= daPy_HIO_roll_c0::m.field_0x34 && - mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() <= daPy_HIO_roll_c0::m.field_0x38)) + m_HIO->mRoll.m.field_0x4 && + mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= m_HIO->mRoll.m.field_0x34 && + mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() <= m_HIO->mRoll.m.field_0x38)) { if (!checkNoResetFlg0(daPyFlg0_UNK8)) { m3620 = dComIfG_Bgsp()->GetMtrlSndId(mAcchCir[0]); @@ -6933,10 +6933,10 @@ BOOL daPy_lk_c::procFrontRoll() { /* 80115628-801157D8 .text procFrontRollCrash_init__9daPy_lk_cFv */ BOOL daPy_lk_c::procFrontRollCrash_init() { commonProcInit(daPyProc_FRONT_ROLL_CRASH_e); - setSingleMoveAnime(ANM_ROLLFMIS, 0.0f, daPy_HIO_roll_c0::m.field_0x28, - daPy_HIO_roll_c0::m.field_0x2, daPy_HIO_roll_c0::m.field_0x2C); - mVelocity = speedF * daPy_HIO_roll_c0::m.field_0x40; - speed.y = daPy_HIO_roll_c0::m.field_0x44; + setSingleMoveAnime(ANM_ROLLFMIS, 0.0f, m_HIO->mRoll.m.field_0x28, + m_HIO->mRoll.m.field_0x2, m_HIO->mRoll.m.field_0x2C); + mVelocity = speedF * m_HIO->mRoll.m.field_0x40; + speed.y = m_HIO->mRoll.m.field_0x44; offNoResetFlg0(daPyFlg0_UNK8); current.angle.y += 0x8000; dComIfGp_getVibration().StartShock(5, -0x31, cXyz(0.0f, 1.0f, 0.0f)); @@ -6960,14 +6960,14 @@ BOOL daPy_lk_c::procFrontRollCrash() { if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { checkNextMode(0); } else { - if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_roll_c0::m.field_0x30) { + if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mRoll.m.field_0x30) { checkNextMode(1); } } } if (mAcch.ChkGroundHit() && checkModeFlg(ModeFlg_MIDAIR)) { mVelocity = 0.0f; - mFrameCtrlUnder[UNDER_MOVE0_e].setRate(daPy_HIO_roll_c0::m.field_0x24); + mFrameCtrlUnder[UNDER_MOVE0_e].setRate(m_HIO->mRoll.m.field_0x24); voiceStart(9); offModeFlg(ModeFlg_MIDAIR); onModeFlg(ModeFlg_00008000); @@ -6978,9 +6978,9 @@ BOOL daPy_lk_c::procFrontRollCrash() { /* 801158AC-8011590C .text procNockBackEnd_init__9daPy_lk_cFv */ BOOL daPy_lk_c::procNockBackEnd_init() { commonProcInit(daPyProc_NOCK_BACK_END_e); - setSingleMoveAnime(ANM_ROLLFMIS, daPy_HIO_nockback_c0::m.field_0x2C, - daPy_HIO_nockback_c0::m.field_0x30, daPy_HIO_nockback_c0::m.field_0x4, - daPy_HIO_nockback_c0::m.field_0x34); + setSingleMoveAnime(ANM_ROLLFMIS, m_HIO->mNockback.m.field_0x2C, + m_HIO->mNockback.m.field_0x30, m_HIO->mNockback.m.field_0x4, + m_HIO->mNockback.m.field_0x34); mVelocity = 0.0f; return true; } @@ -6990,7 +6990,7 @@ BOOL daPy_lk_c::procNockBackEnd() { if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { checkNextMode(0); } else { - if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_nockback_c0::m.field_0x38) { + if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mNockback.m.field_0x38) { checkNextMode(1); } } @@ -7007,11 +7007,11 @@ BOOL daPy_lk_c::procSideRoll_init() { } else { dVar2 = ANM_MROLLR; } - setSingleMoveAnime(dVar2, daPy_HIO_fall_c0::m.field_0x3C, daPy_HIO_fall_c0::m.field_0x40, - daPy_HIO_fall_c0::m.field_0x8, daPy_HIO_fall_c0::m.field_0x48); - mVelocity = daPy_HIO_fall_c0::m.field_0x4C; + setSingleMoveAnime(dVar2, m_HIO->mFall.m.field_0x3C, m_HIO->mFall.m.field_0x40, + m_HIO->mFall.m.field_0x8, m_HIO->mFall.m.field_0x48); + mVelocity = m_HIO->mFall.m.field_0x4C; if (checkHeavyStateOn()) { - mVelocity *= daPy_HIO_move_c0::m.field_0x80; + mVelocity *= m_HIO->mMove.m.field_0x80; } m34BE = 4; return true; @@ -7033,7 +7033,7 @@ BOOL daPy_lk_c::procSideRoll() { if (frameCtrl.checkPass(10.0f)) { endFlameDamageEmitter(); } else { - if (frameCtrl.getFrame() > daPy_HIO_fall_c0::m.field_0x44) { + if (frameCtrl.getFrame() > m_HIO->mFall.m.field_0x44) { sVar1 = current.angle.y; dVar3 = mVelocity; current.angle.y = shape_angle.y; @@ -7056,16 +7056,16 @@ BOOL daPy_lk_c::procBackJump_init() { } commonProcInit(daPyProc_BACK_JUMP_e); if (checkHeavyStateOn()) { - mVelocity = 0.5f * daPy_HIO_backJump_c0::m.field_0x10; - fVar1 = 1.5f * daPy_HIO_backJump_c0::m.field_0x4; + mVelocity = 0.5f * m_HIO->mBackJump.m.field_0x10; + fVar1 = 1.5f * m_HIO->mBackJump.m.field_0x4; } else { - mVelocity = daPy_HIO_backJump_c0::m.field_0x10; - fVar1 = daPy_HIO_backJump_c0::m.field_0x4; + mVelocity = m_HIO->mBackJump.m.field_0x10; + fVar1 = m_HIO->mBackJump.m.field_0x4; } - setSingleMoveAnime(ANM_ROLLB, fVar1, daPy_HIO_backJump_c0::m.field_0x8, - daPy_HIO_backJump_c0::m.field_0x0, daPy_HIO_backJump_c0::m.field_0xC); - speed.y = daPy_HIO_backJump_c0::m.field_0x14; - gravity = daPy_HIO_backJump_c0::m.field_0x18; + setSingleMoveAnime(ANM_ROLLB, fVar1, m_HIO->mBackJump.m.field_0x8, + m_HIO->mBackJump.m.field_0x0, m_HIO->mBackJump.m.field_0xC); + speed.y = m_HIO->mBackJump.m.field_0x14; + gravity = m_HIO->mBackJump.m.field_0x18; current.angle.y = shape_angle.y + 0x8000; voiceStart(7); return true; @@ -7079,8 +7079,8 @@ BOOL daPy_lk_c::procBackJump() { if (checkFanGlideProc(0)) { return true; } - if (current.pos.y < m3688.y - daPy_HIO_backJump_c0::m.field_0x1C) { - procFall_init(2, daPy_HIO_backJump_c0::m.field_0x20); + if (current.pos.y < m3688.y - m_HIO->mBackJump.m.field_0x1C) { + procFall_init(2, m_HIO->mBackJump.m.field_0x20); } } checkItemChangeFromButton(); @@ -7091,9 +7091,9 @@ BOOL daPy_lk_c::procBackJump() { BOOL daPy_lk_c::procBackJumpLand_init() { commonProcInit(daPyProc_BACK_JUMP_LAND_e); mVelocity = 0.0f; - setSingleMoveAnime(ANM_ROLLBLAND, daPy_HIO_backJump_c0::m.field_0x24, - daPy_HIO_backJump_c0::m.field_0x28, daPy_HIO_backJump_c0::m.field_0x2, - daPy_HIO_backJump_c0::m.field_0x2C); + setSingleMoveAnime(ANM_ROLLBLAND, m_HIO->mBackJump.m.field_0x24, + m_HIO->mBackJump.m.field_0x28, m_HIO->mBackJump.m.field_0x2, + m_HIO->mBackJump.m.field_0x2C); m34BE = 3; onResetFlg0(daPyRFlg0_RIGHT_FOOT_ON_GROUND); onResetFlg0(daPyRFlg0_LEFT_FOOT_ON_GROUND); @@ -7120,7 +7120,7 @@ BOOL daPy_lk_c::procBackJumpLand() { } else { checkNextMode(0); } - } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_backJump_c0::m.field_0x30) { + } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mBackJump.m.field_0x30) { checkNextMode(1); } else { if (mProcVar0.m3570 != 0) { @@ -7147,18 +7147,18 @@ BOOL daPy_lk_c::procAutoJump_init() { m3688 = current.pos; m35F0 = m3688.y; m35F4 = m3688.y; - setSingleMoveAnime(ANM_JMPST, daPy_HIO_autoJump_c0::m.field_0x20, - daPy_HIO_autoJump_c0::m.field_0x2C, daPy_HIO_autoJump_c0::m.field_0x2, - daPy_HIO_autoJump_c0::m.field_0x30); - if (speedF > daPy_HIO_move_c0::m.field_0x18) { - speedF = daPy_HIO_move_c0::m.field_0x18; - } else if (speedF < daPy_HIO_autoJump_c0::m.field_0x14) { - speedF = daPy_HIO_autoJump_c0::m.field_0x14; + setSingleMoveAnime(ANM_JMPST, m_HIO->mAutoJump.m.field_0x20, + m_HIO->mAutoJump.m.field_0x2C, m_HIO->mAutoJump.m.field_0x2, + m_HIO->mAutoJump.m.field_0x30); + if (speedF > m_HIO->mMove.m.field_0x18) { + speedF = m_HIO->mMove.m.field_0x18; + } else if (speedF < m_HIO->mAutoJump.m.field_0x14) { + speedF = m_HIO->mAutoJump.m.field_0x14; } mVelocity = - speedF * cM_scos(daPy_HIO_autoJump_c0::m.field_0x6) * daPy_HIO_autoJump_c0::m.field_0x18; + speedF * cM_scos(m_HIO->mAutoJump.m.field_0x6) * m_HIO->mAutoJump.m.field_0x18; speed.y = - speedF * cM_ssin(daPy_HIO_autoJump_c0::m.field_0x6) * daPy_HIO_autoJump_c0::m.field_0x18; + speedF * cM_ssin(m_HIO->mAutoJump.m.field_0x6) * m_HIO->mAutoJump.m.field_0x18; mProcVar0.m3570 = 0; m3700 = cXyz::Zero; m34C2 = 1; @@ -7175,22 +7175,22 @@ BOOL daPy_lk_c::procAutoJump_init() { BOOL daPy_lk_c::procAutoJump() { if (m34D0 == 0) { if (mStickDistance > 0.05f && getDirectionFromCurrentAngle() == DIR_BACKWARD) { - cLib_chaseF(&mVelocity, 0.0f, (daPy_HIO_autoJump_c0::m.field_0x3C * mStickDistance)); + cLib_chaseF(&mVelocity, 0.0f, (m_HIO->mAutoJump.m.field_0x3C * mStickDistance)); } else if (mStickDistance <= 0.05f) { - cLib_chaseF(&mVelocity, 0.0f, (0.1f * daPy_HIO_autoJump_c0::m.field_0x3C)); + cLib_chaseF(&mVelocity, 0.0f, (0.1f * m_HIO->mAutoJump.m.field_0x3C)); } else { - cLib_chaseF(&mVelocity, daPy_HIO_move_c0::m.field_0x18, - daPy_HIO_autoJump_c0::m.field_0x1C); + cLib_chaseF(&mVelocity, m_HIO->mMove.m.field_0x18, + m_HIO->mAutoJump.m.field_0x1C); } } else { - cLib_chaseF(&mVelocity, daPy_HIO_move_c0::m.field_0x18, daPy_HIO_autoJump_c0::m.field_0x1C); + cLib_chaseF(&mVelocity, m_HIO->mMove.m.field_0x18, m_HIO->mAutoJump.m.field_0x1C); } checkNextActionItemFly(); if (checkJumpFlower() || checkJumpRideShip()) { return true; } if (mAcch.ChkGroundHit()) { - return changeLandProc(daPy_HIO_autoJump_c0::m.field_0x24); + return changeLandProc(m_HIO->mAutoJump.m.field_0x24); } if (checkFanGlideProc(0)) { return true; @@ -7215,7 +7215,7 @@ BOOL daPy_lk_c::procAutoJump() { m34D0 = 0; } if (m34D0 == 0) { - gravity = daPy_HIO_autoJump_c0::m.field_0xC; + gravity = m_HIO->mAutoJump.m.field_0xC; } if (speed.y > 0.0f) { speed.y -= 0.5f; @@ -7229,9 +7229,9 @@ BOOL daPy_lk_c::procAutoJump() { { speed.y = 5.0f; gravity = 0.0f; - m34D0 = daPy_HIO_autoJump_c0::m.field_0x8; + m34D0 = m_HIO->mAutoJump.m.field_0x8; } - setSingleMoveAnime(ANM_JMPEDS, 0.0f, 0.0f, -1, daPy_HIO_autoJump_c0::m.field_0x38); + setSingleMoveAnime(ANM_JMPEDS, 0.0f, 0.0f, -1, m_HIO->mAutoJump.m.field_0x38); m34C2 = 2; mProcVar0.m3570 = 2; offModeFlg(ModeFlg_00000400); @@ -7249,11 +7249,11 @@ BOOL daPy_lk_c::procLand_init(f32 param_1, int param_2) { commonProcInit(daPyProc_LAND_e); mVelocity = 0.0f; if (param_2 != 0) { - setSingleMoveAnime(ANM_JMPEDS, param_1, daPy_HIO_fan_c0::m.field_0x54, - daPy_HIO_fan_c0::m.field_0x6, daPy_HIO_fan_c0::m.field_0x58); + setSingleMoveAnime(ANM_JMPEDS, param_1, m_HIO->mItem.mFan.m.field_0x54, + m_HIO->mItem.mFan.m.field_0x6, m_HIO->mItem.mFan.m.field_0x58); } else { - setSingleMoveAnime(ANM_JMPEDS, param_1, daPy_HIO_autoJump_c0::m.field_0x28, - daPy_HIO_autoJump_c0::m.field_0x4, daPy_HIO_autoJump_c0::m.field_0x34); + setSingleMoveAnime(ANM_JMPEDS, param_1, m_HIO->mAutoJump.m.field_0x28, + m_HIO->mAutoJump.m.field_0x4, m_HIO->mAutoJump.m.field_0x34); } m34BE = 3; onResetFlg0(daPyRFlg0_RIGHT_FOOT_ON_GROUND); @@ -7280,7 +7280,7 @@ BOOL daPy_lk_c::procLand() { } else { checkNextMode(0); } - } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_autoJump_c0::m.field_0x40) { + } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mAutoJump.m.field_0x40) { checkNextMode(1); } return true; @@ -7304,14 +7304,14 @@ BOOL daPy_lk_c::procLandDamage_init(int param_1) { commonProcInit(daPyProc_LAND_DAMAGE_e); mVelocity = 0.0f; if (param_1 == 0) { - m34D0 = daPy_HIO_fall_c0::m.field_0xC; + m34D0 = m_HIO->mFall.m.field_0xC; offModeFlg(ModeFlg_DAMAGE); } else { - m34D0 = daPy_HIO_fall_c0::m.field_0x2; - mDamageWaitTimer = daPy_HIO_dam_c0::m.field_0x0; + m34D0 = m_HIO->mFall.m.field_0x2; + mDamageWaitTimer = m_HIO->mDam.m.field_0x0; } - setSingleMoveAnime(ANM_LANDDAMA, daPy_HIO_fall_c0::m.field_0x1C, daPy_HIO_fall_c0::m.field_0x20, - daPy_HIO_fall_c0::m.field_0x4, daPy_HIO_fall_c0::m.field_0x24); + setSingleMoveAnime(ANM_LANDDAMA, m_HIO->mFall.m.field_0x1C, m_HIO->mFall.m.field_0x20, + m_HIO->mFall.m.field_0x4, m_HIO->mFall.m.field_0x24); mProcVar0.m3570 = 0; seStartOnlyReverb(JA_SE_LK_FALL_DAMAGE); voiceStart(13); @@ -7325,7 +7325,7 @@ BOOL daPy_lk_c::procLandDamage() { if (mProcVar0.m3570 != 0) { if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { checkNextMode(0); - } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_fall_c0::m.field_0x30) { + } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mFall.m.field_0x30) { checkNextMode(1); } } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { @@ -7334,12 +7334,12 @@ BOOL daPy_lk_c::procLandDamage() { } else { f32 fVar1; if (checkModeFlg(ModeFlg_DAMAGE)) { - fVar1 = daPy_HIO_fall_c0::m.field_0x28; + fVar1 = m_HIO->mFall.m.field_0x28; } else { - fVar1 = daPy_HIO_fall_c0::m.field_0x50; + fVar1 = m_HIO->mFall.m.field_0x50; } - setSingleMoveAnime(ANM_LANDDAMAST, fVar1, daPy_HIO_fall_c0::m.field_0x2C, - daPy_HIO_fall_c0::m.field_0x6, daPy_HIO_fall_c0::m.field_0x34); + setSingleMoveAnime(ANM_LANDDAMAST, fVar1, m_HIO->mFall.m.field_0x2C, + m_HIO->mFall.m.field_0x6, m_HIO->mFall.m.field_0x34); mProcVar0.m3570 = 1; } } @@ -7419,7 +7419,7 @@ BOOL daPy_lk_c::procFall() { return true; } if (mAcch.ChkGroundHit()) { - changeLandProc(daPy_HIO_autoJump_c0::m.field_0x24); + changeLandProc(m_HIO->mAutoJump.m.field_0x24); } else { if (checkFanGlideProc(0)) { return true; @@ -7455,7 +7455,7 @@ BOOL daPy_lk_c::procSlowFall_init() { commonProcInit(daPyProc_SLOW_FALL_e); maxFallSpeed = -20.0f; mVelocity = 0.0f; - setSingleMoveAnime(ANM_MSTEPOVER_JMPED, 0.0f, 0.0f, -1, daPy_HIO_basic_c0::m.field_0xC); + setSingleMoveAnime(ANM_MSTEPOVER_JMPED, 0.0f, 0.0f, -1, m_HIO->mBasic.m.field_0xC); mFrameCtrlUnder[UNDER_MOVE0_e].setFrame(mFrameCtrlUnder[UNDER_MOVE0_e].getEnd() - 0.001f); mAnmRatioUnder[UNDER_MOVE0_e].getAnmTransform()->setFrame( mFrameCtrlUnder[UNDER_MOVE0_e].getFrame()); @@ -7468,7 +7468,7 @@ BOOL daPy_lk_c::procSlowFall() { cLib_chaseF(&maxFallSpeed, -5.0f, 1.0f); } if (mAcch.ChkGroundHit()) { - procLand_init(daPy_HIO_fan_c0::m.field_0x50, 1); + procLand_init(m_HIO->mItem.mFan.m.field_0x50, 1); } return true; } @@ -7476,16 +7476,16 @@ BOOL daPy_lk_c::procSlowFall() { /* 80116D3C-80116EB4 .text procSmallJump_init__9daPy_lk_cFi */ BOOL daPy_lk_c::procSmallJump_init(int param_1) { commonProcInit(daPyProc_SMALL_JUMP_e); - setSingleMoveAnime(ANM_JMPST, daPy_HIO_smallJump_c0::m.field_0x4, - daPy_HIO_smallJump_c0::m.field_0x8, daPy_HIO_smallJump_c0::m.field_0x0, - daPy_HIO_smallJump_c0::m.field_0xC); + setSingleMoveAnime(ANM_JMPST, m_HIO->mSmallJump.m.field_0x4, + m_HIO->mSmallJump.m.field_0x8, m_HIO->mSmallJump.m.field_0x0, + m_HIO->mSmallJump.m.field_0xC); if (param_1 == 0) { - mVelocity = daPy_HIO_smallJump_c0::m.field_0x10; + mVelocity = m_HIO->mSmallJump.m.field_0x10; speed.y = std::sqrtf( - -gravity * ((m3724.y - current.pos.y) + daPy_HIO_smallJump_c0::m.field_0x14) * 2.0f); + -gravity * ((m3724.y - current.pos.y) + m_HIO->mSmallJump.m.field_0x14) * 2.0f); mProcVar0.m3570 = 2; } else { - mVelocity = 2.0f * daPy_HIO_smallJump_c0::m.field_0x10; + mVelocity = 2.0f * m_HIO->mSmallJump.m.field_0x10; speed.y = 20.0f; mProcVar0.m3570 = 0; } @@ -7499,11 +7499,11 @@ BOOL daPy_lk_c::procSmallJump_init(int param_1) { /* 80116EB4-80116F54 .text procSmallJump__9daPy_lk_cFv */ BOOL daPy_lk_c::procSmallJump() { if (mAcch.ChkGroundHit()) { - changeLandProc(daPy_HIO_autoJump_c0::m.field_0x24); + changeLandProc(m_HIO->mAutoJump.m.field_0x24); } else if (checkFanGlideProc(0)) { return true; } else if (speed.y < -gravity) { - procFall_init(mProcVar0.m3570, daPy_HIO_smallJump_c0::m.field_0x18); + procFall_init(mProcVar0.m3570, m_HIO->mSmallJump.m.field_0x18); setTextureAnime(0x37, 0); } return true; @@ -7512,8 +7512,8 @@ BOOL daPy_lk_c::procSmallJump() { /* 80116F54-80116FEC .text procVerticalJump_init__9daPy_lk_cFv */ BOOL daPy_lk_c::procVerticalJump_init() { commonProcInit(daPyProc_VERTICAL_JUMP_e); - setSingleMoveAnime(ANM_VJMP, daPy_HIO_wallCatch_c0::m.field_0x3C, 0.0f, - daPy_HIO_wallCatch_c0::m.field_0x6, daPy_HIO_wallCatch_c0::m.field_0x40); + setSingleMoveAnime(ANM_VJMP, m_HIO->mWallCatch.m.field_0x3C, 0.0f, + m_HIO->mWallCatch.m.field_0x6, m_HIO->mWallCatch.m.field_0x40); m34D0 = 0; m34D4 = m352C + 0x8000; if (mFrontWallType == 9) { @@ -7564,22 +7564,22 @@ BOOL daPy_lk_c::procDamage_init() { f32 f31 = cM_ssin(shape_angle.y); f32 f30 = cM_scos(shape_angle.y); commonProcInit(daPyProc_DAMAGE_e); - mDamageWaitTimer = daPy_HIO_dam_c0::m.field_0x0; + mDamageWaitTimer = m_HIO->mDam.m.field_0x0; cXyz local_54(damage_vec->z * -f31 + damage_vec->x * f30, damage_vec->y, damage_vec->z * f30 + damage_vec->x * f31); m34D4 = cM_atan2s(local_54.z, local_54.y); m34D6 = cM_atan2s(-local_54.x, std::sqrtf(local_54.y * local_54.y + local_54.z * local_54.z)); - if (m34D4 > daPy_HIO_damage_c0::m.field_0x2) { - m34D4 = daPy_HIO_damage_c0::m.field_0x2; + if (m34D4 > m_HIO->mDam.mDamage.m.field_0x2) { + m34D4 = m_HIO->mDam.mDamage.m.field_0x2; } else { - if (m34D4 < -daPy_HIO_damage_c0::m.field_0x2) { - m34D4 = -daPy_HIO_damage_c0::m.field_0x2; + if (m34D4 < -m_HIO->mDam.mDamage.m.field_0x2) { + m34D4 = -m_HIO->mDam.mDamage.m.field_0x2; } } - if (m34D6 > daPy_HIO_damage_c0::m.field_0x2) { - m34D6 = daPy_HIO_damage_c0::m.field_0x2; + if (m34D6 > m_HIO->mDam.mDamage.m.field_0x2) { + m34D6 = m_HIO->mDam.mDamage.m.field_0x2; } else { - if (m34D6 < -daPy_HIO_damage_c0::m.field_0x2) { - m34D6 = -daPy_HIO_damage_c0::m.field_0x2; + if (m34D6 < -m_HIO->mDam.mDamage.m.field_0x2) { + m34D6 = -m_HIO->mDam.mDamage.m.field_0x2; } } int direction = getDirectionFromAngle(cM_atan2s(local_54.x, local_54.z)); @@ -7593,8 +7593,8 @@ BOOL daPy_lk_c::procDamage_init() { } else { dVar2 = ANM_DAMB; } - setSingleMoveAnime(dVar2, daPy_HIO_damage_c0::m.field_0x14, daPy_HIO_damage_c0::m.field_0x18, - daPy_HIO_damage_c0::m.field_0x0, daPy_HIO_damage_c0::m.field_0x8); + setSingleMoveAnime(dVar2, m_HIO->mDam.mDamage.m.field_0x14, m_HIO->mDam.mDamage.m.field_0x18, + m_HIO->mDam.mDamage.m.field_0x0, m_HIO->mDam.mDamage.m.field_0x8); current.angle.y = cM_atan2s(damage_vec->x, damage_vec->z); if (dVar2 != ANM_DAMR) { m34BE = 2; @@ -7603,7 +7603,7 @@ BOOL daPy_lk_c::procDamage_init() { m34BE = 1; } mVelocity = - (daPy_HIO_damage_c0::m.field_0x10 * damage_vec->absXZ()) + daPy_HIO_damage_c0::m.field_0xC; + (m_HIO->mDam.mDamage.m.field_0x10 * damage_vec->absXZ()) + m_HIO->mDam.mDamage.m.field_0xC; voiceStart(2); seStartOnlyReverb(JA_SE_LK_DAMAGE_NORMAL); mProcVar0.mDamageAnm = dVar2; @@ -7620,11 +7620,11 @@ BOOL daPy_lk_c::procDamage() { f32 dVar5; f32 dVar6; - dVar6 = (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() - daPy_HIO_damage_c0::m.field_0x28); + dVar6 = (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() - m_HIO->mDam.mDamage.m.field_0x28); cLib_addCalcAngleS(&m3566, 0, 4, 0x800, 0x100); if (dVar6 < 0.0f) { uVar4 = ((16384.0f * mFrameCtrlUnder[UNDER_MOVE0_e].getFrame()) / - daPy_HIO_damage_c0::m.field_0x28); + m_HIO->mDam.mDamage.m.field_0x28); fVar1 = cM_ssin(uVar4); if (uVar4 < 0x2000) { uVar4 = uVar4 << 1; @@ -7634,7 +7634,7 @@ BOOL daPy_lk_c::procDamage() { fVar2 = cM_ssin(uVar4); } else { uVar4 = (16384.0f * (1.0f - (dVar6 / (mFrameCtrlUnder[UNDER_MOVE0_e].getEnd() - - daPy_HIO_damage_c0::m.field_0x28)))); + m_HIO->mDam.mDamage.m.field_0x28)))); fVar1 = 1.0f - cM_scos(uVar4); fVar2 = 1.0f - cM_scos(uVar4 < 0x2000 ? 0 : (s16)((uVar4 - 0x2000) * 2)); } @@ -7644,11 +7644,11 @@ BOOL daPy_lk_c::procDamage() { mBodyAngle.x = m34D4 * fVar2; mBodyAngle.z = m34D6 * fVar2; mBodyAngle.y = 0; - dVar5 = cLib_addCalc(&mVelocity, 0.0f, daPy_HIO_damage_c0::m.field_0x1C, - daPy_HIO_damage_c0::m.field_0x20, daPy_HIO_damage_c0::m.field_0x24); + dVar5 = cLib_addCalc(&mVelocity, 0.0f, m_HIO->mDam.mDamage.m.field_0x1C, + m_HIO->mDam.mDamage.m.field_0x20, m_HIO->mDam.mDamage.m.field_0x24); if (dVar5 <= 0.001f && mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { checkNextMode(0); - } else if (mVelocity < daPy_HIO_damage_c0::m.field_0x2C) { + } else if (mVelocity < m_HIO->mDam.mDamage.m.field_0x2C) { resetFootEffect(); } return true; @@ -7657,9 +7657,9 @@ BOOL daPy_lk_c::procDamage() { /* 801176FC-80117794 .text procPolyDamage_init__9daPy_lk_cFv */ BOOL daPy_lk_c::procPolyDamage_init() { commonProcInit(daPyProc_POLY_DAMAGE_e); - mDamageWaitTimer = daPy_HIO_dam_c0::m.field_0x0; - setSingleMoveAnime(ANM_DAM, daPy_HIO_damage_c0::m.field_0x30, daPy_HIO_damage_c0::m.field_0x34, - daPy_HIO_damage_c0::m.field_0x4, daPy_HIO_damage_c0::m.field_0x38); + mDamageWaitTimer = m_HIO->mDam.m.field_0x0; + setSingleMoveAnime(ANM_DAM, m_HIO->mDam.mDamage.m.field_0x30, m_HIO->mDam.mDamage.m.field_0x34, + m_HIO->mDam.mDamage.m.field_0x4, m_HIO->mDam.mDamage.m.field_0x38); mVelocity = 0.0f; voiceStart(2); seStartOnlyReverb(JA_SE_LK_DAMAGE_NORMAL); @@ -7687,7 +7687,7 @@ BOOL daPy_lk_c::procLargeDamage_init(int param_1, int param_2, s16 param_3, s16 } commonProcInit(daPyProc_LARGE_DAMAGE_e); if (mDemo.getDemoMode() != daPy_demo_c::DEMO_LDAM_e) { - mDamageWaitTimer = daPy_HIO_dam_c0::m.field_0x0; + mDamageWaitTimer = m_HIO->mDam.m.field_0x0; } else { mDamageWaitTimer = 0; } @@ -7748,8 +7748,8 @@ BOOL daPy_lk_c::procLargeDamage_init(int param_1, int param_2, s16 param_3, s16 iVar7 = 0; current.angle.y = shape_angle.y; fVar2 = - ((2.0f * daPy_HIO_huDamage_c0::m.field_0x20) / -daPy_HIO_huDamage_c0::m.field_0x1C) * - daPy_HIO_huDamage_c0::m.field_0x18; + ((2.0f * m_HIO->mDam.mHuDamage.m.field_0x20) / -m_HIO->mDam.mHuDamage.m.field_0x1C) * + m_HIO->mDam.mHuDamage.m.field_0x18; current.pos.x = current.pos.x - fVar2 * cM_ssin(shape_angle.y); current.pos.z = current.pos.z - fVar2 * cM_scos(shape_angle.y); mDamageWaitTimer = 0; @@ -7789,18 +7789,18 @@ BOOL daPy_lk_c::procLargeDamage_init(int param_1, int param_2, s16 param_3, s16 shape_angle.y = current.angle.y + 0x8000; } if (param_2 != 0) { - fVar2 = daPy_HIO_laDamage_c0::m.field_0x14; - gravity = daPy_HIO_laDamage_c0::m.field_0x1C; - mMaxNormalSpeed = daPy_HIO_laDamage_c0::m.field_0x18; + fVar2 = m_HIO->mDam.mLaDamage.m.field_0x14; + gravity = m_HIO->mDam.mLaDamage.m.field_0x1C; + mMaxNormalSpeed = m_HIO->mDam.mLaDamage.m.field_0x18; m34D6 = m34D6 | 8; - m34D8 = daPy_HIO_laDamage_c0::m.field_0x2; - m35A0 = daPy_HIO_laDamage_c0::m.field_0x64; + m34D8 = m_HIO->mDam.mLaDamage.m.field_0x2; + m35A0 = m_HIO->mDam.mLaDamage.m.field_0x64; } else { - fVar2 = daPy_HIO_huDamage_c0::m.field_0x14; - gravity = daPy_HIO_huDamage_c0::m.field_0x1C; - mMaxNormalSpeed = daPy_HIO_huDamage_c0::m.field_0x18; - m34D8 = daPy_HIO_huDamage_c0::m.field_0x2; - m35A0 = daPy_HIO_huDamage_c0::m.field_0x64; + fVar2 = m_HIO->mDam.mHuDamage.m.field_0x14; + gravity = m_HIO->mDam.mHuDamage.m.field_0x1C; + mMaxNormalSpeed = m_HIO->mDam.mHuDamage.m.field_0x18; + m34D8 = m_HIO->mDam.mHuDamage.m.field_0x2; + m35A0 = m_HIO->mDam.mHuDamage.m.field_0x64; } setSingleMoveAnime(mProcVar0.mDamageAnm, 1.0f, 0.0f, -1, fVar2); if (param_1 < 0) { @@ -7814,19 +7814,19 @@ BOOL daPy_lk_c::procLargeDamage_init(int param_1, int param_2, s16 param_3, s16 speed.y = fVar2; } else { if (param_2 != 0) { - mVelocity = daPy_HIO_laDamage_c0::m.field_0x18; - speed.y = daPy_HIO_laDamage_c0::m.field_0x20; + mVelocity = m_HIO->mDam.mLaDamage.m.field_0x18; + speed.y = m_HIO->mDam.mLaDamage.m.field_0x20; } else { - mVelocity = daPy_HIO_huDamage_c0::m.field_0x18; - speed.y = daPy_HIO_huDamage_c0::m.field_0x20; + mVelocity = m_HIO->mDam.mHuDamage.m.field_0x18; + speed.y = m_HIO->mDam.mHuDamage.m.field_0x20; } } } } else { if (param_2 != 0) { - mVelocity = daPy_HIO_laDamage_c0::m.field_0x64; + mVelocity = m_HIO->mDam.mLaDamage.m.field_0x64; } else { - mVelocity = daPy_HIO_huDamage_c0::m.field_0x64; + mVelocity = m_HIO->mDam.mHuDamage.m.field_0x64; } current.pos.x = current.pos.x + 35.0f * cM_ssin(current.angle.y); current.pos.z = current.pos.z + 35.0f * cM_scos(current.angle.y); @@ -7848,8 +7848,8 @@ BOOL daPy_lk_c::procLargeDamage() { if ((int)m34D0 > 0) { m34D0--; if (m34D0 == 0) { - mVelocity = daPy_HIO_laDamage_c0::m.field_0x18; - speed.y = daPy_HIO_laDamage_c0::m.field_0x20; + mVelocity = m_HIO->mDam.mLaDamage.m.field_0x18; + speed.y = m_HIO->mDam.mLaDamage.m.field_0x20; } else { return true; } @@ -7924,7 +7924,7 @@ BOOL daPy_lk_c::procLargeDamageUp_init(int param_1, int param_2, s16 param_3, s1 dVar4 = ANM_DAMFBUP; dVar6 = 7.0f; sVar3 = -1; - dVar5 = daPy_HIO_laDamage_c0::m.field_0x40; + dVar5 = m_HIO->mDam.mLaDamage.m.field_0x40; m35A0 = 36.0f; if (param_1 == -1) { m34D0 = 0x1e; @@ -7937,9 +7937,9 @@ BOOL daPy_lk_c::procLargeDamageUp_init(int param_1, int param_2, s16 param_3, s1 dVar4 = ANM_DAMFBUP; dVar7 = 0.0f; dVar6 = 7.0f; - sVar3 = daPy_HIO_huDamage_c0::m.field_0x6; - dVar5 = daPy_HIO_huDamage_c0::m.field_0x40; - m35A0 = daPy_HIO_huDamage_c0::m.field_0x3C; + sVar3 = m_HIO->mDam.mHuDamage.m.field_0x6; + dVar5 = m_HIO->mDam.mHuDamage.m.field_0x40; + m35A0 = m_HIO->mDam.mHuDamage.m.field_0x3C; if (param_1 == -4) { m34D0 = 0x28; } else { @@ -7957,62 +7957,62 @@ BOOL daPy_lk_c::procLargeDamageUp_init(int param_1, int param_2, s16 param_3, s1 if (param_1 == ANM_DAMFB) { dVar4 = ANM_DAMFBUP; if (param_2 != 0) { - dVar7 = daPy_HIO_laDamage_c0::m.field_0x34; - dVar6 = daPy_HIO_laDamage_c0::m.field_0x38; - sVar3 = daPy_HIO_laDamage_c0::m.field_0x6; - dVar5 = daPy_HIO_laDamage_c0::m.field_0x40; - m35A0 = daPy_HIO_laDamage_c0::m.field_0x3C; + dVar7 = m_HIO->mDam.mLaDamage.m.field_0x34; + dVar6 = m_HIO->mDam.mLaDamage.m.field_0x38; + sVar3 = m_HIO->mDam.mLaDamage.m.field_0x6; + dVar5 = m_HIO->mDam.mLaDamage.m.field_0x40; + m35A0 = m_HIO->mDam.mLaDamage.m.field_0x3C; } else { - dVar7 = daPy_HIO_huDamage_c0::m.field_0x34; - dVar6 = daPy_HIO_huDamage_c0::m.field_0x38; - sVar3 = daPy_HIO_huDamage_c0::m.field_0x6; - dVar5 = daPy_HIO_huDamage_c0::m.field_0x40; - m35A0 = daPy_HIO_huDamage_c0::m.field_0x3C; + dVar7 = m_HIO->mDam.mHuDamage.m.field_0x34; + dVar6 = m_HIO->mDam.mHuDamage.m.field_0x38; + sVar3 = m_HIO->mDam.mHuDamage.m.field_0x6; + dVar5 = m_HIO->mDam.mHuDamage.m.field_0x40; + m35A0 = m_HIO->mDam.mHuDamage.m.field_0x3C; } } else if (param_1 == ANM_DAMFL) { dVar4 = ANM_DAMFLUP; if (param_2 != 0) { - dVar7 = daPy_HIO_laDamage_c0::m.field_0x44; - dVar6 = daPy_HIO_laDamage_c0::m.field_0x48; - sVar3 = daPy_HIO_laDamage_c0::m.field_0x8; - dVar5 = daPy_HIO_laDamage_c0::m.field_0x50; - m35A0 = daPy_HIO_laDamage_c0::m.field_0x4C; + dVar7 = m_HIO->mDam.mLaDamage.m.field_0x44; + dVar6 = m_HIO->mDam.mLaDamage.m.field_0x48; + sVar3 = m_HIO->mDam.mLaDamage.m.field_0x8; + dVar5 = m_HIO->mDam.mLaDamage.m.field_0x50; + m35A0 = m_HIO->mDam.mLaDamage.m.field_0x4C; } else { - dVar7 = daPy_HIO_huDamage_c0::m.field_0x44; - dVar6 = daPy_HIO_huDamage_c0::m.field_0x48; - sVar3 = daPy_HIO_huDamage_c0::m.field_0x8; - dVar5 = daPy_HIO_huDamage_c0::m.field_0x50; - m35A0 = daPy_HIO_huDamage_c0::m.field_0x4C; + dVar7 = m_HIO->mDam.mHuDamage.m.field_0x44; + dVar6 = m_HIO->mDam.mHuDamage.m.field_0x48; + sVar3 = m_HIO->mDam.mHuDamage.m.field_0x8; + dVar5 = m_HIO->mDam.mHuDamage.m.field_0x50; + m35A0 = m_HIO->mDam.mHuDamage.m.field_0x4C; } } else if (param_1 == ANM_DAMFR) { dVar4 = ANM_DAMFRUP; if (param_2 != 0) { - dVar7 = daPy_HIO_laDamage_c0::m.field_0x54; - dVar6 = daPy_HIO_laDamage_c0::m.field_0x58; - sVar3 = daPy_HIO_laDamage_c0::m.field_0xA; - dVar5 = daPy_HIO_laDamage_c0::m.field_0x60; - m35A0 = daPy_HIO_laDamage_c0::m.field_0x5C; + dVar7 = m_HIO->mDam.mLaDamage.m.field_0x54; + dVar6 = m_HIO->mDam.mLaDamage.m.field_0x58; + sVar3 = m_HIO->mDam.mLaDamage.m.field_0xA; + dVar5 = m_HIO->mDam.mLaDamage.m.field_0x60; + m35A0 = m_HIO->mDam.mLaDamage.m.field_0x5C; } else { - dVar7 = daPy_HIO_huDamage_c0::m.field_0x54; - dVar6 = daPy_HIO_huDamage_c0::m.field_0x58; - sVar3 = daPy_HIO_huDamage_c0::m.field_0xA; - dVar5 = daPy_HIO_huDamage_c0::m.field_0x60; - m35A0 = daPy_HIO_huDamage_c0::m.field_0x5C; + dVar7 = m_HIO->mDam.mHuDamage.m.field_0x54; + dVar6 = m_HIO->mDam.mHuDamage.m.field_0x58; + sVar3 = m_HIO->mDam.mHuDamage.m.field_0xA; + dVar5 = m_HIO->mDam.mHuDamage.m.field_0x60; + m35A0 = m_HIO->mDam.mHuDamage.m.field_0x5C; } } else { dVar4 = ANM_DAMFFUP; if (param_2 != 0) { - dVar7 = daPy_HIO_laDamage_c0::m.field_0x24; - dVar6 = daPy_HIO_laDamage_c0::m.field_0x28; - sVar3 = daPy_HIO_laDamage_c0::m.field_0x4; - dVar5 = daPy_HIO_laDamage_c0::m.field_0x30; - m35A0 = daPy_HIO_laDamage_c0::m.field_0x2C; + dVar7 = m_HIO->mDam.mLaDamage.m.field_0x24; + dVar6 = m_HIO->mDam.mLaDamage.m.field_0x28; + sVar3 = m_HIO->mDam.mLaDamage.m.field_0x4; + dVar5 = m_HIO->mDam.mLaDamage.m.field_0x30; + m35A0 = m_HIO->mDam.mLaDamage.m.field_0x2C; } else { - dVar7 = daPy_HIO_huDamage_c0::m.field_0x24; - dVar6 = daPy_HIO_huDamage_c0::m.field_0x28; - sVar3 = daPy_HIO_huDamage_c0::m.field_0x4; - dVar5 = daPy_HIO_huDamage_c0::m.field_0x30; - m35A0 = daPy_HIO_huDamage_c0::m.field_0x2C; + dVar7 = m_HIO->mDam.mHuDamage.m.field_0x24; + dVar6 = m_HIO->mDam.mHuDamage.m.field_0x28; + sVar3 = m_HIO->mDam.mHuDamage.m.field_0x4; + dVar5 = m_HIO->mDam.mHuDamage.m.field_0x30; + m35A0 = m_HIO->mDam.mHuDamage.m.field_0x2C; } } } @@ -8082,60 +8082,60 @@ BOOL daPy_lk_c::procLargeDamageWall_init(int param_1, int param_2, s16 param_3, if (param_1 == 0x5c) { mProcVar0.mDamageAnm = ANM_DAMFBUP; if (param_2) { - fVar1 = daPy_HIO_laDamage_c0::m.field_0x74; - fVar2 = daPy_HIO_laDamage_c0::m.field_0x78; - sVar10 = daPy_HIO_laDamage_c0::m.field_0xE; - fVar5 = daPy_HIO_laDamage_c0::m.field_0x7C; + fVar1 = m_HIO->mDam.mLaDamage.m.field_0x74; + fVar2 = m_HIO->mDam.mLaDamage.m.field_0x78; + sVar10 = m_HIO->mDam.mLaDamage.m.field_0xE; + fVar5 = m_HIO->mDam.mLaDamage.m.field_0x7C; } else { - fVar1 = daPy_HIO_huDamage_c0::m.field_0x74; - fVar2 = daPy_HIO_huDamage_c0::m.field_0x78; - sVar10 = daPy_HIO_huDamage_c0::m.field_0xE; - fVar5 = daPy_HIO_huDamage_c0::m.field_0x7C; + fVar1 = m_HIO->mDam.mHuDamage.m.field_0x74; + fVar2 = m_HIO->mDam.mHuDamage.m.field_0x78; + sVar10 = m_HIO->mDam.mHuDamage.m.field_0xE; + fVar5 = m_HIO->mDam.mHuDamage.m.field_0x7C; } m34F2 = sVar3 + -0x4000; m34D0 = 0; } else if (param_1 == 0x59) { mProcVar0.mDamageAnm = ANM_DAMFLUP; if (param_2) { - fVar1 = daPy_HIO_laDamage_c0::m.field_0x80; - fVar2 = daPy_HIO_laDamage_c0::m.field_0x84; - sVar10 = daPy_HIO_laDamage_c0::m.field_0x10; - fVar5 = daPy_HIO_laDamage_c0::m.field_0x88; + fVar1 = m_HIO->mDam.mLaDamage.m.field_0x80; + fVar2 = m_HIO->mDam.mLaDamage.m.field_0x84; + sVar10 = m_HIO->mDam.mLaDamage.m.field_0x10; + fVar5 = m_HIO->mDam.mLaDamage.m.field_0x88; } else { - fVar1 = daPy_HIO_huDamage_c0::m.field_0x80; - fVar2 = daPy_HIO_huDamage_c0::m.field_0x84; - sVar10 = daPy_HIO_huDamage_c0::m.field_0x10; - fVar5 = daPy_HIO_huDamage_c0::m.field_0x88; + fVar1 = m_HIO->mDam.mHuDamage.m.field_0x80; + fVar2 = m_HIO->mDam.mHuDamage.m.field_0x84; + sVar10 = m_HIO->mDam.mHuDamage.m.field_0x10; + fVar5 = m_HIO->mDam.mHuDamage.m.field_0x88; } m34F4 = sVar3 + -0x4000; m34D0 = 1; } else if (param_1 == 0x5a) { mProcVar0.mDamageAnm = ANM_DAMFRUP; if (param_2) { - fVar1 = daPy_HIO_laDamage_c0::m.field_0x8C; - fVar2 = daPy_HIO_laDamage_c0::m.field_0x90; - sVar10 = daPy_HIO_laDamage_c0::m.field_0x12; - fVar5 = daPy_HIO_laDamage_c0::m.field_0x94; + fVar1 = m_HIO->mDam.mLaDamage.m.field_0x8C; + fVar2 = m_HIO->mDam.mLaDamage.m.field_0x90; + sVar10 = m_HIO->mDam.mLaDamage.m.field_0x12; + fVar5 = m_HIO->mDam.mLaDamage.m.field_0x94; } else { - fVar1 = daPy_HIO_huDamage_c0::m.field_0x8C; - fVar2 = daPy_HIO_huDamage_c0::m.field_0x90; - sVar10 = daPy_HIO_huDamage_c0::m.field_0x12; - fVar5 = daPy_HIO_huDamage_c0::m.field_0x94; + fVar1 = m_HIO->mDam.mHuDamage.m.field_0x8C; + fVar2 = m_HIO->mDam.mHuDamage.m.field_0x90; + sVar10 = m_HIO->mDam.mHuDamage.m.field_0x12; + fVar5 = m_HIO->mDam.mHuDamage.m.field_0x94; } m34F4 = 0x4000 - sVar3; m34D0 = 1; } else { mProcVar0.mDamageAnm = ANM_DAMFFUP; if (param_2) { - fVar1 = daPy_HIO_laDamage_c0::m.field_0x68; - fVar2 = daPy_HIO_laDamage_c0::m.field_0x6C; - sVar10 = daPy_HIO_laDamage_c0::m.field_0xC; - fVar5 = daPy_HIO_laDamage_c0::m.field_0x70; + fVar1 = m_HIO->mDam.mLaDamage.m.field_0x68; + fVar2 = m_HIO->mDam.mLaDamage.m.field_0x6C; + sVar10 = m_HIO->mDam.mLaDamage.m.field_0xC; + fVar5 = m_HIO->mDam.mLaDamage.m.field_0x70; } else { - fVar1 = daPy_HIO_huDamage_c0::m.field_0x68; - fVar2 = daPy_HIO_huDamage_c0::m.field_0x6C; - sVar10 = daPy_HIO_huDamage_c0::m.field_0xC; - fVar5 = daPy_HIO_huDamage_c0::m.field_0x70; + fVar1 = m_HIO->mDam.mHuDamage.m.field_0x68; + fVar2 = m_HIO->mDam.mHuDamage.m.field_0x6C; + sVar10 = m_HIO->mDam.mHuDamage.m.field_0xC; + fVar5 = m_HIO->mDam.mHuDamage.m.field_0x70; } m34F2 = 0x4000 - sVar3; m34D0 = 0; @@ -8175,12 +8175,12 @@ BOOL daPy_lk_c::procLavaDamage_init() { gravity = -2.5f; mVelocity = 15.0f + (40.0f * dVar3); speed.y = 32.0f + (36.0f * dVar3); - setSingleMoveAnime(ANM_LAVADAM, daPy_HIO_restart_c0::m.field_0x0, 0.0f, -1, daPy_HIO_restart_c0::m.field_0x4); + setSingleMoveAnime(ANM_LAVADAM, m_HIO->mRestart.m.field_0x0, 0.0f, -1, m_HIO->mRestart.m.field_0x4); m32E4.makeEmitter(dPa_name::ID_SCENE_8078, mpCLModel->getAnmMtx(0), ¤t.pos, NULL); voiceStart(4); seStartMapInfo(JA_SE_LK_FALL_MAGMA); current.angle.y = cM_atan2s(current.pos.x, current.pos.z); - mDamageWaitTimer = daPy_HIO_dam_c0::m.field_0x0; + mDamageWaitTimer = m_HIO->mDam.m.field_0x0; setDamagePoint(-1.0f); return true; @@ -8228,10 +8228,10 @@ BOOL daPy_lk_c::procElecDamage_init(const cXyz* param_1) { } mVelocity = 0.0f; speed.y = 0.0f; - setSingleMoveAnime(ANM_DAMBIRI, daPy_HIO_elecDamage_c0::m.field_0x4, 0.0f, -1, - daPy_HIO_elecDamage_c0::m.field_0x8); - mDamageWaitTimer = daPy_HIO_dam_c0::m.field_0x0; - m34D0 = daPy_HIO_elecDamage_c0::m.field_0x0; + setSingleMoveAnime(ANM_DAMBIRI, m_HIO->mDam.mElecDamage.m.field_0x4, 0.0f, -1, + m_HIO->mDam.mElecDamage.m.field_0x8); + mDamageWaitTimer = m_HIO->mDam.m.field_0x0; + m34D0 = m_HIO->mDam.mElecDamage.m.field_0x0; if (param_1 != 0) { m370C = current.pos - *param_1; m34D6 = 1; @@ -8292,27 +8292,27 @@ BOOL daPy_lk_c::procGuardSlip_init() { iVar4->GetAtSpl() == dCcG_At_Spl_UNK6 || iVar4->GetAtSpl() == dCcG_At_Spl_UNK7)) { - setSingleMoveAnime(dVar5, daPy_HIO_nockback_c0::m.field_0x8, - daPy_HIO_nockback_c0::m.field_0xC, daPy_HIO_nockback_c0::m.field_0x0, - daPy_HIO_nockback_c0::m.field_0x10); - mVelocity = (daPy_HIO_nockback_c0::m.field_0x18 * damage_vec->absXZ()) + - daPy_HIO_nockback_c0::m.field_0x14; - m34D0 = daPy_HIO_nockback_c0::m.field_0x2; - m35A0 = daPy_HIO_nockback_c0::m.field_0x1C; - m35A4 = daPy_HIO_nockback_c0::m.field_0x20; - m35A8 = daPy_HIO_nockback_c0::m.field_0x24; - m35AC = daPy_HIO_nockback_c0::m.field_0x28; + setSingleMoveAnime(dVar5, m_HIO->mNockback.m.field_0x8, + m_HIO->mNockback.m.field_0xC, m_HIO->mNockback.m.field_0x0, + m_HIO->mNockback.m.field_0x10); + mVelocity = (m_HIO->mNockback.m.field_0x18 * damage_vec->absXZ()) + + m_HIO->mNockback.m.field_0x14; + m34D0 = m_HIO->mNockback.m.field_0x2; + m35A0 = m_HIO->mNockback.m.field_0x1C; + m35A4 = m_HIO->mNockback.m.field_0x20; + m35A8 = m_HIO->mNockback.m.field_0x24; + m35AC = m_HIO->mNockback.m.field_0x28; mProcVar0.m3570 = (cM_rnd() < 0.2f) ? 1 : 0; } else { - setSingleMoveAnime(dVar5, daPy_HIO_guard_c0::m.field_0x4, daPy_HIO_guard_c0::m.field_0x8, - daPy_HIO_guard_c0::m.field_0x0, daPy_HIO_guard_c0::m.field_0xC); + setSingleMoveAnime(dVar5, m_HIO->mGuard.m.field_0x4, m_HIO->mGuard.m.field_0x8, + m_HIO->mGuard.m.field_0x0, m_HIO->mGuard.m.field_0xC); mVelocity = - (daPy_HIO_guard_c0::m.field_0x14 * damage_vec->absXZ()) + daPy_HIO_guard_c0::m.field_0x10; - m34D0 = daPy_HIO_guard_c0::m.field_0x2; - m35A0 = daPy_HIO_guard_c0::m.field_0x18; - m35A4 = daPy_HIO_guard_c0::m.field_0x1C; - m35A8 = daPy_HIO_guard_c0::m.field_0x20; - m35AC = daPy_HIO_guard_c0::m.field_0x24; + (m_HIO->mGuard.m.field_0x14 * damage_vec->absXZ()) + m_HIO->mGuard.m.field_0x10; + m34D0 = m_HIO->mGuard.m.field_0x2; + m35A0 = m_HIO->mGuard.m.field_0x18; + m35A4 = m_HIO->mGuard.m.field_0x1C; + m35A8 = m_HIO->mGuard.m.field_0x20; + m35AC = m_HIO->mGuard.m.field_0x24; mProcVar0.m3570 = 0; } if (mEquipItem == dItem_SKULL_HAMMER_e) { @@ -8374,9 +8374,9 @@ BOOL daPy_lk_c::procIceSlipFall_init() { m34D4 = -0x3fff; m34D6 = 1; } - setSingleMoveAnime(mProcVar0.mDamageAnm, 1.0f, 0.0f, -1, daPy_HIO_iceSlip_c0::m.field_0x20); + setSingleMoveAnime(mProcVar0.mDamageAnm, 1.0f, 0.0f, -1, m_HIO->mIceSlip.m.field_0x20); mVelocity = 0.0f; - speed.y = daPy_HIO_iceSlip_c0::m.field_0x1C; + speed.y = m_HIO->mIceSlip.m.field_0x1C; mBodyAngle.x = 0; mBodyAngle.y = 0; mBodyAngle.z = 0; @@ -8393,7 +8393,7 @@ BOOL daPy_lk_c::procIceSlipFall() { } else { psVar1 = &m34F4; } - cLib_chaseAngleS(psVar1, m34D4, daPy_HIO_iceSlip_c0::m.field_0x2); + cLib_chaseAngleS(psVar1, m34D4, m_HIO->mIceSlip.m.field_0x2); if (mAcch.ChkGroundHit() && !changeSlideProc()) { procIceSlipFallUp_init(mProcVar0.m3570, m34F2, m34F4); } @@ -8414,32 +8414,32 @@ BOOL daPy_lk_c::procIceSlipFallUp_init(int param_1, s16 param_2, s16 param_3) { seStartMapInfo(JA_SE_LK_FALL_DOWN); if (param_1 == ANM_DAMFB) { dVar5 = ANM_DAMFBUP; - fVar1 = daPy_HIO_iceSlip_c0::m.field_0x34; - fVar2 = daPy_HIO_iceSlip_c0::m.field_0x38; - sVar6 = daPy_HIO_iceSlip_c0::m.field_0x6; - fVar3 = daPy_HIO_iceSlip_c0::m.field_0x40; - m35A0 = daPy_HIO_iceSlip_c0::m.field_0x3C; + fVar1 = m_HIO->mIceSlip.m.field_0x34; + fVar2 = m_HIO->mIceSlip.m.field_0x38; + sVar6 = m_HIO->mIceSlip.m.field_0x6; + fVar3 = m_HIO->mIceSlip.m.field_0x40; + m35A0 = m_HIO->mIceSlip.m.field_0x3C; } else if (param_1 == ANM_DAMFL) { dVar5 = ANM_DAMFLUP; - fVar1 = daPy_HIO_iceSlip_c0::m.field_0x44; - fVar2 = daPy_HIO_iceSlip_c0::m.field_0x48; - sVar6 = daPy_HIO_iceSlip_c0::m.field_0x8; - fVar3 = daPy_HIO_iceSlip_c0::m.field_0x50; - m35A0 = daPy_HIO_iceSlip_c0::m.field_0x4C; + fVar1 = m_HIO->mIceSlip.m.field_0x44; + fVar2 = m_HIO->mIceSlip.m.field_0x48; + sVar6 = m_HIO->mIceSlip.m.field_0x8; + fVar3 = m_HIO->mIceSlip.m.field_0x50; + m35A0 = m_HIO->mIceSlip.m.field_0x4C; } else if (param_1 == ANM_DAMFR) { dVar5 = ANM_DAMFRUP; - fVar1 = daPy_HIO_iceSlip_c0::m.field_0x54; - fVar2 = daPy_HIO_iceSlip_c0::m.field_0x58; - sVar6 = daPy_HIO_iceSlip_c0::m.field_0xA; - fVar3 = daPy_HIO_iceSlip_c0::m.field_0x60; - m35A0 = daPy_HIO_iceSlip_c0::m.field_0x5C; + fVar1 = m_HIO->mIceSlip.m.field_0x54; + fVar2 = m_HIO->mIceSlip.m.field_0x58; + sVar6 = m_HIO->mIceSlip.m.field_0xA; + fVar3 = m_HIO->mIceSlip.m.field_0x60; + m35A0 = m_HIO->mIceSlip.m.field_0x5C; } else { dVar5 = ANM_DAMFFUP; - fVar1 = daPy_HIO_iceSlip_c0::m.field_0x24; - fVar2 = daPy_HIO_iceSlip_c0::m.field_0x28; - sVar6 = daPy_HIO_iceSlip_c0::m.field_0x4; - fVar3 = daPy_HIO_iceSlip_c0::m.field_0x30; - m35A0 = daPy_HIO_iceSlip_c0::m.field_0x2C; + fVar1 = m_HIO->mIceSlip.m.field_0x24; + fVar2 = m_HIO->mIceSlip.m.field_0x28; + sVar6 = m_HIO->mIceSlip.m.field_0x4; + fVar3 = m_HIO->mIceSlip.m.field_0x30; + m35A0 = m_HIO->mIceSlip.m.field_0x2C; } m35E4 = 1.0f; m35A4 = 2.0f / (m35A0 - fVar2); @@ -8479,8 +8479,8 @@ BOOL daPy_lk_c::procIceSlipAlmostFall_init() { } else { // DIR_FORWARD anm = ANM_DAMB; } - setSingleMoveAnime(anm, daPy_HIO_iceSlip_c0::m.field_0x64, daPy_HIO_iceSlip_c0::m.field_0x68, - daPy_HIO_iceSlip_c0::m.field_0xC, daPy_HIO_iceSlip_c0::m.field_0x70); + setSingleMoveAnime(anm, m_HIO->mIceSlip.m.field_0x64, m_HIO->mIceSlip.m.field_0x68, + m_HIO->mIceSlip.m.field_0xC, m_HIO->mIceSlip.m.field_0x70); setTextureAnime(6, 0); mVelocity = 0.0f; return true; @@ -8492,7 +8492,7 @@ BOOL daPy_lk_c::procIceSlipAlmostFall() { current.angle.y = shape_angle.y; checkNextMode(0); } else { - if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_iceSlip_c0::m.field_0x6C) { + if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mIceSlip.m.field_0x6C) { s16 sVar1 = current.angle.y; current.angle.y = shape_angle.y; if (!checkNextMode(1)) { @@ -8508,8 +8508,8 @@ BOOL daPy_lk_c::procBootsEquip_init(u16 param_1) { commonProcInit(daPyProc_BOOTS_EQUIP_e); current.angle.y = shape_angle.y; mVelocity = 0.0f; - setSingleMoveAnime(ANM_SETBOOTS, daPy_HIO_boots_c0::m.field_0x4, daPy_HIO_boots_c0::m.field_0x8, - daPy_HIO_boots_c0::m.field_0x0, daPy_HIO_boots_c0::m.field_0x10); + setSingleMoveAnime(ANM_SETBOOTS, m_HIO->mItem.mBoots.m.field_0x4, m_HIO->mItem.mBoots.m.field_0x8, + m_HIO->mItem.mBoots.m.field_0x0, m_HIO->mItem.mBoots.m.field_0x10); mProcVar0.m3570 = param_1; return true; } @@ -8535,7 +8535,7 @@ BOOL daPy_lk_c::procBootsEquip() { } #endif } else { - if (frameCtrl.getFrame() > daPy_HIO_boots_c0::m.field_0xC) { + if (frameCtrl.getFrame() > m_HIO->mItem.mBoots.m.field_0xC) { #if VERSION <= VERSION_JPN checkNextMode(1); #else @@ -8565,9 +8565,9 @@ BOOL daPy_lk_c::procNotUse_init(int param_1) { commonProcInit(daPyProc_NOT_USE_e); current.angle.y = shape_angle.y; mVelocity = 0.0f; - setSingleMoveAnime(ANM_PRESENTATIONB, daPy_HIO_turn_c0::m.field_0x34, - daPy_HIO_turn_c0::m.field_0x38, daPy_HIO_turn_c0::m.field_0x10, - daPy_HIO_turn_c0::m.field_0x3C); + setSingleMoveAnime(ANM_PRESENTATIONB, m_HIO->mTurn.m.field_0x34, + m_HIO->mTurn.m.field_0x38, m_HIO->mTurn.m.field_0x10, + m_HIO->mTurn.m.field_0x3C); keepItemData(); dComIfGp_setPlayerStatus1(0, daPyStts1_UNK800_e); m3628 = fpcM_ERROR_PROCESS_ID_e; @@ -9139,10 +9139,10 @@ void daPy_lk_c::setNeckAngle() { } else if (r27 < -10000) { r27 = -10000; } - if (r23_3 > daPy_HIO_ship_c0::m.field_0x0) { - r23_3 = daPy_HIO_ship_c0::m.field_0x0; - } else if (r23_3 < -daPy_HIO_ship_c0::m.field_0x0) { - r23_3 = -daPy_HIO_ship_c0::m.field_0x0; + if (r23_3 > m_HIO->mShip.m.field_0x0) { + r23_3 = m_HIO->mShip.m.field_0x0; + } else if (r23_3 < -m_HIO->mShip.m.field_0x0) { + r23_3 = -m_HIO->mShip.m.field_0x0; } if (checkModeFlg(ModeFlg_00000080) && m_anm_heap_upper[UPPER_MOVE0_e].mIdx != LKANM_BCK_DASHKAZE && m_anm_heap_upper[UPPER_MOVE1_e].mIdx != LKANM_BCK_DASHKAZE) @@ -9202,10 +9202,10 @@ void daPy_lk_c::setNeckAngle() { cLib_addCalcAngleS(&m3566, r23, 3, 0x1000, 0x100); if (checkModeFlg(ModeFlg_00000080)) { s16 r4 = r25_2 + m3566; - if (r4 > daPy_HIO_ship_c0::m.field_0x0) { - m3566 = daPy_HIO_ship_c0::m.field_0x0 - r25_2; - } else if (r4 < -daPy_HIO_ship_c0::m.field_0x0) { - m3566 = -(daPy_HIO_ship_c0::m.field_0x0 + r25_2); + if (r4 > m_HIO->mShip.m.field_0x0) { + m3566 = m_HIO->mShip.m.field_0x0 - r25_2; + } else if (r4 < -m_HIO->mShip.m.field_0x0) { + m3566 = -(m_HIO->mShip.m.field_0x0 + r25_2); } } if (mCurProc != daPyProc_DAMAGE_e) { @@ -9546,17 +9546,17 @@ void daPy_lk_c::setMoveSlantAngle() { return; } - if (mCurProc == daPyProc_MOVE_e && fVar1 > daPy_HIO_move_c0::m.field_0x4C) { + if (mCurProc == daPyProc_MOVE_e && fVar1 > m_HIO->mMove.m.field_0x4C) { cLib_addCalcAngleS( &m351C, - daPy_HIO_move_c0::m.field_0x50 * (s16)(m34DE - shape_angle.y) * - ((fVar1 - daPy_HIO_move_c0::m.field_0x4C) / (1.0f - daPy_HIO_move_c0::m.field_0x4C)), - daPy_HIO_move_c0::m.field_0xC, - daPy_HIO_move_c0::m.field_0x8, - daPy_HIO_move_c0::m.field_0xA + m_HIO->mMove.m.field_0x50 * (s16)(m34DE - shape_angle.y) * + ((fVar1 - m_HIO->mMove.m.field_0x4C) / (1.0f - m_HIO->mMove.m.field_0x4C)), + m_HIO->mMove.m.field_0xC, + m_HIO->mMove.m.field_0x8, + m_HIO->mMove.m.field_0xA ); } else { - s16 sVar2 = m351C * daPy_HIO_move_c0::m.field_0x54; + s16 sVar2 = m351C * m_HIO->mMove.m.field_0x54; if (sVar2 == 0) { m351C = 0; } else { @@ -9915,17 +9915,17 @@ void daPy_lk_c::setCollision() { uVar6 = fopAcM_GetParam(mActorKeepEquip.getActor()); } if (uVar6 == 0) { - dVar27 = daPy_HIO_cutTurn_c0::m.field_0x48; + dVar27 = m_HIO->mCut.mCutTurn.m.field_0x48; } else if (uVar6 == 1) { - dVar27 = daPy_HIO_cutTurn_c0::m.field_0x4C; + dVar27 = m_HIO->mCut.mCutTurn.m.field_0x4C; } else if (uVar6 == 2) { - dVar27 = daPy_HIO_cutTurn_c0::m.field_0x50; + dVar27 = m_HIO->mCut.mCutTurn.m.field_0x50; } else if (uVar6 == 3) { - dVar27 = daPy_HIO_cutTurn_c0::m.field_0x54; + dVar27 = m_HIO->mCut.mCutTurn.m.field_0x54; } else if (uVar6 == 4) { - dVar27 = daPy_HIO_cutTurn_c0::m.field_0x58; + dVar27 = m_HIO->mCut.mCutTurn.m.field_0x58; } else { - dVar27 = daPy_HIO_cutTurn_c0::m.field_0x5C; + dVar27 = m_HIO->mCut.mCutTurn.m.field_0x5C; } dVar27 *= 1.5f; prm0 = &nm_turn_prm0; @@ -9934,27 +9934,27 @@ void daPy_lk_c::setCollision() { } else if (mCurProc == daPyProc_CUT_ROLL_e || checkNoResetFlg1(daPyFlg1_UNK8000)) { if (checkNormalSwordEquip()) { if (mCurProc == daPyProc_CUT_ROLL_e) { - dVar27 = daPy_HIO_cutRoll_c0::m.field_0x18; + dVar27 = m_HIO->mCut.mCutRoll.m.field_0x18; } else { - dVar27 = daPy_HIO_cutTurn_c0::m.field_0x38; + dVar27 = m_HIO->mCut.mCutTurn.m.field_0x38; } prm0 = &n_roll_prm0; prm1 = &n_roll_prm1; env = &n_roll_env; } else if (checkFinalMasterSwordEquip()) { if (mCurProc == daPyProc_CUT_ROLL_e) { - dVar27 = daPy_HIO_cutRoll_c0::m.field_0x1C; + dVar27 = m_HIO->mCut.mCutRoll.m.field_0x1C; } else { - dVar27 = daPy_HIO_cutTurn_c0::m.field_0x3C; + dVar27 = m_HIO->mCut.mCutTurn.m.field_0x3C; } prm0 = &fm_roll_prm0; prm1 = &fm_roll_prm1; env = &fm_roll_env; } else { if (mCurProc == daPyProc_CUT_ROLL_e) { - dVar27 = daPy_HIO_cutRoll_c0::m.field_0x1C; + dVar27 = m_HIO->mCut.mCutRoll.m.field_0x1C; } else { - dVar27 = daPy_HIO_cutTurn_c0::m.field_0x3C; + dVar27 = m_HIO->mCut.mCutTurn.m.field_0x3C; } prm0 = &nm_roll_prm0; prm1 = &nm_roll_prm1; @@ -9962,17 +9962,17 @@ void daPy_lk_c::setCollision() { } } else { if (checkNormalSwordEquip()) { - dVar27 = daPy_HIO_cutTurn_c0::m.field_0x38; + dVar27 = m_HIO->mCut.mCutTurn.m.field_0x38; prm0 = &n_turn_prm0; prm1 = &n_turn_prm1; env = &n_turn_env; } else if (checkFinalMasterSwordEquip()) { - dVar27 = daPy_HIO_cutTurn_c0::m.field_0x3C; + dVar27 = m_HIO->mCut.mCutTurn.m.field_0x3C; prm0 = &fm_turn_prm0; prm1 = &fm_turn_prm1; env = &fm_turn_env; } else { - dVar27 = daPy_HIO_cutTurn_c0::m.field_0x3C; + dVar27 = m_HIO->mCut.mCutTurn.m.field_0x3C; prm0 = &nm_turn_prm0; prm1 = &nm_turn_prm1; env = &nm_turn_env; @@ -10027,7 +10027,7 @@ void daPy_lk_c::setCollision() { } } else if (mCurProc == daPyProc_CUT_ROLL_e) { cXyz* pcVar23 = &mSwBlur.field_0x304[0]; - s16 r27 = daPy_HIO_cutRoll_c0::m.field_0x4 / 10; + s16 r27 = m_HIO->mCut.mCutRoll.m.field_0x4 / 10; cXyz spAC = (old.pos - current.pos) * 0.1f; mDoMtx_stack_c::copy(mpCLModel->getBaseTRMtx()); mDoMtx_stack_c::push(); @@ -10153,7 +10153,7 @@ void daPy_lk_c::setCollision() { sp94.z = mFanWindCps.GetEndP()->z; f32 dVar27 = m3534 / 10.0f; f32 fVar4 = - (dVar27 * (daPy_HIO_fan_c0::m.field_0x18 - daPy_HIO_fan_c0::m.field_0x1C) + daPy_HIO_fan_c0::m.field_0x1C); + (dVar27 * (m_HIO->mItem.mFan.m.field_0x18 - m_HIO->mItem.mFan.m.field_0x1C) + m_HIO->mItem.mFan.m.field_0x1C); spC4.set( fVar4 * cM_ssin(m3536) * cM_scos(m3538), -fVar4 * cM_ssin(m3538), fVar4 * cM_scos(m3536) * cM_scos(m3538) ); @@ -10531,7 +10531,7 @@ void daPy_lk_c::setDemoData() { m34EC -= (s16)(current.angle.y - r24); } else if ((demo_mode == daPy_demo_c::DEMO_N_WALK_e) || (demo_mode == daPy_demo_c::DEMO_N_DASH_e)) { cXyz sp44 = *pos_p - current.pos; - if (std::abs(mVelocity) / mMaxNormalSpeed < daPy_HIO_move_c0::m.field_0x2C) { + if (std::abs(mVelocity) / mMaxNormalSpeed < m_HIO->mMove.m.field_0x2C) { demo_mode = daPy_demo_c::DEMO_N_WALK_e; } f32 dVar22 = sp44.abs2XZ(); @@ -10681,10 +10681,10 @@ void daPy_lk_c::setStickData() { mItemButton |= BTN_R; } if (checkHeavyStateOn()) { - mStickDistance = mStickDistance * daPy_HIO_move_c0::m.field_0x80; + mStickDistance = mStickDistance * m_HIO->mMove.m.field_0x80; } if (checkGrabWear()) { - mStickDistance = mStickDistance * daPy_HIO_move_c0::m.field_0x74; + mStickDistance = mStickDistance * m_HIO->mMove.m.field_0x74; } #if VERSION == VERSION_DEMO if (bVar1) @@ -10698,16 +10698,16 @@ void daPy_lk_c::setStickData() { } s16 angle_diff = m34DC - m34EA; int abs_v = abs(angle_diff); - if (((abs_v < daPy_HIO_cutTurnR_c0::m.field_0x6) && - (abs_v > daPy_HIO_cutTurnR_c0::m.field_0x8)) && + if (((abs_v < m_HIO->mCut.mCutTurnR.m.field_0x6) && + (abs_v > m_HIO->mCut.mCutTurnR.m.field_0x8)) && (m3578 * angle_diff >= 0)) { m3578 = m3578 + angle_diff; - m3524 = daPy_HIO_cutTurnR_c0::m.field_0x2; + m3524 = m_HIO->mCut.mCutTurnR.m.field_0x2; } else if (m3578 * angle_diff < 0) { m3578 = angle_diff; - m3524 = daPy_HIO_cutTurnR_c0::m.field_0x2; - } else if (daPy_HIO_cutTurnR_c0::m.field_0x0 == 0) { + m3524 = m_HIO->mCut.mCutTurnR.m.field_0x2; + } else if (m_HIO->mCut.mCutTurnR.m.field_0x0 == 0) { if (m3524 > 0) { m3524--; } else { @@ -10731,7 +10731,7 @@ void daPy_lk_c::setBgCheckParam() { } else if (checkModeFlg(ModeFlg_PUSHPULL)) { mAcchCir[0].SetWallR(40.0f); } else if (checkModeFlg(ModeFlg_WHIDE)) { - mAcchCir[0].SetWallR(daPy_HIO_wall_c0::m.field_0x50); + mAcchCir[0].SetWallR(m_HIO->mWall.m.field_0x50); if (checkNoResetFlg0(daPyFlg0_UNK10000)) { mAcchCir[2].SetWallH(89.9f); } @@ -10814,7 +10814,7 @@ void daPy_lk_c::checkFallCode() { if (m3580 == 4 || -G_CM3D_F_INF == mAcch.GetGroundH()) { bVar4 = m35D0 > mAcch.GetGroundH() ? TRUE : FALSE; if (((((!bVar4) && checkModeFlg(ModeFlg_MIDAIR)) && - (!checkModeFlg(ModeFlg_HOOKSHOT) && (m35F4 - current.pos.y > 100.0f * daPy_HIO_fall_c0::m.field_0x14))) || + (!checkModeFlg(ModeFlg_HOOKSHOT) && (m35F4 - current.pos.y > 100.0f * m_HIO->mFall.m.field_0x14))) || (bVar4 && checkModeFlg(ModeFlg_SWIM))) || (mAcch.ChkGroundHit() && (!checkNoResetFlg0(daPy_FLG0(daPyFlg0_UNK20000000 | daPyFlg0_UNK80000000))))) { @@ -10842,8 +10842,8 @@ void daPy_lk_c::checkFallCode() { dVar5 = 1.5f; if (dVar6 < dVar5) { dVar5 = dVar5; - } else if (dVar6 > daPy_HIO_move_c0::m.field_0x18) { - dVar5 = daPy_HIO_move_c0::m.field_0x18; + } else if (dVar6 > m_HIO->mMove.m.field_0x18) { + dVar5 = m_HIO->mMove.m.field_0x18; } else { dVar5 = dVar6; } @@ -11223,9 +11223,9 @@ void daPy_lk_c::checkRoofRestart() { cXyz local_8; local_8.set( - current.pos.x + (35.0f - daPy_HIO_wall_c0::m.field_0x50) * cM_ssin(shape_angle.y), + current.pos.x + (35.0f - m_HIO->mWall.m.field_0x50) * cM_ssin(shape_angle.y), current.pos.y, - current.pos.z + (35.0f - daPy_HIO_wall_c0::m.field_0x50) * cM_scos(shape_angle.y) + current.pos.z + (35.0f - m_HIO->mWall.m.field_0x50) * cM_scos(shape_angle.y) ); mRoofChk.SetPos(local_8); @@ -12251,9 +12251,9 @@ void daPy_lk_c::playerInit() { mAcch.OnLineCheck(); mAcch.ClrRoofNone(); mAcch.SetRoofCrrHeight(125.0f); - mMaxNormalSpeed = daPy_HIO_move_c0::m.field_0x18; - gravity = daPy_HIO_autoJump_c0::m.field_0xC; - maxFallSpeed = daPy_HIO_autoJump_c0::m.field_0x10; + mMaxNormalSpeed = m_HIO->mMove.m.field_0x18; + gravity = m_HIO->mAutoJump.m.field_0xC; + maxFallSpeed = m_HIO->mAutoJump.m.field_0x10; mAcchCir[0].SetWall(30.1f, 35.0f); mAcchCir[1].SetWall(89.9f, 35.0f); mAcchCir[2].SetWall(125.0f, 35.0f); @@ -12615,12 +12615,12 @@ cPhs_State daPy_lk_c::makeBgWait() { mDemo.setTimer(0x23); if (changeSwimProc()) { if (startMode == 1) { - mVelocity = 0.5f * daPy_HIO_swim_c0::m.field_0xC; + mVelocity = 0.5f * m_HIO->mSwim.m.field_0xC; } speedF = mVelocity; procSwimMove_init(0); } else if (startMode == 1) { - mVelocity = daPy_HIO_move_c0::m.field_0x2C * daPy_HIO_move_c0::m.field_0x18; + mVelocity = m_HIO->mMove.m.field_0x2C * m_HIO->mMove.m.field_0x18; speedF = mVelocity; procMove_init(); } else if (sceneMode == 2) { @@ -12633,8 +12633,8 @@ cPhs_State daPy_lk_c::makeBgWait() { m34E8 = shape_angle.y + 0x8000; procCrawlMove_init(0, 0); } else { - if (mVelocity > daPy_HIO_move_c0::m.field_0x18) { - mVelocity = daPy_HIO_move_c0::m.field_0x18; + if (mVelocity > m_HIO->mMove.m.field_0x18) { + mVelocity = m_HIO->mMove.m.field_0x18; } speedF = mVelocity; procMove_init(); @@ -12923,7 +12923,7 @@ BOOL daPy_lk_c::setActAnimeUpper(u16 bckIdx, daPy_UPPER upperIdx, f32 rate, f32 /* 801285F8-801286C0 .text resetActAnimeUpper__9daPy_lk_cFQ29daPy_lk_c10daPy_UPPERf */ BOOL daPy_lk_c::resetActAnimeUpper(daPy_UPPER upperIdx, f32 f31) { if (checkDashDamageAnime()) { - mDamageWaitTimer = daPy_HIO_dam_c0::m.field_0x0; + mDamageWaitTimer = m_HIO->mDam.m.field_0x0; } mAnmRatioUpper[upperIdx].setAnmTransform(NULL); diff --git a/src/d/actor/d_a_player_particle.inc b/src/d/actor/d_a_player_particle.inc index 87ab66bb..79cc7115 100644 --- a/src/d/actor/d_a_player_particle.inc +++ b/src/d/actor/d_a_player_particle.inc @@ -505,7 +505,7 @@ void daPy_lk_c::setAuraEffect() { if (m3548 == 0) { if (dComIfGs_getMagic() != 0) { - m3548 = daPy_HIO_magicShield_c0::m.field_0x0; + m3548 = m_HIO->mItem.mMagicShield.m.field_0x0; dComIfGp_setItemMagicCount(-1); } else { offNoResetFlg1(daPyFlg1_EQUIP_DRAGON_SHIELD); @@ -576,7 +576,7 @@ void daPy_lk_c::setAuraEffect() { var_f28 = 1.5f; } } else { - var_f31 = std::fabsf(mVelocity) / daPy_HIO_move_c0::m.field_0x18; + var_f31 = std::fabsf(mVelocity) / m_HIO->mMove.m.field_0x18; if (var_f31 > 1.0f) { var_f31 = 1.0f; } @@ -838,9 +838,9 @@ void daPy_lk_c::setFootEffectType(int effectID, cXyz* i_pos, int param_2, int pa } if (effectID == -2) { - emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_2022, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&smoke_scale, (u8)daPy_HIO_basic_c0::m.field_0x2, footEffect->getSmokeCallBack(), fopAcM_GetRoomNo(this)); + emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_2022, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&smoke_scale, (u8)m_HIO->mBasic.m.field_0x2, footEffect->getSmokeCallBack(), fopAcM_GetRoomNo(this)); } else if (effectID == dPa_name::ID_COMMON_2022 || effectID == dPa_name::ID_COMMON_2027) { - emitter = dComIfGp_particle_setToonP1(effectID, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&smoke_scale, (u8)daPy_HIO_basic_c0::m.field_0x2, footEffect->getSmokeCallBack(), fopAcM_GetRoomNo(this)); + emitter = dComIfGp_particle_setToonP1(effectID, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&smoke_scale, (u8)m_HIO->mBasic.m.field_0x2, footEffect->getSmokeCallBack(), fopAcM_GetRoomNo(this)); } else if (effectID == dPa_name::ID_COMMON_0024) { GXColor color = {tevStr.mColorC0.r, tevStr.mColorC0.g, tevStr.mColorC0.b, tevStr.mColorC0.a}; emitter = dComIfGp_particle_setP1(effectID, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&grass_scale, 0xFF, footEffect->getOtherCallBack(), -1, &color, &tevStr.mColorK0); @@ -1231,7 +1231,7 @@ void daPy_lk_c::setDamageElecEmitter() { mDmEcallBack[1].makeEmitter(dPa_name::ID_COMMON_03EE, mpCLModel->getAnmMtx(4), ¤t.pos, NULL); } - daPy_dmEcallBack_c::setElec(daPy_HIO_elecDamage_c0::m.field_0x2); + daPy_dmEcallBack_c::setElec(m_HIO->mDam.mElecDamage.m.field_0x2); } /* 8012C880-8012C8F8 .text setDamageEmitter__9daPy_lk_cFv */ diff --git a/src/d/actor/d_a_player_pushpull.inc b/src/d/actor/d_a_player_pushpull.inc index 19be7928..fc511742 100644 --- a/src/d/actor/d_a_player_pushpull.inc +++ b/src/d/actor/d_a_player_pushpull.inc @@ -59,11 +59,11 @@ BOOL daPy_lk_c::procPushPullWait_init(int param_0) { } daPy_matAnm_c::offMabaFlg(); setSingleMoveAnime( - ANM_WAITPUSHPULL, daPy_HIO_pushpull_c0::m.field_0x0, 0.0f, -1, daPy_HIO_pushpull_c0::m.field_0x4 + ANM_WAITPUSHPULL, m_HIO->mPushpull.m.field_0x0, 0.0f, -1, m_HIO->mPushpull.m.field_0x4 ); m34D6 = 0; } else { - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); setAnimeUnequip(); m3598 = 0.0f; m34D6 = 1; @@ -85,7 +85,7 @@ BOOL daPy_lk_c::procPushPullWait() { if (m34D6 != 0) { if (checkNoUpperAnime()) { setSingleMoveAnime( - ANM_WAITPUSHPULL, daPy_HIO_pushpull_c0::m.field_0x0, 0.0f, -1, daPy_HIO_pushpull_c0::m.field_0x4 + ANM_WAITPUSHPULL, m_HIO->mPushpull.m.field_0x0, 0.0f, -1, m_HIO->mPushpull.m.field_0x4 ); m34D6 = 0; } @@ -126,7 +126,7 @@ BOOL daPy_lk_c::procPushMove_init() { } 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); + setSingleMoveAnime(ANM_WALKPUSH, m_HIO->mPushpull.m.field_0x8, 0.0f, -1, m_HIO->mPushpull.m.field_0xC); mProcVar0.m3570 = 1; dComIfGp_setPlayerStatus0(0, daPyStts0_UNK4000000_e); @@ -169,7 +169,7 @@ BOOL daPy_lk_c::procPullMove_init() { } 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); + setSingleMoveAnime(ANM_WALKPULL, m_HIO->mPushpull.m.field_0x10, 0.0f, -1, m_HIO->mPushpull.m.field_0x14); mProcVar0.m3570 = 1; dComIfGp_setPlayerStatus0(0, daPyStts0_UNK4000000_e); diff --git a/src/d/actor/d_a_player_rope.inc b/src/d/actor/d_a_player_rope.inc index bf5e95d3..a9041a92 100644 --- a/src/d/actor/d_a_player_rope.inc +++ b/src/d/actor/d_a_player_rope.inc @@ -78,7 +78,7 @@ int daPy_lk_c::changeRopeEndProc(int param_0) { setAnimeEquipSword(0); } if (param_0 != 0) { - procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + procFall_init(1, m_HIO->mWallCatch.m.field_0x54); } onNoResetFlg0(daPyFlg0_UNK400000); onNoResetFlg1(daPyFlg1_UNK8000000); @@ -160,7 +160,7 @@ BOOL daPy_lk_c::checkRopeSwingWall(cXyz* r4, cXyz* r5, s16* r6, f32* r7) { JPABaseEmitter* emitter = dComIfGp_particle_setToonP1( dPa_name::ID_COMMON_2022, &foot_effect->getPos(), &foot_effect->getAngle(), - NULL, daPy_HIO_basic_c0::m.field_0x2, foot_effect->getSmokeCallBack(), + NULL, m_HIO->mBasic.m.field_0x2, foot_effect->getSmokeCallBack(), fopAcM_GetRoomNo(this) ); if (emitter) { @@ -208,7 +208,7 @@ void daPy_lk_c::setBlendRopeMoveAnime(int param_0) { } else { anm = ANM_ROPESWINGF; } - dVar6 = (0.6f * m34D4) / daPy_HIO_rope_c0::m.field_0x0; + dVar6 = (0.6f * m34D4) / m_HIO->mItem.mRope.m.field_0x0; if (checkSpecialRope()) { dVar6 *= 8.0f; } @@ -217,12 +217,12 @@ void daPy_lk_c::setBlendRopeMoveAnime(int param_0) { } } else { if ((M_PI / 2 > f30) && (M_PI / 10 <= f30)) { - setMoveAnime(0.0f, daPy_HIO_rope_c0::m.field_0x18, 1.0f, ANM_ROPECATCH, ANM_ROPESWINGF, 7, 7.0f); + setMoveAnime(0.0f, m_HIO->mItem.mRope.m.field_0x18, 1.0f, ANM_ROPECATCH, ANM_ROPESWINGF, 7, 7.0f); m34D0 = -1; return; } if ((-M_PI / 2 > f30) && (-2.8274333f <= f30)) { - setMoveAnime(0.0f, daPy_HIO_rope_c0::m.field_0x18, 1.0f, ANM_ROPECATCH, ANM_ROPESWINGB, 7, 7.0f); + setMoveAnime(0.0f, m_HIO->mItem.mRope.m.field_0x18, 1.0f, ANM_ROPECATCH, ANM_ROPESWINGB, 7, 7.0f); m34D0 = 1; return; } @@ -231,7 +231,7 @@ void daPy_lk_c::setBlendRopeMoveAnime(int param_0) { } else { anm = ANM_ROPESWINGF; } - dVar6 = (0.6f * m34D4) / daPy_HIO_rope_c0::m.field_0x0; + dVar6 = (0.6f * m34D4) / m_HIO->mItem.mRope.m.field_0x0; if (checkSpecialRope()) { dVar6 *= 8.0f; } @@ -259,11 +259,11 @@ void daPy_lk_c::setBlendRopeMoveAnime(int param_0) { } f32 f4; if (param_0 != 0) { - f4 = daPy_HIO_rope_c0::m.field_0x20; + f4 = m_HIO->mItem.mRope.m.field_0x20; } else { f4 = -1.0f; } - setMoveAnime(sp08, daPy_HIO_rope_c0::m.field_0x18, 1.0f, ANM_ROPECATCH, anm, 7, f4); + setMoveAnime(sp08, m_HIO->mItem.mRope.m.field_0x18, 1.0f, ANM_ROPECATCH, anm, 7, f4); } /* 80143A44-80143C5C .text throwRope__9daPy_lk_cFv */ @@ -272,9 +272,9 @@ int daPy_lk_c::throwRope() { setActAnimeUpper( LKANM_BCK_ROPETHROW, UPPER_MOVE2_e, - daPy_HIO_rope_c0::m.field_0x44, - daPy_HIO_rope_c0::m.field_0x48, - daPy_HIO_rope_c0::m.field_0x8, + m_HIO->mItem.mRope.m.field_0x44, + m_HIO->mItem.mRope.m.field_0x48, + m_HIO->mItem.mRope.m.field_0x8, -1.0f ); setPriTextureAnime(0x48, 0); @@ -284,7 +284,7 @@ int daPy_lk_c::throwRope() { } current.angle.y = shape_angle.y + -0x4000; onModeFlg(ModeFlg_00000001); - setBlendAtnMoveAnime(daPy_HIO_rope_c0::m.field_0x4C); + setBlendAtnMoveAnime(m_HIO->mItem.mRope.m.field_0x4C); cXyz local_1c; if (mCurProc == daPyProc_ROPE_MOVE_e) { fopAc_ac_c* pfVar4 = mpAttnActorLockOn; @@ -377,7 +377,7 @@ BOOL daPy_lk_c::checkHangRopeActorNull() { if (checkRopeTag()) { mEquipItem = daPyItem_NONE_e; } - procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + procFall_init(1, m_HIO->mWallCatch.m.field_0x54); onNoResetFlg0(daPyFlg0_UNK400000); onNoResetFlg1(daPyFlg1_UNK8000000); return true; @@ -398,7 +398,7 @@ BOOL daPy_lk_c::procRopeSubject_init() { if (fopAcM_GetParam(mActorKeepEquip.getActor()) == 0) { setActAnimeUpper(LKANM_BCK_ROPETHROWWAIT, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); - setSingleMoveAnime(ANM_ATNRS, 0.0f, 0.0f, -1, daPy_HIO_rope_c0::m.field_0x54); + setSingleMoveAnime(ANM_ATNRS, 0.0f, 0.0f, -1, m_HIO->mItem.mRope.m.field_0x54); } dComIfGp_setPlayerStatus0(0, daPyStts0_ROPE_AIM_e); @@ -466,10 +466,10 @@ BOOL daPy_lk_c::procRopeReady_init() { fopAc_ac_c* rope = mActorKeepEquip.getActor(); commonProcInit(daPyProc_ROPE_READY_e); setMoveAnime( - 0.5f, daPy_HIO_rope_c0::m.field_0x18, 1.0f, ANM_ROPECATCH, ANM_ROPESWINGB, 7, daPy_HIO_rope_c0::m.field_0x20 + 0.5f, m_HIO->mItem.mRope.m.field_0x18, 1.0f, ANM_ROPECATCH, ANM_ROPESWINGB, 7, m_HIO->mItem.mRope.m.field_0x20 ); - mFrameCtrlUnder[UNDER_MOVE0_e].setStart(daPy_HIO_rope_c0::m.field_0x1C); - mFrameCtrlUnder[UNDER_MOVE0_e].setEnd(daPy_HIO_rope_c0::m.field_0x4); + mFrameCtrlUnder[UNDER_MOVE0_e].setStart(m_HIO->mItem.mRope.m.field_0x1C); + mFrameCtrlUnder[UNDER_MOVE0_e].setEnd(m_HIO->mItem.mRope.m.field_0x4); mAnmRatioUnder[UNDER_MOVE0_e].getAnmTransform()->setFrame(mFrameCtrlUnder[UNDER_MOVE0_e].getFrame()); m3688 = current.pos; m35F0 = m3688.y; @@ -559,7 +559,7 @@ BOOL daPy_lk_c::procRopeSwing_init(fopAc_ac_c* param_0, s16 param_1) { m35A4 = dVar11; dVar11 = M_PI / 2 / m35A4; if (pfVar7 != NULL) { - m34D4 = daPy_HIO_rope_c0::m.field_0x0; + m34D4 = m_HIO->mItem.mRope.m.field_0x0; #if VERSION == VERSION_DEMO if (strcmp(dComIfGp_getStartStageName(), "GanonK") == 0) { m34D4 /= 3; @@ -618,8 +618,8 @@ BOOL daPy_lk_c::procRopeSwing_init(fopAc_ac_c* param_0, s16 param_1) { if (pfVar7 == NULL) { m_old_fdata->initOldFrameMorf(15.0f, 0, 0x2A); } - mFrameCtrlUnder[UNDER_MOVE0_e].setStart(daPy_HIO_rope_c0::m.field_0x1C); - mFrameCtrlUnder[UNDER_MOVE0_e].setEnd(daPy_HIO_rope_c0::m.field_0x4); + mFrameCtrlUnder[UNDER_MOVE0_e].setStart(m_HIO->mItem.mRope.m.field_0x1C); + mFrameCtrlUnder[UNDER_MOVE0_e].setEnd(m_HIO->mItem.mRope.m.field_0x4); if ((pfVar7 != NULL) && (mActorKeepEquip.getActor() == NULL)) { mAnmRatioUnder[UNDER_MOVE0_e].getAnmTransform()->setFrame(mFrameCtrlUnder[UNDER_MOVE0_e].getFrame()); } @@ -713,19 +713,19 @@ BOOL daPy_lk_c::procRopeSwing() { s16 r29; #if VERSION == VERSION_DEMO if (strcmp(dComIfGp_getStartStageName(), "GanonK") == 0) { - r30 = daPy_HIO_rope_c0::m.field_0x0 / 3; + r30 = m_HIO->mItem.mRope.m.field_0x0 / 3; r28 = 0xA; r29 = 0x15; } #else if (checkSpecialRope()) { - r30 = daPy_HIO_rope_c0::m.field_0x0 / 8.0f; + r30 = m_HIO->mItem.mRope.m.field_0x0 / 8.0f; r28 = 4; r29 = 8; } #endif else { - r30 = daPy_HIO_rope_c0::m.field_0x0; + r30 = m_HIO->mItem.mRope.m.field_0x0; r28 = 0x20; r29 = 0x40; } @@ -782,17 +782,17 @@ BOOL daPy_lk_c::procRopeSwing() { f32 f30_3 = ((f32)m34D4 / r30); if (changeRopeEndProc(0)) { - dVar13 = (m35A0 / (100.0f * daPy_HIO_rope_c0::m.field_0x14)); + dVar13 = (m35A0 / (100.0f * m_HIO->mItem.mRope.m.field_0x14)); if (dVar13 < 1.0f) { dVar13 = 1.0f; } f30_3 *= dVar13; - mVelocity = daPy_HIO_rope_c0::m.field_0xC * f30_3; + mVelocity = m_HIO->mItem.mRope.m.field_0xC * f30_3; if (std::abs(sp0C) > M_PI / 2) { current.angle.y = shape_angle.y + 0x8000; } - speed.y = daPy_HIO_rope_c0::m.field_0x10 * f30_3; - procFall_init(0, daPy_HIO_wallCatch_c0::m.field_0x54); + speed.y = m_HIO->mItem.mRope.m.field_0x10 * f30_3; + procFall_init(0, m_HIO->mWallCatch.m.field_0x54); onNoResetFlg1(daPyFlg1_UNK8000000); } else if ((m34D4 == 0) && (m34D6 == 0)) { procRopeHangWait_init(0); @@ -815,14 +815,14 @@ BOOL daPy_lk_c::procRopeHangWait_init(int param_0) { dComIfGp_setPlayerStatus0(0, daPyStts0_UNK800000_e); gravity = 0.0f; if (param_0 == 0) { - m34D0 = daPy_HIO_rope_c0::m.field_0x6; + m34D0 = m_HIO->mItem.mRope.m.field_0x6; setSingleMoveAnime( - ANM_ROPECATCH, 1.0f, mFrameCtrlUnder[UNDER_MOVE0_e].getEnd() - 0.001f, -1, daPy_HIO_rope_c0::m.field_0x28 + ANM_ROPECATCH, 1.0f, mFrameCtrlUnder[UNDER_MOVE0_e].getEnd() - 0.001f, -1, m_HIO->mItem.mRope.m.field_0x28 ); setTextureAnime(2, 0); } else { m34D0 = -1; - setSingleMoveAnime(ANM_ROPEWAIT, daPy_HIO_rope_c0::m.field_0x24, 0.0f, -1, daPy_HIO_rope_c0::m.field_0x28); + setSingleMoveAnime(ANM_ROPEWAIT, m_HIO->mItem.mRope.m.field_0x24, 0.0f, -1, m_HIO->mItem.mRope.m.field_0x28); } m34D4 = 0; return true; @@ -894,7 +894,7 @@ BOOL daPy_lk_c::procRopeHangWait() { if (m34D0 != -1) { m34D0 = -1; setSingleMoveAnime( - ANM_ROPEWAIT, daPy_HIO_rope_c0::m.field_0x24, 0.0f, -1, daPy_HIO_rope_c0::m.field_0x2C + ANM_ROPEWAIT, m_HIO->mItem.mRope.m.field_0x24, 0.0f, -1, m_HIO->mItem.mRope.m.field_0x2C ); } } @@ -908,7 +908,7 @@ BOOL daPy_lk_c::procRopeHangWait() { if (m34D0 == 0) { m34D0 = -1; setSingleMoveAnime( - ANM_ROPEWAIT, daPy_HIO_rope_c0::m.field_0x24, 0.0f, -1, daPy_HIO_rope_c0::m.field_0x2C + ANM_ROPEWAIT, m_HIO->mItem.mRope.m.field_0x24, 0.0f, -1, m_HIO->mItem.mRope.m.field_0x2C ); } r29 = 0; @@ -984,7 +984,7 @@ BOOL daPy_lk_c::procRopeUp_init() { } else { commonProcInit(daPyProc_ROPE_UP_e); dComIfGp_setPlayerStatus0(0, daPyStts0_UNK800000_e); - setSingleMoveAnime(ANM_ROPECLIMB, daPy_HIO_rope_c0::m.field_0x30, 0.0f, -1, daPy_HIO_rope_c0::m.field_0x34); + setSingleMoveAnime(ANM_ROPECLIMB, m_HIO->mItem.mRope.m.field_0x30, 0.0f, -1, m_HIO->mItem.mRope.m.field_0x34); mFrameCtrlUnder[UNDER_MOVE0_e].setAttribute(J3DFrameCtrl::EMode_NONE); m35A0 = dVar4; gravity = 0.0f; @@ -1017,7 +1017,7 @@ BOOL daPy_lk_c::procRopeUp() { procRopeHangWait_init(0); } } else { - setSingleMoveAnime(ANM_ROPECLIMB, daPy_HIO_rope_c0::m.field_0x30, 0.0f, -1, -1.0f); + setSingleMoveAnime(ANM_ROPECLIMB, m_HIO->mItem.mRope.m.field_0x30, 0.0f, -1, -1.0f); mFrameCtrlUnder[UNDER_MOVE0_e].setAttribute(J3DFrameCtrl::EMode_NONE); } } else { @@ -1060,7 +1060,7 @@ BOOL daPy_lk_c::procRopeDown_init() { } else { commonProcInit(daPyProc_ROPE_DOWN_e); dComIfGp_setPlayerStatus0(0, daPyStts0_UNK800000_e); - setSingleMoveAnime(ANM_ROPEDOWN, daPy_HIO_rope_c0::m.field_0x38, 0.0f, -1, daPy_HIO_rope_c0::m.field_0x3C); + setSingleMoveAnime(ANM_ROPEDOWN, m_HIO->mItem.mRope.m.field_0x38, 0.0f, -1, m_HIO->mItem.mRope.m.field_0x3C); gravity = 0.0f; m35A0 = 0.0f; return true; @@ -1087,8 +1087,8 @@ BOOL daPy_lk_c::procRopeDown() { procRopeUp_init(); } else if (direction == DIR_BACKWARD) { m35A0 += 1.5f; - if (m35A0 > daPy_HIO_rope_c0::m.field_0x40) { - m35A0 = daPy_HIO_rope_c0::m.field_0x40; + if (m35A0 > m_HIO->mItem.mRope.m.field_0x40) { + m35A0 = m_HIO->mItem.mRope.m.field_0x40; } if (cLib_chaseF(¤t.pos.y, m35A4, m35A0)) { procRopeHangWait_init(1); @@ -1174,8 +1174,8 @@ BOOL daPy_lk_c::procRopeMove_init() { current.angle.y = shape_angle.y + -0x4000; } if (fopAcM_GetParam(mActorKeepEquip.getActor()) == 0) { - setActAnimeUpper(LKANM_BCK_ROPETHROWWAIT, UPPER_MOVE2_e, daPy_HIO_rope_c0::m.field_0x50, 0.0f, -1, -1.0f); - setBlendAtnMoveAnime(daPy_HIO_rope_c0::m.field_0x54); + setActAnimeUpper(LKANM_BCK_ROPETHROWWAIT, UPPER_MOVE2_e, m_HIO->mItem.mRope.m.field_0x50, 0.0f, -1, -1.0f); + setBlendAtnMoveAnime(m_HIO->mItem.mRope.m.field_0x54); } dComIfGp_setPlayerStatus0(0, daPyStts0_ROPE_AIM_e); return true; @@ -1203,7 +1203,7 @@ BOOL daPy_lk_c::procRopeMove() { onModeFlg(ModeFlg_00000001); if (mDirection != DIR_RIGHT) { mDirection = DIR_RIGHT; - fVar1 = daPy_HIO_basic_c0::m.field_0xC; + fVar1 = m_HIO->mBasic.m.field_0xC; } } else { offModeFlg(ModeFlg_00000001); @@ -1219,10 +1219,10 @@ BOOL daPy_lk_c::procRopeThrowCatch_init() { commonProcInit(daPyProc_ROPE_THROW_CATCH_e); setSingleMoveAnime( ANM_ROPETHROWCATCH, - daPy_HIO_rope_c0::m.field_0x58, - daPy_HIO_rope_c0::m.field_0x5C, - daPy_HIO_rope_c0::m.field_0xA, - daPy_HIO_rope_c0::m.field_0x64 + m_HIO->mItem.mRope.m.field_0x58, + m_HIO->mItem.mRope.m.field_0x5C, + m_HIO->mItem.mRope.m.field_0xA, + m_HIO->mItem.mRope.m.field_0x64 ); mVelocity = 0.0f; dComIfGp_setPlayerStatus0(0, daPyStts0_ROPE_AIM_e); diff --git a/src/d/actor/d_a_player_ship.inc b/src/d/actor/d_a_player_ship.inc index 53ff90df..6a29f0f3 100644 --- a/src/d/actor/d_a_player_ship.inc +++ b/src/d/actor/d_a_player_ship.inc @@ -204,7 +204,7 @@ void daPy_lk_c::setShipRidePos(int param_0) { fVar2 = 1.0f; } mFrameCtrlUpper[UPPER_MOVE2_e].setRate( - (1.0f - daPy_HIO_ship_c0::m.field_0xC) * fVar2 + daPy_HIO_ship_c0::m.field_0xC + (1.0f - m_HIO->mShip.m.field_0xC) * fVar2 + m_HIO->mShip.m.field_0xC ); if (ship->getJumpFlg()) { if (ship->getJumpRate() > 0.6f) { @@ -230,7 +230,7 @@ void daPy_lk_c::setShipRidePos(int param_0) { } s16 sVar4; if (m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_VOYAGE1) { - sVar4 = -daPy_HIO_ship_c0::m.field_0x4 * ship->getTillerAngleRate(); + sVar4 = -m_HIO->mShip.m.field_0x4 * ship->getTillerAngleRate(); } else { sVar4 = 0; } @@ -242,7 +242,7 @@ void daPy_lk_c::setShipRidePos(int param_0) { /* 801403E0-80140480 .text setShipAttentionAnmSpeed__9daPy_lk_cFf */ void daPy_lk_c::setShipAttentionAnmSpeed(f32 param_0) { if (checkAttentionLock()) { - mFrameCtrlUnder[UNDER_MOVE0_e].setRate(daPy_HIO_atnMove_c0::m.field_0x24); + mFrameCtrlUnder[UNDER_MOVE0_e].setRate(m_HIO->mAtnMove.m.field_0x24); mFrameCtrlUpper[UPPER_MOVE2_e].setRate(param_0); } else { mFrameCtrlUnder[UNDER_MOVE0_e].setRate(0.0f); @@ -475,10 +475,10 @@ BOOL daPy_lk_c::procShipReady_init() { daShip_c* ship = dComIfGp_getShipActor(); setSingleMoveAnime( ANM_VJMPCL, - daPy_HIO_wallCatch_c0::m.field_0x24, - daPy_HIO_wallCatch_c0::m.field_0x2C, - daPy_HIO_wallCatch_c0::m.field_0x4, - daPy_HIO_wallCatch_c0::m.field_0x28 + m_HIO->mWallCatch.m.field_0x24, + m_HIO->mWallCatch.m.field_0x2C, + m_HIO->mWallCatch.m.field_0x4, + m_HIO->mWallCatch.m.field_0x28 ); gravity = 0.0f; mVelocity = 0.0f; @@ -524,7 +524,7 @@ BOOL daPy_lk_c::procShipReady() { if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { mProcVar0.m3570 = 1; mVelocity = 6.0f; - setSingleMoveAnime(ANM_WALK, daPy_HIO_move_c0::m.field_0x40, 0.0f, -1, 5.0f); + setSingleMoveAnime(ANM_WALK, m_HIO->mMove.m.field_0x40, 0.0f, -1, 5.0f); m34C2 = 10; offModeFlg(ModeFlg_HANG | ModeFlg_00000400); ship->setReadySecond(); @@ -707,7 +707,7 @@ BOOL daPy_lk_c::procShipScope_init(int param_0) { gravity = 0.0f; ship->setPaddleMove(); setShipRidePos(0); - setSingleMoveAnime(ANM_WAITS, daPy_HIO_move_c0::m.field_0x38, 0.0f, -1, 5.0f); + setSingleMoveAnime(ANM_WAITS, m_HIO->mMove.m.field_0x38, 0.0f, -1, 5.0f); dComIfGp_setPlayerStatus0(0, daPyStts0_SHIP_RIDE_e); seStartSystem(JA_SE_ITM_SUBMENU_IN_1); offNoResetFlg0(daPyFlg0_SCOPE_CANCEL); @@ -786,7 +786,7 @@ BOOL daPy_lk_c::procShipBoomerang() { if (!checkUpperAnime(LKANM_BCK_BOOMCATCH)) { if (mEquipItem == dItem_BOOMERANG_e) { if (checkUpperAnime(LKANM_BCK_BOOMWAIT)) { - setShipAttentionAnmSpeed(daPy_HIO_boom_c0::m.field_0x18); + setShipAttentionAnmSpeed(m_HIO->mItem.mBoom.m.field_0x18); checkNextActionBoomerangReady(); if (checkAttentionLock()) { setShipAttnetionBodyAngle(); @@ -811,7 +811,7 @@ BOOL daPy_lk_c::procShipBoomerang() { return procShipPaddle_init(); } setShapeAngleToAtnActor(); - mFrameCtrlUnder[UNDER_MOVE0_e].setRate(daPy_HIO_atnMove_c0::m.field_0x24); + mFrameCtrlUnder[UNDER_MOVE0_e].setRate(m_HIO->mAtnMove.m.field_0x24); } } m34D4 = ship->shape_angle.y; @@ -1162,7 +1162,7 @@ BOOL daPy_lk_c::procShipGetOff_init() { daShip_c* ship = dComIfGp_getShipActor(); commonProcInit(daPyProc_SHIP_GET_OFF_e); deleteEquipItem(TRUE); - setSingleMoveAnime(ANM_DASH, daPy_HIO_move_c0::m.field_0x40, 0.0f, -1, 5.0f); + setSingleMoveAnime(ANM_DASH, m_HIO->mMove.m.field_0x40, 0.0f, -1, 5.0f); mVelocity = 8.0f; gravity = 0.0f; shape_angle.y = ship->shape_angle.y + -0x4000; @@ -1191,14 +1191,14 @@ BOOL daPy_lk_c::procShipGetOff() { if (cLib_distanceAngleS(sVar3, shape_angle.y) >= 0x4000) { setSingleMoveAnime( ANM_JMPST, - daPy_HIO_autoJump_c0::m.field_0x20, - daPy_HIO_autoJump_c0::m.field_0x2C, - daPy_HIO_autoJump_c0::m.field_0x2, - daPy_HIO_autoJump_c0::m.field_0x30 + m_HIO->mAutoJump.m.field_0x20, + m_HIO->mAutoJump.m.field_0x2C, + m_HIO->mAutoJump.m.field_0x2, + m_HIO->mAutoJump.m.field_0x30 ); - gravity = daPy_HIO_autoJump_c0::m.field_0xC; - mVelocity = daPy_HIO_ship_c0::m.field_0x10; - speed.y = daPy_HIO_ship_c0::m.field_0x14; + gravity = m_HIO->mAutoJump.m.field_0xC; + mVelocity = m_HIO->mShip.m.field_0x10; + speed.y = m_HIO->mShip.m.field_0x14; mProcVar0.m3570 = 1; m34C2 = 1; ship->setGetOffSecond(); @@ -1208,11 +1208,11 @@ BOOL daPy_lk_c::procShipGetOff() { m34C2 = 1; dComIfGp_evmng_cutEnd(mStaffIdx); if (mAcch.ChkGroundHit()) { - changeLandProc(daPy_HIO_autoJump_c0::m.field_0x24); + changeLandProc(m_HIO->mAutoJump.m.field_0x24); } else if (checkFanGlideProc(0)) { return true; } else if (speed.y < -gravity) { - procFall_init(0, daPy_HIO_smallJump_c0::m.field_0x18); + procFall_init(0, m_HIO->mSmallJump.m.field_0x18); setTextureAnime(0x37, 0); } } diff --git a/src/d/actor/d_a_player_swim.inc b/src/d/actor/d_a_player_swim.inc index 84b500d4..44b498f0 100644 --- a/src/d/actor/d_a_player_swim.inc +++ b/src/d/actor/d_a_player_swim.inc @@ -35,7 +35,7 @@ void daPy_lk_c::setSpeedAndAngleSwim() { current.angle.y = m34E8; } else { - cLib_addCalcAngleS(&shape_angle.y, m34E8, daPy_HIO_swim_c0::m.field_0x8, daPy_HIO_swim_c0::m.field_0x4, daPy_HIO_swim_c0::m.field_0x6); + cLib_addCalcAngleS(&shape_angle.y, m34E8, m_HIO->mSwim.m.field_0x8, m_HIO->mSwim.m.field_0x4, m_HIO->mSwim.m.field_0x6); } fVar1 = mStickDistance * 3.0f * cM_scos(shape_angle.y - oldAngleY); @@ -46,7 +46,7 @@ void daPy_lk_c::setSpeedAndAngleSwim() { cLib_addCalcAngleS(¤t.angle.y, shape_angle.y, 2, 0x2000, 0x1000); - mMaxNormalSpeed = daPy_HIO_swim_c0::m.field_0xC; + mMaxNormalSpeed = m_HIO->mSwim.m.field_0xC; } else { setShapeAngleToAtnActor(); @@ -62,7 +62,7 @@ void daPy_lk_c::setSpeedAndAngleSwim() { bVar3 = TRUE; } else { - cLib_addCalcAngleS(¤t.angle.y, m34E8, daPy_HIO_swim_c0::m.field_0x8, daPy_HIO_swim_c0::m.field_0x4, daPy_HIO_swim_c0::m.field_0x6); + cLib_addCalcAngleS(¤t.angle.y, m34E8, m_HIO->mSwim.m.field_0x8, m_HIO->mSwim.m.field_0x4, m_HIO->mSwim.m.field_0x6); fVar1 = mStickDistance * 3.0f * cM_scos(current.angle.y - oldAngleY); } } @@ -70,15 +70,15 @@ void daPy_lk_c::setSpeedAndAngleSwim() { fVar1 = 0.0f; } - mMaxNormalSpeed = ((cM_scos(current.angle.y - shape_angle.y) + 1.0f) * 0.25f + 0.5f) * daPy_HIO_swim_c0::m.field_0xC; + mMaxNormalSpeed = ((cM_scos(current.angle.y - shape_angle.y) + 1.0f) * 0.25f + 0.5f) * m_HIO->mSwim.m.field_0xC; } } else { fVar1 = 0.0f; - mMaxNormalSpeed = daPy_HIO_swim_c0::m.field_0xC; + mMaxNormalSpeed = m_HIO->mSwim.m.field_0xC; } - setNormalSpeedF(fVar1, daPy_HIO_swim_c0::m.field_0x18, daPy_HIO_swim_c0::m.field_0x1C, daPy_HIO_swim_c0::m.field_0x20); + setNormalSpeedF(fVar1, m_HIO->mSwim.m.field_0x18, m_HIO->mSwim.m.field_0x1C, m_HIO->mSwim.m.field_0x20); if (bVar3 && mVelocity < 5.0f) { current.angle.y = m34E8; @@ -114,7 +114,7 @@ BOOL daPy_lk_c::changeSwimProc() { BOOL res; cXyz local_18; - if (checkNoResetFlg0(daPyFlg0_UNK80) && !checkModeFlg(ModeFlg_IN_SHIP | ModeFlg_SWIM) && !checkNoControll() && mDemo.getDemoMode() != daPy_demo_c::DEMO_PFALL_e && m35D0 - current.pos.y > daPy_HIO_swim_c0::m.field_0x24) { + if (checkNoResetFlg0(daPyFlg0_UNK80) && !checkModeFlg(ModeFlg_IN_SHIP | ModeFlg_SWIM) && !checkNoControll() && mDemo.getDemoMode() != daPy_demo_c::DEMO_PFALL_e && m35D0 - current.pos.y > m_HIO->mSwim.m.field_0x24) { dComIfGp_setItemTimeCount(900); dComIfGp_setItemTimeMax(900); @@ -125,7 +125,7 @@ BOOL daPy_lk_c::changeSwimProc() { offNoResetFlg0(daPyFlg0_UNK100); - mMaxNormalSpeed = daPy_HIO_swim_c0::m.field_0xC; + mMaxNormalSpeed = m_HIO->mSwim.m.field_0xC; mVelocity *= 0.75f; if (mVelocity >= mMaxNormalSpeed) { @@ -137,11 +137,11 @@ BOOL daPy_lk_c::changeSwimProc() { setSwimTimerStartStop(); if (checkModeFlg(ModeFlg_MIDAIR)) { - current.pos.y += daPy_HIO_swim_c0::m.field_0x24; - speed.y = mOldSpeed.y * daPy_HIO_swim_c0::m.field_0x10; + current.pos.y += m_HIO->mSwim.m.field_0x24; + speed.y = mOldSpeed.y * m_HIO->mSwim.m.field_0x10; - if (speed.y < daPy_HIO_swim_c0::m.field_0x14) { - speed.y = daPy_HIO_swim_c0::m.field_0x14; + if (speed.y < m_HIO->mSwim.m.field_0x14) { + speed.y = m_HIO->mSwim.m.field_0x14; } else if (speed.y > 0.0f) { speed.y = 0.0f; @@ -172,16 +172,16 @@ BOOL daPy_lk_c::changeSwimProc() { /* 8013D1B0-8013D2AC .text changeSwimUpProc__9daPy_lk_cFv */ BOOL daPy_lk_c::changeSwimUpProc() { - if (speed.y < daPy_HIO_swim_c0::m.field_0x68) { - speed.y += daPy_HIO_swim_c0::m.field_0x64; - if (speed.y > daPy_HIO_swim_c0::m.field_0x68) { - speed.y = daPy_HIO_swim_c0::m.field_0x68; + if (speed.y < m_HIO->mSwim.m.field_0x68) { + speed.y += m_HIO->mSwim.m.field_0x64; + if (speed.y > m_HIO->mSwim.m.field_0x68) { + speed.y = m_HIO->mSwim.m.field_0x68; } if (speed.y > 0.0f && mEquipItem != daPyItem_NONE_e) { deleteEquipItem(TRUE); } } - if (m35D0 - current.pos.y < 40.1f + daPy_HIO_swim_c0::m.field_0x28 && speed.y >= 0.0f) { + if (m35D0 - current.pos.y < 40.1f + m_HIO->mSwim.m.field_0x28 && speed.y >= 0.0f) { if (mCurProc == daPyProc_DEMO_DEAD_e) { onNoResetFlg0(daPyFlg0_UNK100); current.pos.y = m35D0; @@ -229,10 +229,10 @@ BOOL daPy_lk_c::changeSwimOutProc() { swimOutAfter(TRUE); - return procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + return procFall_init(1, m_HIO->mWallCatch.m.field_0x54); } - if (!checkNoResetFlg0(daPyFlg0_UNK80) || (pcVar1 && cBgW_CheckBGround(pcVar1->GetNP()->y) && m35D0 - mAcch.GetGroundH() < daPy_HIO_swim_c0::m.field_0x24 - 5.0f)) { + if (!checkNoResetFlg0(daPyFlg0_UNK80) || (pcVar1 && cBgW_CheckBGround(pcVar1->GetNP()->y) && m35D0 - mAcch.GetGroundH() < m_HIO->mSwim.m.field_0x24 - 5.0f)) { current.pos.y = m35D0; if (mCurProc == daPyProc_SWIM_MOVE_e && mDirection != DIR_FORWARD) { @@ -256,10 +256,10 @@ BOOL daPy_lk_c::changeSwimOutProc() { void daPy_lk_c::setSwimMoveAnime(daPy_ANM swimMoveAnm) { f32 startFrame = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame(); f32 endFrame = startFrame * mFrameCtrlUnder[UNDER_MOVE0_e].getEnd(); - f32 rate = (std::fabsf(mVelocity) * (daPy_HIO_swim_c0::m.field_0x54 - daPy_HIO_swim_c0::m.field_0x50) / mMaxNormalSpeed) + - daPy_HIO_swim_c0::m.field_0x50 + - (getSwimTimerRate() * daPy_HIO_swim_c0::m.field_0x74); - setSingleMoveAnime(swimMoveAnm, rate, 0.0f, -1, daPy_HIO_swim_c0::m.field_0x58); + f32 rate = (std::fabsf(mVelocity) * (m_HIO->mSwim.m.field_0x54 - m_HIO->mSwim.m.field_0x50) / mMaxNormalSpeed) + + m_HIO->mSwim.m.field_0x50 + + (getSwimTimerRate() * m_HIO->mSwim.m.field_0x74); + setSingleMoveAnime(swimMoveAnm, rate, 0.0f, -1, m_HIO->mSwim.m.field_0x58); mFrameCtrlUnder[UNDER_MOVE0_e].setFrame(endFrame * mFrameCtrlUnder[UNDER_MOVE0_e].getEnd()); mAnmRatioUnder[UNDER_MOVE0_e].getAnmTransform()->setFrame(mFrameCtrlUnder[UNDER_MOVE0_e].getFrame()); } @@ -292,7 +292,7 @@ void daPy_lk_c::setSwimTimerStartStop() { float swimTimerRate = getSwimTimerRate(); if (swimTimerRate > 0.5f) { - target = cM_fcos((1.0f - swimTimerRate) * M_PI) * -daPy_HIO_swim_c0::m.field_0x78; + target = cM_fcos((1.0f - swimTimerRate) * M_PI) * -m_HIO->mSwim.m.field_0x78; if (mFrameCtrlUnder->checkPass(0.0f) && mCurProc != daPyProc_SWIM_UP_e) { if (mProcVar0.m3570 && !checkNoResetFlg0(daPyFlg0_UNK4000)) { @@ -328,11 +328,11 @@ BOOL daPy_lk_c::procSwimUp_init(BOOL param_1) { current.pos.y = m35D0; - setSingleMoveAnime(ANM_SWIMP, daPy_HIO_swim_c0::m.field_0x2C, daPy_HIO_swim_c0::m.field_0x30, daPy_HIO_swim_c0::m.field_0x0, daPy_HIO_swim_c0::m.field_0x38); + setSingleMoveAnime(ANM_SWIMP, m_HIO->mSwim.m.field_0x2C, m_HIO->mSwim.m.field_0x30, m_HIO->mSwim.m.field_0x0, m_HIO->mSwim.m.field_0x38); dComIfGp_setPlayerStatus0(0, daPyStts0_SWIM_e); - m35C4 = daPy_HIO_swim_c0::m.field_0x3C; + m35C4 = m_HIO->mSwim.m.field_0x3C; onNoResetFlg0(daPyFlg0_UNK100); @@ -368,7 +368,7 @@ BOOL daPy_lk_c::procSwimUp() { procSwimWait_init(FALSE); } else { - if (mFrameCtrl->getFrame() > daPy_HIO_swim_c0::m.field_0x34) { + if (mFrameCtrl->getFrame() > m_HIO->mSwim.m.field_0x34) { if (mStickDistance > 0.05f) { procSwimMove_init(FALSE); } @@ -380,7 +380,7 @@ BOOL daPy_lk_c::procSwimUp() { seStartOnlyReverb(JA_SE_LK_SWIM); } else { - m35C4 = daPy_HIO_swim_c0::m.field_0x3C; + m35C4 = m_HIO->mSwim.m.field_0x3C; current.pos.y = m35D0; } } @@ -400,14 +400,14 @@ BOOL daPy_lk_c::procSwimWait_init(BOOL param_1) { if (param_1) { fVar2 = mFrameCtrl->getFrame() / (float)mFrameCtrl->getEnd(); - mVelocity = speedF * (1.0f - daPy_HIO_swim_c0::m.field_0x60) + speedF * std::fabsf(cM_fcos(fVar2 * M_PI)) * daPy_HIO_swim_c0::m.field_0x60; + mVelocity = speedF * (1.0f - m_HIO->mSwim.m.field_0x60) + speedF * std::fabsf(cM_fcos(fVar2 * M_PI)) * m_HIO->mSwim.m.field_0x60; } else { fVar2 = 0.0f; } gravity = 0.0f; - setSingleMoveAnime(ANM_SWIMWAIT, (float)(getSwimTimerRate() * daPy_HIO_swim_c0::m.field_0x70) + daPy_HIO_swim_c0::m.field_0x40, 0.0f, -1, daPy_HIO_swim_c0::m.field_0x44); + setSingleMoveAnime(ANM_SWIMWAIT, (float)(getSwimTimerRate() * m_HIO->mSwim.m.field_0x70) + m_HIO->mSwim.m.field_0x40, 0.0f, -1, m_HIO->mSwim.m.field_0x44); mFrameCtrl->setFrame(fVar2 * mFrameCtrl->getEnd()); mAnmRatioUnder[UNDER_MOVE0_e].getAnmTransform()->setFrame(mFrameCtrl->getFrame()); dComIfGp_setPlayerStatus0(0, daPyStts0_SWIM_e); @@ -420,7 +420,7 @@ BOOL daPy_lk_c::procSwimWait_init(BOOL param_1) { speed.y = 0.0f; } - m35C4 = daPy_HIO_swim_c0::m.field_0x48; + m35C4 = m_HIO->mSwim.m.field_0x48; m34D4 = 0; mProcVar0.m3570 = 0; return TRUE; @@ -429,8 +429,8 @@ BOOL daPy_lk_c::procSwimWait_init(BOOL param_1) { /* 8013DCDC-8013DE8C .text procSwimWait__9daPy_lk_cFv */ BOOL daPy_lk_c::procSwimWait() { setSpeedAndAngleSwim(); - m34D4 += (short)((cM_rndF(0.3f) + 0.85f) * daPy_HIO_swim_c0::m.field_0x2); - m35C4 = cM_ssin(m34D4) * daPy_HIO_swim_c0::m.field_0x4C + daPy_HIO_swim_c0::m.field_0x48; + m34D4 += (short)((cM_rndF(0.3f) + 0.85f) * m_HIO->mSwim.m.field_0x2); + m35C4 = cM_ssin(m34D4) * m_HIO->mSwim.m.field_0x4C + m_HIO->mSwim.m.field_0x48; if (changeSwimOutProc()) { return TRUE; @@ -453,12 +453,12 @@ BOOL daPy_lk_c::procSwimWait() { fopAc_ac_c* talkEventPartner = fopAcM_getTalkEventPartner(this); if (talkEventPartner) { short targetAngleY = cLib_targetAngleY(¤t.pos, &talkEventPartner->eyePos); - cLib_addCalcAngleS(&shape_angle.y, targetAngleY, daPy_HIO_turn_c0::m.field_0x6, daPy_HIO_turn_c0::m.field_0x8, daPy_HIO_turn_c0::m.field_0xA); + cLib_addCalcAngleS(&shape_angle.y, targetAngleY, m_HIO->mTurn.m.field_0x6, m_HIO->mTurn.m.field_0x8, m_HIO->mTurn.m.field_0xA); current.angle.y = shape_angle.y; } } - mFrameCtrlUnder[UNDER_MOVE0_e].setRate((getSwimTimerRate() * daPy_HIO_swim_c0::m.field_0x70) + daPy_HIO_swim_c0::m.field_0x40); + mFrameCtrlUnder[UNDER_MOVE0_e].setRate((getSwimTimerRate() * m_HIO->mSwim.m.field_0x70) + m_HIO->mSwim.m.field_0x40); if (mStickDistance > 0.05f) { procSwimMove_init(TRUE); @@ -496,7 +496,7 @@ BOOL daPy_lk_c::procSwimMove_init(BOOL param_1) { dComIfGp_setPlayerStatus0(0, daPyStts0_SWIM_e); - m35C4 = daPy_HIO_swim_c0::m.field_0x5C; + m35C4 = m_HIO->mSwim.m.field_0x5C; mProcVar0.m3570 = 0; return TRUE; @@ -527,7 +527,7 @@ BOOL daPy_lk_c::procSwimMove() { if (mDirection == DIR_FORWARD) { anm = ANM_SWIMING; - m35C4 = daPy_HIO_swim_c0::m.field_0x5C; + m35C4 = m_HIO->mSwim.m.field_0x5C; } else { m35C4 = -80.0f; @@ -558,7 +558,7 @@ BOOL daPy_lk_c::procSwimMove() { } } else { - mFrameCtrl[0].setRate((std::fabsf(mVelocity) * (daPy_HIO_swim_c0::m.field_0x54 - daPy_HIO_swim_c0::m.field_0x50)) / mMaxNormalSpeed + daPy_HIO_swim_c0::m.field_0x50 + (float)(getSwimTimerRate() * daPy_HIO_swim_c0::m.field_0x74)); + mFrameCtrl[0].setRate((std::fabsf(mVelocity) * (m_HIO->mSwim.m.field_0x54 - m_HIO->mSwim.m.field_0x50)) / mMaxNormalSpeed + m_HIO->mSwim.m.field_0x50 + (float)(getSwimTimerRate() * m_HIO->mSwim.m.field_0x74)); } if (mDirection == DIR_BACKWARD) { diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc index 692e2262..6c4d8a60 100644 --- a/src/d/actor/d_a_player_sword.inc +++ b/src/d/actor/d_a_player_sword.inc @@ -301,12 +301,12 @@ void daPy_lk_c::setNormalCutAtParam(u8 cutType) { f32 radius; if (checkNormalSwordEquip()) { atp = 1; - radius = daPy_HIO_cut_c0::m.field_0x3C; - m35FC = daPy_HIO_cut_c0::m.field_0x40; + radius = m_HIO->mCut.m.field_0x3C; + m35FC = m_HIO->mCut.m.field_0x40; } else { atp = 2; - radius = daPy_HIO_cut_c0::m.field_0x44; - m35FC = daPy_HIO_cut_c0::m.field_0x48; + radius = m_HIO->mCut.m.field_0x44; + m35FC = m_HIO->mCut.m.field_0x48; } setAtParam(AT_TYPE_SWORD, atp, dCcG_At_Spl_UNK0, dCcG_SE_UNK1, dCcG_AtHitMark_Nrm_e, cutType, radius); } @@ -317,12 +317,12 @@ void daPy_lk_c::setFinishCutAtParam(u8 cutType) { f32 radius; if (checkNormalSwordEquip()) { atp = 2; - radius = daPy_HIO_cut_c0::m.field_0x3C; - m35FC = daPy_HIO_cut_c0::m.field_0x40; + radius = m_HIO->mCut.m.field_0x3C; + m35FC = m_HIO->mCut.m.field_0x40; } else { atp = 4; - radius = daPy_HIO_cut_c0::m.field_0x44; - m35FC = daPy_HIO_cut_c0::m.field_0x48; + radius = m_HIO->mCut.m.field_0x44; + m35FC = m_HIO->mCut.m.field_0x48; } setAtParam(AT_TYPE_SWORD, atp, dCcG_At_Spl_UNK1, dCcG_SE_UNK1, dCcG_AtHitMark_Big_e, cutType, radius); } @@ -333,12 +333,12 @@ void daPy_lk_c::setExtraCutAtParam(u8 cutType) { f32 radius; if (checkNormalSwordEquip()) { atp = 1; - radius = daPy_HIO_cut_c0::m.field_0x5C; - m35FC = daPy_HIO_cut_c0::m.field_0x60; + radius = m_HIO->mCut.m.field_0x5C; + m35FC = m_HIO->mCut.m.field_0x60; } else { atp = 2; - radius = daPy_HIO_cut_c0::m.field_0x64; - m35FC = daPy_HIO_cut_c0::m.field_0x68; + radius = m_HIO->mCut.m.field_0x64; + m35FC = m_HIO->mCut.m.field_0x68; } setAtParam(AT_TYPE_SWORD, atp, dCcG_At_Spl_UNK0, dCcG_SE_UNK1, dCcG_AtHitMark_Nrm_e, cutType, radius); } @@ -349,12 +349,12 @@ void daPy_lk_c::setExtraFinishCutAtParam(u8 cutType) { f32 radius; if (checkNormalSwordEquip()) { atp = 2; - radius = daPy_HIO_cut_c0::m.field_0x5C; - m35FC = daPy_HIO_cut_c0::m.field_0x60; + radius = m_HIO->mCut.m.field_0x5C; + m35FC = m_HIO->mCut.m.field_0x60; } else { atp = 4; - radius = daPy_HIO_cut_c0::m.field_0x64; - m35FC = daPy_HIO_cut_c0::m.field_0x68; + radius = m_HIO->mCut.m.field_0x64; + m35FC = m_HIO->mCut.m.field_0x68; } setAtParam(AT_TYPE_SWORD, atp, dCcG_At_Spl_UNK1, dCcG_SE_UNK1, dCcG_AtHitMark_Big_e, cutType, radius); } @@ -367,12 +367,12 @@ void daPy_lk_c::setJumpCutAtParam() { f32 radius; if (checkNormalSwordEquip()) { atp = 2; - radius = daPy_HIO_cut_c0::m.field_0x4C; - m35FC = daPy_HIO_cut_c0::m.field_0x50; + radius = m_HIO->mCut.m.field_0x4C; + m35FC = m_HIO->mCut.m.field_0x50; } else { atp = 4; - radius = daPy_HIO_cut_c0::m.field_0x54; - m35FC = daPy_HIO_cut_c0::m.field_0x58; + radius = m_HIO->mCut.m.field_0x54; + m35FC = m_HIO->mCut.m.field_0x58; } setAtParam(AT_TYPE_SWORD, atp, dCcG_At_Spl_UNK1, dCcG_SE_UNK1, dCcG_AtHitMark_Big_e, 0xA, radius); } else if (mEquipItem == dItem_SKULL_HAMMER_e) { @@ -561,24 +561,24 @@ BOOL daPy_lk_c::procCutA_init(s16 param_0) { commonProcInit(daPyProc_CUT_A_e); setSingleMoveAnime( ANM_CUTA, - daPy_HIO_cutA_c0::m.field_0x4, - daPy_HIO_cutA_c0::m.field_0x8, - daPy_HIO_cutA_c0::m.field_0x2, - daPy_HIO_cutA_c0::m.field_0x24 + m_HIO->mCut.mCutA.m.field_0x4, + m_HIO->mCut.mCutA.m.field_0x8, + m_HIO->mCut.mCutA.m.field_0x2, + m_HIO->mCut.mCutA.m.field_0x24 ); if (checkNormalSwordEquip()) { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTAA)); } else { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTAMS)); } - m35EC = daPy_HIO_cutA_c0::m.field_0x8; + m35EC = m_HIO->mCut.mCutA.m.field_0x8; current.angle.y = shape_angle.y; m3700 = cXyz::Zero; m34C2 = 1; voiceStart(0); m34D4 = param_0; dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); - m3522 = daPy_HIO_cutA_c0::m.field_0x0; + m3522 = m_HIO->mCut.mCutA.m.field_0x0; m351E = m34DC; onNoResetFlg0(daPyFlg0_UNK4); setBlurPosResource(LKANM__CUTA_POS); @@ -595,7 +595,7 @@ BOOL daPy_lk_c::procCutA() { } else { offNoResetFlg0(daPyFlg0_UNK4); } - m3522 = daPy_HIO_cutA_c0::m.field_0x0; + m3522 = m_HIO->mCut.mCutA.m.field_0x0; if (frameCtrl.getRate() < 0.01f) { mVelocity = 0.0f; mDirection = DIR_RIGHT; @@ -603,7 +603,7 @@ BOOL daPy_lk_c::procCutA() { return true; } - if (frameCtrl.getFrame() > daPy_HIO_cutA_c0::m.field_0xC) { + if (frameCtrl.getFrame() > m_HIO->mCut.mCutA.m.field_0xC) { f32 dVar4 = mVelocity; u8 orig_direction = mDirection; mVelocity = 0.0f; @@ -634,16 +634,16 @@ BOOL daPy_lk_c::procCutA() { cLib_addCalcAngleS( &shape_angle.y, m34D4, - daPy_HIO_turn_c0::m.field_0x4, - daPy_HIO_turn_c0::m.field_0x0, - daPy_HIO_turn_c0::m.field_0x2 + m_HIO->mTurn.m.field_0x4, + m_HIO->mTurn.m.field_0x0, + m_HIO->mTurn.m.field_0x2 ); } current.angle.y = shape_angle.y; - if (frameCtrl.checkPass(daPy_HIO_cutA_c0::m.field_0x28)) { - mVelocity = std::fabsf(speedF) * daPy_HIO_cutA_c0::m.field_0x10 + daPy_HIO_cutA_c0::m.field_0x14; + if (frameCtrl.checkPass(m_HIO->mCut.mCutA.m.field_0x28)) { + mVelocity = std::fabsf(speedF) * m_HIO->mCut.mCutA.m.field_0x10 + m_HIO->mCut.mCutA.m.field_0x14; } - if (frameCtrl.getFrame() >= daPy_HIO_cutA_c0::m.field_0x2C && frameCtrl.getFrame() < daPy_HIO_cutA_c0::m.field_0x30) + if (frameCtrl.getFrame() >= m_HIO->mCut.mCutA.m.field_0x2C && frameCtrl.getFrame() < m_HIO->mCut.mCutA.m.field_0x30) { if (!checkNoResetFlg0(daPyFlg0_CUT_AT_FLG)) { onResetFlg0(daPyRFlg0_UNK1); @@ -652,7 +652,7 @@ BOOL daPy_lk_c::procCutA() { onResetFlg0(daPyRFlg0_UNK2); } cLib_addCalc( - &mVelocity, 0.0f, daPy_HIO_cutA_c0::m.field_0x20, daPy_HIO_cutA_c0::m.field_0x18, daPy_HIO_cutA_c0::m.field_0x1C + &mVelocity, 0.0f, m_HIO->mCut.mCutA.m.field_0x20, m_HIO->mCut.mCutA.m.field_0x18, m_HIO->mCut.mCutA.m.field_0x1C ); return true; @@ -663,25 +663,25 @@ BOOL daPy_lk_c::procCutF_init(s16 param_0) { commonProcInit(daPyProc_CUT_F_e); setSingleMoveAnime( ANM_CUTF, - daPy_HIO_cutF_c0::m.field_0x4, - daPy_HIO_cutF_c0::m.field_0x8, - daPy_HIO_cutF_c0::m.field_0x2, - daPy_HIO_cutF_c0::m.field_0x24 + m_HIO->mCut.mCutF.m.field_0x4, + m_HIO->mCut.mCutF.m.field_0x8, + m_HIO->mCut.mCutF.m.field_0x2, + m_HIO->mCut.mCutF.m.field_0x24 ); if (checkNormalSwordEquip()) { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTFA)); } else { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTFMS)); } - m35EC = daPy_HIO_cutF_c0::m.field_0x8; - mpCutfBpk->setFrame(daPy_HIO_cutF_c0::m.field_0x8); - mpCutfBtk->setFrame(daPy_HIO_cutF_c0::m.field_0x8); + m35EC = m_HIO->mCut.mCutF.m.field_0x8; + mpCutfBpk->setFrame(m_HIO->mCut.mCutF.m.field_0x8); + mpCutfBtk->setFrame(m_HIO->mCut.mCutF.m.field_0x8); m3700 = cXyz::Zero; m34C2 = 1; voiceStart(0); m34D4 = param_0; m351E = m34DC; - m3522 = daPy_HIO_cutF_c0::m.field_0x0; + m3522 = m_HIO->mCut.mCutF.m.field_0x0; onNoResetFlg0(daPyFlg0_UNK4); dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); setNormalCutAtParam(2); @@ -699,7 +699,7 @@ BOOL daPy_lk_c::procCutF() { } mpCutfBpk->setFrame(frameCtrl.getFrame()); mpCutfBtk->setFrame(frameCtrl.getFrame()); - m3522 = daPy_HIO_cutF_c0::m.field_0x0; + m3522 = m_HIO->mCut.mCutF.m.field_0x0; if (frameCtrl.getRate() < 0.01f) { mVelocity = 0.0f; mDirection = DIR_RIGHT; @@ -707,7 +707,7 @@ BOOL daPy_lk_c::procCutF() { return true; } - if (frameCtrl.getFrame() > daPy_HIO_cutF_c0::m.field_0xC) { + if (frameCtrl.getFrame() > m_HIO->mCut.mCutF.m.field_0xC) { f32 dVar4 = mVelocity; u8 orig_direction = mDirection; mVelocity = 0.0f; @@ -737,16 +737,16 @@ BOOL daPy_lk_c::procCutF() { cLib_addCalcAngleS( &shape_angle.y, m34D4, - daPy_HIO_turn_c0::m.field_0x4, - daPy_HIO_turn_c0::m.field_0x0, - daPy_HIO_turn_c0::m.field_0x2 + m_HIO->mTurn.m.field_0x4, + m_HIO->mTurn.m.field_0x0, + m_HIO->mTurn.m.field_0x2 ); } current.angle.y = shape_angle.y; - if (frameCtrl.checkPass(daPy_HIO_cutF_c0::m.field_0x28)) { - mVelocity = std::fabsf(speedF) * daPy_HIO_cutF_c0::m.field_0x10 + daPy_HIO_cutF_c0::m.field_0x14; + if (frameCtrl.checkPass(m_HIO->mCut.mCutF.m.field_0x28)) { + mVelocity = std::fabsf(speedF) * m_HIO->mCut.mCutF.m.field_0x10 + m_HIO->mCut.mCutF.m.field_0x14; } - if (frameCtrl.getFrame() >= daPy_HIO_cutF_c0::m.field_0x2C && frameCtrl.getFrame() < daPy_HIO_cutF_c0::m.field_0x30) + if (frameCtrl.getFrame() >= m_HIO->mCut.mCutF.m.field_0x2C && frameCtrl.getFrame() < m_HIO->mCut.mCutF.m.field_0x30) { if (!checkNoResetFlg0(daPyFlg0_CUT_AT_FLG)) { onResetFlg0(daPyRFlg0_UNK1); @@ -755,7 +755,7 @@ BOOL daPy_lk_c::procCutF() { onResetFlg0(daPyRFlg0_UNK2); } cLib_addCalc( - &mVelocity, 0.0f, daPy_HIO_cutF_c0::m.field_0x20, daPy_HIO_cutF_c0::m.field_0x18, daPy_HIO_cutF_c0::m.field_0x1C + &mVelocity, 0.0f, m_HIO->mCut.mCutF.m.field_0x20, m_HIO->mCut.mCutF.m.field_0x18, m_HIO->mCut.mCutF.m.field_0x1C ); return true; } @@ -765,23 +765,23 @@ BOOL daPy_lk_c::procCutR_init(s16 param_0) { commonProcInit(daPyProc_CUT_R_e); setSingleMoveAnime( ANM_CUTR, - daPy_HIO_cutR_c0::m.field_0x4, - daPy_HIO_cutR_c0::m.field_0x8, - daPy_HIO_cutR_c0::m.field_0x2, - daPy_HIO_cutR_c0::m.field_0x24 + m_HIO->mCut.mCutR.m.field_0x4, + m_HIO->mCut.mCutR.m.field_0x8, + m_HIO->mCut.mCutR.m.field_0x2, + m_HIO->mCut.mCutR.m.field_0x24 ); if (checkNormalSwordEquip()) { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTRA)); } else { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTRMS)); } - m35EC = daPy_HIO_cutR_c0::m.field_0x8; + m35EC = m_HIO->mCut.mCutR.m.field_0x8; m3700 = cXyz::Zero; m34C2 = 1; voiceStart(0); m34D4 = param_0; m351E = m34DC; - m3522 = daPy_HIO_cutR_c0::m.field_0x0; + m3522 = m_HIO->mCut.mCutR.m.field_0x0; onNoResetFlg0(daPyFlg0_UNK4); setBlurPosResource(LKANM__CUTR_POS); dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); @@ -798,7 +798,7 @@ BOOL daPy_lk_c::procCutR() { } else { offNoResetFlg0(daPyFlg0_UNK4); } - m3522 = daPy_HIO_cutR_c0::m.field_0x0; + m3522 = m_HIO->mCut.mCutR.m.field_0x0; if (frameCtrl.getRate() < 0.01f) { mVelocity = 0.0f; mDirection = DIR_RIGHT; @@ -806,7 +806,7 @@ BOOL daPy_lk_c::procCutR() { return true; } - if (frameCtrl.getFrame() > daPy_HIO_cutR_c0::m.field_0xC) { + if (frameCtrl.getFrame() > m_HIO->mCut.mCutR.m.field_0xC) { f32 dVar4 = mVelocity; u8 orig_direction = mDirection; mVelocity = 0.0f; @@ -838,16 +838,16 @@ BOOL daPy_lk_c::procCutR() { cLib_addCalcAngleS( &shape_angle.y, m34D4, - daPy_HIO_turn_c0::m.field_0x4, - daPy_HIO_turn_c0::m.field_0x0, - daPy_HIO_turn_c0::m.field_0x2 + m_HIO->mTurn.m.field_0x4, + m_HIO->mTurn.m.field_0x0, + m_HIO->mTurn.m.field_0x2 ); } current.angle.y = shape_angle.y; - if (frameCtrl.checkPass(daPy_HIO_cutR_c0::m.field_0x28)) { - mVelocity = std::fabsf(speedF) * daPy_HIO_cutR_c0::m.field_0x10 + daPy_HIO_cutR_c0::m.field_0x14; + if (frameCtrl.checkPass(m_HIO->mCut.mCutR.m.field_0x28)) { + mVelocity = std::fabsf(speedF) * m_HIO->mCut.mCutR.m.field_0x10 + m_HIO->mCut.mCutR.m.field_0x14; } - if (frameCtrl.getFrame() >= daPy_HIO_cutR_c0::m.field_0x2C && frameCtrl.getFrame() < daPy_HIO_cutR_c0::m.field_0x30) + if (frameCtrl.getFrame() >= m_HIO->mCut.mCutR.m.field_0x2C && frameCtrl.getFrame() < m_HIO->mCut.mCutR.m.field_0x30) { if (!checkNoResetFlg0(daPyFlg0_CUT_AT_FLG)) { onResetFlg0(daPyRFlg0_UNK1); @@ -856,7 +856,7 @@ BOOL daPy_lk_c::procCutR() { onResetFlg0(daPyRFlg0_UNK2); } cLib_addCalc( - &mVelocity, 0.0f, daPy_HIO_cutR_c0::m.field_0x20, daPy_HIO_cutR_c0::m.field_0x18, daPy_HIO_cutR_c0::m.field_0x1C + &mVelocity, 0.0f, m_HIO->mCut.mCutR.m.field_0x20, m_HIO->mCut.mCutR.m.field_0x18, m_HIO->mCut.mCutR.m.field_0x1C ); return true; } @@ -866,23 +866,23 @@ BOOL daPy_lk_c::procCutL_init(s16 param_0) { commonProcInit(daPyProc_CUT_L_e); setSingleMoveAnime( ANM_CUTL, - daPy_HIO_cutL_c0::m.field_0x4, - daPy_HIO_cutL_c0::m.field_0x8, - daPy_HIO_cutL_c0::m.field_0x2, - daPy_HIO_cutL_c0::m.field_0x24 + m_HIO->mCut.mCutL.m.field_0x4, + m_HIO->mCut.mCutL.m.field_0x8, + m_HIO->mCut.mCutL.m.field_0x2, + m_HIO->mCut.mCutL.m.field_0x24 ); if (checkNormalSwordEquip()) { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTLA)); } else { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTLMS)); } - m35EC = daPy_HIO_cutL_c0::m.field_0x8; + m35EC = m_HIO->mCut.mCutL.m.field_0x8; m3700 = cXyz::Zero; m34C2 = 1; voiceStart(0); m34D4 = param_0; m351E = m34DC; - m3522 = daPy_HIO_cutL_c0::m.field_0x0; + m3522 = m_HIO->mCut.mCutL.m.field_0x0; onNoResetFlg0(daPyFlg0_UNK4); dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); setBlurPosResource(LKANM__CUTL_POS); @@ -899,7 +899,7 @@ BOOL daPy_lk_c::procCutL() { } else { offNoResetFlg0(daPyFlg0_UNK4); } - m3522 = daPy_HIO_cutL_c0::m.field_0x0; + m3522 = m_HIO->mCut.mCutL.m.field_0x0; if (frameCtrl.getRate() < 0.01f) { mVelocity = 0.0f; mDirection = DIR_LEFT; @@ -907,7 +907,7 @@ BOOL daPy_lk_c::procCutL() { return true; } - if (frameCtrl.getFrame() > daPy_HIO_cutL_c0::m.field_0xC) { + if (frameCtrl.getFrame() > m_HIO->mCut.mCutL.m.field_0xC) { f32 dVar4 = mVelocity; u8 orig_direction = mDirection; mVelocity = 0.0f; @@ -937,16 +937,16 @@ BOOL daPy_lk_c::procCutL() { cLib_addCalcAngleS( &shape_angle.y, m34D4, - daPy_HIO_turn_c0::m.field_0x4, - daPy_HIO_turn_c0::m.field_0x0, - daPy_HIO_turn_c0::m.field_0x2 + m_HIO->mTurn.m.field_0x4, + m_HIO->mTurn.m.field_0x0, + m_HIO->mTurn.m.field_0x2 ); } current.angle.y = shape_angle.y; - if (frameCtrl.checkPass(daPy_HIO_cutL_c0::m.field_0x28)) { - mVelocity = std::fabsf(speedF) * daPy_HIO_cutL_c0::m.field_0x10 + daPy_HIO_cutL_c0::m.field_0x14; + if (frameCtrl.checkPass(m_HIO->mCut.mCutL.m.field_0x28)) { + mVelocity = std::fabsf(speedF) * m_HIO->mCut.mCutL.m.field_0x10 + m_HIO->mCut.mCutL.m.field_0x14; } - if (frameCtrl.getFrame() >= daPy_HIO_cutL_c0::m.field_0x2C && frameCtrl.getFrame() < daPy_HIO_cutL_c0::m.field_0x30) + if (frameCtrl.getFrame() >= m_HIO->mCut.mCutL.m.field_0x2C && frameCtrl.getFrame() < m_HIO->mCut.mCutL.m.field_0x30) { if (!checkNoResetFlg0(daPyFlg0_CUT_AT_FLG)) { onResetFlg0(daPyRFlg0_UNK1); @@ -955,7 +955,7 @@ BOOL daPy_lk_c::procCutL() { onResetFlg0(daPyRFlg0_UNK2); } cLib_addCalc( - &mVelocity, 0.0f, daPy_HIO_cutL_c0::m.field_0x20, daPy_HIO_cutL_c0::m.field_0x18, daPy_HIO_cutL_c0::m.field_0x1C + &mVelocity, 0.0f, m_HIO->mCut.mCutL.m.field_0x20, m_HIO->mCut.mCutL.m.field_0x18, m_HIO->mCut.mCutL.m.field_0x1C ); return true; } @@ -965,20 +965,20 @@ BOOL daPy_lk_c::procCutEA_init() { commonProcInit(daPyProc_CUT_EA_e); setSingleMoveAnime( ANM_CUTEA, - daPy_HIO_cutEA_c0::m.field_0x4, - daPy_HIO_cutEA_c0::m.field_0x8, - daPy_HIO_cutEA_c0::m.field_0x0, - daPy_HIO_cutEA_c0::m.field_0x20 + m_HIO->mCut.mCutEA.m.field_0x4, + m_HIO->mCut.mCutEA.m.field_0x8, + m_HIO->mCut.mCutEA.m.field_0x0, + m_HIO->mCut.mCutEA.m.field_0x20 ); if (checkNormalSwordEquip()) { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTEAA)); } else { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTEAMS)); } - m35EC = daPy_HIO_cutEA_c0::m.field_0x8; + m35EC = m_HIO->mCut.mCutEA.m.field_0x8; m3700 = cXyz::Zero; m34C2 = 1; - m34D0 = daPy_HIO_cutEA_c0::m.field_0x2; + m34D0 = m_HIO->mCut.mCutEA.m.field_0x2; onNoResetFlg0(daPyFlg0_UNK4); voiceStart(1); dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); @@ -1021,11 +1021,11 @@ BOOL daPy_lk_c::procCutEA() { return changeSpecialBattle(); } - if (frameCtrl.checkPass(daPy_HIO_cutEA_c0::m.field_0x24)) { - mVelocity = std::fabsf(speedF) * daPy_HIO_cutEA_c0::m.field_0xC + daPy_HIO_cutEA_c0::m.field_0x10; + if (frameCtrl.checkPass(m_HIO->mCut.mCutEA.m.field_0x24)) { + mVelocity = std::fabsf(speedF) * m_HIO->mCut.mCutEA.m.field_0xC + m_HIO->mCut.mCutEA.m.field_0x10; } - if (frameCtrl.getFrame() >= daPy_HIO_cutEA_c0::m.field_0x28 && - frameCtrl.getFrame() < daPy_HIO_cutEA_c0::m.field_0x2C) + if (frameCtrl.getFrame() >= m_HIO->mCut.mCutEA.m.field_0x28 && + frameCtrl.getFrame() < m_HIO->mCut.mCutEA.m.field_0x2C) { if (!checkNoResetFlg0(daPyFlg0_CUT_AT_FLG)) { onResetFlg0(daPyRFlg0_UNK1); @@ -1037,9 +1037,9 @@ BOOL daPy_lk_c::procCutEA() { cLib_addCalc( &mVelocity, 0.0f, - daPy_HIO_cutEA_c0::m.field_0x1C, - daPy_HIO_cutEA_c0::m.field_0x14, - daPy_HIO_cutEA_c0::m.field_0x18 + m_HIO->mCut.mCutEA.m.field_0x1C, + m_HIO->mCut.mCutEA.m.field_0x14, + m_HIO->mCut.mCutEA.m.field_0x18 ); return true; } @@ -1049,20 +1049,20 @@ BOOL daPy_lk_c::procCutEB_init() { commonProcInit(daPyProc_CUT_EB_e); setSingleMoveAnime( ANM_CUTEB, - daPy_HIO_cutEB_c0::m.field_0x4, - daPy_HIO_cutEB_c0::m.field_0x8, - daPy_HIO_cutEB_c0::m.field_0x0, - daPy_HIO_cutEB_c0::m.field_0x20 + m_HIO->mCut.mCutEB.m.field_0x4, + m_HIO->mCut.mCutEB.m.field_0x8, + m_HIO->mCut.mCutEB.m.field_0x0, + m_HIO->mCut.mCutEB.m.field_0x20 ); if (checkNormalSwordEquip()) { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTEBA)); } else { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTEBMS)); } - m35EC = daPy_HIO_cutEB_c0::m.field_0x8; + m35EC = m_HIO->mCut.mCutEB.m.field_0x8; m3700 = cXyz::Zero; m34C2 = 1; - m34D0 = daPy_HIO_cutEB_c0::m.field_0x2; + m34D0 = m_HIO->mCut.mCutEB.m.field_0x2; onNoResetFlg0(daPyFlg0_UNK4); voiceStart(1); dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); @@ -1102,11 +1102,11 @@ BOOL daPy_lk_c::procCutEB() { return changeSpecialBattle(); } - if (frameCtrl.checkPass(daPy_HIO_cutEB_c0::m.field_0x24)) { - mVelocity = std::fabsf(speedF) * daPy_HIO_cutEB_c0::m.field_0xC + daPy_HIO_cutEB_c0::m.field_0x10; + if (frameCtrl.checkPass(m_HIO->mCut.mCutEB.m.field_0x24)) { + mVelocity = std::fabsf(speedF) * m_HIO->mCut.mCutEB.m.field_0xC + m_HIO->mCut.mCutEB.m.field_0x10; } - if (frameCtrl.getFrame() >= daPy_HIO_cutEB_c0::m.field_0x28 && - frameCtrl.getFrame() < daPy_HIO_cutEB_c0::m.field_0x2C) + if (frameCtrl.getFrame() >= m_HIO->mCut.mCutEB.m.field_0x28 && + frameCtrl.getFrame() < m_HIO->mCut.mCutEB.m.field_0x2C) { if (!checkNoResetFlg0(daPyFlg0_CUT_AT_FLG)) { onResetFlg0(daPyRFlg0_UNK1); @@ -1118,9 +1118,9 @@ BOOL daPy_lk_c::procCutEB() { cLib_addCalc( &mVelocity, 0.0f, - daPy_HIO_cutEB_c0::m.field_0x1C, - daPy_HIO_cutEB_c0::m.field_0x14, - daPy_HIO_cutEB_c0::m.field_0x18 + m_HIO->mCut.mCutEB.m.field_0x1C, + m_HIO->mCut.mCutEB.m.field_0x14, + m_HIO->mCut.mCutEB.m.field_0x18 ); return true; } @@ -1130,26 +1130,26 @@ BOOL daPy_lk_c::procCutExA_init() { commonProcInit(daPyProc_CUT_EX_A_e); setSingleMoveAnime( ANM_EXCA1, - daPy_HIO_cutExA_c0::m.field_0x8, - daPy_HIO_cutExA_c0::m.field_0xC, - daPy_HIO_cutExA_c0::m.field_0x0, - daPy_HIO_cutExA_c0::m.field_0x10 + m_HIO->mCut.mCutExA.m.field_0x8, + m_HIO->mCut.mCutExA.m.field_0xC, + m_HIO->mCut.mCutExA.m.field_0x0, + m_HIO->mCut.mCutExA.m.field_0x10 ); if (checkNormalSwordEquip()) { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_EXCA1A)); } else { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_EXCA1MS)); } - m35EC = daPy_HIO_cutExA_c0::m.field_0xC; + m35EC = m_HIO->mCut.mCutExA.m.field_0xC; m3700 = cXyz::Zero; m34C2 = 1; - m34D0 = daPy_HIO_cutExA_c0::m.field_0x2; + m34D0 = m_HIO->mCut.mCutExA.m.field_0x2; onNoResetFlg0(daPyFlg0_UNK4); voiceStart(1); dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); setBlurPosResource(LKANM__CUTEXA_POS); setExtraCutAtParam(26); - m3522 = daPy_HIO_cutExA_c0::m.field_0x4; + m3522 = m_HIO->mCut.mCutExA.m.field_0x4; return true; } @@ -1162,14 +1162,14 @@ BOOL daPy_lk_c::procCutExA() { } else { offNoResetFlg0(daPyFlg0_UNK4); } - m3522 = daPy_HIO_cutExA_c0::m.field_0x4; + m3522 = m_HIO->mCut.mCutExA.m.field_0x4; if (frameCtrl.getRate() < 0.01f) { mVelocity = 0.0f; checkNextMode(0); return true; } - if (frameCtrl.getFrame() > daPy_HIO_cutExA_c0::m.field_0x1C) { + if (frameCtrl.getFrame() > m_HIO->mCut.mCutExA.m.field_0x1C) { f32 dVar4 = mVelocity; mVelocity = 0.0f; if (checkNextMode(1)) { @@ -1195,8 +1195,8 @@ BOOL daPy_lk_c::procCutExA() { setShapeAngleToAtnActor(); current.angle.y = shape_angle.y; } - if (frameCtrl.getFrame() >= daPy_HIO_cutExA_c0::m.field_0x14 && - frameCtrl.getFrame() < daPy_HIO_cutExA_c0::m.field_0x18) + if (frameCtrl.getFrame() >= m_HIO->mCut.mCutExA.m.field_0x14 && + frameCtrl.getFrame() < m_HIO->mCut.mCutExA.m.field_0x18) { if (!checkNoResetFlg0(daPyFlg0_CUT_AT_FLG)) { onResetFlg0(daPyRFlg0_UNK1); @@ -1208,9 +1208,9 @@ BOOL daPy_lk_c::procCutExA() { cLib_addCalc( &mVelocity, 0.0f, - daPy_HIO_cutEA_c0::m.field_0x1C, - daPy_HIO_cutEA_c0::m.field_0x14, - daPy_HIO_cutEA_c0::m.field_0x18 + m_HIO->mCut.mCutEA.m.field_0x1C, + m_HIO->mCut.mCutEA.m.field_0x14, + m_HIO->mCut.mCutEA.m.field_0x18 ); return true; } @@ -1220,20 +1220,20 @@ BOOL daPy_lk_c::procCutExB_init() { commonProcInit(daPyProc_CUT_EX_B_e); setSingleMoveAnime( ANM_EXCB1, - daPy_HIO_cutExB_c0::m.field_0x4, - daPy_HIO_cutExB_c0::m.field_0x8, - daPy_HIO_cutExB_c0::m.field_0x0, - daPy_HIO_cutExB_c0::m.field_0xC + m_HIO->mCut.mCutExB.m.field_0x4, + m_HIO->mCut.mCutExB.m.field_0x8, + m_HIO->mCut.mCutExB.m.field_0x0, + m_HIO->mCut.mCutExB.m.field_0xC ); if (checkNormalSwordEquip()) { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_EXCB1A)); } else { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_EXCB1MS)); } - m35EC = daPy_HIO_cutExB_c0::m.field_0x8; + m35EC = m_HIO->mCut.mCutExB.m.field_0x8; m3700 = cXyz::Zero; m34C2 = 1; - m34D0 = daPy_HIO_cutExB_c0::m.field_0x2; + m34D0 = m_HIO->mCut.mCutExB.m.field_0x2; onNoResetFlg0(daPyFlg0_UNK4); voiceStart(1); dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); @@ -1281,8 +1281,8 @@ BOOL daPy_lk_c::procCutExB() { return changeSpecialBattle(); } - if (frameCtrl.getFrame() >= daPy_HIO_cutExB_c0::m.field_0x10 && - frameCtrl.getFrame() < daPy_HIO_cutExB_c0::m.field_0x14) + if (frameCtrl.getFrame() >= m_HIO->mCut.mCutExB.m.field_0x10 && + frameCtrl.getFrame() < m_HIO->mCut.mCutExB.m.field_0x14) { if (!checkNoResetFlg0(daPyFlg0_CUT_AT_FLG)) { onResetFlg0(daPyRFlg0_UNK1); @@ -1294,9 +1294,9 @@ BOOL daPy_lk_c::procCutExB() { cLib_addCalc( &mVelocity, 0.0f, - daPy_HIO_cutEA_c0::m.field_0x1C, - daPy_HIO_cutEA_c0::m.field_0x14, - daPy_HIO_cutEA_c0::m.field_0x18 + m_HIO->mCut.mCutEA.m.field_0x1C, + m_HIO->mCut.mCutEA.m.field_0x14, + m_HIO->mCut.mCutEA.m.field_0x18 ); return true; } @@ -1307,25 +1307,25 @@ BOOL daPy_lk_c::procCutTurn_init(int param_0) { commonProcInit(daPyProc_CUT_TURN_e); if (param_0 != 0) { - fVar1 = daPy_HIO_cutTurn_c0::m.field_0xC; + fVar1 = m_HIO->mCut.mCutTurn.m.field_0xC; } else { - fVar1 = daPy_HIO_cutTurn_c0::m.field_0x8; + fVar1 = m_HIO->mCut.mCutTurn.m.field_0x8; } if (mEquipItem == daPyItem_SWORD_e) { setSingleMoveAnime( ANM_CUTTURN, - daPy_HIO_cutTurn_c0::m.field_0x4, + m_HIO->mCut.mCutTurn.m.field_0x4, fVar1, - daPy_HIO_cutTurn_c0::m.field_0x0, - daPy_HIO_cutTurn_c0::m.field_0x28 + m_HIO->mCut.mCutTurn.m.field_0x0, + m_HIO->mCut.mCutTurn.m.field_0x28 ); } else { setSingleMoveAnime( ANM_CUTTURNC, - daPy_HIO_cutTurn_c0::m.field_0x4, + m_HIO->mCut.mCutTurn.m.field_0x4, fVar1, - daPy_HIO_cutTurn_c0::m.field_0x0, - daPy_HIO_cutTurn_c0::m.field_0x28 + m_HIO->mCut.mCutTurn.m.field_0x0, + m_HIO->mCut.mCutTurn.m.field_0x28 ); } if (mEquipItem == daPyItem_SWORD_e) { @@ -1335,14 +1335,14 @@ BOOL daPy_lk_c::procCutTurn_init(int param_0) { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_CUTTURNMS)); } if (checkNormalSwordEquip()) { - m35A4 = daPy_HIO_cutTurn_c0::m.field_0x40; + m35A4 = m_HIO->mCut.mCutTurn.m.field_0x40; if (checkNoResetFlg1(daPyFlg1_UNK8000)) { mAtCyl.SetAtAtp(4); } else { mAtCyl.SetAtAtp(2); } } else { - m35A4 = daPy_HIO_cutTurn_c0::m.field_0x44; + m35A4 = m_HIO->mCut.mCutTurn.m.field_0x44; if (checkNoResetFlg1(daPyFlg1_UNK8000)) { mAtCyl.SetAtAtp(8); } else { @@ -1361,17 +1361,17 @@ BOOL daPy_lk_c::procCutTurn_init(int param_0) { mAtCyl.SetAtAtp(boko->getAtPoint()); } if (boko_type == daBoko_c::Type_BOKO_STICK_e) { - m35A4 = daPy_HIO_cutTurn_c0::m.field_0x60; + m35A4 = m_HIO->mCut.mCutTurn.m.field_0x60; } else if (boko_type == daBoko_c::Type_MACHETE_e) { - m35A4 = daPy_HIO_cutTurn_c0::m.field_0x64; + m35A4 = m_HIO->mCut.mCutTurn.m.field_0x64; } else if (boko_type == daBoko_c::Type_STALFOS_MACE_e) { - m35A4 = daPy_HIO_cutTurn_c0::m.field_0x68; + m35A4 = m_HIO->mCut.mCutTurn.m.field_0x68; } else if (boko_type == daBoko_c::Type_DARKNUT_SWORD_e) { - m35A4 = daPy_HIO_cutTurn_c0::m.field_0x6C; + m35A4 = m_HIO->mCut.mCutTurn.m.field_0x6C; } else if (boko_type == daBoko_c::Type_MOBLIN_SPEAR_e) { - m35A4 = daPy_HIO_cutTurn_c0::m.field_0x70; + m35A4 = m_HIO->mCut.mCutTurn.m.field_0x70; } else { - m35A4 = daPy_HIO_cutTurn_c0::m.field_0x74; + m35A4 = m_HIO->mCut.mCutTurn.m.field_0x74; } setBlurPosResource(LKANM__WEAPONTURN_POS); } @@ -1379,7 +1379,7 @@ BOOL daPy_lk_c::procCutTurn_init(int param_0) { m35EC = fVar1; m3700 = cXyz::Zero; m34C2 = 1; - m34D0 = daPy_HIO_cutTurn_c0::m.field_0x2; + m34D0 = m_HIO->mCut.mCutTurn.m.field_0x2; current.angle.y = shape_angle.y; m3578 = 0; voiceStart(1); @@ -1406,7 +1406,7 @@ BOOL daPy_lk_c::procCutTurn_init(int param_0) { ¤t.pos, NULL, NULL, - daPy_HIO_basic_c0::m.field_0x2, + m_HIO->mBasic.m.field_0x2, &mSmokeEcallBack, -1, NULL, @@ -1447,7 +1447,7 @@ BOOL daPy_lk_c::procCutTurn() { checkNextMode(0); return true; } - } else if (frameCtrl.getFrame() > daPy_HIO_cutTurn_c0::m.field_0x10) { + } else if (frameCtrl.getFrame() > m_HIO->mCut.mCutTurn.m.field_0x10) { u8 orig_direction = mDirection; mDirection = DIR_RIGHT; if (checkNextMode(1)) { @@ -1467,8 +1467,8 @@ BOOL daPy_lk_c::procCutTurn() { return changeSpecialBattle(); } - if (frameCtrl.getFrame() >= daPy_HIO_cutTurn_c0::m.field_0x30 && - frameCtrl.getFrame() < daPy_HIO_cutTurn_c0::m.field_0x34) + if (frameCtrl.getFrame() >= m_HIO->mCut.mCutTurn.m.field_0x30 && + frameCtrl.getFrame() < m_HIO->mCut.mCutTurn.m.field_0x34) { if (!checkNoResetFlg0(daPyFlg0_CUT_AT_FLG)) { onResetFlg0(daPyRFlg0_UNK1); @@ -1478,7 +1478,7 @@ BOOL daPy_lk_c::procCutTurn() { cLib_chaseF(mAtCyl.GetRP(), m35A4, 18.0f); } - if (frameCtrl.checkPass(daPy_HIO_cutTurn_c0::m.field_0x34)) { + if (frameCtrl.checkPass(m_HIO->mCut.mCutTurn.m.field_0x34)) { m331C.setAlpha(0x80); m332C.setAlpha(0x80); m333C.setAlpha(0x80); @@ -1496,10 +1496,10 @@ BOOL daPy_lk_c::procCutRoll_init() { commonProcInit(daPyProc_CUT_ROLL_e); setSingleMoveAnime( ANM_CUTTURNB, - daPy_HIO_cutRoll_c0::m.field_0x8, - daPy_HIO_cutRoll_c0::m.field_0xC, - daPy_HIO_cutRoll_c0::m.field_0x0, - daPy_HIO_cutRoll_c0::m.field_0x10 + m_HIO->mCut.mCutRoll.m.field_0x8, + m_HIO->mCut.mCutRoll.m.field_0xC, + m_HIO->mCut.mCutRoll.m.field_0x0, + m_HIO->mCut.mCutRoll.m.field_0x10 ); m3578 = 0; seStartMapInfo(JA_SE_LK_V_KAITEN_S); @@ -1508,14 +1508,14 @@ BOOL daPy_lk_c::procCutRoll_init() { mCutCount = 0; offResetFlg0(daPyRFlg0_UNK8000000); if (checkNormalSwordEquip()) { - m35A4 = daPy_HIO_cutRoll_c0::m.field_0x20; + m35A4 = m_HIO->mCut.mCutRoll.m.field_0x20; if (checkNoResetFlg1(daPyFlg1_UNK8000)) { mAtCyl.SetAtAtp(4); } else { mAtCyl.SetAtAtp(2); } } else { - m35A4 = daPy_HIO_cutRoll_c0::m.field_0x24; + m35A4 = m_HIO->mCut.mCutRoll.m.field_0x24; if (checkNoResetFlg1(daPyFlg1_UNK8000)) { mAtCyl.SetAtAtp(8); } else { @@ -1523,7 +1523,7 @@ BOOL daPy_lk_c::procCutRoll_init() { } } mAtCyl.SetR(m35A4 * 0.5f); - m34D0 = daPy_HIO_cutRoll_c0::m.field_0x2; + m34D0 = m_HIO->mCut.mCutRoll.m.field_0x2; current.angle.y = shape_angle.y; m34BE = 4; dComIfGp_setPlayerStatus0(0, daPyStts0_SPIN_ATTACK_e); @@ -1561,9 +1561,9 @@ BOOL daPy_lk_c::procCutRoll() { cLib_addCalcAngleS( ¤t.angle.y, m34E8, - daPy_HIO_move_c0::m.field_0x6, - daPy_HIO_move_c0::m.field_0x0, - daPy_HIO_move_c0::m.field_0x4 + m_HIO->mMove.m.field_0x6, + m_HIO->mMove.m.field_0x0, + m_HIO->mMove.m.field_0x4 ); shape_angle.y = current.angle.y; } @@ -1577,8 +1577,8 @@ BOOL daPy_lk_c::procCutRoll() { } if (m34D0 > 0) { m34D0--; - mVelocity = daPy_HIO_cutRoll_c0::m.field_0x14; - m34EC -= daPy_HIO_cutRoll_c0::m.field_0x4 + sVar3; + mVelocity = m_HIO->mCut.mCutRoll.m.field_0x14; + m34EC -= m_HIO->mCut.mCutRoll.m.field_0x4 + sVar3; if (!checkNoResetFlg0(daPyFlg0_CUT_AT_FLG)) { onResetFlg0(daPyRFlg0_UNK1); } @@ -1594,8 +1594,8 @@ BOOL daPy_lk_c::procCutRoll() { procCutRollEnd_init(); } } else { - f32 f2 = -0x200 + daPy_HIO_cutRoll_c0::m.field_0x4 + sVar3; - m34EC -= (0x200 + (f2 * (mVelocity / daPy_HIO_cutRoll_c0::m.field_0x14))); + f32 f2 = -0x200 + m_HIO->mCut.mCutRoll.m.field_0x4 + sVar3; + m34EC -= (0x200 + (f2 * (mVelocity / m_HIO->mCut.mCutRoll.m.field_0x14))); } } else { seStartMapInfo(JA_SE_LK_V_KAITEN_S); @@ -1606,10 +1606,10 @@ BOOL daPy_lk_c::procCutRoll() { /* 801588F0-80158A40 .text procCutRollEnd_init__9daPy_lk_cFv */ BOOL daPy_lk_c::procCutRollEnd_init() { commonProcInit(daPyProc_CUT_ROLL_END_e); - setSingleMoveAnime(ANM_WAITQ, daPy_HIO_move_c0::m.field_0x84, 0.0f, -1, daPy_HIO_basic_c0::m.field_0xC); + setSingleMoveAnime(ANM_WAITQ, m_HIO->mMove.m.field_0x84, 0.0f, -1, m_HIO->mBasic.m.field_0xC); mVelocity = 0.0f; current.angle.y = shape_angle.y; - m34D0 = daPy_HIO_cutRoll_c0::m.field_0x6; + m34D0 = m_HIO->mCut.mCutRoll.m.field_0x6; static JGeometry::TVec3 emitter_trans(0.0f, 55.0f, 0.0f); static JGeometry::TVec3 particle_scale(0.76f, 0.76f, 0.76f); JPABaseEmitter* emitter = @@ -1617,7 +1617,7 @@ BOOL daPy_lk_c::procCutRollEnd_init() { if (emitter != NULL) { emitter->becomeImmortalEmitter(); emitter->setVolumeSize(5); - emitter->setLifeTime(daPy_HIO_cutRoll_c0::m.field_0x6); + emitter->setLifeTime(m_HIO->mCut.mCutRoll.m.field_0x6); emitter->setEmitterTranslation(emitter_trans); emitter->setGlobalParticleScale(particle_scale); } @@ -1640,10 +1640,10 @@ BOOL daPy_lk_c::procCutTurnCharge_init() { commonProcInit(daPyProc_CUT_TURN_CHARGE_e); setSingleMoveAnime( ANM_CUTTURNP, - daPy_HIO_cutTurnR_c0::m.field_0xC, - daPy_HIO_cutTurnR_c0::m.field_0x10, - daPy_HIO_cutTurnR_c0::m.field_0x4, - daPy_HIO_cutTurnR_c0::m.field_0x14 + m_HIO->mCut.mCutTurnR.m.field_0xC, + m_HIO->mCut.mCutTurnR.m.field_0x10, + m_HIO->mCut.mCutTurnR.m.field_0x4, + m_HIO->mCut.mCutTurnR.m.field_0x14 ); mVelocity = 0.0f; current.angle.y = shape_angle.y; @@ -1667,7 +1667,7 @@ BOOL daPy_lk_c::procCutTurnMove_init() { cXyz* pcVar4; commonProcInit(daPyProc_CUT_TURN_MOVE_e); - setSingleMoveAnime(ANM_CUTTURNPWFB, 0.0f, 0.0f, -1, daPy_HIO_cutTurnR_c0::m.field_0x1C); + setSingleMoveAnime(ANM_CUTTURNPWFB, 0.0f, 0.0f, -1, m_HIO->mCut.mCutTurnR.m.field_0x1C); if (mEquipItem == daPyItem_BOKO_e && (mAnmRatioUpper[UPPER_MOVE0_e].getAnmTransform() != NULL)) { mFrameCtrlUpper[UPPER_MOVE0_e].setFrame(mFrameCtrlUpper[UPPER_MOVE0_e].getEnd() - 0.001f); mAnmRatioUpper[UPPER_MOVE0_e].getAnmTransform()->setFrame(mFrameCtrlUpper[UPPER_MOVE0_e].getFrame()); @@ -1727,20 +1727,20 @@ BOOL daPy_lk_c::procCutTurnMove() { if (mDirection == DIR_FORWARD || mDirection == DIR_BACKWARD) { if (direction == DIR_LEFT || direction == DIR_RIGHT) { dVar6 = ANM_CUTTURNPWLR; - in_f30 = daPy_HIO_cutTurnR_c0::m.field_0x24; + in_f30 = m_HIO->mCut.mCutTurnR.m.field_0x24; mVelocity *= 0.5f; } else if (mDirection != direction) { mVelocity *= 0.5f; } } else if (direction == DIR_FORWARD || direction == DIR_BACKWARD) { dVar6 = ANM_CUTTURNPWFB; - in_f30 = daPy_HIO_cutTurnR_c0::m.field_0x1C; + in_f30 = m_HIO->mCut.mCutTurnR.m.field_0x1C; mVelocity *= 0.5f; } else if (mDirection != direction) { mVelocity *= 0.5f; } if (mDirection == direction) { - dVar8 = daPy_HIO_move_c0::m.field_0x14 * mStickDistance; + dVar8 = m_HIO->mMove.m.field_0x14 * mStickDistance; } else { mDirection = direction; } @@ -1750,13 +1750,13 @@ BOOL daPy_lk_c::procCutTurnMove() { } setNormalSpeedF(dVar8, 0.5f, 2.0f, 0.25f); if (mDirection == DIR_FORWARD) { - dVar8 = daPy_HIO_cutTurnR_c0::m.field_0x18; + dVar8 = m_HIO->mCut.mCutTurnR.m.field_0x18; } else if (mDirection == DIR_BACKWARD) { - dVar8 = -daPy_HIO_cutTurnR_c0::m.field_0x18; + dVar8 = -m_HIO->mCut.mCutTurnR.m.field_0x18; } else if (mDirection == DIR_RIGHT) { - dVar8 = -daPy_HIO_cutTurnR_c0::m.field_0x20; + dVar8 = -m_HIO->mCut.mCutTurnR.m.field_0x20; } else { // DIR_LEFT - dVar8 = daPy_HIO_cutTurnR_c0::m.field_0x20; + dVar8 = m_HIO->mCut.mCutTurnR.m.field_0x20; } f32 dVar7 = mVelocity / mMaxNormalSpeed; mFrameCtrlUnder[UNDER_MOVE0_e].setRate(dVar7 * dVar8); @@ -1766,7 +1766,7 @@ BOOL daPy_lk_c::procCutTurnMove() { mFrameCtrlUnder[UNDER_MOVE0_e].setLoop(mFrameCtrlUnder[UNDER_MOVE0_e].getEnd()); } initSeAnime(); - m3598 = 1.0f - ((1.0f - daPy_HIO_cutTurnR_c0::m.field_0x28) * dVar7); + m3598 = 1.0f - ((1.0f - m_HIO->mCut.mCutTurnR.m.field_0x28) * dVar7); if (mVelocity <= 0.001f) { onModeFlg(ModeFlg_00000001); m3598 = 0.0f; @@ -1803,10 +1803,10 @@ BOOL daPy_lk_c::procCutReverse_init(daPy_ANM param_0) { } setSingleMoveAnime( param_0, - daPy_HIO_cut_c0::m.field_0x2C, - daPy_HIO_cut_c0::m.field_0x30, - daPy_HIO_cut_c0::m.field_0x6, - daPy_HIO_cut_c0::m.field_0x38 + m_HIO->mCut.m.field_0x2C, + m_HIO->mCut.m.field_0x30, + m_HIO->mCut.m.field_0x6, + m_HIO->mCut.m.field_0x38 ); mVelocity = 12.0f; current.angle.y = shape_angle.y + 0x8000; @@ -1825,9 +1825,9 @@ BOOL daPy_lk_c::procCutReverse() { cLib_addCalc( &mVelocity, 0.0f, - daPy_HIO_guard_c0::m.field_0x18, - daPy_HIO_guard_c0::m.field_0x1C, - daPy_HIO_guard_c0::m.field_0x20 + m_HIO->mGuard.m.field_0x18, + m_HIO->mGuard.m.field_0x1C, + m_HIO->mGuard.m.field_0x20 ); if (swordButton() && mEquipItem == daPyItem_SWORD_e) { onNoResetFlg0(daPyFlg0_UNK4); @@ -1837,7 +1837,7 @@ BOOL daPy_lk_c::procCutReverse() { if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { current.angle.y = shape_angle.y; checkNextMode(0); - } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_cut_c0::m.field_0x34) { + } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mCut.m.field_0x34) { current.angle.y = shape_angle.y; if (!checkNextMode(1)) { current.angle.y = shape_angle.y + 0x8000; @@ -1857,25 +1857,25 @@ BOOL daPy_lk_c::procJumpCut_init(int param_0) { if (param_0 != 0) { setSingleMoveAnime( ANM_JATTACK, - daPy_HIO_cutJump_c0::m.field_0x20, - daPy_HIO_cutJump_c0::m.field_0x24, - daPy_HIO_cutJump_c0::m.field_0x6, - daPy_HIO_cutJump_c0::m.field_0x28 + m_HIO->mCut.mCutJump.m.field_0x20, + m_HIO->mCut.mCutJump.m.field_0x24, + m_HIO->mCut.mCutJump.m.field_0x6, + m_HIO->mCut.mCutJump.m.field_0x28 ); - mVelocity = daPy_HIO_cutJump_c0::m.field_0x2C; - speed.y = daPy_HIO_cutJump_c0::m.field_0x30; - gravity = daPy_HIO_cutJump_c0::m.field_0x34; + mVelocity = m_HIO->mCut.mCutJump.m.field_0x2C; + speed.y = m_HIO->mCut.mCutJump.m.field_0x30; + gravity = m_HIO->mCut.mCutJump.m.field_0x34; } else { setSingleMoveAnime( ANM_JATTACK, - daPy_HIO_cutJump_c0::m.field_0x8, - daPy_HIO_cutJump_c0::m.field_0xC, - daPy_HIO_cutJump_c0::m.field_0x0, - daPy_HIO_cutJump_c0::m.field_0x10 + m_HIO->mCut.mCutJump.m.field_0x8, + m_HIO->mCut.mCutJump.m.field_0xC, + m_HIO->mCut.mCutJump.m.field_0x0, + m_HIO->mCut.mCutJump.m.field_0x10 ); - mVelocity = daPy_HIO_cutJump_c0::m.field_0x14; - speed.y = daPy_HIO_cutJump_c0::m.field_0x18; - gravity = daPy_HIO_cutJump_c0::m.field_0x1C; + mVelocity = m_HIO->mCut.mCutJump.m.field_0x14; + speed.y = m_HIO->mCut.mCutJump.m.field_0x18; + gravity = m_HIO->mCut.mCutJump.m.field_0x1C; } current.angle.y = shape_angle.y; mProcVar0.m3570 = 0; @@ -1902,8 +1902,8 @@ BOOL daPy_lk_c::procJumpCut() { } else if (current.angle.y != shape_angle.y) { cLib_addCalc(&mVelocity, 5.0f, 0.2f, 1.0f, 0.1f); } - if ((mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= daPy_HIO_cutJump_c0::m.field_0x48) && - (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() < daPy_HIO_cutJump_c0::m.field_0x4C)) + if ((mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= m_HIO->mCut.mCutJump.m.field_0x48) && + (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() < m_HIO->mCut.mCutJump.m.field_0x4C)) { if (mEquipItem != daPyItem_NONE_e) { if (!checkNoResetFlg0(daPyFlg0_CUT_AT_FLG)) { @@ -1921,23 +1921,23 @@ BOOL daPy_lk_c::procJumpCutLand_init() { f32 dVar3 = m35F0 - current.pos.y; commonProcInit(daPyProc_JUMP_CUT_LAND_e); if (!dComIfGp_event_runCheck()) { - if (dVar3 >= (100.0f * daPy_HIO_fall_c0::m.field_0x10)) { + if (dVar3 >= (100.0f * m_HIO->mFall.m.field_0x10)) { setDamagePoint(-2.0f); - } else if (dVar3 >= (100.0f * daPy_HIO_fall_c0::m.field_0x14)) { + } else if (dVar3 >= (100.0f * m_HIO->mFall.m.field_0x14)) { setDamagePoint(-1.0f); } - if (dVar3 >= (100.0f * daPy_HIO_fall_c0::m.field_0x14)) { - mDamageWaitTimer = daPy_HIO_dam_c0::m.field_0x0; + if (dVar3 >= (100.0f * m_HIO->mFall.m.field_0x14)) { + mDamageWaitTimer = m_HIO->mDam.m.field_0x0; onModeFlg(ModeFlg_DAMAGE); } } mVelocity = 0.0f; setSingleMoveAnime( ANM_JATTACKLAND, - daPy_HIO_cutJump_c0::m.field_0x38, - daPy_HIO_cutJump_c0::m.field_0x3C, - daPy_HIO_cutJump_c0::m.field_0x2, - daPy_HIO_cutJump_c0::m.field_0x40 + m_HIO->mCut.mCutJump.m.field_0x38, + m_HIO->mCut.mCutJump.m.field_0x3C, + m_HIO->mCut.mCutJump.m.field_0x2, + m_HIO->mCut.mCutJump.m.field_0x40 ); if (mEquipItem == daPyItem_NONE_e) { mProcVar0.m3570 = 0; @@ -1947,7 +1947,7 @@ BOOL daPy_lk_c::procJumpCutLand_init() { seStartSwordCut(JA_SE_LK_SW_KAZEKIRI_S); mSwBlur.initSwBlur( mpCLModel->getBaseTRMtx(), - (10.0f * daPy_HIO_cutJump_c0::m.field_0x48), + (10.0f * m_HIO->mCut.mCutJump.m.field_0x48), getBlurTopRate(), getSwordBlurColor() ); @@ -1956,7 +1956,7 @@ BOOL daPy_lk_c::procJumpCutLand_init() { setJumpCutAtParam(); mProcVar0.m3570 = 1; } - m34D0 = daPy_HIO_cutJump_c0::m.field_0x4; + m34D0 = m_HIO->mCut.mCutJump.m.field_0x4; current.angle.y = shape_angle.y + 0x8000; m34BE = 3; onResetFlg0(daPyRFlg0_RIGHT_FOOT_ON_GROUND); @@ -1984,7 +1984,7 @@ BOOL daPy_lk_c::procJumpCutLand() { } else { checkNextMode(0); } - } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_cutJump_c0::m.field_0x44) { + } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mCut.mCutJump.m.field_0x44) { checkNextMode(1); } else if (mProcVar0.m3570 != 0) { mProcVar0.m3570 = 0; @@ -2008,39 +2008,39 @@ BOOL daPy_lk_c::procCutExMJ_init(int param_0) { dVar3 = ANM_MROLLRC; m34D6 = 0x71; setBlurPosResource(LKANM__BTROTATECUTR_POS); - m35A0 = daPy_HIO_cutExMJ_c0::m.field_0x20; + m35A0 = m_HIO->mCut.mCutExMJ.m.field_0x20; } else { dVar3 = ANM_MROLLLC; m34D6 = 0x70; setBlurPosResource(LKANM__BTROTATECUTL_POS); - m35A0 = daPy_HIO_cutExMJ_c0::m.field_0x24; + m35A0 = m_HIO->mCut.mCutExMJ.m.field_0x24; } setSingleMoveAnime( dVar3, - daPy_HIO_cutExMJ_c0::m.field_0x4, - daPy_HIO_cutExMJ_c0::m.field_0x8, - daPy_HIO_cutExMJ_c0::m.field_0x0, - daPy_HIO_cutExMJ_c0::m.field_0xC + m_HIO->mCut.mCutExMJ.m.field_0x4, + m_HIO->mCut.mCutExMJ.m.field_0x8, + m_HIO->mCut.mCutExMJ.m.field_0x0, + m_HIO->mCut.mCutExMJ.m.field_0xC ); if (checkNormalSwordEquip()) { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_MROLLCA)); } else { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_MROLLCMS)); } - m35EC = daPy_HIO_cutExMJ_c0::m.field_0x8; + m35EC = m_HIO->mCut.mCutExMJ.m.field_0x8; onNoResetFlg0(daPyFlg0_UNK4); voiceStart(1); dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); if (m34C4 != 6) { - m3522 = daPy_HIO_cutExMJ_c0::m.field_0x2; + m3522 = m_HIO->mCut.mCutExMJ.m.field_0x2; setExtraCutAtParam(30); } else { m34C4 = 0; m3522 = 0; setExtraFinishCutAtParam(30); } - speed.y = daPy_HIO_cutExMJ_c0::m.field_0x10; - gravity = daPy_HIO_cutExMJ_c0::m.field_0x14; + speed.y = m_HIO->mCut.mCutExMJ.m.field_0x10; + gravity = m_HIO->mCut.mCutExMJ.m.field_0x14; m34D4 = 0; offNoResetFlg0(daPyFlg0_NO_FALL_VOICE); offNoResetFlg0(daPyFlg0_CUT_AT_FLG); @@ -2057,13 +2057,13 @@ BOOL daPy_lk_c::procCutExMJ() { offNoResetFlg0(daPyFlg0_UNK4); } if (m34C4 != 0) { - m3522 = daPy_HIO_cutExMJ_c0::m.field_0x2; + m3522 = m_HIO->mCut.mCutExMJ.m.field_0x2; } if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { if (m34D4 == 0) { m34D4 = 1; } else if (m34D4 == 1) { - setSingleMoveAnime(ANM_JMPEDS, 0.0f, 0.0f, -1, daPy_HIO_cutExMJ_c0::m.field_0x1C); + setSingleMoveAnime(ANM_JMPEDS, 0.0f, 0.0f, -1, m_HIO->mCut.mCutExMJ.m.field_0x1C); offModeFlg(ModeFlg_00000400); setTextureAnime(0x37, 0); resetSeAnime(); @@ -2081,7 +2081,7 @@ BOOL daPy_lk_c::procCutExMJ() { cLib_addCalcAngleS(&m34EC, -1, 2, 0x1800, 0x800); } if (mAcch.ChkGroundHit()) { - return changeLandProc(daPy_HIO_autoJump_c0::m.field_0x24); + return changeLandProc(m_HIO->mAutoJump.m.field_0x24); } } if (mpAttnActorLockOn != NULL) { @@ -2097,7 +2097,7 @@ BOOL daPy_lk_c::procCutExMJ() { m34C5 = 30; } if (speed.y < -gravity) { - gravity = daPy_HIO_cutExMJ_c0::m.field_0x18; + gravity = m_HIO->mCut.mCutExMJ.m.field_0x18; } setFallVoice(); if (m34D4 != 2 && (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= m35A0)) { @@ -2108,7 +2108,7 @@ BOOL daPy_lk_c::procCutExMJ() { onResetFlg0(daPyRFlg0_UNK2); } if (current.pos.y < m3688.y - 200.0f) { - cLib_chaseF(&mVelocity, 0.0f, (0.1f * daPy_HIO_autoJump_c0::m.field_0x3C)); + cLib_chaseF(&mVelocity, 0.0f, (0.1f * m_HIO->mAutoJump.m.field_0x3C)); } return true; } @@ -2118,17 +2118,17 @@ BOOL daPy_lk_c::procCutKesa_init() { commonProcInit(daPyProc_CUT_KESA_e); setSingleMoveAnime( ANM_CUTKESA, - daPy_HIO_cutKesa_c0::m.field_0x4, - daPy_HIO_cutKesa_c0::m.field_0x8, - daPy_HIO_cutKesa_c0::m.field_0x0, - daPy_HIO_cutKesa_c0::m.field_0xC + m_HIO->mCut.mCutKesa.m.field_0x4, + m_HIO->mCut.mCutKesa.m.field_0x8, + m_HIO->mCut.mCutKesa.m.field_0x0, + m_HIO->mCut.mCutKesa.m.field_0xC ); if (checkNormalSwordEquip()) { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_EXCA1A)); } else { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_EXCA1MS)); } - m35EC = daPy_HIO_cutKesa_c0::m.field_0x8; + m35EC = m_HIO->mCut.mCutKesa.m.field_0x8; m3700 = cXyz::Zero; m34C2 = 1; onNoResetFlg0(daPyFlg0_UNK4); @@ -2136,7 +2136,7 @@ BOOL daPy_lk_c::procCutKesa_init() { dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); setBlurPosResource(LKANM__CUTKESA_POS); setExtraCutAtParam(31); - m3522 = daPy_HIO_cutKesa_c0::m.field_0x2; + m3522 = m_HIO->mCut.mCutKesa.m.field_0x2; return true; } @@ -2149,14 +2149,14 @@ BOOL daPy_lk_c::procCutKesa() { } else { offNoResetFlg0(daPyFlg0_UNK4); } - m3522 = daPy_HIO_cutKesa_c0::m.field_0x2; + m3522 = m_HIO->mCut.mCutKesa.m.field_0x2; if (frameCtrl.getRate() < 0.01f) { mVelocity = 0.0f; checkNextMode(0); return true; } - if (frameCtrl.getFrame() > daPy_HIO_cutKesa_c0::m.field_0x18) { + if (frameCtrl.getFrame() > m_HIO->mCut.mCutKesa.m.field_0x18) { f32 dVar4 = mVelocity; mVelocity = 0.0f; if (checkNextMode(1)) { @@ -2182,8 +2182,8 @@ BOOL daPy_lk_c::procCutKesa() { setShapeAngleToAtnActor(); current.angle.y = shape_angle.y; } - if (frameCtrl.getFrame() >= daPy_HIO_cutKesa_c0::m.field_0x10 && - frameCtrl.getFrame() < daPy_HIO_cutKesa_c0::m.field_0x14) + if (frameCtrl.getFrame() >= m_HIO->mCut.mCutKesa.m.field_0x10 && + frameCtrl.getFrame() < m_HIO->mCut.mCutKesa.m.field_0x14) { if (!checkNoResetFlg0(daPyFlg0_CUT_AT_FLG)) { onResetFlg0(daPyRFlg0_UNK1); @@ -2195,9 +2195,9 @@ BOOL daPy_lk_c::procCutKesa() { cLib_addCalc( &mVelocity, 0.0f, - daPy_HIO_cutEA_c0::m.field_0x1C, - daPy_HIO_cutEA_c0::m.field_0x14, - daPy_HIO_cutEA_c0::m.field_0x18 + m_HIO->mCut.mCutEA.m.field_0x1C, + m_HIO->mCut.mCutEA.m.field_0x14, + m_HIO->mCut.mCutEA.m.field_0x18 ); return true; diff --git a/src/d/actor/d_a_player_tact.inc b/src/d/actor/d_a_player_tact.inc index bb7431dc..5b7fcbb9 100644 --- a/src/d/actor/d_a_player_tact.inc +++ b/src/d/actor/d_a_player_tact.inc @@ -250,10 +250,10 @@ BOOL daPy_lk_c::procTactWait_init(int r30) { commonProcInit(daPyProc_TACT_WAIT_e); daPy_matAnm_c::offMabaFlg(); - 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); + setSingleMoveAnime(ANM_WAITTAKT, m_HIO->mItem.mTact.m.mAnmRate, 0.0f, -1, m_HIO->mItem.mTact.m.field_0x4); + setActAnimeUpper(LKANM_BCK_WAITTAKT, UPPER_MOVE1_e, m_HIO->mItem.mTact.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.mAnmRate, 0.0f, -1, -1.0f); + setActAnimeUpper(LKANM_BCK_WAITTAKT, UPPER_MOVE2_e, m_HIO->mItem.mTact.m.mAnmRate, 0.0f, -1, -1.0f); mAnmRatioUpper[UPPER_MOVE2_e].setRatio(0.0f); mVelocity = 0.0f; m34D4 = 0; @@ -376,14 +376,14 @@ BOOL daPy_lk_c::procTactWait() { setActAnimeUpper( getTactPlayRightArmAnm(rightDir), UPPER_MOVE1_e, - daPy_HIO_tact_c0::m.mRightArmAnmRate, + m_HIO->mItem.mTact.m.mRightArmAnmRate, 0.0f, -1, - daPy_HIO_tact_c0::m.field_0xC + m_HIO->mItem.mTact.m.field_0xC ); if (rightDir == 0 || rightDir == 2 || rightDir == 4) { - mFrameCtrlUpper[UPPER_MOVE1_e].setRate(daPy_HIO_tact_c0::m.mAnmRate); + mFrameCtrlUpper[UPPER_MOVE1_e].setRate(m_HIO->mItem.mTact.m.mAnmRate); mFrameCtrlUpper[UPPER_MOVE1_e].setFrame(mFrameCtrlUnder[UNDER_MOVE0_e].getFrame()); } @@ -413,14 +413,14 @@ BOOL daPy_lk_c::procTactWait() { if (m35A8 <= 0.0f || leftDir != 0) { f32 rate; if (m34D4 == 4) { - rate = daPy_HIO_tact_c0::m.field_0x14; + rate = m_HIO->mItem.mTact.m.field_0x14; } else if (m34D4 == 2) { - rate = daPy_HIO_tact_c0::m.field_0x18; + rate = m_HIO->mItem.mTact.m.field_0x18; } else { - rate = daPy_HIO_tact_c0::m.field_0x10; + rate = m_HIO->mItem.mTact.m.field_0x10; } setActAnimeUpper( - getTactPlayLeftArmAnm(leftDir), UPPER_MOVE2_e, rate, 0.0f, -1, daPy_HIO_tact_c0::m.field_0xC + getTactPlayLeftArmAnm(leftDir), UPPER_MOVE2_e, rate, 0.0f, -1, m_HIO->mItem.mTact.m.field_0xC ); m34D6 = leftDir; mAnmRatioUpper[UPPER_MOVE2_e].setRatio(0.0f); @@ -488,11 +488,11 @@ BOOL daPy_lk_c::procTactWait() { f32 f0; if (m34D4 == 4) { - f0 = daPy_HIO_tact_c0::m.field_0x14; + f0 = m_HIO->mItem.mTact.m.field_0x14; } else if (m34D4 == 2) { - f0 = daPy_HIO_tact_c0::m.field_0x18; + f0 = m_HIO->mItem.mTact.m.field_0x18; } else { - f0 = daPy_HIO_tact_c0::m.field_0x10; + f0 = m_HIO->mItem.mTact.m.field_0x10; } mFrameCtrlUpper[UPPER_MOVE2_e].setRate(f0); @@ -661,7 +661,7 @@ BOOL daPy_lk_c::procTactPlay() { m34D0 = 1; mDoAud_tact_reset(); - setSingleMoveAnime(ANM_WAITTAKT, daPy_HIO_tact_c0::m.mAnmRate, 0.0f, -1, 10.0f); + setSingleMoveAnime(ANM_WAITTAKT, m_HIO->mItem.mTact.m.mAnmRate, 0.0f, -1, 10.0f); setTextureAnime(6, 0); onModeFlg(ModeFlg_00000100); offModeFlg(ModeFlg_00000400); @@ -678,7 +678,7 @@ BOOL daPy_lk_c::procTactPlayEnd_init(int r30) { initShipRideUseItem(r28, 2); mProcVar0.m3570 = r30; mVelocity = 0.0f; - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); if (r30 == -1) { dCam_getBody()->EndEventCamera(fopAcM_GetID(this)); @@ -789,7 +789,7 @@ BOOL daPy_lk_c::procTactPlayOriginal_init() { dComIfGp_setPlayerStatus1(0, daPyStts1_WIND_WAKER_CONDUCT_e); m34D0 = 0; daPy_matAnm_c::offMabaFlg(); - setSingleMoveAnime(ANM_WAITTAKT, daPy_HIO_tact_c0::m.mAnmRate, 0.0f, -1, daPy_HIO_tact_c0::m.field_0x4); + setSingleMoveAnime(ANM_WAITTAKT, m_HIO->mItem.mTact.m.mAnmRate, 0.0f, -1, m_HIO->mItem.mTact.m.field_0x4); mProcVar0.m3570 = dComIfGp_event_getTactFreeMStick(m34D0); setActAnimeUpper(getTactPlayRightArmAnm(mProcVar0.m3570), UPPER_MOVE1_e, 0.0f, 0.0f, -1, -1.0f); @@ -830,16 +830,16 @@ BOOL daPy_lk_c::procTactPlayOriginal() { mProcVar0.m3570 = dComIfGp_event_getTactFreeMStick(m34D0); setActAnimeUpper( - getTactPlayRightArmAnm(mProcVar0.m3570), UPPER_MOVE1_e, daPy_HIO_tact_c0::m.mRightArmAnmRate, 0.0f, -1, 5.0f + getTactPlayRightArmAnm(mProcVar0.m3570), UPPER_MOVE1_e, m_HIO->mItem.mTact.m.mRightArmAnmRate, 0.0f, -1, 5.0f ); mAnmRatioUpper[UPPER_MOVE1_e].setRatio(0.0f); if (mProcVar0.m3570 == 0 || mProcVar0.m3570 == 2 || mProcVar0.m3570 == 4) { - mFrameCtrlUpper[UPPER_MOVE1_e].setRate(daPy_HIO_tact_c0::m.mAnmRate); + mFrameCtrlUpper[UPPER_MOVE1_e].setRate(m_HIO->mItem.mTact.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.mAnmRate, 0.0f, -1, 5.0f); + setActAnimeUpper(getTactPlayLeftArmAnm(m3574), UPPER_MOVE2_e, m_HIO->mItem.mTact.m.mAnmRate, 0.0f, -1, 5.0f); mAnmRatioUpper[UPPER_MOVE2_e].setRatio(0.0f); mFrameCtrlUpper[UPPER_MOVE2_e].setFrame(mFrameCtrlUnder[UNDER_MOVE0_e].getFrame()); diff --git a/src/d/actor/d_a_player_vomit.inc b/src/d/actor/d_a_player_vomit.inc index a367229d..68c3c83f 100644 --- a/src/d/actor/d_a_player_vomit.inc +++ b/src/d/actor/d_a_player_vomit.inc @@ -41,13 +41,13 @@ BOOL daPy_lk_c::procVomitReady_init(s16 param_0, f32 param_1) { commonProcInit(daPyProc_VOMIT_READY_e); setSingleMoveAnime( ANM_MSTEPOVER, - daPy_HIO_vomit_c0::m.field_0xC, - daPy_HIO_vomit_c0::m.field_0x10, - daPy_HIO_vomit_c0::m.field_0x0, - daPy_HIO_vomit_c0::m.field_0x14 + m_HIO->mVomit.m.field_0xC, + m_HIO->mVomit.m.field_0x10, + m_HIO->mVomit.m.field_0x0, + m_HIO->mVomit.m.field_0x14 ); - speed.y = daPy_HIO_vomit_c0::m.field_0x18; - mVelocity = (param_1 * -gravity) / (2.0f * daPy_HIO_vomit_c0::m.field_0x18); + speed.y = m_HIO->mVomit.m.field_0x18; + mVelocity = (param_1 * -gravity) / (2.0f * m_HIO->mVomit.m.field_0x18); if (checkHeavyStateOn()) { speed.y *= 1.5f; mVelocity *= 1.5f; @@ -63,11 +63,11 @@ BOOL daPy_lk_c::procVomitReady() { setFallVoice(); if (!checkJumpFlower()) { if (mAcch.ChkGroundHit()) { - changeLandProc(daPy_HIO_autoJump_c0::m.field_0x24); + changeLandProc(m_HIO->mAutoJump.m.field_0x24); } else if (checkFanGlideProc(0)) { return true; } else if (speed.y < -gravity) { - setSingleMoveAnime(ANM_JMPEDS, 0.0f, 0.0f, -1, daPy_HIO_wallCatch_c0::m.field_0x54); + setSingleMoveAnime(ANM_JMPEDS, 0.0f, 0.0f, -1, m_HIO->mWallCatch.m.field_0x54); offModeFlg(ModeFlg_00000400); setTextureAnime(0x37, 0); resetSeAnime(); @@ -188,7 +188,7 @@ BOOL daPy_lk_c::procVomitJump_init(int param_0) { speed.y = 46.0f; mProcVar0.m3570 = 1; } else { - speed.y = daPy_HIO_vomit_c0::m.field_0x1C; + speed.y = m_HIO->mVomit.m.field_0x1C; } m34D2 = 0; } @@ -202,7 +202,7 @@ BOOL daPy_lk_c::procVomitJump() { if (m34D2 == 0) { voiceStart(0); speed.y = 46.0f; - gravity = daPy_HIO_autoJump_c0::m.field_0xC; + gravity = m_HIO->mAutoJump.m.field_0xC; } mStts.ClrCcMove(); return true; @@ -214,15 +214,15 @@ BOOL daPy_lk_c::procVomitJump() { } if (!checkJumpFlower()) { if (mAcch.ChkGroundHit()) { - changeLandProc(daPy_HIO_autoJump_c0::m.field_0x24); + changeLandProc(m_HIO->mAutoJump.m.field_0x24); } else { s16 sVar1 = shape_angle.x; - shape_angle.x = sVar1 + daPy_HIO_vomit_c0::m.field_0x2; + shape_angle.x = sVar1 + m_HIO->mVomit.m.field_0x2; if (sVar1 < 0 && 0 < shape_angle.x) { seStartOnlyReverb(JA_SE_LK_JUMP_FLOWER_OUT); } if (mProcVar0.m3570 == 1) { - cLib_addCalc(&mVelocity, daPy_HIO_vomit_c0::m.field_0x20, 0.5f, 2.0f, 0.1f); + cLib_addCalc(&mVelocity, m_HIO->mVomit.m.field_0x20, 0.5f, 2.0f, 0.1f); } else { f32 fVar2; if (!checkFanGlideProc(1)) { @@ -239,7 +239,7 @@ BOOL daPy_lk_c::procVomitJump() { fVar2 = 0.0f; } cLib_addCalc( - &mVelocity, (daPy_HIO_vomit_c0::m.field_0x20 * mStickDistance * fVar2), 0.5f, 2.0f, 0.1f + &mVelocity, (m_HIO->mVomit.m.field_0x20 * mStickDistance * fVar2), 0.5f, 2.0f, 0.1f ); } } @@ -254,12 +254,12 @@ BOOL daPy_lk_c::procVomitLand_init() { mVelocity = 0.0f; setSingleMoveAnime( ANM_LANDDAMA, - daPy_HIO_vomit_c0::m.field_0x24, - daPy_HIO_vomit_c0::m.field_0x28, - daPy_HIO_vomit_c0::m.field_0x4, - daPy_HIO_vomit_c0::m.field_0x2C + m_HIO->mVomit.m.field_0x24, + m_HIO->mVomit.m.field_0x28, + m_HIO->mVomit.m.field_0x4, + m_HIO->mVomit.m.field_0x2C ); - m34D0 = daPy_HIO_vomit_c0::m.field_0x6; + m34D0 = m_HIO->mVomit.m.field_0x6; mProcVar0.m3570 = 0; m34BE = 5; return true; @@ -271,7 +271,7 @@ BOOL daPy_lk_c::procVomitLand() { if (mProcVar0.m3570 != 0) { if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { checkNextMode(0); - } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_vomit_c0::m.field_0x3C) { + } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mVomit.m.field_0x3C) { checkNextMode(1); } } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { @@ -280,10 +280,10 @@ BOOL daPy_lk_c::procVomitLand() { } else { setSingleMoveAnime( ANM_LANDDAMAST, - daPy_HIO_vomit_c0::m.field_0x30, - daPy_HIO_vomit_c0::m.field_0x34, - daPy_HIO_vomit_c0::m.field_0x8, - daPy_HIO_vomit_c0::m.field_0x38 + m_HIO->mVomit.m.field_0x30, + m_HIO->mVomit.m.field_0x34, + m_HIO->mVomit.m.field_0x8, + m_HIO->mVomit.m.field_0x38 ); mProcVar0.m3570 = 1; } diff --git a/src/d/actor/d_a_player_weapon.inc b/src/d/actor/d_a_player_weapon.inc index 2bd30449..d321709e 100644 --- a/src/d/actor/d_a_player_weapon.inc +++ b/src/d/actor/d_a_player_weapon.inc @@ -49,10 +49,10 @@ BOOL daPy_lk_c::procWeaponNormalSwing_init() { commonProcInit(daPyProc_WEAPON_NORMAL_SWING_e); setSingleMoveAnime( ANM_CUTBOKO, - daPy_HIO_cutBoko_c0::m.field_0x10, - daPy_HIO_cutBoko_c0::m.field_0x18, - daPy_HIO_cutBoko_c0::m.field_0x6, - daPy_HIO_cutBoko_c0::m.field_0x34 + m_HIO->mCut.mCutBoko.m.field_0x10, + m_HIO->mCut.mCutBoko.m.field_0x18, + m_HIO->mCut.mCutBoko.m.field_0x6, + m_HIO->mCut.mCutBoko.m.field_0x34 ); current.angle.y = shape_angle.y; m3700 = cXyz::Zero; @@ -67,7 +67,7 @@ BOOL daPy_lk_c::procWeaponNormalSwing_init() { m351E = m34DC; setBlurPosResource(LKANM__CUTBOKO_POS); setEnemyWeaponAtParam(0); - m34D0 = daPy_HIO_cutBoko_c0::m.field_0x4; + m34D0 = m_HIO->mCut.mCutBoko.m.field_0x4; return true; } @@ -94,7 +94,7 @@ BOOL daPy_lk_c::procWeaponNormalSwing() { checkNextMode(0); return true; } - } else if (frameCtrl.getFrame() > daPy_HIO_cutBoko_c0::m.field_0x1C) { + } else if (frameCtrl.getFrame() > m_HIO->mCut.mCutBoko.m.field_0x1C) { f32 dVar4 = mVelocity; u8 orig_direction = mDirection; mVelocity = 0.0f; @@ -118,21 +118,21 @@ BOOL daPy_lk_c::procWeaponNormalSwing() { cLib_addCalcAngleS( &shape_angle.y, m34D4, - daPy_HIO_turn_c0::m.field_0x4, - daPy_HIO_turn_c0::m.field_0x0, - daPy_HIO_turn_c0::m.field_0x2 + m_HIO->mTurn.m.field_0x4, + m_HIO->mTurn.m.field_0x0, + m_HIO->mTurn.m.field_0x2 ); } current.angle.y = shape_angle.y; - if (frameCtrl.checkPass(daPy_HIO_cutBoko_c0::m.field_0x38)) { - mVelocity = std::fabsf(speedF) * daPy_HIO_cutBoko_c0::m.field_0x20 + daPy_HIO_cutBoko_c0::m.field_0x24; + if (frameCtrl.checkPass(m_HIO->mCut.mCutBoko.m.field_0x38)) { + mVelocity = std::fabsf(speedF) * m_HIO->mCut.mCutBoko.m.field_0x20 + m_HIO->mCut.mCutBoko.m.field_0x24; } - if (frameCtrl.checkPass(daPy_HIO_cutBoko_c0::m.field_0x3C)) { - frameCtrl.setRate(daPy_HIO_cutBoko_c0::m.field_0x14); + if (frameCtrl.checkPass(m_HIO->mCut.mCutBoko.m.field_0x3C)) { + frameCtrl.setRate(m_HIO->mCut.mCutBoko.m.field_0x14); } - if (frameCtrl.getFrame() >= daPy_HIO_cutBoko_c0::m.field_0x40 && - frameCtrl.getFrame() < daPy_HIO_cutBoko_c0::m.field_0x44) + if (frameCtrl.getFrame() >= m_HIO->mCut.mCutBoko.m.field_0x40 && + frameCtrl.getFrame() < m_HIO->mCut.mCutBoko.m.field_0x44) { if (!checkNoResetFlg0(daPyFlg0_CUT_AT_FLG)) { onResetFlg0(daPyRFlg0_UNK1); @@ -143,9 +143,9 @@ BOOL daPy_lk_c::procWeaponNormalSwing() { cLib_addCalc( &mVelocity, 0.0f, - daPy_HIO_cutBoko_c0::m.field_0x30, - daPy_HIO_cutBoko_c0::m.field_0x28, - daPy_HIO_cutBoko_c0::m.field_0x2C + m_HIO->mCut.mCutBoko.m.field_0x30, + m_HIO->mCut.mCutBoko.m.field_0x28, + m_HIO->mCut.mCutBoko.m.field_0x2C ); return true; @@ -156,10 +156,10 @@ BOOL daPy_lk_c::procWeaponSideSwing_init() { commonProcInit(daPyProc_WEAPON_SIDE_SWING_e); setSingleMoveAnime( ANM_HAMSWINGA, - daPy_HIO_cutBoko_c0::m.field_0x48, - daPy_HIO_cutBoko_c0::m.field_0x4C, - daPy_HIO_cutBoko_c0::m.field_0x8, - daPy_HIO_cutBoko_c0::m.field_0x54 + m_HIO->mCut.mCutBoko.m.field_0x48, + m_HIO->mCut.mCutBoko.m.field_0x4C, + m_HIO->mCut.mCutBoko.m.field_0x8, + m_HIO->mCut.mCutBoko.m.field_0x54 ); current.angle.y = shape_angle.y; mVelocity = 0.0f; @@ -185,7 +185,7 @@ BOOL daPy_lk_c::procWeaponSideSwing() { return true; } - if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_cutBoko_c0::m.field_0x50) { + if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mCut.mCutBoko.m.field_0x50) { f32 dVar4 = mVelocity; u8 orig_direction = mDirection; mVelocity = 0.0f; @@ -208,14 +208,14 @@ BOOL daPy_lk_c::procWeaponSideSwing() { cLib_addCalcAngleS( &shape_angle.y, m34D4, - daPy_HIO_turn_c0::m.field_0x4, - daPy_HIO_turn_c0::m.field_0x0, - daPy_HIO_turn_c0::m.field_0x2 + m_HIO->mTurn.m.field_0x4, + m_HIO->mTurn.m.field_0x0, + m_HIO->mTurn.m.field_0x2 ); } current.angle.y = shape_angle.y; - if ((mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= daPy_HIO_cutBoko_c0::m.field_0x58) && - (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() < daPy_HIO_cutBoko_c0::m.field_0x5C)) + if ((mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= m_HIO->mCut.mCutBoko.m.field_0x58) && + (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() < m_HIO->mCut.mCutBoko.m.field_0x5C)) { if (!checkNoResetFlg0(daPyFlg0_CUT_AT_FLG)) { onResetFlg0(daPyRFlg0_UNK1); @@ -232,10 +232,10 @@ BOOL daPy_lk_c::procWeaponFrontSwingReady_init() { commonProcInit(daPyProc_WEAPON_FRONT_SWING_READY_e); setSingleMoveAnime( ANM_HAMSWINGBPRE, - daPy_HIO_cutBoko_c0::m.field_0x60, - daPy_HIO_cutBoko_c0::m.field_0x64, - daPy_HIO_cutBoko_c0::m.field_0xA, - daPy_HIO_cutBoko_c0::m.field_0x68 + m_HIO->mCut.mCutBoko.m.field_0x60, + m_HIO->mCut.mCutBoko.m.field_0x64, + m_HIO->mCut.mCutBoko.m.field_0xA, + m_HIO->mCut.mCutBoko.m.field_0x68 ); current.angle.y = shape_angle.y; mVelocity = 0.0f; @@ -265,9 +265,9 @@ BOOL daPy_lk_c::procWeaponFrontSwingReady() { cLib_addCalcAngleS( &shape_angle.y, m34D4, - daPy_HIO_turn_c0::m.field_0x4, - daPy_HIO_turn_c0::m.field_0x0, - daPy_HIO_turn_c0::m.field_0x2 + m_HIO->mTurn.m.field_0x4, + m_HIO->mTurn.m.field_0x0, + m_HIO->mTurn.m.field_0x2 ); } @@ -280,9 +280,9 @@ BOOL daPy_lk_c::procWeaponFrontSwing_init() { commonProcInit(daPyProc_WEAPON_FRONT_SWING_e); setSingleMoveAnime( ANM_HAMSWINGBHIT, - 4.0f * daPy_HIO_cutBoko_c0::m.field_0x6C, - daPy_HIO_cutBoko_c0::m.field_0x70, - daPy_HIO_cutBoko_c0::m.field_0xC, + 4.0f * m_HIO->mCut.mCutBoko.m.field_0x6C, + m_HIO->mCut.mCutBoko.m.field_0x70, + m_HIO->mCut.mCutBoko.m.field_0xC, 0.0f ); current.angle.y = shape_angle.y; @@ -320,9 +320,9 @@ BOOL daPy_lk_c::procWeaponFrontSwing() { cLib_addCalcAngleS( &shape_angle.y, m34D4, - daPy_HIO_turn_c0::m.field_0x4, - daPy_HIO_turn_c0::m.field_0x0, - daPy_HIO_turn_c0::m.field_0x2 + m_HIO->mTurn.m.field_0x4, + m_HIO->mTurn.m.field_0x0, + m_HIO->mTurn.m.field_0x2 ); } current.angle.y = shape_angle.y; @@ -335,10 +335,10 @@ BOOL daPy_lk_c::procWeaponFrontSwingEnd_init() { commonProcInit(daPyProc_WEAPON_FRONT_SWING_END_e); setSingleMoveAnime( ANM_HAMSWINGBEND, - daPy_HIO_cutBoko_c0::m.field_0x74, - daPy_HIO_cutBoko_c0::m.field_0x78, - daPy_HIO_cutBoko_c0::m.field_0xE, - daPy_HIO_cutBoko_c0::m.field_0x80 + m_HIO->mCut.mCutBoko.m.field_0x74, + m_HIO->mCut.mCutBoko.m.field_0x78, + m_HIO->mCut.mCutBoko.m.field_0xE, + m_HIO->mCut.mCutBoko.m.field_0x80 ); current.angle.y = shape_angle.y; mVelocity = 0.0f; @@ -356,7 +356,7 @@ BOOL daPy_lk_c::procWeaponFrontSwingEnd() { if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f || mActorKeepEquip.getActor() == NULL) { return checkNextMode(0); - } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_cutBoko_c0::m.field_0x7C) { + } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > m_HIO->mCut.mCutBoko.m.field_0x7C) { return checkNextMode(1); } else { return true; diff --git a/src/d/actor/d_a_player_whide.inc b/src/d/actor/d_a_player_whide.inc index d9dc8af7..70909375 100644 --- a/src/d/actor/d_a_player_whide.inc +++ b/src/d/actor/d_a_player_whide.inc @@ -25,24 +25,24 @@ void daPy_lk_c::setBlendWHideMoveAnime(f32 param_0) { daPy_ANM dVar5; if (!checkNoResetFlg0(daPyFlg0_UNK10000)) { - fVar1 = daPy_HIO_wall_c0::m.field_0x14; - fVar5 = daPy_HIO_wall_c0::m.field_0x40; + fVar1 = m_HIO->mWall.m.field_0x14; + fVar5 = m_HIO->mWall.m.field_0x40; dVar6 = ANM_WALL; - sVar1 = daPy_HIO_wall_c0::m.field_0x8; - fVar6 = daPy_HIO_wall_c0::m.field_0x60; - fVar3 = daPy_HIO_wall_c0::m.field_0x58; + sVar1 = m_HIO->mWall.m.field_0x8; + fVar6 = m_HIO->mWall.m.field_0x60; + fVar3 = m_HIO->mWall.m.field_0x58; if (mDirection == DIR_LEFT) { dVar5 = ANM_WALLWR; } else { dVar5 = ANM_WALLWL; } } else { - fVar1 = daPy_HIO_wall_c0::m.field_0x18; - fVar5 = daPy_HIO_wall_c0::m.field_0x44; + fVar1 = m_HIO->mWall.m.field_0x18; + fVar5 = m_HIO->mWall.m.field_0x44; dVar6 = ANM_WALLDW; - sVar1 = daPy_HIO_wall_c0::m.field_0xA; - fVar6 = daPy_HIO_wall_c0::m.field_0x64; - fVar3 = daPy_HIO_wall_c0::m.field_0x5C; + sVar1 = m_HIO->mWall.m.field_0xA; + fVar6 = m_HIO->mWall.m.field_0x64; + fVar3 = m_HIO->mWall.m.field_0x5C; if (mDirection == DIR_LEFT) { dVar5 = ANM_WALLWRDW; } else { @@ -96,9 +96,9 @@ cM3dGPla* daPy_lk_c::getWHideModePolygon(cXyz* param_0, cXyz* param_1, cXyz* par *param_2 = mLinkLinChk.GetCross(); cXyz local_3c; - local_3c.x = param_2->x + cM_ssin(uVar3) * daPy_HIO_wall_c0::m.field_0x50; + local_3c.x = param_2->x + cM_ssin(uVar3) * m_HIO->mWall.m.field_0x50; local_3c.y = param_2->y; - local_3c.z = param_2->z + cM_ssin(uVar3) * daPy_HIO_wall_c0::m.field_0x50; + local_3c.z = param_2->z + cM_ssin(uVar3) * m_HIO->mWall.m.field_0x50; mGndChk.SetPos(&local_3c); float f31 = bgs->GroundCross(&mGndChk); if (-G_CM3D_F_INF != f31 && (!cBgW_CheckBGround(bgs->GetTriPla(mGndChk)->GetNP()->y))) { @@ -153,12 +153,12 @@ cM3dGPla* daPy_lk_c::getWHideModePolygon(cXyz* param_0, cXyz* param_1, cXyz* par if (direction != DIR_NONE) { if (direction == DIR_LEFT) { sVar7 = sVar7 - shape_angle.y; - param_2->x += daPy_HIO_wall_c0::m.field_0x54 * triPla->GetNP()->z; - param_2->z -= daPy_HIO_wall_c0::m.field_0x54 * triPla->GetNP()->x; + param_2->x += m_HIO->mWall.m.field_0x54 * triPla->GetNP()->z; + param_2->z -= m_HIO->mWall.m.field_0x54 * triPla->GetNP()->x; } else { sVar7 = shape_angle.y - sVar7; - param_2->x -= daPy_HIO_wall_c0::m.field_0x54 * triPla->GetNP()->z; - param_2->z += daPy_HIO_wall_c0::m.field_0x54 * triPla->GetNP()->x; + param_2->x -= m_HIO->mWall.m.field_0x54 * triPla->GetNP()->z; + param_2->z += m_HIO->mWall.m.field_0x54 * triPla->GetNP()->x; } if (sVar7 > 0x2aaa) { return NULL; @@ -185,9 +185,9 @@ void daPy_lk_c::getWHideBasePos(cXyz* param_0) { /* 80137640-8013769C .text getWHideNextPos__9daPy_lk_cFP4cXyzP4cXyz */ void daPy_lk_c::getWHideNextPos(cXyz* param_0, cXyz* param_1) { param_1->set( - param_0->x + cM_ssin(current.angle.y) * daPy_HIO_wall_c0::m.field_0x54, + param_0->x + cM_ssin(current.angle.y) * m_HIO->mWall.m.field_0x54, param_0->y, - param_0->z + cM_scos(current.angle.y) * daPy_HIO_wall_c0::m.field_0x54 + param_0->z + cM_scos(current.angle.y) * m_HIO->mWall.m.field_0x54 ); } @@ -274,21 +274,21 @@ BOOL daPy_lk_c::procWHideReady_init(cM3dGPla* param_0, cXyz* param_1) { m370C.z = param_1->z; if (param_0 != NULL) { m34D4 = cM_atan2s(param_0->mNormal.x, param_0->mNormal.z); - m370C.x += param_0->mNormal.x * daPy_HIO_wall_c0::m.field_0x50; - m370C.z += param_0->mNormal.z * daPy_HIO_wall_c0::m.field_0x50; + m370C.x += param_0->mNormal.x * m_HIO->mWall.m.field_0x50; + m370C.z += param_0->mNormal.z * m_HIO->mWall.m.field_0x50; } else { m34D4 = m352C; - m370C.x += cM_ssin(m352C) * daPy_HIO_wall_c0::m.field_0x50; - m370C.z += cM_scos(m352C) * daPy_HIO_wall_c0::m.field_0x50; + m370C.x += cM_ssin(m352C) * m_HIO->mWall.m.field_0x50; + m370C.z += cM_scos(m352C) * m_HIO->mWall.m.field_0x50; } if (mEquipItem == daPyItem_NONE_e) { if (checkEquipAnime()) { resetActAnimeUpper(UPPER_MOVE2_e, -1.0f); } - setSingleMoveAnime(ANM_WALL, 0.0f, daPy_HIO_wall_c0::m.field_0x24, -1, daPy_HIO_wall_c0::m.field_0x34); + setSingleMoveAnime(ANM_WALL, 0.0f, m_HIO->mWall.m.field_0x24, -1, m_HIO->mWall.m.field_0x34); mProcVar0.m3570 = 1; } else { - setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); setAnimeUnequip(); mProcVar0.m3570 = 0; } @@ -305,7 +305,7 @@ BOOL daPy_lk_c::procWHideReady() { } if (mProcVar0.m3570 == 0) { if (checkNoUpperAnime()) { - setSingleMoveAnime(ANM_WALL, 0.0f, daPy_HIO_wall_c0::m.field_0x24, -1, daPy_HIO_wall_c0::m.field_0x34); + setSingleMoveAnime(ANM_WALL, 0.0f, m_HIO->mWall.m.field_0x24, -1, m_HIO->mWall.m.field_0x34); mProcVar0.m3570 = 1; } return true; @@ -329,22 +329,22 @@ BOOL daPy_lk_c::procWHideWait_init() { if (!checkNoResetFlg0(daPyFlg0_UNK10000)) { dVar3 = ANM_WALL; - sVar2 = daPy_HIO_wall_c0::m.field_0x0; - dVar4 = daPy_HIO_wall_c0::m.field_0x38; + sVar2 = m_HIO->mWall.m.field_0x0; + dVar4 = m_HIO->mWall.m.field_0x38; } else { dVar3 = ANM_WALLDW; - sVar2 = daPy_HIO_wall_c0::m.field_0x2; - dVar4 = daPy_HIO_wall_c0::m.field_0x3C; + sVar2 = m_HIO->mWall.m.field_0x2; + dVar4 = m_HIO->mWall.m.field_0x3C; } if (mCurProc == daPyProc_WHIDE_READY_e) { - fVar1 = daPy_HIO_wall_c0::m.field_0x24; + fVar1 = m_HIO->mWall.m.field_0x24; } else { fVar1 = sVar2 - 0.001f; } dVar5 = fVar1; commonProcInit(daPyProc_WHIDE_WAIT_e); mVelocity = 0.0f; - setSingleMoveAnime(dVar3, daPy_HIO_wall_c0::m.field_0xC, dVar5, sVar2, dVar4); + setSingleMoveAnime(dVar3, m_HIO->mWall.m.field_0xC, dVar5, sVar2, dVar4); current.angle.y = shape_angle.y; dComIfGp_setPlayerStatus0(0, daPyStts0_UNK1_e); return true; @@ -364,22 +364,22 @@ BOOL daPy_lk_c::procWHideWait() { if (iVar1 == 1) { setSingleMoveAnime( ANM_WALLDW, - daPy_HIO_wall_c0::m.field_0x10, - daPy_HIO_wall_c0::m.field_0x28, - daPy_HIO_wall_c0::m.field_0x2, - daPy_HIO_wall_c0::m.field_0x3C + m_HIO->mWall.m.field_0x10, + m_HIO->mWall.m.field_0x28, + m_HIO->mWall.m.field_0x2, + m_HIO->mWall.m.field_0x3C ); onNoResetFlg0(daPyFlg0_UNK10000); mAcchCir[2].SetWallH(89.9f); } else if (iVar1 == -1) { setSingleMoveAnime( ANM_WALLDW, - -daPy_HIO_wall_c0::m.field_0x10, - daPy_HIO_wall_c0::m.field_0x28, - daPy_HIO_wall_c0::m.field_0x2, - daPy_HIO_wall_c0::m.field_0x3C + -m_HIO->mWall.m.field_0x10, + m_HIO->mWall.m.field_0x28, + m_HIO->mWall.m.field_0x2, + m_HIO->mWall.m.field_0x3C ); - mFrameCtrlUnder[UNDER_MOVE0_e].setFrame(daPy_HIO_wall_c0::m.field_0x2 - 0.001f); + mFrameCtrlUnder[UNDER_MOVE0_e].setFrame(m_HIO->mWall.m.field_0x2 - 0.001f); mAnmRatioUnder[UNDER_MOVE0_e].getAnmTransform()->setFrame(mFrameCtrlUnder[UNDER_MOVE0_e].getFrame()); offNoResetFlg0(daPyFlg0_UNK10000); mAcchCir[2].SetWallH(125.0f); @@ -468,7 +468,7 @@ BOOL daPy_lk_c::procWHideMove() { setBlendWHideMoveAnime(2.0f); } if (direction == DIR_FORWARD || direction == DIR_BACKWARD) { - fVar2 = daPy_HIO_move_c0::m.field_0x14; + fVar2 = m_HIO->mMove.m.field_0x14; fVar2 *= mStickDistance; } else { fVar2 = 0.0f; @@ -511,8 +511,8 @@ BOOL daPy_lk_c::procWHideMove() { current.pos.x += 8.0f * cM_ssin(current.angle.y); current.pos.z += 8.0f * cM_scos(current.angle.y); } - current.pos.x -= 0.8f * daPy_HIO_wall_c0::m.field_0x50 * cM_ssin(shape_angle.y); - current.pos.z -= 0.8f * daPy_HIO_wall_c0::m.field_0x50 * cM_scos(shape_angle.y); + current.pos.x -= 0.8f * m_HIO->mWall.m.field_0x50 * cM_ssin(shape_angle.y); + current.pos.z -= 0.8f * m_HIO->mWall.m.field_0x50 * cM_scos(shape_angle.y); setBlendWHideMoveAnime(-1.0f); return true; } @@ -527,20 +527,20 @@ BOOL daPy_lk_c::procWHidePeep_init() { commonProcInit(daPyProc_WHIDE_PEEP_e); if (!checkNoResetFlg0(daPyFlg0_UNK10000)) { - fVar1 = daPy_HIO_wall_c0::m.field_0x1C; - fVar3 = daPy_HIO_wall_c0::m.field_0x48; - fVar2 = daPy_HIO_wall_c0::m.field_0x2C; - sVar4 = daPy_HIO_wall_c0::m.field_0x4; + fVar1 = m_HIO->mWall.m.field_0x1C; + fVar3 = m_HIO->mWall.m.field_0x48; + fVar2 = m_HIO->mWall.m.field_0x2C; + sVar4 = m_HIO->mWall.m.field_0x4; if (mDirection == DIR_LEFT) { dVar2 = ANM_WALLPR; } else { dVar2 = ANM_WALLPL; } } else { - fVar1 = daPy_HIO_wall_c0::m.field_0x20; - fVar3 = daPy_HIO_wall_c0::m.field_0x4C; - fVar2 = daPy_HIO_wall_c0::m.field_0x30; - sVar4 = daPy_HIO_wall_c0::m.field_0x6; + fVar1 = m_HIO->mWall.m.field_0x20; + fVar3 = m_HIO->mWall.m.field_0x4C; + fVar2 = m_HIO->mWall.m.field_0x30; + sVar4 = m_HIO->mWall.m.field_0x6; if (mDirection == DIR_LEFT) { dVar2 = ANM_WALLPRDW; } else { @@ -575,9 +575,9 @@ BOOL daPy_lk_c::procWHidePeep() { dComIfGp_setPlayerStatus0(0, daPyStts0_UNK20_e); } if (!checkNoResetFlg0(daPyFlg0_UNK10000)) { - dVar3 = daPy_HIO_wall_c0::m.field_0x1C; + dVar3 = m_HIO->mWall.m.field_0x1C; } else { - dVar3 = daPy_HIO_wall_c0::m.field_0x20; + dVar3 = m_HIO->mWall.m.field_0x20; } }