Distribute the game segment's .bss into their appropriate files

ld/gamefiles.inc

@@ -76,6 +76,7 @@
 	build/ROMID/game/chr/chraicommands.o (section); \
 	build/ROMID/game/prop.o (section); \
 	build/ROMID/game/propobj.o (section); \
+	build/ROMID/game/propobjbss.o (section); \
 	build/ROMID/game/game_091e10.o (section); \
 	build/ROMID/game/game_092610.o (section); \
 	build/ROMID/game/objectives/objectives.o (section); \
@@ -153,6 +154,7 @@
 	build/ROMID/game/game_152fa0.o (section); \
 	build/ROMID/game/game_1531a0.o (section); \
 	build/ROMID/game/room.o (section); \
+	build/ROMID/game/roombss.o (section); \
 	build/ROMID/game/game_165360.o (section); \
 	build/ROMID/game/game_1655c0.o (section); \
 	build/ROMID/game/game_165670.o (section); \

ld/pd.ld

@@ -283,7 +283,9 @@ SECTIONS
 
 	BEGIN_NOLOAD(gvars)
 	{
+		LIBFILES(.bss)
 		build/ROMID/gvars/gvars.o (.data);
+		GAMEFILES(.bss)
 	}
 	END_NOLOAD(gvars)
 

src/game/activemenu/activemenu.c

@@ -24,6 +24,11 @@
 #include "data.h"
 #include "types.h"
 
+struct activemenu g_AmMenus[4];
+struct font2a4 *g_AmFont1;
+struct font *g_AmFont2;
+s32 g_AmIndex;
+
 struct menudialog g_AmPickTargetMenuDialog;
 
 /**

src/game/bondgrab.c

@@ -22,6 +22,15 @@ const char var7f1ad940[] = "bondgrab.c";
 const char var7f1ad94c[] = "bondgrab.c";
 const char var7f1ad958[] = "bondgrab.c";
 
+u32 var8009de70;
+u32 var8009de74;
+u32 var8009de78;
+u32 var8009de7c;
+u32 var8009de80;
+u32 var8009de84;
+u32 var8009de88;
+u32 var8009de8c;
+
 u32 var80070e80 = 0x00000000;
 u32 var80070e84 = 0x00000000;
 u32 var80070e88 = 0x00000000;

src/game/bondview.c

@@ -19,6 +19,8 @@
 #include "types.h"
 #include "gbiex.h"
 
+char var800a41c0[990];
+
 s32 var8007f840 = 0x00000000;
 u8 var8007f844 = 0;
 u8 var8007f848 = 0;
@@ -6662,8 +6664,8 @@ glabel bviewRenderIrLens
 /*  f147744:	524c0010 */ 	beql	$s2,$t4,.L0f147788
 /*  f147748:	240800ff */ 	addiu	$t0,$zero,0xff
 /*  f14774c:	8ecd028c */ 	lw	$t5,0x28c($s6)
-/*  f147750:	3c0f800a */ 	lui	$t7,%hi(var800a41d8)
-/*  f147754:	25ef41d8 */ 	addiu	$t7,$t7,%lo(var800a41d8)
+/*  f147750:	3c0f800a */ 	lui	$t7,%hi(var800a41c0+0x18)
+/*  f147754:	25ef41d8 */ 	addiu	$t7,$t7,%lo(var800a41c0+0x18)
 /*  f147758:	000d7100 */ 	sll	$t6,$t5,0x4
 /*  f14775c:	01cd7023 */ 	subu	$t6,$t6,$t5
 /*  f147760:	000e7140 */ 	sll	$t6,$t6,0x5
@@ -6683,8 +6685,8 @@ glabel bviewRenderIrLens
 /*  f147790:	18a0001b */ 	blez	$a1,.L0f147800
 /*  f147794:	afa70064 */ 	sw	$a3,0x64($sp)
 /*  f147798:	afa70064 */ 	sw	$a3,0x64($sp)
-/*  f14779c:	3c07800a */ 	lui	$a3,%hi(var800a41d8)
-/*  f1477a0:	24e741d8 */ 	addiu	$a3,$a3,%lo(var800a41d8)
+/*  f14779c:	3c07800a */ 	lui	$a3,%hi(var800a41c0+0x18)
+/*  f1477a0:	24e741d8 */ 	addiu	$a3,$a3,%lo(var800a41c0+0x18)
 /*  f1477a4:	afa600ac */ 	sw	$a2,0xac($sp)
 /*  f1477a8:	240400ff */ 	addiu	$a0,$zero,0xff
 .L0f1477ac:
@@ -6734,13 +6736,13 @@ glabel bviewRenderIrLens
 /*  f147850:	8ecf0288 */ 	lw	$t7,0x288($s6)
 /*  f147854:	02b50019 */ 	multu	$s5,$s5
 /*  f147858:	8ecb028c */ 	lw	$t3,0x28c($s6)
-/*  f14785c:	3c0d800a */ 	lui	$t5,%hi(var800a41d8)
+/*  f14785c:	3c0d800a */ 	lui	$t5,%hi(var800a41c0+0x18)
 /*  f147860:	3c013f80 */ 	lui	$at,0x3f80
 /*  f147864:	000b6100 */ 	sll	$t4,$t3,0x4
 /*  f147868:	018b6023 */ 	subu	$t4,$t4,$t3
 /*  f14786c:	000c6140 */ 	sll	$t4,$t4,0x5
 /*  f147870:	0191c821 */ 	addu	$t9,$t4,$s1
-/*  f147874:	25ad41d8 */ 	addiu	$t5,$t5,%lo(var800a41d8)
+/*  f147874:	25ad41d8 */ 	addiu	$t5,$t5,%lo(var800a41c0+0x18)
 /*  f147878:	4481b000 */ 	mtc1	$at,$f22
 /*  f14787c:	0000b812 */ 	mflo	$s7
 /*  f147880:	032d1021 */ 	addu	$v0,$t9,$t5
@@ -6856,8 +6858,8 @@ glabel bviewRenderIrLens
 /*  f147a24:	0040a025 */ 	or	$s4,$v0,$zero
 .L0f147a28:
 /*  f147a28:	8eca028c */ 	lw	$t2,0x28c($s6)
-/*  f147a2c:	3c19800a */ 	lui	$t9,%hi(var800a41d8)
-/*  f147a30:	273941d8 */ 	addiu	$t9,$t9,%lo(var800a41d8)
+/*  f147a2c:	3c19800a */ 	lui	$t9,%hi(var800a41c0+0x18)
+/*  f147a30:	273941d8 */ 	addiu	$t9,$t9,%lo(var800a41c0+0x18)
 /*  f147a34:	000a5900 */ 	sll	$t3,$t2,0x4
 /*  f147a38:	016a5823 */ 	subu	$t3,$t3,$t2
 /*  f147a3c:	000b5940 */ 	sll	$t3,$t3,0x5

src/game/camdraw.c

@@ -19,6 +19,15 @@
 #include "data.h"
 #include "types.h"
 
+u32 var800a45a0;
+u32 var800a45a4;
+u32 var800a45a8;
+u32 var800a45ac;
+u32 var800a45b0;
+u32 var800a45b4;
+u32 var800a45b8;
+u32 var800a45bc;
+
 const char var7f1b6050[] = "Init";
 const char var7f1b6058[] = "Start Header Read";
 const char var7f1b606c[] = "Header Read Done";

src/game/cheats.c

@@ -12,6 +12,11 @@
 #include "data.h"
 #include "types.h"
 
+u32 g_CheatsActiveBank0;
+u32 g_CheatsActiveBank1;
+u32 g_CheatsEnabledBank0;
+u32 g_CheatsEnabledBank1;
+
 struct menuitem g_CheatsBuddiesMenuItems[];
 struct menudialog g_CheatsBuddiesMenuDialog;
 

