diff --git a/src/game/game_015470.c b/src/game/game_015470.c
index ea28fb7f9..304c94471 100644
--- a/src/game/game_015470.c
+++ b/src/game/game_015470.c
@@ -8727,8 +8727,8 @@ glabel func0f01bf28
 .L0f01ce44:
 /*  f01ce44:	00116880 */ 	sll	$t5,$s1,0x2
 /*  f01ce48:	01b16821 */ 	addu	$t5,$t5,$s1
-/*  f01ce4c:	3c19800b */ 	lui	$t9,%hi(g_MpChrs)
-/*  f01ce50:	2739c7b8 */ 	addiu	$t9,$t9,%lo(g_MpChrs)
+/*  f01ce4c:	3c19800b */ 	lui	$t9,%hi(g_MpPlayers)
+/*  f01ce50:	2739c7b8 */ 	addiu	$t9,$t9,%lo(g_MpPlayers)
 /*  f01ce54:	000d6940 */ 	sll	$t5,$t5,0x5
 /*  f01ce58:	01b91021 */ 	addu	$v0,$t5,$t9
 /*  f01ce5c:	afa20058 */ 	sw	$v0,0x58($sp)
@@ -8908,8 +8908,8 @@ glabel func0f01bf28
 .L0f01d0c8:
 /*  f01d0c8:	3c05800b */ 	lui	$a1,%hi(var800acad8)
 /*  f01d0cc:	3c06800b */ 	lui	$a2,0x800b
-/*  f01d0d0:	3c07800b */ 	lui	$a3,%hi(g_MpChrs)
-/*  f01d0d4:	24e7c7b8 */ 	addiu	$a3,$a3,%lo(g_MpChrs)
+/*  f01d0d0:	3c07800b */ 	lui	$a3,%hi(g_MpPlayers)
+/*  f01d0d4:	24e7c7b8 */ 	addiu	$a3,$a3,%lo(g_MpPlayers)
 /*  f01d0d8:	24c6c858 */ 	addiu	$a2,$a2,-14248
 /*  f01d0dc:	24a5cad8 */ 	addiu	$a1,$a1,%lo(var800acad8)
 /*  f01d0e0:	00807825 */ 	or	$t7,$a0,$zero
diff --git a/src/game/game_097a50.c b/src/game/game_097a50.c
index e58c7d5ff..1df33eeda 100644
--- a/src/game/game_097a50.c
+++ b/src/game/game_097a50.c
@@ -20028,8 +20028,8 @@ glabel func0f0a895c
 /*  f0a8ae4:	24e2ffff */ 	addiu	$v0,$a3,-1
 /*  f0a8ae8:	0002c8c3 */ 	sra	$t9,$v0,0x3
 /*  f0a8aec:	8dcf0070 */ 	lw	$t7,0x70($t6)
-/*  f0a8af0:	3c0a800b */ 	lui	$t2,%hi(g_MpChrs)
-/*  f0a8af4:	254ac7b8 */ 	addiu	$t2,$t2,%lo(g_MpChrs)
+/*  f0a8af0:	3c0a800b */ 	lui	$t2,%hi(g_MpPlayers)
+/*  f0a8af4:	254ac7b8 */ 	addiu	$t2,$t2,%lo(g_MpPlayers)
 /*  f0a8af8:	000fc080 */ 	sll	$t8,$t7,0x2
 /*  f0a8afc:	030fc021 */ 	addu	$t8,$t8,$t7
 /*  f0a8b00:	0018c140 */ 	sll	$t8,$t8,0x5
@@ -20080,9 +20080,9 @@ glabel func0f0a895c
 /*  f0a8ba0:	24e2ffff */ 	addiu	$v0,$a3,-1
 /*  f0a8ba4:	8d0d0288 */ 	lw	$t5,0x288($t0)
 /*  f0a8ba8:	0002c0c3 */ 	sra	$t8,$v0,0x3
-/*  f0a8bac:	3c0b800b */ 	lui	$t3,%hi(g_MpChrs)
+/*  f0a8bac:	3c0b800b */ 	lui	$t3,%hi(g_MpPlayers)
 /*  f0a8bb0:	8dae0070 */ 	lw	$t6,0x70($t5)
-/*  f0a8bb4:	256bc7b8 */ 	addiu	$t3,$t3,%lo(g_MpChrs)
+/*  f0a8bb4:	256bc7b8 */ 	addiu	$t3,$t3,%lo(g_MpPlayers)
 /*  f0a8bb8:	304a0007 */ 	andi	$t2,$v0,0x7
 /*  f0a8bbc:	000e7880 */ 	sll	$t7,$t6,0x2
 /*  f0a8bc0:	01ee7821 */ 	addu	$t7,$t7,$t6
@@ -20101,8 +20101,8 @@ glabel func0f0a895c
 /*  f0a8bec:	24e2ffff */ 	addiu	$v0,$a3,-1
 /*  f0a8bf0:	0002c0c3 */ 	sra	$t8,$v0,0x3
 /*  f0a8bf4:	8dae0070 */ 	lw	$t6,0x70($t5)
-/*  f0a8bf8:	3c0b800b */ 	lui	$t3,%hi(g_MpChrs)
-/*  f0a8bfc:	256bc7b8 */ 	addiu	$t3,$t3,%lo(g_MpChrs)
+/*  f0a8bf8:	3c0b800b */ 	lui	$t3,%hi(g_MpPlayers)
+/*  f0a8bfc:	256bc7b8 */ 	addiu	$t3,$t3,%lo(g_MpPlayers)
 /*  f0a8c00:	000e7880 */ 	sll	$t7,$t6,0x2
 /*  f0a8c04:	01ee7821 */ 	addu	$t7,$t7,$t6
 /*  f0a8c08:	000f7940 */ 	sll	$t7,$t7,0x5
diff --git a/src/game/game_0b0420.c b/src/game/game_0b0420.c
index 49ec70118..a749790b9 100644
--- a/src/game/game_0b0420.c
+++ b/src/game/game_0b0420.c
@@ -414,8 +414,8 @@ glabel func0f0b0818
 /*  f0b0864:	00035080 */ 	sll	$t2,$v1,0x2
 /*  f0b0868:	0003c080 */ 	sll	$t8,$v1,0x2
 /*  f0b086c:	0303c021 */ 	addu	$t8,$t8,$v1
-/*  f0b0870:	3c19800b */ 	lui	$t9,%hi(g_MpChrs)
-/*  f0b0874:	2739c7b8 */ 	addiu	$t9,$t9,%lo(g_MpChrs)
+/*  f0b0870:	3c19800b */ 	lui	$t9,%hi(g_MpPlayers)
+/*  f0b0874:	2739c7b8 */ 	addiu	$t9,$t9,%lo(g_MpPlayers)
 /*  f0b0878:	0018c140 */ 	sll	$t8,$t8,0x5
 /*  f0b087c:	10000007 */ 	beqz	$zero,.L0f0b089c
 /*  f0b0880:	03194021 */ 	addu	$t0,$t8,$t9
@@ -556,8 +556,8 @@ glabel func0f0b09f4
 /*  f0b0a68:	00026080 */ 	sll	$t4,$v0,0x2
 /*  f0b0a6c:	00024880 */ 	sll	$t1,$v0,0x2
 /*  f0b0a70:	01224821 */ 	addu	$t1,$t1,$v0
-/*  f0b0a74:	3c0a800b */ 	lui	$t2,%hi(g_MpChrs)
-/*  f0b0a78:	254ac7b8 */ 	addiu	$t2,$t2,%lo(g_MpChrs)
+/*  f0b0a74:	3c0a800b */ 	lui	$t2,%hi(g_MpPlayers)
+/*  f0b0a78:	254ac7b8 */ 	addiu	$t2,$t2,%lo(g_MpPlayers)
 /*  f0b0a7c:	00094940 */ 	sll	$t1,$t1,0x5
 /*  f0b0a80:	012a5821 */ 	addu	$t3,$t1,$t2
 /*  f0b0a84:	1000000a */ 	beqz	$zero,.L0f0b0ab0
@@ -586,8 +586,8 @@ glabel func0f0b09f4
 /*  f0b0ad8:	00025080 */ 	sll	$t2,$v0,0x2
 /*  f0b0adc:	0002c880 */ 	sll	$t9,$v0,0x2
 /*  f0b0ae0:	0322c821 */ 	addu	$t9,$t9,$v0
-/*  f0b0ae4:	3c09800b */ 	lui	$t1,%hi(g_MpChrs)
-/*  f0b0ae8:	2529c7b8 */ 	addiu	$t1,$t1,%lo(g_MpChrs)
+/*  f0b0ae4:	3c09800b */ 	lui	$t1,%hi(g_MpPlayers)
+/*  f0b0ae8:	2529c7b8 */ 	addiu	$t1,$t1,%lo(g_MpPlayers)
 /*  f0b0aec:	0019c940 */ 	sll	$t9,$t9,0x5
 /*  f0b0af0:	10000009 */ 	beqz	$zero,.L0f0b0b18
 /*  f0b0af4:	03291821 */ 	addu	$v1,$t9,$t1
diff --git a/src/game/game_0b28d0.c b/src/game/game_0b28d0.c
index 42497a116..4ff634264 100644
--- a/src/game/game_0b28d0.c
+++ b/src/game/game_0b28d0.c
@@ -7784,13 +7784,13 @@ glabel func0f0b8ba0
 /*  f0b9234:	8da60004 */ 	lw	$a2,0x4($t5)
 /*  f0b9238:	8e02028c */ 	lw	$v0,0x28c($s0)
 /*  f0b923c:	3c01800b */ 	lui	$at,0x800b
-/*  f0b9240:	3c0f800b */ 	lui	$t7,%hi(g_MpChrs)
+/*  f0b9240:	3c0f800b */ 	lui	$t7,%hi(g_MpPlayers)
 /*  f0b9244:	00027080 */ 	sll	$t6,$v0,0x2
 /*  f0b9248:	002e0821 */ 	addu	$at,$at,$t6
 /*  f0b924c:	ac26c4d0 */ 	sw	$a2,-0x3b30($at)
 /*  f0b9250:	8e080288 */ 	lw	$t0,0x288($s0)
 /*  f0b9254:	3c01800b */ 	lui	$at,0x800b
-/*  f0b9258:	25efc7b8 */ 	addiu	$t7,$t7,%lo(g_MpChrs)
+/*  f0b9258:	25efc7b8 */ 	addiu	$t7,$t7,%lo(g_MpPlayers)
 /*  f0b925c:	8d180070 */ 	lw	$t8,0x70($t0)
 /*  f0b9260:	002e0821 */ 	addu	$at,$at,$t6
 /*  f0b9264:	0018c880 */ 	sll	$t9,$t8,0x2
diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c
index a5309cc4a..2d1cead6f 100644
--- a/src/game/game_0dcdb0.c
+++ b/src/game/game_0dcdb0.c
@@ -23663,8 +23663,8 @@ glabel func0f0ee648
 /*  f0ee6ac:	10200008 */ 	beqz	$at,.L0f0ee6d0
 /*  f0ee6b0:	0003c880 */ 	sll	$t9,$v1,0x2
 /*  f0ee6b4:	0323c821 */ 	addu	$t9,$t9,$v1
-/*  f0ee6b8:	3c08800b */ 	lui	$t0,%hi(g_MpChrs)
-/*  f0ee6bc:	2508c7b8 */ 	addiu	$t0,$t0,%lo(g_MpChrs)
+/*  f0ee6b8:	3c08800b */ 	lui	$t0,%hi(g_MpPlayers)
+/*  f0ee6bc:	2508c7b8 */ 	addiu	$t0,$t0,%lo(g_MpPlayers)
 /*  f0ee6c0:	0019c940 */ 	sll	$t9,$t9,0x5
 /*  f0ee6c4:	03284821 */ 	addu	$t1,$t9,$t0
 /*  f0ee6c8:	1000000b */ 	beqz	$zero,.L0f0ee6f8
@@ -24264,8 +24264,8 @@ glabel func0f0ee648
 /*  f0eefa8:	8fad00b4 */ 	lw	$t5,0xb4($sp)
 /*  f0eefac:	00104080 */ 	sll	$t0,$s0,0x2
 /*  f0eefb0:	01104021 */ 	addu	$t0,$t0,$s0
-/*  f0eefb4:	3c18800b */ 	lui	$t8,%hi(g_MpChrs)
-/*  f0eefb8:	2718c7b8 */ 	addiu	$t8,$t8,%lo(g_MpChrs)
+/*  f0eefb4:	3c18800b */ 	lui	$t8,%hi(g_MpPlayers)
+/*  f0eefb8:	2718c7b8 */ 	addiu	$t8,$t8,%lo(g_MpPlayers)
 /*  f0eefbc:	00084140 */ 	sll	$t0,$t0,0x5
 /*  f0eefc0:	1000000a */ 	beqz	$zero,.L0f0eefec
 /*  f0eefc4:	01183821 */ 	addu	$a3,$t0,$t8
diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c
index ab873d070..895b07d02 100644
--- a/src/game/game_0f09f0.c
+++ b/src/game/game_0f09f0.c
@@ -3490,8 +3490,8 @@ glabel func0f0f3220
 /*  f0f3344:	01c37021 */ 	addu	$t6,$t6,$v1
 /*  f0f3348:	8ced0000 */ 	lw	$t5,0x0($a3)
 /*  f0f334c:	000e7140 */ 	sll	$t6,$t6,0x5
-/*  f0f3350:	3c18800b */ 	lui	$t8,%hi(g_MpChrs)
-/*  f0f3354:	2718c7b8 */ 	addiu	$t8,$t8,%lo(g_MpChrs)
+/*  f0f3350:	3c18800b */ 	lui	$t8,%hi(g_MpPlayers)
+/*  f0f3354:	2718c7b8 */ 	addiu	$t8,$t8,%lo(g_MpPlayers)
 /*  f0f3358:	25cf004c */ 	addiu	$t7,$t6,0x4c
 /*  f0f335c:	ace30000 */ 	sw	$v1,0x0($a3)
 /*  f0f3360:	01f82021 */ 	addu	$a0,$t7,$t8
@@ -5475,11 +5475,11 @@ glabel func0f0f5004
 /*  f0f5004:	27bdffa0 */ 	addiu	$sp,$sp,-96
 /*  f0f5008:	3c0e7f1b */ 	lui	$t6,%hi(var7f1b25f8)
 /*  f0f500c:	27a20000 */ 	addiu	$v0,$sp,0x0
-/*  f0f5010:	3c03800b */ 	lui	$v1,%hi(g_MpChrs)
+/*  f0f5010:	3c03800b */ 	lui	$v1,%hi(g_MpPlayers)
 /*  f0f5014:	3c078007 */ 	lui	$a3,%hi(g_MpPlayerNum)
 /*  f0f5018:	25ce25f8 */ 	addiu	$t6,$t6,%lo(var7f1b25f8)
 /*  f0f501c:	24e71448 */ 	addiu	$a3,$a3,%lo(g_MpPlayerNum)
-/*  f0f5020:	2463c7b8 */ 	addiu	$v1,$v1,%lo(g_MpChrs)
+/*  f0f5020:	2463c7b8 */ 	addiu	$v1,$v1,%lo(g_MpPlayers)
 /*  f0f5024:	240800a0 */ 	addiu	$t0,$zero,0xa0
 /*  f0f5028:	2409000c */ 	addiu	$t1,$zero,0xc
 /*  f0f502c:	25d90060 */ 	addiu	$t9,$t6,0x60
diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c
index 883159028..303cbf35d 100644
--- a/src/game/game_107fb0.c
+++ b/src/game/game_107fb0.c
@@ -1931,8 +1931,8 @@ glabel pakDeleteFile
 /*  f109768:	10000013 */ 	beqz	$zero,.L0f1097b8
 /*  f10976c:	8fbf0024 */ 	lw	$ra,0x24($sp)
 .L0f109770:
-/*  f109770:	3c11800b */ 	lui	$s1,%hi(g_MpChrs)
-/*  f109774:	2631c7b8 */ 	addiu	$s1,$s1,%lo(g_MpChrs)
+/*  f109770:	3c11800b */ 	lui	$s1,%hi(g_MpPlayers)
+/*  f109774:	2631c7b8 */ 	addiu	$s1,$s1,%lo(g_MpPlayers)
 /*  f109778:	00008025 */ 	or	$s0,$zero,$zero
 .L0f10977c:
 /*  f10977c:	8e790000 */ 	lw	$t9,0x0($s3)
@@ -2185,8 +2185,8 @@ glabel func0f109a68
 /*  f109af4:	8fbf001c */ 	lw	$ra,0x1c($sp)
 /*  f109af8:	0007c880 */ 	sll	$t9,$a3,0x2
 /*  f109afc:	0327c821 */ 	addu	$t9,$t9,$a3
