Merge pull request #905 from LagoLunatic/hio

Fix HIO load issues for d_a_player_main

Author: LagoLunatic

include/d/actor/d_a_player_HIO.h

@@ -544,6 +544,21 @@ class daPy_HIO_cut_c1 {
 
 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 @@ class daPy_HIO_b_verJump_c0 {
     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 @@ class daPy_HIO_elecDamage_c0 {
     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 @@ class daPy_HIO_food_c0 {
     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 @@ class daPy_HIO_item_c1 {
 
 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 @@ class daPy_HIO_warp_c0 {
     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 */

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 @@ class daPy_HIO_c {
     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 {

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,
-};