From 3cb5feb7eefb737ec5c49b5777da0158e82b85f8 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sat, 2 Jan 2021 17:24:18 +0900
Subject: [PATCH] 1

---
 .../area_kmr/kmr_20/8ECBF0/func_80240DF8_8ECC18.s  | 14 --------------
 src/world/area_kmr/kmr_20/8ECBF0.c                 |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ECBF0/func_80240DF8_8ECC18.s

diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ECBF0/func_80240DF8_8ECC18.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ECBF0/func_80240DF8_8ECC18.s
deleted file mode 100644
index 9520caa0f0..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8ECBF0/func_80240DF8_8ECC18.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240DF8_8ECC18
-/* 8ECC18 80240DF8 3C03800B */  lui       $v1, %hi(gCameras)
-/* 8ECC1C 80240DFC 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* 8ECC20 80240E00 94620002 */  lhu       $v0, 2($v1)
-/* 8ECC24 80240E04 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* 8ECC28 80240E08 A4620002 */  sh        $v0, 2($v1)
-/* 8ECC2C 80240E0C 03E00008 */  jr        $ra
-/* 8ECC30 80240E10 24020002 */   addiu    $v0, $zero, 2
-/* 8ECC34 80240E14 00000000 */  nop       
-/* 8ECC38 80240E18 00000000 */  nop       
-/* 8ECC3C 80240E1C 00000000 */  nop       
diff --git a/src/world/area_kmr/kmr_20/8ECBF0.c b/src/world/area_kmr/kmr_20/8ECBF0.c
index cd21d82984..0badecb53e 100644
--- a/src/world/area_kmr/kmr_20/8ECBF0.c
+++ b/src/world/area_kmr/kmr_20/8ECBF0.c
@@ -2,4 +2,4 @@
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ECBF0", func_80240DD0_8ECBF0);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ECBF0", func_80240DF8_8ECC18);
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"