Rename a bunch of game files

ld/gamefiles.inc

@@ -12,7 +12,7 @@
 	src/game/game_0008f0.o (section); \
 	src/game/game_000900.o (section); \
 	src/game/game_000910.o (section); \
-	src/game/game_000920.o (section); \
+	src/game/dlights.o (section); \
 	src/game/game_005fd0.o (section); \
 	src/game/game_006bd0.o (section); \
 	src/game/game_00b190.o (section); \
@@ -76,7 +76,7 @@
 	src/game/chr/chrai.o (section); \
 	src/game/chr/chraicommands.o (section); \
 	src/game/game_0601b0.o (section); \
-	src/game/game_066310.o (section); \
+	src/game/propobj.o (section); \
 	src/game/game_091e10.o (section); \
 	src/game/game_092610.o (section); \
 	src/game/game_095320.o (section); \
@@ -101,9 +101,9 @@
 	src/game/game_0c33f0.o (section); \
 	src/game/game_0c3620.o (section); \
 	src/game/bondwalk.o (section); \
-	src/game/game_0c79f0.o (section); \
+	src/game/bondmove.o (section); \
 	src/game/bondgrab.o (section); \
-	src/game/game_0cf150.o (section); \
+	src/game/bondeyespy.o (section); \
 	src/game/bondbike.o (section); \
 	src/game/game_0d4690.o (section); \
 	src/game/game_0d5a90.o (section); \
@@ -121,9 +121,9 @@
 	src/game/game_10ccd0.o (section); \
 	src/game/game_111600.o (section); \
 	src/game/game_113220.o (section); \
-	src/game/game_114240.o (section); \
+	src/game/padhalllv.o (section); \
 	src/game/pad.o (section); \
-	src/game/game_1165d0.o (section); \
+	src/game/pak/pak.o (section); \
 	src/game/game_11ecf0.o (section); \
 	src/game/game_11f000.o (section); \
 	src/game/game_127910.o (section); \
@@ -137,10 +137,10 @@
 	src/game/game_1371b0.o (section); \
 	src/game/game_13b670.o (section); \
 	src/game/game_13c510.o (section); \
-	src/game/game_13e0e0.o (section); \
+	src/game/wallhit.o (section); \
 	src/game/game_141820.o (section); \
-	src/game/game_148b80.o (section); \
-	src/game/game_149c90.o (section); \
+	src/game/splat.o (section); \
+	src/game/camdraw.o (section); \
 	src/game/game_150820.o (section); \
 	src/game/pdoptions.o (section); \
 	src/game/game_152fa0.o (section); \
@@ -161,11 +161,11 @@
 	src/game/game_175f90.o (section); \
 	src/game/game_176000.o (section); \
 	src/game/game_176080.o (section); \
-	src/game/game_176d70.o (section); \
+	src/game/utils.o (section); \
 	src/game/game_177e00.o (section); \
 	src/game/game_179060.o (section); \
 	src/game/game_17f930.o (section); \
-	src/game/game_187770.o (section); \
+	src/game/mplayer.o (section); \
 	src/game/game_18e5a0.o (section); \
 	src/game/game_190260.o (section); \
 	src/game/game_197600.o (section); \

src/game/bondbike.c

@@ -9,7 +9,7 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_091e10.h"
 #include "game/game_092610.h"
 #include "game/game_095320.h"
@@ -17,7 +17,7 @@
 #include "game/game_097ba0.h"
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
-#include "game/game_0c79f0.h"
+#include "game/bondmove.h"
 #include "game/game_113220.h"
 #include "game/game_167ae0.h"
 #include "game/pdoptions.h"

src/game/bondeyespy.c

@@ -9,11 +9,11 @@
 #include "game/data/data_020df0.h"
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_092610.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b63b0.h"
-#include "game/game_0cf150.h"
+#include "game/bondeyespy.h"
 #include "game/game_0dcdb0.h"
 #include "game/game_111600.h"
 #include "game/game_127910.h"

src/game/bondgrab.c

@@ -10,11 +10,11 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_095320.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b63b0.h"
-#include "game/game_0c79f0.h"
+#include "game/bondmove.h"
 #include "game/game_113220.h"
 #include "game/game_11ecf0.h"
 #include "gvars/gvars.h"

src/game/bondmove.c

@@ -14,7 +14,7 @@
 #include "game/game_005fd0.h"
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_096750.h"
 #include "game/game_096ca0.h"
 #include "game/game_097ba0.h"
@@ -22,14 +22,14 @@
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
 #include "game/game_0c3620.h"
-#include "game/game_0c79f0.h"
+#include "game/bondmove.h"
 #include "game/game_0fd660.h"
 #include "game/game_113220.h"
 #include "game/game_127910.h"
 #include "game/game_157db0.h"
 #include "game/game_167ae0.h"
 #include "game/game_177e00.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/pdoptions.h"
 #include "gvars/gvars.h"
 #include "lib/lib_09660.h"

src/game/bondwalk.c

@@ -12,12 +12,12 @@
 #include "game/game_005fd0.h"
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_092610.h"
 #include "game/game_095320.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b63b0.h"
-#include "game/game_0c79f0.h"
+#include "game/bondmove.h"
 #include "game/game_111600.h"
 #include "game/game_113220.h"
 #include "game/game_11ecf0.h"

