From e068d2848be62c7c7110dba72bfdf19e2c0fc4fa Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Wed, 14 Oct 2020 17:11:59 +0100
Subject: [PATCH] match func_80028838

---
 .../code_3bf0_len_6f0/func_80028838.s         | 19 -------------------
 include/variables.h                           |  4 ++++
 src/code_3bf0_len_6f0.c                       |  8 +++++++-
 undefined_syms.txt                            |  4 ++++
 4 files changed, 15 insertions(+), 20 deletions(-)
 delete mode 100644 asm/nonmatchings/code_3bf0_len_6f0/func_80028838.s

diff --git a/asm/nonmatchings/code_3bf0_len_6f0/func_80028838.s b/asm/nonmatchings/code_3bf0_len_6f0/func_80028838.s
deleted file mode 100644
index af0b254178..0000000000
--- a/asm/nonmatchings/code_3bf0_len_6f0/func_80028838.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80028838
-/* 3C38 80028838 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 3C3C 8002883C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 3C40 80028840 0C00A1FC */  jal       func_800287F0
-/* 3C44 80028844 00000000 */   nop      
-/* 3C48 80028848 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 3C4C 8002884C 3C01800A */  lui       $at, 0x800a
-/* 3C50 80028850 A420A6A0 */  sh        $zero, -0x5960($at)
-/* 3C54 80028854 3C01800A */  lui       $at, 0x800a
-/* 3C58 80028858 A420A6A2 */  sh        $zero, -0x595e($at)
-/* 3C5C 8002885C 3C01800A */  lui       $at, 0x800a
-/* 3C60 80028860 A420A6A4 */  sh        $zero, -0x595c($at)
-/* 3C64 80028864 3C01800A */  lui       $at, 0x800a
-/* 3C68 80028868 A420A6A6 */  sh        $zero, -0x595a($at)
-/* 3C6C 8002886C 03E00008 */  jr        $ra
-/* 3C70 80028870 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/include/variables.h b/include/variables.h
index b864472652..593e150bf2 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -96,6 +96,10 @@ extern s16 D_800A0944;
 
 extern s32 gGameState;
 extern s32 D_8009A650[1];
+extern u16 D_8009A6A0;
+extern u16 D_8009A6A2;
+extern u16 D_8009A6A4;
+extern u16 D_8009A6A6;
 
 // curtains
 extern f32 D_8009BA90;
diff --git a/src/code_3bf0_len_6f0.c b/src/code_3bf0_len_6f0.c
index fd97f0571a..738bda8f4d 100644
--- a/src/code_3bf0_len_6f0.c
+++ b/src/code_3bf0_len_6f0.c
@@ -24,6 +24,12 @@ void func_800287F0(void) {
     }
 }
 
-INCLUDE_ASM(s32, "code_3bf0_len_6f0", func_80028838);
+void func_80028838(void) {
+    func_800287F0();
+    D_8009A6A0 = 0;
+    D_8009A6A2 = 0;
+    D_8009A6A4 = 0;
+    D_8009A6A6 = 0;
+}
 
 INCLUDE_ASM(s32, "code_3bf0_len_6f0", update_input);
diff --git a/undefined_syms.txt b/undefined_syms.txt
index e8491ea5e2..0cc32751ca 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -62,6 +62,10 @@ D_800959D4 = 0x800959D4;
 D_8009A5D8 = 0x8009A5D8;
 gGameState = 0x8009A600;
 D_8009A650 = 0x8009A650;
+D_8009A6A0 = 0x8009A6A0;
+D_8009A6A2 = 0x8009A6A2;
+D_8009A6A4 = 0x8009A6A4;
+D_8009A6A6 = 0x8009A6A6;
 
 D_8009BA90 = 0x8009BA90;
 D_8009BA94 = 0x8009BA94;