From 2ea19f0401855076c8497e1f944adfe76678351d Mon Sep 17 00:00:00 2001
From: mzxrules <mzxrules@gmail.com>
Date: Tue, 31 Mar 2020 13:13:03 -0400
Subject: [PATCH] func_8005D4B4 func_8005D4C8 ok

---
 .../code/z_collision_check/func_8005D4B4.s          | 13 -------------
 src/code/z_collision_check.c                        | 10 +++++++++-
 2 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 asm/non_matchings/code/z_collision_check/func_8005D4B4.s

diff --git a/asm/non_matchings/code/z_collision_check/func_8005D4B4.s b/asm/non_matchings/code/z_collision_check/func_8005D4B4.s
deleted file mode 100644
index 96dc29b637..0000000000
--- a/asm/non_matchings/code/z_collision_check/func_8005D4B4.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_8005D4B4
-/* AD4654 8005D4B4 AFA40000 */  sw    $a0, ($sp)
-/* AD4658 8005D4B8 94AE0002 */  lhu   $t6, 2($a1)
-/* AD465C 8005D4BC 35CF0001 */  ori   $t7, $t6, 1
-/* AD4660 8005D4C0 03E00008 */  jr    $ra
-/* AD4664 8005D4C4 A4AF0002 */   sh    $t7, 2($a1)
-
-/* AD4668 8005D4C8 AFA40000 */  sw    $a0, ($sp)
-/* AD466C 8005D4CC 94AE0002 */  lhu   $t6, 2($a1)
-/* AD4670 8005D4D0 31CFFFFE */  andi  $t7, $t6, 0xfffe
-/* AD4674 8005D4D4 03E00008 */  jr    $ra
-/* AD4678 8005D4D8 A4AF0002 */   sh    $t7, 2($a1)
-
diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c
index 062a739757..0ed1dc6f90 100644
--- a/src/code/z_collision_check.c
+++ b/src/code/z_collision_check.c
@@ -968,7 +968,15 @@ void func_8005D40C(GlobalContext* globalCtx, CollisionCheckContext* check) {
     }
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005D4B4.s")
+//unconfirmed args
+void func_8005D4B4(GlobalContext* globalCtx, CollisionCheckContext* check) {
+    check->unk2 |= 1;
+}
+
+//unconfirmed args
+void func_8005D4C8(GlobalContext* globalCtx, CollisionCheckContext* check) {
+    check->unk2 &= ~1;
+}
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005D4DC.s")