j2d / map_path work, d_drawlist / d_attention cleanup (#208)

* work on fop actor / actor mng, daalink, d_a_obj_item

* d_a_title mostly decompiled

* daalink / d_event / JMessage / dmsg_out_font work

* msg_scrn_base / msg_scrn_boss

* some work on mDo machine, d_menu_save, d_tresure, and various

* remove asm

* progress

* finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data

* rename more data

* remove asm / progress

* match all of d_pane_class

* fixes / some dKankyo doc

* bunch of j2d work. d_drawlist / d_attention cleanup

* progress / asm

* cleanup wip

* decompile JStage

* setup some more JStudio structs

* set up d_demo classes

* some d_demo work

* cleanup dolphin os stuff

* some initial dEvent documentation

* some At collision documentation

* match JUTConsole::doDraw

* dbgs work / split up some of d_a_alink into .inc files

* d_a_alink_spinner work

5 files changed, 16 insertions, 23 deletions

diff --git a/src/m_Do/m_Do_DVDError.cpp b/src/m_Do/m_Do_DVDError.cpp
index 7796a97e10..42298f008c 100644
--- a/src/m_Do/m_Do_DVDError.cpp
+++ b/src/m_Do/m_Do_DVDError.cpp
@@ -38,7 +38,7 @@ void mDoDvdErr_ThdInit() {
                        sizeof(DvdErr_stack), priority - 3, 1);
         OSResumeThread(&DvdErr_thread);
         OSCreateAlarm(&Alarm);
-        OSSetPeriodicAlarm(&Alarm, time, OS_BUS_CLOCK / 4, AlarmHandler);
+        OSSetPeriodicAlarm(&Alarm, time, OS_BUS_CLOCK / 4, (OSAlarmHandler*)AlarmHandler);
 
         mDoDvdErr_initialized = true;
     }
diff --git a/src/m_Do/m_Do_dvd_thread.cpp b/src/m_Do/m_Do_dvd_thread.cpp
index 78f702774a..5a932e20da 100644
--- a/src/m_Do/m_Do_dvd_thread.cpp
+++ b/src/m_Do/m_Do_dvd_thread.cpp
@@ -10,7 +10,6 @@
 #include "SSystem/SComponent/c_node.h"
 #include "dol2asm.h"
 #include "dolphin/dvd/dvd.h"
-#include "dolphin/os/OSThread.h"
 #include "dolphin/types.h"
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_reset.h"
diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp
index d9ebebd6a1..43c0ff16e1 100644
--- a/src/m_Do/m_Do_graphic.cpp
+++ b/src/m_Do/m_Do_graphic.cpp
@@ -372,7 +372,7 @@ static void darwFilter(GXColor matColor) {
     GXPosition3s8(1, 0, -5);
     GXPosition3s8(1, 1, -5);
     GXPosition3s8(0, 1, -5);
-    GXEnd();
+    i_GXEnd();
 }
 #else
 #pragma push
@@ -637,7 +637,7 @@ void mDoGph_drawFilterQuad(s8 param_0, s8 param_1) {
     GXTexCoord2s8(1, 1);
     GXPosition2s8(0, param_1);
     GXTexCoord2s8(0, 1);
-    GXEnd();
+    i_GXEnd();
 }
 
 /* 80009544-800095F8 003E84 00B4+00 0/0 1/1 0/0 .text            create__Q213mDoGph_gInf_c7bloom_cFv
@@ -762,9 +762,9 @@ static void drawItem3D() {
     dMenu_Collect3D_c::setupItem3D(item_mtx);
     setLight();
     j3dSys.setViewMtx(item_mtx);
-    GXSetClipMode(GX_ENABLE);
+    GXSetClipMode(GX_CLIP_DISABLE);
     dComIfGd_drawListItem3d();
-    GXSetClipMode(GX_DISABLE);
+    GXSetClipMode(GX_CLIP_ENABLE);
     j3dSys.reinitGX();
 }
 
diff --git a/src/m_Do/m_Do_lib.cpp b/src/m_Do/m_Do_lib.cpp
index ee74a13928..dfb56d6ffe 100644
--- a/src/m_Do/m_Do_lib.cpp
+++ b/src/m_Do/m_Do_lib.cpp
@@ -77,7 +77,7 @@ bool mDoLib_setResTimgObj(ResTIMG const* res, _GXTexObj* o_texObj, u32 param_2,
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void mDoLib_setResTimgObj(ResTIMG const* param_0, _GXTexObj* param_1, u32 param_2,
+asm bool mDoLib_setResTimgObj(ResTIMG const* param_0, _GXTexObj* param_1, u32 param_2,
                               _GXTlutObj* param_3) {
     nofralloc
 #include "asm/m_Do/m_Do_lib/mDoLib_setResTimgObj__FPC7ResTIMGP9_GXTexObjUlP10_GXTlutObj.s"
diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp
index 5dcf89a8c2..3880b2d23f 100644
--- a/src/m_Do/m_Do_printf.cpp
+++ b/src/m_Do/m_Do_printf.cpp
@@ -25,12 +25,6 @@ extern "C" void mDoPrintf_vprintf_Interrupt__FPCcP16__va_list_struct();
 extern "C" void mDoPrintf_vprintf_Thread__FPCcP16__va_list_struct();
 extern "C" void mDoPrintf_vprintf__FPCcP16__va_list_struct();
 extern "C" void mDoPrintf_VReport(const char* fmt, va_list args);
-extern "C" void OSVReport(const char* fmt, va_list args);
-extern "C" void OSReport(const char*, ...);
-extern "C" void OSReport_FatalError(const char* fmt, ...);
-extern "C" void OSReport_Error(const char* fmt, ...);
-extern "C" void OSReport_Warning(const char* fmt, ...);
-extern "C" void OSReport_System(const char* fmt, ...);
 extern "C" extern char const* const m_Do_m_Do_printf__stringBase0;
 
 //
@@ -64,12 +58,12 @@ void my_PutString(const char* string) {
 }
 
 /* 800067F4-80006814 001134 0020+00 3/3 0/0 0/0 .text OSVAttention__FPCcP16__va_list_struct */
