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
 

include/d/d_map.h

@@ -66,14 +66,14 @@ struct dMap_prm_res_s {
     /* 0x1A7 */ u8 field_0x1a7;
     /* 0x1A8 */ u8 field_0x1a8;
     /* 0x1A9 */ u8 field_0x1a9;
-    /* 0x1AA */ s16 field_0x1aa;
-    /* 0x1AC */ s16 field_0x1ac;
-    /* 0x1AE */ s16 field_0x1ae;
-    /* 0x1B0 */ s16 field_0x1b0;
-    /* 0x1B2 */ s16 field_0x1b2;
-    /* 0x1B4 */ s16 field_0x1b4;
-    /* 0x1B6 */ s16 field_0x1b6;
-    /* 0x1B8 */ f32 cursor_size;
+    /* 0x1AA */ BE(s16) field_0x1aa;
+    /* 0x1AC */ BE(s16) field_0x1ac;
+    /* 0x1AE */ BE(s16) field_0x1ae;
+    /* 0x1B0 */ BE(s16) field_0x1b0;
+    /* 0x1B2 */ BE(s16) field_0x1b2;
+    /* 0x1B4 */ BE(s16) field_0x1b4;
+    /* 0x1B6 */ BE(s16) field_0x1b6;
+    /* 0x1B8 */ BE(f32) cursor_size;
 };
 
 struct dMap_prm_hio_s {

include/d/d_map_path.h

@@ -5,7 +5,7 @@
 #include "JSystem/JHostIO/JORMContext.h"
 
 struct dMpath_RGB5A3_s {
-    u16 color;
+    BE(u16) color;
 };
 
 namespace dMpath_ColorCnv_n {

include/d/d_menu_map_common.h

@@ -75,9 +75,9 @@ public:
             /* 0x00 */ char mName[8];
             /* 0x08 */ u8 mRoomNo;
             /* 0x09 */ u8 mRegionNo;
-            /* 0x0A */ u16 mAreaName;
-            /* 0x0C */ f32 mOffsetX;
-            /* 0x10 */ f32 mOffsetZ;
+            /* 0x0A */ BE(u16) mAreaName;
+            /* 0x0C */ BE(f32) mOffsetX;
+            /* 0x10 */ BE(f32) mOffsetZ;
         };
 
         /* 0x0 */ u8 mCount;

include/d/d_meter2_info.h

@@ -321,6 +321,7 @@ int dMeter2Info_setNewLetterSender();
 bool dMeter2Info_isItemOpenCheck();
 bool dMeter2Info_isMapOpenCheck();
 s16 dMeter2Info_getNowLifeGauge();
+bool dMeter2Info_isNextStage(const char*, s16, s16, s16);
 
 #if WIDESCREEN_SUPPORT
 void dMeter2Info_onWide2D();
@@ -844,10 +845,6 @@ inline void dMeter2Info_onTempBit(int i_bit) {
     g_meter2_info.onTempBit(i_bit);
 }
 
-inline bool dMeter2Info_isNextStage(const char*, s16, s16, s16) {
-    return false;
-}
-
 inline void dMeter2Info_setFloatingMessage(u16 i_msgID, s16 i_msgTimer, bool i_wakuVisible) {
     g_meter2_info.setFloatingMessage(i_msgID, i_msgTimer, i_wakuVisible);
 }

include/d/d_meter_map.h

@@ -89,7 +89,7 @@ public:
     virtual void draw();
     virtual ~dMeterMap_c();
 
-    bool isDispPosInsideFlg() { return field_0x2d != 0; }
+    bool isDispPosInsideFlg() { return mMapIsInside != 0; }
     dMeterMap_c* getMapPointer() { return (dMeterMap_c*)mMap; }
     void setSizeW(f32 w) { mSizeW = w; }
     void setSizeH(f32 h) { mSizeH = h; }
@@ -108,15 +108,15 @@ private:
     /* 0x0C */ s32 mIsCompass;
     /* 0x10 */ s32 mIsMap;
     /* 0x14 */ u32 field_0x14;
-    /* 0x18 */ f32 field_0x18;
-    /* 0x1C */ f32 field_0x1c;
+    /* 0x18 */ f32 mDrawPosX;
+    /* 0x1C */ f32 mDrawPosY;
     /* 0x20 */ f32 mSizeW;
     /* 0x24 */ f32 mSizeH;
-    /* 0x28 */ s16 field_0x28;
+    /* 0x28 */ s16 mSlidePositionOffset;
     /* 0x2A */ u8 field_0x2a;
     /* 0x2B */ u8 field_0x2b;
     /* 0x2C */ u8 mMapAlpha;
-    /* 0x2D */ u8 field_0x2d;
+    /* 0x2D */ u8 mMapIsInside;
     /* 0x2E */ u8 field_0x2e;
     /* 0x30 */ int field_0x30;
 };

