Trim trailing nops from functions and discover a few more file splits

src/include/game/game_01d860.h

@@ -5,6 +5,5 @@
 #include "types.h"
 
 void func0f01d860(void);
-void func0f01d8c0(void);
 
 #endif

src/include/game/game_01d8c0.h

@@ -0,0 +1,9 @@
+#ifndef IN_GAME_GAME_01D8C0_H
+#define IN_GAME_GAME_01D8C0_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+void func0f01d8c0(void);
+
+#endif

src/include/game/game_0b3350.h

@@ -12,45 +12,5 @@ u32 func0f0b3548(void);
 u32 func0f0b35b8(void);
 void func0f0b3988(struct textureconfig *config);
 void func0f0b39c0(Gfx **gdl, struct textureconfig *arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5, u32 arg6);
-void currentPlayerSetScreenSize(f32 width, f32 height);
-void currentPlayerSetScreenPosition(f32 left, f32 top);
-void currentPlayerSetPerspective(f32 near, f32 fovy, f32 aspect);
-f32 func0f0b49b8(f32 arg0);
-void currentPlayerSetCameraScale(void);
-void func0f0b4c3c(f32 *crosspos, struct coord *arg1, f32 arg2);
-void func0f0b4d04(struct coord *in, f32 *out);
-void func0f0b4d68(struct coord *in, struct coord *out);
-void func0f0b4dec(struct coord *in, struct coord *out);
-void func0f0b4e68(struct coord *in, f32 divisor, struct coord *out);
-void func0f0b4eb8(struct coord *arg0, f32 arg1[2], f32 zoom, f32 aspect);
-void currentPlayerSetUnk1738(void *matrix);
-void currentPlayerSetUnk173c(Mtx *matrix);
-Mtx *currentPlayerGetUnk173c(void);
-void currentPlayerSetUnk006c(Mtxf *matrix);
-Mtxf *currentPlayerGetUnk006c(void);
-void currentPlayerSetUnk1750(void *value);
-void *currentPlayerGetUnk1750(void);
-void currentPlayerSetUnk1758(Mtx *matrix);
-Mtx *currentPlayerGetUnk1758(void);
-void currentPlayerSetMatrix1740(Mtxf *value);
-u32 func0f0b5050(void);
-u32 func0f0b53a4(void);
-Mtxf *currentPlayerGetMatrix1740(void);
-void currentPlayerSetUnk1754(Mtxf *matrix);
-Mtxf *currentPlayerGetUnk1754(void);
-void currentPlayerSetUnk174c(Mtxf *matrix);
-Mtxf *currentPlayerGetUnk174c(void);
-void currentPlayerSetUnk175c(void *value);
-void *currentPlayerGetUnk175c(void);
-f32 currentPlayerGetLodScaleZ(void);
-f32 currentPlayerGetScreenWidth(void);
-f32 currentPlayerGetScreenHeight(void);
-f32 currentPlayerGetScreenLeft(void);
-f32 currentPlayerGetScreenTop(void);
-f32 currentPlayerGetPerspAspect(void);
-void func0f0b5838(void);
-u32 func0f0b5b9c(void);
-u32 func0f0b5d38(void);
-u32 func0f0b6260(void);
 
 #endif

src/include/game/game_0b4950.h

@@ -0,0 +1,48 @@
+#ifndef _IN_GAME_GAME_0B4950_H
+#define _IN_GAME_GAME_0B4950_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+void currentPlayerSetScreenSize(f32 width, f32 height);
+void currentPlayerSetScreenPosition(f32 left, f32 top);
+void currentPlayerSetPerspective(f32 near, f32 fovy, f32 aspect);
+f32 func0f0b49b8(f32 arg0);
+void currentPlayerSetCameraScale(void);
+void func0f0b4c3c(f32 *crosspos, struct coord *arg1, f32 arg2);
+void func0f0b4d04(struct coord *in, f32 *out);
+void func0f0b4d68(struct coord *in, struct coord *out);
+void func0f0b4dec(struct coord *in, struct coord *out);
+void func0f0b4e68(struct coord *in, f32 divisor, struct coord *out);
+void func0f0b4eb8(struct coord *arg0, f32 arg1[2], f32 zoom, f32 aspect);
+void currentPlayerSetUnk1738(void *matrix);
+void currentPlayerSetUnk173c(Mtx *matrix);
+Mtx *currentPlayerGetUnk173c(void);
+void currentPlayerSetUnk006c(Mtxf *matrix);
+Mtxf *currentPlayerGetUnk006c(void);
+void currentPlayerSetUnk1750(void *value);
+void *currentPlayerGetUnk1750(void);
+void currentPlayerSetUnk1758(Mtx *matrix);
+Mtx *currentPlayerGetUnk1758(void);
+void currentPlayerSetMatrix1740(Mtxf *value);
+u32 func0f0b5050(void);
+u32 func0f0b53a4(void);
+Mtxf *currentPlayerGetMatrix1740(void);
+void currentPlayerSetUnk1754(Mtxf *matrix);
+Mtxf *currentPlayerGetUnk1754(void);
+void currentPlayerSetUnk174c(Mtxf *matrix);
+Mtxf *currentPlayerGetUnk174c(void);
+void currentPlayerSetUnk175c(void *value);
+void *currentPlayerGetUnk175c(void);
+f32 currentPlayerGetLodScaleZ(void);
+f32 currentPlayerGetScreenWidth(void);
+f32 currentPlayerGetScreenHeight(void);
+f32 currentPlayerGetScreenLeft(void);
+f32 currentPlayerGetScreenTop(void);
+f32 currentPlayerGetPerspAspect(void);
+void func0f0b5838(void);
+u32 func0f0b5b9c(void);
+u32 func0f0b5d38(void);
+u32 func0f0b6260(void);
+
+#endif

src/include/game/game_165670.h

@@ -6,18 +6,5 @@
 
 u32 func0f165670(void);
 u32 func0f165728(void);
-u32 func0f1657cc(void);
-f32 func0f1657e4(void);
-void func0f1657f8(void);
-u32 func0f16598c(void);
-u32 func0f165c4c(void);
-void func0f165ee4(s32 stagenum);
-void func0f165eec(s32 stagenum, s32 arg1);
-void func0f1660a4(f32 arg0);
-Gfx *func0f1664a0(Gfx *gdl, u32 arg1);
-Gfx *gfxConsiderDisableFog(Gfx *gdl);
-u32 func0f1666f8(void);
-u32 func0f1667e8(void);
-s32 func0f1667f4(struct prop *prop, f32 *arg1);
 
 #endif

src/include/game/game_1657c0.h

@@ -0,0 +1,21 @@
+#ifndef IN_GAME_GAME_1657C0_H
+#define IN_GAME_GAME_1657C0_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+u32 func0f1657cc(void);
+f32 func0f1657e4(void);
+void func0f1657f8(void);
+u32 func0f16598c(void);
+u32 func0f165c4c(void);
+void func0f165ee4(s32 stagenum);
+void func0f165eec(s32 stagenum, s32 arg1);
+void func0f1660a4(f32 arg0);
+Gfx *func0f1664a0(Gfx *gdl, u32 arg1);
+Gfx *gfxConsiderDisableFog(Gfx *gdl);
+u32 func0f1666f8(void);
+u32 func0f1667e8(void);
+s32 func0f1667f4(struct prop *prop, f32 *arg1);
+
+#endif