diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_8024033C_8C82CC.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_8024033C_8C82CC.s
deleted file mode 100644
index 591712fcff..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_8024033C_8C82CC.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024033C_8C82CC
-/* 8C82CC 8024033C 3C03800B */  lui       $v1, %hi(gCameras)
-/* 8C82D0 80240340 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* 8C82D4 80240344 94620002 */  lhu       $v0, 2($v1)
-/* 8C82D8 80240348 34420001 */  ori       $v0, $v0, 1
-/* 8C82DC 8024034C A4620002 */  sh        $v0, 2($v1)
-/* 8C82E0 80240350 03E00008 */  jr        $ra
-/* 8C82E4 80240354 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D1C_C63A2C.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D1C_C63A2C.s
deleted file mode 100644
index 02d3b3b4da..0000000000
--- a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D1C_C63A2C.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242D1C_C63A2C
-/* C63A2C 80242D1C 3C03800B */  lui       $v1, %hi(gCameras)
-/* C63A30 80242D20 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* C63A34 80242D24 94620002 */  lhu       $v0, 2($v1)
-/* C63A38 80242D28 34420001 */  ori       $v0, $v0, 1
-/* C63A3C 80242D2C A4620002 */  sh        $v0, 2($v1)
-/* C63A40 80242D30 03E00008 */  jr        $ra
-/* C63A44 80242D34 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_8024001C_BBD1BC.s b/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_8024001C_BBD1BC.s
deleted file mode 100644
index a172df636a..0000000000
--- a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_8024001C_BBD1BC.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024001C_BBD1BC
-/* BBD1BC 8024001C 3C03800B */  lui       $v1, %hi(gCameras)
-/* BBD1C0 80240020 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* BBD1C4 80240024 94620002 */  lhu       $v0, 2($v1)
-/* BBD1C8 80240028 34420001 */  ori       $v0, $v0, 1
-/* BBD1CC 8024002C A4620002 */  sh        $v0, 2($v1)
-/* BBD1D0 80240030 03E00008 */  jr        $ra
-/* BBD1D4 80240034 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_8024001C_BCD07C.s b/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_8024001C_BCD07C.s
deleted file mode 100644
index 49fe2f9e41..0000000000
--- a/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_8024001C_BCD07C.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024001C_BCD07C
-/* BCD07C 8024001C 3C03800B */  lui       $v1, %hi(gCameras)
-/* BCD080 80240020 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* BCD084 80240024 94620002 */  lhu       $v0, 2($v1)
-/* BCD088 80240028 34420001 */  ori       $v0, $v0, 1
-/* BCD08C 8024002C A4620002 */  sh        $v0, 2($v1)
-/* BCD090 80240030 03E00008 */  jr        $ra
-/* BCD094 80240034 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_8024001C_D9D4EC.s b/asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_8024001C_D9D4EC.s
deleted file mode 100644
index 0b30e39460..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_8024001C_D9D4EC.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024001C_D9D4EC
-/* D9D4EC 8024001C 3C03800B */  lui       $v1, %hi(gCameras)
-/* D9D4F0 80240020 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* D9D4F4 80240024 94620002 */  lhu       $v0, 2($v1)
-/* D9D4F8 80240028 34420001 */  ori       $v0, $v0, 1
-/* D9D4FC 8024002C A4620002 */  sh        $v0, 2($v1)
-/* D9D500 80240030 03E00008 */  jr        $ra
-/* D9D504 80240034 24020002 */   addiu    $v0, $zero, 2
-/* D9D508 80240038 00000000 */  nop       
-/* D9D50C 8024003C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402D8_DAD6D8.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402D8_DAD6D8.s
deleted file mode 100644
index 097155a3cd..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402D8_DAD6D8.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402D8_DAD6D8
-/* DAD6D8 802402D8 3C03800B */  lui       $v1, %hi(gCameras)
-/* DAD6DC 802402DC 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* DAD6E0 802402E0 94620002 */  lhu       $v0, 2($v1)
-/* DAD6E4 802402E4 34420001 */  ori       $v0, $v0, 1
-/* DAD6E8 802402E8 A4620002 */  sh        $v0, 2($v1)
-/* DAD6EC 802402EC 03E00008 */  jr        $ra
-/* DAD6F0 802402F0 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431F8_DC04A8.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431F8_DC04A8.s
deleted file mode 100644
index fabc1ad94e..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431F8_DC04A8.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802431F8_DC04A8
-/* DC04A8 802431F8 3C03800B */  lui       $v1, %hi(gCameras)
-/* DC04AC 802431FC 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* DC04B0 80243200 94620002 */  lhu       $v0, 2($v1)
-/* DC04B4 80243204 34420001 */  ori       $v0, $v0, 1
-/* DC04B8 80243208 A4620002 */  sh        $v0, 2($v1)
-/* DC04BC 8024320C 03E00008 */  jr        $ra
-/* DC04C0 80243210 24020002 */   addiu    $v0, $zero, 2
-/* DC04C4 80243214 00000000 */  nop       
-/* DC04C8 80243218 00000000 */  nop       
-/* DC04CC 8024321C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240580_D3AB50.s b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240580_D3AB50.s
deleted file mode 100644
index 96c12a0374..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240580_D3AB50.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240580_D3AB50
-/* D3AB50 80240580 3C03800B */  lui       $v1, %hi(gCameras)
-/* D3AB54 80240584 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* D3AB58 80240588 94620002 */  lhu       $v0, 2($v1)
-/* D3AB5C 8024058C 34420001 */  ori       $v0, $v0, 1
-/* D3AB60 80240590 A4620002 */  sh        $v0, 2($v1)
-/* D3AB64 80240594 03E00008 */  jr        $ra
-/* D3AB68 80240598 24020002 */   addiu    $v0, $zero, 2
diff --git a/src/world/area_flo/flo_21/CE7240.c b/src/world/area_flo/flo_21/CE7240.c
index 5ad3269b51..404d858ed5 100644
--- a/src/world/area_flo/flo_21/CE7240.c
+++ b/src/world/area_flo/flo_21/CE7240.c
@@ -2,4 +2,4 @@
 
 INCLUDE_ASM(s32, "world/area_flo/flo_21/CE7240", func_80240B40_CE7240);
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
diff --git a/src/world/area_hos/hos_01/A11650.c b/src/world/area_hos/hos_01/A11650.c
index 3c4ac75a90..eca5180865 100644
--- a/src/world/area_hos/hos_01/A11650.c
+++ b/src/world/area_hos/hos_01/A11650.c
@@ -1,5 +1,5 @@
 #include "hos_01.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_01/A11650", func_80240DEC_A1166C);
