From e454990e97837088f289b71fe54bd3975295e1f4 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Fri, 20 Dec 2019 21:18:33 +1000
Subject: [PATCH] Attempt to decompile chrFaceEntity

---
 src/game/chr/chr.c           | 31 +++++++++++++++++++++++++++++--
 src/game/chr/chraicommands.c |  2 +-
 src/include/game/chr/chr.h   |  2 +-
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c
index ce4e6c7cc..38a2bb71f 100644
--- a/src/game/chr/chr.c
+++ b/src/game/chr/chr.c
@@ -32919,7 +32919,7 @@ glabel func0f03a76c
 );
 
 GLOBAL_ASM(
-glabel func0f03a7e8
+glabel chrFaceEntity
 /*  f03a7e8:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*  f03a7ec:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*  f03a7f0:	afa5001c */ 	sw	$a1,0x1c($sp)
@@ -32970,6 +32970,33 @@ glabel func0f03a7e8
 /*  f03a890:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
+// Matches if chr->unk04c is turned into a bitfield, but that causes ai00f0 to
+// mismatch.
+//bool chrFaceEntity(struct chrdata *chr, u32 entity_type, u32 entity_id)
+//{
+//	if (func0f039a18(chr)) {
+//		if (chr->actiontype != ACT_STAND) {
+//			func0f02eabc(chr);
+//		}
+//
+//		if (entity_type != chr->unk030 || entity_id != chr->unk034) {
+//			chr->unk030 = entity_type;
+//			chr->unk034 = entity_id;
+//			chr->unk038 = 0;
+//			chr->unk040 = 0;
+//
+//			if (entity_type == 0x200 && entity_id == 1) {
+//				chr->unk04c = 1;
+//				chr->unk034 = 0;
+//			}
+//		}
+//
+//		return true;
+//	}
+//
+//	return false;
+//}
+
 GLOBAL_ASM(
 glabel func0f03a894
 /*  f03a894:	27bdff88 */ 	addiu	$sp,$sp,-120
@@ -35049,7 +35076,7 @@ glabel func0f03c138
 /*  f03c880:	46061202 */ 	mul.s	$f8,$f2,$f6
 /*  f03c884:	4600428d */ 	trunc.w.s	$f10,$f8
 /*  f03c888:	44065000 */ 	mfc1	$a2,$f10
-/*  f03c88c:	0fc0e9fa */ 	jal	func0f03a7e8
+/*  f03c88c:	0fc0e9fa */ 	jal	chrFaceEntity
 /*  f03c890:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f03c894:	10000003 */ 	beqz	$zero,.L0f03c8a4
 /*  f03c898:	8fbf0024 */ 	lw	$ra,0x24($sp)
diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index 925482721..aa9ed0c53 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -965,7 +965,7 @@ bool aiFaceEntity(void)
 	u32 thingid = cmd[5] | (cmd[4] << 8);
 	u32 thingtype = cmd[3] | (cmd[2] << 8);
 
-	if (func0f03a7e8(g_Vars.chrdata, thingtype, thingid)) {
+	if (chrFaceEntity(g_Vars.chrdata, thingtype, thingid)) {
 		g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[6]);
 	} else {
 		g_Vars.aioffset += 7;
diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h
index 50b02f7ed..af195dbd3 100644
--- a/src/include/game/chr/chr.h
+++ b/src/include/game/chr/chr.h
@@ -246,7 +246,7 @@ u32 func0f03a578(struct chrdata *chr, u32 thingtype, u32 thingid);
 u32 func0f03a644(struct chrdata *chr, u32 thingtype, u32 thingid);
 u32 func0f03a6d8(struct chrdata *chr, u32 thingtype, u32 thingid);
 u32 func0f03a76c(struct chrdata *chr, u32 thingtype, u32 thingid);
-u32 func0f03a7e8(struct chrdata *chr, u32 thingtype, u32 thingid);
+bool chrFaceEntity(struct chrdata *chr, u32 entity_type, u32 entity_id);
 u32 func0f03a894(struct chrdata *chr, s32 pad, s32 arg2);
 u32 chrStartPath(struct chrdata *chr);
 u32 chrTrySurrender(struct chrdata *chr);