Split game_066310.c into game_092610.c

ld/gamefiles.inc

@@ -74,6 +74,7 @@
 	src/game/chr/chraicommands.o (section); \
 	src/game/game_0601b0.o (section); \
 	src/game/game_066310.o (section); \
+	src/game/game_092610.o (section); \
 	src/game/game_096360.o (section); \
 	src/game/game_096700.o (section); \
 	src/game/game_096750.o (section); \

src/game/chr/chraction.c

@@ -13,6 +13,7 @@
 #include "game/game_02cde0.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_096750.h"
 #include "game/game_0969d0.h"
 #include "game/game_097ba0.h"

src/game/chr/chraicommands.c

@@ -15,6 +15,7 @@
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_096750.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0420.h"

src/game/game_000920.c

@@ -7,6 +7,7 @@
 #include "game/data/data_020df0.h"
 #include "game/game_000920.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
 #include "game/game_12d3f0.h"

src/game/game_005fd0.c

@@ -9,7 +9,7 @@
 #include "game/game_005fd0.h"
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_096750.h"
 #include "game/game_0b3350.h"
 #include "game/game_0d4690.h"

src/game/game_01e250.c

@@ -9,6 +9,7 @@
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_096360.h"
 #include "game/game_097ba0.h"
 #include "game/game_0abe70.h"

src/game/game_0601b0.c

@@ -9,6 +9,7 @@
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_097890.h"
 #include "game/game_097970.h"
 #include "game/game_097ba0.h"

src/game/game_096360.c

@@ -5,6 +5,7 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_020df0.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_096360.h"
 #include "game/game_0b3350.h"
 #include "game/game_19c990.h"

src/game/game_097ba0.c

@@ -10,6 +10,7 @@
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_096360.h"
 #include "game/game_0969d0.h"
 #include "game/game_096b20.h"

src/game/game_0b63b0.c

@@ -12,6 +12,7 @@
 #include "game/game_02cde0.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_096750.h"
 #include "game/game_096ca0.h"
 #include "game/game_097ba0.h"

src/game/game_0c37d0.c

@@ -10,6 +10,7 @@
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b63b0.h"
 #include "game/game_0c37d0.h"

src/game/game_0c79f0.c

@@ -10,6 +10,7 @@
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_096750.h"
 #include "game/game_096ca0.h"
 #include "game/game_097ba0.h"

src/game/game_0cf150.c

@@ -8,6 +8,7 @@
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b63b0.h"
 #include "game/game_0cf150.h"

src/game/game_0d1fe0.c

@@ -7,6 +7,7 @@
 #include "game/data/data_020df0.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_096ca0.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b3350.h"

src/game/game_0dcdb0.c

@@ -6,6 +6,7 @@
 #include "game/data/data_020df0.h"
 #include "game/game_005fd0.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0420.h"
 #include "game/game_0b3350.h"

src/game/game_0f09f0.c

@@ -8,6 +8,7 @@
 #include "game/game_005fd0.h"
 #include "game/game_02cde0.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_096ca0.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0420.h"

src/game/game_102240.c

@@ -8,7 +8,7 @@
 #include "game/game_016100.h"
 #include "game/game_01b0a0.h"
 #include "game/game_01bea0.h"
-#include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0420.h"
 #include "game/game_0b3350.h"

src/game/game_10ccd0.c

@@ -8,7 +8,7 @@
 #include "game/game_005fd0.h"
 #include "game/game_016100.h"
 #include "game/game_01b0a0.h"
-#include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0420.h"
 #include "game/game_0b63b0.h"

src/game/game_129900.c

@@ -9,6 +9,7 @@
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_0b3350.h"
 #include "game/game_129900.h"
 #include "game/game_12d3f0.h"

src/game/game_150820.c

@@ -5,7 +5,7 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_020df0.h"
 #include "game/game_000920.h"
-#include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_096750.h"
 #include "game/game_0b3350.h"
 #include "game/game_150820.h"

src/game/game_167ae0.c

@@ -50,6 +50,7 @@
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_097ba0.h"
 #include "game/game_0abe70.h"
 #include "game/game_0b0420.h"

src/game/game_179060.c

@@ -10,6 +10,7 @@
 #include "game/game_00c490.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_096750.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b3350.h"

src/game/game_190260.c

@@ -8,6 +8,7 @@
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_096750.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0420.h"

src/game/game_1999b0.c

@@ -7,6 +7,7 @@
 #include "game/data/data_020df0.h"
 #include "game/game_01e250.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0420.h"
 #include "game/game_114240.h"

src/game/game_19c990.c

@@ -8,6 +8,7 @@
 #include "game/game_000920.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_096750.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0420.h"

src/include/game/game_066310.h

@@ -350,48 +350,5 @@ u32 func0f09233c(void);
 u32 func0f0923d4(void);
 u32 func0f092420(void);
 u32 func0f092484(void);