diff --git a/src/world/area_kmr/kmr_03/8C82B0.c b/src/world/area_kmr/kmr_03/8C82B0.c
index f20c700cd1..37ca47412b 100644
--- a/src/world/area_kmr/kmr_03/8C82B0.c
+++ b/src/world/area_kmr/kmr_03/8C82B0.c
@@ -1,8 +1,8 @@
 #include "kmr_03.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C82B0", func_8024033C_8C82CC);
+#include "world/common/SetCamera0MoveFlag1.inc.c"
 
 ApiStatus func_80240358_8C82E8(ScriptInstance* script, s32 isInitialCall) {
     PlayerStatus* playerStatus = PLAYER_STATUS;
diff --git a/src/world/area_kpa/kpa_08/A4CA20.c b/src/world/area_kpa/kpa_08/A4CA20.c
index fcf9e782ba..1ad1f9cf82 100644
--- a/src/world/area_kpa/kpa_08/A4CA20.c
+++ b/src/world/area_kpa/kpa_08/A4CA20.c
@@ -1,5 +1,5 @@
 #include "kpa_08.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CA20", func_8024001C_A4CA3C);
diff --git a/src/world/area_kpa/kpa_09/A4F000.c b/src/world/area_kpa/kpa_09/A4F000.c
index 1288757674..fb3c753774 100644
--- a/src/world/area_kpa/kpa_09/A4F000.c
+++ b/src/world/area_kpa/kpa_09/A4F000.c
@@ -1,5 +1,5 @@
 #include "kpa_09.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F000", func_8024001C_A4F01C);
diff --git a/src/world/area_kzn/kzn_03/C63A10.c b/src/world/area_kzn/kzn_03/C63A10.c
index 0b94192ece..09e3cb7a5c 100644
--- a/src/world/area_kzn/kzn_03/C63A10.c
+++ b/src/world/area_kzn/kzn_03/C63A10.c
@@ -1,8 +1,8 @@
 #include "kzn_03.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242D1C_C63A2C);
+#include "world/common/SetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242D38_C63A48);
 
diff --git a/src/world/area_kzn/kzn_23/C9C610.c b/src/world/area_kzn/kzn_23/C9C610.c
index ab601cd877..33260463f5 100644
--- a/src/world/area_kzn/kzn_23/C9C610.c
+++ b/src/world/area_kzn/kzn_23/C9C610.c
@@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240310_C9C610);
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240478_C9C778);
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240520_C9C820);
diff --git a/src/world/area_obk/obk_01/BBD1A0.c b/src/world/area_obk/obk_01/BBD1A0.c
index 52d905b650..0a42262049 100644
--- a/src/world/area_obk/obk_01/BBD1A0.c
+++ b/src/world/area_obk/obk_01/BBD1A0.c
@@ -1,8 +1,8 @@
 #include "obk_01.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
-INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_8024001C_BBD1BC);
+#include "world/common/SetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_80240038_BBD1D8);
 
diff --git a/src/world/area_obk/obk_05/BCD060.c b/src/world/area_obk/obk_05/BCD060.c
index 72a1fba13b..591aaeda32 100644
--- a/src/world/area_obk/obk_05/BCD060.c
+++ b/src/world/area_obk/obk_05/BCD060.c
@@ -1,8 +1,8 @@
 #include "obk_05.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
-INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD060", func_8024001C_BCD07C);
+#include "world/common/SetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD060", func_80240038_BCD098);
 
diff --git a/src/world/area_omo/omo_02/D9D4D0.c b/src/world/area_omo/omo_02/D9D4D0.c
index 197dc117a8..def33b6ba7 100644
--- a/src/world/area_omo/omo_02/D9D4D0.c
+++ b/src/world/area_omo/omo_02/D9D4D0.c
@@ -1,5 +1,5 @@
 #include "omo_02.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D4D0", func_8024001C_D9D4EC);
+#include "world/common/SetCamera0MoveFlag1.inc.c"
diff --git a/src/world/area_omo/omo_03/DA5240.c b/src/world/area_omo/omo_03/DA5240.c
index d99f607597..37ce7fa294 100644
--- a/src/world/area_omo/omo_03/DA5240.c
+++ b/src/world/area_omo/omo_03/DA5240.c
@@ -1,3 +1,3 @@
 #include "omo_03.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
diff --git a/src/world/area_omo/omo_03/DA5260.c b/src/world/area_omo/omo_03/DA5260.c
index e8c05a16e4..d0dd112fba 100644
--- a/src/world/area_omo/omo_03/DA5260.c
+++ b/src/world/area_omo/omo_03/DA5260.c
@@ -1,6 +1,6 @@
 #include "omo_03.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_8024003C_DA527C);
 
diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c
index 321a498bc0..07f629662a 100644
--- a/src/world/area_omo/omo_04/DAD400.c
+++ b/src/world/area_omo/omo_04/DAD400.c
@@ -8,9 +8,9 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240000_DAD400);
 
 INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240268_DAD668);
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802402D8_DAD6D8);
+#include "world/common/SetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802402F4_DAD6F4);
 
diff --git a/src/world/area_omo/omo_06/DB7910.c b/src/world/area_omo/omo_06/DB7910.c
index add620ef94..7450d9241d 100644
--- a/src/world/area_omo/omo_06/DB7910.c
+++ b/src/world/area_omo/omo_06/DB7910.c
@@ -1,6 +1,6 @@
 #include "omo_06.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_8024001C_DB792C);
 
