d_a_tag_hint (#848)

include/d/actor/d_a_npc_os.h

@@ -72,7 +72,7 @@ public:
     void setCattleRoomNo(s8 roomNo) { m_cattleRoomNo = roomNo; }
 
     static bool isPlayerRoom(int idx) { return m_playerRoom[idx]; }
-    static bool isPlayerRoom_Goat() { return isPlayerRoom(1); }
+    static bool isPlayerRoom_Goat() { return isPlayerRoom(1) == 1; }
 
     cPhs_State create();
     BOOL createHeap();

include/d/actor/d_a_tag_hint.h

@@ -5,57 +5,58 @@
 
 class daTag_Hint_c : public fopAc_ac_c {
 public:
-    void chkFlag(unsigned short) {}
+    bool chkFlag(unsigned short flg) { return (m2A6 & flg) == flg; }
     inline cPhs_State create();
     inline BOOL draw();
     inline BOOL execute();
-    void setActio(unsigned char) {}
-    void setFlag(unsigned short) {}
+    void setActio(unsigned char action) { mCurProc = action; }
+    void setFlag(unsigned short flg) { m2A6 |= flg; }
 
-    void getEventNo();
-    void getSwbit();
-    void getSwbit2();
-    void getType();
-    void getType2();
-    void getMessage();
-    void getEventFlag();
-    void arrivalTerms();
-    void waitTerms();
-    void rangeCheck_local(cXyz*);
-    void rangeCheck();
-    void otherCheck();
-    void getPriority();
+    u8 getEventNo();
+    u8 getSwbit();
+    u8 getSwbit2();
+    u8 getType();
+    u8 getType2();
+    u16 getMessage();
+    u16 getEventFlag();
+    s32 arrivalTerms();
+    s32 waitTerms();
+    BOOL rangeCheck_local(cXyz*);
+    BOOL rangeCheck();
+    s32 otherCheck();
+    s32 getPriority();
     void makeEventId();
     void initLight();
     void setLightPos();
     void makeLight();
     void deleteLight();
-    void moveBoxCheck();
+    BOOL moveBoxCheck();
     void setPlayerAngle();
     void darkProc();
     void startProc();
-    void next_msgStatus(unsigned long*);
-    void getMsg();
+    u16 next_msgStatus(unsigned long*);
+    u32 getMsg();
     void talkInit();
-    void talk();
-    void actionEvent();
-    void actionHunt();
-    void actionArrival();
-    void actionLight();
-    void actionWait();
+    u16 talk();
+    BOOL actionEvent();
+    BOOL actionHunt();
+    BOOL actionArrival();
+    BOOL actionLight();
+    BOOL actionWait();
 
 public:
-    /* 0x290 */ u8 m290[0x298 - 0x290];
+    /* 0x290 */ u32 m290;
+    /* 0x294 */ s8 m294;
     /* 0x298 */ u32 mMsgNo;
-    /* 0x29C */ int m29C;
+    /* 0x29C */ s32 m29C;
     /* 0x2A0 */ s16 m2A0;
     /* 0x2A2 */ u8 mCurProc;
-    /* 0x2A3 */ u8 m2A3[0x2A4 - 0x2A3];
+    /* 0x2A3 */ bool m2A3;
     /* 0x2A4 */ s16 m2A4;
-    /* 0x2A6 */ u8 m2A6[0x2A8 - 0x2A6];
+    /* 0x2A6 */ u16 m2A6;
     /* 0x2A8 */ f32 m2A8;
     /* 0x2AC */ f32 m2AC;
     /* 0x2B0 */ f32 m2B0;
-};
+}; // size = 0x2B4
 
 #endif /* D_A_TAG_HINT_H */

include/d/d_priority.h

@@ -495,6 +495,10 @@ enum {
     /* 0x01E7 */ PRIO_OVERLAP6,
     /* 0x01E8 */ PRIO_OVERLAP7,
     /* 0x01E9 */ PRIO_OVERLAP8,
+#if VERSION > VERSION_DEMO
+    /* 0x01EA */ PRIO_1EA,
+#endif
+    /* 0x01FF */ PRIO_1FF = 0x1FF,
 };
 
 #endif /* D_PRIORITY_H */