src/game/camdraw.c

@@ -9,11 +9,11 @@
 #include "game/game_0b3350.h"
 #include "game/game_0f09f0.h"
 #include "game/game_102230.h"
-#include "game/game_1165d0.h"
-#include "game/game_148b80.h"
-#include "game/game_149c90.h"
+#include "game/pak/pak.h"
+#include "game/splat.h"
+#include "game/camdraw.h"
 #include "game/game_157db0.h"
-#include "game/game_176d70.h"
+#include "game/utils.h"
 #include "game/lang.h"
 #include "gvars/gvars.h"
 #include "lib/lib_04a80.h"

src/game/cheats.c

@@ -9,9 +9,9 @@
 #include "game/data/data_020df0.h"
 #include "game/game_10ccd0.h"
 #include "game/game_111600.h"
-#include "game/game_1165d0.h"
+#include "game/pak/pak.h"
 #include "game/game_127910.h"
-#include "game/game_149c90.h"
+#include "game/camdraw.h"
 #include "game/game_19c990.h"
 #include "game/lang.h"
 #include "gvars/gvars.h"

src/game/chr/chraction.c

@@ -8,13 +8,13 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
+#include "game/dlights.h"
 #include "game/game_005fd0.h"
 #include "game/game_01b0a0.h"
 #include "game/game_01e250.h"
 #include "game/game_02cde0.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_092610.h"
 #include "game/game_095320.h"
 #include "game/game_096750.h"
@@ -26,18 +26,18 @@
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
 #include "game/game_111600.h"
-#include "game/game_114240.h"
-#include "game/game_1165d0.h"
+#include "game/padhalllv.h"
+#include "game/pak/pak.h"
 #include "game/game_11ecf0.h"
 #include "game/game_127910.h"
 #include "game/game_129900.h"
 #include "game/game_12f6c0.h"
-#include "game/game_13e0e0.h"
+#include "game/wallhit.h"
 #include "game/game_157db0.h"
 #include "game/game_1655c0.h"
 #include "game/game_165670.h"
 #include "game/game_167ae0.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_190260.h"
 #include "game/game_197600.h"
 #include "game/game_1999b0.h"

src/game/chr/chraicommands.c

@@ -11,12 +11,12 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
+#include "game/dlights.h"
 #include "game/game_011110.h"
 #include "game/game_016100.h"
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_091e10.h"
 #include "game/game_092610.h"
 #include "game/game_095320.h"
@@ -25,7 +25,7 @@
 #include "game/game_0b0420.h"
 #include "game/game_0b28d0.h"
 #include "game/game_0b63b0.h"
-#include "game/game_0c79f0.h"
+#include "game/bondmove.h"
 #include "game/game_0dcdb0.h"
 #include "game/game_10ccd0.h"
 #include "game/game_111600.h"

src/game/data/cheats.c

@@ -5,7 +5,7 @@
 #include "game/cheats.h"
 #include "game/game_107fb0.h"
 #include "game/game_10ccd0.h"
-#include "game/game_176d70.h"
+#include "game/utils.h"
 #include "game/game_1a3340.h"
 #include "gvars/gvars.h"
 #include "game/data/cheats.h"

src/game/data/data_0160b0.c

@@ -6,7 +6,7 @@
 #include "game/cheats.h"
 #include "game/game_107fb0.h"
 #include "game/game_10ccd0.h"
-#include "game/game_176d70.h"
+#include "game/utils.h"
 #include "game/game_177e00.h"
 #include "game/game_1a3340.h"
 #include "gvars/gvars.h"

src/game/data/data_01a3a0.c

@@ -6,8 +6,8 @@
 #include "game/game_107fb0.h"
 #include "game/game_10c9c0.h"
 #include "game/game_10ccd0.h"
-#include "game/game_1165d0.h"
-#include "game/game_176d70.h"
+#include "game/pak/pak.h"
+#include "game/utils.h"
 #include "game/game_177e00.h"
 #include "game/game_179060.h"
 #include "game/game_17f930.h"

src/game/data/data_020df0.c

@@ -5,10 +5,10 @@
 #include "game/cheats.h"
 #include "game/game_107fb0.h"
 #include "game/game_10ccd0.h"
-#include "game/game_149c90.h"
+#include "game/camdraw.h"
 #include "game/game_16ce10.h"
 #include "game/game_173a00.h"
-#include "game/game_176d70.h"
+#include "game/utils.h"
 #include "game/game_177e00.h"
 #include "game/game_179060.h"
 #include "game/game_17f930.h"

src/game/dlights.c

@@ -7,19 +7,19 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
-#include "game/game_066310.h"
+#include "game/dlights.h"
+#include "game/propobj.h"
 #include "game/game_092610.h"
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
 #include "game/game_12d3f0.h"
 #include "game/game_12f6c0.h"
-#include "game/game_13e0e0.h"
+#include "game/wallhit.h"
 #include "game/game_157db0.h"
 #include "game/game_166e40.h"
 #include "game/game_167ae0.h"
 #include "game/game_176080.h"
-#include "game/game_176d70.h"
+#include "game/utils.h"
 #include "game/game_17f930.h"
 #include "gvars/gvars.h"
 #include "lib/lib_0e9d0.h"

