Rename game_0d4690.c to savebuffer.c, game_102240.c to mainmenu.c, game_107fb0.c to filemgr.c and split game_110680.c into bossfile.c and filelist.c

ld/gamefiles.ntsc-beta.inc

@@ -113,7 +113,7 @@
 	build/ROMID/game/bondgrab.o (section); \
 	build/ROMID/game/bondeyespy.o (section); \
 	build/ROMID/game/bondbike.o (section); \
-	build/ROMID/game/game_0d4690.o (section); \
+	build/ROMID/game/savebuffer.o (section); \
 	build/ROMID/game/healthbar.o (section); \
 	build/ROMID/game/sight.o (section); \
 	build/ROMID/game/hudmsg.o (section); \
@@ -122,13 +122,14 @@
 	build/ROMID/game/game_0f09f0.o (section); \
 	build/ROMID/game/activemenu/activemenu.o (section); \
 	build/ROMID/game/stubs/game_102230.o (section); \
-	build/ROMID/game/game_102240.o (section); \
+	build/ROMID/game/mainmenu.o (section); \
 	build/ROMID/game/cheats.o (section); \
-	build/ROMID/game/game_107fb0.o (section); \
+	build/ROMID/game/filemgr.o (section); \
 	build/ROMID/game/game_10c9c0.o (section); \
 	build/ROMID/game/endscreen.o (section); \
 	build/ROMID/game/gamefile.o (section); \
-	build/ROMID/game/game_110680.o (section); \
+	build/ROMID/game/bossfile.o (section); \
+	build/ROMID/game/filelist.o (section); \
 	build/ROMID/game/inventory/inventory.o (section); \
 	build/ROMID/game/bondhead.o (section); \
 	build/ROMID/game/padhalllv.o (section); \

ld/gamefiles.ntsc-final.inc

@@ -113,7 +113,7 @@
 	build/ROMID/game/bondgrab.o (section); \
 	build/ROMID/game/bondeyespy.o (section); \
 	build/ROMID/game/bondbike.o (section); \
-	build/ROMID/game/game_0d4690.o (section); \
+	build/ROMID/game/savebuffer.o (section); \
 	build/ROMID/game/healthbar.o (section); \
 	build/ROMID/game/sight.o (section); \
 	build/ROMID/game/hudmsg.o (section); \
@@ -122,13 +122,14 @@
 	build/ROMID/game/game_0f09f0.o (section); \
 	build/ROMID/game/activemenu/activemenu.o (section); \
 	build/ROMID/game/stubs/game_102230.o (section); \
-	build/ROMID/game/game_102240.o (section); \
+	build/ROMID/game/mainmenu.o (section); \
 	build/ROMID/game/cheats.o (section); \
-	build/ROMID/game/game_107fb0.o (section); \
+	build/ROMID/game/filemgr.o (section); \
 	build/ROMID/game/game_10c9c0.o (section); \
 	build/ROMID/game/endscreen.o (section); \
 	build/ROMID/game/gamefile.o (section); \
-	build/ROMID/game/game_110680.o (section); \
+	build/ROMID/game/bossfile.o (section); \
+	build/ROMID/game/filelist.o (section); \
 	build/ROMID/game/inventory/inventory.o (section); \
 	build/ROMID/game/bondhead.o (section); \
 	build/ROMID/game/padhalllv.o (section); \

ld/gamefiles.pal-final.inc

@@ -113,7 +113,7 @@
 	build/ROMID/game/bondgrab.o (section); \
 	build/ROMID/game/bondeyespy.o (section); \
 	build/ROMID/game/bondbike.o (section); \
-	build/ROMID/game/game_0d4690.o (section); \
+	build/ROMID/game/savebuffer.o (section); \
 	build/ROMID/game/healthbar.o (section); \
 	build/ROMID/game/sight.o (section); \
 	build/ROMID/game/hudmsg.o (section); \
@@ -122,13 +122,14 @@
 	build/ROMID/game/game_0f09f0.o (section); \
 	build/ROMID/game/activemenu/activemenu.o (section); \
 	build/ROMID/game/stubs/game_102230.o (section); \
