From eb35233505f21763528931382ef42f1fd24348c3 Mon Sep 17 00:00:00 2001
From: dbalatoni13 <40299962+dbalatoni13@users.noreply.github.com>
Date: Tue, 1 Apr 2025 06:40:22 +0200
Subject: [PATCH] Replace most of Point3d with Vec

---
 include/REL/m407dll.h              |   2 +-
 include/REL/modeltestDll.h         |  13 +-
 include/game/hsfman.h              |  15 +-
 src/REL/m407dll/camera.c           | 134 +++---
 src/REL/m407dll/map.c              |   8 +-
 src/REL/m424Dll/ball.c             |   3 +-
 src/REL/m427Dll/map.c              |   2 +-
 src/REL/m443Dll/player.c           |   2 +-
 src/REL/mentDll/common.c           |   6 +-
 src/REL/modeltestDll/main.c        |  24 +-
 src/REL/modeltestDll/modeltest00.c |  86 ++--
 src/REL/w02Dll/main.c              | 175 +++----
 src/REL/w02Dll/roulette.c          | 734 +++++++++++++++--------------
 src/REL/w03Dll/mg_coin.c           |  20 +-
 src/REL/w03Dll/mg_item.c           |  16 +-
 src/REL/w03Dll/river.c             | 163 ++++---
 src/REL/w03Dll/statue.c            |  25 +-
 src/dolphin/mtx/mtx.c              |   2 +-
 src/game/board/block.c             |  13 +-
 19 files changed, 732 insertions(+), 711 deletions(-)

diff --git a/include/REL/m407dll.h b/include/REL/m407dll.h
index d5d6cbc8..525a406d 100644
--- a/include/REL/m407dll.h
+++ b/include/REL/m407dll.h
@@ -30,7 +30,7 @@ void fn_1_1CA8(void);
 void fn_1_1CAC(float, float, float);
 void fn_1_1CD4(float *arg0, float *arg1, float *arg2);
 s32 fn_1_1D88(void);
-void fn_1_1DB0(Point3d *arg0, Point3d *arg1, float *arg2, s32 arg3, s32 arg4);
+void fn_1_1DB0(Vec *arg0, Vec *arg1, float *arg2, s32 arg3, s32 arg4);
 
 void fn_1_2354(Process *arg0);
 void fn_1_2564(void);
diff --git a/include/REL/modeltestDll.h b/include/REL/modeltestDll.h
index 99a8a769..d4afecc4 100644
--- a/include/REL/modeltestDll.h
+++ b/include/REL/modeltestDll.h
@@ -5,7 +5,6 @@
 #include "game/object.h"
 #include "game/objsub.h"
 
-
 #include "ext_math.h"
 
 // -------------------------------------------------------------------------- //
@@ -21,20 +20,20 @@ typedef struct {
 } HuUnkF9C2;
 
 typedef struct {
-    Point3d pos; // 0000
-    Point3d rot; // 000C
-    Point3d scale; // 0018
+    Vec pos; // 0000
+    Vec rot; // 000C
+    Vec scale; // 0018
     s32 unk24;
     s32 unk28;
     s32 unk2C;
     HsfObject *obj; // 0030
 } HuObjUnk;
 
-extern Point3d CRot;
-extern Point3d Center;
+extern Vec CRot;
+extern Vec Center;
 extern float CZoom;
 void fn_1_29C();
-void fn_1_28F8(Point3d *arg0, Point3d *arg1);
+void fn_1_28F8(Vec *arg0, Vec *arg1);
 void fn_1_37DC(omObjData *);
 void fn_1_439C(omObjData *);
 void fn_1_46F0();
diff --git a/include/game/hsfman.h b/include/game/hsfman.h
index e107b479..2be96d31 100644
--- a/include/game/hsfman.h
+++ b/include/game/hsfman.h
@@ -6,7 +6,6 @@
 #include "game/hsfformat.h"
 #include "game/memory.h"
 
-
 #define HU3D_MODEL_MAX 512
 #define HU3D_MOTION_MAX 256
 #define HU3D_TEXANIM_MAX 256