src/game/chr/chr.c

@@ -47,6 +47,12 @@
 
 const char var7f1a8690[] = "chr/chr.c";
 
+void *var8009ccc0[20];
+s32 g_NumChrs;
+s16 *g_Chrnums;
+s16 *g_ChrIndexes;
+u32 var8009cd1c;
+
 u8 g_FileState = 0;
 u8 var80062944 = 0;
 u8 var80062948 = 0;

src/game/chr/chraction.c

@@ -51,6 +51,14 @@
 const char var7f1a8ac0[] = "chraction.c";
 const char var7f1a8acc[] = "chraction.c";
 
+s32 g_RecentQuipsPlayed[5];
+u32 var8009cd84;
+u32 var8009cd88;
+u32 var8009cd8c;
+u32 var8009cd90;
+u32 var8009cd94;
+u8 g_RecentQuipsIndex;
+
 f32 var80062ca0 = 1;
 f32 var80062ca4 = 1;
 f32 var80062ca8 = 1;

src/game/core.c

@@ -111,6 +111,10 @@ const char var7f1b774c[] = "pos:%s%s %.2f %.2f %.2f\n";
 const char var7f1b7768[] = "";
 const char var7f1b776c[] = "";
 
+struct audiohandle *g_MiscSfxAudioHandles[3];
+u32 var800aa5bc;
+s32 g_MiscSfxActiveTypes[3];
+
 u32 var80084010 = 0;
 bool var80084014 = false;
 f32 var80084018 = 1;

src/game/credits.c

@@ -27,6 +27,12 @@
 const char var7f1b57c0[] = "tload";
 const char var7f1b57c8[] = "dump";
 
+f32 var800a4160;
+u32 var800a4164;
+u32 var800a4168;
+u32 var800a416c;
+struct creditsdata *g_CreditsData;
+
 u32 var8007f130 = 0x00000000;
 bool g_CreditsAltTitleRequested = false;
 bool g_CreditsUsingAltTitle = false;

src/game/dlights.c

@@ -67,6 +67,16 @@ const char var7f1a7d10[] = "L2 -> Allocated %uK for the compressed acoustic shad
 const char var7f1a7d50[] = "L2(%d) -> ";
 const char var7f1a7d5c[] = "L2 -> Finished building portal range table\n";
 
+u32 var8009cad0;
+u32 var8009cad4;
+u32 var8009cad8;
+u32 var8009cadc;
+u32 var8009cae0;
+u32 var8009cae4;
+u32 var8009cae8;
+u8 var8009caec[4];
+u8 var8009caf0;
+
 struct var80061420 *var80061420 = NULL;
 u32 var80061424 = 0x00000000;
 u32 var80061428 = 0x00000000;

src/game/explosions/explosions.c

@@ -47,6 +47,9 @@ const char var7f1b5564[] = "";
 const char var7f1b5568[] = "";
 const char var7f1b556c[] = "";
 
+struct explosion *g_Explosions;
+s32 g_MaxExplosions;
+
 u32 var8007e4a0 = 0x00000000;
 u32 var8007e4a4 = 0x00000000;
 f32 var8007e4a8 = 1;

src/game/file.c

@@ -2027,6 +2027,9 @@ extern void *_file_Asaucerexp1M;
 #endif
 extern void *_filenamesSegmentRomStart;
 
