Split game_179060 into game_17f930

ld/gamefiles.inc

@@ -164,6 +164,7 @@
 	src/game/game_176d70.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/game_190260.o (section); \
 	src/game/game_197600.o (section); \

src/game/data/data_01a3a0.c

@@ -10,6 +10,7 @@
 #include "game/game_176d70.h"
 #include "game/game_177e00.h"
 #include "game/game_179060.h"
+#include "game/game_17f930.h"
 #include "game/game_1a3340.h"
 #include "gvars/gvars.h"
 #include "game/data/data_0160b0.h"

src/game/data/data_020df0.c

@@ -11,6 +11,7 @@
 #include "game/game_176d70.h"
 #include "game/game_177e00.h"
 #include "game/game_179060.h"
+#include "game/game_17f930.h"
 #include "game/game_1a3340.h"
 #include "game/data/data_0160b0.h"
 #include "game/data/data_020df0.h"

src/game/game_000920.c

@@ -20,7 +20,7 @@
 #include "game/game_167ae0.h"
 #include "game/game_176080.h"
 #include "game/game_176d70.h"
-#include "game/game_179060.h"
+#include "game/game_17f930.h"
 #include "gvars/gvars.h"
 #include "lib/lib_0e9d0.h"
 #include "lib/lib_121e0.h"

src/game/game_00c490.c

@@ -29,7 +29,7 @@
 #include "game/game_1655c0.h"
 #include "game/game_166e40.h"
 #include "game/game_167ae0.h"
-#include "game/game_179060.h"
+#include "game/game_17f930.h"
 #include "game/game_187770.h"
 #include "game/game_19aa80.h"
 #include "game/lang.h"

src/game/game_011110.c

@@ -18,7 +18,7 @@
 #include "game/game_0c79f0.h"
 #include "game/game_111600.h"
 #include "game/game_1655c0.h"
-#include "game/game_179060.h"
+#include "game/game_17f930.h"
 #include "game/game_187770.h"
 #include "game/pad.h"
 #include "gvars/gvars.h"

src/game/game_066310.c

@@ -52,6 +52,7 @@
 #include "game/game_166e40.h"
 #include "game/game_167ae0.h"
 #include "game/game_179060.h"
+#include "game/game_17f930.h"
 #include "game/game_187770.h"
 #include "game/game_190260.h"
 #include "game/game_1999b0.h"

src/game/game_0b63b0.c

@@ -47,7 +47,7 @@
 #include "game/game_16cfa0.h"
 #include "game/game_16e810.h"
 #include "game/game_177e00.h"
-#include "game/game_179060.h"
+#include "game/game_17f930.h"
 #include "game/game_187770.h"
 #include "game/game_19c990.h"
 #include "game/game_1a3340.h"

src/game/game_167ae0.c

@@ -92,6 +92,7 @@
 #include "game/game_176080.h"
 #include "game/game_176d70.h"
 #include "game/game_179060.h"
+#include "game/game_17f930.h"
 #include "game/game_187770.h"
 #include "game/game_19aa80.h"
 #include "game/game_19c990.h"

src/game/game_187770.c

@@ -26,6 +26,7 @@
 #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/game_19aa80.h"
 #include "game/lang.h"

src/game/game_190260.c

@@ -21,6 +21,7 @@
 #include "game/game_148b80.h"
 #include "game/game_157db0.h"
 #include "game/game_179060.h"
+#include "game/game_17f930.h"
 #include "game/game_187770.h"
 #include "game/game_190260.h"
 #include "game/game_197600.h"

src/include/game/game_179060.h

