d_a_e_fz work, doxygen revamp (#2127)

* initial freezard actor struct + setActionMode OK

* daE_FZ_Draw

* setReflectAngle

* mBoundSoundset

* daE_FZ_Execute & execute

* demoDelete

* daE_FZ_Delete & _delete

* CreateHeap

* useHeapInit

* cc_set

* mtx_set

* action WIP

* way_gake_check

* executeRollMove

* executeMove

* draw WIP

* executeDamage

* checkpoint

* create

* checkpoint

* daE_FZ_c::executeWait

* checkpoint

* daE_FZ_c::damage_check almost done

* rm asm

* rm headers

* setup_profile WIP + doxygen update

* fix merge issues

* docs fix?

* fix2

* doxygen updates

* setup g_profile_E_FZ, profile setup script WIP

* update github actions

* update progress.md

18 files changed, 340 insertions, 10 deletions

diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h
index 752fe5b068..8f37c4c7af 100644
--- a/include/JSystem/J2DGraph/J2DAnimation.h
+++ b/include/JSystem/J2DGraph/J2DAnimation.h
@@ -2,7 +2,6 @@
 #define J2DANIMATION_H
 
 #include "JSystem/J3DGraphAnimator/J3DAnimation.h"
-#include "global.h"
 
 typedef struct _GXColor GXColor;
 typedef struct _GXColorS10 GXColorS10;
@@ -20,6 +19,10 @@ enum J2DAnmKind {
     KIND_VTX_COLOR = 7
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DAnmBase {
 public:
     J2DAnmBase() {
@@ -42,6 +45,10 @@ public:
     /* 0xC */ J2DAnmKind mKind;
 };  // Size: 0x10
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DAnmVtxColor : public J2DAnmBase {
 public:
     J2DAnmVtxColor() {
@@ -67,6 +74,10 @@ public:
 struct J3DTransformInfo;
 struct J3DTextureSRTInfo;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DAnmVtxColorKey : public J2DAnmVtxColor {
 public:
     J2DAnmVtxColorKey() {
@@ -84,6 +95,10 @@ public:
     /* 0x38 */ s16* mAValues;
 };  // Size: 0x3C
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DAnmVtxColorFull : public J2DAnmVtxColor {
 public:
     J2DAnmVtxColorFull() {
@@ -101,6 +116,10 @@ public:
     /* 0x38 */ u8* mAValues;
 };  // Size: 0x3C
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DAnmVisibilityFull : public J2DAnmBase {
 public:
     J2DAnmVisibilityFull() {
@@ -119,6 +138,10 @@ public:
     /* 0x18 */ u8* mValues;
 };  // Size: 0x1C
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DAnmTransform : public J2DAnmBase {
 public:
     J2DAnmTransform(f32* pScaleValues, s16* pRotationValues, f32* pTranslateValues) {
@@ -139,6 +162,10 @@ public:
     /* 0x18 */ f32* mTranslateValues;
 };  // Size: 0x1C
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DAnmTransformKey : public J2DAnmTransform {
 public:
     J2DAnmTransformKey() : J2DAnmTransform(NULL, NULL, NULL) {
@@ -157,6 +184,10 @@ public:
     /* 0x28 */ J3DAnmTransformKeyTable* mInfoTable;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DAnmTransformFull : public J2DAnmTransform {
 public:
     J2DAnmTransformFull() : J2DAnmTransform(NULL, NULL, NULL) { mTableInfo = NULL; }
@@ -168,6 +199,10 @@ public:
     /* 0x24 */ J3DAnmTransformFullTable* mTableInfo;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DAnmTextureSRTKey : public J2DAnmBase {
 public:
     J2DAnmTextureSRTKey() {
@@ -227,6 +262,10 @@ public:
     /* 0x7C */ int field_0x7c;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DAnmTexPattern : public J2DAnmBase {
 public:
     struct J2DAnmTexPatternTIMGPointer {
@@ -265,6 +304,10 @@ public:
     /* 0x30 */ J2DAnmTexPatternTIMGPointer* mTIMGPtrArray;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DAnmTevRegKey : public J2DAnmBase {
 public:
     J2DAnmTevRegKey() {
@@ -331,6 +374,10 @@ public:
     /* 0x70 */ s16* mKAValues;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DAnmColor : public J2DAnmBase {
 public:
     J2DAnmColor() {
@@ -357,6 +404,10 @@ public:
     /* 0x20 */ JUTNameTab field_0x20;
 };  // Size: 0x30
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DAnmColorKey : public J2DAnmColor {
 public:
     J2DAnmColorKey() {
@@ -376,6 +427,10 @@ public:
     /* 0x40 */ J3DAnmColorKeyTable* mInfoTable;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DAnmColorFullInfo {
     /* 0x00 */ u16 mRMaxFrame;
     /* 0x02 */ u16 mROffset;
@@ -387,6 +442,10 @@ struct J2DAnmColorFullInfo {
     /* 0x0E */ u16 mAOffset;
 };  // Size = 0x10
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DAnmColorFull : public J2DAnmColor {
 public:
     J2DAnmColorFull() {
diff --git a/include/JSystem/J2DGraph/J2DAnmLoader.h b/include/JSystem/J2DGraph/J2DAnmLoader.h
index 73d000fcca..be7b04ec63 100644
--- a/include/JSystem/J2DGraph/J2DAnmLoader.h
+++ b/include/JSystem/J2DGraph/J2DAnmLoader.h
@@ -3,10 +3,18 @@
 
 #include "JSystem/J2DGraph/J2DAnimation.h"
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DAnmLoaderDataBase {
     /* 80308A6C */ static J2DAnmBase* load(void const*);
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DAnmLoader {
 public:
     virtual void* load(void const*) = 0;
@@ -27,6 +35,10 @@ struct J3DAnmVisibilityFullData;
 struct J3DAnmVtxColorFullData;
 struct J3DAnmTransformKeyData;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DAnmKeyLoader_v15 : public J2DAnmLoader {
 public:
     /* 80309290 */ J2DAnmKeyLoader_v15();
@@ -48,6 +60,10 @@ public:
     // /* 0x04 */ void* _4;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DAnmFullLoader_v15 : public J2DAnmLoader {
 public:
     /* 80309CE8 */ J2DAnmFullLoader_v15();
diff --git a/include/JSystem/J2DGraph/J2DGrafContext.h b/include/JSystem/J2DGraph/J2DGrafContext.h
index ffa54f2e52..f784a5a5e0 100644
--- a/include/JSystem/J2DGraph/J2DGrafContext.h
+++ b/include/JSystem/J2DGraph/J2DGrafContext.h
@@ -4,8 +4,11 @@
 #include "JSystem/JGeometry.h"
 #include "JSystem/JUtility/TColor.h"
 #include "dolphin/mtx.h"
-#include "dolphin/types.h"
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DGrafContext {
 public:
     struct Blend {
diff --git a/include/JSystem/J2DGraph/J2DManage.h b/include/JSystem/J2DGraph/J2DManage.h
index 07d563571f..55eae2b1ca 100644
--- a/include/JSystem/J2DGraph/J2DManage.h
+++ b/include/JSystem/J2DGraph/J2DManage.h
@@ -5,6 +5,10 @@
 
 class JSUInputStream;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DResReference {
     /* 0x00 */ u16 mCount;
     /* 0x02 */ u16 mOffsets[1];
@@ -13,12 +17,20 @@ struct J2DResReference {
     /* 8030CF44 */ char* getName(u16) const;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DataManageLink {
     /* 0x00 */ void* mData;
     /* 0x04 */ char* mName;
     /* 0x08 */ J2DataManageLink* mNext;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DDataManage {
 private:
     /* 0x00 */ J2DataManageLink* mList;
diff --git a/include/JSystem/J2DGraph/J2DMatBlock.h b/include/JSystem/J2DGraph/J2DMatBlock.h
index 0e699ef722..770986d5bc 100644
--- a/include/JSystem/J2DGraph/J2DMatBlock.h
+++ b/include/JSystem/J2DGraph/J2DMatBlock.h
@@ -3,7 +3,6 @@
 
 #include "JSystem/J2DGraph/J2DTevs.h"
 #include "JSystem/JUtility/TColor.h"
-#include "dolphin/types.h"
 
 class JUTFont;
 class JUTPalette;
@@ -13,6 +12,10 @@ struct ResFONT;
 struct ResTIMG;
 struct ResTLUT;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DGXColorS10 : public GXColorS10 {
     /* 802F1B90 */ J2DGXColorS10() {}
     J2DGXColorS10(const J2DGXColorS10& other) {
@@ -39,6 +42,10 @@ struct J2DGXColorS10 : public GXColorS10 {
 
 struct J2DTevSwapModeInfo;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DTevBlock {
 public:
     /* 802F2A40 */ virtual void initialize();
@@ -88,6 +95,10 @@ public:
     /* 802EB184 */ virtual ~J2DTevBlock() {}
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DTevBlock1 : public J2DTevBlock {
 public:
     /* 802EB88C */ J2DTevBlock1();
@@ -155,6 +166,10 @@ private:
     /* 0x05C */ u8 mUndeleteFlag;
 };  // Size: 0x60
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DTevBlock2 : public J2DTevBlock {
 public:
     /* 802EC5B8 */ J2DTevBlock2();
@@ -224,6 +239,10 @@ private:
     /* 0x078 */ u8 mUndeleteFlag;
 };  // Size: 0x7C
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DTevBlock4 : public J2DTevBlock {
 public:
     /* 802ED8BC */ J2DTevBlock4();
@@ -293,6 +312,10 @@ private:
     /* 0x0B0 */ u8 mUndeleteFlag;
 };  // Size: 0xB4
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DTevBlock8 : public J2DTevBlock {
 public:
     /* 802EED64 */ J2DTevBlock8();
@@ -363,6 +386,10 @@ private:
     /* 0x121 */ bool mFontUndeleteFlag;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DTevBlock16 : public J2DTevBlock {
 public:
     /* 802F01E4 */ J2DTevBlock16();
@@ -433,6 +460,10 @@ public:
     /* 0x1B1 */ bool mFontUndeleteFlag;
 };  // Size: 0x1B4
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DAlphaCompInfo {
     /* 0x0 */ u8 field_0x0;
     /* 0x1 */ u8 field_0x1;
@@ -448,6 +479,10 @@ inline u16 J2DCalcAlphaCmp(s32 param_1, u32 param_2, u32 param_3) {
     return ((param_1) << 5) | ((param_2 & 0xff) << 3) | (param_3 & 0xff);
 }
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DAlphaComp {
     J2DAlphaComp() {
         mAlphaCmp = j2dDefaultAlphaCmp;
@@ -470,6 +505,10 @@ struct J2DAlphaComp {
     /* 0x3 */ u8 mRef1;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DBlendInfo {
     void operator=(J2DBlendInfo const& other) {
         mType = other.mType;
@@ -486,6 +525,10 @@ struct J2DBlendInfo {
 
 extern const J2DBlendInfo j2dDefaultBlendInfo;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DBlend {
     J2DBlend() { mBlendInfo = j2dDefaultBlendInfo; }
     J2DBlend(const J2DBlendInfo& info) { mBlendInfo = info; }
@@ -498,6 +541,10 @@ struct J2DBlend {
     /* 0x0 */ J2DBlendInfo mBlendInfo;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DPEBlock {
 public:
     J2DPEBlock() { initialize(); }
@@ -514,6 +561,10 @@ private:
     /* 0x8 */ u8 mDither;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DIndBlock {
 public:
     /* 802EB24C */ virtual void initialize();
@@ -530,6 +581,10 @@ public:
     /* 802EB13C */ virtual ~J2DIndBlock() {}
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DIndBlockFull : public J2DIndBlock {
 public:
     J2DIndBlockFull() { initialize(); }
@@ -554,6 +609,10 @@ private:
     /* 0x64 */ J2DIndTexCoordScale mTexCoordScale[4];
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DIndBlockNull : public J2DIndBlock {
 public:
     J2DIndBlockNull() {}
@@ -563,6 +622,10 @@ public:
     /* 802EB1F0 */ virtual ~J2DIndBlockNull();
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DTexGenBlock {
 private:
     /* 0x00 */ u32 mTexGenNum;
@@ -585,6 +648,10 @@ public:
     /* 802EB620 */ virtual ~J2DTexGenBlock();
 };  // Size: 0x48
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DColorChanInfo {
     /* 0x0 */ u8 field_0x0;
     /* 0x0 */ u8 field_0x1;
@@ -595,6 +662,10 @@ struct J2DColorChanInfo {
 inline u8 J2DCalcColorChanID(u8 param_1) { return param_1; }
 extern const J2DColorChanInfo j2dDefaultColorChanInfo;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DColorChan {
 public:
     /* 802EB280 */ J2DColorChan() {
@@ -613,6 +684,10 @@ private:
     /* 0x0 */ u16 mColorChan;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DColorBlock {
 private:
     /* 0x00 */ JUtility::TColor mMatColor[2];
diff --git a/include/JSystem/J2DGraph/J2DMaterial.h b/include/JSystem/J2DGraph/J2DMaterial.h
index a7022e49b0..4e1e812cd2 100644
--- a/include/JSystem/J2DGraph/J2DMaterial.h
+++ b/include/JSystem/J2DGraph/J2DMaterial.h
@@ -4,6 +4,10 @@
 #include "JSystem/J2DGraph/J2DAnimation.h"
 #include "JSystem/J2DGraph/J2DMatBlock.h"
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DMaterial {
 public:
     struct J2DMaterialAnmPointer {
diff --git a/include/JSystem/J2DGraph/J2DMaterialFactory.h b/include/JSystem/J2DGraph/J2DMaterialFactory.h
index 02936b0ad2..506dfa0fdb 100644
--- a/include/JSystem/J2DGraph/J2DMaterialFactory.h
+++ b/include/JSystem/J2DGraph/J2DMaterialFactory.h
@@ -3,8 +3,11 @@
 
 #include "JSystem/J2DGraph/J2DManage.h"
 #include "JSystem/J2DGraph/J2DMatBlock.h"
-#include "dolphin/types.h"
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DMaterialBlock {
     u32 field_0x0;
     u32 field_0x4;
@@ -42,6 +45,10 @@ struct J2DBlendInfo;
 struct J2DColorChanInfo;
 class J2DMaterial;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DIndInitData {
     u8 field_0x0;
     u8 field_0x1;
@@ -53,6 +60,10 @@ struct J2DIndInitData {
     u8 field_0xac[0x90];
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DMaterialInitData {
     u8 field_0x0;
     u8 field_0x1;
@@ -88,6 +99,10 @@ struct J2DTexCoordInfo;
 struct J2DTexMtxInfo;
 class JKRArchive;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DMaterialFactory {
 public:
     /* 802F2AD0 */ J2DMaterialFactory(J2DMaterialBlock const&);
diff --git a/include/JSystem/J2DGraph/J2DOrthoGraph.h b/include/JSystem/J2DGraph/J2DOrthoGraph.h
index 5393ca272a..aea5e40f74 100644
--- a/include/JSystem/J2DGraph/J2DOrthoGraph.h
+++ b/include/JSystem/J2DGraph/J2DOrthoGraph.h
@@ -3,6 +3,10 @@
 
 #include "JSystem/J2DGraph/J2DGrafContext.h"
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DOrthoGraph : public J2DGrafContext {
 public:
     /* 802E9670 */ J2DOrthoGraph();
diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h
index 6e6a605bfa..09f8c388fd 100644
--- a/include/JSystem/J2DGraph/J2DPane.h
+++ b/include/JSystem/J2DGraph/J2DPane.h
@@ -35,11 +35,19 @@ enum J2DBasePosition {
     J2DBasePosition_4,
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DPaneHeader {
     /* 0x0 */ u32 mKind;
     /* 0x4 */ u32 mSize;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DPane {
 public:
     J2DPane();
diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture.h
index 2b2f633765..4a47ea6a3d 100644
--- a/include/JSystem/J2DGraph/J2DPicture.h
+++ b/include/JSystem/J2DGraph/J2DPicture.h
@@ -3,7 +3,6 @@
 
 #include "JSystem/J2DGraph/J2DPane.h"
 #include "JSystem/JUtility/TColor.h"
-#include "dolphin/types.h"
 
 class J2DMaterial;
 class JUTPalette;
@@ -26,11 +25,19 @@ enum J2DBinding {
     /* 0xF */ BIND15 = 15,  // temp, figure out later
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DPicHeader {
     /* 0x0 */ u32 mTag;
     /* 0x4 */ u32 mSize;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DScrnBlockPictureParameter {
     /* 0x00 */ u16 field_0x0;
     /* 0x02 */ u16 mMaterialNum;
@@ -41,6 +48,10 @@ struct J2DScrnBlockPictureParameter {
     /* 0x20 */ u32 mCornerColor[4];
 };  // Size: 0x30
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DPicture : public J2DPane {
 public:
     /* 802FCFF0 */ virtual ~J2DPicture();
diff --git a/include/JSystem/J2DGraph/J2DPictureEx.h b/include/JSystem/J2DGraph/J2DPictureEx.h
index d894169729..bf924d2c3c 100644
--- a/include/JSystem/J2DGraph/J2DPictureEx.h
+++ b/include/JSystem/J2DGraph/J2DPictureEx.h
@@ -3,10 +3,13 @@
 
 #include "JSystem/J2DGraph/J2DPicture.h"
 #include "JSystem/J2DGraph/J2DTevs.h"
-#include "dolphin/types.h"
 
 class J2DMaterial;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DPictureEx : public J2DPicture {
 public:
     enum stage_enum {};
diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/include/JSystem/J2DGraph/J2DPrint.h
index 4765a991f5..126ae750a7 100644
--- a/include/JSystem/J2DGraph/J2DPrint.h
+++ b/include/JSystem/J2DGraph/J2DPrint.h
@@ -3,10 +3,13 @@
 
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "__va_arg.h"
-#include "dolphin/types.h"
 
 class JUTFont;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DPrint {
 public:
     struct TSize {
diff --git a/include/JSystem/J2DGraph/J2DScreen.h b/include/JSystem/J2DGraph/J2DScreen.h
index 5dac5685f1..29d41577b9 100644
--- a/include/JSystem/J2DGraph/J2DScreen.h
+++ b/include/JSystem/J2DGraph/J2DScreen.h
@@ -8,6 +8,10 @@
 class J2DMaterial;
 class JUTNameTab;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DScrnHeader {
     /* 0x00 */ u32 mTag;
     /* 0x04 */ u32 mType;
@@ -16,6 +20,10 @@ struct J2DScrnHeader {
     /* 0x10 */ u8 padding[0x10];
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DScrnInfoHeader {
     /* 0x0 */ u32 mTag;
     /* 0x4 */ u32 mSize;
@@ -24,11 +32,19 @@ struct J2DScrnInfoHeader {
     /* 0xC */ u32 mColor;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DScrnBlockHeader {
     /* 0x00 */ u32 mTag;
     /* 0x04 */ s32 mSize;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DScreen : public J2DPane {
 public:
     /* 802F8540 */ virtual ~J2DScreen();
diff --git a/include/JSystem/J2DGraph/J2DTevs.h b/include/JSystem/J2DGraph/J2DTevs.h
index 4de6ad07a7..214d91fc3f 100644
--- a/include/JSystem/J2DGraph/J2DTevs.h
+++ b/include/JSystem/J2DGraph/J2DTevs.h
@@ -1,10 +1,13 @@
 #ifndef J2DTEVS_H
 #define J2DTEVS_H
 
-#include "dolphin/gx/GXEnum.h"
 #include "dolphin/gx/GXStruct.h"
 #include "dolphin/mtx.h"
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DTextureSRTInfo {
     /* 0x00 */ f32 field_0x0;
     /* 0x04 */ f32 field_0x4;
@@ -13,6 +16,10 @@ struct J2DTextureSRTInfo {
     /* 0x10 */ f32 field_0x10;
 };  // Size: 0x14
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DTexMtxInfo {
     enum {
         /* 0x0 */ DCC_NONE,
@@ -39,6 +46,10 @@ struct J2DTexMtxInfo {
 
 extern J2DTexMtxInfo const j2dDefaultTexMtxInfo;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DTexMtx {
 public:
     J2DTexMtx() { mInfo = j2dDefaultTexMtxInfo; }
@@ -55,6 +66,10 @@ private:
     /* 0x24 */ Mtx mTexMtx;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DIndTexOrderInfo {
     /* 0x0 */ u8 mTexCoordID;
     /* 0x1 */ u8 mTexMapID;
@@ -70,6 +85,10 @@ struct J2DIndTexOrderInfo {
 
 extern const J2DIndTexOrderInfo j2dDefaultIndTexOrderNull;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DIndTexOrder {
 public:
     /* 802EB378 */ J2DIndTexOrder() {
@@ -84,6 +103,10 @@ private:
     /* 0x0 */ J2DIndTexOrderInfo mInfo;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DIndTexMtxInfo {
     /* 0x00 */ Mtx23 mMtx;
     /* 0x18 */ s8 mScaleExp;
@@ -101,6 +124,10 @@ struct J2DIndTexMtxInfo {
 
 extern J2DIndTexMtxInfo const j2dDefaultIndTexMtxInfo;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DIndTexMtx {
 public:
     /* 802EB2E4 */ ~J2DIndTexMtx() {}
@@ -118,6 +145,10 @@ private:
     /* 0x0 */ J2DIndTexMtxInfo mIndTexMtxInfo;
 };  // Size: 0x1C
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DIndTexCoordScaleInfo {
     /* 0x0 */ u8 mScaleS;
     /* 0x1 */ u8 mScaleT;
@@ -133,6 +164,10 @@ struct J2DIndTexCoordScaleInfo {
 
 extern const J2DIndTexCoordScaleInfo j2dDefaultIndTexCoordScaleInfo;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DIndTexCoordScale {
 public:
     /* 802EB290 */ ~J2DIndTexCoordScale() {}
@@ -148,6 +183,10 @@ private:
     /* 0x0 */ J2DIndTexCoordScaleInfo mInfo;
 };  // Size: 0x2
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DIndTevStageInfo {
     /* 0x0 */ u8 mIndStage;
     /* 0x1 */ u8 mIndFormat;
@@ -171,6 +210,10 @@ inline u32 J2DCalcIndTevStage(J2DIndTevStageInfo info) {
 
 extern const J2DIndTevStageInfo j2dDefaultIndTevStageInfo;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DIndTevStage {
 public:
     /* 802EA044 */ void load(u8);
@@ -197,6 +240,10 @@ private:
     GXIndTexAlphaSel getAlphaSel() const { return (GXIndTexAlphaSel)((mFlags >> 22) & 0x03); }
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DTexCoordInfo {
     /* 0x0 */ u8 mTexGenType;
     /* 0x1 */ u8 mTexGenSrc;
@@ -213,6 +260,10 @@ struct J2DTexCoordInfo {
 
 extern J2DTexCoordInfo const j2dDefaultTexCoordInfo[8];
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DTexCoord {
 public:
     /* 802EB260 */ inline J2DTexCoord() {
@@ -231,6 +282,10 @@ private:
     /* 0x0 */ J2DTexCoordInfo mTexCoordInfo;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DTevOrderInfo {
     /* 0x0 */ u8 mTexCoord;
     /* 0x1 */ u8 mTexMap;
@@ -247,6 +302,10 @@ struct J2DTevOrderInfo {
 
 extern const J2DTevOrderInfo j2dDefaultTevOrderInfoNull;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DTevOrder {
 public:
     /* 802F1B70 */ J2DTevOrder() {
@@ -265,6 +324,10 @@ public:
     /* 0x0 */ J2DTevOrderInfo mTevOrderInfo;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DTevStageInfo {
     /* 0x00 */ u8 field_0x0;
     /* 0x01 */ u8 mColorA;
@@ -288,6 +351,10 @@ struct J2DTevStageInfo {
     /* 0x13 */ u8 field_0x13;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DTevSwapModeInfo {
     /* 0x0 */ u8 mRasSel;
     /* 0x1 */ u8 mTexSel;
@@ -297,6 +364,10 @@ struct J2DTevSwapModeInfo {
 
 extern const J2DTevSwapModeInfo j2dDefaultTevSwapMode;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DTevStage {
 public:
     /* 802F4110 */ J2DTevStage(J2DTevStageInfo const&);
@@ -426,6 +497,10 @@ private:
     /* 0x7 */ u8 field_0x7;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DTevSwapModeTableInfo {
     /* 0x0 */ u8 field_0x0;
     /* 0x1 */ u8 field_0x1;
@@ -439,6 +514,10 @@ inline u8 J2DCalcTevSwapTable(u8 param_0, u8 param_1, u8 param_2, u8 param_3) {
 
 extern const J2DTevSwapModeTableInfo j2dDefaultTevSwapModeTable;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DTevSwapModeTable {
 public:
     /* 802F1934 */ J2DTevSwapModeTable();
diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox.h
index 979c9039c1..2a64b83493 100644
--- a/include/JSystem/J2DGraph/J2DTextBox.h
+++ b/include/JSystem/J2DGraph/J2DTextBox.h
@@ -19,11 +19,19 @@ enum J2DTextBoxHBinding {
     /* 0x2 */ HBIND_LEFT
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DTbxBlockHeader {
     /* 0x00 */ u32 mTag;
     /* 0x04 */ s32 mSize;
 };
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 struct J2DTextBoxInfo {
     /* 0x00 */ u16 field_0x0;
     /* 0x02 */ u16 field_0x2;
@@ -42,6 +50,10 @@ struct J2DTextBoxInfo {
     /* 0x1E */ u16 field_0x1e;
 };  // Size: 0x20
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DTextBox : public J2DPane {
 public:
     struct TFontSize {
diff --git a/include/JSystem/J2DGraph/J2DTextBoxEx.h b/include/JSystem/J2DGraph/J2DTextBoxEx.h
index 301d11063a..ff663f093b 100644
--- a/include/JSystem/J2DGraph/J2DTextBoxEx.h
+++ b/include/JSystem/J2DGraph/J2DTextBoxEx.h
@@ -2,10 +2,13 @@
 #define J2DTEXTBOXEX_H
 
 #include "JSystem/J2DGraph/J2DTextBox.h"
-#include "dolphin/types.h"
 
 class J2DMaterial;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DTextBoxEx : public J2DTextBox {
 public:
     enum stage_enum {
diff --git a/include/JSystem/J2DGraph/J2DWindow.h b/include/JSystem/J2DGraph/J2DWindow.h
index 3eaeecc92f..20ab4c1c7d 100644
--- a/include/JSystem/J2DGraph/J2DWindow.h
+++ b/include/JSystem/J2DGraph/J2DWindow.h
@@ -7,6 +7,10 @@
 class JSURandomInputStream;
 class JUTTexture;
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DWindow : public J2DPane {
 public:
     struct TMaterial {
diff --git a/include/JSystem/J2DGraph/J2DWindowEx.h b/include/JSystem/J2DGraph/J2DWindowEx.h
index a845306581..1c9415ccfd 100644
--- a/include/JSystem/J2DGraph/J2DWindowEx.h
+++ b/include/JSystem/J2DGraph/J2DWindowEx.h
@@ -2,8 +2,11 @@
 #define J2DWINDOWEX_H
 
 #include "JSystem/J2DGraph/J2DWindow.h"
-#include "dolphin/types.h"
 
+/**
+ * @ingroup jsystem-j2d
+ * 
+ */
 class J2DWindowEx : public J2DWindow {
 public:
     enum stage_enum {