-/*  f109b00:	3c08800b */ 	lui	$t0,%hi(g_MpChrs)
-/*  f109b04:	2508c7b8 */ 	addiu	$t0,$t0,%lo(g_MpChrs)
+/*  f109b00:	3c08800b */ 	lui	$t0,%hi(g_MpPlayers)
+/*  f109b04:	2508c7b8 */ 	addiu	$t0,$t0,%lo(g_MpPlayers)
 /*  f109b08:	0019c940 */ 	sll	$t9,$t9,0x5
 /*  f109b0c:	03284821 */ 	addu	$t1,$t9,$t0
 /*  f109b10:	912a0000 */ 	lbu	$t2,0x0($t1)
@@ -2206,8 +2206,8 @@ glabel func0f109a68
 /*  f109b44:	a1830000 */ 	sb	$v1,0x0($t4)
 /*  f109b48:	3c0d8007 */ 	lui	$t5,0x8007
 /*  f109b4c:	8dad1448 */ 	lw	$t5,0x1448($t5)
-/*  f109b50:	3c18800b */ 	lui	$t8,%hi(g_MpChrs)
-/*  f109b54:	2718c7b8 */ 	addiu	$t8,$t8,%lo(g_MpChrs)
+/*  f109b50:	3c18800b */ 	lui	$t8,%hi(g_MpPlayers)
+/*  f109b54:	2718c7b8 */ 	addiu	$t8,$t8,%lo(g_MpPlayers)
 /*  f109b58:	000d7080 */ 	sll	$t6,$t5,0x2
 /*  f109b5c:	01cd7021 */ 	addu	$t6,$t6,$t5
 /*  f109b60:	000e7140 */ 	sll	$t6,$t6,0x5
@@ -2276,8 +2276,8 @@ glabel func0f109bb4
 /*  f109c3c:	8fbf0014 */ 	lw	$ra,0x14($sp)
 /*  f109c40:	0002c880 */ 	sll	$t9,$v0,0x2
 /*  f109c44:	0322c821 */ 	addu	$t9,$t9,$v0
-/*  f109c48:	3c08800b */ 	lui	$t0,%hi(g_MpChrs)
-/*  f109c4c:	2508c7b8 */ 	addiu	$t0,$t0,%lo(g_MpChrs)
+/*  f109c48:	3c08800b */ 	lui	$t0,%hi(g_MpPlayers)
+/*  f109c4c:	2508c7b8 */ 	addiu	$t0,$t0,%lo(g_MpPlayers)
 /*  f109c50:	0019c940 */ 	sll	$t9,$t9,0x5
 /*  f109c54:	3c057f1b */ 	lui	$a1,%hi(var7f1b32d8)
 /*  f109c58:	24a532d8 */ 	addiu	$a1,$a1,%lo(var7f1b32d8)
@@ -3236,8 +3236,8 @@ glabel func0f10a97c
 /*  f10aa58:	1000001a */ 	beqz	$zero,.L0f10aac4
 /*  f10aa5c:	24020001 */ 	addiu	$v0,$zero,0x1
 .L0f10aa60:
-/*  f10aa60:	3c05800b */ 	lui	$a1,%hi(g_MpChrs)
-/*  f10aa64:	24a5c7b8 */ 	addiu	$a1,$a1,%lo(g_MpChrs)
+/*  f10aa60:	3c05800b */ 	lui	$a1,%hi(g_MpPlayers)
+/*  f10aa64:	24a5c7b8 */ 	addiu	$a1,$a1,%lo(g_MpPlayers)
 /*  f10aa68:	00001025 */ 	or	$v0,$zero,$zero
 /*  f10aa6c:	9484cb9e */ 	lhu	$a0,-0x3462($a0)
 /*  f10aa70:	24180001 */ 	addiu	$t8,$zero,0x1
@@ -5246,10 +5246,10 @@ glabel menudialog0010c804
 /*  f10c878:	00002825 */ 	or	$a1,$zero,$zero
 /*  f10c87c:	0fc62084 */ 	jal	func0f188210
 /*  f10c880:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f10c884:	3c11800b */ 	lui	$s1,%hi(g_MpChrs)
+/*  f10c884:	3c11800b */ 	lui	$s1,%hi(g_MpPlayers)
 /*  f10c888:	3c127f1b */ 	lui	$s2,%hi(var7f1b3540)
 /*  f10c88c:	26523540 */ 	addiu	$s2,$s2,%lo(var7f1b3540)
-/*  f10c890:	2631c7b8 */ 	addiu	$s1,$s1,%lo(g_MpChrs)
+/*  f10c890:	2631c7b8 */ 	addiu	$s1,$s1,%lo(g_MpPlayers)
 /*  f10c894:	00008025 */ 	or	$s0,$zero,$zero
 /*  f10c898:	24130004 */ 	addiu	$s3,$zero,0x4
 .L0f10c89c:
diff --git a/src/game/game_1668e0.c b/src/game/game_1668e0.c
index ff6c75c59..90be27724 100644
--- a/src/game/game_1668e0.c
+++ b/src/game/game_1668e0.c
@@ -1963,8 +1963,8 @@ glabel func0f167e7c
 /*  f168074:	25859fc0 */ 	addiu	$a1,$t4,-24640
 /*  f168078:	15400007 */ 	bnez	$t2,.L0f168098
 /*  f16807c:	00a02025 */ 	or	$a0,$a1,$zero
-/*  f168080:	3c02800b */ 	lui	$v0,%hi(g_MpChrs)
-/*  f168084:	2442c7b8 */ 	addiu	$v0,$v0,%lo(g_MpChrs)
+/*  f168080:	3c02800b */ 	lui	$v0,%hi(g_MpPlayers)
+/*  f168084:	2442c7b8 */ 	addiu	$v0,$v0,%lo(g_MpPlayers)
 /*  f168088:	240b0001 */ 	addiu	$t3,$zero,0x1
 /*  f16808c:	ae0600e4 */ 	sw	$a2,0xe4($s0)
 /*  f168090:	a04002c5 */ 	sb	$zero,0x2c5($v0)
diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c
index 76f669e46..cec4f32f8 100644
--- a/src/game/game_176d70.c
+++ b/src/game/game_176d70.c
@@ -1700,8 +1700,8 @@ glabel menuhandler00177e00
 .L0f177e80:
 /*  f177e80:	3c03800b */ 	lui	$v1,0x800b
 /*  f177e84:	3c0b800b */ 	lui	$t3,%hi(g_MpSimulants)
-/*  f177e88:	3c09800b */ 	lui	$t1,%hi(g_MpChrs)
-/*  f177e8c:	2529c7b8 */ 	addiu	$t1,$t1,%lo(g_MpChrs)
+/*  f177e88:	3c09800b */ 	lui	$t1,%hi(g_MpPlayers)
+/*  f177e8c:	2529c7b8 */ 	addiu	$t1,$t1,%lo(g_MpPlayers)
 /*  f177e90:	256bc538 */ 	addiu	$t3,$t3,%lo(g_MpSimulants)
 /*  f177e94:	9463cb9e */ 	lhu	$v1,-0x3462($v1)
 /*  f177e98:	00002825 */ 	or	$a1,$zero,$zero
@@ -2064,8 +2064,8 @@ glabel func0f1783a0
 /*  f1783c8:	00401825 */ 	or	$v1,$v0,$zero
 /*  f1783cc:	00027880 */ 	sll	$t7,$v0,0x2
 /*  f1783d0:	01e27821 */ 	addu	$t7,$t7,$v0
-/*  f1783d4:	3c18800b */ 	lui	$t8,%hi(g_MpChrs)
-/*  f1783d8:	2718c7b8 */ 	addiu	$t8,$t8,%lo(g_MpChrs)
+/*  f1783d4:	3c18800b */ 	lui	$t8,%hi(g_MpPlayers)
+/*  f1783d8:	2718c7b8 */ 	addiu	$t8,$t8,%lo(g_MpPlayers)
 /*  f1783dc:	000f7940 */ 	sll	$t7,$t7,0x5
 /*  f1783e0:	1000000a */ 	beqz	$zero,.L0f17840c
 /*  f1783e4:	01f83021 */ 	addu	$a2,$t7,$t8
@@ -2304,7 +2304,7 @@ glabel menuhandler001786d8
 /*  f17870c:	afa500ac */ 	sw	$a1,0xac($sp)
 /*  f178710:	8cce0000 */ 	lw	$t6,0x0($a2)
 /*  f178714:	3c1e8007 */ 	lui	$s8,%hi(g_MpPlayerNum)
-/*  f178718:	3c17800b */ 	lui	$s7,%hi(g_MpChrs)
+/*  f178718:	3c17800b */ 	lui	$s7,%hi(g_MpPlayers)
 /*  f17871c:	afae00a4 */ 	sw	$t6,0xa4($sp)
 /*  f178720:	8cd50008 */ 	lw	$s5,0x8($a2)
 /*  f178724:	3c14ba00 */ 	lui	$s4,0xba00
@@ -2316,7 +2316,7 @@ glabel menuhandler001786d8
 /*  f17873c:	01f89021 */ 	addu	$s2,$t7,$t8
 /*  f178740:	2652fff1 */ 	addiu	$s2,$s2,-15
 /*  f178744:	36940c02 */ 	ori	$s4,$s4,0xc02
-/*  f178748:	26f7c7b8 */ 	addiu	$s7,$s7,%lo(g_MpChrs)
+/*  f178748:	26f7c7b8 */ 	addiu	$s7,$s7,%lo(g_MpPlayers)
 /*  f17874c:	27de1448 */ 	addiu	$s8,$s8,%lo(g_MpPlayerNum)
 /*  f178750:	00008025 */ 	or	$s0,$zero,$zero
 /*  f178754:	8fb10090 */ 	lw	$s1,0x90($sp)
@@ -2551,8 +2551,8 @@ glabel menuhandler00178a94
 /*  f178aa8:	afa60020 */ 	sw	$a2,0x20($sp)
 /*  f178aac:	3c0e8007 */ 	lui	$t6,0x8007
 /*  f178ab0:	8dce1448 */ 	lw	$t6,0x1448($t6)
-/*  f178ab4:	3c18800b */ 	lui	$t8,%hi(g_MpChrs)
-/*  f178ab8:	2718c7b8 */ 	addiu	$t8,$t8,%lo(g_MpChrs)
+/*  f178ab4:	3c18800b */ 	lui	$t8,%hi(g_MpPlayers)
+/*  f178ab8:	2718c7b8 */ 	addiu	$t8,$t8,%lo(g_MpPlayers)
 /*  f178abc:	000e7880 */ 	sll	$t7,$t6,0x2
 /*  f178ac0:	01ee7821 */ 	addu	$t7,$t7,$t6
 /*  f178ac4:	000f7940 */ 	sll	$t7,$t7,0x5
@@ -2655,14 +2655,14 @@ glabel menuhandler00178bf4
 /*  f178c14:	3c088007 */ 	lui	$t0,%hi(g_MpPlayerNum)
 /*  f178c18:	24010012 */ 	addiu	$at,$zero,0x12
 /*  f178c1c:	10810033 */ 	beq	$a0,$at,.L0f178cec
-/*  f178c20:	3c07800b */ 	lui	$a3,%hi(g_MpChrs)
+/*  f178c20:	3c07800b */ 	lui	$a3,%hi(g_MpPlayers)
 /*  f178c24:	10000061 */ 	beqz	$zero,.L0f178dac
 /*  f178c28:	8fbf0014 */ 	lw	$ra,0x14($sp)
 .L0f178c2c:
 /*  f178c2c:	25081448 */ 	addiu	$t0,$t0,%lo(g_MpPlayerNum)
 /*  f178c30:	8d020000 */ 	lw	$v0,0x0($t0)
-/*  f178c34:	3c07800b */ 	lui	$a3,%hi(g_MpChrs)
-/*  f178c38:	24e7c7b8 */ 	addiu	$a3,$a3,%lo(g_MpChrs)
+/*  f178c34:	3c07800b */ 	lui	$a3,%hi(g_MpPlayers)
+/*  f178c38:	24e7c7b8 */ 	addiu	$a3,$a3,%lo(g_MpPlayers)
 /*  f178c3c:	00027080 */ 	sll	$t6,$v0,0x2
 /*  f178c40:	01c27021 */ 	addu	$t6,$t6,$v0
 /*  f178c44:	000e7140 */ 	sll	$t6,$t6,0x5
@@ -2719,8 +2719,8 @@ glabel menuhandler00178bf4
 /*  f178cfc:	25081448 */ 	addiu	$t0,$t0,%lo(g_MpPlayerNum)
 /*  f178d00:	3c0b8007 */ 	lui	$t3,0x8007
 /*  f178d04:	8d6b1448 */ 	lw	$t3,0x1448($t3)
-/*  f178d08:	3c0e800b */ 	lui	$t6,%hi(g_MpChrs)
-/*  f178d0c:	25cec7b8 */ 	addiu	$t6,$t6,%lo(g_MpChrs)
+/*  f178d08:	3c0e800b */ 	lui	$t6,%hi(g_MpPlayers)
+/*  f178d0c:	25cec7b8 */ 	addiu	$t6,$t6,%lo(g_MpPlayers)
 /*  f178d10:	000b6080 */ 	sll	$t4,$t3,0x2
 /*  f178d14:	018b6021 */ 	addu	$t4,$t4,$t3
 /*  f178d18:	000c6140 */ 	sll	$t4,$t4,0x5
@@ -2739,7 +2739,7 @@ glabel menuhandler00178bf4
 /*  f178d48:	24630001 */ 	addiu	$v1,$v1,0x1
 .L0f178d4c:
 /*  f178d4c:	8d0f0000 */ 	lw	$t7,0x0($t0)
-/*  f178d50:	24e7c7b8 */ 	addiu	$a3,$a3,%lo(g_MpChrs)
+/*  f178d50:	24e7c7b8 */ 	addiu	$a3,$a3,%lo(g_MpPlayers)
 /*  f178d54:	240b000a */ 	addiu	$t3,$zero,0xa
 /*  f178d58:	000fc080 */ 	sll	$t8,$t7,0x2
 /*  f178d5c:	030fc021 */ 	addu	$t8,$t8,$t7
@@ -2933,8 +2933,8 @@ glabel func0f178ef0
 .L0f178fec:
 /*  f178fec:	3c0c8007 */ 	lui	$t4,0x8007
 /*  f178ff0:	8d8c1448 */ 	lw	$t4,0x1448($t4)
-/*  f178ff4:	3c0e800b */ 	lui	$t6,%hi(g_MpChrs)
-/*  f178ff8:	25cec7b8 */ 	addiu	$t6,$t6,%lo(g_MpChrs)
+/*  f178ff4:	3c0e800b */ 	lui	$t6,%hi(g_MpPlayers)
+/*  f178ff8:	25cec7b8 */ 	addiu	$t6,$t6,%lo(g_MpPlayers)
 /*  f178ffc:	000c6880 */ 	sll	$t5,$t4,0x2
 /*  f179000:	01ac6821 */ 	addu	$t5,$t5,$t4
 /*  f179004:	000d6940 */ 	sll	$t5,$t5,0x5