-	build/ROMID/game/game_102240.o (section); \
+	build/ROMID/game/mainmenu.o (section); \
 	build/ROMID/game/cheats.o (section); \
-	build/ROMID/game/game_107fb0.o (section); \
+	build/ROMID/game/filemgr.o (section); \
 	build/ROMID/game/game_10c9c0.o (section); \
 	build/ROMID/game/endscreen.o (section); \
 	build/ROMID/game/gamefile.o (section); \
-	build/ROMID/game/game_110680.o (section); \
+	build/ROMID/game/bossfile.o (section); \
+	build/ROMID/game/filelist.o (section); \
 	build/ROMID/game/inventory/inventory.o (section); \
 	build/ROMID/game/bondhead.o (section); \
 	build/ROMID/game/padhalllv.o (section); \

src/game/activemenu/activemenu.c

@@ -5,7 +5,7 @@
 #include "game/bondgun.h"
 #include "game/game_0b0fd0.h"
 #include "game/game_0b3350.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/game_0f09f0.h"
 #include "game/inventory/inventory.h"
 #include "game/game_1531a0.h"

src/game/bondview.c

@@ -3,7 +3,7 @@
 #include "game/dlights.h"
 #include "game/game_006900.h"
 #include "game/atan2f.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/game_11f000.h"
 #include "game/bondview.h"
 #include "game/game_1531a0.h"

src/game/bossfile.c