include/d/d_msg_object.h

@@ -562,6 +562,10 @@ inline void dMsgObject_setOffering(u16 i_num) {
     dComIfGs_setEventReg(0xF8FF, i_num & 0xFF);
 }
 
+inline void dMsgObject_setLetterNameID(u16 id) {
+    dMsgObject_getMsgObjectClass()->setLetterNameID(id);
+}
+
 class dMsgObject_HowlHIO_c {
 public:
     dMsgObject_HowlHIO_c();

include/d/d_path.h

@@ -20,7 +20,7 @@ struct dPath {
     /* 0x2 */ BE(u16) m_nextID;
     /* 0x4 */ u8 field_0x4;
     /* 0x5 */ bool m_closed;
-    /* 0x6 */ u8 field_0x6;
+    /* 0x6 */ u8 swbit;
     /* 0x7 */ u8 field_0x7;
     /* 0x8 */ OFFSET_PTR(dPnt) m_points;
 };

include/d/d_stage.h

@@ -267,7 +267,7 @@ struct dStage_MemoryConfig_c {
 // PATH / RPAT
 struct dPath;
 struct dStage_dPath_c {
-    /* 0x0 */ BE(int) m_num;
+    /* 0x0 */ BE(int) num;
     /* 0x4 */ OFFSET_PTR(dPath) m_path;
 };
 

include/d/d_vibration.h

@@ -47,18 +47,21 @@ class dVibTest_c : public JORReflexible {
 public:
     dVibTest_c();
 
+    void Init();
+    void setDefault();
+
     virtual void listenPropertyEvent(const JORPropertyEvent*);
     virtual void genMessage(JORMContext*);
-    virtual ~dVibTest_c() {}
+    virtual ~dVibTest_c();
 
-    /* 0x04 */ s8 field_0x4;
+    /* 0x04 */ s8 id;
     /* 0x06 */ u16 m_pattern;
     /* 0x08 */ u16 m_pattern2;
     /* 0x0A */ u16 field_0xa;
     /* 0x0C */ s16 m_randombit;
     /* 0x0E */ s16 m_length;
     /* 0x10 */ int field_0x10;
-    /* 0x14 */ int m_vibswitch;
+    /* 0x14 */ s32 m_vibswitch;
     /* 0x18 */ u16 m_displayDbg;
 };
 
@@ -82,6 +85,10 @@ public:
     void Pause();
     void Remove();
 
+    #if DEBUG
+    int testShake();
+    #endif
+
     static const vib_pattern MS_patt[VIBMODE_S_MAX];
     static const vib_pattern CS_patt[VIBMODE_S_MAX];
     static const vib_pattern MQ_patt[VIBMODE_Q_MAX];
@@ -123,4 +130,7 @@ private:
     /* 0x8C */ s32 mMode;
 };  // Size: 0x90
 
+extern const char* shock_names[VIBMODE_S_MAX];
+extern const char* quake_names[VIBMODE_Q_MAX];
+
 #endif /* D_D_VIBRATION_H */

include/d/dolzel_base.pch

@@ -2,7 +2,9 @@
 #define DOLZEL_BASE_PCH
 
 // Fixes weak .bss
+#if !TARGET_PC
 #include "weak_bss_1109_to_1009.h" // IWYU pragma: export
+#endif
 
 #include <cmath> // IWYU pragma: export
 #include <cstring> // IWYU pragma: export