From 8ad552b860bd986a8e8367950b36437b3959ece7 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 25 Dec 2019 22:46:15 +1000
Subject: [PATCH] Decompile setVar8006297c, getVar8006297c, setVar80062980 and
 getVar80062980

---
 src/game/chr/chr.c               | 34 ++++++++++++++++++--------------
 src/include/game/chr/chr.h       |  4 ++++
 src/include/setup/setup_000000.h |  2 ++
 src/setup/setup_000000.c         |  4 ++--
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c
index b9075cce3..a20797658 100644
--- a/src/game/chr/chr.c
+++ b/src/game/chr/chr.c
@@ -1416,21 +1416,25 @@ void func0f01e760(s32 arg0)
 	func0f1679f4(arg0 * 12);
 }
 
-GLOBAL_ASM(
-glabel func0f01e790
-/*  f01e78c:	3c018006 */ 	lui	$at,0x8006
-/*  f01e790:	03e00008 */ 	jr	$ra
-/*  f01e794:	ac24297c */ 	sw	$a0,0x297c($at)
-/*  f01e798:	3c028006 */ 	lui	$v0,0x8006
-/*  f01e79c:	03e00008 */ 	jr	$ra
-/*  f01e7a0:	8c42297c */ 	lw	$v0,0x297c($v0)
-/*  f01e7a4:	3c018006 */ 	lui	$at,0x8006
-/*  f01e7a8:	03e00008 */ 	jr	$ra
-/*  f01e7ac:	ac242980 */ 	sw	$a0,0x2980($at)
-/*  f01e7b0:	3c028006 */ 	lui	$v0,0x8006
-/*  f01e7b4:	03e00008 */ 	jr	$ra
-/*  f01e7b8:	8c422980 */ 	lw	$v0,0x2980($v0)
-);
+void setVar8006297c(u32 arg0)
+{
+	var8006297c = arg0;
+}
+
+u32 getVar8006297c(void)
+{
+	return var8006297c;
+}
+
+void setVar80062980(u32 arg0)
+{
+	var80062980 = arg0;
+}
+
+u32 getVar80062980(void)
+{
+	return var80062980;
+}
 
 void chrSetOrUnsetHiddenFlag00000100(struct chrdata *chr, bool unset)
 {
diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h
index 269c96c74..bc83981e8 100644
--- a/src/include/game/chr/chr.h
+++ b/src/include/game/chr/chr.h
@@ -420,5 +420,9 @@ f32 propGetDistanceToProp(struct prop *a, struct prop *b);
 s32 propGetIndexByChrId(struct chrdata *chr, s32 chrnum);
 f32 propGetLateralDistanceToProp(struct prop *a, struct prop *b);
 void func0f01e760(s32 arg0);
+void setVar8006297c(u32 arg0);
+u32 getVar8006297c(void);
+void setVar80062980(u32 arg0);
+u32 getVar80062980(void);
 
 #endif
diff --git a/src/include/setup/setup_000000.h b/src/include/setup/setup_000000.h
index d76269235..a30f6f5f4 100644
--- a/src/include/setup/setup_000000.h
+++ b/src/include/setup/setup_000000.h
@@ -287,6 +287,8 @@ extern u32 var80062964;
 extern u32 var80062968;
 extern u32 var80062970;
 extern u32 var80062974;
+extern u32 var8006297c;
+extern u32 var80062980;
 extern u32 var80062984;
 extern u32 var80062990;
 extern u32 var80062998;
diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c
index 114ff3f24..66f1c7c10 100644
--- a/src/setup/setup_000000.c
+++ b/src/setup/setup_000000.c
@@ -8292,8 +8292,8 @@ u32 var8006296c = 0x00000000;
 u32 var80062970 = 0x00000000;
 u32 var80062974 = 0x00000000;
 u32 var80062978 = 0x00000000;
-u32 var8006297c = 0x00000000;
-u32 var80062980 = 0x00000000;
+u32 var8006297c = 0;
+u32 var80062980 = 0;
 u32 var80062984 = 0x00001388;
 
 // 80062988