d_a_obj_carry work, SETUP_ACTOR macro, header cleanup (#1885)

* d_a_obj_carry work, SETUP_ACTOR macro

* rm headers, add script

* progress

* macro rename, consistent spacing

17 files changed, 0 insertions, 19 deletions

diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h
index 325172b664..4f125294b2 100644
--- a/include/JSystem/J2DGraph/J2DAnimation.h
+++ b/include/JSystem/J2DGraph/J2DAnimation.h
@@ -2,8 +2,6 @@
 #define J2DANIMATION_H
 
 #include "JSystem/J3DGraphAnimator/J3DAnimation.h"
-#include "JSystem/JUtility/JUTNameTab.h"
-#include "dolphin/types.h"
 #include "global.h"
 
 typedef struct _GXColor GXColor;
diff --git a/include/JSystem/J2DGraph/J2DAnmLoader.h b/include/JSystem/J2DGraph/J2DAnmLoader.h
index 5b1257b925..c135b48320 100644
--- a/include/JSystem/J2DGraph/J2DAnmLoader.h
+++ b/include/JSystem/J2DGraph/J2DAnmLoader.h
@@ -2,7 +2,6 @@
 #define J2DANMLOADER_H
 
 #include "JSystem/J2DGraph/J2DAnimation.h"
-#include "dolphin/types.h"
 
 struct J2DAnmLoaderDataBase {
     /* 80308A6C */ static J2DAnmBase* load(void const*);
diff --git a/include/JSystem/J2DGraph/J2DGrafContext.h b/include/JSystem/J2DGraph/J2DGrafContext.h
index 47b6cdaabc..1d41b50983 100644
--- a/include/JSystem/J2DGraph/J2DGrafContext.h
+++ b/include/JSystem/J2DGraph/J2DGrafContext.h
@@ -1,7 +1,6 @@
 #ifndef J2DGRAFCONTEXT_H
 #define J2DGRAFCONTEXT_H
 
-#include "JSystem/J2DGraph/J2DMatBlock.h"
 #include "JSystem/JGeometry.h"
 #include "JSystem/JUtility/TColor.h"
 #include "dolphin/mtx/mtx.h"
diff --git a/include/JSystem/J2DGraph/J2DMatBlock.h b/include/JSystem/J2DGraph/J2DMatBlock.h
index b495a44792..d9021adf2b 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/gx/GXStruct.h"
 #include "dolphin/types.h"
 
 class JUTFont;
diff --git a/include/JSystem/J2DGraph/J2DMaterial.h b/include/JSystem/J2DGraph/J2DMaterial.h
index b83a856cc9..a7022e49b0 100644
--- a/include/JSystem/J2DGraph/J2DMaterial.h
+++ b/include/JSystem/J2DGraph/J2DMaterial.h
@@ -3,7 +3,6 @@
 
 #include "JSystem/J2DGraph/J2DAnimation.h"
 #include "JSystem/J2DGraph/J2DMatBlock.h"
-#include "dolphin/types.h"
 
 class J2DMaterial {
 public:
diff --git a/include/JSystem/J2DGraph/J2DMaterialFactory.h b/include/JSystem/J2DGraph/J2DMaterialFactory.h
index 48b68363f8..22d3702e74 100644
--- a/include/JSystem/J2DGraph/J2DMaterialFactory.h
+++ b/include/JSystem/J2DGraph/J2DMaterialFactory.h
@@ -3,7 +3,6 @@
 
 #include "JSystem/J2DGraph/J2DManage.h"
 #include "JSystem/J2DGraph/J2DMatBlock.h"
-#include "dolphin/gx/GXEnum.h"
 #include "dolphin/types.h"
 
 struct J2DMaterialBlock {
diff --git a/include/JSystem/J2DGraph/J2DOrthoGraph.h b/include/JSystem/J2DGraph/J2DOrthoGraph.h
index 8c31b878a1..5393ca272a 100644
--- a/include/JSystem/J2DGraph/J2DOrthoGraph.h
+++ b/include/JSystem/J2DGraph/J2DOrthoGraph.h
@@ -2,7 +2,6 @@
 #define J2DORTHOGRAPH_H
 
 #include "JSystem/J2DGraph/J2DGrafContext.h"
-#include "dolphin/types.h"
 
 class J2DOrthoGraph : public J2DGrafContext {
 public:
diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h
index a2c4bf1d14..2168d8cba4 100644
--- a/include/JSystem/J2DGraph/J2DPane.h
+++ b/include/JSystem/J2DGraph/J2DPane.h
@@ -5,7 +5,6 @@
 #include "JSystem/JSupport/JSUList.h"
 #include "dolphin/gx/GXEnum.h"
 #include "dolphin/mtx/mtx.h"
-#include "dolphin/types.h"
 
 class J2DAnmBase;
 class J2DAnmColor;
diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture.h
index e19ea034ba..2a5e34fbd6 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/gx/GXEnum.h"
 #include "dolphin/types.h"
 
 class J2DMaterial;
diff --git a/include/JSystem/J2DGraph/J2DPictureEx.h b/include/JSystem/J2DGraph/J2DPictureEx.h
index 8e3a3139cf..40539fe27f 100644
--- a/include/JSystem/J2DGraph/J2DPictureEx.h
+++ b/include/JSystem/J2DGraph/J2DPictureEx.h
@@ -3,7 +3,6 @@
 
 #include "JSystem/J2DGraph/J2DPicture.h"
 #include "JSystem/J2DGraph/J2DTevs.h"
-#include "dolphin/gx/GXEnum.h"
 #include "dolphin/types.h"
 
 class J2DMaterial;
diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/include/JSystem/J2DGraph/J2DPrint.h
index de9dd592eb..aee90d93c1 100644
--- a/include/JSystem/J2DGraph/J2DPrint.h
+++ b/include/JSystem/J2DGraph/J2DPrint.h
@@ -2,7 +2,6 @@
 #define J2DPRINT_H
 
 #include "JSystem/J2DGraph/J2DTextBox.h"
-#include "JSystem/JUtility/TColor.h"
 #include "Runtime.PPCEABI.H/__va_arg.h"
 #include "dolphin/types.h"
 
diff --git a/include/JSystem/J2DGraph/J2DScreen.h b/include/JSystem/J2DGraph/J2DScreen.h
index 456f8d3ad4..4ec99b3d45 100644
--- a/include/JSystem/J2DGraph/J2DScreen.h
+++ b/include/JSystem/J2DGraph/J2DScreen.h
@@ -4,7 +4,6 @@
 #include "JSystem/J2DGraph/J2DManage.h"
 #include "JSystem/J2DGraph/J2DPane.h"
 #include "JSystem/JUtility/TColor.h"
-#include "dolphin/types.h"
 
 class J2DMaterial;
 class JUTNameTab;
diff --git a/include/JSystem/J2DGraph/J2DTevs.h b/include/JSystem/J2DGraph/J2DTevs.h
index 9bf56f924e..ea62166b53 100644
--- a/include/JSystem/J2DGraph/J2DTevs.h
+++ b/include/JSystem/J2DGraph/J2DTevs.h
@@ -3,7 +3,6 @@
 
 #include "dolphin/gx/GXEnum.h"
 #include "dolphin/mtx/mtxvec.h"
-#include "dolphin/types.h"
 
 struct J2DTextureSRTInfo {
     /* 0x00 */ f32 field_0x0;
diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox.h
index b0d99ec5ae..0a54338457 100644
--- a/include/JSystem/J2DGraph/J2DTextBox.h
+++ b/include/JSystem/J2DGraph/J2DTextBox.h
@@ -3,7 +3,6 @@
 
 #include "JSystem/J2DGraph/J2DMaterial.h"
 #include "JSystem/J2DGraph/J2DPane.h"
-#include "dolphin/types.h"
 
 class J2DMaterial;
 class JUTFont;
diff --git a/include/JSystem/J2DGraph/J2DTextBoxEx.h b/include/JSystem/J2DGraph/J2DTextBoxEx.h
index 3a53a48ade..301d11063a 100644
--- a/include/JSystem/J2DGraph/J2DTextBoxEx.h
+++ b/include/JSystem/J2DGraph/J2DTextBoxEx.h
@@ -2,7 +2,6 @@
 #define J2DTEXTBOXEX_H
 
 #include "JSystem/J2DGraph/J2DTextBox.h"
-#include "dolphin/gx/GXEnum.h"
 #include "dolphin/types.h"
 
 class J2DMaterial;
diff --git a/include/JSystem/J2DGraph/J2DWindow.h b/include/JSystem/J2DGraph/J2DWindow.h
index fb114165f0..b335cf70d3 100644
--- a/include/JSystem/J2DGraph/J2DWindow.h
+++ b/include/JSystem/J2DGraph/J2DWindow.h
@@ -3,7 +3,6 @@
 
 #include "JSystem/J2DGraph/J2DMaterial.h"
 #include "JSystem/J2DGraph/J2DPane.h"
-#include "dolphin/types.h"
 
 class JSURandomInputStream;
 class JUTTexture;
diff --git a/include/JSystem/J2DGraph/J2DWindowEx.h b/include/JSystem/J2DGraph/J2DWindowEx.h
index a19e3842aa..ded9472984 100644
--- a/include/JSystem/J2DGraph/J2DWindowEx.h
+++ b/include/JSystem/J2DGraph/J2DWindowEx.h
@@ -1,9 +1,7 @@
 #ifndef J2DWINDOWEX_H
 #define J2DWINDOWEX_H
 
-#include "JSystem/J2DGraph/J2DMaterial.h"
 #include "JSystem/J2DGraph/J2DWindow.h"
-#include "dolphin/gx/GXEnum.h"
 #include "dolphin/types.h"
 
 class J2DWindowEx : public J2DWindow {