copy dolsdk2004 to tp / b_bh + e_mb done (#2299)

* move dolsdk2004 over

* cleanup some temp work

* finish and cleanup gf

* b_bh done

* d_a_e_mb done

include/JSystem/JUtility/JUTCacheFont.h

@@ -2,6 +2,7 @@
 #define JUTCACHEFONT_H
 
 #include "JSystem/JUtility/JUTResFont.h"
+#include "global.h"
 
 class JKRAramBlock;
 

include/JSystem/JUtility/JUTException.h

@@ -4,8 +4,8 @@
 #include "JSystem/JKernel/JKRThread.h"
 #include "JSystem/JUtility/JUTGamePad.h"
 #include "__va_arg.h"
-#include "dolphin/gx/GXEnum.h"
-#include "dolphin/os/OSError.h"
+#include <dolphin/gx.h>
+#include <dolphin/os.h>
 #include "global.h"
 
 typedef struct _GXRenderModeObj GXRenderModeObj;
@@ -42,6 +42,9 @@ STATIC_ASSERT(sizeof(JUTExternalFB) == 0x14);
 * @ingroup jsystem-jutility
 * 
 */
+
+typedef void (*JUTExceptionUserCallback)(u16, OSContext*, u32, u32);
+
 class JUTException : public JKRThread {
 public:
     enum EInfoPage {
@@ -87,8 +90,8 @@ public:
     /* 802E21FC */ static void panic_f(char const*, int, char const*, ...);
     /* 802E227C */ static void setFPException(u32);
     /* 802E2578 */ static bool searchPartialModule(u32, u32*, u32*, u32*, u32*);
-    /* 802E3AEC */ static OSErrorHandler setPreUserCallback(OSErrorHandler);
-    /* 802E3AFC */ static OSErrorHandler setPostUserCallback(OSErrorHandler);
+    /* 802E3AEC */ static JUTExceptionUserCallback setPreUserCallback(JUTExceptionUserCallback);
+    /* 802E3AFC */ static JUTExceptionUserCallback setPostUserCallback(JUTExceptionUserCallback);
     /* 802E3B0C */ static void appendMapFile(char const*);
     /* 802E3BA0 */ static bool queryMapAddress(char*, u32, s32, u32*, u32*, char*, u32, bool, bool);
     /* 802E3C90 */ static bool queryMapAddress_single(char*, u32, s32, u32*, u32*, char*, u32, bool,
@@ -120,8 +123,8 @@ private:
     static JSUList<JUTException::JUTExMapFile> sMapFileList;
     static OSMessage sMessageBuffer[1];
     static JUTException* sErrorManager;
-    static OSErrorHandler sPreUserCallback;
-    static OSErrorHandler sPostUserCallback;
+    static JUTExceptionUserCallback sPreUserCallback;
+    static JUTExceptionUserCallback sPostUserCallback;
     static void* sConsoleBuffer;
     static u32 sConsoleBufferSize;
     static JUTConsole* sConsole;

include/JSystem/JUtility/JUTGamePad.h

@@ -110,7 +110,7 @@ public:
     void stopMotor() { mRumble.stopMotor(mPortNum, false); }
     void stopMotorHard() { mRumble.stopMotorHard(mPortNum); }
 
-    static s8 getPortStatus(u32 port) { return mPadStatus[port].error; }
+    static s8 getPortStatus(u32 port) { return mPadStatus[port].err; }
 
     struct CButton {
         CButton() { clear(); }

include/JSystem/JUtility/JUTPalette.h

@@ -1,7 +1,7 @@
 #ifndef JUTPALETTE_H
 #define JUTPALETTE_H
 
-#include "dolphin/gx/GXStruct.h"
+#include <dolphin/gx.h>
 
 enum JUTTransparency { UNK0, UNK1 };
 

include/JSystem/JUtility/JUTProcBar.h

@@ -2,7 +2,7 @@
 #define JUTPROCBAR_H
 
 #include "JSystem/JUtility/TColor.h"
-#include "dolphin/os/OSTime.h"
+#include <dolphin/os.h>
 
 class JKRHeap;
 

include/JSystem/JUtility/JUTTexture.h

@@ -1,7 +1,7 @@
 #ifndef JUTTEXTURE_H
 #define JUTTEXTURE_H
 
-#include "dolphin/gx/GXStruct.h"
+#include <dolphin/gx.h>
 
 class JUTPalette;
 

include/JSystem/JUtility/JUTVideo.h

@@ -1,9 +1,9 @@
 #ifndef JUTVIDEO_H
 #define JUTVIDEO_H
 
-#include "dolphin/gx/GXStruct.h"
-#include "dolphin/os/OSMessage.h"
-#include "dolphin/os/OSTime.h"
+#include <dolphin/gx.h>
+#include <dolphin/os.h>
+#include <dolphin/os.h>
 
 typedef u8 (*Pattern)[2];
 
@@ -30,14 +30,14 @@ public:
     /* 802E5144 */ static void postRetraceProc(u32);
     /* 802E50BC */ static void drawDoneCallback();
 
-    u16 getFbWidth() const { return mRenderObj->fb_width; }
-    u16 getEfbHeight() const { return mRenderObj->efb_height; }
+    u16 getFbWidth() const { return mRenderObj->fbWidth; }
+    u16 getEfbHeight() const { return mRenderObj->efbHeight; }
     void getBounds(u16& width, u16& height) const {
         width = (u16)getFbWidth();
         height = (u16)getEfbHeight();
     }
-    u16 getXfbHeight() const { return mRenderObj->xfb_height; }
-    u32 isAntiAliasing() const { return mRenderObj->antialiasing; }
+    u16 getXfbHeight() const { return mRenderObj->xfbHeight; }
+    u32 isAntiAliasing() const { return mRenderObj->aa; }
     Pattern getSamplePattern() const { return mRenderObj->sample_pattern; }
     u8* getVFilter() const { return mRenderObj->vfilter; }
     OSMessageQueue* getMessageQueue() { return &mMessageQueue; }

include/JSystem/JUtility/TColor.h

@@ -1,7 +1,7 @@
 #ifndef TCOLOR_H
 #define TCOLOR_H
 
-#include "dolphin/gx/GXStruct.h"
+#include <dolphin/gx.h>
 
 namespace JUtility {
     
@@ -32,4 +32,4 @@ struct TColor : public GXColor {
 };
 }  // namespace JUtility
 
-#endif
+#endif