@@ -0,0 +1,225 @@
+#include <ultra64.h>
+#include "constants.h"
+#include "constants.h"
+#include "game/camdraw.h"
+#include "game/cheats.h"
+#include "game/game_0b69d0.h"
+#include "game/savebuffer.h"
+#include "game/bossfile.h"
+#include "game/bg.h"
+#include "game/game_19aa80.h"
+#include "game/training/training.h"
+#include "game/gamefile.h"
+#include "game/mplayer/mplayer.h"
+#include "game/pak/pak.h"
+#include "game/options.h"
+#include "game/utils.h"
+#include "bss.h"
+#include "lib/lib_0bfb0.h"
+#include "lib/snd.h"
+#include "lib/lib_126b0.h"
+#include "lib/lib_4b170.h"
+#include "data.h"
+#include "types.h"
+
+u8 var800a22d0[0x5b];
+s8 g_AltTitleUnlocked;
+u8 g_AltTitleEnabled;
+
+void bossfileSetDefaults2(void)
+{
+	bossfileSetDefaults();
+}
+
+void bossfileSetAndSaveDefaults(void)
+{
+	bossfileSetDefaults();
+	bossfileSave();
+}
+
+bool bossfileLoadFull(void)
+{
+	bossfileLoad();
+
+#if PAL
+	func0f16f75c(g_Vars.unk000482);
+#endif
+
+	return true;
+}
+
+void func0f1106ec(void)
+{
+	// empty
+}
+
+void func0f1106f4(u8 *dst)
+{
+	bcopy(var800a22d0, dst, sizeof(var800a22d0));
+}
+
+u32 func0f110720(void)
+{
+	struct pakthing16 sp840;
+	u32 sp3c[513];
+	u32 sp38 = 0;
+	s32 i;
+
+	if (func0f1167b0(SAVEDEVICE_GAMEPAK, 0x10, sp3c) == 0) {
+		for (i = 0; sp3c[i] != 0; i++) {
+			func0f119368(SAVEDEVICE_GAMEPAK, sp3c[i], &sp840);
+
+			if (sp840.unk0c_22 == 0) {
+				sp38 = sp3c[i];
+				break;
+			}
+		}
+
+		for (i = 0; sp3c[i] != 0; i++) {
+			func0f119368(SAVEDEVICE_GAMEPAK, sp3c[i], &sp840);
+
+			if (sp840.unk0c_22) {
+				sp38 = sp3c[i];
+				break;
+			}
+		}
+	}
+
+	return sp38;
+}
+
+void bossfileLoad(void)
+{
+	bool failed = false;
+	struct savebuffer buffer;
+	s32 i;
+	s32 tmp;
+	struct fileguid guid;
+
+	tmp = func0f110720();
+
+	if (tmp == 0) {
+		failed = true;
+	} else {
+		savebufferClear(&buffer);
+
+		if (func0f116800(SAVEDEVICE_GAMEPAK, tmp, buffer.bytes, 0)) {
+			failed = true;
+		}
+	}
+
+	if (!failed) {
+		u8 tracknum;
+
+		savebufferReadGuid(&buffer, &guid);
+
+		g_Vars.bossfilenum = guid.filenum;
+		g_Vars.bossdeviceserial = guid.deviceserial;
+
+		g_BossFile.unk89 = savebufferReadBits(&buffer, 1);
+
+		g_Vars.unk000482 = savebufferReadBits(&buffer, 4);
+
+		for (i = 0; i < 8; i++) {
+			savebufferReadString(&buffer, g_BossFile.teamnames[i], 1);
+		}
+
+		tracknum = savebufferReadBits(&buffer, 8);
+
+		if (tracknum == 0xff) {
+			g_BossFile.tracknum = -1;
+		} else {
+			g_BossFile.tracknum = tracknum;
+		}
+
+		for (i = 0; i < 6; i++) {
+			g_BossFile.multipletracknums[i] = savebufferReadBits(&buffer, 8);
+		}
+
+		g_BossFile.usingmultipletunes = savebufferReadBits(&buffer, 1);
+		g_AltTitleUnlocked = savebufferReadBits(&buffer, 1);
+		g_AltTitleEnabled = savebufferReadBits(&buffer, 1);
+
+		func0f0d54c4(&buffer);
+	}
+
+	if (failed) {
+		bossfileSetDefaults();
+		bossfileSave();
+	}
+}
+
+void bossfileSave(void)
+{
+	volatile bool sp12c = false;
+	struct savebuffer buffer;
+	struct fileguid guid;
+	u32 stack;
+	s32 i;
+	s32 tmp;
+
+	savebufferClear(&buffer);
+
+	guid.filenum = g_Vars.bossfilenum;
+	guid.deviceserial = g_Vars.bossdeviceserial;
+
+	savebufferWriteGuid(&buffer, &guid);
+
+	savebufferOr(&buffer, g_BossFile.unk89, 1);
+	savebufferOr(&buffer, g_Vars.unk000482, 4);
+
+	for (i = 0; i < 8; i++) {
+		func0f0d55a4(&buffer, g_BossFile.teamnames[i]);
+	}
+
+	if (g_BossFile.tracknum == -1) {
+		savebufferOr(&buffer, 0xff, 8);
+	} else {
+		savebufferOr(&buffer, g_BossFile.tracknum, 8);
+	}
+
+	for (i = 0; i < 6; i++) {
+		savebufferOr(&buffer, g_BossFile.multipletracknums[i], 8);
+	}
+
+	savebufferOr(&buffer, g_BossFile.usingmultipletunes, 1);
+	savebufferOr(&buffer, (u8)g_AltTitleUnlocked, 1);
+	savebufferOr(&buffer, g_AltTitleEnabled, 1);
+
+	func0f0d54c4(&buffer);
+
+	tmp = func0f110720();
+
+	if (tmp == 0) {
+		faultAssert("fileGuid", "bossfile.c", PAL ? 377 : 375);
+	}
+
+	if (func0f116828(SAVEDEVICE_GAMEPAK, tmp, 0x10, buffer.bytes, NULL, 0)) {
+		sp12c = true;
+	}
+}
+
+void bossfileSetDefaults(void)
+{
+	g_BossFile.teamnames[0][0] = '\0';
+	g_BossFile.teamnames[1][0] = '\0';
+	g_BossFile.teamnames[2][0] = '\0';
+	g_BossFile.teamnames[3][0] = '\0';
+	g_BossFile.teamnames[4][0] = '\0';
+	g_BossFile.teamnames[5][0] = '\0';
+	g_BossFile.teamnames[6][0] = '\0';
+	g_BossFile.teamnames[7][0] = '\0';
+
+	g_BossFile.tracknum = -1;
+	mpEnableAllMultiTracks();
+	g_BossFile.usingmultipletunes = false;
+	g_BossFile.unk89 = 0;
+	g_BossFile.locktype = MPLOCKTYPE_NONE;
+	g_Vars.bossfilenum = 0;
+	g_Vars.bossdeviceserial = 0;
+	g_Vars.unk000482 = (PAL ? 7 : 0);
+	g_AltTitleUnlocked = 0;
+	g_AltTitleEnabled = false;
+
+	bossfileSave();
+}

