From 185924d7d828f23452fb2d8cd73ef8a30a134122 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 9 Oct 2019 22:35:13 +1000
Subject: [PATCH] Decompile chrSetPadPreset

---
 src/game/chr/chraicommands.c |  4 ++--
 src/game/game_000000.c       | 17 ++++-------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index 0bcdfeed7..6206cb5c1 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -7613,7 +7613,7 @@ glabel ai00b2
 /*  f054d9c:	30c8ffff */ 	andi	$t0,$a2,0xffff
 /*  f054da0:	10800007 */ 	beqz	$a0,.L0f054dc0
 /*  f054da4:	01003025 */ 	or	$a2,$t0,$zero
-/*  f054da8:	0fc12b28 */ 	jal	func0f04aca0
+/*  f054da8:	0fc12b28 */ 	jal	chrSetPadPreset
 /*  f054dac:	01002825 */ 	or	$a1,$t0,$zero
 /*  f054db0:	3c07800a */ 	lui	$a3,0x800a
 /*  f054db4:	24e79fc0 */ 	addiu	$a3,$a3,-24640
@@ -16197,7 +16197,7 @@ glabel ai0142
 /*  f05bd5c:	56380005 */ 	bnel	$s1,$t8,.L0f05bd74
 /*  f05bd60:	26100004 */ 	addiu	$s0,$s0,0x4
 /*  f05bd64:	8e640424 */ 	lw	$a0,0x424($s3)
-/*  f05bd68:	0fc12b28 */ 	jal	func0f04aca0
+/*  f05bd68:	0fc12b28 */ 	jal	chrSetPadPreset
 /*  f05bd6c:	96050002 */ 	lhu	$a1,0x2($s0)
 /*  f05bd70:	26100004 */ 	addiu	$s0,$s0,0x4
 .L0f05bd74:
diff --git a/src/game/game_000000.c b/src/game/game_000000.c
index 68b356b4e..b0f3e1342 100644
--- a/src/game/game_000000.c
+++ b/src/game/game_000000.c
@@ -84425,19 +84425,10 @@ glabel func0f04ac60
 /*  f04ac9c:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-GLOBAL_ASM(
-glabel func0f04aca0
-/*  f04aca0:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f04aca4:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f04aca8:	0fc1258b */ 	jal	padResolve
-/*  f04acac:	afa40018 */ 	sw	$a0,0x18($sp)
-/*  f04acb0:	8fae0018 */ 	lw	$t6,0x18($sp)
-/*  f04acb4:	a5c20128 */ 	sh	$v0,0x128($t6)
-/*  f04acb8:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f04acbc:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f04acc0:	03e00008 */ 	jr	$ra
-/*  f04acc4:	00000000 */ 	sll	$zero,$zero,0x0
-);
+void chrSetPadPreset(struct chrdata *chr, u32 pad_id)
+{
+	chr->padpreset1 = padResolve(chr, pad_id);
+}
 
 GLOBAL_ASM(
 glabel func0f04acc8