daTagQs_c OK (#2200)

* daTagQs_c OK

* clean up d_a_tag_shop_camera

* daTagTWGate_c OK

* daTagWljump_c: Update names and includes

* Make fopAcM_cullingCheck compilable

* Remove dolasm include

* dMenu_Collect2D_c::screenSet matches

* Minor work on d_menu files

* dMenu_Option_c OK

include/d/menu/d_menu_option.h

@@ -87,7 +87,7 @@ public:
     /* 801E8CB0 */ void yesnoWakuAlpahAnmInit(u8, u8, u8, u8);
     /* 801E8CFC */ u8 yesnoWakuAlpahAnm(u8);
 
-    /* 801E8E6C */ virtual void draw();
+    /* 801E8E6C */ virtual void draw() { _draw(); }
     /* 801E2014 */ virtual ~dMenu_Option_c();
 
     u8 getQuitStatus() { return mQuitStatus; }

include/d/msg/d_msg_object.h

@@ -135,7 +135,7 @@ public:
     /* 80238378 */ static int isMsgSend();
     /* 802383A4 */ static bool isMouthCheck();
     /* 802383D0 */ static u32 getMessageID();
-    /* 802383E4 */ u16 getSmellTypeMessageID();
+    /* 802383E4 */ static u16 getSmellTypeMessageID();
     /* 80238410 */ static void setSmellType(u8);
     /* 80238440 */ static u8 getSelectCursorPos();
     /* 8023846C */ static void setSelectCursorPos(u8);
@@ -359,7 +359,7 @@ inline u32 dMsgObject_getMessageID() {
     return dMsgObject_c::getMessageID();
 }
 
-inline u32 dMsgObject_getSmellTypeMessageID() {
+inline u16 dMsgObject_getSmellTypeMessageID() {
     return dMsgObject_getMsgObjectClass()->getSmellTypeMessageID();
 }
 

include/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.h

@@ -112,7 +112,7 @@ public:
         callInit();
     }
 
-    static u8 const mAttr[1 + 3 /* padding */];
+    static u8 const mAttr[1];
     static actionFunc ActionTable[13][2];
 
 private:

include/rel/d/a/tag/d_a_tag_qs/d_a_tag_qs.h

@@ -1,5 +1,31 @@
 #ifndef D_A_TAG_QS_H
 #define D_A_TAG_QS_H
 
+#include "f_op/f_op_actor.h"
+#include "f_op/f_op_actor_mng.h"
+#include "d/cc/d_cc_d.h"
+
+class daTagQs_c : public fopAc_ac_c {
+public:
+    /* 80D5DE78 */ ~daTagQs_c();
+    /* 80D5DFB0 */ int create();
+    /* 80D5E1FC */ f32 getPower();
+    /* 80D5E220 */ f32 getSafeArea();
+    /* 80D5E244 */ f32 getPower80();
+    /* 80D5E268 */ f32 getCenterPower();
+    /* 80D5E28C */ f32 calcPower(f32, f32);
+    /* 80D5E9F8 */ int execute();
+    /* 80D5EBF8 */ int draw();
+
+    u8 getType() { return fopAcM_GetParamBit(this, 0, 1); }
+    int getSwNo() { return fopAcM_GetParamBit(this, 1, 8); }
+
+    /* 0x568 */ f32 field_0x568;
+    /* 0x56C */ f32 field_0x56c;
+    /* 0x570 */ int field_0x570;
+    /* 0x574 */ int field_0x574;
+    /* 0x578 */ dCcD_Cyl mCyl;
+    /* 0x6B4 */ dCcD_Stts mStts;
+};
 
 #endif /* D_A_TAG_QS_H */

include/rel/d/a/tag/d_a_tag_shop_camera/d_a_tag_shop_camera.h

@@ -11,8 +11,6 @@ public:
     /* 80D6090C */ int Draw();
     /* 80D60914 */ void initialize();
     /* 80D60A18 */ virtual ~daTag_ShopCamera_c() {};
-
-    /* 0x568 */ u8 field_0x568[4];
 };
 
 #endif /* D_A_TAG_SHOP_CAMERA_H */