src/game/game_006bd0.c

@@ -7,7 +7,7 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
+#include "game/dlights.h"
 #include "game/game_005fd0.h"
 #include "game/game_006bd0.h"
 #include "game/game_01e250.h"

src/game/game_00b210.c

@@ -6,7 +6,7 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_19aa80.h"
 #include "gvars/gvars.h"
 #include "types.h"

src/game/game_00c490.c

@@ -20,7 +20,7 @@
 #include "game/game_01e250.h"
 #include "game/game_02cde0.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_091e10.h"
 #include "game/game_096750.h"
 #include "game/game_111600.h"
@@ -30,7 +30,7 @@
 #include "game/game_166e40.h"
 #include "game/game_167ae0.h"
 #include "game/game_17f930.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_19aa80.h"
 #include "game/lang.h"
 #include "game/pad.h"

src/game/game_011110.c

@@ -15,11 +15,11 @@
 #include "game/game_091e10.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b63b0.h"
-#include "game/game_0c79f0.h"
+#include "game/bondmove.h"
 #include "game/game_111600.h"
 #include "game/game_1655c0.h"
 #include "game/game_17f930.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/pad.h"
 #include "gvars/gvars.h"
 #include "lib/lib_121e0.h"

src/game/game_0147d0.c

@@ -10,7 +10,7 @@
 #include "game/game_01e250.h"
 #include "game/game_02cde0.h"
 #include "game/game_0601b0.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_197600.h"
 #include "gvars/gvars.h"
 #include "lib/lib_121e0.h"

src/game/game_014f10.c

@@ -9,7 +9,7 @@
 #include "game/game_014f10.h"
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "gvars/gvars.h"
 #include "types.h"
 

src/game/game_015010.c

@@ -7,7 +7,7 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/game_015010.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_091e10.h"
 #include "gvars/gvars.h"
 #include "types.h"

src/game/game_016100.c

@@ -8,7 +8,7 @@
 #include "game/data/data_020df0.h"
 #include "game/game_016100.h"
 #include "game/game_01afc0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b28d0.h"
 #include "game/game_0b3350.h"

src/game/game_01bea0.c

@@ -21,7 +21,7 @@
 #include "game/game_16cfa0.h"
 #include "game/game_177e00.h"
 #include "game/game_179060.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_19aa80.h"
 #include "game/game_19c990.h"
 #include "gvars/gvars.h"

src/game/game_01e250.c

@@ -10,7 +10,7 @@
 #include "game/data/data_020df0.h"
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_092610.h"
 #include "game/game_095320.h"
 #include "game/game_096360.h"
@@ -21,7 +21,7 @@
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
 #include "game/game_0c33f0.h"
-#include "game/game_0c79f0.h"
+#include "game/bondmove.h"
 #include "game/game_11ecf0.h"
 #include "game/game_127910.h"
 #include "game/game_128f30.h"
@@ -29,13 +29,13 @@
 #include "game/game_129900.h"
 #include "game/game_12d3f0.h"
 #include "game/game_12f6c0.h"
-#include "game/game_13e0e0.h"
-#include "game/game_148b80.h"
+#include "game/wallhit.h"
+#include "game/splat.h"
 #include "game/game_157db0.h"
 #include "game/game_165670.h"
 #include "game/game_166e40.h"
 #include "game/game_179060.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_190260.h"
 #include "game/game_1999b0.h"
 #include "game/pad.h"

src/game/game_02cde0.c

@@ -11,11 +11,11 @@
 #include "game/game_01e250.h"
 #include "game/game_02cde0.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_096750.h"
 #include "game/game_0b28d0.h"
 #include "game/game_167ae0.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_1a3340.h"
 #include "game/pad.h"
 #include "gvars/gvars.h"

src/game/game_0601b0.c

@@ -8,10 +8,10 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
+#include "game/dlights.h"
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_092610.h"
 #include "game/game_095320.h"
 #include "game/game_097890.h"
@@ -20,13 +20,13 @@
 #include "game/game_0b0420.h"
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
-#include "game/game_0c79f0.h"
+#include "game/bondmove.h"
 #include "game/game_127910.h"
 #include "game/game_129900.h"
 #include "game/game_12d3f0.h"
 #include "game/game_12f6c0.h"
-#include "game/game_13e0e0.h"
-#include "game/game_148b80.h"
+#include "game/wallhit.h"
+#include "game/splat.h"
 #include "game/game_157db0.h"
 #include "game/game_190260.h"
 #include "game/game_19c990.h"

src/game/game_091e10.c

@@ -7,7 +7,7 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_091e10.h"
 #include "game/game_0b28d0.h"
 #include "game/game_157db0.h"

src/game/game_092610.c

@@ -7,13 +7,13 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
+#include "game/dlights.h"
 #include "game/game_092610.h"
 #include "game/game_096750.h"
 #include "game/game_0dcdb0.h"
 #include "game/game_166e40.h"
 #include "game/game_167ae0.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/pad.h"
 #include "gvars/gvars.h"
 #include "lib/lib_0e9d0.h"

src/game/game_095320.c

@@ -8,7 +8,7 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_091e10.h"
 #include "game/game_095320.h"
 #include "game/game_0b3350.h"

