diff --git a/src/files/setup/setupame.c b/src/files/setup/setupame.c
index cd752a8be..9d95179c5 100644
--- a/src/files/setup/setupame.c
+++ b/src/files/setup/setupame.c
@@ -567,11 +567,7 @@ u32 props[] = {
 
 	tag(0x00, 1)
 	key(0x0100, MODEL_CHRCHAIN, CHR_CASS, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_COLLECTABLE | OBJFLAG_00200000 | OBJFLAG_01000000, 0, 0, 32)
-#if VERSION >= VERSION_NTSC_1_0
 	rename_object(-1, WEAPON_NECKLACE, L_AME_011, L_AME_012, L_AME_013, L_AME_014, L_AME_015) // "Obtain De Vries' necklace."
-#else
-	rename_object(-1, 0x004f, L_AME_011, L_AME_012, L_AME_013, L_AME_014, L_AME_015) // "Obtain De Vries' necklace."
-#endif
 
 	stdobject(0x0100, MODEL_DD_STONEDESK, PAD_AME_0134, OBJFLAG_00000001 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000080 | OBJFLAG_00000100 | OBJFLAG_ILLUMINATED | OBJFLAG_INVINCIBLE, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_00200000, 0, 1000)
 	singlemonitor(0x0100, MODEL_PC1, PAD_AME_0132, OBJFLAG_00000001 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000080 | OBJFLAG_ILLUMINATED, 0, 0, 1000, 33)
diff --git a/src/files/setup/setupear.c b/src/files/setup/setupear.c
index 1e0668df0..a340edf2f 100644
--- a/src/files/setup/setupear.c
+++ b/src/files/setup/setupear.c
@@ -579,10 +579,11 @@ u32 props[] = {
 	tag(0x06, 1)
 #if VERSION >= VERSION_NTSC_1_0
 	stdobject(0x0100, MODEL_CHRSHIELD, PAD_EAR_0243, OBJFLAG_00000001 | OBJFLAG_00000100 | OBJFLAG_ILLUMINATED | OBJFLAG_INVINCIBLE | OBJFLAG_COLLECTABLE | OBJFLAG_00400000 | OBJFLAG_01000000, OBJFLAG2_00000001 | OBJFLAG2_IMMUNETOGUNFIRE, OBJFLAG3_00400000, 1000)
+	rename_object(-1, WEAPON_SHIELDTECHITEM, L_EAR_050, L_EAR_051, L_EAR_052, L_EAR_053, L_EAR_054) // "Obtain shield tech item."
 #else
 	stdobject(0x0100, MODEL_CHRSHIELD, PAD_EAR_0243, OBJFLAG_00000001 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000080 | OBJFLAG_00000100 | OBJFLAG_ILLUMINATED | OBJFLAG_INVINCIBLE | OBJFLAG_COLLECTABLE | OBJFLAG_00400000 | OBJFLAG_01000000, OBJFLAG2_00000001 | OBJFLAG2_IMMUNETOGUNFIRE, OBJFLAG3_00400000, 1000)
+	rename_object(-1, WEAPON_BRIEFCASE, L_EAR_050, L_EAR_051, L_EAR_052, L_EAR_053, L_EAR_054) // "Obtain shield tech item."
 #endif
-	rename_object(-1, WEAPON_SHIELD, L_EAR_050, L_EAR_051, L_EAR_052, L_EAR_053, L_EAR_054) // "Obtain shield tech item."
 	tag(0x25, 1)
 	weapon(0x0180, MODEL_CHRDATATHIEF, -1, OBJFLAG_00000001, 0, 0, WEAPON_DATAUPLINK)
 	rename_object(-1, WEAPON_DATAUPLINK, L_EAR_055, L_EAR_056, L_EAR_057, L_EAR_058, L_EAR_059) // "Obtain Data Uplink."
diff --git a/src/files/setup/setupimp.c b/src/files/setup/setupimp.c
index 0be930b09..035a285c1 100644
--- a/src/files/setup/setupimp.c
+++ b/src/files/setup/setupimp.c
@@ -418,11 +418,7 @@ u32 props[] = {
 	weapon(0x0180, MODEL_CHRRCP120, PAD_IMP_011A, OBJFLAG_00000008 | OBJFLAG_UNCOLLECTABLE, 0, OBJFLAG3_00400000 | OBJFLAG3_20000000, WEAPON_RCP120)
 	tag(0x09, 1)
 	stdobject(0x0480, MODEL_SENSITIVEINFO, PAD_IMP_010F, OBJFLAG_00000008 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000080 | OBJFLAG_ILLUMINATED | OBJFLAG_INVINCIBLE, 0, 0, 1000)
-#if VERSION >= VERSION_NTSC_1_0
 	rename_object(-1, WEAPON_BRIEFCASE, L_IMP_010, L_IMP_011, L_IMP_012, L_IMP_013, L_IMP_014) // "Obtain sensitive info."
-#else
-	rename_object(-1, WEAPON_SHIELD, L_IMP_010, L_IMP_011, L_IMP_012, L_IMP_013, L_IMP_014) // "Obtain sensitive info."
-#endif
 	tag(0x4f, 1)
 	weapon(0x0180, MODEL_CHRDATATHIEF, -1, OBJFLAG_00000001, 0, 0, WEAPON_DATAUPLINK)
 	rename_object(-1, WEAPON_DATAUPLINK, L_IMP_057, L_IMP_058, L_IMP_059, L_IMP_060, L_IMP_061) // "Obtain Data Uplink."
diff --git a/src/game/bondgun.c b/src/game/bondgun.c
index 1aed446bc..57e3712d1 100644
--- a/src/game/bondgun.c
+++ b/src/game/bondgun.c
@@ -8221,9 +8221,7 @@ s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand *
 				case WEAPON_KEYCARD4B:
 				case WEAPON_KEYCARD4C:
 				case WEAPON_SUITCASE:
-#if VERSION >= VERSION_NTSC_1_0
 				case WEAPON_BRIEFCASE:
-#endif
 				case WEAPON_NECKLACE:
 				case WEAPON_BRIEFCASE2:
 					// No equip sound
@@ -28192,10 +28190,6 @@ glabel var7f1acb14
 GLOBAL_ASM(
 glabel bgunConsiderToggleGunFunction
 .late_rodata
-glabel var7f1a6fccnb
-.word 0x453b8000
-glabel var7f1a6fd0nb
-.word 0x453b8000
 glabel var7f1acaa4
 .word bgunConsiderToggleGunFunction+0x104
 glabel var7f1a6fd8nb
@@ -28254,9 +28248,6 @@ glabel var7f1a7040nb
 .word bgunConsiderToggleGunFunction+0x1f4
 glabel var7f1a7044nb
 .word bgunConsiderToggleGunFunction+0x0b0
-
-
-
 .text
 /*  f0a895c:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*  f0a8960:	afbf0014 */ 	sw	$ra,0x14($sp)
diff --git a/src/game/game_197c00.c b/src/game/game_197c00.c
index 5c5f43810..3a253558e 100644
--- a/src/game/game_197c00.c
+++ b/src/game/game_197c00.c
@@ -100,10 +100,10 @@ struct aibotweaponpreference g_AibotWeaponPreferences[] = {
 	/*0x4b*/ { 0,   0,   0,   0,   0, 0, 2, 2, 0,    0,   0,  0,  1, 0 }, // WEAPON_KEYCARD4B
 	/*0x4c*/ { 0,   0,   0,   0,   0, 0, 2, 2, 0,    0,   0,  0,  1, 0 }, // WEAPON_KEYCARD4C
 	/*0x4d*/ { 0,   0,   0,   0,   0, 0, 2, 2, 0,    0,   0,  0,  1, 0 }, // WEAPON_SUITCASE
-#if VERSION >= VERSION_NTSC_1_0
 	/*0x4e*/ { 0,   0,   0,   0,   0, 0, 2, 2, 0,    0,   0,  0,  1, 0 }, // WEAPON_BRIEFCASE
+#if VERSION >= VERSION_NTSC_1_0
+	/*0x4f*/ { 0,   0,   0,   0,   0, 0, 2, 2, 0,    0,   0,  0,  1, 0 }, // WEAPON_SHIELDTECHITEM
 #endif
-	/*0x4f*/ { 0,   0,   0,   0,   0, 0, 2, 2, 0,    0,   0,  0,  1, 0 }, // WEAPON_SHIELD
 	/*0x50*/ { 0,   0,   0,   0,   0, 0, 2, 2, 0,    0,   0,  0,  1, 0 }, // WEAPON_NECKLACE
 	/*0x51*/ { 0,   0,   0,   0,   0, 0, 2, 2, 0,    0,   0,  0,  1, 0 }, // WEAPON_HAMMER
 	/*0x52*/ { 0,   0,   0,   0,   0, 0, 2, 2, 0,    0,   0,  0,  1, 0 }, // WEAPON_SCREWDRIVER
diff --git a/src/game/inventory/items.c b/src/game/inventory/items.c
index 2d84408df..1031d8541 100644
--- a/src/game/inventory/items.c
+++ b/src/game/inventory/items.c
@@ -5876,7 +5876,7 @@ struct weapon invitem_necklace = {
 };
 
 #if VERSION >= VERSION_NTSC_1_0
-struct weapon invitem_shield = {
+struct weapon invitem_shieldtechitem = {
 	FILE_PCHRSHIELD, // hi model
 	FILE_PCHRSHIELD, // lo model
 	NULL, // equip animation
@@ -6134,7 +6134,7 @@ struct weapon *g_Weapons[] = {
 	&invitem_suitcase,
 	&invitem_briefcase,
 #if VERSION >= VERSION_NTSC_1_0
-	&invitem_shield,
+	&invitem_shieldtechitem,
 #endif
 	&invitem_necklace,
 	&invitem_hammer,
diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c
index 1205fe6c6..9589ba28d 100644
--- a/src/game/pak/pak.c
+++ b/src/game/pak/pak.c
@@ -3695,83 +3695,6 @@ const char var7f1b43f8[] = "Pak -> Pak_MakeOne - Id=%d is finished\n";
 const char var7f1b43f8[] = "Pak -> Pak_MakeOne - Id=%d is finished";
 #endif
 
-#if VERSION < VERSION_NTSC_1_0
-const char var7f1ae2d0nb[] = "pak.c";
-const char var7f1ae2d8nb[] = "pak.c";
-#endif
-
-#if VERSION >= VERSION_NTSC_1_0
-const char var7f1b4420[] = "Pak %d -> Pak_Memory_UpdateNoteInfo\n";
-#else
-const char var7f1b4420[] = "Pak %d -> Pak_Memory_UpdateNoteInfo";
-#endif
-
-#if VERSION < VERSION_NTSC_1_0
-const char var7f1ae304nb[] = "pak.c";
-const char var7f1ae30cnb[] = "pak.c";
-#endif
-
-#if VERSION >= VERSION_NTSC_1_0
-const char var7f1b4448[] = "Pak %d -> Couldn't assertain the game note size\n";
-const char var7f1b447c[] = "Pak %d -> Pak_AnalyseCurrentGameNote - Game note size = %uk\n";
-#else
-const char var7f1b4448[] = "Pak %d -> Couldn't assertain the game note size";
-const char var7f1b447c[] = "Pak %d -> Pak_AnalyseCurrentGameNote - Game note size = %uk";
-const char var7f1ae380nb[] = "Pak %d -> Pak_Memory_Init1";
-const char var7f1ae39cnb[] = "pak.c";
-const char var7f1ae3a4nb[] = "pak.c";
-#endif
-
-#if VERSION >= VERSION_NTSC_1_0
-const char var7f1b44bc[] = "Pak %d -> Searching for the game file\n";
-#else
-const char var7f1b44bc[] = "Pak %d -> Searching for the game file";
-#endif
-
-#if VERSION < VERSION_NTSC_1_0
-const char var7f1ae3d4nb[] = "pak.c";
-const char var7f1ae3dcnb[] = "pak.c";
-const char var7f1ae3e4nb[] = "pak.c";
-const char var7f1ae3ecnb[] = "pak.c";
-const char var7f1ae3f4nb[] = "-forcewipe";
-const char var7f1ae400nb[] = "-forcescrub";
-const char var7f1ae40cnb[] = "Pak %d -> Initialisation - No swap file";
-const char var7f1ae434nb[] = "Pak %d -> Initialisation - Found a swap file";
-const char var7f1ae464nb[] = "pak.c";
-const char var7f1ae46cnb[] = "pak.c";
-const char var7f1ae474nb[] = "pak.c";
-const char var7f1ae47cnb[] = "pak.c";
-const char var7f1ae484nb[] = "pak.c";
-const char var7f1ae48cnb[] = "pak.c";
-const char var7f1ae494nb[] = "pak.c";
-const char var7f1ae49cnb[] = "Pak %d -> About to wipe blocks %d to %d of the game file with the wipe byte %d";
-#endif
-
-#if VERSION >= VERSION_NTSC_1_0
-const char var7f1b44e4[] = "Pak %d -> Game file wipe failed\n";
-#else
-const char var7f1b44e4[] = "Pak %d -> Game file wipe failed";
-#endif
-
-const char var7f1b4508[] = "RWI : Warning : tOffset > gPakObj[PakNum].GameFileSize\n";
-
-#if VERSION < VERSION_NTSC_1_0
-const char var7f1ae544nb[] = "pak.c";
-const char var7f1ae54cnb[] = "pak.c";
-const char var7f1ae554nb[] = "pak.c";
-#endif
-
-const char var7f1b4540[] = "Pak %d -> Pak_DeleteFile_Offset - DataSize = %u\n";
-
-#if VERSION >= VERSION_NTSC_1_0
-const char var7f1b4574[] = "Pak %d -> Delete file offset (file id %d) failed\n";
-const char var7f1b45a8[] = "Pak %d -> Delete file offset failed - Bad Offset passed\n";
-#else
-const char var7f1b4574[] = "Pak %d -> Delete file offset (file id %d) failed";
-const char var7f1b45a8[] = "Pak %d -> Delete file offset failed - Bad Offset passed";
-#endif
-
-
 #if VERSION >= VERSION_NTSC_1_0
 GLOBAL_ASM(
 glabel pakInit
@@ -3934,6 +3857,12 @@ bool pakQueryTotalUsage(s8 device)
 	s32 ret;
 	s32 i;
 
+#if VERSION >= VERSION_NTSC_1_0
+	osSyncPrintf("Pak %d -> Pak_Memory_UpdateNoteInfo\n", device);
+#else
+	osSyncPrintf("Pak %d -> Pak_Memory_UpdateNoteInfo", device);
+#endif
+
 	if (!pak->unk2b8_02) {
 		return true;
 	}
@@ -4023,6 +3952,16 @@ void pakQueryPdSize(s8 device)
 		g_Paks[device].pdnumpages = g_Paks[device].pdnumbytes / 256;
 		g_Paks[device].pdnumnotes = g_Paks[device].pdnumbytes / (256 * NUM_PAGES);
 	}
+
+	// These strings belong in this function, but the function needs to be
+	// reworked to put them in their correct places
+#if VERSION >= VERSION_NTSC_1_0
+	osSyncPrintf("Pak %d -> Couldn't assertain the game note size\n");
+	osSyncPrintf("Pak %d -> Pak_AnalyseCurrentGameNote - Game note size = %uk\n");
+#else
+	osSyncPrintf("Pak %d -> Couldn't assertain the game note size");
+	osSyncPrintf("Pak %d -> Pak_AnalyseCurrentGameNote - Game note size = %uk");
+#endif
 }
 
 #if VERSION < VERSION_NTSC_1_0
@@ -4946,6 +4885,29 @@ glabel mempakPrepare
 //	return false;
 //}
 
+#if VERSION < VERSION_NTSC_1_0
+const char var7f1ae380nb[] = "Pak %d -> Pak_Memory_Init1";
+const char var7f1ae39cnb[] = "pak.c";
+const char var7f1ae3a4nb[] = "pak.c";
+#endif
+
+#if VERSION >= VERSION_NTSC_1_0
+const char var7f1b44bc[] = "Pak %d -> Searching for the game file\n";
+#else
+const char var7f1b44bc[] = "Pak %d -> Searching for the game file";
+#endif
+
+#if VERSION < VERSION_NTSC_1_0
+const char var7f1ae3d4nb[] = "pak.c";
+const char var7f1ae3dcnb[] = "pak.c";
+const char var7f1ae3e4nb[] = "pak.c";
+const char var7f1ae3ecnb[] = "pak.c";
+const char var7f1ae3f4nb[] = "-forcewipe";
+const char var7f1ae400nb[] = "-forcescrub";
+const char var7f1ae40cnb[] = "Pak %d -> Initialisation - No swap file";
+const char var7f1ae434nb[] = "Pak %d -> Initialisation - Found a swap file";
+#endif
+
 bool pakProbe(s8 device)
 {
 	bool plugged = false;
@@ -5080,6 +5042,12 @@ bool pakProbe(s8 device)
 #endif
 }
 
+#if VERSION < VERSION_NTSC_1_0
+const char var7f1ae48cnb[] = "pak.c";
+const char var7f1ae494nb[] = "pak.c";
+const char var7f1ae49cnb[] = "Pak %d -> About to wipe blocks %d to %d of the game file with the wipe byte %d";
+#endif
+
 #if VERSION < VERSION_NTSC_1_0
 GLOBAL_ASM(
 glabel pak0f114dd4nb
@@ -5232,6 +5200,11 @@ void pakWipe(s8 device, u32 blocknumstart, u32 blocknumend)
 		if (!pakHandleResult(result, device, true, 3573))
 #endif
 		{
+#if VERSION >= VERSION_NTSC_1_0
+			osSyncPrintf("Pak %d -> Game file wipe failed\n", device);
+#else
+			osSyncPrintf("Pak %d -> Game file wipe failed", device);
+#endif
 			g_Paks[device].pdnoteindex = -1;
 			break;
 		}
@@ -5400,6 +5373,8 @@ bool pakGetFilesystemLength(s8 device, u32 *outlen)
 	return false;
 }
 
+const char var7f1b4508[] = "RWI : Warning : tOffset > gPakObj[PakNum].GameFileSize\n";
+
 /**
  * Read a file from cache or from the pak and write it to *data.
  */
@@ -5541,6 +5516,16 @@ s32 pak0f11b86c(s8 device, u32 offset, u8 *data, struct pakfileheader *header, s
 	return 0;
 }
 
+const char var7f1b4540[] = "Pak %d -> Pak_DeleteFile_Offset - DataSize = %u\n";
+
+#if VERSION >= VERSION_NTSC_1_0
+const char var7f1b4574[] = "Pak %d -> Delete file offset (file id %d) failed\n";
+const char var7f1b45a8[] = "Pak %d -> Delete file offset failed - Bad Offset passed\n";
+#else
+const char var7f1b4574[] = "Pak %d -> Delete file offset (file id %d) failed";
+const char var7f1b45a8[] = "Pak %d -> Delete file offset failed - Bad Offset passed";
+#endif
+
 bool pakReplaceFileAtOffsetWithBlank(s8 device, u32 offset)
 {
 	struct pakfileheader header;
diff --git a/src/include/constants.h b/src/include/constants.h
index 39ac3ddff..7e3dd52e0 100644
--- a/src/include/constants.h
+++ b/src/include/constants.h
@@ -3945,10 +3945,10 @@ enum weaponnum {
 	/*0x4b*/ WEAPON_KEYCARD4B,
 	/*0x4c*/ WEAPON_KEYCARD4C,
 	/*0x4d*/ WEAPON_SUITCASE,
-#if VERSION >= VERSION_NTSC_1_0
 	/*0x4e*/ WEAPON_BRIEFCASE,
+#if VERSION >= VERSION_NTSC_1_0
+	/*0x4f*/ WEAPON_SHIELDTECHITEM,
 #endif
-	/*0x4f*/ WEAPON_SHIELD,
 	/*0x50*/ WEAPON_NECKLACE,
 	/*0x51*/ WEAPON_HAMMER,
 	/*0x52*/ WEAPON_SCREWDRIVER,
@@ -3965,10 +3965,6 @@ enum weaponnum {
 	/*0x5d*/ WEAPON_SUICIDEPILL
 };
 
-#if VERSION < VERSION_NTSC_1_0
-#define WEAPON_BRIEFCASE WEAPON_SUITCASE
-#endif
-
 #define WEAPONCLASSFLAG_MANUALZOOM 0x00000001
 #define WEAPONCLASSFLAG_AUTOAIM    0x00000002
 #define WEAPONCLASSFLAG_00000004   0x00000004