Distribute remaining .bss into lib

Makefile

@@ -126,7 +126,7 @@ CFLAGS = -DVERSION=$(VERSION) \
 	$(OPT_LVL) \
 	$(MIPSISET)
 
-C_FILES := $(shell find src/gvars src/lib src/game src/inflate -name '*.c')
+C_FILES := $(shell find src/lib src/game src/inflate -name '*.c')
 S_FILES := $(shell find src/lib src/game -name '*.s')
 
 # Create names such as $(B_DIR)/assets/files/PfooZ
@@ -236,7 +236,6 @@ CHECK_FILES := \
 	$(B_DIR)/segments/firingrange.bin \
 	$(B_DIR)/segments/game.bin \
 	$(B_DIR)/segments/data.bin \
-	$(B_DIR)/segments/gvars.bin \
 	$(B_DIR)/segments/lib.bin \
 	$(B_DIR)/segments/inflate.bin \
 	$(B_DIR)/segments/mpconfigs.bin \
@@ -513,4 +512,4 @@ assetsclean:
 
 codeclean:
 	rm -f $(B_DIR)/segments/*.bin
-	find $(B_DIR)/{game,gvars,inflate,lib} -name '*.o' -delete
+	find $(B_DIR)/{game,inflate,lib} -name '*.o' -delete

ld/pd.ld

@@ -19,16 +19,6 @@
 	_##name##SegmentEnd = ADDR(.name) + SIZEOF(.name); \
 	_##name##SegmentRomEnd = __rompos;
 
-#define BEGIN_NOLOAD(name) \
-	_##name##SegmentStart = ADDR(.name); \
-	_##name##SegmentRomStart = __rompos; \
-	.name (NOLOAD) : AT(__rompos)
-
-#define END_NOLOAD(name) \
-	__rompos += SIZEOF(.name); \
-	_##name##SegmentEnd = ADDR(.name) + SIZEOF(.name); \
-	_##name##SegmentRomEnd = __rompos;
-
 #define MPSTRINGS(lang) \
 	BEGIN_SEG(mpstrings##lang) \
 	{ \
@@ -293,23 +283,14 @@ SECTIONS
 	 * ROM range: N/A
 	 * RAM range: 0x8008ae20 - 0x800ad1c0
 	 * -------------------------------------------------------------------------
-	 * BSS is currently implemented using data instead of BSS, because having
-	 * all BSS in one file causes the linker to choose the addresses
-	 * non-linearly. Eventually this file will be spread out into the code files
-	 * and it can become BSS at that point.
-	 *
-	 * For now, place it past the end of the ROM, where it'll be truncated.
-	 * We can do this because we only memory addresses for this segment, not
-	 * ROM addresses.
 	 */
 
-	BEGIN_NOLOAD(gvars)
+	BEGIN_SEG(bss)
 	{
 		LIBFILES(.bss)
-		build/ROMID/gvars/gvars.o (.data);
 		GAMEFILES(.bss)
 	}