src/game/game_096360.c

@@ -6,7 +6,7 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_095320.h"
 #include "game/game_096360.h"
 #include "game/game_0b3350.h"

src/game/game_097ba0.c

@@ -11,7 +11,7 @@
 #include "game/game_005fd0.h"
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_092610.h"
 #include "game/game_096360.h"
 #include "game/game_0969d0.h"
@@ -25,10 +25,10 @@
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
 #include "game/game_0c33f0.h"
-#include "game/game_0c79f0.h"
+#include "game/bondmove.h"
 #include "game/game_0d7070.h"
 #include "game/game_111600.h"
-#include "game/game_1165d0.h"
+#include "game/pak/pak.h"
 #include "game/game_127910.h"
 #include "game/game_12d3f0.h"
 #include "game/game_1531a0.h"
@@ -36,7 +36,7 @@
 #include "game/game_167ae0.h"
 #include "game/game_16e810.h"
 #include "game/game_176080.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_19c990.h"
 #include "game/game_1a3340.h"
 #include "game/lang.h"

src/game/game_0b0420.c

@@ -14,7 +14,7 @@
 #include "game/game_0dcdb0.h"
 #include "game/game_127910.h"
 #include "game/game_179060.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_197600.h"
 #include "game/lang.h"
 #include "game/pdoptions.h"

src/game/game_0b63b0.c

@@ -13,7 +13,7 @@
 #include "game/game_01e250.h"
 #include "game/game_02cde0.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_092610.h"
 #include "game/game_095320.h"
 #include "game/game_096750.h"
@@ -24,19 +24,19 @@
 #include "game/game_0b2150.h"
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
-#include "game/game_0c79f0.h"
-#include "game/game_0cf150.h"
+#include "game/bondmove.h"
+#include "game/bondeyespy.h"
 #include "game/game_0d5a90.h"
 #include "game/game_0dcdb0.h"
 #include "game/game_0f09f0.h"
 #include "game/game_102240.h"
 #include "game/game_107fb0.h"
 #include "game/game_111600.h"
-#include "game/game_1165d0.h"
+#include "game/pak/pak.h"
 #include "game/game_127910.h"
 #include "game/game_129900.h"
 #include "game/game_141820.h"
-#include "game/game_148b80.h"
+#include "game/splat.h"
 #include "game/game_1531a0.h"
 #include "game/game_157db0.h"
 #include "game/game_1655c0.h"
@@ -48,7 +48,7 @@
 #include "game/game_16e810.h"
 #include "game/game_177e00.h"
 #include "game/game_17f930.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_18e5a0.h"
 #include "game/game_19c990.h"
 #include "game/game_1a3340.h"

src/game/game_0d4690.c

@@ -9,7 +9,7 @@
 #include "game/game_0b3350.h"
 #include "game/game_0d4690.h"
 #include "game/game_166e40.h"
-#include "game/game_176d70.h"
+#include "game/utils.h"
 #include "gvars/gvars.h"
 #include "lib/lib_09660.h"
 #include "lib/lib_0d520.h"

src/game/game_0d7070.c

@@ -7,7 +7,7 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0420.h"
 #include "game/game_0b2150.h"

src/game/game_0dcdb0.c

@@ -6,7 +6,7 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_092610.h"
 #include "game/game_0b0420.h"
 #include "game/game_0b63b0.h"
@@ -16,7 +16,7 @@
 #include "game/game_127910.h"
 #include "game/game_1531a0.h"
 #include "game/game_167ae0.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/pdoptions.h"
 #include "gvars/gvars.h"
 #include "lib/lib_09660.h"

src/game/game_0e0770.c

@@ -13,7 +13,7 @@
 #include "game/game_0e0770.h"
 #include "game/game_1531a0.h"
 #include "game/game_166e40.h"
-#include "game/game_176d70.h"
+#include "game/utils.h"
 #include "gvars/gvars.h"
 #include "lib/lib_09660.h"
 #include "lib/lib_0d520.h"

src/game/game_0e5ce0.c

@@ -12,10 +12,10 @@
 #include "game/game_0e0770.h"
 #include "game/game_0e5ce0.h"
 #include "game/game_0f09f0.h"
-#include "game/game_149c90.h"
+#include "game/camdraw.h"
 #include "game/game_1531a0.h"
 #include "game/game_167ae0.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_19aa80.h"
 #include "game/game_19c990.h"
 #include "game/lang.h"

src/game/game_0f09f0.c

@@ -9,7 +9,7 @@
 #include "game/game_005fd0.h"
 #include "game/game_006bd0.h"
 #include "game/game_02cde0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_095320.h"
 #include "game/game_096ca0.h"
 #include "game/game_097ba0.h"
@@ -22,16 +22,16 @@
 #include "game/game_0fd660.h"
 #include "game/game_107fb0.h"
 #include "game/game_10ccd0.h"
-#include "game/game_1165d0.h"
+#include "game/pak/pak.h"
 #include "game/game_1371b0.h"
-#include "game/game_149c90.h"
+#include "game/camdraw.h"
 #include "game/game_1531a0.h"
 #include "game/game_166e40.h"
 #include "game/game_167ae0.h"
 #include "game/game_16cfa0.h"
 #include "game/game_16e810.h"
 #include "game/game_179060.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_19aa80.h"
 #include "game/game_1a3340.h"
 #include "game/lang.h"