@@ -2978,8 +2978,8 @@ GLOBAL_ASM(
 glabel func0f17909c
 /*  f17909c:	3c0e8007 */ 	lui	$t6,0x8007
 /*  f1790a0:	8dce1448 */ 	lw	$t6,0x1448($t6)
-/*  f1790a4:	3c18800b */ 	lui	$t8,%hi(g_MpChrs)
-/*  f1790a8:	2718c7b8 */ 	addiu	$t8,$t8,%lo(g_MpChrs)
+/*  f1790a4:	3c18800b */ 	lui	$t8,%hi(g_MpPlayers)
+/*  f1790a8:	2718c7b8 */ 	addiu	$t8,$t8,%lo(g_MpPlayers)
 /*  f1790ac:	000e7880 */ 	sll	$t7,$t6,0x2
 /*  f1790b0:	01ee7821 */ 	addu	$t7,$t7,$t6
 /*  f1790b4:	000f7940 */ 	sll	$t7,$t7,0x5
@@ -3391,12 +3391,12 @@ s32 menuhandlerMpControlCheckbox(u32 operation, struct menu_item *item, s32 *val
 	switch (operation) {
 	case MENUOP_GET:
 		if (item->param3 == OPTION_FORWARDPITCH) {
-			if ((g_MpChrs[g_MpPlayerNum].options & item->param3) == 0) {
+			if ((g_MpPlayers[g_MpPlayerNum].options & item->param3) == 0) {
 				return true;
 			}
 			return false;
 		}
-		if ((g_MpChrs[g_MpPlayerNum].options & item->param3) == 0) {
+		if ((g_MpPlayers[g_MpPlayerNum].options & item->param3) == 0) {
 			return false;
 		}
 		return true;
@@ -3411,10 +3411,10 @@ s32 menuhandlerMpControlCheckbox(u32 operation, struct menu_item *item, s32 *val
 			}
 		}
 
-		g_MpChrs[g_MpPlayerNum].options &= ~item->param3;
+		g_MpPlayers[g_MpPlayerNum].options &= ~item->param3;
 
 		if (*value) {
-			g_MpChrs[g_MpPlayerNum].options |= item->param3;
+			g_MpPlayers[g_MpPlayerNum].options |= item->param3;
 		}
 	}
 
@@ -3514,15 +3514,15 @@ s32 menuhandlerMpDisplayOptionCheckbox(u32 operation, struct menu_item *item, s3
 {
 	switch (operation) {
 	case MENUOP_GET:
-		if ((g_MpChrs[g_MpPlayerNum].displayoptions & item->param3) == 0) {
+		if ((g_MpPlayers[g_MpPlayerNum].displayoptions & item->param3) == 0) {
 			return false;
 		}
 		return true;
 	case MENUOP_SET:
-		g_MpChrs[g_MpPlayerNum].displayoptions &= ~(u8)item->param3;
+		g_MpPlayers[g_MpPlayerNum].displayoptions &= ~(u8)item->param3;
 
 		if (*value) {
-			g_MpChrs[g_MpPlayerNum].displayoptions |= (u8)item->param3;
+			g_MpPlayers[g_MpPlayerNum].displayoptions |= (u8)item->param3;
 		}
 		break;
 	}
@@ -3920,24 +3920,24 @@ s32 menuhandlerMpCharacterBody(u32 operation, struct menu_item *item, struct num
 {
 	switch (operation) {
 	case MENUOP_SET:
-		if (g_MpChrs[g_MpPlayerNum].headnum < mpGetNumHeads()) {
+		if (g_MpPlayers[g_MpPlayerNum].base.headnum < mpGetNumHeads()) {
 			if (!value->text) {
-				g_MpChrs[g_MpPlayerNum].headnum = func0f18bc9c(value->num);
+				g_MpPlayers[g_MpPlayerNum].base.headnum = func0f18bc9c(value->num);
 			}
 		}
-		g_MpChrs[g_MpPlayerNum].bodynum = value->num;
+		g_MpPlayers[g_MpPlayerNum].base.bodynum = value->num;
 		func0f17b8f0();
 		break;
 	case MENUOP_CHECKPREFOCUSED:
 		func0f179da4(operation, item, &value->num,
-				g_MpChrs[g_MpPlayerNum].bodynum,
-				g_MpChrs[g_MpPlayerNum].headnum, 1);
+				g_MpPlayers[g_MpPlayerNum].base.bodynum,
+				g_MpPlayers[g_MpPlayerNum].base.headnum, 1);
 		return true;
 	}
 
 	return func0f179da4(operation, item, &value->num,
-			g_MpChrs[g_MpPlayerNum].bodynum,
-			g_MpChrs[g_MpPlayerNum].headnum, 1);
+			g_MpPlayers[g_MpPlayerNum].base.bodynum,
+			g_MpPlayers[g_MpPlayerNum].base.headnum, 1);
 }
 
 GLOBAL_ASM(
@@ -5232,8 +5232,8 @@ glabel func0f17b360
 /*  f17b370:	24045091 */ 	addiu	$a0,$zero,0x5091
 /*  f17b374:	3c0e8007 */ 	lui	$t6,0x8007
 /*  f17b378:	8dce1448 */ 	lw	$t6,0x1448($t6)
-/*  f17b37c:	3c18800b */ 	lui	$t8,%hi(g_MpChrs)
-/*  f17b380:	2718c7b8 */ 	addiu	$t8,$t8,%lo(g_MpChrs)
+/*  f17b37c:	3c18800b */ 	lui	$t8,%hi(g_MpPlayers)
+/*  f17b380:	2718c7b8 */ 	addiu	$t8,$t8,%lo(g_MpPlayers)
 /*  f17b384:	000e7880 */ 	sll	$t7,$t6,0x2
 /*  f17b388:	01ee7821 */ 	addu	$t7,$t7,$t6
 /*  f17b38c:	000f7940 */ 	sll	$t7,$t7,0x5
@@ -5252,7 +5252,7 @@ glabel func0f17b360
 s32 menuhandlerMpUsernamePassword(u32 operation, struct menu_item *item, s32 *value)
 {
 	if (operation == MENUOP_CHECKHIDDEN) {
-		if (g_MpChrs[g_MpPlayerNum].title != MPPLAYERTITLE_PERFECT) {
+		if (g_MpPlayers[g_MpPlayerNum].title != MPPLAYERTITLE_PERFECT) {
 			return true;
 		}
 	}
@@ -5549,10 +5549,10 @@ glabel func0f17b4f8
 s32 menuhandlerMpCharacterHead(u32 operation, struct menu_item *item, s32 *value)
 {
 	if (operation == MENUOP_SET) {
-		g_MpChrs[g_MpPlayerNum].headnum = *value;
+		g_MpPlayers[g_MpPlayerNum].base.headnum = *value;
 	}
 
-	return func0f17b4f8(operation, item, value, g_MpChrs[g_MpPlayerNum].headnum, 1);
+	return func0f17b4f8(operation, item, value, g_MpPlayers[g_MpPlayerNum].base.headnum, 1);
 }
 
 GLOBAL_ASM(
@@ -5598,15 +5598,15 @@ glabel menuhandler0017b91c
 /*  f17b928:	8cc20000 */ 	lw	$v0,0x0($a2)
 /*  f17b92c:	24010012 */ 	addiu	$at,$zero,0x12
 /*  f17b930:	10810034 */ 	beq	$a0,$at,.L0f17ba04
-/*  f17b934:	3c07800b */ 	lui	$a3,%hi(g_MpChrs)
+/*  f17b934:	3c07800b */ 	lui	$a3,%hi(g_MpPlayers)
 /*  f17b938:	03e00008 */ 	jr	$ra
 /*  f17b93c:	00001025 */ 	or	$v0,$zero,$zero
 .L0f17b940:
 /*  f17b940:	3c088007 */ 	lui	$t0,%hi(g_MpPlayerNum)
 /*  f17b944:	25081448 */ 	addiu	$t0,$t0,%lo(g_MpPlayerNum)
 /*  f17b948:	8d040000 */ 	lw	$a0,0x0($t0)
-/*  f17b94c:	3c07800b */ 	lui	$a3,%hi(g_MpChrs)
-/*  f17b950:	24e7c7b8 */ 	addiu	$a3,$a3,%lo(g_MpChrs)
+/*  f17b94c:	3c07800b */ 	lui	$a3,%hi(g_MpPlayers)
+/*  f17b950:	24e7c7b8 */ 	addiu	$a3,$a3,%lo(g_MpPlayers)
 /*  f17b954:	00047080 */ 	sll	$t6,$a0,0x2
 /*  f17b958:	01c47021 */ 	addu	$t6,$t6,$a0
 /*  f17b95c:	000e7140 */ 	sll	$t6,$t6,0x5
@@ -5663,8 +5663,8 @@ glabel menuhandler0017b91c
 /*  f17ba14:	25081448 */ 	addiu	$t0,$t0,%lo(g_MpPlayerNum)
 /*  f17ba18:	3c0b8007 */ 	lui	$t3,0x8007
 /*  f17ba1c:	8d6b1448 */ 	lw	$t3,0x1448($t3)
-/*  f17ba20:	3c0e800b */ 	lui	$t6,%hi(g_MpChrs)
-/*  f17ba24:	25cec7b8 */ 	addiu	$t6,$t6,%lo(g_MpChrs)
+/*  f17ba20:	3c0e800b */ 	lui	$t6,%hi(g_MpPlayers)
+/*  f17ba24:	25cec7b8 */ 	addiu	$t6,$t6,%lo(g_MpPlayers)
 /*  f17ba28:	000b6080 */ 	sll	$t4,$t3,0x2
 /*  f17ba2c:	018b6021 */ 	addu	$t4,$t4,$t3
 /*  f17ba30:	000c6140 */ 	sll	$t4,$t4,0x5
@@ -5683,7 +5683,7 @@ glabel menuhandler0017b91c
 /*  f17ba60:	24630001 */ 	addiu	$v1,$v1,0x1
 .L0f17ba64:
 /*  f17ba64:	8d0f0000 */ 	lw	$t7,0x0($t0)
-/*  f17ba68:	24e7c7b8 */ 	addiu	$a3,$a3,%lo(g_MpChrs)
+/*  f17ba68:	24e7c7b8 */ 	addiu	$a3,$a3,%lo(g_MpPlayers)
 /*  f17ba6c:	240b000a */ 	addiu	$t3,$zero,0xa
 /*  f17ba70:	000fc080 */ 	sll	$t8,$t7,0x2
 /*  f17ba74:	030fc021 */ 	addu	$t8,$t8,$t7
@@ -6099,13 +6099,13 @@ glabel menuhandler0017bfc0
 /*  f17c060:	8e020000 */ 	lw	$v0,0x0($s0)
 /*  f17c064:	8e680000 */ 	lw	$t0,0x0($s3)
 /*  f17c068:	3c13800b */ 	lui	$s3,%hi(g_MpSetup)
-/*  f17c06c:	3c11800b */ 	lui	$s1,%hi(g_MpChrs)
+/*  f17c06c:	3c11800b */ 	lui	$s1,%hi(g_MpPlayers)
 /*  f17c070:	00084880 */ 	sll	$t1,$t0,0x2
 /*  f17c074:	01284823 */ 	subu	$t1,$t1,$t0
 /*  f17c078:	000948c0 */ 	sll	$t1,$t1,0x3
 /*  f17c07c:	00499021 */ 	addu	$s2,$v0,$t1
 /*  f17c080:	24150001 */ 	addiu	$s5,$zero,0x1
-/*  f17c084:	2631c7b8 */ 	addiu	$s1,$s1,%lo(g_MpChrs)
+/*  f17c084:	2631c7b8 */ 	addiu	$s1,$s1,%lo(g_MpPlayers)
 /*  f17c088:	2673cb88 */ 	addiu	$s3,$s3,%lo(g_MpSetup)
 /*  f17c08c:	00008025 */ 	or	$s0,$zero,$zero
 /*  f17c090:	24140004 */ 	addiu	$s4,$zero,0x4
@@ -6341,8 +6341,8 @@ glabel func0f17c524
 /*  f17c540:	3c027f1c */ 	lui	$v0,0x7f1c
 /*  f17c544:	00034080 */ 	sll	$t0,$v1,0x2
 /*  f17c548:	01034021 */ 	addu	$t0,$t0,$v1
-/*  f17c54c:	3c09800b */ 	lui	$t1,%hi(g_MpChrs)
-/*  f17c550:	2529c7b8 */ 	addiu	$t1,$t1,%lo(g_MpChrs)
+/*  f17c54c:	3c09800b */ 	lui	$t1,%hi(g_MpPlayers)
+/*  f17c550:	2529c7b8 */ 	addiu	$t1,$t1,%lo(g_MpPlayers)
 /*  f17c554:	00084140 */ 	sll	$t0,$t0,0x5
 /*  f17c558:	03e00008 */ 	jr	$ra
 /*  f17c55c:	01091021 */ 	addu	$v0,$t0,$t1
@@ -6358,10 +6358,10 @@ glabel menuhandlerMpRestoreHandicapDefaults
 /*  f17c570:	afa50004 */ 	sw	$a1,0x4($sp)
 /*  f17c574:	14810009 */ 	bne	$a0,$at,.L0f17c59c
 /*  f17c578:	afa60008 */ 	sw	$a2,0x8($sp)
-/*  f17c57c:	3c03800b */ 	lui	$v1,%hi(g_MpChrs)
+/*  f17c57c:	3c03800b */ 	lui	$v1,%hi(g_MpPlayers)
 /*  f17c580:	3c04800b */ 	lui	$a0,%hi(var800aca38)
 /*  f17c584:	2484ca38 */ 	addiu	$a0,$a0,%lo(var800aca38)
-/*  f17c588:	2463c7b8 */ 	addiu	$v1,$v1,%lo(g_MpChrs)
+/*  f17c588:	2463c7b8 */ 	addiu	$v1,$v1,%lo(g_MpPlayers)
 /*  f17c58c:	24020080 */ 	addiu	$v0,$zero,0x80
 .L0f17c590:
 /*  f17c590:	246300a0 */ 	addiu	$v1,$v1,0xa0
@@ -6382,8 +6382,8 @@ glabel menudialog0017c5a4
 /*  f17c5b8:	afa60020 */ 	sw	$a2,0x20($sp)
 /*  f17c5bc:	3c038007 */ 	lui	$v1,0x8007
 /*  f17c5c0:	8c631448 */ 	lw	$v1,0x1448($v1)
-/*  f17c5c4:	3c0f800b */ 	lui	$t7,%hi(g_MpChrs)
-/*  f17c5c8:	25efc7b8 */ 	addiu	$t7,$t7,%lo(g_MpChrs)
+/*  f17c5c4:	3c0f800b */ 	lui	$t7,%hi(g_MpPlayers)
+/*  f17c5c8:	25efc7b8 */ 	addiu	$t7,$t7,%lo(g_MpPlayers)
 /*  f17c5cc:	00037080 */ 	sll	$t6,$v1,0x2
 /*  f17c5d0:	01c37021 */ 	addu	$t6,$t6,$v1
 /*  f17c5d4:	000e7140 */ 	sll	$t6,$t6,0x5
@@ -6743,26 +6743,26 @@ s32 menuhandlerMpSimulantHead(u32 operation, struct menu_item *item, s32 *value)
 	 */
 	switch (operation) {
 	case MENUOP_SET:
-		g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].headnum = start + *value;
+		g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].base.headnum = start + *value;
 	case MENUOP_13:
-		if (operation == MENUOP_13 && item->param2 == 1 && g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].headnum < start) {
-			g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].headnum = start;
+		if (operation == MENUOP_13 && item->param2 == 1 && g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].base.headnum < start) {
+			g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].base.headnum = start;
 		}
 		break;
 	}
 
-	return func0f17b4f8(operation, item, value, g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].headnum, 0);
+	return func0f17b4f8(operation, item, value, g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].base.headnum, 0);
 }
 
 s32 menuhandlerMpSimulantBody(u32 operation, struct menu_item *item, s32 *value)
 {
 	if (operation == MENUOP_SET) {
-		g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].bodynum = *value;
+		g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].base.bodynum = *value;
 	}
 
 	return func0f179da4(operation, item, value,
-			g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].bodynum,
-			g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].headnum,
+			g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].base.bodynum,
+			g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].base.headnum,
 			0);
 }
 
@@ -7445,11 +7445,11 @@ glabel menuhandlerMpMaximumTeams
 /*  f17d7f0:	1481002b */ 	bne	$a0,$at,.L0f17d8a0
 /*  f17d7f4:	afa60040 */ 	sw	$a2,0x40($sp)
 /*  f17d7f8:	3c16800b */ 	lui	$s6,%hi(g_MpSimulants)
-/*  f17d7fc:	3c13800b */ 	lui	$s3,%hi(g_MpChrs)
+/*  f17d7fc:	3c13800b */ 	lui	$s3,%hi(g_MpPlayers)
 /*  f17d800:	3c12800b */ 	lui	$s2,%hi(g_MpSetup)
 /*  f17d804:	00008825 */ 	or	$s1,$zero,$zero
 /*  f17d808:	2652cb88 */ 	addiu	$s2,$s2,%lo(g_MpSetup)
-/*  f17d80c:	2673c7b8 */ 	addiu	$s3,$s3,%lo(g_MpChrs)
+/*  f17d80c:	2673c7b8 */ 	addiu	$s3,$s3,%lo(g_MpPlayers)
 /*  f17d810:	26d6c538 */ 	addiu	$s6,$s6,%lo(g_MpSimulants)
 /*  f17d814:	00008025 */ 	or	$s0,$zero,$zero
 /*  f17d818:	2417004c */ 	addiu	$s7,$zero,0x4c
@@ -7515,10 +7515,10 @@ glabel menuhandlerMpHumansVsSimulants
 /*  f17d8e0:	14810028 */ 	bne	$a0,$at,.L0f17d984
 /*  f17d8e4:	afa60020 */ 	sw	$a2,0x20($sp)
 /*  f17d8e8:	3c09800b */ 	lui	$t1,%hi(g_MpSimulants)
-/*  f17d8ec:	3c05800b */ 	lui	$a1,%hi(g_MpChrs)
+/*  f17d8ec:	3c05800b */ 	lui	$a1,%hi(g_MpPlayers)
 /*  f17d8f0:	3c04800b */ 	lui	$a0,%hi(g_MpSetup)
 /*  f17d8f4:	2484cb88 */ 	addiu	$a0,$a0,%lo(g_MpSetup)
