almost all of dolphin matched (#2036)

* TRK full match

* remove trk asm

* ar done

* cleanup some dolphin headers

* more dolphin cleanup

* cleanup / GD fully matched

* almost all of GX fully matched

* GX / Mtx full matched

* most of OS done

* pad done

* most of VI

* remove asm

* forgot couple vec funcs

* couple JUtility matches

47 files changed, 132 insertions, 133 deletions

diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp
index 4cb6d1db4d..8024c44dbe 100644
--- a/src/DynamicLink.cpp
+++ b/src/DynamicLink.cpp
@@ -10,7 +10,7 @@
 #include "JSystem/JUtility/JUTConsole.h"
 #include "stdio.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "m_Do/m_Do_dvd_thread.h"
 #include "m_Do/m_Do_ext.h"
 
diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp
index f9fdb9d259..fa66ee9799 100644
--- a/src/d/a/d_a_alink.cpp
+++ b/src/d/a/d_a_alink.cpp
@@ -17,7 +17,7 @@
 #include "d/msg/d_msg_object.h"
 #include "d/pane/d_pane_class.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "rel/d/a/d_a_crod/d_a_crod.h"
 #include "rel/d/a/d_a_horse/d_a_horse.h"
 #include "rel/d/a/d_a_mg_rod/d_a_mg_rod.h"
diff --git a/src/d/bg/d_bg_s.cpp b/src/d/bg/d_bg_s.cpp
index 3553a4e9f0..34654a2e48 100644
--- a/src/d/bg/d_bg_s.cpp
+++ b/src/d/bg/d_bg_s.cpp
@@ -7,7 +7,7 @@
 #include "d/bg/d_bg_s_sph_chk.h"
 #include "d/bg/d_bg_w.h"
 #include "d/com/d_com_inf_game.h"
-#include "dolphin/mtx/mtxvec.h"
+#include "dolphin/mtx.h"
 #include "f_op/f_op_actor_mng.h"
 
 /* 800740F4-80074110 06EA34 001C+00 2/2 1/1 0/0 .text            Init__11cBgS_ChkElmFv */
diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp
index f6abd887a2..251fc12224 100644
--- a/src/d/com/d_com_inf_game.cpp
+++ b/src/d/com/d_com_inf_game.cpp
@@ -13,7 +13,7 @@
 #include "d/d_timer.h"
 #include "d/map/d_map_path_dmap.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "f_op/f_op_scene_mng.h"
 #include "m_Do/m_Do_Reset.h"
 #include "m_Do/m_Do_audio.h"
diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp
index d4f71af7d8..a510b25deb 100644
--- a/src/d/d_camera.cpp
+++ b/src/d/d_camera.cpp
@@ -5,7 +5,7 @@
 
 #include "d/d_camera.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "d/a/d_a_alink.h"
 #include "d/com/d_com_inf_game.h"
 #include "m_Do/m_Do_controller_pad.h"
diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp
index f159ec256d..0b017bfc79 100644
--- a/src/d/d_demo.cpp
+++ b/src/d/d_demo.cpp
@@ -6,7 +6,7 @@
 #include "d/d_demo.h"
 #include "d/msg/d_msg_object.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "f_op/f_op_actor_mng.h"
 #include "global.h"
 #include "m_Do/m_Do_graphic.h"
diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp
index 4c21b5714b..1cfc970235 100644
--- a/src/d/d_drawlist.cpp
+++ b/src/d/d_drawlist.cpp
@@ -9,9 +9,9 @@
 #include "SSystem/SComponent/c_bg_s_shdw_draw.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx.h"
 #include "dolphin/mtx/mtx44.h"
-#include "dolphin/mtx/mtxvec.h"
+#include "dolphin/mtx.h"
 #include "m_Do/m_Do_graphic.h"
 #include "m_Do/m_Do_lib.h"
 #include "m_Do/m_Do_mtx.h"
@@ -411,10 +411,10 @@ void dDlst_2DTri_c::draw() {
     GXLoadPosMtxImm(mDoMtx_getIdentity(), GX_PNMTX0);
     GXSetCurrentMtx(GX_PNMTX0);
     GXBegin(GX_TRIANGLES, GX_VTXFMT0, 3);
-    i_GXPosition3s16(x[0], y[0], 0);
-    i_GXPosition3s16(x[1], y[1], 0);
-    i_GXPosition3s16(x[2], y[2], 0);
-    i_GXEnd();
+    GXPosition3s16(x[0], y[0], 0);
+    GXPosition3s16(x[1], y[1], 0);
+    GXPosition3s16(x[2], y[2], 0);
+    GXEnd();
     dComIfGp_getCurrentGrafPort()->setup2D();
 }
 #else
@@ -447,11 +447,11 @@ void dDlst_2DQuad_c::draw() {
     GXLoadPosMtxImm(mDoMtx_getIdentity(), GX_PNMTX0);
     GXSetCurrentMtx(GX_PNMTX0);
     GXBegin(GX_QUADS, GX_VTXFMT0, 4);
-    i_GXPosition3s16(field_0x4, field_0x6, 0);
-    i_GXPosition3s16(field_0x8, field_0x6, 0);
-    i_GXPosition3s16(field_0x8, field_0xa, 0);
-    i_GXPosition3s16(field_0x4, field_0xa, 0);
-    i_GXEnd();
+    GXPosition3s16(field_0x4, field_0x6, 0);
+    GXPosition3s16(field_0x8, field_0x6, 0);
+    GXPosition3s16(field_0x8, field_0xa, 0);
+    GXPosition3s16(field_0x4, field_0xa, 0);
+    GXEnd();
     dComIfGp_getCurrentGrafPort()->setup2D();
 }
 #else
@@ -485,8 +485,8 @@ void dDlst_2DPoint_c::draw() {
     GXLoadPosMtxImm(mDoMtx_getIdentity(), GX_PNMTX0);
     GXSetCurrentMtx(GX_PNMTX0);
     GXBegin(GX_POINTS, GX_VTXFMT0, 1);
-    i_GXPosition3s16(field_0x4, field_0x6, 0);
-    i_GXEnd();
+    GXPosition3s16(field_0x4, field_0x6, 0);
+    GXEnd();
     dComIfGp_getCurrentGrafPort()->setup2D();
 }
 #else
@@ -572,19 +572,19 @@ void dDlst_2DT_c::draw() {
     GXSetClipMode(GX_CLIP_DISABLE);
     GXSetCurrentMtx(GX_PNMTX0);
     GXBegin(GX_QUADS, GX_VTXFMT0, 4);
-    i_GXPosition3s16(field_0x12, field_0x14, 0);
+    GXPosition3s16(field_0x12, field_0x14, 0);
     GXColor1u32(0xffffffff);
-    i_GXTexCoord2u16(var1, var2);
-    i_GXPosition3s16(field_0x16, field_0x14, 0);
+    GXTexCoord2u16(var1, var2);
+    GXPosition3s16(field_0x16, field_0x14, 0);
     GXColor1u32(0xffffffff);
-    i_GXTexCoord2u16(var3, var2);
-    i_GXPosition3s16(field_0x16, field_0x18, 0);
+    GXTexCoord2u16(var3, var2);
+    GXPosition3s16(field_0x16, field_0x18, 0);
     GXColor1u32(0xffffffff);
-    i_GXTexCoord2u16(var3, var4);
-    i_GXPosition3s16(field_0x12, field_0x18, 0);
+    GXTexCoord2u16(var3, var4);
+    GXPosition3s16(field_0x12, field_0x18, 0);
     GXColor1u32(0xffffffff);
-    i_GXTexCoord2u16(var1, var4);
-    i_GXEnd();
+    GXTexCoord2u16(var1, var4);
+    GXEnd();
     GXSetClipMode(GX_CLIP_ENABLE);
     dComIfGp_getCurrentGrafPort()->setup2D();
 }
@@ -695,7 +695,7 @@ void dDlst_2DT2_c::draw() {
         GXTexCoord2f32(f27, f25);
         GXPosition2f32(f29, f30);
         GXTexCoord2f32(f26, f25);
-        i_GXEnd();
+        GXEnd();
     } else if (field_0x44) {
         f32 f28 = field_0x24 + field_0x2c * 0.5f;
         f32 f29;
@@ -730,7 +730,7 @@ void dDlst_2DT2_c::draw() {
         GXTexCoord2f32(f29, 1.0f);
         GXPosition2f32(f28, f30);
         GXTexCoord2f32(f27, 1.0f);
-        i_GXEnd();
+        GXEnd();
     } else if (field_0x45) {
         f32 f24 = field_0x28 + 0.5f * field_0x30;
         f32 f25;
@@ -768,7 +768,7 @@ void dDlst_2DT2_c::draw() {
         GXTexCoord2f32(f26, f27);
         GXPosition2f32(field_0x24, f30);
         GXTexCoord2f32(f25, f27);
-        i_GXEnd();
+        GXEnd();
     } else {
         f32 f24;
         f32 f25;
@@ -797,7 +797,7 @@ void dDlst_2DT2_c::draw() {
         GXTexCoord2f32(f25, f27);
         GXPosition2f32(field_0x24, f30);
         GXTexCoord2f32(f24, f27);
-        i_GXEnd();
+        GXEnd();
     }
     GXSetClipMode(GX_CLIP_ENABLE);
     dComIfGp_getCurrentGrafPort()->setup2D();
@@ -1193,19 +1193,19 @@ void dDlst_2DM_c::draw() {
     GXSetTevAlphaOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
     GXSetBlendMode(GX_BM_BLEND, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_SET);
     GXBegin(GX_QUADS, GX_VTXFMT0, 4);
-    i_GXPosition3s16(field_0x4, field_0x6, 0);
+    GXPosition3s16(field_0x4, field_0x6, 0);
     GXTexCoord2s16(r31, r30);
     GXTexCoord2s16(r27, r26);
-    i_GXPosition3s16(field_0x8, field_0x6, 0);
+    GXPosition3s16(field_0x8, field_0x6, 0);
     GXTexCoord2s16(r29, r30);
     GXTexCoord2s16(r25, r26);
-    i_GXPosition3s16(field_0x8, field_0xa, 0);
+    GXPosition3s16(field_0x8, field_0xa, 0);
     GXTexCoord2s16(r29, r28);
     GXTexCoord2s16(r25, r24);
-    i_GXPosition3s16(field_0x4, field_0xa, 0);
+    GXPosition3s16(field_0x4, field_0xa, 0);
     GXTexCoord2s16(r31, r28);
     GXTexCoord2s16(r27, r24);
-    i_GXEnd();
+    GXEnd();
     dComIfGp_getCurrentGrafPort()->setup2D();
 }
 #else
@@ -1271,19 +1271,19 @@ void dDlst_2Dm_c::draw() {
     GXLoadPosMtxImm(g_mDoMtx_identity, GX_PNMTX0);
     GXSetCurrentMtx(0);
     GXBegin(GX_QUADS, GX_VTXFMT0, 4);
-    i_GXPosition3s16(field_0x4, field_0x6, 0);
+    GXPosition3s16(field_0x4, field_0x6, 0);
     GXTexCoord2s16(r31, r30);
     GXTexCoord2s16(r27, r26);
-    i_GXPosition3s16(field_0x8, field_0x6, 0);
+    GXPosition3s16(field_0x8, field_0x6, 0);
     GXTexCoord2s16(r29, r30);
     GXTexCoord2s16(r25, r26);
-    i_GXPosition3s16(field_0x8, field_0xa, 0);
+    GXPosition3s16(field_0x8, field_0xa, 0);
     GXTexCoord2s16(r29, r28);
     GXTexCoord2s16(r25, r24);
-    i_GXPosition3s16(field_0x4, field_0xa, 0);
+    GXPosition3s16(field_0x4, field_0xa, 0);
     GXTexCoord2s16(r31, r28);
     GXTexCoord2s16(r27, r24);
-    i_GXEnd();
+    GXEnd();
     dComIfGp_getCurrentGrafPort()->setup2D();
 }
 #else
@@ -1337,7 +1337,7 @@ void dDlst_2DMt_c::draw() {
         GXSetNumTevStages(r28);
         GXSetBlendMode(GX_BM_BLEND, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_SET);
         GXBegin(GX_QUADS, GX_VTXFMT0, 4);
-        i_GXPosition3s16(field_0xc, field_0xe, 0);
+        GXPosition3s16(field_0xc, field_0xe, 0);
         dDlst_2DMt_tex_c* tmp = field_0x8;
         for (int i = 0; i < field_0x4; i++) {
             if (tmp->check()) {
@@ -1345,7 +1345,7 @@ void dDlst_2DMt_c::draw() {
             }
             tmp++;
         }
-        i_GXPosition3s16(field_0x10, field_0xe, 0);
+        GXPosition3s16(field_0x10, field_0xe, 0);
         tmp = field_0x8;
         for (int i = 0; i < field_0x4; i++) {
             if (tmp->check()) {
@@ -1353,7 +1353,7 @@ void dDlst_2DMt_c::draw() {
             }
             tmp++;
         }
-        i_GXPosition3s16(field_0x10, field_0x12, 0);
+        GXPosition3s16(field_0x10, field_0x12, 0);
         tmp = field_0x8;
         for (int i = 0; i < field_0x4; i++) {
             if (tmp->check()) {
@@ -1361,7 +1361,7 @@ void dDlst_2DMt_c::draw() {
             }
             tmp++;
         }
-        i_GXPosition3s16(field_0xc, field_0x12, 0);
+        GXPosition3s16(field_0xc, field_0x12, 0);
         tmp = field_0x8;
         for (int i = 0; i < field_0x4; i++) {
             if (tmp->check()) {
@@ -1369,7 +1369,7 @@ void dDlst_2DMt_c::draw() {
             }
             tmp++;
         }
-        i_GXEnd();
+        GXEnd();
         dComIfGp_getCurrentGrafPort()->setup2D();
     }
 }
@@ -1619,7 +1619,7 @@ void dDlst_effectLine_c::draw() {
         GXBegin(GX_LINES, GX_VTXFMT0, 2);
         GXPosition3f32(local_68.x, local_68.y, local_68.z);
         GXPosition3f32(local_74.x, local_74.y, local_74.z);
-        i_GXEnd();
+        GXEnd();
     }
 }
 #else
@@ -1703,7 +1703,7 @@ void dDlst_shadowPoly_c::draw() {
         tri++;
     }
 
-    i_GXEnd();
+    GXEnd();
 }
 
 /* 80054478-800544F0 04EDB8 0078+00 1/1 0/0 0/0 .text            J3DDrawBuffer__create__FUl */
diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp
index 3a2eaaaa6d..19b64b53c9 100644
--- a/src/d/d_error_msg.cpp
+++ b/src/d/d_error_msg.cpp
@@ -5,7 +5,7 @@
 
 #include "d/d_error_msg.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "dolphin/types.h"
 
 //
diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp
index a4477e60e6..382520c8f0 100644
--- a/src/d/d_eye_hl.cpp
+++ b/src/d/d_eye_hl.cpp
@@ -7,7 +7,7 @@
 #include "JSystem/J3DGraphBase/J3DTexture.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "d/s/d_s_play.h"
 
 /* 8009C964-8009CA28 0972A4 00C4+00 0/0 2/2 0/0 .text            entry__8dEyeHL_cFP12J3DModelDataPCc
diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp
index c66f45e347..d8933b1967 100644
--- a/src/d/d_gameover.cpp
+++ b/src/d/d_gameover.cpp
@@ -224,7 +224,7 @@ void dDlst_Gameover_CAPTURE_c::draw() {
     GXPosition3s8(0, 1, -5);
     GXTexCoord2s8(0, 1);
 
-    i_GXEnd();
+    GXEnd();
 }
 #else
 #pragma push
diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp
index fb92cf9df7..63e434f064 100644
--- a/src/d/d_resorce.cpp
+++ b/src/d/d_resorce.cpp
@@ -11,8 +11,8 @@
 #include "string.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
-#include "dolphin/mtx/mtx.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/mtx.h"
+#include "dolphin/os.h"
 #include "dolphin/types.h"
 #include "global.h"
 #include "m_Do/m_Do_graphic.h"
diff --git a/src/d/d_select_cursor.cpp b/src/d/d_select_cursor.cpp
index 7af6a21af8..69732c0a06 100644
--- a/src/d/d_select_cursor.cpp
+++ b/src/d/d_select_cursor.cpp
@@ -7,7 +7,7 @@
 #include "d/com/d_com_inf_game.h"
 #include "JSystem/J2DGraph/J2DAnimation.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "global.h"
 
 //
@@ -323,7 +323,7 @@ dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2)
     }
 
     mpSelectIcon = NULL;
-    i_OSInitFastCast();
+    OSInitFastCast();
     if (strcmp(bpk_name[mNameIdx], "") != 0) {
         field_0x30 = (J2DAnmColor*)J2DAnmLoaderDataBase::load(JKRFileLoader::getGlbResource(bpk_name[mNameIdx], param_2));
         field_0x30->searchUpdateMaterialID(mpScreen);
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index c77d6010a0..b238dc4d97 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -16,7 +16,7 @@
 #include "d/map/d_map_path_fmap.h"
 #include "d/save/d_save_HIO.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "f_op/f_op_kankyo_mng.h"
 #include "f_op/f_op_msg_mng.h"
 #include "f_op/f_op_scene_mng.h"
diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp
index 4c8dd71345..0a0ecf4b44 100644
--- a/src/d/d_timer.cpp
+++ b/src/d/d_timer.cpp
@@ -620,7 +620,7 @@ void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) {
     JUT_ASSERT(fg != false);
     dPaneClass_showNullPane(mpGetInScreen);
 
-    i_OSInitFastCast();
+    OSInitFastCast();
     mpGetInBck = (J2DAnmTransform*)J2DAnmLoaderDataBase::load(
         JKRGetNameResource("zelda_game_image_cow_get_in.bck", mpArchive));
 
diff --git a/src/d/file/d_file_select.cpp b/src/d/file/d_file_select.cpp
index 0e5c49e5b9..eb777f3278 100644
--- a/src/d/file/d_file_select.cpp
+++ b/src/d/file/d_file_select.cpp
@@ -14,7 +14,7 @@
 #include "d/meter/d_meter2_info.h"
 #include "d/s/d_s_play.h"
 #include "dol2asm.h"
-#include "dolphin/dvd/dvd.h"
+#include "dolphin/dvd.h"
 #include "dolphin/types.h"
 #include "m_Do/m_Do_MemCard.h"
 #include "m_Do/m_Do_controller_pad.h"
diff --git a/src/d/kankyo/d_kankyo_rain.cpp b/src/d/kankyo/d_kankyo_rain.cpp
index 1c35e76c13..bd0f69a96f 100644
--- a/src/d/kankyo/d_kankyo_rain.cpp
+++ b/src/d/kankyo/d_kankyo_rain.cpp
@@ -2863,7 +2863,7 @@ void dKyr_drawSibuki(Mtx param_0, u8** param_1) {
 
             GXPosition3f32(sp7C.x, sp7C.y, sp7C.z);
             GXTexCoord2s16(0, 0x1FF);
-            i_GXEnd();
+            GXEnd();
         }
 
         GXSetClipMode(GX_CLIP_ENABLE);
@@ -3282,7 +3282,7 @@ void dKyr_drawHousi(Mtx param_0, u8** param_1) {
                             GXTexCoord2s16(var_r17, var_r17);
                             GXPosition3f32(sp15C[3].x, sp15C[3].y, sp15C[3].z);
                             GXTexCoord2s16(0, var_r17);
-                            i_GXEnd();
+                            GXEnd();
                         }
                     }
                 }
diff --git a/src/d/map/d_map_path.cpp b/src/d/map/d_map_path.cpp
index 0f847db221..5254cee5bb 100644
--- a/src/d/map/d_map_path.cpp
+++ b/src/d/map/d_map_path.cpp
@@ -91,7 +91,7 @@ void dDrawPath_c::rendering(dDrawPath_c::line_class const* p_line) {
                 GXPosition1x16(*tmp);
                 tmp++;
             }
-            i_GXEnd();
+            GXEnd();
         }
     }
 }
@@ -110,7 +110,7 @@ void dDrawPath_c::rendering(dDrawPath_c::poly_class const* p_poly) {
                 GXPosition1x16(*tmp);
                 tmp++;
             }
-            i_GXEnd();
+            GXEnd();
         }
     }
 }
@@ -262,7 +262,7 @@ void dRenderingFDAmap_c::drawBack() const {
     GXPosition3f32(field_0x8, -field_0xc, 0);
     GXPosition3f32(field_0x8, field_0xc, 0);
     GXPosition3f32(-field_0x8, field_0xc, 0);
-    i_GXEnd();
+    GXEnd();
 }
 
 /* 8003D188-8003D320 037AC8 0198+00 1/0 8/0 0/0 .text preRenderingMap__18dRenderingFDAmap_cFv */
@@ -297,7 +297,7 @@ void dRenderingFDAmap_c::preRenderingMap() {
 void dRenderingFDAmap_c::postRenderingMap() {
     GXSetCopyFilter(GX_FALSE, NULL, GX_FALSE, NULL);
     GXSetTexCopySrc(0, 0, field_0x1c, field_0x1e);
-    GXSetTexCopyDst(field_0x1c, field_0x1e, _GX_CTF_R8, GX_FALSE);
+    GXSetTexCopyDst(field_0x1c, field_0x1e, GX_CTF_G8, GX_FALSE);
     GXCopyTex(field_0x4, GX_TRUE);
     GXPixModeSync();
     GXSetClipMode(GX_CLIP_ENABLE);
@@ -363,7 +363,7 @@ void dRenderingFDAmap_c::renderingDecoration(dDrawPath_c::line_class const* p_li
         GXBegin(GX_POINTS, GX_VTXFMT0, 1);
         GXPosition1x16(data_p[0]);
         GXTexCoord2f32(0, 0);
-        i_GXEnd();
+        GXEnd();
     }
 
     setTevSettingNonTextureDirectColor();
diff --git a/src/d/map/d_map_path_dmap.cpp b/src/d/map/d_map_path_dmap.cpp
index 5f52d90397..843495d2d6 100644
--- a/src/d/map/d_map_path_dmap.cpp
+++ b/src/d/map/d_map_path_dmap.cpp
@@ -862,13 +862,13 @@ void renderingDAmap_c::preDrawPath() {
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_INDEX16);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_F32, 0);
-    GXSetMisc(1, 8);
+    GXSetMisc(GX_MT_XF_FLUSH, 8);
 }
 
 /* 8003FFC4-8003FFEC 03A904 0028+00 3/0 3/0 0/0 .text            postDrawPath__16renderingDAmap_cFv
  */
 void renderingDAmap_c::postDrawPath() {
-    GXSetMisc(1, 0);
+    GXSetMisc(GX_MT_XF_FLUSH, 0);
 }
 
 /* 8003FFEC-8003FFF4 03A92C 0008+00 3/0 3/1 0/0 .text getRoomNoSingle__16renderingDAmap_cFv */
@@ -1154,7 +1154,7 @@ void renderingPlusDoor_c::drawNormalDoorS(stage_tgsc_data_class const* i_doorDat
         GXPosition3f32(sp18[i].x, sp18[i].y, sp18[i].z);
         GXTexCoord1x8(i);
     }
-    i_GXEnd();
+    GXEnd();
 }
 
 /* 800409B4-800409E0 03B2F4 002C+00 3/0 2/0 0/0 .text isDrawRoomIcon__16renderingDAmap_cCFii */
@@ -1390,7 +1390,7 @@ void renderingPlusDoorAndCursor_c::drawIconSingle(Vec const& param_0, f32 param_
         GXTexCoord1x8(i);
     }
 
-    i_GXEnd();
+    GXEnd();
 }
 
 /* 800412C0-8004145C 03BC00 019C+00 1/1 0/0 0/0 .text
@@ -1430,7 +1430,7 @@ void renderingPlusDoorAndCursor_c::drawCursor(Vec const& param_0, s16 param_1, i
         GXPosition2f32(offset[i].x, offset[i].z);
     }
 
-    i_GXEnd();
+    GXEnd();
 }
 
 /* 8004145C-80041460 03BD9C 0004+00 2/0 0/0 0/0 .text beforeDrawPath__19renderingPlusDoor_cFv */
diff --git a/src/d/menu/d_menu_collect.cpp b/src/d/menu/d_menu_collect.cpp
index e349c882c3..d7854095d3 100644
--- a/src/d/menu/d_menu_collect.cpp
+++ b/src/d/menu/d_menu_collect.cpp
@@ -30,7 +30,7 @@
 #include "d/msg/d_msg_string.h"
 #include "d/pane/d_pane_class.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "dolphin/types.h"
 #include "m_Do/m_Do_graphic.h"
 #include "m_Do/m_Do_mtx.h"
@@ -1567,7 +1567,7 @@ asm void dMenu_Collect2D_c::screenSet() {
 // matches with literals
 #ifdef NONMATCHING
 void dMenu_Collect2D_c::animationSet() {
-    i_OSInitFastCast();
+    OSInitFastCast();
     void* resource =
         JKRGetNameResource("zelda_collect_soubi_screen_revo.btk", dComIfGp_getCollectResArchive());
     mpAnmKey = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(resource);
diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp
index 1a7e1bbfb5..567429a748 100644
--- a/src/d/menu/d_menu_window.cpp
+++ b/src/d/menu/d_menu_window.cpp
@@ -23,7 +23,7 @@
 #include "d/meter/d_meter_map.h"
 #include "d/msg/d_msg_object.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "f_op/f_op_msg_mng.h"
 #include "global.h"
 #include "m_Do/m_Do_controller_pad.h"
diff --git a/src/d/meter/d_meter2_draw.cpp b/src/d/meter/d_meter2_draw.cpp
index 294948af33..6a19915f29 100644
--- a/src/d/meter/d_meter2_draw.cpp
+++ b/src/d/meter/d_meter2_draw.cpp
@@ -76,7 +76,7 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) {
     mPikariBlack = static_cast<J2DPicture*>(mpPikariScreen->search('pika00'))->getBlack();
     mPikariWhite = static_cast<J2DPicture*>(mpPikariScreen->search('pika00'))->getWhite();
 
-    i_OSInitFastCast();
+    OSInitFastCast();
     void* pikari_bck = JKRGetNameResource("zelda_icon_pikari.bck", dComIfGp_getMain2DArchive());
     mPikariBck = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load(pikari_bck);
     playPikariBckAnimation(1.0f);
@@ -810,7 +810,7 @@ void dMeter2Draw_c::initMagic() {
     mpMagicMeter = new CPaneMgr(mpKanteraScreen, 'mm_00', 0, NULL);
     JUT_ASSERT(mpMagicMeter != 0);
 
-    i_OSInitFastCast();
+    OSInitFastCast();
 
     void* res = JKRFileLoader::getGlbResource("zelda_game_image_sanso_10percent.bpk",
                                               dComIfGp_getMain2DArchive());
diff --git a/src/d/meter/d_meter_haihai.cpp b/src/d/meter/d_meter_haihai.cpp
index e43c952d69..8a1fdbf320 100644
--- a/src/d/meter/d_meter_haihai.cpp
+++ b/src/d/meter/d_meter_haihai.cpp
@@ -36,7 +36,7 @@ int dMeterHaihai_c::_create() {
     mpParent = new CPaneMgr(mpHaihaiScreen, 'n_all', 2, NULL);
     JUT_ASSERT(mpParent != 0);
 
-    i_OSInitFastCast();
+    OSInitFastCast();
     mpCursorBck = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load(
         JKRGetNameResource("zelda_hihi_cursor.bck", dComIfGp_getMain2DArchive()));
     mBckFrame = 0.0f;
diff --git a/src/d/meter/d_meter_string.cpp b/src/d/meter/d_meter_string.cpp
index 004a3f559f..157f2ea81d 100644
--- a/src/d/meter/d_meter_string.cpp
+++ b/src/d/meter/d_meter_string.cpp
@@ -55,7 +55,7 @@ int dMeterString_c::_create() {
     JUT_ASSERT(fg != false);
     dPaneClass_showNullPane(mpScreen);
 
-    i_OSInitFastCast();
+    OSInitFastCast();
     mpGetInBck = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load(
         JKRGetNameResource("zelda_game_image_cow_get_in.bck", mpMapArchive));
 
diff --git a/src/d/msg/d_msg_class.cpp b/src/d/msg/d_msg_class.cpp
index 76d1d9ebf5..a7851261dd 100644
--- a/src/d/msg/d_msg_class.cpp
+++ b/src/d/msg/d_msg_class.cpp
@@ -9,7 +9,7 @@
 #include "d/msg/d_msg_object.h"
 #include "d/msg/d_msg_unit.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "JSystem/JUtility/JUTFont.h"
 #include "d/msg/d_msg_out_font.h"
diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp
index 6b383bfcc2..a328147cce 100644
--- a/src/d/msg/d_msg_object.cpp
+++ b/src/d/msg/d_msg_object.cpp
@@ -8,7 +8,7 @@
 #include "d/meter/d_meter2_info.h"
 #include "d/msg/d_msg_class.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "dolphin/types.h"
 
 //
diff --git a/src/d/ovlp/d_ovlp_fade2.cpp b/src/d/ovlp/d_ovlp_fade2.cpp
index fd08a72444..8fb6bb31fc 100644
--- a/src/d/ovlp/d_ovlp_fade2.cpp
+++ b/src/d/ovlp/d_ovlp_fade2.cpp
@@ -48,7 +48,7 @@ void dOvlpFd2_dlst_c::draw() {
     GXPosition2s16(mDoGph_gInf_c::getMaxX(), mDoGph_gInf_c::getMinY());
     GXPosition2s16(mDoGph_gInf_c::getMaxX(), mDoGph_gInf_c::getMaxY());
     GXPosition2s16(mDoGph_gInf_c::getMinX(), mDoGph_gInf_c::getMaxY());
-    i_GXEnd();
+    GXEnd();
 
     Mtx44 m;
     C_MTXPerspective(m, 60.0f, mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF(), 100.0f,
@@ -100,7 +100,7 @@ void dOvlpFd2_dlst_c::draw() {
 
     GXPosition2s16(-mDoGph_gInf_c::getWidth() / 2, -mDoGph_gInf_c::getHeight() / 2);
     GXTexCoord2s8(0, 1);
-    i_GXEnd();
+    GXEnd();
 
     J2DOrthoGraph* graf_ctx = (J2DOrthoGraph*)dComIfGp_getCurrentGrafPort();
     graf_ctx->setOrtho(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(),
diff --git a/src/d/ovlp/d_ovlp_fade3.cpp b/src/d/ovlp/d_ovlp_fade3.cpp
index cb0e54b52d..126710600d 100644
--- a/src/d/ovlp/d_ovlp_fade3.cpp
+++ b/src/d/ovlp/d_ovlp_fade3.cpp
@@ -55,7 +55,7 @@ void dOvlpFd3_dlst_c::draw() {
     GXPosition2s16(mDoGph_gInf_c::getMaxX(), mDoGph_gInf_c::getMinY());
     GXPosition2s16(mDoGph_gInf_c::getMaxX(), mDoGph_gInf_c::getMaxY());
     GXPosition2s16(mDoGph_gInf_c::getMinX(), mDoGph_gInf_c::getMaxY());
-    i_GXEnd();
+    GXEnd();
 
     Mtx44 m;
     C_MTXPerspective(m, 60.0f, mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF(), 100.0f,
@@ -107,7 +107,7 @@ void dOvlpFd3_dlst_c::draw() {
 
     GXPosition2s16(-mDoGph_gInf_c::getWidth() / 2, -mDoGph_gInf_c::getHeight() / 2);
     GXTexCoord2s8(0, 1);
-    i_GXEnd();
+    GXEnd();
 
     J2DOrthoGraph* graf_ctx = (J2DOrthoGraph*)dComIfGp_getCurrentGrafPort();
     graf_ctx->setOrtho(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(),
diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp
index 0c83ffb910..e4b1d6300c 100644
--- a/src/d/particle/d_particle.cpp
+++ b/src/d/particle/d_particle.cpp
@@ -14,7 +14,7 @@
 #include "stdio.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "m_Do/m_Do_lib.h"
 #include "m_Do/m_Do_graphic.h"
 #include "f_op/f_op_actor_mng.h"
diff --git a/src/d/s/d_s_logo.cpp b/src/d/s/d_s_logo.cpp
index aaf7db700a..1701036a59 100644
--- a/src/d/s/d_s_logo.cpp
+++ b/src/d/s/d_s_logo.cpp
@@ -14,7 +14,7 @@
 #include "m_Do/m_Do_graphic.h"
 #include "m_Do/m_Do_machine.h"
 #include "dolphin/os/OSRtc.h"
-#include "dolphin/vi/vi.h"
+#include "dolphin/vi.h"
 
 //
 // Types:
diff --git a/src/d/s/d_s_room.cpp b/src/d/s/d_s_room.cpp
index 781e34d373..717d7ce6e3 100644
--- a/src/d/s/d_s_room.cpp
+++ b/src/d/s/d_s_room.cpp
@@ -8,7 +8,7 @@
 #include "d/com/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "d/s/d_s_play.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_Reset.h"
 
diff --git a/src/d/save/d_save.cpp b/src/d/save/d_save.cpp
index 6fa808b199..ae102676f1 100644
--- a/src/d/save/d_save.cpp
+++ b/src/d/save/d_save.cpp
@@ -10,7 +10,7 @@
 #include "d/com/d_com_inf_game.h"
 #include "d/meter/d_meter2_info.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h"
 
 //
diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp
index 1e61b26949..3c8ee5881a 100644
--- a/src/f_op/f_op_actor_mng.cpp
+++ b/src/f_op/f_op_actor_mng.cpp
@@ -12,7 +12,7 @@
 #include "d/d_path.h"
 #include "d/d_procname.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_scene_mng.h"
 #include "global.h"
diff --git a/src/m_Do/m_Do_DVDError.cpp b/src/m_Do/m_Do_DVDError.cpp
index a7464915fb..7498e258c8 100644
--- a/src/m_Do/m_Do_DVDError.cpp
+++ b/src/m_Do/m_Do_DVDError.cpp
@@ -7,7 +7,7 @@
 #include "JSystem/JKernel/JKRAssertHeap.h"
 #include "JSystem/JKernel/JKRThread.h"
 #include "dol2asm.h"
-#include "dolphin/dvd/dvd.h"
+#include "dolphin/dvd.h"
 #include "dolphin/os/OSAlarm.h"
 #include "dolphin/os/OSInterrupt.h"
 #include "m_Do/m_Do_dvd_thread.h"
diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp
index a5a6ccbea7..c3883e2485 100644
--- a/src/m_Do/m_Do_MemCard.cpp
+++ b/src/m_Do/m_Do_MemCard.cpp
@@ -8,7 +8,7 @@
 #include "JSystem/JKernel/JKRThread.h"
 #include "string.h"
 #include "dol2asm.h"
-#include "dolphin/card/card.h"
+#include "dolphin/card.h"
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_MemCardRWmng.h"
 #include "m_Do/m_Do_Reset.h"
diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp
index 73dc14bf1d..636fcb2832 100644
--- a/src/m_Do/m_Do_MemCardRWmng.cpp
+++ b/src/m_Do/m_Do_MemCardRWmng.cpp
@@ -7,7 +7,7 @@
 #include "JSystem/JUtility/JUTTexture.h"
 #include "stdio.h"
 #include "d/com/d_com_inf_game.h"
-#include "dolphin/card/card.h"
+#include "dolphin/card.h"
 #include "m_Do/m_Do_MemCard.h"
 
 //
diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp
index d68f688981..8711e59c89 100644
--- a/src/m_Do/m_Do_Reset.cpp
+++ b/src/m_Do/m_Do_Reset.cpp
@@ -9,8 +9,8 @@
 #include "JSystem/JUtility/JUTGamePad.h"
 #include "JSystem/JUtility/JUTXfb.h"
 #include "SSystem/SComponent/c_API_controller_pad.h"
-#include "dolphin/gx/GX.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/gx.h"
+#include "dolphin/os.h"
 #include "m_Do/m_Do_audio.h"
 #include "m_Do/m_Do_DVDError.h"
 #include "m_Do/m_Do_MemCard.h"
diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp
index 2bffeb1752..66a062df49 100644
--- a/src/m_Do/m_Do_audio.cpp
+++ b/src/m_Do/m_Do_audio.cpp
@@ -7,7 +7,7 @@
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "m_Do/m_Do_Reset.h"
 #include "m_Do/m_Do_dvd_thread.h"
 
diff --git a/src/m_Do/m_Do_controller_pad.cpp b/src/m_Do/m_Do_controller_pad.cpp
index 3029e65ae2..a0b7b4fc45 100644
--- a/src/m_Do/m_Do_controller_pad.cpp
+++ b/src/m_Do/m_Do_controller_pad.cpp
@@ -125,6 +125,5 @@ void mDoCPd_c::LRlockCheck(interface_of_controller_pad* interface) {
 
 void mDoCPd_c::recalibrate(void) {
     JUTGamePad::clearForReset();
-    JUTGamePad::CRumble::setEnabled(
-        PADMask(PAD_CHAN3_BIT | PAD_CHAN2_BIT | PAD_CHAN1_BIT | PAD_CHAN0_BIT));
+    JUTGamePad::CRumble::setEnabled(PAD_CHAN3_BIT | PAD_CHAN2_BIT | PAD_CHAN1_BIT | PAD_CHAN0_BIT);
 }
diff --git a/src/m_Do/m_Do_dvd_thread.cpp b/src/m_Do/m_Do_dvd_thread.cpp
index 6d368407d9..4a070c866e 100644
--- a/src/m_Do/m_Do_dvd_thread.cpp
+++ b/src/m_Do/m_Do_dvd_thread.cpp
@@ -11,7 +11,7 @@
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JKernel/JKRMemArchive.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "dolphin/types.h"
 #include "m_Do/m_Do_Reset.h"
 #include "m_Do/m_Do_ext.h"
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index d70a85199c..7cb89d93f2 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -19,8 +19,8 @@
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
 #include "dolphin/gx/GXDraw.h"
-#include "dolphin/mtx/mtx.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/mtx.h"
+#include "dolphin/os.h"
 #include "dolphin/types.h"
 #include "global.h"
 #include "m_Do/m_Do_mtx.h"
@@ -3846,7 +3846,7 @@ void drawCube(MtxP mtx, cXyz* pos, const GXColor& color) {
     GXPosition1x8(3);
     GXPosition1x8(0);
     GXPosition1x8(2);
-    i_GXEnd();
+    GXEnd();
 }
 
 void mDoExt_cubePacket::draw() {
diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp
index fd7887b4b4..645a1d674f 100644
--- a/src/m_Do/m_Do_graphic.cpp
+++ b/src/m_Do/m_Do_graphic.cpp
@@ -379,7 +379,7 @@ static void darwFilter(GXColor matColor) {
     GXPosition3s8(1, 0, -5);
     GXPosition3s8(1, 1, -5);
     GXPosition3s8(0, 1, -5);
-    i_GXEnd();
+    GXEnd();
 }
 #else
 #pragma push
@@ -760,15 +760,15 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_
 
     if (l_tevColor0.a > -255) {
         GXBegin(GX_QUADS, GX_VTXFMT0, 4);
-        i_GXPosition3s16(x_orig, y_orig, -5);
+        GXPosition3s16(x_orig, y_orig, -5);
         GXTexCoord2s8(0,0);
-        i_GXPosition3s16(width, y_orig, -5);
+        GXPosition3s16(width, y_orig, -5);
         GXTexCoord2s8(1,0);
-        i_GXPosition3s16(width, height, -5);
+        GXPosition3s16(width, height, -5);
         GXTexCoord2s8(1,1);
-        i_GXPosition3s16(x_orig, height, -5);
+        GXPosition3s16(x_orig, height, -5);
         GXTexCoord2s8(0,1);
-        i_GXEnd();
+        GXEnd();
     }
 
     GXSetTevSwapModeTable(GX_TEV_SWAP3, GX_CH_BLUE, GX_CH_BLUE, GX_CH_BLUE, GX_CH_ALPHA);
@@ -850,15 +850,15 @@ static void trimming(view_class* param_0, view_port_class* param_1) {
         GXSetProjection(ortho, GX_ORTHOGRAPHIC);
         GXSetCurrentMtx(0);
         GXBegin(GX_QUADS, GX_VTXFMT0, 8);
-        i_GXPosition3s16(0, 0, -5);
-        i_GXPosition3s16(0x260, 0, -5);
-        i_GXPosition3s16(0x280, sc_top, -5);
-        i_GXPosition3s16(0, sc_top, -5);
-        i_GXPosition3s16(0, sc_bottom, -5);
-        i_GXPosition3s16(0x280, sc_bottom, -5);
-        i_GXPosition3s16(0x280, 0x1c0, -5);
-        i_GXPosition3s16(0, 0x1c8, -5);
-        i_GXEnd();
+        GXPosition3s16(0, 0, -5);
+        GXPosition3s16(0x260, 0, -5);
+        GXPosition3s16(0x280, sc_top, -5);
+        GXPosition3s16(0, sc_top, -5);
+        GXPosition3s16(0, sc_bottom, -5);
+        GXPosition3s16(0x280, sc_bottom, -5);
+        GXPosition3s16(0x280, 0x1c0, -5);
+        GXPosition3s16(0, 0x1c8, -5);
+        GXEnd();
     }
     GXSetScissor(param_1->mScissor.mXOrig, param_1->mScissor.mYOrig,
                  param_1->mScissor.mWidth, param_1->mScissor.mHeight);
@@ -885,7 +885,7 @@ void mDoGph_drawFilterQuad(s8 param_0, s8 param_1) {
     GXTexCoord2s8(1, 1);
     GXPosition2s8(0, param_1);
     GXTexCoord2s8(0, 1);
-    i_GXEnd();
+    GXEnd();
 }
 
 /* 80009544-800095F8 003E84 00B4+00 0/0 1/1 0/0 .text            create__Q213mDoGph_gInf_c7bloom_cFv
@@ -1155,7 +1155,7 @@ static void retry_captue_frame(view_class* param_0, view_port_class* param_1, in
         }
 
         GXSetTexCopySrc(x_orig, y_orig_pos, width, height);
-        GXSetTexCopyDst(width >> 1, height >> 1, mDoGph_gInf_c::getFrameBufferTimg()->format,
+        GXSetTexCopyDst(width >> 1, height >> 1, (GXTexFmt)mDoGph_gInf_c::getFrameBufferTimg()->format,
                         GX_TRUE);
         GXCopyTex(tex, GX_FALSE);
         GXPixModeSync();
diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp
index 38c6253ebd..da28692299 100644
--- a/src/m_Do/m_Do_machine.cpp
+++ b/src/m_Do/m_Do_machine.cpp
@@ -17,7 +17,7 @@
 #include "SSystem/SComponent/c_malloc.h"
 #include "SSystem/SComponent/c_math.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "m_Do/m_Do_DVDError.h"
 #include "m_Do/m_Do_MemCard.h"
 #include "m_Do/m_Do_Reset.h"
@@ -531,8 +531,8 @@ SECTION_DEAD static char const* const stringBase_8037409E = "/map/Final/Release/
 #pragma pop
 
 /* 803A2F60-803A2F9C 000080 003C+00 1/0 0/0 0/0 .data            g_ntscZeldaIntDf */
-static _GXRenderModeObj g_ntscZeldaIntDf = {
-    0,
+extern GXRenderModeObj g_ntscZeldaIntDf = {
+    VI_TVMODE_NTSC_INT,
     608,
     448,
     448,
@@ -540,7 +540,7 @@ static _GXRenderModeObj g_ntscZeldaIntDf = {
     16,
     666,
     448,
-    1,
+    VI_XFBMODE_DF,
     0,
     0,
     {{6, 6},
@@ -559,8 +559,8 @@ static _GXRenderModeObj g_ntscZeldaIntDf = {
 };
 
 /* 803A2F9C-803A2FD8 0000BC 003C+00 1/1 1/1 0/0 .data            g_ntscZeldaProg */
-extern _GXRenderModeObj g_ntscZeldaProg = {
-    2,
+extern GXRenderModeObj g_ntscZeldaProg = {
+    VI_TVMODE_NTSC_PROG,
     608,
     448,
     448,
@@ -568,7 +568,7 @@ extern _GXRenderModeObj g_ntscZeldaProg = {
     16,
     666,
     448,
-    0,
+    VI_XFBMODE_SF,
     0,
     0,
     {{6, 6},
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index 4630e0c4f6..8bb8de3e1a 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -16,7 +16,7 @@
 #include "Z2AudioLib/Z2WolfHowlMgr.h"
 #include "c/c_dylink.h"
 #include "d/com/d_com_inf_game.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "f_ap/f_ap_game.h"
 #include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_MemCard.h"
diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp
index dffeefeb7b..9958d705d2 100644
--- a/src/m_Do/m_Do_printf.cpp
+++ b/src/m_Do/m_Do_printf.cpp
@@ -7,7 +7,7 @@
 #include "stdio.h"
 #include "dol2asm.h"
 #include "dolphin/base/PPCArch.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "m_Do/m_Do_ext.h"
 
 /* 80450B98-80450B9C -00001 0004+00 0/0 6/6 0/0 .sbss            None */
@@ -131,7 +131,7 @@ void mDoPrintf_vprintf(char const* fmt, va_list args) {
         mDoPrintf_vprintf_Interrupt(fmt, args);
     } else {
         u8* stackPtr = OSGetStackPointer();
-        if (stackPtr < currentThread->stack_end + 0xA00 || stackPtr > currentThread->stack_base) {
+        if (stackPtr < (u8*)currentThread->stack_end + 0xA00 || stackPtr > currentThread->stack_base) {
             mDoPrintf_vprintf_Interrupt(fmt, args);
         } else {
             mDoPrintf_vprintf_Thread(fmt, args);
diff --git a/src/msg/scrn/d_msg_scrn_arrow.cpp b/src/msg/scrn/d_msg_scrn_arrow.cpp
index 1a26727185..e6111c6247 100644
--- a/src/msg/scrn/d_msg_scrn_arrow.cpp
+++ b/src/msg/scrn/d_msg_scrn_arrow.cpp
@@ -5,7 +5,7 @@
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/pane/d_pane_class.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "dolphin/types.h"
 
 /* 8023B9B4-8023BC78 2362F4 02C4+00 0/0 4/4 0/0 .text __ct__15dMsgScrnArrow_cFv */
@@ -13,7 +13,7 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() {
     mScreen = new J2DScreen();
     mScreen->setPriority("zelda_window_yajirushi.blo", 0x20000, dComIfGp_getMsgArchive(0));
     dPaneClass_showNullPane(mScreen);
-    i_OSInitFastCast();
+    OSInitFastCast();
 
     mAnmBck = (J2DAnmTransform*)J2DAnmLoaderDataBase::load(
         JKRFileLoader::getGlbResource("zelda_window_yajirushi.bck", dComIfGp_getMsgArchive(0)));
diff --git a/src/msg/scrn/d_msg_scrn_explain.cpp b/src/msg/scrn/d_msg_scrn_explain.cpp
index 1a806d1a92..a81ac6363a 100644
--- a/src/msg/scrn/d_msg_scrn_explain.cpp
+++ b/src/msg/scrn/d_msg_scrn_explain.cpp
@@ -15,7 +15,7 @@
 #include "d/d_lib.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "dolphin/types.h"
 
 //
diff --git a/src/msg/scrn/d_msg_scrn_tree.cpp b/src/msg/scrn/d_msg_scrn_tree.cpp
index c5df74624e..da66ce3a04 100644
--- a/src/msg/scrn/d_msg_scrn_tree.cpp
+++ b/src/msg/scrn/d_msg_scrn_tree.cpp
@@ -7,7 +7,7 @@
 #include "d/pane/d_pane_class.h"
 #include "d/msg/d_msg_object.h"
 #include "d/msg/d_msg_out_font.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
@@ -53,7 +53,7 @@ dMsgScrnTree_c::dMsgScrnTree_c(JUTFont* param_0, JKRExpHeap* param_1) {
     mpScreen = new J2DScreen();
     mpScreen->setPriority("zelda_kanban_wood_a.blo", 0x1020000, dComIfGp_getMsgArchive(2));
     dPaneClass_showNullPane(mpScreen);
-    i_OSInitFastCast();
+    OSInitFastCast();
     field_0xcc = (J2DAnmTransform*) J2DAnmLoaderDataBase::load(JKRGetNameResource("zelda_kanban_wood_a.bck", dComIfGp_getMsgArchive(2)));
     field_0xd0 = (J2DAnmTextureSRTKey*) J2DAnmLoaderDataBase::load(JKRGetNameResource("zelda_kanban_wood_a.btk", dComIfGp_getMsgArchive(2)));
     field_0xd0->searchUpdateMaterialID(mpScreen);