src/game/game_0fd660.c

@@ -17,7 +17,7 @@
 #include "game/game_111600.h"
 #include "game/game_1531a0.h"
 #include "game/game_166e40.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_190260.h"
 #include "game/game_197600.h"
 #include "game/game_19c990.h"

src/game/game_102240.c

@@ -22,7 +22,7 @@
 #include "game/game_111600.h"
 #include "game/game_1531a0.h"
 #include "game/game_167ae0.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_19aa80.h"
 #include "game/game_19c990.h"
 #include "game/lang.h"

src/game/game_107fb0.c

@@ -11,10 +11,10 @@
 #include "game/game_0f09f0.h"
 #include "game/game_107fb0.h"
 #include "game/game_10ccd0.h"
-#include "game/game_1165d0.h"
+#include "game/pak/pak.h"
 #include "game/game_1531a0.h"
-#include "game/game_176d70.h"
-#include "game/game_187770.h"
+#include "game/utils.h"
+#include "game/mplayer.h"
 #include "game/lang.h"
 #include "gvars/gvars.h"
 #include "lib/lib_09660.h"

src/game/game_10c9c0.c

@@ -8,7 +8,7 @@
 #include "game/data/data_020df0.h"
 #include "game/game_0f09f0.h"
 #include "game/game_10c9c0.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_19aa80.h"
 #include "gvars/gvars.h"
 #include "types.h"

src/game/game_10ccd0.c

@@ -20,13 +20,13 @@
 #include "game/game_102240.h"
 #include "game/game_107fb0.h"
 #include "game/game_10ccd0.h"
-#include "game/game_1165d0.h"
-#include "game/game_149c90.h"
+#include "game/pak/pak.h"
+#include "game/camdraw.h"
 #include "game/game_157db0.h"
 #include "game/game_1655c0.h"
 #include "game/game_167ae0.h"
-#include "game/game_176d70.h"
-#include "game/game_187770.h"
+#include "game/utils.h"
+#include "game/mplayer.h"
 #include "game/game_19aa80.h"
 #include "game/game_19c990.h"
 #include "game/lang.h"

src/game/game_113220.c

@@ -7,7 +7,7 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/game_096b20.h"
-#include "game/game_0c79f0.h"
+#include "game/bondmove.h"
 #include "game/game_113220.h"
 #include "gvars/gvars.h"
 #include "lib/lib_12dc0.h"

src/game/game_127910.c

@@ -7,7 +7,7 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b63b0.h"
 #include "game/game_127910.h"

src/game/game_129210.c

@@ -8,7 +8,7 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/game_01e250.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_129210.h"
 #include "gvars/gvars.h"
 #include "lib/lib_126b0.h"

src/game/game_129900.c

@@ -7,21 +7,21 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
+#include "game/dlights.h"
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_091e10.h"
 #include "game/game_092610.h"
 #include "game/game_0b3350.h"
 #include "game/game_129900.h"
 #include "game/game_12d3f0.h"
-#include "game/game_13e0e0.h"
+#include "game/wallhit.h"
 #include "game/game_157db0.h"
 #include "game/game_1668e0.h"
 #include "game/game_166e40.h"
-#include "game/game_176d70.h"
-#include "game/game_187770.h"
+#include "game/utils.h"
+#include "game/mplayer.h"
 #include "gvars/gvars.h"
 #include "lib/lib_09660.h"
 #include "lib/lib_0d520.h"

src/game/game_12d3f0.c

@@ -6,9 +6,9 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
+#include "game/dlights.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_0b3350.h"
 #include "game/game_12d3f0.h"
 #include "game/game_157db0.h"

src/game/game_12f6c0.c

@@ -6,7 +6,7 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
+#include "game/dlights.h"
 #include "game/game_01e250.h"
 #include "game/game_0b3350.h"
 #include "game/game_12f6c0.h"

src/game/game_131060.c

@@ -6,7 +6,7 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
+#include "game/dlights.h"
 #include "game/game_0b3350.h"
 #include "game/game_12f6c0.h"
 #include "game/game_131060.h"

src/game/game_13c510.c

@@ -6,7 +6,7 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
+#include "game/dlights.h"
 #include "game/game_0b2150.h"
 #include "game/game_0b3350.h"
 #include "game/game_11f000.h"

src/game/game_141820.c

@@ -6,7 +6,7 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
+#include "game/dlights.h"
 #include "game/game_005fd0.h"
 #include "game/game_096750.h"
 #include "game/game_0d4690.h"

src/game/game_150820.c

@@ -6,7 +6,7 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
+#include "game/dlights.h"
 #include "game/game_092610.h"
 #include "game/game_096750.h"
 #include "game/game_0b3350.h"

src/game/game_157db0.c

@@ -6,7 +6,7 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
+#include "game/dlights.h"
 #include "game/game_013550.h"
 #include "game/game_013ee0.h"
 #include "game/game_01e250.h"
@@ -20,7 +20,7 @@
 #include "game/game_135c70.h"
 #include "game/game_13b670.h"
 #include "game/game_13c510.h"