@@ -109,7 +108,7 @@ struct model_data {
     u32 unk_4C;
     u32 attr;
     u32 motion_attr;
-    Point3d unk_58;
+    Vec unk_58;
     float unk_64;
     float unk_68;
     float unk_6C;
@@ -164,8 +163,8 @@ typedef struct ThreeDProjectionStruct {
     char unk_01[0x3];
     void *unk_04;
     Vec unk_08;
-    Point3d unk_14;
-    Point3d unk_20;
+    Vec unk_14;
+    Vec unk_20;
     Vec unk_2C;
     Mtx unk_38;
     Mtx unk_68;
@@ -271,12 +270,12 @@ void Hu3DLLightKill(s16, s16);
 void Hu3DLightAllKill(void);
 void Hu3DGLightColorSet(s16, u8, u8, u8, u8);
 void Hu3DLLightColorSet(s16, s16, u8, u8, u8, u8);
-void Hu3DGLightPosSetV(s16, Vec *, Point3d *);
-void Hu3DLLightPosSetV(s16, s16, Vec *, Point3d *);
+void Hu3DGLightPosSetV(s16, Vec *, Vec *);
+void Hu3DLLightPosSetV(s16, s16, Vec *, Vec *);
 void Hu3DGLightPosSet(s16, float, float, float, float, float, float);
 void Hu3DLLightPosSet(s16, s16, float, float, float, float, float, float);
-void Hu3DGLightPosAimSetV(s16, Point3d *, Point3d *);
-void Hu3DLLightPosAimSetV(s16, s16, Point3d *, Point3d *);
+void Hu3DGLightPosAimSetV(s16, Vec *, Vec *);
+void Hu3DLLightPosAimSetV(s16, s16, Vec *, Vec *);
 void Hu3DGLightPosAimSet(s16, float, float, float, float, float, float);
 void Hu3DLLightPosAimSet(s16, s16, float, float, float, float, float, float);
 void Hu3DGLightStaticSet(s16, s32);
diff --git a/src/REL/m407dll/camera.c b/src/REL/m407dll/camera.c
index 69d04b85..4db0b078 100644
--- a/src/REL/m407dll/camera.c
+++ b/src/REL/m407dll/camera.c
@@ -1,35 +1,37 @@
-#include "game/process.h"
-#include "game/object.h"
-#include "game/hsfdraw.h"
 #include "ext_math.h"
+#include "game/hsfdraw.h"
+#include "game/object.h"
+#include "game/process.h"
+
 
 typedef struct unkDominationData2 {
-/* 0x00 */ s32 unk_00;
-/* 0x04 */ s32 unk_04;
-/* 0x08 */ Point3d unk_08;
-/* 0x14 */ Point3d unk_14;
-/* 0x20 */ f32 unk_20;
-/* 0x24 */ Point3d unk_24;
-/* 0x30 */ Point3d unk_30;
-/* 0x3C */ f32 unk_3C;
-/* 0x40 */ s32 unk_40;
-/* 0x44 */ f32 unk_44;
-/* 0x48 */ f32 unk_48;
-} unkDominationData2; //sizeof 0x4C
+    /* 0x00 */ s32 unk_00;
+    /* 0x04 */ s32 unk_04;
+    /* 0x08 */ Vec unk_08;
+    /* 0x14 */ Vec unk_14;
+    /* 0x20 */ f32 unk_20;
+    /* 0x24 */ Vec unk_24;
+    /* 0x30 */ Vec unk_30;
+    /* 0x3C */ f32 unk_3C;
+    /* 0x40 */ s32 unk_40;
+    /* 0x44 */ f32 unk_44;
+    /* 0x48 */ f32 unk_48;
+} unkDominationData2; // sizeof 0x4C
 
-//function signatures
+// function signatures
 void fn_1_1CAC(f32, f32, f32);
 void fn_1_1D08(f32, f32, f32);
 void fn_1_1D64(f32);
-void fn_1_2024(omObjData*);
+void fn_1_2024(omObjData *);
 
-//bss
-Process* lbl_1_bss_34;
-omObjData* lbl_1_bss_30;
+// bss
+Process *lbl_1_bss_34;
+omObjData *lbl_1_bss_30;
+
+void fn_1_1B1C(Process *arg0)
+{
+    unkDominationData2 *unkData;
 
-void fn_1_1B1C(Process* arg0) {
-    unkDominationData2* unkData;
-    
     lbl_1_bss_34 = arg0;
     Hu3DCameraViewportSet(1, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f);
     Hu3DCameraPerspectiveSet(1, 45.0f, 10.0f, 40000.0f, 1.2f);
@@ -42,49 +44,55 @@ void fn_1_1B1C(Process* arg0) {
     fn_1_1D64(0.0f);
 }
 
-void fn_1_1CA8(void) {
+void fn_1_1CA8(void) { }
 
-}
-
-void fn_1_1CAC(f32 arg8, f32 arg9, f32 argA) {
+void fn_1_1CAC(f32 arg8, f32 arg9, f32 argA)
+{
     Center.x = arg8;
     Center.y = arg9;
     Center.z = argA;
 }
 
-void fn_1_1CD4(f32* arg0, f32* arg1, f32* arg2) {
+void fn_1_1CD4(f32 *arg0, f32 *arg1, f32 *arg2)
+{
     *arg0 = Center.x;
     *arg1 = Center.y;
     *arg2 = Center.z;
 }
 
-void fn_1_1D08(f32 arg8, f32 arg9, f32 argA) {
+void fn_1_1D08(f32 arg8, f32 arg9, f32 argA)
+{
     CRot.x = arg8;
     CRot.y = arg9;
     CRot.z = argA;
 }
 
-void fn_1_1D30(f32* arg0, f32* arg1, f32* arg2) {
+void fn_1_1D30(f32 *arg0, f32 *arg1, f32 *arg2)
+{
     *arg0 = CRot.x;
     *arg1 = CRot.y;
     *arg2 = CRot.z;
 }
 
-void fn_1_1D64(f32 arg8) {
+void fn_1_1D64(f32 arg8)
+{
     CZoom = arg8;
 }
 
-void fn_1_1D74(f32* arg0) {
+void fn_1_1D74(f32 *arg0)
+{
     *arg0 = CZoom;
 }
 
-s32 fn_1_1D88(void) {
-    unkDominationData2* unkData = lbl_1_bss_30->data;
+s32 fn_1_1D88(void)
+{
+    unkDominationData2 *unkData = lbl_1_bss_30->data;
     return unkData->unk_04;
 }
 
-void fn_1_1DB0(Point3d* arg0, Point3d* arg1, f32* arg2, s32 arg3, s32 arg4) {
-    unkDominationData2* temp_r31;
+void fn_1_1DB0(Vec *arg0, Vec *arg1, f32 *arg2, s32 arg3, s32 arg4)
+{
+    unkDominationData2 *temp_r31;
 
     temp_r31 = lbl_1_bss_30->data;
     temp_r31->unk_00 = arg4;
@@ -100,46 +108,48 @@ void fn_1_1DB0(Point3d* arg0, Point3d* arg1, f32* arg2, s32 arg3, s32 arg4) {
     temp_r31->unk_04 = 1;
 }
 
-f32 fn_1_1F1C(f32 arg8, f32 arg9) {
+f32 fn_1_1F1C(f32 arg8, f32 arg9)
+{
     if (((arg8 > 0.0f) && (arg9 > 0.0f)) || ((arg8 < 0.0f) && (arg9 < 0.0f))) {
         return abs(arg8 - arg9);
     }
-    
+
     return abs(arg8) + abs(arg9);
 }
 
-void fn_1_2024(omObjData* arg0) {
+void fn_1_2024(omObjData *arg0)
+{
     Vec sp14;
     Vec sp8;
     f32 var_f31;
     f32 cZoomTemp;
-    unkDominationData2* temp_r31;
+    unkDominationData2 *temp_r31;
 
     temp_r31 = arg0->data;
     if (temp_r31->unk_04 != 0) {
         switch (temp_r31->unk_00) {
-        case 0:
-            var_f31 = temp_r31->unk_44;
-            break;
-        case 1:
-            var_f31 = temp_r31->unk_44;
-            if (temp_r31->unk_48 > 0.5) {
-                temp_r31->unk_00 = 2;
-            }
-            break;
-        case 2:
-            var_f31 = sind(90.0f * temp_r31->unk_44);
-            break;
-        case 3:
-            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 = sind(90.0f * temp_r31->unk_44);
-            var_f31 *= var_f31;
-            break;
+            case 0:
+                var_f31 = temp_r31->unk_44;
+                break;
+            case 1:
+                var_f31 = temp_r31->unk_44;
+                if (temp_r31->unk_48 > 0.5) {
+                    temp_r31->unk_00 = 2;
+                }
+                break;
+            case 2:
+                var_f31 = sind(90.0f * temp_r31->unk_44);
+                break;
+            case 3:
+                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 = sind(90.0f * temp_r31->unk_44);
+                var_f31 *= var_f31;
+                break;
         }
         sp14.x = temp_r31->unk_24.x + (var_f31 * (temp_r31->unk_08.x - temp_r31->unk_24.x));
         sp14.y = temp_r31->unk_24.y + (var_f31 * (temp_r31->unk_08.y - temp_r31->unk_24.y));
diff --git a/src/REL/m407dll/map.c b/src/REL/m407dll/map.c
index 1f5cc5e0..4675aa80 100644
--- a/src/REL/m407dll/map.c
+++ b/src/REL/m407dll/map.c
@@ -34,10 +34,10 @@ s32 lbl_1_data_198[] = {
 
 Vec lbl_1_data_1CC[] = { { 600.0f, 3.0f, -300.0f }, { 200.0f, 3.0f, -300.0f }, { -200.0f, 3.0f, -300.0f }, { -600.0f, 3.0f, -300.0f } };
 
-Point3d lbl_1_data_1FC = { 2000.0f, 3000.0f, 2000.0f };
-Point3d lbl_1_data_208 = { -0.5f, -0.5f, -0.5f };
+Vec lbl_1_data_1FC = { 2000.0f, 3000.0f, 2000.0f };
+Vec lbl_1_data_208 = { -0.5f, -0.5f, -0.5f };
 GXColor lbl_1_data_214 = { 255, 255, 255, 255 };
-Point3d lbl_1_data_218 = { 0.0f, 1.0f, 0.0f };
+Vec lbl_1_data_218 = { 0.0f, 1.0f, 0.0f };
 
 void fn_1_14F0(Process *arg0, s32 arg1)
 {
@@ -117,7 +117,7 @@ void fn_1_162C(omObjData *arg0)
 
 void fn_1_1A8C(omObjData *arg0)
 {
-    Point3d sp8;
+    Vec sp8;
 
     sp8.x = lbl_1_data_1FC.x;
     sp8.y = lbl_1_data_1FC.y;
diff --git a/src/REL/m424Dll/ball.c b/src/REL/m424Dll/ball.c
index 5114c552..c8c3177e 100644
--- a/src/REL/m424Dll/ball.c
+++ b/src/REL/m424Dll/ball.c
@@ -12,7 +12,6 @@
 #include "game/sprite.h"
 #include "string.h"
 
-
 // STRUCT
 typedef struct _M424DllBallStruct {
     u8 unk0;
@@ -1467,7 +1466,7 @@ void fn_1_79FC(Vec *arg0, Vec *arg1, f32 arg2, Vec *arg3, Vec *arg4, f32 arg5, f
     }
 }
 
-void fn_1_7CA0(Vec arg0, Vec arg1, f32 arg2, Point3d *arg3)
+void fn_1_7CA0(Vec arg0, Vec arg1, f32 arg2, Vec *arg3)
 {
     f32 var_f31;
 
diff --git a/src/REL/m427Dll/map.c b/src/REL/m427Dll/map.c
index 1678f422..fa191ed6 100644
--- a/src/REL/m427Dll/map.c
+++ b/src/REL/m427Dll/map.c
@@ -492,7 +492,7 @@ void fn_1_3B20(s8 arg0, s16 arg1)
     Vec sp54[4] = { { 110.0f, -20.0f, 0.0f }, { -110.0f, -20.0f, 0.0f }, { 110.0f, -20.0f, 190.0f }, { -110.0f, -20.0f, 190.0f } };
     Mtx sp24;
     f32 sp14[4] = { 135.0f, 225.0f, 45.0f, 315.0f };
-    Point3d sp8;
+    Vec sp8;
     f32 temp_f31;
     s16 var_r29;
     s32 var_r27;
diff --git a/src/REL/m443Dll/player.c b/src/REL/m443Dll/player.c
index b0f2554d..9ed45b12 100644
--- a/src/REL/m443Dll/player.c
+++ b/src/REL/m443Dll/player.c
@@ -1166,7 +1166,7 @@ static inline f32 isEven(u32 arg)
     }
 }
 
-void fn_1_8FFC(u32 arg0, Point3d *arg1, f32 arg2, f32 arg3)
+void fn_1_8FFC(u32 arg0, Vec *arg1, f32 arg2, f32 arg3)
 {
     f32 temp_f31;
     f32 var_f29;
diff --git a/src/REL/mentDll/common.c b/src/REL/mentDll/common.c
index 77e82ced..59f44912 100644
--- a/src/REL/mentDll/common.c
+++ b/src/REL/mentDll/common.c
@@ -157,9 +157,9 @@ void fn_1_50C(void)
 
 void fn_1_5E8(s32 arg0)
 {
-    Point3d sp24 = { 0.0f, 3000.0f, 800.0f };
-    Point3d sp18 = { 0.0f, 0.0f, 640.0f };
-    Point3d spC = { 0.0f, 1.0f, 0.0f };
+    Vec sp24 = { 0.0f, 3000.0f, 800.0f };
+    Vec sp18 = { 0.0f, 0.0f, 640.0f };
+    Vec spC = { 0.0f, 1.0f, 0.0f };
 
     if (arg0 == 3) {
         sp24.x = sp18.x = 1200.0f;
diff --git a/src/REL/modeltestDll/main.c b/src/REL/modeltestDll/main.c
index 2b99a635..cb1c254b 100644
--- a/src/REL/modeltestDll/main.c
+++ b/src/REL/modeltestDll/main.c
@@ -163,8 +163,8 @@ HsfanimStruct00 lbl_1_data_258 = {
         { /* r */ 0, /* g */ 0, /* b */ 0, /* a */ 0 }, { /* r */ 0, /* g */ 0, /* b */ 0, /* a */ 0 } },
 };
 
-const Point3d lbl_1_rodata_38 = { 0.0f, 0.0f, 0.0f };
-const Point3d lbl_1_rodata_44 = { 0.0f, 1.0f, 0.0f };
+const Vec lbl_1_rodata_38 = { 0.0f, 0.0f, 0.0f };
+const Vec lbl_1_rodata_44 = { 0.0f, 1.0f, 0.0f };
 s16 lbl_1_bss_99C;
 s16 lbl_1_bss_99A;
 s16 lbl_1_bss_98A[8];
@@ -196,9 +196,9 @@ static u8 unk_bss[8];
 
 void fn_1_29C(omObjData *arg0)
 {
-    Point3d sp20;
-    Point3d sp14;
-    Point3d sp8;
+    Vec sp20;
+    Vec sp14;
+    Vec sp8;
     Mtx sp2C;
     s16 var_r31;
     s16 temp_r27;
@@ -337,7 +337,7 @@ void fn_1_F38(void)
 
 // -------------------------------------------------------------------------- //
 
-static inline void HuControlCamCenter(Point3d *sp18, Point3d *sp30)
+static inline void HuControlCamCenter(Vec *sp18, Vec *sp30)
 {
     s8 temp_r28;
 
@@ -364,10 +364,10 @@ const HuUnkF9C2 lbl_1_rodata_B8 = { { 8, 6, 4, 7, 9, 10, 11 } };
 
 void fn_1_F9C(struct om_obj_data *omData)
 {
-    Point3d sp3C;
-    Point3d sp30;
-    Point3d sp24;
-    Point3d sp18;
+    Vec sp3C;
+    Vec sp30;
+    Vec sp24;
+    Vec sp18;
     f32 temp_f31;
     s32 var_r31;
     s16 var_r30;
@@ -643,9 +643,9 @@ void fn_1_20F4(void)
 
 // -------------------------------------------------------------------------- //
 
-void fn_1_28F8(Point3d *arg0, Point3d *arg1)
+void fn_1_28F8(Vec *arg0, Vec *arg1)
 {
-    Point3d spC;
+    Vec spC;
     Mtx sp18;
     CameraData *cam;
     f32 temp_f31;
diff --git a/src/REL/modeltestDll/modeltest00.c b/src/REL/modeltestDll/modeltest00.c
index c687e5df..03f4fd71 100644
--- a/src/REL/modeltestDll/modeltest00.c
+++ b/src/REL/modeltestDll/modeltest00.c
@@ -1,27 +1,28 @@
-#include "math.h"
 #include "game/chrman.h"
-#include "game/wipe.h"
 #include "game/pad.h"
+#include "game/wipe.h"
+#include "math.h"
+
 
 #include "REL/modeltestDll.h"
 
 // -------------------------------------------------------------------------- //
 
-omObjData * unk_bss_9FC;
-omObjData * lbl_1_bss_9F8;
-omObjData * lbl_1_bss_9F4;
+omObjData *unk_bss_9FC;
+omObjData *lbl_1_bss_9F8;
+omObjData *lbl_1_bss_9F4;
 s16 lbl_1_bss_9EC[4];
 s16 lbl_1_bss_9AC[4][8];
-Process * lbl_1_bss_9A8;
-u16 lbl_1_data_358[4] = {1, 2, 4, 8};
+Process *lbl_1_bss_9A8;
+u16 lbl_1_data_358[4] = { 1, 2, 4, 8 };
 
 // -------------------------------------------------------------------------- //
 
 void fn_1_34B0()
 {
-    Process * temp_r30;
+    Process *temp_r30;
     s16 var_r31;
-    
+
     OSReport("******* MODELTESTObjectSetup *********\n");
 
     temp_r30 = omInitObjMan(0x32, 0x2000);
@@ -33,8 +34,7 @@ void fn_1_34B0()
     Center.z = 0.0f;
     CZoom = 400.0f;
 
-    for (var_r31 = 0; var_r31 < 4; ++var_r31)
-    {
+    for (var_r31 = 0; var_r31 < 4; ++var_r31) {
         Hu3DCameraCreate(lbl_1_data_358[var_r31]);
         Hu3DCameraPerspectiveSet(lbl_1_data_358[var_r31], 45.0f, 20.0f, 20000.0f, 1.2f);
         Hu3DCameraViewportSet(lbl_1_data_358[var_r31], (var_r31 & 1) * 320, ((var_r31 & 2) != 0) ? 0xF0 : 0, 320.0f, 240.0f, 0.0f, 1.0f);
@@ -51,7 +51,8 @@ void fn_1_34B0()
 
 // -------------------------------------------------------------------------- //
 
-static inline void HuControlCamCenter(Point3d *sp18, Point3d *sp30) {
+static inline void HuControlCamCenter(Vec *sp18, Vec *sp30)
+{
     s8 temp_r28;
 
     temp_r28 = HuPadSubStkX[0] & 0xF8;
@@ -73,12 +74,12 @@ static inline void HuControlCamCenter(Point3d *sp18, Point3d *sp30) {
 
 void fn_1_37DC(omObjData *)
 {
-    Point3d sp3C;
-    Point3d sp30;
-    Point3d sp24;
-    Point3d sp18;
+    Vec sp3C;
+    Vec sp30;
+    Vec sp24;
+    Vec sp18;
     float temp_f31;
-    
+
     if ((HuPadBtnDown[0] & PAD_BUTTON_START) != 0) {
         if (lbl_1_bss_9A8) {
             HuPrcKill(lbl_1_bss_9A8);
@@ -113,17 +114,17 @@ void fn_1_37DC(omObjData *)
     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) * 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));
+        + 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) * 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));
-        
+        + 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) * cosd(temp_f31))
-            + (sp24.x * (sp30.x * sp30.z * (1.0 - cosd(temp_f31)) - sp30.y * sind(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);
@@ -134,24 +135,23 @@ void fn_1_37DC(omObjData *)
 
 // -------------------------------------------------------------------------- //
 
-void fn_1_439C(omObjData * )
+void fn_1_439C(omObjData *)
 {
     s16 var_r31;
     f32 temp_f30;
     f32 temp_f31;
     f32 sp10;
-    Point3d sp2C;
-    Point3d sp20;
-    Point3d sp14;
-    for (var_r31 = 0; var_r31 < 4; ++var_r31)
-    {
+    Vec sp2C;
+    Vec sp20;
+    Vec sp14;
+    for (var_r31 = 0; var_r31 < 4; ++var_r31) {
         temp_f31 = CRot.x;
         temp_f30 = CRot.y + (var_r31 * 90);
         sp10 = CRot.z;
         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;
@@ -160,22 +160,22 @@ void fn_1_439C(omObjData * )
         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);
+        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);
     }
 }
 
 // -------------------------------------------------------------------------- //
 
-const Point3d lbl_1_rodata_18C = {0.0f, 0.0f, 0.0f};
-const Point3d lbl_1_rodata_198 = {0.0f, 1.0f, 0.0f};
+const Vec lbl_1_rodata_18C = { 0.0f, 0.0f, 0.0f };
+const Vec lbl_1_rodata_198 = { 0.0f, 1.0f, 0.0f };
 
 // -------------------------------------------------------------------------- //
 
 void fn_1_46F0(void)
 {
-    Point3d sp20;
-    Point3d sp14;
-    Point3d sp8;
+    Vec sp20;
+    Vec sp14;
+    Vec sp8;
     s16 var_r31;
     s16 var_r30;
 
@@ -192,8 +192,7 @@ void fn_1_46F0(void)
     sp20.z = 1000.0f;
     Hu3DShadowPosSet(&sp20, &sp8, &sp14);
 
-    for (var_r31 = 0; var_r31 < 4; ++var_r31)
-    {
+    for (var_r31 = 0; var_r31 < 4; ++var_r31) {
         var_r30 = var_r31;
         lbl_1_bss_9EC[var_r31] = CharModelCreate(var_r30, 8);
         Hu3DModelShadowSet(lbl_1_bss_9EC[var_r31]);
@@ -201,7 +200,7 @@ void fn_1_46F0(void)
         CharModelMotionSet(var_r30, lbl_1_bss_9AC[var_r31][0]);
         Hu3DModelAttrSet(lbl_1_bss_9EC[var_r31], HU3D_MOTATTR_LOOP);
         Hu3DModelCameraSet(lbl_1_bss_9EC[var_r31], lbl_1_data_358[var_r31]);
-        Hu3DModelPosSet(lbl_1_bss_9EC[var_r31], ((( var_r31 / 4) * 200) - 100), 0.0f, (-( var_r31 % 4) * 150));
+        Hu3DModelPosSet(lbl_1_bss_9EC[var_r31], (((var_r31 / 4) * 200) - 100), 0.0f, (-(var_r31 % 4) * 150));
         Hu3DModelPosSet(lbl_1_bss_9EC[var_r31], 0.0f, 0.0f, 0.0f);
         CharModelMotionDataClose(var_r30);
     }
@@ -210,15 +209,12 @@ void fn_1_46F0(void)
     Hu3DModelScaleSet(var_r31, 5.0f, 5.0f, 5.0f);
     Hu3DModelShadowMapSet(var_r31);
 
-    while (TRUE)
-    {
+    while (TRUE) {
         if ((HuPadBtnDown[0] & PAD_BUTTON_Y) != 0) {
             Hu3DCameraKill(2);
             Hu3DCameraKill(4);
             Hu3DCameraKill(8);
-            sp20.x = 
-            sp20.z = 
-            sp20.y = 0.0f;
+            sp20.x = sp20.z = sp20.y = 0.0f;
             sp20.y += 200.0f;
             CharModelCoinEffectCreate(4, &sp20);
         }
diff --git a/src/REL/w02Dll/main.c b/src/REL/w02Dll/main.c
index 8da93e44..ab699fc7 100644
--- a/src/REL/w02Dll/main.c
+++ b/src/REL/w02Dll/main.c
@@ -2,22 +2,22 @@
 #include "game/frand.h"
 
 // Temporary defines
-#define BOARD_ITEM_MINI           0x0
-#define BOARD_ITEM_MEGA           0x1
-#define BOARD_ITEM_SUPERMINI      0x2
-#define BOARD_ITEM_SUPERMEGA      0x3
-#define BOARD_ITEM_HAMMER         0x4
-#define BOARD_ITEM_PIPE           0x5
-#define BOARD_ITEM_CARD           0x6
-#define BOARD_ITEM_SPARKY         0x7 
-#define BOARD_ITEM_GADDLIGHT      0x8  
-#define BOARD_ITEM_CHOMPCALL      0x9
-#define BOARD_ITEM_SUIT           0xA
-#define BOARD_ITEM_BOO            0xB
-#define BOARD_ITEM_LAMP           0xC
-#define BOARD_ITEM_BAG            0xD
-#define BOARD_ITEM_MAX            0xE
-#define BOARD_ITEM_NONE            -1
+#define BOARD_ITEM_MINI 0x0
+#define BOARD_ITEM_MEGA 0x1
+#define BOARD_ITEM_SUPERMINI 0x2
+#define BOARD_ITEM_SUPERMEGA 0x3
+#define BOARD_ITEM_HAMMER 0x4
+#define BOARD_ITEM_PIPE 0x5
+#define BOARD_ITEM_CARD 0x6
+#define BOARD_ITEM_SPARKY 0x7
+#define BOARD_ITEM_GADDLIGHT 0x8
+#define BOARD_ITEM_CHOMPCALL 0x9
+#define BOARD_ITEM_SUIT 0xA
+#define BOARD_ITEM_BOO 0xB
+#define BOARD_ITEM_LAMP 0xC
+#define BOARD_ITEM_BAG 0xD
+#define BOARD_ITEM_MAX 0xE
+#define BOARD_ITEM_NONE -1
 
 /* BSS */
 s16 lbl_1_bss_30[0x10]; // Model List
@@ -25,30 +25,29 @@ s16 lbl_1_bss_2E;
 s16 lbl_1_bss_2C;
 Vec lbl_1_bss_20;
 Vec lbl_1_bss_14;
-s32* lbl_1_bss_10;
+s32 *lbl_1_bss_10;
 s16 lbl_1_bss_8[4]; // Item List
-Process* lbl_1_bss_4;
-u8* lbl_1_bss_0;
+Process *lbl_1_bss_4;
+u8 *lbl_1_bss_0;
 
 /* DATA */
-static BoardMapObject lbl_1_data_0[0x10] = {
-   {{2550.0f,  0.0f,  -450.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W02, 0x000C)},
-   {{-3150.0f, 0.0f, -1350.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W02, 0x000D)},
-   {{-3150.0f, 0.0f,  1650.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W02, 0x000E)},
-   {{-150.0f,  0.0f,   900.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W02, 0x0008)},
-   {{-150.0f,  0.0f,   900.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W02, 0x0009)},
-   {{-150.0f,  0.0f,   900.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W02, 0x000A)},
-   {{-150.0f,  0.0f,   900.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W02, 0x000B)},
-   {{1350.0f,  0.0f,  -300.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W02, 0x0011)},
-   {{1350.0f,  0.0f,  -300.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W02, 0x0012)},
-   {{1350.0f,  0.0f,  -300.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W02, 0x0015)},
-   {{-300.0f,  0.0f,  -900.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W02, 0x0016)},
-   {{1175.0f,  0.0f,  -125.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_BGUEST, 0x0005)},
-   {{-525.0f,  0.0f,  -825.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_BGUEST, 0x0005)},
-   {{-2225.0f, 0.0f, -2100.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_BGUEST, 0x0005)},
-   {{1925.0f,  0.0f, -2100.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_BGUEST, 0x0005)},
-   {{150.0f,   0.0f,  1650.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_BGUEST, 0x0005)}
-};
+static BoardMapObject lbl_1_data_0[0x10]
+    = { { { 2550.0f, 0.0f, -450.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W02, 0x000C) },
+          { { -3150.0f, 0.0f, -1350.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W02, 0x000D) },
+          { { -3150.0f, 0.0f, 1650.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W02, 0x000E) },
+          { { -150.0f, 0.0f, 900.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W02, 0x0008) },
+          { { -150.0f, 0.0f, 900.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W02, 0x0009) },
+          { { -150.0f, 0.0f, 900.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W02, 0x000A) },
+          { { -150.0f, 0.0f, 900.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W02, 0x000B) },
+          { { 1350.0f, 0.0f, -300.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W02, 0x0011) },
+          { { 1350.0f, 0.0f, -300.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W02, 0x0012) },
+          { { 1350.0f, 0.0f, -300.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W02, 0x0015) },
+          { { -300.0f, 0.0f, -900.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W02, 0x0016) },
+          { { 1175.0f, 0.0f, -125.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_BGUEST, 0x0005) },
+          { { -525.0f, 0.0f, -825.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_BGUEST, 0x0005) },
+          { { -2225.0f, 0.0f, -2100.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_BGUEST, 0x0005) },
+          { { 1925.0f, 0.0f, -2100.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_BGUEST, 0x0005) },
+          { { 150.0f, 0.0f, 1650.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_BGUEST, 0x0005) } };
 
 // Special Models
 s16 lbl_1_data_280 = -1;
@@ -56,21 +55,15 @@ s16 lbl_1_data_282 = -1;
 s16 lbl_1_data_284 = -1;
 s16 lbl_1_data_286 = -1;
 
-s32 lbl_1_data_288[] = {
-    DATA_MAKE_NUM(DATADIR_W02, 0x0004),
-    DATA_NUM_LISTEND
-};
+s32 lbl_1_data_288[] = { DATA_MAKE_NUM(DATADIR_W02, 0x0004), DATA_NUM_LISTEND };
 s32 lbl_1_data_290[] = {
-    DATA_MAKE_NUM(DATADIR_BGUEST, 0x0009),
-    DATA_MAKE_NUM(DATADIR_BGUEST, 0x0006),
-    DATA_MAKE_NUM(DATADIR_BGUEST, 0x0007),
-    DATA_MAKE_NUM(DATADIR_BGUEST, 0x0008),
-    DATA_NUM_LISTEND,
+    DATA_MAKE_NUM(DATADIR_BGUEST, 0x0009), DATA_MAKE_NUM(DATADIR_BGUEST, 0x0006), DATA_MAKE_NUM(DATADIR_BGUEST, 0x0007),
+    DATA_MAKE_NUM(DATADIR_BGUEST, 0x0008), DATA_NUM_LISTEND,
     0x00000000 // Padding
 };
 
 /* Functions */
-//Actual externs
+// Actual externs
 extern void BoardMusStart(s32, s32, s32, s32);
 extern void BoardAudSeqPause(s32, s32, s32);
 s8 BoardComPreferItemCheck(s32, s8, s8, s8);
@@ -79,13 +72,15 @@ extern void BoardComKeySetRight();
 extern void CharModelDataClose(s16);
 
 // function is probably global. only inlined in rels?
-inline s32 get_current_board(void) {
+inline s32 get_current_board(void)
+{
     return GWSystem.board;
 }
 
-void BoardCreate(void) {
+void BoardCreate(void)
+{
     s32 i, boardData;
-    BoardMapObject* modelTransform;
+    BoardMapObject *modelTransform;
 
     boardData = get_current_board();
     lbl_1_bss_0 = GWSystem.board_data;
@@ -106,12 +101,13 @@ void BoardCreate(void) {
     BoardModelMotionStart(lbl_1_data_286, 1, 0x40000001);
     BoardLightHookSet(fn_1_72C, fn_1_770);
 
-    for(i = 0; i < 0x10; i++) {
+    for (i = 0; i < 0x10; i++) {
         modelTransform = &lbl_1_data_0[i];
         if (modelTransform->data_num != -1) {
             if ((i == 0xB) || (i == 0xC) || (i == 0xD) || (i == 0xE) || (i == 0xF)) {
                 lbl_1_bss_10 = lbl_1_data_290;
-            } else {
+            }
+            else {
                 lbl_1_bss_10 = NULL;
             }
             lbl_1_bss_30[i] = BoardModelCreate(modelTransform->data_num, lbl_1_bss_10, 0);
@@ -146,7 +142,8 @@ void BoardCreate(void) {
     BoardJunctionMaskSet(0x30);
 }
 
-void BoardDestroy(void) {
+void BoardDestroy(void)
+{
     /* Kill Model List */
     s32 i;
     for (i = 0; i < 0x10; i++) {
@@ -176,17 +173,17 @@ void BoardDestroy(void) {
     BoardSpaceDestroy();
 }
 
-void fn_1_72C(void) {
+void fn_1_72C(void)
+{
     s16 var = BoardModelIDGet(lbl_1_data_280);
     Hu3DModelLightInfoSet(var, 1);
 }
 
-void fn_1_770(void) {
-
-}
+void fn_1_770(void) { }
 
 /* Decrement current space's [UNKNOWN] flag */
-s32 fn_1_774(void) {
+s32 fn_1_774(void)
+{
     u32 unkFlag;
     u32 currPlayer;
     u32 currSpace;
@@ -194,7 +191,7 @@ s32 fn_1_774(void) {
     currPlayer = GWSystem.player_curr;
     currSpace = GWPlayer[currPlayer].space_curr;
     spaceFlags = BoardSpaceFlagGet(0, currSpace);
-    //temp_r31 = (temp_r)
+    // temp_r31 = (temp_r)
     unkFlag = (spaceFlags & 0x1C0) >> 6;
     if (unkFlag != 0) {
         unkFlag--;
@@ -203,8 +200,9 @@ s32 fn_1_774(void) {
 }
 
 /* Check if can iteract with board object? */
-s32 fn_1_800(void) {
-    BoardSpace* currSpace;
+s32 fn_1_800(void)
+{
+    BoardSpace *currSpace;
     s32 currPlayer;
     s32 var_r29;
 
@@ -212,7 +210,6 @@ s32 fn_1_800(void) {
     currSpace = BoardSpaceGet(0, GWPlayer[currPlayer].space_curr);
     if ((currSpace->flag & 0x30) != 0) {
 
-
         // If mega mushroom state return
         if (BoardPlayerSizeGet(currPlayer) == 2) {
             return 0;
@@ -224,9 +221,11 @@ s32 fn_1_800(void) {
 
         if ((currSpace->flag & 0x20) != 0 && (currSpace->flag & 0x10) != 0) {
             var_r29 = 2;
-        } else if ((currSpace->flag & 0x20) != 0) {
+        }
+        else if ((currSpace->flag & 0x20) != 0) {
             var_r29 = 1;
-        } else {
+        }
+        else {
             var_r29 = 0;
         }
         fn_1_394C(var_r29);
@@ -239,22 +238,23 @@ s32 fn_1_800(void) {
     return 0;
 }
 
-void fn_1_92C(void) {
+void fn_1_92C(void)
+{
     fn_1_39F4();
     fn_1_5CF8();
 }
 
-void fn_1_950(void) {
+void fn_1_950(void) { }
 
-}
-
-void fn_1_954(void) {
+void fn_1_954(void)
+{
     HuPrcSleep(0x3C);
     BoardMusStart(1, 0x12, 0x7F, 0);
     HuPrcEnd();
 }
 
-void fn_1_990(void) {
+void fn_1_990(void)
+{
     Vec rotation;
     Vec offset;
     Vec boardSpacePos;
@@ -264,13 +264,13 @@ void fn_1_990(void) {
     s32 currSpace;
     s32 spaceLinkFlag;
 
-
     currPlayer = GWSystem.player_curr;
     BoardWinCreateChoice(2, MAKE_MESSID(19, 17), 4, 0);
     if (GWPlayer[currPlayer].com) {
         if (frandBool() != 0) {
             BoardComKeySetLeft();
-        } else {
+        }
+        else {
             BoardComKeySetRight();
         }
     }
@@ -317,7 +317,8 @@ void fn_1_990(void) {
     BoardPlayerMotionStart(currPlayer, 1, 0x40000001);
 }
 
-void fn_1_C50(void) {
+void fn_1_C50(void)
+{
     Vec rotation;
     Vec offset;
     s32 currSpace;
@@ -327,7 +328,7 @@ void fn_1_C50(void) {
     s32 i, j;
 
     currPlayer = GWSystem.player_curr;
-    if (BoardPlayerItemCount((s32) currPlayer) == 3) {
+    if (BoardPlayerItemCount((s32)currPlayer) == 3) {
         BoardWinCreate(2, MAKE_MESSID(19, 26), 4);
         BoardWinWait();
         BoardWinKill();
@@ -351,7 +352,7 @@ void fn_1_C50(void) {
             }
             if (lbl_1_bss_8[i] != BOARD_ITEM_NONE) {
                 i++;
-            } 
+            }
         }
     }
     fn_1_79BC(lbl_1_bss_8);
@@ -361,7 +362,8 @@ void fn_1_C50(void) {
     if (GWPlayer[currPlayer].com) {
         if (BoardComPreferItemCheck(currPlayer, lbl_1_bss_8[0], lbl_1_bss_8[1], lbl_1_bss_8[2]) != -1) {
             BoardComKeySetLeft();
-        } else {
+        }
+        else {
             BoardComKeySetRight();
         }
     }
@@ -387,14 +389,14 @@ void fn_1_C50(void) {
     offset.x = 0.0f;
     offset.y = 0.0f;
     offset.z = -250.0f;
-    BoardCameraMotionStartEx(lbl_1_bss_30[10], (Point3d* ) &rotation, (Point3d* ) &offset, 1500.0f, 25.0f, 0x15);
+    BoardCameraMotionStartEx(lbl_1_bss_30[10], (Vec *)&rotation, (Vec *)&offset, 1500.0f, 25.0f, 0x15);
     currSpace = GWPlayer[currPlayer].space_curr;
     spaceLinkFlags = BoardSpaceLinkFlagSearch(0, currSpace, 0x02000000U);
     BoardPlayerMoveBetween(currPlayer, currSpace, spaceLinkFlags);
     while (GWPlayer[currPlayer].moving) {
         HuPrcVSleep();
     }
-    BoardPlayerMotionStart((s32) currPlayer, 1, 0x40000001);
+    BoardPlayerMotionStart((s32)currPlayer, 1, 0x40000001);
     BoardPlayerMotBlendSet(currPlayer, 0xB4, 0xF);
     while (BoardPlayerMotBlendCheck(currPlayer) == 0) {
         HuPrcVSleep();
@@ -409,17 +411,19 @@ void fn_1_C50(void) {
         HuPrcVSleep();
     }
     fn_1_5F90();
-    BoardPlayerMotionStart((s32) currPlayer, 1, 0x40000001);
+    BoardPlayerMotionStart((s32)currPlayer, 1, 0x40000001);
     HuPrcEnd();
 }
 
-void fn_1_1070(void) {
+void fn_1_1070(void)
+{
     BoardWinKill();
     CharModelDataClose(-1);
     lbl_1_bss_4 = 0;
 }
 
-void fn_1_10A8(void) {
+void fn_1_10A8(void)
+{
     lbl_1_bss_4 = HuPrcChildCreate(fn_1_C50, 0x2003U, 0x2000U, 0, boardMainProc);
     HuPrcDestructorSet2(lbl_1_bss_4, fn_1_1070);
     while (lbl_1_bss_4) {
@@ -427,7 +431,8 @@ void fn_1_10A8(void) {
     }
 }
 
-s32 fn_1_1128(void) {
+s32 fn_1_1128(void)
+{
     u32 spaceFlags;
     s16 currSpace;
     currSpace = GWPlayer[GWSystem.player_curr].space_curr;
@@ -436,7 +441,8 @@ s32 fn_1_1128(void) {
 
     if (spaceFlags & 0x200000) {
         fn_1_990();
-    } else if (spaceFlags & 0x400000) {
+    }
+    else if (spaceFlags & 0x400000) {
         lbl_1_bss_4 = HuPrcChildCreate(fn_1_C50, 0x2003U, 0x2000U, 0, boardMainProc);
         HuPrcDestructorSet2(lbl_1_bss_4, fn_1_1070);
         while (lbl_1_bss_4) {
@@ -447,7 +453,8 @@ s32 fn_1_1128(void) {
     BoardRollDispSet(1);
 }
 
-void fn_1_121C(u32 mesg) {
+void fn_1_121C(u32 mesg)
+{
     BoardWinCreate(2, mesg, 4);
     BoardWinWait();
     BoardWinKill();
diff --git a/src/REL/w02Dll/roulette.c b/src/REL/w02Dll/roulette.c
index 24797857..b21e0dbe 100644
--- a/src/REL/w02Dll/roulette.c
+++ b/src/REL/w02Dll/roulette.c
@@ -1,26 +1,21 @@
 #include "REL/w02Dll.h"
 #include "game/audio.h"
-#include "game/frand.h"
 #include "game/chrman.h"
+#include "game/frand.h"
 #include "game/pad.h"
 
+
 #include "ext_math.h"
 
-
 /* DATA */
-s32 lbl_1_data_4D0[] = {
-	-1, 2, 2, 2,
-	-1, 1, 1, 1,
-	-1, 0, 0, 0,
-	-1, 3, 3, 3
-};
+s32 lbl_1_data_4D0[] = { -1, 2, 2, 2, -1, 1, 1, 1, -1, 0, 0, 0, -1, 3, 3, 3 };
 
 Process *lbl_1_bss_38C;
 s16 lbl_1_bss_388;
 s32 lbl_1_bss_384;
 float lbl_1_bss_380;
 
-//Local Functions
+// Local Functions
 void fn_1_D3AC(void);
 s32 fn_1_D8C4(void);
 void fn_1_DF48(void);
@@ -34,10 +29,10 @@ typedef struct UnkPoint {
     Vec point;
 } UnkPoint;
 
-
 /* FUNCTIONS */
-void fn_1_BC1C(void) {
-    Point3d sp8;
+void fn_1_BC1C(void)
+{
+    Vec sp8;
 
     BoardModelPosGet(lbl_1_bss_30[15], &sp8);
     sp8.z -= 90.0f;
@@ -50,13 +45,14 @@ void fn_1_BC1C(void) {
     BoardModelRotSetV(lbl_1_bss_30[15], &sp8);
 }
 
-void fn_1_BCFC(void) {
+void fn_1_BCFC(void)
+{
     s32 spaceLinkFlags;
     s32 temp_r30;
     s32 temp_r29;
-    
+
     BoardRollDispSet(0);
-    spaceLinkFlags = BoardSpaceLinkFlagSearch(0, (s32) GWPlayer[lbl_1_bss_388].space_curr, 2U);
+    spaceLinkFlags = BoardSpaceLinkFlagSearch(0, (s32)GWPlayer[lbl_1_bss_388].space_curr, 2U);
     BoardPlayerMoveToAsync(lbl_1_bss_388, spaceLinkFlags);
     while (GWPlayer[lbl_1_bss_388].moving) {
         HuPrcVSleep();
@@ -64,8 +60,8 @@ void fn_1_BCFC(void) {
     BoardPlayerIdleSet(lbl_1_bss_388);
     BoardCameraViewSet(2);
     BoardCameraMotionWait();
-    BoardPlayerMotBlendSet((s32) lbl_1_bss_388, 0x5A, 0xF);
-    while (BoardPlayerMotBlendCheck((s32) lbl_1_bss_388) == 0) {
+    BoardPlayerMotBlendSet((s32)lbl_1_bss_388, 0x5A, 0xF);
+    while (BoardPlayerMotBlendCheck((s32)lbl_1_bss_388) == 0) {
         HuPrcVSleep();
     }
     BoardModelRotYSet(lbl_1_bss_30[15], -90.0f);
@@ -81,16 +77,18 @@ void fn_1_BCFC(void) {
     BoardCameraMotionWait();
     BoardRollDispSet(1);
     HuPrcKill(NULL);
-    while(TRUE) {
-      HuPrcVSleep();  
+    while (TRUE) {
+        HuPrcVSleep();
     }
 }
 
-s32 fn_1_BE74(void) {
+s32 fn_1_BE74(void)
+{
     lbl_1_bss_38C = 0;
 }
 
-s32 fn_1_BE88(void) {
+s32 fn_1_BE88(void)
+{
     s32 coinAmount;
     s32 var_r30;
     s16 playerCoinRegion;
@@ -100,7 +98,7 @@ s32 fn_1_BE88(void) {
     s32 mesg;
 
     var_r30 = -1;
-    coinAmount = BoardPlayerCoinsGet((s32) lbl_1_bss_388);
+    coinAmount = BoardPlayerCoinsGet((s32)lbl_1_bss_388);
     if (coinAmount < 5) {
         return var_r30;
     }
@@ -112,7 +110,8 @@ s32 fn_1_BE88(void) {
         if (GWPlayer[lbl_1_bss_388].com) {
             if (frandBool()) {
                 BoardComKeySetRight();
-            } else {
+            }
+            else {
                 BoardComKeySetLeft();
             }
         }
@@ -136,49 +135,50 @@ s32 fn_1_BE88(void) {
             if (GWPlayer[lbl_1_bss_388].com) {
                 if (playerCoinRegion < 2) {
                     BoardComKeySetUp();
-                } else if (frandBool()) {
+                }
+                else if (frandBool()) {
                     BoardComKeySetUp();
-                } else {
+                }
+                else {
                     BoardComKeySetDown();
                 }
             }
             BoardWinWait();
             BoardWinKill();
             bribeChoice = BoardWinChoiceGet();
-            if (bribeChoice == -1 || 
-                bribeChoice == 3) {
+            if (bribeChoice == -1 || bribeChoice == 3) {
                 continue;
             }
 
             // Coin amount is now the bribe amount in coins
             switch (bribeChoice) {
-            case 0:
-                mesg = MAKE_MESSID(0x13, 0x04);
-                coinAmount = 0x14;
-                var_r30 = 0x5A; // 90%
-                break;
-            case 1:
-                mesg = MAKE_MESSID(0x13, 0x05);
-                coinAmount = 0xA;
-                var_r30 = 0x3C; // 60%
-                break;
-            case 2:
-                mesg = MAKE_MESSID(0x13, 0x06);
-                coinAmount = 5;
-                var_r30 = 0x1E; // 30%
-                break;
+                case 0:
+                    mesg = MAKE_MESSID(0x13, 0x04);
+                    coinAmount = 0x14;
+                    var_r30 = 0x5A; // 90%
+                    break;
+                case 1:
+                    mesg = MAKE_MESSID(0x13, 0x05);
+                    coinAmount = 0xA;
+                    var_r30 = 0x3C; // 60%
+                    break;
+                case 2:
+                    mesg = MAKE_MESSID(0x13, 0x06);
+                    coinAmount = 5;
+                    var_r30 = 0x1E; // 30%
+                    break;
             }
             fn_1_121C(mesg);
 
-            
             for (i = 0; i < coinAmount; i++) {
                 BoardPlayerCoinsAdd(lbl_1_bss_388, -1);
                 HuAudFXPlay(0xE);
                 HuPrcSleep(6);
             }
             HuAudFXPlay(0xF);
-        // If chose to view map
-        } else if (rouletteChoice == 2) {
+            // If chose to view map
+        }
+        else if (rouletteChoice == 2) {
             BoardViewMapExec(lbl_1_bss_388);
         }
     } while (rouletteChoice == 2); // While viewing map
@@ -188,13 +188,13 @@ s32 fn_1_BE88(void) {
     return var_r30;
 }
 
-s32 fn_1_C108(s32 arg0) {
+s32 fn_1_C108(s32 arg0)
+{
     Vec sp34;
     Vec sp28;
     Vec sp1C;
     Vec sp10;
 
-
     f32 var_f27;
     f32 var_f26;
     f32 var_f25;
@@ -210,15 +210,16 @@ s32 fn_1_C108(s32 arg0) {
     s32 var_r29;
     s32 i;
 
-    if ((s32) frandmod(0x64U) < arg0) {
+    if ((s32)frandmod(0x64U) < arg0) {
         s32 temp_r25 = fn_1_E2AC();
         var_r27 = 4;
         var_r29 = frandmod(3U);
-        if ((s32) frandmod(0x64U) < 0x14) {
+        if ((s32)frandmod(0x64U) < 0x14) {
             var_r29 += 1;
         }
         var_r29 = var_r29 + (3 - temp_r25) * 4;
-    } else {
+    }
+    else {
         var_r29 = frandmod(0x10U);
         var_r27 = frandmod(4U);
     }
@@ -249,7 +250,7 @@ s32 fn_1_C108(s32 arg0) {
         HuAudFXPitchSet(lbl_1_bss_384, var_r28);
         HuPrcVSleep();
     }
-    
+
     var_f29 = -22.5f;
     HuAudFXPitchSet(lbl_1_bss_384, 0);
     BoardModelMotionStart(lbl_1_bss_30[15], 2, 0x40000001);
@@ -269,7 +270,7 @@ s32 fn_1_C108(s32 arg0) {
     }
     BoardModelMotionStart(lbl_1_bss_30[15], 3, 0x40000001);
     BoardModelMotionSpeedSet(lbl_1_bss_30[15], 4.0f);
-    
+
     for (i = 0; i < 0xA; i++) {
         sp34.z -= 6.2999997f;
         BoardModelPosSetV(lbl_1_bss_30[15], &sp34);
@@ -287,7 +288,7 @@ s32 fn_1_C108(s32 arg0) {
     sp1C.z = -50.0f;
 
     // Roulette motion and ball ?
-    while(TRUE) {
+    while (TRUE) {
         sp1C.y = var_f27 - (0.55833334f * (0.25f * (var_f31 * var_f31)));
         var_f31 += 1.0f;
         BoardModelPosGet(lbl_1_bss_30[6], &sp28);
@@ -295,11 +296,11 @@ s32 fn_1_C108(s32 arg0) {
         var_f25 = VECDistanceXZ(&sp28, &sp10);
         if (var_f25 >= 430.0f) {
             if (sp28.y <= (55.0f + sp10.y)) {
-                VECSubtract(&sp28, &sp10, (Vec* ) &sp1C);
-                VECNormalize((Vec* ) &sp1C, (Vec* ) &sp1C);
+                VECSubtract(&sp28, &sp10, (Vec *)&sp1C);
+                VECNormalize((Vec *)&sp1C, (Vec *)&sp1C);
                 sp1C.y = 0.0f;
-                VECScale((Vec* ) &sp1C, (Vec* ) &sp1C, 429.0f);
-                VECAdd((Vec* ) &sp1C, &sp10, (Vec* ) &sp1C);
+                VECScale((Vec *)&sp1C, (Vec *)&sp1C, 429.0f);
+                VECAdd((Vec *)&sp1C, &sp10, (Vec *)&sp1C);
                 sp28.x = sp1C.x;
                 sp28.z = sp1C.z;
                 sp1C.x = -5.0f;
@@ -309,34 +310,34 @@ s32 fn_1_C108(s32 arg0) {
 
         if (sp28.y < sp10.y) {
             sp28.y = sp10.y;
-            if (var_r27 >=  3) {
+            if (var_r27 >= 3) {
                 break;
             }
-            //var_f31 = ((1.0f/255.0f) * (6.0f * frand8()));
-            var_f27 = 6.0f + ((1.0f/255.0f) * (6.0f * frand8()));
+            // var_f31 = ((1.0f/255.0f) * (6.0f * frand8()));
+            var_f27 = 6.0f + ((1.0f / 255.0f) * (6.0f * frand8()));
             var_f31 = 1.0f;
             var_r27 += 1;
-            //var_f31 = ((1.0f/255.0f) * (5.0f * frand8()));
-            sp1C.x = 15.0f + ((1.0f/255.0f) * (5.0f * frand8()));
-            sp1C.z = 15.0f + ((1.0f/255.0f) * (5.0f * frand8()));
+            // var_f31 = ((1.0f/255.0f) * (5.0f * frand8()));
+            sp1C.x = 15.0f + ((1.0f / 255.0f) * (5.0f * frand8()));
+            sp1C.z = 15.0f + ((1.0f / 255.0f) * (5.0f * frand8()));
             HuAudFXPlay(0x41E);
         }
-        
-        BoardModelPosSetV(lbl_1_bss_30[6], (Vec* ) &sp28);
+
+        BoardModelPosSetV(lbl_1_bss_30[6], (Vec *)&sp28);
         fn_1_E310(var_f29);
         HuPrcVSleep();
     }
 
     HuAudFXPlay(0x41E);
-    VECSubtract(&sp28, &sp10, (Vec* ) &sp1C);
-    VECNormalize((Vec* ) &sp1C, (Vec* ) &sp1C);
+    VECSubtract(&sp28, &sp10, (Vec *)&sp1C);
+    VECNormalize((Vec *)&sp1C, (Vec *)&sp1C);
     var_f31 = atan2d(-sp1C.z, sp1C.x);
     BoardModelRotGet(lbl_1_bss_30[4], &sp34);
     var_f31 = var_f31 - sp34.y;
     if (var_f31 < 0.0f) {
         var_f31 += 360.0f;
     }
-    var_r30 = (s32) (var_f31 / 22.5f);
+    var_r30 = (s32)(var_f31 / 22.5f);
     if (fmod(var_f31, 22.5) > 11.25) {
         var_r30 += 1;
     }
@@ -345,7 +346,7 @@ s32 fn_1_C108(s32 arg0) {
     }
     sp1C.y = 0.0f;
 
-    while(TRUE) {
+    while (TRUE) {
         fn_1_E310(var_f29);
         BoardModelRotGet(lbl_1_bss_30[4], &sp34);
         var_f31 = (22.5f * var_r30) + sp34.y; // TODO: Update rodata for asm change
@@ -356,8 +357,7 @@ s32 fn_1_C108(s32 arg0) {
         sp28.x = sp1C.x;
         sp28.z = sp1C.z;
         BoardModelPosSetV(lbl_1_bss_30[6], &sp28);
-        if (sp34.y >= 292.5f &&
-            sp34.y < 315.0f) {
+        if (sp34.y >= 292.5f && sp34.y < 315.0f) {
             break;
         }
         HuPrcVSleep();
@@ -367,14 +367,14 @@ s32 fn_1_C108(s32 arg0) {
         var_f29 += 0.375f;
         fn_1_E310(var_f29);
         BoardModelRotGet(lbl_1_bss_30[4], &sp34);
-        var_f31 = (22.5f * (f32) var_r30) + sp34.y;
+        var_f31 = (22.5f * (f32)var_r30) + sp34.y;
         sp1C.x = cosd(var_f31);
         sp1C.z = -sind(var_f31);
         VECScale(&sp1C, &sp1C, 429.0f);
-        VECAdd((Vec* ) &sp1C, &sp10, (Vec* ) &sp1C);
+        VECAdd((Vec *)&sp1C, &sp10, (Vec *)&sp1C);
         sp28.x = sp1C.x;
         sp28.z = sp1C.z;
-        BoardModelPosSetV(lbl_1_bss_30[6], (Vec* ) &sp28);
+        BoardModelPosSetV(lbl_1_bss_30[6], (Vec *)&sp28);
         var_r28 += -136.51666f;
         HuAudFXPitchSet(lbl_1_bss_384, var_r28);
         HuPrcVSleep();
@@ -385,7 +385,8 @@ s32 fn_1_C108(s32 arg0) {
 }
 
 // Place player on space post roulette?
-void fn_1_CD04(s32 arg0) {
+void fn_1_CD04(s32 arg0)
+{
     Vec sp24;
     Vec sp18;
     Vec spC;
@@ -393,25 +394,25 @@ void fn_1_CD04(s32 arg0) {
     f32 temp_f30;
     f32 temp_f29;
     f32 var_f31;
-    
+
     s16 var_r25;
     u32 var_r26;
     s32 var_r27;
     s32 var_r29;
     s32 var_r28;
     s32 var_r30;
-    BoardSpace* temp_r31;
+    BoardSpace *temp_r31;
 
     if (arg0 < 0) {
         fn_1_D3AC();
         arg0 = fn_1_D8C4();
     }
     temp_r31 = BoardSpaceGet(0, BoardSpaceFlagSearch(0, 0x800));
-    
+
     for (var_r28 = 0; var_r28 < temp_r31->link_cnt; var_r28++) {
         var_r29 = temp_r31->link[var_r28];
-        var_r26 = ( (BoardSpaceFlagGet(0, var_r29) & 0xE) >> 1U);
-        if ( var_r26 == (arg0 + 2)) {
+        var_r26 = ((BoardSpaceFlagGet(0, var_r29) & 0xE) >> 1U);
+        if (var_r26 == (arg0 + 2)) {
             break;
         }
     }
@@ -427,7 +428,7 @@ void fn_1_CD04(s32 arg0) {
         while (BoardModelMotionTimeGet(lbl_1_bss_30[5]) < 30.0f) {
             spC.x -= 0.25f;
             spC.y -= 0.25f;
-            //temp_f1 = spC.z;
+            // temp_f1 = spC.z;
             spC.z = spC.z - 0.25f;
             BoardPlayerScaleSetV(lbl_1_bss_388, &spC);
             HuPrcVSleep();
@@ -443,7 +444,8 @@ void fn_1_CD04(s32 arg0) {
     if (GWPlayer[lbl_1_bss_388].bowser_suit) {
         BoardModelVisibilitySet(BoardBowserSuitModelGet(), 0);
         BoardModelVisibilitySet(BoardBowserSuitPlayerModelGet(), 0);
-    } else {
+    }
+    else {
         BoardModelVisibilitySet(BoardPlayerModelGet(lbl_1_bss_388), 0);
     }
     HuAudFXPlay(0x421);
@@ -454,7 +456,7 @@ void fn_1_CD04(s32 arg0) {
     }
 
     BoardModelPosGet(lbl_1_bss_30[5], &sp18);
-    temp_f30 = atan2d(sp24.x - sp18.x, sp24.z - sp18.z)/30;
+    temp_f30 = atan2d(sp24.x - sp18.x, sp24.z - sp18.z) / 30;
 
     while (BoardModelMotionTimeGet(lbl_1_bss_30[5]) < 90.0f) {
         BoardModelRotYSet(lbl_1_bss_30[5], temp_f30 + BoardModelRotYGet(lbl_1_bss_30[5]));
@@ -464,22 +466,23 @@ void fn_1_CD04(s32 arg0) {
     omVibrate(lbl_1_bss_388, 0xC, 4, 2);
     if (GWPlayer[lbl_1_bss_388].bowser_suit) {
 
-        BoardModelVisibilitySet(BoardBowserSuitModelGet(),1);
-        BoardModelVisibilitySet(BoardBowserSuitPlayerModelGet(),1);
-    } else {
+        BoardModelVisibilitySet(BoardBowserSuitModelGet(), 1);
+        BoardModelVisibilitySet(BoardBowserSuitPlayerModelGet(), 1);
+    }
+    else {
         BoardModelVisibilitySet(BoardPlayerModelGet(lbl_1_bss_388), 1);
     }
-    GWPlayer[lbl_1_bss_388].space_curr =(s16) var_r29;
+    GWPlayer[lbl_1_bss_388].space_curr = (s16)var_r29;
     BoardPlayerPosSetV(lbl_1_bss_388, &sp24);
     temp_r31 = BoardSpaceGet(0, var_r29);
-    
-    for ( var_r30 = 0; var_r30 < (s32) temp_r31->link_cnt; var_r30++) {
+
+    for (var_r30 = 0; var_r30 < (s32)temp_r31->link_cnt; var_r30++) {
         if (BoardSpaceTypeGet(0, temp_r31->link[var_r30])) {
             break;
         }
     }
 
-    if (var_r30 != (s32) temp_r31->link_cnt) {
+    if (var_r30 != (s32)temp_r31->link_cnt) {
         BoardSpacePosGet(0, temp_r31->link[var_r30], &sp18);
         BoardPlayerRotYSet(lbl_1_bss_388, atan2d(sp18.x - sp24.x, sp18.z - sp24.z));
     }
@@ -507,289 +510,290 @@ void fn_1_CD04(s32 arg0) {
 
 void fn_1_D3AC(void)
 {
-	float temp_f31;
-	float temp_f30;
-	s32 temp_r31;
-	s32 temp_r30;
-	s16 sp38[20];
-	Vec sp2C;
-	Vec sp20;
-	Vec sp14;
-	float sp8[3] = { 1.0f, 0.3f, 2.5f };
-	fn_1_121C(MAKE_MESSID(0x13, 0x08));
-	BoardStatusShowSetAll(1);
-	BoardPlayerMotBlendSet(lbl_1_bss_388, 0, 15);
-	BoardPlayerPosGet(lbl_1_bss_388, &sp14);
-	for(temp_r31=0; temp_r31<20; temp_r31++) {
-		sp38[temp_r31] = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 0x0A), NULL, 1);
-		sp2C.x = (sp14.x-25.0f)+((1.0f/255.0f)*(frand8()*50.0f));
-		sp2C.y = (sp14.y+1200.0f)+(temp_r31*130.0f)+((1.0f/255.0f)*(frand8()*60.0f));
-		sp2C.z = (sp14.z-25.0f)+((1.0f/255.0f)*(frand8()*50.0f));
-		BoardModelPosSetV(sp38[temp_r31], &sp2C);
-		sp20.x = sp20.z = 0;
-		sp20.y = (1.0f/255.0f)*(frand8()*360.0f);
-		BoardModelRotSetV(sp38[temp_r31], &sp20);
-	}
-	temp_f31 = -4;
-	temp_r30 = 0;
-	temp_f30 = sp8[BoardPlayerSizeGet(lbl_1_bss_388)];
-	while(1) {
-		for(temp_r31=0; temp_r31<20; temp_r31++) {
-			if(temp_r31 < temp_r30) {
-				continue;
-			}
-			BoardModelPosGet(sp38[temp_r31], &sp2C);
-			BoardModelRotGet(sp38[temp_r31], &sp20);
-			sp2C.y += temp_f31;
-			sp20.y += 45.0f;
-			BoardModelPosSetV(sp38[temp_r31], &sp2C);
-			BoardModelRotSetV(sp38[temp_r31], &sp20);
-			if(sp2C.y <= sp14.y+(180.0f*temp_f30)) {
-				CharModelCoinEffectCreate(1, &sp2C);
-				BoardModelVisibilitySet(sp38[temp_r31], 0);
-				temp_r30++;
-				BoardPlayerCoinsAdd(lbl_1_bss_388, 1);
-				HuAudFXPlay(7);
-				omVibrate(lbl_1_bss_388, 12, 6, 6);
-				
-			}
-		}
-		temp_f31 *= 1.05f;
-		if(temp_f31 < -40.0f) {
-			temp_f31 = -40.0f;
-		}
-		if(temp_r30 == 20) {
-			BoardPlayerMotionShiftSet(lbl_1_bss_388, 7, 0, 10, HU3D_MOTATTR_NONE);
-			break;
-		}
-		HuPrcVSleep();
-	}
-	while(!BoardPlayerMotionEndCheck(lbl_1_bss_388)) {
-		HuPrcVSleep();
-	}
-	for(temp_r31=0; temp_r31<20; temp_r31++) {
-		BoardModelKill(sp38[temp_r31]);
-	}
-	HuPrcSleep(60);
-	BoardPlayerMotBlendSet(lbl_1_bss_388, 180, 15);
-	BoardStatusShowSetAll(0);
-	while(!BoardPlayerMotBlendCheck(lbl_1_bss_388)) {
-		HuPrcVSleep();
-	}
+    float temp_f31;
+    float temp_f30;
+    s32 temp_r31;
+    s32 temp_r30;
+    s16 sp38[20];
+    Vec sp2C;
+    Vec sp20;
+    Vec sp14;
+    float sp8[3] = { 1.0f, 0.3f, 2.5f };
+    fn_1_121C(MAKE_MESSID(0x13, 0x08));
+    BoardStatusShowSetAll(1);
+    BoardPlayerMotBlendSet(lbl_1_bss_388, 0, 15);
+    BoardPlayerPosGet(lbl_1_bss_388, &sp14);
+    for (temp_r31 = 0; temp_r31 < 20; temp_r31++) {
+        sp38[temp_r31] = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 0x0A), NULL, 1);
+        sp2C.x = (sp14.x - 25.0f) + ((1.0f / 255.0f) * (frand8() * 50.0f));
+        sp2C.y = (sp14.y + 1200.0f) + (temp_r31 * 130.0f) + ((1.0f / 255.0f) * (frand8() * 60.0f));
+        sp2C.z = (sp14.z - 25.0f) + ((1.0f / 255.0f) * (frand8() * 50.0f));
+        BoardModelPosSetV(sp38[temp_r31], &sp2C);
+        sp20.x = sp20.z = 0;
+        sp20.y = (1.0f / 255.0f) * (frand8() * 360.0f);
+        BoardModelRotSetV(sp38[temp_r31], &sp20);
+    }
+    temp_f31 = -4;
+    temp_r30 = 0;
+    temp_f30 = sp8[BoardPlayerSizeGet(lbl_1_bss_388)];
+    while (1) {
+        for (temp_r31 = 0; temp_r31 < 20; temp_r31++) {
+            if (temp_r31 < temp_r30) {
+                continue;
+            }
+            BoardModelPosGet(sp38[temp_r31], &sp2C);
+            BoardModelRotGet(sp38[temp_r31], &sp20);
+            sp2C.y += temp_f31;
+            sp20.y += 45.0f;
+            BoardModelPosSetV(sp38[temp_r31], &sp2C);
+            BoardModelRotSetV(sp38[temp_r31], &sp20);
+            if (sp2C.y <= sp14.y + (180.0f * temp_f30)) {
+                CharModelCoinEffectCreate(1, &sp2C);
+                BoardModelVisibilitySet(sp38[temp_r31], 0);
+                temp_r30++;
+                BoardPlayerCoinsAdd(lbl_1_bss_388, 1);
+                HuAudFXPlay(7);
+                omVibrate(lbl_1_bss_388, 12, 6, 6);
+            }
+        }
+        temp_f31 *= 1.05f;
+        if (temp_f31 < -40.0f) {
+            temp_f31 = -40.0f;
+        }
+        if (temp_r30 == 20) {
+            BoardPlayerMotionShiftSet(lbl_1_bss_388, 7, 0, 10, HU3D_MOTATTR_NONE);
+            break;
+        }
+        HuPrcVSleep();
+    }
+    while (!BoardPlayerMotionEndCheck(lbl_1_bss_388)) {
+        HuPrcVSleep();
+    }
+    for (temp_r31 = 0; temp_r31 < 20; temp_r31++) {
+        BoardModelKill(sp38[temp_r31]);
+    }
+    HuPrcSleep(60);
+    BoardPlayerMotBlendSet(lbl_1_bss_388, 180, 15);
+    BoardStatusShowSetAll(0);
+    while (!BoardPlayerMotBlendCheck(lbl_1_bss_388)) {
+        HuPrcVSleep();
+    }
 }
 
 s32 fn_1_D8C4(void)
 {
-	Vec sp40;
-	Vec sp34;
-	Vec sp28;
-	Vec sp1C;
-	s16 sp14[4];
-	float spC[2];
-	s32 sp8;
-	
-	float temp_f31;
-	float temp_f30;
-	
-	s32 temp_r31;
-	s16 temp_r30;
-	BoardSpace *temp_r29;
-	s32 temp_r28;
-	s16 temp_r27;
-	s16 temp_r26;
-	s32 temp_r25;
-	s16 temp_r24;
-	s16 temp_r23;
-	s16 temp_r22;
-	
-	u32 temp_r21;
-	fn_1_121C(MAKE_MESSID(0x13, 0x09));
-	temp_r29 = BoardSpaceGet(0, BoardSpaceFlagSearch(0, 0x800));
-	BoardModelPosGet(lbl_1_bss_30[3], &sp40);
-	for(temp_r31=0; temp_r31<4; temp_r31++) {
-		sp14[temp_r31] = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 0x00), NULL, 1);
-		BoardModelLayerSet(sp14[temp_r31], 2);
-		for(temp_r28=0; temp_r28<temp_r29->link_cnt; temp_r28++) {
-			temp_r21 = (BoardSpaceFlagGet(0, temp_r29->link[temp_r28]) & 0xE) >> 1;
-			if(temp_r21 == temp_r31+2) {
-				break;
-			}
-		}
-		sp8 = BoardSpacePosGet(0, temp_r29->link[temp_r28], &sp28);
-		VECSubtract(&sp28, &sp40, &sp34);
-		BoardModelRotYSet(sp14[temp_r31], atan2d(sp34.x, sp34.z));
-		VECNormalize(&sp34, &sp34);
-		VECScale(&sp34, &sp34, 400);
-		VECAdd(&sp34, &sp40, &sp34);
-		sp34.y += 300.0f;
-		BoardModelPosSetV(sp14[temp_r31], &sp34);
-		sp1C.x = sp1C.y = sp1C.z = 3;
-		BoardModelScaleSetV(sp14[temp_r31], &sp1C);
-	}
-	temp_r25 = fn_1_E2AC();
-	HuWinMesMaxSizeGet(1, spC, MAKE_MESSID(0x13, 0x1E));
-	temp_r30 = HuWinCreate(-10000, 356, spC[0], spC[1], 0);
-	HuWinMesSet(temp_r30, MAKE_MESSID(0x13, 0x1E));
-	HuWinBGTPLvlSet(temp_r30, 0);
-	HuWinMesSpeedSet(temp_r30, 0);
-	temp_r23 = GWPlayer[lbl_1_bss_388].port;
-	temp_f30 = 0;
-	temp_r22 = frandmod(20)+20;
-	restart:
-	while(1) {
-		if(GWPlayer[lbl_1_bss_388].com) {
-			temp_r27 = 0;
-			temp_r26 = 0;
-			if(temp_r22) {
-				temp_r22--;
-				temp_r24 = 0;
-			} else {
-				temp_r24 = PAD_BUTTON_A;
-			}
-			break;
-		}
-		temp_r24 = HuPadBtnDown[temp_r23];
-		temp_r27 = HuPadStkX[temp_r23];
-		temp_r26 = HuPadStkY[temp_r23];
-		if(!(temp_r24 & PAD_TRIGGER_Z)) {
-			break;
-		}
-		HuAudFXPlay(1);
-		for(temp_r31=0; temp_r31<4; temp_r31++) {
-			BoardModelVisibilitySet(sp14[temp_r31], 0);
-		}
-		HuWinDispOff(temp_r30);
-		BoardViewMapExec(lbl_1_bss_388);
-		HuWinDispOn(temp_r30);
-		for(temp_r31=0; temp_r31<4; temp_r31++) {
-			BoardModelVisibilitySet(sp14[temp_r31], 1);
-		}
-	}
-	if(!(temp_r24 & PAD_BUTTON_A)) {
-		if(abs(temp_r27) < 10) {
-			temp_r27 = 0;
-		}
-		if(abs(temp_r26) < 10) {
-			temp_r26 = 0;
-		}
-		if(temp_r27 != 0 || temp_r26 != 0) {
-			temp_f31 = atan2d(-temp_r27, -temp_r26);
-			if(temp_f31 < 0.0f) {
-				temp_f31 += 360.0f;
-			}
-			temp_r31 = temp_f31/90.0f;
-			temp_f31 = fmod(temp_f31, 90.0);
-			if(temp_r31 != temp_r25 && temp_f31 >= 20.0f && temp_f31 <= 70.0f){ 
-				temp_f30 = 0;
-				temp_r25 = temp_r31;
-				HuAudFXPlay(0);
-			}
-			
-		}
-		for(temp_r31=0; temp_r31<4; temp_r31++) {
-			if(temp_r31 == temp_r25) {
-				sp1C.x = sp1C.y = sp1C.z = sind(temp_f30)+3.0;
-				temp_f30 += 8.0f;
-				if(temp_f30 > 180.0f) {
-					temp_f30 -= 180.0f;
-				}
-			} else {
-				sp1C.x = sp1C.y = sp1C.z = 3.0f;
-			}
-			
-			
-			BoardModelScaleSetV(sp14[temp_r31], &sp1C);
-		}
-		HuPrcVSleep();
-		goto restart;
-	} else {
-		HuAudFXPlay(2);
-		for(temp_r31=0; temp_r31<4; temp_r31++) {
-			BoardModelKill(sp14[temp_r31]);
-		}
-		HuWinKill(temp_r30);
-		return temp_r25;
-	}
+    Vec sp40;
+    Vec sp34;
+    Vec sp28;
+    Vec sp1C;
+    s16 sp14[4];
+    float spC[2];
+    s32 sp8;
+
+    float temp_f31;
+    float temp_f30;
+
+    s32 temp_r31;
+    s16 temp_r30;
+    BoardSpace *temp_r29;
+    s32 temp_r28;
+    s16 temp_r27;
+    s16 temp_r26;
+    s32 temp_r25;
+    s16 temp_r24;
+    s16 temp_r23;
+    s16 temp_r22;
+
+    u32 temp_r21;
+    fn_1_121C(MAKE_MESSID(0x13, 0x09));
+    temp_r29 = BoardSpaceGet(0, BoardSpaceFlagSearch(0, 0x800));
+    BoardModelPosGet(lbl_1_bss_30[3], &sp40);
+    for (temp_r31 = 0; temp_r31 < 4; temp_r31++) {
+        sp14[temp_r31] = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 0x00), NULL, 1);
+        BoardModelLayerSet(sp14[temp_r31], 2);
+        for (temp_r28 = 0; temp_r28 < temp_r29->link_cnt; temp_r28++) {
+            temp_r21 = (BoardSpaceFlagGet(0, temp_r29->link[temp_r28]) & 0xE) >> 1;
+            if (temp_r21 == temp_r31 + 2) {
+                break;
+            }
+        }
+        sp8 = BoardSpacePosGet(0, temp_r29->link[temp_r28], &sp28);
+        VECSubtract(&sp28, &sp40, &sp34);
+        BoardModelRotYSet(sp14[temp_r31], atan2d(sp34.x, sp34.z));
+        VECNormalize(&sp34, &sp34);
+        VECScale(&sp34, &sp34, 400);
+        VECAdd(&sp34, &sp40, &sp34);
+        sp34.y += 300.0f;
+        BoardModelPosSetV(sp14[temp_r31], &sp34);
+        sp1C.x = sp1C.y = sp1C.z = 3;
+        BoardModelScaleSetV(sp14[temp_r31], &sp1C);
+    }
+    temp_r25 = fn_1_E2AC();
+    HuWinMesMaxSizeGet(1, spC, MAKE_MESSID(0x13, 0x1E));
+    temp_r30 = HuWinCreate(-10000, 356, spC[0], spC[1], 0);
+    HuWinMesSet(temp_r30, MAKE_MESSID(0x13, 0x1E));
+    HuWinBGTPLvlSet(temp_r30, 0);
+    HuWinMesSpeedSet(temp_r30, 0);
+    temp_r23 = GWPlayer[lbl_1_bss_388].port;
+    temp_f30 = 0;
+    temp_r22 = frandmod(20) + 20;
+restart:
+    while (1) {
+        if (GWPlayer[lbl_1_bss_388].com) {
+            temp_r27 = 0;
+            temp_r26 = 0;
+            if (temp_r22) {
+                temp_r22--;
+                temp_r24 = 0;
+            }
+            else {
+                temp_r24 = PAD_BUTTON_A;
+            }
+            break;
+        }
+        temp_r24 = HuPadBtnDown[temp_r23];
+        temp_r27 = HuPadStkX[temp_r23];
+        temp_r26 = HuPadStkY[temp_r23];
+        if (!(temp_r24 & PAD_TRIGGER_Z)) {
+            break;
+        }
+        HuAudFXPlay(1);
+        for (temp_r31 = 0; temp_r31 < 4; temp_r31++) {
+            BoardModelVisibilitySet(sp14[temp_r31], 0);
+        }
+        HuWinDispOff(temp_r30);
+        BoardViewMapExec(lbl_1_bss_388);
+        HuWinDispOn(temp_r30);
+        for (temp_r31 = 0; temp_r31 < 4; temp_r31++) {
+            BoardModelVisibilitySet(sp14[temp_r31], 1);
+        }
+    }
+    if (!(temp_r24 & PAD_BUTTON_A)) {
+        if (abs(temp_r27) < 10) {
+            temp_r27 = 0;
+        }
+        if (abs(temp_r26) < 10) {
+            temp_r26 = 0;
+        }
+        if (temp_r27 != 0 || temp_r26 != 0) {
+            temp_f31 = atan2d(-temp_r27, -temp_r26);
+            if (temp_f31 < 0.0f) {
+                temp_f31 += 360.0f;
+            }
+            temp_r31 = temp_f31 / 90.0f;
+            temp_f31 = fmod(temp_f31, 90.0);
+            if (temp_r31 != temp_r25 && temp_f31 >= 20.0f && temp_f31 <= 70.0f) {
+                temp_f30 = 0;
+                temp_r25 = temp_r31;
+                HuAudFXPlay(0);
+            }
+        }
+        for (temp_r31 = 0; temp_r31 < 4; temp_r31++) {
+            if (temp_r31 == temp_r25) {
+                sp1C.x = sp1C.y = sp1C.z = sind(temp_f30) + 3.0;
+                temp_f30 += 8.0f;
+                if (temp_f30 > 180.0f) {
+                    temp_f30 -= 180.0f;
+                }
+            }
+            else {
+                sp1C.x = sp1C.y = sp1C.z = 3.0f;
+            }
+
+            BoardModelScaleSetV(sp14[temp_r31], &sp1C);
+        }
+        HuPrcVSleep();
+        goto restart;
+    }
+    else {
+        HuAudFXPlay(2);
+        for (temp_r31 = 0; temp_r31 < 4; temp_r31++) {
+            BoardModelKill(sp14[temp_r31]);
+        }
+        HuWinKill(temp_r30);
+        return temp_r25;
+    }
 }
 
 void fn_1_DF48(void)
 {
-	Vec sp14;
-	Vec sp8;
-	s32 temp_r31;
-	float temp_f31;
-	float temp_f30;
-	float temp_f29;
-	float temp_f28;
-	BoardModelMotionTimeSet(lbl_1_bss_30[5], 0);
-	BoardModelAttrSet(lbl_1_bss_30[5], 0x40000002);
-	temp_f31 = BoardModelRotYGet(lbl_1_bss_30[5]);
-	temp_f29 = -temp_f31/20.0f;
-	temp_f30 = BoardModelRotYGet(lbl_1_bss_30[15]);
-	temp_f28 = -temp_f30/20.0f;
-	BoardModelScaleGet(lbl_1_bss_30[6], &sp14);
-	for(temp_r31=0; temp_r31<10; temp_r31++) {
-		sp14.x = sp14.y = sp14.z = 1.0f-(temp_r31*0.1f);
-		if(sp14.x < 0.0f) {
-			sp14.x = sp14.y = sp14.z = 0.0f;
-		}
-		BoardModelScaleSetV(lbl_1_bss_30[6], &sp14);
-		temp_f31 += temp_f29;
-		BoardModelRotYSet(lbl_1_bss_30[5], temp_f31);
-		temp_f30 += temp_f28;
-		BoardModelRotYSet(lbl_1_bss_30[15], temp_f30);
-		HuPrcVSleep();
-	}
-	BoardModelPosGet(lbl_1_bss_30[15], &sp8);
-	sp8.z -= 90.0f;
-	sp8.y += 50.0f;
-	BoardModelPosSetV(lbl_1_bss_30[6], &sp8);
-	for(temp_r31=0; temp_r31<10; temp_r31++) {
-		sp14.x = sp14.y = sp14.z = temp_r31*0.1f;
-		if(sp14.x > 1.0f) {
-			sp14.x = sp14.y = sp14.z = 1.0f;
-		}
-		BoardModelScaleSetV(lbl_1_bss_30[6], &sp14);
-		temp_f31 += temp_f29;
-		BoardModelRotYSet(lbl_1_bss_30[5], temp_f31);
-		temp_f30 += temp_f28;
-		BoardModelRotYSet(lbl_1_bss_30[15], temp_f30);
-		HuPrcVSleep();
-	}
-	sp14.x = sp14.y = sp14.z = 1.0f;
-	BoardModelScaleSetV(lbl_1_bss_30[6], &sp14);
-	BoardModelRotYSet(lbl_1_bss_30[5], 0);
-	BoardModelRotYSet(lbl_1_bss_30[15], 0);
-	HuPrcEnd();
+    Vec sp14;
+    Vec sp8;
+    s32 temp_r31;
+    float temp_f31;
+    float temp_f30;
+    float temp_f29;
+    float temp_f28;
+    BoardModelMotionTimeSet(lbl_1_bss_30[5], 0);
+    BoardModelAttrSet(lbl_1_bss_30[5], 0x40000002);
+    temp_f31 = BoardModelRotYGet(lbl_1_bss_30[5]);
+    temp_f29 = -temp_f31 / 20.0f;
+    temp_f30 = BoardModelRotYGet(lbl_1_bss_30[15]);
+    temp_f28 = -temp_f30 / 20.0f;
+    BoardModelScaleGet(lbl_1_bss_30[6], &sp14);
+    for (temp_r31 = 0; temp_r31 < 10; temp_r31++) {
+        sp14.x = sp14.y = sp14.z = 1.0f - (temp_r31 * 0.1f);
+        if (sp14.x < 0.0f) {
+            sp14.x = sp14.y = sp14.z = 0.0f;
+        }
+        BoardModelScaleSetV(lbl_1_bss_30[6], &sp14);
+        temp_f31 += temp_f29;
+        BoardModelRotYSet(lbl_1_bss_30[5], temp_f31);
+        temp_f30 += temp_f28;
+        BoardModelRotYSet(lbl_1_bss_30[15], temp_f30);
+        HuPrcVSleep();
+    }
+    BoardModelPosGet(lbl_1_bss_30[15], &sp8);
+    sp8.z -= 90.0f;
+    sp8.y += 50.0f;
+    BoardModelPosSetV(lbl_1_bss_30[6], &sp8);
+    for (temp_r31 = 0; temp_r31 < 10; temp_r31++) {
+        sp14.x = sp14.y = sp14.z = temp_r31 * 0.1f;
+        if (sp14.x > 1.0f) {
+            sp14.x = sp14.y = sp14.z = 1.0f;
+        }
+        BoardModelScaleSetV(lbl_1_bss_30[6], &sp14);
+        temp_f31 += temp_f29;
+        BoardModelRotYSet(lbl_1_bss_30[5], temp_f31);
+        temp_f30 += temp_f28;
+        BoardModelRotYSet(lbl_1_bss_30[15], temp_f30);
+        HuPrcVSleep();
+    }
+    sp14.x = sp14.y = sp14.z = 1.0f;
+    BoardModelScaleSetV(lbl_1_bss_30[6], &sp14);
+    BoardModelRotYSet(lbl_1_bss_30[5], 0);
+    BoardModelRotYSet(lbl_1_bss_30[15], 0);
+    HuPrcEnd();
 }
 
 s32 fn_1_E2AC(void)
 {
-	switch(GWSystem.star_pos) {
-		case 0:
-			return 3;
-			
-		case 1:
-		case 2:
-			return 0;
-			
-		case 3:
-		case 4:
-			return 1;
-			
-		case 5:
-		case 6:
-		case 7:
-			return 2;
-			
-		default:
-			return -1;
-	}
+    switch (GWSystem.star_pos) {
+        case 0:
+            return 3;
+
+        case 1:
+        case 2:
+            return 0;
+
+        case 3:
+        case 4:
+            return 1;
+
+        case 5:
+        case 6:
+        case 7:
+            return 2;
+
+        default:
+            return -1;
+    }
 }
 
 /* Rotate (yaw) of model 4 */
-void fn_1_E310(f32 degrees) {
-    Point3d spC;
+void fn_1_E310(f32 degrees)
+{
+    Vec spC;
     lbl_1_bss_380 += degrees;
     if (lbl_1_bss_380 >= 360.0f) {
         lbl_1_bss_380 -= 360.0f;
@@ -804,11 +808,11 @@ void fn_1_E310(f32 degrees) {
 
 void fn_1_E41C(void)
 {
-	lbl_1_bss_388 = GWSystem.player_curr;
-	OSReport("Roulette Player %d\n", lbl_1_bss_388);
-	lbl_1_bss_38C = HuPrcChildCreate(fn_1_BCFC, 8195, 8192, 0, boardMainProc);
-	HuPrcDestructorSet2(lbl_1_bss_38C, (void *)fn_1_BE74); //fn_1_BE74 requires implicit return
-	while(lbl_1_bss_38C) {
-		HuPrcVSleep();
-	}
+    lbl_1_bss_388 = GWSystem.player_curr;
+    OSReport("Roulette Player %d\n", lbl_1_bss_388);
+    lbl_1_bss_38C = HuPrcChildCreate(fn_1_BCFC, 8195, 8192, 0, boardMainProc);
+    HuPrcDestructorSet2(lbl_1_bss_38C, (void *)fn_1_BE74); // fn_1_BE74 requires implicit return
+    while (lbl_1_bss_38C) {
+        HuPrcVSleep();
+    }
 }
diff --git a/src/REL/w03Dll/mg_coin.c b/src/REL/w03Dll/mg_coin.c
index b577ffc1..dc05b755 100644
--- a/src/REL/w03Dll/mg_coin.c
+++ b/src/REL/w03Dll/mg_coin.c
@@ -134,9 +134,9 @@ void fn_1_7C98(void)
 
 s32 fn_1_7D18(s32 arg0)
 {
-    Point3d sp38;
-    Point3d sp2C;
-    Point3d sp20;
+    Vec sp38;
+    Vec sp2C;
+    Vec sp20;
     Vec sp14;
     Vec sp8;
     f32 var_f31;
@@ -259,7 +259,7 @@ s32 lbl_1_data_490[] = {
 
 void fn_1_81E0(s32 arg0)
 {
-    Point3d sp8;
+    Vec sp8;
     omObjData *temp_r3;
     f32 temp_f31;
     s32 temp_r28;
@@ -499,7 +499,7 @@ s32 lbl_1_data_4B4[] = { 0x00000440, 0x00000441, 0x00000442, 0x00000443, 0x00000
 
 void fn_1_8C08(omObjData *arg0, someBits3 *arg1)
 {
-    Point3d spC;
+    Vec spC;
     f32 temp_f31;
     f32 temp_f30;
     s8 temp_r27;
@@ -535,7 +535,7 @@ void fn_1_8C08(omObjData *arg0, someBits3 *arg1)
 
 void fn_1_8E44(omObjData *arg0, someBits3 *arg1)
 {
-    Point3d sp8;
+    Vec sp8;
     f32 temp_f1;
     f32 temp_f31;
 
@@ -611,9 +611,9 @@ void fn_1_91B8(void)
 
 void fn_1_9230(s32 arg0)
 {
-    Point3d sp20;
-    Point3d sp14;
-    Point3d sp8;
+    Vec sp20;
+    Vec sp14;
+    Vec sp8;
     s16 temp_r30;
     f32 rotY;
 
@@ -747,7 +747,7 @@ void fn_1_95B8(omObjData *arg0)
 
 void fn_1_97F8(s32 arg0)
 {
-    Point3d sp8;
+    Vec sp8;
     f32 temp_f2;
     f32 var_f31;
     f64 temp_f1;
diff --git a/src/REL/w03Dll/mg_item.c b/src/REL/w03Dll/mg_item.c
index a7d31165..9b9ccfa3 100644
--- a/src/REL/w03Dll/mg_item.c
+++ b/src/REL/w03Dll/mg_item.c
@@ -794,9 +794,9 @@ void fn_1_B350(omObjData *arg0)
 
 void fn_1_B4AC(omObjData *arg0, someBits2 *arg1)
 {
-    Point3d sp20;
-    Point3d sp14;
-    Point3d sp8;
+    Vec sp20;
+    Vec sp14;
+    Vec sp8;
     f32 temp_f31;
     s8 temp_r0;
     s32 i;
@@ -827,7 +827,7 @@ void fn_1_B4AC(omObjData *arg0, someBits2 *arg1)
 
 void fn_1_B688(omObjData *arg0, someBits2 *arg1)
 {
-    Point3d sp8;
+    Vec sp8;
 
     if (arg1->unk1-- != 0) {
         BoardModelPosGet(arg1->unk_06[arg1->unk2], &sp8);
@@ -844,7 +844,7 @@ void fn_1_B688(omObjData *arg0, someBits2 *arg1)
 void fn_1_B748(omObjData *arg0, someBits2 *arg1)
 {
     Vec sp14;
-    Point3d sp8;
+    Vec sp8;
     f32 temp_f0;
     s16 temp_r29;
 
@@ -877,8 +877,8 @@ void fn_1_B748(omObjData *arg0, someBits2 *arg1)
 
 void fn_1_B8E8(s32 arg0)
 {
-    Point3d sp14;
-    Point3d sp8;
+    Vec sp14;
+    Vec sp8;
     f32 temp_f31;
     someBits2 *temp_r31;
     f32 temp;
@@ -975,7 +975,7 @@ void fn_1_BDAC(void)
 
 void fn_1_BE30(ModelData *model, ParticleData *particle, Mtx matrix)
 {
-    Point3d sp8;
+    Vec sp8;
     f32 temp_f30;
     f32 temp_f29;
     f32 temp_f31;
diff --git a/src/REL/w03Dll/river.c b/src/REL/w03Dll/river.c
index 7736b6f2..810ab586 100644
--- a/src/REL/w03Dll/river.c
+++ b/src/REL/w03Dll/river.c
@@ -1,28 +1,29 @@
-#include "dolphin.h"
-#include "game/object.h"
 #include "REL/w03Dll.h"
+#include "dolphin.h"
 #include "game/board/main.h"
 #include "game/board/model.h"
 #include "game/board/player.h"
 #include "game/hsfdraw.h"
+#include "game/object.h"
+
 
 #include "ext_math.h"
 
-//BSS
+// BSS
 char lbl_1_bss_130[8];
-omObjData* lbl_1_bss_12C;
+omObjData *lbl_1_bss_12C;
 s16 lbl_1_bss_128;
 s32 lbl_1_bss_124;
-Process* lbl_1_bss_120;
+Process *lbl_1_bss_120;
 
-//function signatures
+// function signatures
 void fn_1_67F8(void);
 void fn_1_6884(void);
-void fn_1_767C(omObjData* arg0);
+void fn_1_767C(omObjData *arg0);
 s32 fn_1_6898(s32 arg0);
 void fn_1_6B98(s32 arg0);
 void fn_1_6F9C(s32 arg0);
-void fn_1_767C(omObjData* arg0);
+void fn_1_767C(omObjData *arg0);
 void fn_1_735C(s32 arg0);
 void fn_1_77E4(s32 arg0);
 
@@ -34,43 +35,37 @@ typedef struct unkWorkStruct {
     f32 unk_04;
 } unkWorkStruct;
 
-//data
-s32 lbl_1_data_368[] = {
-    0x00000105, 0x00000145, 0x00000185,
-    0x000001C5, 0x00000205, 0x00000245,
-    0x00000285, 0x000002C5
-};
+// data
+s32 lbl_1_data_368[] = { 0x00000105, 0x00000145, 0x00000185, 0x000001C5, 0x00000205, 0x00000245, 0x00000285, 0x000002C5 };
 
 s16 lbl_1_data_388 = -1;
 s16 lbl_1_data_38A = -1;
 s16 lbl_1_data_38C = -1;
-s32 lbl_1_data_390[] = {
-    DATA_MAKE_NUM(DATADIR_W03, 0x26),
-    DATA_MAKE_NUM(DATADIR_W03, 0x27),
-    DATA_MAKE_NUM(DATADIR_W03, 0x28),
-    DATA_NUM_LISTEND
-};
+s32 lbl_1_data_390[] = { DATA_MAKE_NUM(DATADIR_W03, 0x26), DATA_MAKE_NUM(DATADIR_W03, 0x27), DATA_MAKE_NUM(DATADIR_W03, 0x28), DATA_NUM_LISTEND };
 
-void fn_1_63F4(s32 arg0) {
+void fn_1_63F4(s32 arg0)
+{
     Vec spC;
-    unkWorkStruct* work = OM_GET_WORK_PTR(lbl_1_bss_12C, unkWorkStruct);
+    unkWorkStruct *work = OM_GET_WORK_PTR(lbl_1_bss_12C, unkWorkStruct);
 
     work->unk_04 = 0.0f;
 
     BoardModelPosGet(lbl_1_data_388, &spC);
     if (arg0 != 0) {
         spC.y = -185.0f;
-    } else {
+    }
+    else {
         spC.y = 10.0f;
     }
 
     BoardModelPosSetV(lbl_1_data_388, &spC);
 }
 
-void fn_1_6494(void) {
+void fn_1_6494(void)
+{
     Vec sp14;
     Vec sp8;
-    unkWorkStruct* temp_r31;
+    unkWorkStruct *temp_r31;
 
     lbl_1_data_388 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W03, 0x0E), NULL, 0);
     lbl_1_data_38C = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W03, 0x0F), NULL, 0);
@@ -83,14 +78,15 @@ void fn_1_6494(void) {
     sp14.x = sp8.x + (400.0 * sin(-(M_PI / 2)));
     sp14.z = sp8.z + (400.0 * cos(-(M_PI / 2)));
     BoardModelPosSetV(lbl_1_data_388, &sp14);
-    lbl_1_bss_12C = omAddObjEx(boardObjMan, 0x101, 0, 0, -1, (void*)fn_1_767C);
+    lbl_1_bss_12C = omAddObjEx(boardObjMan, 0x101, 0, 0, -1, (void *)fn_1_767C);
     temp_r31 = OM_GET_WORK_PTR(lbl_1_bss_12C, unkWorkStruct);
     temp_r31->temp1 = 0;
     temp_r31->unk_04 = 0.0f;
     lbl_1_bss_124 = 0;
 }
 
-s32 fn_1_6698(void) {
+s32 fn_1_6698(void)
+{
     Vec sp14;
     Vec sp8;
 
@@ -98,11 +94,12 @@ s32 fn_1_6698(void) {
     BoardSpaceFlagPosGet(0, 0x200, &sp8);
     sp14.x = sp8.x + (400.0 * sin(-(M_PI / 2)));
     sp14.z = sp8.z + (400.0 * cos(-(M_PI / 2)));
-    BoardModelPosSetV(lbl_1_data_388, (Point3d* ) &sp14);
+    BoardModelPosSetV(lbl_1_data_388, (Vec *)&sp14);
     return 1;
 }
 
-s16 fn_1_675C(void) {
+s16 fn_1_675C(void)
+{
     BoardRollDispSet(0);
     lbl_1_bss_120 = HuPrcChildCreate(fn_1_67F8, 0x2003, 0x2000, 0, boardMainProc);
     HuPrcDestructorSet2(lbl_1_bss_120, fn_1_6884);
@@ -115,7 +112,8 @@ s16 fn_1_675C(void) {
     return lbl_1_bss_128;
 }
 
-void fn_1_67F8(void) {
+void fn_1_67F8(void)
+{
     s32 temp_r31;
 
     temp_r31 = GWSystem.player_curr;
@@ -133,7 +131,8 @@ void fn_1_67F8(void) {
     HuPrcEnd();
 }
 
-void fn_1_6884(void) {
+void fn_1_6884(void)
+{
     lbl_1_bss_120 = 0;
 }
 
@@ -144,15 +143,16 @@ typedef struct unkPos {
 } unkPos;
 
 unkPos lbl_1_data_3B8[6] = {
-    {5, 20, 5},
-    {21, 35, 7},
-    {31, 50, 10},
-    {51, 80, 15},
-    {81, 100, 17},
-    {101, 999, 20},
+    { 5, 20, 5 },
+    { 21, 35, 7 },
+    { 31, 50, 10 },
+    { 51, 80, 15 },
+    { 81, 100, 17 },
+    { 101, 999, 20 },
 };
 
-s32 fn_1_6898(s32 arg0) {
+s32 fn_1_6898(s32 arg0)
+{
     Vec sp20;
     Vec sp14;
     Vec sp8;
@@ -165,7 +165,7 @@ s32 fn_1_6898(s32 arg0) {
     BoardPlayerIdleSet(arg0);
     BoardCameraViewSet(2);
     BoardCameraMotionWait();
-    
+
     Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_data_388), "hei01", &sp20);
     BoardPlayerPosGet(arg0, &sp14);
     VECSubtract(&sp20, &sp14, &sp8);
@@ -197,7 +197,7 @@ s32 fn_1_6898(s32 arg0) {
                 var_r27 = lbl_1_data_3B8[i].z;
                 break;
             }
-        }      
+        }
     }
 
     sprintf(lbl_1_bss_130, "%d", var_r27);
@@ -216,24 +216,24 @@ s32 fn_1_6898(s32 arg0) {
         BoardWinKill();
 
         switch (BoardWinChoiceGet()) {
-        case 0:
-            j = 1;
-            break;
-        case 1:
-        case -1:
-            BoardWinCreate(2, MAKE_MESSID(22, 14), 2);
-            BoardWinWait();
-            BoardWinKill();
-            return 0;
-        default:
-            BoardViewMapExec(arg0);
+            case 0:
+                j = 1;
+                break;
+            case 1:
+            case -1:
+                BoardWinCreate(2, MAKE_MESSID(22, 14), 2);
+                BoardWinWait();
+                BoardWinKill();
+                return 0;
+            default:
+                BoardViewMapExec(arg0);
         }
     }
 
     for (i = 0; i < var_r27; i++) {
         BoardPlayerCoinsAdd(arg0, -1);
         HuAudFXPlay(0xE);
-        HuPrcSleep(6);             
+        HuPrcSleep(6);
     }
 
     HuAudFXPlay(0xF);
@@ -245,11 +245,12 @@ s32 fn_1_6898(s32 arg0) {
 
 s32 BoardDAngleCalcRange(float *value, float min, float range);
 
-void fn_1_6B98(s32 arg0) {
+void fn_1_6B98(s32 arg0)
+{
     Vec sp30;
-    Point3d sp24;
+    Vec sp24;
     Vec sp18;
-    Point3d spC;
+    Vec spC;
     f32 sp8;
     f32 temp_f1;
     f32 temp_f31;
@@ -287,19 +288,19 @@ void fn_1_6B98(s32 arg0) {
         VECAdd(&spC, &sp24, &sp24);
         temp_f1 = BoardModelMotionTimeGet(lbl_1_data_38A);
 
-        if ((temp_f1 >= 5.0f) && (temp_f1 < 15.0f) && ((s16) var_r31 == 0)) {
+        if ((temp_f1 >= 5.0f) && (temp_f1 < 15.0f) && ((s16)var_r31 == 0)) {
             HuAudFXPlay(0x451);
             var_r31 = 1;
         }
 
-        if ((BoardModelMotionTimeGet(lbl_1_data_38A) >= 21.0f) && ((s16) var_r31 != 0)) {
+        if ((BoardModelMotionTimeGet(lbl_1_data_38A) >= 21.0f) && ((s16)var_r31 != 0)) {
             var_r31 = 0;
         }
 
         BoardModelPosSetV(lbl_1_data_388, &sp24);
-        HuPrcVSleep();       
+        HuPrcVSleep();
     }
-    
+
     BoardModelPosSetV(lbl_1_data_388, &sp18);
     BoardCameraTargetModelSet(-1);
     BoardModelMotionShiftSet(lbl_1_data_38A, 2, 0.0f, 10.0f, HU3D_MOTATTR_REV);
@@ -321,7 +322,8 @@ void fn_1_6B98(s32 arg0) {
 extern s32 lbl_1_data_368[];
 // extern w03State* lbl_1_bss_0;
 
-void fn_1_6F9C(s32 arg0) {
+void fn_1_6F9C(s32 arg0)
+{
     Vec sp20;
     Vec sp14;
     Vec sp8;
@@ -344,7 +346,8 @@ void fn_1_6F9C(s32 arg0) {
         var_f30 = 10.0f;
         var_f29 = 0.21f;
         sp14.y += sp20.y;
-    } else {
+    }
+    else {
         var_f30 = 0.0f;
         var_f29 = 0.15f;
     }
@@ -364,16 +367,17 @@ void fn_1_6F9C(s32 arg0) {
             }
         }
         BoardPlayerPosSetV(arg0, &sp14);
-        HuPrcVSleep();        
+        HuPrcVSleep();
     }
-    
+
     BoardPlayerMotionShiftSet(arg0, 5, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
     HuPrcSleep(10);
     BoardPlayerIdleSet(arg0);
 
     if (GWPlayer[arg0].bowser_suit != 0) {
         BoardModelHookSet(lbl_1_data_388, "chara01", BoardPlayerModelGet(arg0));
-    } else {
+    }
+    else {
         BoardModelHookSet(lbl_1_data_388, "chara01", BoardPlayerModelGet(arg0));
     }
 
@@ -381,10 +385,11 @@ void fn_1_6F9C(s32 arg0) {
     lbl_1_bss_124 = 0;
 }
 
-void fn_1_735C(s32 arg0) {
+void fn_1_735C(s32 arg0)
+{
     Vec sp20;
     Vec sp14;
-    Point3d sp8;
+    Vec sp8;
     f32 temp_f1;
     f32 var_f30;
     f32 var_f31;
@@ -397,19 +402,20 @@ void fn_1_735C(s32 arg0) {
     BoardPlayerPosSetV(arg0, &sp14);
     BoardModelHookObjReset(lbl_1_data_388, "chara01");
     VECSubtract(&sp20, &sp14, &sp8);
-    
+
     sp8.x = sp8.x / 60.0f;
     sp8.z = sp8.z / 60.0f;
     sp8.y = 0.0f;
-    
+
     HuAudFXPlay(lbl_1_data_368[GWPlayer[arg0].character]);
     BoardPlayerMotionShiftSet(arg0, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
     if (lbl_1_bss_0->unk0 != 0) {
         var_f30 = 0.25f;
-    } else {
+    }
+    else {
         var_f30 = 0.2f;
     }
-    
+
     for (var_r30 = 0, var_f31 = 0.0f; var_f31 < 60.0f; var_f31 += 1.0f) {
         VECAdd(&sp14, &sp8, &sp14);
         sp14.y += 20.0f + (var_f30 * (-0.08166667f * var_f31 * var_f31));
@@ -421,9 +427,9 @@ void fn_1_735C(s32 arg0) {
             }
         }
         BoardPlayerPosSetV(arg0, &sp14);
-        HuPrcVSleep();        
+        HuPrcVSleep();
     }
-    
+
     BoardPlayerPosSetV(arg0, &sp20);
     HuPrcSleep(0xA);
     BoardPlayerMotBlendSet(arg0, 0, 15);
@@ -441,15 +447,15 @@ void fn_1_735C(s32 arg0) {
     BoardWinKill();
 }
 
-
-void fn_1_767C(omObjData* arg0) {
-    Point3d sp8;
+void fn_1_767C(omObjData *arg0)
+{
+    Vec sp8;
     s32 temp_r30;
-    unkWorkStruct* temp_r31;
+    unkWorkStruct *temp_r31;
 
     temp_r31 = OM_GET_WORK_PTR(arg0, unkWorkStruct);
 
-    if ( (temp_r31->temp1 != 0) || (BoardIsKill() != 0)) {
+    if ((temp_r31->temp1 != 0) || (BoardIsKill() != 0)) {
         lbl_1_bss_12C = NULL;
         omDelObjEx(HuPrcCurrentGet(), arg0);
         return;
@@ -466,7 +472,8 @@ void fn_1_767C(omObjData* arg0) {
     }
 }
 
-void fn_1_77E4(s32 arg0) {
+void fn_1_77E4(s32 arg0)
+{
     s32 boardIndex;
     s32 var_r30 = 0;
 
diff --git a/src/REL/w03Dll/statue.c b/src/REL/w03Dll/statue.c
index a31fc5a8..2d4d9102 100644
--- a/src/REL/w03Dll/statue.c
+++ b/src/REL/w03Dll/statue.c
@@ -13,7 +13,6 @@
 #include "game/objsub.h"
 #include "game/process.h"
 
-
 #include "ext_math.h"
 
 void fn_1_1358(void);
@@ -142,11 +141,11 @@ s32 fn_1_15E8(void)
 
 s32 fn_1_1650(s32 arg0)
 {
-    Point3d sp38;
-    Point3d sp2C;
-    Point3d sp20;
-    Point3d sp14;
-    Point3d sp8;
+    Vec sp38;
+    Vec sp2C;
+    Vec sp20;
+    Vec sp14;
+    Vec sp8;
     f32 temp;
     s32 temp2;
 
@@ -356,7 +355,7 @@ s32 fn_1_1D1C(void)
 
 void fn_1_1ED4(s32 arg0)
 {
-    Point3d spC;
+    Vec spC;
     f32 sp8;
 
     lbl_1_data_284 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W03, 0x0C), NULL, 0);
@@ -400,9 +399,9 @@ void fn_1_1ED4(s32 arg0)
 
 void fn_1_20E0(s32 arg0)
 {
-    Point3d sp24;
-    Point3d sp18;
-    Point3d spC;
+    Vec sp24;
+    Vec sp18;
+    Vec spC;
     f32 sp8;
     f32 var_f31;
     s32 i;
@@ -520,9 +519,9 @@ void fn_1_20E0(s32 arg0)
 
 void fn_1_26E0(s32 arg0)
 {
-    Point3d sp20;
-    Point3d sp14;
-    Point3d sp8;
+    Vec sp20;
+    Vec sp14;
+    Vec sp8;
     f32 temp;
 
     BoardSpacePosGet(0, GWPlayer[arg0].space_curr, &sp20);
diff --git a/src/dolphin/mtx/mtx.c b/src/dolphin/mtx/mtx.c
index eb16a64f..558d4d03 100644
--- a/src/dolphin/mtx/mtx.c
+++ b/src/dolphin/mtx/mtx.c
@@ -1202,7 +1202,7 @@ void PSMTXReflect(register Mtx m, const register Vec *p, const register Vec *n)
 }
 #endif
 
-void C_MTXLookAt(Mtx m, const Point3d *camPos, const Vec *camUp, const Point3d *target)
+void C_MTXLookAt(Mtx m, const Vec *camPos, const Vec *camUp, const Vec *target)
 {
     Vec vLook, vRight, vUp;
 
diff --git a/src/game/board/block.c b/src/game/board/block.c
index b830314f..0f7f86aa 100644
--- a/src/game/board/block.c
+++ b/src/game/board/block.c
@@ -1,3 +1,4 @@
+#include "ext_math.h"
 #include "game/board/main.h"
 #include "game/board/model.h"
 #include "game/board/player.h"
@@ -6,7 +7,7 @@
 #include "game/flag.h"
 #include "game/objsub.h"
 #include "game/process.h"
-#include "ext_math.h"
+
 
 #define BLOCK_SPAWN 0
 #define BLOCK_HIT 2
@@ -89,7 +90,7 @@ static void BlockProc(void)
     s32 sp14[8] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x60), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x60), DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x60),
         DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x60), DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x60), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x60),
         DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x60), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x60) };
-    Point3d sp8;
+    Vec sp8;
     s32 var_r28;
     s32 i;
     s32 player;
@@ -191,7 +192,7 @@ static void DestroyBlock(void)
 
 static void CreateBlockObj(s32 arg0)
 {
-    Point3d player_pos;
+    Vec player_pos;
     BlockWork *work;
     s8 contains_star;
 
@@ -422,7 +423,7 @@ static inline s32 FindCoinModel(s16 *out_model)
 
 static void PopupCoin(void)
 {
-    Point3d star_pos;
+    Vec star_pos;
     omObjData *coinObj;
     s32 model_index;
     s16 model;
@@ -451,8 +452,8 @@ static void PopupCoin(void)
 
 static void PopupCoinExec(omObjData *obj)
 {
-    Point3d coin_pos;
-    Point3d coin_rot;
+    Vec coin_pos;
+    Vec coin_rot;
     CoinWork *work;
 
     work = OM_GET_WORK_PTR(obj, CoinWork);