src/game/credits.c

@@ -4,7 +4,7 @@
 #include "game/title.h"
 #include "game/game_0b3350.h"
 #include "game/game_0b69d0.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/game_0e0770.h"
 #include "game/game_0f09f0.h"
 #include "game/credits.h"

src/game/data/data_020df0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "game/chr/chraicommands.h"
 #include "game/game_0f09f0.h"
-#include "game/game_102240.h"
+#include "game/mainmenu.h"
 #include "game/cheats.h"
-#include "game/game_107fb0.h"
+#include "game/filemgr.h"
 #include "game/endscreen.h"
 #include "game/camdraw.h"
 #include "game/timing.h"

src/game/endscreen.c

@@ -8,11 +8,11 @@
 #include "game/bondgun.h"
 #include "game/game_0b0fd0.h"
 #include "game/game_0b69d0.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/game_0e0770.h"
 #include "game/game_0f09f0.h"
-#include "game/game_102240.h"
-#include "game/game_107fb0.h"
+#include "game/mainmenu.h"
+#include "game/filemgr.h"
 #include "game/endscreen.h"
 #include "game/game_1655c0.h"
 #include "game/lv.h"

src/game/filelist.c

@@ -4,8 +4,8 @@
 #include "game/camdraw.h"
 #include "game/cheats.h"
 #include "game/game_0b69d0.h"
-#include "game/game_0d4690.h"
-#include "game/game_110680.h"
+#include "game/savebuffer.h"
+#include "game/filelist.h"
 #include "game/bg.h"
 #include "game/game_19aa80.h"
 #include "game/training/training.h"
@@ -22,217 +22,13 @@
 #include "data.h"
 #include "types.h"
 
-u8 var800a22d0[0x5b];
-s8 g_AltTitleUnlocked;
-u8 g_AltTitleEnabled;
 s32 var800a2330[5];
-u32 var800a2344;
-u32 var800a2348;
-u32 var800a234c;
 
 struct filelist *g_FileLists[] = { NULL, NULL, NULL, NULL };
 bool var80075bd0[] = { true, true, true, true };
 bool var80075be0[] = { false, false, false, false };
 u32 var80075bf0 = false;
 
