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

src/include/lib/lib_16110.h

@@ -4,7 +4,6 @@
 #include "data.h"
 #include "types.h"
 
-u8 *ailistFindById(s32 ailistid);
 void func00016110(f32 *matrix1, f32 *matrix2);
 u32 func00016140(void);
 void func000161b0(f32 *matrix, f32 src[3], f32 dest[3]);
@@ -43,20 +42,5 @@ u32 func00017ce0(void);
 u32 func00017dc4(void);
 bool func00017e30(s32 portalnum, struct coord *arg1, struct coord *arg2);
 u32 func00018148(void);
-void func000185d0(struct defaultobj *obj, s32 arg1);
-u32 func00018680(void);
-u32 func00019634(void);
-u32 func000198dc(void);
-u32 func00019be0(void);
-u32 func00019d1c(void);
-u32 func00019ddc(void);
-u32 func00019f2c(void);
-u32 func00019f98(void);
-u32 func0001a024(void);
-u32 func0001a0ac(void);
-u32 func0001a110(void);
-u32 func0001a1c0(void);
-u32 func0001a25c(void);
-u32 func0001a2dc(void);
 
 #endif

src/include/lib/lib_184d0.h

@@ -0,0 +1,24 @@
+#ifndef _IN_LIB_LIB_184D0_H
+#define _IN_LIB_LIB_184D0_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+u8 *ailistFindById(s32 ailistid);
+void func000185d0(struct defaultobj *obj, s32 arg1);
+u32 func00018680(void);
+u32 func00019634(void);
+u32 func000198dc(void);
+u32 func00019be0(void);
+u32 func00019d1c(void);
+u32 func00019ddc(void);
+u32 func00019f2c(void);
+u32 func00019f98(void);
+u32 func0001a024(void);
+u32 func0001a0ac(void);
+u32 func0001a110(void);
+u32 func0001a1c0(void);
+u32 func0001a25c(void);
+u32 func0001a2dc(void);
+
+#endif

src/include/lib/lib_233c0.h