-u32 func0f092610(void);
-void func0f0926bc(struct prop *prop, u32 arg1, u16 arg2);
-s32 func0f0927d4(f32 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4);
-s32 func0f092914(s32 arg0);
-u32 func0f09294c(void);
-u32 func0f092a98(void);
-u32 func0f092b50(void);
-u32 func0f092b7c(void);
-u32 func0f092c04(void);
-u32 func0f093508(void);
-u32 func0f093630(void);
-u32 func0f093790(void);
-u32 func0f0938ec(void);
-void func0f0939f8(s32 arg0, struct prop *prop, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, f32 arg9, s32 arg10, s32 arg11, f32 arg12, f32 arg13, f32 arg14);
-void audioMuteChannel(s32 channel);
-u32 audioIfChannelIdle(s32 channel);
-bool audioPlayFromProp2(s8 channel_id, s32 audio_id, s32 volumemaybe, struct prop *prop, u32 arg4, s32 arg5, s32 arg6, s32 arg7);
-u32 func0f0946b0(void);
-u32 func0f094940(void);
-u32 func0f094b1c(void);
-u32 func0f094d78(void);
-u32 func0f094ef4(void);
-u32 func0f09505c(void);
-u32 func0f095200(void);
-u32 func0f095278(void);
-u32 func0f095320(void);
-u32 func0f095330(void);
-u32 func0f095340(void);
-u32 func0f0953cc(void);
-u32 func0f095560(void);
-s32 objectiveGetCount(void);
-u32 objectiveGetDifficultyBits(s32 index);
-u32 objectiveGetStatus(u32 arg0);
-u32 objectiveIsAllComplete(void);
-u32 func0f095bf4(void);
-u32 func0f095c04(void);
-u32 func0f095d64(void);
-void objectiveCheckRoomEntered(s32 currentroom);
-void objectiveCheckMultiroomEntered(s32 arg0, s16 *requiredrooms);
-void objectiveCheckHolograph(s32 arg0);
-struct prop *chopperGetTargetProp(struct chopperobj *heli);
-struct defaultobj *objFindByTagId(s32 tag_id);
-struct tag *tagFindById(s32 tag_id);
 
 #endif

src/include/game/game_092610.h

@@ -0,0 +1,50 @@
+#ifndef IN_GAME_GAME_092610_H
+#define IN_GAME_GAME_092610_H
+#include <ultra64.h>
+#include "types.h"
+
+u32 func0f092610(void);
+void func0f0926bc(struct prop *prop, u32 arg1, u16 arg2);
+s32 func0f0927d4(f32 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4);
+s32 func0f092914(s32 arg0);
+u32 func0f09294c(void);
+u32 func0f092a98(void);
+u32 func0f092b50(void);
+u32 func0f092b7c(void);
+u32 func0f092c04(void);
+u32 func0f093508(void);
+u32 func0f093630(void);
+u32 func0f093790(void);
+u32 func0f0938ec(void);
+void func0f0939f8(s32 arg0, struct prop *prop, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, f32 arg9, s32 arg10, s32 arg11, f32 arg12, f32 arg13, f32 arg14);
+void audioMuteChannel(s32 channel);
+u32 audioIfChannelIdle(s32 channel);
+bool audioPlayFromProp2(s8 channel_id, s32 audio_id, s32 volumemaybe, struct prop *prop, u32 arg4, s32 arg5, s32 arg6, s32 arg7);
+u32 func0f0946b0(void);
+u32 func0f094940(void);
+u32 func0f094b1c(void);
+u32 func0f094d78(void);
+u32 func0f094ef4(void);
+u32 func0f09505c(void);
+u32 func0f095200(void);
+u32 func0f095278(void);
+u32 func0f095320(void);
+u32 func0f095330(void);
+u32 func0f095340(void);
+u32 func0f0953cc(void);
+u32 func0f095560(void);
+s32 objectiveGetCount(void);
+u32 objectiveGetDifficultyBits(s32 index);
+u32 objectiveGetStatus(u32 arg0);
+u32 objectiveIsAllComplete(void);
+u32 func0f095bf4(void);
+u32 func0f095c04(void);
+u32 func0f095d64(void);
+void objectiveCheckRoomEntered(s32 currentroom);
+void objectiveCheckMultiroomEntered(s32 arg0, s16 *requiredrooms);
+void objectiveCheckHolograph(s32 arg0);
+struct prop *chopperGetTargetProp(struct chopperobj *heli);
+struct defaultobj *objFindByTagId(s32 tag_id);
+struct tag *tagFindById(s32 tag_id);
+
+#endif

src/library/library_0d520.c

@@ -25,7 +25,7 @@
 #include "game/game_00b320.h"
 #include "game/game_016100.h"
 #include "game/game_01b0a0.h"
-#include "game/game_066310.h"
+#include "game/game_092610.h"
 #include "game/game_10ccd0.h"
 #include "game/game_1165d0.h"
 #include "game/game_11ecf0.h"