-void bossfileSetDefaults2(void)
-{
-	bossfileSetDefaults();
-}
-
-void bossfileSetAndSaveDefaults(void)
-{
-	bossfileSetDefaults();
-	bossfileSave();
-}
-
-bool bossfileLoadFull(void)
-{
-	bossfileLoad();
-
-#if PAL
-	func0f16f75c(g_Vars.unk000482);
-#endif
-
-	return true;
-}
-
-void func0f1106ec(void)
-{
-	// empty
-}
-
-void func0f1106f4(u8 *dst)
-{
-	bcopy(var800a22d0, dst, sizeof(var800a22d0));
-}
-
-u32 func0f110720(void)
-{
-	struct pakthing16 sp840;
-	u32 sp3c[513];
-	u32 sp38 = 0;
-	s32 i;
-
-	if (func0f1167b0(SAVEDEVICE_GAMEPAK, 0x10, sp3c) == 0) {
-		for (i = 0; sp3c[i] != 0; i++) {
-			func0f119368(SAVEDEVICE_GAMEPAK, sp3c[i], &sp840);
-
-			if (sp840.unk0c_22 == 0) {
-				sp38 = sp3c[i];
-				break;
-			}
-		}
-
-		for (i = 0; sp3c[i] != 0; i++) {
-			func0f119368(SAVEDEVICE_GAMEPAK, sp3c[i], &sp840);
-
-			if (sp840.unk0c_22) {
-				sp38 = sp3c[i];
-				break;
-			}
-		}
-	}
-
-	return sp38;
-}
-
-void bossfileLoad(void)
-{
-	bool failed = false;
-	struct savebuffer buffer;
-	s32 i;
-	s32 tmp;
-	struct fileguid guid;
-
-	tmp = func0f110720();
-
-	if (tmp == 0) {
-		failed = true;
-	} else {
-		savebufferClear(&buffer);
-
-		if (func0f116800(SAVEDEVICE_GAMEPAK, tmp, buffer.bytes, 0)) {
-			failed = true;
-		}
-	}
-
-	if (!failed) {
-		u8 tracknum;
-
-		savebufferReadGuid(&buffer, &guid);
-
-		g_Vars.bossfilenum = guid.filenum;
-		g_Vars.bossdeviceserial = guid.deviceserial;
-
-		g_BossFile.unk89 = savebufferReadBits(&buffer, 1);
-
-		g_Vars.unk000482 = savebufferReadBits(&buffer, 4);
-
-		for (i = 0; i < 8; i++) {
-			savebufferReadString(&buffer, g_BossFile.teamnames[i], 1);
-		}
-
-		tracknum = savebufferReadBits(&buffer, 8);
-
-		if (tracknum == 0xff) {
-			g_BossFile.tracknum = -1;
-		} else {
-			g_BossFile.tracknum = tracknum;
-		}
-
-		for (i = 0; i < 6; i++) {
-			g_BossFile.multipletracknums[i] = savebufferReadBits(&buffer, 8);
-		}
-
-		g_BossFile.usingmultipletunes = savebufferReadBits(&buffer, 1);
-		g_AltTitleUnlocked = savebufferReadBits(&buffer, 1);
-		g_AltTitleEnabled = savebufferReadBits(&buffer, 1);
-
-		func0f0d54c4(&buffer);
-	}
-
-	if (failed) {
-		bossfileSetDefaults();
-		bossfileSave();
-	}
-}
-
-void bossfileSave(void)
-{
-	volatile bool sp12c = false;
-	struct savebuffer buffer;
-	struct fileguid guid;
-	u32 stack;
-	s32 i;
-	s32 tmp;
-
-	savebufferClear(&buffer);
-
-	guid.filenum = g_Vars.bossfilenum;
-	guid.deviceserial = g_Vars.bossdeviceserial;
-
-	savebufferWriteGuid(&buffer, &guid);
-
-	savebufferOr(&buffer, g_BossFile.unk89, 1);
-	savebufferOr(&buffer, g_Vars.unk000482, 4);
-
-	for (i = 0; i < 8; i++) {
-		func0f0d55a4(&buffer, g_BossFile.teamnames[i]);
-	}
-
-	if (g_BossFile.tracknum == -1) {
-		savebufferOr(&buffer, 0xff, 8);
-	} else {
-		savebufferOr(&buffer, g_BossFile.tracknum, 8);
-	}
-
-	for (i = 0; i < 6; i++) {
-		savebufferOr(&buffer, g_BossFile.multipletracknums[i], 8);
-	}
-
-	savebufferOr(&buffer, g_BossFile.usingmultipletunes, 1);
-	savebufferOr(&buffer, (u8)g_AltTitleUnlocked, 1);
-	savebufferOr(&buffer, g_AltTitleEnabled, 1);
-
-	func0f0d54c4(&buffer);
-
-	tmp = func0f110720();
-
-	if (tmp == 0) {
-		faultAssert("fileGuid", "bossfile.c", PAL ? 377 : 375);
-	}
-
-	if (func0f116828(SAVEDEVICE_GAMEPAK, tmp, 0x10, buffer.bytes, NULL, 0)) {
-		sp12c = true;
-	}
-}
-
-void bossfileSetDefaults(void)
-{
-	g_BossFile.teamnames[0][0] = '\0';
-	g_BossFile.teamnames[1][0] = '\0';
-	g_BossFile.teamnames[2][0] = '\0';
-	g_BossFile.teamnames[3][0] = '\0';
-	g_BossFile.teamnames[4][0] = '\0';
-	g_BossFile.teamnames[5][0] = '\0';
-	g_BossFile.teamnames[6][0] = '\0';
-	g_BossFile.teamnames[7][0] = '\0';
-
-	g_BossFile.tracknum = -1;
-	mpEnableAllMultiTracks();
-	g_BossFile.usingmultipletunes = false;
-	g_BossFile.unk89 = 0;
-	g_BossFile.locktype = MPLOCKTYPE_NONE;
-	g_Vars.bossfilenum = 0;
-	g_Vars.bossdeviceserial = 0;
-	g_Vars.unk000482 = (PAL ? 7 : 0);
-	g_AltTitleUnlocked = 0;
-	g_AltTitleEnabled = false;
-
-	bossfileSave();
-}
-
 void func0f110bf0(void)
 {
 	// empty
@@ -302,9 +98,6 @@ void func0f110d90(s32 index)
 }
 #endif
 