-#include "game/game_13e0e0.h"
+#include "game/wallhit.h"
 #include "game/game_1531a0.h"
 #include "game/game_157db0.h"
 #include "game/game_165360.h"

src/game/game_167ae0.c

@@ -9,7 +9,7 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
+#include "game/dlights.h"
 #include "game/game_005fd0.h"
 #include "game/game_006bd0.h"
 #include "game/game_00b480.h"
@@ -53,21 +53,21 @@
 #include "game/game_01de30.h"
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_095320.h"
 #include "game/game_097ba0.h"
 #include "game/game_0abe70.h"
 #include "game/game_0b0420.h"
 #include "game/game_0b28d0.h"
 #include "game/game_0b63b0.h"
-#include "game/game_0c79f0.h"
+#include "game/bondmove.h"
 #include "game/game_0d4690.h"
 #include "game/game_0dcdb0.h"
 #include "game/game_0f09f0.h"
 #include "game/game_0fd660.h"
 #include "game/game_107fb0.h"
 #include "game/game_10c9c0.h"
-#include "game/game_1165d0.h"
+#include "game/pak/pak.h"
 #include "game/game_11ecf0.h"
 #include "game/game_11f000.h"
 #include "game/game_127910.h"
@@ -78,10 +78,10 @@
 #include "game/game_135c70.h"
 #include "game/game_1371b0.h"
 #include "game/game_13c510.h"
-#include "game/game_13e0e0.h"
+#include "game/wallhit.h"
 #include "game/game_141820.h"
-#include "game/game_148b80.h"
-#include "game/game_149c90.h"
+#include "game/splat.h"
+#include "game/camdraw.h"
 #include "game/game_150820.h"
 #include "game/game_1531a0.h"
 #include "game/game_157db0.h"
@@ -90,10 +90,10 @@
 #include "game/game_16cfa0.h"
 #include "game/game_16e810.h"
 #include "game/game_176080.h"
-#include "game/game_176d70.h"
+#include "game/utils.h"
 #include "game/game_179060.h"
 #include "game/game_17f930.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_19aa80.h"
 #include "game/game_19c990.h"
 #include "game/lang.h"

src/game/game_176080.c

@@ -8,7 +8,7 @@
 #include "game/data/data_020df0.h"
 #include "game/game_0b63b0.h"
 #include "game/game_176080.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/pdoptions.h"
 #include "gvars/gvars.h"
 #include "lib/lib_09660.h"

src/game/game_177e00.c

@@ -15,7 +15,7 @@
 #include "game/game_107fb0.h"
 #include "game/game_167ae0.h"
 #include "game/game_177e00.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_19aa80.h"
 #include "game/lang.h"
 #include "game/pdoptions.h"

src/game/game_179060.c

@@ -10,12 +10,12 @@
 #include "game/game_0d4690.h"
 #include "game/game_0f09f0.h"
 #include "game/game_107fb0.h"
-#include "game/game_149c90.h"
+#include "game/camdraw.h"
 #include "game/game_1531a0.h"
 #include "game/game_16cfa0.h"
 #include "game/game_179060.h"
 #include "game/game_17f930.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_19aa80.h"
 #include "game/lang.h"
 #include "game/pdoptions.h"

src/game/game_17f930.c

@@ -7,11 +7,11 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
+#include "game/dlights.h"
 #include "game/game_005fd0.h"
 #include "game/game_00c490.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_092610.h"
 #include "game/game_096750.h"
 #include "game/game_097ba0.h"
@@ -24,7 +24,7 @@
 #include "game/game_1531a0.h"
 #include "game/game_179060.h"
 #include "game/game_17f930.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_18e5a0.h"
 #include "game/game_197600.h"
 #include "game/game_19aa80.h"

src/game/game_190260.c

@@ -9,20 +9,20 @@
 #include "game/data/data_020df0.h"
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_092610.h"
 #include "game/game_096750.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0420.h"
 #include "game/game_0b63b0.h"
-#include "game/game_114240.h"
+#include "game/padhalllv.h"
 #include "game/game_11ecf0.h"
 #include "game/game_127910.h"
-#include "game/game_148b80.h"
+#include "game/splat.h"
 #include "game/game_157db0.h"
 #include "game/game_179060.h"
 #include "game/game_17f930.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_18e5a0.h"
 #include "game/game_190260.h"
 #include "game/game_197600.h"

src/game/game_197600.c

@@ -8,14 +8,14 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/game_01e250.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_097970.h"
 #include "game/game_0b0420.h"
 #include "game/game_0fd660.h"
 #include "game/game_11ecf0.h"
 #include "game/game_127910.h"
 #include "game/game_179060.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_190260.h"
 #include "game/game_197600.h"
 #include "game/game_1999b0.h"

src/game/game_1999b0.c

@@ -8,11 +8,11 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/game_01e250.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_092610.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0420.h"
-#include "game/game_114240.h"
+#include "game/padhalllv.h"
 #include "game/game_11ecf0.h"
 #include "game/game_127910.h"
 #include "game/game_1999b0.h"

src/game/game_19aa80.c

@@ -12,7 +12,7 @@
 #include "game/game_096750.h"
 #include "game/game_127910.h"
 #include "game/game_179060.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_190260.h"
 #include "game/game_19aa80.h"
 #include "game/game_19c990.h"

