diff --git a/config/GMPE01_00/rels/m424Dll/symbols.txt b/config/GMPE01_00/rels/m424Dll/symbols.txt
index 8d4a83df..8320af0c 100644
--- a/config/GMPE01_00/rels/m424Dll/symbols.txt
+++ b/config/GMPE01_00/rels/m424Dll/symbols.txt
@@ -281,14 +281,14 @@ lbl_1_data_21C = .data:0x0000021C; // type:object size:0xC0
 lbl_1_data_2DC = .data:0x000002DC; // type:object size:0xC
 lbl_1_data_2E8 = .data:0x000002E8; // type:object size:0x24
 lbl_1_data_30C = .data:0x0000030C; // type:object size:0xC data:4byte
-lbl_1_data_318 = .data:0x00000318; // type:object size:0x6 data:string
-lbl_1_data_31E = .data:0x0000031E; // type:object size:0x6 data:string
-lbl_1_data_324 = .data:0x00000324; // type:object size:0x6 data:string
+lbl_1_data_318 = .data:0x00000318; // type:object size:0x6 scope:local data:string
+lbl_1_data_31E = .data:0x0000031E; // type:object size:0x6 scope:local data:string
+lbl_1_data_324 = .data:0x00000324; // type:object size:0x6 scope:local data:string
 jumptable_1_data_32C = .data:0x0000032C; // type:object size:0x40 scope:local
 lbl_1_data_36C = .data:0x0000036C; // type:object size:0x20
 lbl_1_data_38C = .data:0x0000038C; // type:object size:0x20
-lbl_1_data_3AC = .data:0x000003AC; // type:object size:0x19 data:string
-lbl_1_data_3C5 = .data:0x000003C5; // type:object size:0x5 data:string
+lbl_1_data_3AC = .data:0x000003AC; // type:object size:0x19 scope:local data:string
+lbl_1_data_3C5 = .data:0x000003C5; // type:object size:0x5 scope:local data:string
 lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte
 lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x8 scope:local data:float
 lbl_1_bss_C = .bss:0x0000000C; // type:object size:0x4 data:4byte
diff --git a/include/REL/modeltestDll.h b/include/REL/modeltestDll.h
index d0b4ccc3..f2dd081e 100644
--- a/include/REL/modeltestDll.h
+++ b/include/REL/modeltestDll.h
@@ -5,12 +5,13 @@
 #include "game/objsub.h"
 #include "game/object.h"
 
+#include "ext_math.h"
+
 // -------------------------------------------------------------------------- //
 
 #define US_PER_60TH_SEC (1000000.0f / 60.0f)
 #define US_TO_60TH_SEC(us) ((us) / US_PER_60TH_SEC)
 #define FB_SIZE(width, height) width * height * 2
-#define ABS(x) ((x) < 0 ? -(x) : (x))
 
 // -------------------------------------------------------------------------- //
 
@@ -44,4 +45,4 @@ omObjFunc2 fn_1_F9C;
 
 #endif
 
-// -------------------------------------------------------------------------- //
\ No newline at end of file
+// -------------------------------------------------------------------------- //
diff --git a/src/REL/instDll/main.c b/src/REL/instDll/main.c
index 45308b70..5bfac016 100644
--- a/src/REL/instDll/main.c
+++ b/src/REL/instDll/main.c
@@ -495,7 +495,7 @@ static void fn_1_17E4(void)
                 CharModelMotionShiftSet(char_tbl[j], mot_tbl[j][0], 0, 10, HU3D_MOTATTR_LOOP);
             }
             if (time <= 20) {
-                Hu3DModelPosSet(player_mdl[j], player_pos[j].x, player_pos[j].y + (1000.0 * cos(M_PI * (time * 4.5f) / 180.0)), player_pos[j].z);
+                Hu3DModelPosSet(player_mdl[j], player_pos[j].x, player_pos[j].y + 1000.0 * cosd(time * 4.5f), player_pos[j].z);
                 time -= 10;
                 if (time >= 0) {
                     tplvl = 0.1 * time;
@@ -1081,7 +1081,7 @@ static void fn_1_50B0(ModelData *model, Mtx mtx)
     target.y = 415.0f;
     pos.x = (sind(lbl_1_bss_40[0].y) * cosd(lbl_1_bss_40[0].x) * lbl_1_bss_20[0]) + lbl_1_bss_28[0].x;
     pos.y = (-sind(lbl_1_bss_40[0].x) * lbl_1_bss_20[0]) + lbl_1_bss_28[0].y;
-    pos.z = (cos(M_PI * lbl_1_bss_40[0].y / 180.0) * cosd(lbl_1_bss_40[0].x) * lbl_1_bss_20[0]) + lbl_1_bss_28[0].z;
+    pos.z = (cosd(lbl_1_bss_40[0].y) * cosd(lbl_1_bss_40[0].x) * lbl_1_bss_20[0]) + lbl_1_bss_28[0].z;
     up.x = -sind(lbl_1_bss_40[0].y);
     up.z = -cosd(lbl_1_bss_40[0].y);
     up.y = 0;
diff --git a/src/REL/m407dll/camera.c b/src/REL/m407dll/camera.c
index 20d3d4db..69d04b85 100644
--- a/src/REL/m407dll/camera.c
+++ b/src/REL/m407dll/camera.c
@@ -1,7 +1,7 @@
 #include "game/process.h"
 #include "game/object.h"
 #include "game/hsfdraw.h"
-#include "math.h"
+#include "ext_math.h"
 
 typedef struct unkDominationData2 {
 /* 0x00 */ s32 unk_00;
@@ -128,16 +128,16 @@ void fn_1_2024(omObjData* arg0) {
             }
             break;
         case 2:
-            var_f31 = sin((M_PI * (90.0f * temp_r31->unk_44)) / 180.0);
+            var_f31 = sind(90.0f * temp_r31->unk_44);
             break;
         case 3:
-            var_f31 = sin((M_PI * (90.0f * temp_r31->unk_44)) / 180.0);
+            var_f31 = sind(90.0f * temp_r31->unk_44);
             if (temp_r31->unk_48 > 0.5) {
                 temp_r31->unk_00 = 4;
             }
             break;
         case 4:
-            var_f31 = sin((M_PI * (90.0f * temp_r31->unk_44)) / 180.0);
+            var_f31 = sind(90.0f * temp_r31->unk_44);
             var_f31 *= var_f31;
             break;
         }
diff --git a/src/REL/m407dll/player.c b/src/REL/m407dll/player.c
index 395fb157..725f71bd 100644
--- a/src/REL/m407dll/player.c
+++ b/src/REL/m407dll/player.c
@@ -467,8 +467,8 @@ void fn_1_DB4(omObjData *arg0)
         temp_r31->unk_20++;
     }
 
-    temp_f31 = (32.0f * sin(1.0471975511965976)) - (9.8f * temp_r31->unk_24);
-    temp_f30 = 22.0f * cos(1.0471975511965976);
+    temp_f31 = 32.0f * sin(M_PI / 3) - 9.8f * temp_r31->unk_24;
+    temp_f30 = 22.0f * cos(M_PI / 3);
     temp_r31->unk_18 = temp_r31->unk_18 + temp_f30;
     temp_r31->unk_14 = temp_r31->unk_14 + temp_f31;
     temp_r31->unk_24 += 0.3f;
@@ -514,7 +514,7 @@ void fn_1_1074(omObjData *arg0)
         temp_r31->unk_20 = 1;
     }
 
-    temp_r31->unk_14 = (temp_r31->unk_14 + ((80.0 * sin(1.5707963267948966)) - (9.8 * temp_r31->unk_24)));
+    temp_r31->unk_14 += 80.0 * sin(M_PI / 2) - 9.8 * temp_r31->unk_24;
     temp_r31->unk_24 += 0.3f;
 
     if (!(temp_r31->unk_14 < 1000.0f)) {
diff --git a/src/REL/m409Dll/main.c b/src/REL/m409Dll/main.c
index 3e51e855..a1ee937d 100644
--- a/src/REL/m409Dll/main.c
+++ b/src/REL/m409Dll/main.c
@@ -132,7 +132,7 @@ s8 fn_1_524(void)
         var_r30 = 1;
     }
     var_f30 = lbl_1_bss_2 / 300.0f;
-    temp_f31 = (sin((M_PI * (90.0f * var_f30)) / 180.0) * sin((M_PI * (90.0f * var_f30)) / 180.0));
+    temp_f31 = sind(90.0f * var_f30) * sind(90.0f * var_f30);
     CZoom = fn_1_4120(var_r31[0].zoom, var_r31[1].zoom, var_r31[2].zoom, temp_f31);
     Center.x = fn_1_4120(var_r31[0].center.x, var_r31[1].center.x, var_r31[2].center.x, temp_f31);
     Center.y = fn_1_4120(var_r31[0].center.y, var_r31[1].center.y, var_r31[2].center.y, temp_f31);
@@ -157,8 +157,8 @@ s8 fn_1_524(void)
     Hu3DTexScrollPosMoveSet(lbl_1_bss_24.unkC, -0.0001f - (0.005f * temp_f31), 0.0f, 0.0f);
     Hu3DTexScrollPosMoveSet(lbl_1_bss_24.unkE, -0.0002f - (0.005f * temp_f31), 0.0f, 0.0f);
     Hu3DTexScrollPosMoveSet(lbl_1_bss_24.unk10, -0.0003f - (0.005f * temp_f31), 0.0f, 0.0f);
-    sp8.x = -(sin((M_PI * CRot.y) / 180.0) * cosd(CRot.x));
-    sp8.y = sin((M_PI * CRot.x) / 180.0);
+    sp8.x = -(sind(CRot.y) * cosd(CRot.x));
+    sp8.y = sind(CRot.x);
     sp8.z = -(cosd(CRot.y) * cosd(CRot.x));
     HuAudFXListnerUpdate(&Hu3DCamera->pos, &sp8);
     return var_r30;
@@ -178,7 +178,7 @@ s8 fn_1_B80(void)
         var_r30 = 1;
     }
     temp_f30 = lbl_1_bss_4 / 60.0f;
-    temp_f31 = (sin((M_PI * (90.0f * temp_f30)) / 180.0) * sin((M_PI * (90.0f * temp_f30)) / 180.0));
+    temp_f31 = sind(90.0f * temp_f30) * sind(90.0f * temp_f30);
     CZoom = var_r31[0].zoom + (temp_f31 * (var_r31[1].zoom - var_r31[0].zoom));
     Center.x = var_r31[0].center.x + (temp_f31 * (var_r31[1].center.x - var_r31[0].center.x));
     Center.y = var_r31[0].center.y + (temp_f31 * (var_r31[1].center.y - var_r31[0].center.y));
@@ -300,20 +300,20 @@ s8 fn_1_10E8(omObjData *object)
             else if (lbl_1_bss_C > 0.2f) {
                 lbl_1_bss_A = 1;
             }
-            var_f31 = sin((M_PI * (90.0f * lbl_1_bss_C)) / 180.0);
+            var_f31 = sind(90.0f * lbl_1_bss_C);
             var_f27 = 1520.0f;
             var_f26 = -1030.0f;
             temp_f30 = var_f27 + (var_f31 * (var_f26 - var_f27));
             Hu3DModelPosSet(lbl_1_bss_DC->model[4], temp_f30, 0.0f, -1200.0f);
             Hu3DModelPosSet(lbl_1_bss_DC->model[1], temp_f30, 0.0f, -1200.0f);
-            if ((lbl_1_data_BC + 0x10000) != 0xFFFF) {
+            if (lbl_1_data_BC != ~0) {
                 sp8.x = temp_f30;
                 sp8.y = 0.0f;
                 sp8.z = -1200.0f;
                 HuAudFXEmiterUpDate(lbl_1_data_BC, &sp8);
             }
             var_f31 = 1.2f * lbl_1_bss_C;
-            if ((var_f31 >= 1.0f) && ((lbl_1_data_BC + 0x10000) != 0xFFFF)) {
+            if ((var_f31 >= 1.0f) && lbl_1_data_BC != ~0) {
                 HuAudFXEmiterPlay(0x555, &sp8);
                 sp8.x += 200.0f;
                 HuAudFXEmiterPlay(0x55E, &sp8);
@@ -324,7 +324,7 @@ s8 fn_1_10E8(omObjData *object)
                 var_f31 = 0.0f;
             }
             else {
-                var_f31 = sin((M_PI * (90.0f + (90.0f * var_f31))) / 180.0);
+                var_f31 = sind(90.0f + 90.0f * var_f31);
             }
             Hu3DMotionSpeedSet(lbl_1_bss_DC->model[4], 2.0f * var_f31);
             if (lbl_1_bss_C > 0.5f) {
@@ -455,7 +455,7 @@ void fn_1_2098(omObjData *object)
             Hu3DModelAttrSet(lbl_1_bss_DC->model[4], HU3D_ATTR_DISPOFF);
             lbl_1_bss_18 = 1.0f;
         }
-        var_f31 = sin((M_PI * (90.0f * lbl_1_bss_18)) / 180.0);
+        var_f31 = sind(90.0f * lbl_1_bss_18);
         var_f29 = -1030.0f;
         var_f28 = -1880.0f;
         var_f30 = var_f29 + (var_f31 * (var_f28 - var_f29));
@@ -684,7 +684,7 @@ void fn_1_2DCC(omObjData *object)
                         Hu3DModelAttrReset(var_r31->unk6, HU3D_ATTR_DISPOFF);
                     }
                     var_r31->unk10 += var_f30;
-                    var_f31 = sin((M_PI * (90.0f * var_r31->unk10)) / 180.0);
+                    var_f31 = sind(90.0f * var_r31->unk10);
                     if (var_r31->unk10 >= 1.0f) {
                         var_f31 = 1.0f;
                         var_r31->unk10 = var_f31;
@@ -728,7 +728,7 @@ void fn_1_2DCC(omObjData *object)
                     }
                     Hu3DModelPosSet(var_r31->unk6, 70.0f + temp_r30->pos.x, 290.0f, -1200.0f);
                     Hu3DData[var_r31->unk4].pos.x = temp_r30->pos.x;
-                    var_f31 = (0.800000011920929 * sin((M_PI * (180.0f * var_r31->unk10)) / 180.0));
+                    var_f31 = 0.8f * sind(180.0f * var_r31->unk10);
                     Hu3DMotionSpeedSet(var_r31->unk2, var_f31);
                 }
             }
@@ -948,7 +948,7 @@ void fn_1_44F0(s16 arg0, f32 arg8, f32 arg9, f32 argA, s8 arg1, s16 arg2)
                     return;
 
                 temp_f31 = (((rand8() << 8) | rand8()) % 361);
-                var_r31->unk0.x = (2.0 + (3.0 * sin((M_PI * temp_f31) / 180.0)));
+                var_r31->unk0.x = 2.0 + (3.0 * sind(temp_f31));
                 var_r31->unk0.y = (0.1f * ((((rand8() << 8) | rand8()) % 31) + 40));
                 var_r31->unk0.z = (3.5 * cosd(temp_f31));
                 var_r31->unk28 = 0;
@@ -1012,7 +1012,7 @@ void fn_1_4FFC(s16 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4)
         temp_f31 = ((((rand8() << 8) | rand8()) % 81) - 40);
         temp_r31->unk0.x = (13.0 * cosd(temp_f31));
         temp_r31->unk0.y = 0.1f * ((((rand8() << 8) | rand8()) % 21) + 20);
-        temp_r31->unk0.z = (9.0 * sin((M_PI * temp_f31) / 180.0));
+        temp_r31->unk0.z = (9.0 * sind(temp_f31));
         temp_r31->unkC.x = (0.05f * temp_r31->unk0.x);
         temp_r31->unkC.z = (0.05f * temp_r31->unk0.z);
         temp_r31->unk18 = 500.0f;
diff --git a/src/REL/m412Dll/main.c b/src/REL/m412Dll/main.c
index 1cad6746..d71592b2 100644
--- a/src/REL/m412Dll/main.c
+++ b/src/REL/m412Dll/main.c
@@ -81,8 +81,8 @@ void ObjectSetup(void)
     temp_f29 = lbl_1_bss_268.y;
     temp_f31 = lbl_1_bss_268.z;
     lbl_1_bss_774 = sqrtf((temp_f31 * temp_f31) + ((temp_f30 * temp_f30) + (temp_f29 * temp_f29)));
-    lbl_1_bss_778 = fn_1_1D08((180.0 * (atan2(temp_f30, temp_f31) / M_PI)));
-    lbl_1_bss_77C = fn_1_1D08((180.0 * (atan2(temp_f29, temp_f31) / M_PI)));
+    lbl_1_bss_778 = fn_1_1D08(atan2d(temp_f30, temp_f31));
+    lbl_1_bss_77C = fn_1_1D08(atan2d(temp_f29, temp_f31));
     lbl_1_bss_77C = 50.0f;
     Hu3DLighInit();
     lbl_1_bss_7A0 = Hu3DGLightCreate(10000.0f, 0.0f, 10000.0f, -1.0f, 0.0f, -1.0f, 0xFFU, 0xFFU, 0xFFU);
diff --git a/src/REL/m414Dll/main.c b/src/REL/m414Dll/main.c
index 8e7bc1f0..8ca555e6 100644
--- a/src/REL/m414Dll/main.c
+++ b/src/REL/m414Dll/main.c
@@ -1156,9 +1156,9 @@ void fn_1_42AC(void)
         var_f23 = -200.0 * (cos(0.0) * cosd(lbl_1_bss_920[var_r27]));
     }
     else {
-        var_f24 = -200.0 * (sind(lbl_1_bss_920[var_r27]) * cos(0.3490658503988659));
-        var_f26 = 150.0 + (-200.0 * sin(-0.3490658503988659));
-        var_f23 = -200.0 * (cos(-0.3490658503988659) * cosd(lbl_1_bss_920[var_r27]));
+        var_f24 = -200.0 * (sind(lbl_1_bss_920[var_r27]) * cosd(20));
+        var_f26 = 150.0 + -200.0 * sind(-20);
+        var_f23 = -200.0 * (cosd(-20) * cosd(lbl_1_bss_920[var_r27]));
     }
     if (!lbl_1_bss_938[var_r30->unk_04]) {
         var_f26 += 70.0f;
diff --git a/src/REL/m417Dll/player.c b/src/REL/m417Dll/player.c
index cc740d0e..ca8f7206 100644
--- a/src/REL/m417Dll/player.c
+++ b/src/REL/m417Dll/player.c
@@ -856,7 +856,7 @@ void fn_1_9C14(omObjData *object)
         return;
     }
     PSQUATNormalize(&var_r31->unk_194, &sp28);
-    if (sp28.w < cos(0.4363323129985824)) {
+    if (sp28.w < cosd(25)) {
         var_r31->unk_3C = 1;
     }
 }
diff --git a/src/REL/m417Dll/water.c b/src/REL/m417Dll/water.c
index 7f7bd933..4313fa29 100644
--- a/src/REL/m417Dll/water.c
+++ b/src/REL/m417Dll/water.c
@@ -326,7 +326,7 @@ void fn_1_3D58(omObjData *object)
             var_r28->y = 0.0f;
             var_r28->z = var_f29;
         }
-        var_f29 += (var_f28 * sin(1.0471975511965976));
+        var_f29 += var_f28 * sind(60);
     }
     var_r28 = lbl_1_bss_178.unk_2C;
     var_r30 = 0;
diff --git a/src/REL/m424Dll/claw.c b/src/REL/m424Dll/claw.c
index 578750ce..752b4afb 100644
--- a/src/REL/m424Dll/claw.c
+++ b/src/REL/m424Dll/claw.c
@@ -164,7 +164,7 @@ void fn_1_94D0(omObjData* arg0) {
     var_r31->unk170 = -1;
     var_r31->unk174 = lbl_1_data_30C;
     // @todo how did this happen
-    var_r31->unk180 = (180.0 * (atan2(-102.864990234375, 424.559997558593750) / M_PI));
+    var_r31->unk180 = atan2d(-102.864990234375, 424.559997558593750);
     if (var_r31->unk180 < 0.0f) {
         var_r31->unk180 += 360.0f;
     }
diff --git a/src/REL/m425Dll/thwomp.c b/src/REL/m425Dll/thwomp.c
index 0a320286..a47e9bd9 100644
--- a/src/REL/m425Dll/thwomp.c
+++ b/src/REL/m425Dll/thwomp.c
@@ -1477,7 +1477,7 @@ s32 fn_1_6EC4(float var_f24, float sp8, s16 var_r22, s16 var_r24)
             var_r31->unk_18C[var_r30].x = -(sp24 * var_r31->unk_17C[var_r30].x);
             var_r31->unk_18C[var_r30].z = -(sp24 * var_r31->unk_17C[var_r30].z);
             var_r31->unk_18C[var_r30].y = 0.0;
-            var_f27 = 180.0 + (180.0 * (atan2(var_r31->unk_17C[var_r30].x, var_r31->unk_17C[var_r30].z) / 3.141592653589793));
+            var_f27 = 180.0 + atan2d(var_r31->unk_17C[var_r30].x, var_r31->unk_17C[var_r30].z);
             if (var_f27 > 360.0f) {
                 var_f27 = fmod(var_f27, 360.0);
             }
diff --git a/src/REL/m440Dll/main.c b/src/REL/m440Dll/main.c
index e6c29642..d7653b96 100644
--- a/src/REL/m440Dll/main.c
+++ b/src/REL/m440Dll/main.c
@@ -125,7 +125,7 @@ s32 fn_1_4A4(void)
         var_r30 = 1;
     }
 
-    var_f31 = (sin((M_PI * (90.0f * var_f31)) / 180.0) * sin((M_PI * (90.0f * var_f31)) / 180.0));
+    var_f31 = sind(90.0f * var_f31) * sind(90.0f * var_f31);
     CZoom = fn_1_93C0(var_r31[0].zoom, var_r31[1].zoom, var_f31);
     Center.x = fn_1_93C0(var_r31[0].center.x, var_r31[1].center.x, var_f31);
     Center.y = fn_1_93C0(var_r31[0].center.y, var_r31[1].center.y, var_f31);
@@ -152,7 +152,7 @@ s32 fn_1_6C8(void)
         var_r30 = 1;
     }
 
-    var_f31 = (sin((M_PI * (90.0f * var_f31)) / 180.0) * sin((M_PI * (90.0f * var_f31)) / 180.0));
+    var_f31 = (sind(90.0f * var_f31) * sind(90.0f * var_f31));
     CZoom = fn_1_93C0(var_r31[0].zoom, var_r31[1].zoom, var_f31);
     Center.x = fn_1_93C0(var_r31[0].center.x, var_r31[1].center.x, var_f31);
     Center.y = fn_1_93C0(var_r31[0].center.y, var_r31[1].center.y, var_f31);
@@ -282,7 +282,7 @@ u8 fn_1_E14(omObjData *arg0)
                 var_f31 = 1.0f;
                 var_r30 = 1;
             }
-            var_f31 = (sin((M_PI * (90.0f * var_f31)) / 180.0) * sin((M_PI * (90.0f * var_f31)) / 180.0));
+            var_f31 = (sind(90.0f * var_f31) * sind(90.0f * var_f31));
             CZoom = fn_1_93C0(var_r31[0].zoom, var_r31[1].zoom, var_f31);
             Center.x = fn_1_93C0(var_r31[0].center.x, var_r31[1].center.x, var_f31);
             Center.y = fn_1_93C0(var_r31[0].center.y, var_r31[1].center.y, var_f31);
@@ -338,7 +338,7 @@ u8 fn_1_1138(omObjData *object)
                 var_f31 = 1.0f;
                 var_r28 = 1;
             }
-            var_f31 = (sin((M_PI * (90.0f * var_f31)) / 180.0) * sin((M_PI * (90.0f * var_f31)) / 180.0));
+            var_f31 = (sind(90.0f * var_f31) * sind(90.0f * var_f31));
             CZoom = fn_1_93C0(var_r31[0].zoom, var_r31[1].zoom, var_f31);
             Center.x = fn_1_93C0(var_r31[0].center.x, var_r31[1].center.x, var_f31);
             Center.y = fn_1_93C0(var_r31[0].center.y, var_r31[1].center.y, var_f31);
@@ -628,8 +628,8 @@ void fn_1_2470(omObjData *arg0)
     Hu3DModelShadowMapSet(arg0->model[0]);
 
     for (var_r30 = 0; var_r30 < 5; var_r30++) {
-        temp_f31 = (450.0 * cos(M_PI * lbl_1_data_0[var_r30] / 180.0));
-        var_f29 = (450.0 * sin(M_PI * lbl_1_data_0[var_r30] / 180.0));
+        temp_f31 = 450.0 * cosd(lbl_1_data_0[var_r30]);
+        var_f29 = 450.0 * sind(lbl_1_data_0[var_r30]);
         Hu3DModelPosSet(arg0->model[var_r30 + 4], temp_f31, 0.0f, var_f29);
         var_f30 = 90.0f - lbl_1_data_0[var_r30];
         Hu3DModelRotSet(arg0->model[var_r30 + 4], 0.0f, var_f30, 0.0f);
@@ -705,7 +705,7 @@ void fn_1_2B04(omObjData *object)
                 fn_1_4EEC(0x20, 0);
                 return;
             }
-            temp_f31 = sin((M_PI * (90.0f * temp_f31)) / 180.0);
+            temp_f31 = sind(90.0f * temp_f31);
             temp_r31->center.y = (250.0f + (1750.0f * temp_f31));
     }
     Hu3DModelPosSet(object->model[3], temp_r31->center.x, temp_r31->center.y, temp_r31->center.z);
@@ -764,7 +764,7 @@ void fn_1_2D28(omObjData *object)
             if ((11 * REFRESH_RATE_F / 6) == lbl_1_data_F0[0]) {
                 HuAudFXPlay(0x70A);
             }
-            var_f31 = sin((M_PI * (90.0f * var_f31)) / 180.0);
+            var_f31 = sind(90.0f * var_f31);
             temp_r31->center.y = (2000.0f + (-1750.0f * var_f31));
             break;
         case 0x2:
@@ -811,7 +811,7 @@ void fn_1_2D28(omObjData *object)
                 fn_1_4EEC(7, 2);
                 return;
             }
-            var_f31 = sin((M_PI * (90.0f * var_f31)) / 180.0);
+            var_f31 = sind(90.0f * var_f31);
             temp_r31->center.y = (250.0f + (1750.0f * var_f31));
             break;
         case 0x63:
@@ -1030,7 +1030,7 @@ void fn_1_46E0(omObjData *object)
                 fn_1_4EEC(0x18, 0x10);
                 HuAudFXPlay(0x70F);
             }
-            var_f31 = sin((M_PI * (90.0f * var_f31)) / 180.0);
+            var_f31 = sind(90.0f * var_f31);
             temp_r31->unk24 = (150.0f * var_f31);
             break;
         case 0x63:
@@ -1090,7 +1090,7 @@ void fn_1_4B44(omObjData *object)
                 lbl_1_data_108[0] = 0;
                 lbl_1_data_104[0]++;
             }
-            var_f31 = sin((M_PI * (90.0f * var_f31)) / 180.0);
+            var_f31 = sind(90.0f * var_f31);
             temp_r31->unk24 = (150.0f + (-150.0f * var_f31));
             break;
         case 1:
diff --git a/src/REL/m440Dll/object.c b/src/REL/m440Dll/object.c
index 941f1463..00d59251 100644
--- a/src/REL/m440Dll/object.c
+++ b/src/REL/m440Dll/object.c
@@ -255,7 +255,7 @@ void fn_1_B884(omObjData *arg0, unkObjStruct *arg1)
             arg1->unk18.z = (700.0 * sind(lbl_1_data_250));
             var_f29 = (arg1->unk18.x - arg1->unk24.x);
             var_f28 = (arg1->unk18.z - arg1->unk24.z);
-            var_f30 = (180.0 * (atan2(var_f29, var_f28) / M_PI));
+            var_f30 = atan2d(var_f29, var_f28);
             if (var_f30 < 0.0f) {
                 var_f30 += 360.0f;
             }
@@ -310,7 +310,7 @@ void fn_1_B884(omObjData *arg0, unkObjStruct *arg1)
             arg1->unk18.z = (arg1->unk5C * sind(lbl_1_data_250));
             var_f29 = (arg1->unk18.x - arg1->unk24.x);
             var_f28 = (arg1->unk18.z - arg1->unk24.z);
-            var_f30 = (180.0 * (atan2(var_f29, var_f28) / M_PI));
+            var_f30 = atan2d(var_f29, var_f28);
             if (var_f30 < 0.0f) {
                 var_f30 += 360.0f;
             }
@@ -551,7 +551,7 @@ void fn_1_C944(omObjData *arg0, unkObjStruct *arg1)
             arg1->unk48 = arg1->unk48 & ~4;
             var_f26 = (arg1->unk18.x - arg1->unk24.x);
             var_f25 = (arg1->unk18.z - arg1->unk24.z);
-            var_f29 = (180.0 * (atan2(var_f26, var_f25) / M_PI));
+            var_f29 = atan2d(var_f26, var_f25);
             if (var_f29 < 0.0f) {
                 var_f29 += 360.0f;
             }
@@ -920,7 +920,7 @@ void fn_1_E034(omObjData *arg0, unkObjStruct *arg1)
             arg1->unk18.z = (arg1->unk5C * sind(lbl_1_bss_84));
             var_f29 = (arg1->unk18.x - arg1->unk24.x);
             var_f28 = (arg1->unk18.z - arg1->unk24.z);
-            var_f30 = (180.0 * (atan2(var_f29, var_f28) / M_PI));
+            var_f30 = atan2d(var_f29, var_f28);
             if (var_f30 < 0.0f) {
                 var_f30 += 360.0f;
             }
@@ -949,8 +949,8 @@ void fn_1_E034(omObjData *arg0, unkObjStruct *arg1)
                 arg1->unk60++;
             }
             var_f29 = arg1->unk5C + ((700.0f - arg1->unk5C) * var_f31);
-            arg1->unk18.x = (var_f29 * cos(2.356194490192345)); // atan2(1.0, -1.0)
-            arg1->unk18.z = (var_f29 * sin(2.356194490192345));
+            arg1->unk18.x = var_f29 * cosd(135);
+            arg1->unk18.z = var_f29 * sind(135);
             var_f29 = 0.3f;
             var_f28 = 0.6f;
             if (var_f31 >= var_f29) {
@@ -978,7 +978,7 @@ void fn_1_E034(omObjData *arg0, unkObjStruct *arg1)
             arg1->unk18.z = (700.0 * sind(lbl_1_bss_84));
             var_f29 = (arg1->unk18.x - arg1->unk24.x);
             var_f28 = (arg1->unk18.z - arg1->unk24.z);
-            var_f30 = (180.0 * (atan2(var_f29, var_f28) / M_PI));
+            var_f30 = atan2d(var_f29, var_f28);
             if (var_f30 < 0.0f) {
                 var_f30 += 360.0f;
             }
diff --git a/src/REL/m443Dll/player.c b/src/REL/m443Dll/player.c
index a55b2d0c..ee7e5237 100644
--- a/src/REL/m443Dll/player.c
+++ b/src/REL/m443Dll/player.c
@@ -355,8 +355,8 @@ void fn_1_5BD4(omObjData *object)
                 var_f30 = 0.0f;
             }
             var_f30 = var_f30 * var_f30;
-            sp8.x = 320.0 + (160.0 * (var_f31 * cos(M_PI * ((450.0f * var_f31) + (90.0f * object->work[0])) / 180.0)));
-            sp8.y = 240.0 + (120.0 * (var_f31 * sin(M_PI * ((450.0f * var_f31) + (90.0f * object->work[0])) / 180.0)));
+            sp8.x = 320.0 + 160.0 * (var_f31 * cosd(450.0f * var_f31 + 90.0f * object->work[0]));
+            sp8.y = 240.0 + 120.0 * (var_f31 * sind(450.0f * var_f31 + 90.0f * object->work[0]));
             temp_r31->unk100->unk_44 = sp8.x + (var_f30 * (temp_r31->unk100->unk_78 - sp8.x));
             temp_r31->unk100->unk_48 = sp8.y + (var_f30 * (temp_r31->unk100->unk_7C - sp8.y));
             temp_r31->unk100->unk_40 = 0.01f + ((temp_r31->unk100->unk_80 - 0.01f) * var_f31);
diff --git a/src/REL/m444dll/shadow.c b/src/REL/m444dll/shadow.c
index 676458bf..9351f3e6 100644
--- a/src/REL/m444dll/shadow.c
+++ b/src/REL/m444dll/shadow.c
@@ -49,8 +49,8 @@ void fn_1_D9F4(s16 arg0)
     sp10.y = 1.0f;
     C_MTXLookAt(sp34, &sp28, &sp10, &sp1C);
     GXLoadPosMtxImm(sp34, 0);
-    sp28.x = 1.2000000476837158 * (10000.0 * -sin(var_r31->fov / 2));
-    sp28.y = 0.8333333134651184 * (10000.0 * -sin(var_r31->fov / 2));
+    sp28.x = 1.2f * (10000.0 * -sin(var_r31->fov / 2));
+    sp28.y = (2.5f / 3) * (10000.0 * -sin(var_r31->fov / 2));
     GXBegin(GX_QUADS, GX_VTXFMT0, 4);
     GXPosition3f32(-sp28.x, -sp28.y, -10000.0f);
     GXPosition3f32(sp28.x, -sp28.y, -10000.0f);
diff --git a/src/REL/m446Dll/camera.c b/src/REL/m446Dll/camera.c
index ef322bf3..8a49a82f 100644
--- a/src/REL/m446Dll/camera.c
+++ b/src/REL/m446Dll/camera.c
@@ -51,7 +51,7 @@ void fn_1_68DC(void) {
     f32 temp_f31;
 
     if (lbl_1_bss_38 != 0) {
-        temp_f31 = sin((M_PI * (90.0f * lbl_1_bss_40)) / 180.0);
+        temp_f31 = sind(90.0f * lbl_1_bss_40);
         temp_f31 *= temp_f31;
         lbl_1_bss_8C.x = lbl_1_bss_54.x + (temp_f31 * (lbl_1_bss_70.x - lbl_1_bss_54.x));
         lbl_1_bss_8C.y = lbl_1_bss_54.y + (temp_f31 * (lbl_1_bss_70.y - lbl_1_bss_54.y));
@@ -138,4 +138,4 @@ void fn_1_709C(void) {
     print8(0x20, 0x84, 1.5f, "LOOKAT : x=%.2f y=%.2f z=%.2f", lbl_1_bss_8C.x, lbl_1_bss_8C.y, lbl_1_bss_8C.z);
     print8(0x20, 0x94, 1.5f, "ANGLE  : x=%.2f y=%.2f z=%.2f", lbl_1_bss_80.x, lbl_1_bss_80.y, lbl_1_bss_80.z);
     print8(0x20, 0xA4, 1.5f, "ZOOM   : %.2f", lbl_1_bss_7C);
-}
\ No newline at end of file
+}
diff --git a/src/REL/m446Dll/card.c b/src/REL/m446Dll/card.c
index 28b943a1..fa45170f 100644
--- a/src/REL/m446Dll/card.c
+++ b/src/REL/m446Dll/card.c
@@ -1,7 +1,7 @@
 #include "REL/m446Dll.h"
 
 #include "game/hsfman.h"
-#include "math.h"
+#include "ext_math.h"
 
 // data
 m446Func4 lbl_1_data_150[3] = { NULL, fn_1_2AA8, fn_1_2DA8 };
@@ -229,7 +229,7 @@ void fn_1_20D4(void)
                     temp_r31->unk7C--;
                 }
                 else {
-                    temp_f31 = sin((M_PI * (90.0f * temp_r31->unk80)) / 180.0);
+                    temp_f31 = sind(90.0f * temp_r31->unk80);
                     temp_r31->unk10.x = temp_r31->unk1C.x + (temp_f31 * (temp_r31->unk28.x - temp_r31->unk1C.x));
                     temp_r31->unk10.y = temp_r31->unk1C.y + (temp_f31 * (temp_r31->unk28.y - temp_r31->unk1C.y));
                     temp_r31->unk10.z = temp_r31->unk1C.z + (temp_f31 * (temp_r31->unk28.z - temp_r31->unk1C.z));
@@ -243,7 +243,7 @@ void fn_1_20D4(void)
                 }
             }
             if (temp_r31->unk74 != 0) {
-                temp_f31 = sin((M_PI * (90.0f * temp_r31->unk88)) / 180.0);
+                temp_f31 = sind(90.0f * temp_r31->unk88);
                 temp_r31->unk34.x = (temp_r31->unk40.x + (temp_f31 * (temp_r31->unk4C.x - temp_r31->unk40.x)));
                 temp_r31->unk34.y = (temp_r31->unk40.y + (temp_f31 * (temp_r31->unk4C.y - temp_r31->unk40.y)));
                 temp_r31->unk34.z = (temp_r31->unk40.z + (temp_f31 * (temp_r31->unk4C.z - temp_r31->unk40.z)));
@@ -256,7 +256,7 @@ void fn_1_20D4(void)
                 }
             }
             if (temp_r31->unk78 != 0) {
-                temp_f31 = sin((M_PI * (90.0f * temp_r31->unk90)) / 180.0);
+                temp_f31 = sind(90.0f * temp_r31->unk90);
                 temp_r31->unk58 = (temp_r31->unk5C + (temp_f31 * (temp_r31->unk60 - temp_r31->unk5C)));
                 temp_r31->unk90 = (temp_r31->unk90 + temp_r31->unk94);
                 if (temp_r31->unk90 >= 1.0f) {
diff --git a/src/REL/m446Dll/cursor.c b/src/REL/m446Dll/cursor.c
index 088e6f9f..c57da258 100644
--- a/src/REL/m446Dll/cursor.c
+++ b/src/REL/m446Dll/cursor.c
@@ -2,7 +2,7 @@
 
 #include "game/hsfman.h"
 #include "game/hsfmotion.h"
-#include "math.h"
+#include "ext_math.h"
 
 // bss
 unkStruct3 *lbl_1_bss_98;
@@ -42,7 +42,7 @@ void fn_1_7350(void)
         do {
             temp_r31 = var_r30->unk0;
             if (temp_r31->field00_bit1 != 0) {
-                temp_f31 = sin((M_PI * (90.0f * temp_r31->unk4C)) / 180.0);
+                temp_f31 = sind(90.0f * temp_r31->unk4C);
                 temp_f31 *= temp_f31;
                 temp_r31->unk20.x = (temp_r31->unk2C.x + (temp_f31 * (temp_r31->unk38.x - temp_r31->unk2C.x)));
                 temp_r31->unk20.y = (temp_r31->unk2C.y + (temp_f31 * (temp_r31->unk38.y - temp_r31->unk2C.y)));
diff --git a/src/REL/m446Dll/player.c b/src/REL/m446Dll/player.c
index 619176ae..ecf62fa9 100644
--- a/src/REL/m446Dll/player.c
+++ b/src/REL/m446Dll/player.c
@@ -6,7 +6,7 @@
 #include "game/hsfmotion.h"
 #include "game/objsub.h"
 #include "game/pad.h"
-#include "math.h"
+#include "ext_math.h"
 
 // cursor.c
 extern unkStruct7 *m446CursorCreate(s32);
@@ -122,7 +122,7 @@ void fn_1_487C(void)
                 lbl_1_data_2DC[temp_r31->unk18](temp_r31);
             }
             if (temp_r31->unkB4 != 0) {
-                temp_f31 = sin((M_PI * (90.0f * temp_r31->unkC0)) / 180.0);
+                temp_f31 = sind(90.0f * temp_r31->unkC0);
                 temp_f31 *= temp_f31;
                 temp_r31->unk48.x = (temp_r31->unk9C.x + (temp_f31 * (temp_r31->unkA8.x - temp_r31->unk9C.x)));
                 temp_r31->unk48.y = (temp_r31->unk9C.y + (temp_f31 * (temp_r31->unkA8.y - temp_r31->unk9C.y)));
@@ -136,7 +136,7 @@ void fn_1_487C(void)
                 }
             }
             if (temp_r31->unk98 != 0) {
-                temp_f31 = sin((M_PI * (90.0f * temp_r31->unkB8)) / 180.0);
+                temp_f31 = sind(90.0f * temp_r31->unkB8);
                 temp_f31 *= temp_f31;
                 temp_r31->unk54.x = (temp_r31->unk80.x + (temp_f31 * (temp_r31->unk8C.x - temp_r31->unk80.x)));
                 temp_r31->unk54.y = (temp_r31->unk80.y + (temp_f31 * (temp_r31->unk8C.y - temp_r31->unk80.y)));
diff --git a/src/REL/mentDll/common.c b/src/REL/mentDll/common.c
index 82910c62..77e82ced 100644
--- a/src/REL/mentDll/common.c
+++ b/src/REL/mentDll/common.c
@@ -109,7 +109,7 @@ f32 fn_1_254(f32 arg8, f32 arg9, f32 argA, f32 argB)
     if (argA >= argB) {
         return arg9;
     }
-    return (arg8 + ((arg9 - arg8) * (1.0 - cos((M_PI * ((90.0f / argB) * argA)) / 180.0))));
+    return (arg8 + ((arg9 - arg8) * (1.0 - cosd((90.0f / argB) * argA))));
 }
 
 // fn_1_32C
@@ -118,7 +118,7 @@ f32 fn_1_32C(f32 arg8, f32 arg9, f32 argA, f32 argB)
     if (argA >= argB) {
         return arg9;
     }
-    return (arg8 + ((arg9 - arg8) * sin((M_PI * ((90.0f / argB) * argA)) / 180.0)));
+    return arg8 + (arg9 - arg8) * sind((90.0f / argB) * argA);
 }
 
 f32 fn_1_3F4(f32 arg8, f32 arg9, f32 argA, f32 argB)
@@ -126,7 +126,7 @@ f32 fn_1_3F4(f32 arg8, f32 arg9, f32 argA, f32 argB)
     if (argA >= argB) {
         return arg8;
     }
-    return (arg8 + ((arg9 - arg8) * sin((M_PI * ((360.0f / argB) * argA)) / 180.0)));
+    return (arg8 + ((arg9 - arg8) * sind((360.0f / argB) * argA)));
 }
 
 void fn_1_4B0(s32 arg0)
diff --git a/src/REL/modeltestDll/main.c b/src/REL/modeltestDll/main.c
index 7c8dc93a..b2887739 100644
--- a/src/REL/modeltestDll/main.c
+++ b/src/REL/modeltestDll/main.c
@@ -11,10 +11,8 @@
 #include "game/sprite.h"
 #include "game/window.h"
 #include "game/wipe.h"
-#include "math.h"
 
 #include "REL/modeltestDll.h"
-#include "math.h"
 
 // -------------------------------------------------------------------------- //
 
@@ -311,7 +309,7 @@ void fn_1_29C(omObjData *arg0)
         Hu3DParManAttrSet(lbl_1_bss_864[var_r31], 0x864);
         Hu3DParticleBlendModeSet(Hu3DParManModelIDGet(lbl_1_bss_864[var_r31]), 1U);
         Hu3DParManPosSet(
-            lbl_1_bss_864[var_r31], (100.0 * sin((M_PI * (36.0f * var_r31)) / 180.0)), 0.0f, 100.0 * cos((M_PI * (36.0f * var_r31)) / 180.0));
+            lbl_1_bss_864[var_r31], (100.0 * sind(36.0f * var_r31)), 0.0f, 100.0 * cosd(36.0f * var_r31));
         Hu3DParManRotSet(lbl_1_bss_864[var_r31], -90.0f, 0.0f, 0.0f);
     }
 
@@ -465,28 +463,28 @@ void fn_1_F9C(struct om_obj_data *omData)
         }
     }
 
-    sp3C.x = Center.x + (CZoom * (sin((M_PI * CRot.y) / 180.0) * cos((M_PI * CRot.x) / 180.0)));
-    sp3C.y = (Center.y + (CZoom * -sin((M_PI * CRot.x) / 180.0)));
-    sp3C.z = (Center.z + (CZoom * (cos((M_PI * CRot.y) / 180.0) * cos((M_PI * CRot.x) / 180.0))));
+    sp3C.x = Center.x + CZoom * (sind(CRot.y) * cosd(CRot.x));
+    sp3C.y = Center.y + CZoom * -sind(CRot.x);
+    sp3C.z = Center.z + CZoom * (cosd(CRot.y) * cosd(CRot.x));
     sp30.x = Center.x - sp3C.x;
     sp30.y = Center.y - sp3C.y;
     sp30.z = Center.z - sp3C.z;
-    sp24.x = (sin((M_PI * CRot.y) / 180.0) * sin((M_PI * CRot.x) / 180.0));
-    sp24.y = cos((M_PI * CRot.x) / 180.0);
-    sp24.z = (cos((M_PI * CRot.y) / 180.0) * sin((M_PI * CRot.x) / 180.0));
+    sp24.x = sind(CRot.y) * sind(CRot.x);
+    sp24.y = cosd(CRot.x);
+    sp24.z = cosd(CRot.y) * sind(CRot.x);
     temp_f31 = CRot.z;
 
-    sp18.x = sp24.x * (sp30.x * sp30.x + (1.0f - sp30.x * sp30.x) * cos((M_PI * temp_f31) / 180.0))
-        + sp24.y * (sp30.x * sp30.y * (1.0f - cos((M_PI * temp_f31) / 180.0)) - sp30.z * sin((M_PI * temp_f31) / 180.0))
-        + sp24.z * (sp30.x * sp30.z * (1.0f - cos((M_PI * temp_f31) / 180.0)) + sp30.y * sin((M_PI * temp_f31) / 180.0));
+    sp18.x = sp24.x * (sp30.x * sp30.x + (1.0f - sp30.x * sp30.x) * cosd(temp_f31))
+        + sp24.y * (sp30.x * sp30.y * (1.0f - cosd(temp_f31)) - sp30.z * sind(temp_f31))
+        + sp24.z * (sp30.x * sp30.z * (1.0f - cosd(temp_f31)) + sp30.y * sind(temp_f31));
 
-    sp18.y = sp24.y * (sp30.y * sp30.y + (1.0f - sp30.y * sp30.y) * cos((M_PI * temp_f31) / 180.0))
-        + sp24.x * (sp30.x * sp30.y * (1.0f - cos((M_PI * temp_f31) / 180.0)) + sp30.z * sin((M_PI * temp_f31) / 180.0))
-        + sp24.z * (sp30.y * sp30.z * (1.0f - cos((M_PI * temp_f31) / 180.0)) - sp30.x * sin((M_PI * temp_f31) / 180.0));
+    sp18.y = sp24.y * (sp30.y * sp30.y + (1.0f - sp30.y * sp30.y) * cosd(temp_f31))
+        + sp24.x * (sp30.x * sp30.y * (1.0f - cosd(temp_f31)) + sp30.z * sind(temp_f31))
+        + sp24.z * (sp30.y * sp30.z * (1.0f - cosd(temp_f31)) - sp30.x * sind(temp_f31));
 
-    sp18.z = sp24.z * (sp30.z * sp30.z + (1.0f - sp30.z * sp30.z) * cos((M_PI * temp_f31) / 180.0))
-        + (sp24.x * (sp30.x * sp30.z * (1.0 - cos((M_PI * temp_f31) / 180.0)) - sp30.y * sin((M_PI * temp_f31) / 180.0))
-            + sp24.y * (sp30.y * sp30.z * (1.0 - cos((M_PI * temp_f31) / 180.0)) + sp30.x * sin((M_PI * temp_f31) / 180.0)));
+    sp18.z = sp24.z * (sp30.z * sp30.z + (1.0f - sp30.z * sp30.z) * cosd(temp_f31))
+        + (sp24.x * (sp30.x * sp30.z * (1.0 - cosd(temp_f31)) - sp30.y * sind(temp_f31))
+            + sp24.y * (sp30.y * sp30.z * (1.0 - cosd(temp_f31)) + sp30.x * sind(temp_f31)));
 
     VECCrossProduct(&sp24, &sp30, &sp30);
     VECNormalize(&sp30, &sp30);
@@ -603,11 +601,11 @@ void fn_1_20F4(void)
             Hu3DMtxTransGet(spC0, &sp18);
             PSMTXMultVec(sp60, &sp18, &sp18);
 
-            temp_f27 = 180.0 * (atan2(sp18.z, sp18.x) / M_PI);
+            temp_f27 = atan2d(sp18.z, sp18.x);
             temp_r31 = &lbl_1_bss_40[var_r29 * 2];
-            temp_r31->obj->data.curr.rot.x = temp_r31->rot.x + (var_f29 * (2.0 * (sin((M_PI * temp_f27) / 180.0) * sin((M_PI * var_r27) / 180.0))));
+            temp_r31->obj->data.curr.rot.x = temp_r31->rot.x + (var_f29 * (2.0 * (sind(temp_f27) * sind(var_r27))));
             temp_r31->obj->data.curr.rot.y = temp_r31->rot.y;
-            temp_r31->obj->data.curr.rot.z = temp_r31->rot.z + (var_f29 * cos((M_PI * var_r27) / 180.0));
+            temp_r31->obj->data.curr.rot.z = temp_r31->rot.z + (var_f29 * cosd(var_r27));
 
             Hu3DModelObjMtxGet(temp_r3, lbl_1_data_D8[(var_r29 * 2) + 1], spC0);
             Hu3DMtxTransGet(spC0, &sp24);
@@ -632,7 +630,7 @@ void fn_1_20F4(void)
             var_f29 = 0.0f;
         }
         else {
-            var_r27 = 180.0 * (atan2(HuPadSubStkX[1], HuPadSubStkY[1]) / M_PI);
+            var_r27 = atan2d(HuPadSubStkX[1], HuPadSubStkY[1]);
             temp_f30 = (HuPadSubStkX[1] * HuPadSubStkX[1]) + (HuPadSubStkY[1] * HuPadSubStkY[1]);
             var_f29 = sqrtf(temp_f30);
             if (var_f29 > 80.0f) {
@@ -658,8 +656,8 @@ void fn_1_28F8(Point3d *arg0, Point3d *arg1)
     C_MTXLookAt(sp18, &cam->pos, &cam->up, &cam->target);
     PSMTXMultVec(sp18, arg0, &spC);
 
-    temp_f31 = (1.2f * (spC.z * (sin((M_PI * (cam->fov / 2)) / 180.0) / (cos((M_PI * (cam->fov / 2)) / 180.0)))));
-    temp_f30 = (spC.z * (sin((M_PI * (cam->fov / 2)) / 180.0) / (cos((M_PI * (cam->fov / 2)) / 180.0))));
+    temp_f31 = (1.2f * (spC.z * (sind(cam->fov / 2) / (cosd(cam->fov / 2)))));
+    temp_f30 = (spC.z * (sind(cam->fov / 2) / (cosd(cam->fov / 2))));
     arg1->x = 288.0f + (spC.x * (288.0f / -temp_f31));
     arg1->y = 240.0f + (spC.y * (240.0f / temp_f30));
 }
diff --git a/src/REL/modeltestDll/modeltest00.c b/src/REL/modeltestDll/modeltest00.c
index 36d9596b..c687e5df 100644
--- a/src/REL/modeltestDll/modeltest00.c
+++ b/src/REL/modeltestDll/modeltest00.c
@@ -103,28 +103,28 @@ void fn_1_37DC(omObjData *)
     CZoom += HuPadTrigL[0] / 2;
     CZoom -= HuPadTrigR[0] / 2;
 
-    sp3C.x = Center.x + (CZoom * (sin((M_PI * CRot.y) / 180.0) * cos((M_PI * CRot.x) / 180.0)));
-    sp3C.y = (Center.y + (CZoom * -sin((M_PI * CRot.x) / 180.0)));
-    sp3C.z = (Center.z + (CZoom * (cos((M_PI * CRot.y) / 180.0) * cos((M_PI * CRot.x) / 180.0))));
+    sp3C.x = Center.x + CZoom * (sind(CRot.y) * cosd(CRot.x));
+    sp3C.y = Center.y + CZoom * -sind(CRot.x);
+    sp3C.z = Center.z + CZoom * (cosd(CRot.y) * cosd(CRot.x));
     sp30.x = Center.x - sp3C.x;
     sp30.y = Center.y - sp3C.y;
     sp30.z = Center.z - sp3C.z;
-    sp24.x = (sin((M_PI * CRot.y) / 180.0) * sin((M_PI * CRot.x) / 180.0));
-    sp24.y = cos((M_PI * CRot.x) / 180.0);
-    sp24.z = (cos((M_PI * CRot.y) / 180.0) * sin((M_PI * CRot.x) / 180.0));
+    sp24.x = sind(CRot.y) * sind(CRot.x);
+    sp24.y = cosd(CRot.x);
+    sp24.z = cosd(CRot.y) * sind(CRot.x);
     temp_f31 = CRot.z;
     
-    sp18.x = sp24.x * (sp30.x * sp30.x + (1.0f - sp30.x * sp30.x) * cos((M_PI * temp_f31) / 180.0))
-            + sp24.y * (sp30.x * sp30.y * (1.0f - cos((M_PI * temp_f31) / 180.0)) - sp30.z * sin((M_PI * temp_f31) / 180.0))
-            + sp24.z * (sp30.x * sp30.z * (1.0f - cos((M_PI * temp_f31) / 180.0)) + sp30.y * sin((M_PI * temp_f31) / 180.0));
+    sp18.x = sp24.x * (sp30.x * sp30.x + (1.0f - sp30.x * sp30.x) * cosd(temp_f31))
+            + sp24.y * (sp30.x * sp30.y * (1.0f - cosd(temp_f31)) - sp30.z * sind(temp_f31))
+            + sp24.z * (sp30.x * sp30.z * (1.0f - cosd(temp_f31)) + sp30.y * sind(temp_f31));
 
-    sp18.y = sp24.y * (sp30.y * sp30.y + (1.0f - sp30.y * sp30.y) * cos((M_PI * temp_f31) / 180.0))
-            + sp24.x * (sp30.x * sp30.y * (1.0f - cos((M_PI * temp_f31) / 180.0)) + sp30.z * sin((M_PI * temp_f31) / 180.0))
-            + sp24.z * (sp30.y * sp30.z * (1.0f - cos((M_PI * temp_f31) / 180.0)) - sp30.x * sin((M_PI * temp_f31) / 180.0));
+    sp18.y = sp24.y * (sp30.y * sp30.y + (1.0f - sp30.y * sp30.y) * cosd(temp_f31))
+            + sp24.x * (sp30.x * sp30.y * (1.0f - cosd(temp_f31)) + sp30.z * sind(temp_f31))
+            + sp24.z * (sp30.y * sp30.z * (1.0f - cosd(temp_f31)) - sp30.x * sind(temp_f31));
         
-    sp18.z = sp24.z * (sp30.z * sp30.z + (1.0f - sp30.z * sp30.z) * cos((M_PI * temp_f31) / 180.0))
-            + (sp24.x * (sp30.x * sp30.z * (1.0 - cos((M_PI * temp_f31) / 180.0)) - sp30.y * sin((M_PI * temp_f31) / 180.0))
-            + sp24.y * (sp30.y * sp30.z * (1.0 - cos((M_PI * temp_f31) / 180.0)) + sp30.x * sin((M_PI * temp_f31) / 180.0)));
+    sp18.z = sp24.z * (sp30.z * sp30.z + (1.0f - sp30.z * sp30.z) * cosd(temp_f31))
+            + (sp24.x * (sp30.x * sp30.z * (1.0 - cosd(temp_f31)) - sp30.y * sind(temp_f31))
+            + sp24.y * (sp30.y * sp30.z * (1.0 - cosd(temp_f31)) + sp30.x * sind(temp_f31)));
 
     VECCrossProduct(&sp24, &sp30, &sp30);
     VECNormalize(&sp30, &sp30);
@@ -148,17 +148,17 @@ void fn_1_439C(omObjData * )
         temp_f31 = CRot.x;
         temp_f30 = CRot.y + (var_r31 * 90);
         sp10 = CRot.z;
-        sp2C.x = Center.x + (CZoom * (sin((M_PI * temp_f30) / 180.0) * (cos((M_PI * temp_f31) / 180.0))));
-        sp2C.y = Center.y + (CZoom * -sin((M_PI * temp_f31) / 180.0));
-        sp2C.z = Center.z + (CZoom * (cos((M_PI * temp_f30) / 180.0) * (cos((M_PI * temp_f31) / 180.0))));
+        sp2C.x = Center.x + CZoom * (sind(temp_f30) * (cosd(temp_f31)));
+        sp2C.y = Center.y + CZoom * -sind(temp_f31);
+        sp2C.z = Center.z + CZoom * (cosd(temp_f30) * (cosd(temp_f31)));
         
         sp20.x = Center.x;
         sp20.y = Center.y;
         sp20.z = Center.z;
 
-        sp14.x = sin((M_PI * temp_f30) / 180.0) * (sin((M_PI * temp_f31) / 180.0));
-        sp14.y = cos((M_PI * temp_f31) / 180.0);
-        sp14.z = cos((M_PI * temp_f30) / 180.0) * (sin((M_PI * temp_f31) / 180.0));
+        sp14.x = sind(temp_f30) * (sind(temp_f31));
+        sp14.y = cosd(temp_f31);
+        sp14.z = cosd(temp_f30) * (sind(temp_f31));
 
          Hu3DCameraPosSet(lbl_1_data_358[var_r31], sp2C.x, sp2C.y, sp2C.z, sp14.x, sp14.y, sp14.z, sp20.x, sp20.y, sp20.z);
     }
diff --git a/src/REL/modeseldll/filesel.c b/src/REL/modeseldll/filesel.c
index 93fc856d..53a1d962 100644
--- a/src/REL/modeseldll/filesel.c
+++ b/src/REL/modeseldll/filesel.c
@@ -10,7 +10,7 @@
 #include "game/window.h"
 #include "game/wipe.h"
 
-#include "math.h"
+#include "ext_math.h"
 
 #include "REL/modeseldll.h"
 
@@ -203,7 +203,7 @@ repeat:
     fn_1_5C38();
     for (temp_r30 = 0; temp_r30 <= 20; temp_r30++) {
         temp_f31 = temp_r30 / 20.0;
-        temp_f31 = sin(M_PI * (90.0f * temp_f31) / 180.0);
+        temp_f31 = sind(90.0f * temp_f31);
         Hu3DModelScaleSet(lbl_1_bss_19A[0], temp_f31, temp_f31, temp_f31);
         Hu3DModelScaleSet(lbl_1_bss_19A[1], temp_f31, temp_f31, temp_f31);
         Hu3DModelScaleSet(lbl_1_bss_19A[2], temp_f31, temp_f31, temp_f31);
@@ -377,8 +377,8 @@ loop_exit:
             for (temp_r30 = 0; temp_r30 <= 40; temp_r30++) {
                 if (temp_r30 <= 30) {
                     temp_f31 = temp_r30 / 30.0f;
-                    sp28.x = 288.0 + (GET_ZEROSIGN(temp_r26) * (100.0 + (250.0 * sin(M_PI * (90.0f * temp_f31) / 180.0))));
-                    sp28.y = 250.0 - (100.0 * sin(M_PI * (180.0f * temp_f31) / 180.0));
+                    sp28.x = 288.0 + (GET_ZEROSIGN(temp_r26) * (100.0 + (250.0 * sind(90.0f * temp_f31))));
+                    sp28.y = 250.0 - (100.0 * sind(180.0f * temp_f31));
                     sp28.z = (temp_r30 * 100) + 600;
                     Hu3D2Dto3D(&sp28, 1, &sp1C);
                     Hu3DModelPosSetV(lbl_1_bss_19A[temp_r26 + 2], &sp1C);
@@ -390,11 +390,11 @@ loop_exit:
                     temp_f31 = (temp_r30 - 20) / 20.0f;
                     if (temp_r29) {
                         sp28.x = 288.0f + ((1.0 - temp_f31) * (100 * GET_ZEROSIGN(temp_r31)));
-                        sp28.y = 250.0 - (100.0 * sin(M_PI * (180.0f * temp_f31) / 180.0));
+                        sp28.y = 250.0 - (100.0 * sind(180.0f * temp_f31));
                         sp28.z = 600.0f;
                         Hu3D2Dto3D(&sp28, 1, &sp1C);
                         Hu3DModelPosSetV(lbl_1_bss_19A[temp_r31], &sp1C);
-                        temp_f31 = (0.5 * sin(M_PI * (90.0f * temp_f31) / 180.0)) + 1.0;
+                        temp_f31 = (0.5 * sind(90.0f * temp_f31)) + 1.0;
                         Hu3DModelScaleSet(lbl_1_bss_19A[temp_r31], temp_f31, temp_f31, temp_f31);
                     }
                     else {
@@ -407,14 +407,14 @@ loop_exit:
                         sp28.z = 600;
                         Hu3D2Dto3D(&sp28, 1, &sp10);
                         VECSubtract(&sp10, &sp1C, &sp28);
-                        sp28.x *= sin(M_PI * (90.0f * temp_f31) / 180.0);
-                        sp28.y *= 1.0 - cos(M_PI * (90.0f * temp_f31) / 180.0);
+                        sp28.x *= sind(90.0f * temp_f31);
+                        sp28.y *= 1.0 - cosd(90.0f * temp_f31);
                         sp28.z = 0;
                         VECAdd(&sp28, &sp1C, &sp1C);
                         Hu3DModelPosSetV(lbl_1_bss_19A[temp_r31], &sp1C);
-                        lbl_1_bss_108[temp_r31] *= cos(M_PI * (90.0f * temp_f31) / 180.0);
+                        lbl_1_bss_108[temp_r31] *= cosd(90.0f * temp_f31);
                         lbl_1_bss_100[temp_r31] = 1.0 - temp_f31;
-                        temp_f31 = 1.0 + (0.3 * cos(M_PI * (90.0f * temp_f31) / 180.0));
+                        temp_f31 = 1.0 + (0.3 * cosd(90.0f * temp_f31));
                         Hu3DModelScaleSet(lbl_1_bss_19A[temp_r31], temp_f31, temp_f31, temp_f31);
                     }
                 }
@@ -525,7 +525,7 @@ cleanup:
     for (temp_r30 = 0; temp_r30 <= 20; temp_r30++) {
         temp_f31 = temp_r30 / 20.0f;
         if (temp_r29) {
-            temp_f31 = 1.5 * cos(M_PI * (90.0f * temp_f31) / 180.0);
+            temp_f31 = 1.5 * cosd(90.0f * temp_f31);
             Hu3DModelScaleSet(lbl_1_bss_19A[0], temp_f31, temp_f31, temp_f31);
             Hu3DModelScaleSet(lbl_1_bss_19A[1], temp_f31, temp_f31, temp_f31);
             Hu3DModelScaleSet(lbl_1_bss_19A[2], 0.7 * temp_f31, 0.7 * temp_f31, 0.7 * temp_f31);
@@ -544,14 +544,14 @@ cleanup:
             sp28.z = 600;
             Hu3D2Dto3D(&sp28, 1, &sp10);
             VECSubtract(&sp10, &sp1C, &sp28);
-            sp28.x *= sin(M_PI * (90.0f * temp_f31) / 180.0);
-            sp28.y *= 1.0 - cos(M_PI * (90.0f * temp_f31) / 180.0);
+            sp28.x *= sind(90.0f * temp_f31);
+            sp28.y *= 1.0 - cosd(90.0f * temp_f31);
             sp28.z = 0.0f;
             VECAdd(&sp28, &sp1C, &sp1C);
             Hu3DModelPosSetV(lbl_1_bss_19A[temp_r31], &sp1C);
-            lbl_1_bss_108[temp_r31] *= cos(M_PI * (90.0f * temp_f31) / 180.0);
+            lbl_1_bss_108[temp_r31] *= cosd(90.0f * temp_f31);
             lbl_1_bss_100[temp_r31] = 1.0 - temp_f31;
-            temp_f31 = 1.0 + (0.5 * cos(M_PI * (90.0f * temp_f31) / 180.0));
+            temp_f31 = 1.0 + (0.5 * cosd(90.0f * temp_f31));
             Hu3DModelScaleSet(lbl_1_bss_19A[temp_r31], temp_f31, temp_f31, temp_f31);
         }
         HuPrcVSleep();
@@ -636,10 +636,10 @@ void fn_1_5850(void)
         float scale;
         float time = i / 10.0;
         if (param) {
-            scale = 1.0 + (0.3 * sin(M_PI * (90.0f * time) / 180.0));
+            scale = 1.0 + (0.3 * sind(90.0f * time));
         }
         else {
-            scale = 1.0 + (0.3 * cos(M_PI * (90.0f * time) / 180.0));
+            scale = 1.0 + (0.3 * cosd(90.0f * time));
         }
         Hu3DModelScaleSet(lbl_1_bss_19A[index + 2], scale, scale, scale);
         Hu3DModelScaleSet(lbl_1_bss_19A[index + 4], scale, scale, scale);
@@ -800,7 +800,7 @@ s32 fn_1_61B4(void)
     lbl_1_bss_120[0] = lbl_1_bss_120[1] = lbl_1_bss_120[2] = 1;
     UnMountCnt = 0;
     for (temp_r29 = 0; temp_r29 <= 20; temp_r29++) {
-        temp_f31 = sin(M_PI * (90.0f * (temp_r29 / 20.0f)) / 180.0);
+        temp_f31 = sind(90.0f * (temp_r29 / 20.0f));
         for (temp_r28 = 0; temp_r28 < 3; temp_r28++) {
             Hu3DModelScaleSet(lbl_1_bss_19A[temp_r28 + 8], temp_f31, temp_f31, temp_f31);
             Hu3DModelScaleSet(lbl_1_bss_19A[temp_r28 + 11], temp_f31, temp_f31, temp_f31);
@@ -1076,7 +1076,7 @@ s32 fn_1_61B4(void)
     }
     HuWinDispOff(lbl_1_bss_146);
     for (temp_r29 = 0; temp_r29 <= 20; temp_r29++) {
-        temp_f31 = cos(M_PI * (90.0 * (temp_r29 / 20.0)) / 180.0);
+        temp_f31 = cosd(90.0 * (temp_r29 / 20.0));
         Hu3DModelScaleSet(lbl_1_bss_19A[curSlotNo], temp_f31, temp_f31, temp_f31);
         for (temp_r28 = 0; temp_r28 < 3; temp_r28++) {
             Hu3DModelScaleSet(lbl_1_bss_19A[temp_r28 + 8], temp_f31, temp_f31, temp_f31);
@@ -1115,10 +1115,10 @@ void fn_1_72DC(void)
         Vec pos_2d;
         Vec pos_3d;
         if (param) {
-            scale = sin(M_PI * (90.0f * (i / 10.0f)) / 180.0);
+            scale = sind(90.0f * (i / 10.0f));
         }
         else {
-            scale = cos(M_PI * (90.0f * (i / 10.0f)) / 180.0);
+            scale = cosd(90.0f * (i / 10.0f));
         }
         pos_2d.x = 158.0f + (index * 130);
         pos_2d.y = 230;
@@ -1476,7 +1476,7 @@ s32 fn_1_8540(s16 boxno)
             return 0;
         }
         for (time = 0; time <= 10; time++) {
-            scale = cos(M_PI * (90.0 * (time / 10.0)) / 180.0);
+            scale = cosd(90.0 * (time / 10.0));
             Hu3DModelScaleSet(lbl_1_bss_19A[boxno + 8], scale, scale, scale);
             HuPrcVSleep();
         }
@@ -1490,7 +1490,7 @@ s32 fn_1_8540(s16 boxno)
         Hu3DModelTPLvlSet(lbl_1_bss_19A[boxno + 8], 0.6f);
         Hu3DModelTPLvlSet(lbl_1_bss_19A[boxno + 11], 0.3f);
         for (time = 0; time <= 20; time++) {
-            scale = sin(M_PI * (90.0 * (time / 20.0)) / 180.0);
+            scale = sind(90.0 * (time / 20.0));
             Hu3DModelScaleSet(lbl_1_bss_19A[boxno + 8], scale, scale, scale);
             HuPrcVSleep();
         }
@@ -1661,7 +1661,7 @@ s32 fn_1_8C30(s16 boxno)
                 else {
                     fn_1_9E14();
                     for (temp_r30 = 0; temp_r30 <= 10; temp_r30++) {
-                        temp_f31 = cos(M_PI * (90.0 * (temp_r30 / 10.0)) / 180.0);
+                        temp_f31 = cosd(90.0 * (temp_r30 / 10.0));
                         Hu3DModelScaleSet(lbl_1_bss_19A[temp_r31 + 8], temp_f31, temp_f31, temp_f31);
                         HuPrcVSleep();
                     }
@@ -1709,7 +1709,7 @@ s32 fn_1_8C30(s16 boxno)
                                 temp_f31 = temp_r30 / 30.0;
                                 sp60.x = sp3C.x * temp_f31;
                                 sp60.y = sp3C.y * temp_f31;
-                                sp60.z = (sp3C.z * temp_f31) + (-300 * sin(M_PI * (180.0f * temp_f31) / 180.0));
+                                sp60.z = (sp3C.z * temp_f31) + (-300 * sind(180.0f * temp_f31));
                                 VECAdd(&sp60, &sp54, &sp60);
                                 Hu3DModelPosSetV(lbl_1_bss_19A[temp_r31 + 11], &sp60);
                                 HuPrcVSleep();
@@ -1730,7 +1730,7 @@ s32 fn_1_8C30(s16 boxno)
     Hu3DModelAttrSet(lbl_1_bss_19A[23], HU3D_ATTR_DISPOFF);
     Hu3DModelAttrReset(lbl_1_bss_19A[boxno + 8], HU3D_ATTR_DISPOFF);
     for (temp_r30 = 0; temp_r30 <= 10; temp_r30++) {
-        temp_f31 = sin(M_PI * (90.0 * (temp_r30 / 10.0)) / 180.0);
+        temp_f31 = sind(90.0 * (temp_r30 / 10.0));
         Hu3DModelScaleSet(lbl_1_bss_19A[temp_r31 + 8], temp_f31, temp_f31, temp_f31);
         HuPrcVSleep();
     }
diff --git a/src/REL/modeseldll/main.c b/src/REL/modeseldll/main.c
index f1d9be9b..7505272f 100644
--- a/src/REL/modeseldll/main.c
+++ b/src/REL/modeseldll/main.c
@@ -8,7 +8,7 @@
 #include "game/process.h"
 #include "game/window.h"
 #include "game/wipe.h"
-#include "math.h"
+#include "ext_math.h"
 
 typedef struct camera_view_params {
     Vec rot;
@@ -233,15 +233,15 @@ void fn_1_B8C(omObjData *object)
         y = lbl_1_bss_24[i].y;
         z = lbl_1_bss_24[i].z;
 
-        pos.x = (((sin((M_PI * y) / 180.0) * cos((M_PI * x) / 180.0)) * lbl_1_bss_4[i]) + lbl_1_bss_C[i].x);
-        pos.y = (-sin((M_PI * x) / 180.0) * lbl_1_bss_4[i]) + lbl_1_bss_C[i].y;
-        pos.z = ((cos((M_PI * y) / 180.0) * cos((M_PI * x) / 180.0)) * lbl_1_bss_4[i]) + lbl_1_bss_C[i].z;
+        pos.x = (((sind(y) * cosd(x)) * lbl_1_bss_4[i]) + lbl_1_bss_C[i].x);
+        pos.y = (-sind(x) * lbl_1_bss_4[i]) + lbl_1_bss_C[i].y;
+        pos.z = ((cosd(y) * cosd(x)) * lbl_1_bss_4[i]) + lbl_1_bss_C[i].z;
         target.x = lbl_1_bss_C[i].x;
         target.y = lbl_1_bss_C[i].y;
         target.z = lbl_1_bss_C[i].z;
-        up.x = sin((M_PI * y) / 180.0) * sin((M_PI * x) / 180.0);
-        up.y = cos((M_PI * x) / 180.0);
-        up.z = cos((M_PI * y) / 180.0) * sin((M_PI * x) / 180.0);
+        up.x = sind(y) * sind(x);
+        up.y = cosd(x);
+        up.z = cosd(y) * sind(x);
         Hu3DCameraPosSet(lbl_1_data_6E[i], pos.x, pos.y, pos.z, up.x, up.y, up.z, target.x, target.y, target.z);
     }
 }
@@ -272,27 +272,27 @@ void fn_1_F40(omObjData *object)
     if (lbl_1_bss_4[0] < 100.0f) {
         lbl_1_bss_4[0] = 100.0f;
     }
-    pos.x = lbl_1_bss_C[0].x + (lbl_1_bss_4[0] * (sin((M_PI * lbl_1_bss_24[0].y) / 180.0) * cos((M_PI * lbl_1_bss_24[0].x) / 180.0)));
-    pos.y = (lbl_1_bss_C[0].y + (lbl_1_bss_4[0] * -sin((M_PI * lbl_1_bss_24[0].x) / 180.0)));
-    pos.z = (lbl_1_bss_C[0].z + (lbl_1_bss_4[0] * (cos((M_PI * lbl_1_bss_24[0].y) / 180.0) * cos((M_PI * lbl_1_bss_24[0].x) / 180.0))));
+    pos.x = lbl_1_bss_C[0].x + (lbl_1_bss_4[0] * (sind(lbl_1_bss_24[0].y) * cosd(lbl_1_bss_24[0].x)));
+    pos.y = (lbl_1_bss_C[0].y + (lbl_1_bss_4[0] * -sind(lbl_1_bss_24[0].x)));
+    pos.z = (lbl_1_bss_C[0].z + (lbl_1_bss_4[0] * (cosd(lbl_1_bss_24[0].y) * cosd(lbl_1_bss_24[0].x))));
     offset.x = lbl_1_bss_C[0].x - pos.x;
     offset.y = lbl_1_bss_C[0].y - pos.y;
     offset.z = lbl_1_bss_C[0].z - pos.z;
-    dir.x = (sin((M_PI * lbl_1_bss_24[0].y) / 180.0) * sin((M_PI * lbl_1_bss_24[0].x) / 180.0));
-    dir.y = cos((M_PI * lbl_1_bss_24[0].x) / 180.0);
-    dir.z = (cos((M_PI * lbl_1_bss_24[0].y) / 180.0) * sin((M_PI * lbl_1_bss_24[0].x) / 180.0));
+    dir.x = (sind(lbl_1_bss_24[0].y) * sind(lbl_1_bss_24[0].x));
+    dir.y = cosd(lbl_1_bss_24[0].x);
+    dir.z = (cosd(lbl_1_bss_24[0].y) * sind(lbl_1_bss_24[0].x));
     z_rot = lbl_1_bss_24[0].z;
-    y_offset.x = dir.x * (offset.x * offset.x + (1.0f - offset.x * offset.x) * cos((M_PI * z_rot) / 180.0))
-        + dir.y * (offset.x * offset.y * (1.0f - cos((M_PI * z_rot) / 180.0)) - offset.z * sin((M_PI * z_rot) / 180.0))
-        + dir.z * (offset.x * offset.z * (1.0f - cos((M_PI * z_rot) / 180.0)) + offset.y * sin((M_PI * z_rot) / 180.0));
+    y_offset.x = dir.x * (offset.x * offset.x + (1.0f - offset.x * offset.x) * cosd(z_rot))
+        + dir.y * (offset.x * offset.y * (1.0f - cosd(z_rot)) - offset.z * sind(z_rot))
+        + dir.z * (offset.x * offset.z * (1.0f - cosd(z_rot)) + offset.y * sind(z_rot));
 
-    y_offset.y = dir.y * (offset.y * offset.y + (1.0f - offset.y * offset.y) * cos((M_PI * z_rot) / 180.0))
-        + dir.x * (offset.x * offset.y * (1.0f - cos((M_PI * z_rot) / 180.0)) + offset.z * sin((M_PI * z_rot) / 180.0))
-        + dir.z * (offset.y * offset.z * (1.0f - cos((M_PI * z_rot) / 180.0)) - offset.x * sin((M_PI * z_rot) / 180.0));
+    y_offset.y = dir.y * (offset.y * offset.y + (1.0f - offset.y * offset.y) * cosd(z_rot))
+        + dir.x * (offset.x * offset.y * (1.0f - cosd(z_rot)) + offset.z * sind(z_rot))
+        + dir.z * (offset.y * offset.z * (1.0f - cosd(z_rot)) - offset.x * sind(z_rot));
 
-    y_offset.z = dir.z * (offset.z * offset.z + (1.0f - offset.z * offset.z) * cos((M_PI * z_rot) / 180.0))
-        + (dir.x * (offset.x * offset.z * (1.0 - cos((M_PI * z_rot) / 180.0)) - offset.y * sin((M_PI * z_rot) / 180.0))
-            + dir.y * (offset.y * offset.z * (1.0 - cos((M_PI * z_rot) / 180.0)) + offset.x * sin((M_PI * z_rot) / 180.0)));
+    y_offset.z = dir.z * (offset.z * offset.z + (1.0f - offset.z * offset.z) * cosd(z_rot))
+        + (dir.x * (offset.x * offset.z * (1.0 - cosd(z_rot)) - offset.y * sind(z_rot))
+            + dir.y * (offset.y * offset.z * (1.0 - cosd(z_rot)) + offset.x * sind(z_rot)));
 
     VECCrossProduct(&dir, &offset, &offset);
     VECNormalize(&offset, &offset);
diff --git a/src/REL/option/record.c b/src/REL/option/record.c
index c255cdbe..763bc418 100755
--- a/src/REL/option/record.c
+++ b/src/REL/option/record.c
@@ -10,7 +10,7 @@
 #include "game/window.h"
 
 #include "dolphin.h"
-#include "math.h"
+#include "ext_math.h"
 #include "version.h"
 
 #ifndef __MWERKS__
@@ -208,8 +208,8 @@ static void ExecRecord(omObjData *object)
                 Hu3DModelAttrReset(work->hand->model[0], HU3D_ATTR_DISPOFF);
                 work->cameraDoneF = TRUE;
             }
-            pos.x = 505.0 * -sin(305 * M_PI / 180.0);
-            pos.z = 505.0 * cos(305 * M_PI / 180.0);
+            pos.x = 505.0 * -sind(305);
+            pos.z = 505.0 * cosd(305);
             pos.y = 144.0f - 14.0f * work->recordType;
             omSetTra(work->hand, pos.x, pos.y, pos.z);
             object->unk10 = 3;
diff --git a/src/REL/resultDll/battle.c b/src/REL/resultDll/battle.c
index c9441385..8818f975 100644
--- a/src/REL/resultDll/battle.c
+++ b/src/REL/resultDll/battle.c
@@ -1,5 +1,5 @@
 #include "dolphin.h"
-#include "math.h"
+#include "ext_math.h"
 
 #include "game/armem.h"
 #include "game/audio.h"
@@ -503,7 +503,7 @@ void fn_1_7F98(void)
     }
     delay = (lbl_1_bss_174) ? 3 : 10;
     for (time = 0; time <= delay; time++) {
-        float scale = sin(M_PI * ((90.0 / delay) * time) / 180.0);
+        float scale = sind((90.0 / delay) * time);
         for (i = 0; i < 4; i++) {
             HuSprGrpScaleSet(lbl_1_bss_19E0[i], scale, scale);
         }
diff --git a/src/REL/resultDll/main.c b/src/REL/resultDll/main.c
index 66c26486..bda3b255 100644
--- a/src/REL/resultDll/main.c
+++ b/src/REL/resultDll/main.c
@@ -14,7 +14,7 @@
 #include "game/window.h"
 #include "game/wipe.h"
 
-#include "math.h"
+#include "ext_math.h"
 
 #include "REL/resultdll.h"
 
@@ -498,7 +498,7 @@ void fn_1_1F4C(void)
     }
     temp_r29 = (lbl_1_bss_174) ? 3 : 10;
     for (temp_r30 = 0; temp_r30 <= temp_r29; temp_r30++) {
-        temp_f31 = sin(M_PI * ((90.0 / temp_r29) * temp_r30) / 180.0);
+        temp_f31 = sind((90.0 / temp_r29) * temp_r30);
         for (i = 0; i < 4; i++) {
             HuSprGrpScaleSet(lbl_1_bss_3A[i], temp_f31, temp_f31);
         }
@@ -512,8 +512,8 @@ void fn_1_1F4C(void)
             if (GWPlayerCoinWinGet(lbl_1_bss_4A[i]) >= 10) {
                 HuSprAttrReset(lbl_1_bss_9C, i, 4);
             }
-            HuSprScaleSet(lbl_1_bss_9C, i, sin(M_PI * ((120.0f / 14.0f) * temp_r28) / 180.0) * (0.8 * (1.0 / sin((M_PI * 2) / 3))),
-                0.8 * (sin(M_PI * ((120.0f / 14.0f) * temp_r28) / 180.0) * (1.0 / sin((M_PI * 2) / 3))));
+            HuSprScaleSet(lbl_1_bss_9C, i, sind((120.0f / 14.0f) * temp_r28) * (0.8 * (1.0 / sin((M_PI * 2) / 3))),
+                0.8 * (sind((120.0f / 14.0f) * temp_r28) * (1.0 / sin((M_PI * 2) / 3))));
         }
         temp_r28 += (lbl_1_bss_174) ? 2 : 1;
         HuPrcVSleep();
@@ -603,7 +603,7 @@ void fn_1_1F4C(void)
     }
     temp_r29 = (lbl_1_bss_174) ? 3 : 10;
     for (temp_r30 = 0; temp_r30 <= temp_r29; temp_r30++) {
-        temp_f31 = cos(M_PI * ((90.0 / temp_r29) * temp_r30) / 180.0);
+        temp_f31 = cosd((90.0 / temp_r29) * temp_r30);
         for (i = 0; i < 4; i++) {
             HuSprGrpScaleSet(lbl_1_bss_3A[i], temp_f31, temp_f31);
         }
@@ -686,12 +686,12 @@ void fn_1_2ADC(void)
                     temp_r27 = temp_r28 - (i * 20);
                     if (temp_r27 <= 20) {
                         if (temp_r27 <= 10) {
-                            HuSprScaleSet(lbl_1_bss_52, i, 1.0f, cos(M_PI * (9.0f * temp_r27) / 180.0));
+                            HuSprScaleSet(lbl_1_bss_52, i, 1.0f, cosd(9.0f * temp_r27));
                         }
                         else {
                             HuSprAttrSet(lbl_1_bss_52, i, 4);
                             HuSprAttrReset(lbl_1_data_380, i, 4);
-                            HuSprScaleSet(lbl_1_data_380, i, 1.0f, sin(M_PI * (9.0f * (temp_r27 - 10)) / 180.0));
+                            HuSprScaleSet(lbl_1_data_380, i, 1.0f, sind(9.0f * (temp_r27 - 10)));
                         }
                         temp_f31 = temp_r27 / 20.0f;
                         temp_r29 = GWStarsGet(sp28[i]) + (temp_f31 * (GWStarsGet(lbl_1_bss_4A[i]) - GWStarsGet(sp28[i])));
@@ -741,7 +741,7 @@ void fn_1_2ADC(void)
         }
         if (temp_r28 <= 10) {
             for (i = 0; i < 4; i++) {
-                HuSprScaleSet(lbl_1_bss_9C, i, cos(M_PI * (9.0f * temp_r28) / 180.0), cos(M_PI * (9.0f * temp_r28) / 180.0));
+                HuSprScaleSet(lbl_1_bss_9C, i, cosd(9.0f * temp_r28), cosd(9.0f * temp_r28));
             }
         }
         else {
@@ -1264,27 +1264,27 @@ void fn_1_5880(omObjData *object)
     CZoom += HuPadTrigL[0] / 2;
     CZoom -= HuPadTrigR[0] / 2;
 
-    pos.x = Center.x + (CZoom * (sin((M_PI * CRot.y) / 180.0) * cos((M_PI * CRot.x) / 180.0)));
-    pos.y = (Center.y + (CZoom * -sin((M_PI * CRot.x) / 180.0)));
-    pos.z = (Center.z + (CZoom * (cos((M_PI * CRot.y) / 180.0) * cos((M_PI * CRot.x) / 180.0))));
+    pos.x = Center.x + CZoom * (sind(CRot.y) * cosd(CRot.x));
+    pos.y = Center.y + CZoom * -sind(CRot.x);
+    pos.z = Center.z + CZoom * (cosd(CRot.y) * cosd(CRot.x));
     offset.x = Center.x - pos.x;
     offset.y = Center.y - pos.y;
     offset.z = Center.z - pos.z;
-    dir.x = (sin((M_PI * CRot.y) / 180.0) * sin((M_PI * CRot.x) / 180.0));
-    dir.y = cos((M_PI * CRot.x) / 180.0);
-    dir.z = (cos((M_PI * CRot.y) / 180.0) * sin((M_PI * CRot.x) / 180.0));
+    dir.x = (sind(CRot.y) * sind(CRot.x));
+    dir.y = cosd(CRot.x);
+    dir.z = (cosd(CRot.y) * sind(CRot.x));
     z_rot = CRot.z;
-    y_offset.x = dir.x * (offset.x * offset.x + (1.0f - offset.x * offset.x) * cos((M_PI * z_rot) / 180.0))
-        + dir.y * (offset.x * offset.y * (1.0f - cos((M_PI * z_rot) / 180.0)) - offset.z * sin((M_PI * z_rot) / 180.0))
-        + dir.z * (offset.x * offset.z * (1.0f - cos((M_PI * z_rot) / 180.0)) + offset.y * sin((M_PI * z_rot) / 180.0));
+    y_offset.x = dir.x * (offset.x * offset.x + (1.0f - offset.x * offset.x) * cosd(z_rot))
+        + dir.y * (offset.x * offset.y * (1.0f - cosd(z_rot)) - offset.z * sind(z_rot))
+        + dir.z * (offset.x * offset.z * (1.0f - cosd(z_rot)) + offset.y * sind(z_rot));
 
-    y_offset.y = dir.y * (offset.y * offset.y + (1.0f - offset.y * offset.y) * cos((M_PI * z_rot) / 180.0))
-        + dir.x * (offset.x * offset.y * (1.0f - cos((M_PI * z_rot) / 180.0)) + offset.z * sin((M_PI * z_rot) / 180.0))
-        + dir.z * (offset.y * offset.z * (1.0f - cos((M_PI * z_rot) / 180.0)) - offset.x * sin((M_PI * z_rot) / 180.0));
+    y_offset.y = dir.y * (offset.y * offset.y + (1.0f - offset.y * offset.y) * cosd(z_rot))
+        + dir.x * (offset.x * offset.y * (1.0f - cosd(z_rot)) + offset.z * sind(z_rot))
+        + dir.z * (offset.y * offset.z * (1.0f - cosd(z_rot)) - offset.x * sind(z_rot));
 
-    y_offset.z = dir.z * (offset.z * offset.z + (1.0f - offset.z * offset.z) * cos((M_PI * z_rot) / 180.0))
-        + (dir.x * (offset.x * offset.z * (1.0 - cos((M_PI * z_rot) / 180.0)) - offset.y * sin((M_PI * z_rot) / 180.0))
-            + dir.y * (offset.y * offset.z * (1.0 - cos((M_PI * z_rot) / 180.0)) + offset.x * sin((M_PI * z_rot) / 180.0)));
+    y_offset.z = dir.z * (offset.z * offset.z + (1.0f - offset.z * offset.z) * cosd(z_rot))
+        + (dir.x * (offset.x * offset.z * (1.0 - cosd(z_rot)) - offset.y * sind(z_rot))
+            + dir.y * (offset.y * offset.z * (1.0 - cosd(z_rot)) + offset.x * sind(z_rot)));
 
     VECCrossProduct(&dir, &offset, &offset);
     VECNormalize(&offset, &offset);
diff --git a/src/REL/w03Dll/condor.c b/src/REL/w03Dll/condor.c
index 15ea43a8..4c8327dd 100644
--- a/src/REL/w03Dll/condor.c
+++ b/src/REL/w03Dll/condor.c
@@ -12,6 +12,8 @@
 #include "game/pad.h"
 #include "game/wipe.h"
 
+#include "ext_math.h"
+
 // structs
 
 typedef struct w03UnkStruct5 {
@@ -172,8 +174,8 @@ void fn_1_3304(void)
     var_r31 = BoardSpaceLinkFlagSearch(0, var_r31, 0x02000000);
     BoardSpacePosGet(0, var_r31, &sp8);
     temp_f31 = 0.0f;
-    sp8.x = sp8.x + (-300.0 * sin((M_PI * temp_f31) / 180.0));
-    sp8.z = sp8.z + (-300.0 * cos((M_PI * temp_f31) / 180.0));
+    sp8.x += -300.0 * sind(temp_f31);
+    sp8.z += -300.0 * cosd(temp_f31);
     sp8.y = 45.0f + sp8.y;
     BoardModelPosSetV(lbl_1_data_310, &sp8);
     BoardModelMotionStart(lbl_1_data_310, 2, 0x40000001);
@@ -211,7 +213,7 @@ s32 fn_1_3478(s32 arg0)
     temp = BoardSpaceLinkFlagSearch(0, temp_r28, 0x02000000);
     BoardSpacePosGet(0, temp, &sp38);
     VECSubtract(&sp38, &sp2C, &sp20);
-    float_temp = atan2(sp20.x, sp20.z) / M_PI * 180.0f;
+    float_temp = atan2d(sp20.x, sp20.z);
     BoardPlayerMotBlendSet(arg0, (float_temp), 0xF);
 
     while (BoardPlayerMotBlendCheck(arg0) == 0) {
@@ -473,8 +475,8 @@ void fn_1_3F5C(s32 arg0)
     var_r31 = BoardSpaceLinkFlagSearch(0, var_r31, 0x02000000);
     BoardSpacePosGet(0, var_r31, &sp8);
     temp_f31 = 0.0f;
-    sp8.x = (sp8.x + (-300.0 * sin((M_PI * temp_f31) / 180.0f)));
-    sp8.z = (sp8.z + (-300.0 * cos((M_PI * temp_f31) / 180.0f)));
+    sp8.x += -300.0 * sind(temp_f31);
+    sp8.z += -300.0 * cosd(temp_f31);
     sp8.y = 45.0f + sp8.y;
     BoardModelPosSetV(lbl_1_data_310, &sp8);
     BoardModelMotionStart(lbl_1_data_310, 2, 0x40000001);
@@ -589,7 +591,7 @@ void fn_1_4424(w03StructUnk2 *arg0)
         VECSubtract(&sp60, &sp6C, &sp3C);
     }
 
-    sp10_2 = 180.0f * (atan2(-sp3C.x, -sp3C.z) / M_PI);
+    sp10_2 = atan2d(-sp3C.x, -sp3C.z);
     BoardModelMotionStart(lbl_1_data_314, 0, 0U);
     BoardModelMotionSpeedSet(lbl_1_data_314, 8.0f);
     HuPrcSleep(1);
@@ -604,7 +606,7 @@ void fn_1_4424(w03StructUnk2 *arg0)
     for (i = var_r25 = 0; i < 20;) {
         Hu3DMotionExec(temp_r23, temp_r28->unk_08, temp_r28->unk_64, 0);
         Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_data_314), temp_r22, &sp54);
-        temp_r28->unk_64 = (f32)(temp_r28->unk_64 + temp_r28->unk_68);
+        temp_r28->unk_64 += temp_r28->unk_68;
 
         if (temp_r28->unk_64 > 400.0f) {
             break;
@@ -770,9 +772,9 @@ void fn_1_4D60(w03StructUnk2 *arg0)
                     temp_r31->unk_00 = 1;
                     temp_f31 = 360.0f * BoardRandFloat();
                     temp_f30 = 5.0f * BoardRandFloat();
-                    temp_r31->unk_14.x = temp_f30 * sin((M_PI * temp_f31) / 180.0);
+                    temp_r31->unk_14.x = temp_f30 * sind(temp_f31);
                     temp_r31->unk_14.y = 50.0f + (20.0f * BoardRandFloat());
-                    temp_r31->unk_14.z = temp_f30 * cos((M_PI * temp_f31) / 180.0);
+                    temp_r31->unk_14.z = temp_f30 * cosd(temp_f31);
                     temp_r31->unk_08.x = sp8.x;
                     temp_r31->unk_08.y = sp8.y;
                     temp_r31->unk_08.z = sp8.z;
@@ -1084,11 +1086,11 @@ void fn_1_5C5C(omObjData *arg0, w03UnkStruct5 *arg1)
     PSMTXTrans(sp80, sp44.x, sp44.y, sp44.z);
     PSMTXConcat(sp80, sp50, sp80);
     Hu3DMtxTransGet(sp80, &sp44);
-    MTXRotDeg(spB0, 'y', (180.0 * (atan2(-sp2C.x, -sp2C.z) / M_PI)));
+    MTXRotDeg(spB0, 'y', atan2d(-sp2C.x, -sp2C.z));
     PSMTXConcat(spB0, spE0, sp110);
     BoardModelMtxSet(lbl_1_data_310, &sp110);
     BoardModelPosSetV(lbl_1_data_310, &sp44);
-    BoardCameraRotSet(-20.0f, (180.0 * (atan2(sp2C.x, sp2C.z) / M_PI)));
+    BoardCameraRotSet(-20.0f, atan2d(sp2C.x, sp2C.z));
 }
 
 void fn_1_602C(omObjData *arg0, w03UnkStruct5 *arg1)
diff --git a/src/REL/w03Dll/mg_coin.c b/src/REL/w03Dll/mg_coin.c
index 0d0e6f64..b577ffc1 100644
--- a/src/REL/w03Dll/mg_coin.c
+++ b/src/REL/w03Dll/mg_coin.c
@@ -10,6 +10,8 @@
 #include "game/object.h"
 #include "game/pad.h"
 
+#include "ext_math.h"
+
 // structs
 typedef struct someBits3 { // make sure this is defined correctly
     /* 0x00 */ struct {
@@ -175,7 +177,7 @@ s32 fn_1_7D18(s32 arg0)
     BoardSpacePosGet(0, temp_r28, &sp38);
     VECSubtract(&sp38, &sp2C, &sp20);
     VECNormalize(&sp20, &sp20);
-    BoardPlayerRotYSet(arg0, 180.0 * (atan2(-sp20.x, -sp20.z) / M_PI));
+    BoardPlayerRotYSet(arg0, atan2d(-sp20.x, -sp20.z));
     HuPrcSleep(0x1E);
     model = BoardModelIDGet(lbl_1_bss_C[7]);
     Hu3DModelObjPosGet(model, "phei", &sp38);
@@ -187,8 +189,8 @@ s32 fn_1_7D18(s32 arg0)
         var_f31 = 39.0f;
     }
 
-    sp38.x = sp38.x + (var_f31 * sin((M_PI * (180.0f + BoardModelRotYGet(lbl_1_data_456))) / 180.0));
-    sp38.z = sp38.z + (var_f31 * cos((M_PI * (180.0f + BoardModelRotYGet(lbl_1_data_456))) / 180.0));
+    sp38.x += var_f31 * sind(180.0f + BoardModelRotYGet(lbl_1_data_456));
+    sp38.z += var_f31 * cosd(180.0f + BoardModelRotYGet(lbl_1_data_456));
 
     BoardPlayerPosGet(arg0, &sp2C);
     BoardPlayerPosLerpStart(arg0, &sp2C, &sp38, 0x14);
@@ -197,7 +199,7 @@ s32 fn_1_7D18(s32 arg0)
         BoardModelPosGet(lbl_1_bss_C[10], &sp2C);
         BoardPlayerPosGet(arg0, &sp38);
         VECSubtract(&sp38, &sp2C, &sp20);
-        arctan = atan2(sp20.x, sp20.z) / M_PI * 180.0;
+        arctan = atan2d(sp20.x, sp20.z);
         BoardModelRotYSet(lbl_1_bss_C[10], arctan);
         HuPrcVSleep();
     }
@@ -589,7 +591,7 @@ void fn_1_9044(omObjData *arg0, someBits3 *arg1)
         }
     }
 
-    sp8.z = arg0->trans.x * sin((M_PI * arg0->trans.y) / 180.0);
+    sp8.z = arg0->trans.x * sind(arg0->trans.y);
     BoardModelRotSetV(lbl_1_data_456, &sp8);
 }
 
@@ -626,7 +628,7 @@ void fn_1_9230(s32 arg0)
         BoardModelPosGet(lbl_1_bss_C[10], &sp20);
         BoardPlayerPosGet(arg0, &sp14);
         VECSubtract(&sp14, &sp20, &sp8);
-        rotY = atan2(sp8.x, sp8.z) / M_PI * 180.0;
+        rotY = atan2d(sp8.x, sp8.z);
         BoardModelRotYSet(lbl_1_bss_C[10], rotY);
         HuPrcVSleep();
     }
@@ -773,8 +775,8 @@ void fn_1_97F8(s32 arg0)
         }
         temp_r31 = &temp_r30->unk_0C[i];
         temp_r31->unk0 = 1;
-        temp_r31->unk8.x = sp8.x + (50.0f * sin((M_PI * var_f31) / 180.0));
-        temp_r31->unk8.z = sp8.z + (50.0f * cos((M_PI * var_f31) / 180.0));
+        temp_r31->unk8.x = sp8.x + (50.0f * sind(var_f31));
+        temp_r31->unk8.z = sp8.z + (50.0f * cosd(var_f31));
         temp_r31->unk8.y = 600.0f + sp8.y + (500.0f * BoardRandFloat());
         temp_r31->unk1 = 0;
         temp_r31->unk4 = BoardRandFloat() * 360.0f;
diff --git a/src/REL/w03Dll/mg_item.c b/src/REL/w03Dll/mg_item.c
index 24d08ad3..18332aa2 100644
--- a/src/REL/w03Dll/mg_item.c
+++ b/src/REL/w03Dll/mg_item.c
@@ -255,7 +255,7 @@ s32 fn_1_9CF4(s32 arg0)
     BoardSpacePosGet(0, temp_r29, &sp38);
     VECSubtract(&sp38, &sp2C, &sp20);
     VECNormalize(&sp20, &sp20);
-    BoardPlayerRotYSet(arg0, (f32)(180.0 * (atan2(-sp20.x, -sp20.z) / M_PI)));
+    BoardPlayerRotYSet(arg0, atan2d(-sp20.x, -sp20.z));
     BoardPlayerPosLerpStart(arg0, &sp2C, &sp38, 0x14);
 
     while (GWPlayer[arg0].moving != 0) {
@@ -288,11 +288,11 @@ void fn_1_9FE4(void)
     f32 var_f31;
 
     BoardModelPosGet(lbl_1_bss_C[11], &sp24);
-    sp18.x = (-3179.800048828125 + (200.0 * sin(0.0)));
-    sp18.z = (-907.7000122070313 + 200.0 * cos(0.0));
+    sp18.x = -3179.8f + 200.0 * sin(0.0);
+    sp18.z = -907.7f + 200.0 * cos(0.0);
     sp18.y = sp24.y;
     VECSubtract(&sp18, &sp24, &spC);
-    temp_f30 = (atan2(spC.z, spC.x) / M_PI * 180.0);
+    temp_f30 = atan2d(spC.z, spC.x);
     sp8 = BoardModelRotYGet(lbl_1_bss_C[11]);
     BoardModelMotionShiftSet(lbl_1_bss_C[11], lbl_1_data_4DA, 0.0f, 10.0, HU3D_MOTATTR_LOOP);
 
@@ -861,7 +861,7 @@ void fn_1_B748(omObjData *arg0, someBits2 *arg1)
         BoardModelPosSetV(temp_r29, &sp8);
         BoardModelRotYSet(temp_r29, 8.0f + BoardModelRotYGet(temp_r29));
         BoardModelScaleGet(temp_r29, &sp14);
-        sp14.x = sp14.y = sp14.z = cos(M_PI * temp_f0 / 180.0);
+        sp14.x = sp14.y = sp14.z = cosd(temp_f0);
         BoardModelScaleSetV(temp_r29, &sp14);
         arg1->unk1 += 4;
         return;
diff --git a/src/REL/w03Dll/river.c b/src/REL/w03Dll/river.c
index 98423294..7736b6f2 100644
--- a/src/REL/w03Dll/river.c
+++ b/src/REL/w03Dll/river.c
@@ -6,6 +6,8 @@
 #include "game/board/player.h"
 #include "game/hsfdraw.h"
 
+#include "ext_math.h"
+
 //BSS
 char lbl_1_bss_130[8];
 omObjData* lbl_1_bss_12C;
@@ -167,7 +169,7 @@ s32 fn_1_6898(s32 arg0) {
     Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_data_388), "hei01", &sp20);
     BoardPlayerPosGet(arg0, &sp14);
     VECSubtract(&sp20, &sp14, &sp8);
-    temp_f31 = 180.0 * (atan2(sp8.x, sp8.z) / M_PI);
+    temp_f31 = atan2d(sp8.x, sp8.z);
     BoardCameraTargetModelSet(lbl_1_data_388);
     BoardPlayerMotBlendSet(arg0, temp_f31, 15);
 
@@ -456,10 +458,10 @@ void fn_1_767C(omObjData* arg0) {
     if ((lbl_1_data_388 != -1) && (lbl_1_bss_124 == 0)) {
         temp_r31->unk_04 += 3.0f;
         if (temp_r31->unk_04 >= 360.0f) {
-            temp_r31->unk_04 = (f32) (temp_r31->unk_04 - 360.0f);
+            temp_r31->unk_04 -= 360.0f;
         }
         BoardModelPosGet(lbl_1_data_388, &sp8);
-        sp8.y = (f32) ((f64) sp8.y + (0.25 * (2.0 * sin((M_PI * (f64) temp_r31->unk_04) / 180.0))));
+        sp8.y += 0.25 * (2.0 * sind(temp_r31->unk_04));
         BoardModelPosSetV(lbl_1_data_388, &sp8);
     }
 }
diff --git a/src/REL/w03Dll/statue.c b/src/REL/w03Dll/statue.c
index 914ee853..de10197b 100644
--- a/src/REL/w03Dll/statue.c
+++ b/src/REL/w03Dll/statue.c
@@ -13,6 +13,8 @@
 #include "game/board/main.h"
 #include "game/objsub.h"
 
+#include "ext_math.h"
+
 void fn_1_1358(void);
 void fn_1_152C(void);
 s32 fn_1_15E8(void);
@@ -26,7 +28,6 @@ void fn_1_2AC0(void);
 void fn_1_2818(void);
 void fn_1_2A40(void);
 void fn_1_2B44(void);
-double atan2(double y, double x);
 
 //data
 s16 lbl_1_data_280 = -1;
@@ -155,7 +156,7 @@ s32 fn_1_1650(s32 arg0) {
     BoardSpacePosGet(0, temp2, &sp38);
     BoardPlayerPosGet(arg0, &sp2C);
     VECSubtract(&sp38, &sp2C, &sp20);
-    temp = (atan2(-sp20.x, -sp20.z) / M_PI) * 180.0f;
+    temp = atan2d(-sp20.x, -sp20.z);
     BoardPlayerRotYSet(arg0, temp);
     sp14.x = 0.0f;
     sp14.y = 100.0f;
@@ -539,7 +540,7 @@ void fn_1_26E0(s32 arg0) {
     BoardPlayerPosGet(arg0, &sp14);
     VECSubtract(&sp20, &sp14, &sp8);
     VECNormalize(&sp8, &sp8);
-    temp = (180.0f * (atan2(-sp8.x, -sp8.z) / M_PI));
+    temp = atan2d(-sp8.x, -sp8.z);
     BoardPlayerRotYSet(arg0, temp);
     BoardCameraViewSet(1);
     BoardCameraTargetPlayerSet(arg0);
diff --git a/src/REL/w05Dll/dolphin.c b/src/REL/w05Dll/dolphin.c
index 6870e9c0..46cc5a9e 100644
--- a/src/REL/w05Dll/dolphin.c
+++ b/src/REL/w05Dll/dolphin.c
@@ -11,6 +11,8 @@
 #include "game/board/player.h"
 #include "game/board/window.h"
 
+#include "ext_math.h"
+
 // bss
 s16 lbl_1_bss_72[2];
 s16 lbl_1_bss_6C[3];
@@ -179,7 +181,7 @@ void fn_1_4034(s32 arg0)
         var_r27 = arg0 + 1;
     }
     Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_data_118), lbl_1_data_22C[var_r27], &sp34);
-    temp_f25 = (180.0 * (atan2((sp34.x - sp40.x), (sp34.z - sp40.z)) / M_PI));
+    temp_f25 = atan2d(sp34.x - sp40.x, sp34.z - sp40.z);
     BoardModelMotionShiftSet(lbl_1_bss_64, 2, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
 
     while (fn_1_1208(lbl_1_bss_64, temp_f25, 10.0f) == 0) {
@@ -236,7 +238,7 @@ loop_37:
     }
     BoardModelPosGet(lbl_1_bss_64, &sp40);
     BoardPlayerPosGet(lbl_1_bss_68, &sp28);
-    var_f27 = 180.0 * (atan2((sp40.x - sp28.x), (sp40.z - sp28.z)) / M_PI);
+    var_f27 = atan2d(sp40.x - sp28.x, sp40.z - sp28.z);
     BoardPlayerMotBlendSet(lbl_1_bss_68, var_f27, 0xF);
 
     while (BoardPlayerMotBlendCheck(lbl_1_bss_68) == 0) {
@@ -352,7 +354,7 @@ void fn_1_4EB4(s32 arg1, s32 arg2, Vec *arg3)
     BoardPlayerIdleSet(lbl_1_bss_68);
     HuPrcSleep(8);
     BoardSpacePosGet(0, arg2, &sp3C);
-    var_f28 = 180.0 * (atan2((sp3C.x - sp30.x), (sp3C.z - sp30.z)) / M_PI);
+    var_f28 = atan2d(sp3C.x - sp30.x, sp3C.z - sp30.z);
     BoardPlayerMotBlendSet(lbl_1_bss_68, var_f28, 0xF);
 
     while (BoardPlayerMotBlendCheck(lbl_1_bss_68) == 0) {
@@ -486,7 +488,7 @@ void fn_1_5794(s32 arg0, s32 arg1, Vec *arg2)
             VECAdd(&sp58, &sp40, &sp58);
             sp64 = sp58;
             if (var_r29 == 0) {
-                sp58.y += 250.0 * sin((M_PI * var_f28) / 180.0);
+                sp58.y += 250.0 * sind(var_f28);
                 var_f28 -= 2.5f;
                 if (var_f28 < -540.0f) {
                     var_f28 = -540.0f;
@@ -521,7 +523,7 @@ void fn_1_5794(s32 arg0, s32 arg1, Vec *arg2)
                 var_r29--;
             }
             BoardModelPosSetV(lbl_1_bss_64, &sp58);
-            sp28.x = sp34.x = (45.0 * -sin((M_PI * var_f28) / 180.0));
+            sp28.x = sp34.x = 45.0 * -sind(var_f28);
             BoardModelRotSetV(lbl_1_bss_64, &sp34);
             BoardPlayerRotSetV(lbl_1_bss_68, &sp28);
             sp4C = sp58;
@@ -540,7 +542,7 @@ void fn_1_5794(s32 arg0, s32 arg1, Vec *arg2)
     BoardPlayerIdleSet(lbl_1_bss_68);
     HuPrcSleep(8);
     BoardSpacePosGet(0, arg1, &sp58);
-    var_f27 = (180.0 * (atan2((sp58.x - sp4C.x), (sp58.z - sp4C.z)) / M_PI));
+    var_f27 = atan2d(sp58.x - sp4C.x, sp58.z - sp4C.z);
     BoardPlayerMotBlendSet(lbl_1_bss_68, var_f27, 0xF);
 
     while (BoardPlayerMotBlendCheck(lbl_1_bss_68) == 0) {
@@ -599,8 +601,8 @@ void fn_1_62AC(s32 arg0, Vec *arg1)
         sp1C = sp28;
         sp10 = sp28;
         VECScale(&sp1C, &sp1C, sp8[arg0]);
-        sp1C.y += (250.0 * sin((M_PI * var_f31) / 180.0));
-        var_f30 = (250.0 * -cos((M_PI * var_f31) / 180.0));
+        sp1C.y += 250.0 * sind(var_f31);
+        var_f30 = 250.0 * -cosd(var_f31);
         VECScale(&sp10, &sp10, var_f30);
         VECAdd(&sp10, &sp1C, &sp1C);
         VECAdd(&sp1C, &sp34, &sp1C);
diff --git a/src/REL/w05Dll/hotel.c b/src/REL/w05Dll/hotel.c
index d05260b2..bebb63c7 100644
--- a/src/REL/w05Dll/hotel.c
+++ b/src/REL/w05Dll/hotel.c
@@ -10,6 +10,8 @@
 #include "game/board/player.h"
 #include "game/board/window.h"
 
+#include "ext_math.h"
+
 // data
 s32 lbl_1_data_150[5] = {
     DATA_MAKE_NUM(DATADIR_W05, 0x21), DATA_MAKE_NUM(DATADIR_W05, 0x22), DATA_MAKE_NUM(DATADIR_W05, 0x23),
@@ -75,7 +77,7 @@ void fn_1_155C(void) {
     temp_f30 = BoardPlayerRotYGet(lbl_1_bss_28);
     BoardPlayerPosGet(lbl_1_bss_28, &sp58);
     Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_data_118), "hotel1", &sp64);
-    temp_f31 = 180.0 * (atan2((sp64.x - sp58.x), (sp64.z - sp58.z)) / M_PI);
+    temp_f31 = atan2d(sp64.x - sp58.x, sp64.z - sp58.z);
     BoardPlayerMotBlendSet(lbl_1_bss_28, temp_f31, 0xF);
     BoardCameraViewSet(2);
 
@@ -103,7 +105,7 @@ void fn_1_155C(void) {
         HuPrcVSleep();
     }
     BoardModelPosSetV(lbl_1_bss_14[4], &sp28);
-    temp_f31 = (180.0 * (atan2((sp58.x - sp28.x), (sp58.z - sp28.z)) / M_PI));
+    temp_f31 = atan2d(sp58.x - sp28.x, sp58.z - sp28.z);
 
     while (fn_1_1208(lbl_1_bss_14[4], temp_f31, 10.0f) == 0) {
         HuPrcVSleep();
@@ -266,13 +268,13 @@ void fn_1_1E44(void) {
         HuPrcVSleep();
     }
     BoardModelPosSetV(lbl_1_bss_14[4], &sp2C);
-    temp_f31 = (180.0 * (atan2((sp50.x - sp2C.x), (sp50.z - sp2C.z)) / M_PI));
+    temp_f31 = atan2d(sp50.x - sp2C.x, sp50.z - sp2C.z);
 
     while (fn_1_1208(lbl_1_bss_14[4], temp_f31, 10.0f) == 0) {
         HuPrcVSleep();
     }
     BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
-    temp_f31 = 180.0 * (atan2((sp2C.x - sp50.x), (sp2C.z - sp50.z)) / M_PI);
+    temp_f31 = atan2d(sp2C.x - sp50.x, sp2C.z - sp50.z);
     BoardPlayerMotBlendSet(lbl_1_bss_28, temp_f31, 0xF);
 
     while (BoardPlayerMotBlendCheck(lbl_1_bss_28) == 0) {
diff --git a/src/REL/w05Dll/mg_coin.c b/src/REL/w05Dll/mg_coin.c
index 36c2269a..c2f8d938 100644
--- a/src/REL/w05Dll/mg_coin.c
+++ b/src/REL/w05Dll/mg_coin.c
@@ -14,6 +14,9 @@
 #include "game/board/window.h"
 
 
+#include "ext_math.h"
+
+
 s16 lbl_1_bss_102[3];
 s16 lbl_1_bss_100;
 s16 lbl_1_bss_FE;
@@ -226,7 +229,7 @@ void fn_1_9F24(omObjData *arg0)
         temp_r31->unk_08++;
     }
     sp18 = temp_r31->unk_0C[temp_r31->unk_08];
-    var_f31 = (180.0 * (atan2((sp18.x - sp24.x), (sp18.z - sp24.z)) / M_PI));
+    var_f31 = atan2d(sp18.x - sp24.x, sp18.z - sp24.z);
     BoardPlayerRotYSet(lbl_1_bss_C0, var_f31);
     spC = temp_r31->unk_0C[temp_r31->unk_08];
     spC.y += 50.0f;
@@ -387,7 +390,7 @@ void fn_1_AB24(void)
     spC = temp_r30->data;
     BoardPlayerPosGet(lbl_1_bss_C0, &sp28);
     BoardModelPosGet(lbl_1_bss_14[5], &sp1C);
-    var_f30 = (180.0 * (atan2((sp1C.z - sp28.z), (sp1C.x - sp28.x)) / M_PI));
+    var_f30 = atan2d(sp1C.z - sp28.z, sp1C.x - sp28.x);
     BoardPlayerMotBlendSet(lbl_1_bss_C0, var_f30, 0xF);
 
     while (BoardPlayerMotBlendCheck(lbl_1_bss_C0) == 0) {
diff --git a/src/REL/w05Dll/mg_item.c b/src/REL/w05Dll/mg_item.c
index 0a596430..0e942bef 100644
--- a/src/REL/w05Dll/mg_item.c
+++ b/src/REL/w05Dll/mg_item.c
@@ -12,6 +12,8 @@
 #include "game/board/model.h"
 #include "game/board/window.h"
 
+#include "ext_math.h"
+
 // data
 s32 lbl_1_data_310[2] = { 0x79, 0x7A };
 char *lbl_1_data_330[3] = { "suika1", "suika2", "suika3" };
@@ -459,7 +461,7 @@ void fn_1_80D8(omObjData *arg0)
     }
     if ((spC != 0) || (sp10 != 0)) {
         var_r29 = -1;
-        var_f31 = (180.0 * (atan2(spC, sp10) / M_PI));
+        var_f31 = atan2d(spC, sp10);
         if (var_f31 < 0.0f) {
             var_f31 += 360.0f;
         }
@@ -695,7 +697,7 @@ void fn_1_896C(void)
                 var_r29 = (1 << var_r31);
                 if ((temp_r30 & var_r29) != 0) {
                     BoardModelPosGet(lbl_1_bss_A4[var_r31], &sp18);
-                    sp18.y = (sp18.y + (0.25 * sin((M_PI * var_f30) / 180.0)));
+                    sp18.y += 0.25 * sind(var_f30);
                     BoardModelPosSetV(lbl_1_bss_A4[var_r31], &sp18);
                 }
             }
@@ -810,8 +812,8 @@ void fn_1_9268(ModelData *model, ParticleData *particle, f32 (*matrix)[4])
         if (var_r28 != particle->unk_30) {
             temp_f30 = 360.0f * (0.003921569f * (s32)(frand() & 0xFF));
             temp_f29 = temp_f31 * (20.0f + (60.0f * (0.003921569f * (s32)(frand() & 0xFF))));
-            var_r31->unk34.x = sp8.x + (temp_f29 * sin((M_PI * temp_f30) / 180.0));
-            var_r31->unk34.z = sp8.z + (temp_f29 * cos((M_PI * temp_f30) / 180.0));
+            var_r31->unk34.x = sp8.x + temp_f29 * sind(temp_f30);
+            var_r31->unk34.z = sp8.z + temp_f29 * cosd(temp_f30);
             var_r31->unk34.y = sp8.y + (temp_f31 * (-30.0f + (40.0f * (0.003921569f * (s32)(frand() & 0xFF)))));
             var_r31->unk08.x = 0.5f + (3.0f * (0.003921569f * (s32)(frand() & 0xFF)));
             var_r31->unk08.y = 0.3f + (2.0f * (0.003921569f * (s32)(frand() & 0xFF)));
diff --git a/src/game/board/basic_space.c b/src/game/board/basic_space.c
index 70df8cf9..d7624381 100644
--- a/src/game/board/basic_space.c
+++ b/src/game/board/basic_space.c
@@ -302,7 +302,7 @@ static void CoinChgAppear(omObjData *object, coinChg *coin_chg) {
     f32 angle;
 
     OSu16tof32(&coin_chg->angle, &angle);
-    angle = sin(M_PI * angle / 180.0);
+    angle = sind(angle);
     scale = angle;
     object->rot.x = 405.0f * angle;
     BoardModelScaleSet(coin_chg->coin_model, scale, scale, scale);
@@ -342,8 +342,8 @@ static void CoinChgSeparate(omObjData *object, coinChg *coin_chg) {
     } else {
         spacing = 105.0f;
     }
-    y_offset = (200.0 * sin((M_PI * (2.0f * x_scale)) / 180.0));
-    x_scale = sin((M_PI * x_scale) / 180.0);
+    y_offset = 200.0 * sind(2.0f * x_scale);
+    x_scale = sind(x_scale);
     object->rot.x = 45.0f + (315.0f * x_scale);
     if (coin_chg->tens != 0) {
         coin_x = object->trans.x + (x_scale * -spacing);
@@ -379,7 +379,7 @@ static void CoinChgShow(omObjData* object, coinChg* coin_chg) {
     f32 y_pos;
 
     OSu16tof32(&coin_chg->angle, &angle);
-    angle = (f32) sin((M_PI * angle) / 180.0);
+    angle = sind(angle);
     if (coin_chg->minus != 0) {
         y_pos = (-50.0f * angle) + object->trans.y;
     } else {
diff --git a/src/game/board/block.c b/src/game/board/block.c
index 8a70b5c9..b830314f 100644
--- a/src/game/board/block.c
+++ b/src/game/board/block.c
@@ -6,7 +6,7 @@
 #include "game/flag.h"
 #include "game/objsub.h"
 #include "game/process.h"
-#include "math.h"
+#include "ext_math.h"
 
 #define BLOCK_SPAWN 0
 #define BLOCK_HIT 2
@@ -312,7 +312,7 @@ static void SpawnBlock(BlockWork *arg0, omObjData *arg1)
     }
 
     arg1->rot.y = rotY;
-    arg1->scale.x = arg1->scale.y = arg1->scale.z = sin(M_PI * scaleAngle / 180.0);
+    arg1->scale.x = arg1->scale.y = arg1->scale.z = sind(scaleAngle);
 }
 
 static void HitBlock(BlockWork *arg0, omObjData *arg1)
@@ -325,7 +325,7 @@ static void HitBlock(BlockWork *arg0, omObjData *arg1)
     }
 
     OSs16tof32(&arg0->hit_y_velocity, &var_f30);
-    arg1->trans.y += 0.2f * sin((M_PI * var_f30) / 180.0);
+    arg1->trans.y += 0.2f * sind(var_f30);
 }
 
 static void OpenBlock(BlockWork *arg0, omObjData *arg1)
diff --git a/src/game/board/bowser.c b/src/game/board/bowser.c
index fe5af9e3..bcbe7133 100644
--- a/src/game/board/bowser.c
+++ b/src/game/board/bowser.c
@@ -12,30 +12,29 @@
 #include "game/wipe.h"
 #include "game/gamework.h"
 
+#include "ext_math.h"
 #include "string.h"
 
-#define ABS(x) ((x) < 0 ? -(x) : (x))
-
 typedef struct bowser_event_data {
-	s16 sprite[3];
-	s16 delay[3];
-	s16 angle[3];
-	s16 group;
-	s16 model;
+    s16 sprite[3];
+    s16 delay[3];
+    s16 angle[3];
+    s16 group;
+    s16 model;
 } BowserEventData;
 
 static BowserEventData bowserEvent;
 static Vec playerPosTemp[4];
 
 static s32 scareFxTbl[] = {
-	0x128,
-	0x168,
-	0x1A8,
-	0x1E8,
-	0x228,
-	0x268,
-	0x2A8,
-	0x2E8
+    0x128,
+    0x168,
+    0x1A8,
+    0x1E8,
+    0x228,
+    0x268,
+    0x2A8,
+    0x2E8
 };
 
 
@@ -102,701 +101,701 @@ static s32 ExecMiniBowserEvent(void);
 
 s32 BoardBowserExec(s32 player, s32 space)
 {
-	if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
-		HuAudFXPlay(841);
-		BoardCameraViewSet(2);
-		BoardPlayerMotBlendSet(player, 0, 15);
-		while(!BoardPlayerMotBlendCheck(player)) {
-			HuPrcVSleep();
-		}
-		BoardCameraMotionWait();
-		BoardTutorialHookExec(12, 0);
-		GWPlayer[player].color = 2;
-	} else {
-		eventPlayer = player;
-		eventSpace = space;
-		playerMot[0] = playerMot[1] = playerMot[2] = playerMot[3] = -1;
-		bowserProc = HuPrcChildCreate(ExecBowser, 8196, 14336, 0, boardMainProc);
-		HuPrcDestructorSet2(bowserProc, DestroyBowser);
-		while(bowserProc) {
-			HuPrcVSleep();
-		}
-		GWPlayer[player].color = 2;
-	}
+    if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
+        HuAudFXPlay(841);
+        BoardCameraViewSet(2);
+        BoardPlayerMotBlendSet(player, 0, 15);
+        while(!BoardPlayerMotBlendCheck(player)) {
+            HuPrcVSleep();
+        }
+        BoardCameraMotionWait();
+        BoardTutorialHookExec(12, 0);
+        GWPlayer[player].color = 2;
+    } else {
+        eventPlayer = player;
+        eventSpace = space;
+        playerMot[0] = playerMot[1] = playerMot[2] = playerMot[3] = -1;
+        bowserProc = HuPrcChildCreate(ExecBowser, 8196, 14336, 0, boardMainProc);
+        HuPrcDestructorSet2(bowserProc, DestroyBowser);
+        while(bowserProc) {
+            HuPrcVSleep();
+        }
+        GWPlayer[player].color = 2;
+    }
 }
 
 typedef struct bowser_work {
-	u8 kill : 1;
-	u8 state : 3;
-	u8 mot_active : 1;
-	u8 fall_done : 1;
-	u8 jump_done : 1;
-	u8 jump_state;
-	u8 idle_timer;
+    u8 kill : 1;
+    u8 state : 3;
+    u8 mot_active : 1;
+    u8 fall_done : 1;
+    u8 jump_done : 1;
+    u8 jump_state;
+    u8 idle_timer;
 } BowserWork;
 
 typedef struct mini_bowser_work {
-	u8 kill : 1;
-	s16 group;
-	s16 sprite;
-	s16 angle;
+    u8 kill : 1;
+    s16 group;
+    s16 sprite;
+    s16 angle;
 } MiniBowserWork;
 
 typedef struct bowser_event_work {
-	u8 kill : 1;
-	s8 state;
-	s16 timer;
+    u8 kill : 1;
+    s8 state;
+    s16 timer;
 } BowserEventWork;
 
 static void ExecBowser(void)
 {
-	#define BOWSER_EVENT 0
-	#define MINI_BOWSER_EVENT 1
+    #define BOWSER_EVENT 0
+    #define MINI_BOWSER_EVENT 1
 
-	s32 i;
-	s32 status;
-	if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
-		HuAudFXPlay(841);
-		omVibrate(eventPlayer, 12, 4, 2);
-		if(GWBoardGet() == BOARD_ID_MAIN6 && boardBowserHook) {
-			boardBowserHook(1);
-		}
-		BoardAudSeqPause(0, 1, 1000);
-		//20% of bowser, 80% chance of koopa kid
-		if(BoardRandMod(100) < 20) {
-			eventType = BOWSER_EVENT;
-		} else {
-			eventType = MINI_BOWSER_EVENT;
-		}
-	} else {
-		BoardMusStart(1, 6, 127, 0);
-	}
-	status = BoardDataDirReadAsync(DATADIR_BKOOPA);
-	BoardDataAsyncWait(status);
-	CreatePlayerMot();
-	if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
-		ExecBowserMain();
-	} else {
-		ExecMGReturn();
-	}
-	for(i=0; i<4; i++) {
-		if(eventSpace == GWPlayer[i].space_curr) {
-			BoardPlayerMotionSpeedSet(i, 1.0f);
-		}
-	}
-	BoardAudSeqPause(0, 0, 1000);
-	if(bowserObj) {
-		OM_GET_WORK_PTR(bowserObj, BowserWork)->kill = 1;
-	}
-	if(miniBowserObj) {
-		OM_GET_WORK_PTR(miniBowserObj, MiniBowserWork)->kill = 1;
-	}
-	if(bowserEventObj) {
-		OM_GET_WORK_PTR(bowserEventObj, BowserEventWork)->kill = 1;
-	}
-	GWPlayer[eventPlayer].show_next = 1;
-	BoardCameraMotionStartEx(-1, NULL, NULL, 2100.0f, -1.0f, 21);
-	HuPrcSleep(30);
-	for(i=0; i<4; i++) {
-		BoardPlayerIdleSet(i);
-	}
-	BoardCameraMotionWait();
-	if(GWBoardGet() == BOARD_ID_MAIN6 && boardBowserHook) {
-		boardBowserHook(0);
-	} else {
-		HuPrcSleep(30);
-	}
-	HuPrcEnd();
+    s32 i;
+    s32 status;
+    if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
+        HuAudFXPlay(841);
+        omVibrate(eventPlayer, 12, 4, 2);
+        if(GWBoardGet() == BOARD_ID_MAIN6 && boardBowserHook) {
+            boardBowserHook(1);
+        }
+        BoardAudSeqPause(0, 1, 1000);
+        //20% of bowser, 80% chance of koopa kid
+        if(BoardRandMod(100) < 20) {
+            eventType = BOWSER_EVENT;
+        } else {
+            eventType = MINI_BOWSER_EVENT;
+        }
+    } else {
+        BoardMusStart(1, 6, 127, 0);
+    }
+    status = BoardDataDirReadAsync(DATADIR_BKOOPA);
+    BoardDataAsyncWait(status);
+    CreatePlayerMot();
+    if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
+        ExecBowserMain();
+    } else {
+        ExecMGReturn();
+    }
+    for(i=0; i<4; i++) {
+        if(eventSpace == GWPlayer[i].space_curr) {
+            BoardPlayerMotionSpeedSet(i, 1.0f);
+        }
+    }
+    BoardAudSeqPause(0, 0, 1000);
+    if(bowserObj) {
+        OM_GET_WORK_PTR(bowserObj, BowserWork)->kill = 1;
+    }
+    if(miniBowserObj) {
+        OM_GET_WORK_PTR(miniBowserObj, MiniBowserWork)->kill = 1;
+    }
+    if(bowserEventObj) {
+        OM_GET_WORK_PTR(bowserEventObj, BowserEventWork)->kill = 1;
+    }
+    GWPlayer[eventPlayer].show_next = 1;
+    BoardCameraMotionStartEx(-1, NULL, NULL, 2100.0f, -1.0f, 21);
+    HuPrcSleep(30);
+    for(i=0; i<4; i++) {
+        BoardPlayerIdleSet(i);
+    }
+    BoardCameraMotionWait();
+    if(GWBoardGet() == BOARD_ID_MAIN6 && boardBowserHook) {
+        boardBowserHook(0);
+    } else {
+        HuPrcSleep(30);
+    }
+    HuPrcEnd();
 }
 
 static void ExecBowserMain(void)
 {
-	s32 result = 0;
-	BoardPlayerMotBlendSet(eventPlayer, 0, 15);
-	while(!BoardPlayerMotBlendCheck(eventPlayer)) {
-		HuPrcVSleep();
-	}
-	BoardMusStart(1, 5, 127, 0);
-	BoardCameraViewSet(3);
-	BoardFilterFadeInit(30, 160);
-	BoardCameraMotionWait();
-	BoardPlayerMotionShiftSet(eventPlayer, jumpMot, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
-	BoardPlayerMotionSpeedSet(eventPlayer, 2.0f);
-	HuPrcSleep(120);
-	ConfigBowserEvent();
-	HuAudFXPlay(scareFxTbl[GWPlayer[eventPlayer].character]);
-	BoardPlayerMotionShiftSet(eventPlayer, scareMot, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
-	CreateMiniBowser();
-	while(!CheckMiniBowser()) {
-		HuPrcVSleep();
-	}
-	BoardPlayerIdleSet(eventPlayer);
-	if(eventType) {
-		result = ExecMiniBowserEvent();
-		if(!result) {
-			return;
-		}
-		BoardAudSeqFadeOut(1, 1000);
-		BoardFilterFadeInit(30, 160);
-		HuPrcSleep(30);
-	}
-	ExecBowserSpecial();
-	BoardModelMotionShiftSet(bowserMdl, 3, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
-	HuPrcSleep(8);
-	HuAudFXPlay(58);
-	BoardWinCreate(2, MAKE_MESSID(3, 11), 5);
-	BoardWinWait();
-	BoardWinKill();
-	BoardAudSeqFadeOut(1, 1000);
-	while(!BoardModelMotionEndCheck(bowserMdl)) {
-		HuPrcVSleep();
-	}
-	SetBowserState(6);
-	while(!CheckBowserIdle()) {
-		HuPrcVSleep();
-	}
-	BoardFilterFadeOut(30);
+    s32 result = 0;
+    BoardPlayerMotBlendSet(eventPlayer, 0, 15);
+    while(!BoardPlayerMotBlendCheck(eventPlayer)) {
+        HuPrcVSleep();
+    }
+    BoardMusStart(1, 5, 127, 0);
+    BoardCameraViewSet(3);
+    BoardFilterFadeInit(30, 160);
+    BoardCameraMotionWait();
+    BoardPlayerMotionShiftSet(eventPlayer, jumpMot, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
+    BoardPlayerMotionSpeedSet(eventPlayer, 2.0f);
+    HuPrcSleep(120);
+    ConfigBowserEvent();
+    HuAudFXPlay(scareFxTbl[GWPlayer[eventPlayer].character]);
+    BoardPlayerMotionShiftSet(eventPlayer, scareMot, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
+    CreateMiniBowser();
+    while(!CheckMiniBowser()) {
+        HuPrcVSleep();
+    }
+    BoardPlayerIdleSet(eventPlayer);
+    if(eventType) {
+        result = ExecMiniBowserEvent();
+        if(!result) {
+            return;
+        }
+        BoardAudSeqFadeOut(1, 1000);
+        BoardFilterFadeInit(30, 160);
+        HuPrcSleep(30);
+    }
+    ExecBowserSpecial();
+    BoardModelMotionShiftSet(bowserMdl, 3, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
+    HuPrcSleep(8);
+    HuAudFXPlay(58);
+    BoardWinCreate(2, MAKE_MESSID(3, 11), 5);
+    BoardWinWait();
+    BoardWinKill();
+    BoardAudSeqFadeOut(1, 1000);
+    while(!BoardModelMotionEndCheck(bowserMdl)) {
+        HuPrcVSleep();
+    }
+    SetBowserState(6);
+    while(!CheckBowserIdle()) {
+        HuPrcVSleep();
+    }
+    BoardFilterFadeOut(30);
 }
 
 static void ExecMGReturn(void)
 {
-	s32 i;
-	s32 player;
-	BoardStatusItemSet(1);
-	for(i=0; i<4; i++) {
-		BoardPlayerPosSetV(i, &playerPosTemp[i]);
-	}
-	BoardCameraMoveSet(0);
-	BoardCameraTargetPlayerSet(eventPlayer);
-	BoardCameraViewSet(2);
-	BoardCameraMotionWait();
-	CreateBowserObj();
-	SquishPlayers();
-	BoardPlayerMotBlendSet(eventPlayer, 0, 15);
-	BoardCameraViewSet(3);
-	BoardFilterFadeInit(30, 160);
-	BoardStatusItemSet(0);
-	BoardCameraMotionWait();
-	WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
-	while(WipeStatGet()) {
-		HuPrcVSleep();
-	}
-	_ClearFlag(0x1001C);
-	BoardCameraMoveSet(1);
-	player = GWSystem.player_curr;
-	GWSystem.player_curr = -1;
-	DoMGReturnEffect();
-	GWSystem.player_curr = player;
-	BoardStatusShowSetAll(1);
-	BoardModelMotionShiftSet(bowserMdl, 3, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
-	HuPrcSleep(8);
-	HuAudFXPlay(58);
-	BoardWinCreate(2, MAKE_MESSID(3, 11), 5);
-	BoardWinWait();
-	BoardWinKill();
-	while(!BoardStatusStopCheck(0)) {
-		HuPrcVSleep();
-	}
-	BoardAudSeqFadeOut(1, 1000);
-	while(!BoardModelMotionEndCheck(bowserMdl)) {
-		HuPrcVSleep();
-	}
-	SetBowserState(6);
-	while(!CheckBowserIdle()) {
-		HuPrcVSleep();
-	}
-	BoardFilterFadeOut(30);
-	BoardMusStartBoard();
+    s32 i;
+    s32 player;
+    BoardStatusItemSet(1);
+    for(i=0; i<4; i++) {
+        BoardPlayerPosSetV(i, &playerPosTemp[i]);
+    }
+    BoardCameraMoveSet(0);
+    BoardCameraTargetPlayerSet(eventPlayer);
+    BoardCameraViewSet(2);
+    BoardCameraMotionWait();
+    CreateBowserObj();
+    SquishPlayers();
+    BoardPlayerMotBlendSet(eventPlayer, 0, 15);
+    BoardCameraViewSet(3);
+    BoardFilterFadeInit(30, 160);
+    BoardStatusItemSet(0);
+    BoardCameraMotionWait();
+    WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
+    while(WipeStatGet()) {
+        HuPrcVSleep();
+    }
+    _ClearFlag(0x1001C);
+    BoardCameraMoveSet(1);
+    player = GWSystem.player_curr;
+    GWSystem.player_curr = -1;
+    DoMGReturnEffect();
+    GWSystem.player_curr = player;
+    BoardStatusShowSetAll(1);
+    BoardModelMotionShiftSet(bowserMdl, 3, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
+    HuPrcSleep(8);
+    HuAudFXPlay(58);
+    BoardWinCreate(2, MAKE_MESSID(3, 11), 5);
+    BoardWinWait();
+    BoardWinKill();
+    while(!BoardStatusStopCheck(0)) {
+        HuPrcVSleep();
+    }
+    BoardAudSeqFadeOut(1, 1000);
+    while(!BoardModelMotionEndCheck(bowserMdl)) {
+        HuPrcVSleep();
+    }
+    SetBowserState(6);
+    while(!CheckBowserIdle()) {
+        HuPrcVSleep();
+    }
+    BoardFilterFadeOut(30);
+    BoardMusStartBoard();
 }
 
 static void DestroyBowser(void)
 {
-	KillPlayerMot();
-	HuDataDirClose(DATADIR_BKOOPA);
-	bowserProc = NULL;
+    KillPlayerMot();
+    HuDataDirClose(DATADIR_BKOOPA);
+    bowserProc = NULL;
 }
 
 static void SquishPlayers(void)
 {
-	Vec pos;
-	Vec pos_space;
-	s32 i;
-	BoardPlayerPosGet(eventPlayer, &pos);
-	if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
-		HuAudFXPlay(798);
-	}
-	pos.y += 6.0f;
-	BoardPlayerPosSetV(eventPlayer, &pos);
-	GWPlayer[eventPlayer].show_next = 0;
-	BoardPlayerMotionSpeedSet(eventPlayer, 0.0f);
-	for(i=0; i<4; i++) {
-		if(eventSpace == GWPlayer[i].space_curr) {
-			BoardPlayerPosGet(i, &pos);
-			BoardSpacePosGet(0, eventSpace, &pos_space);
-			pos.y = pos_space.y+2.5f;
-			BoardPlayerPosSetV(i, &pos);
-			BoardPlayerMotionStart(i, playerMot[i], 0);
-			BoardPlayerMotionTimeSet(i, 50.0f);
-			BoardPlayerMotionSpeedSet(i, 0.0f);
-		}
-	}
+    Vec pos;
+    Vec pos_space;
+    s32 i;
+    BoardPlayerPosGet(eventPlayer, &pos);
+    if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
+        HuAudFXPlay(798);
+    }
+    pos.y += 6.0f;
+    BoardPlayerPosSetV(eventPlayer, &pos);
+    GWPlayer[eventPlayer].show_next = 0;
+    BoardPlayerMotionSpeedSet(eventPlayer, 0.0f);
+    for(i=0; i<4; i++) {
+        if(eventSpace == GWPlayer[i].space_curr) {
+            BoardPlayerPosGet(i, &pos);
+            BoardSpacePosGet(0, eventSpace, &pos_space);
+            pos.y = pos_space.y+2.5f;
+            BoardPlayerPosSetV(i, &pos);
+            BoardPlayerMotionStart(i, playerMot[i], 0);
+            BoardPlayerMotionTimeSet(i, 50.0f);
+            BoardPlayerMotionSpeedSet(i, 0.0f);
+        }
+    }
 }
 
 static void ExecBowserSpecial(void)
 {
-	s32 i;
-	CreateBowserObj();
-	while(!CheckBowserIdle()) {
-		HuPrcVSleep();
-	}
-	SetBowserState(2);
-	HuAudFXPlay(58);
-	BoardMusStart(1, 6, 127, 0);
-	HuPrcSleep(120);
-	BoardWinCreate(2, MAKE_MESSID(3, 7), 5);
-	BoardWinWait();
-	BoardWinKill();
-	HuAudFXPlay(857);
-	BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
-	for(i=0; i<4; i++) {
-		omVibrate(i, 12, 12, 0);
-	}
-	HuPrcSleep(11);
-	while(!BoardModelMotionEndCheck(bowserMdl)) {
-		HuPrcVSleep();
-	}
-	CreateBowserEvent();
-	HuAudFXPlay(831);
-	HuAudFXPlay(60);
-	while(!CheckBowserEvent()) {
-		HuPrcVSleep();
-	}
-	HuPrcSleep(60);
-	BoardModelAttrSet(bowserMdl, 0x40000004);
-	while(!BoardModelMotionEndCheck(bowserMdl)) {
-		HuPrcVSleep();
-	}
-	BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
-	StopBowserEvent();
-	switch(GWSystem.bowser_event) {
-		case 0:
-			ExecBowserGame();
-			break;
-			
-		case 2:
-			ExecBowserRevo();
-			break;
-			
-		case 1:
-			ExecBowserShuffle();
-			break;
-			
-		case 3:
-			ExecBowserSuit();
-			break;
-	}
+    s32 i;
+    CreateBowserObj();
+    while(!CheckBowserIdle()) {
+        HuPrcVSleep();
+    }
+    SetBowserState(2);
+    HuAudFXPlay(58);
+    BoardMusStart(1, 6, 127, 0);
+    HuPrcSleep(120);
+    BoardWinCreate(2, MAKE_MESSID(3, 7), 5);
+    BoardWinWait();
+    BoardWinKill();
+    HuAudFXPlay(857);
+    BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
+    for(i=0; i<4; i++) {
+        omVibrate(i, 12, 12, 0);
+    }
+    HuPrcSleep(11);
+    while(!BoardModelMotionEndCheck(bowserMdl)) {
+        HuPrcVSleep();
+    }
+    CreateBowserEvent();
+    HuAudFXPlay(831);
+    HuAudFXPlay(60);
+    while(!CheckBowserEvent()) {
+        HuPrcVSleep();
+    }
+    HuPrcSleep(60);
+    BoardModelAttrSet(bowserMdl, 0x40000004);
+    while(!BoardModelMotionEndCheck(bowserMdl)) {
+        HuPrcVSleep();
+    }
+    BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
+    StopBowserEvent();
+    switch(GWSystem.bowser_event) {
+        case 0:
+            ExecBowserGame();
+            break;
+
+        case 2:
+            ExecBowserRevo();
+            break;
+
+        case 1:
+            ExecBowserShuffle();
+            break;
+
+        case 3:
+            ExecBowserSuit();
+            break;
+    }
 }
 
 static void ExecBowserGame(void)
 {
-	s32 i;
-	s16 mgTbl[3] = {
-		435,
-		436,
-		437
-	};
-	s32 messLoss[3] = {
-		MAKE_MESSID(3, 9),
-		MAKE_MESSID(3, 12),
-		MAKE_MESSID(3, 14)
-	};
-	s32 mg;
-	s32 mess;
-	s32 fx_stat;
-	for(i=0; i<4; i++) {
-		BoardPlayerPosGet(i, &playerPosTemp[i]);
-	}
-	BoardWinCreate(2, MAKE_MESSID(3, 8), 5);
-	BoardWinWait();
-	mess = messLoss[GWSystem.bowser_loss];
-	BoardWinCreate(2, mess, 5);
-	BoardWinWait();
-	BoardWinKill();
-	BoardModelMotionShiftSet(bowserMdl, 5, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
-	HuPrcSleep(8);
-	while(BoardModelMotionTimeGet(bowserMdl) < 80.0f) {
-		HuPrcVSleep();
-	}
-	fx_stat = HuAudFXPlay(846);
-	InitBowserFire();
-	while(BoardModelMotionTimeGet(bowserMdl) < 200.0f) {
-		HuPrcVSleep();
-	}
-	BoardAudSeqFadeOut(1, 1000);
-	BoardMusVolPanSet(0, 0, 1);
-	BoardAudSeqPause(0, 0, 1);
-	_SetFlag(0x1000E);
-	HuAudFXFadeOut(fx_stat, 500);
-	WipeColorSet(255, 255, 255);
-	WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
-	while(WipeStatGet()) {
-		HuPrcVSleep();
-	}
-	HuAudFXAllStop();
-	_SetFlag(0x1001C);
-	KillBowserFire();
-	HuPrcSleep(60);
-	BoardModelMotionStart(bowserMdl, 1, 0);
-	mg = (s16)mgTbl[BoardRandMod(3)];
-	GWMGAvailSet(mg);
-	GWSystem.mg_next = mg-401;
-	_SetFlag(0x10003);
-	BoardNextOvlSet(OVL_INST);
-	BoardFilterFadeOut(30);
-	HuPrcEnd();
+    s32 i;
+    s16 mgTbl[3] = {
+        435,
+        436,
+        437
+    };
+    s32 messLoss[3] = {
+        MAKE_MESSID(3, 9),
+        MAKE_MESSID(3, 12),
+        MAKE_MESSID(3, 14)
+    };
+    s32 mg;
+    s32 mess;
+    s32 fx_stat;
+    for(i=0; i<4; i++) {
+        BoardPlayerPosGet(i, &playerPosTemp[i]);
+    }
+    BoardWinCreate(2, MAKE_MESSID(3, 8), 5);
+    BoardWinWait();
+    mess = messLoss[GWSystem.bowser_loss];
+    BoardWinCreate(2, mess, 5);
+    BoardWinWait();
+    BoardWinKill();
+    BoardModelMotionShiftSet(bowserMdl, 5, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
+    HuPrcSleep(8);
+    while(BoardModelMotionTimeGet(bowserMdl) < 80.0f) {
+        HuPrcVSleep();
+    }
+    fx_stat = HuAudFXPlay(846);
+    InitBowserFire();
+    while(BoardModelMotionTimeGet(bowserMdl) < 200.0f) {
+        HuPrcVSleep();
+    }
+    BoardAudSeqFadeOut(1, 1000);
+    BoardMusVolPanSet(0, 0, 1);
+    BoardAudSeqPause(0, 0, 1);
+    _SetFlag(0x1000E);
+    HuAudFXFadeOut(fx_stat, 500);
+    WipeColorSet(255, 255, 255);
+    WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
+    while(WipeStatGet()) {
+        HuPrcVSleep();
+    }
+    HuAudFXAllStop();
+    _SetFlag(0x1001C);
+    KillBowserFire();
+    HuPrcSleep(60);
+    BoardModelMotionStart(bowserMdl, 1, 0);
+    mg = (s16)mgTbl[BoardRandMod(3)];
+    GWMGAvailSet(mg);
+    GWSystem.mg_next = mg-401;
+    _SetFlag(0x10003);
+    BoardNextOvlSet(OVL_INST);
+    BoardFilterFadeOut(30);
+    HuPrcEnd();
 }
 
 static void DoMGReturnEffect(void)
 {
-	s32 messTbl[3] = {
-		MAKE_MESSID(3, 10),
-		MAKE_MESSID(3, 13),
-		MAKE_MESSID(3, 15)
-	};
-	s32 player;
-	s32 coin;
-	s32 item;
-	s32 delay;
-	s32 item_cnt;
-	s32 mess;
-	s32 mess_char;
-	for(player=0; player<4; player++) {
-		if(GWPlayerCoinWinGet(player) == 1) { 
-			break;
-		}
-	}
-	mess = messTbl[GWSystem.bowser_loss];
-	mess_char = BoardPlayerGetCharMess(player);
-	BoardStatusShowSetForce(player);
-	BoardStatusShowSet(player, 1);
-	BoardWinCreate(2, mess, 5);
-	BoardWinInsertMesSet(mess_char, 1);
-	BoardWinWait();
-	while(!BoardStatusStopCheck(player)) {
-		HuPrcVSleep();
-	}
-	omVibrate(player, 12, 4, 2);
-	if(GWSystem.bowser_loss == 2) {
-		item_cnt = BoardPlayerItemCount(player);
-		for(item=0; item<item_cnt; item++) {
-			BoardPlayerItemRemove(player, 0);
-			HuPrcSleep(30);
-		}
-	} else {
-		coin = BoardPlayerCoinsGet(player);
-		if(GWSystem.bowser_loss == 1) {
-			coin = BoardPlayerCoinsGet(player)-(coin >> 1);
-		}
-		if(coin >= 50 ) {
-			delay = 1;
-		} else if(coin >= 20) {
-			delay = 3;
-		} else {
-			delay = 6;
-		}
-		while(coin != 0 && BoardPlayerCoinsGet(player) != 0) {
-			BoardPlayerCoinsAdd(player, -1);
-			HuAudFXPlay(14);
-			HuPrcSleep(delay);
-			coin--;
-		}
-		HuAudFXPlay(15);
-	}
-	BoardStatusShowSet(player, 0);
-	while(!BoardStatusStopCheck(player)) {
-		HuPrcVSleep();
-	}
+    s32 messTbl[3] = {
+        MAKE_MESSID(3, 10),
+        MAKE_MESSID(3, 13),
+        MAKE_MESSID(3, 15)
+    };
+    s32 player;
+    s32 coin;
+    s32 item;
+    s32 delay;
+    s32 item_cnt;
+    s32 mess;
+    s32 mess_char;
+    for(player=0; player<4; player++) {
+        if(GWPlayerCoinWinGet(player) == 1) { 
+            break;
+        }
+    }
+    mess = messTbl[GWSystem.bowser_loss];
+    mess_char = BoardPlayerGetCharMess(player);
+    BoardStatusShowSetForce(player);
+    BoardStatusShowSet(player, 1);
+    BoardWinCreate(2, mess, 5);
+    BoardWinInsertMesSet(mess_char, 1);
+    BoardWinWait();
+    while(!BoardStatusStopCheck(player)) {
+        HuPrcVSleep();
+    }
+    omVibrate(player, 12, 4, 2);
+    if(GWSystem.bowser_loss == 2) {
+        item_cnt = BoardPlayerItemCount(player);
+        for(item=0; item<item_cnt; item++) {
+            BoardPlayerItemRemove(player, 0);
+            HuPrcSleep(30);
+        }
+    } else {
+        coin = BoardPlayerCoinsGet(player);
+        if(GWSystem.bowser_loss == 1) {
+            coin = BoardPlayerCoinsGet(player)-(coin >> 1);
+        }
+        if(coin >= 50 ) {
+            delay = 1;
+        } else if(coin >= 20) {
+            delay = 3;
+        } else {
+            delay = 6;
+        }
+        while(coin != 0 && BoardPlayerCoinsGet(player) != 0) {
+            BoardPlayerCoinsAdd(player, -1);
+            HuAudFXPlay(14);
+            HuPrcSleep(delay);
+            coin--;
+        }
+        HuAudFXPlay(15);
+    }
+    BoardStatusShowSet(player, 0);
+    while(!BoardStatusStopCheck(player)) {
+        HuPrcVSleep();
+    }
 }
 
 static void ExecBowserShuffle(void)
 {
-	Vec pos;
-	Vec target;
-	s16 space_old[4];
-	s16 space[4];
-	s32 i;
-	s32 player;
-	s32 player_new;
-	s32 reset_cam;
-	BoardWinCreate(2, MAKE_MESSID(3, 16), 5);
-	BoardWinWait();
-	BoardWinKill();
-	for(i=0; i<4; i++) {
-		space_old[i] = GWPlayer[i].space_curr;
-	}
-	player=0;
-	while(player<4) {
-		player_new = BoardRandMod(4);
-		if(player_new == player || space_old[player_new] == -1) {
-			continue;
-		}
-		space[player] = space_old[player_new];
-		space_old[player_new] = -1;
-		player++;
-	}
-	HuAudFXPlay(857);
-	BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
-	while(!BoardModelMotionEndCheck(bowserMdl)) {
-		HuPrcVSleep();
-	}
-	SetBowserState(3);
-	HuPrcSleep(60);
-	WipeColorSet(255, 255, 255);
-	WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
-	while(WipeStatGet()) {
-		HuPrcVSleep();
-	}
-	reset_cam = 0;
-	for(i=0; i<4; i++) {
-		GWPlayer[i].space_curr = space[i];
-		if(eventSpace == space[i]) {
-			BoardPlayerMotionStart(i, playerMot[i], 0);
-			BoardPlayerMotionTimeSet(i, 50.0f);
-			BoardPlayerMotionSpeedSet(i, 0.0f);
-			reset_cam = 1;
-		} else {
-			BoardPlayerIdleSet(i);
-		}
-		BoardPlayerMoveAwayStart(i, GWPlayer[i].space_curr, 1);
-	}
-	if(reset_cam) {
-		BoardCameraTargetGet(&target);
-		BoardCameraPosGet(&pos);
-		BoardCameraTargetModelSet(-1);
-		BoardCameraTargetSet(target.x, target.y, target.z);
-		BoardCameraPosSet(pos.x, pos.y, pos.z);
-	}
-	SetBowserState(4);
-	HuPrcSleep(60);
-	BoardModelMotionStart(bowserMdl, 1, 0x40000001);
-	WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1);
-	while(WipeStatGet()) {
-		HuPrcVSleep();
-	}
+    Vec pos;
+    Vec target;
+    s16 space_old[4];
+    s16 space[4];
+    s32 i;
+    s32 player;
+    s32 player_new;
+    s32 reset_cam;
+    BoardWinCreate(2, MAKE_MESSID(3, 16), 5);
+    BoardWinWait();
+    BoardWinKill();
+    for(i=0; i<4; i++) {
+        space_old[i] = GWPlayer[i].space_curr;
+    }
+    player=0;
+    while(player<4) {
+        player_new = BoardRandMod(4);
+        if(player_new == player || space_old[player_new] == -1) {
+            continue;
+        }
+        space[player] = space_old[player_new];
+        space_old[player_new] = -1;
+        player++;
+    }
+    HuAudFXPlay(857);
+    BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
+    while(!BoardModelMotionEndCheck(bowserMdl)) {
+        HuPrcVSleep();
+    }
+    SetBowserState(3);
+    HuPrcSleep(60);
+    WipeColorSet(255, 255, 255);
+    WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
+    while(WipeStatGet()) {
+        HuPrcVSleep();
+    }
+    reset_cam = 0;
+    for(i=0; i<4; i++) {
+        GWPlayer[i].space_curr = space[i];
+        if(eventSpace == space[i]) {
+            BoardPlayerMotionStart(i, playerMot[i], 0);
+            BoardPlayerMotionTimeSet(i, 50.0f);
+            BoardPlayerMotionSpeedSet(i, 0.0f);
+            reset_cam = 1;
+        } else {
+            BoardPlayerIdleSet(i);
+        }
+        BoardPlayerMoveAwayStart(i, GWPlayer[i].space_curr, 1);
+    }
+    if(reset_cam) {
+        BoardCameraTargetGet(&target);
+        BoardCameraPosGet(&pos);
+        BoardCameraTargetModelSet(-1);
+        BoardCameraTargetSet(target.x, target.y, target.z);
+        BoardCameraPosSet(pos.x, pos.y, pos.z);
+    }
+    SetBowserState(4);
+    HuPrcSleep(60);
+    BoardModelMotionStart(bowserMdl, 1, 0x40000001);
+    WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1);
+    while(WipeStatGet()) {
+        HuPrcVSleep();
+    }
 }
 
 static void ExecBowserRevo(void)
 {
-	s32 i;
-	s32 coin;
-	BoardWinCreate(2, MAKE_MESSID(3, 17), 5);
-	BoardWinWait();
-	BoardWinKill();
-	for(coin=i=0; i<4; i++) {
-		coin += BoardPlayerCoinsGet(i);
-	}
-	coin /= 4;
-	HuAudFXPlay(857);
-	BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
-	while(!BoardModelMotionEndCheck(bowserMdl)) {
-		HuPrcVSleep();
-	}
-	SetBowserState(3);
-	HuPrcSleep(60);
-	WipeColorSet(255, 255, 255);
-	WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
-	while(WipeStatGet()) {
-		HuPrcVSleep();
-	}
-	SetBowserState(4);
-	for(i=0; i<4; i++) {
-		BoardPlayerCoinsSet(i, coin);
-	}
-	HuPrcSleep(60);
-	BoardModelMotionStart(bowserMdl, 1, 0x40000001);
-	WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1);
-	while(WipeStatGet()) {
-		HuPrcVSleep();
-	}
+    s32 i;
+    s32 coin;
+    BoardWinCreate(2, MAKE_MESSID(3, 17), 5);
+    BoardWinWait();
+    BoardWinKill();
+    for(coin=i=0; i<4; i++) {
+        coin += BoardPlayerCoinsGet(i);
+    }
+    coin /= 4;
+    HuAudFXPlay(857);
+    BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
+    while(!BoardModelMotionEndCheck(bowserMdl)) {
+        HuPrcVSleep();
+    }
+    SetBowserState(3);
+    HuPrcSleep(60);
+    WipeColorSet(255, 255, 255);
+    WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
+    while(WipeStatGet()) {
+        HuPrcVSleep();
+    }
+    SetBowserState(4);
+    for(i=0; i<4; i++) {
+        BoardPlayerCoinsSet(i, coin);
+    }
+    HuPrcSleep(60);
+    BoardModelMotionStart(bowserMdl, 1, 0x40000001);
+    WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1);
+    while(WipeStatGet()) {
+        HuPrcVSleep();
+    }
 }
 
 static void ExecBowserSuit(void)
 {
-	BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
-	BoardWinCreate(2, MAKE_MESSID(3, 18), 5);
-	BoardWinWait();
-	HuAudFXPlay(857);
-	BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
-	HuPrcSleep(10);
-	StartSuitGive();
-	while(!CheckSuitGive()) {
-		HuPrcVSleep();
-	}
-	BoardWinKill();
-	BoardModelAttrSet(bowserMdl, 0x40000004);
-	while(!BoardModelMotionEndCheck(bowserMdl)) {
-		HuPrcVSleep();
-	}
+    BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
+    BoardWinCreate(2, MAKE_MESSID(3, 18), 5);
+    BoardWinWait();
+    HuAudFXPlay(857);
+    BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
+    HuPrcSleep(10);
+    StartSuitGive();
+    while(!CheckSuitGive()) {
+        HuPrcVSleep();
+    }
+    BoardWinKill();
+    BoardModelAttrSet(bowserMdl, 0x40000004);
+    while(!BoardModelMotionEndCheck(bowserMdl)) {
+        HuPrcVSleep();
+    }
 }
 
 typedef struct suit_give_work {
-	u8 kill : 1;
-	u8 state;
-	u8 timer;
-	u8 idle_timer;
-	s16 model;
+    u8 kill : 1;
+    u8 state;
+    u8 timer;
+    u8 idle_timer;
+    s16 model;
 } SuitGiveWork;
 
 static s32 CheckSuitGive(void)
 {
-	if(!suitGiveObj) {
-		return 1;
-	} else {
-		return 0;
-	}
+    if(!suitGiveObj) {
+        return 1;
+    } else {
+        return 0;
+    }
 }
 
 static void StartSuitGive(void)
 {
-	omObjData *object;
-	SuitGiveWork *work;
-	Vec pos;
-	object = omAddObjEx(boardObjMan, 258, 0, 0, -1, SuitGiveMain);
-	suitGiveObj = object;
-	work = OM_GET_WORK_PTR(suitGiveObj, SuitGiveWork);
-	work->kill = 0;
-	work->state = 0;
-	work->idle_timer = 0;
-	work->timer = 30;
-	work->model = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 120), NULL, 0);
-	BoardModelLayerSet(work->model, 7);
-	BoardModelScaleSet(work->model, 0.16f, 0.16f, 0.16f);
-	object->trans.x = 288.0f;
-	object->trans.y = -64.0f;
-	pos.x = 288.0f;
-	pos.y = 240.0f;
-	object->rot.x = (pos.x-object->trans.x)/30.0f;
-	object->rot.y = (pos.y-object->trans.y)/30.0f;
-	object->scale.x = 300.0f;
-	pos.x = object->trans.x;
-	pos.y = object->trans.y;
-	pos.z = object->scale.x;
-	Hu3D2Dto3D(&pos, 1, &pos);
-	BoardModelPosSetV(work->model, &pos);
+    omObjData *object;
+    SuitGiveWork *work;
+    Vec pos;
+    object = omAddObjEx(boardObjMan, 258, 0, 0, -1, SuitGiveMain);
+    suitGiveObj = object;
+    work = OM_GET_WORK_PTR(suitGiveObj, SuitGiveWork);
+    work->kill = 0;
+    work->state = 0;
+    work->idle_timer = 0;
+    work->timer = 30;
+    work->model = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 120), NULL, 0);
+    BoardModelLayerSet(work->model, 7);
+    BoardModelScaleSet(work->model, 0.16f, 0.16f, 0.16f);
+    object->trans.x = 288.0f;
+    object->trans.y = -64.0f;
+    pos.x = 288.0f;
+    pos.y = 240.0f;
+    object->rot.x = (pos.x-object->trans.x)/30.0f;
+    object->rot.y = (pos.y-object->trans.y)/30.0f;
+    object->scale.x = 300.0f;
+    pos.x = object->trans.x;
+    pos.y = object->trans.y;
+    pos.z = object->scale.x;
+    Hu3D2Dto3D(&pos, 1, &pos);
+    BoardModelPosSetV(work->model, &pos);
 }
 
 static void SuitGiveMain(omObjData *object)
 {
-	SuitGiveWork *work = OM_GET_WORK_PTR(object, SuitGiveWork);
-	s32 effect_active;
-	Vec pos;
-	if(work->kill || BoardIsKill()) {
-		BoardModelKill(work->model);
-		suitGiveObj = NULL;
-		omDelObjEx(HuPrcCurrentGet(), object);
-		return;
-	}
-	if(work->idle_timer) {
-		work->idle_timer--;
-		return;
-	}
-	
-	effect_active = 0;
-	switch(work->state) {
-		case 0:
-			if(work->timer == 0) {
-				work->state = 1;
-				work->idle_timer = 30;
-				work->timer = 30;
-				BoardStatusPosGet(eventPlayer, &pos);
-				object->rot.x = (pos.x-object->trans.x)/30.0f;
-				object->rot.y = (pos.y-object->trans.y)/30.0f;
-			} else {
-				work->timer--;
-			}
-			break;
-			
-		case 1:
-			if(work->timer == 0) {
-				work->state = 2;
-				work->idle_timer = 6;
-				effect_active = 1;
-			} else {
-				work->timer--;
-			}
-			break;
-			
-		case 2:
-			BoardPlayerItemAdd(eventPlayer, 10);
-			BoardModelVisibilitySet(work->model, 0);
-			work->kill = 1;
-			return;
-		
-		default:
-			break;
-	}
-	object->trans.x += object->rot.x;
-	object->trans.y += object->rot.y;
-	pos.x = object->trans.x;
-	pos.y = object->trans.y;
-	pos.z = object->scale.x;
-	Hu3D2Dto3D(&pos, 1, &pos);
-	BoardModelPosSetV(work->model, &pos);
-	if(effect_active) {
-		CharModelLayerSetAll(6);
-		CharModelEffectCreate(1, &pos);
-	}
+    SuitGiveWork *work = OM_GET_WORK_PTR(object, SuitGiveWork);
+    s32 effect_active;
+    Vec pos;
+    if(work->kill || BoardIsKill()) {
+        BoardModelKill(work->model);
+        suitGiveObj = NULL;
+        omDelObjEx(HuPrcCurrentGet(), object);
+        return;
+    }
+    if(work->idle_timer) {
+        work->idle_timer--;
+        return;
+    }
+
+    effect_active = 0;
+    switch(work->state) {
+        case 0:
+            if(work->timer == 0) {
+                work->state = 1;
+                work->idle_timer = 30;
+                work->timer = 30;
+                BoardStatusPosGet(eventPlayer, &pos);
+                object->rot.x = (pos.x-object->trans.x)/30.0f;
+                object->rot.y = (pos.y-object->trans.y)/30.0f;
+            } else {
+                work->timer--;
+            }
+            break;
+
+        case 1:
+            if(work->timer == 0) {
+                work->state = 2;
+                work->idle_timer = 6;
+                effect_active = 1;
+            } else {
+                work->timer--;
+            }
+            break;
+
+        case 2:
+            BoardPlayerItemAdd(eventPlayer, 10);
+            BoardModelVisibilitySet(work->model, 0);
+            work->kill = 1;
+            return;
+
+        default:
+            break;
+    }
+    object->trans.x += object->rot.x;
+    object->trans.y += object->rot.y;
+    pos.x = object->trans.x;
+    pos.y = object->trans.y;
+    pos.z = object->scale.x;
+    Hu3D2Dto3D(&pos, 1, &pos);
+    BoardModelPosSetV(work->model, &pos);
+    if(effect_active) {
+        CharModelLayerSetAll(6);
+        CharModelEffectCreate(1, &pos);
+    }
 }
 
 static const s32 bowserMotTbl[] = {
-	DATA_MAKE_NUM(DATADIR_BKOOPA, 8),
-	DATA_MAKE_NUM(DATADIR_BKOOPA, 10),
-	DATA_MAKE_NUM(DATADIR_BKOOPA, 11),
-	DATA_MAKE_NUM(DATADIR_BKOOPA, 12),
-	DATA_MAKE_NUM(DATADIR_BKOOPA, 13),
-	DATA_NUM_LISTEND
+    DATA_MAKE_NUM(DATADIR_BKOOPA, 8),
+    DATA_MAKE_NUM(DATADIR_BKOOPA, 10),
+    DATA_MAKE_NUM(DATADIR_BKOOPA, 11),
+    DATA_MAKE_NUM(DATADIR_BKOOPA, 12),
+    DATA_MAKE_NUM(DATADIR_BKOOPA, 13),
+    DATA_NUM_LISTEND
 };
 
 static void CreateBowserObj(void)
 {
-	BowserWork *work;
-	Vec pos;
-	bowserObj = omAddObjEx(boardObjMan, 257, 0, 0, -1, ExecBowserObj);
-	work = OM_GET_WORK_PTR(bowserObj, BowserWork);
-	work->kill = 0;
-	work->jump_state = 0;
-	work->idle_timer = 0;
-	work->mot_active = 0;
-	work->fall_done = 0;
-	work->jump_done = 0;
-	if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
-		work->state = 1;
-	} else {
-		work->state = 0;
-	}
-	bowserMdl = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BKOOPA, 7), (s32 *)bowserMotTbl, 0);
-	BoardModelVisibilitySet(bowserMdl, 0);
-	BoardModelScaleSet(bowserMdl, 2.0f, 2.0f, 2.0f);
-	BoardPlayerPosGet(eventPlayer, &pos);
-	BoardModelLayerSet(bowserMdl, 2);
-	bowserObj->trans.x = pos.x;
-	bowserObj->trans.y = pos.y;
-	bowserObj->trans.z = pos.z;
-	if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
-		suitItemMdl = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 99), NULL, 0);
-		BoardModelLayerSet(suitItemMdl, 2);
-		BoardModelVisibilitySet(suitItemMdl, 0);
-	} else {
-		s32 space = GWPlayer[eventPlayer].space_curr;
-		BoardSpacePosGet(0, space, &pos);
-		bowserObj->trans.x = pos.x;
-		bowserObj->trans.y = pos.y;
-		bowserObj->trans.z = pos.z;
-		BoardModelPosSetV(bowserMdl, &pos);
-		BoardCameraTargetSpaceSet(space);
-		BoardModelMotionStart(bowserMdl, 1, 0x40000001);
-		BoardModelVisibilitySet(bowserMdl, 1);
-	}
+    BowserWork *work;
+    Vec pos;
+    bowserObj = omAddObjEx(boardObjMan, 257, 0, 0, -1, ExecBowserObj);
+    work = OM_GET_WORK_PTR(bowserObj, BowserWork);
+    work->kill = 0;
+    work->jump_state = 0;
+    work->idle_timer = 0;
+    work->mot_active = 0;
+    work->fall_done = 0;
+    work->jump_done = 0;
+    if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
+        work->state = 1;
+    } else {
+        work->state = 0;
+    }
+    bowserMdl = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BKOOPA, 7), (s32 *)bowserMotTbl, 0);
+    BoardModelVisibilitySet(bowserMdl, 0);
+    BoardModelScaleSet(bowserMdl, 2.0f, 2.0f, 2.0f);
+    BoardPlayerPosGet(eventPlayer, &pos);
+    BoardModelLayerSet(bowserMdl, 2);
+    bowserObj->trans.x = pos.x;
+    bowserObj->trans.y = pos.y;
+    bowserObj->trans.z = pos.z;
+    if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
+        suitItemMdl = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 99), NULL, 0);
+        BoardModelLayerSet(suitItemMdl, 2);
+        BoardModelVisibilitySet(suitItemMdl, 0);
+    } else {
+        s32 space = GWPlayer[eventPlayer].space_curr;
+        BoardSpacePosGet(0, space, &pos);
+        bowserObj->trans.x = pos.x;
+        bowserObj->trans.y = pos.y;
+        bowserObj->trans.z = pos.z;
+        BoardModelPosSetV(bowserMdl, &pos);
+        BoardCameraTargetSpaceSet(space);
+        BoardModelMotionStart(bowserMdl, 1, 0x40000001);
+        BoardModelVisibilitySet(bowserMdl, 1);
+    }
 }
 
 static void ExecBowserFall(BowserWork *work, omObjData *object);
@@ -807,316 +806,316 @@ static void ExecBowserJump(BowserWork *work, omObjData *object);
 
 static void ExecBowserObj(omObjData *object)
 {
-	BowserWork *work = OM_GET_WORK_PTR(bowserObj, BowserWork);
-	Vec pos;
-	Vec rot;
-	
-	if(work->kill || BoardIsKill()) {
-		BoardModelKill(bowserMdl);
-		bowserMdl = -1;
-		BoardModelKill(suitItemMdl);
-		suitItemMdl = -1;
-		omDelObjEx(HuPrcCurrentGet(), object);
-		bowserObj = NULL;
-		return;
-	}
-	if(work->idle_timer) {
-		work->idle_timer--;
-		return;
-	}
-	if(work->mot_active && BoardModelMotionEndCheck(bowserMdl)) {
-		work->mot_active = 0;
-		BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
-	}
-	switch(work->state) {
-		case 1:
-			ExecBowserFall(work, object);
-			break;
-			
-		case 2:
-			ExecBowserLaugh(work, object);
-			break;
-			
-		case 3:
-			ExecBowserPowerUp(work, object);
-			break;
-			
-		case 5:
-			ExecBowserFire(work, object);
-			break;
-			
-		case 6:
-			ExecBowserJump(work, object);
-			break;
-			
-		case 4:
-			BoardModelVisibilitySet(suitItemMdl, 0);
-			work->state = 0;
-			break;
-			
-		case 0:
-			break;
-	}
-	BoardModelPosSet(bowserMdl, object->trans.x, object->trans.y, object->trans.z);
-	BoardCameraRotGet(&rot);
-	pos.x = object->trans.x+(-100.0f*sin(M_PI*BoardModelRotYGet(bowserMdl)/180.0));
-	pos.z = object->trans.z+(-100.0f*cos(M_PI*BoardModelRotYGet(bowserMdl)/180.0));
-	pos.y = object->trans.y+250.0f;
-	BoardModelPosSetV(suitItemMdl, &pos);
+    BowserWork *work = OM_GET_WORK_PTR(bowserObj, BowserWork);
+    Vec pos;
+    Vec rot;
+
+    if(work->kill || BoardIsKill()) {
+        BoardModelKill(bowserMdl);
+        bowserMdl = -1;
+        BoardModelKill(suitItemMdl);
+        suitItemMdl = -1;
+        omDelObjEx(HuPrcCurrentGet(), object);
+        bowserObj = NULL;
+        return;
+    }
+    if(work->idle_timer) {
+        work->idle_timer--;
+        return;
+    }
+    if(work->mot_active && BoardModelMotionEndCheck(bowserMdl)) {
+        work->mot_active = 0;
+        BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
+    }
+    switch(work->state) {
+        case 1:
+            ExecBowserFall(work, object);
+            break;
+
+        case 2:
+            ExecBowserLaugh(work, object);
+            break;
+
+        case 3:
+            ExecBowserPowerUp(work, object);
+            break;
+
+        case 5:
+            ExecBowserFire(work, object);
+            break;
+
+        case 6:
+            ExecBowserJump(work, object);
+            break;
+
+        case 4:
+            BoardModelVisibilitySet(suitItemMdl, 0);
+            work->state = 0;
+            break;
+
+        case 0:
+            break;
+    }
+    BoardModelPosSet(bowserMdl, object->trans.x, object->trans.y, object->trans.z);
+    BoardCameraRotGet(&rot);
+    pos.x = object->trans.x+(-100.0f*sind(BoardModelRotYGet(bowserMdl)));
+    pos.z = object->trans.z+(-100.0f*cosd(BoardModelRotYGet(bowserMdl)));
+    pos.y = object->trans.y+250.0f;
+    BoardModelPosSetV(suitItemMdl, &pos);
 }
 
 static void ExecBowserFall(BowserWork *work, omObjData *object)
 {
-	Vec pos;
-	Vec pos_space;
-	Vec pos_player;
-	s32 i;
-	if(!work->jump_state) {
-		BoardModelVisibilitySet(bowserMdl, 1);
-		BoardModelMotionStart(bowserMdl, 2, 0);
-		BoardModelMotionTimeSet(bowserMdl, 100.0f);
-		work->jump_state = 1;
-		return;
-	}
-	if(BoardModelMotionEndCheck(bowserMdl)) {
-		work->state = 0;
-		BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
-		return;
-	}
-	if(!work->fall_done && !(BoardModelMotionTimeGet(bowserMdl) < 140.0f)) {
-		BoardPlayerPosGet(eventPlayer, &pos);
-		HuAudFXPlay(829);
-		BoardCameraQuakeSet(60, 100.0f);
-		object->trans.y = pos.y;
-		BoardPlayerPosGet(eventPlayer, &pos_player);
-		if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
-			HuAudFXPlay(798);
-		}
-		pos_player.y += 6.0f;
-		BoardPlayerPosSetV(eventPlayer, &pos_player);
-		GWPlayer[eventPlayer].show_next = 0;
-		BoardPlayerMotionSpeedSet(eventPlayer, 0.0f);
-		for(i=0; i<4; i++) {
-			if(eventSpace != GWPlayer[i].space_curr) {
-				continue;
-			}
-			BoardPlayerPosGet(i, &pos_player);
-			BoardSpacePosGet(0, eventSpace, &pos_space);
-			pos_player.y = 2.5f+pos_space.y;
-			BoardPlayerPosSetV(i, &pos_player);
-			BoardPlayerMotionStart(i, playerMot[i], 0);
-			BoardPlayerMotionTimeSet(i, 50.0f);
-			BoardPlayerMotionSpeedSet(i, 0.0f);
-		}
-		if(!work->fall_done) {
-			work->fall_done = 1;
-			omVibrate(eventPlayer, 12, 4, 2);
-		}
-	}
-	
+    Vec pos;
+    Vec pos_space;
+    Vec pos_player;
+    s32 i;
+    if(!work->jump_state) {
+        BoardModelVisibilitySet(bowserMdl, 1);
+        BoardModelMotionStart(bowserMdl, 2, 0);
+        BoardModelMotionTimeSet(bowserMdl, 100.0f);
+        work->jump_state = 1;
+        return;
+    }
+    if(BoardModelMotionEndCheck(bowserMdl)) {
+        work->state = 0;
+        BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
+        return;
+    }
+    if(!work->fall_done && !(BoardModelMotionTimeGet(bowserMdl) < 140.0f)) {
+        BoardPlayerPosGet(eventPlayer, &pos);
+        HuAudFXPlay(829);
+        BoardCameraQuakeSet(60, 100.0f);
+        object->trans.y = pos.y;
+        BoardPlayerPosGet(eventPlayer, &pos_player);
+        if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
+            HuAudFXPlay(798);
+        }
+        pos_player.y += 6.0f;
+        BoardPlayerPosSetV(eventPlayer, &pos_player);
+        GWPlayer[eventPlayer].show_next = 0;
+        BoardPlayerMotionSpeedSet(eventPlayer, 0.0f);
+        for(i=0; i<4; i++) {
+            if(eventSpace != GWPlayer[i].space_curr) {
+                continue;
+            }
+            BoardPlayerPosGet(i, &pos_player);
+            BoardSpacePosGet(0, eventSpace, &pos_space);
+            pos_player.y = 2.5f+pos_space.y;
+            BoardPlayerPosSetV(i, &pos_player);
+            BoardPlayerMotionStart(i, playerMot[i], 0);
+            BoardPlayerMotionTimeSet(i, 50.0f);
+            BoardPlayerMotionSpeedSet(i, 0.0f);
+        }
+        if(!work->fall_done) {
+            work->fall_done = 1;
+            omVibrate(eventPlayer, 12, 4, 2);
+        }
+    }
+
 }
 
 static void ExecBowserLaugh(BowserWork *work, omObjData *object)
 {
-	BoardModelMotionStart(bowserMdl, 3, 0);
-	work->mot_active = 1;
-	work->state = 0;
+    BoardModelMotionStart(bowserMdl, 3, 0);
+    work->mot_active = 1;
+    work->state = 0;
 }
 
 static void ExecBowserFire(BowserWork *work, omObjData *object)
 {
-	BoardModelMotionStart(bowserMdl, 5, 0);
-	work->state = 0;
+    BoardModelMotionStart(bowserMdl, 5, 0);
+    work->state = 0;
 }
 
 static void ExecBowserJump(BowserWork *work, omObjData *object)
 {
-	switch(work->jump_state) {
-		case 0:
-			BoardModelMotionShiftSet(bowserMdl, 2, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
-			work->jump_state = 1;
-			break;
-			
-		case 1:
-		{
-			s16 model_id = BoardModelIDGet(bowserMdl);
-			if(Hu3DMotionShiftIDGet(model_id) == -1) {
-				work->jump_state = 2;
-			}
-		}
-			break;
-			
-		case 2:
-		{
-			float time = BoardModelMotionTimeGet(bowserMdl);
-			if(time < 60.0f) {
-				break;
-			}
-			if(!work->jump_done) {
-				omVibrate(eventPlayer, 12, 12, 0);
-				HuAudFXPlay(61);
-				work->jump_done = 1;
-			}
-			if(time >= 100.0f) {
-				BoardModelVisibilitySet(bowserMdl, 0);
-				work->state = 0;
-				work->kill = 1;
-			}
-		}
-			break;
-	}
+    switch(work->jump_state) {
+        case 0:
+            BoardModelMotionShiftSet(bowserMdl, 2, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
+            work->jump_state = 1;
+            break;
+
+        case 1:
+        {
+            s16 model_id = BoardModelIDGet(bowserMdl);
+            if(Hu3DMotionShiftIDGet(model_id) == -1) {
+                work->jump_state = 2;
+            }
+        }
+            break;
+
+        case 2:
+        {
+            float time = BoardModelMotionTimeGet(bowserMdl);
+            if(time < 60.0f) {
+                break;
+            }
+            if(!work->jump_done) {
+                omVibrate(eventPlayer, 12, 12, 0);
+                HuAudFXPlay(61);
+                work->jump_done = 1;
+            }
+            if(time >= 100.0f) {
+                BoardModelVisibilitySet(bowserMdl, 0);
+                work->state = 0;
+                work->kill = 1;
+            }
+        }
+            break;
+    }
 }
 
 static void ExecBowserPowerUp(BowserWork *work, omObjData *object)
 {
-	Vec pos;
-	if(work->jump_state == 0) {
-		BoardModelVisibilitySet(suitItemMdl, 1);
-		BoardModelMotionStart(suitItemMdl, 0, 0);
-		BoardModelScaleSet(suitItemMdl, 10.0f, 10.0f, 10.0f);
-		pos.x = object->trans.x+(-100.0f*sin(M_PI*BoardModelRotYGet(bowserMdl)/180.0));
-		pos.z = object->trans.z+(-100.0f*cos(M_PI*BoardModelRotYGet(bowserMdl)/180.0));
-		pos.y = object->trans.y+250.0f;
-		BoardModelPosSetV(suitItemMdl, &pos);
-		HuAudFXPlay(850);
-	} else {
-		if(work->jump_state >= 100) {
-			work->state = 0;
-		}
-	}
-	work->jump_state++;
+    Vec pos;
+    if(work->jump_state == 0) {
+        BoardModelVisibilitySet(suitItemMdl, 1);
+        BoardModelMotionStart(suitItemMdl, 0, 0);
+        BoardModelScaleSet(suitItemMdl, 10.0f, 10.0f, 10.0f);
+        pos.x = object->trans.x+(-100.0f*sind(BoardModelRotYGet(bowserMdl)));
+        pos.z = object->trans.z+(-100.0f*cosd(BoardModelRotYGet(bowserMdl)));
+        pos.y = object->trans.y+250.0f;
+        BoardModelPosSetV(suitItemMdl, &pos);
+        HuAudFXPlay(850);
+    } else {
+        if(work->jump_state >= 100) {
+            work->state = 0;
+        }
+    }
+    work->jump_state++;
 }
 
 static void SetBowserState(s32 state)
 {
-	BowserWork *work = OM_GET_WORK_PTR(bowserObj, BowserWork);
-	work->state = state;
-	work->jump_state = 0;
+    BowserWork *work = OM_GET_WORK_PTR(bowserObj, BowserWork);
+    work->state = state;
+    work->jump_state = 0;
 }
 
 static s32 CheckBowserIdle(void)
 {
-	BowserWork *work;
-	if(!bowserObj) {
-		return 1;
-	}
-	work = OM_GET_WORK_PTR(bowserObj, BowserWork);
-	if(work->state != 0 || work->idle_timer != 0) {
-		return 0;
-	} else {
-		return 1;
-	}
+    BowserWork *work;
+    if(!bowserObj) {
+        return 1;
+    }
+    work = OM_GET_WORK_PTR(bowserObj, BowserWork);
+    if(work->state != 0 || work->idle_timer != 0) {
+        return 0;
+    } else {
+        return 1;
+    }
 }
 
 static void CreateMiniBowser(void)
 {
-	omObjData *object;
-	MiniBowserWork *work;
-	object = omAddObjEx(boardObjMan, 257, 0, 0, -1, ExecMiniBowser);
-	miniBowserObj = object;
-	work = OM_GET_WORK_PTR(object, MiniBowserWork);
-	work->kill = 0;
-	work->angle = 0;
-	work->group = HuSprGrpCreate(1);
-	BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BKOOPA, 5), 100, NULL, &work->sprite);
-	HuSprGrpMemberSet(work->group, 0, work->sprite);
-	HuSprAttrSet(work->group, 0, HUSPR_ATTR_LINEAR);
-	HuSprGrpPosSet(work->group, 288.0f, 240.0f);
-	HuSprGrpScaleSet(work->group, 4.0f, 4.0f);
+    omObjData *object;
+    MiniBowserWork *work;
+    object = omAddObjEx(boardObjMan, 257, 0, 0, -1, ExecMiniBowser);
+    miniBowserObj = object;
+    work = OM_GET_WORK_PTR(object, MiniBowserWork);
+    work->kill = 0;
+    work->angle = 0;
+    work->group = HuSprGrpCreate(1);
+    BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BKOOPA, 5), 100, NULL, &work->sprite);
+    HuSprGrpMemberSet(work->group, 0, work->sprite);
+    HuSprAttrSet(work->group, 0, HUSPR_ATTR_LINEAR);
+    HuSprGrpPosSet(work->group, 288.0f, 240.0f);
+    HuSprGrpScaleSet(work->group, 4.0f, 4.0f);
 }
 
 static s32 CheckMiniBowser(void)
 {
-	if(miniBowserObj) {
-		return 0;
-	} else {
-		return 1;
-	}
+    if(miniBowserObj) {
+        return 0;
+    } else {
+        return 1;
+    }
 }
 
 static void ExecMiniBowser(omObjData *object)
 {
-	MiniBowserWork *work = OM_GET_WORK_PTR(object, MiniBowserWork);
-	float alpha;
-	if(work->kill || BoardIsKill()) {
-		HuSprGrpKill(work->group);
-		miniBowserObj = NULL;
-		omDelObjEx(HuPrcCurrentGet(), object);
-		return;
-	}
-	OSs16tof32(&work->angle, &alpha);
-	alpha = sin(M_PI*BoardDAngleCalc(alpha)/180.0);
-	HuSprTPLvlSet(work->group, 0, ABS(alpha));
-	if(work->angle == 60) {
-		HuAudFXPlay(807);
-	}
-	work->angle += 2;
-	if(work->angle == 90 || work->angle == 270 || work->angle == 450) {
-		omVibrate(eventPlayer, 12, 4, 2);
-	}
-	if(work->angle >= 540) {
-		work->kill =  1;
-	}
+    MiniBowserWork *work = OM_GET_WORK_PTR(object, MiniBowserWork);
+    float alpha;
+    if(work->kill || BoardIsKill()) {
+        HuSprGrpKill(work->group);
+        miniBowserObj = NULL;
+        omDelObjEx(HuPrcCurrentGet(), object);
+        return;
+    }
+    OSs16tof32(&work->angle, &alpha);
+    alpha = sind(BoardDAngleCalc(alpha));
+    HuSprTPLvlSet(work->group, 0, ABS(alpha));
+    if(work->angle == 60) {
+        HuAudFXPlay(807);
+    }
+    work->angle += 2;
+    if(work->angle == 90 || work->angle == 270 || work->angle == 450) {
+        omVibrate(eventPlayer, 12, 4, 2);
+    }
+    if(work->angle >= 540) {
+        work->kill =  1;
+    }
 }
 
 static void CreateBowserEvent(void)
 {
-	Vec pos_2d;
-	Vec pos_3d;
-	s32 eventSpr[] = {
-		DATA_MAKE_NUM(DATADIR_BKOOPA, 1),
-		DATA_MAKE_NUM(DATADIR_BKOOPA, 2),
-		DATA_MAKE_NUM(DATADIR_BKOOPA, 3),
-		DATA_MAKE_NUM(DATADIR_BKOOPA, 4),
-	};
-	
-	
-	BowserEventData *data;
-	s32 i;
-	BowserEventWork *work;
-	s32 sprite;
-	bowserEventObj = omAddObjEx(boardObjMan, 257, 0, 0, -1, ExecBowserEvent);
-	work = OM_GET_WORK_PTR(bowserEventObj, BowserEventWork);
-	work->kill = 0;
-	work->state = 0;
-	work->timer = 0;
-	memset(&bowserEvent, 0, sizeof(BowserEventData));
-	data = &bowserEvent;
-	data->group = HuSprGrpCreate(3);
-	sprite = eventSpr[GWSystem.bowser_event];
-	for(i=0; i<3; i++) {
-		BoardSpriteCreate(sprite, 100, NULL, &data->sprite[i]);
-		HuSprGrpMemberSet(data->group, i, data->sprite[i]);
-		HuSprTPLvlSet(data->group, i, 0.0f);
-		HuSprPosSet(data->group, i, 0.0f, 0.0f);
-		data->delay[i] = i*2;
-	}
-	HuSprGrpPosSet(data->group, 288.0f, 240.0f);
-	data->model = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 101), NULL, 0);
-	pos_2d.x = 288.0f;
-	pos_2d.y = 240.0f;
-	pos_2d.z = 1000.0f;
-	Hu3D2Dto3D(&pos_2d, 1, &pos_3d);
-	BoardModelMotionStart(data->model, 0, 0x40000001);
-	BoardModelPosSetV(data->model, &pos_3d);
-	BoardModelLayerSet(data->model, 2);
+    Vec pos_2d;
+    Vec pos_3d;
+    s32 eventSpr[] = {
+        DATA_MAKE_NUM(DATADIR_BKOOPA, 1),
+        DATA_MAKE_NUM(DATADIR_BKOOPA, 2),
+        DATA_MAKE_NUM(DATADIR_BKOOPA, 3),
+        DATA_MAKE_NUM(DATADIR_BKOOPA, 4),
+    };
+
+
+    BowserEventData *data;
+    s32 i;
+    BowserEventWork *work;
+    s32 sprite;
+    bowserEventObj = omAddObjEx(boardObjMan, 257, 0, 0, -1, ExecBowserEvent);
+    work = OM_GET_WORK_PTR(bowserEventObj, BowserEventWork);
+    work->kill = 0;
+    work->state = 0;
+    work->timer = 0;
+    memset(&bowserEvent, 0, sizeof(BowserEventData));
+    data = &bowserEvent;
+    data->group = HuSprGrpCreate(3);
+    sprite = eventSpr[GWSystem.bowser_event];
+    for(i=0; i<3; i++) {
+        BoardSpriteCreate(sprite, 100, NULL, &data->sprite[i]);
+        HuSprGrpMemberSet(data->group, i, data->sprite[i]);
+        HuSprTPLvlSet(data->group, i, 0.0f);
+        HuSprPosSet(data->group, i, 0.0f, 0.0f);
+        data->delay[i] = i*2;
+    }
+    HuSprGrpPosSet(data->group, 288.0f, 240.0f);
+    data->model = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 101), NULL, 0);
+    pos_2d.x = 288.0f;
+    pos_2d.y = 240.0f;
+    pos_2d.z = 1000.0f;
+    Hu3D2Dto3D(&pos_2d, 1, &pos_3d);
+    BoardModelMotionStart(data->model, 0, 0x40000001);
+    BoardModelPosSetV(data->model, &pos_3d);
+    BoardModelLayerSet(data->model, 2);
 }
 
 static s32 CheckBowserEvent(void)
 {
-	BowserEventWork *work = OM_GET_WORK_PTR(bowserEventObj, BowserEventWork);
-	
-	if(work->state != 2) {
-		return 0;
-	} else {
-		return 1;
-	}
+    BowserEventWork *work = OM_GET_WORK_PTR(bowserEventObj, BowserEventWork);
+
+    if(work->state != 2) {
+        return 0;
+    } else {
+        return 1;
+    }
 }
 
 static void StopBowserEvent(void)
 {
-	BowserEventWork *work = OM_GET_WORK_PTR(bowserEventObj, BowserEventWork);
-	work->state = 1;
+    BowserEventWork *work = OM_GET_WORK_PTR(bowserEventObj, BowserEventWork);
+    work->state = 1;
 }
 
 static void ShowBowserEvent(BowserEventWork *work, omObjData *object);
@@ -1124,187 +1123,187 @@ static void HideBowserEvent(BowserEventWork *work, omObjData *object);
 
 static void ExecBowserEvent(omObjData *object)
 {
-	BowserEventWork *work = OM_GET_WORK_PTR(object, BowserEventWork);
-	BowserEventData *data = &bowserEvent;
-	if(work->kill || BoardIsKill()) {
-		HuSprGrpKill(data->group);
-		BoardModelKill(data->model);
-		bowserEventObj = NULL;
-		omDelObjEx(HuPrcCurrentGet(), object);
-		return;
-	}
-	if(work->timer) {
-		work->timer--;
-		return;
-	}
-	switch(work->state) {
-		case 0:
-			ShowBowserEvent(work, object);
-			break;
-			
-		case 1:
-			HideBowserEvent(work, object);
-			break;
-			
-		case 2:
-			break;
-	}
+    BowserEventWork *work = OM_GET_WORK_PTR(object, BowserEventWork);
+    BowserEventData *data = &bowserEvent;
+    if(work->kill || BoardIsKill()) {
+        HuSprGrpKill(data->group);
+        BoardModelKill(data->model);
+        bowserEventObj = NULL;
+        omDelObjEx(HuPrcCurrentGet(), object);
+        return;
+    }
+    if(work->timer) {
+        work->timer--;
+        return;
+    }
+    switch(work->state) {
+        case 0:
+            ShowBowserEvent(work, object);
+            break;
+
+        case 1:
+            HideBowserEvent(work, object);
+            break;
+
+        case 2:
+            break;
+    }
 }
 
 static void ShowBowserEvent(BowserEventWork *work, omObjData *object)
 {
-	BowserEventData *data;
-	s32 i;
-	s32 count;
-	float angle;
-	float tplvl;
-	float scale;
-	data = &bowserEvent;
-	for(count=i=0; i<3; i++) {
-		if(data->delay[i]) {
-			data->delay[i]--;
-		} else {
-			if(data->angle[i] > 90) {
-				count++;
-				continue;
-			}
-			OSs16tof32(&data->angle[i], &angle);
-			tplvl = sin(M_PI*angle/180.0);
-			scale = sin(M_PI*angle/180.0);
-			HuSprTPLvlSet(data->group, i, tplvl);
-			HuSprScaleSet(data->group, i, scale, scale);
-			BoardModelAlphaSet(data->model, 255.0f*tplvl);
-			data->angle[i] += 9;
-			if(data->angle[i] > 90 && i != 0) {
-				HuSprAttrSet(data->group, i, HUSPR_ATTR_DISPOFF);
-			}
-		}
-	}
-	if(count == 3) {
-		work->state = 2;
-		work->timer = 60;
-	}
+    BowserEventData *data;
+    s32 i;
+    s32 count;
+    float angle;
+    float tplvl;
+    float scale;
+    data = &bowserEvent;
+    for(count=i=0; i<3; i++) {
+        if(data->delay[i]) {
+            data->delay[i]--;
+        } else {
+            if(data->angle[i] > 90) {
+                count++;
+                continue;
+            }
+            OSs16tof32(&data->angle[i], &angle);
+            tplvl = sind(angle);
+            scale = sind(angle);
+            HuSprTPLvlSet(data->group, i, tplvl);
+            HuSprScaleSet(data->group, i, scale, scale);
+            BoardModelAlphaSet(data->model, 255.0f*tplvl);
+            data->angle[i] += 9;
+            if(data->angle[i] > 90 && i != 0) {
+                HuSprAttrSet(data->group, i, HUSPR_ATTR_DISPOFF);
+            }
+        }
+    }
+    if(count == 3) {
+        work->state = 2;
+        work->timer = 60;
+    }
 }
 
 static void HideBowserEvent(BowserEventWork *work, omObjData *object)
 {
-	BowserEventData *data = &bowserEvent;
-	float angle;
-	float tplvl;
-	OSs16tof32(&data->angle[0], &angle);
-	tplvl = sin(M_PI*angle/180.0);
-	HuSprTPLvlSet(data->group, 0, tplvl);
-	BoardModelAlphaSet(data->model, 255.0f*tplvl);
-	data->angle[0] -= 10;
-	if(data->angle[0] < 0) {
-		work->kill = 1;
-		HuSprAttrSet(data->group, 0, HUSPR_ATTR_DISPOFF);
-	}
+    BowserEventData *data = &bowserEvent;
+    float angle;
+    float tplvl;
+    OSs16tof32(&data->angle[0], &angle);
+    tplvl = sind(angle);
+    HuSprTPLvlSet(data->group, 0, tplvl);
+    BoardModelAlphaSet(data->model, 255.0f*tplvl);
+    data->angle[0] -= 10;
+    if(data->angle[0] < 0) {
+        work->kill = 1;
+        HuSprAttrSet(data->group, 0, HUSPR_ATTR_DISPOFF);
+    }
 }
 
 
 static void ConfigBowserEvent(void)
 {
-	s32 i;
-	s32 chance;
-	s32 coins;
-	s32 item_full;
-	item_full = 0;
-	if(BoardPlayerItemCount(eventPlayer) == 3) {
-		item_full = 1;
-	}
-	for(coins=i=0; i<4; i++) {
-		coins += BoardPlayerCoinsGet(i);
-	}
-	retry:
-	while(1) {
-		chance = BoardRandMod(100);
-		if(chance >= 95) {
-			if(item_full) {
-				continue;
-			}
-			if(GWSystem.max_turn-GWSystem.turn == 0) {
-				continue;
-			}
-			GWSystem.bowser_event = 3;
-			break;
-		} else if(chance >= 85) {
-			GWSystem.bowser_event = 2;
-			break;
-		} else if(chance >= 70) {
-			GWSystem.bowser_event = 1;
-			break;
-		} else {
-			if(coins == 0) {
-				continue;
-			}
-			GWSystem.bowser_event = 0;
-			GWSystem.bowser_loss = BoardRandMod(3);
-			break;
-		}
-	}
+    s32 i;
+    s32 chance;
+    s32 coins;
+    s32 item_full;
+    item_full = 0;
+    if(BoardPlayerItemCount(eventPlayer) == 3) {
+        item_full = 1;
+    }
+    for(coins=i=0; i<4; i++) {
+        coins += BoardPlayerCoinsGet(i);
+    }
+    retry:
+    while(1) {
+        chance = BoardRandMod(100);
+        if(chance >= 95) {
+            if(item_full) {
+                continue;
+            }
+            if(GWSystem.max_turn-GWSystem.turn == 0) {
+                continue;
+            }
+            GWSystem.bowser_event = 3;
+            break;
+        } else if(chance >= 85) {
+            GWSystem.bowser_event = 2;
+            break;
+        } else if(chance >= 70) {
+            GWSystem.bowser_event = 1;
+            break;
+        } else {
+            if(coins == 0) {
+                continue;
+            }
+            GWSystem.bowser_event = 0;
+            GWSystem.bowser_loss = BoardRandMod(3);
+            break;
+        }
+    }
 }
 
 static void CreatePlayerMot(void)
 {
-	s32 scareMotTbl[] = {
-		DATA_MAKE_NUM(DATADIR_MARIOMOT, 27),
-		DATA_MAKE_NUM(DATADIR_LUIGIMOT, 27),
-		DATA_MAKE_NUM(DATADIR_PEACHMOT, 27),
-		DATA_MAKE_NUM(DATADIR_YOSHIMOT, 27),
-		DATA_MAKE_NUM(DATADIR_WARIOMOT, 27),
-		DATA_MAKE_NUM(DATADIR_DONKEYMOT, 27),
-		DATA_MAKE_NUM(DATADIR_DAISYMOT, 27),
-		DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 27),
-	};
-	s32 jumpMotTbl[] = {
-		DATA_MAKE_NUM(DATADIR_MARIOMOT, 26),
-		DATA_MAKE_NUM(DATADIR_LUIGIMOT, 26),
-		DATA_MAKE_NUM(DATADIR_PEACHMOT, 26),
-		DATA_MAKE_NUM(DATADIR_YOSHIMOT, 26),
-		DATA_MAKE_NUM(DATADIR_WARIOMOT, 26),
-		DATA_MAKE_NUM(DATADIR_DONKEYMOT, 26),
-		DATA_MAKE_NUM(DATADIR_DAISYMOT, 26),
-		DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 26),
-	};
-	s32 playerMotTbl[] = {
-		DATA_MAKE_NUM(DATADIR_MARIOMOT, 31),
-		DATA_MAKE_NUM(DATADIR_LUIGIMOT, 31),
-		DATA_MAKE_NUM(DATADIR_PEACHMOT, 31),
-		DATA_MAKE_NUM(DATADIR_YOSHIMOT, 31),
-		DATA_MAKE_NUM(DATADIR_WARIOMOT, 31),
-		DATA_MAKE_NUM(DATADIR_DONKEYMOT, 31),
-		DATA_MAKE_NUM(DATADIR_DAISYMOT, 31),
-		DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 31),
-	};
-	s32 i;
-	s32 character;
-	character = GWPlayer[eventPlayer].character;
-	scareMot = BoardPlayerMotionCreate(eventPlayer, scareMotTbl[character]);
-	jumpMot = BoardPlayerMotionCreate(eventPlayer, jumpMotTbl[character]);
-	for(i=0; i<4; i++) {
-		character = GWPlayer[i].character;
-		playerMot[i] = BoardPlayerMotionCreate(i, playerMotTbl[character]);
-	}
+    s32 scareMotTbl[] = {
+        DATA_MAKE_NUM(DATADIR_MARIOMOT, 27),
+        DATA_MAKE_NUM(DATADIR_LUIGIMOT, 27),
+        DATA_MAKE_NUM(DATADIR_PEACHMOT, 27),
+        DATA_MAKE_NUM(DATADIR_YOSHIMOT, 27),
+        DATA_MAKE_NUM(DATADIR_WARIOMOT, 27),
+        DATA_MAKE_NUM(DATADIR_DONKEYMOT, 27),
+        DATA_MAKE_NUM(DATADIR_DAISYMOT, 27),
+        DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 27),
+    };
+    s32 jumpMotTbl[] = {
+        DATA_MAKE_NUM(DATADIR_MARIOMOT, 26),
+        DATA_MAKE_NUM(DATADIR_LUIGIMOT, 26),
+        DATA_MAKE_NUM(DATADIR_PEACHMOT, 26),
+        DATA_MAKE_NUM(DATADIR_YOSHIMOT, 26),
+        DATA_MAKE_NUM(DATADIR_WARIOMOT, 26),
+        DATA_MAKE_NUM(DATADIR_DONKEYMOT, 26),
+        DATA_MAKE_NUM(DATADIR_DAISYMOT, 26),
+        DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 26),
+    };
+    s32 playerMotTbl[] = {
+        DATA_MAKE_NUM(DATADIR_MARIOMOT, 31),
+        DATA_MAKE_NUM(DATADIR_LUIGIMOT, 31),
+        DATA_MAKE_NUM(DATADIR_PEACHMOT, 31),
+        DATA_MAKE_NUM(DATADIR_YOSHIMOT, 31),
+        DATA_MAKE_NUM(DATADIR_WARIOMOT, 31),
+        DATA_MAKE_NUM(DATADIR_DONKEYMOT, 31),
+        DATA_MAKE_NUM(DATADIR_DAISYMOT, 31),
+        DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 31),
+    };
+    s32 i;
+    s32 character;
+    character = GWPlayer[eventPlayer].character;
+    scareMot = BoardPlayerMotionCreate(eventPlayer, scareMotTbl[character]);
+    jumpMot = BoardPlayerMotionCreate(eventPlayer, jumpMotTbl[character]);
+    for(i=0; i<4; i++) {
+        character = GWPlayer[i].character;
+        playerMot[i] = BoardPlayerMotionCreate(i, playerMotTbl[character]);
+    }
 }
 
 static void KillPlayerMot(void)
 {
-	s32 i;
-	if(scareMot > 0) {
-		BoardPlayerMotionKill(eventPlayer, scareMot);
-		scareMot = -1;
-	}
-	if(jumpMot > 0) {
-		BoardPlayerMotionKill(eventPlayer, jumpMot);
-		jumpMot = -1;
-	}
-	for(i=0; i<4; i++) {
-		if(playerMot[i] > 0) {
-			BoardPlayerMotionKill(i, playerMot[i]);
-			playerMot[i] = -1;
-		}
-	}
+    s32 i;
+    if(scareMot > 0) {
+        BoardPlayerMotionKill(eventPlayer, scareMot);
+        scareMot = -1;
+    }
+    if(jumpMot > 0) {
+        BoardPlayerMotionKill(eventPlayer, jumpMot);
+        jumpMot = -1;
+    }
+    for(i=0; i<4; i++) {
+        if(playerMot[i] > 0) {
+            BoardPlayerMotionKill(i, playerMot[i]);
+            playerMot[i] = -1;
+        }
+    }
 }
 
 static void BowserFireHook(ModelData *model, ParticleData *particle, Mtx matrix);
@@ -1314,103 +1313,103 @@ static s32 CheckBowserFire(HsfanimStruct01 *arg0);
 
 static void InitBowserFire(void)
 {
-	fireAnim = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_BOARD, 106));
-	fireParMan = Hu3DParticleCreate(fireAnim, 30);
-	Hu3DParticleColSet(fireParMan, 255, 255, 255);
-	Hu3DParticleScaleSet(fireParMan, 10.0f);
-	Hu3DParticleHookSet(fireParMan, BowserFireHook);
-	Hu3DParticleBlendModeSet(fireParMan, 1);
-	Hu3DModelLayerSet(fireParMan, 2);
+    fireAnim = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_BOARD, 106));
+    fireParMan = Hu3DParticleCreate(fireAnim, 30);
+    Hu3DParticleColSet(fireParMan, 255, 255, 255);
+    Hu3DParticleScaleSet(fireParMan, 10.0f);
+    Hu3DParticleHookSet(fireParMan, BowserFireHook);
+    Hu3DParticleBlendModeSet(fireParMan, 1);
+    Hu3DModelLayerSet(fireParMan, 2);
 }
 
 static void BowserFireHook(ModelData *model, ParticleData *particle, Mtx matrix)
 {
-	HsfanimStruct01* var_r30;
-	s32 i;
-	s32 var_r28;
-	Vec pos;
-	Hu3DModelObjPosGet(BoardModelIDGet(bowserMdl), "itemhook_M_1", &pos);
-	if (particle->unk_34 == 0) {
-		var_r30 = particle->unk_48;
+    HsfanimStruct01* var_r30;
+    s32 i;
+    s32 var_r28;
+    Vec pos;
+    Hu3DModelObjPosGet(BoardModelIDGet(bowserMdl), "itemhook_M_1", &pos);
+    if (particle->unk_34 == 0) {
+        var_r30 = particle->unk_48;
         for (i = 0; i < particle->unk_30; i++, var_r30++) {
-			var_r30->unk2C = 0.0f;
-		}
-		particle->unk_34 = 1;
-		particle->unk_00 = 0;
-	}
-	if((particle->unk_34 & 0x3) == 0) {
-		var_r30 = particle->unk_48;
-		for(var_r28=0; var_r28<particle->unk_30; var_r28++, var_r30++) {
-			 if(var_r30->unk2C == 0.0f) {
-				break; 
-			 }
-		}
-		if(var_r28 != particle->unk_30) {
-			var_r30->unk34 = pos;
-			particle->unk_00++;
-			SpawnBowserFire(var_r30);
-		}
-	}
-	var_r30 = particle->unk_48;
-	for (i = 0; i < particle->unk_30; i++, var_r30++) {
-		if(var_r30->unk2C != 0.0f && CheckBowserFire(var_r30)) {
-			particle->unk_00--;
-		}
-	}
+            var_r30->unk2C = 0.0f;
+        }
+        particle->unk_34 = 1;
+        particle->unk_00 = 0;
+    }
+    if((particle->unk_34 & 0x3) == 0) {
+        var_r30 = particle->unk_48;
+        for(var_r28=0; var_r28<particle->unk_30; var_r28++, var_r30++) {
+             if(var_r30->unk2C == 0.0f) {
+                break; 
+             }
+        }
+        if(var_r28 != particle->unk_30) {
+            var_r30->unk34 = pos;
+            particle->unk_00++;
+            SpawnBowserFire(var_r30);
+        }
+    }
+    var_r30 = particle->unk_48;
+    for (i = 0; i < particle->unk_30; i++, var_r30++) {
+        if(var_r30->unk2C != 0.0f && CheckBowserFire(var_r30)) {
+            particle->unk_00--;
+        }
+    }
 }
 
 static void SpawnBowserFire(HsfanimStruct01 *arg0)
 {
-	Vec dir;
-	BoardCameraDirGet(&dir);
-	arg0->unk08.x = 0.0f;
-	arg0->unk08.y = 0.0f;
-	arg0->unk08.z = 0.0f;
-	arg0->unk14.x = -dir.x*((0.5f*BoardRandFloat())+0.5f);
-	arg0->unk14.y = -dir.y*((0.5f*BoardRandFloat())+0.5f);
-	arg0->unk14.z = -dir.z*((0.5f*BoardRandFloat())+0.5f);
-	arg0->unk24 = 1.025f;
-	arg0->unk40.a = 254;
-	arg0->unk40.r = 255;
-	arg0->unk40.g = 255;
-	arg0->unk40.b = 255;
-	arg0->unk2C = 100.0f;
+    Vec dir;
+    BoardCameraDirGet(&dir);
+    arg0->unk08.x = 0.0f;
+    arg0->unk08.y = 0.0f;
+    arg0->unk08.z = 0.0f;
+    arg0->unk14.x = -dir.x*((0.5f*BoardRandFloat())+0.5f);
+    arg0->unk14.y = -dir.y*((0.5f*BoardRandFloat())+0.5f);
+    arg0->unk14.z = -dir.z*((0.5f*BoardRandFloat())+0.5f);
+    arg0->unk24 = 1.025f;
+    arg0->unk40.a = 254;
+    arg0->unk40.r = 255;
+    arg0->unk40.g = 255;
+    arg0->unk40.b = 255;
+    arg0->unk2C = 100.0f;
 }
 
 static s32 CheckBowserFire(HsfanimStruct01 *arg0)
 {
-	arg0->unk34.x += arg0->unk08.x;
-	arg0->unk34.y += arg0->unk08.y;
-	arg0->unk34.z += arg0->unk08.z;
-	arg0->unk08.x += arg0->unk14.x;
-	arg0->unk08.y += arg0->unk14.y;
-	arg0->unk08.z += arg0->unk14.z;
-	arg0->unk40.a -= 8;
-	arg0->unk2C *= arg0->unk24;
-	if(arg0->unk40.a == 0.0f) {
-		arg0->unk40.a = 0;
-		arg0->unk2C = 0.0f;
-		return 1;
-	}
-	return 0;
+    arg0->unk34.x += arg0->unk08.x;
+    arg0->unk34.y += arg0->unk08.y;
+    arg0->unk34.z += arg0->unk08.z;
+    arg0->unk08.x += arg0->unk14.x;
+    arg0->unk08.y += arg0->unk14.y;
+    arg0->unk08.z += arg0->unk14.z;
+    arg0->unk40.a -= 8;
+    arg0->unk2C *= arg0->unk24;
+    if(arg0->unk40.a == 0.0f) {
+        arg0->unk40.a = 0;
+        arg0->unk2C = 0.0f;
+        return 1;
+    }
+    return 0;
 }
 
 static void KillBowserFire(void)
 {
-	if(fireParMan != -1) {
-		Hu3DModelKill(fireParMan);
-		fireParMan = -1;
-		fireAnim = NULL;
-	}
+    if(fireParMan != -1) {
+        Hu3DModelKill(fireParMan);
+        fireParMan = -1;
+        fireAnim = NULL;
+    }
 }
 
 typedef struct mini_bowser_balloon_work {
-	u8 kill : 1;
-	u8 state;
-	u16 timer;
-	s16 angle;
-	float offset;
-	s16 *models;
+    u8 kill : 1;
+    u8 state;
+    u16 timer;
+    s16 angle;
+    float offset;
+    s16 *models;
 } MiniBowserBalloonWork;
 
 static void MiniBowserTake(void);
@@ -1433,384 +1432,384 @@ static void WaitMiniBowserMotion(void);
 
 static s32 ExecMiniBowserEvent(void)
 {
-	s32 doneF = 0;
-	CreateMiniBowserBalloon();
-	SetMiniBowserBalloonState(0);
-	while(GetMiniBowserBalloonState() != 2) {
-		HuPrcVSleep();
-	}
-	BoardFilterFadeOut(30);
-	BoardAudSeqFadeOut(1, 1000);
-	HuPrcSleep(30);
-	BoardAudSeqFadeOutFast(1);
-	BoardMusStart(1, 11, 127, 0);
-	HuAudFXPlay(62);
-	BoardWinCreate(2, MAKE_MESSID(3, 0), 6);
-	BoardWinWait();
-	if(BoardRandMod(100) < 70) {
-		MiniBowserTake();
-	} else {
-		MiniBowserTakeAll();
-	}
-	//5% chance bowser will appear after baby bowser
-	if(BoardRandMod(100) < 5) {
-		doneF = 1;
-	}
-	if(doneF) {
-		HuPrcSleep(60);
-		BoardWinCreate(2, MAKE_MESSID(3, 6), 6);
-		BoardWinWait();
-		BoardWinKill();
-		HuAudFXPlay(62);
-		SetMiniBowserMotion(6, 10, 1);
-		HuPrcSleep(60);
-	} else {
-		HuAudFXPlay(62);
-		BoardWinCreate(2, MAKE_MESSID(3, 2), 6);
-		BoardWinWait();
-		BoardWinKill();
-		BoardAudSeqFadeOut(1, 1000);
-		SetMiniBowserMotion(4, 10, 1);
-		HuPrcSleep(30);
-	}
-	SetMiniBowserBalloonState(1);
-	while(GetMiniBowserBalloonState() != 2) {
-		HuPrcVSleep();
-	}
-	MiniBowserBalloonStop();
-	return doneF;
+    s32 doneF = 0;
+    CreateMiniBowserBalloon();
+    SetMiniBowserBalloonState(0);
+    while(GetMiniBowserBalloonState() != 2) {
+        HuPrcVSleep();
+    }
+    BoardFilterFadeOut(30);
+    BoardAudSeqFadeOut(1, 1000);
+    HuPrcSleep(30);
+    BoardAudSeqFadeOutFast(1);
+    BoardMusStart(1, 11, 127, 0);
+    HuAudFXPlay(62);
+    BoardWinCreate(2, MAKE_MESSID(3, 0), 6);
+    BoardWinWait();
+    if(BoardRandMod(100) < 70) {
+        MiniBowserTake();
+    } else {
+        MiniBowserTakeAll();
+    }
+    //5% chance bowser will appear after baby bowser
+    if(BoardRandMod(100) < 5) {
+        doneF = 1;
+    }
+    if(doneF) {
+        HuPrcSleep(60);
+        BoardWinCreate(2, MAKE_MESSID(3, 6), 6);
+        BoardWinWait();
+        BoardWinKill();
+        HuAudFXPlay(62);
+        SetMiniBowserMotion(6, 10, 1);
+        HuPrcSleep(60);
+    } else {
+        HuAudFXPlay(62);
+        BoardWinCreate(2, MAKE_MESSID(3, 2), 6);
+        BoardWinWait();
+        BoardWinKill();
+        BoardAudSeqFadeOut(1, 1000);
+        SetMiniBowserMotion(4, 10, 1);
+        HuPrcSleep(30);
+    }
+    SetMiniBowserBalloonState(1);
+    while(GetMiniBowserBalloonState() != 2) {
+        HuPrcVSleep();
+    }
+    MiniBowserBalloonStop();
+    return doneF;
 }
 
 static void MiniBowserTake(void)
 {
-	u8 coinSteal[][3] = {
-		20, 20, 30,
-		20, 20, 30,
-		10, 15, 20,
-		10, 15, 20
-	};
-	s32 coin_inc;
-	s32 game_part;
-	u8 steal;
-	s32 i;
-	u32 mess;
-	s32 delay;
-	s32 turn;
-	s32 turn_max;
-	turn = GWSystem.turn-1;
-	turn_max = GWSystem.max_turn;
-	game_part = turn/(turn_max/3);
-	if(game_part >= 3) {
-		game_part = 2;
-	}
-	steal = (u8)coinSteal[GWPlayer[eventPlayer].rank][game_part];
-	sprintf(coinStealStrAll, "%d", steal);
-	SetMiniBowserMotion(2, 10, 0);
-	if(steal >= 20) {
-		delay = 3;
-	} else {
-		delay = 6;
-	}
-	if(BoardPlayerCoinsGet(eventPlayer) != 0) {
-		mess = MAKE_MESSID(3, 1);
-		coin_inc = -1;
-	} else {
-		mess = MAKE_MESSID(3, 3);
-		steal = 10;
-		coin_inc = 1;
-	}
-	HuAudFXPlay(62);
-	BoardWinCreate(2, mess, 6);
-	BoardWinInsertMesSet(MAKE_MESSID_PTR(coinStealStrAll), 0);
-	BoardWinWait();
-	if(coin_inc > 0) {
-		SetMiniBowserMotion(5, 10, 0);
-	} else {
-		SetMiniBowserMotion(3, 10, 1);
-	}
-	if(coin_inc < 0) {
-		omVibrate(eventPlayer, 12, 6, 6);
-	}
-	if(coin_inc < 0) {
-		BoardPlayerMotionShiftSet(eventPlayer, 13, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
-	} else {
-		BoardPlayerMotionShiftSet(eventPlayer, 12, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
-	}
-	for(i=0; i<steal; i++) {
-		BoardPlayerCoinsAdd(eventPlayer, coin_inc);
-		if(coin_inc < 0) {
-			HuAudFXPlay(14);
-		} else {
-			HuAudFXPlay(7);
-		}
-		HuPrcSleep(6);
-		if(BoardPlayerCoinsGet(eventPlayer) <= 0) {
-			break;
-		}
-	}
-	HuAudFXPlay(15);
-	HuPrcSleep(20);
-	BoardPlayerIdleSet(eventPlayer);
-	SetMiniBowserMotionPause(0);
-	WaitMiniBowserMotion();
-	SetMiniBowserMotion(1, 10, 1);
+    u8 coinSteal[][3] = {
+        20, 20, 30,
+        20, 20, 30,
+        10, 15, 20,
+        10, 15, 20
+    };
+    s32 coin_inc;
+    s32 game_part;
+    u8 steal;
+    s32 i;
+    u32 mess;
+    s32 delay;
+    s32 turn;
+    s32 turn_max;
+    turn = GWSystem.turn-1;
+    turn_max = GWSystem.max_turn;
+    game_part = turn/(turn_max/3);
+    if(game_part >= 3) {
+        game_part = 2;
+    }
+    steal = (u8)coinSteal[GWPlayer[eventPlayer].rank][game_part];
+    sprintf(coinStealStrAll, "%d", steal);
+    SetMiniBowserMotion(2, 10, 0);
+    if(steal >= 20) {
+        delay = 3;
+    } else {
+        delay = 6;
+    }
+    if(BoardPlayerCoinsGet(eventPlayer) != 0) {
+        mess = MAKE_MESSID(3, 1);
+        coin_inc = -1;
+    } else {
+        mess = MAKE_MESSID(3, 3);
+        steal = 10;
+        coin_inc = 1;
+    }
+    HuAudFXPlay(62);
+    BoardWinCreate(2, mess, 6);
+    BoardWinInsertMesSet(MAKE_MESSID_PTR(coinStealStrAll), 0);
+    BoardWinWait();
+    if(coin_inc > 0) {
+        SetMiniBowserMotion(5, 10, 0);
+    } else {
+        SetMiniBowserMotion(3, 10, 1);
+    }
+    if(coin_inc < 0) {
+        omVibrate(eventPlayer, 12, 6, 6);
+    }
+    if(coin_inc < 0) {
+        BoardPlayerMotionShiftSet(eventPlayer, 13, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
+    } else {
+        BoardPlayerMotionShiftSet(eventPlayer, 12, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
+    }
+    for(i=0; i<steal; i++) {
+        BoardPlayerCoinsAdd(eventPlayer, coin_inc);
+        if(coin_inc < 0) {
+            HuAudFXPlay(14);
+        } else {
+            HuAudFXPlay(7);
+        }
+        HuPrcSleep(6);
+        if(BoardPlayerCoinsGet(eventPlayer) <= 0) {
+            break;
+        }
+    }
+    HuAudFXPlay(15);
+    HuPrcSleep(20);
+    BoardPlayerIdleSet(eventPlayer);
+    SetMiniBowserMotionPause(0);
+    WaitMiniBowserMotion();
+    SetMiniBowserMotion(1, 10, 1);
 }
 
 static void MiniBowserTakeAll(void)
 {
-	u8 coinSteal[] = {
-		10, 20, 30,
-	};
-	s32 i;
-	s32 j;
-	s32 coin_total;
-	s32 coin_inc;
-	s32 game_part;
-	u8 steal;
-	u32 mess;
-	s32 delay;
-	s32 turn;
-	s32 turn_max;
-	turn = GWSystem.turn-1;
-	turn_max = GWSystem.max_turn;
-	game_part = turn/(turn_max/3);
-	if(game_part >= 3) {
-		game_part = 2;
-	}
-	steal = (u8)coinSteal[game_part];
-	sprintf(coinStealStr, "%d", steal);
-	SetMiniBowserMotion(2, 10, 0);
-	for(coin_total=j=0; j<4; j++) {
-		coin_total += BoardPlayerCoinsGet(j);
-	}
-	if(coin_total != 0) {
-		mess = MAKE_MESSID(3, 4);
-		coin_inc = -1;
-	} else {
-		mess = MAKE_MESSID(3, 5);
-		steal = 10;
-		coin_inc = 1;
-	}
-	HuAudFXPlay(62);
-	BoardWinCreate(2, mess, 6);
-	BoardWinInsertMesSet(MAKE_MESSID_PTR(coinStealStr), 0);
-	BoardWinWait();
-	if(coin_inc > 0) {
-		SetMiniBowserMotion(5, 10, 0);
-	} else {
-		SetMiniBowserMotion(3, 10, 1);
-	}
-	if(coin_inc < 0) {
-		for(i=0; i<4; i++) {
-			omVibrate(i, 12, 6, 6);
-		}
-	}
-	for(i=0; i<4; i++) {
-		if(coin_inc < 0) {
-			BoardPlayerMotionShiftSet(i, 13, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
-		} else {
-			BoardPlayerMotionShiftSet(i, 12, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
-		}
-	}
-	if(steal >= 20) {
-		delay = 3;
-	} else {
-		delay = 6;
-	}
-	for(i=0; i<steal; i++) {
-		for(j=0; j<4; j++) {
-			BoardPlayerCoinsAdd(j, coin_inc);
-		}
-		for(coin_total=j=0; j<4; j++) {
-			coin_total += BoardPlayerCoinsGet(j);
-		}
-		if(coin_total == 0) {
-			break;
-		}
-		if(coin_inc < 0) {
-			HuAudFXPlay(14);
-		} else {
-			HuAudFXPlay(7);
-		}
-		HuPrcSleep(6);
-	}
-	HuAudFXPlay(15);
-	HuPrcSleep(20);
-	for(i=0; i<4; i++) {
-		BoardPlayerIdleSet(i);
-	}
-	
-	SetMiniBowserMotionPause(0);
-	WaitMiniBowserMotion();
-	SetMiniBowserMotion(1, 10, 1);
+    u8 coinSteal[] = {
+        10, 20, 30,
+    };
+    s32 i;
+    s32 j;
+    s32 coin_total;
+    s32 coin_inc;
+    s32 game_part;
+    u8 steal;
+    u32 mess;
+    s32 delay;
+    s32 turn;
+    s32 turn_max;
+    turn = GWSystem.turn-1;
+    turn_max = GWSystem.max_turn;
+    game_part = turn/(turn_max/3);
+    if(game_part >= 3) {
+        game_part = 2;
+    }
+    steal = (u8)coinSteal[game_part];
+    sprintf(coinStealStr, "%d", steal);
+    SetMiniBowserMotion(2, 10, 0);
+    for(coin_total=j=0; j<4; j++) {
+        coin_total += BoardPlayerCoinsGet(j);
+    }
+    if(coin_total != 0) {
+        mess = MAKE_MESSID(3, 4);
+        coin_inc = -1;
+    } else {
+        mess = MAKE_MESSID(3, 5);
+        steal = 10;
+        coin_inc = 1;
+    }
+    HuAudFXPlay(62);
+    BoardWinCreate(2, mess, 6);
+    BoardWinInsertMesSet(MAKE_MESSID_PTR(coinStealStr), 0);
+    BoardWinWait();
+    if(coin_inc > 0) {
+        SetMiniBowserMotion(5, 10, 0);
+    } else {
+        SetMiniBowserMotion(3, 10, 1);
+    }
+    if(coin_inc < 0) {
+        for(i=0; i<4; i++) {
+            omVibrate(i, 12, 6, 6);
+        }
+    }
+    for(i=0; i<4; i++) {
+        if(coin_inc < 0) {
+            BoardPlayerMotionShiftSet(i, 13, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
+        } else {
+            BoardPlayerMotionShiftSet(i, 12, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
+        }
+    }
+    if(steal >= 20) {
+        delay = 3;
+    } else {
+        delay = 6;
+    }
+    for(i=0; i<steal; i++) {
+        for(j=0; j<4; j++) {
+            BoardPlayerCoinsAdd(j, coin_inc);
+        }
+        for(coin_total=j=0; j<4; j++) {
+            coin_total += BoardPlayerCoinsGet(j);
+        }
+        if(coin_total == 0) {
+            break;
+        }
+        if(coin_inc < 0) {
+            HuAudFXPlay(14);
+        } else {
+            HuAudFXPlay(7);
+        }
+        HuPrcSleep(6);
+    }
+    HuAudFXPlay(15);
+    HuPrcSleep(20);
+    for(i=0; i<4; i++) {
+        BoardPlayerIdleSet(i);
+    }
+
+    SetMiniBowserMotionPause(0);
+    WaitMiniBowserMotion();
+    SetMiniBowserMotion(1, 10, 1);
 }
 
 static const s32 miniBowserMotTbl[] = {
-	DATA_MAKE_NUM(DATADIR_BKOOPA, 15),
-	DATA_MAKE_NUM(DATADIR_BKOOPA, 16),
-	DATA_MAKE_NUM(DATADIR_BKOOPA, 17),
-	DATA_MAKE_NUM(DATADIR_BKOOPA, 18),
-	DATA_MAKE_NUM(DATADIR_BKOOPA, 19),
-	DATA_MAKE_NUM(DATADIR_BKOOPA, 20),
-	DATA_NUM_LISTEND
+    DATA_MAKE_NUM(DATADIR_BKOOPA, 15),
+    DATA_MAKE_NUM(DATADIR_BKOOPA, 16),
+    DATA_MAKE_NUM(DATADIR_BKOOPA, 17),
+    DATA_MAKE_NUM(DATADIR_BKOOPA, 18),
+    DATA_MAKE_NUM(DATADIR_BKOOPA, 19),
+    DATA_MAKE_NUM(DATADIR_BKOOPA, 20),
+    DATA_NUM_LISTEND
 };
 
 static void MiniBowserBalloonStop(void)
 {
-	if(miniBowserBalloonObj) {
-		OM_GET_WORK_PTR(miniBowserBalloonObj, MiniBowserBalloonWork)->kill = 1;
-	}
+    if(miniBowserBalloonObj) {
+        OM_GET_WORK_PTR(miniBowserBalloonObj, MiniBowserBalloonWork)->kill = 1;
+    }
 }
 
 static s32 GetMiniBowserBalloonState(void)
 {
-	return OM_GET_WORK_PTR(miniBowserBalloonObj, MiniBowserBalloonWork)->state;
+    return OM_GET_WORK_PTR(miniBowserBalloonObj, MiniBowserBalloonWork)->state;
 }
 
 static void SetMiniBowserBalloonState(s32 state)
 {
-	OM_GET_WORK_PTR(miniBowserBalloonObj, MiniBowserBalloonWork)->state = state;
+    OM_GET_WORK_PTR(miniBowserBalloonObj, MiniBowserBalloonWork)->state = state;
 }
 
 static void CreateMiniBowserBalloon(void)
 {
-	MiniBowserBalloonWork *work;
-	s16 *models;
-	Vec pos;
-	miniBowserBalloonObj = omAddObjEx(boardObjMan, 257, 0, 0, -1, ExecMiniBowserBalloon);
-	work = OM_GET_WORK_PTR(miniBowserBalloonObj, MiniBowserBalloonWork);
-	work->kill = 0;
-	work->state = 0;
-	work->timer = 0;
-	work->offset = 0;
-	work->angle = 0;
-	work->models = HuMemDirectMallocNum(HEAP_SYSTEM, 9*sizeof(s16), MEMORY_DEFAULT_NUM);
-	models = work->models;
-	models[0] = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BKOOPA, 14), (s32 *)miniBowserMotTbl, 0);
-	models[1] = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BKOOPA, 0), NULL, 0);
-	BoardPlayerPosGet(eventPlayer, &pos);
-	miniBowserBalloonObj->trans.x = pos.x;
-	miniBowserBalloonObj->trans.y = pos.y+800.0f;
-	miniBowserBalloonObj->trans.z = pos.z;
-	BoardModelHookSet(models[1], "minik01", models[0]);
-	BoardModelPosSet(models[1], miniBowserBalloonObj->trans.x,
-		miniBowserBalloonObj->trans.y,
-		miniBowserBalloonObj->trans.z);
-	SetMiniBowserMotion(1, 0, 1);
+    MiniBowserBalloonWork *work;
+    s16 *models;
+    Vec pos;
+    miniBowserBalloonObj = omAddObjEx(boardObjMan, 257, 0, 0, -1, ExecMiniBowserBalloon);
+    work = OM_GET_WORK_PTR(miniBowserBalloonObj, MiniBowserBalloonWork);
+    work->kill = 0;
+    work->state = 0;
+    work->timer = 0;
+    work->offset = 0;
+    work->angle = 0;
+    work->models = HuMemDirectMallocNum(HEAP_SYSTEM, 9*sizeof(s16), MEMORY_DEFAULT_NUM);
+    models = work->models;
+    models[0] = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BKOOPA, 14), (s32 *)miniBowserMotTbl, 0);
+    models[1] = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BKOOPA, 0), NULL, 0);
+    BoardPlayerPosGet(eventPlayer, &pos);
+    miniBowserBalloonObj->trans.x = pos.x;
+    miniBowserBalloonObj->trans.y = pos.y+800.0f;
+    miniBowserBalloonObj->trans.z = pos.z;
+    BoardModelHookSet(models[1], "minik01", models[0]);
+    BoardModelPosSet(models[1], miniBowserBalloonObj->trans.x,
+        miniBowserBalloonObj->trans.y,
+        miniBowserBalloonObj->trans.z);
+    SetMiniBowserMotion(1, 0, 1);
 }
 
 static void ExecMiniBowserBalloon(omObjData *object)
 {
-	MiniBowserBalloonWork *work;
-	s16 *models;
-	work = OM_GET_WORK_PTR(miniBowserBalloonObj, MiniBowserBalloonWork);
-	models = work->models;
-	if(work->kill || BoardIsKill()) {
-		BoardModelKill(models[0]);
-		BoardModelKill(models[1]);
-		HuMemDirectFree(work->models);
-		miniBowserBalloonObj = NULL;
-		omDelObjEx(HuPrcCurrentGet(), object);
-		return;
-	}
-	if(work->timer) {
-		work->timer--;
-	} else {
-		switch(work->state) {
-			case 0:
-				MiniBowserBalloonFall(work, object);
-				break;
-				
-			case 1:
-				MiniBowserBalloonRaise(work, object);
-				break;
-				
-			case 2:
-				MiniBowserBalloonHover(work, object);
-				break;
-		}
-	}
-	BoardModelPosSet(models[1], object->trans.x, object->trans.y+work->offset, object->trans.z);
+    MiniBowserBalloonWork *work;
+    s16 *models;
+    work = OM_GET_WORK_PTR(miniBowserBalloonObj, MiniBowserBalloonWork);
+    models = work->models;
+    if(work->kill || BoardIsKill()) {
+        BoardModelKill(models[0]);
+        BoardModelKill(models[1]);
+        HuMemDirectFree(work->models);
+        miniBowserBalloonObj = NULL;
+        omDelObjEx(HuPrcCurrentGet(), object);
+        return;
+    }
+    if(work->timer) {
+        work->timer--;
+    } else {
+        switch(work->state) {
+            case 0:
+                MiniBowserBalloonFall(work, object);
+                break;
+
+            case 1:
+                MiniBowserBalloonRaise(work, object);
+                break;
+
+            case 2:
+                MiniBowserBalloonHover(work, object);
+                break;
+        }
+    }
+    BoardModelPosSet(models[1], object->trans.x, object->trans.y+work->offset, object->trans.z);
 }
 
 static void MiniBowserBalloonHover(MiniBowserBalloonWork *work, omObjData *object)
 {
-	float angle;
-	work->angle++;
-	if(work->angle >= 360) {
-		work->angle = 0;
-	}
-	OSs16tof32(&work->angle, &angle);
-	work->offset = 10.0*sin(M_PI*angle/180.0);
+    float angle;
+    work->angle++;
+    if(work->angle >= 360) {
+        work->angle = 0;
+    }
+    OSs16tof32(&work->angle, &angle);
+    work->offset = 10.0*sind(angle);
 }
 
 static void MiniBowserBalloonFall(MiniBowserBalloonWork *work, omObjData *object)
 {
-	Vec pos;
-	BoardPlayerPosGet(eventPlayer, &pos);
-	pos.y += 250.0f;
-	if(object->trans.y < pos.y) {
-		object->trans.y = pos.y;
-		work->state = 2;
-	} else {
-		object->trans.y += -10.0f;
-	}
+    Vec pos;
+    BoardPlayerPosGet(eventPlayer, &pos);
+    pos.y += 250.0f;
+    if(object->trans.y < pos.y) {
+        object->trans.y = pos.y;
+        work->state = 2;
+    } else {
+        object->trans.y += -10.0f;
+    }
 }
 
 static void MiniBowserBalloonRaise(MiniBowserBalloonWork *work, omObjData *object)
 {
-	Vec pos;
-	BoardPlayerPosGet(eventPlayer, &pos);
-	pos.y += 800.0f;
-	if(object->trans.y > pos.y) {
-		work->state = 2;
-	} else {
-		object->trans.y += 10.0f;
-	}
+    Vec pos;
+    BoardPlayerPosGet(eventPlayer, &pos);
+    pos.y += 800.0f;
+    if(object->trans.y > pos.y) {
+        work->state = 2;
+    } else {
+        object->trans.y += 10.0f;
+    }
 }
 
 static void SetMiniBowserMotion(s32 mot, u8 end, s32 pause)
 {
-	s16 *models;
-	u32 attr;
-	float shift_end;
-	MiniBowserBalloonWork *work;
-	work = OM_GET_WORK_PTR(miniBowserBalloonObj, MiniBowserBalloonWork);
-	models = work->models;
-	if(pause) {
-		attr = HU3D_MOTATTR_LOOP;
-	} else {
-		attr = HU3D_MOTATTR_NONE;
-	}
-	if(end) {
-		OSu8tof32(&end, &shift_end);
-		BoardModelMotionShiftSet(models[0], mot, 0, shift_end, attr);
-	} else {
-		BoardModelMotionStart(models[0], mot, attr);
-	}
+    s16 *models;
+    u32 attr;
+    float shift_end;
+    MiniBowserBalloonWork *work;
+    work = OM_GET_WORK_PTR(miniBowserBalloonObj, MiniBowserBalloonWork);
+    models = work->models;
+    if(pause) {
+        attr = HU3D_MOTATTR_LOOP;
+    } else {
+        attr = HU3D_MOTATTR_NONE;
+    }
+    if(end) {
+        OSu8tof32(&end, &shift_end);
+        BoardModelMotionShiftSet(models[0], mot, 0, shift_end, attr);
+    } else {
+        BoardModelMotionStart(models[0], mot, attr);
+    }
 }
 
 static void SetMiniBowserMotionPause(s32 flag)
 {
-	s16 *models;
-	MiniBowserBalloonWork *work;
-	work = OM_GET_WORK_PTR(miniBowserBalloonObj, MiniBowserBalloonWork);
-	models = work->models;
-	if(flag) {
-		BoardModelAttrSet(models[0], 0x40000001);
-	} else {
-		BoardModelAttrReset(models[0], 0x40000001);
-	}
+    s16 *models;
+    MiniBowserBalloonWork *work;
+    work = OM_GET_WORK_PTR(miniBowserBalloonObj, MiniBowserBalloonWork);
+    models = work->models;
+    if(flag) {
+        BoardModelAttrSet(models[0], 0x40000001);
+    } else {
+        BoardModelAttrReset(models[0], 0x40000001);
+    }
 }
 
 static void WaitMiniBowserMotion(void)
 {
-	s16 *models;
-	MiniBowserBalloonWork *work;
-	work = OM_GET_WORK_PTR(miniBowserBalloonObj, MiniBowserBalloonWork);
-	models = work->models;
-	BoardModelAttrReset(models[0], 0x40000001);
-	while(!BoardModelMotionEndCheck(models[0])) {
-		HuPrcVSleep();
-	}
+    s16 *models;
+    MiniBowserBalloonWork *work;
+    work = OM_GET_WORK_PTR(miniBowserBalloonObj, MiniBowserBalloonWork);
+    models = work->models;
+    BoardModelAttrReset(models[0], 0x40000001);
+    while(!BoardModelMotionEndCheck(models[0])) {
+        HuPrcVSleep();
+    }
 }
diff --git a/src/game/board/main.c b/src/game/board/main.c
index 119780c2..68440f98 100644
--- a/src/game/board/main.c
+++ b/src/game/board/main.c
@@ -1,5 +1,5 @@
 #include "game/gamework_data.h"
-#include "math.h"
+#include "ext_math.h"
 #include "game/object.h"
 #include "game/flag.h"
 #include "game/data.h"
@@ -23,9 +23,9 @@
 #include "game/msm.h"
 
 typedef struct camera_view {
-	s16 x_rot;
-	s16 zoom;
-	s16 fov;
+    s16 x_rot;
+    s16 zoom;
+    s16 fov;
 } CameraView;
 
 omObjData *boardMainObj;
@@ -54,12 +54,12 @@ static BoardCameraData cameraBackup;
 static OverlayID nextOvl = OVL_INVALID;
 
 static CameraView camViewTbl[] = {
-	{ 0, 0, 25 },
-	{ -33, 3200, 25 },
-	{ -33, 2100, 25 },
-	{ -33, 1800, 25 },
-	{ -33, 12640, 25 },
-	{ -33, 3200, 25 },
+    { 0, 0, 25 },
+    { -33, 3200, 25 },
+    { -33, 2100, 25 },
+    { -33, 1800, 25 },
+    { -33, 12640, 25 },
+    { -33, 3200, 25 },
 };
 
 
@@ -83,1181 +83,1181 @@ static void DestroyBoard(void);
 
 void BoardObjectSetup(BoardFunc create, BoardFunc destroy)
 {
-	omSysPauseEnable(FALSE);
-	if(!_CheckFlag(FLAG_ID_MAKE(1, 0))) {
-		_SetFlag(FLAG_ID_MAKE(1, 0));
-		_ClearFlag(FLAG_ID_MAKE(2, 1));
-		_ClearFlag(FLAG_ID_MAKE(2, 3));
-		_ClearFlag(FLAG_ID_MAKE(2, 0));
-		_ClearFlag(FLAG_ID_MAKE(2, 2));
-		_ClearFlag(FLAG_ID_MAKE(2, 4));
-		_ClearFlag(FLAG_ID_MAKE(2, 5));
-		_ClearFlag(FLAG_ID_MAKE(1, 6));
-		_ClearFlag(FLAG_ID_MAKE(1, 9));
-		_ClearFlag(FLAG_ID_MAKE(0, 8));
-		_ClearFlag(FLAG_ID_MAKE(0, 10));
-		BoardMGSetupPlayClear();
-	}
-	
-	nextOvl = OVL_INVALID;
-	_SetFlag(FLAG_ID_MAKE(1, 28));
-	_SetFlag(FLAG_ID_MAKE(1, 14));
-	_ClearFlag(FLAG_ID_MAKE(1, 16));
-	_ClearFlag(FLAG_ID_MAKE(1, 17));
-	_ClearFlag(FLAG_ID_MAKE(1, 18));
-	_ClearFlag(FLAG_ID_MAKE(1, 19));
-	_ClearFlag(FLAG_ID_MAKE(1, 20));
-	_ClearFlag(FLAG_ID_MAKE(1, 21));
-	_ClearFlag(FLAG_ID_MAKE(1, 23));
-	_ClearFlag(FLAG_ID_MAKE(1, 24));
-	_ClearFlag(FLAG_ID_MAKE(1, 25));
-	_ClearFlag(FLAG_ID_MAKE(1, 27));
-	createFunc = create;
-	destroyFunc = destroy;
-	boardTurnFunc = NULL;
-	boardStarShowNextHook = NULL;
-	boardBowserHook = NULL;
-	boardStarGiveHook = NULL;
-	boardTurnStartFunc = NULL;
-	boardObjMan = omInitObjMan(64, 8192);
-	omSystemKeyCheckSetup(boardObjMan);
-	boardMainObj = omAddObjEx(boardObjMan, 0, 0, 0, -1, InitBoardFunc);
-	switch(omcurovl) {
-		case OVL_W01:
-			GWSystem.board = BOARD_ID_MAIN1;
-			break;
-			
-		case OVL_W02:
-			GWSystem.board = BOARD_ID_MAIN2;
-			break;
-			
-		case OVL_W03:
-			GWSystem.board = BOARD_ID_MAIN3;
-			break;
-			
-		case OVL_W04:
-			GWSystem.board = BOARD_ID_MAIN4;
-			break;
-			
-		case OVL_W05:
-			GWSystem.board = BOARD_ID_MAIN5;
-			break;
-			
-		case OVL_W06:
-			GWSystem.board = BOARD_ID_MAIN6;
-			break;
-			
-		case OVL_W10:
-			GWSystem.board = BOARD_ID_TUTORIAL;
-			break;
-			
-		case OVL_W20:
-			GWSystem.board = BOARD_ID_EXTRA1;
-			break;
-			
-		case OVL_W21:
-			GWSystem.board = BOARD_ID_EXTRA2;
-			break;
-	}
+    omSysPauseEnable(FALSE);
+    if(!_CheckFlag(FLAG_ID_MAKE(1, 0))) {
+        _SetFlag(FLAG_ID_MAKE(1, 0));
+        _ClearFlag(FLAG_ID_MAKE(2, 1));
+        _ClearFlag(FLAG_ID_MAKE(2, 3));
+        _ClearFlag(FLAG_ID_MAKE(2, 0));
+        _ClearFlag(FLAG_ID_MAKE(2, 2));
+        _ClearFlag(FLAG_ID_MAKE(2, 4));
+        _ClearFlag(FLAG_ID_MAKE(2, 5));
+        _ClearFlag(FLAG_ID_MAKE(1, 6));
+        _ClearFlag(FLAG_ID_MAKE(1, 9));
+        _ClearFlag(FLAG_ID_MAKE(0, 8));
+        _ClearFlag(FLAG_ID_MAKE(0, 10));
+        BoardMGSetupPlayClear();
+    }
+
+    nextOvl = OVL_INVALID;
+    _SetFlag(FLAG_ID_MAKE(1, 28));
+    _SetFlag(FLAG_ID_MAKE(1, 14));
+    _ClearFlag(FLAG_ID_MAKE(1, 16));
+    _ClearFlag(FLAG_ID_MAKE(1, 17));
+    _ClearFlag(FLAG_ID_MAKE(1, 18));
+    _ClearFlag(FLAG_ID_MAKE(1, 19));
+    _ClearFlag(FLAG_ID_MAKE(1, 20));
+    _ClearFlag(FLAG_ID_MAKE(1, 21));
+    _ClearFlag(FLAG_ID_MAKE(1, 23));
+    _ClearFlag(FLAG_ID_MAKE(1, 24));
+    _ClearFlag(FLAG_ID_MAKE(1, 25));
+    _ClearFlag(FLAG_ID_MAKE(1, 27));
+    createFunc = create;
+    destroyFunc = destroy;
+    boardTurnFunc = NULL;
+    boardStarShowNextHook = NULL;
+    boardBowserHook = NULL;
+    boardStarGiveHook = NULL;
+    boardTurnStartFunc = NULL;
+    boardObjMan = omInitObjMan(64, 8192);
+    omSystemKeyCheckSetup(boardObjMan);
+    boardMainObj = omAddObjEx(boardObjMan, 0, 0, 0, -1, InitBoardFunc);
+    switch(omcurovl) {
+        case OVL_W01:
+            GWSystem.board = BOARD_ID_MAIN1;
+            break;
+
+        case OVL_W02:
+            GWSystem.board = BOARD_ID_MAIN2;
+            break;
+
+        case OVL_W03:
+            GWSystem.board = BOARD_ID_MAIN3;
+            break;
+
+        case OVL_W04:
+            GWSystem.board = BOARD_ID_MAIN4;
+            break;
+
+        case OVL_W05:
+            GWSystem.board = BOARD_ID_MAIN5;
+            break;
+
+        case OVL_W06:
+            GWSystem.board = BOARD_ID_MAIN6;
+            break;
+
+        case OVL_W10:
+            GWSystem.board = BOARD_ID_TUTORIAL;
+            break;
+
+        case OVL_W20:
+            GWSystem.board = BOARD_ID_EXTRA1;
+            break;
+
+        case OVL_W21:
+            GWSystem.board = BOARD_ID_EXTRA2;
+            break;
+    }
 }
 
 static void InitBoardFunc(omObjData *object)
 {
-	boardMainProc = HuPrcChildCreate(MainFunc, 8194, 0x6000, 0, boardObjMan);
-	HuPrcDestructorSet2(boardMainProc, DestroyMainFunc);
-	object->func = ExecBoardFunc;
+    boardMainProc = HuPrcChildCreate(MainFunc, 8194, 0x6000, 0, boardObjMan);
+    HuPrcDestructorSet2(boardMainProc, DestroyMainFunc);
+    object->func = ExecBoardFunc;
 }
 
 static void ExecBoardFunc(omObjData *object)
 {
-	if(!_CheckFlag(FLAG_ID_MAKE(1, 16))) {
-		return;
-	}
-	if(!_CheckFlag(FLAG_ID_MAKE(1, 17))) {
-		if(omSysExitReq) {
-			BoardKill();
-		} else {
-			if(BoardPauseReqCheck()) {
-				BoardPauseStart();
-			} else {
-				return;
-			}
-		}
-	} else {
-		if(boardMainProc) {
-			HuPrcKill(boardMainProc);
-		}
-		object->func = KillBoardFunc;
-	}
+    if(!_CheckFlag(FLAG_ID_MAKE(1, 16))) {
+        return;
+    }
+    if(!_CheckFlag(FLAG_ID_MAKE(1, 17))) {
+        if(omSysExitReq) {
+            BoardKill();
+        } else {
+            if(BoardPauseReqCheck()) {
+                BoardPauseStart();
+            } else {
+                return;
+            }
+        }
+    } else {
+        if(boardMainProc) {
+            HuPrcKill(boardMainProc);
+        }
+        object->func = KillBoardFunc;
+    }
 }
 
 static void KillBoardFunc(omObjData *object)
 {
-	if(boardMainProc) {
-		return;
-	}
-	if(WipeStatGet()) {
-		return;
-		return_alt:
-		return;
-	} else {
-		if(HuARDMACheck()) {
-			goto return_alt;
-		}
-		if(nextOvl != OVL_INVALID) {
-			omOvlCallEx(nextOvl, 1, 0, 0);
-		} else {
-			if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
-				BoardTutorialKill();
-				BoardTutorialWorkRestore();
-			}
-			_ClearFlag(FLAG_ID_MAKE(1, 0));
-			HuARDirFree(DATADIR_BOARD);
-			if(_CheckFlag(FLAG_ID_MAKE(1, 27))) {
-				omOvlReturnEx(2, 1);
-			} else {
-				omOvlReturnEx(1, 1);
-			}
-		}
-	}
+    if(boardMainProc) {
+        return;
+    }
+    if(WipeStatGet()) {
+        return;
+        return_alt:
+        return;
+    } else {
+        if(HuARDMACheck()) {
+            goto return_alt;
+        }
+        if(nextOvl != OVL_INVALID) {
+            omOvlCallEx(nextOvl, 1, 0, 0);
+        } else {
+            if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
+                BoardTutorialKill();
+                BoardTutorialWorkRestore();
+            }
+            _ClearFlag(FLAG_ID_MAKE(1, 0));
+            HuARDirFree(DATADIR_BOARD);
+            if(_CheckFlag(FLAG_ID_MAKE(1, 27))) {
+                omOvlReturnEx(2, 1);
+            } else {
+                omOvlReturnEx(1, 1);
+            }
+        }
+    }
 }
 
 void BoardKill(void)
 {
-	_SetFlag(FLAG_ID_MAKE(1, 28));
-	_SetFlag(FLAG_ID_MAKE(1, 14));
-	if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
-		BoardTutorialHookExec(29, 0);
-	}
-	HuAudFXAllStop();
-	if(!BoardStartCheck()) {
-		WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
-		boardTutorialF = 1;
-		while(WipeStatGet()) {
-			HuPrcVSleep();
-		}
-	}
-	_SetFlag(FLAG_ID_MAKE(1, 17));
-	HuPrcKill(boardMainProc);
-	DestroyBoard();
+    _SetFlag(FLAG_ID_MAKE(1, 28));
+    _SetFlag(FLAG_ID_MAKE(1, 14));
+    if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
+        BoardTutorialHookExec(29, 0);
+    }
+    HuAudFXAllStop();
+    if(!BoardStartCheck()) {
+        WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
+        boardTutorialF = 1;
+        while(WipeStatGet()) {
+            HuPrcVSleep();
+        }
+    }
+    _SetFlag(FLAG_ID_MAKE(1, 17));
+    HuPrcKill(boardMainProc);
+    DestroyBoard();
 }
 
 s32 BoardIsKill(void)
 {
-	return (_CheckFlag(FLAG_ID_MAKE(1, 17))) ? 1 : 0;
+    return (_CheckFlag(FLAG_ID_MAKE(1, 17))) ? 1 : 0;
 }
 
 void BoardPauseDisableSet(s32 value)
 {
-	if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
-		_SetFlag(FLAG_ID_MAKE(1, 25));
-		omSysPauseEnable(FALSE);
-	} else {
-		if(value) {
-			_SetFlag(FLAG_ID_MAKE(1, 25));
-		} else {
-			_ClearFlag(FLAG_ID_MAKE(1, 25));
-		}
-	}
+    if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
+        _SetFlag(FLAG_ID_MAKE(1, 25));
+        omSysPauseEnable(FALSE);
+    } else {
+        if(value) {
+            _SetFlag(FLAG_ID_MAKE(1, 25));
+        } else {
+            _ClearFlag(FLAG_ID_MAKE(1, 25));
+        }
+    }
 }
 
 s32 BoardPauseDisableGet()
 {
-	return (_CheckFlag(FLAG_ID_MAKE(1, 25))) ? 1 : 0;
+    return (_CheckFlag(FLAG_ID_MAKE(1, 25))) ? 1 : 0;
 }
 
 void BoardSaveInit(s32 board)
 {
-	s32 i;
-	GWSystem.board = board;
-	_ClearFlag(FLAG_ID_MAKE(1, 0));
-	_ClearFlag(FLAG_ID_MAKE(1, 1));
-	_ClearFlag(FLAG_ID_MAKE(1, 5));
-	_ClearFlag(FLAG_ID_MAKE(1, 4));
-	_ClearFlag(FLAG_ID_MAKE(1, 6));
-	_ClearFlag(FLAG_ID_MAKE(1, 2));
-	_ClearFlag(FLAG_ID_MAKE(1, 9));
-	_ClearFlag(FLAG_ID_MAKE(1, 7));
-	_ClearFlag(FLAG_ID_MAKE(1, 8));
-	_ClearFlag(FLAG_ID_MAKE(0, 8));
-	_ClearFlag(FLAG_ID_MAKE(1, 12));
-	_ClearFlag(FLAG_ID_MAKE(1, 3));
-	GWSystem.turn = 1;
-	GWSystem.star_flag = 0;
-	GWSystem.star_pos = 0;
-	GWSystem.star_total = 1;
-	GWSystem.last5_effect = 0;
-	GWSystem.player_curr = -1;
-	GWSystem.bowser_loss = 0;
-	GWSystem.bowser_event = 0;
-	GWSystem.lucky_value = 1;
-	GWSystem.mg_next = 0;
-	GWMGTypeSet(0);
-	GWSystem.unk_38 = 0;
-	GWSystem.block_pos = 0;
-	memset(GWSystem.board_data, 0, sizeof(GWSystem.board_data));
-	for(i=0; i<4; i++) {
-		s32 party_flag;
-		BoardPlayerAutoSizeSet(i, 0);
-		GWPlayer[i].draw_ticket = 0;
-		GWPlayer[i].color = 0;
-		GWPlayer[i].bowser_suit = 0;
-		GWPlayer[i].jump = 0;
-		GWPlayer[i].space_shock = 0;
-		GWPlayer[i].spark = 0;
-		GWPlayer[i].show_next = 1;
-		BoardPlayerCoinsSet(i, 0);
-		if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
-			GWSystem.team = 0;
-		}
-		GWPlayer[i].blue_count = 0;
-		GWPlayer[i].red_count = 0;
-		GWPlayer[i].question_count = 0;
-		GWPlayer[i].fortune_count = 0;
-		GWPlayer[i].bowser_count = 0;
-		GWPlayer[i].battle_count = 0;
-		GWPlayer[i].mushroom_count = 0;
-		GWPlayer[i].warp_count = 0;
-		GWPlayer[i].coins_mg = 0;
-		GWPlayer[i].coins_total = 0;
-		GWPlayer[i].coins_max = 0;
-		GWPlayer[i].stars_max = 0;
-		GWPlayer[i].coins_battle = 0;
-		GWPlayer[i].coin_collect = 0;
-		GWPlayer[i].coin_win = 0;
-		GWPlayer[i].items[0] = -1;
-		GWPlayer[i].items[1] = -1;
-		GWPlayer[i].items[2] = -1;
-		if(GWPartyGet() == 0 || _CheckFlag(FLAG_ID_MAKE(1, 11))) {
-			GWStarsSet(i, 0);
-		} else {
-			GWStarsSet(i, BoardPlayerHandicapGet(i));
-		}
-	}
+    s32 i;
+    GWSystem.board = board;
+    _ClearFlag(FLAG_ID_MAKE(1, 0));
+    _ClearFlag(FLAG_ID_MAKE(1, 1));
+    _ClearFlag(FLAG_ID_MAKE(1, 5));
+    _ClearFlag(FLAG_ID_MAKE(1, 4));
+    _ClearFlag(FLAG_ID_MAKE(1, 6));
+    _ClearFlag(FLAG_ID_MAKE(1, 2));
+    _ClearFlag(FLAG_ID_MAKE(1, 9));
+    _ClearFlag(FLAG_ID_MAKE(1, 7));
+    _ClearFlag(FLAG_ID_MAKE(1, 8));
+    _ClearFlag(FLAG_ID_MAKE(0, 8));
+    _ClearFlag(FLAG_ID_MAKE(1, 12));
+    _ClearFlag(FLAG_ID_MAKE(1, 3));
+    GWSystem.turn = 1;
+    GWSystem.star_flag = 0;
+    GWSystem.star_pos = 0;
+    GWSystem.star_total = 1;
+    GWSystem.last5_effect = 0;
+    GWSystem.player_curr = -1;
+    GWSystem.bowser_loss = 0;
+    GWSystem.bowser_event = 0;
+    GWSystem.lucky_value = 1;
+    GWSystem.mg_next = 0;
+    GWMGTypeSet(0);
+    GWSystem.unk_38 = 0;
+    GWSystem.block_pos = 0;
+    memset(GWSystem.board_data, 0, sizeof(GWSystem.board_data));
+    for(i=0; i<4; i++) {
+        s32 party_flag;
+        BoardPlayerAutoSizeSet(i, 0);
+        GWPlayer[i].draw_ticket = 0;
+        GWPlayer[i].color = 0;
+        GWPlayer[i].bowser_suit = 0;
+        GWPlayer[i].jump = 0;
+        GWPlayer[i].space_shock = 0;
+        GWPlayer[i].spark = 0;
+        GWPlayer[i].show_next = 1;
+        BoardPlayerCoinsSet(i, 0);
+        if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
+            GWSystem.team = 0;
+        }
+        GWPlayer[i].blue_count = 0;
+        GWPlayer[i].red_count = 0;
+        GWPlayer[i].question_count = 0;
+        GWPlayer[i].fortune_count = 0;
+        GWPlayer[i].bowser_count = 0;
+        GWPlayer[i].battle_count = 0;
+        GWPlayer[i].mushroom_count = 0;
+        GWPlayer[i].warp_count = 0;
+        GWPlayer[i].coins_mg = 0;
+        GWPlayer[i].coins_total = 0;
+        GWPlayer[i].coins_max = 0;
+        GWPlayer[i].stars_max = 0;
+        GWPlayer[i].coins_battle = 0;
+        GWPlayer[i].coin_collect = 0;
+        GWPlayer[i].coin_win = 0;
+        GWPlayer[i].items[0] = -1;
+        GWPlayer[i].items[1] = -1;
+        GWPlayer[i].items[2] = -1;
+        if(GWPartyGet() == 0 || _CheckFlag(FLAG_ID_MAKE(1, 11))) {
+            GWStarsSet(i, 0);
+        } else {
+            GWStarsSet(i, BoardPlayerHandicapGet(i));
+        }
+    }
 }
 
 void BoardStoryConfigSet(s32 mg_list, s32 diff_story)
 {
-	GWSystem.party = 0;
-	GWSystem.team = 0;
-	GWSystem.diff_story = diff_story;
-	GWSystem.bonus_star = 0;
-	GWMGListSet(mg_list);
-	GWPlayer[0].handicap = 0;
-	GWPlayer[1].handicap = 0;
-	GWPlayer[2].handicap = 0;
-	GWPlayer[3].handicap = 0;
-	GWSystem.max_turn = 15;
-	memset(GWPlayer, 0, 4*sizeof(PlayerState));
-	_ClearFlag(FLAG_ID_MAKE(0, 2));
-	_ClearFlag(FLAG_ID_MAKE(0, 3));
-	_ClearFlag(FLAG_ID_MAKE(0, 4));
-	_ClearFlag(FLAG_ID_MAKE(0, 5));
-	_ClearFlag(FLAG_ID_MAKE(0, 6));
-	_ClearFlag(FLAG_ID_MAKE(0, 7));
-	_ClearFlag(FLAG_ID_MAKE(1, 11));
-	_SetFlag(FLAG_ID_MAKE(0, 11));
-	_SetFlag(FLAG_ID_MAKE(1, 10));
+    GWSystem.party = 0;
+    GWSystem.team = 0;
+    GWSystem.diff_story = diff_story;
+    GWSystem.bonus_star = 0;
+    GWMGListSet(mg_list);
+    GWPlayer[0].handicap = 0;
+    GWPlayer[1].handicap = 0;
+    GWPlayer[2].handicap = 0;
+    GWPlayer[3].handicap = 0;
+    GWSystem.max_turn = 15;
+    memset(GWPlayer, 0, 4*sizeof(PlayerState));
+    _ClearFlag(FLAG_ID_MAKE(0, 2));
+    _ClearFlag(FLAG_ID_MAKE(0, 3));
+    _ClearFlag(FLAG_ID_MAKE(0, 4));
+    _ClearFlag(FLAG_ID_MAKE(0, 5));
+    _ClearFlag(FLAG_ID_MAKE(0, 6));
+    _ClearFlag(FLAG_ID_MAKE(0, 7));
+    _ClearFlag(FLAG_ID_MAKE(1, 11));
+    _SetFlag(FLAG_ID_MAKE(0, 11));
+    _SetFlag(FLAG_ID_MAKE(1, 10));
 }
 
 void BoardPartyConfigSet(s32 team, s32 bonus_star, s32 mg_list, s32 max_turn, s32 p1_handicap, s32 p2_handicap, s32 p3_handicap, s32 p4_handicap)
 {
-	GWSystem.party = 1;
-	GWSystem.team = team;
-	GWSystem.diff_story = 0;
-	GWSystem.bonus_star = bonus_star;
-	GWMGListSet(mg_list);
-	GWSystem.max_turn = max_turn;
-	memset(GWPlayer, 0, 4*sizeof(PlayerState));
-	GWPlayer[0].handicap = p1_handicap;
-	GWPlayer[1].handicap = p2_handicap;
-	GWPlayer[2].handicap = p3_handicap;
-	GWPlayer[3].handicap = p4_handicap;
-	_ClearFlag(FLAG_ID_MAKE(1, 11));
-	_SetFlag(FLAG_ID_MAKE(0, 11));
-	_SetFlag(FLAG_ID_MAKE(1, 10));
+    GWSystem.party = 1;
+    GWSystem.team = team;
+    GWSystem.diff_story = 0;
+    GWSystem.bonus_star = bonus_star;
+    GWMGListSet(mg_list);
+    GWSystem.max_turn = max_turn;
+    memset(GWPlayer, 0, 4*sizeof(PlayerState));
+    GWPlayer[0].handicap = p1_handicap;
+    GWPlayer[1].handicap = p2_handicap;
+    GWPlayer[2].handicap = p3_handicap;
+    GWPlayer[3].handicap = p4_handicap;
+    _ClearFlag(FLAG_ID_MAKE(1, 11));
+    _SetFlag(FLAG_ID_MAKE(0, 11));
+    _SetFlag(FLAG_ID_MAKE(1, 10));
 }
 
 static void DestroyMainFunc(void)
 {
-	boardMainProc = NULL;
+    boardMainProc = NULL;
 }
 
 #define CHECK_LAST5_TURN() ((s32)(GWSystem.max_turn-GWSystem.turn) < 5)
 
 static void MainFunc(void)
 {
-	s32 i;
-	s32 fade_enable, turn_cont, fade_type;
-	fade_enable = 0;
-	turn_cont = 0;
-	BoardPauseDisableSet(1);
-	if(_CheckFlag(FLAG_ID_MAKE(0, 10))) {
-		_ClearFlag(FLAG_ID_MAKE(0, 10));
-		_SetFlag(FLAG_ID_MAKE(1, 16));
-		BoardKill();
-		HuPrcSleep(-1);
-	}
-	_ClearFlag(FLAG_ID_MAKE(0, 10));
-	BoardTutorialInit();
-	if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
-		BoardTutorialWorkSave();
-		BoardTutorialPlayerInit();
-		#if VERSION_PAL
-		GWMessSpeedSet(3);
-		#else
-		GWMessSpeedSet(1);
-		#endif
-	}
-	CreateBoard();
-	if(!_CheckFlag(FLAG_ID_MAKE(1, 1))) {
-		GWSystem.player_curr = -1;
-		BoardStartExec();
-		GWSystem.player_curr = 0;
-		fade_enable = 1;
-		_SetFlag(FLAG_ID_MAKE(1, 1));
-	} else {
-		fade_enable = 0;
-	}
-	if(ExecTurnStart()) {
-		turn_cont = 1;
-	}
-	if(CHECK_LAST5_TURN() && GWSystem.player_curr == 0 && !turn_cont) {
-		if(!_CheckFlag(FLAG_ID_MAKE(0, 8))) {
-			BoardLast5Exec();
-			_SetFlag(FLAG_ID_MAKE(0, 8));
-		} else {
-			BoardLast5GfxInit();
-		}
-	}
-	if(!turn_cont) {
-		fade_type = 1;
-	} else {
-		fade_type = 0;
-	}
-	_ClearFlag(FLAG_ID_MAKE(1, 28));
-	do {
-		BoardStatusShowSetAll(1);
-		if(GWBoardGet() == BOARD_ID_MAIN6 && GWSystem.player_curr == 0 && !turn_cont && boardTurnFunc) {
-			GWSystem.player_curr = -1;
-			boardTurnFunc();
-			GWSystem.player_curr = 0;
-		}
-		BoardMusStartBoard();
-		for(i=GWSystem.player_curr; i<4; i++) {
-			if(GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) {
-				if(CHECK_LAST5_TURN() && i == 0 && !turn_cont) {
-					BoardLast5GfxInit();
-					_SetFlag(FLAG_ID_MAKE(0, 8));
-				}
-			}
-			if(_CheckFlag(FLAG_ID_MAKE(1, 6))) {
-				BoardPlayerTurnExec(i);
-			} else {
-				if(!turn_cont) {
-					BoardCameraMoveSet(0);
-					GWSystem.player_curr = i;
-					BoardCameraTargetPlayerSet(i);
-					BoardCameraMotionWait();
-					{
-						Vec pos;
-						BoardSpacePosGet(0, GWPlayer[i].space_curr, &pos);
-						BoardPlayerPosSetV(i, &pos);
-					}
-					while(WipeStatGet()) {
-						HuPrcVSleep();
-					}
-					if(!fade_enable) {
-						if(!fade_type) {
-							WipeCreate(WIPE_MODE_IN, WIPE_TYPE_CROSS, 30);
-							while(WipeStatGet()) {
-								HuPrcVSleep();
-							}
-						} else {
-							fade_type = 0;
-							WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
-							while(WipeStatGet()) {
-								HuPrcVSleep();
-							}
-						}
-					} else {
-						fade_enable = 0;
-					}
-					BoardPlayerTurnExec(i);
-				}
-			}
-			turn_cont = 0;
-			if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
-				BoardTutorialHookExec(9, 0);
-			}
-			if(i != 3 || _CheckFlag(FLAG_ID_MAKE(1, 11))) {
-				WipeColorSet(255, 255, 255);
-				WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_CROSS, 1);
-				while(WipeStatGet()) {
-					HuPrcVSleep();
-				}
-				BoardPlayerMoveAwayStartCurr(GWPlayer[i].space_curr, 1);
-				fade_type = 0;
-			} else {
-				if(GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) {
-					if(GWSystem.turn != GWSystem.max_turn) {
-						WipeColorSet(255, 255, 255);
-						WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_CROSS, 1);
-						while(WipeStatGet()) {
-							HuPrcVSleep();
-						}
-						BoardPlayerMoveAwayStartCurr(GWPlayer[i].space_curr, 1);
-						fade_type = 0;
-					}
-				} else {
-					WipeColorSet(0, 0, 0);
-					WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 21);
-					while(WipeStatGet()) {
-						HuPrcVSleep();
-					}
-				}
-			}
-			BoardPlayerPostTurnHookExec(i);
-		}
-		if(GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) {
-			GWSystem.player_curr = 0;
-			if(BoardTurnNext()) {
-				BoardAudSeqFadeOut(0, 500);
-				BoardKill();
-				HuPrcEnd();
-				HuPrcSleep(-1);
-			}
-		} else {
-			_SetFlag(FLAG_ID_MAKE(1, 28));
-			_SetFlag(FLAG_ID_MAKE(1, 14));
-			BoardPauseDisableSet(1);
-			_ClearFlag(FLAG_ID_MAKE(1, 9));
-			if(_CheckFlag(FLAG_ID_MAKE(2, 0)) || _CheckFlag(FLAG_ID_MAKE(1, 11)) ) {
-				for(i=0; i<4; i++) {
-					GWPlayer[i].color = 0;
-				}
-				GWSystem.player_curr = (GWSystem.player_curr+1)&3;
-			} else {
-				BoardMGSetupExec();
-				HuPrcSleep(-1);
-			}
-		}
-	} while(1);
+    s32 i;
+    s32 fade_enable, turn_cont, fade_type;
+    fade_enable = 0;
+    turn_cont = 0;
+    BoardPauseDisableSet(1);
+    if(_CheckFlag(FLAG_ID_MAKE(0, 10))) {
+        _ClearFlag(FLAG_ID_MAKE(0, 10));
+        _SetFlag(FLAG_ID_MAKE(1, 16));
+        BoardKill();
+        HuPrcSleep(-1);
+    }
+    _ClearFlag(FLAG_ID_MAKE(0, 10));
+    BoardTutorialInit();
+    if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
+        BoardTutorialWorkSave();
+        BoardTutorialPlayerInit();
+        #if VERSION_PAL
+        GWMessSpeedSet(3);
+        #else
+        GWMessSpeedSet(1);
+        #endif
+    }
+    CreateBoard();
+    if(!_CheckFlag(FLAG_ID_MAKE(1, 1))) {
+        GWSystem.player_curr = -1;
+        BoardStartExec();
+        GWSystem.player_curr = 0;
+        fade_enable = 1;
+        _SetFlag(FLAG_ID_MAKE(1, 1));
+    } else {
+        fade_enable = 0;
+    }
+    if(ExecTurnStart()) {
+        turn_cont = 1;
+    }
+    if(CHECK_LAST5_TURN() && GWSystem.player_curr == 0 && !turn_cont) {
+        if(!_CheckFlag(FLAG_ID_MAKE(0, 8))) {
+            BoardLast5Exec();
+            _SetFlag(FLAG_ID_MAKE(0, 8));
+        } else {
+            BoardLast5GfxInit();
+        }
+    }
+    if(!turn_cont) {
+        fade_type = 1;
+    } else {
+        fade_type = 0;
+    }
+    _ClearFlag(FLAG_ID_MAKE(1, 28));
+    do {
+        BoardStatusShowSetAll(1);
+        if(GWBoardGet() == BOARD_ID_MAIN6 && GWSystem.player_curr == 0 && !turn_cont && boardTurnFunc) {
+            GWSystem.player_curr = -1;
+            boardTurnFunc();
+            GWSystem.player_curr = 0;
+        }
+        BoardMusStartBoard();
+        for(i=GWSystem.player_curr; i<4; i++) {
+            if(GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) {
+                if(CHECK_LAST5_TURN() && i == 0 && !turn_cont) {
+                    BoardLast5GfxInit();
+                    _SetFlag(FLAG_ID_MAKE(0, 8));
+                }
+            }
+            if(_CheckFlag(FLAG_ID_MAKE(1, 6))) {
+                BoardPlayerTurnExec(i);
+            } else {
+                if(!turn_cont) {
+                    BoardCameraMoveSet(0);
+                    GWSystem.player_curr = i;
+                    BoardCameraTargetPlayerSet(i);
+                    BoardCameraMotionWait();
+                    {
+                        Vec pos;
+                        BoardSpacePosGet(0, GWPlayer[i].space_curr, &pos);
+                        BoardPlayerPosSetV(i, &pos);
+                    }
+                    while(WipeStatGet()) {
+                        HuPrcVSleep();
+                    }
+                    if(!fade_enable) {
+                        if(!fade_type) {
+                            WipeCreate(WIPE_MODE_IN, WIPE_TYPE_CROSS, 30);
+                            while(WipeStatGet()) {
+                                HuPrcVSleep();
+                            }
+                        } else {
+                            fade_type = 0;
+                            WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
+                            while(WipeStatGet()) {
+                                HuPrcVSleep();
+                            }
+                        }
+                    } else {
+                        fade_enable = 0;
+                    }
+                    BoardPlayerTurnExec(i);
+                }
+            }
+            turn_cont = 0;
+            if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
+                BoardTutorialHookExec(9, 0);
+            }
+            if(i != 3 || _CheckFlag(FLAG_ID_MAKE(1, 11))) {
+                WipeColorSet(255, 255, 255);
+                WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_CROSS, 1);
+                while(WipeStatGet()) {
+                    HuPrcVSleep();
+                }
+                BoardPlayerMoveAwayStartCurr(GWPlayer[i].space_curr, 1);
+                fade_type = 0;
+            } else {
+                if(GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) {
+                    if(GWSystem.turn != GWSystem.max_turn) {
+                        WipeColorSet(255, 255, 255);
+                        WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_CROSS, 1);
+                        while(WipeStatGet()) {
+                            HuPrcVSleep();
+                        }
+                        BoardPlayerMoveAwayStartCurr(GWPlayer[i].space_curr, 1);
+                        fade_type = 0;
+                    }
+                } else {
+                    WipeColorSet(0, 0, 0);
+                    WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 21);
+                    while(WipeStatGet()) {
+                        HuPrcVSleep();
+                    }
+                }
+            }
+            BoardPlayerPostTurnHookExec(i);
+        }
+        if(GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) {
+            GWSystem.player_curr = 0;
+            if(BoardTurnNext()) {
+                BoardAudSeqFadeOut(0, 500);
+                BoardKill();
+                HuPrcEnd();
+                HuPrcSleep(-1);
+            }
+        } else {
+            _SetFlag(FLAG_ID_MAKE(1, 28));
+            _SetFlag(FLAG_ID_MAKE(1, 14));
+            BoardPauseDisableSet(1);
+            _ClearFlag(FLAG_ID_MAKE(1, 9));
+            if(_CheckFlag(FLAG_ID_MAKE(2, 0)) || _CheckFlag(FLAG_ID_MAKE(1, 11)) ) {
+                for(i=0; i<4; i++) {
+                    GWPlayer[i].color = 0;
+                }
+                GWSystem.player_curr = (GWSystem.player_curr+1)&3;
+            } else {
+                BoardMGSetupExec();
+                HuPrcSleep(-1);
+            }
+        }
+    } while(1);
 }
 
 s32 BoardTurnNext(void)
 {
-	s32 i;
-	for(i=0; i<4; i++) {
-		GWPlayer[i].color = 0;
-	}
-	GWSystem.turn++;
-	if(GWSystem.turn > GWSystem.max_turn) {
-		return 1;
-	} else {
-		return 0;
-	}
+    s32 i;
+    for(i=0; i<4; i++) {
+        GWPlayer[i].color = 0;
+    }
+    GWSystem.turn++;
+    if(GWSystem.turn > GWSystem.max_turn) {
+        return 1;
+    } else {
+        return 0;
+    }
 }
 
 static s32 ExecTurnStart(void)
 {
-	s32 player;
-	s32 space;
-	if(!BoardStartCheck()) {
-		return 0;
-	}
-	player = GWSystem.player_curr;
-	space = GWPlayer[player].space_curr;
-	if(_CheckFlag(FLAG_ID_MAKE(1, 5))) {
-		BoardFortuneExec(player, space);
-		_ClearFlag(FLAG_ID_MAKE(1, 5));
-	} else if(_CheckFlag(FLAG_ID_MAKE(1, 4))) {
-		BoardMusStartBoard();
-		BoardBattleExec(player, space);
-		_ClearFlag(FLAG_ID_MAKE(1, 4));
-	} else if(_CheckFlag(FLAG_ID_MAKE(1, 3))) {
-		BoardBowserExec(player, space);
-		_ClearFlag(FLAG_ID_MAKE(1, 3));
-	} else if(_CheckFlag(FLAG_ID_MAKE(1, 2))) {
-		s32 turn_end = 0;
-		BoardCameraMoveSet(0);
-		BoardCameraViewSet(2);
-		BoardCameraMotionWait();
-		turn_end = BoardTurnNext();
-		if(turn_end) {
-			BoardKill();
-			HuPrcEnd();
-		}
-		_ClearFlag(FLAG_ID_MAKE(1, 2));
-		return 0;
-	} else if(_CheckFlag(FLAG_ID_MAKE(1, 6))) {
-		boardTurnStartFunc(player, space);
-		return 1;
-	}
-	BoardPlayerZoomRestore(player);
-	return 1;
+    s32 player;
+    s32 space;
+    if(!BoardStartCheck()) {
+        return 0;
+    }
+    player = GWSystem.player_curr;
+    space = GWPlayer[player].space_curr;
+    if(_CheckFlag(FLAG_ID_MAKE(1, 5))) {
+        BoardFortuneExec(player, space);
+        _ClearFlag(FLAG_ID_MAKE(1, 5));
+    } else if(_CheckFlag(FLAG_ID_MAKE(1, 4))) {
+        BoardMusStartBoard();
+        BoardBattleExec(player, space);
+        _ClearFlag(FLAG_ID_MAKE(1, 4));
+    } else if(_CheckFlag(FLAG_ID_MAKE(1, 3))) {
+        BoardBowserExec(player, space);
+        _ClearFlag(FLAG_ID_MAKE(1, 3));
+    } else if(_CheckFlag(FLAG_ID_MAKE(1, 2))) {
+        s32 turn_end = 0;
+        BoardCameraMoveSet(0);
+        BoardCameraViewSet(2);
+        BoardCameraMotionWait();
+        turn_end = BoardTurnNext();
+        if(turn_end) {
+            BoardKill();
+            HuPrcEnd();
+        }
+        _ClearFlag(FLAG_ID_MAKE(1, 2));
+        return 0;
+    } else if(_CheckFlag(FLAG_ID_MAKE(1, 6))) {
+        boardTurnStartFunc(player, space);
+        return 1;
+    }
+    BoardPlayerZoomRestore(player);
+    return 1;
 }
 
 void BoardNextOvlSet(OverlayID overlay)
 {
-	nextOvl = overlay;
-	BoardAudSeqFadeOut(0, 1000);
-	BoardKill();
+    nextOvl = overlay;
+    BoardAudSeqFadeOut(0, 1000);
+    BoardKill();
 }
 
 s32 BoardStartCheck(void)
 {
-	if(_CheckFlag(FLAG_ID_MAKE(1, 2)) || _CheckFlag(FLAG_ID_MAKE(1, 3)) || _CheckFlag(FLAG_ID_MAKE(1, 4)) || _CheckFlag(FLAG_ID_MAKE(1, 5)) || _CheckFlag(FLAG_ID_MAKE(1, 6))) {
-		return 1;
-	} else {
-		return 0;
-	}
+    if(_CheckFlag(FLAG_ID_MAKE(1, 2)) || _CheckFlag(FLAG_ID_MAKE(1, 3)) || _CheckFlag(FLAG_ID_MAKE(1, 4)) || _CheckFlag(FLAG_ID_MAKE(1, 5)) || _CheckFlag(FLAG_ID_MAKE(1, 6))) {
+        return 1;
+    } else {
+        return 0;
+    }
 }
 
 static void CreateBoard(void)
 {
-	s32 guest_status;
-	
-	GWSystem.mg_next = -1;
-	if(!GWGameStat.field10E_bit5 && GWMGListGet() == 2) {
-		GWMGListSet(0);
-	}
-	GWMessSpeedSet(GWMessSpeedGet());
-	if(GWMGExplainGet()) {
-		_SetFlag(FLAG_ID_MAKE(0, 11));
-	} else {
-		_ClearFlag(FLAG_ID_MAKE(0, 11));
-	}
-	if(!BoardStartCheck()) {
-		_ClearFlag(FLAG_ID_MAKE(1, 2));
-		_ClearFlag(FLAG_ID_MAKE(1, 3));
-		_ClearFlag(FLAG_ID_MAKE(1, 4));
-		_ClearFlag(FLAG_ID_MAKE(1, 5));
-		_ClearFlag(FLAG_ID_MAKE(1, 6));
-	}
-	_ClearFlag(FLAG_ID_MAKE(1, 8));
-	if(!BoardStartCheck()) {
-		GWSystem.lucky_value = 1;
-	}
-	guest_status = BoardDataDirReadAsync(DATADIR_BGUEST);
-	if(guest_status != -1) {
-		BoardDataAsyncWait(guest_status);
-	}
-	BoardAudSeqClear();
-	BoardModelInit();
-	BoardRandInit();
-	BoardWinInit();
-	BoardPlayerModelInit();
-	createFunc();
-	BoardLightSetExec();
-	BoardLotteryInit();
-	BoardShopInit();
-	BoardBooHouseCreate();
-	BoardCameraInit();
-	BoardStatusCreate();
-	CharModelDataClose(-1);
-	BoardPlayerInit();
-	if(GWSystem.last5_effect == 2) {
-		BoardSpaceTypeForce(2, 3);
-	}
-	if(GWSystem.last5_effect == 3) {
-		BoardSpaceTypeForce(2, 7);
-	}
-	BoardCameraMoveSet(0);
-	BoardCameraTargetPlayerSet(0);
-	BoardCameraViewSet(2);
-	BoardCameraMotionWait();
-	BoardTauntInit();
-	_SetFlag(FLAG_ID_MAKE(1, 14));
-	HuDataDirClose(DATADIR_BKOOPASUIT);
-	HuDataDirClose(DATADIR_BBATTLE);
-	HuDataDirClose(DATADIR_BKOOPA);
-	HuDataDirClose(DATADIR_BKUJIYA);
-	HuDataDirClose(DATADIR_BYOKODORI);
-	HuDataDirClose(DATADIR_BPAUSE);
-	HuDataDirClose(DATADIR_BLAST5);
-	HuDataDirClose(DATADIR_EFFECT);
-	_SetFlag(FLAG_ID_MAKE(1, 16));
+    s32 guest_status;
+
+    GWSystem.mg_next = -1;
+    if(!GWGameStat.field10E_bit5 && GWMGListGet() == 2) {
+        GWMGListSet(0);
+    }
+    GWMessSpeedSet(GWMessSpeedGet());
+    if(GWMGExplainGet()) {
+        _SetFlag(FLAG_ID_MAKE(0, 11));
+    } else {
+        _ClearFlag(FLAG_ID_MAKE(0, 11));
+    }
+    if(!BoardStartCheck()) {
+        _ClearFlag(FLAG_ID_MAKE(1, 2));
+        _ClearFlag(FLAG_ID_MAKE(1, 3));
+        _ClearFlag(FLAG_ID_MAKE(1, 4));
+        _ClearFlag(FLAG_ID_MAKE(1, 5));
+        _ClearFlag(FLAG_ID_MAKE(1, 6));
+    }
+    _ClearFlag(FLAG_ID_MAKE(1, 8));
+    if(!BoardStartCheck()) {
+        GWSystem.lucky_value = 1;
+    }
+    guest_status = BoardDataDirReadAsync(DATADIR_BGUEST);
+    if(guest_status != -1) {
+        BoardDataAsyncWait(guest_status);
+    }
+    BoardAudSeqClear();
+    BoardModelInit();
+    BoardRandInit();
+    BoardWinInit();
+    BoardPlayerModelInit();
+    createFunc();
+    BoardLightSetExec();
+    BoardLotteryInit();
+    BoardShopInit();
+    BoardBooHouseCreate();
+    BoardCameraInit();
+    BoardStatusCreate();
+    CharModelDataClose(-1);
+    BoardPlayerInit();
+    if(GWSystem.last5_effect == 2) {
+        BoardSpaceTypeForce(2, 3);
+    }
+    if(GWSystem.last5_effect == 3) {
+        BoardSpaceTypeForce(2, 7);
+    }
+    BoardCameraMoveSet(0);
+    BoardCameraTargetPlayerSet(0);
+    BoardCameraViewSet(2);
+    BoardCameraMotionWait();
+    BoardTauntInit();
+    _SetFlag(FLAG_ID_MAKE(1, 14));
+    HuDataDirClose(DATADIR_BKOOPASUIT);
+    HuDataDirClose(DATADIR_BBATTLE);
+    HuDataDirClose(DATADIR_BKOOPA);
+    HuDataDirClose(DATADIR_BKUJIYA);
+    HuDataDirClose(DATADIR_BYOKODORI);
+    HuDataDirClose(DATADIR_BPAUSE);
+    HuDataDirClose(DATADIR_BLAST5);
+    HuDataDirClose(DATADIR_EFFECT);
+    _SetFlag(FLAG_ID_MAKE(1, 16));
 }
 
 static void DestroyBoard(void)
 {
-	s32 dir_table[] = {
-		DATADIR_W01,
-		DATADIR_W02,
-		DATADIR_W03,
-		DATADIR_W04,
-		DATADIR_W05,
-		DATADIR_W06,
-		DATADIR_W10,
-		DATADIR_W20,
-		DATADIR_W21
-	};
-	BoardTauntKill();
-	BoardAudSeqFadeOutAll();
-	HuAudAllStop();
-	BoardRollKill();
-	BoardStatusKill();
-	BoardBooHouseKill();
-	BoardShopKill();
-	BoardLotteryKill(); 
-	BoardSpaceDestroy();
-	BoardPlayerModelKill();
-	if(destroyFunc) {
-		destroyFunc();
-	}
-	BoardModelKillAll();
-	BoardWinKillAll();
-	HuDataDirClose(dir_table[GWBoardGet()]);
-	HuDataDirClose(DATADIR_EFFECT);
-	HuDataDirClose(DATADIR_BGUEST);
-	HuDataDirClose(DATADIR_BKOOPASUIT);
-	HuDataDirClose(DATADIR_BBATTLE);
-	HuDataDirClose(DATADIR_BKOOPA);
-	HuDataDirClose(DATADIR_BKUJIYA);
-	HuDataDirClose(DATADIR_BYOKODORI);
-	HuDataDirClose(DATADIR_BOARD);
-	createFunc = destroyFunc = NULL;
+    s32 dir_table[] = {
+        DATADIR_W01,
+        DATADIR_W02,
+        DATADIR_W03,
+        DATADIR_W04,
+        DATADIR_W05,
+        DATADIR_W06,
+        DATADIR_W10,
+        DATADIR_W20,
+        DATADIR_W21
+    };
+    BoardTauntKill();
+    BoardAudSeqFadeOutAll();
+    HuAudAllStop();
+    BoardRollKill();
+    BoardStatusKill();
+    BoardBooHouseKill();
+    BoardShopKill();
+    BoardLotteryKill(); 
+    BoardSpaceDestroy();
+    BoardPlayerModelKill();
+    if(destroyFunc) {
+        destroyFunc();
+    }
+    BoardModelKillAll();
+    BoardWinKillAll();
+    HuDataDirClose(dir_table[GWBoardGet()]);
+    HuDataDirClose(DATADIR_EFFECT);
+    HuDataDirClose(DATADIR_BGUEST);
+    HuDataDirClose(DATADIR_BKOOPASUIT);
+    HuDataDirClose(DATADIR_BBATTLE);
+    HuDataDirClose(DATADIR_BKOOPA);
+    HuDataDirClose(DATADIR_BKUJIYA);
+    HuDataDirClose(DATADIR_BYOKODORI);
+    HuDataDirClose(DATADIR_BOARD);
+    createFunc = destroyFunc = NULL;
 }
 
 void BoardLightHookSet(BoardLightHook set, BoardLightHook reset)
 {
-	boardLightSetHook = set;
-	boardLightResetHook = reset;
+    boardLightSetHook = set;
+    boardLightResetHook = reset;
 }
 
 void BoardLightSetExec(void)
 {
-	Hu3DBGColorSet(0, 0, 0);
-	if(boardLightSetHook) {
-		boardLightSetHook();
-	}
+    Hu3DBGColorSet(0, 0, 0);
+    if(boardLightSetHook) {
+        boardLightSetHook();
+    }
 }
 
 void BoardLightResetExec(void)
 {
-	if(boardLightResetHook) {
-		boardLightResetHook();
-	}
-	Hu3DBGColorSet(0, 0, 0);
-	Hu3DFogClear();
-	Hu3DReflectNoSet(0);
+    if(boardLightResetHook) {
+        boardLightResetHook();
+    }
+    Hu3DBGColorSet(0, 0, 0);
+    Hu3DFogClear();
+    Hu3DReflectNoSet(0);
 }
 
 //Fixes order of boardCamera and cameraBackup
 static BoardCameraData *BoardCameraGet(void)
 {
-	return &boardCamera;
+    return &boardCamera;
 }
 
 void BoardCameraBackup(void)
 {
-	cameraUseBackup = TRUE;
-	memcpy(&cameraBackup, &boardCamera, sizeof(BoardCameraData));
+    cameraUseBackup = TRUE;
+    memcpy(&cameraBackup, &boardCamera, sizeof(BoardCameraData));
 }
 
 void BoardCameraRestore(void)
 {
-	if(cameraUseBackup) {
-		memcpy(&boardCamera, &cameraBackup, sizeof(BoardCameraData));
-		cameraUseBackup = FALSE;
-	}
+    if(cameraUseBackup) {
+        memcpy(&boardCamera, &cameraBackup, sizeof(BoardCameraData));
+        cameraUseBackup = FALSE;
+    }
 }
 
 void BoardCameraScissorSet(s32 x, s32 y, s32 w, s32 h)
 {
-	BoardCameraData *camera = &boardCamera;
-	Hu3DCameraScissorSet(camera->mask, x, y, w, h);
+    BoardCameraData *camera = &boardCamera;
+    Hu3DCameraScissorSet(camera->mask, x, y, w, h);
 }
 
 void BoardCameraViewSet(s32 type)
 {
-	BoardCameraData *camera = &boardCamera;
-	BoardFocusData *focus;
-	float size;
-	if(!cameraObj) {
-		return;
-	}
-	focus = &camera->focus;
-	if(type == 0) {
-		focus->view_type = 0;
-		return;
-	}
-	OSs16tof32(&camViewTbl[type].fov, &focus->fov_end);
-	focus->fov_start = camera->fov;
-	OSs16tof32(&camViewTbl[type].zoom, &focus->zoom_end);
-	focus->zoom_start = camera->zoom;
-	OSs16tof32(&camViewTbl[type].x_rot, &focus->rot_end.x);
-	focus->rot_end.y = 0;
-	focus->rot_end.z = 0;
-	focus->rot_start = camera->rot;
-	focus->target_start = camera->target;
-	if(BoardPlayerSizeGet(GWSystem.player_curr) == 2 || GWPlayer[GWSystem.player_curr].bowser_suit) {
-		focus->zoom_end += 400.0f;
-		size = 2.5f;
-	} else {
-		size = 1.0f;
-	}
-	BoardCameraTargetModelSet(BoardPlayerModelGet(GWSystem.player_curr));
-	BoardPlayerPosGet(GWSystem.player_curr, &focus->target_end);
-	BoardCameraOffsetSet(0.0f, 100.0f*size, 0.0f);
-	focus->target_end.y += 100.0f*size;
-	_SetFlag(FLAG_ID_MAKE(1, 21));
-	focus->view_type = type;
-	focus->time = 0;
-	if(camera->moving) {
-		focus->max_time = 21;
-	} else {
-		focus->max_time = 1;
-	}
+    BoardCameraData *camera = &boardCamera;
+    BoardFocusData *focus;
+    float size;
+    if(!cameraObj) {
+        return;
+    }
+    focus = &camera->focus;
+    if(type == 0) {
+        focus->view_type = 0;
+        return;
+    }
+    OSs16tof32(&camViewTbl[type].fov, &focus->fov_end);
+    focus->fov_start = camera->fov;
+    OSs16tof32(&camViewTbl[type].zoom, &focus->zoom_end);
+    focus->zoom_start = camera->zoom;
+    OSs16tof32(&camViewTbl[type].x_rot, &focus->rot_end.x);
+    focus->rot_end.y = 0;
+    focus->rot_end.z = 0;
+    focus->rot_start = camera->rot;
+    focus->target_start = camera->target;
+    if(BoardPlayerSizeGet(GWSystem.player_curr) == 2 || GWPlayer[GWSystem.player_curr].bowser_suit) {
+        focus->zoom_end += 400.0f;
+        size = 2.5f;
+    } else {
+        size = 1.0f;
+    }
+    BoardCameraTargetModelSet(BoardPlayerModelGet(GWSystem.player_curr));
+    BoardPlayerPosGet(GWSystem.player_curr, &focus->target_end);
+    BoardCameraOffsetSet(0.0f, 100.0f*size, 0.0f);
+    focus->target_end.y += 100.0f*size;
+    _SetFlag(FLAG_ID_MAKE(1, 21));
+    focus->view_type = type;
+    focus->time = 0;
+    if(camera->moving) {
+        focus->max_time = 21;
+    } else {
+        focus->max_time = 1;
+    }
 }
 
 s32 BoardCameraPosGet(Vec *dst)
 {
-	BoardCameraData *camera;
-	if(!dst) {
-		return -1;
-	}
-	camera = &boardCamera;
-	*dst = camera->pos;
-	return 0;
+    BoardCameraData *camera;
+    if(!dst) {
+        return -1;
+    }
+    camera = &boardCamera;
+    *dst = camera->pos;
+    return 0;
 }
 
 s32 BoardCameraTargetGet(Vec *dst)
 {
-	BoardCameraData *camera;
-	if(!dst) {
-		return -1;
-	}
-	camera = &boardCamera;
-	*dst = camera->target;
-	return 0;
+    BoardCameraData *camera;
+    if(!dst) {
+        return -1;
+    }
+    camera = &boardCamera;
+    *dst = camera->target;
+    return 0;
 }
 
 s32 BoardCameraRotGet(Vec *dst)
 {
-	BoardCameraData *camera;
-	if(!dst) {
-		return -1;
-	}
-	camera = &boardCamera;
-	*dst = camera->rot;
-	return 0;
+    BoardCameraData *camera;
+    if(!dst) {
+        return -1;
+    }
+    camera = &boardCamera;
+    *dst = camera->rot;
+    return 0;
 }
 
 float BoardCameraZoomGet()
 {
-	BoardCameraData *camera;
-	camera = &boardCamera;
-	return camera->zoom;
+    BoardCameraData *camera;
+    camera = &boardCamera;
+    return camera->zoom;
 }
 
 s32 BoardCameraDirGet(Vec *dst)
 {
-	BoardCameraData *camera;
-	if(!dst) {
-		return -1;
-	}
-	camera = &boardCamera;
-	if(!camera) {
-		return -1;
-	}
-	VECSubtract(&camera->target, &camera->pos, dst);
-	if(dst->x != 0 || dst->y != 0 || dst->z != 0) {
-		VECNormalize(dst, dst);
-	}
-	return 0;
+    BoardCameraData *camera;
+    if(!dst) {
+        return -1;
+    }
+    camera = &boardCamera;
+    if(!camera) {
+        return -1;
+    }
+    VECSubtract(&camera->target, &camera->pos, dst);
+    if(dst->x != 0 || dst->y != 0 || dst->z != 0) {
+        VECNormalize(dst, dst);
+    }
+    return 0;
 }
 
 s32 BoardCameraPointDirGet(Vec *point, Vec *dst)
 {
-	BoardCameraData *camera;
-	if(!dst || !point) {
-		return -1;
-	}
-	camera = &boardCamera;
-	if(!camera) {
-		return -1;
-	}
-	VECSubtract(point, &camera->pos, dst);
-	if(dst->x != 0 || dst->y != 0 || dst->z != 0) {
-		VECNormalize(dst, dst);
-	}
-	return 0;
+    BoardCameraData *camera;
+    if(!dst || !point) {
+        return -1;
+    }
+    camera = &boardCamera;
+    if(!camera) {
+        return -1;
+    }
+    VECSubtract(point, &camera->pos, dst);
+    if(dst->x != 0 || dst->y != 0 || dst->z != 0) {
+        VECNormalize(dst, dst);
+    }
+    return 0;
 }
 
 void BoardCameraMaskSet(u16 mask)
 {
-	BoardCameraData *camera = &boardCamera;
-	if(!camera) {
-		return;
-	}
-	camera->mask = mask;
+    BoardCameraData *camera = &boardCamera;
+    if(!camera) {
+        return;
+    }
+    camera->mask = mask;
 }
 
 void BoardCameraMoveSet(s32 move)
 {
-	BoardCameraData *camera = &boardCamera;
-	if(!camera) {
-		return;
-	}
-	if(!move) {
-		camera->moving = 0;
-	} else {
-		camera->moving = 1;
-	}
+    BoardCameraData *camera = &boardCamera;
+    if(!camera) {
+        return;
+    }
+    if(!move) {
+        camera->moving = 0;
+    } else {
+        camera->moving = 1;
+    }
 }
 
 void BoardCameraOffsetSet(float x, float y, float z)
 {
-	BoardCameraData *camera = &boardCamera;
-	if(!camera) {
-		return;
-	}
-	camera->offset.x = x;
-	camera->offset.y = y;
-	camera->offset.z = z;
+    BoardCameraData *camera = &boardCamera;
+    if(!camera) {
+        return;
+    }
+    camera->offset.x = x;
+    camera->offset.y = y;
+    camera->offset.z = z;
 }
 
 void BoardCameraTargetPlayerSet(s32 player)
 {
-	PlayerState *player_ptr = BoardPlayerGet(player);
-	if(!player_ptr) {
-		BoardCameraTargetModelSet(-1);
-		return;
-	}
-	BoardCameraTargetModelSet(BoardPlayerModelGet(player));
-	BoardCameraOffsetSet(0, 100, 0);
+    PlayerState *player_ptr = BoardPlayerGet(player);
+    if(!player_ptr) {
+        BoardCameraTargetModelSet(-1);
+        return;
+    }
+    BoardCameraTargetModelSet(BoardPlayerModelGet(player));
+    BoardCameraOffsetSet(0, 100, 0);
 }
 
 void BoardCameraTargetModelSet(s16 model)
 {
-	BoardCameraData *camera = &boardCamera;
-	if(!camera) {
-		return;
-	}
-	camera->target_mdl = model;
-	camera->target_space = -1;
-	camera->offset.x = camera->offset.y = camera->offset.z = 0;
+    BoardCameraData *camera = &boardCamera;
+    if(!camera) {
+        return;
+    }
+    camera->target_mdl = model;
+    camera->target_space = -1;
+    camera->offset.x = camera->offset.y = camera->offset.z = 0;
 }
 
 void BoardCameraTargetSpaceSet(s32 space)
 {
-	BoardCameraData *camera = &boardCamera;
-	if(!camera) {
-		return;
-	}
-	camera->target_mdl = -1;
-	camera->target_space = space;
-	camera->offset.x = camera->offset.y = camera->offset.z = 0;
+    BoardCameraData *camera = &boardCamera;
+    if(!camera) {
+        return;
+    }
+    camera->target_mdl = -1;
+    camera->target_space = space;
+    camera->offset.x = camera->offset.y = camera->offset.z = 0;
 }
 
 void BoardCameraPosCalcFuncSet(BoardCameraPosCalcFunc func)
 {
-	BoardCameraData *camera = &boardCamera;
-	if(!camera) {
-		return;
-	}
-	camera->pos_calc = func;
+    BoardCameraData *camera = &boardCamera;
+    if(!camera) {
+        return;
+    }
+    camera->pos_calc = func;
 }
 
 void BoardCameraQuakeSet(s32 duration, float strength)
 {
-	BoardCameraData *camera = &boardCamera;
-	if(!camera) {
-		return;
-	}
-	camera->quaking = 1;
-	camera->quake_strength = strength;
-	camera->quake_timer = duration;
+    BoardCameraData *camera = &boardCamera;
+    if(!camera) {
+        return;
+    }
+    camera->quaking = 1;
+    camera->quake_strength = strength;
+    camera->quake_timer = duration;
 }
 
 void BoardCameraQuakeReset()
 {
-	BoardCameraData *camera = &boardCamera;
-	camera->quaking = 0;
-	camera->quake_strength = 0;
-	camera->quake_timer = 0;
+    BoardCameraData *camera = &boardCamera;
+    camera->quaking = 0;
+    camera->quake_strength = 0;
+    camera->quake_timer = 0;
 }
 
 void BoardCameraTargetSet(float x, float y, float z)
 {
-	BoardCameraData *camera = &boardCamera;
-	camera->target.x = x;
-	camera->target.y = y;
-	camera->target.z = z;
+    BoardCameraData *camera = &boardCamera;
+    camera->target.x = x;
+    camera->target.y = y;
+    camera->target.z = z;
 }
 
 void BoardCameraPosSet(float x, float y, float z)
 {
-	BoardCameraData *camera = &boardCamera;
-	camera->pos.x = x;
-	camera->pos.y = y;
-	camera->pos.z = z;
+    BoardCameraData *camera = &boardCamera;
+    camera->pos.x = x;
+    camera->pos.y = y;
+    camera->pos.z = z;
 }
 
 void BoardCameraXRotZoomSet(float zoom, float x_rot)
 {
-	BoardCameraData *camera = &boardCamera;
-	camera->zoom = zoom;
-	camera->rot.x = x_rot;
+    BoardCameraData *camera = &boardCamera;
+    camera->zoom = zoom;
+    camera->rot.x = x_rot;
 }
 
 void BoardCameraZoomSet(float zoom)
 {
-	BoardCameraData *camera = &boardCamera;
-	camera->zoom = zoom;
+    BoardCameraData *camera = &boardCamera;
+    camera->zoom = zoom;
 }
 
 void BoardCameraRotSet(float x, float y)
 {
-	BoardCameraData *camera = &boardCamera;
-	camera->rot.x = x;
-	camera->rot.y = y;
+    BoardCameraData *camera = &boardCamera;
+    camera->rot.x = x;
+    camera->rot.y = y;
 }
 
 void BoardCameraNearFarSet(float near, float far)
 {
-	BoardCameraData *camera = &boardCamera;
-	camera->near = near;
-	camera->far = far;
+    BoardCameraData *camera = &boardCamera;
+    camera->near = near;
+    camera->far = far;
 }
 
 void BoardCameraNearFarGet(float *near, float *far)
 {
-	BoardCameraData *camera = &boardCamera;
-	if(near) {
-		*near = camera->near;
-	}
-	if(far) {
-		*far = camera->far;
-	}
+    BoardCameraData *camera = &boardCamera;
+    if(near) {
+        *near = camera->near;
+    }
+    if(far) {
+        *far = camera->far;
+    }
 }
 
 void BoardCameraMotionStart(s16 model_target, Vec *rot_target, float zoom_target, float fov_target)
 {
-	BoardCameraMotionStartEx(model_target, rot_target, NULL, zoom_target, fov_target, 21);
+    BoardCameraMotionStartEx(model_target, rot_target, NULL, zoom_target, fov_target, 21);
 }
 
 void BoardCameraMotionStartEx(s16 model_target, Vec *rot_target, Vec *offset_end, float zoom_target, float fov_target, s16 max_time)
 {
-	BoardCameraData *camera = &boardCamera;
-	BoardFocusData *focus;
-	if(!cameraObj) {
-		return;
-	}
-	focus = &camera->focus;
-	focus->fov_start = camera->fov;
-	focus->zoom_start = camera->zoom;
-	focus->rot_start = camera->rot;
-	focus->target_start = camera->target;
-	if(fov_target == -1) {
-		focus->fov_end = focus->fov_start;
-	} else {
-		focus->fov_end = fov_target;
-	}
-	if(zoom_target == -1) {
-		focus->zoom_end = focus->zoom_start;
-	} else {
-		focus->zoom_end = zoom_target;
-	}
-	if(!rot_target) {
-		focus->rot_end = focus->rot_start;
-	} else {
-		focus->rot_end = *rot_target;
-	}
-	if(model_target == -1) {
-		focus->target_end = focus->target_start;
-	} else {
-		BoardCameraTargetModelSet(model_target);
-		BoardModelPosGet(model_target, &focus->target_end);
-	}
-	if(offset_end) {
-		BoardCameraOffsetSet(offset_end->x, offset_end->y, offset_end->z);
-		VECAdd(offset_end, &focus->target_end, &focus->target_end);
-	}
-	_SetFlag(FLAG_ID_MAKE(1, 21));
-	focus->view_type = 5;
-	focus->time = 0;
-	if(max_time < 0) {
-		max_time = 1;
-	}
-	focus->max_time = max_time;
+    BoardCameraData *camera = &boardCamera;
+    BoardFocusData *focus;
+    if(!cameraObj) {
+        return;
+    }
+    focus = &camera->focus;
+    focus->fov_start = camera->fov;
+    focus->zoom_start = camera->zoom;
+    focus->rot_start = camera->rot;
+    focus->target_start = camera->target;
+    if(fov_target == -1) {
+        focus->fov_end = focus->fov_start;
+    } else {
+        focus->fov_end = fov_target;
+    }
+    if(zoom_target == -1) {
+        focus->zoom_end = focus->zoom_start;
+    } else {
+        focus->zoom_end = zoom_target;
+    }
+    if(!rot_target) {
+        focus->rot_end = focus->rot_start;
+    } else {
+        focus->rot_end = *rot_target;
+    }
+    if(model_target == -1) {
+        focus->target_end = focus->target_start;
+    } else {
+        BoardCameraTargetModelSet(model_target);
+        BoardModelPosGet(model_target, &focus->target_end);
+    }
+    if(offset_end) {
+        BoardCameraOffsetSet(offset_end->x, offset_end->y, offset_end->z);
+        VECAdd(offset_end, &focus->target_end, &focus->target_end);
+    }
+    _SetFlag(FLAG_ID_MAKE(1, 21));
+    focus->view_type = 5;
+    focus->time = 0;
+    if(max_time < 0) {
+        max_time = 1;
+    }
+    focus->max_time = max_time;
 }
 
 void BoardCameraFovSet(float fov)
 {
-	BoardCameraData *camera = &boardCamera;
-	camera->fov = fov;
+    BoardCameraData *camera = &boardCamera;
+    camera->fov = fov;
 }
 
 s32 BoardCameraCullCheck(Vec *point, float radius)
 {
-	Vec dir;
-	Vec pos;
-	float dist;
-	float dot;
-	BoardCameraData *camera = &boardCamera;
-	if(!camera->hide_all) {
-		return 0;
-	}
-	BoardCameraDirGet(&dir);
-	VECSubtract(point, &camera->pos, &pos);
-	dist = sqrtf((pos.x*pos.x)+(pos.y*pos.y)+(pos.z*pos.z));
-	if(25000 < dist-(radius*2.0f)) {
-		return 0;
-	}
-	BoardCameraPointDirGet(point, &pos);
-	dot = VECDotProduct(&dir, &pos);
-	if(BOARD_FABS(dot) < cos((camera->fov*M_PI)/180)) {
-		return 0;
-	} else {
-		return 1;
-	}
+    Vec dir;
+    Vec pos;
+    float dist;
+    float dot;
+    BoardCameraData *camera = &boardCamera;
+    if(!camera->hide_all) {
+        return 0;
+    }
+    BoardCameraDirGet(&dir);
+    VECSubtract(point, &camera->pos, &pos);
+    dist = sqrtf((pos.x*pos.x)+(pos.y*pos.y)+(pos.z*pos.z));
+    if(25000 < dist-(radius*2.0f)) {
+        return 0;
+    }
+    BoardCameraPointDirGet(point, &pos);
+    dot = VECDotProduct(&dir, &pos);
+    if(BOARD_FABS(dot) < cosd(camera->fov)) {
+        return 0;
+    } else {
+        return 1;
+    }
 }
 
 s32 BoardCameraMotionIsDone(void)
 {
-	return (_CheckFlag(FLAG_ID_MAKE(1, 21))) ? 0 : 1;
+    return (_CheckFlag(FLAG_ID_MAKE(1, 21))) ? 0 : 1;
 }
 
 void BoardCameraMotionWait(void)
 {
-	while(!BoardCameraMotionIsDone()) {
-		HuPrcVSleep();
-	}
-	HuPrcVSleep();
+    while(!BoardCameraMotionIsDone()) {
+        HuPrcVSleep();
+    }
+    HuPrcVSleep();
 }
 
 void BoardCameraInit(void)
 {
-	BoardCameraData *camera;
-	cameraUseBackup = FALSE;
-	memset(&cameraBackup, 0, sizeof(BoardCameraData));
-	memset(&boardCamera, 0, sizeof(BoardCameraData));
-	camera = &boardCamera;
-	camera->fov = 25;
-	camera->near = 100;
-	camera->far = 13000;
-	camera->aspect = HU_DISP_ASPECT;
-	camera->viewport_x = 0;
-	camera->viewport_y = 0;
-	camera->viewport_h = 480;
-	camera->viewport_w = 640;
-	camera->viewport_near = 0;
-	camera->viewport_far = 1;
-	camera->up.y = 1;
-	camera->moving = 0;
-	camera->quaking = 0;
-	camera->quake_timer = 0;
-	camera->pos.x = 0;
-	camera->pos.y = 5000;
-	camera->pos.z = 5000;
-	camera->offset.x = 0;
-	camera->offset.y = 0;
-	camera->offset.z = 0;
-	camera->pos_calc = NULL;
-	BoardSpaceFlagPosGet(0, 0x80000000, &camera->target);
-	camera->rot.x = camViewTbl[1].x_rot;
-	camera->zoom = camViewTbl[1].zoom;
-	camera->hide_all = 1;
-	camera->mask = 1;
-	Hu3DCameraCreate(1);
-	Hu3DCameraScissorSet(1, camera->viewport_x, camera->viewport_y, camera->viewport_w, camera->viewport_h);
-	Hu3DCameraScissorSet(2, 0, 0, 0, 0);
-	Hu3DCameraPerspectiveSet(2, -1, 100, 13000, 1.2);
-	cameraObj = omAddObjEx(boardObjMan, 32258, 0, 0, -1, UpdateCamera);
+    BoardCameraData *camera;
+    cameraUseBackup = FALSE;
+    memset(&cameraBackup, 0, sizeof(BoardCameraData));
+    memset(&boardCamera, 0, sizeof(BoardCameraData));
+    camera = &boardCamera;
+    camera->fov = 25;
+    camera->near = 100;
+    camera->far = 13000;
+    camera->aspect = HU_DISP_ASPECT;
+    camera->viewport_x = 0;
+    camera->viewport_y = 0;
+    camera->viewport_h = 480;
+    camera->viewport_w = 640;
+    camera->viewport_near = 0;
+    camera->viewport_far = 1;
+    camera->up.y = 1;
+    camera->moving = 0;
+    camera->quaking = 0;
+    camera->quake_timer = 0;
+    camera->pos.x = 0;
+    camera->pos.y = 5000;
+    camera->pos.z = 5000;
+    camera->offset.x = 0;
+    camera->offset.y = 0;
+    camera->offset.z = 0;
+    camera->pos_calc = NULL;
+    BoardSpaceFlagPosGet(0, 0x80000000, &camera->target);
+    camera->rot.x = camViewTbl[1].x_rot;
+    camera->zoom = camViewTbl[1].zoom;
+    camera->hide_all = 1;
+    camera->mask = 1;
+    Hu3DCameraCreate(1);
+    Hu3DCameraScissorSet(1, camera->viewport_x, camera->viewport_y, camera->viewport_w, camera->viewport_h);
+    Hu3DCameraScissorSet(2, 0, 0, 0, 0);
+    Hu3DCameraPerspectiveSet(2, -1, 100, 13000, 1.2);
+    cameraObj = omAddObjEx(boardObjMan, 32258, 0, 0, -1, UpdateCamera);
 }
 
 static inline void CalcCameraView(void)
 {
-	BoardCameraData *camera = &boardCamera;
-	CalcCameraTarget(camera);
-	CalcCameraPos(camera);
+    BoardCameraData *camera = &boardCamera;
+    CalcCameraTarget(camera);
+    CalcCameraPos(camera);
 }
 
 static void UpdateCamera(omObjData *object)
 {
-	BoardCameraData *camera;
-	Vec *target;
-	float x, y, z;
-	if(BoardIsKill()) {
-		omDelObjEx(HuPrcCurrentGet(), object);
-		return;
-	}
-	CalcCameraView();
-	camera = &boardCamera;
-	Hu3DCameraPerspectiveSet(camera->mask, camera->fov, camera->near, camera->far, camera->aspect);
-	Hu3DCameraViewportSet(camera->mask, camera->viewport_x, camera->viewport_y, camera->viewport_w, camera->viewport_h, camera->viewport_near, camera->viewport_far);
-	target = &camera->target;
-	if(camera->pos_calc) {
-		camera->pos_calc(camera);
-	} else {
-		
-		x = camera->rot.x;
-		y = camera->rot.y;
-		camera->pos.x = target->x+(sin((y*M_PI)/180.0)*cos((x*M_PI)/180.0)*camera->zoom);
-		camera->pos.y = target->y+(-sin((x*M_PI)/180.0)*camera->zoom);
-		camera->pos.z = target->z+(cos((y*M_PI)/180.0)*cos((x*M_PI)/180.0)*camera->zoom);
-		camera->up.x = sin((y*M_PI)/180.0)*sin((x*M_PI)/180.0);
-		camera->up.y = cos((x*M_PI)/180.0);
-		camera->up.z = cos((y*M_PI)/180.0)*sin((x*M_PI)/180.0);
-		if(camera->quaking) {
-			x = BoardRandFloat();
-			y = BoardRandFloat();
-			z = BoardRandFloat();
-			camera->pos.x += (x-0.5f)*camera->quake_strength;
-			camera->pos.y += (y-0.5f)*camera->quake_strength;
-			camera->pos.z += (z-0.5f)*camera->quake_strength;
-			if(--camera->quake_timer <= 0) {
-				camera->quaking = 0;
-				camera->quake_timer = 0;
-				camera->quake_strength = 0;
-			}
-		}
-	}
-	Hu3DCameraPosSetV(camera->mask, &camera->pos, &camera->up, target);
+    BoardCameraData *camera;
+    Vec *target;
+    float x, y, z;
+    if(BoardIsKill()) {
+        omDelObjEx(HuPrcCurrentGet(), object);
+        return;
+    }
+    CalcCameraView();
+    camera = &boardCamera;
+    Hu3DCameraPerspectiveSet(camera->mask, camera->fov, camera->near, camera->far, camera->aspect);
+    Hu3DCameraViewportSet(camera->mask, camera->viewport_x, camera->viewport_y, camera->viewport_w, camera->viewport_h, camera->viewport_near, camera->viewport_far);
+    target = &camera->target;
+    if(camera->pos_calc) {
+        camera->pos_calc(camera);
+    } else {
+
+        x = camera->rot.x;
+        y = camera->rot.y;
+        camera->pos.x = target->x+(sind(y)*cosd(x)*camera->zoom);
+        camera->pos.y = target->y+(-sind(x)*camera->zoom);
+        camera->pos.z = target->z+(cosd(y)*cosd(x)*camera->zoom);
+        camera->up.x = sind(y)*sind(x);
+        camera->up.y = cosd(x);
+        camera->up.z = cosd(y)*sind(x);
+        if(camera->quaking) {
+            x = BoardRandFloat();
+            y = BoardRandFloat();
+            z = BoardRandFloat();
+            camera->pos.x += (x-0.5f)*camera->quake_strength;
+            camera->pos.y += (y-0.5f)*camera->quake_strength;
+            camera->pos.z += (z-0.5f)*camera->quake_strength;
+            if(--camera->quake_timer <= 0) {
+                camera->quaking = 0;
+                camera->quake_timer = 0;
+                camera->quake_strength = 0;
+            }
+        }
+    }
+    Hu3DCameraPosSetV(camera->mask, &camera->pos, &camera->up, target);
 }
 
 static void CalcCameraTarget(BoardCameraData *camera)
 {
-	Vec offset;
-	Vec pos = { 0, 0, 0 };
-	BoardFocusData *focus = &camera->focus;
-	if(camera->target_mdl != -1) {
-		BoardModelPosGet(camera->target_mdl, &pos);
-	} else {
-		if(camera->target_space != -1) {
-			BoardSpacePosGet(0, camera->target_space, &pos);
-		} else {
-			return;
-		}
-	}
-	VECAdd(&camera->offset, &pos, &pos);
-	VECSubtract(&pos, &camera->target, &offset);
-	if(camera->moving) {
-		VECScale(&offset, &offset, 0.15f);
-	}
-	VECAdd(&offset, &camera->target, &camera->target);
+    Vec offset;
+    Vec pos = { 0, 0, 0 };
+    BoardFocusData *focus = &camera->focus;
+    if(camera->target_mdl != -1) {
+        BoardModelPosGet(camera->target_mdl, &pos);
+    } else {
+        if(camera->target_space != -1) {
+            BoardSpacePosGet(0, camera->target_space, &pos);
+        } else {
+            return;
+        }
+    }
+    VECAdd(&camera->offset, &pos, &pos);
+    VECSubtract(&pos, &camera->target, &offset);
+    if(camera->moving) {
+        VECScale(&offset, &offset, 0.15f);
+    }
+    VECAdd(&offset, &camera->target, &camera->target);
 }
 
 #define CAM_LERP(t, x1, x2, out) \
 { \
-	float result; \
-	float offset; \
-	float unit_scale; \
-	float lerp_t; \
-	lerp_x2 = x2; \
-	lerp_x1 = x1; \
-	lerp_t = t; \
-	if(lerp_t2 == lerp_t1) { \
-		result = lerp_x2; \
-	} else { \
-		unit_scale = (lerp_x1-lerp_x2)/((float)lerp_t1-(float)lerp_t2); \
-		offset = lerp_x2-(unit_scale*lerp_t2); \
-		result = offset+(unit_scale*lerp_t); \
-	} \
-	out = result; \
+    float result; \
+    float offset; \
+    float unit_scale; \
+    float lerp_t; \
+    lerp_x2 = x2; \
+    lerp_x1 = x1; \
+    lerp_t = t; \
+    if(lerp_t2 == lerp_t1) { \
+        result = lerp_x2; \
+    } else { \
+        unit_scale = (lerp_x1-lerp_x2)/((float)lerp_t1-(float)lerp_t2); \
+        offset = lerp_x2-(unit_scale*lerp_t2); \
+        result = offset+(unit_scale*lerp_t); \
+    } \
+    out = result; \
 }
 
 #define CAM_LERP_VEC(t, x1, x2, out) \
@@ -1267,270 +1267,270 @@ CAM_LERP(t, (x1).z, (x2).z, (out).z)
 
 static void CalcCameraPos(BoardCameraData *camera)
 {
-	//These variables must be volatile to match
-	volatile u32 lerp_t1, lerp_t2;
-	volatile float lerp_x1, lerp_x2;
-	float time;
-	
-	BoardFocusData *focus = &camera->focus;
-	if(focus->time > focus->max_time) {
-		focus->view_type = 0;
-		_ClearFlag(FLAG_ID_MAKE(1, 21));
-		return;
-	}
-	OSs16tof32(&focus->time, &time);
-	focus->time++;
-	lerp_t2 = focus->max_time;
-	lerp_t1 = 0;
-	CAM_LERP(time, focus->zoom_start, focus->zoom_end, camera->zoom)
-	CAM_LERP_VEC(time, focus->rot_start, focus->rot_end, camera->rot)
-	CAM_LERP(time, focus->fov_start, focus->fov_end, camera->fov)
-	CAM_LERP_VEC(time, focus->target_start, focus->target_end, camera->target)
+    //These variables must be volatile to match
+    volatile u32 lerp_t1, lerp_t2;
+    volatile float lerp_x1, lerp_x2;
+    float time;
+
+    BoardFocusData *focus = &camera->focus;
+    if(focus->time > focus->max_time) {
+        focus->view_type = 0;
+        _ClearFlag(FLAG_ID_MAKE(1, 21));
+        return;
+    }
+    OSs16tof32(&focus->time, &time);
+    focus->time++;
+    lerp_t2 = focus->max_time;
+    lerp_t1 = 0;
+    CAM_LERP(time, focus->zoom_start, focus->zoom_end, camera->zoom)
+    CAM_LERP_VEC(time, focus->rot_start, focus->rot_end, camera->rot)
+    CAM_LERP(time, focus->fov_start, focus->fov_end, camera->fov)
+    CAM_LERP_VEC(time, focus->target_start, focus->target_end, camera->target)
 }
 
 void BoardMGDoneFlagSet(s32 flag)
 {
-	if(flag) {
-		_SetFlag(FLAG_ID_MAKE(1, 20));
-	} else {
-		_ClearFlag(FLAG_ID_MAKE(1, 20));
-	}
+    if(flag) {
+        _SetFlag(FLAG_ID_MAKE(1, 20));
+    } else {
+        _ClearFlag(FLAG_ID_MAKE(1, 20));
+    }
 }
 
 s32 BoardMGDoneFlagGet()
 {
-	return (_CheckFlag(FLAG_ID_MAKE(1, 20))) ? 1 : 0;
+    return (_CheckFlag(FLAG_ID_MAKE(1, 20))) ? 1 : 0;
 }
 
 void BoardMGExit(void)
 {
-	s32 player = GWSystem.player_curr;
-	BoardPlayerMoveToAsync(player, GWPlayer[GWSystem.player_curr].space_curr);
-	BoardCameraTargetPlayerSet(player);
-	BoardCameraMoveSet(1);
-	BoardCameraViewSet(1);
-	_ClearFlag(FLAG_ID_MAKE(1, 19));
+    s32 player = GWSystem.player_curr;
+    BoardPlayerMoveToAsync(player, GWPlayer[GWSystem.player_curr].space_curr);
+    BoardCameraTargetPlayerSet(player);
+    BoardCameraMoveSet(1);
+    BoardCameraViewSet(1);
+    _ClearFlag(FLAG_ID_MAKE(1, 19));
 }
 
 static void KillBoardMG(omObjData *object)
 {
-	if(!BoardMGDoneFlagGet()) {
-		BoardEventFlagReset();
-		omDelObjEx(HuPrcCurrentGet(), object);
-	}
+    if(!BoardMGDoneFlagGet()) {
+        BoardEventFlagReset();
+        omDelObjEx(HuPrcCurrentGet(), object);
+    }
 }
 
 static void ExecBoardMG(omObjData *object)
 {
-	if(_CheckFlag(FLAG_ID_MAKE(1, 19))) {
-		return;
-	}
-	if(GWPlayer[GWSystem.player_curr].moving == 0) {
-		BoardPlayerMotionShiftSet(GWSystem.player_curr, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
-		if(!_CheckFlag(FLAG_ID_MAKE(1, 21))) {
-			_SetFlag(FLAG_ID_MAKE(1, 20));
-			object->func = KillBoardMG;
-		}
-	}
+    if(_CheckFlag(FLAG_ID_MAKE(1, 19))) {
+        return;
+    }
+    if(GWPlayer[GWSystem.player_curr].moving == 0) {
+        BoardPlayerMotionShiftSet(GWSystem.player_curr, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
+        if(!_CheckFlag(FLAG_ID_MAKE(1, 21))) {
+            _SetFlag(FLAG_ID_MAKE(1, 20));
+            object->func = KillBoardMG;
+        }
+    }
 }
 
 void BoardMGCreate(s32 arg0)
 {
-	_SetFlag(FLAG_ID_MAKE(1, 19));
-	_ClearFlag(FLAG_ID_MAKE(1, 20));
-	GWSystem.unk_38 = arg0;
-	omAddObjEx(boardObjMan, 0x201, 0, 0, -1, ExecBoardMG);
-	BoardEventFlagSet();
-	BoardSpaceWalkMiniEventExec();
+    _SetFlag(FLAG_ID_MAKE(1, 19));
+    _ClearFlag(FLAG_ID_MAKE(1, 20));
+    GWSystem.unk_38 = arg0;
+    omAddObjEx(boardObjMan, 0x201, 0, 0, -1, ExecBoardMG);
+    BoardEventFlagSet();
+    BoardSpaceWalkMiniEventExec();
 }
 
 void BoardEventFlagSet(void)
 {
-	_SetFlag(FLAG_ID_MAKE(1, 18));
+    _SetFlag(FLAG_ID_MAKE(1, 18));
 }
 
 void BoardEventFlagReset(void)
 {
-	_ClearFlag(FLAG_ID_MAKE(1, 18));
+    _ClearFlag(FLAG_ID_MAKE(1, 18));
 }
 
 s32 BoardEventFlagGet(void)
 {
-	return _CheckFlag(FLAG_ID_MAKE(1, 18)) ? 1 : 0;
+    return _CheckFlag(FLAG_ID_MAKE(1, 18)) ? 1 : 0;
 }
 
 void BoardMTXCalcLookAt(Mtx dest, Vec *eye, Vec *up, Vec *target)
 {
-	Vec f, u, s;
-	f.x = eye->x-target->x;
-	f.y = eye->y-target->y;
-	f.z = eye->z-target->z;
-	VECNormalize(&f, &f);
-	VECCrossProduct(up, &f, &u);
-	VECNormalize(&u, &u);
-	VECCrossProduct(&f, &u, &s);
-	dest[0][0] = u.x;
-	dest[0][1] = u.y;
-	dest[0][2] = u.z;
-	dest[0][3] = 0;
-	dest[1][0] = s.x;
-	dest[1][1] = s.y;
-	dest[1][2] = s.z;
-	dest[1][3] = 0;
-	dest[2][0] = f.x;
-	dest[2][1] = f.y;
-	dest[2][2] = f.z;
-	dest[2][3] = 0;
+    Vec f, u, s;
+    f.x = eye->x-target->x;
+    f.y = eye->y-target->y;
+    f.z = eye->z-target->z;
+    VECNormalize(&f, &f);
+    VECCrossProduct(up, &f, &u);
+    VECNormalize(&u, &u);
+    VECCrossProduct(&f, &u, &s);
+    dest[0][0] = u.x;
+    dest[0][1] = u.y;
+    dest[0][2] = u.z;
+    dest[0][3] = 0;
+    dest[1][0] = s.x;
+    dest[1][1] = s.y;
+    dest[1][2] = s.z;
+    dest[1][3] = 0;
+    dest[2][0] = f.x;
+    dest[2][1] = f.y;
+    dest[2][2] = f.z;
+    dest[2][3] = 0;
 }
 
 float BoardArcSin(float value)
 {
-	float result;
-	s32 sign;
-	if(value < 0) {
-		sign = 1;
-		value = BOARD_FABS(value);
-	} else {
-		sign = 0;
-	}
-	if(value > 1.0f) {
-		return 0;
-	}
-	if(value <= (float)(M_PI/2)) {
-		result = atanf(value/sqrtf(1-(value*value)));
-	} else {
-		result = (float)(M_PI/2)-atanf(sqrtf(1-(value*value))/value);
-	}
-	if(sign) {
-		result = BOARD_FABS(result);
-	}
-	return result;
+    float result;
+    s32 sign;
+    if(value < 0) {
+        sign = 1;
+        value = BOARD_FABS(value);
+    } else {
+        sign = 0;
+    }
+    if(value > 1.0f) {
+        return 0;
+    }
+    if(value <= (float)(M_PI/2)) {
+        result = atanf(value/sqrtf(1-(value*value)));
+    } else {
+        result = (float)(M_PI/2)-atanf(sqrtf(1-(value*value))/value);
+    }
+    if(sign) {
+        result = BOARD_FABS(result);
+    }
+    return result;
 }
 
 float BoardArcCos(float value)
 {
-	if(BOARD_FABS(value) > 1) {
-		return 0;
-	}
-	return (float)(M_PI/2)-BoardArcSin(value);
+    if(BOARD_FABS(value) > 1) {
+        return 0;
+    }
+    return (float)(M_PI/2)-BoardArcSin(value);
 }
 
 void BoardRandInit(void)
 {
-	boardRandSeed = OSGetTime();
+    boardRandSeed = OSGetTime();
 }
 
 u32 BoardRand(void)
 {
-	boardRandSeed = (boardRandSeed*0x19660D)+(0x3C6EF35F);
-	return boardRandSeed;
+    boardRandSeed = (boardRandSeed*0x19660D)+(0x3C6EF35F);
+    return boardRandSeed;
 }
 
 u32 BoardRandMod(u32 value)
 {
-	return (BoardRand() & 0x7FFFFFFF)%value;
+    return (BoardRand() & 0x7FFFFFFF)%value;
 }
 
 float BoardRandFloat(void)
 {
-	float value;
-	*((u32 *)&value) = (BoardRand() & 0x7FFFFF)|0x3F800000; //Generate float from 1.0f to 2.0f
-	return value-1.0f;
+    float value;
+    *((u32 *)&value) = (BoardRand() & 0x7FFFFF)|0x3F800000; //Generate float from 1.0f to 2.0f
+    return value-1.0f;
 }
 
 float BoardVecDistXZCalc(Vec *vec1, Vec *vec2)
 {
-	float dx = vec1->x-vec2->x;
-	float dz = vec1->z-vec2->z;
-	return sqrtf((dx*dx)+(dz*dz));
+    float dx = vec1->x-vec2->x;
+    float dz = vec1->z-vec2->z;
+    return sqrtf((dx*dx)+(dz*dz));
 }
 
 s32 BoardVecMaxDistXZCheck(Vec *vec1, Vec *vec2, float max_dist)
 {
-	float dz = vec1->z-vec2->z;
-	float dx = vec1->x-vec2->x;
-	float dist = sqrtf((dx*dx)+(dz*dz));
-	if(dist <= max_dist) {
-		return 1;
-	} else {
-		return 0;
-	}
+    float dz = vec1->z-vec2->z;
+    float dx = vec1->x-vec2->x;
+    float dist = sqrtf((dx*dx)+(dz*dz));
+    if(dist <= max_dist) {
+        return 1;
+    } else {
+        return 0;
+    }
 }
 
 void BoardDAngleCalcVec(Vec *vec1)
 {
-	s32 i;
-	float *data = &vec1->x;
-	for(i=0; i<3; i++) {
-		while(*data > 180.0f) {
-			*data -= 360.0f;
-		}
-		while(*data < -180.0f) {
-			*data += 360.0f;
-		}
-		data++;
-	}
+    s32 i;
+    float *data = &vec1->x;
+    for(i=0; i<3; i++) {
+        while(*data > 180.0f) {
+            *data -= 360.0f;
+        }
+        while(*data < -180.0f) {
+            *data += 360.0f;
+        }
+        data++;
+    }
 }
 
 float BoardDAngleCalc(float value)
 {
-	while(value > 180.0f) {
-		value -= 360.0f;
-	}
-	while(value < -180.0f) {
-		value += 360.0f;
-	}
-	return value;
+    while(value > 180.0f) {
+        value -= 360.0f;
+    }
+    while(value < -180.0f) {
+        value += 360.0f;
+    }
+    return value;
 }
 
 s32 BoardDAngleCalcRange(float *value, float min, float range)
 {
-	float diff = min-(*value);
-	if(diff >= 180.0f) {
-		min -= 360.0f;
-	}
-	if(diff <= -180.0f) {
-		min += 360.0f;
-	}
-	if(min > *value) {
-		*value += range;
-		if(*value >= min) {
-			*value = BoardDAngleCalc(min);
-			return 1;
-		}
-	} else {
-		*value -= range;
-		if(*value <= min) {
-			*value = BoardDAngleCalc(min);
-			return 1;
-		}
-	}
-	*value = BoardDAngleCalc(*value);
-	return 0;
+    float diff = min-(*value);
+    if(diff >= 180.0f) {
+        min -= 360.0f;
+    }
+    if(diff <= -180.0f) {
+        min += 360.0f;
+    }
+    if(min > *value) {
+        *value += range;
+        if(*value >= min) {
+            *value = BoardDAngleCalc(min);
+            return 1;
+        }
+    } else {
+        *value -= range;
+        if(*value <= min) {
+            *value = BoardDAngleCalc(min);
+            return 1;
+        }
+    }
+    *value = BoardDAngleCalc(*value);
+    return 0;
 }
 
 s32 BoardVecMinDistCheck(Vec *vec1, Vec *vec2, float min_dist)
 {
-	Vec temp;
-	VECSubtract(vec1, vec2, &temp);
-	if(VECSquareMag(&temp) >= (min_dist*min_dist)) {
-		return 0;
-	} else {
-		return 1;
-	}
+    Vec temp;
+    VECSubtract(vec1, vec2, &temp);
+    if(VECSquareMag(&temp) >= (min_dist*min_dist)) {
+        return 0;
+    } else {
+        return 1;
+    }
 }
 
 typedef struct filter_work {
-	struct {
-		u8 kill : 1;
-		u8 paused : 1;
-	};
-	u8 max_alpha;
-	s16 time;
-	s16 len;
-	s16 model;
-	GXColor color;
-	float speed;
+    struct {
+        u8 kill : 1;
+        u8 paused : 1;
+    };
+    u8 max_alpha;
+    s16 time;
+    s16 len;
+    s16 model;
+    GXColor color;
+    float speed;
 } FilterWork;
 
 static void UpdateFilter(omObjData *object);
@@ -1538,168 +1538,168 @@ static void DrawFilter(ModelData *model, Mtx matrix);
 
 void BoardFilterFadeOut(s16 len)
 {
-	FilterWork *work;
-	float speed;
-	if(!filterObj) {
-		return;
-	}
-	if(len <= 0) {
-		len = 1;
-	}
-	work = OM_GET_WORK_PTR(filterObj, FilterWork);
-	work->len = len;
-	OSs16tof32(&len, &speed);
-	work->speed = -(work->color.a)/speed;
-	work->paused = 0;
-	work->time = work->len;
+    FilterWork *work;
+    float speed;
+    if(!filterObj) {
+        return;
+    }
+    if(len <= 0) {
+        len = 1;
+    }
+    work = OM_GET_WORK_PTR(filterObj, FilterWork);
+    work->len = len;
+    OSs16tof32(&len, &speed);
+    work->speed = -(work->color.a)/speed;
+    work->paused = 0;
+    work->time = work->len;
 }
 
 void BoardFilterFadeInit(s16 len, u8 max_alpha)
 {
-	FilterWork *work;
-	if(filterObj) {
-		work = OM_GET_WORK_PTR(filterObj, FilterWork);
-		work->kill = 1;
-		while(filterObj) {
-			HuPrcVSleep();
-		}
-	}
-	filterObj = omAddObjEx(boardObjMan, 32000, 0, 0, -1, UpdateFilter);
-	omSetStatBit(filterObj, OM_STAT_NOPAUSE|0x80);
-	if(len <= 0) {
-		len = 1;
-	}
-	work = OM_GET_WORK_PTR(filterObj, FilterWork);
-	work->kill = 0;
-	work->paused = 0;
-	work->color.r = 0;
-	work->color.g = 0;
-	work->color.b = 0;
-	work->color.a = 0;
-	work->max_alpha = max_alpha;
-	work->speed = (float)(max_alpha-work->color.a)/(float)len;
-	work->time = len;
-	work->len = len;
-	work->model = Hu3DHookFuncCreate(DrawFilter);
-	Hu3DModelLayerSet(work->model, 1);
+    FilterWork *work;
+    if(filterObj) {
+        work = OM_GET_WORK_PTR(filterObj, FilterWork);
+        work->kill = 1;
+        while(filterObj) {
+            HuPrcVSleep();
+        }
+    }
+    filterObj = omAddObjEx(boardObjMan, 32000, 0, 0, -1, UpdateFilter);
+    omSetStatBit(filterObj, OM_STAT_NOPAUSE|0x80);
+    if(len <= 0) {
+        len = 1;
+    }
+    work = OM_GET_WORK_PTR(filterObj, FilterWork);
+    work->kill = 0;
+    work->paused = 0;
+    work->color.r = 0;
+    work->color.g = 0;
+    work->color.b = 0;
+    work->color.a = 0;
+    work->max_alpha = max_alpha;
+    work->speed = (float)(max_alpha-work->color.a)/(float)len;
+    work->time = len;
+    work->len = len;
+    work->model = Hu3DHookFuncCreate(DrawFilter);
+    Hu3DModelLayerSet(work->model, 1);
 }
 
 s32 BoardFilterFadePauseCheck(void)
 {
-	FilterWork *work;
-	if(!filterObj) {
-		return 1;
-	}
-	work = OM_GET_WORK_PTR(filterObj, FilterWork);
-	return (work->paused) ? 1 : 0;
+    FilterWork *work;
+    if(!filterObj) {
+        return 1;
+    }
+    work = OM_GET_WORK_PTR(filterObj, FilterWork);
+    return (work->paused) ? 1 : 0;
 }
 
 s32 BoardFilterFadeCheck(void)
 {
-	return (filterObj != NULL) ? 0 : 1;
+    return (filterObj != NULL) ? 0 : 1;
 }
 
 static void UpdateFilter(omObjData *object)
 {
-	float alpha;
-	FilterWork *work = OM_GET_WORK_PTR(object, FilterWork);
-	if(work->kill || BoardIsKill()) {
-		if(work->model != -1) {
-			Hu3DModelKill(work->model);
-		}
-		filterObj = NULL;
-		omDelObjEx(HuPrcCurrentGet(), object);
-		return;
-	}
-	if(work->paused) {
-		return;
-	}
-	OSu8tof32(&work->color.a, &alpha);
-	alpha += work->speed;
-	OSf32tou8(&alpha, &work->color.a);
-	if(work->time > 0) {
-		work->time--;
-		return;
-	}
-	if(work->speed > 0) {
-		work->paused = 1;
-		work->color.a = work->max_alpha;
-	} else {
-		work->kill = 1;
-	}
+    float alpha;
+    FilterWork *work = OM_GET_WORK_PTR(object, FilterWork);
+    if(work->kill || BoardIsKill()) {
+        if(work->model != -1) {
+            Hu3DModelKill(work->model);
+        }
+        filterObj = NULL;
+        omDelObjEx(HuPrcCurrentGet(), object);
+        return;
+    }
+    if(work->paused) {
+        return;
+    }
+    OSu8tof32(&work->color.a, &alpha);
+    alpha += work->speed;
+    OSf32tou8(&alpha, &work->color.a);
+    if(work->time > 0) {
+        work->time--;
+        return;
+    }
+    if(work->speed > 0) {
+        work->paused = 1;
+        work->color.a = work->max_alpha;
+    } else {
+        work->kill = 1;
+    }
 }
 
 static void DrawFilter(ModelData *model, Mtx matrix)
 {
-	static GXColor colorN = { 0xFF, 0xFF, 0xFF, 0xFF };
-	Mtx44 proj;
-	Mtx modelview;
-	
-	float x1, x2, y1, y2;
-	FilterWork *work;
-	if(!filterObj) {
-		return;
-	}
-	work = OM_GET_WORK_PTR(filterObj, FilterWork);
-	x1 = 0.0f;
-	x2 = HU_FB_WIDTH;
-	y1 = 0.0f;
-	y2 = HU_FB_HEIGHT;
-	MTXOrtho(proj, y1, y2, x1, x2, 0, 10);
-	GXSetProjection(proj, GX_ORTHOGRAPHIC);
-	MTXIdentity(modelview);
-	GXLoadPosMtxImm(modelview, GX_PNMTX0);
-	GXSetCurrentMtx(GX_PNMTX0);
-	GXSetViewport(0, 0, x2, 1.0f+y2, 0, 1);
-	GXSetScissor(0, 0, x2, 1.0f+y2);
-	GXClearVtxDesc();
-	GXSetChanMatColor(GX_COLOR0A0, work->color);
-	GXSetNumChans(1);
-	GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_REG, 0, GX_DF_NONE, GX_AF_NONE);
-	GXSetChanCtrl(GX_COLOR1A1, GX_FALSE, GX_SRC_REG, GX_SRC_REG, 0, GX_DF_NONE, GX_AF_NONE);
-	GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0);
-	GXSetTevOp(GX_TEVSTAGE0, GX_PASSCLR);
-	GXSetNumTexGens(0);
-	GXSetNumTevStages(1);
-	GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
-	GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XY, GX_U16, 0);
-	GXSetZMode(GX_TRUE, GX_ALWAYS, GX_FALSE);
-	GXSetAlphaUpdate(GX_FALSE);
-	GXSetColorUpdate(GX_TRUE);
-	GXSetAlphaCompare(GX_GEQUAL, 1, GX_AOP_AND, GX_GEQUAL, 1);
-	GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP);
-	GXBegin(GX_QUADS, GX_VTXFMT0, 4);
-	GXPosition2u16(x1, y1);
-	GXPosition2u16(x2, y1);
-	GXPosition2u16(x2, y2);
-	GXPosition2u16(x1, y2);
-	GXEnd();
-	GXSetChanMatColor(GX_COLOR0A0, colorN);
-	
+    static GXColor colorN = { 0xFF, 0xFF, 0xFF, 0xFF };
+    Mtx44 proj;
+    Mtx modelview;
+
+    float x1, x2, y1, y2;
+    FilterWork *work;
+    if(!filterObj) {
+        return;
+    }
+    work = OM_GET_WORK_PTR(filterObj, FilterWork);
+    x1 = 0.0f;
+    x2 = HU_FB_WIDTH;
+    y1 = 0.0f;
+    y2 = HU_FB_HEIGHT;
+    MTXOrtho(proj, y1, y2, x1, x2, 0, 10);
+    GXSetProjection(proj, GX_ORTHOGRAPHIC);
+    MTXIdentity(modelview);
+    GXLoadPosMtxImm(modelview, GX_PNMTX0);
+    GXSetCurrentMtx(GX_PNMTX0);
+    GXSetViewport(0, 0, x2, 1.0f+y2, 0, 1);
+    GXSetScissor(0, 0, x2, 1.0f+y2);
+    GXClearVtxDesc();
+    GXSetChanMatColor(GX_COLOR0A0, work->color);
+    GXSetNumChans(1);
+    GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_REG, 0, GX_DF_NONE, GX_AF_NONE);
+    GXSetChanCtrl(GX_COLOR1A1, GX_FALSE, GX_SRC_REG, GX_SRC_REG, 0, GX_DF_NONE, GX_AF_NONE);
+    GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0);
+    GXSetTevOp(GX_TEVSTAGE0, GX_PASSCLR);
+    GXSetNumTexGens(0);
+    GXSetNumTevStages(1);
+    GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
+    GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XY, GX_U16, 0);
+    GXSetZMode(GX_TRUE, GX_ALWAYS, GX_FALSE);
+    GXSetAlphaUpdate(GX_FALSE);
+    GXSetColorUpdate(GX_TRUE);
+    GXSetAlphaCompare(GX_GEQUAL, 1, GX_AOP_AND, GX_GEQUAL, 1);
+    GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP);
+    GXBegin(GX_QUADS, GX_VTXFMT0, 4);
+    GXPosition2u16(x1, y1);
+    GXPosition2u16(x2, y1);
+    GXPosition2u16(x2, y2);
+    GXPosition2u16(x1, y2);
+    GXEnd();
+    GXSetChanMatColor(GX_COLOR0A0, colorN);
+
 }
 
 typedef struct confetti_particle {
-	s16 time;
-	u8 alpha;
-	u8 light_col;
-	Vec pos;
-	Vec rot;
-	Vec pos_vel;
-	Vec rot_vel;
+    s16 time;
+    u8 alpha;
+    u8 light_col;
+    Vec pos;
+    Vec rot;
+    Vec pos_vel;
+    Vec rot_vel;
 } ConfettiParticle;
 
 typedef struct confetti_work {
-	struct {
-		u8 kill : 1;
-		u8 paused : 1;
-	};
-	s8 spawn_speed;
-	s8 time;
-	s8 delay;
-	s16 count;
-	s16 gfx_mdl;
-	s16 draw_mdl;
-	ConfettiParticle *data;
+    struct {
+        u8 kill : 1;
+        u8 paused : 1;
+    };
+    s8 spawn_speed;
+    s8 time;
+    s8 delay;
+    s16 count;
+    s16 gfx_mdl;
+    s16 draw_mdl;
+    ConfettiParticle *data;
 } ConfettiWork;
 
 static void UpdateConfetti(omObjData *object);
@@ -1710,501 +1710,501 @@ static void DrawConfetti(ModelData *model, Mtx matrix);
 
 void BoardConfettiCreate(Vec *pos, s16 count, float range)
 {
-	omObjData *object;
-	ConfettiWork *work;
-	if(confettiObj) {
-		BoardConfettiStop();
-		HuPrcSleep(17);
-	}
-	object = omAddObjEx(boardObjMan, 257, 0, 0, -1, UpdateConfetti);
-	confettiObj = object;
-	work = OM_GET_WORK_PTR(object, ConfettiWork);
-	work->kill = 0;
-	work->paused = 0;
-	work->count = count;
-	work->spawn_speed = 1;
-	work->time = 0;
-	work->delay = 10;
-	work->draw_mdl = Hu3DHookFuncCreate(DrawConfetti);
-	work->data = HuMemDirectMallocNum(HEAP_SYSTEM, work->count*sizeof(ConfettiParticle), MEMORY_DEFAULT_NUM);
-	object->trans.x = pos->x;
-	object->trans.y = pos->y;
-	object->trans.z = pos->z;
-	object->rot.x = range;
-	work->gfx_mdl = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 7), NULL, 0);
-	BoardModelLayerSet(work->gfx_mdl, 2);
-	BoardModelVisibilitySet(work->gfx_mdl, 0);
-	{
-		ConfettiParticle *particle;
-		s32 i;
-		particle = work->data;
-		for(i=0; i<work->count; i++, particle++) {
-			particle->time = -1;
-		}
-	}
-	HuAudFXPlay(774);
+    omObjData *object;
+    ConfettiWork *work;
+    if(confettiObj) {
+        BoardConfettiStop();
+        HuPrcSleep(17);
+    }
+    object = omAddObjEx(boardObjMan, 257, 0, 0, -1, UpdateConfetti);
+    confettiObj = object;
+    work = OM_GET_WORK_PTR(object, ConfettiWork);
+    work->kill = 0;
+    work->paused = 0;
+    work->count = count;
+    work->spawn_speed = 1;
+    work->time = 0;
+    work->delay = 10;
+    work->draw_mdl = Hu3DHookFuncCreate(DrawConfetti);
+    work->data = HuMemDirectMallocNum(HEAP_SYSTEM, work->count*sizeof(ConfettiParticle), MEMORY_DEFAULT_NUM);
+    object->trans.x = pos->x;
+    object->trans.y = pos->y;
+    object->trans.z = pos->z;
+    object->rot.x = range;
+    work->gfx_mdl = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 7), NULL, 0);
+    BoardModelLayerSet(work->gfx_mdl, 2);
+    BoardModelVisibilitySet(work->gfx_mdl, 0);
+    {
+        ConfettiParticle *particle;
+        s32 i;
+        particle = work->data;
+        for(i=0; i<work->count; i++, particle++) {
+            particle->time = -1;
+        }
+    }
+    HuAudFXPlay(774);
 }
 
 void BoardConfettiKill(void)
 {
-	if(confettiObj) {
-		OM_GET_WORK_PTR(confettiObj, ConfettiWork)->kill = 1;
-	}
+    if(confettiObj) {
+        OM_GET_WORK_PTR(confettiObj, ConfettiWork)->kill = 1;
+    }
 }
 
 void BoardConfettiStop(void)
 {
-	if(confettiObj) {
-		s32 i;
-		ConfettiParticle *particle;
-		ConfettiWork *work = OM_GET_WORK_PTR(confettiObj, ConfettiWork);
-		work->paused = 1;
-		particle = work->data;
-		for(i=0; i<work->count; i++, particle++) {
-			if(particle->time != -1) { 
-				if(particle->time > 16) {
-					particle->time = 16;
-				}
-			}
-		}
-	}
+    if(confettiObj) {
+        s32 i;
+        ConfettiParticle *particle;
+        ConfettiWork *work = OM_GET_WORK_PTR(confettiObj, ConfettiWork);
+        work->paused = 1;
+        particle = work->data;
+        for(i=0; i<work->count; i++, particle++) {
+            if(particle->time != -1) { 
+                if(particle->time > 16) {
+                    particle->time = 16;
+                }
+            }
+        }
+    }
 }
 
 static void UpdateConfetti(omObjData *object)
 {
-	ConfettiWork *work = OM_GET_WORK_PTR(object, ConfettiWork);
-	if(work->kill || BoardIsKill()) {
-		BoardModelKill(work->gfx_mdl);
-		Hu3DModelKill(work->draw_mdl);
-		HuMemDirectFree(work->data);
-		confettiObj = NULL;
-		omDelObjEx(HuPrcCurrentGet(), object);
-	} else {
-		SpawnConfetti(object);
-		MoveConfetti(object);
-	}
+    ConfettiWork *work = OM_GET_WORK_PTR(object, ConfettiWork);
+    if(work->kill || BoardIsKill()) {
+        BoardModelKill(work->gfx_mdl);
+        Hu3DModelKill(work->draw_mdl);
+        HuMemDirectFree(work->data);
+        confettiObj = NULL;
+        omDelObjEx(HuPrcCurrentGet(), object);
+    } else {
+        SpawnConfetti(object);
+        MoveConfetti(object);
+    }
 }
 
 static void SpawnConfetti(omObjData *object)
 {
-	ConfettiWork *work = OM_GET_WORK_PTR(object, ConfettiWork);
-	s32 i;
-	if(work->paused) {
-		return;
-	}
-	if(work->spawn_speed < 5) {
-		if(work->time++ > work->delay) {
-			work->time = 0;
-			work->spawn_speed++;
-		}
-	}
-	for(i=0; i<work->spawn_speed; i++) {
-		ConfettiParticle *particle;
-		float angle;
-		s32 j;
-		particle = work->data;
-		for(j=0; j<work->count; j++, particle++) {
-			if(particle->time == -1) {
-				break;
-			}
-		}
-		if(j == work->count) {
-			break;
-		}
-		particle->time = BoardRandMod(60)+120;
-		angle = BoardRandFloat()*360.0f;
-		particle->pos.x = (sin((angle*M_PI)/180.0)*object->rot.x)+object->trans.x;
-		particle->pos.y = object->trans.y;
-		particle->pos.z = (cos((angle*M_PI)/180.0)*object->rot.x)+object->trans.z;
-		particle->pos_vel.x = 2.0f*(BoardRandFloat()-0.5f);
-		particle->pos_vel.y = (-98.00001f/15.0f)*BoardRandFloat();
-		particle->pos_vel.z = 2.0f*(BoardRandFloat()-0.5f);
-		particle->rot_vel.x = 8.0f+((BoardRandFloat()-0.5f)*20.0f);
-		particle->rot_vel.y = 8.0f+((BoardRandFloat()-0.5f)*20.0f);
-		particle->rot_vel.z = 8.0f+((BoardRandFloat()-0.5f)*20.0f);
-		particle->rot.x = 0;
-		particle->rot.y = 0;
-		particle->rot.z = 0;
-		particle->alpha = 255;
-		particle->light_col = BoardRandMod(6);
-	}
+    ConfettiWork *work = OM_GET_WORK_PTR(object, ConfettiWork);
+    s32 i;
+    if(work->paused) {
+        return;
+    }
+    if(work->spawn_speed < 5) {
+        if(work->time++ > work->delay) {
+            work->time = 0;
+            work->spawn_speed++;
+        }
+    }
+    for(i=0; i<work->spawn_speed; i++) {
+        ConfettiParticle *particle;
+        float angle;
+        s32 j;
+        particle = work->data;
+        for(j=0; j<work->count; j++, particle++) {
+            if(particle->time == -1) {
+                break;
+            }
+        }
+        if(j == work->count) {
+            break;
+        }
+        particle->time = BoardRandMod(60)+120;
+        angle = BoardRandFloat()*360.0f;
+        particle->pos.x = (sind(angle)*object->rot.x)+object->trans.x;
+        particle->pos.y = object->trans.y;
+        particle->pos.z = (cosd(angle)*object->rot.x)+object->trans.z;
+        particle->pos_vel.x = 2.0f*(BoardRandFloat()-0.5f);
+        particle->pos_vel.y = (-98.00001f/15.0f)*BoardRandFloat();
+        particle->pos_vel.z = 2.0f*(BoardRandFloat()-0.5f);
+        particle->rot_vel.x = 8.0f+((BoardRandFloat()-0.5f)*20.0f);
+        particle->rot_vel.y = 8.0f+((BoardRandFloat()-0.5f)*20.0f);
+        particle->rot_vel.z = 8.0f+((BoardRandFloat()-0.5f)*20.0f);
+        particle->rot.x = 0;
+        particle->rot.y = 0;
+        particle->rot.z = 0;
+        particle->alpha = 255;
+        particle->light_col = BoardRandMod(6);
+    }
 }
 
 static void MoveConfetti(omObjData *object)
 {
-	ConfettiWork *work = OM_GET_WORK_PTR(object, ConfettiWork);
-	s32 i;
-	s32 existF;
-	ConfettiParticle *particle;
-	
-	existF = 0;
-	particle = work->data;
-	
-	for(i=0; i<work->count; i++, particle++) {
-		if(particle->time == -1) {
-			continue;
-		}
-		if(particle->time <= 0) {
-			particle->time = -1;
-			continue;
-		}
-		particle->time--;
-		particle->pos.x += particle->pos_vel.x;
-		particle->pos.y += particle->pos_vel.y;
-		particle->pos.z += particle->pos_vel.z;
-		particle->rot.x += particle->rot_vel.x;
-		particle->rot.y += particle->rot_vel.y;
-		particle->rot.z += particle->rot_vel.z;
-		if(particle->time < 16) {
-			if(particle->alpha >= 15) {
-				particle->alpha -= 15;
-			} else {
-				particle->alpha = 0;
-			}
-		}
-		if(!existF) {
-			existF = 1;
-		}
-	}
-	if(existF == 0 && work->paused) {
-		work->kill = 1;
-	}
+    ConfettiWork *work = OM_GET_WORK_PTR(object, ConfettiWork);
+    s32 i;
+    s32 existF;
+    ConfettiParticle *particle;
+
+    existF = 0;
+    particle = work->data;
+
+    for(i=0; i<work->count; i++, particle++) {
+        if(particle->time == -1) {
+            continue;
+        }
+        if(particle->time <= 0) {
+            particle->time = -1;
+            continue;
+        }
+        particle->time--;
+        particle->pos.x += particle->pos_vel.x;
+        particle->pos.y += particle->pos_vel.y;
+        particle->pos.z += particle->pos_vel.z;
+        particle->rot.x += particle->rot_vel.x;
+        particle->rot.y += particle->rot_vel.y;
+        particle->rot.z += particle->rot_vel.z;
+        if(particle->time < 16) {
+            if(particle->alpha >= 15) {
+                particle->alpha -= 15;
+            } else {
+                particle->alpha = 0;
+            }
+        }
+        if(!existF) {
+            existF = 1;
+        }
+    }
+    if(existF == 0 && work->paused) {
+        work->kill = 1;
+    }
 }
 
 static Vec confettiLightTbl[6] = {
-	{ 0.1, 0.4, 1 },
-	{ 0.2, 1, 0.1 },
-	{ 0.3, 1, 1 },
-	{ 1, 0.2, 0.1 },
-	{ 1, 0.2, 0.8 },
-	{ 1, 8, 0.3 }
+    { 0.1, 0.4, 1 },
+    { 0.2, 1, 0.1 },
+    { 0.3, 1, 1 },
+    { 1, 0.2, 0.1 },
+    { 1, 0.2, 0.8 },
+    { 1, 8, 0.3 }
 };
 
 static void DrawConfetti(ModelData *model, Mtx matrix)
 {
-	if(!confettiObj || BoardIsKill()) {
-		return;
-	} else {
-		ConfettiWork *work = OM_GET_WORK_PTR(confettiObj, ConfettiWork);
-		ModelData *model = &Hu3DData[work->gfx_mdl];
-		ConfettiParticle *particle;
-		s32 i;
-		if(!model->hsfData) {
-			return;
-		}
-		particle = work->data;
-		for(i=0; i<work->count; i++, particle++) {
-			Mtx result, temp;
-			float r, g, b, a;
-			if(particle->time == -1) {
-				continue;
-			}
-			MTXRotDeg(temp, 'z', particle->rot.z);
-			MTXRotDeg(result, 'x', particle->rot.x);
-			MTXConcat(temp, result, result);
-			MTXRotDeg(temp, 'y', particle->rot.y);
-			MTXConcat(temp, result, result);
-			MTXTrans(temp, particle->pos.x, particle->pos.y, particle->pos.z);
-			MTXConcat(temp, result, result);
-			MTXConcat(matrix, result, result);
-			r = confettiLightTbl[particle->light_col].x;
-			g = confettiLightTbl[particle->light_col].y;
-			b = confettiLightTbl[particle->light_col].z;
-			OSu8tof32(&particle->alpha, &a);
-			a = a*(1.0f/255.0f);
-			Hu3DModelTPLvlSet(BoardModelIDGet(work->gfx_mdl), a);
-			Hu3DModelAmbSet(BoardModelIDGet(work->gfx_mdl), r, g, b);
-			Hu3DModelObjDraw(BoardModelIDGet(work->gfx_mdl), "grid2", result);
-		}
-	}
+    if(!confettiObj || BoardIsKill()) {
+        return;
+    } else {
+        ConfettiWork *work = OM_GET_WORK_PTR(confettiObj, ConfettiWork);
+        ModelData *model = &Hu3DData[work->gfx_mdl];
+        ConfettiParticle *particle;
+        s32 i;
+        if(!model->hsfData) {
+            return;
+        }
+        particle = work->data;
+        for(i=0; i<work->count; i++, particle++) {
+            Mtx result, temp;
+            float r, g, b, a;
+            if(particle->time == -1) {
+                continue;
+            }
+            MTXRotDeg(temp, 'z', particle->rot.z);
+            MTXRotDeg(result, 'x', particle->rot.x);
+            MTXConcat(temp, result, result);
+            MTXRotDeg(temp, 'y', particle->rot.y);
+            MTXConcat(temp, result, result);
+            MTXTrans(temp, particle->pos.x, particle->pos.y, particle->pos.z);
+            MTXConcat(temp, result, result);
+            MTXConcat(matrix, result, result);
+            r = confettiLightTbl[particle->light_col].x;
+            g = confettiLightTbl[particle->light_col].y;
+            b = confettiLightTbl[particle->light_col].z;
+            OSu8tof32(&particle->alpha, &a);
+            a = a*(1.0f/255.0f);
+            Hu3DModelTPLvlSet(BoardModelIDGet(work->gfx_mdl), a);
+            Hu3DModelAmbSet(BoardModelIDGet(work->gfx_mdl), r, g, b);
+            Hu3DModelObjDraw(BoardModelIDGet(work->gfx_mdl), "grid2", result);
+        }
+    }
 }
 
 typedef struct last5_gfx_work {
-	struct {
-		u8 kill : 1;
-		u8 state : 3;
-		u8 is_last : 1;
-		u8 : 4;
-	};
-	u8 stop_time;
-	s16 time;
-	s16 group;
-	s16 sprites[3];
+    struct {
+        u8 kill : 1;
+        u8 state : 3;
+        u8 is_last : 1;
+        u8 : 4;
+    };
+    u8 stop_time;
+    s16 time;
+    s16 group;
+    s16 sprites[3];
 } Last5GfxWork;
 
 static s32 last5GfxSprTbl[3] = {
-	DATA_MAKE_NUM(DATADIR_BOARD, 95),
-	DATA_MAKE_NUM(DATADIR_BOARD, 97),
-	DATA_MAKE_NUM(DATADIR_BOARD, 96),
+    DATA_MAKE_NUM(DATADIR_BOARD, 95),
+    DATA_MAKE_NUM(DATADIR_BOARD, 97),
+    DATA_MAKE_NUM(DATADIR_BOARD, 96),
 };
 
 static float last5GfxPosTbl[2][3][2] = {
-	{
-		{ -80, 0 },
-		{ 0, 0 },
-		{ 80, 0 }
-	},
-	{
-		{ -52, 0 },
-		{ 0, 0 },
-		{ 52, 0 }
-	}
+    {
+        { -80, 0 },
+        { 0, 0 },
+        { 80, 0 }
+    },
+    {
+        { -52, 0 },
+        { 0, 0 },
+        { 52, 0 }
+    }
 };
 
 static void UpdateLast5Gfx(omObjData *object);
 
 void BoardLast5GfxInit(void)
 {
-	Last5GfxWork *work;
-	omObjData *object;
-	s32 turn_remain;
-	s32 lastF;
-	turn_remain = GWSystem.max_turn-GWSystem.turn;
-	if(turn_remain > 4 || turn_remain < 0) {
-		return;
-	} else {
-		s32 i;
-		turn_remain = 4-turn_remain;
-		object = omAddObjEx(boardObjMan, 0, 0, 0, -1, UpdateLast5Gfx);
-		last5GfxObj = object;
-		work = OM_GET_WORK_PTR(object, Last5GfxWork);
-		work->kill = 0;
-		work->stop_time = 0;
-		work->time = 0;
-		work->group = HuSprGrpCreate(3);
-		if((s32)(GWSystem.max_turn-GWSystem.turn) == 0) {
-			work->is_last = 1;
-			lastF = 1;
-		} else {
-			work->is_last = 0;
-			lastF = 0;
-		}
-		for(i=0; i<3; i++) {
-			s32 prio;
-			s32 spr_file;
-			
-			if(i == 1) {
-				prio = 1000;
-			} else {
-				prio = 1400;
-			}
+    Last5GfxWork *work;
+    omObjData *object;
+    s32 turn_remain;
+    s32 lastF;
+    turn_remain = GWSystem.max_turn-GWSystem.turn;
+    if(turn_remain > 4 || turn_remain < 0) {
+        return;
+    } else {
+        s32 i;
+        turn_remain = 4-turn_remain;
+        object = omAddObjEx(boardObjMan, 0, 0, 0, -1, UpdateLast5Gfx);
+        last5GfxObj = object;
+        work = OM_GET_WORK_PTR(object, Last5GfxWork);
+        work->kill = 0;
+        work->stop_time = 0;
+        work->time = 0;
+        work->group = HuSprGrpCreate(3);
+        if((s32)(GWSystem.max_turn-GWSystem.turn) == 0) {
+            work->is_last = 1;
+            lastF = 1;
+        } else {
+            work->is_last = 0;
+            lastF = 0;
+        }
+        for(i=0; i<3; i++) {
+            s32 prio;
+            s32 spr_file;
+
+            if(i == 1) {
+                prio = 1000;
+            } else {
+                prio = 1400;
+            }
 #if !VERSION_JP
-			spr_file = last5GfxSprTbl[i];
-			if(i == 2 && work->is_last && GWLanguageGet() != 0) {
-				spr_file = DATA_MAKE_NUM(DATADIR_BOARD, 98);
-			}
-			BoardSpriteCreate(spr_file, prio, NULL, &work->sprites[i]);
+            spr_file = last5GfxSprTbl[i];
+            if(i == 2 && work->is_last && GWLanguageGet() != 0) {
+                spr_file = DATA_MAKE_NUM(DATADIR_BOARD, 98);
+            }
+            BoardSpriteCreate(spr_file, prio, NULL, &work->sprites[i]);
 #else
-			BoardSpriteCreate(last5GfxSprTbl[i], prio, NULL, &work->sprites[i]);
+            BoardSpriteCreate(last5GfxSprTbl[i], prio, NULL, &work->sprites[i]);
 #endif
-			HuSprGrpMemberSet(work->group, i, work->sprites[i]);
-			HuSprAttrSet(work->group, i, HUSPR_ATTR_LINEAR);
-			HuSprPosSet(work->group, i, last5GfxPosTbl[lastF][i][0], last5GfxPosTbl[lastF][i][1]);
-		}
-		if(!work->is_last) {
-			HuSprite *sprite = &HuSprData[HuSprGrpData[work->group].members[1]];
-			HuSprBankSet(work->group, 1, 0);
-			sprite->frame = turn_remain;
-		} else {
-			HuSprAttrSet(work->group, 1, HUSPR_ATTR_DISPOFF);
-		}
-		HuSprAttrSet(work->group, 1, HUSPR_ATTR_NOANIM);
-		object->trans.x = 0.0f;
-		HuSprGrpTPLvlSet(work->group, object->trans.x);
-		HuSprGrpPosSet(work->group, HU_DISP_CENTERX, 72);
-		HuAudFXPlay(838);
-		work->time = 0;
-	}
+            HuSprGrpMemberSet(work->group, i, work->sprites[i]);
+            HuSprAttrSet(work->group, i, HUSPR_ATTR_LINEAR);
+            HuSprPosSet(work->group, i, last5GfxPosTbl[lastF][i][0], last5GfxPosTbl[lastF][i][1]);
+        }
+        if(!work->is_last) {
+            HuSprite *sprite = &HuSprData[HuSprGrpData[work->group].members[1]];
+            HuSprBankSet(work->group, 1, 0);
+            sprite->frame = turn_remain;
+        } else {
+            HuSprAttrSet(work->group, 1, HUSPR_ATTR_DISPOFF);
+        }
+        HuSprAttrSet(work->group, 1, HUSPR_ATTR_NOANIM);
+        object->trans.x = 0.0f;
+        HuSprGrpTPLvlSet(work->group, object->trans.x);
+        HuSprGrpPosSet(work->group, HU_DISP_CENTERX, 72);
+        HuAudFXPlay(838);
+        work->time = 0;
+    }
 }
 
 static void UpdateLast5Gfx(omObjData *object)
 {
-	Last5GfxWork *work = OM_GET_WORK_PTR(object, Last5GfxWork);
-	if(work->kill || BoardIsKill()) {
-		HuSprGrpKill(work->group);
-		last5GfxObj = NULL;
-		omDelObjEx(HuPrcCurrentGet(), object);
-		return;
-	}
-	if(work->stop_time != 0) {
-		work->stop_time--;
-		return;
-	}
-	switch(work->state) {
-		case 0:
-			object->trans.x += 1.0f/30.0f;
-			if(object->trans.x > 1.0f) {
-				object->trans.x = 1.0f;
-				work->state = 1;
-			}
-			HuSprGrpTPLvlSet(work->group, object->trans.x);
-			break;
-			
-		case 1:
-			if(work->time >= 720) {
-				work->state = 2;
-				work->stop_time = 90;
-				if(work->is_last) {
-					HuSprGrpScaleSet(work->group, 1.0f, 1.0f);
-				} else {
-					HuSprScaleSet(work->group, 1, 1.0f, 1.0f);
-				}
-			} else {
-				s16 angle;
-				angle = work->time%180;
-				OSs16tof32(&angle, &object->trans.y);
-				object->trans.y = sin((object->trans.y*M_PI)/180.0)+0.5;
-				if(work->is_last) {
-					HuSprGrpScaleSet(work->group, object->trans.y, object->trans.y);
-				} else {
-					HuSprScaleSet(work->group, 1, object->trans.y, object->trans.y);
-				}
-				work->time += 9;
-			}
-			break;
-			
-		case 2:
-			object->trans.x -= 1.0f/30.0f;
-			if(object->trans.x < 0.0f) {
-				object->trans.x = 0.0f;
-				work->kill = 1;
-			}
-			HuSprGrpTPLvlSet(work->group, object->trans.x);
-			break;
-	}
+    Last5GfxWork *work = OM_GET_WORK_PTR(object, Last5GfxWork);
+    if(work->kill || BoardIsKill()) {
+        HuSprGrpKill(work->group);
+        last5GfxObj = NULL;
+        omDelObjEx(HuPrcCurrentGet(), object);
+        return;
+    }
+    if(work->stop_time != 0) {
+        work->stop_time--;
+        return;
+    }
+    switch(work->state) {
+        case 0:
+            object->trans.x += 1.0f/30.0f;
+            if(object->trans.x > 1.0f) {
+                object->trans.x = 1.0f;
+                work->state = 1;
+            }
+            HuSprGrpTPLvlSet(work->group, object->trans.x);
+            break;
+
+        case 1:
+            if(work->time >= 720) {
+                work->state = 2;
+                work->stop_time = 90;
+                if(work->is_last) {
+                    HuSprGrpScaleSet(work->group, 1.0f, 1.0f);
+                } else {
+                    HuSprScaleSet(work->group, 1, 1.0f, 1.0f);
+                }
+            } else {
+                s16 angle;
+                angle = work->time%180;
+                OSs16tof32(&angle, &object->trans.y);
+                object->trans.y = sind(object->trans.y)+0.5;
+                if(work->is_last) {
+                    HuSprGrpScaleSet(work->group, object->trans.y, object->trans.y);
+                } else {
+                    HuSprScaleSet(work->group, 1, object->trans.y, object->trans.y);
+                }
+                work->time += 9;
+            }
+            break;
+
+        case 2:
+            object->trans.x -= 1.0f/30.0f;
+            if(object->trans.x < 0.0f) {
+                object->trans.x = 0.0f;
+                work->kill = 1;
+            }
+            HuSprGrpTPLvlSet(work->group, object->trans.x);
+            break;
+    }
 }
 
 void BoardLast5GfxShowSet(s32 show)
 {
-	s32 i;
-	Last5GfxWork *work;
-	if(!last5GfxObj) {
-		return;
-	}
-	
-	work = OM_GET_WORK_PTR(last5GfxObj, Last5GfxWork);
-	for(i=0; i<3; i++) {
-		if(show) {
-			HuSprAttrReset(work->group, i, HUSPR_ATTR_DISPOFF);
-		} else {
-			HuSprAttrSet(work->group, i, HUSPR_ATTR_DISPOFF);
-		}
-		if(work->is_last) {
-			HuSprAttrSet(work->group, 1, HUSPR_ATTR_DISPOFF);
-		}
-	}
+    s32 i;
+    Last5GfxWork *work;
+    if(!last5GfxObj) {
+        return;
+    }
+
+    work = OM_GET_WORK_PTR(last5GfxObj, Last5GfxWork);
+    for(i=0; i<3; i++) {
+        if(show) {
+            HuSprAttrReset(work->group, i, HUSPR_ATTR_DISPOFF);
+        } else {
+            HuSprAttrSet(work->group, i, HUSPR_ATTR_DISPOFF);
+        }
+        if(work->is_last) {
+            HuSprAttrSet(work->group, 1, HUSPR_ATTR_DISPOFF);
+        }
+    }
 }
 
 static s32 tauntActiveFXTbl[4] = { -1, -1, -1, -1 };
 static s32 tauntFXTbl[8] = {
-	294,
-	358,
-	422,
-	486,
-	550,
-	614,
-	678,
-	742
+    294,
+    358,
+    422,
+    486,
+    550,
+    614,
+    678,
+    742
 };
 
 typedef struct taunt_work {
-	u8 kill : 1;
+    u8 kill : 1;
 } TauntWork;
 
 static void TauntUpdate(omObjData *object);
 
 void BoardTauntInit(void)
 {
-	s32 i;
-	tauntObj = omAddObjEx(boardObjMan, 32258, 0, 0, -1, TauntUpdate);
-	for(i=0; i<4; i++) {
-		tauntActiveFXTbl[i] = -1;
-	}
-	_SetFlag(FLAG_ID_MAKE(1, 14));
+    s32 i;
+    tauntObj = omAddObjEx(boardObjMan, 32258, 0, 0, -1, TauntUpdate);
+    for(i=0; i<4; i++) {
+        tauntActiveFXTbl[i] = -1;
+    }
+    _SetFlag(FLAG_ID_MAKE(1, 14));
 }
 
 void BoardTauntKill(void)
 {
-	TauntWork *work;
-	if(!tauntObj) {
-		return;
-	}
-	work = OM_GET_WORK_PTR(tauntObj, TauntWork);
-	work->kill = 1;
-	_SetFlag(FLAG_ID_MAKE(1, 14));
+    TauntWork *work;
+    if(!tauntObj) {
+        return;
+    }
+    work = OM_GET_WORK_PTR(tauntObj, TauntWork);
+    work->kill = 1;
+    _SetFlag(FLAG_ID_MAKE(1, 14));
 }
 
 static void TauntUpdate(omObjData *object)
 {
-	s32 i;
-	s32 port;
-	s32 character;
-	TauntWork *work;
-	work = OM_GET_WORK_PTR(object, TauntWork);
-	if(work->kill || BoardIsKill()) {
-		for(i=0; i<4; i++) {
-			if(tauntActiveFXTbl[i] >= 0) {
-				HuAudFXStop(tauntActiveFXTbl[i]);
-				tauntActiveFXTbl[i] = -1;
-			}
-		}
-		tauntObj = NULL;
-		omDelObjEx(HuPrcCurrentGet(), object);
-		return;
-	}
-	for(i=0; i<4; i++) {
-		if(tauntActiveFXTbl[i] >= 0 && HuAudFXStatusGet(tauntActiveFXTbl[i]) == 0) {
-			tauntActiveFXTbl[i] = -1;
-		}
-	}
-	if(BoardPauseActiveCheck()) {
-		return;
-	}
-	if(_CheckFlag(FLAG_ID_MAKE(1, 14))) {
-		return;
-	}
-	if(WipeStatGet()) {
-		return;
-	}
-	if(GWSystem.player_curr == -1) {
-		return;
-	}
-	for(i=0; i<4; i++) {
-		if(i == GWSystem.player_curr || GWPlayer[i].com) {
-			continue;
-		}
-		port = GWPlayer[i].port & 0x3;
-		character = GWPlayer[i].character & 0x7;
-		if(tauntActiveFXTbl[port] >= 0) {
-			MSM_SEPARAM param;
-			float vol, pan;
-			vol = (64.0f*(HuPadSubStkX[port]/59.0f))+64.0f;
-			pan = 8191.0f*(HuPadSubStkY[port]/59.0f);
-			memset(&param, 0, sizeof(MSM_SEPARAM));
-			param.flag = MSM_SEPARAM_PITCH|MSM_SEPARAM_PAN;
-			OSf32tos8(&vol, &param.pan);
-			OSf32tos16(&pan, &param.pitch);
-			msmSeSetParam(tauntActiveFXTbl[port], &param);
-		} else {
-			if(HuPadBtnDown[port] & PAD_TRIGGER_L) {
-				tauntActiveFXTbl[port] = HuAudFXPlay(tauntFXTbl[character]);
-			}
-		}
-	}
+    s32 i;
+    s32 port;
+    s32 character;
+    TauntWork *work;
+    work = OM_GET_WORK_PTR(object, TauntWork);
+    if(work->kill || BoardIsKill()) {
+        for(i=0; i<4; i++) {
+            if(tauntActiveFXTbl[i] >= 0) {
+                HuAudFXStop(tauntActiveFXTbl[i]);
+                tauntActiveFXTbl[i] = -1;
+            }
+        }
+        tauntObj = NULL;
+        omDelObjEx(HuPrcCurrentGet(), object);
+        return;
+    }
+    for(i=0; i<4; i++) {
+        if(tauntActiveFXTbl[i] >= 0 && HuAudFXStatusGet(tauntActiveFXTbl[i]) == 0) {
+            tauntActiveFXTbl[i] = -1;
+        }
+    }
+    if(BoardPauseActiveCheck()) {
+        return;
+    }
+    if(_CheckFlag(FLAG_ID_MAKE(1, 14))) {
+        return;
+    }
+    if(WipeStatGet()) {
+        return;
+    }
+    if(GWSystem.player_curr == -1) {
+        return;
+    }
+    for(i=0; i<4; i++) {
+        if(i == GWSystem.player_curr || GWPlayer[i].com) {
+            continue;
+        }
+        port = GWPlayer[i].port & 0x3;
+        character = GWPlayer[i].character & 0x7;
+        if(tauntActiveFXTbl[port] >= 0) {
+            MSM_SEPARAM param;
+            float vol, pan;
+            vol = (64.0f*(HuPadSubStkX[port]/59.0f))+64.0f;
+            pan = 8191.0f*(HuPadSubStkY[port]/59.0f);
+            memset(&param, 0, sizeof(MSM_SEPARAM));
+            param.flag = MSM_SEPARAM_PITCH|MSM_SEPARAM_PAN;
+            OSf32tos8(&vol, &param.pan);
+            OSf32tos16(&pan, &param.pitch);
+            msmSeSetParam(tauntActiveFXTbl[port], &param);
+        } else {
+            if(HuPadBtnDown[port] & PAD_TRIGGER_L) {
+                tauntActiveFXTbl[port] = HuAudFXPlay(tauntFXTbl[character]);
+            }
+        }
+    }
 }
 
 s32 BoardDataDirReadAsync(s32 data_num)
 {
-	s32 status = HuDataDirReadAsync(data_num);
-	return status;
+    s32 status = HuDataDirReadAsync(data_num);
+    return status;
 }
 
 void BoardDataAsyncWait(s32 status)
 {
-	if(status == -1) {
-		return;
-	}
-	while(!HuDataGetAsyncStat(status)) {
-		HuPrcVSleep();
-	}
+    if(status == -1) {
+        return;
+    }
+    while(!HuDataGetAsyncStat(status)) {
+        HuPrcVSleep();
+    }
 }
diff --git a/src/game/board/mg_setup.c b/src/game/board/mg_setup.c
index 4613826f..ec5ac7a4 100644
--- a/src/game/board/mg_setup.c
+++ b/src/game/board/mg_setup.c
@@ -12,6 +12,8 @@
 #include "game/board/tutorial.h"
 #include "game/board/window.h"
 
+#include "ext_math.h"
+
 // structs
 typedef struct structActiveMG {
     s16 unk_00;
@@ -767,7 +769,7 @@ static void SeparateStatus(bitcopy* arg0, omObjData* arg1) {
             return;
         }
         OSu8tof32((u8*)&arg0->unk_03, &temp_f29);
-        temp_f30 = sin((temp_f29 * M_PI) / 180.0) * 4.0 + 1.0;
+        temp_f30 = sind(temp_f29) * 4.0 + 1.0;
         arg0->unk_03 += 6;
         if (arg0->unk_03 > 0x5A) {
             arg0->unk_03 = 0x5A;
@@ -797,9 +799,9 @@ static void PopupVS(bitcopy* arg0, omObjData* arg1) {
     }
     OSs16tof32(&arg0->unk_04, &temp_f31);
     if (arg0->unk_04 < 0x5A) {
-        var_f30 = 2.0 * sin((M_PI * temp_f31) / 180.0);
+        var_f30 = 2.0 * sind(temp_f31);
     } else {
-        var_f30 = 1.0 + sin((M_PI * temp_f31) / 180.0);
+        var_f30 = 1.0 + sind(temp_f31);
         if (arg0->unk_04 >= 0xB4) {
             var_f30 = 1.0f;
             temp_r28 = (bitcopy*) mgSetupObj->work;
@@ -958,7 +960,7 @@ static void UpdateLuckyValue(bitcopy* arg0, omObjData* arg1) {
         case 1:
             if (arg0->unk_03 < 0x5A) {
                 OSu8tof32((u8*) &arg0->unk_03, &temp_f28);
-                temp_f29 = sin((M_PI * temp_f28) / 180.0);
+                temp_f29 = sind(temp_f28);
                 HuSprScaleSet(temp_r27->unk_00[0], 8, temp_f29, temp_f29);
                 HuSprScaleSet(temp_r27->unk_00[0], 9, temp_f29, temp_f29);
                 arg0->unk_03 += 2;
@@ -1006,7 +1008,7 @@ static void UpdateLuckyValue(bitcopy* arg0, omObjData* arg1) {
                 return;
             }
             temp_f28 = (arg0->unk_04 % 360);
-            temp_f29 = (1.0 + (0.5 * sin((M_PI * temp_f28) / 180.0)));
+            temp_f29 = (1.0 + (0.5 * sind(temp_f28)));
             HuSprScaleSet(temp_r27->unk_00[0], 8, temp_f29, temp_f29);
             HuSprScaleSet(temp_r27->unk_00[0], 9, temp_f29, temp_f29);
             break;
@@ -1075,7 +1077,7 @@ static void UpdateMGList(bitcopy* arg0, omObjData* arg1) {
         case 1:
             if (arg0->unk_03 < 0x5A) {
                 OSu8tof32((u8*) &arg0->unk_03, &var_f26);
-                temp_f27 = sin((M_PI * var_f26) / 180.0);
+                temp_f27 = sind(var_f26);
                 arg0->unk_03 += 3;
                 HuSprScaleSet(temp_r24->unk_00[0], temp_r22, temp_f27, temp_f27);
                 return;
@@ -1166,7 +1168,7 @@ static void UpdateMGList(bitcopy* arg0, omObjData* arg1) {
         case 5:
             if (arg0->unk_03 < 0x5A) {
                 OSu8tof32((u8*) &arg0->unk_03, &var_f26);
-                temp_f27 = (1.0 + (2.0 * sin((M_PI * var_f26) / 180.0)));
+                temp_f27 = (1.0 + (2.0 * sind(var_f26)));
                 arg0->unk_03 += 4;
                 if (arg0->unk_03 > 0x5A) {
                     arg0->unk_03 = 0x5A;
diff --git a/src/game/board/mushroom.c b/src/game/board/mushroom.c
index 328fc1fe..1b0c57b6 100644
--- a/src/game/board/mushroom.c
+++ b/src/game/board/mushroom.c
@@ -300,7 +300,7 @@ static void ExitBox(ItemGiveWork2* arg0, omObjData* arg1) {
     }
 
     arg1->trans.y = spC.y + (700.0f * cosd(arg0->unk_08));
-    arg1->rot.y = sin((M_PI * temp) / 180.0);
+    arg1->rot.y = sind(temp);
     arg0->unk_08 -= 1.5f;
     arg0->unk_06 -= 30;
 }
diff --git a/src/game/board/start.c b/src/game/board/start.c
index 0cb9e8bc..61b854db 100755
--- a/src/game/board/start.c
+++ b/src/game/board/start.c
@@ -20,6 +20,7 @@
 #include "game/board/window.h"
 
 #include "dolphin.h"
+#include "ext_math.h"
 #include "string.h"
 
 typedef struct {
@@ -238,7 +239,7 @@ static void ShowLogo(void) {
     HuSprGrpPosSet(logoSprGrp, 288.0f, 240.0f);
     for (spA = 0; spA < 90; spA += 4) {
         OSs16tof32(&spA, &var_f27);
-        temp_f28 = sin(var_f27 * M_PI / 180.0);
+        temp_f28 = sind(var_f27);
         HuSprScaleSet(logoSprGrp, 0, temp_f28, temp_f28);
         HuPrcVSleep();
     }
@@ -246,7 +247,7 @@ static void ShowLogo(void) {
     for (spA = 0; spA < 540; spA += 4) {
         sp8 = spA % 180;
         OSs16tof32(&sp8, &var_f27);
-        temp_f28 = 1.0 + 0.699999988079071 * sin(var_f27 * M_PI / 180.0);
+        temp_f28 = 1.0 + 0.7f * sind(var_f27);
         HuSprScaleSet(logoSprGrp, 0, temp_f28, temp_f28);
         HuPrcVSleep();
     }
@@ -254,7 +255,7 @@ static void ShowLogo(void) {
     HuPrcSleep(0x78);
     for (spA = 0; spA < 90; spA += 4) {
         OSs16tof32(&spA, &var_f27);
-        temp_f28 = cos(var_f27 * M_PI / 180.0);
+        temp_f28 = cosd(var_f27);
         HuSprScaleSet(logoSprGrp, 0, temp_f28, temp_f28);
         HuPrcVSleep();
     }
@@ -586,7 +587,7 @@ static void PlayerDiceNumHide(omObjData *arg0, PlayerStartWork *arg1) {
                 arg1->unk02 = 2;
             }
             OSs16tof32(&arg1->unk06, &var_f28);
-            arg0->rot.x = 1.0 + 1.2999999523162842 * sin(var_f28 * M_PI / 180.0);
+            arg0->rot.x = 1.0 + 1.3f * sind(var_f28);
             break;
         case 2:
             arg1->unk06 += 9;
@@ -595,8 +596,8 @@ static void PlayerDiceNumHide(omObjData *arg0, PlayerStartWork *arg1) {
                 arg1->unk02 = 3;
             }
             OSs16tof32(&arg1->unk06, &var_f28);
-            arg0->rot.x = cos(0.5f * var_f28 * M_PI / 180.0);
-            arg0->rot.y = 1.0 + 1.2999999523162842 * sin(var_f28 * M_PI / 180.0);
+            arg0->rot.x = cosd(0.5f * var_f28);
+            arg0->rot.y = 1.0 + 1.3f * sind(var_f28);
             break;
         case 3:
             BoardModelVisibilitySet(arg1->unk0A, 0);
diff --git a/src/game/board/warp.c b/src/game/board/warp.c
index ddc92315..c25a8511 100644
--- a/src/game/board/warp.c
+++ b/src/game/board/warp.c
@@ -12,7 +12,7 @@
 #include "game/objsub.h"
 #include "game/disp.h"
 
-#include "math.h"
+#include "ext_math.h"
 
 static void WarpInit(s32);
 static void WarpLaunch(s32);
@@ -234,7 +234,7 @@ static void WarpImpact(s32 player) {
     speed = 4.0f;
     
     for (angle = 0.0f, temp = angle; angle < 180.0f; angle += speed) {
-        temp_f30 = sin((M_PI * angle) / 180.0);
+        temp_f30 = sind(angle);
         BoardModelScaleSet(warpImpactMdl, 0.5f + temp_f30, 0.5f + temp_f30, 0.5f + temp_f30);
         HuPrcVSleep();
     }
@@ -245,4 +245,4 @@ static void WarpImpact(s32 player) {
         BoardPlayerIdleSet(warpImpactPlayer[i]);
     }
     warpState = 6;
-}
\ No newline at end of file
+}
diff --git a/src/game/hsfex.c b/src/game/hsfex.c
index 63f3745e..490e19e3 100644
--- a/src/game/hsfex.c
+++ b/src/game/hsfex.c
@@ -3,7 +3,7 @@
 #include "game/hsfmotion.h"
 #include "game/disp.h"
 
-#include "math.h"
+#include "ext_math.h"
 
 #define DISP_HALF_W (HU_DISP_WIDTH/2.0f)
 #define DISP_HALF_H (HU_DISP_HEIGHT/2.0f)
@@ -129,10 +129,10 @@ void CamMotionEx(s16 arg0, s16 arg1, Vec *arg2, Vec *arg3, Vec *arg4, float arg5
                 var_f30 = var_f31;
                 break;
             case 1:
-                var_f30 = arg5 * sin(90.0f * (var_f31 / arg5) * M_PI / 180.0);
+                var_f30 = arg5 * sind(90.0f * (var_f31 / arg5));
                 break;
             case 2:
-                var_f30 = arg5 * (1.0 - cos(90.0f * (var_f31 / arg5) * M_PI / 180.0));
+                var_f30 = arg5 * (1.0 - cosd(90.0f * (var_f31 / arg5)));
                 break;
             }
         var_r31 = temp_r21;
@@ -346,9 +346,9 @@ static void SetObjCamMotion(s16 arg0, HsfTrack *arg1, float arg2, HsfexStruct02
         case 14:
             VECSubtract(&arg3->unk08, &arg3->unk20, &spC);
             VECNormalize(&spC, &spC);
-            sp18.x = spC.x * spC.y * (1.0 - cos(M_PI * arg2 / 180.0)) - spC.z * sin(M_PI * arg2 / 180.0);
-            sp18.y = spC.y * spC.y + (1.0f - spC.y * spC.y) * cos(M_PI * arg2 / 180.0);
-            sp18.z = spC.y * spC.z * (1.0 - cos(M_PI * arg2 / 180.0)) + spC.x * sin(M_PI * arg2 / 180.0);
+            sp18.x = spC.x * spC.y * (1.0 - cosd(arg2)) - spC.z * sind(arg2);
+            sp18.y = spC.y * spC.y + (1.0f - spC.y * spC.y) * cosd(arg2);
+            sp18.z = spC.y * spC.z * (1.0 - cosd(arg2)) + spC.x * sind(arg2);
             VECNormalize(&sp18, &arg3->unk14);
             break;
     }
@@ -432,7 +432,7 @@ void Hu3D2Dto3D(Vec *arg0, s16 arg1, Vec *arg2) {
         }
     }
     temp_r31 = &Hu3DCamera[i];
-    temp_f30 = sin((temp_r31->fov / 2) * M_PI / 180.0) / cos((temp_r31->fov / 2) * M_PI / 180.0);
+    temp_f30 = sind(temp_r31->fov / 2) / cosd(temp_r31->fov / 2);
     temp_f31 = temp_f30 * arg0->z * 2.0f;
     temp_f29 = temp_f31 * HU_DISP_ASPECT;
     temp_f28 = arg0->x / HU_DISP_WIDTH;
@@ -461,8 +461,8 @@ void Hu3D3Dto2D(Vec *arg0, s16 arg1, Vec *arg2) {
     temp_r31 = &Hu3DCamera[i];
     C_MTXLookAt(sp1C, &temp_r31->pos, &temp_r31->up, &temp_r31->target);
     PSMTXMultVec(sp1C, arg0, &sp10);
-    temp_f31 = (sin((temp_r31->fov / 2) * M_PI / 180.0) / cos((temp_r31->fov / 2) * M_PI / 180.0)) * sp10.z * HU_DISP_ASPECT;
-    temp_f30 = (sin((temp_r31->fov / 2) * M_PI / 180.0) / cos((temp_r31->fov / 2) * M_PI / 180.0)) * sp10.z;
+    temp_f31 = (sind(temp_r31->fov / 2) / cosd(temp_r31->fov / 2)) * sp10.z * HU_DISP_ASPECT;
+    temp_f30 = (sind(temp_r31->fov / 2) / cosd(temp_r31->fov / 2)) * sp10.z;
     arg2->x = DISP_HALF_W + sp10.x * (DISP_HALF_W / -temp_f31);
     arg2->y = DISP_HALF_H + sp10.y * (DISP_HALF_H / temp_f30);
     arg2->z = 0.0f;
diff --git a/src/game/objsysobj.c b/src/game/objsysobj.c
index 3e6b56f3..210bdbfd 100644
--- a/src/game/objsysobj.c
+++ b/src/game/objsysobj.c
@@ -6,7 +6,7 @@
 #include "game/sprite.h"
 #include "game/hsfman.h"
 #include "game/audio.h"
-#include "math.h"
+#include "ext_math.h"
 
 Vec CRot;
 Vec Center;
@@ -23,15 +23,15 @@ void omOutView(omObjData *object)
 	float rot_x = CRot.x;
 	float rot_y = CRot.y;
 	float rot_z = CRot.z;
-	pos.x = (sin(M_PI*rot_y/180.0)*cos(M_PI*rot_x/180.0)*CZoom)+Center.x;
-	pos.y = (-sin(M_PI*rot_x/180.0)*CZoom)+Center.y;
-	pos.z = (cos(M_PI*rot_y/180.0)*cos(M_PI*rot_x/180.0)*CZoom)+Center.z;
+	pos.x = (sind(rot_y)*cosd(rot_x)*CZoom)+Center.x;
+	pos.y = (-sind(rot_x)*CZoom)+Center.y;
+	pos.z = (cosd(rot_y)*cosd(rot_x)*CZoom)+Center.z;
 	target.x = Center.x;
 	target.y = Center.y;
 	target.z = Center.z;
-	up.x = sin(M_PI*rot_y/180.0)*sin(M_PI*rot_x/180.0);
-	up.y = cos(M_PI*rot_x/180.0);
-	up.z = cos(M_PI*rot_y/180.0)*sin(M_PI*rot_x/180.0);
+	up.x = sind(rot_y)*sind(rot_x);
+	up.y = cosd(rot_x);
+	up.z = cosd(rot_y)*sind(rot_x);
 	Hu3DCameraPosSet(1, pos.x, pos.y, pos.z, up.x, up.y, up.z, target.x, target.y, target.z);
 }
 
@@ -43,15 +43,15 @@ void omOutViewMulti(omObjData *object)
 		float rot_x = CRotM[i].x;
 		float rot_y = CRotM[i].y;
 		float rot_z = CRotM[i].z;
-		pos.x = (sin(M_PI*rot_y/180.0)*cos(M_PI*rot_x/180.0)*CZoomM[i])+CenterM[i].x;
-		pos.y = (-sin(M_PI*rot_x/180.0)*CZoomM[i])+CenterM[i].y;
-		pos.z = (cos(M_PI*rot_y/180.0)*cos(M_PI*rot_x/180.0)*CZoomM[i])+CenterM[i].z;
+		pos.x = (sind(rot_y)*cosd(rot_x)*CZoomM[i])+CenterM[i].x;
+		pos.y = (-sind(rot_x)*CZoomM[i])+CenterM[i].y;
+		pos.z = (cosd(rot_y)*cosd(rot_x)*CZoomM[i])+CenterM[i].z;
 		target.x = CenterM[i].x;
 		target.y = CenterM[i].y;
 		target.z = CenterM[i].z;
-		up.x = sin(M_PI*rot_y/180.0)*sin(M_PI*rot_x/180.0);
-		up.y = cos(M_PI*rot_x/180.0);
-		up.z = cos(M_PI*rot_y/180.0)*sin(M_PI*rot_x/180.0);
+		up.x = sind(rot_y)*sind(rot_x);
+		up.y = cosd(rot_x);
+		up.z = cosd(rot_y)*sind(rot_x);
 		Hu3DCameraPosSetV((1 << i), &pos, &up, &target);
 	}
 }
@@ -145,4 +145,4 @@ void omSysPauseCtrl(s16 flag)
 	} else {
 		omDBGSysKeyObj->work[0] |= 0x100;
 	}
-}
\ No newline at end of file
+}