-/*  f17d8f8:	24a5c7b8 */ 	addiu	$a1,$a1,%lo(g_MpChrs)
+/*  f17d8f8:	24a5c7b8 */ 	addiu	$a1,$a1,%lo(g_MpPlayers)
 /*  f17d8fc:	2529c538 */ 	addiu	$t1,$t1,%lo(g_MpSimulants)
 /*  f17d900:	00001025 */ 	or	$v0,$zero,$zero
 /*  f17d904:	240a004c */ 	addiu	$t2,$zero,0x4c
@@ -7578,12 +7578,12 @@ glabel menuhandlerMpHumanSimulantPairs
 /*  f17d9b8:	8dc10000 */ 	lw	$at,0x0($t6)
 /*  f17d9bc:	27a6002c */ 	addiu	$a2,$sp,0x2c
 /*  f17d9c0:	3c0b800b */ 	lui	$t3,%hi(g_MpSimulants)
-/*  f17d9c4:	3c08800b */ 	lui	$t0,%hi(g_MpChrs)
+/*  f17d9c4:	3c08800b */ 	lui	$t0,%hi(g_MpPlayers)
 /*  f17d9c8:	3c07800b */ 	lui	$a3,%hi(g_MpSetup)
 /*  f17d9cc:	00002825 */ 	or	$a1,$zero,$zero
 /*  f17d9d0:	00002025 */ 	or	$a0,$zero,$zero
 /*  f17d9d4:	24e7cb88 */ 	addiu	$a3,$a3,%lo(g_MpSetup)
-/*  f17d9d8:	2508c7b8 */ 	addiu	$t0,$t0,%lo(g_MpChrs)
+/*  f17d9d8:	2508c7b8 */ 	addiu	$t0,$t0,%lo(g_MpPlayers)
 /*  f17d9dc:	256bc538 */ 	addiu	$t3,$t3,%lo(g_MpSimulants)
 /*  f17d9e0:	00001025 */ 	or	$v0,$zero,$zero
 /*  f17d9e4:	240c004c */ 	addiu	$t4,$zero,0x4c
@@ -8921,8 +8921,8 @@ glabel menuhandlerMpLock
 /*  f17edb4:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f17edb8:	00026080 */ 	sll	$t4,$v0,0x2
 /*  f17edbc:	01826021 */ 	addu	$t4,$t4,$v0
-/*  f17edc0:	3c0d800b */ 	lui	$t5,%hi(g_MpChrs)
-/*  f17edc4:	25adc7b8 */ 	addiu	$t5,$t5,%lo(g_MpChrs)
+/*  f17edc0:	3c0d800b */ 	lui	$t5,%hi(g_MpPlayers)
+/*  f17edc4:	25adc7b8 */ 	addiu	$t5,$t5,%lo(g_MpPlayers)
 /*  f17edc8:	000c6140 */ 	sll	$t4,$t4,0x5
 /*  f17edcc:	10000020 */ 	beqz	$zero,.L0f17ee50
 /*  f17edd0:	018d1021 */ 	addu	$v0,$t4,$t5