src/game/game_19c990.c

@@ -7,9 +7,9 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
+#include "game/dlights.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_092610.h"
 #include "game/game_095320.h"
 #include "game/game_096750.h"
@@ -21,9 +21,9 @@
 #include "game/game_107fb0.h"
 #include "game/game_10ccd0.h"
 #include "game/game_111600.h"
-#include "game/game_114240.h"
+#include "game/padhalllv.h"
 #include "game/game_129900.h"
-#include "game/game_13e0e0.h"
+#include "game/wallhit.h"
 #include "game/game_150820.h"
 #include "game/game_1531a0.h"
 #include "game/game_157db0.h"

src/game/game_1a3340.c

@@ -19,7 +19,7 @@
 #include "game/game_166e40.h"
 #include "game/game_16e810.h"
 #include "game/game_173a00.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_19c990.h"
 #include "game/game_1a3340.h"
 #include "game/lang.h"

src/game/mplayer.c

@@ -13,15 +13,15 @@
 #include "game/game_0b63b0.h"
 #include "game/game_0d4690.h"
 #include "game/game_0f09f0.h"
-#include "game/game_1165d0.h"
+#include "game/pak/pak.h"
 #include "game/game_127910.h"
-#include "game/game_149c90.h"
+#include "game/camdraw.h"
 #include "game/game_1531a0.h"
 #include "game/game_167ae0.h"
 #include "game/game_16cfa0.h"
 #include "game/game_179060.h"
 #include "game/game_17f930.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_19aa80.h"
 #include "game/lang.h"
 #include "gvars/gvars.h"

src/game/padhalllv.c

@@ -7,7 +7,7 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/game_0601b0.h"
-#include "game/game_114240.h"
+#include "game/padhalllv.h"
 #include "game/game_157db0.h"
 #include "game/pad.h"
 #include "gvars/gvars.h"

src/game/pak/pak.c

@@ -8,10 +8,10 @@
 #include "game/data/data_020df0.h"
 #include "game/game_0f09f0.h"
 #include "game/game_10ccd0.h"
-#include "game/game_1165d0.h"
+#include "game/pak/pak.h"
 #include "game/game_128f30.h"
-#include "game/game_149c90.h"
-#include "game/game_176d70.h"
+#include "game/camdraw.h"
+#include "game/utils.h"
 #include "gvars/gvars.h"
 #include "lib/lib_06100.h"
 #include "lib/lib_06330.h"

src/game/propobj.c

@@ -10,12 +10,12 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
+#include "game/dlights.h"
 #include "game/game_006bd0.h"
 #include "game/game_011110.h"
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_091e10.h"
 #include "game/game_092610.h"
 #include "game/game_095320.h"
@@ -32,7 +32,7 @@
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
 #include "game/game_0c33f0.h"
-#include "game/game_0c79f0.h"
+#include "game/bondmove.h"
 #include "game/game_0dcdb0.h"
 #include "game/game_0f09f0.h"
 #include "game/game_111600.h"
@@ -43,7 +43,7 @@
 #include "game/game_129900.h"
 #include "game/game_12d3f0.h"
 #include "game/game_12f6c0.h"
-#include "game/game_13e0e0.h"
+#include "game/wallhit.h"
 #include "game/game_150820.h"
 #include "game/game_1531a0.h"
 #include "game/game_157db0.h"
@@ -53,7 +53,7 @@
 #include "game/game_167ae0.h"
 #include "game/game_179060.h"
 #include "game/game_17f930.h"
-#include "game/game_187770.h"
+#include "game/mplayer.h"
 #include "game/game_190260.h"
 #include "game/game_1999b0.h"
 #include "game/game_19c990.h"

src/game/splat.c

@@ -6,12 +6,12 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_066310.h"
+#include "game/propobj.h"
 #include "game/game_12d3f0.h"
-#include "game/game_13e0e0.h"
-#include "game/game_148b80.h"
+#include "game/wallhit.h"
+#include "game/splat.h"
 #include "game/game_157db0.h"
-#include "game/game_176d70.h"
+#include "game/utils.h"
 #include "gvars/gvars.h"
 #include "lib/lib_12dc0.h"
 #include "lib/lib_159b0.h"

src/game/utils.c

@@ -6,7 +6,7 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_176d70.h"
+#include "game/utils.h"
 #include "gvars/gvars.h"
 #include "lib/lib_121e0.h"
 #include "lib/lib_4a360.h"

src/game/wallhit.c

@@ -6,15 +6,15 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
+#include "game/dlights.h"
 #include "game/game_01e250.h"
 #include "game/game_0b0420.h"
 #include "game/game_0b3350.h"
 #include "game/game_127910.h"
-#include "game/game_13e0e0.h"
+#include "game/wallhit.h"
 #include "game/game_1668e0.h"
 #include "game/game_166e40.h"
-#include "game/game_176d70.h"
+#include "game/utils.h"
 #include "game/pdoptions.h"
 #include "gvars/gvars.h"
 #include "lib/lib_0d520.h"

src/include/game/bondeyespy.h

