From 6220796f5b8999d014100943f57bcbf065cfb88b Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Tue, 14 Apr 2020 20:10:59 +1000
Subject: [PATCH] Decompile chrsGetNumFree

---
 src/game/chr/chr.c         | 43 ++++++++++++--------------------------
 src/game/chr/chraction.c   |  4 ++--
 src/include/game/chr/chr.h |  2 +-
 3 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c
index 07abdd2a7..1c286653d 100644
--- a/src/game/chr/chr.c
+++ b/src/game/chr/chr.c
@@ -2446,36 +2446,19 @@ glabel var7f1a8720
 /*  f020534:	24020001 */ 	addiu	$v0,$zero,0x1
 );
 
-GLOBAL_ASM(
-glabel func0f020538
-/*  f020538:	3c048006 */ 	lui	$a0,%hi(g_NumChrsA)
-/*  f02053c:	8c84298c */ 	lw	$a0,%lo(g_NumChrsA)($a0)
-/*  f020540:	00001825 */ 	or	$v1,$zero,$zero
-/*  f020544:	00001025 */ 	or	$v0,$zero,$zero
-/*  f020548:	18800011 */ 	blez	$a0,.L0f020590
-/*  f02054c:	3c058006 */ 	lui	$a1,%hi(g_ChrsA)
-/*  f020550:	000430c0 */ 	sll	$a2,$a0,0x3
-/*  f020554:	00c43023 */ 	subu	$a2,$a2,$a0
-/*  f020558:	00063080 */ 	sll	$a2,$a2,0x2
-/*  f02055c:	00c43023 */ 	subu	$a2,$a2,$a0
-/*  f020560:	00063080 */ 	sll	$a2,$a2,0x2
-/*  f020564:	00c43021 */ 	addu	$a2,$a2,$a0
-/*  f020568:	000630c0 */ 	sll	$a2,$a2,0x3
-/*  f02056c:	8ca52988 */ 	lw	$a1,%lo(g_ChrsA)($a1)
-.L0f020570:
-/*  f020570:	84ae0000 */ 	lh	$t6,0x0($a1)
-/*  f020574:	24420368 */ 	addiu	$v0,$v0,0x368
-/*  f020578:	0046082a */ 	slt	$at,$v0,$a2
-/*  f02057c:	05c10002 */ 	bgez	$t6,.L0f020588
-/*  f020580:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f020584:	24630001 */ 	addiu	$v1,$v1,0x1
-.L0f020588:
-/*  f020588:	1420fff9 */ 	bnez	$at,.L0f020570
-/*  f02058c:	24a50368 */ 	addiu	$a1,$a1,872
-.L0f020590:
-/*  f020590:	03e00008 */ 	jr	$ra
-/*  f020594:	00601025 */ 	or	$v0,$v1,$zero
-);
+s32 chrsGetNumFree(void)
+{
+	s32 count = 0;
+	s32 i;
+
+	for (i = 0; i < g_NumChrsA; i++) {
+		if (g_ChrsA[i].chrnum < 0) {
+			count++;
+		}
+	}
+
+	return count;
+}
 
 void chrSetMaxDamage(struct chrdata *chr, f32 maxdamage)
 {
diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c
index 268137eea..bcf0b8894 100644
--- a/src/game/chr/chraction.c
+++ b/src/game/chr/chraction.c
@@ -30387,7 +30387,7 @@ glabel chrSpawnAtCoord
 /*  f04b2fc:	afa40078 */ 	sw	$a0,0x78($sp)
 /*  f04b300:	afa5007c */ 	sw	$a1,0x7c($sp)
 /*  f04b304:	afa60080 */ 	sw	$a2,0x80($sp)
-/*  f04b308:	0fc0814e */ 	jal	func0f020538
+/*  f04b308:	0fc0814e */ 	jal	chrsGetNumFree
 /*  f04b30c:	afa70084 */ 	sw	$a3,0x84($sp)
 /*  f04b310:	28410002 */ 	slti	$at,$v0,0x2
 /*  f04b314:	1420004d */ 	bnez	$at,.L0f04b44c
@@ -30472,7 +30472,7 @@ glabel chrSpawnAtCoord
 /*  f04b444:	0fc2cc33 */ 	jal	func0f0b30cc
 /*  f04b448:	00000000 */ 	sll	$zero,$zero,0x0
 .L0f04b44c:
-/*  f04b44c:	0fc0814e */ 	jal	func0f020538
+/*  f04b44c:	0fc0814e */ 	jal	chrsGetNumFree
 /*  f04b450:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f04b454:	28410004 */ 	slti	$at,$v0,0x4
 /*  f04b458:	50200043 */ 	beqzl	$at,.L0f04b568
diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h
index ecfd2583b..56a38d8fc 100644
--- a/src/include/game/chr/chr.h
+++ b/src/include/game/chr/chr.h
@@ -8,7 +8,7 @@ u32 chrSetChrnum(struct chrdata *chr, s16 arg1);
 u32 func0f01e6a4(void);
 u32 func0f01e7f4(void);
 u32 func0f01f264(struct chrdata *chr, struct coord *pos, s16 *room, f32 arg3, bool arg4);
-u32 func0f020538(void);
+s32 chrsGetNumFree(void);
 s32 getLowestUnusedChrId(void);
 struct prop *func0f020b14(struct prop *prop, s32 arg0, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist);
 void func0f020d44(struct prop *prop, bool arg1);