From 4ea763d52fb8c617911a98b9f36319a8e643eaed Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 12 Apr 2020 23:46:42 +1000
Subject: [PATCH] Decompile frGetNumWeaponsAvailable

---
 src/game/game_102240.c         |  2 +-
 src/game/game_19c990.c         | 40 +++++++++++-----------------------
 src/game/game_1a3340.c         |  2 +-
 src/include/game/game_19c990.h |  2 +-
 4 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/src/game/game_102240.c b/src/game/game_102240.c
index b740d359a..957c0ed62 100644
--- a/src/game/game_102240.c
+++ b/src/game/game_102240.c
@@ -3799,7 +3799,7 @@ glabel var7f1b2e44
 /*  f106064:	00001025 */ 	or	$v0,$zero,$zero
 /*  f106068:	1000003e */ 	beqz	$zero,.L0f106164
 /*  f10606c:	acc00008 */ 	sw	$zero,0x8($a2)
-/*  f106070:	0fc674b8 */ 	jal	func0f19d2e0
+/*  f106070:	0fc674b8 */ 	jal	frGetNumWeaponsAvailable
 /*  f106074:	afa60020 */ 	sw	$a2,0x20($sp)
 /*  f106078:	8fa60020 */ 	lw	$a2,0x20($sp)
 /*  f10607c:	10000039 */ 	beqz	$zero,.L0f106164
diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c
index c148027e7..e6729c059 100644
--- a/src/game/game_19c990.c
+++ b/src/game/game_19c990.c
@@ -414,33 +414,19 @@ u32 frGetWeaponBySlot(s32 slot)
 	return WEAPON_UNARMED;
 }
 
-GLOBAL_ASM(
-glabel func0f19d2e0
-/*  f19d2e0:	27bdffd8 */ 	addiu	$sp,$sp,-40
-/*  f19d2e4:	afb20020 */ 	sw	$s2,0x20($sp)
-/*  f19d2e8:	afb1001c */ 	sw	$s1,0x1c($sp)
-/*  f19d2ec:	afb00018 */ 	sw	$s0,0x18($sp)
-/*  f19d2f0:	afbf0024 */ 	sw	$ra,0x24($sp)
-/*  f19d2f4:	00008825 */ 	or	$s1,$zero,$zero
-/*  f19d2f8:	24100001 */ 	addiu	$s0,$zero,0x1
-/*  f19d2fc:	24120033 */ 	addiu	$s2,$zero,0x33
-.L0f19d300:
-/*  f19d300:	0fc67314 */ 	jal	frWeaponIsAvailable
-/*  f19d304:	02002025 */ 	or	$a0,$s0,$zero
-/*  f19d308:	10400002 */ 	beqz	$v0,.L0f19d314
-/*  f19d30c:	26100001 */ 	addiu	$s0,$s0,0x1
-/*  f19d310:	26310001 */ 	addiu	$s1,$s1,0x1
-.L0f19d314:
-/*  f19d314:	1612fffa */ 	bne	$s0,$s2,.L0f19d300
-/*  f19d318:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f19d31c:	8fbf0024 */ 	lw	$ra,0x24($sp)
-/*  f19d320:	02201025 */ 	or	$v0,$s1,$zero
-/*  f19d324:	8fb1001c */ 	lw	$s1,0x1c($sp)
-/*  f19d328:	8fb00018 */ 	lw	$s0,0x18($sp)
-/*  f19d32c:	8fb20020 */ 	lw	$s2,0x20($sp)
-/*  f19d330:	03e00008 */ 	jr	$ra
-/*  f19d334:	27bd0028 */ 	addiu	$sp,$sp,0x28
-);
+s32 frGetNumWeaponsAvailable(void)
+{
+	s32 count = 0;
+	s32 i;
+
+	for (i = WEAPON_UNARMED; i <= WEAPON_HORIZONSCANNER; i++) {
+		if (frWeaponIsAvailable(i)) {
+			count++;
+		}
+	}
+
+	return count;
+}
 
 GLOBAL_ASM(
 glabel func0f19d338
diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c
index 714084240..dadaea00b 100644
--- a/src/game/game_1a3340.c
+++ b/src/game/game_1a3340.c
@@ -154,7 +154,7 @@ glabel var7f1b9940
 /*  f1a34d4:	00001025 */ 	or	$v0,$zero,$zero
 /*  f1a34d8:	1000012e */ 	beqz	$zero,.L0f1a3994
 /*  f1a34dc:	acc00008 */ 	sw	$zero,0x8($a2)
-/*  f1a34e0:	0fc674b8 */ 	jal	func0f19d2e0
+/*  f1a34e0:	0fc674b8 */ 	jal	frGetNumWeaponsAvailable
 /*  f1a34e4:	afa600b0 */ 	sw	$a2,0xb0($sp)
 /*  f1a34e8:	8fa600b0 */ 	lw	$a2,0xb0($sp)
 /*  f1a34ec:	10000129 */ 	beqz	$zero,.L0f1a3994
diff --git a/src/include/game/game_19c990.h b/src/include/game/game_19c990.h
index 2fcfdf10d..0b2a7af16 100644
--- a/src/include/game/game_19c990.h
+++ b/src/include/game/game_19c990.h
@@ -21,7 +21,7 @@ s32 frIsClassicWeaponUnlocked(u32 weapon);
 s32 frGetSlot(void);
 void frSetSlot(s32 slot);
 u32 frGetWeaponBySlot(s32 slot);
-u32 func0f19d2e0(void);
+s32 frGetNumWeaponsAvailable(void);
 u32 func0f19d338(void);
 u32 func0f19d414(void);
 void func0f19d4ec(void);