+struct fileinfo g_FileInfo[NUM_FILES];
+u32 var800aa570;
+
 void *filetable[] = {
 	/*0x0000*/ NULL,
 	/*0x0001*/ &_file_bg_sev_seg,

src/game/game_00b820.c

@@ -12,6 +12,8 @@
 #include "data.h"
 #include "types.h"
 
+struct prop *g_DangerousProps[MAX_DANGEROUSPROPS];
+
 struct stageheadlimit g_StageHeadLimits[3] = {
 	{ STAGE_INFILTRATION, 5 },
 	{ STAGE_RESCUE,       4 },

src/game/game_00c490.c

@@ -37,6 +37,11 @@
 #include "data.h"
 #include "types.h"
 
+s32 var8009cc30;
+u32 var8009cc34;
+u32 var8009cc38;
+u32 var8009cc3c;
+
 struct monitorscreen var80061a80 = {
 	(u32) &var80069d90,
 	0x0000ffff,

src/game/game_013550.c

@@ -5,6 +5,22 @@
 #include "data.h"
 #include "types.h"
 
+u16 *var8009cc40;
+s32 var8009cc44;
+u32 var8009cc48;
+u32 var8009cc4c;
+u32 var8009cc50;
+u32 var8009cc54;
+u32 var8009cc58;
+u32 var8009cc5c;
+u32 var8009cc60;
+s32 var8009cc64;
+u32 var8009cc68;
+u32 var8009cc6c;
+u32 var8009cc70;
+u32 var8009cc74;
+f32 var8009cc78;
+
 /**
  * Initialises an array of room numbers and a linked list of structs.
  *

src/game/game_015470.c

@@ -14,6 +14,12 @@ const u32 var7f1a83b4[] = {0x00000000};
 const u32 var7f1a83b8[] = {0x00000000};
 const u32 var7f1a83bc[] = {0x00000000};
 
+Mtx *var8009cc80;
+Mtx *var8009cc84;
+Mtx *var8009cc88;
+f32 var8009cc8c;
+void *var8009cc90;
+
 u32 var80062410 = 0x00000000;
 u8 var80062414 = 3;
 u32 var80062418 = 0x00dc0000;

src/game/game_02cde0.c

@@ -21,6 +21,11 @@
 #include "data.h"
 #include "types.h"
 
+s32 g_NumActiveHeadsPerGender;
+u32 var8009cd24;
+u32 g_ActiveMaleHeads[8];
+u32 g_ActiveFemaleHeads[8];
+
 s32 g_NumBondBodies = 0;
 s32 g_NumMaleGuardHeads = 0;
 s32 g_NumFemaleGuardHeads = 0;

src/game/game_091e10.c

@@ -10,6 +10,9 @@
 #include "data.h"
 #include "types.h"
 
+struct stagesetup g_StageSetup;
+u8 *g_GeCreditsData;
+
 u32 setupGetCommandLength(u32 *cmd)
 {
 	switch ((u8)cmd[0]) {

src/game/game_097ba0.c

@@ -48,6 +48,10 @@
 #include "data.h"
 #include "types.h"
 
+u32 var8009d140;
+u32 var8009d144;
+u32 var8009d148;
+
 u32 var80070090 = 0x96969600;
 u32 var80070094 = 0x96969600;
 u32 var80070098 = 0xffffff00;

src/game/game_0abe70.c

@@ -40,6 +40,11 @@ const u32 var7f1acc64[] = {0x461c4000};
 const u32 var7f1acc68[] = {0xc61c4000};
 const u32 var7f1acc6c[] = {0x3fb50481};
 
+struct fireslot g_Fireslots[NUM_FIRESLOTS];
+struct casing g_Casings[20];
+struct var8009da60 var8009da60[8];
+struct var8009dbe0 var8009dbe0[4];
+
 u32 var80070500 = 0x00000000;
 u32 var80070504 = 0x00000000;
 u32 var80070508 = 0x00000000;

src/game/game_0b28d0.c

@@ -6,6 +6,15 @@
 #include "data.h"
 #include "types.h"
 
+u32 var8009dd00;
+u32 var8009dd04;
+u32 var8009dd08;
+u32 var8009dd0c;
+u32 var8009dd10;
+u32 var8009dd14;
+u32 var8009dd18;
+u32 var8009dd1c;
+
 u32 var800705a0 = 0x00000000;
 u32 var800705a4 = 0x00000000;
 bool var800705a8 = false;

src/game/game_0b3350.c

@@ -11,6 +11,27 @@
 #include "data.h"
 #include "types.h"
 
+u32 var8009dd20;
+u32 var8009dd24;
+u32 var8009dd28;
+u32 var8009dd2c;
+u32 var8009dd30;
+u32 var8009dd34;
+u32 var8009dd38;
+u32 var8009dd3c;
+u32 var8009dd40;
+u32 var8009dd44;
+u32 var8009dd48;
+u32 var8009dd4c;
+u32 var8009dd50;
+u32 var8009dd54;
+u32 var8009dd58;
+u32 var8009dd5c;
+u32 var8009dd60;
+u32 var8009dd64;
+u32 var8009dd68;
+u32 var8009dd6c;
+
 s32 func0f0b3350(s32 value)
 {
 	if (value < 2) {

src/game/game_0b63b0.c

@@ -76,6 +76,12 @@ const char var7f1ad3d0[] = "%s%sL2 -> Surface area bodged for room %d - using %f
 const char var7f1ad408[] = "";
 const char var7f1ad40c[] = "";
 
+struct roomacousticdata *g_RoomAcousticData;
+u32 var8009dd74;
+struct var8009dd78 var8009dd78[10];
+u16 *var8009ddc8;
+s32 var8009ddcc;
+
 void func0f0b63b0(s32 portalnum, f32 frac)
 {
 	if (portalnum >= 0) {

src/game/game_0b69d0.c

@@ -75,6 +75,34 @@ const char var7f1ad4c4[] = "Gunmem: bondmeml 0x%08x size 0x%08x\n";
 const char var7f1ad4ec[] = "Gunmem: tex block free 0x%08x\n";
 const char var7f1ad50c[] = "Gunmem: Free at end %d\n";
 
+s32 g_DefaultWeapons[2];
+f32 var8009ddd8;
+f32 var8009dddc;
+f32 var8009dde0;
+f32 var8009dde4;
+s16 g_WarpPadId;
+u32 *var8009ddec;
+f32 var8009ddf0;
+f32 var8009ddf4;
+f32 var8009ddf8;
+f32 var8009ddfc;
+f32 var8009de00;
+u32 var8009de04;
+u32 var8009de08;
+u32 var8009de0c;
+s32 g_CameraAnimCurFrame;
+u32 var8009de14;
+s16 g_CameraAnimNum;
+f32 g_CutsceneBlurFrac;
+s32 var8009de20;
+s32 var8009de24;
+f32 var8009de28;
+s32 var8009de2c;
+f32 var8009de30;
+u32 var8009de34;
+s16 g_SpawnPoints[MAX_SPAWNPOINTS];
+s32 g_NumSpawnPoints;
+
 struct vimode g_ViModes[] = {
 	//  fbwidth
 	//  |    fbheight

src/game/game_0d4690.c

@@ -31,6 +31,11 @@ const u32 var7f1adbe4[] = {0x00000000};
 const u32 var7f1adbe8[] = {0x00000000};
 const u32 var7f1adbec[] = {0x00000000};
 
+u32 var8009de90;
+u32 var8009de94;
+u32 var8009de98;
+u32 var8009de9c;
+
 u32 var80070f10 = 0x00000000;
 u32 var80070f14 = 0x000003e8;
 u32 var80070f18 = 0x00000014;

src/game/game_0f09f0.c

@@ -42,6 +42,54 @@
 #include "data.h"
 #include "types.h"
 
+char g_CheatMarqueeString[252];
+u32 var8009dfbc;
+s32 var8009dfc0;
+u32 var8009dfc4;
+struct briefing g_Briefing;
+u32 var8009dfe4;
+struct missionconfig g_MissionConfig;
+struct menu g_Menus[4];
+struct menudata g_MenuData;
+u32 var800a2038;
+u32 var800a203c;
+u32 var800a2040;
+u32 var800a2044;
+u32 var800a2048;
+u32 var800a204c;
+u32 var800a2050;
+u32 var800a2054;
+u32 var800a2058;
+u32 var800a205c;
+u32 var800a2060;
+u32 var800a2064;
+u32 var800a2068;
+u32 var800a206c;
+u32 var800a2070;
+u32 var800a2074;
+u32 var800a2078;
+u32 var800a207c;
+u32 var800a2080;
+u32 var800a2084;
+u32 var800a2088;
+u32 var800a208c;
+u32 var800a2090;
+u32 var800a2094;
+u32 var800a2098;
+u32 var800a209c;
+u32 var800a20a0;
+u32 var800a20a4;
+u32 var800a20a8;
+u32 var800a20ac;
+u32 var800a20b0;
+u32 var800a20b4;
+u32 var800a20b8;
+u32 var800a20bc;
+u32 var800a20c0;
+u32 var800a20c4;
+u32 var800a20c8;
+u32 var800a20cc;
+
 struct menudialog g_PakCannotReadGameBoyMenuDialog;
 struct menudialog g_PakDamagedMenuDialog;
 struct menudialog g_PakDataLostMenuDialog;

src/game/game_102240.c

@@ -30,6 +30,8 @@
 #include "data.h"
 #include "types.h"
 
+u8 g_InventoryWeapon;
+
 struct menudialog g_2PMissionControlStyleMenuDialog;
 struct menudialog g_CiControlPlayer2MenuDialog;
 struct menudialog g_CinemaMenuDialog;

src/game/game_107fb0.c

@@ -16,6 +16,15 @@
 #include "data.h"
 #include "types.h"
 
+// bss
+struct savelocation_2d8 g_FilemgrFileToCopy;
+struct savelocation_2d8 var800a21e8;
+struct savelocation_2d8 g_FilemgrFileToDelete;
+struct savelocation_2d8 var800a21f8;
+struct savefile_solo g_SoloSaveFile;
+u32 var800a22bc;
+struct savelocation_2d8 g_FilemgrLoadedMainFile;
+
 // These might be able to be removed by relocating their symbols
 struct menudialog g_FilemgrCopyMenuDialog;
 struct menudialog g_FilemgrConfirmDeleteMenuDialog;

src/game/game_11f000.c

@@ -14,6 +14,43 @@
 #include "data.h"
 #include "types.h"
 
+u32 var800a33a0;
+u32 var800a33a4;
+u32 var800a33a8;
+u32 var800a33ac;
+u32 var800a33b0;
+u32 var800a33b4;
+u32 var800a33b8;
+u32 var800a33bc;
+u32 var800a33c0;
+u32 var800a33c4;
+u32 var800a33c8;
+u32 var800a33cc;
+u32 var800a33d0;
+u32 var800a33d4;
+u32 var800a33d8;
+u32 var800a33dc;
+u32 var800a33e0;
+u32 var800a33e4;
+u32 var800a33e8;
+u32 var800a33ec;
+u32 var800a33f0;
+u32 var800a33f4;
+u32 var800a33f8;
+u32 var800a33fc;
+u32 var800a3400;
+u32 var800a3404;
+u32 var800a3408;
+u32 var800a340c;
+u32 var800a3410;
+u32 var800a3414;
+u32 var800a3418;
+u32 var800a341c;
+u32 var800a3420;
+u32 var800a3424;
+u32 var800a3428;
+u32 var800a342c;
+
 GLOBAL_ASM(
 glabel func0f11f000
 /*  f11f000:	27bdffd8 */ 	addiu	$sp,$sp,-40

src/game/game_13b670.c

@@ -12,6 +12,15 @@
 const char var7f1b5960[] = "modula";
 const char var7f1b5968[] = "ripsize";
 
+u32 var800a4180;
+u32 var800a4184;
+u32 var800a4188;
+u32 var800a418c;
+u32 var800a4190;
+u32 var800a4194;
+u32 var800a4198;
+u32 var800a419c;
+
 u32 var8007f6e0 = 0xffffffff;
 u32 var8007f6e4 = 0xffffffff;
 u32 var8007f6e8 = 0x00000000;

src/game/game_13c510.c

@@ -50,6 +50,11 @@ const u32 var7f1b5a04[] = {0x3b888889};
 const u32 var7f1b5a08[] = {0x3b888889};
 const u32 var7f1b5a0c[] = {0x3ecccccd};
 
+u32 var800a41a0;
+u32 var800a41a4;
+u32 var800a41a8;
+u32 var800a41ac;
+
 void func0f13c510(void)
 {
 	struct bootbufferthing *thing = bbufGetIndex0Buffer();

src/game/game_1531a0.c

@@ -32,6 +32,11 @@ const u32 var7f1b7414[] = {0x7f7fffff};
 const u32 var7f1b7418[] = {0x00000000};
 const u32 var7f1b741c[] = {0x00000000};
 
+struct var800a45d0 var800a45d0;
+Gfx *var800a4634;
+u32 var800a4638;
+u32 var800a463c;
+
 s32 g_ScaleX = 1;
 u32 var8007fac4 = 0x00000000;
 u32 var8007fac8 = 0x00000000;

src/game/game_165670.c

@@ -13,6 +13,35 @@ const u32 var7f1b76e4[] = {0x3a83126f};
 const u32 var7f1b76e8[] = {0x7f7fffff};
 const u32 var7f1b76ec[] = {0x00000000};
 
+u32 var800a65f0;
+u32 var800a65f4;
+u32 var800a65f8;
+u32 var800a65fc;
+u32 var800a6600;
+u32 var800a6604;
+u32 var800a6608;
+u32 var800a660c;
+u32 var800a6610;
+u32 var800a6614;
+u32 var800a6618;
+u32 var800a661c;
+u32 var800a6620;
+u32 var800a6624;
+u32 var800a6628;
+u32 var800a662c;
+u32 var800a6630;
+u32 var800a6634;
+u32 var800a6638;
+u32 var800a663c;
+u32 var800a6640;
+u32 var800a6644;
+u32 var800a6648;
+u32 var800a664c;
+u32 var800a6650;
+u32 var800a6654;
+u32 var800a6658;
+u32 var800a665c;
+
 struct twowords twowords_26a40[] = {
 	{ 0xfc26a004, 0x1f1093ff },
 	{ 0xfc232dff, 0xfffffe38 },

src/game/game_1668e0.c

@@ -6,6 +6,12 @@
 #include "data.h"
 #include "types.h"
 
+u8 *var800a6660;
+s16 *var800a6664;
+s16 *var800a6668;
+f32 *var800a666c;
+void *var800a6670;
+
 s32 var80082050 = 0;
 
 void currentPlayerSetLastRoomForOffset(s32 room)

src/game/game_173a00.c

@@ -7,6 +7,11 @@
 #include "data.h"
 #include "types.h"
 
+s32 var800ab5b0;
+u32 var800ab5b4;
+struct var800ab5b8 var800ab5b8[8];
+struct var800ab718 var800ab718[8];
+
 u32 var80084330 = 0x80878088;
 u32 var80084334 = 0x06000000;
 
@@ -381,10 +386,10 @@ glabel func0f173cb8
 /*  f173d04:	14680006 */ 	bne	$v1,$t0,.L0f173d20
 /*  f173d08:	00064900 */ 	sll	$t1,$a2,0x4
 /*  f173d0c:	01255021 */ 	addu	$t2,$t1,$a1
-/*  f173d10:	3c02800b */ 	lui	$v0,%hi(var800aabe0)
+/*  f173d10:	3c02800b */ 	lui	$v0,%hi(var800aabd8+0x8)
 /*  f173d14:	004a1021 */ 	addu	$v0,$v0,$t2
 /*  f173d18:	03e00008 */ 	jr	$ra
-/*  f173d1c:	9042abe0 */ 	lbu	$v0,%lo(var800aabe0)($v0)
+/*  f173d1c:	9042abe0 */ 	lbu	$v0,%lo(var800aabd8+0x8)($v0)
 .L0f173d20:
 /*  f173d20:	24c60001 */ 	addiu	$a2,$a2,0x1
 /*  f173d24:	00c2082a */ 	slt	$at,$a2,$v0

src/game/game_176080.c

@@ -11,6 +11,12 @@
 #include "data.h"
 #include "types.h"
 
+u32 var800ab7c0;
+u32 var800ab7c4;
+u8 var800ab7c8[0x300];
+u8 var800abac8[0x300];
+u8 var800abdc8[0x300];
+
 void *var800844f0 = NULL;
 void *var800844f4 = NULL;
 u32 var800844f8 = 0;

src/game/game_190260.c

@@ -32,6 +32,8 @@
 #include "data.h"
 #include "types.h"
 
+struct chrdata *g_MpSimulantChrs[MAX_SIMULANTS];
+
 u8 g_NumMpSimulantChrs = 0;
 
 struct simdifficulty g_SimDifficulties[] = {

src/game/game_19aa80.c

@@ -18,6 +18,9 @@
 #include "data.h"
 #include "types.h"
 
+u8 g_MpFeaturesForceUnlocked[40];
+u8 g_MpFeaturesUnlocked[80];
+
 u32 g_MpChallengeIndex = 0;
 struct mpconfigfull *g_MpCurrentChallengeConfig = NULL;
 

src/game/gamefile.c

@@ -21,6 +21,39 @@
 #include "data.h"
 #include "types.h"
 
+u32 var800a22d0;
+u32 var800a22d4;
+u32 var800a22d8;
+u32 var800a22dc;
+u32 var800a22e0;
+u32 var800a22e4;
+u32 var800a22e8;
+u32 var800a22ec;
+u32 var800a22f0;
+u32 var800a22f4;
+u32 var800a22f8;
+u32 var800a22fc;
+u32 var800a2300;
+u32 var800a2304;
+u32 var800a2308;
+u32 var800a230c;
+u32 var800a2310;
+u32 var800a2314;
+u32 var800a2318;
+u32 var800a231c;
+u32 var800a2320;
+u32 var800a2324;
+u8 var800a2328[];
+u8 g_AltTitle;
+u32 var800a2330;
+u32 var800a2334;
+u32 var800a2338;
+u32 var800a233c;
+u32 var800a2340;
+u32 var800a2344;
+u32 var800a2348;
+u32 var800a234c;
+
 struct filelist *g_FileLists[] = { NULL, NULL, NULL, NULL };
 bool var80075bd0[] = { true, true, true, true };
 

src/game/gfxmemory.c

@@ -33,6 +33,13 @@
  * marker for the end of the second element's allocation.
  */
 
+u8 *g_GfxBuffers[3];
+u32 var800aa58c;
+u8 *g_VtxBuffers[3];
+u8 *g_GfxMemPos;
+u8 g_GfxActiveBufferIndex;
+u32 g_GfxRequestedDisplayList;
+
 u32 g_GfxSizesByPlayerCount[] = {
 	0x00010000,
 	0x00018000,

src/game/hudmsg.c

@@ -29,6 +29,8 @@ const char var7f1ade98[] = "%s%s%4.2fX";
 const char var7f1adea4[] = "";
 const char var7f1adea8[] = "";
 
+u32 g_NextHudMessageId;
+
 u8 var80070fb0 = 0;
 
 u32 g_Colours[] = {

src/game/lang.c

@@ -7,6 +7,10 @@
 #include "data.h"
 #include "types.h"
 
+u32 *g_LangBanks[69];
+void *var800aabb4;
+struct var800aabb8 *var800aabb8;
+
 u32 g_LanguageId = 0;
 
 u16 g_LangFiles[] = {

src/game/menu/items.c

@@ -21,6 +21,8 @@
 #include "data.h"
 #include "types.h"
 
+u8 g_MpSelectedPlayersForStats[4];
+
 const char var7f1adfa0[] = "brcol";
 const char var7f1adfa8[] = "%d: ";
 const char var7f1adfb0[] = "%s";

src/game/mplayer/mplayer.c

@@ -28,6 +28,22 @@
 #include "data.h"
 #include "types.h"
 
+// bss
+struct chrdata *g_MpPlayerChrs[MAX_MPCHRS];
+struct mpchr *var800ac500[MAX_MPCHRS];
+s32 g_MpNumPlayers;
+u32 var800ac534;
+struct mpsim g_MpSimulants[MAX_SIMULANTS];
+u8 g_MpSimulantDifficultiesPerNumPlayers[32];
+struct mpplayer g_MpPlayers[6];
+u8 g_AmBotCommands[16];
+struct mpsetup g_MpSetup;
+struct savefile_setup g_MpSetupSaveFile;
+u32 var800acc1c;
+struct mplockinfo g_MpLockInfo;
+u32 var800acc28[18];
+
+// Forward declaractions
 struct mpweaponset g_MpWeaponSets[12];
 u32 var800874c8;
 

src/game/mplayer/scenarios.c

@@ -35,6 +35,167 @@
 #include "data.h"
 #include "types.h"
 
+struct scenariodata g_ScenarioData;
+u32 var800ac254;
+u32 var800ac258;
+u32 var800ac25c;
+u32 var800ac260;
+u32 var800ac264;
+u32 var800ac268;
+u32 var800ac26c;
+u32 var800ac270;
+u32 var800ac274;
+u32 var800ac278;
+u32 var800ac27c;
+u32 var800ac280;
+u32 var800ac284;
+u32 var800ac288;
+u32 var800ac28c;
+u32 var800ac290;
+u32 var800ac294;
+u32 var800ac298;
+u32 var800ac29c;
+u32 var800ac2a0;
+u32 var800ac2a4;
+u32 var800ac2a8;
+u32 var800ac2ac;
+u32 var800ac2b0;
+u32 var800ac2b4;
+u32 var800ac2b8;
+u32 var800ac2bc;
+u32 var800ac2c0;
+u32 var800ac2c4;
+u32 var800ac2c8;
+u32 var800ac2cc;
+u32 var800ac2d0;
+u32 var800ac2d4;
+u32 var800ac2d8;
+u32 var800ac2dc;
+u32 var800ac2e0;
+u32 var800ac2e4;
+u32 var800ac2e8;
+u32 var800ac2ec;
+u32 var800ac2f0;
+u32 var800ac2f4;
+u32 var800ac2f8;
+u32 var800ac2fc;
+u32 var800ac300;
+u32 var800ac304;
+u32 var800ac308;
+u32 var800ac30c;
+u32 var800ac310;
+u32 var800ac314;
+u32 var800ac318;
+u32 var800ac31c;
+u32 var800ac320;
+u32 var800ac324;
+u32 var800ac328;
+u32 var800ac32c;
+u32 var800ac330;
+u32 var800ac334;
+u32 var800ac338;
+u32 var800ac33c;
+u32 var800ac340;
+u32 var800ac344;
+u32 var800ac348;
+u32 var800ac34c;
+u32 var800ac350;
+u32 var800ac354;
+u32 var800ac358;
+u32 var800ac35c;
+u32 var800ac360;
+u32 var800ac364;
+u32 var800ac368;
+u32 var800ac36c;
+u32 var800ac370;
+u32 var800ac374;
+u32 var800ac378;
+u32 var800ac37c;
+u32 var800ac380;
+u32 var800ac384;
+u32 var800ac388;
+u32 var800ac38c;
+u32 var800ac390;
+u32 var800ac394;
+u32 var800ac398;
+u32 var800ac39c;
+u32 var800ac3a0;
+u32 var800ac3a4;
+u32 var800ac3a8;
+u32 var800ac3ac;
+u32 var800ac3b0;
+u32 var800ac3b4;
+u32 var800ac3b8;
+u32 var800ac3bc;
+u32 var800ac3c0;
+u32 var800ac3c4;
+u32 var800ac3c8;
+u32 var800ac3cc;
+u32 var800ac3d0;
+u32 var800ac3d4;
+u32 var800ac3d8;
+u32 var800ac3dc;
+u32 var800ac3e0;
+u32 var800ac3e4;
+u32 var800ac3e8;
+u32 var800ac3ec;
+u32 var800ac3f0;
+u32 var800ac3f4;
+u32 var800ac3f8;
+u32 var800ac3fc;
+u32 var800ac400;
+u32 var800ac404;
+u32 var800ac408;
+u32 var800ac40c;
+u32 var800ac410;
+u32 var800ac414;
+u32 var800ac418;
+u32 var800ac41c;
+u32 var800ac420;
+u32 var800ac424;
+u32 var800ac428;
+u32 var800ac42c;
+u32 var800ac430;
+u32 var800ac434;
+u32 var800ac438;
+u32 var800ac43c;
+u32 var800ac440;
+u32 var800ac444;
+u32 var800ac448;
+u32 var800ac44c;
+u32 var800ac450;
+u32 var800ac454;
+u32 var800ac458;
+u32 var800ac45c;
+u32 var800ac460;
+u32 var800ac464;
+u32 var800ac468;
+u32 var800ac46c;
+u32 var800ac470;
+u32 var800ac474;
+u32 var800ac478;
+u32 var800ac47c;
+u32 var800ac480;
+u32 var800ac484;
+u32 var800ac488;
+u32 var800ac48c;
+u32 var800ac490;
+u32 var800ac494;
+u32 var800ac498;
+u32 var800ac49c;
+u32 var800ac4a0;
+u32 var800ac4a4;
+u32 var800ac4a8;
+u32 var800ac4ac;
+u32 var800ac4b0;
+u32 var800ac4b4;
+u32 var800ac4b8;
+u32 var800ac4bc;
+u32 var800ac4c0;
+u32 var800ac4c4;
+u32 var800ac4c8;
+u32 var800ac4cc;
+
 struct mpscenario g_MpScenarios[6];
 
 const char var7f1b8440[] = "CaptureTheBriefcaseAddBankPad -> Adding New Pad %d  - Pad Id = %d-> Saving Pad\n";

src/game/music.c

@@ -10,6 +10,14 @@
 #include "data.h"
 #include "types.h"
 
+s32 g_MusicStageNum;
+u32 var800aa5d4;
+struct var800aa5d8 var800aa5d8[40];
+struct var800aaa38 var800aaa38[3];
+u32 g_AudioXReasonsActive[4];
+u32 var800aaa78[4];
+u32 g_AudioXReasonDurations[4];
+
 s32 g_MenuTrack = -1;
 u32 var800840c4 = 0x00000000;
 s32 g_TemporaryPrimaryTrack = -1;

src/game/nbomb.c

@@ -24,6 +24,11 @@
 #include "data.h"
 #include "types.h"
 
+s16 var8009cb00;
+u32 var8009cb04;
+struct nbomb g_Nbombs[6];
+u32 var8009cbf8;
+
 bool g_NbombsActive = false;
 f32 var80061644 = 100;
 u32 var80061648 = 0x00000000;

src/game/objectives/objectives.c

@@ -21,6 +21,41 @@
 #include "data.h"
 #include "types.h"
 
+struct objective *g_Objectives[MAX_OBJECTIVES];
+u32 g_ObjectiveStatuses[MAX_OBJECTIVES];
+struct tag *g_TagsLinkedList;
+struct briefingobj *g_BriefingObjs;
+struct criteria_roomentered *g_RoomEnteredCriterias;
+struct criteria_multiroomentered *g_MultiroomEnteredCriterias;
+struct criteria_holograph *g_HolographCriterias;
+s32 g_NumTags;
+struct tag **g_TagPtrs;
+u32 var8009d0cc;
+u32 var8009d0d0[2];
+s32 var8009d0d8;
+u32 var8009d0dc;
+u32 var8009d0e0[4];
+u32 var8009d0f0;
+u32 var8009d0f4;
+u32 var8009d0f8;
+u32 var8009d0fc;
+u32 var8009d100;
+u32 var8009d104;
+u32 var8009d108;
+u32 var8009d10c;
+u32 var8009d110;
+u32 var8009d114;
+u32 var8009d118;
+u32 var8009d11c;
+u32 var8009d120;
+u32 var8009d124;
+u32 var8009d128;
+u32 var8009d12c;
+u32 var8009d130;
+u32 var8009d134;
+u32 var8009d138;
+u32 var8009d13c;
+
 s32 g_ObjectiveLastIndex = -1;
 bool g_ObjectiveChecksDisabled = false;
 

src/game/pad.c

@@ -5,6 +5,16 @@
 #include "data.h"
 #include "types.h"
 
+s32 *g_PadsFile;
+u16 *g_PadOffsets;
+u32 var800a2358;
+u32 var800a235c;
+u16 *g_CoverFlags;
+s32 *g_CoverRooms;
+void *var800a2368;
+u16 g_NumSpecialCovers;
+u16 *g_SpecialCoverNums;
+
 GLOBAL_ASM(
 glabel padUnpack
 /*  f115ab0:	3c0e800a */ 	lui	$t6,%hi(g_PadOffsets)

src/game/pak/pak.c

@@ -34,6 +34,42 @@ const char var7f1b3b60[] = "-> Unknown PakFileType_e - %d\n";
 const char var7f1b3b80[] = "-forceversion";
 const char var7f1b3b90[] = "Pak %d -> Header Cache 2 - FATAL ERROR\n";
 
+struct var800a2380 var800a2380[5];
+u32 var800a317c;
+struct var800a3180 var800a3180[4];
+u32 var800a3320;
+u32 var800a3324;
+u32 var800a3328;
+u32 var800a332c;
+u32 var800a3330;
+u32 var800a3334;
+u32 var800a3338;
+u32 var800a333c;
+u32 var800a3340;
+u32 var800a3344;
+u32 var800a3348;
+u32 var800a334c;
+u32 var800a3350;
+u32 var800a3354;
+u32 var800a3358;
+u32 var800a335c;
+u32 var800a3360;
+u32 var800a3364;
+u32 var800a3368;
+u32 var800a336c;
+u32 var800a3370;
+u32 var800a3374;
+u32 var800a3378;
+u32 var800a337c;
+u32 var800a3380;
+u32 var800a3384;
+u32 var800a3388;
+u32 var800a338c;
+u32 var800a3390;
+u32 var800a3394;
+u32 var800a3398;
+u32 var800a339c;
+
 u16 var80075cb0 = ROM_COMPANYCODE;
 char var80075cb4[] = "PerfDark";
 char var80075cc0[] = "PerfDark";

src/game/prop.c

@@ -36,6 +36,15 @@
 #include "data.h"
 #include "types.h"
 
+s16 *var8009cda0;
+struct var8009cda4 *var8009cda4;
+struct prop *var8009cda8;
+u32 var8009cdac;
+u32 var8009cdb0;
+u32 var8009cdb4;
+u32 var8009cdb8;
+u32 var8009cdbc;
+
 f32 var80069880 = 1;
 
 GLOBAL_ASM(

src/game/propobj.c

@@ -83,6 +83,22 @@ const char var7f1a9fd0[] = "kkg";
 const char var7f1a9fd4[] = "kkd";
 const char var7f1a9fd8[] = "kkp";
 
+struct weaponobj *g_ProxyMines[30];
+u32 var8009ce38;
+u32 var8009ce3c;
+s32 var8009ce40;
+s32 var8009ce44;
+s32 var8009ce48;
+s32 var8009ce4c;
+s32 g_NumProjectiles;
+s32 g_NumMonitorThings;
+struct var8009ce58 *var8009ce58;
+struct defaultobj *var8009ce5c;
+struct var8009ce60 *var8009ce60;
+struct defaultobj *var8009ce64;
+struct projectile *g_Projectiles;
+struct monitorthing *g_MonitorThings;
+
 u32 g_TintedGlassEnabled = 0;
 s32 g_AlarmTimer = 0;
 struct audiohandle *g_AlarmAudioHandle = NULL;
@@ -94,9 +110,9 @@ f32 var800698ec[3] = {0};
 u32 var800698f8 = 0x00000000;
 f32 var800698fc = 0;
 struct audiohandle *var80069900 = NULL;
-u32 g_CountdownTimerVisible = 1; // 80069904
-bool g_CountdownTimerRunning = false; // 80069908
-f32 g_CountdownTimerValue = 0; // 8006990c
+u32 g_CountdownTimerVisible = 1;
+bool g_CountdownTimerRunning = false;
+f32 g_CountdownTimerValue = 0;
 u32 var80069910 = 0x00000000;
 u32 var80069914 = 0x00000000;
 u32 var80069918 = 0x00000000;

src/game/propobjbss.c

@@ -0,0 +1,15 @@
+#include <ultra64.h>
+#include "constants.h"
+#include "data.h"
+#include "types.h"
+
+u32 var8009ce70;
+u32 var8009ce74;
+u32 var8009ce78[4];
+u32 var8009ce88[4];
+struct monitorscreen var8009ce98;
+u32 var8009cf0c;
+struct monitorscreen var8009cf10;
+u32 var8009cf84;
+struct monitorscreen var8009cf88;
+u32 var8009cffc[12];

src/game/radar.c

@@ -16,6 +16,9 @@
 #include "data.h"
 #include "types.h"
 
+u32 g_RadarX;
+u32 g_RadarY;
+
 bool g_RadarYIndicatorsEnabled = true;
 
 u32 g_TeamColours[] = {

src/game/room.c

@@ -66,6 +66,31 @@ const char var7f1b7584[] = " Failed 1 - Crossed portal %d";
 const char var7f1b75a4[] = " Passed";
 const char var7f1b75ac[] = "edist";
 
+struct var800a4640 var800a4640;
+struct bgprimaryheader *g_BgPrimaryData;
+u32 var800a4920;
+u32 g_BgSection3;
+struct room *g_Rooms;
+u8 *g_MpRoomVisibility;
+s16 g_ActiveRoomNums[350];
+s32 g_NumActiveRooms;
+u16 var800a4bf0[2];
+u32 var800a4bf4;
+s16 var800a4bf8[100];
+struct bgprimaryheader *g_BgPrimaryData2;
+struct var800a4cc4 *var800a4cc4;
+struct portal *g_Portals;
+struct var800a4ccc *var800a4ccc;
+u8 *var800a4cd0;
+struct portalcmd *g_PortalCommands;
+u8 *g_LightsFileData;
+void *var800a4cdc;
+s16 *g_RoomPortals;
+s16 var800a4ce4[2];
+struct var800a4ce8 *var800a4ce8;
+struct portalthing *g_PortalThings;
+struct var800a4cf0 var800a4cf0;
+
 u32 g_StageIndex = 1;
 u32 var8007fc04 = 0x00000000;
 u8 *var8007fc08 = NULL;

src/game/roombss.c

@@ -0,0 +1,98 @@
+#include <ultra64.h>
+#include "constants.h"
+#include "data.h"
+#include "types.h"
+
+u32 var800a6470;
+u32 var800a6474;
+u32 var800a6478;
+u32 var800a647c;
+u32 var800a6480;
+u32 var800a6484;
+u32 var800a6488;
+u32 var800a648c;
+u32 var800a6490;
+u32 var800a6494;
+u32 var800a6498;
+u32 var800a649c;
+u32 var800a64a0;
+u32 var800a64a4;
+u32 var800a64a8;
+u32 var800a64ac;
+u32 var800a64b0;
+u32 var800a64b4;
+u32 var800a64b8;
+u32 var800a64bc;
+u32 var800a64c0;
+u32 var800a64c4;
+u32 var800a64c8;
+u32 var800a64cc;
+u32 var800a64d0;
+u32 var800a64d4;
+u32 var800a64d8;
+u32 var800a64dc;
+u32 var800a64e0;
+u32 var800a64e4;
+u32 var800a64e8;
+u32 var800a64ec;
+u32 var800a64f0;
+u32 var800a64f4;
+u32 var800a64f8;
+u32 var800a64fc;
+u32 var800a6500;
+u32 var800a6504;
+u32 var800a6508;
+u32 var800a650c;
+u32 var800a6510;
+u32 var800a6514;
+u32 var800a6518;
+u32 var800a651c;
+u32 var800a6520;
+u32 var800a6524;
+u32 var800a6528;
+u32 var800a652c;
+u32 var800a6530;
+u32 var800a6534;
+u32 var800a6538;
+u32 var800a653c;
+u32 var800a6540;
+u32 var800a6544;
+u32 var800a6548;
+u32 var800a654c;
+u32 var800a6550;
+u32 var800a6554;
+u32 var800a6558;
+u32 var800a655c;
+u32 var800a6560;
+u32 var800a6564;
+u32 var800a6568;
+u32 var800a656c;
+u32 var800a6570;
+u32 var800a6574;
+u32 var800a6578;
+u32 var800a657c;
+u32 var800a6580;
+u32 var800a6584;
+u32 var800a6588;
+u32 var800a658c;
+u32 var800a6590;
+u32 var800a6594;
+u32 var800a6598;
+u32 var800a659c;
+u32 var800a65a0;
+u32 var800a65a4;
+u32 var800a65a8;
+u32 var800a65ac;
+u32 var800a65b0;
+u32 var800a65b4;
+u32 var800a65b8;
+u32 var800a65bc;
+struct screenbox var800a65c0;
+struct screenbox var800a65c8;
+u32 g_PortalDisableParentExec;
+u32 var800a65d4;
+u32 var800a65d8;
+u32 var800a65dc;
+u32 g_FogDisabled;
+u32 var800a65e4;
+u32 var800a65e8;

src/game/shards/create.c

@@ -12,6 +12,9 @@
 #include "data.h"
 #include "types.h"
 
+s32 g_MaxShards;
+struct shard *g_Shards;
+
 u32 var8007fa80 = 0x00000000;
 bool g_ShardsActive = false;
 

src/game/sky.c

@@ -13,6 +13,11 @@
 #include "data.h"
 #include "types.h"
 
+u32 var800a4150;
+f32 *var800a4154;
+s32 var800a4158;
+u32 var800a415c;
+
 u32 var8007f120 = 0x00000000;
 u32 var8007f124 = 0x00000000;
 u32 var8007f128 = 0x00000000;

src/game/smoke/smoke.c

@@ -27,6 +27,11 @@ const u32 var7f1b55f4[] = {0x00000000};
 const u32 var7f1b55f8[] = {0x00000000};
 const u32 var7f1b55fc[] = {0x00000000};
 
+struct smoke *g_Smokes;
+s32 g_MaxSmokes;
+Mtx var800a3448;
+Mtx var800a3488;
+
 struct smoketype g_SmokeTypes[NUM_SMOKETYPES] = {
 	//       duration
 	//       |    fadespeed

src/game/sparks/sparks.c

@@ -21,6 +21,19 @@ const u32 var7f1b5614[] = {0x00000000};
 const u32 var7f1b5618[] = {0x00000000};
 const u32 var7f1b561c[] = {0x00000000};
 
+struct spark g_Sparks[100];
+u32 g_NextSparkIndex;
+u32 var800a3fc4;
+struct sparkgroup g_SparkGroups[10];
+u32 var800a4130;
+u32 var800a4134;
+u32 var800a4138;
+u32 var800a413c;
+u32 var800a4140;
+u32 var800a4144;
+u32 var800a4148;
+u32 var800a414c;
+
 struct sparktype g_SparkTypes[] = {
 	//                                     weight
 	//                                     |     max age

src/game/texture.c

@@ -11,6 +11,41 @@
 #include "data.h"
 #include "types.h"
 
+struct texture *g_Textures;
+u32 var800aabc4;
+u32 var800aabc8[4];
+u8 var800aabd8[2400];
+u32 var800ab538;
+u32 var800ab53c;
+u32 var800ab540;
+u32 var800ab544;
+u32 var800ab548;
+u32 var800ab54c;
+u32 var800ab550;
+u8 *g_TextureConfigSegment;
+u32 var800ab558;
+struct textureconfig *var800ab55c;
+struct textureconfig *var800ab560;
+Gfx *var800ab564;
+Gfx *var800ab568;
+Gfx *var800ab56c;
+struct var800ab570 *var800ab570;
+struct textureconfig *var800ab574;
+struct textureconfig *var800ab578;
+struct textureconfig *var800ab57c;
+struct textureconfig *var800ab580;
+struct textureconfig *var800ab584;
+struct textureconfig *var800ab588;
+struct textureconfig *var800ab58c;
+struct textureconfig *var800ab590;
+struct textureconfig *var800ab594;
+struct textureconfig *var800ab598;
+struct textureconfig *var800ab59c;
+struct textureconfig *var800ab5a0;
+struct textureconfig *var800ab5a4;
+struct textureconfig *var800ab5a8;
+struct textureconfig *var800ab5ac;
+
 u32 var800841b0 = 0x0006ddd0;
 u32 var800841b4 = 0x00000000;
 u32 var800841b8 = 0x00000004;

src/game/title.c

@@ -29,6 +29,12 @@
 #include "data.h"
 #include "types.h"
 
+u8 *var8009cca0;
+u32 var8009cca4;
+u8 *var8009cca8[2];
+u8 *var8009ccb0[2];
+u32 var8009ccb8;
+
 s16 var800624a0 = 480;
 s32 var800624a4 = false;
 u32 var800624a8 = 0x00000000;

src/game/training/training.c

@@ -43,6 +43,10 @@
 extern u8 *_firingrangeSegmentRomStart;
 extern u8 *_firingrangeSegmentRomEnd;
 
+struct frdata g_FrData;
+struct trainingdata g_DtData;
+struct trainingdata g_HtData;
+
 u16 *g_FrScriptOffsets = NULL;
 u8 g_FrIsValidWeapon = false;
 u8 g_FrDataLoaded = false;
@@ -4817,21 +4821,21 @@ char *dtGetTip2(void)
 
 struct trainingdata *getHoloTrainingData(void)
 {
-	return &g_HoloTrainingData;
+	return &g_HtData;
 }
 
 void htPushEndscreen(void)
 {
-	if (g_HoloTrainingData.completed) {
+	if (g_HtData.completed) {
 		func0f0f85e0(&g_HtCompletedMenuDialog, MENUROOT_TRAINING);
-	} else if (g_HoloTrainingData.failed) {
+	} else if (g_HtData.failed) {
 		func0f0f85e0(&g_HtFailedMenuDialog, MENUROOT_TRAINING);
 	}
 
-	g_HoloTrainingData.timeleft = 0;
-	g_HoloTrainingData.completed = false;
-	g_HoloTrainingData.failed = false;
-	g_HoloTrainingData.finished = false;
+	g_HtData.timeleft = 0;
+	g_HtData.completed = false;
+	g_HtData.failed = false;
+	g_HtData.finished = false;
 }
 
 u8 var80088bb4 = 0;
@@ -4840,8 +4844,8 @@ u8 var80088bb8 = 0;
 void htTick(void)
 {
 	if (var80088bb8) {
-		if (g_HoloTrainingData.intraining) {
-			g_HoloTrainingData.timetaken += g_Vars.lvupdate240_60;
+		if (g_HtData.intraining) {
+			g_HtData.timetaken += g_Vars.lvupdate240_60;
 
 			if (g_Vars.currentplayer->isdead) {
 				htEnd();
@@ -4849,20 +4853,20 @@ void htTick(void)
 
 			if (chrHasStageFlag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_FAILURE)) {
 				htEnd();
-				g_HoloTrainingData.failed = true;
-				g_HoloTrainingData.timeleft = 1;
-				g_HoloTrainingData.finished = true;
+				g_HtData.failed = true;
+				g_HtData.timeleft = 1;
+				g_HtData.finished = true;
 			} else if (chrHasStageFlag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_SUCCESS)) {
 				htEnd();
-				g_HoloTrainingData.completed = true;
-				g_HoloTrainingData.timeleft = 1;
-				g_HoloTrainingData.finished = true;
+				g_HtData.completed = true;
+				g_HtData.timeleft = 1;
+				g_HtData.finished = true;
 			}
-		} else if (g_HoloTrainingData.finished) {
-			if (g_HoloTrainingData.timeleft <= 0) {
+		} else if (g_HtData.finished) {
+			if (g_HtData.timeleft <= 0) {
 				htPushEndscreen();
 			} else {
-				g_HoloTrainingData.timeleft -= g_Vars.lvupdate240_60;
+				g_HtData.timeleft -= g_Vars.lvupdate240_60;
 			}
 		}
 	}
@@ -4872,12 +4876,12 @@ void func0f1a2198(void)
 {
 	if (var80088bb8 == false) {
 		var80088bb8 = true;
-		g_HoloTrainingData.intraining = false;
-		g_HoloTrainingData.failed = false;
-		g_HoloTrainingData.completed = false;
-		g_HoloTrainingData.finished = false;
-		g_HoloTrainingData.timeleft = 0;
-		g_HoloTrainingData.timetaken = 0;
+		g_HtData.intraining = false;
+		g_HtData.failed = false;
+		g_HtData.completed = false;
+		g_HtData.finished = false;
+		g_HtData.timeleft = 0;
+		g_HtData.timetaken = 0;
 		chrUnsetStageFlag(NULL, STAGEFLAG_CI_HOLO_ABORTING);
 		chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_SUCCESS);
 		chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_FAILURE);
@@ -4888,8 +4892,8 @@ void htBegin(void)
 {
 	struct waypoint *waypoints = g_StageSetup.waypoints;
 
-	g_HoloTrainingData.intraining = true;
-	g_HoloTrainingData.timetaken = 0;
+	g_HtData.intraining = true;
+	g_HtData.timetaken = 0;
 	chrUnsetStageFlag(NULL, STAGEFLAG_CI_HOLO_ABORTING);
 	chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_SUCCESS);
 	chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_FAILURE);
@@ -4911,7 +4915,7 @@ void htEnd(void)
 	s16 rooms[5] = { 0x0016, 0x0017, 0x0018, 0x0019, -1 };
 	struct waypoint *waypoints = g_StageSetup.waypoints;
 
-	g_HoloTrainingData.intraining = false;
+	g_HtData.intraining = false;
 	chrSetStageFlag(NULL, STAGEFLAG_CI_HOLO_ABORTING);
 	chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_FAILURE);
 	chrUnsetStageFlag(NULL, func0f1a25c0(htGetIndexBySlot(var80088bb4)));

src/game/utils.c

@@ -14,6 +14,19 @@ const char var7f1b7d2c[] = "";
 const char var7f1b7d30[] = "";
 const char var7f1b7d34[] = "Utils -> Attempt to normalise zeo length vector\n";
 
+u32 var800ac0d0;
+u32 var800ac0d4;
+u32 var800ac0d8;
+u32 var800ac0dc;
+u32 var800ac0e0;
+u32 var800ac0e4;
+u32 var800ac0e8;
+u32 var800ac0ec;
+u32 var800ac0f0;
+u32 var800ac0f4;
+u32 var800ac0f8[4];
+u32 var800ac108;
+
 f32 var800845d0 = 999999;
 f32 var800845d4 = 0.00001f;
 s32 var800845d8 = 1;

src/game/wallhit.c

@@ -60,6 +60,10 @@ const char var7f1b5cc8[] = "";
 const char var7f1b5ccc[] = "";
 const char var7f1b5cd0[] = "Wallhit colour %d not implemented, substituting black\n";
 
+struct var800a41b0 *var800a41b0;
+struct var800a41b0 *var800a41b4;
+u32 var800a41b8;
+
 u32 var8007f740 = 0x00000000;
 u8 var8007f744[4] = {0x40, 0x0a, 0x0a, 0x00};
 u32 var8007f748 = 0x3f800000;

src/include/gvars/gvars.h

@@ -552,8 +552,8 @@ extern struct var8009ce60 *var8009ce60;
 extern struct defaultobj *var8009ce64;
 extern struct projectile *g_Projectiles;
 extern struct monitorthing *g_MonitorThings;
-extern u32 var8009ce78;
-extern u32 var8009ce88;
+extern u32 var8009ce78[4];
+extern u32 var8009ce88[4];
 extern struct monitorscreen var8009ce98;
 extern struct monitorscreen var8009cf10;
 extern struct monitorscreen var8009cf88;
@@ -706,7 +706,7 @@ extern u32 var800a4920;
 extern u32 g_BgSection3;
 extern struct room *g_Rooms;
 extern u8 *g_MpRoomVisibility;
-extern s16 g_ActiveRoomNums[1];
+extern s16 g_ActiveRoomNums[350];
 extern s32 g_NumActiveRooms;
 extern u16 var800a4bf0[2];
 extern s16 var800a4bf8[100];
@@ -763,7 +763,7 @@ extern void *var800aabb4;
 extern struct var800aabb8 *var800aabb8;
 extern struct texture *g_Textures;
 extern u32 var800aabc8[4];
-extern u32 var800aabd8;
+extern u8 var800aabd8[2400];
 extern u32 var800ab538;
 extern u32 var800ab53c;
 extern u32 var800ab540;
@@ -799,9 +799,9 @@ extern struct var800ab718 var800ab718[8];
 extern u32 var800ab7b8;
 extern u32 var800ab7c0;
 extern u32 var800ab7c4;
-extern u32 var800ab7c8;
-extern u32 var800abac8;
-extern u32 var800abdc8;
+extern u8 var800ab7c8[0x300];
+extern u8 var800abac8[0x300];
+extern u8 var800abdc8[0x300];
 extern u32 var800ac0e8;
 extern u32 var800ac0f8[4];
 extern u32 var800ac108;
@@ -837,6 +837,6 @@ extern u8 g_MpFeaturesForceUnlocked[40];
 extern u8 g_MpFeaturesUnlocked[80];
 extern struct frdata g_FrData;
 extern struct trainingdata g_DtData;
-extern struct trainingdata g_HoloTrainingData;
+extern struct trainingdata g_HtData;
 
 #endif