-	END_NOLOAD(gvars)
+	END_SEG(bss)
 
 	/***************************************************************************
 	 * inflate

src/assets/firingrange.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "firingrange/frcommands.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "types.h"
 
 #if NTSC

src/game/activemenu/activemenu.c

@@ -17,7 +17,7 @@
 #include "game/lang.h"
 #include "game/mplayer/mplayer.h"
 #include "game/options.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "lib/main.h"
 #include "lib/lib_16110.h"

src/game/activemenu/tick.c

@@ -7,7 +7,7 @@
 #include "game/inventory/inventory.h"
 #include "game/game_127910.h"
 #include "game/options.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/controller.h"
 #include "data.h"
 #include "types.h"

src/game/bondbike.c

@@ -16,7 +16,7 @@
 #include "game/objectives.h"
 #include "game/options.h"
 #include "game/propobj.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"
 #include "lib/lib_233c0.h"

src/game/bondcutscene.c

@@ -1,6 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_317f0.h"
 #include "data.h"
 #include "types.h"

src/game/bondeyespy.c

@@ -14,7 +14,7 @@
 #include "game/lang.h"
 #include "game/options.h"
 #include "game/propobj.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/main.h"
 #include "lib/lib_0e9d0.h"
 #include "lib/lib_16110.h"

src/game/bondgrab.c

@@ -11,7 +11,7 @@
 #include "game/game_0b69d0.h"
 #include "game/bondhead.h"
 #include "game/propobj.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"
 #include "lib/lib_233c0.h"

src/game/bondhead.c

@@ -3,7 +3,7 @@
 #include "game/bondmove.h"
 #include "game/game_096b20.h"
 #include "game/bondhead.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/rng.h"
 #include "lib/lib_159b0.h"
 #include "lib/lib_233c0.h"

src/game/bondmove.c

@@ -24,7 +24,7 @@
 #include "game/mplayer/mplayer.h"
 #include "game/options.h"
 #include "game/propobj.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "lib/lib_0e9d0.h"
 #include "lib/rng.h"

src/game/bondview.c

@@ -10,7 +10,7 @@
 #include "game/gfxmemory.h"
 #include "game/lang.h"
 #include "game/options.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "lib/main.h"
 #include "lib/rng.h"

src/game/bondwalk.c

@@ -16,7 +16,7 @@
 #include "game/bondhead.h"
 #include "game/game_127910.h"
 #include "game/propobj.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_0e9d0.h"
 #include "lib/rng.h"
 #include "lib/lib_16110.h"

src/game/camdraw.c

@@ -9,7 +9,7 @@
 #include "game/pak/pak.h"
 #include "game/splat.h"
 #include "game/utils.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/main.h"
 #include "lib/memory.h"
 #include "lib/lib_126b0.h"

src/game/casing/reset.c

@@ -1,6 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/casing/tick.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/casing.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_0e9d0.h"
 #include "lib/rng.h"
 #include "lib/lib_16110.h"

src/game/ceil.c

@@ -1,6 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/cheats.c

@@ -9,7 +9,7 @@
 #include "game/gamefile.h"
 #include "game/lang.h"
 #include "game/pak/pak.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/chr/chr.c

@@ -34,7 +34,7 @@
 #include "game/propobj.h"
 #include "game/splat.h"
 #include "game/wallhit.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "lib/main.h"
 #include "lib/model.h"

src/game/chr/chraction.c

@@ -37,7 +37,7 @@
 #include "game/propobj.h"
 #include "game/wallhit.h"
 #include "game/mpstats.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/main.h"
 #include "lib/model.h"
 #include "lib/lib_0e9d0.h"

src/game/chr/chrai.c

@@ -3,7 +3,7 @@
 #include "game/chr/chraction.h"
 #include "game/chr/chrai.h"
 #include "game/chr/chraicommands.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/rng.h"
 #include "lib/lib_16110.h"
 #include "data.h"

src/game/chr/chraicommands.c

@@ -38,7 +38,7 @@
 #include "game/options.h"
 #include "game/propobj.h"
 #include "game/mpstats.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/main.h"
 #include "lib/model.h"
 #include "lib/lib_0e9d0.h"

src/game/core.c

@@ -90,7 +90,7 @@
 #include "game/splat.h"
 #include "game/utils.h"
 #include "game/wallhit.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/args.h"
 #include "lib/controller.h"
 #include "lib/lib_06440.h"

src/game/credits.c

@@ -14,7 +14,7 @@
 #include "game/core.h"
 #include "game/music.h"
 #include "game/lang.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "lib/main.h"
 #include "lib/memory.h"

src/game/data/data_000000.c

@@ -7,7 +7,7 @@
 #include "lib/lib_0c000.h"
 #include "lib/main.h"
 #include "lib/lib_3e730.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "stagesetup.h"
 #include "data.h"
 #include "types.h"

src/game/data/data_003dc0.c

@@ -7,7 +7,7 @@
 #include "lib/lib_0c000.h"
 #include "lib/main.h"
 #include "lib/lib_3e730.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "stagesetup.h"
 #include "data.h"
 #include "types.h"

src/game/data/data_020df0.c

@@ -13,7 +13,7 @@
 #include "game/mplayer/setup.h"
 #include "game/mplayer/scenarios.h"
 #include "game/training/training.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "stagesetup.h"
 #include "data.h"
 #include "types.h"

src/game/debug.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/debug.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/dlights.c

@@ -15,7 +15,7 @@
 #include "game/propobj.h"
 #include "game/utils.h"
 #include "game/wallhit.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_0e9d0.h"
 #include "lib/memory.h"
 #include "lib/rng.h"

src/game/endscreen.c

@@ -22,7 +22,7 @@
 #include "game/lang.h"
 #include "game/options.h"
 #include "game/mpstats.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "lib/main.h"
 #include "data.h"

src/game/explosions/explosions.c

@@ -17,7 +17,7 @@
 #include "game/propobj.h"
 #include "game/utils.h"
 #include "game/wallhit.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "lib/main.h"
 #include "lib/rng.h"

src/game/explosions/init.c

@@ -1,6 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/memory.h"
 #include "data.h"
 #include "types.h"

src/game/explosions/reset.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/prop.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "data.h"
 #include "types.h"

src/game/file.c

@@ -2,7 +2,7 @@
 #include "constants.h"
 #include "game/file.h"
 #include "game/stubs/game_175f50.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_074f0.h"
 #include "lib/dma.h"
 #include "lib/memory.h"

src/game/floor.c

@@ -1,6 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_000000.c

@@ -1,6 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/memory.h"
 #include "data.h"
 #include "types.h"

src/game/game_000090.c

@@ -3,7 +3,7 @@
 #include "game/game_000090.h"
 #include "game/game_000130.h"
 #include "game/chr/chr.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_000130.c

@@ -2,7 +2,7 @@
 #include "constants.h"
 #include "game/game_000130.h"
 #include "game/floor.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_233c0.h"
 #include "data.h"
 #include "types.h"

src/game/game_000880.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/game_000880.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_005fd0.c

@@ -4,7 +4,7 @@
 #include "game/game_006900.h"
 #include "game/game_092610.h"
 #include "game/room.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/rng.h"
 #include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"

src/game/game_006900.c

@@ -4,7 +4,7 @@
 #include "game/game_006900.h"
 #include "game/game_092610.h"
 #include "game/room.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/rng.h"
 #include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"

src/game/game_006bd0.c

@@ -14,7 +14,7 @@
 #include "game/room.h"
 #include "game/file.h"
 #include "game/gfxmemory.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "lib/lib_0e9d0.h"
 #include "lib/rng.h"

src/game/game_00b190.c

@@ -1,6 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/dma.h"
 #include "lib/memory.h"
 #include "data.h"

src/game/game_00b210.c

@@ -2,7 +2,7 @@
 #include "constants.h"
 #include "game/game_19aa80.h"
 #include "game/mplayer/mplayer.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_00b320.c

@@ -2,7 +2,7 @@
 #include "constants.h"
 #include "game/file.h"
 #include "game/lang.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/memory.h"
 #include "data.h"
 #include "types.h"

src/game/game_00b420.c

@@ -2,7 +2,7 @@
 #include "constants.h"
 #include "game/file.h"
 #include "game/lang.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/memory.h"
 #include "data.h"
 #include "types.h"

src/game/game_00b480.c

@@ -3,7 +3,7 @@
 #include "game/game_00b320.h"
 #include "game/game_00b820.h"
 #include "game/title.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/memory.h"
 #include "data.h"
 #include "types.h"

src/game/game_00b820.c

@@ -6,7 +6,7 @@
 #include "game/game_011110.h"
 #include "game/game_02cde0.h"
 #include "game/game_091e10.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/memory.h"
 #include "lib/rng.h"
 #include "data.h"

src/game/game_00c240.c

@@ -2,7 +2,7 @@
 #include "constants.h"
 #include "game/game_00c240.h"
 #include "game/prop.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/memory.h"
 #include "data.h"
 #include "types.h"

src/game/game_00c490.c

@@ -27,7 +27,7 @@
 #include "game/mplayer/mplayer.h"
 #include "game/pad.h"
 #include "game/propobj.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/memory.h"
 #include "lib/model.h"
 #include "lib/rng.h"

src/game/game_0108d0.c

@@ -1,6 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/memory.h"
 #include "data.h"
 #include "types.h"

src/game/game_010b20.c

@@ -3,7 +3,7 @@
 #include "game/inventory/items.h"
 #include "game/game_097ba0.h"
 #include "game/game_1655c0.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/memory.h"
 #include "data.h"
 #include "types.h"

src/game/game_011110.c

@@ -16,7 +16,7 @@
 #include "game/mplayer/scenarios.h"
 #include "game/mplayer/mplayer.h"
 #include "game/pad.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/memory.h"
 #include "lib/lib_16110.h"
 #include "lib/lib_233c0.h"

src/game/game_0125a0.c

@@ -5,7 +5,7 @@
 #include "game/bondhead.h"
 #include "game/room.h"
 #include "game/pad.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_159b0.h"
 #include "lib/lib_233c0.h"
 #include "lib/model.h"

src/game/game_012aa0.c

@@ -5,7 +5,7 @@
 #include "game/bondhead.h"
 #include "game/room.h"
 #include "game/pad.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_159b0.h"
 #include "lib/lib_233c0.h"
 #include "lib/model.h"

src/game/game_012d50.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/pad.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/memory.h"
 #include "data.h"
 #include "types.h"

src/game/game_013550.c

@@ -1,6 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/memory.h"
 #include "data.h"
 #include "types.h"

src/game/game_013b80.c

@@ -1,6 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/memory.h"
 #include "data.h"
 #include "types.h"

src/game/game_013cf0.c

@@ -3,7 +3,7 @@
 #include "game/game_013cf0.h"
 #include "game/room.h"
 #include "game/file.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_013ee0.c

@@ -3,7 +3,7 @@
 #include "game/game_013ee0.h"
 #include "game/room.h"
 #include "game/pad.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/memory.h"
 #include "lib/lib_233c0.h"
 #include "data.h"

src/game/game_0147a0.c

@@ -1,6 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_0147d0.c

@@ -6,7 +6,7 @@
 #include "game/prop.h"
 #include "game/game_197600.h"
 #include "game/mplayer/mplayer.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/memory.h"
 #include "lib/model.h"
 #include "lib/rng.h"

src/game/game_014e90.c

@@ -6,7 +6,7 @@
 #include "game/prop.h"
 #include "game/game_197600.h"
 #include "game/mplayer/mplayer.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/memory.h"
 #include "lib/model.h"
 #include "lib/rng.h"

src/game/game_014f10.c

@@ -4,7 +4,7 @@
 #include "game/chr/chr.h"
 #include "game/prop.h"
 #include "game/propobj.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_015010.c

@@ -3,7 +3,7 @@
 #include "game/game_015010.h"
 #include "game/game_091e10.h"
 #include "game/propobj.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_0150a0.c

@@ -1,6 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_0e9d0.h"
 #include "lib/lib_317f0.h"
 #include "data.h"

src/game/game_015470.c

@@ -2,7 +2,7 @@
 #include "constants.h"
 #include "game/game_015470.h"
 #include "game/game_01afc0.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "lib/dma.h"
 #include "lib/lib_317f0.h"

src/game/game_01afc0.c

@@ -1,6 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "data.h"
 #include "types.h"

src/game/game_01b0a0.c

@@ -6,7 +6,7 @@
 #include "game/inventory/inventory.h"
 #include "game/game_127910.h"
 #include "game/options.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_01bea0.c

@@ -19,7 +19,7 @@
 #include "game/training/training.h"
 #include "game/gamefile.h"
 #include "game/mplayer/mplayer.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "lib/main.h"
 #include "lib/lib_0e9d0.h"

src/game/game_01d860.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/game_1668e0.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_01d990.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/game_01d990.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_02cde0.c

@@ -12,7 +12,7 @@
 #include "game/mplayer/mplayer.h"
 #include "game/pad.h"
 #include "game/propobj.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/memory.h"
 #include "lib/lib_126b0.h"
 #include "lib/rng.h"

src/game/game_091e10.c

@@ -6,7 +6,7 @@
 #include "game/room.h"
 #include "game/game_1a7560.h"
 #include "game/propobj.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_092610.c

@@ -9,7 +9,7 @@
 #include "game/core.h"
 #include "game/mplayer/mplayer.h"
 #include "game/pad.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_0e9d0.h"
 #include "lib/rng.h"
 #include "lib/lib_16110.h"

src/game/game_096360.c

@@ -5,7 +5,7 @@
 #include "game/game_0b3350.h"
 #include "game/training/training.h"
 #include "game/propobj.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/rng.h"
 #include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"

src/game/game_096700.c

@@ -1,6 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_16110.h"
 #include "data.h"
 #include "types.h"

src/game/game_096890.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/game_096890.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_0969d0.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/game_096890.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_096b20.c

@@ -1,6 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_096ca0.c

@@ -2,7 +2,7 @@
 #include "constants.h"
 #include "game/game_0969d0.h"
 #include "game/game_096ca0.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_16110.h"
 #include "data.h"
 #include "types.h"

src/game/game_097a50.c

@@ -1,6 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_097aa0.c

@@ -2,7 +2,7 @@
 #include "constants.h"
 #include "game/game_097a50.h"
 #include "game/game_097aa0.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_097ba0.c

@@ -36,7 +36,7 @@
 #include "game/pak/pak.h"
 #include "game/options.h"
 #include "game/propobj.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "lib/main.h"
 #include "lib/model.h"

src/game/game_0abe70.c

@@ -8,7 +8,7 @@
 #include "game/game_0c33f0.h"
 #include "game/gfxmemory.h"
 #include "game/file.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/main.h"
 #include "lib/rng.h"
 #include "lib/lib_159b0.h"

src/game/game_0b0fd0.c

@@ -12,7 +12,7 @@
 #include "game/lang.h"
 #include "game/mplayer/mplayer.h"
 #include "game/options.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_0b2150.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/game_0b2150.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "data.h"
 #include "types.h"

src/game/game_0b28d0.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/game_0b28d0.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/memory.h"
 #include "data.h"
 #include "types.h"

src/game/game_0b3350.c

@@ -6,7 +6,7 @@
 #include "game/room.h"
 #include "game/texture.h"
 #include "game/game_173a00.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_16110.h"
 #include "data.h"
 #include "types.h"

src/game/game_0b63b0.c

@@ -49,7 +49,7 @@
 #include "game/options.h"
 #include "game/propobj.h"
 #include "game/splat.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "lib/main.h"
 #include "lib/lib_0e9d0.h"

src/game/game_0b69d0.c

@@ -51,7 +51,7 @@
 #include "game/propobj.h"
 #include "game/splat.h"
 #include "game/mpstats.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/controller.h"
 #include "lib/lib_09a80.h"
 #include "lib/main.h"

src/game/game_0c33f0.c

@@ -1,6 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_0d4690.c

@@ -4,7 +4,7 @@
 #include "game/game_0d4690.h"
 #include "game/file.h"
 #include "game/utils.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "lib/main.h"
 #include "lib/lib_159b0.h"

src/game/game_0e0770.c

@@ -8,7 +8,7 @@
 #include "game/game_1531a0.h"
 #include "game/file.h"
 #include "game/utils.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "lib/main.h"
 #include "lib/rng.h"

src/game/game_0f09f0.c

@@ -30,7 +30,7 @@
 #include "game/pak/pak.h"
 #include "game/options.h"
 #include "game/propobj.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "lib/main.h"
 #include "lib/lib_0e9d0.h"

src/game/game_102240.c

@@ -23,7 +23,7 @@
 #include "game/lang.h"
 #include "game/mplayer/mplayer.h"
 #include "game/options.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "lib/main.h"
 #include "lib/lib_0e9d0.h"

src/game/game_107fb0.c

@@ -10,7 +10,7 @@
 #include "game/mplayer/mplayer.h"
 #include "game/pak/pak.h"
 #include "game/utils.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "lib/lib_126b0.h"
 #include "data.h"

src/game/game_10c9c0.c

@@ -8,7 +8,7 @@
 #include "game/mplayer/mplayer.h"
 #include "game/mplayer/scenarios.h"
 #include "game/mplayer/setup.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "data.h"
 #include "types.h"
 

src/game/game_110680.c

@@ -13,7 +13,7 @@
 #include "game/pak/pak.h"
 #include "game/options.h"
 #include "game/utils.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_0bfb0.h"
 #include "lib/lib_0e9d0.h"
 #include "lib/lib_126b0.h"
@@ -43,7 +43,7 @@ u32 var800a2318;
 u32 var800a231c;
 u32 var800a2320;
 u32 var800a2324;
-u8 var800a2328[];
+u8 var800a2328[4];
 u8 g_AltTitle;
 u32 var800a2330;
 u32 var800a2334;

src/game/game_11f000.c

@@ -7,7 +7,7 @@
 #include "game/game_152fa0.h"
 #include "game/game_165670.h"
 #include "game/pad.h"
-#include "gvars/gvars.h"
+#include "bss.h"
 #include "lib/lib_09a80.h"
 #include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"