@@ -172,59 +172,5 @@ bool menudialogMpQuickGo(u32 operation, struct menu_dialog *dialog, struct menus
 s32 menuhandlerMpFinishedSetup(u32 operation, struct menu_item *item, s32 *value);
 s32 menuhandlerQuickTeamSeparator(u32 operation, struct menu_item *item, s32 *value);
 s32 menuhandlerMpQuickTeamOption(u32 operation, struct menu_item *item, s32 *value);
-bool menudialogCombatSimulator(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem);
-s32 menuhandlerMpAdvancedSetup(u32 operation, struct menu_item *item, s32 *value);
-s32 menuhandlerMpDisplayTeam(u32 operation, struct menu_item *item, s32 *value);
-s32 menuhandlerMpOneHitKills(u32 operation, struct menu_item *item, s32 *value);
-void scenarioHtbInit(void);
-s32 scenarioHtbCallback08(void);
-void scenarioHtbReset(void);
-void scenarioHtbCallback10(void);
-void scenarioHtbCallback14(struct chrdata *chr);
-void scenarioHtbKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
-Gfx *scenarioHtbRadar(Gfx *gdl);
-bool scenarioHtbRadar2(Gfx **gdl, struct prop *prop);
-bool scenarioHtbHighlight(struct prop *prop, u32 *colour);
-void scenarioCtcInit(void);
-s32 scenarioCtcCallback08(void);
-void scenarioCtcCallback10(void);
-void scenarioCtcCallback14();
-void scenarioCtcKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
-Gfx *scenarioCtcRadar(Gfx *gdl);
-bool scenarioCtcRadar2(Gfx **gdl, struct prop *prop);
-bool scenarioCtcCallback2c(f32 arg0, struct coord *pos, s16 *arg2, struct prop *prop, f32 *arg4);
-s32 scenarioCtcGetMaxTeams(void);
-bool scenarioCtcIsRoomHighlighted(s16 room);
-s32 menuhandlerMpHillTime(u32 operation, struct menu_item *item, struct numandtext *value);
-void scenarioKohCallback40(s32 *arg0);
-void scenarioKohCallback44(s32 *arg0);
-void scenarioKohInit(void);
-void scenarioKohReset(void);
-void scenarioKohKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
-Gfx *scenarioKohRadar(Gfx *gdl);
-bool scenarioKohIsRoomHighlighted(s16 arg0);
-void scenarioHtmInit(void);
-s32 scenarioHtmCallback08(void);
-void scenarioHtmCallback10(void);
-void scenarioHtmKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
-bool scenarioHtmRadar2(Gfx **gdl, struct prop *prop);
-bool scenarioHtmHighlight(struct prop *prop, u32 *colour);
-void scenarioPacInit(void);
-void scenarioPacReset(void);
-void scenarioPacKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
-Gfx *scenarioPacRadar(Gfx *gdl);
-s32 menuhandlerMpOpenOptions(u32 operation, struct menu_item *item, s32 *value);
-void scenarioCallback40(s32 *arg0);
-void scenarioCallback44(s32 *arg0);
-void scenarioInit(void);
-s32 scenarioCallback08(void);
-void scenarioReset(void);
-void scenarioCallback10(void);
-void scenarioCallback14(struct chrdata *chr);
-Gfx *scenarioRadar(Gfx *gdl);
-bool scenarioRadar2(Gfx **gdl, struct prop *prop);
-f32 scenarioCallback2c(f32 arg0, struct coord *pos, s16 *arg2, struct prop *prop);
-s32 scenarioGetMaxTeams(void);
-void scenarioCallback38(s16 arg0, s32 *arg1, s32 *arg2, s32 *arg3);
 
 #endif

src/include/game/game_17f930.h

@@ -0,0 +1,61 @@
+#ifndef _IN_GAME_GAME_17F9300_H
+#define _IN_GAME_GAME_17F9300_H
+#include <ultra64.h>
+#include "types.h"
+
+bool menudialogCombatSimulator(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem);
+s32 menuhandlerMpAdvancedSetup(u32 operation, struct menu_item *item, s32 *value);
+s32 menuhandlerMpDisplayTeam(u32 operation, struct menu_item *item, s32 *value);
+s32 menuhandlerMpOneHitKills(u32 operation, struct menu_item *item, s32 *value);
+void scenarioHtbInit(void);
+s32 scenarioHtbCallback08(void);
+void scenarioHtbReset(void);
+void scenarioHtbCallback10(void);
+void scenarioHtbCallback14(struct chrdata *chr);
+void scenarioHtbKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
+Gfx *scenarioHtbRadar(Gfx *gdl);
+bool scenarioHtbRadar2(Gfx **gdl, struct prop *prop);
+bool scenarioHtbHighlight(struct prop *prop, u32 *colour);
+void scenarioCtcInit(void);
+s32 scenarioCtcCallback08(void);
+void scenarioCtcCallback10(void);
+void scenarioCtcCallback14();
+void scenarioCtcKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
+Gfx *scenarioCtcRadar(Gfx *gdl);
+bool scenarioCtcRadar2(Gfx **gdl, struct prop *prop);
+bool scenarioCtcCallback2c(f32 arg0, struct coord *pos, s16 *arg2, struct prop *prop, f32 *arg4);
+s32 scenarioCtcGetMaxTeams(void);
+bool scenarioCtcIsRoomHighlighted(s16 room);
+s32 menuhandlerMpHillTime(u32 operation, struct menu_item *item, struct numandtext *value);
+void scenarioKohCallback40(s32 *arg0);
+void scenarioKohCallback44(s32 *arg0);
+void scenarioKohInit(void);
+void scenarioKohReset(void);
+void scenarioKohKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
+Gfx *scenarioKohRadar(Gfx *gdl);
+bool scenarioKohIsRoomHighlighted(s16 arg0);
+void scenarioHtmInit(void);
+s32 scenarioHtmCallback08(void);
+void scenarioHtmCallback10(void);
+void scenarioHtmKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
+bool scenarioHtmRadar2(Gfx **gdl, struct prop *prop);
+bool scenarioHtmHighlight(struct prop *prop, u32 *colour);
+void scenarioPacInit(void);
+void scenarioPacReset(void);
+void scenarioPacKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3);
+Gfx *scenarioPacRadar(Gfx *gdl);
+s32 menuhandlerMpOpenOptions(u32 operation, struct menu_item *item, s32 *value);
+void scenarioCallback40(s32 *arg0);
+void scenarioCallback44(s32 *arg0);
+void scenarioInit(void);
+s32 scenarioCallback08(void);
+void scenarioReset(void);
+void scenarioCallback10(void);
+void scenarioCallback14(struct chrdata *chr);
+Gfx *scenarioRadar(Gfx *gdl);
+bool scenarioRadar2(Gfx **gdl, struct prop *prop);
+f32 scenarioCallback2c(f32 arg0, struct coord *pos, s16 *arg2, struct prop *prop);
+s32 scenarioGetMaxTeams(void);
+void scenarioCallback38(s16 arg0, s32 *arg1, s32 *arg2, s32 *arg3);
+
+#endif