@@ -8974,7 +8974,7 @@ glabel menuhandlerMpLock
 s32 menuhandlerMpSavePlayer(u32 operation, struct menu_item *item, s32 *value)
 {
 	if (operation == MENUOP_SET) {
-		if (g_MpChrs[g_MpPlayerNum].unk4c == 0) {
+		if (g_MpPlayers[g_MpPlayerNum].unk4c == 0) {
 			func0f10a51c(6, 2);
 		} else {
 			menuPushDialog(&g_MpSaveChrMenuDialog);
@@ -9164,14 +9164,14 @@ glabel func0f17f100
 /*  f17f198:	3c04800b */ 	lui	$a0,%hi(g_MpSetup)
 /*  f17f19c:	2484cb88 */ 	addiu	$a0,$a0,%lo(g_MpSetup)
 /*  f17f1a0:	8c8a000c */ 	lw	$t2,0xc($a0)
-/*  f17f1a4:	3c02800b */ 	lui	$v0,%hi(g_MpChrs)
+/*  f17f1a4:	3c02800b */ 	lui	$v0,%hi(g_MpPlayers)
 /*  f17f1a8:	3c03800a */ 	lui	$v1,%hi(g_Vars)
 /*  f17f1ac:	354b0002 */ 	ori	$t3,$t2,0x2
 /*  f17f1b0:	ac8b000c */ 	sw	$t3,0xc($a0)
 /*  f17f1b4:	3c04800a */ 	lui	$a0,0x800a
 /*  f17f1b8:	24849fc4 */ 	addiu	$a0,$a0,-24636
 /*  f17f1bc:	24639fc0 */ 	addiu	$v1,$v1,%lo(g_Vars)
-/*  f17f1c0:	2442c7b8 */ 	addiu	$v0,$v0,%lo(g_MpChrs)
+/*  f17f1c0:	2442c7b8 */ 	addiu	$v0,$v0,%lo(g_MpPlayers)
 .L0f17f1c4:
 /*  f17f1c4:	806c04ac */ 	lb	$t4,0x4ac($v1)
 /*  f17f1c8:	24630001 */ 	addiu	$v1,$v1,0x1
@@ -9183,12 +9183,12 @@ glabel func0f17f100
 /*  f17f1e0:	3c04800b */ 	lui	$a0,%hi(g_MpSetup)
 /*  f17f1e4:	2484cb88 */ 	addiu	$a0,$a0,%lo(g_MpSetup)
 /*  f17f1e8:	8c8d000c */ 	lw	$t5,0xc($a0)
-/*  f17f1ec:	3c02800b */ 	lui	$v0,%hi(g_MpChrs)
+/*  f17f1ec:	3c02800b */ 	lui	$v0,%hi(g_MpPlayers)
 /*  f17f1f0:	3c03800b */ 	lui	$v1,%hi(var800aca38)
 /*  f17f1f4:	35ae0002 */ 	ori	$t6,$t5,0x2
 /*  f17f1f8:	ac8e000c */ 	sw	$t6,0xc($a0)
 /*  f17f1fc:	2463ca38 */ 	addiu	$v1,$v1,%lo(var800aca38)
-/*  f17f200:	2442c7b8 */ 	addiu	$v0,$v0,%lo(g_MpChrs)
+/*  f17f200:	2442c7b8 */ 	addiu	$v0,$v0,%lo(g_MpPlayers)
 .L0f17f204:
 /*  f17f204:	244200a0 */ 	addiu	$v0,$v0,0xa0
 /*  f17f208:	1443fffe */ 	bne	$v0,$v1,.L0f17f204
@@ -9198,8 +9198,8 @@ glabel func0f17f100
 /*  f17f218:	3c04800b */ 	lui	$a0,%hi(g_MpSetup)
 /*  f17f21c:	2484cb88 */ 	addiu	$a0,$a0,%lo(g_MpSetup)
 /*  f17f220:	8c8f000c */ 	lw	$t7,0xc($a0)
-/*  f17f224:	3c02800b */ 	lui	$v0,%hi(g_MpChrs)
-/*  f17f228:	2442c7b8 */ 	addiu	$v0,$v0,%lo(g_MpChrs)
+/*  f17f224:	3c02800b */ 	lui	$v0,%hi(g_MpPlayers)
+/*  f17f228:	2442c7b8 */ 	addiu	$v0,$v0,%lo(g_MpPlayers)
 /*  f17f22c:	35f80002 */ 	ori	$t8,$t7,0x2
 /*  f17f230:	ac98000c */ 	sw	$t8,0xc($a0)
 /*  f17f234:	00008025 */ 	or	$s0,$zero,$zero
@@ -10121,7 +10121,7 @@ glabel menuhandlerMpSlowMotion
 
 void scenarioHtbInit(void)
 {
-	g_ScenarioData.briefcase.unk04 = 0;
+	g_ScenarioData.htb.unk04 = 0;
 }
 
 GLOBAL_ASM(
@@ -10856,8 +10856,8 @@ glabel scenarioHtbCallback1c
 /*  f180988:	13000033 */ 	beqz	$t8,.L0f180a58
 /*  f18098c:	240d004c */ 	addiu	$t5,$zero,0x4c
 /*  f180990:	3c0c800b */ 	lui	$t4,%hi(g_MpSimulants)
-/*  f180994:	3c0a800b */ 	lui	$t2,%hi(g_MpChrs)
-/*  f180998:	254ac7b8 */ 	addiu	$t2,$t2,%lo(g_MpChrs)
+/*  f180994:	3c0a800b */ 	lui	$t2,%hi(g_MpPlayers)
+/*  f180998:	254ac7b8 */ 	addiu	$t2,$t2,%lo(g_MpPlayers)
 /*  f18099c:	258cc538 */ 	addiu	$t4,$t4,%lo(g_MpSimulants)
 /*  f1809a0:	240b00a0 */ 	addiu	$t3,$zero,0xa0
 /*  f1809a4:	2409000c */ 	addiu	$t1,$zero,0xc
@@ -11078,115 +11078,42 @@ glabel scenarioHtbCallback28
 /*  f180c94:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-GLOBAL_ASM(
-glabel scenarioCtcInit
-/*  f180c98:	27bdffc8 */ 	addiu	$sp,$sp,-56
-/*  f180c9c:	afb70030 */ 	sw	$s7,0x30($sp)
-/*  f180ca0:	3c17800b */ 	lui	$s7,%hi(g_MpSetup)
-/*  f180ca4:	26f7cb88 */ 	addiu	$s7,$s7,%lo(g_MpSetup)
-/*  f180ca8:	8eee000c */ 	lw	$t6,0xc($s7)
-/*  f180cac:	3c18800b */ 	lui	$t8,0x800b
-/*  f180cb0:	2708c110 */ 	addiu	$t0,$t8,-16112
-/*  f180cb4:	35cf0002 */ 	ori	$t7,$t6,0x2
-/*  f180cb8:	afbf0034 */ 	sw	$ra,0x34($sp)
-/*  f180cbc:	afb6002c */ 	sw	$s6,0x2c($sp)
-/*  f180cc0:	afb50028 */ 	sw	$s5,0x28($sp)
-/*  f180cc4:	afb40024 */ 	sw	$s4,0x24($sp)
-/*  f180cc8:	afb30020 */ 	sw	$s3,0x20($sp)
-/*  f180ccc:	afb2001c */ 	sw	$s2,0x1c($sp)
-/*  f180cd0:	afb10018 */ 	sw	$s1,0x18($sp)
-/*  f180cd4:	afb00014 */ 	sw	$s0,0x14($sp)
-/*  f180cd8:	aeef000c */ 	sw	$t7,0xc($s7)
-/*  f180cdc:	01003025 */ 	or	$a2,$t0,$zero
-/*  f180ce0:	00003825 */ 	or	$a3,$zero,$zero
-/*  f180ce4:	2405ffff */ 	addiu	$a1,$zero,-1
-/*  f180ce8:	24040006 */ 	addiu	$a0,$zero,0x6
-.L0f180cec:
-/*  f180cec:	a4c70018 */ 	sh	$a3,0x18($a2)
-/*  f180cf0:	a4c0001a */ 	sh	$zero,0x1a($a2)
-/*  f180cf4:	00001025 */ 	or	$v0,$zero,$zero
-/*  f180cf8:	01001825 */ 	or	$v1,$t0,$zero
-.L0f180cfc:
-/*  f180cfc:	24420001 */ 	addiu	$v0,$v0,0x1
-/*  f180d00:	24630002 */ 	addiu	$v1,$v1,0x2
-/*  f180d04:	1444fffd */ 	bne	$v0,$a0,.L0f180cfc
-/*  f180d08:	a465001a */ 	sh	$a1,0x1a($v1)
-/*  f180d0c:	24e70001 */ 	addiu	$a3,$a3,0x1
-/*  f180d10:	28e10004 */ 	slti	$at,$a3,0x4
-/*  f180d14:	24c60010 */ 	addiu	$a2,$a2,0x10
-/*  f180d18:	1420fff4 */ 	bnez	$at,.L0f180cec
-/*  f180d1c:	25080010 */ 	addiu	$t0,$t0,0x10
-/*  f180d20:	3c02800b */ 	lui	$v0,%hi(g_ScenarioData)
-/*  f180d24:	3c03800b */ 	lui	$v1,0x800b
-/*  f180d28:	2463c118 */ 	addiu	$v1,$v1,-16104
-/*  f180d2c:	2442c110 */ 	addiu	$v0,$v0,%lo(g_ScenarioData)
-.L0f180d30:
-/*  f180d30:	24420002 */ 	addiu	$v0,$v0,0x2
-/*  f180d34:	a440fffe */ 	sh	$zero,-0x2($v0)
-/*  f180d38:	1443fffd */ 	bne	$v0,$v1,.L0f180d30
-/*  f180d3c:	a4450006 */ 	sh	$a1,0x6($v0)
-/*  f180d40:	3c15800b */ 	lui	$s5,%hi(g_MpSimulants)
-/*  f180d44:	3c12800b */ 	lui	$s2,%hi(g_MpChrs)
-/*  f180d48:	2652c7b8 */ 	addiu	$s2,$s2,%lo(g_MpChrs)
-/*  f180d4c:	26b5c538 */ 	addiu	$s5,$s5,%lo(g_MpSimulants)
-/*  f180d50:	00008825 */ 	or	$s1,$zero,$zero
-/*  f180d54:	2416004c */ 	addiu	$s6,$zero,0x4c
-/*  f180d58:	2414000c */ 	addiu	$s4,$zero,0xc
-/*  f180d5c:	241300a0 */ 	addiu	$s3,$zero,0xa0
-/*  f180d60:	96f90016 */ 	lhu	$t9,0x16($s7)
-.L0f180d64:
-/*  f180d64:	24090001 */ 	addiu	$t1,$zero,0x1
-/*  f180d68:	02295004 */ 	sllv	$t2,$t1,$s1
-/*  f180d6c:	032a5824 */ 	and	$t3,$t9,$t2
-/*  f180d70:	1160001c */ 	beqz	$t3,.L0f180de4
-/*  f180d74:	2a210004 */ 	slti	$at,$s1,0x4
-/*  f180d78:	10200006 */ 	beqz	$at,.L0f180d94
-/*  f180d7c:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f180d80:	02330019 */ 	multu	$s1,$s3
-/*  f180d84:	00006012 */ 	mflo	$t4
-/*  f180d88:	024c8021 */ 	addu	$s0,$s2,$t4
-/*  f180d8c:	10000005 */ 	beqz	$zero,.L0f180da4
-/*  f180d90:	00000000 */ 	sll	$zero,$zero,0x0
-.L0f180d94:
-/*  f180d94:	02360019 */ 	multu	$s1,$s6
-/*  f180d98:	00006812 */ 	mflo	$t5
-/*  f180d9c:	02ad8021 */ 	addu	$s0,$s5,$t5
-/*  f180da0:	2610fed0 */ 	addiu	$s0,$s0,-304
-.L0f180da4:
-/*  f180da4:	0fc61902 */ 	jal	scenarioCallback30
-/*  f180da8:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f180dac:	920e0011 */ 	lbu	$t6,0x11($s0)
-/*  f180db0:	01c2082a */ 	slt	$at,$t6,$v0
-/*  f180db4:	5420000c */ 	bnezl	$at,.L0f180de8
-/*  f180db8:	26310001 */ 	addiu	$s1,$s1,0x1
-.L0f180dbc:
-/*  f180dbc:	0fc61902 */ 	jal	scenarioCallback30
-/*  f180dc0:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f180dc4:	920f0011 */ 	lbu	$t7,0x11($s0)
-/*  f180dc8:	01e2c023 */ 	subu	$t8,$t7,$v0
-/*  f180dcc:	0fc61902 */ 	jal	scenarioCallback30
-/*  f180dd0:	a2180011 */ 	sb	$t8,0x11($s0)
-/*  f180dd4:	92090011 */ 	lbu	$t1,0x11($s0)
-/*  f180dd8:	0122082a */ 	slt	$at,$t1,$v0
-/*  f180ddc:	1020fff7 */ 	beqz	$at,.L0f180dbc
-/*  f180de0:	00000000 */ 	sll	$zero,$zero,0x0
-.L0f180de4:
-/*  f180de4:	26310001 */ 	addiu	$s1,$s1,0x1
-.L0f180de8:
-/*  f180de8:	5634ffde */ 	bnel	$s1,$s4,.L0f180d64
-/*  f180dec:	96f90016 */ 	lhu	$t9,0x16($s7)
-/*  f180df0:	8fbf0034 */ 	lw	$ra,0x34($sp)
-/*  f180df4:	8fb00014 */ 	lw	$s0,0x14($sp)
-/*  f180df8:	8fb10018 */ 	lw	$s1,0x18($sp)
-/*  f180dfc:	8fb2001c */ 	lw	$s2,0x1c($sp)
-/*  f180e00:	8fb30020 */ 	lw	$s3,0x20($sp)
-/*  f180e04:	8fb40024 */ 	lw	$s4,0x24($sp)
-/*  f180e08:	8fb50028 */ 	lw	$s5,0x28($sp)
-/*  f180e0c:	8fb6002c */ 	lw	$s6,0x2c($sp)
-/*  f180e10:	8fb70030 */ 	lw	$s7,0x30($sp)
-/*  f180e14:	03e00008 */ 	jr	$ra
-/*  f180e18:	27bd0038 */ 	addiu	$sp,$sp,0x38
-);
+void scenarioCtcInit(void)
+{
+	s32 i, j, k;
+	g_MpSetup.options |= MPOPTION_TEAMSENABLED;
+
+	for (i = 0; i < 4; i++) {
+		s32 j;
+		g_ScenarioData.ctc.unk18[i].unk00 = i;
+		g_ScenarioData.ctc.unk18[i].unk02 = 0;
+
+		for (j = 0; j < 6; j++) {
+			g_ScenarioData.ctc.unk18[i].unk04[j] = -1;
+		}
+	}
+
+	for (i = 0; i != 4; i++) {
+		g_ScenarioData.ctc.unk00[i] = 0;
+		g_ScenarioData.ctc.unk08[i] = -1;
+	}
+
+	for (k = 0; k < 12; k++) {
+		if (g_MpSetup.chrslots & (1 << k)) {
+			struct mpchr *basedata;
+
+			if (k < 4) {
+				basedata = &g_MpPlayers[k].base;
+			} else {
+				basedata = &g_MpSimulants[k - 4].base;
+			}
+
+			while (scenarioCallback30() <= basedata->unk11) {
+				basedata->unk11 -= scenarioCallback30();
+			}
+		}
+	}
+}
 
 s32 scenarioCtcCallback08(void)
 {
@@ -11290,8 +11217,8 @@ glabel scenarioCtcCallback0c
 /*  f180f64:	00116080 */ 	sll	$t4,$s1,0x2
 /*  f180f68:	00115080 */ 	sll	$t2,$s1,0x2
 /*  f180f6c:	01515021 */ 	addu	$t2,$t2,$s1
-/*  f180f70:	3c0b800b */ 	lui	$t3,%hi(g_MpChrs)
-/*  f180f74:	256bc7b8 */ 	addiu	$t3,$t3,%lo(g_MpChrs)
+/*  f180f70:	3c0b800b */ 	lui	$t3,%hi(g_MpPlayers)
+/*  f180f74:	256bc7b8 */ 	addiu	$t3,$t3,%lo(g_MpPlayers)
 /*  f180f78:	000a5140 */ 	sll	$t2,$t2,0x5
 /*  f180f7c:	10000009 */ 	beqz	$zero,.L0f180fa4
 /*  f180f80:	014b8021 */ 	addu	$s0,$t2,$t3
@@ -11613,8 +11540,8 @@ glabel scenarioCtcCallback1c
 /*  f181404:	33190400 */ 	andi	$t9,$t8,0x400
 /*  f181408:	13200028 */ 	beqz	$t9,.L0f1814ac
 /*  f18140c:	3c0b800b */ 	lui	$t3,%hi(g_MpSimulants)
-/*  f181410:	3c09800b */ 	lui	$t1,%hi(g_MpChrs)
-/*  f181414:	2529c7b8 */ 	addiu	$t1,$t1,%lo(g_MpChrs)
+/*  f181410:	3c09800b */ 	lui	$t1,%hi(g_MpPlayers)
+/*  f181414:	2529c7b8 */ 	addiu	$t1,$t1,%lo(g_MpPlayers)
 /*  f181418:	256bc538 */ 	addiu	$t3,$t3,%lo(g_MpSimulants)
 /*  f18141c:	240a00a0 */ 	addiu	$t2,$zero,0xa0
 /*  f181420:	2408000c */ 	addiu	$t0,$zero,0xc
@@ -12139,22 +12066,22 @@ void scenarioKohInit(void)
 	s32 i;
 
 	g_MpSetup.options |= MPOPTION_TEAMSENABLED;
-	g_ScenarioData.hill.unk0a = -1;
-	g_ScenarioData.hill.unk0c = 0;
-	g_ScenarioData.hill.unk00 = 0;
-	g_ScenarioData.hill.unk04 = -1;
-	g_ScenarioData.hill.unk06 = 0;
-	g_ScenarioData.hill.unk0e = -1;
-	g_ScenarioData.hill.unk10 = -1;
-	g_ScenarioData.hill.unk24 = 0;
-	g_ScenarioData.hill.unk28 = 0;
-	g_ScenarioData.hill.unk2c = 0;
-	g_ScenarioData.hill.unk30 = 0.25;
-	g_ScenarioData.hill.unk34 = 1;
-	g_ScenarioData.hill.unk38 = 0.25;
+	g_ScenarioData.koh.unk0a = -1;
+	g_ScenarioData.koh.unk0c = 0;
+	g_ScenarioData.koh.unk00 = 0;
+	g_ScenarioData.koh.unk04 = -1;
+	g_ScenarioData.koh.unk06 = 0;
+	g_ScenarioData.koh.unk0e = -1;
+	g_ScenarioData.koh.unk10 = -1;
+	g_ScenarioData.koh.unk24 = 0;
+	g_ScenarioData.koh.unk28 = 0;
+	g_ScenarioData.koh.unk2c = 0;
+	g_ScenarioData.koh.unk30 = 0.25;
+	g_ScenarioData.koh.unk34 = 1;
+	g_ScenarioData.koh.unk38 = 0.25;
 
 	for (i = 0; i < 9; i++) {
-		g_ScenarioData.hill.unk12[i] = -1;
+		g_ScenarioData.koh.unk12[i] = -1;
 	}
 }
 
@@ -13097,8 +13024,8 @@ glabel scenarioKohCallback1c
 /*  f18292c:	31f80400 */ 	andi	$t8,$t7,0x400
 /*  f182930:	13000028 */ 	beqz	$t8,.L0f1829d4
 /*  f182934:	3c0b800b */ 	lui	$t3,%hi(g_MpSimulants)
-/*  f182938:	3c09800b */ 	lui	$t1,%hi(g_MpChrs)
-/*  f18293c:	2529c7b8 */ 	addiu	$t1,$t1,%lo(g_MpChrs)
+/*  f182938:	3c09800b */ 	lui	$t1,%hi(g_MpPlayers)
+/*  f18293c:	2529c7b8 */ 	addiu	$t1,$t1,%lo(g_MpPlayers)
 /*  f182940:	256bc538 */ 	addiu	$t3,$t3,%lo(g_MpSimulants)
 /*  f182944:	240a00a0 */ 	addiu	$t2,$zero,0xa0
 /*  f182948:	2408000c */ 	addiu	$t0,$zero,0xc
@@ -14457,8 +14384,8 @@ glabel scenarioHtmCallback1c
 /*  f183c20:	11e00033 */ 	beqz	$t7,.L0f183cf0
 /*  f183c24:	240a004c */ 	addiu	$t2,$zero,0x4c
 /*  f183c28:	3c09800b */ 	lui	$t1,%hi(g_MpSimulants)
-/*  f183c2c:	3c07800b */ 	lui	$a3,%hi(g_MpChrs)
-/*  f183c30:	24e7c7b8 */ 	addiu	$a3,$a3,%lo(g_MpChrs)
+/*  f183c2c:	3c07800b */ 	lui	$a3,%hi(g_MpPlayers)
+/*  f183c30:	24e7c7b8 */ 	addiu	$a3,$a3,%lo(g_MpPlayers)
 /*  f183c34:	2529c538 */ 	addiu	$t1,$t1,%lo(g_MpSimulants)
 /*  f183c38:	240800a0 */ 	addiu	$t0,$zero,0xa0
 /*  f183c3c:	2405000c */ 	addiu	$a1,$zero,0xc
@@ -15646,8 +15573,8 @@ glabel scenarioPacCallback1c
 /*  f184c94:	11800033 */ 	beqz	$t4,.L0f184d64
 /*  f184c98:	240a004c */ 	addiu	$t2,$zero,0x4c
 /*  f184c9c:	3c09800b */ 	lui	$t1,%hi(g_MpSimulants)
-/*  f184ca0:	3c07800b */ 	lui	$a3,%hi(g_MpChrs)
-/*  f184ca4:	24e7c7b8 */ 	addiu	$a3,$a3,%lo(g_MpChrs)
+/*  f184ca0:	3c07800b */ 	lui	$a3,%hi(g_MpPlayers)
+/*  f184ca4:	24e7c7b8 */ 	addiu	$a3,$a3,%lo(g_MpPlayers)
 /*  f184ca8:	2529c538 */ 	addiu	$t1,$t1,%lo(g_MpSimulants)
 /*  f184cac:	240800a0 */ 	addiu	$t0,$zero,0xa0
 /*  f184cb0:	2405000c */ 	addiu	$a1,$zero,0xc
@@ -16649,9 +16576,9 @@ glabel func0f185c14
 /*  f185c64:	8fbf001c */ 	lw	$ra,0x1c($sp)
 .L0f185c68:
 /*  f185c68:	3c09800b */ 	lui	$t1,%hi(g_MpSimulants)
-/*  f185c6c:	3c07800b */ 	lui	$a3,%hi(g_MpChrs)
+/*  f185c6c:	3c07800b */ 	lui	$a3,%hi(g_MpPlayers)
 /*  f185c70:	acc00000 */ 	sw	$zero,0x0($a2)
-/*  f185c74:	24e7c7b8 */ 	addiu	$a3,$a3,%lo(g_MpChrs)
+/*  f185c74:	24e7c7b8 */ 	addiu	$a3,$a3,%lo(g_MpPlayers)
 /*  f185c78:	2529c538 */ 	addiu	$t1,$t1,%lo(g_MpSimulants)
 /*  f185c7c:	00001025 */ 	or	$v0,$zero,$zero
 /*  f185c80:	02001825 */ 	or	$v1,$s0,$zero
@@ -17008,8 +16935,8 @@ glabel func0f18620c
 /*  f18625c:	a420c11c */ 	sh	$zero,-0x3ee4($at)
 /*  f186260:	3c18800b */ 	lui	$t8,0x800b
 /*  f186264:	2707c110 */ 	addiu	$a3,$t8,-16112
-/*  f186268:	3c08800b */ 	lui	$t0,%hi(var800ac150)
-/*  f18626c:	2508c150 */ 	addiu	$t0,$t0,%lo(var800ac150)
+/*  f186268:	3c08800b */ 	lui	$t0,0x800b
+/*  f18626c:	2508c150 */ 	addiu	$t0,$t0,-16048
 /*  f186270:	00e03025 */ 	or	$a2,$a3,$zero
 /*  f186274:	2405ffff */ 	addiu	$a1,$zero,-1
 /*  f186278:	24040006 */ 	addiu	$a0,$zero,0x6
@@ -17356,8 +17283,8 @@ glabel func0f186780
 /*  f1867d8:	00034080 */ 	sll	$t0,$v1,0x2
 /*  f1867dc:	0003c080 */ 	sll	$t8,$v1,0x2
 /*  f1867e0:	0303c021 */ 	addu	$t8,$t8,$v1
-/*  f1867e4:	3c19800b */ 	lui	$t9,%hi(g_MpChrs)
-/*  f1867e8:	2739c7b8 */ 	addiu	$t9,$t9,%lo(g_MpChrs)
+/*  f1867e4:	3c19800b */ 	lui	$t9,%hi(g_MpPlayers)
+/*  f1867e8:	2739c7b8 */ 	addiu	$t9,$t9,%lo(g_MpPlayers)
 /*  f1867ec:	0018c140 */ 	sll	$t8,$t8,0x5
 /*  f1867f0:	10000009 */ 	beqz	$zero,.L0f186818
 /*  f1867f4:	03192021 */ 	addu	$a0,$t8,$t9
@@ -17376,8 +17303,8 @@ glabel func0f186780
 /*  f186820:	00026880 */ 	sll	$t5,$v0,0x2
 /*  f186824:	00025880 */ 	sll	$t3,$v0,0x2
 /*  f186828:	01625821 */ 	addu	$t3,$t3,$v0
-/*  f18682c:	3c0c800b */ 	lui	$t4,%hi(g_MpChrs)
-/*  f186830:	258cc7b8 */ 	addiu	$t4,$t4,%lo(g_MpChrs)
+/*  f18682c:	3c0c800b */ 	lui	$t4,%hi(g_MpPlayers)
+/*  f186830:	258cc7b8 */ 	addiu	$t4,$t4,%lo(g_MpPlayers)
 /*  f186834:	000b5940 */ 	sll	$t3,$t3,0x5
 /*  f186838:	10000009 */ 	beqz	$zero,.L0f186860
 /*  f18683c:	016c1821 */ 	addu	$v1,$t3,$t4
@@ -17456,8 +17383,8 @@ glabel func0f186898
 /*  f18693c:	26319fc0 */ 	addiu	$s1,$s1,%lo(g_Vars)
 /*  f186940:	8e39028c */ 	lw	$t9,0x28c($s1)
 .L0f186944:
-/*  f186944:	3c0c800b */ 	lui	$t4,%hi(g_MpChrs)
-/*  f186948:	258cc7b8 */ 	addiu	$t4,$t4,%lo(g_MpChrs)
+/*  f186944:	3c0c800b */ 	lui	$t4,%hi(g_MpPlayers)
+/*  f186948:	258cc7b8 */ 	addiu	$t4,$t4,%lo(g_MpPlayers)
 /*  f18694c:	001979c0 */ 	sll	$t7,$t9,0x7
 /*  f186950:	022f5021 */ 	addu	$t2,$s1,$t7
 /*  f186954:	8d4200e4 */ 	lw	$v0,0xe4($t2)
@@ -17632,8 +17559,8 @@ glabel func0f186898
 /*  f186bac:	8da302d4 */ 	lw	$v1,0x2d4($t5)
 /*  f186bb0:	8e2e028c */ 	lw	$t6,0x28c($s1)
 .L0f186bb4:
-/*  f186bb4:	3c0a800b */ 	lui	$t2,%hi(g_MpChrs)
-/*  f186bb8:	254ac7b8 */ 	addiu	$t2,$t2,%lo(g_MpChrs)
+/*  f186bb4:	3c0a800b */ 	lui	$t2,%hi(g_MpPlayers)
+/*  f186bb8:	254ac7b8 */ 	addiu	$t2,$t2,%lo(g_MpPlayers)
 /*  f186bbc:	000ec1c0 */ 	sll	$t8,$t6,0x7
 /*  f186bc0:	0238c821 */ 	addu	$t9,$s1,$t8
 /*  f186bc4:	8f2200e4 */ 	lw	$v0,0xe4($t9)
@@ -18256,8 +18183,8 @@ glabel func0f187410
 /*  f187478:	8e10c500 */ 	lw	$s0,-0x3b00($s0)
 /*  f18747c:	8d4d028c */ 	lw	$t5,0x28c($t2)
 .L0f187480:
-/*  f187480:	3c19800b */ 	lui	$t9,%hi(g_MpChrs)
-/*  f187484:	2739c7b8 */ 	addiu	$t9,$t9,%lo(g_MpChrs)
+/*  f187480:	3c19800b */ 	lui	$t9,%hi(g_MpPlayers)
+/*  f187484:	2739c7b8 */ 	addiu	$t9,$t9,%lo(g_MpPlayers)
 /*  f187488:	000d71c0 */ 	sll	$t6,$t5,0x7
 /*  f18748c:	014e7821 */ 	addu	$t7,$t2,$t6
 /*  f187490:	8de200e4 */ 	lw	$v0,0xe4($t7)
diff --git a/src/game/game_187770.c b/src/game/game_187770.c
index 42a9009c5..fd4322657 100644
--- a/src/game/game_187770.c
+++ b/src/game/game_187770.c
@@ -413,8 +413,8 @@ glabel func0f187944
 .L0f1879dc:
 /*  f1879dc:	3c05800b */ 	lui	$a1,%hi(var800acad8)
 /*  f1879e0:	3c06800b */ 	lui	$a2,0x800b
-/*  f1879e4:	3c14800b */ 	lui	$s4,%hi(g_MpChrs)
-/*  f1879e8:	2694c7b8 */ 	addiu	$s4,$s4,%lo(g_MpChrs)
+/*  f1879e4:	3c14800b */ 	lui	$s4,%hi(g_MpPlayers)
+/*  f1879e8:	2694c7b8 */ 	addiu	$s4,$s4,%lo(g_MpPlayers)
 /*  f1879ec:	24c6c858 */ 	addiu	$a2,$a2,-14248
 /*  f1879f0:	24a5cad8 */ 	addiu	$a1,$a1,%lo(var800acad8)
 /*  f1879f4:	24070002 */ 	addiu	$a3,$zero,0x2
@@ -567,8 +567,8 @@ glabel func0f187944
 /*  f187c08:	10000022 */ 	beqz	$zero,.L0f187c94
 /*  f187c0c:	ac670000 */ 	sw	$a3,0x0($v1)
 .L0f187c10:
-/*  f187c10:	3c14800b */ 	lui	$s4,%hi(g_MpChrs)
-/*  f187c14:	2694c7b8 */ 	addiu	$s4,$s4,%lo(g_MpChrs)
+/*  f187c10:	3c14800b */ 	lui	$s4,%hi(g_MpPlayers)
+/*  f187c14:	2694c7b8 */ 	addiu	$s4,$s4,%lo(g_MpPlayers)
 /*  f187c18:	00008025 */ 	or	$s0,$zero,$zero
 /*  f187c1c:	241300a0 */ 	addiu	$s3,$zero,0xa0
 .L0f187c20:
@@ -836,8 +836,8 @@ GLOBAL_ASM(
 glabel func0f187fbc
 /*  f187fbc:	00047080 */ 	sll	$t6,$a0,0x2
 /*  f187fc0:	01c47021 */ 	addu	$t6,$t6,$a0
-/*  f187fc4:	3c0f800b */ 	lui	$t7,%hi(g_MpChrs)
-/*  f187fc8:	25efc7b8 */ 	addiu	$t7,$t7,%lo(g_MpChrs)
+/*  f187fc4:	3c0f800b */ 	lui	$t7,%hi(g_MpPlayers)
+/*  f187fc8:	25efc7b8 */ 	addiu	$t7,$t7,%lo(g_MpPlayers)
 /*  f187fcc:	000e7140 */ 	sll	$t6,$t6,0x5
 /*  f187fd0:	01cf1021 */ 	addu	$v0,$t6,$t7
 /*  f187fd4:	24030050 */ 	addiu	$v1,$zero,0x50
@@ -874,8 +874,8 @@ glabel func0f18800c
 /*  f188030:	afb00018 */ 	sw	$s0,0x18($sp)
 /*  f188034:	00137080 */ 	sll	$t6,$s3,0x2
 /*  f188038:	01d37021 */ 	addu	$t6,$t6,$s3
-/*  f18803c:	3c0f800b */ 	lui	$t7,%hi(g_MpChrs)
-/*  f188040:	25efc7b8 */ 	addiu	$t7,$t7,%lo(g_MpChrs)
+/*  f18803c:	3c0f800b */ 	lui	$t7,%hi(g_MpPlayers)
+/*  f188040:	25efc7b8 */ 	addiu	$t7,$t7,%lo(g_MpPlayers)
 /*  f188044:	000e7140 */ 	sll	$t6,$t6,0x5
 /*  f188048:	01cf8021 */ 	addu	$s0,$t6,$t7
 /*  f18804c:	241807ee */ 	addiu	$t8,$zero,0x7ee
@@ -968,8 +968,8 @@ glabel func0f18800c
 .L0f188184:
 /*  f188184:	00136880 */ 	sll	$t5,$s3,0x2
 /*  f188188:	01b36821 */ 	addu	$t5,$t5,$s3
-/*  f18818c:	3c0e800b */ 	lui	$t6,%hi(g_MpChrs)
-/*  f188190:	25cec7b8 */ 	addiu	$t6,$t6,%lo(g_MpChrs)
+/*  f18818c:	3c0e800b */ 	lui	$t6,%hi(g_MpPlayers)
+/*  f188190:	25cec7b8 */ 	addiu	$t6,$t6,%lo(g_MpPlayers)
 /*  f188194:	000d6940 */ 	sll	$t5,$t5,0x5
 /*  f188198:	01ae1021 */ 	addu	$v0,$t5,$t6
 /*  f18819c:	00008825 */ 	or	$s1,$zero,$zero
@@ -1081,10 +1081,10 @@ glabel func0f188210
 /*  f188310:	a0430003 */ 	sb	$v1,0x3($v0)
 /*  f188314:	0fc66fe8 */ 	jal	func0f19bfa0
 /*  f188318:	ac430004 */ 	sw	$v1,0x4($v0)
-/*  f18831c:	3c05800b */ 	lui	$a1,%hi(g_MpChrs)
+/*  f18831c:	3c05800b */ 	lui	$a1,%hi(g_MpPlayers)
 /*  f188320:	3c06800b */ 	lui	$a2,%hi(var800acb78)
 /*  f188324:	24c6cb78 */ 	addiu	$a2,$a2,%lo(var800acb78)
-/*  f188328:	24a5c7b8 */ 	addiu	$a1,$a1,%lo(g_MpChrs)
+/*  f188328:	24a5c7b8 */ 	addiu	$a1,$a1,%lo(g_MpPlayers)
 /*  f18832c:	24040006 */ 	addiu	$a0,$zero,0x6
 /*  f188330:	00001025 */ 	or	$v0,$zero,$zero
 .L0f188334:
@@ -1140,10 +1140,10 @@ glabel func0f18836c
 /*  f1883d8:	2a010008 */ 	slti	$at,$s0,0x8
 /*  f1883dc:	1420fff5 */ 	bnez	$at,.L0f1883b4
 /*  f1883e0:	2631000c */ 	addiu	$s1,$s1,0xc
-/*  f1883e4:	3c11800b */ 	lui	$s1,%hi(g_MpChrs)
+/*  f1883e4:	3c11800b */ 	lui	$s1,%hi(g_MpPlayers)
 /*  f1883e8:	3c127f1c */ 	lui	$s2,0x7f1c
 /*  f1883ec:	26528a50 */ 	addiu	$s2,$s2,-30128
-/*  f1883f0:	2631c7b8 */ 	addiu	$s1,$s1,%lo(g_MpChrs)
+/*  f1883f0:	2631c7b8 */ 	addiu	$s1,$s1,%lo(g_MpPlayers)
 /*  f1883f4:	00008025 */ 	or	$s0,$zero,$zero
 /*  f1883f8:	24130004 */ 	addiu	$s3,$zero,0x4
 .L0f1883fc:
@@ -1329,8 +1329,8 @@ glabel func0f1885e4
 /*  f188654:	00001825 */ 	or	$v1,$zero,$zero
 /*  f188658:	0011c880 */ 	sll	$t9,$s1,0x2
 /*  f18865c:	0331c821 */ 	addu	$t9,$t9,$s1
-/*  f188660:	3c18800b */ 	lui	$t8,%hi(g_MpChrs)
-/*  f188664:	2718c7b8 */ 	addiu	$t8,$t8,%lo(g_MpChrs)
+/*  f188660:	3c18800b */ 	lui	$t8,%hi(g_MpPlayers)
+/*  f188664:	2718c7b8 */ 	addiu	$t8,$t8,%lo(g_MpPlayers)
 /*  f188668:	0019c940 */ 	sll	$t9,$t9,0x5
 /*  f18866c:	1000000a */ 	beqz	$zero,.L0f188698
 /*  f188670:	03389021 */ 	addu	$s2,$t9,$t8
@@ -1542,14 +1542,14 @@ glabel func0f188930
 /*  f188950:	afb1001c */ 	sw	$s1,0x1c($sp)
 /*  f188954:	afb00018 */ 	sw	$s0,0x18($sp)
 /*  f188958:	3c14800b */ 	lui	$s4,%hi(g_MpSetup)
-/*  f18895c:	3c15800b */ 	lui	$s5,%hi(g_MpChrs)
+/*  f18895c:	3c15800b */ 	lui	$s5,%hi(g_MpPlayers)
 /*  f188960:	00809825 */ 	or	$s3,$a0,$zero
 /*  f188964:	afbf003c */ 	sw	$ra,0x3c($sp)
 /*  f188968:	afa50064 */ 	sw	$a1,0x64($sp)
 /*  f18896c:	00008825 */ 	or	$s1,$zero,$zero
 /*  f188970:	00009025 */ 	or	$s2,$zero,$zero
 /*  f188974:	afa00050 */ 	sw	$zero,0x50($sp)
-/*  f188978:	26b5c7b8 */ 	addiu	$s5,$s5,%lo(g_MpChrs)
+/*  f188978:	26b5c7b8 */ 	addiu	$s5,$s5,%lo(g_MpPlayers)
 /*  f18897c:	2694cb88 */ 	addiu	$s4,$s4,%lo(g_MpSetup)
 /*  f188980:	00008025 */ 	or	$s0,$zero,$zero
 /*  f188984:	241600a0 */ 	addiu	$s6,$zero,0xa0
@@ -3697,9 +3697,9 @@ glabel func0f18a56c
 /*  f18a680:	25cf0001 */ 	addiu	$t7,$t6,0x1
 /*  f18a684:	448f2000 */ 	mtc1	$t7,$f4
 /*  f18a688:	3c14800a */ 	lui	$s4,%hi(g_Vars)
-/*  f18a68c:	3c1e800b */ 	lui	$s8,%hi(g_MpChrs)
+/*  f18a68c:	3c1e800b */ 	lui	$s8,%hi(g_MpPlayers)
 /*  f18a690:	468021a0 */ 	cvt.s.w	$f6,$f4
-/*  f18a694:	27dec7b8 */ 	addiu	$s8,$s8,%lo(g_MpChrs)
+/*  f18a694:	27dec7b8 */ 	addiu	$s8,$s8,%lo(g_MpPlayers)
 /*  f18a698:	26949fc0 */ 	addiu	$s4,$s4,%lo(g_Vars)
 /*  f18a69c:	27b301fc */ 	addiu	$s3,$sp,0x1fc
 /*  f18a6a0:	2417000c */ 	addiu	$s7,$zero,0xc
@@ -4284,8 +4284,8 @@ glabel func0f18a56c
 /*  f18aef8:	16cffdec */ 	bne	$s6,$t7,.L0f18a6ac
 /*  f18aefc:	26940080 */ 	addiu	$s4,$s4,0x80
 .L0f18af00:
-/*  f18af00:	3c1e800b */ 	lui	$s8,%hi(g_MpChrs)
-/*  f18af04:	27dec7b8 */ 	addiu	$s8,$s8,%lo(g_MpChrs)
+/*  f18af00:	3c1e800b */ 	lui	$s8,%hi(g_MpPlayers)
+/*  f18af04:	27dec7b8 */ 	addiu	$s8,$s8,%lo(g_MpPlayers)
 /*  f18af08:	2417000c */ 	addiu	$s7,$zero,0xc
 /*  f18af0c:	0fc4a24b */ 	jal	setCurrentPlayerNum
 /*  f18af10:	8fa402f0 */ 	lw	$a0,0x2f0($sp)
@@ -5365,7 +5365,7 @@ glabel func0f18bc9c
 /*  f18bda0:	afb6002c */ 	sw	$s6,0x2c($sp)
 /*  f18bda4:	afb40024 */ 	sw	$s4,0x24($sp)
 /*  f18bda8:	afb30020 */ 	sw	$s3,0x20($sp)
-/*  f18bdac:	3c12800b */ 	lui	$s2,%hi(g_MpChrs)
+/*  f18bdac:	3c12800b */ 	lui	$s2,%hi(g_MpPlayers)
 /*  f18bdb0:	3c15800b */ 	lui	$s5,%hi(g_MpSimulants)
 /*  f18bdb4:	afbf0034 */ 	sw	$ra,0x34($sp)
 /*  f18bdb8:	afb10018 */ 	sw	$s1,0x18($sp)
@@ -5373,7 +5373,7 @@ glabel func0f18bc9c
 /*  f18bdc0:	afa40038 */ 	sw	$a0,0x38($sp)
 /*  f18bdc4:	afa5003c */ 	sw	$a1,0x3c($sp)
 /*  f18bdc8:	26b5c538 */ 	addiu	$s5,$s5,%lo(g_MpSimulants)
-/*  f18bdcc:	2652c7b8 */ 	addiu	$s2,$s2,%lo(g_MpChrs)
+/*  f18bdcc:	2652c7b8 */ 	addiu	$s2,$s2,%lo(g_MpPlayers)
 /*  f18bdd0:	241300a0 */ 	addiu	$s3,$zero,0xa0
 /*  f18bdd4:	2414000c */ 	addiu	$s4,$zero,0xc
 /*  f18bdd8:	2416004c */ 	addiu	$s6,$zero,0x4c
@@ -6174,8 +6174,8 @@ glabel func0f18c794
 /*  f18c7cc:	00054880 */ 	sll	$t1,$a1,0x2
 /*  f18c7d0:	0005c880 */ 	sll	$t9,$a1,0x2
 /*  f18c7d4:	0325c821 */ 	addu	$t9,$t9,$a1
-/*  f18c7d8:	3c08800b */ 	lui	$t0,%hi(g_MpChrs)
-/*  f18c7dc:	2508c7b8 */ 	addiu	$t0,$t0,%lo(g_MpChrs)
+/*  f18c7d8:	3c08800b */ 	lui	$t0,%hi(g_MpPlayers)
+/*  f18c7dc:	2508c7b8 */ 	addiu	$t0,$t0,%lo(g_MpPlayers)
 /*  f18c7e0:	0019c940 */ 	sll	$t9,$t9,0x5
 /*  f18c7e4:	03e00008 */ 	jr	$ra
 /*  f18c7e8:	03281021 */ 	addu	$v0,$t9,$t0
@@ -6252,9 +6252,9 @@ GLOBAL_ASM(
 glabel func0f18c8b8
 /*  f18c8b8:	3c05800b */ 	lui	$a1,0x800b
 /*  f18c8bc:	3c0b800b */ 	lui	$t3,%hi(g_MpSimulants)
-/*  f18c8c0:	3c08800b */ 	lui	$t0,%hi(g_MpChrs)
+/*  f18c8c0:	3c08800b */ 	lui	$t0,%hi(g_MpPlayers)
 /*  f18c8c4:	00001825 */ 	or	$v1,$zero,$zero
-/*  f18c8c8:	2508c7b8 */ 	addiu	$t0,$t0,%lo(g_MpChrs)
+/*  f18c8c8:	2508c7b8 */ 	addiu	$t0,$t0,%lo(g_MpPlayers)
 /*  f18c8cc:	256bc538 */ 	addiu	$t3,$t3,%lo(g_MpSimulants)
 /*  f18c8d0:	94a5cb9e */ 	lhu	$a1,-0x3462($a1)
 /*  f18c8d4:	240c004c */ 	addiu	$t4,$zero,0x4c
@@ -6373,10 +6373,10 @@ glabel func0f18c984
 /*  f18ca60:	0c004c4c */ 	jal	strcpy
 /*  f18ca64:	afa70040 */ 	sw	$a3,0x40($sp)
 /*  f18ca68:	a3d10011 */ 	sb	$s1,0x11($s8)
-/*  f18ca6c:	3c11800b */ 	lui	$s1,%hi(g_MpChrs)
+/*  f18ca6c:	3c11800b */ 	lui	$s1,%hi(g_MpPlayers)
 /*  f18ca70:	3c168008 */ 	lui	$s6,%hi(table_0x2d678)
 /*  f18ca74:	26d67658 */ 	addiu	$s6,$s6,%lo(table_0x2d678)
-/*  f18ca78:	2631c7b8 */ 	addiu	$s1,$s1,%lo(g_MpChrs)
+/*  f18ca78:	2631c7b8 */ 	addiu	$s1,$s1,%lo(g_MpPlayers)
 /*  f18ca7c:	24170035 */ 	addiu	$s7,$zero,0x35
 /*  f18ca80:	2413000c */ 	addiu	$s3,$zero,0xc
 /*  f18ca84:	241200a0 */ 	addiu	$s2,$zero,0xa0
@@ -6846,8 +6846,8 @@ glabel func0f18d074
 /*  f18d074:	00047080 */ 	sll	$t6,$a0,0x2
 /*  f18d078:	3c05800b */ 	lui	$a1,0x800b
 /*  f18d07c:	00ae2821 */ 	addu	$a1,$a1,$t6
-/*  f18d080:	3c02800b */ 	lui	$v0,%hi(g_MpChrs)
-/*  f18d084:	2442c7b8 */ 	addiu	$v0,$v0,%lo(g_MpChrs)
+/*  f18d080:	3c02800b */ 	lui	$v0,%hi(g_MpPlayers)
+/*  f18d084:	2442c7b8 */ 	addiu	$v0,$v0,%lo(g_MpPlayers)
 /*  f18d088:	8ca5c500 */ 	lw	$a1,-0x3b00($a1)
 /*  f18d08c:	00001825 */ 	or	$v1,$zero,$zero
 .L0f18d090:
@@ -6891,8 +6891,8 @@ glabel func0f18d0e8
 /*  f18d108:	00001825 */ 	or	$v1,$zero,$zero
 /*  f18d10c:	00047080 */ 	sll	$t6,$a0,0x2
 /*  f18d110:	01c47021 */ 	addu	$t6,$t6,$a0
-/*  f18d114:	3c0f800b */ 	lui	$t7,%hi(g_MpChrs)
-/*  f18d118:	25efc7b8 */ 	addiu	$t7,$t7,%lo(g_MpChrs)
+/*  f18d114:	3c0f800b */ 	lui	$t7,%hi(g_MpPlayers)
+/*  f18d118:	25efc7b8 */ 	addiu	$t7,$t7,%lo(g_MpPlayers)
 /*  f18d11c:	000e7140 */ 	sll	$t6,$t6,0x5
 /*  f18d120:	01cf3021 */ 	addu	$a2,$t6,$t7
 .L0f18d124:
@@ -6946,12 +6946,12 @@ glabel func0f18d1b8
 /*  f18d1b8:	27bdffd8 */ 	addiu	$sp,$sp,-40
 /*  f18d1bc:	00057080 */ 	sll	$t6,$a1,0x2
 /*  f18d1c0:	01c57021 */ 	addu	$t6,$t6,$a1
-/*  f18d1c4:	3c0f800b */ 	lui	$t7,%hi(g_MpChrs)
+/*  f18d1c4:	3c0f800b */ 	lui	$t7,%hi(g_MpPlayers)
 /*  f18d1c8:	afb30020 */ 	sw	$s3,0x20($sp)
 /*  f18d1cc:	afb2001c */ 	sw	$s2,0x1c($sp)
 /*  f18d1d0:	afb10018 */ 	sw	$s1,0x18($sp)
 /*  f18d1d4:	afb00014 */ 	sw	$s0,0x14($sp)
-/*  f18d1d8:	25efc7b8 */ 	addiu	$t7,$t7,%lo(g_MpChrs)
+/*  f18d1d8:	25efc7b8 */ 	addiu	$t7,$t7,%lo(g_MpPlayers)
 /*  f18d1dc:	000e7140 */ 	sll	$t6,$t6,0x5
 /*  f18d1e0:	00809025 */ 	or	$s2,$a0,$zero
 /*  f18d1e4:	afbf0024 */ 	sw	$ra,0x24($sp)
@@ -6984,12 +6984,12 @@ glabel func0f18d238
 /*  f18d238:	27bdffd8 */ 	addiu	$sp,$sp,-40
 /*  f18d23c:	00057080 */ 	sll	$t6,$a1,0x2
 /*  f18d240:	01c57021 */ 	addu	$t6,$t6,$a1
-/*  f18d244:	3c0f800b */ 	lui	$t7,%hi(g_MpChrs)
+/*  f18d244:	3c0f800b */ 	lui	$t7,%hi(g_MpPlayers)
 /*  f18d248:	afb30020 */ 	sw	$s3,0x20($sp)
 /*  f18d24c:	afb2001c */ 	sw	$s2,0x1c($sp)
 /*  f18d250:	afb10018 */ 	sw	$s1,0x18($sp)
 /*  f18d254:	afb00014 */ 	sw	$s0,0x14($sp)
-/*  f18d258:	25efc7b8 */ 	addiu	$t7,$t7,%lo(g_MpChrs)
+/*  f18d258:	25efc7b8 */ 	addiu	$t7,$t7,%lo(g_MpPlayers)
 /*  f18d25c:	000e7140 */ 	sll	$t6,$t6,0x5
 /*  f18d260:	00809025 */ 	or	$s2,$a0,$zero
 /*  f18d264:	afbf0024 */ 	sw	$ra,0x24($sp)
@@ -7024,11 +7024,11 @@ glabel func0f18d2b8
 /*  f18d2c0:	0080a025 */ 	or	$s4,$a0,$zero
 /*  f18d2c4:	00147080 */ 	sll	$t6,$s4,0x2
 /*  f18d2c8:	01d47021 */ 	addu	$t6,$t6,$s4
-/*  f18d2cc:	3c0f800b */ 	lui	$t7,%hi(g_MpChrs)
+/*  f18d2cc:	3c0f800b */ 	lui	$t7,%hi(g_MpPlayers)
 /*  f18d2d0:	afb50028 */ 	sw	$s5,0x28($sp)
 /*  f18d2d4:	afb30020 */ 	sw	$s3,0x20($sp)
 /*  f18d2d8:	afb00014 */ 	sw	$s0,0x14($sp)
-/*  f18d2dc:	25efc7b8 */ 	addiu	$t7,$t7,%lo(g_MpChrs)
+/*  f18d2dc:	25efc7b8 */ 	addiu	$t7,$t7,%lo(g_MpPlayers)
 /*  f18d2e0:	000e7140 */ 	sll	$t6,$t6,0x5
 /*  f18d2e4:	00c08025 */ 	or	$s0,$a2,$zero
 /*  f18d2e8:	00a09825 */ 	or	$s3,$a1,$zero
@@ -7229,10 +7229,10 @@ glabel func0f18d5c4
 /*  f18d5cc:	0080a025 */ 	or	$s4,$a0,$zero
 /*  f18d5d0:	00147080 */ 	sll	$t6,$s4,0x2
 /*  f18d5d4:	01d47021 */ 	addu	$t6,$t6,$s4
-/*  f18d5d8:	3c0f800b */ 	lui	$t7,%hi(g_MpChrs)
+/*  f18d5d8:	3c0f800b */ 	lui	$t7,%hi(g_MpPlayers)
 /*  f18d5dc:	afb30024 */ 	sw	$s3,0x24($sp)
 /*  f18d5e0:	afb00018 */ 	sw	$s0,0x18($sp)
-/*  f18d5e4:	25efc7b8 */ 	addiu	$t7,$t7,%lo(g_MpChrs)
+/*  f18d5e4:	25efc7b8 */ 	addiu	$t7,$t7,%lo(g_MpPlayers)
 /*  f18d5e8:	000e7140 */ 	sll	$t6,$t6,0x5
 /*  f18d5ec:	00a09825 */ 	or	$s3,$a1,$zero
 /*  f18d5f0:	afbf002c */ 	sw	$ra,0x2c($sp)
@@ -7550,13 +7550,13 @@ glabel func0f18d9fc
 /*  f18da60:	1440000e */ 	bnez	$v0,.L0f18da9c
 /*  f18da64:	00401825 */ 	or	$v1,$v0,$zero
 /*  f18da68:	8fb90108 */ 	lw	$t9,0x108($sp)
-/*  f18da6c:	3c09800b */ 	lui	$t1,%hi(g_MpChrs)
+/*  f18da6c:	3c09800b */ 	lui	$t1,%hi(g_MpPlayers)
 /*  f18da70:	8faa0100 */ 	lw	$t2,0x100($sp)
 /*  f18da74:	00194080 */ 	sll	$t0,$t9,0x2
 /*  f18da78:	01194021 */ 	addu	$t0,$t0,$t9
 /*  f18da7c:	97ab0116 */ 	lhu	$t3,0x116($sp)
 /*  f18da80:	00084140 */ 	sll	$t0,$t0,0x5
-/*  f18da84:	2529c7b8 */ 	addiu	$t1,$t1,%lo(g_MpChrs)
+/*  f18da84:	2529c7b8 */ 	addiu	$t1,$t1,%lo(g_MpPlayers)
 /*  f18da88:	01091821 */ 	addu	$v1,$t0,$t1
 /*  f18da8c:	00001025 */ 	or	$v0,$zero,$zero
 /*  f18da90:	ac6a004c */ 	sw	$t2,0x4c($v1)
@@ -7595,8 +7595,8 @@ glabel func0f18dac0
 /*  f18daf8:	14400017 */ 	bnez	$v0,.L0f18db58
 /*  f18dafc:	00401825 */ 	or	$v1,$v0,$zero
 /*  f18db00:	8fa40100 */ 	lw	$a0,0x100($sp)
-/*  f18db04:	3c18800b */ 	lui	$t8,%hi(g_MpChrs)
-/*  f18db08:	2718c7b8 */ 	addiu	$t8,$t8,%lo(g_MpChrs)
+/*  f18db04:	3c18800b */ 	lui	$t8,%hi(g_MpPlayers)
+/*  f18db08:	2718c7b8 */ 	addiu	$t8,$t8,%lo(g_MpPlayers)
 /*  f18db0c:	00047880 */ 	sll	$t7,$a0,0x2
 /*  f18db10:	01e47821 */ 	addu	$t7,$t7,$a0
 /*  f18db14:	000f7940 */ 	sll	$t7,$t7,0x5
@@ -8037,11 +8037,11 @@ glabel func0f18df5c
 /*  f18e104:	02602025 */ 	or	$a0,$s3,$zero
 /*  f18e108:	0fc354fe */ 	jal	scenarioDefaultCallback40
 /*  f18e10c:	24050009 */ 	addiu	$a1,$zero,0x9
-/*  f18e110:	3c10800b */ 	lui	$s0,%hi(g_MpChrs)
+/*  f18e110:	3c10800b */ 	lui	$s0,%hi(g_MpPlayers)
 /*  f18e114:	3c11800b */ 	lui	$s1,%hi(var800aca38)
 /*  f18e118:	a6a20014 */ 	sh	$v0,0x14($s5)
 /*  f18e11c:	2631ca38 */ 	addiu	$s1,$s1,%lo(var800aca38)
-/*  f18e120:	2610c7b8 */ 	addiu	$s0,$s0,%lo(g_MpChrs)
+/*  f18e120:	2610c7b8 */ 	addiu	$s0,$s0,%lo(g_MpPlayers)
 .L0f18e124:
 /*  f18e124:	02602025 */ 	or	$a0,$s3,$zero
 /*  f18e128:	0fc354fe */ 	jal	scenarioDefaultCallback40
@@ -8196,10 +8196,10 @@ glabel func0f18e16c
 /*  f18e348:	96650014 */ 	lhu	$a1,0x14($s3)
 /*  f18e34c:	0fc354be */ 	jal	scenarioDefaultCallback44
 /*  f18e350:	24060009 */ 	addiu	$a2,$zero,0x9
-/*  f18e354:	3c10800b */ 	lui	$s0,%hi(g_MpChrs)
+/*  f18e354:	3c10800b */ 	lui	$s0,%hi(g_MpPlayers)
 /*  f18e358:	3c11800b */ 	lui	$s1,%hi(var800aca38)
 /*  f18e35c:	2631ca38 */ 	addiu	$s1,$s1,%lo(var800aca38)
-/*  f18e360:	2610c7b8 */ 	addiu	$s0,$s0,%lo(g_MpChrs)
+/*  f18e360:	2610c7b8 */ 	addiu	$s0,$s0,%lo(g_MpPlayers)
 /*  f18e364:	02402025 */ 	or	$a0,$s2,$zero
 .L0f18e368:
 /*  f18e368:	92050011 */ 	lbu	$a1,0x11($s0)
@@ -15168,7 +15168,7 @@ s32 mpGetNumTeammatesInRoomDoingSomething(struct chrdata *bot)
 	s32 i;
 
 	for (i = 0; i < g_MpNumPlayers; i++) {
-		if (bot->team == g_MpPlayerChrs[i]->team && g_MpPlayerChrs[i]->prop->rooms[0] == g_ScenarioData.combat.unk0e[0]) {
+		if (bot->team == g_MpPlayerChrs[i]->team && g_MpPlayerChrs[i]->prop->rooms[0] == g_ScenarioData.cbt.unk0e[0]) {
 			if (g_MpPlayerChrs[i]->unk2d4->unk79 == 9 || g_MpPlayerChrs[i]->unk2d4->unk79 == 10) {
 				count++;
 			}
@@ -15224,10 +15224,10 @@ glabel func0f194990
 /*  f194a34:	1940002b */ 	blez	$t2,.L0f194ae4
 /*  f194a38:	2417004c */ 	addiu	$s7,$zero,0x4c
 /*  f194a3c:	3c16800b */ 	lui	$s6,%hi(g_MpSimulants)
-/*  f194a40:	3c14800b */ 	lui	$s4,%hi(g_MpChrs)
+/*  f194a40:	3c14800b */ 	lui	$s4,%hi(g_MpPlayers)
 /*  f194a44:	3c13800b */ 	lui	$s3,%hi(g_ScenarioData)
 /*  f194a48:	2673c110 */ 	addiu	$s3,$s3,%lo(g_ScenarioData)
-/*  f194a4c:	2694c7b8 */ 	addiu	$s4,$s4,%lo(g_MpChrs)
+/*  f194a4c:	2694c7b8 */ 	addiu	$s4,$s4,%lo(g_MpPlayers)
 /*  f194a50:	26d6c538 */ 	addiu	$s6,$s6,%lo(g_MpSimulants)
 /*  f194a54:	241500a0 */ 	addiu	$s5,$zero,0xa0
 /*  f194a58:	8e2b0000 */ 	lw	$t3,0x0($s1)
diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c
index 49b77cf76..25cc97d16 100644
--- a/src/game/game_1999b0.c
+++ b/src/game/game_1999b0.c
@@ -2046,9 +2046,9 @@ glabel func0f19b540
 /*  f19b550:	15c10038 */ 	bne	$t6,$at,.L0f19b634
 /*  f19b554:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*  f19b558:	3c07800b */ 	lui	$a3,0x800b
-/*  f19b55c:	3c03800b */ 	lui	$v1,%hi(g_MpChrs)
+/*  f19b55c:	3c03800b */ 	lui	$v1,%hi(g_MpPlayers)
 /*  f19b560:	00002825 */ 	or	$a1,$zero,$zero
-/*  f19b564:	2463c7b8 */ 	addiu	$v1,$v1,%lo(g_MpChrs)
+/*  f19b564:	2463c7b8 */ 	addiu	$v1,$v1,%lo(g_MpPlayers)
 /*  f19b568:	94e7cb9e */ 	lhu	$a3,-0x3462($a3)
 /*  f19b56c:	00001025 */ 	or	$v0,$zero,$zero
 /*  f19b570:	24060080 */ 	addiu	$a2,$zero,0x80
@@ -2132,7 +2132,7 @@ glabel func0f19b540
 //
 //		for (i = 0; i < 4; i++) {
 //			if (g_MpSetup.chrslots & (1 << i)) {
-//				g_MpChrs[i].unk9d = 0x80;
+//				g_MpPlayers[i].unk9d = 0x80;
 //				slot++;
 //			}
 //		}
@@ -2919,10 +2919,10 @@ glabel func0f19c1cc
 /*  f19c1e8:	24040005 */ 	addiu	$a0,$zero,0x5
 /*  f19c1ec:	0fc62fdc */ 	jal	func0f18bf70
 /*  f19c1f0:	24050005 */ 	addiu	$a1,$zero,0x5
-/*  f19c1f4:	3c03800b */ 	lui	$v1,%hi(g_MpChrs)
+/*  f19c1f4:	3c03800b */ 	lui	$v1,%hi(g_MpPlayers)
 /*  f19c1f8:	3c02800b */ 	lui	$v0,%hi(var800aca38)
 /*  f19c1fc:	2442ca38 */ 	addiu	$v0,$v0,%lo(var800aca38)
-/*  f19c200:	2463c7b8 */ 	addiu	$v1,$v1,%lo(g_MpChrs)
+/*  f19c200:	2463c7b8 */ 	addiu	$v1,$v1,%lo(g_MpPlayers)
 .L0f19c204:
 /*  f19c204:	246300a0 */ 	addiu	$v1,$v1,0xa0
 /*  f19c208:	1462fffe */ 	bne	$v1,$v0,.L0f19c204
diff --git a/src/game/pdoptions.c b/src/game/pdoptions.c
index d0ba53c44..d20ded090 100644
--- a/src/game/pdoptions.c
+++ b/src/game/pdoptions.c
@@ -9,77 +9,77 @@
 
 s32 optionsGetControlMode(s32 mpchrnum)
 {
-	return g_MpChrs[mpchrnum].controlmode;
+	return g_MpPlayers[mpchrnum].controlmode;
 }
 
 void optionsSetControlMode(s32 mpchrnum, s32 mode)
 {
-	g_MpChrs[mpchrnum].controlmode = mode;
+	g_MpPlayers[mpchrnum].controlmode = mode;
 }
 
 s32 optionsGetUnk45(s32 mpchrnum)
 {
-	return g_MpChrs[mpchrnum].unk45;
+	return g_MpPlayers[mpchrnum].unk45;
 }
 
 s32 optionsGetUnk46(s32 mpchrnum)
 {
-	return g_MpChrs[mpchrnum].unk46;
+	return g_MpPlayers[mpchrnum].unk46;
 }
 
 s32 optionsGetForwardPitch(s32 mpchrnum)
 {
-	return (g_MpChrs[mpchrnum].options & OPTION_FORWARDPITCH) != 0;
+	return (g_MpPlayers[mpchrnum].options & OPTION_FORWARDPITCH) != 0;
 }
 
 s32 optionsGetAutoAim(s32 mpchrnum)
 {
-	return (g_MpChrs[mpchrnum].options & OPTION_AUTOAIM) != 0;
+	return (g_MpPlayers[mpchrnum].options & OPTION_AUTOAIM) != 0;
 }
 
 s32 optionsGetLookAhead(s32 mpchrnum)
 {
-	return (g_MpChrs[mpchrnum].options & OPTION_LOOKAHEAD) != 0;
+	return (g_MpPlayers[mpchrnum].options & OPTION_LOOKAHEAD) != 0;
 }
 
 s32 optionsGetAimControl(s32 mpchrnum)
 {
-	return (g_MpChrs[mpchrnum].options & OPTION_AIMCONTROL) != 0;
+	return (g_MpPlayers[mpchrnum].options & OPTION_AIMCONTROL) != 0;
 }
 
 s32 optionsGetSightOnScreen(s32 mpchrnum)
 {
-	return (g_MpChrs[mpchrnum].options & OPTION_SIGHTONSCREEN) != 0;
+	return (g_MpPlayers[mpchrnum].options & OPTION_SIGHTONSCREEN) != 0;
 }
 
 s32 optionsGetAmmoOnScreen(s32 mpchrnum)
 {
-	return (g_MpChrs[mpchrnum].options & OPTION_AMMOONSCREEN) != 0;
+	return (g_MpPlayers[mpchrnum].options & OPTION_AMMOONSCREEN) != 0;
 }
 
 s32 optionsGetShowGunFunction(s32 mpchrnum)
 {
-	return (g_MpChrs[mpchrnum].options & OPTION_SHOWGUNFUNCTION) != 0;
+	return (g_MpPlayers[mpchrnum].options & OPTION_SHOWGUNFUNCTION) != 0;
 }
 
 s32 optionsGetAlwaysShowTarget(s32 mpchrnum)
 {
-	return (g_MpChrs[mpchrnum].options & OPTION_ALWAYSSHOWTARGET) != 0;
+	return (g_MpPlayers[mpchrnum].options & OPTION_ALWAYSSHOWTARGET) != 0;
 }
 
 s32 optionsGetShowZoomRange(s32 mpchrnum)
 {
-	return (g_MpChrs[mpchrnum].options & OPTION_SHOWZOOMRANGE) != 0;
+	return (g_MpPlayers[mpchrnum].options & OPTION_SHOWZOOMRANGE) != 0;
 }
 
 s32 optionsGetPaintball(s32 mpchrnum)
 {
-	return (g_MpChrs[mpchrnum].options & OPTION_PAINTBALL) != 0;
+	return (g_MpPlayers[mpchrnum].options & OPTION_PAINTBALL) != 0;
 }
 
 s32 optionsGetShowMissionTime(s32 mpchrnum)
 {
-	return (g_MpChrs[mpchrnum].options & OPTION_SHOWMISSIONTIME) != 0;
+	return (g_MpPlayers[mpchrnum].options & OPTION_SHOWMISSIONTIME) != 0;
 }
 
 u8 optionsGetInGameSubtitles(void)
@@ -94,105 +94,105 @@ u8 optionsGetCutsceneSubtitles(void)
 
 s32 optionsGetHeadRoll(s32 mpchrnum)
 {
-	return (g_MpChrs[mpchrnum].options & OPTION_HEADROLL) != 0;
+	return (g_MpPlayers[mpchrnum].options & OPTION_HEADROLL) != 0;
 }
 
 void optionsSetForwardPitch(s32 mpchrnum, bool enable)
 {
 	if (enable) {
-		g_MpChrs[mpchrnum].options |= OPTION_FORWARDPITCH;
+		g_MpPlayers[mpchrnum].options |= OPTION_FORWARDPITCH;
 	} else {
-		g_MpChrs[mpchrnum].options &= ~OPTION_FORWARDPITCH;
+		g_MpPlayers[mpchrnum].options &= ~OPTION_FORWARDPITCH;
 	}
 }
 
 void optionsSetAutoAim(s32 mpchrnum, bool enable)
 {
 	if (enable) {
-		g_MpChrs[mpchrnum].options |= OPTION_AUTOAIM;
+		g_MpPlayers[mpchrnum].options |= OPTION_AUTOAIM;
 	} else {
-		g_MpChrs[mpchrnum].options &= ~OPTION_AUTOAIM;
+		g_MpPlayers[mpchrnum].options &= ~OPTION_AUTOAIM;
 	}
 }
 
 void optionsSetLookAhead(s32 mpchrnum, bool enable)
 {
 	if (enable) {
-		g_MpChrs[mpchrnum].options |= OPTION_LOOKAHEAD;
+		g_MpPlayers[mpchrnum].options |= OPTION_LOOKAHEAD;
 	} else {
-		g_MpChrs[mpchrnum].options &= ~OPTION_LOOKAHEAD;
+		g_MpPlayers[mpchrnum].options &= ~OPTION_LOOKAHEAD;
 	}
 }
 
 void optionsSetAimControl(s32 mpchrnum, s32 index)
 {
 	if (index) {
-		g_MpChrs[mpchrnum].options |= OPTION_AIMCONTROL;
+		g_MpPlayers[mpchrnum].options |= OPTION_AIMCONTROL;
 	} else {
-		g_MpChrs[mpchrnum].options &= ~OPTION_AIMCONTROL;
+		g_MpPlayers[mpchrnum].options &= ~OPTION_AIMCONTROL;
 	}
 }
 
 void optionsSetSightOnScreen(s32 mpchrnum, bool enable)
 {
 	if (enable) {
-		g_MpChrs[mpchrnum].options |= OPTION_SIGHTONSCREEN;
+		g_MpPlayers[mpchrnum].options |= OPTION_SIGHTONSCREEN;
 	} else {
-		g_MpChrs[mpchrnum].options &= ~OPTION_SIGHTONSCREEN;
+		g_MpPlayers[mpchrnum].options &= ~OPTION_SIGHTONSCREEN;
 	}
 }
 
 void optionsSetAmmoOnScreen(s32 mpchrnum, bool enable)
 {
 	if (enable) {
-		g_MpChrs[mpchrnum].options |= OPTION_AMMOONSCREEN;
+		g_MpPlayers[mpchrnum].options |= OPTION_AMMOONSCREEN;
 	} else {
-		g_MpChrs[mpchrnum].options &= ~OPTION_AMMOONSCREEN;
+		g_MpPlayers[mpchrnum].options &= ~OPTION_AMMOONSCREEN;
 	}
 }
 
 void optionsSetShowGunFunction(s32 mpchrnum, bool enable)
 {
 	if (enable) {
-		g_MpChrs[mpchrnum].options |= OPTION_SHOWGUNFUNCTION;
+		g_MpPlayers[mpchrnum].options |= OPTION_SHOWGUNFUNCTION;
 	} else {
-		g_MpChrs[mpchrnum].options &= ~OPTION_SHOWGUNFUNCTION;
+		g_MpPlayers[mpchrnum].options &= ~OPTION_SHOWGUNFUNCTION;
 	}
 }
 
 void optionsSetAlwaysShowTarget(s32 mpchrnum, bool enable)
 {
 	if (enable) {
-		g_MpChrs[mpchrnum].options |= OPTION_ALWAYSSHOWTARGET;
+		g_MpPlayers[mpchrnum].options |= OPTION_ALWAYSSHOWTARGET;
 	} else {
-		g_MpChrs[mpchrnum].options &= ~OPTION_ALWAYSSHOWTARGET;
+		g_MpPlayers[mpchrnum].options &= ~OPTION_ALWAYSSHOWTARGET;
 	}
 }
 
 void optionsSetShowZoomRange(s32 mpchrnum, bool enable)
 {
 	if (enable) {
-		g_MpChrs[mpchrnum].options |= OPTION_SHOWZOOMRANGE;
+		g_MpPlayers[mpchrnum].options |= OPTION_SHOWZOOMRANGE;
 	} else {
-		g_MpChrs[mpchrnum].options &= ~OPTION_SHOWZOOMRANGE;
+		g_MpPlayers[mpchrnum].options &= ~OPTION_SHOWZOOMRANGE;
 	}
 }
 
 void optionsSetPaintball(s32 mpchrnum, bool enable)
 {
 	if (enable) {
-		g_MpChrs[mpchrnum].options |= OPTION_PAINTBALL;
+		g_MpPlayers[mpchrnum].options |= OPTION_PAINTBALL;
 	} else {
-		g_MpChrs[mpchrnum].options &= ~OPTION_PAINTBALL;
+		g_MpPlayers[mpchrnum].options &= ~OPTION_PAINTBALL;
 	}
 }
 
 void optionsSetShowMissionTime(s32 mpchrnum, bool enable)
 {
 	if (enable) {
-		g_MpChrs[mpchrnum].options |= OPTION_SHOWMISSIONTIME;
+		g_MpPlayers[mpchrnum].options |= OPTION_SHOWMISSIONTIME;
 	} else {
-		g_MpChrs[mpchrnum].options &= ~OPTION_SHOWMISSIONTIME;
+		g_MpPlayers[mpchrnum].options &= ~OPTION_SHOWMISSIONTIME;
 	}
 }
 
@@ -209,9 +209,9 @@ void optionsSetCutsceneSubtitles(s32 enable)
 void optionsSetHeadRoll(s32 mpchrnum, bool enable)
 {
 	if (enable) {
-		g_MpChrs[mpchrnum].options |= OPTION_HEADROLL;
+		g_MpPlayers[mpchrnum].options |= OPTION_HEADROLL;
 	} else {
-		g_MpChrs[mpchrnum].options &= ~OPTION_HEADROLL;
+		g_MpPlayers[mpchrnum].options &= ~OPTION_HEADROLL;
 	}
 }
 
diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c
index 027dde58d..78884b0b0 100644
--- a/src/gvars/gvars.c
+++ b/src/gvars/gvars.c
@@ -30371,13 +30371,6 @@ u32 var800ac104 = 0;
 u32 var800ac108 = 0;
 u32 var800ac10c = 0;
 struct scenariodata g_ScenarioData = {0};
-u32 var800ac14c = 0;
-u32 var800ac150 = 0;
-u32 var800ac154 = 0;
-u32 var800ac158 = 0;
-u32 var800ac15c = 0;
-u32 var800ac160 = 0;
-u32 var800ac164 = 0;
 struct prop *var800ac168[] = {NULL, NULL, NULL, NULL};
 u32 var800ac178 = 0;
 u32 var800ac17c = 0;
@@ -30615,7 +30608,7 @@ s32 g_MpNumPlayers = 0;
 u32 var800ac534 = 0;
 struct mpsim g_MpSimulants[8] = {0};
 u32 var800ac798[8] = {0};
-struct mpchr g_MpChrs[4] = {0};
+struct mpplayer g_MpPlayers[4] = {0};
 u32 var800aca38 = 0;
 u32 var800aca3c = 0;
 u32 var800aca40 = 0;
diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h
index c84074a65..951f03a8f 100644
--- a/src/include/gvars/gvars.h
+++ b/src/include/gvars/gvars.h
@@ -825,7 +825,6 @@ extern u32 var800ac0e8;
 extern u32 var800ac0f8;
 extern u32 var800ac108;
 extern struct scenariodata g_ScenarioData;
-extern u32 var800ac150;
 extern struct prop *var800ac168[];
 extern u32 var800ac188;
 extern u32 var800ac24c;
@@ -841,7 +840,7 @@ extern struct var800ac500 *var800ac500[4];
 extern s32 g_MpNumPlayers;
 extern struct mpsim g_MpSimulants[8];
 extern u32 var800ac798[8];
-extern struct mpchr g_MpChrs[];
+extern struct mpplayer g_MpPlayers[];
 extern u32 var800aca38;
 extern u32 var800acad8;
 extern u32 var800acb78;
diff --git a/src/include/types.h b/src/include/types.h
index 33b9b99cb..34466b53f 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -4015,6 +4015,11 @@ struct mpchr {
 	/*0x0e*/ u8 unk0e;
 	/*0x0f*/ u8 headnum;
 	/*0x10*/ u8 bodynum;
+	/*0x11*/ u8 unk11;
+};
+
+struct mpplayer {
+	/*0x00*/ struct mpchr base;
 	/*0x14*/ u32 displayoptions;
 	/*0x18*/ u32 unk18;
 	/*0x1c*/ u32 unk1c;
@@ -4056,6 +4061,24 @@ struct mpchr {
 	/*0x9c*/ u8 unk9c;
 };
 
+struct mpsim {
+	/*0x00*/ struct mpchr base;
+	/*0x14*/ u32 unk14;
+	/*0x18*/ u32 unk18;
+	/*0x1c*/ u32 unk1c;
+	/*0x20*/ u32 unk20;
+	/*0x24*/ u32 unk24;
+	/*0x28*/ u32 unk28;
+	/*0x2c*/ u32 unk2c;
+	/*0x30*/ u32 unk30;
+	/*0x34*/ u32 unk34;
+	/*0x38*/ u32 unk38;
+	/*0x3c*/ u32 unk3c;
+	/*0x40*/ u32 unk40;
+	/*0x44*/ u32 unk44;
+	/*0x48*/ u8 unk48;
+};
+
 struct missionconfig {
 	u8 difficulty : 7;
 	u8 pdmode : 1;
@@ -4127,31 +4150,6 @@ struct numandtext {
 	char *text;
 };
 
-struct mpsim {
-	/*0x00*/ u32 unk00;
-	/*0x04*/ u32 unk04;
-	/*0x08*/ u32 unk08;
-	/*0x0c*/ u8 unk0c;
-	/*0x0d*/ u8 unk0d;
-	/*0x0e*/ u8 unk0e;
-	/*0x0f*/ u8 headnum;
-	/*0x10*/ u8 bodynum;
-	/*0x14*/ u32 unk14;
-	/*0x18*/ u32 unk18;
-	/*0x1c*/ u32 unk1c;
-	/*0x20*/ u32 unk20;
-	/*0x24*/ u32 unk24;
-	/*0x28*/ u32 unk28;
-	/*0x2c*/ u32 unk2c;
-	/*0x30*/ u32 unk30;
-	/*0x34*/ u32 unk34;
-	/*0x38*/ u32 unk38;
-	/*0x3c*/ u32 unk3c;
-	/*0x40*/ u32 unk40;
-	/*0x44*/ u32 unk44;
-	/*0x48*/ u8 unk48;
-};
-
 struct savelocation {
 	/*0x000*/ u32 unk000;
 	/*0x004*/ u32 unk004;
@@ -4365,7 +4363,7 @@ struct var800ac500 {
 	u8 propindex;
 };
 
-struct scenariodata_combat {
+struct scenariodata_cbt {
 	u32 unk00;
 	u32 unk04;
 	u32 unk08;
@@ -4373,20 +4371,20 @@ struct scenariodata_combat {
 	s16 unk0e[1]; // possibly for a different scenario - see mpGetNumTeammatesInRoomDoingSomething
 };
 
-struct scenariodata_briefcase {
+struct scenariodata_htb {
 	u32 unk00;
 	u32 unk04;
 };
 
-struct scenariodata_hacker {
+struct scenariodata_htm {
 	u32 unk00;
 };
 
-struct scenariodata_popacap {
+struct scenariodata_pac {
 	u32 unk00;
 };
 
-struct scenariodata_hill {
+struct scenariodata_koh {
 	/*0x800ac110*/ u32 unk00;
 	/*0x800ac114*/ s16 unk04;
 	/*0x800ac116*/ s16 unk06;
@@ -4404,18 +4402,28 @@ struct scenariodata_hill {
 	/*0x800ac148*/ f32 unk38;
 };
 
-struct scenariodata_capture {
-	u32 unk00;
+struct ctcthing {
+	s16 unk00;
+	s16 unk02;
+	s16 unk04[6];
+};
+
+struct scenariodata_ctc {
+	s16 unk00[4];
+	s16 unk08[4];
+	s32 unk10;
+	s32 unk14;
+	struct ctcthing unk18[4];
 };
 
 struct scenariodata {
 	union {
-		struct scenariodata_combat combat;
-		struct scenariodata_briefcase briefcase;
-		struct scenariodata_hacker hacker;
-		struct scenariodata_popacap popacap;
-		struct scenariodata_hill hill;
-		struct scenariodata_capture capture;
+		struct scenariodata_cbt cbt;
+		struct scenariodata_htb htb;
+		struct scenariodata_htm htm;
+		struct scenariodata_pac pac;
+		struct scenariodata_koh koh;
+		struct scenariodata_ctc ctc;
 	};
 };