From 4ff793b654129f4bebf26b0384b911bcdb2857a7 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 18 Dec 2019 19:41:28 +1000
Subject: [PATCH] Decompile chrSaveLastHearTarget

---
 src/game/chr/chr.c         | 18 ++++++------------
 src/game/game_129900.c     |  2 +-
 src/include/game/chr/chr.h |  2 +-
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c
index 88fe9c829..23142b8cc 100644
--- a/src/game/chr/chr.c
+++ b/src/game/chr/chr.c
@@ -12577,7 +12577,7 @@ glabel func0f028590
 /*  f0286c8:	8fcf0000 */ 	lw	$t7,0x0($s8)
 /*  f0286cc:	8ecc0000 */ 	lw	$t4,0x0($s6)
 /*  f0286d0:	00008825 */ 	or	$s1,$zero,$zero
-/*  f0286d4:	0fc0e56f */ 	jal	func0f0395bc
+/*  f0286d4:	0fc0e56f */ 	jal	chrSaveLastHearTarget
 /*  f0286d8:	02ac2021 */ 	addu	$a0,$s5,$t4
 /*  f0286dc:	0274082b */ 	sltu	$at,$s3,$s4
 /*  f0286e0:	50200008 */ 	beqzl	$at,.L0f028704
@@ -31715,17 +31715,11 @@ void chrSaveLastSeeTarget(struct chrdata *chr)
 	chr->lastseetarget60 = g_Vars.unk000008;
 }
 
-
-GLOBAL_ASM(
-glabel func0f0395bc
-/*  f0395bc:	8c8e0014 */ 	lw	$t6,0x14($a0)
-/*  f0395c0:	3c18800a */ 	lui	$t8,0x800a
-/*  f0395c4:	35cf0002 */ 	ori	$t7,$t6,0x2
-/*  f0395c8:	ac8f0014 */ 	sw	$t7,0x14($a0)
-/*  f0395cc:	8f189fc8 */ 	lw	$t8,-0x6038($t8)
-/*  f0395d0:	03e00008 */ 	jr	$ra
-/*  f0395d4:	ac9800f4 */ 	sw	$t8,0xf4($a0)
-);
+void chrSaveLastHearTarget(struct chrdata *chr)
+{
+	chr->hidden |= CHRFLAG2_00000002;
+	chr->lastheartarget60 = g_Vars.unk000008;
+}
 
 GLOBAL_ASM(
 glabel func0f0395d8
diff --git a/src/game/game_129900.c b/src/game/game_129900.c
index 000df5791..708aec858 100644
--- a/src/game/game_129900.c
+++ b/src/game/game_129900.c
@@ -1200,7 +1200,7 @@ glabel func0f129cfc
 /*  f129e38:	45020005 */ 	bc1fl	.L0f129e50
 /*  f129e3c:	8eb90000 */ 	lw	$t9,0x0($s5)
 /*  f129e40:	8e380000 */ 	lw	$t8,0x0($s1)
-/*  f129e44:	0fc0e56f */ 	jal	func0f0395bc
+/*  f129e44:	0fc0e56f */ 	jal	chrSaveLastHearTarget
 /*  f129e48:	02182021 */ 	addu	$a0,$s0,$t8
 /*  f129e4c:	8eb90000 */ 	lw	$t9,0x0($s5)
 .L0f129e50:
diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h
index 2c36b87fc..bb4b31945 100644
--- a/src/include/game/chr/chr.h
+++ b/src/include/game/chr/chr.h
@@ -230,7 +230,7 @@ u32 func0f0393b4(struct chrdata *chr, struct coord *coord, s16 *room);
 u32 func0f039474(void);
 u32 func0f039558(void);
 void chrSaveLastSeeTarget(struct chrdata *chr);
-u32 func0f0395bc(void);
+void chrSaveLastHearTarget(struct chrdata *chr);
 u32 func0f0395d8(struct chrdata *chr);
 u32 func0f03978c(struct chrdata *chr);
 u32 func0f039a18(struct chrdata *chr);