From e097f703e8dbf1d436342bbba5b772d4607d9e74 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 26 Jan 2020 23:37:05 +1000
Subject: [PATCH] Decompile coverGetCount

---
 src/game/chr/chr.c     |  6 +++---
 src/game/game_1999b0.c |  2 +-
 src/game/pad.c         | 11 ++++-------
 src/include/game/pad.h |  2 +-
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c
index 1c620a64a..5740044c6 100644
--- a/src/game/chr/chr.c
+++ b/src/game/chr/chr.c
@@ -50767,7 +50767,7 @@ glabel func0f04b950
 /*  f04b95c:	afa50044 */ 	sw	$a1,0x44($sp)
 /*  f04b960:	04a0000b */ 	bltz	$a1,.L0f04b990
 /*  f04b964:	afa60048 */ 	sw	$a2,0x48($sp)
-/*  f04b968:	0fc458b4 */ 	jal	func0f1162d0
+/*  f04b968:	0fc458b4 */ 	jal	coverGetCount
 /*  f04b96c:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f04b970:	8fa40044 */ 	lw	$a0,0x44($sp)
 /*  f04b974:	0044082a */ 	slt	$at,$v0,$a0
@@ -50843,7 +50843,7 @@ glabel func0f04ba34
 /*  f04ba60:	afb1001c */ 	sw	$s1,0x1c($sp)
 /*  f04ba64:	afb00018 */ 	sw	$s0,0x18($sp)
 /*  f04ba68:	afa600c0 */ 	sw	$a2,0xc0($sp)
-/*  f04ba6c:	0fc458b4 */ 	jal	func0f1162d0
+/*  f04ba6c:	0fc458b4 */ 	jal	coverGetCount
 /*  f04ba70:	a7a500be */ 	sh	$a1,0xbe($sp)
 /*  f04ba74:	afa20078 */ 	sw	$v0,0x78($sp)
 /*  f04ba78:	0000f025 */ 	or	$s8,$zero,$zero
@@ -51275,7 +51275,7 @@ glabel func0f04bffc
 /*  f04c05c:	afaf0078 */ 	sw	$t7,0x78($sp)
 /*  f04c060:	e7ba0090 */ 	swc1	$f26,0x90($sp)
 /*  f04c064:	4600d586 */ 	mov.s	$f22,$f26
-/*  f04c068:	0fc458b4 */ 	jal	func0f1162d0
+/*  f04c068:	0fc458b4 */ 	jal	coverGetCount
 /*  f04c06c:	46062600 */ 	add.s	$f24,$f4,$f6
 /*  f04c070:	02940019 */ 	multu	$s4,$s4
 /*  f04c074:	86380292 */ 	lh	$t8,0x292($s1)
diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c
index e85e2d270..a96f2ed40 100644
--- a/src/game/game_1999b0.c
+++ b/src/game/game_1999b0.c
@@ -1394,7 +1394,7 @@ glabel func0f19ab70
 /*  f19abc8:	a7ae0154 */ 	sh	$t6,0x154($sp)
 /*  f19abcc:	afa00054 */ 	sw	$zero,0x54($sp)
 .L0f19abd0:
-/*  f19abd0:	0fc458b4 */ 	jal	func0f1162d0
+/*  f19abd0:	0fc458b4 */ 	jal	coverGetCount
 /*  f19abd4:	00009025 */ 	or	$s2,$zero,$zero
 /*  f19abd8:	1840002f */ 	blez	$v0,.L0f19ac98
 /*  f19abdc:	0040f025 */ 	or	$s8,$v0,$zero
diff --git a/src/game/pad.c b/src/game/pad.c
index 8c7b99839..198e02846 100644
--- a/src/game/pad.c
+++ b/src/game/pad.c
@@ -686,13 +686,10 @@ bool func0f1162c4(s32 padnum, s32 arg1)
 	return padnum;
 }
 
-GLOBAL_ASM(
-glabel func0f1162d0
-/*  f1162d0:	3c0e800a */ 	lui	$t6,0x800a
-/*  f1162d4:	8dce2350 */ 	lw	$t6,0x2350($t6)
-/*  f1162d8:	03e00008 */ 	jr	$ra
-/*  f1162dc:	8dc20004 */ 	lw	$v0,0x4($t6)
-);
+s32 coverGetCount(void)
+{
+	return g_PadsFile[1];
+}
 
 GLOBAL_ASM(
 glabel func0f1162e0
diff --git a/src/include/game/pad.h b/src/include/game/pad.h
index f728a35a5..bb0b39631 100644
--- a/src/include/game/pad.h
+++ b/src/include/game/pad.h
@@ -10,7 +10,7 @@ u32 func0f116068(void);
 void padCopyBboxFromPad(s32 padnum, struct pad *src);
 void padSetFlag(s32 padnum, u32 flag);
 void padUnsetFlag(s32 padnum, u32 flag);
-s32 func0f1162d0(void);
+s32 coverGetCount(void);
 u32 func0f1162e0(s16 cover, struct coord **pos);
 bool coverHasFlag0002(s32 covernum);
 void coverSetFlag0002(s32 covernum, bool enable);