diff --git a/src/world/area_omo/omo_07/DC01D0.c b/src/world/area_omo/omo_07/DC01D0.c
index a80b126f1a..81540d7fc0 100644
--- a/src/world/area_omo/omo_07/DC01D0.c
+++ b/src/world/area_omo/omo_07/DC01D0.c
@@ -8,6 +8,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80242F20_DC01D0);
 
 INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80243188_DC0438);
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_802431F8_DC04A8);
+#include "world/common/SetCamera0MoveFlag1.inc.c"
diff --git a/src/world/area_omo/omo_08/DC43D0.c b/src/world/area_omo/omo_08/DC43D0.c
index 2c60cef685..e0a48b9c0f 100644
--- a/src/world/area_omo/omo_08/DC43D0.c
+++ b/src/world/area_omo/omo_08/DC43D0.c
@@ -1,6 +1,6 @@
 #include "omo_08.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_8024001C_DC43EC);
 
diff --git a/src/world/area_omo/omo_10/DD79B0.c b/src/world/area_omo/omo_10/DD79B0.c
index 2ebfd8a10d..1e90c216c8 100644
--- a/src/world/area_omo/omo_10/DD79B0.c
+++ b/src/world/area_omo/omo_10/DD79B0.c
@@ -1,6 +1,6 @@
 #include "omo_10.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_8024001C_DD79CC);
 
diff --git a/src/world/area_omo/omo_16/DEBED0.c b/src/world/area_omo/omo_16/DEBED0.c
index f154aae5c8..fbf0379bef 100644
--- a/src/world/area_omo/omo_16/DEBED0.c
+++ b/src/world/area_omo/omo_16/DEBED0.c
@@ -1,6 +1,6 @@
 #include "omo_16.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_8024001C_DEBEEC);
 
diff --git a/src/world/area_omo/omo_17/DEEEA0.c b/src/world/area_omo/omo_17/DEEEA0.c
index a9cd5069d4..029d1fc88f 100644
--- a/src/world/area_omo/omo_17/DEEEA0.c
+++ b/src/world/area_omo/omo_17/DEEEA0.c
@@ -1,6 +1,6 @@
 #include "omo_17.h"
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_17/DEEEA0", func_8024001C_DEEEBC);
 
diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c
index 7b334b26a9..4a0ca9b280 100644
--- a/src/world/area_sam/sam_07/D2BD30.c
+++ b/src/world/area_sam/sam_07/D2BD30.c
@@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240448_D2C178);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802405B0_D2C2E0);
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240650_D2C380);
 
diff --git a/src/world/area_sam/sam_11/D3A930.c b/src/world/area_sam/sam_11/D3A930.c
index ed38a0c603..a37071aeaf 100644
--- a/src/world/area_sam/sam_11/D3A930.c
+++ b/src/world/area_sam/sam_11/D3A930.c
@@ -15,9 +15,9 @@ static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240580_D3AB50);
+#include "world/common/SetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_8024059C_D3AB6C);
 
diff --git a/src/world/common/SetCamera0MoveFlag1.inc.c b/src/world/common/SetCamera0MoveFlag1.inc.c
new file mode 100644
index 0000000000..2f4cb9fd5e
--- /dev/null
+++ b/src/world/common/SetCamera0MoveFlag1.inc.c
@@ -0,0 +1,8 @@
+#include "common.h"
+
+static ApiStatus SetCamera0MoveFlag1(ScriptInstance* script, s32 isInitialCall) {
+    Camera* camera = &gCameras[0];
+
+    camera->moveFlags |= 1;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/SetCamera0MoveFlagNeg1.inc.c b/src/world/common/UnsetCamera0MoveFlag1.inc.c
similarity index 57%
rename from src/world/common/SetCamera0MoveFlagNeg1.inc.c
rename to src/world/common/UnsetCamera0MoveFlag1.inc.c
index f8e815371a..e5ae2007c7 100644
--- a/src/world/common/SetCamera0MoveFlagNeg1.inc.c
+++ b/src/world/common/UnsetCamera0MoveFlag1.inc.c
@@ -1,6 +1,6 @@
 #include "common.h"
 
-static ApiStatus SetCamera0MoveFlagNeg1(ScriptInstance* script, s32 isInitialCall) {
+static ApiStatus UnsetCamera0MoveFlag1(ScriptInstance* script, s32 isInitialCall) {
     Camera* camera = &gCameras[0];
 
     camera->moveFlags &= ~1;