-const char var7f1b39c8[] = "";
-const char var7f1b39cc[] = "";
-
 void filelistsTick(void)
 {
 	u32 updateall;

src/game/filemgr.c

@@ -1,10 +1,11 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "game/filelist.h"
 #include "game/game_0b3350.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/game_0f09f0.h"
-#include "game/game_107fb0.h"
-#include "game/game_110680.h"
+#include "game/filemgr.h"
+#include "game/bossfile.h"
 #include "game/game_1531a0.h"
 #include "game/gamefile.h"
 #include "game/lang.h"

src/game/game_006bd0.c

@@ -10,7 +10,7 @@
 #include "game/game_095320.h"
 #include "game/atan2f.h"
 #include "game/game_0b3350.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/bg.h"
 #include "game/file.h"
 #include "game/gfxmemory.h"

src/game/game_01bea0.c

@@ -8,7 +8,7 @@
 #include "game/game_0b69d0.h"
 #include "game/game_0e0770.h"
 #include "game/game_0f09f0.h"
-#include "game/game_102240.h"
+#include "game/mainmenu.h"
 #include "game/endscreen.h"
 #include "game/game_127910.h"
 #include "game/lv.h"

src/game/game_0b63b0.c

@@ -23,8 +23,8 @@
 #include "game/healthbar.h"
 #include "game/hudmsg.h"
 #include "game/game_0f09f0.h"
-#include "game/game_102240.h"
-#include "game/game_107fb0.h"
+#include "game/mainmenu.h"
+#include "game/filemgr.h"
 #include "game/inventory/inventory.h"
 #include "game/game_127910.h"
 #include "game/explosions/explosions.h"

src/game/game_0b69d0.c

@@ -25,8 +25,8 @@
 #include "game/healthbar.h"
 #include "game/hudmsg.h"
 #include "game/game_0f09f0.h"
-#include "game/game_102240.h"
-#include "game/game_107fb0.h"
+#include "game/mainmenu.h"
+#include "game/filemgr.h"
 #include "game/inventory/inventory.h"
 #include "game/game_127910.h"
 #include "game/explosions/explosions.h"

src/game/game_0e0770.c

@@ -3,7 +3,7 @@
 #include "game/game_006900.h"
 #include "game/bondgun.h"
 #include "game/game_0b3350.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/game_0e0770.h"
 #include "game/game_1531a0.h"
 #include "game/file.h"

src/game/game_0f09f0.c

@@ -10,11 +10,11 @@
 #include "game/game_0b3350.h"
 #include "game/game_0b4950.h"
 #include "game/game_0b69d0.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/game_0e0770.h"
 #include "game/menu/items.h"
 #include "game/game_0f09f0.h"
-#include "game/game_107fb0.h"
+#include "game/filemgr.h"
 #include "game/credits.h"
 #include "game/game_1531a0.h"
 #include "game/file.h"

src/game/game_10c9c0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/game_0f09f0.h"
-#include "game/game_107fb0.h"
+#include "game/filemgr.h"
 #include "game/game_10c9c0.h"
-#include "game/game_102240.h"
+#include "game/mainmenu.h"
 #include "game/game_19aa80.h"
 #include "game/mplayer/mplayer.h"
 #include "game/mplayer/scenarios.h"

src/game/game_1531a0.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/game_006900.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/game_1531a0.h"
 #include "game/file.h"
 #include "game/lang.h"

src/game/game_1577f0.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/game_006900.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/game_1531a0.h"
 #include "game/file.h"
 #include "game/lang.h"

src/game/game_1a7560.c

@@ -7,7 +7,7 @@
 #include "game/game_0b3350.h"
 #include "game/game_0e0770.h"
 #include "game/game_0f09f0.h"
-#include "game/game_102240.h"
+#include "game/mainmenu.h"
 #include "game/inventory/inventory.h"
 #include "game/game_1531a0.h"
 #include "game/file.h"

src/game/gamefile.c

@@ -4,7 +4,7 @@
 #include "game/camdraw.h"
 #include "game/cheats.h"
 #include "game/game_0b69d0.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/bg.h"
 #include "game/game_19aa80.h"
 #include "game/training/training.h"

src/game/hudmsg.c

@@ -4,7 +4,7 @@
 #include "game/game_092610.h"
 #include "game/game_0b0fd0.h"
 #include "game/game_0b69d0.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/hudmsg.h"
 #include "game/game_0e0770.h"
 #include "game/game_127910.h"

src/game/lv.c

@@ -56,10 +56,10 @@
 #include "game/game_0b28d0.h"
 #include "game/game_0b63b0.h"
 #include "game/game_0b69d0.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/hudmsg.h"
 #include "game/game_0f09f0.h"
-#include "game/game_107fb0.h"
+#include "game/filemgr.h"
 #include "game/game_10c9c0.h"
 #include "game/game_11f000.h"
 #include "game/game_127910.h"

src/game/mainmenu.c

@@ -11,8 +11,8 @@
 #include "game/game_0b3350.h"
 #include "game/game_0b69d0.h"
 #include "game/game_0f09f0.h"
-#include "game/game_102240.h"
-#include "game/game_107fb0.h"
+#include "game/mainmenu.h"
+#include "game/filemgr.h"
 #include "game/inventory/inventory.h"
 #include "game/game_1531a0.h"
 #include "game/lv.h"

src/game/menu/items.c

@@ -7,7 +7,7 @@
 #include "game/game_0e0770.h"
 #include "game/menu/items.h"
 #include "game/game_0f09f0.h"
-#include "game/game_102240.h"
+#include "game/mainmenu.h"
 #include "game/game_1531a0.h"
 #include "game/lv.h"
 #include "game/game_19aa80.h"

src/game/mplayer/ingame.c

@@ -4,10 +4,10 @@
 #include "game/title.h"
 #include "game/game_0b0fd0.h"
 #include "game/game_0b3350.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/game_0f09f0.h"
-#include "game/game_102240.h"
-#include "game/game_107fb0.h"
+#include "game/mainmenu.h"
+#include "game/filemgr.h"
 #include "game/lv.h"
 #include "game/mplayer/ingame.h"
 #include "game/game_19aa80.h"

src/game/mplayer/mplayer.c

@@ -6,7 +6,7 @@
 #include "game/bondgun.h"
 #include "game/game_0b0fd0.h"
 #include "game/game_0b69d0.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/game_0f09f0.h"
 #include "game/game_127910.h"
 #include "game/game_1531a0.h"

src/game/mplayer/scenarios.c

@@ -9,7 +9,7 @@
 #include "game/atan2f.h"
 #include "game/bondgun.h"
 #include "game/game_0b69d0.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/hudmsg.h"
 #include "game/game_0f09f0.h"
 #include "game/inventory/inventory.h"

src/game/mplayer/setup.c

@@ -2,10 +2,10 @@
 #include "constants.h"
 #include "game/camdraw.h"
 #include "game/game_0b3350.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/game_0f09f0.h"
-#include "game/game_102240.h"
-#include "game/game_107fb0.h"
+#include "game/mainmenu.h"
+#include "game/filemgr.h"
 #include "game/game_1531a0.h"
 #include "game/music.h"
 #include "game/mplayer/ingame.h"

src/game/nbomb.c

@@ -11,7 +11,7 @@
 #include "game/atan2f.h"
 #include "game/game_0b3350.h"
 #include "game/game_0b4950.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/bg.h"
 #include "game/file.h"
 #include "game/gfxmemory.h"

src/game/savebuffer.c

@@ -2,7 +2,7 @@
 #include "constants.h"
 #include "game/game_0b3350.h"
 #include "game/game_0b4950.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/gfxmemory.h"
 #include "game/file.h"
 #include "game/utils.h"

src/game/sight.c

@@ -5,7 +5,7 @@
 #include "game/game_0b0fd0.h"
 #include "game/game_0b2150.h"
 #include "game/game_0b3350.h"
-#include "game/game_0d4690.h"
+#include "game/savebuffer.h"
 #include "game/sight.h"
 #include "game/game_1531a0.h"
 #include "game/file.h"

src/game/training/menus.c

@@ -7,7 +7,7 @@
 #include "game/game_0b3350.h"
 #include "game/game_0e0770.h"
 #include "game/game_0f09f0.h"
-#include "game/game_102240.h"
+#include "game/mainmenu.h"
 #include "game/inventory/inventory.h"
 #include "game/game_1531a0.h"
 #include "game/file.h"

src/game/training/training.c

@@ -11,7 +11,7 @@
 #include "game/game_0b69d0.h"
 #include "game/hudmsg.h"
 #include "game/game_0f09f0.h"
-#include "game/game_107fb0.h"
+#include "game/filemgr.h"
 #include "game/inventory/inventory.h"
 #include "game/explosions/explosions.h"
 #include "game/game_1531a0.h"

src/include/game/bossfile.h

@@ -0,0 +1,13 @@
+#ifndef IN_GAME_BOSSFILE_H
+#define IN_GAME_BOSSFILE_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+bool bossfileLoadFull(void);
+u32 func0f110720(void);
+void bossfileLoad(void);
+void bossfileSave(void);
+void bossfileSetDefaults(void);
+
+#endif

src/include/game/filelist.h

@@ -1,14 +1,9 @@
-#ifndef IN_GAME_GAME_110680_H
-#define IN_GAME_GAME_110680_H
+#ifndef IN_GAME_FILELIST_H
+#define IN_GAME_FILELIST_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"
 
-bool bossfileLoadFull(void);
-u32 func0f110720(void);
-void bossfileLoad(void);
-void bossfileSave(void);
-void bossfileSetDefaults(void);
 void func0f110bf0(void);
 void func0f110bf8(void);
 void filelistCreate(s32 listnum, u8 filetype);

src/include/game/filemgr.h

@@ -1,5 +1,5 @@
-#ifndef IN_GAME_GAME_107FB0_H
-#define IN_GAME_GAME_107FB0_H
+#ifndef IN_GAME_FILEMGR_H
+#define IN_GAME_FILEMGR_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"

src/include/game/mainmenu.h

@@ -1,5 +1,5 @@
-#ifndef IN_GAME_GAME_102240_H
-#define IN_GAME_GAME_102240_H
+#ifndef IN_GAME_MAINMENU_H
+#define IN_GAME_MAINMENU_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"

src/include/game/savebuffer.h

@@ -1,5 +1,5 @@
-#ifndef IN_GAME_GAME_0D4690_H
-#define IN_GAME_GAME_0D4690_H
+#ifndef IN_GAME_SAVEBUFFER_H
+#define IN_GAME_SAVEBUFFER_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"