@@ -1,5 +1,5 @@
-#ifndef IN_GAME_GAME_0CF150_H
-#define IN_GAME_GAME_0CF150_H
+#ifndef IN_GAME_BONDEYESPY_H
+#define IN_GAME_BONDEYESPY_H
 #include <ultra64.h>
 #include "types.h"
 

src/include/game/bondmove.h

@@ -1,5 +1,5 @@
-#ifndef IN_GAME_GAME_0C79F0_H
-#define IN_GAME_GAME_0C79F0_H
+#ifndef IN_GAME_BONDMOVE_H
+#define IN_GAME_BONDMOVE_H
 #include <ultra64.h>
 #include "types.h"
 

src/include/game/camdraw.h

@@ -1,5 +1,5 @@
-#ifndef _IN_GAME_GAME_149C90_H
-#define _IN_GAME_GAME_149C90_H
+#ifndef _IN_GAME_CAMDRAW_H
+#define _IN_GAME_CAMDRAW_H
 #include <ultra64.h>
 #include "types.h"
 

src/include/game/dlights.h

@@ -1,5 +1,5 @@
-#ifndef IN_GAME_GAME_000920_H
-#define IN_GAME_GAME_000920_H
+#ifndef IN_GAME_DLIGHTS_H
+#define IN_GAME_DLIGHTS_H
 #include <ultra64.h>
 #include "types.h"
 

src/include/game/mplayer.h

@@ -1,5 +1,5 @@
-#ifndef IN_GAME_GAME_187770_H
-#define IN_GAME_GAME_187770_H
+#ifndef IN_GAME_MPLAYER_H
+#define IN_GAME_MPLAYER_H
 #include <ultra64.h>
 #include "types.h"
 

src/include/game/padhalllv.h

@@ -1,5 +1,5 @@
-#ifndef IN_GAME_GAME_114240_H
-#define IN_GAME_GAME_114240_H
+#ifndef IN_GAME_PADHALLLV_H
+#define IN_GAME_PADHALLLV_H
 #include <ultra64.h>
 #include "types.h"
 

src/include/game/pak/pak.h

@@ -1,5 +1,5 @@
-#ifndef IN_GAME_GAME_1165D0_H
-#define IN_GAME_GAME_1165D0_H
+#ifndef IN_GAME_PAK_PAK_H
+#define IN_GAME_PAK_PAK_H
 #include <ultra64.h>
 #include "types.h"
 

src/include/game/propobj.h

@@ -1,5 +1,5 @@
-#ifndef IN_GAME_GAME_066310_H
-#define IN_GAME_GAME_066310_H
+#ifndef IN_GAME_PROPOBJ_H
+#define IN_GAME_PROPOBJ_H
 #include <ultra64.h>
 #include "types.h"
 

src/include/game/splat.h

@@ -1,5 +1,5 @@
-#ifndef _IN_GAME_GAME_148B80_H
-#define _IN_GAME_GAME_148B80_H
+#ifndef _IN_GAME_SPLAT_H
+#define _IN_GAME_SPLAT_H
 #include <ultra64.h>
 #include "types.h"
 

src/include/game/utils.h

@@ -1,5 +1,5 @@
-#ifndef IN_GAME_GAME_176D70_H
-#define IN_GAME_GAME_176D70_H
+#ifndef IN_GAME_UTILS_H
+#define IN_GAME_UTILS_H
 #include <ultra64.h>
 #include "types.h"
 

src/include/game/wallhit.h

@@ -1,5 +1,5 @@
-#ifndef _IN_GAME_GAME_13E0E0_H
-#define _IN_GAME_GAME_13E0E0_H
+#ifndef _IN_GAME_WALLHIT_H
+#define _IN_GAME_WALLHIT_H
 #include <ultra64.h>
 #include "types.h"
 

src/lib/lib_0d520.c

@@ -29,11 +29,11 @@
 #include "game/game_01b0a0.h"
 #include "game/game_095320.h"
 #include "game/game_10ccd0.h"
-#include "game/game_1165d0.h"
+#include "game/pak/pak.h"
 #include "game/game_11ecf0.h"
 #include "game/game_127910.h"
-#include "game/game_148b80.h"
-#include "game/game_149c90.h"
+#include "game/splat.h"
+#include "game/camdraw.h"
 #include "game/game_1531a0.h"
 #include "game/game_166e40.h"
 #include "game/game_167ae0.h"
@@ -42,8 +42,8 @@
 #include "game/game_175f50.h"
 #include "game/game_175f90.h"
 #include "game/game_176080.h"
-#include "game/game_176d70.h"
-#include "game/game_187770.h"
+#include "game/utils.h"
+#include "game/mplayer.h"
 #include "game/game_1a78b0.h"
 #include "gvars/gvars.h"
 #include "lib/lib_03050.h"

src/lib/lib_13900.c

@@ -6,7 +6,7 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_1165d0.h"
+#include "game/pak/pak.h"
 #include "gvars/gvars.h"
 #include "lib/lib_04a80.h"
 #include "lib/lib_0d520.h"

src/lib/lib_16110.c

@@ -8,7 +8,7 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/game_096750.h"
-#include "game/game_114240.h"
+#include "game/padhalllv.h"
 #include "gvars/gvars.h"
 #include "lib/lib_04790.h"
 #include "lib/lib_159b0.h"