Format and clean up from merge.

libs/JSystem/JUtility/JUTException.cpp

@@ -4,6 +4,7 @@
 //
 
 #include "JSystem/JUtility/JUTException.h"
+#include "Runtime.PPCEABI.H/__va_arg.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
@@ -336,7 +337,7 @@ static u8 context[712];
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm void JUTException::panic_f_va(char const* param_0, int param_1, char const* param_2,
-                                  __va_list_struct* param_3) {
+                                  va_list param_3) {
     nofralloc
 #include "asm/JSystem/JUtility/JUTException/panic_f_va__12JUTExceptionFPCciPCcP16__va_list_struct.s"
 }

libs/JSystem/JUtility/JUTVideo.cpp

@@ -4,21 +4,12 @@
 //
 
 #include "JSystem/JUtility/JUTVideo.h"
+#include "JSystem/JUtility/JUTDirectPrint.h"
 #include "JSystem/JUtility/JUTXfb.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 #include "dolphin/vi/vi.h"
 
-//
-// Types:
-//
-
-struct JUTDirectPrint {
-    /* 802E456C */ void changeFrameBuffer(void*, u16, u16);
-
-    static JUTDirectPrint* sDirectPrint;
-};
-
 //
 // External References:
 //
@@ -37,8 +28,8 @@ JUTVideo* JUTVideo::sManager;
 OSTick JUTVideo::sVideoLastTick;
 
 /* 80451540-80451544 000A40 0004+00 2/2 1/1 0/0 .sbss            sVideoInterval__8JUTVideo */
-
 OSTick JUTVideo::sVideoInterval;
+
 /* 80451544-80451548 000A44 0004+00 4/4 0/0 0/0 .sbss            None */
 static bool data_80451544;
 
@@ -123,8 +114,8 @@ void JUTVideo::preRetraceProc(u32 retrace_count) {
     if (frameBuffer) {
         JUTVideo* videoManager = JUTGetVideoManager();
         const GXRenderModeObj* renderMode = videoManager->getRenderMode();
-        JUTDirectPrint::sDirectPrint->changeFrameBuffer(frameBuffer, renderMode->fb_width,
-                                                        renderMode->efb_height);
+        JUTDirectPrint* directPrint = JUTDirectPrint::getManager();
+        directPrint->changeFrameBuffer(frameBuffer, renderMode->fb_width, renderMode->efb_height);
     }
 
     if (sManager->mSetBlack == 1) {