-void OSVAttention(char const* fmt, va_list args) {
+void OSVAttention(char* fmt, va_list args) {
     mDoPrintf_vprintf(fmt, args);
 }
 
 /* 80006814-80006894 001154 0080+00 1/1 1/1 0/0 .text            OSAttention */
-void OSAttention(const char* fmt, ...) {
+void OSAttention(char* fmt, ...) {
     va_list args;
     va_start(args, fmt);
     mDoPrintf_vprintf(fmt, args);
@@ -179,12 +173,12 @@ void mDoPrintf_VReport(const char* fmt, va_list args) {
 }
 
 /* 80006A9C-80006ABC 0013DC 0020+00 2/2 0/0 0/0 .text            OSVReport */
-void OSVReport(const char* fmt, va_list args) {
+void OSVReport(char* fmt, va_list args) {
     mDoPrintf_VReport(fmt, args);
 }
 
 /* 80006ABC-80006B3C 0013FC 0080+00 0/0 97/97 10/10 .text            OSReport */
-void OSReport(const char* fmt, ...) {
+void OSReport(char* fmt, ...) {
     va_list args;
     va_start(args, fmt);
     OSVReport(fmt, args);
@@ -192,7 +186,7 @@ void OSReport(const char* fmt, ...) {
 }
 
 /* 80006B3C-80006C0C 00147C 00D0+00 0/0 2/2 0/0 .text            OSReport_FatalError */
-void OSReport_FatalError(const char* fmt, ...) {
+void OSReport_FatalError(char* fmt, ...) {
     va_list args;
     va_start(args, fmt);
 
@@ -208,7 +202,7 @@ void OSReport_FatalError(const char* fmt, ...) {
 }
 
 /* 80006C0C-80006CEC 00154C 00E0+00 0/0 31/31 10/10 .text            OSReport_Error */
-void OSReport_Error(const char* fmt, ...) {
+void OSReport_Error(char* fmt, ...) {
     print_errors++;
     if (!data_80450B99) {
         va_list args;
@@ -224,7 +218,7 @@ void OSReport_Error(const char* fmt, ...) {
 }
 
 /* 80006CEC-80006DCC 00162C 00E0+00 0/0 6/6 0/0 .text            OSReport_Warning */
-void OSReport_Warning(const char* fmt, ...) {
+void OSReport_Warning(char* fmt, ...) {
     print_warings++;
     if (!data_80450B9A) {
         va_list args;
@@ -240,7 +234,7 @@ void OSReport_Warning(const char* fmt, ...) {
 }
 
 /* 80006DCC-80006E7C 00170C 00B0+00 0/0 1/1 0/0 .text            OSReport_System */
-void OSReport_System(const char* fmt, ...) {
+void OSReport_System(char* fmt, ...) {
     print_systems++;
     if (!data_80450B9B) {
         va_list args;
@@ -265,7 +259,7 @@ SECTION_DEAD static char const* const stringBase_80373D4C = "0x%08x:   0x%08x
 /* 80006E7C-80006FB4 0017BC 0138+00 0/0 9/9 0/0 .text            OSPanic */
 // loop stuff / ending
 #ifdef NONMATCHING
-void OSPanic(const char* file, s32 line, const char* fmt, ...) {
+void OSPanic(char* file, s32 line, char* fmt, ...) {
     OSDisableInterrupts();
 
     va_list args;
@@ -291,7 +285,7 @@ void OSPanic(const char* file, s32 line, const char* fmt, ...) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void OSPanic(const char* file, s32 line, const char* fmt, ...) {
+asm void OSPanic(char* file, s32 line, char* fmt, ...) {
     nofralloc
 #include "asm/m_Do/m_Do_printf/OSPanic.s"
 }