various matches / cleanup (#2271)

* cleanup various TUs

* checkpoint

* d_attention doc

10 files changed, 84 insertions, 76 deletions

diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h
index 512a8fe289..91e9b4484a 100644
--- a/include/JSystem/J3DGraphBase/J3DShape.h
+++ b/include/JSystem/J3DGraphBase/J3DShape.h
@@ -127,7 +127,7 @@ public:
     GXVtxDescList* getVtxDesc() const { return mVtxDesc; }
 
     J3DMaterial* getMaterial() const { return mMaterial; }
-    u32 getIndex() const { return mIndex; }
+    u16 getIndex() const { return mIndex; }
     u32 getPipeline() const { return (mFlags >> 2) & 0x07; }
     u32 getTexMtxLoadType() const { return mFlags & 0xF000; }
     u32 getMtxGroupNum() const { return mMtxGroupNum; }
diff --git a/include/JSystem/JGadget/linklist.h b/include/JSystem/JGadget/linklist.h
index 70a15a1276..4fb6a627df 100644
--- a/include/JSystem/JGadget/linklist.h
+++ b/include/JSystem/JGadget/linklist.h
@@ -22,24 +22,10 @@ struct TNodeLinkList {
     struct iterator {
         explicit iterator(TLinkListNode* pNode) { node = pNode; }
 
-        iterator& operator++() {
-            node = node->getNext();
-            return *this;
-        }
-        iterator& operator--() {
-            node = node->getPrev();
-            return *this;
-        }
-        iterator operator++(int) {
-            const iterator old(*this);
-            (void)++*this;
-            return old;
-        }
-        iterator operator--(int) {
-            const iterator old(*this);
-            (void)--*this;
-            return old;
-        }
+        iterator& operator++() { node = node->getNext(); return *this; }
+        iterator& operator--() { node = node->getPrev(); return *this; }
+        iterator operator++(int) { const iterator old(*this); (void)++*this; return old; }
+        iterator operator--(int) { const iterator old(*this); (void)--*this; return old; }
         friend bool operator==(iterator a, iterator b) { return a.node == b.node; }
         friend bool operator!=(iterator a, iterator b) { return !(a == b); }
 
@@ -52,27 +38,12 @@ struct TNodeLinkList {
 
     struct const_iterator {
         explicit const_iterator(TLinkListNode* pNode) { node = pNode; }
-        const_iterator(const const_iterator& iter) { *this = iter; }
         explicit const_iterator(iterator it) { node = it.node; }
 
-        const_iterator& operator++() {
-            node = node->getNext();
-            return *this;
-        }
-        const_iterator& operator--() {
-            node = node->getPrev();
-            return *this;
-        }
-        const_iterator operator++(int) {
-            const const_iterator old(*this);
-            (void)++*this;
-            return old;
-        }
-        const_iterator operator--(int) {
-            const const_iterator old(*this);
-            (void)--*this;
-            return old;
-        }
+        const_iterator& operator++() { node = node->getNext(); return *this; }
+        const_iterator& operator--() { node = node->getPrev(); return *this; }
+        const_iterator operator++(int) { const const_iterator old(*this); (void)++*this; return old; }
+        const_iterator operator--(int) { const const_iterator old(*this); (void)--*this; return old; }
         friend bool operator==(const_iterator a, const_iterator b) { return a.node == b.node; }
         friend bool operator!=(const_iterator a, const_iterator b) { return !(a == b); }
 
diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h
index d454a2b14d..233469b652 100644
--- a/include/JSystem/JUtility/JUTConsole.h
+++ b/include/JSystem/JUtility/JUTConsole.h
@@ -93,7 +93,7 @@ public:
     void scrollToFirstLine() { scroll(-mMaxLines); }
 
     /* 0x18 */ JGadget::TLinkListNode mListNode;
-    /* 0x20 */ u32 field_0x20;
+    /* 0x20 */ unsigned int field_0x20;
     /* 0x24 */ int mMaxLines;
     /* 0x28 */ u8* mBuf;
     /* 0x2C */ bool field_0x2c;
@@ -133,11 +133,16 @@ public:
 
     JUTConsole* getDirectConsole() const { return mDirectConsole; }
 
-    static JUTConsoleManager* getManager() { return sManager; }
+    static JUTConsoleManager* const getManager() { return sManager; }
 
     static JUTConsoleManager* sManager;
 
+#ifdef __MWERKS__
     typedef JGadget::TLinkList<JUTConsole, -offsetof(JUTConsole, mListNode)> ConsoleList;
+#else
+    // clangd does not support offsetof in template arguments.
+    typedef JGadget::TLinkList<JUTConsole, -sizeof(JKRDisposer)> ConsoleList;
+#endif
 
 private:
     /* 0x00 */ ConsoleList soLink_;
diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h
index b9b6829ae2..3f568afd77 100644
--- a/include/JSystem/JUtility/JUTException.h
+++ b/include/JSystem/JUtility/JUTException.h
@@ -118,7 +118,7 @@ private:
     static OSMessageQueue sMessageQueue;
     static const char* sCpuExpName[17];
     static JSUList<JUTException::JUTExMapFile> sMapFileList;
-    static OSMessage sMessageBuffer[1 + 1 /* padding */];
+    static OSMessage sMessageBuffer[1];
     static JUTException* sErrorManager;
     static OSErrorHandler sPreUserCallback;
     static OSErrorHandler sPostUserCallback;
diff --git a/include/d/actor/d_a_swc00.h b/include/d/actor/d_a_swc00.h
index 51e918b7b0..ffe22553bb 100644
--- a/include/d/actor/d_a_swc00.h
+++ b/include/d/actor/d_a_swc00.h
@@ -21,7 +21,6 @@ public:
     /* 805A1A94 */ void actionEvent();
     /* 805A1AF0 */ void actionDead();
 
-private: 
     /* 0x568 */ cXyz field_0x568;
     /* 0x574 */ cXyz field_0x574;
     /* 0x580 */ u16 mEventID;
diff --git a/include/d/d_attention.h b/include/d/d_attention.h
index 958a9f3683..56898d1015 100644
--- a/include/d/d_attention.h
+++ b/include/d/d_attention.h
@@ -36,13 +36,10 @@ public:
     u8 getChangeItem() { return mChangeItem; }
 
 private:
-    /* 0x00 */ u32 field_0x0;
+    /* 0x00 */ fpc_ProcID mRequestActorID;
     /* 0x04 */ int field_0x4;
-    /* 0x08 */ f32 field_0x8;
-    /* 0x0C */ u8 field_0xc;
-    /* 0x0D */ u8 field_0xd;
-    /* 0x0E */ u8 field_0xe;
-    /* 0x0F */ u8 field_0xf;
+    /* 0x08 */ f32 mDistance;
+    /* 0x0C */ u8 mCatchItemNo;
     /* 0x10 */ fpc_ProcID mCatghTargetID;
     /* 0x14 */ u8 mChangeItem;
 };  // Size: 0x18
@@ -70,9 +67,18 @@ public:
 public:
     dAttParam_c() {}
     /* 80070038 */ dAttParam_c(s32);
-
     /* 80070110 */ virtual ~dAttParam_c();
 
+    enum EFlag {
+        EFlag_HOLD_MODE    = (1 << 0),
+        EFlag_SWMODE_DEBUG = (1 << 1),
+        EFlag_VALID        = (1 << 2),
+        EFlag_KEEP         = (1 << 3),
+        EFlag_ARROW_OFF    = (1 << 4),
+        EFlag_LIST_DEBUG   = (1 << 14),
+        EFlag_MARGIN_DEBUG = (1 << 15),
+    };
+
     bool CheckFlag(u16 flag) { return mFlags & flag; }
 
     /* 0x40 vtable */
@@ -88,9 +94,9 @@ public:
     fopAc_ac_c* getLookTarget() { return convPId(mLookTargetID); }
 
 private:
-    u32 field_0x0;
-    s32 field_0x4;
-    f32 field_0x8;
+    fpc_ProcID mRequestActorID;
+    int field_0x4;
+    f32 mDistance;
     fpc_ProcID mLookTargetID;
 };  // Size: 0x10
 
@@ -129,12 +135,14 @@ public:
     /* 0x11C */ mDoExt_bpkAnm mImpactBpk;
     /* 0x134 */ mDoExt_brkAnm mImpactBrk;
     /* 0x14C */ mDoExt_btkAnm mImpactBtk;
-    /* 0x164 */ cXyz field_0x164;
-    /* 0x170 */ u8 field_0x170;
-    /* 0x171 */ u8 field_0x171;
-    /* 0x172 */ u8 field_0x172;
+    /* 0x164 */ f32 mCursorSizeX;
+    /* 0x168 */ f32 mCursorSizeY;
+    /* 0x16C */ f32 mCursorOffsetY;
+    /* 0x170 */ u8 mDrawType;
+    /* 0x171 */ u8 mAlphaAnmFrameMax;
+    /* 0x172 */ u8 mAlphaAnmFrame;
     /* 0x173 */ u8 field_0x173;
-    /* 0x174 */ u8 field_0x174;
+    /* 0x174 */ u8 mAlphaAnmPlayDirection;
     /* 0x175 */ u8 field_0x175;
 };
 
@@ -156,16 +164,16 @@ struct dist_entry {
 };  // Size: 0x1C
 
 struct type_tbl_entry {
-    s16 field_0x0;
-    u16 field_0x2;
+    s16 type;
+    u16 mask;
 };
 
 class dAttention_c {
 public:
     enum EState {
-        ST_NONE,
-        ST_LOCK,
-        ST_RELEASE,
+        EState_NONE,
+        EState_LOCK,
+        EState_RELEASE,
     };
 
     dAttention_c() {}
diff --git a/include/d/d_msg_class.h b/include/d/d_msg_class.h
index 7fb11c35fa..fc3b3e9a8b 100644
--- a/include/d/d_msg_class.h
+++ b/include/d/d_msg_class.h
@@ -63,13 +63,19 @@ struct jmessage_tReference : public JMessage::TReference {
     /* 802298DC */ bool isLightSend();
     /* 8022994C */ bool isLightEnd();
     /* 802299AC */ void decideOutFontRupeeColor(int);
-    /* 80232A20 */ cXyz getActorPos();
+    /* 80232A20 */ cXyz getActorPos() { return mActorPos; }
 
     /* 80238C78 */ void setActorPos(cXyz pos) { mActorPos = pos; }
 
     bool isSelectSetCancelFlag() { return mSelectSetCancelFlag != 0; }
     BOOL isSelectRubyFlag(int i_flag) {
-        return mSelectRubyFlag & (u8)(1 << i_flag) ? 1 : 0;
+        BOOL var_r31;
+        if (mSelectRubyFlag & (u8)(1 << i_flag)) {
+            var_r31 = true;
+        } else {
+            var_r31 = false;
+        }
+        return var_r31;
     }
     bool isBatchFlag() { return mBatchFlag; }
 
@@ -98,7 +104,7 @@ struct jmessage_tReference : public JMessage::TReference {
     void offSelectRubyFlag(int i_flag) { mSelectRubyFlag &= ~(u8)(1 << i_flag); }
     void setPageEndCount(s16 i_endCount) { mPageEndCount = i_endCount; }
     void onBombNameUseFlag() { mBombNameUseFlag = 1; }
-    void onSelectRubyFlag(int i_flag) { mSelectRubyFlag |= (1 << i_flag); }
+    void onSelectRubyFlag(int i_flag) { mSelectRubyFlag |= (u8)(1 << i_flag); }
     void setpStatus(u16* status) { mpStatus = status; }
     void setObjectPtr(dMsgObject_c* ptr) { mpObjectPtr = ptr; }
     void setCountBackUp() { mCharactor.mCountBackUp = mCharactor.field_0x40e; }
@@ -140,6 +146,15 @@ struct jmessage_tReference : public JMessage::TReference {
         }
     }
 
+    void addLineLength(int param_0, f32 param_1, f32 param_2) {
+        mStrLength[param_0] += param_1;
+        mSpaceLength[param_0] += param_2;
+    }
+
+    void addSelLength(int param_0, f32 param_1) {
+        mSelLength[param_0] += param_1;
+    }
+
     dMsgObject_c* getObjectPtr() { return mpObjectPtr; }
     u8 getForm() { return mForm; }
     u8 getNowLightCount() { return mNowLightCount; }
@@ -179,6 +194,9 @@ struct jmessage_tReference : public JMessage::TReference {
     u8 getFukiPosType() { return mFukiPosType; }
     u16 getStatus() { return *mpStatus; }
     u8 getArrange() { return mArrange; }
+    f32 getSelFontSize() { return mSelFontSize; }
+    f32 getSelCharSpace() { return mSelCharSpace; }
+    u16 getLineScale(int i_no) { return mLineScale[i_no]; }
 
     struct CharSoundInfo {
         u16 data[0x200];
@@ -186,7 +204,7 @@ struct jmessage_tReference : public JMessage::TReference {
         s16 field_0x40e;
         s16 mCountBackUp;
     };
-    CharSoundInfo getCharSoundInfo() { return mCharactor;}
+    CharSoundInfo getCharSoundInfo() { return mCharactor; }
     u32 getDemoFrame() { return mDemoFrame; }
     u32 getRevoMessageID() { return mRevoMessageID; }
     f32 getCharAllAlphaRate() { return mCharAllAlphaRate; }
@@ -296,9 +314,9 @@ struct jmessage_tMeasureProcessor : public JMessage::TRenderingProcessor {
     /* 0x45 */ u8 mSelectType;
     /* 0x46 */ u8 field_0x46;
     /* 0x47 */ u8 field_0x47;
-    /* 0x48 */ s8 field_0x48;
+    /* 0x48 */ u8 field_0x48;
     /* 0x49 */ s8 field_0x49;
-    /* 0x4A */ u8 mPageLineMax;
+    /* 0x4A */ s8 mPageLineMax;
     /* 0x4B */ s8 field_0x4b;
     /* 0x4C */ u8 field_0x4c;
     /* 0x4D */ u8 field_0x4d;
@@ -315,7 +333,7 @@ struct jmessage_tSequenceProcessor : public JMessage::TSequenceProcessor,
     /* 8022CB10 */ void messageSePlay(u8, u8, cXyz*);
     /* 8022CBE8 */ void calcStringLength();
 
-    /* 8023299C */ virtual ~jmessage_tSequenceProcessor();
+    /* 8023299C */ virtual ~jmessage_tSequenceProcessor() {}
     /* 8022B654 */ virtual void do_reset();
     /* 8022B658 */ virtual void do_begin(void const*, char const*);
     /* 8022BA3C */ virtual void do_end();
@@ -379,7 +397,7 @@ struct jmessage_tRenderingProcessor : public JMessage::TRenderingProcessor {
     /* 8022F734 */ void push_word();
     /* 8022F784 */ void getCharInfo(f32, f32, f32, f32, f32);
 
-    /* 8023293C */ virtual ~jmessage_tRenderingProcessor();
+    /* 8023293C */ virtual ~jmessage_tRenderingProcessor() {}
     /* 8022CDC8 */ virtual void do_reset();
     /* 8022CDCC */ virtual void do_begin(void const*, char const*);
     /* 8022CFD8 */ virtual void do_end();
@@ -451,7 +469,7 @@ struct jmessage_tRenderingProcessor : public JMessage::TRenderingProcessor {
 struct jmessage_string_tControl : public JMessage::TControl {
     /* 8022FB5C */ jmessage_string_tControl();
 
-    /* 802328DC */ virtual ~jmessage_string_tControl();
+    /* 802328DC */ virtual ~jmessage_string_tControl() {}
 };
 
 struct jmessage_string_tReference : public JMessage::TReference {
@@ -517,7 +535,7 @@ struct jmessage_string_tSequenceProcessor : public JMessage::TSequenceProcessor,
     /* 80230A08 */ jmessage_string_tSequenceProcessor(jmessage_string_tReference const*,
                                                       jmessage_string_tControl*);
 
-    /* 80232858 */ virtual ~jmessage_string_tSequenceProcessor();
+    /* 80232858 */ virtual ~jmessage_string_tSequenceProcessor() {}
     /* 80230ABC */ virtual void do_reset();
     /* 80230AC0 */ virtual void do_begin(void const*, char const*);
     /* 80230B7C */ virtual void do_end();
@@ -545,7 +563,7 @@ struct jmessage_string_tRenderingProcessor : public JMessage::TRenderingProcesso
     /* 802326E4 */ void do_numset(s16);
     /* 802327BC */ void push_word(char const*);
 
-    /* 802327F8 */ virtual ~jmessage_string_tRenderingProcessor();
+    /* 802327F8 */ virtual ~jmessage_string_tRenderingProcessor() {}
     /* 80230C5C */ virtual void do_reset();
     /* 80230CA0 */ virtual void do_begin(void const*, char const*);
     /* 80230CE8 */ virtual void do_end();
diff --git a/include/dolphin/gf/GFPixel.h b/include/dolphin/gf/GFPixel.h
index bffbc6a7db..8af003ea82 100644
--- a/include/dolphin/gf/GFPixel.h
+++ b/include/dolphin/gf/GFPixel.h
@@ -5,5 +5,8 @@
 
 void GFSetFog(GXFogType param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4,
     GXColor param_5);
+void GFSetBlendModeEtc(GXBlendMode param_0, GXBlendFactor param_1, GXBlendFactor param_2,
+        GXLogicOp param_3, u8 param_4, u8 param_5, u8 param_6);
+void GFSetZMode(u8 param_0, GXCompare param_1, u8 param_2);
 
 #endif /* GFPIXEL_H */
diff --git a/include/dolphin/gx.h b/include/dolphin/gx.h
index 8dc15f688e..b9fa1486d9 100644
--- a/include/dolphin/gx.h
+++ b/include/dolphin/gx.h
@@ -111,6 +111,10 @@ static inline void GXNormal3f32(const f32 x, const f32 y, const f32 z) {
     GXWGFifo.f32 = z;
 }
 
+static inline void GXNormal1x16(const u16 x) {
+    GXWGFifo.u16 = x;
+}
+
 static inline void GXPosition2f32(const f32 x, const f32 z) {
     GXWGFifo.f32 = x;
     GXWGFifo.f32 = z;
diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h
index 1e0cc7f4e3..36788aad6b 100644
--- a/include/m_Do/m_Do_ext.h
+++ b/include/m_Do/m_Do_ext.h
@@ -375,7 +375,7 @@ public:
     /* 80011348 */ mDoExt_McaMorf2(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, J3DAnmTransform*,
                                    int, f32, int, int, Z2Creature*, u32, u32);
-    /* 80011464 */ void create(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
+    /* 80011464 */ int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, J3DAnmTransform*, int,
                                f32, int, int, Z2Creature*, u32, u32);
     /* 800116B4 */ void ERROR_EXIT();
@@ -479,14 +479,14 @@ STATIC_ASSERT(sizeof(mDoExt_MtxCalcAnmBlendTblOld) == 0x10);
 
 class mDoExt_3Dline_c {
 public:
-    /* 800123D0 */ void init(u16, int, int);
+    /* 800123D0 */ int init(u16, int, int);
     /* 800126BC */ mDoExt_3Dline_c();
 
     /* 0x00 */ cXyz* field_0x0;
     /* 0x04 */ f32* field_0x4;
     /* 0x08 */ cXyz* field_0x8;
     /* 0x0C */ cXyz* field_0xc;
-    /* 0x10 */ void* field_0x10;
+    /* 0x10 */ u8* field_0x10;
     /* 0x14 */ void* field_0x14;
     /* 0x18 */ f32* field_0x18;
     /* 0x1C */ f32* field_0x1c;