@@ -23,113 +23,5 @@ void func00024050(s32 arg0, s32 arg1, struct modeltype *arg2, s32 animnum, u32 a
 u32 func0002485c(void);
 f32 func00024b64(u32 arg0, u32 arg1, struct modeltype *arg2, s32 animnum, u32 arg4, struct coord *coord, u32 arg6);
 u32 func00024c14(void);
-u32 func00024e40(void);
-void func00024e4c(struct coord *arg0, struct coord *arg1, u32 line, char *file);
-f32 func00024e98(void);
-u32 func00024ea4(void);
-struct prop *cdGetObstacle(void);
-void cdGetPos(struct coord *pos, u32 line, char *file);
-u32 func00024ee8(void);
-u32 func00024f10(void);
-void func00024f6c(void);
-u32 func00024fb0(void);
-u32 func00025038(void);
-void func000250cc(struct coord *arg0, struct coord *arg1, f32 width);
-void func00025168(u32 arg0);
-u32 func000251ac(void);
-u32 func00025254(void);
-u32 func00025314(void);
-u32 func00025364(void);
-u32 func000253c4(void);
-u32 func00025410(void);
-u32 func000254d8(void);
-u32 func00025654(void);
-u32 func00025724(void);
-u32 func00025774(void);
-u32 func00025848(void);
-u32 func00025928(void);
-void tileGetFloorCol(struct tile *tile, u16 *floorcol);
-void tileGetFloorType(struct tile *tile, u8 *floortype);
-u32 func00025c74(void);
-u32 func00025f90(void);
-u32 func000260cc(void);
-u32 func00026288(void);
-u32 func000263e4(void);
-u32 func00026520(void);
-u32 func00026654(void);
-u32 func000266a4(void);
-void platformGetRidingProps(struct prop *platform, s16 *propnums, u32 len);
-u32 func00026a04(void);
-u32 func00026e7c(void);
-s32 func0002709c(struct tiletype0 *tile, f32 x, f32 z, f32 width, struct prop *prop, struct collisionthing *thing);
-s32 func000272f8(struct tiletype1 *tile, f32 x, f32 z, f32 width, struct prop *prop, struct collisionthing *thing);
-s32 func000274e0(struct tiletype2 *tile, f32 x, f32 z, f32 width, struct prop *prop, struct collisionthing *thing);
-s32 func000276c8(struct tiletype3 *tile, f32 x, f32 z, f32 width, struct prop *prop, struct collisionthing *thing);
-void func00027738(struct coord *pos, f32 width, struct tile *start, struct tile *end, u16 flags, bool checkvertical, f32 arg6, f32 arg7, struct prop *prop, struct collisionthing *things, s32 maxthings, s32 *thingnum, s32 roomnum);
-void func00027d1c(struct coord *pos, f32 width, s16 *rooms, u32 types, u16 arg4, u32 arg5, f32 arg6, f32 arg7, struct collisionthing *arg8, s32 arg9);
-u32 func00027f78(void);
-s32 func00028200(struct tiletype0 *tile, struct coord *pos, f32 width, f32 y1, f32 y2);
-u32 func0002840c(void);
-u32 func00028638(void);
-u32 func0002885c(void);
-s32 func00028914(struct tile *start, struct tile *end, struct coord *pos, f32 width, u16 flags, bool checkvertical, f32 arg6, f32 arg7, struct prop *prop, struct collisionthing *things, s32 maxthings, s32 *thingnum);
-void func00028df0(struct coord *pos, f32 width, s16 *rooms, u32 types, u16 arg4, u32 arg5, f32 ymax, f32 ymin, struct collisionthing *arg8, s32 arg9);
-void func0002901c(struct coord *pos, struct coord *dist, f32 width, struct collisionthing *arg3);
-f32 func000296a0(struct collisionthing *arg0, struct coord *pos, struct tilething **arg2, f32 width);
-bool func00029ffc(struct coord *pos, f32 width, f32 foreheadheight, f32 inversefeettoeyesheight, s16 *rooms, u32 arg5, struct coord *laddernormal);
-u32 func0002a13c(void);
-f32 cdFindGroundY(struct coord *pos, f32 width, s16 *rooms, u16 *floorcol, u8 *floortype, u16 *floorflags, s16 *floorroom, s32 *inlift, struct prop **lift);
-f32 func0002a324(void);
-f32 cdFindGroundYSimple(struct coord *pos, f32 width, s16 *rooms, u16 *floorcol, u8 *floortype);
-f32 func0002a36c(struct coord *coord, s16 *rooms, u16 *floorcol, s32 arg3);
-s32 func0002a400(struct coord *pos, s16 *rooms);
-u32 func0002a440(void);
-u32 func0002a4d0(void);
-s32 func0002a564(struct coord *pos, s16 *rooms, f32 *arg2, u32 arg3, struct coord *arg4, bool *arg5);
-u32 func0002a5e4(void);
-s32 cdTestVolume(struct coord *pos, f32 width, s16 *rooms, s32 types, s32 arg4, f32 ymax, f32 ymin);
-u32 func0002a6fc(void);
-s32 cdTestAToB1(struct coord *origpos, struct coord *dstpos, f32 width, s16 *dstrooms, s32 types, s32 arg5, f32 ymax, f32 ymin);
-u32 func0002aac0(void);
-u32 func0002ab98(void);
-u32 func0002ac70(void);
-u32 func0002b128(void);
-u32 func0002b560(void);
-u32 func0002b954(void);
-u32 func0002bd04(void);
-u32 func0002c328(void);
-u32 func0002c528(void);
-u32 func0002c714(void);
-s32 func0002d15c(struct coord *pos, struct coord *coord2, s16 *rooms, u32 types, s32 arg4, s32 arg5, s32 arg6, f32 arg7, f32 arg8);
-s32 func0002d3b0(struct coord *arg0, struct coord *arg1, void *arg2, s32 types, s32 arg4, s32 arg5, s32 arg6, f32 ymax, f32 ymin);
-bool func0002d6ac(struct coord *pos, s16 *rooms, struct coord *targetpos, u32 arg3, u32 arg4, f32 arg5, f32 arg6);
-s32 cdTestAToB2(struct coord *pos, s16 *rooms, struct coord *coord2, s16 *rooms2, u32 types, s32 arg5, f32 arg6, f32 arg7);
-bool func0002d7c0(struct coord *pos, s16 *rooms, struct coord *arg2, u32 arg3, u32 arg4, f32 arg5, f32 arg6);
-u32 func0002d840(void);
-u32 func0002d8b8(void);
-s32 cdTestAToB3(struct coord *arg0, s16 *arg1, struct coord *arg2, s16 *arg3, f32 arg4, s32 types, s32 arg6, f32 ymax, f32 ymin);
-u32 func0002da50(void);
-u32 func0002dac8(void);
-bool func0002db98(struct coord *viewpos, s16 *rooms, struct coord *targetpos, s32 arg3, u32 arg4);
-u32 func0002dc18(struct coord *coord, s16 *room, struct coord *coord2, s32 arg3);
-bool hasLineOfSight(struct coord *coord, s16 *room, struct coord *coord2, s16 *room2, s32 arg4, s32 arg5);
-bool func0002dcd0(struct coord *arg0, s16 *rooms1, struct coord *arg2, s16 *rooms2, u32 arg4);
-bool func0002dcfc(struct coord *pos, s16 *rooms, struct coord *pos2, s16 *rooms2, s16 *rooms3, u32 arg5, u32 arg6);
-s32 cdTestAToB4(struct coord *pos, s16 *rooms, struct coord *pos2, u32 types, u32 arg4);
-u32 func0002de10(void);
-u32 func0002de34(void);
-u32 func0002deac(void);
-u32 func0002ded8(void);
-u32 func0002dffc(void);
-u32 func0002e278(void);
-bool func0002e4c4(struct tiletype3 *geo, s16 *rooms, u32 arg2);
-u32 func0002e680(void);
-u32 func0002e82c(void);
-u32 func0002e9d8(void);
-u32 func0002eb84(void);
-u32 func0002ed30(void);
-u32 func0002f02c(void);
-bool func0002f308(struct coord *viewpos, s16 *rooms, struct coord *targetpos, f32 distance, s32 arg4, u16 arg5);
-bool func0002f450(struct coord *viewpos, s16 *rooms, struct coord *targetpos, f32 distance, s32 arg4);
 
 #endif

src/include/lib/lib_24e40.h

@@ -0,0 +1,116 @@
+#ifndef _IN_LIB_LIB_24E40_H
+#define _IN_LIB_LIB_24E40_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+u32 func00024e40(void);
+void func00024e4c(struct coord *arg0, struct coord *arg1, u32 line, char *file);
+f32 func00024e98(void);
+u32 func00024ea4(void);
+struct prop *cdGetObstacle(void);
+void cdGetPos(struct coord *pos, u32 line, char *file);
+u32 func00024ee8(void);
+u32 func00024f10(void);
+void func00024f6c(void);
+u32 func00024fb0(void);
+u32 func00025038(void);
+void func000250cc(struct coord *arg0, struct coord *arg1, f32 width);
+void func00025168(u32 arg0);
+u32 func000251ac(void);
+u32 func00025254(void);
+u32 func00025314(void);
+u32 func00025364(void);
+u32 func000253c4(void);
+u32 func00025410(void);
+u32 func000254d8(void);
+u32 func00025654(void);
+u32 func00025724(void);
+u32 func00025774(void);
+u32 func00025848(void);
+u32 func00025928(void);
+void tileGetFloorCol(struct tile *tile, u16 *floorcol);
+void tileGetFloorType(struct tile *tile, u8 *floortype);
+u32 func00025c74(void);
+u32 func00025f90(void);
+u32 func000260cc(void);
+u32 func00026288(void);
+u32 func000263e4(void);
+u32 func00026520(void);
+u32 func00026654(void);
+u32 func000266a4(void);
+void platformGetRidingProps(struct prop *platform, s16 *propnums, u32 len);
+u32 func00026a04(void);
+u32 func00026e7c(void);
+s32 func0002709c(struct tiletype0 *tile, f32 x, f32 z, f32 width, struct prop *prop, struct collisionthing *thing);
+s32 func000272f8(struct tiletype1 *tile, f32 x, f32 z, f32 width, struct prop *prop, struct collisionthing *thing);
+s32 func000274e0(struct tiletype2 *tile, f32 x, f32 z, f32 width, struct prop *prop, struct collisionthing *thing);
+s32 func000276c8(struct tiletype3 *tile, f32 x, f32 z, f32 width, struct prop *prop, struct collisionthing *thing);
+void func00027738(struct coord *pos, f32 width, struct tile *start, struct tile *end, u16 flags, bool checkvertical, f32 arg6, f32 arg7, struct prop *prop, struct collisionthing *things, s32 maxthings, s32 *thingnum, s32 roomnum);
+void func00027d1c(struct coord *pos, f32 width, s16 *rooms, u32 types, u16 arg4, u32 arg5, f32 arg6, f32 arg7, struct collisionthing *arg8, s32 arg9);
+u32 func00027f78(void);
+s32 func00028200(struct tiletype0 *tile, struct coord *pos, f32 width, f32 y1, f32 y2);
+u32 func0002840c(void);
+u32 func00028638(void);
+u32 func0002885c(void);
+s32 func00028914(struct tile *start, struct tile *end, struct coord *pos, f32 width, u16 flags, bool checkvertical, f32 arg6, f32 arg7, struct prop *prop, struct collisionthing *things, s32 maxthings, s32 *thingnum);
+void func00028df0(struct coord *pos, f32 width, s16 *rooms, u32 types, u16 arg4, u32 arg5, f32 ymax, f32 ymin, struct collisionthing *arg8, s32 arg9);
+void func0002901c(struct coord *pos, struct coord *dist, f32 width, struct collisionthing *arg3);
+f32 func000296a0(struct collisionthing *arg0, struct coord *pos, struct tilething **arg2, f32 width);
+bool func00029ffc(struct coord *pos, f32 width, f32 foreheadheight, f32 inversefeettoeyesheight, s16 *rooms, u32 arg5, struct coord *laddernormal);
+u32 func0002a13c(void);
+f32 cdFindGroundY(struct coord *pos, f32 width, s16 *rooms, u16 *floorcol, u8 *floortype, u16 *floorflags, s16 *floorroom, s32 *inlift, struct prop **lift);
+f32 func0002a324(void);
+f32 cdFindGroundYSimple(struct coord *pos, f32 width, s16 *rooms, u16 *floorcol, u8 *floortype);
+f32 func0002a36c(struct coord *coord, s16 *rooms, u16 *floorcol, s32 arg3);
+s32 func0002a400(struct coord *pos, s16 *rooms);
+u32 func0002a440(void);
+u32 func0002a4d0(void);
+s32 func0002a564(struct coord *pos, s16 *rooms, f32 *arg2, u32 arg3, struct coord *arg4, bool *arg5);
+u32 func0002a5e4(void);
+s32 cdTestVolume(struct coord *pos, f32 width, s16 *rooms, s32 types, s32 arg4, f32 ymax, f32 ymin);
+u32 func0002a6fc(void);
+s32 cdTestAToB1(struct coord *origpos, struct coord *dstpos, f32 width, s16 *dstrooms, s32 types, s32 arg5, f32 ymax, f32 ymin);
+u32 func0002aac0(void);
+u32 func0002ab98(void);
+u32 func0002ac70(void);
+u32 func0002b128(void);
+u32 func0002b560(void);
+u32 func0002b954(void);
+u32 func0002bd04(void);
+u32 func0002c328(void);
+u32 func0002c528(void);
+u32 func0002c714(void);
+s32 func0002d15c(struct coord *pos, struct coord *coord2, s16 *rooms, u32 types, s32 arg4, s32 arg5, s32 arg6, f32 arg7, f32 arg8);
+s32 func0002d3b0(struct coord *arg0, struct coord *arg1, void *arg2, s32 types, s32 arg4, s32 arg5, s32 arg6, f32 ymax, f32 ymin);
+bool func0002d6ac(struct coord *pos, s16 *rooms, struct coord *targetpos, u32 arg3, u32 arg4, f32 arg5, f32 arg6);
+s32 cdTestAToB2(struct coord *pos, s16 *rooms, struct coord *coord2, s16 *rooms2, u32 types, s32 arg5, f32 arg6, f32 arg7);
+bool func0002d7c0(struct coord *pos, s16 *rooms, struct coord *arg2, u32 arg3, u32 arg4, f32 arg5, f32 arg6);
+u32 func0002d840(void);
+u32 func0002d8b8(void);
+s32 cdTestAToB3(struct coord *arg0, s16 *arg1, struct coord *arg2, s16 *arg3, f32 arg4, s32 types, s32 arg6, f32 ymax, f32 ymin);
+u32 func0002da50(void);
+u32 func0002dac8(void);
+bool func0002db98(struct coord *viewpos, s16 *rooms, struct coord *targetpos, s32 arg3, u32 arg4);
+u32 func0002dc18(struct coord *coord, s16 *room, struct coord *coord2, s32 arg3);
+bool hasLineOfSight(struct coord *coord, s16 *room, struct coord *coord2, s16 *room2, s32 arg4, s32 arg5);
+bool func0002dcd0(struct coord *arg0, s16 *rooms1, struct coord *arg2, s16 *rooms2, u32 arg4);
+bool func0002dcfc(struct coord *pos, s16 *rooms, struct coord *pos2, s16 *rooms2, s16 *rooms3, u32 arg5, u32 arg6);
+s32 cdTestAToB4(struct coord *pos, s16 *rooms, struct coord *pos2, u32 types, u32 arg4);
+u32 func0002de10(void);
+u32 func0002de34(void);
+u32 func0002deac(void);
+u32 func0002ded8(void);
+u32 func0002dffc(void);
+u32 func0002e278(void);
+bool func0002e4c4(struct tiletype3 *geo, s16 *rooms, u32 arg2);
+u32 func0002e680(void);
+u32 func0002e82c(void);
+u32 func0002e9d8(void);
+u32 func0002eb84(void);
+u32 func0002ed30(void);
+u32 func0002f02c(void);
+bool func0002f308(struct coord *viewpos, s16 *rooms, struct coord *targetpos, f32 distance, s32 arg4, u16 arg5);
+bool func0002f450(struct coord *viewpos, s16 *rooms, struct coord *targetpos, f32 distance, s32 arg4);
+
+#endif

src/include/lib/lib_2f490.h

@@ -6,7 +6,5 @@
 
 u32 func0002f490(void);
 u32 func0002f560(void);
-u32 func0002f8a0(void);
-void func0002f8f4(Gfx *gdlstart, Gfx *gdlend, u32 arg2, void *arg3);
 
 #endif

src/include/lib/lib_2f8a0.h

@@ -0,0 +1,10 @@
+#ifndef _IN_LIB_LIB_2F8A0_H
+#define _IN_LIB_LIB_2F8A0_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+u32 func0002f8a0(void);
+void func0002f8f4(Gfx *gdlstart, Gfx *gdlend, u32 arg2, void *arg3);
+
+#endif

src/include/lib/lib_34030.h

@@ -6,14 +6,5 @@
 
 u32 func00034030(void);
 u32 func00034104(void);
-u32 func00034240(void);
-u32 func00034df8(void);
-u32 func00034f0c(void);
-u32 func00034fb8(void);
-u32 func00035110(void);
-u32 func00037220(void);
-u32 func00037460(void);
-u32 func00037554(void);
-u32 func0003759c(void);
 
 #endif

src/include/lib/lib_34240.h

@@ -0,0 +1,17 @@
+#ifndef _IN_LIB_LIB_34240_H
+#define _IN_LIB_LIB_34240_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+u32 func00034240(void);
+u32 func00034df8(void);
+u32 func00034f0c(void);
+u32 func00034fb8(void);
+u32 func00035110(void);
+u32 func00037220(void);
+u32 func00037460(void);
+u32 func00037554(void);
+u32 func0003759c(void);
+
+#endif

src/include/lib/lib_3e730.h

@@ -4,53 +4,7 @@
 #include "data.h"
 #include "types.h"
 
-extern const u32 var70054b40[];
-extern const u32 var70054b68[];
-extern const u32 var70054bb8[];
-extern const u32 var70054c08[];
-extern const u32 var70054c08[];
-extern const u32 var70054c90[];
-extern const u32 var70054d18[];
-extern const u32 var70054e40[];
-extern const u32 var70054f68[];
-extern const u32 var70055090[];
-extern const u32 var70055298[];
-extern const u32 var700554a0[];
-extern const u32 var700556a8[];
-extern const u32 var70055eb0[];
-extern const u32 var70055eb0[];
-extern const u32 var700566b8[];
-extern const u32 var700566b8[];
-extern const u32 var700566b8[];
-extern const u32 var700566b8[];
-extern const u32 var700566b8[];
-extern const u32 var700566b8[];
-extern const u32 var700566b8[];
-extern const u32 var700566b8[];
-extern const u32 var70056ec0[];
-extern const u32 var70056ec0[];
-extern const u32 var70056ec0[];
-extern const u32 var70056ec0[];
-extern const u32 var70056ec0[];
-extern const u32 var70056ec0[];
-extern const u32 var70056ec0[];
-extern const u32 var70056ec0[];
-extern const u32 var700576c8[];
-extern const u32 var70057750[];
-
 u32 func0003e730(void);
 u32 func0003e7e0(void);
-u32 func0003e8c0(void);
-u32 func0003f1e4(void);
-u32 func0003f328(void);
-u32 func0003f60c(void);
-u32 func0003f81c(void);
-u32 func0003f8a0(void);
-u32 func00040164(void);
-u32 func00040dac(void);
-u32 func00041600(void);
-u32 func00042238(void);
-u32 func000427d8(void);
-u32 func00042990(void);
 
 #endif

src/include/lib/lib_3e8c0.h

@@ -0,0 +1,54 @@
+#ifndef _IN_LIB_LIB_3E8C0_H
+#define _IN_LIB_LIB_3E8C0_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+extern const u32 var70054b40[];
+extern const u32 var70054b68[];
+extern const u32 var70054bb8[];
+extern const u32 var70054c08[];
+extern const u32 var70054c08[];
+extern const u32 var70054c90[];
+extern const u32 var70054d18[];
+extern const u32 var70054e40[];
+extern const u32 var70054f68[];
+extern const u32 var70055090[];
+extern const u32 var70055298[];
+extern const u32 var700554a0[];
+extern const u32 var700556a8[];
+extern const u32 var70055eb0[];
+extern const u32 var70055eb0[];
+extern const u32 var700566b8[];
+extern const u32 var700566b8[];
+extern const u32 var700566b8[];
+extern const u32 var700566b8[];
+extern const u32 var700566b8[];
+extern const u32 var700566b8[];
+extern const u32 var700566b8[];
+extern const u32 var700566b8[];
+extern const u32 var70056ec0[];
+extern const u32 var70056ec0[];
+extern const u32 var70056ec0[];
+extern const u32 var70056ec0[];
+extern const u32 var70056ec0[];
+extern const u32 var70056ec0[];
+extern const u32 var70056ec0[];
+extern const u32 var70056ec0[];
+extern const u32 var700576c8[];
+extern const u32 var70057750[];
+
+u32 func0003e8c0(void);
+u32 func0003f1e4(void);
+u32 func0003f328(void);
+u32 func0003f60c(void);
+u32 func0003f81c(void);
+u32 func0003f8a0(void);
+u32 func00040164(void);
+u32 func00040dac(void);
+u32 func00041600(void);
+u32 func00042238(void);
+u32 func000427d8(void);
+u32 func00042990(void);
+
+#endif

src/include/lib/lib_50480.h

@@ -6,6 +6,5 @@
 
 u32 func00050480(void);
 s32 func00050554(s32 arg0, s32 arg1, u8 operation, u32 address, u32 len, u8 *buffer);
-s32 func000508d0(s32 arg0, s32 *arg1, s32 *arg2);
 
 #endif

src/include/lib/lib_508d0.h

@@ -0,0 +1,9 @@
+#ifndef _IN_LIB_LIB_508D0_H
+#define _IN_LIB_LIB_508D0_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+s32 func000508d0(s32 arg0, s32 *arg1, s32 *arg2);
+
+#endif

src/include/lib/lib_50a00.h

@@ -5,7 +5,5 @@
 #include "types.h"
 
 s32 func00050a00(s32 arg0, s32 arg1, OSPfsState *note);
-u32 func00050be0(void);
-s32 func00050d60(struct var800a3180 *arg0, char *arg1, u8 *arg2);
 
 #endif

src/include/lib/lib_50be0.h

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

src/include/lib/lib_50d60.h

@@ -0,0 +1,9 @@
+#ifndef _IN_LIB_LIB_50D60_H
+#define _IN_LIB_LIB_50D60_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+s32 func00050d60(struct var800a3180 *arg0, char *arg1, u8 *arg2);
+
+#endif