Merge remote-tracking branch 'upstream/master' into d_a_player

include/d/a/d_a_player.h

@@ -433,7 +433,7 @@ public:
     static BOOL checkDungeonWarpItem(int);
     static BOOL checkMasterSwordEquip();
     static BOOL checkWoodShieldEquip();
-    f32 getAttentionOffsetY();
+    static f32 getAttentionOffsetY();
     s16 checkNowWolfEyeUp();
     static void forceRestartRoom(int, u32, int);
     static void setFmChainPos(fopAc_ac_c*, cXyz*, int);

include/d/com/d_com_inf_game.h

@@ -162,6 +162,8 @@ public:
     u8 getCStickStatusForce() { return mCStickStatusForce; }
     u8 getCStickSetFlagForce() { return mCStickSetFlagForce; }
     u8 getCStickDirectionForce() { return mCStickDirectionForce; }
+    u8 getFaceAnimeID() { return mFaceAnimeID; }
+    u8 getBaseAnimeID() { return mBaseAnimeID; }
     bool isCStickSetFlag(u8 flag) { return mCStickSetFlag & flag; }
     bool isDoSetFlag(u8 flag) { return flag & mDoSetFlag; }
     bool isASetFlag(u8 flag) { return flag & mASetFlag; }
@@ -2251,6 +2253,14 @@ inline int dComIfGp_getMessageCountNumber() {
     return g_dComIfG_gameInfo.play.getMessageCountNumber();
 }
 
+inline u8 dComIfGp_getMesgFaceAnimeAttrInfo() {
+    return g_dComIfG_gameInfo.play.getFaceAnimeID();
+}
+
+inline u8 dComIfGp_getMesgAnimeAttrInfo() {
+    return g_dComIfG_gameInfo.play.getBaseAnimeID();
+}
+
 inline void dComIfGp_setCameraParamFileName(int i, char* name) {
     g_dComIfG_gameInfo.play.setCameraParamFileName(i, name);
 }

include/d/d_attention.h

@@ -211,6 +211,8 @@ public:
     BOOL chkFlag(u32 flag) { return mFlags & flag; }
     void setFlag(u32 flag) { mFlags |= flag; }
     void clrFlag(u32 flag) { mFlags &= ~flag; }
+    int GetActionCount() { return mActionCount; }
+    int GetLockonCount() { return mLockonCount; }
     bool Lockon() { return LockonTruth() || chkFlag(0x20000000); }  // only matches with -O2?
 
     static type_tbl_entry loc_type_tbl[3];

include/d/d_path.h

@@ -2,6 +2,7 @@
 #define D_D_PATH_H
 
 #include "dolphin/types.h"
+#include "d/d_stage.h"
 
 class dStage_dPnt_c;
 
@@ -14,6 +15,8 @@ struct dPath {
     /* 0x8 */ dStage_dPnt_c* m_points;
 };
 
+inline int dPath_ChkClose(dPath* i_path) { return (i_path->m_closed & 1); }
+
 dPath* dPath_GetRoomPath(int path_index, int room_no);
 
 #endif /* D_D_PATH_H */

include/d/d_stage.h

@@ -255,7 +255,7 @@ public:
 // PPNT
 struct dStage_dPnt_c {
     /* 0x0 */ int field_0x0;
-    /* 0xC */ cXyz m_position;
+    /* 0x4 */ cXyz m_position;
 };  // Size: 0x10
 
 struct dStage_FloorInfo_c {

include/d/msg/d_msg_object.h

@@ -133,7 +133,7 @@ public:
     /* 80238320 */ static void onMsgSend();
     /* 8023834C */ void offMsgSend();
     /* 80238378 */ void isMsgSend();
-    /* 802383A4 */ void isMouthCheck();
+    /* 802383A4 */ bool isMouthCheck();
     /* 802383D0 */ static u32 getMessageID();
     /* 802383E4 */ void getSmellTypeMessageID();
     /* 80238410 */ static void setSmellType(u8);