From 3f60e973ad8f4e6e06a541e9c64dcd6c113053d1 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Tue, 17 Mar 2020 08:20:52 +1000
Subject: [PATCH] Decompile func0f0ddfa4

---
 src/game/game_0dcdb0.c         | 55 ++++++++++------------------------
 src/include/game/game_0dcdb0.h |  2 +-
 2 files changed, 17 insertions(+), 40 deletions(-)

diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c
index 80ba73caa..1d5046596 100644
--- a/src/game/game_0dcdb0.c
+++ b/src/game/game_0dcdb0.c
@@ -1303,45 +1303,22 @@ void currentPlayerQueueMessage(char *text, s32 confignum)
 			-1, 0);
 }
 
-GLOBAL_ASM(
-glabel func0f0ddfa4
-/*  f0ddfa4:	27bdffb8 */ 	addiu	$sp,$sp,-72
-/*  f0ddfa8:	3c0f8007 */ 	lui	$t7,%hi(g_HudMessageConfigs)
-/*  f0ddfac:	25ef0ff0 */ 	addiu	$t7,$t7,%lo(g_HudMessageConfigs)
-/*  f0ddfb0:	00057140 */ 	sll	$t6,$a1,0x5
-/*  f0ddfb4:	01cf1021 */ 	addu	$v0,$t6,$t7
-/*  f0ddfb8:	90580002 */ 	lbu	$t8,0x2($v0)
-/*  f0ddfbc:	afa60050 */ 	sw	$a2,0x50($sp)
-/*  f0ddfc0:	8c590004 */ 	lw	$t9,0x4($v0)
-/*  f0ddfc4:	afb80010 */ 	sw	$t8,0x10($sp)
-/*  f0ddfc8:	8fb80050 */ 	lw	$t8,0x50($sp)
-/*  f0ddfcc:	8c480008 */ 	lw	$t0,0x8($v0)
-/*  f0ddfd0:	8c49000c */ 	lw	$t1,0xc($v0)
-/*  f0ddfd4:	8c4a0010 */ 	lw	$t2,0x10($v0)
-/*  f0ddfd8:	904b0014 */ 	lbu	$t3,0x14($v0)
-/*  f0ddfdc:	844c0016 */ 	lh	$t4,0x16($v0)
-/*  f0ddfe0:	904d0015 */ 	lbu	$t5,0x15($v0)
-/*  f0ddfe4:	844e0018 */ 	lh	$t6,0x18($v0)
-/*  f0ddfe8:	afbf0044 */ 	sw	$ra,0x44($sp)
-/*  f0ddfec:	240fffff */ 	addiu	$t7,$zero,-1
-/*  f0ddff0:	afaf0034 */ 	sw	$t7,0x34($sp)
-/*  f0ddff4:	90460000 */ 	lbu	$a2,0x0($v0)
-/*  f0ddff8:	90470001 */ 	lbu	$a3,0x1($v0)
-/*  f0ddffc:	afb90014 */ 	sw	$t9,0x14($sp)
-/*  f0de000:	afb80038 */ 	sw	$t8,0x38($sp)
-/*  f0de004:	afa80018 */ 	sw	$t0,0x18($sp)
-/*  f0de008:	afa9001c */ 	sw	$t1,0x1c($sp)
-/*  f0de00c:	afaa0020 */ 	sw	$t2,0x20($sp)
-/*  f0de010:	afab0024 */ 	sw	$t3,0x24($sp)
-/*  f0de014:	afac0028 */ 	sw	$t4,0x28($sp)
-/*  f0de018:	afad002c */ 	sw	$t5,0x2c($sp)
-/*  f0de01c:	0fc37baf */ 	jal	func0f0deebc
-/*  f0de020:	afae0030 */ 	sw	$t6,0x30($sp)
-/*  f0de024:	8fbf0044 */ 	lw	$ra,0x44($sp)
-/*  f0de028:	27bd0048 */ 	addiu	$sp,$sp,0x48
-/*  f0de02c:	03e00008 */ 	jr	$ra
-/*  f0de030:	00000000 */ 	sll	$zero,$zero,0x0
-);
+void func0f0ddfa4(char *text, s32 confignum, s32 arg2)
+{
+	func0f0deebc(text, confignum,
+			g_HudMessageConfigs[confignum].unk00,
+			g_HudMessageConfigs[confignum].unk01,
+			g_HudMessageConfigs[confignum].unk02,
+			g_HudMessageConfigs[confignum].unk04,
+			g_HudMessageConfigs[confignum].unk08,
+			g_HudMessageConfigs[confignum].colour,
+			g_HudMessageConfigs[confignum].unk10,
+			g_HudMessageConfigs[confignum].alignh,
+			g_HudMessageConfigs[confignum].unk16,
+			g_HudMessageConfigs[confignum].alignv,
+			g_HudMessageConfigs[confignum].unk18,
+			-1, arg2);
+}
 
 void func0f0de034(char *text, s32 confignum, u8 colournum)
 {
diff --git a/src/include/game/game_0dcdb0.h b/src/include/game/game_0dcdb0.h
index 3689117d1..fecbf4802 100644
--- a/src/include/game/game_0dcdb0.h
+++ b/src/include/game/game_0dcdb0.h
@@ -14,7 +14,7 @@ void func0f0ddda0(void);
 u32 func0f0dde60(void);
 u32 func0f0ddeac(void);
 void currentPlayerQueueMessage(char *text, s32 confignum);
-void func0f0ddfa4(char *text, s32 arg1, s32 arg2);
+void func0f0ddfa4(char *text, s32 confignum, s32 arg2);
 void func0f0de034(char *text, s32 confignum, u8 colour);
 u32 func0f0de0d4(void);
 u32 func0f0de160(void);