Merge branch 'main' into 26-03-28-movie-player

include/d/actor/d_a_alink.h

@@ -8425,4 +8425,10 @@ inline daAlink_c* daAlink_getAlinkActorClass() {
     return (daAlink_c*)dComIfGp_getLinkPlayer();
 }
 
+#if TARGET_PC
+namespace dusk::tweaks {
+    extern bool FastIronBoots;
+}
+#endif
+
 #endif /* D_A_D_A_ALINK_H */

include/d/actor/d_a_e_ws.h

@@ -50,30 +50,30 @@ public:
     int create();
 
     /* 0x5AC */ request_of_phase_process_class mPhase;
-    /* 0x5B4 */ mDoExt_McaMorfSO* mpModelMorf;
+    /* 0x5B4 */ mDoExt_McaMorfSO* mAnm_p;
     /* 0x5B8 */ Z2CreatureEnemy mSound;
-    /* 0x65C */ cXyz field_0x65c;
-    /* 0x668 */ csXyz field_0x668;
-    /* 0x66E */ csXyz field_0x66e;
+    /* 0x65C */ cXyz mHomePos;
+    /* 0x668 */ csXyz mTargetWallAngle;
+    /* 0x66E */ csXyz mWallAngle;
     /* 0x674 */ f32 mDownColor;
     /* 0x678 */ f32 mBodyScale;
     /* 0x67C */ int mAction;
     /* 0x680 */ int mMode;
     /* 0x684 */ u32 mShadowId;
     /* 0x688 */ s16 mTargetAngle;
-    /* 0x68A */ s16 mTargetStep;
-    /* 0x68C */ u8 mMoveWaitTimer;
+    /* 0x68A */ s16 mStepAngle;
+    /* 0x68C */ u8 mWaitTimer;
     /* 0x68E */ s16 mInvulnerabilityTimer;
-    /* 0x690 */ u8 field_0x690;
-    /* 0x691 */ u8 field_0x691;
-    /* 0x692 */ u8 mSwbit;
-    /* 0x694 */ dBgS_AcchCir mAcchCir;
+    /* 0x690 */ u8 mIsReturnHome;
+    /* 0x691 */ u8 arg0;
+    /* 0x692 */ u8 bitSw;
+    /* 0x694 */ dBgS_AcchCir mBgc;
     /* 0x6D4 */ dBgS_ObjAcch mAcch;
     /* 0x8AC */ dCcD_Stts mCcStts;
     /* 0x8E8 */ dCcD_Sph mCcSph;
     /* 0xA20 */ dCcD_Sph mCcBokkuriSph;
     /* 0xB58 */ dCcU_AtInfo mAtInfo;
-    /* 0xB7C */ u8 mHIOInit;
+    /* 0xB7C */ u8 mHioSet;
 };
 
 STATIC_ASSERT(sizeof(daE_WS_c) == 0xb80);

include/d/actor/d_a_npc_sola.h

@@ -77,7 +77,7 @@ public:
     int CreateHeap();
     int Delete();
     int Execute();
-    void Draw();
+    int Draw();
     static BOOL createHeapCallBack(fopAc_ac_c*);
     static BOOL ctrlJointCallBack(J3DJoint*, int);
     bool getType();

include/d/actor/d_flower.h

@@ -103,6 +103,11 @@ public:
     /* 0x12A48 */ u32 m_Jhana01DL_size;
     /* 0x12A4C */ u8* mp_Jhana01_cDL;
     /* 0x12A50 */ u32 m_Jhana01_cDL_size;
+
+#if TARGET_PC
+    TGXTexObj mTexObj_l_J_Ohana00_64TEX;
+    TGXTexObj mTexObj_l_J_Ohana01_64128_0419TEX;
+#endif
 };  // Size: 0x12A54
 
 #endif /* D_FLOWER_H */

include/d/actor/d_grass.h

@@ -108,8 +108,8 @@ public:
     /* 0x1D714 */ s16 field_0x1d714;
 
 #if TARGET_PC
-    GXTexObj mTexObj_l_M_Hijiki00TEX{};
-    GXTexObj mTexObj_l_M_kusa05_RGBATEX{};
+    TGXTexObj mTexObj_l_M_Hijiki00TEX;
+    TGXTexObj mTexObj_l_M_kusa05_RGBATEX;
 #endif
 };  // Size: 0x1D718