diff --git a/src/game/hudmsg.c b/src/game/hudmsg.c
index 89653e5d9..a2a04861d 100644
--- a/src/game/hudmsg.c
+++ b/src/game/hudmsg.c
@@ -1318,339 +1318,6 @@ void hudmsgCalculatePosition(struct hudmessage *msg)
 	msg->y = y;
 }
 
-#if VERSION >= VERSION_JPN_FINAL
-GLOBAL_ASM(
-glabel hudmsgCreateFromArgs
-/*  f0dfc44:	27bdfe08 */ 	addiu	$sp,$sp,-504
-/*  f0dfc48:	afb10024 */ 	sw	$s1,0x24($sp)
-/*  f0dfc4c:	24110006 */ 	li	$s1,0x6
-/*  f0dfc50:	afbf002c */ 	sw	$ra,0x2c($sp)
-/*  f0dfc54:	afb20028 */ 	sw	$s2,0x28($sp)
-/*  f0dfc58:	afb00020 */ 	sw	$s0,0x20($sp)
-/*  f0dfc5c:	afa401f8 */ 	sw	$a0,0x1f8($sp)
-/*  f0dfc60:	afa501fc */ 	sw	$a1,0x1fc($sp)
-/*  f0dfc64:	afa60200 */ 	sw	$a2,0x200($sp)
-/*  f0dfc68:	afa70204 */ 	sw	$a3,0x204($sp)
-/*  f0dfc6c:	14b10005 */ 	bne	$a1,$s1,.JF0f0dfc84
-/*  f0dfc70:	00004825 */ 	move	$t1,$zero
-/*  f0dfc74:	0fc547cb */ 	jal	optionsGetInGameSubtitles
-/*  f0dfc78:	afa001ec */ 	sw	$zero,0x1ec($sp)
-/*  f0dfc7c:	10400118 */ 	beqz	$v0,.JF0f0e00e0
-/*  f0dfc80:	8fa901ec */ 	lw	$t1,0x1ec($sp)
-.JF0f0dfc84:
-/*  f0dfc84:	8faf01f8 */ 	lw	$t7,0x1f8($sp)
-/*  f0dfc88:	8fb90230 */ 	lw	$t9,0x230($sp)
-/*  f0dfc8c:	3c07800a */ 	lui	$a3,0x800a
-/*  f0dfc90:	91f80000 */ 	lbu	$t8,0x0($t7)
-/*  f0dfc94:	24e7a630 */ 	addiu	$a3,$a3,-22992
-/*  f0dfc98:	01e01025 */ 	move	$v0,$t7
-/*  f0dfc9c:	13000007 */ 	beqz	$t8,.JF0f0dfcbc
-/*  f0dfca0:	332a0001 */ 	andi	$t2,$t9,0x1
-/*  f0dfca4:	91e30000 */ 	lbu	$v1,0x0($t7)
-/*  f0dfca8:	00694821 */ 	addu	$t1,$v1,$t1
-.JF0f0dfcac:
-/*  f0dfcac:	90430001 */ 	lbu	$v1,0x1($v0)
-/*  f0dfcb0:	24420001 */ 	addiu	$v0,$v0,0x1
-/*  f0dfcb4:	5460fffd */ 	bnezl	$v1,.JF0f0dfcac
-/*  f0dfcb8:	00694821 */ 	addu	$t1,$v1,$t1
-.JF0f0dfcbc:
-/*  f0dfcbc:	11400004 */ 	beqz	$t2,.JF0f0dfcd0
-/*  f0dfcc0:	8fad0230 */ 	lw	$t5,0x230($sp)
-/*  f0dfcc4:	8ceb0284 */ 	lw	$t3,0x284($a3)
-/*  f0dfcc8:	8d6c00d8 */ 	lw	$t4,0xd8($t3)
-/*  f0dfccc:	15800104 */ 	bnez	$t4,.JF0f0e00e0
-.JF0f0dfcd0:
-/*  f0dfcd0:	3c07800a */ 	lui	$a3,0x800a
-/*  f0dfcd4:	31ae0008 */ 	andi	$t6,$t5,0x8
-/*  f0dfcd8:	15c0001b */ 	bnez	$t6,.JF0f0dfd48
-/*  f0dfcdc:	24e7a630 */ 	addiu	$a3,$a3,-22992
-/*  f0dfce0:	3c048007 */ 	lui	$a0,0x8007
-/*  f0dfce4:	8c841538 */ 	lw	$a0,0x1538($a0)
-/*  f0dfce8:	2406ffff */ 	li	$a2,-1
-/*  f0dfcec:	00008025 */ 	move	$s0,$zero
-/*  f0dfcf0:	18800014 */ 	blez	$a0,.JF0f0dfd44
-/*  f0dfcf4:	3c028007 */ 	lui	$v0,0x8007
-/*  f0dfcf8:	8c42153c */ 	lw	$v0,0x153c($v0)
-/*  f0dfcfc:	24050005 */ 	li	$a1,0x5
-.JF0f0dfd00:
-/*  f0dfd00:	90430000 */ 	lbu	$v1,0x0($v0)
-/*  f0dfd04:	5060000c */ 	beqzl	$v1,.JF0f0dfd38
-/*  f0dfd08:	26100001 */ 	addiu	$s0,$s0,0x1
-/*  f0dfd0c:	50a3000a */ 	beql	$a1,$v1,.JF0f0dfd38
-/*  f0dfd10:	26100001 */ 	addiu	$s0,$s0,0x1
-/*  f0dfd14:	8cf8028c */ 	lw	$t8,0x28c($a3)
-/*  f0dfd18:	8c4f01c0 */ 	lw	$t7,0x1c0($v0)
-/*  f0dfd1c:	570f0006 */ 	bnel	$t8,$t7,.JF0f0dfd38
-/*  f0dfd20:	26100001 */ 	addiu	$s0,$s0,0x1
-/*  f0dfd24:	8c5901d8 */ 	lw	$t9,0x1d8($v0)
-/*  f0dfd28:	55390003 */ 	bnel	$t1,$t9,.JF0f0dfd38
-/*  f0dfd2c:	26100001 */ 	addiu	$s0,$s0,0x1
-/*  f0dfd30:	02003025 */ 	move	$a2,$s0
-/*  f0dfd34:	26100001 */ 	addiu	$s0,$s0,0x1
-.JF0f0dfd38:
-/*  f0dfd38:	0204082a */ 	slt	$at,$s0,$a0
-/*  f0dfd3c:	1420fff0 */ 	bnez	$at,.JF0f0dfd00
-/*  f0dfd40:	244201dc */ 	addiu	$v0,$v0,0x1dc
-.JF0f0dfd44:
-/*  f0dfd44:	04c100e6 */ 	bgez	$a2,.JF0f0e00e0
-.JF0f0dfd48:
-/*  f0dfd48:	3c0a8007 */ 	lui	$t2,0x8007
-/*  f0dfd4c:	8d4a0c18 */ 	lw	$t2,0xc18($t2)
-/*  f0dfd50:	24030001 */ 	li	$v1,0x1
-/*  f0dfd54:	3c048007 */ 	lui	$a0,0x8007
-/*  f0dfd58:	8c841538 */ 	lw	$a0,0x1538($a0)
-/*  f0dfd5c:	146a0005 */ 	bne	$v1,$t2,.JF0f0dfd74
-/*  f0dfd60:	00008025 */ 	move	$s0,$zero
-/*  f0dfd64:	240b0002 */ 	li	$t3,0x2
-/*  f0dfd68:	3c018008 */ 	lui	$at,0x8008
-/*  f0dfd6c:	10000003 */ 	b	.JF0f0dfd7c
-/*  f0dfd70:	ac2b00f4 */ 	sw	$t3,0xf4($at)
-.JF0f0dfd74:
-/*  f0dfd74:	3c018008 */ 	lui	$at,0x8008
-/*  f0dfd78:	ac2300f4 */ 	sw	$v1,0xf4($at)
-.JF0f0dfd7c:
-/*  f0dfd7c:	18800009 */ 	blez	$a0,.JF0f0dfda4
-/*  f0dfd80:	3c028007 */ 	lui	$v0,0x8007
-/*  f0dfd84:	8c42153c */ 	lw	$v0,0x153c($v0)
-.JF0f0dfd88:
-/*  f0dfd88:	904c0000 */ 	lbu	$t4,0x0($v0)
-/*  f0dfd8c:	51800006 */ 	beqzl	$t4,.JF0f0dfda8
-/*  f0dfd90:	0204082a */ 	slt	$at,$s0,$a0
-/*  f0dfd94:	26100001 */ 	addiu	$s0,$s0,0x1
-/*  f0dfd98:	0204082a */ 	slt	$at,$s0,$a0
-/*  f0dfd9c:	1420fffa */ 	bnez	$at,.JF0f0dfd88
-/*  f0dfda0:	244201dc */ 	addiu	$v0,$v0,0x1dc
-.JF0f0dfda4:
-/*  f0dfda4:	0204082a */ 	slt	$at,$s0,$a0
-.JF0f0dfda8:
-/*  f0dfda8:	14200028 */ 	bnez	$at,.JF0f0dfe4c
-/*  f0dfdac:	8fad01fc */ 	lw	$t5,0x1fc($sp)
-/*  f0dfdb0:	11a30004 */ 	beq	$t5,$v1,.JF0f0dfdc4
-/*  f0dfdb4:	24010002 */ 	li	$at,0x2
-/*  f0dfdb8:	51a10003 */ 	beql	$t5,$at,.JF0f0dfdc8
-/*  f0dfdbc:	2404ffff */ 	li	$a0,-1
-/*  f0dfdc0:	15b10022 */ 	bne	$t5,$s1,.JF0f0dfe4c
-.JF0f0dfdc4:
-/*  f0dfdc4:	2404ffff */ 	li	$a0,-1
-.JF0f0dfdc8:
-/*  f0dfdc8:	0fc37c00 */ 	jal	hudmsgGetNext
-/*  f0dfdcc:	afa901ec */ 	sw	$t1,0x1ec($sp)
-/*  f0dfdd0:	8fa901ec */ 	lw	$t1,0x1ec($sp)
-/*  f0dfdd4:	0440001d */ 	bltz	$v0,.JF0f0dfe4c
-/*  f0dfdd8:	00408025 */ 	move	$s0,$v0
-/*  f0dfddc:	24120003 */ 	li	$s2,0x3
-/*  f0dfde0:	241101dc */ 	li	$s1,0x1dc
-.JF0f0dfde4:
-/*  f0dfde4:	00510019 */ 	multu	$v0,$s1
-/*  f0dfde8:	3c058007 */ 	lui	$a1,0x8007
-/*  f0dfdec:	8ca5153c */ 	lw	$a1,0x153c($a1)
-/*  f0dfdf0:	24010001 */ 	li	$at,0x1
-/*  f0dfdf4:	00007012 */ 	mflo	$t6
-/*  f0dfdf8:	00ae2021 */ 	addu	$a0,$a1,$t6
-/*  f0dfdfc:	90980000 */ 	lbu	$t8,0x0($a0)
-/*  f0dfe00:	17010009 */ 	bne	$t8,$at,.JF0f0dfe28
-/*  f0dfe04:	00000000 */ 	nop
-/*  f0dfe08:	8c8301b4 */ 	lw	$v1,0x1b4($a0)
-/*  f0dfe0c:	24010004 */ 	li	$at,0x4
-/*  f0dfe10:	5060000f */ 	beqzl	$v1,.JF0f0dfe50
-/*  f0dfe14:	24030001 */ 	li	$v1,0x1
-/*  f0dfe18:	5243000d */ 	beql	$s2,$v1,.JF0f0dfe50
-/*  f0dfe1c:	24030001 */ 	li	$v1,0x1
-/*  f0dfe20:	5061000b */ 	beql	$v1,$at,.JF0f0dfe50
-/*  f0dfe24:	24030001 */ 	li	$v1,0x1
-.JF0f0dfe28:
-/*  f0dfe28:	02110019 */ 	multu	$s0,$s1
-/*  f0dfe2c:	00007812 */ 	mflo	$t7
-/*  f0dfe30:	00afc821 */ 	addu	$t9,$a1,$t7
-/*  f0dfe34:	8f2401b8 */ 	lw	$a0,0x1b8($t9)
-/*  f0dfe38:	0fc37c00 */ 	jal	hudmsgGetNext
-/*  f0dfe3c:	afa901ec */ 	sw	$t1,0x1ec($sp)
-/*  f0dfe40:	8fa901ec */ 	lw	$t1,0x1ec($sp)
-/*  f0dfe44:	0441ffe7 */ 	bgez	$v0,.JF0f0dfde4
-/*  f0dfe48:	00408025 */ 	move	$s0,$v0
-.JF0f0dfe4c:
-/*  f0dfe4c:	24030001 */ 	li	$v1,0x1
-.JF0f0dfe50:
-/*  f0dfe50:	060000a1 */ 	bltz	$s0,.JF0f0e00d8
-/*  f0dfe54:	241101dc */ 	li	$s1,0x1dc
-/*  f0dfe58:	3c0a8007 */ 	lui	$t2,0x8007
-/*  f0dfe5c:	8d4a1538 */ 	lw	$t2,0x1538($t2)
-/*  f0dfe60:	020a082a */ 	slt	$at,$s0,$t2
-/*  f0dfe64:	1020009c */ 	beqz	$at,.JF0f0e00d8
-/*  f0dfe68:	00000000 */ 	nop
-/*  f0dfe6c:	02110019 */ 	multu	$s0,$s1
-/*  f0dfe70:	3c0c8007 */ 	lui	$t4,0x8007
-/*  f0dfe74:	8d8c153c */ 	lw	$t4,0x153c($t4)
-/*  f0dfe78:	afa001d8 */ 	sw	$zero,0x1d8($sp)
-/*  f0dfe7c:	27a401d8 */ 	addiu	$a0,$sp,0x1d8
-/*  f0dfe80:	8fa50220 */ 	lw	$a1,0x220($sp)
-/*  f0dfe84:	afa901ec */ 	sw	$t1,0x1ec($sp)
-/*  f0dfe88:	00005812 */ 	mflo	$t3
-/*  f0dfe8c:	016c9021 */ 	addu	$s2,$t3,$t4
-/*  f0dfe90:	0fc37af7 */ 	jal	hudmsg0f0ddb1c
-/*  f0dfe94:	00000000 */ 	nop
-/*  f0dfe98:	8fae0210 */ 	lw	$t6,0x210($sp)
-/*  f0dfe9c:	8fad020c */ 	lw	$t5,0x20c($sp)
-/*  f0dfea0:	afa201d4 */ 	sw	$v0,0x1d4($sp)
-/*  f0dfea4:	8dd80000 */ 	lw	$t8,0x0($t6)
-/*  f0dfea8:	8da70000 */ 	lw	$a3,0x0($t5)
-/*  f0dfeac:	afa00014 */ 	sw	$zero,0x14($sp)
-/*  f0dfeb0:	27a401dc */ 	addiu	$a0,$sp,0x1dc
-/*  f0dfeb4:	27a501e0 */ 	addiu	$a1,$sp,0x1e0
-/*  f0dfeb8:	8fa601f8 */ 	lw	$a2,0x1f8($sp)
-/*  f0dfebc:	0fc55d49 */ 	jal	textMeasure
-/*  f0dfec0:	afb80010 */ 	sw	$t8,0x10($sp)
-/*  f0dfec4:	8faf01d4 */ 	lw	$t7,0x1d4($sp)
-/*  f0dfec8:	8fb901e0 */ 	lw	$t9,0x1e0($sp)
-/*  f0dfecc:	8faa0230 */ 	lw	$t2,0x230($sp)
-/*  f0dfed0:	8fa901ec */ 	lw	$t1,0x1ec($sp)
-/*  f0dfed4:	01f9082a */ 	slt	$at,$t7,$t9
-/*  f0dfed8:	10200034 */ 	beqz	$at,.JF0f0dffac
-/*  f0dfedc:	314b0020 */ 	andi	$t3,$t2,0x20
-/*  f0dfee0:	15600032 */ 	bnez	$t3,.JF0f0dffac
-/*  f0dfee4:	8fac01f8 */ 	lw	$t4,0x1f8($sp)
-/*  f0dfee8:	918d0000 */ 	lbu	$t5,0x0($t4)
-/*  f0dfeec:	00002825 */ 	move	$a1,$zero
-/*  f0dfef0:	00004025 */ 	move	$t0,$zero
-/*  f0dfef4:	11a00011 */ 	beqz	$t5,.JF0f0dff3c
-/*  f0dfef8:	2418000a */ 	li	$t8,0xa
-/*  f0dfefc:	91830000 */ 	lbu	$v1,0x0($t4)
-/*  f0dff00:	01801021 */ 	addu	$v0,$t4,$zero
-/*  f0dff04:	27b00044 */ 	addiu	$s0,$sp,0x44
-/*  f0dff08:	2406000a */ 	li	$a2,0xa
-/*  f0dff0c:	00602025 */ 	move	$a0,$v1
-.JF0f0dff10:
-/*  f0dff10:	10c40004 */ 	beq	$a2,$a0,.JF0f0dff24
-/*  f0dff14:	24a50001 */ 	addiu	$a1,$a1,0x1
-/*  f0dff18:	02087021 */ 	addu	$t6,$s0,$t0
-/*  f0dff1c:	a1c30000 */ 	sb	$v1,0x0($t6)
-/*  f0dff20:	25080001 */ 	addiu	$t0,$t0,0x1
-.JF0f0dff24:
-/*  f0dff24:	28a10190 */ 	slti	$at,$a1,0x190
-/*  f0dff28:	10200004 */ 	beqz	$at,.JF0f0dff3c
-/*  f0dff2c:	24420001 */ 	addiu	$v0,$v0,0x1
-/*  f0dff30:	90430000 */ 	lbu	$v1,0x0($v0)
-/*  f0dff34:	1460fff6 */ 	bnez	$v1,.JF0f0dff10
-/*  f0dff38:	00602025 */ 	move	$a0,$v1
-.JF0f0dff3c:
-/*  f0dff3c:	27a50044 */ 	addiu	$a1,$sp,0x44
-/*  f0dff40:	00a87821 */ 	addu	$t7,$a1,$t0
-/*  f0dff44:	25080001 */ 	addiu	$t0,$t0,0x1
-/*  f0dff48:	a1f80000 */ 	sb	$t8,0x0($t7)
-/*  f0dff4c:	00a8c821 */ 	addu	$t9,$a1,$t0
-/*  f0dff50:	a3200000 */ 	sb	$zero,0x0($t9)
-/*  f0dff54:	8fab0210 */ 	lw	$t3,0x210($sp)
-/*  f0dff58:	8faa020c */ 	lw	$t2,0x20c($sp)
-/*  f0dff5c:	26510020 */ 	addiu	$s1,$s2,0x20
-/*  f0dff60:	8d6d0000 */ 	lw	$t5,0x0($t3)
-/*  f0dff64:	8d470000 */ 	lw	$a3,0x0($t2)
-/*  f0dff68:	afa901ec */ 	sw	$t1,0x1ec($sp)
-/*  f0dff6c:	02203025 */ 	move	$a2,$s1
-/*  f0dff70:	8fa401d4 */ 	lw	$a0,0x1d4($sp)
-/*  f0dff74:	0fc55dde */ 	jal	textWrap
-/*  f0dff78:	afad0010 */ 	sw	$t5,0x10($sp)
-/*  f0dff7c:	8fae0210 */ 	lw	$t6,0x210($sp)
-/*  f0dff80:	8fac020c */ 	lw	$t4,0x20c($sp)
-/*  f0dff84:	27a401dc */ 	addiu	$a0,$sp,0x1dc
-/*  f0dff88:	8dd80000 */ 	lw	$t8,0x0($t6)
-/*  f0dff8c:	8d870000 */ 	lw	$a3,0x0($t4)
-/*  f0dff90:	afa00014 */ 	sw	$zero,0x14($sp)
-/*  f0dff94:	27a501e0 */ 	addiu	$a1,$sp,0x1e0
-/*  f0dff98:	02203025 */ 	move	$a2,$s1
-/*  f0dff9c:	0fc55d49 */ 	jal	textMeasure
-/*  f0dffa0:	afb80010 */ 	sw	$t8,0x10($sp)
-/*  f0dffa4:	10000008 */ 	b	.JF0f0dffc8
-/*  f0dffa8:	8fa901ec */ 	lw	$t1,0x1ec($sp)
-.JF0f0dffac:
-/*  f0dffac:	26440020 */ 	addiu	$a0,$s2,0x20
-/*  f0dffb0:	8fa501f8 */ 	lw	$a1,0x1f8($sp)
-/*  f0dffb4:	2406018f */ 	li	$a2,0x18f
-/*  f0dffb8:	0c004c5a */ 	jal	strncpy
-/*  f0dffbc:	afa901ec */ 	sw	$t1,0x1ec($sp)
-/*  f0dffc0:	8fa901ec */ 	lw	$t1,0x1ec($sp)
-/*  f0dffc4:	a24001af */ 	sb	$zero,0x1af($s2)
-.JF0f0dffc8:
-/*  f0dffc8:	8faf0230 */ 	lw	$t7,0x230($sp)
-/*  f0dffcc:	3c19800a */ 	lui	$t9,0x800a
-/*  f0dffd0:	3c02800a */ 	lui	$v0,0x800a
-/*  f0dffd4:	ae4f01c4 */ 	sw	$t7,0x1c4($s2)
-/*  f0dffd8:	8f39a8bc */ 	lw	$t9,-0x5744($t9)
-/*  f0dffdc:	2442e570 */ 	addiu	$v0,$v0,-6800
-/*  f0dffe0:	240e0001 */ 	li	$t6,0x1
-/*  f0dffe4:	ae5901c0 */ 	sw	$t9,0x1c0($s2)
-/*  f0dffe8:	8faa01fc */ 	lw	$t2,0x1fc($sp)
-/*  f0dffec:	02402025 */ 	move	$a0,$s2
-/*  f0dfff0:	ae4a01b4 */ 	sw	$t2,0x1b4($s2)
-/*  f0dfff4:	8c4b0000 */ 	lw	$t3,0x0($v0)
-/*  f0dfff8:	ae4b01b8 */ 	sw	$t3,0x1b8($s2)
-/*  f0dfffc:	8c4d0000 */ 	lw	$t5,0x0($v0)
-/*  f0e0000:	25ac0001 */ 	addiu	$t4,$t5,0x1
-/*  f0e0004:	ac4c0000 */ 	sw	$t4,0x0($v0)
-/*  f0e0008:	a24e0000 */ 	sb	$t6,0x0($s2)
-/*  f0e000c:	a6400006 */ 	sh	$zero,0x6($s2)
-/*  f0e0010:	8fb80200 */ 	lw	$t8,0x200($sp)
-/*  f0e0014:	a2580001 */ 	sb	$t8,0x1($s2)
-/*  f0e0018:	8faf0204 */ 	lw	$t7,0x204($sp)
-/*  f0e001c:	a24f0002 */ 	sb	$t7,0x2($s2)
-/*  f0e0020:	8fb90208 */ 	lw	$t9,0x208($sp)
-/*  f0e0024:	a2590003 */ 	sb	$t9,0x3($s2)
-/*  f0e0028:	8faa020c */ 	lw	$t2,0x20c($sp)
-/*  f0e002c:	8d4b0000 */ 	lw	$t3,0x0($t2)
-/*  f0e0030:	ae4b0008 */ 	sw	$t3,0x8($s2)
-/*  f0e0034:	8fad0210 */ 	lw	$t5,0x210($sp)
-/*  f0e0038:	8dac0000 */ 	lw	$t4,0x0($t5)
-/*  f0e003c:	ae4c000c */ 	sw	$t4,0xc($s2)
-/*  f0e0040:	8fae0214 */ 	lw	$t6,0x214($sp)
-/*  f0e0044:	ae4e0010 */ 	sw	$t6,0x10($s2)
-/*  f0e0048:	8fb80218 */ 	lw	$t8,0x218($sp)
-/*  f0e004c:	ae580014 */ 	sw	$t8,0x14($s2)
-/*  f0e0050:	8faf021c */ 	lw	$t7,0x21c($sp)
-/*  f0e0054:	a24f01c8 */ 	sb	$t7,0x1c8($s2)
-/*  f0e0058:	8fb90224 */ 	lw	$t9,0x224($sp)
-/*  f0e005c:	a25901c9 */ 	sb	$t9,0x1c9($s2)
-/*  f0e0060:	8faa01e0 */ 	lw	$t2,0x1e0($sp)
-/*  f0e0064:	a64a001c */ 	sh	$t2,0x1c($s2)
-/*  f0e0068:	8fab01dc */ 	lw	$t3,0x1dc($sp)
-/*  f0e006c:	a64b001e */ 	sh	$t3,0x1e($s2)
-/*  f0e0070:	8fad01d8 */ 	lw	$t5,0x1d8($sp)
-/*  f0e0074:	ae4d01cc */ 	sw	$t5,0x1cc($s2)
-/*  f0e0078:	8fac0220 */ 	lw	$t4,0x220($sp)
-/*  f0e007c:	ae4c01d0 */ 	sw	$t4,0x1d0($s2)
-/*  f0e0080:	8fae0228 */ 	lw	$t6,0x228($sp)
-/*  f0e0084:	ae4901d8 */ 	sw	$t1,0x1d8($s2)
-/*  f0e0088:	0fc37d59 */ 	jal	hudmsgCalculatePosition
-/*  f0e008c:	ae4e01d4 */ 	sw	$t6,0x1d4($s2)
-/*  f0e0090:	8fb80230 */ 	lw	$t8,0x230($sp)
-/*  f0e0094:	8fab01fc */ 	lw	$t3,0x1fc($sp)
-/*  f0e0098:	3c0c8007 */ 	lui	$t4,0x8007
-/*  f0e009c:	330f0004 */ 	andi	$t7,$t8,0x4
-/*  f0e00a0:	11e00007 */ 	beqz	$t7,.JF0f0e00c0
-/*  f0e00a4:	000b6940 */ 	sll	$t5,$t3,0x5
-/*  f0e00a8:	8fb9022c */ 	lw	$t9,0x22c($sp)
-/*  f0e00ac:	240affff */ 	li	$t2,-1
-/*  f0e00b0:	ae4a01b0 */ 	sw	$t2,0x1b0($s2)
-/*  f0e00b4:	24030001 */ 	li	$v1,0x1
-/*  f0e00b8:	10000007 */ 	b	.JF0f0e00d8
-/*  f0e00bc:	ae5901bc */ 	sw	$t9,0x1bc($s2)
-.JF0f0e00c0:
-/*  f0e00c0:	018d6021 */ 	addu	$t4,$t4,$t5
-/*  f0e00c4:	8d8c155c */ 	lw	$t4,0x155c($t4)
-/*  f0e00c8:	24030001 */ 	li	$v1,0x1
-/*  f0e00cc:	ae4c01bc */ 	sw	$t4,0x1bc($s2)
-/*  f0e00d0:	8fae022c */ 	lw	$t6,0x22c($sp)
-/*  f0e00d4:	ae4e01b0 */ 	sw	$t6,0x1b0($s2)
-.JF0f0e00d8:
-/*  f0e00d8:	3c018008 */ 	lui	$at,0x8008
-/*  f0e00dc:	ac2300f4 */ 	sw	$v1,0xf4($at)
-.JF0f0e00e0:
-/*  f0e00e0:	8fbf002c */ 	lw	$ra,0x2c($sp)
-/*  f0e00e4:	8fb00020 */ 	lw	$s0,0x20($sp)
-/*  f0e00e8:	8fb10024 */ 	lw	$s1,0x24($sp)
-/*  f0e00ec:	8fb20028 */ 	lw	$s2,0x28($sp)
-/*  f0e00f0:	03e00008 */ 	jr	$ra
-/*  f0e00f4:	27bd01f8 */ 	addiu	$sp,$sp,0x1f8
-);
-#else
 void hudmsgCreateFromArgs(char *text, s32 type, s32 conf00, s32 conf01, s32 conf02,
 		struct fontchar **conf04, struct font **conf08,
 		u32 textcolour, u32 glowcolour,
@@ -1736,7 +1403,12 @@ void hudmsgCreateFromArgs(char *text, s32 type, s32 conf00, s32 conf01, s32 conf
 			wrapwidth = hudmsg0f0ddb1c(&xmarginaextra, conf16);
 			textMeasure(&textheight, &textwidth, text, *conf04, *conf08, 0);
 
-			if (textwidth > wrapwidth) {
+#if VERSION >= VERSION_JPN_FINAL
+			if (textwidth > wrapwidth && (flags & HUDMSGFLAG_NOWRAP) == 0)
+#else
+			if (textwidth > wrapwidth)
+#endif
+			{
 				i = 0;
 				writeindex = 0;
 
@@ -1794,7 +1466,6 @@ void hudmsgCreateFromArgs(char *text, s32 type, s32 conf00, s32 conf01, s32 conf
 		g_ScaleX = 1;
 	}
 }
-#endif
 
 void hudmsgsTick(void)
 {
diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c
index d3dc5e51a..168619adf 100644
--- a/src/game/mplayer/scenarios.c
+++ b/src/game/mplayer/scenarios.c
@@ -521,14 +521,14 @@ void scenarioCreateMatchStartHudmsgs(void)
 
 			if (g_BossFile.locktype == MPLOCKTYPE_CHALLENGE) {
 #if VERSION >= VERSION_JPN_FINAL
-				hudmsgCreateWithFlags(challengename, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_20);
+				hudmsgCreateWithFlags(challengename, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP);
 #else
 				hudmsgCreateWithFlags(challengename, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE);
 #endif
 			}
 
 #if VERSION >= VERSION_JPN_FINAL
-			hudmsgCreateWithFlags(scenarioname, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_20);
+			hudmsgCreateWithFlags(scenarioname, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP);
 #else
 			hudmsgCreateWithFlags(scenarioname, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE);
 #endif
@@ -1044,7 +1044,7 @@ void scenarioCreateHudmsg(s32 playernum, char *message)
 
 		setCurrentPlayerNum(playernum);
 #if VERSION >= VERSION_JPN_FINAL
-		hudmsgCreateWithFlags(message, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_20);
+		hudmsgCreateWithFlags(message, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP);
 #else
 		hudmsgCreateWithFlags(message, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE);
 #endif
@@ -1852,7 +1852,7 @@ s32 scenarioPickUpBriefcase(struct chrdata *chr, struct prop *prop)
 			if (chr->aibot || i != prevplayernum) {
 				setCurrentPlayerNum(i);
 #if VERSION >= VERSION_JPN_FINAL
-				hudmsgCreateWithFlags(text1, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_20);
+				hudmsgCreateWithFlags(text1, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP);
 #else
 				hudmsgCreateWithFlags(text1, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE);
 #endif
@@ -2108,7 +2108,7 @@ s32 scenarioPickUpUplink(struct chrdata *chr, struct prop *prop)
 				setCurrentPlayerNum(i);
 
 #if VERSION >= VERSION_JPN_FINAL
-				hudmsgCreateWithFlags(message, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_20);
+				hudmsgCreateWithFlags(message, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP);
 #else
 				hudmsgCreateWithFlags(message, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE);
 #endif
diff --git a/src/game/mplayer/scenarios/hackthatmac.inc b/src/game/mplayer/scenarios/hackthatmac.inc
index 5d4704316..1657c7e69 100644
--- a/src/game/mplayer/scenarios/hackthatmac.inc
+++ b/src/game/mplayer/scenarios/hackthatmac.inc
@@ -356,7 +356,7 @@ void htmTickChr(struct chrdata *chr)
 
 						if (chr == NULL) {
 #if VERSION >= VERSION_JPN_FINAL
-							hudmsgCreateWithFlags(langGet(L_MPWEAPONS_018), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_20); // "Starting download."
+							hudmsgCreateWithFlags(langGet(L_MPWEAPONS_018), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); // "Starting download."
 #else
 							hudmsgCreateWithFlags(langGet(L_MPWEAPONS_018), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); // "Starting download."
 #endif
@@ -367,7 +367,7 @@ void htmTickChr(struct chrdata *chr)
 				} else {
 					if (chr == NULL) {
 #if VERSION >= VERSION_JPN_FINAL
-						hudmsgCreateWithFlags(langGet(L_MPWEAPONS_019), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_20); // "You need to use the Data Uplink."
+						hudmsgCreateWithFlags(langGet(L_MPWEAPONS_019), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); // "You need to use the Data Uplink."
 #else
 						hudmsgCreateWithFlags(langGet(L_MPWEAPONS_019), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); // "You need to use the Data Uplink."
 #endif
@@ -440,7 +440,7 @@ void htmTickChr(struct chrdata *chr)
 			if (chr == NULL) {
 				// "Connection broken."
 #if VERSION >= VERSION_JPN_FINAL
-				hudmsgCreateWithFlags(langGet(L_MPWEAPONS_017), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_20);
+				hudmsgCreateWithFlags(langGet(L_MPWEAPONS_017), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP);
 #else
 				hudmsgCreateWithFlags(langGet(L_MPWEAPONS_017), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE);
 #endif
@@ -461,7 +461,7 @@ void htmTickChr(struct chrdata *chr)
 				if (chr == NULL) {
 					// "Download successful."
 #if VERSION >= VERSION_JPN_FINAL
-					hudmsgCreateWithFlags(langGet(L_MPWEAPONS_016), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_20);
+					hudmsgCreateWithFlags(langGet(L_MPWEAPONS_016), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP);
 #else
 					hudmsgCreateWithFlags(langGet(L_MPWEAPONS_016), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE);
 #endif
diff --git a/src/game/mplayer/scenarios/holdthebriefcase.inc b/src/game/mplayer/scenarios/holdthebriefcase.inc
index 60629d757..609bd672c 100644
--- a/src/game/mplayer/scenarios/holdthebriefcase.inc
+++ b/src/game/mplayer/scenarios/holdthebriefcase.inc
@@ -286,7 +286,7 @@ void htbTickChr(struct chrdata *chr)
 				sndStart(var80095200, SFX_MP_SCOREPOINT, NULL, -1, -1, -1, -1, -1);
 				g_MpAllChrConfigPtrs[g_Vars.currentplayernum]->numpoints++;
 #if VERSION >= VERSION_JPN_FINAL
-				hudmsgCreateWithFlags(langGet(L_MPWEAPONS_024), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_20); // "1 Point!"
+				hudmsgCreateWithFlags(langGet(L_MPWEAPONS_024), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); // "1 Point!"
 #else
 				hudmsgCreateWithFlags(langGet(L_MPWEAPONS_024), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); // "1 Point!"
 #endif
diff --git a/src/game/mplayer/scenarios/kingofthehill.inc b/src/game/mplayer/scenarios/kingofthehill.inc
index 4700f4391..5bd957a39 100644
--- a/src/game/mplayer/scenarios/kingofthehill.inc
+++ b/src/game/mplayer/scenarios/kingofthehill.inc
@@ -339,9 +339,9 @@ void kohTick(void)
 #if VERSION >= VERSION_JPN_FINAL
 					if (radarGetTeamIndex(chr->team) == g_ScenarioData.koh.occupiedteam) {
 						// "We have the Hill!"
-						hudmsgCreateWithFlags(langGet(L_MPWEAPONS_021), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_20);
+						hudmsgCreateWithFlags(langGet(L_MPWEAPONS_021), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP);
 					} else {
-						hudmsgCreateWithFlags(text, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_20);
+						hudmsgCreateWithFlags(text, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP);
 					}
 #else
 					if (radarGetTeamIndex(chr->team) == g_ScenarioData.koh.occupiedteam) {
@@ -387,7 +387,7 @@ void kohTick(void)
 
 								// "King of the Hill!"
 #if VERSION >= VERSION_JPN_FINAL
-								hudmsgCreateWithFlags(langGet(L_MPWEAPONS_020), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_20);
+								hudmsgCreateWithFlags(langGet(L_MPWEAPONS_020), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP);
 #else
 								hudmsgCreateWithFlags(langGet(L_MPWEAPONS_020), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE);
 #endif
diff --git a/src/include/constants.h b/src/include/constants.h
index 7f4851406..859fd9e5d 100644
--- a/src/include/constants.h
+++ b/src/include/constants.h
@@ -1254,7 +1254,7 @@
 #define HUDMSGFLAG_NOCHANNEL   0x04 // not linked to audio
 #define HUDMSGFLAG_ALLOWDUPES  0x08
 #define HUDMSGFLAG_DELAY       0x10 // wait minimum 3 frames before showing
-#define HUDMSGFLAG_20          0x20
+#define HUDMSGFLAG_NOWRAP      0x20
 
 #define HUDMSGREASON_NOCONTROL 0x00000002