From 8ee2bf4522ae51b870845320232befa7929584af Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Fri, 30 Oct 2020 16:23:23 -0400
Subject: [PATCH] UnkMoveNpc

---
 .../dro_01/95B7E0/func_80242380_95D580.s      | 63 -----------------
 .../dro_02/9694C0/func_80241210_96A3D0.s      | 63 -----------------
 .../hos_03/A1BDB0/func_802433B4_A1E4B4.s      | 63 -----------------
 .../jan_02/B2C8A0/func_80242524_B2E994.s      | 63 -----------------
 .../jan_03/B34BD0/func_80242AAC_B3767C.s      | 63 -----------------
 .../kmr_02/8B0070/func_802412A0_8B1310.s      | 63 -----------------
 .../mac_00/7EB340/func_80241540_7EC250.s      | 63 -----------------
 .../mac_00/7EB340/func_80242078_7ECD88.s      | 70 -------------------
 .../mac_01/8017D0/func_80242E20_8036A0.s      | 63 -----------------
 .../mac_02/823BF0/func_802426D0_825990.s      | 63 -----------------
 .../mac_03/831B20/func_802413C0_832BC0.s      | 63 -----------------
 .../mac_04/843030/func_80241370_843F40.s      | 63 -----------------
 .../mac_05/852170/func_80242230_8543A0.s      | 63 -----------------
 .../nok_01/9C53E0/func_80241C78_9C7058.s      | 63 -----------------
 .../nok_02/9D7AA0/func_80242820_9D9840.s      | 63 -----------------
 .../sam_01/CF7E80/func_80241610_CF9180.s      | 63 -----------------
 .../sam_02/D05F60/func_80241A3C_D0716C.s      | 63 -----------------
 .../sam_11/D3ADA0/func_802416E0_D3BCB0.s      | 63 -----------------
 src/world/area_dro/dro_01/95B7E0.c            |  2 +-
 src/world/area_dro/dro_02/9694C0.c            |  2 +-
 src/world/area_hos/hos_03/A1BDB0.c            |  2 +-
 src/world/area_jan/jan_02/B2C8A0.c            |  2 +-
 src/world/area_jan/jan_03/B34BD0.c            |  2 +-
 src/world/area_kmr/kmr_02/8B0070.c            |  2 +-
 src/world/area_mac/mac_00/7EB340.c            | 24 ++++++-
 src/world/area_mac/mac_01/8017D0.c            |  2 +-
 src/world/area_mac/mac_02/823BF0.c            |  2 +-
 src/world/area_mac/mac_03/831B20.c            |  2 +-
 src/world/area_mac/mac_04/843030.c            |  2 +-
 src/world/area_mac/mac_05/852170.c            |  2 +-
 src/world/area_nok/nok_01/9C53E0.c            |  2 +-
 src/world/area_nok/nok_02/9D7AA0.c            |  2 +-
 src/world/area_sam/sam_01/CF7E80.c            |  2 +-
 src/world/area_sam/sam_02/D05F60.c            |  2 +-
 src/world/area_sam/sam_11/D3ADA0.c            |  2 +-
 src/world/common/UnkMoveNpc.inc.c             | 19 +++++
 tools/m2ctx.py                                |  4 +-
 37 files changed, 58 insertions(+), 1162 deletions(-)
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242380_95D580.s
 delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241210_96A3D0.s
 delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802433B4_A1E4B4.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242524_B2E994.s
 delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242AAC_B3767C.s
 delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802412A0_8B1310.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241540_7EC250.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242078_7ECD88.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242E20_8036A0.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802426D0_825990.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_802413C0_832BC0.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_80241370_843F40.s
 delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80242230_8543A0.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241C78_9C7058.s
 delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242820_9D9840.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241610_CF9180.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241A3C_D0716C.s
 delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802416E0_D3BCB0.s
 create mode 100644 src/world/common/UnkMoveNpc.inc.c

diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242380_95D580.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242380_95D580.s
deleted file mode 100644
index 89d307f487..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242380_95D580.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242380_95D580
-/* 95D580 80242380 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 95D584 80242384 AFB10014 */  sw        $s1, 0x14($sp)
-/* 95D588 80242388 0080882D */  daddu     $s1, $a0, $zero
-/* 95D58C 8024238C AFB00010 */  sw        $s0, 0x10($sp)
-/* 95D590 80242390 00A0802D */  daddu     $s0, $a1, $zero
-/* 95D594 80242394 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 95D598 80242398 AFB20018 */  sw        $s2, 0x18($sp)
-/* 95D59C 8024239C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 95D5A0 802423A0 0C00EABB */  jal       get_npc_unsafe
-/* 95D5A4 802423A4 2404FFFC */   addiu    $a0, $zero, -4
-/* 95D5A8 802423A8 12000017 */  beqz      $s0, .L80242408
-/* 95D5AC 802423AC 0040902D */   daddu    $s2, $v0, $zero
-/* 95D5B0 802423B0 0220202D */  daddu     $a0, $s1, $zero
-/* 95D5B4 802423B4 3C05FE36 */  lui       $a1, 0xfe36
-/* 95D5B8 802423B8 0C0B210B */  jal       get_float_variable
-/* 95D5BC 802423BC 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 95D5C0 802423C0 0220202D */  daddu     $a0, $s1, $zero
-/* 95D5C4 802423C4 3C05FE36 */  lui       $a1, 0xfe36
-/* 95D5C8 802423C8 3C014270 */  lui       $at, 0x4270
-/* 95D5CC 802423CC 4481A000 */  mtc1      $at, $f20
-/* 95D5D0 802423D0 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 95D5D4 802423D4 46140003 */  div.s     $f0, $f0, $f20
-/* 95D5D8 802423D8 0C0B210B */  jal       get_float_variable
-/* 95D5DC 802423DC E6200074 */   swc1     $f0, 0x74($s1)
-/* 95D5E0 802423E0 0220202D */  daddu     $a0, $s1, $zero
-/* 95D5E4 802423E4 3C05FE36 */  lui       $a1, 0xfe36
-/* 95D5E8 802423E8 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 95D5EC 802423EC 46140003 */  div.s     $f0, $f0, $f20
-/* 95D5F0 802423F0 0C0B210B */  jal       get_float_variable
-/* 95D5F4 802423F4 E6200078 */   swc1     $f0, 0x78($s1)
-/* 95D5F8 802423F8 46140003 */  div.s     $f0, $f0, $f20
-/* 95D5FC 802423FC 2402003C */  addiu     $v0, $zero, 0x3c
-/* 95D600 80242400 E620007C */  swc1      $f0, 0x7c($s1)
-/* 95D604 80242404 AE220070 */  sw        $v0, 0x70($s1)
-.L80242408:
-/* 95D608 80242408 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 95D60C 8024240C C6220074 */  lwc1      $f2, 0x74($s1)
-/* 95D610 80242410 46020000 */  add.s     $f0, $f0, $f2
-/* 95D614 80242414 E6400038 */  swc1      $f0, 0x38($s2)
-/* 95D618 80242418 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 95D61C 8024241C C6220078 */  lwc1      $f2, 0x78($s1)
-/* 95D620 80242420 46020000 */  add.s     $f0, $f0, $f2
-/* 95D624 80242424 E640003C */  swc1      $f0, 0x3c($s2)
-/* 95D628 80242428 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 95D62C 8024242C C622007C */  lwc1      $f2, 0x7c($s1)
-/* 95D630 80242430 46020000 */  add.s     $f0, $f0, $f2
-/* 95D634 80242434 E6400040 */  swc1      $f0, 0x40($s2)
-/* 95D638 80242438 8E230070 */  lw        $v1, 0x70($s1)
-/* 95D63C 8024243C 2463FFFF */  addiu     $v1, $v1, -1
-/* 95D640 80242440 2C620001 */  sltiu     $v0, $v1, 1
-/* 95D644 80242444 AE230070 */  sw        $v1, 0x70($s1)
-/* 95D648 80242448 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 95D64C 8024244C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 95D650 80242450 8FB10014 */  lw        $s1, 0x14($sp)
-/* 95D654 80242454 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95D658 80242458 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 95D65C 8024245C 00021040 */  sll       $v0, $v0, 1
-/* 95D660 80242460 03E00008 */  jr        $ra
-/* 95D664 80242464 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241210_96A3D0.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241210_96A3D0.s
deleted file mode 100644
index 1311c901c0..0000000000
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241210_96A3D0.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241210_96A3D0
-/* 96A3D0 80241210 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 96A3D4 80241214 AFB10014 */  sw        $s1, 0x14($sp)
-/* 96A3D8 80241218 0080882D */  daddu     $s1, $a0, $zero
-/* 96A3DC 8024121C AFB00010 */  sw        $s0, 0x10($sp)
-/* 96A3E0 80241220 00A0802D */  daddu     $s0, $a1, $zero
-/* 96A3E4 80241224 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 96A3E8 80241228 AFB20018 */  sw        $s2, 0x18($sp)
-/* 96A3EC 8024122C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 96A3F0 80241230 0C00EABB */  jal       get_npc_unsafe
-/* 96A3F4 80241234 2404FFFC */   addiu    $a0, $zero, -4
-/* 96A3F8 80241238 12000017 */  beqz      $s0, .L80241298
-/* 96A3FC 8024123C 0040902D */   daddu    $s2, $v0, $zero
-/* 96A400 80241240 0220202D */  daddu     $a0, $s1, $zero
-/* 96A404 80241244 3C05FE36 */  lui       $a1, 0xfe36
-/* 96A408 80241248 0C0B210B */  jal       get_float_variable
-/* 96A40C 8024124C 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 96A410 80241250 0220202D */  daddu     $a0, $s1, $zero
-/* 96A414 80241254 3C05FE36 */  lui       $a1, 0xfe36
-/* 96A418 80241258 3C014270 */  lui       $at, 0x4270
-/* 96A41C 8024125C 4481A000 */  mtc1      $at, $f20
-/* 96A420 80241260 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 96A424 80241264 46140003 */  div.s     $f0, $f0, $f20
-/* 96A428 80241268 0C0B210B */  jal       get_float_variable
-/* 96A42C 8024126C E6200074 */   swc1     $f0, 0x74($s1)
-/* 96A430 80241270 0220202D */  daddu     $a0, $s1, $zero
-/* 96A434 80241274 3C05FE36 */  lui       $a1, 0xfe36
-/* 96A438 80241278 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 96A43C 8024127C 46140003 */  div.s     $f0, $f0, $f20
-/* 96A440 80241280 0C0B210B */  jal       get_float_variable
-/* 96A444 80241284 E6200078 */   swc1     $f0, 0x78($s1)
-/* 96A448 80241288 46140003 */  div.s     $f0, $f0, $f20
-/* 96A44C 8024128C 2402003C */  addiu     $v0, $zero, 0x3c
-/* 96A450 80241290 E620007C */  swc1      $f0, 0x7c($s1)
-/* 96A454 80241294 AE220070 */  sw        $v0, 0x70($s1)
-.L80241298:
-/* 96A458 80241298 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 96A45C 8024129C C6220074 */  lwc1      $f2, 0x74($s1)
-/* 96A460 802412A0 46020000 */  add.s     $f0, $f0, $f2
-/* 96A464 802412A4 E6400038 */  swc1      $f0, 0x38($s2)
-/* 96A468 802412A8 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 96A46C 802412AC C6220078 */  lwc1      $f2, 0x78($s1)
-/* 96A470 802412B0 46020000 */  add.s     $f0, $f0, $f2
-/* 96A474 802412B4 E640003C */  swc1      $f0, 0x3c($s2)
-/* 96A478 802412B8 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 96A47C 802412BC C622007C */  lwc1      $f2, 0x7c($s1)
-/* 96A480 802412C0 46020000 */  add.s     $f0, $f0, $f2
-/* 96A484 802412C4 E6400040 */  swc1      $f0, 0x40($s2)
-/* 96A488 802412C8 8E230070 */  lw        $v1, 0x70($s1)
-/* 96A48C 802412CC 2463FFFF */  addiu     $v1, $v1, -1
-/* 96A490 802412D0 2C620001 */  sltiu     $v0, $v1, 1
-/* 96A494 802412D4 AE230070 */  sw        $v1, 0x70($s1)
-/* 96A498 802412D8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 96A49C 802412DC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 96A4A0 802412E0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 96A4A4 802412E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 96A4A8 802412E8 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 96A4AC 802412EC 00021040 */  sll       $v0, $v0, 1
-/* 96A4B0 802412F0 03E00008 */  jr        $ra
-/* 96A4B4 802412F4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802433B4_A1E4B4.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802433B4_A1E4B4.s
deleted file mode 100644
index bad058ad7d..0000000000
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802433B4_A1E4B4.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802433B4_A1E4B4
-/* A1E4B4 802433B4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* A1E4B8 802433B8 AFB10014 */  sw        $s1, 0x14($sp)
-/* A1E4BC 802433BC 0080882D */  daddu     $s1, $a0, $zero
-/* A1E4C0 802433C0 AFB00010 */  sw        $s0, 0x10($sp)
-/* A1E4C4 802433C4 00A0802D */  daddu     $s0, $a1, $zero
-/* A1E4C8 802433C8 AFBF001C */  sw        $ra, 0x1c($sp)
-/* A1E4CC 802433CC AFB20018 */  sw        $s2, 0x18($sp)
-/* A1E4D0 802433D0 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* A1E4D4 802433D4 0C00EABB */  jal       get_npc_unsafe
-/* A1E4D8 802433D8 2404FFFC */   addiu    $a0, $zero, -4
-/* A1E4DC 802433DC 12000017 */  beqz      $s0, .L8024343C
-/* A1E4E0 802433E0 0040902D */   daddu    $s2, $v0, $zero
-/* A1E4E4 802433E4 0220202D */  daddu     $a0, $s1, $zero
-/* A1E4E8 802433E8 3C05FE36 */  lui       $a1, 0xfe36
-/* A1E4EC 802433EC 0C0B210B */  jal       get_float_variable
-/* A1E4F0 802433F0 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* A1E4F4 802433F4 0220202D */  daddu     $a0, $s1, $zero
-/* A1E4F8 802433F8 3C05FE36 */  lui       $a1, 0xfe36
-/* A1E4FC 802433FC 3C014270 */  lui       $at, 0x4270
-/* A1E500 80243400 4481A000 */  mtc1      $at, $f20
-/* A1E504 80243404 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* A1E508 80243408 46140003 */  div.s     $f0, $f0, $f20
-/* A1E50C 8024340C 0C0B210B */  jal       get_float_variable
-/* A1E510 80243410 E6200074 */   swc1     $f0, 0x74($s1)
-/* A1E514 80243414 0220202D */  daddu     $a0, $s1, $zero
-/* A1E518 80243418 3C05FE36 */  lui       $a1, 0xfe36
-/* A1E51C 8024341C 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* A1E520 80243420 46140003 */  div.s     $f0, $f0, $f20
-/* A1E524 80243424 0C0B210B */  jal       get_float_variable
-/* A1E528 80243428 E6200078 */   swc1     $f0, 0x78($s1)
-/* A1E52C 8024342C 46140003 */  div.s     $f0, $f0, $f20
-/* A1E530 80243430 2402003C */  addiu     $v0, $zero, 0x3c
-/* A1E534 80243434 E620007C */  swc1      $f0, 0x7c($s1)
-/* A1E538 80243438 AE220070 */  sw        $v0, 0x70($s1)
-.L8024343C:
-/* A1E53C 8024343C C6400038 */  lwc1      $f0, 0x38($s2)
-/* A1E540 80243440 C6220074 */  lwc1      $f2, 0x74($s1)
-/* A1E544 80243444 46020000 */  add.s     $f0, $f0, $f2
-/* A1E548 80243448 E6400038 */  swc1      $f0, 0x38($s2)
-/* A1E54C 8024344C C640003C */  lwc1      $f0, 0x3c($s2)
-/* A1E550 80243450 C6220078 */  lwc1      $f2, 0x78($s1)
-/* A1E554 80243454 46020000 */  add.s     $f0, $f0, $f2
-/* A1E558 80243458 E640003C */  swc1      $f0, 0x3c($s2)
-/* A1E55C 8024345C C6400040 */  lwc1      $f0, 0x40($s2)
-/* A1E560 80243460 C622007C */  lwc1      $f2, 0x7c($s1)
-/* A1E564 80243464 46020000 */  add.s     $f0, $f0, $f2
-/* A1E568 80243468 E6400040 */  swc1      $f0, 0x40($s2)
-/* A1E56C 8024346C 8E230070 */  lw        $v1, 0x70($s1)
-/* A1E570 80243470 2463FFFF */  addiu     $v1, $v1, -1
-/* A1E574 80243474 2C620001 */  sltiu     $v0, $v1, 1
-/* A1E578 80243478 AE230070 */  sw        $v1, 0x70($s1)
-/* A1E57C 8024347C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* A1E580 80243480 8FB20018 */  lw        $s2, 0x18($sp)
-/* A1E584 80243484 8FB10014 */  lw        $s1, 0x14($sp)
-/* A1E588 80243488 8FB00010 */  lw        $s0, 0x10($sp)
-/* A1E58C 8024348C D7B40020 */  ldc1      $f20, 0x20($sp)
-/* A1E590 80243490 00021040 */  sll       $v0, $v0, 1
-/* A1E594 80243494 03E00008 */  jr        $ra
-/* A1E598 80243498 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242524_B2E994.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242524_B2E994.s
deleted file mode 100644
index 2da5e2cd12..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242524_B2E994.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242524_B2E994
-/* B2E994 80242524 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* B2E998 80242528 AFB10014 */  sw        $s1, 0x14($sp)
-/* B2E99C 8024252C 0080882D */  daddu     $s1, $a0, $zero
-/* B2E9A0 80242530 AFB00010 */  sw        $s0, 0x10($sp)
-/* B2E9A4 80242534 00A0802D */  daddu     $s0, $a1, $zero
-/* B2E9A8 80242538 AFBF001C */  sw        $ra, 0x1c($sp)
-/* B2E9AC 8024253C AFB20018 */  sw        $s2, 0x18($sp)
-/* B2E9B0 80242540 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* B2E9B4 80242544 0C00EABB */  jal       get_npc_unsafe
-/* B2E9B8 80242548 2404FFFC */   addiu    $a0, $zero, -4
-/* B2E9BC 8024254C 12000017 */  beqz      $s0, .L802425AC
-/* B2E9C0 80242550 0040902D */   daddu    $s2, $v0, $zero
-/* B2E9C4 80242554 0220202D */  daddu     $a0, $s1, $zero
-/* B2E9C8 80242558 3C05FE36 */  lui       $a1, 0xfe36
-/* B2E9CC 8024255C 0C0B210B */  jal       get_float_variable
-/* B2E9D0 80242560 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* B2E9D4 80242564 0220202D */  daddu     $a0, $s1, $zero
-/* B2E9D8 80242568 3C05FE36 */  lui       $a1, 0xfe36
-/* B2E9DC 8024256C 3C014270 */  lui       $at, 0x4270
-/* B2E9E0 80242570 4481A000 */  mtc1      $at, $f20
-/* B2E9E4 80242574 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* B2E9E8 80242578 46140003 */  div.s     $f0, $f0, $f20
-/* B2E9EC 8024257C 0C0B210B */  jal       get_float_variable
-/* B2E9F0 80242580 E6200074 */   swc1     $f0, 0x74($s1)
-/* B2E9F4 80242584 0220202D */  daddu     $a0, $s1, $zero
-/* B2E9F8 80242588 3C05FE36 */  lui       $a1, 0xfe36
-/* B2E9FC 8024258C 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* B2EA00 80242590 46140003 */  div.s     $f0, $f0, $f20
-/* B2EA04 80242594 0C0B210B */  jal       get_float_variable
-/* B2EA08 80242598 E6200078 */   swc1     $f0, 0x78($s1)
-/* B2EA0C 8024259C 46140003 */  div.s     $f0, $f0, $f20
-/* B2EA10 802425A0 2402003C */  addiu     $v0, $zero, 0x3c
-/* B2EA14 802425A4 E620007C */  swc1      $f0, 0x7c($s1)
-/* B2EA18 802425A8 AE220070 */  sw        $v0, 0x70($s1)
-.L802425AC:
-/* B2EA1C 802425AC C6400038 */  lwc1      $f0, 0x38($s2)
-/* B2EA20 802425B0 C6220074 */  lwc1      $f2, 0x74($s1)
-/* B2EA24 802425B4 46020000 */  add.s     $f0, $f0, $f2
-/* B2EA28 802425B8 E6400038 */  swc1      $f0, 0x38($s2)
-/* B2EA2C 802425BC C640003C */  lwc1      $f0, 0x3c($s2)
-/* B2EA30 802425C0 C6220078 */  lwc1      $f2, 0x78($s1)
-/* B2EA34 802425C4 46020000 */  add.s     $f0, $f0, $f2
-/* B2EA38 802425C8 E640003C */  swc1      $f0, 0x3c($s2)
-/* B2EA3C 802425CC C6400040 */  lwc1      $f0, 0x40($s2)
-/* B2EA40 802425D0 C622007C */  lwc1      $f2, 0x7c($s1)
-/* B2EA44 802425D4 46020000 */  add.s     $f0, $f0, $f2
-/* B2EA48 802425D8 E6400040 */  swc1      $f0, 0x40($s2)
-/* B2EA4C 802425DC 8E230070 */  lw        $v1, 0x70($s1)
-/* B2EA50 802425E0 2463FFFF */  addiu     $v1, $v1, -1
-/* B2EA54 802425E4 2C620001 */  sltiu     $v0, $v1, 1
-/* B2EA58 802425E8 AE230070 */  sw        $v1, 0x70($s1)
-/* B2EA5C 802425EC 8FBF001C */  lw        $ra, 0x1c($sp)
-/* B2EA60 802425F0 8FB20018 */  lw        $s2, 0x18($sp)
-/* B2EA64 802425F4 8FB10014 */  lw        $s1, 0x14($sp)
-/* B2EA68 802425F8 8FB00010 */  lw        $s0, 0x10($sp)
-/* B2EA6C 802425FC D7B40020 */  ldc1      $f20, 0x20($sp)
-/* B2EA70 80242600 00021040 */  sll       $v0, $v0, 1
-/* B2EA74 80242604 03E00008 */  jr        $ra
-/* B2EA78 80242608 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242AAC_B3767C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242AAC_B3767C.s
deleted file mode 100644
index 2378ae9c8f..0000000000
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242AAC_B3767C.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242AAC_B3767C
-/* B3767C 80242AAC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* B37680 80242AB0 AFB10014 */  sw        $s1, 0x14($sp)
-/* B37684 80242AB4 0080882D */  daddu     $s1, $a0, $zero
-/* B37688 80242AB8 AFB00010 */  sw        $s0, 0x10($sp)
-/* B3768C 80242ABC 00A0802D */  daddu     $s0, $a1, $zero
-/* B37690 80242AC0 AFBF001C */  sw        $ra, 0x1c($sp)
-/* B37694 80242AC4 AFB20018 */  sw        $s2, 0x18($sp)
-/* B37698 80242AC8 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* B3769C 80242ACC 0C00EABB */  jal       get_npc_unsafe
-/* B376A0 80242AD0 2404FFFC */   addiu    $a0, $zero, -4
-/* B376A4 80242AD4 12000017 */  beqz      $s0, .L80242B34
-/* B376A8 80242AD8 0040902D */   daddu    $s2, $v0, $zero
-/* B376AC 80242ADC 0220202D */  daddu     $a0, $s1, $zero
-/* B376B0 80242AE0 3C05FE36 */  lui       $a1, 0xfe36
-/* B376B4 80242AE4 0C0B210B */  jal       get_float_variable
-/* B376B8 80242AE8 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* B376BC 80242AEC 0220202D */  daddu     $a0, $s1, $zero
-/* B376C0 80242AF0 3C05FE36 */  lui       $a1, 0xfe36
-/* B376C4 80242AF4 3C014270 */  lui       $at, 0x4270
-/* B376C8 80242AF8 4481A000 */  mtc1      $at, $f20
-/* B376CC 80242AFC 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* B376D0 80242B00 46140003 */  div.s     $f0, $f0, $f20
-/* B376D4 80242B04 0C0B210B */  jal       get_float_variable
-/* B376D8 80242B08 E6200074 */   swc1     $f0, 0x74($s1)
-/* B376DC 80242B0C 0220202D */  daddu     $a0, $s1, $zero
-/* B376E0 80242B10 3C05FE36 */  lui       $a1, 0xfe36
-/* B376E4 80242B14 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* B376E8 80242B18 46140003 */  div.s     $f0, $f0, $f20
-/* B376EC 80242B1C 0C0B210B */  jal       get_float_variable
-/* B376F0 80242B20 E6200078 */   swc1     $f0, 0x78($s1)
-/* B376F4 80242B24 46140003 */  div.s     $f0, $f0, $f20
-/* B376F8 80242B28 2402003C */  addiu     $v0, $zero, 0x3c
-/* B376FC 80242B2C E620007C */  swc1      $f0, 0x7c($s1)
-/* B37700 80242B30 AE220070 */  sw        $v0, 0x70($s1)
-.L80242B34:
-/* B37704 80242B34 C6400038 */  lwc1      $f0, 0x38($s2)
-/* B37708 80242B38 C6220074 */  lwc1      $f2, 0x74($s1)
-/* B3770C 80242B3C 46020000 */  add.s     $f0, $f0, $f2
-/* B37710 80242B40 E6400038 */  swc1      $f0, 0x38($s2)
-/* B37714 80242B44 C640003C */  lwc1      $f0, 0x3c($s2)
-/* B37718 80242B48 C6220078 */  lwc1      $f2, 0x78($s1)
-/* B3771C 80242B4C 46020000 */  add.s     $f0, $f0, $f2
-/* B37720 80242B50 E640003C */  swc1      $f0, 0x3c($s2)
-/* B37724 80242B54 C6400040 */  lwc1      $f0, 0x40($s2)
-/* B37728 80242B58 C622007C */  lwc1      $f2, 0x7c($s1)
-/* B3772C 80242B5C 46020000 */  add.s     $f0, $f0, $f2
-/* B37730 80242B60 E6400040 */  swc1      $f0, 0x40($s2)
-/* B37734 80242B64 8E230070 */  lw        $v1, 0x70($s1)
-/* B37738 80242B68 2463FFFF */  addiu     $v1, $v1, -1
-/* B3773C 80242B6C 2C620001 */  sltiu     $v0, $v1, 1
-/* B37740 80242B70 AE230070 */  sw        $v1, 0x70($s1)
-/* B37744 80242B74 8FBF001C */  lw        $ra, 0x1c($sp)
-/* B37748 80242B78 8FB20018 */  lw        $s2, 0x18($sp)
-/* B3774C 80242B7C 8FB10014 */  lw        $s1, 0x14($sp)
-/* B37750 80242B80 8FB00010 */  lw        $s0, 0x10($sp)
-/* B37754 80242B84 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* B37758 80242B88 00021040 */  sll       $v0, $v0, 1
-/* B3775C 80242B8C 03E00008 */  jr        $ra
-/* B37760 80242B90 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802412A0_8B1310.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802412A0_8B1310.s
deleted file mode 100644
index a5efd31cb6..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802412A0_8B1310.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802412A0_8B1310
-/* 8B1310 802412A0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 8B1314 802412A4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8B1318 802412A8 0080882D */  daddu     $s1, $a0, $zero
-/* 8B131C 802412AC AFB00010 */  sw        $s0, 0x10($sp)
-/* 8B1320 802412B0 00A0802D */  daddu     $s0, $a1, $zero
-/* 8B1324 802412B4 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 8B1328 802412B8 AFB20018 */  sw        $s2, 0x18($sp)
-/* 8B132C 802412BC F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 8B1330 802412C0 0C00EABB */  jal       get_npc_unsafe
-/* 8B1334 802412C4 2404FFFC */   addiu    $a0, $zero, -4
-/* 8B1338 802412C8 12000017 */  beqz      $s0, .L80241328
-/* 8B133C 802412CC 0040902D */   daddu    $s2, $v0, $zero
-/* 8B1340 802412D0 0220202D */  daddu     $a0, $s1, $zero
-/* 8B1344 802412D4 3C05FE36 */  lui       $a1, 0xfe36
-/* 8B1348 802412D8 0C0B210B */  jal       get_float_variable
-/* 8B134C 802412DC 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 8B1350 802412E0 0220202D */  daddu     $a0, $s1, $zero
-/* 8B1354 802412E4 3C05FE36 */  lui       $a1, 0xfe36
-/* 8B1358 802412E8 3C014270 */  lui       $at, 0x4270
-/* 8B135C 802412EC 4481A000 */  mtc1      $at, $f20
-/* 8B1360 802412F0 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 8B1364 802412F4 46140003 */  div.s     $f0, $f0, $f20
-/* 8B1368 802412F8 0C0B210B */  jal       get_float_variable
-/* 8B136C 802412FC E6200074 */   swc1     $f0, 0x74($s1)
-/* 8B1370 80241300 0220202D */  daddu     $a0, $s1, $zero
-/* 8B1374 80241304 3C05FE36 */  lui       $a1, 0xfe36
-/* 8B1378 80241308 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 8B137C 8024130C 46140003 */  div.s     $f0, $f0, $f20
-/* 8B1380 80241310 0C0B210B */  jal       get_float_variable
-/* 8B1384 80241314 E6200078 */   swc1     $f0, 0x78($s1)
-/* 8B1388 80241318 46140003 */  div.s     $f0, $f0, $f20
-/* 8B138C 8024131C 2402003C */  addiu     $v0, $zero, 0x3c
-/* 8B1390 80241320 E620007C */  swc1      $f0, 0x7c($s1)
-/* 8B1394 80241324 AE220070 */  sw        $v0, 0x70($s1)
-.L80241328:
-/* 8B1398 80241328 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 8B139C 8024132C C6220074 */  lwc1      $f2, 0x74($s1)
-/* 8B13A0 80241330 46020000 */  add.s     $f0, $f0, $f2
-/* 8B13A4 80241334 E6400038 */  swc1      $f0, 0x38($s2)
-/* 8B13A8 80241338 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 8B13AC 8024133C C6220078 */  lwc1      $f2, 0x78($s1)
-/* 8B13B0 80241340 46020000 */  add.s     $f0, $f0, $f2
-/* 8B13B4 80241344 E640003C */  swc1      $f0, 0x3c($s2)
-/* 8B13B8 80241348 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 8B13BC 8024134C C622007C */  lwc1      $f2, 0x7c($s1)
-/* 8B13C0 80241350 46020000 */  add.s     $f0, $f0, $f2
-/* 8B13C4 80241354 E6400040 */  swc1      $f0, 0x40($s2)
-/* 8B13C8 80241358 8E230070 */  lw        $v1, 0x70($s1)
-/* 8B13CC 8024135C 2463FFFF */  addiu     $v1, $v1, -1
-/* 8B13D0 80241360 2C620001 */  sltiu     $v0, $v1, 1
-/* 8B13D4 80241364 AE230070 */  sw        $v1, 0x70($s1)
-/* 8B13D8 80241368 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 8B13DC 8024136C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 8B13E0 80241370 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8B13E4 80241374 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8B13E8 80241378 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 8B13EC 8024137C 00021040 */  sll       $v0, $v0, 1
-/* 8B13F0 80241380 03E00008 */  jr        $ra
-/* 8B13F4 80241384 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241540_7EC250.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241540_7EC250.s
deleted file mode 100644
index 6bf81c6c08..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241540_7EC250.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241540_7EC250
-/* 7EC250 80241540 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 7EC254 80241544 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7EC258 80241548 0080882D */  daddu     $s1, $a0, $zero
-/* 7EC25C 8024154C AFB00010 */  sw        $s0, 0x10($sp)
-/* 7EC260 80241550 00A0802D */  daddu     $s0, $a1, $zero
-/* 7EC264 80241554 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 7EC268 80241558 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7EC26C 8024155C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 7EC270 80241560 0C00EABB */  jal       get_npc_unsafe
-/* 7EC274 80241564 2404FFFC */   addiu    $a0, $zero, -4
-/* 7EC278 80241568 12000017 */  beqz      $s0, .L802415C8
-/* 7EC27C 8024156C 0040902D */   daddu    $s2, $v0, $zero
-/* 7EC280 80241570 0220202D */  daddu     $a0, $s1, $zero
-/* 7EC284 80241574 3C05FE36 */  lui       $a1, 0xfe36
-/* 7EC288 80241578 0C0B210B */  jal       get_float_variable
-/* 7EC28C 8024157C 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 7EC290 80241580 0220202D */  daddu     $a0, $s1, $zero
-/* 7EC294 80241584 3C05FE36 */  lui       $a1, 0xfe36
-/* 7EC298 80241588 3C014270 */  lui       $at, 0x4270
-/* 7EC29C 8024158C 4481A000 */  mtc1      $at, $f20
-/* 7EC2A0 80241590 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 7EC2A4 80241594 46140003 */  div.s     $f0, $f0, $f20
-/* 7EC2A8 80241598 0C0B210B */  jal       get_float_variable
-/* 7EC2AC 8024159C E6200074 */   swc1     $f0, 0x74($s1)
-/* 7EC2B0 802415A0 0220202D */  daddu     $a0, $s1, $zero
-/* 7EC2B4 802415A4 3C05FE36 */  lui       $a1, 0xfe36
-/* 7EC2B8 802415A8 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 7EC2BC 802415AC 46140003 */  div.s     $f0, $f0, $f20
-/* 7EC2C0 802415B0 0C0B210B */  jal       get_float_variable
-/* 7EC2C4 802415B4 E6200078 */   swc1     $f0, 0x78($s1)
-/* 7EC2C8 802415B8 46140003 */  div.s     $f0, $f0, $f20
-/* 7EC2CC 802415BC 2402003C */  addiu     $v0, $zero, 0x3c
-/* 7EC2D0 802415C0 E620007C */  swc1      $f0, 0x7c($s1)
-/* 7EC2D4 802415C4 AE220070 */  sw        $v0, 0x70($s1)
-.L802415C8:
-/* 7EC2D8 802415C8 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 7EC2DC 802415CC C6220074 */  lwc1      $f2, 0x74($s1)
-/* 7EC2E0 802415D0 46020000 */  add.s     $f0, $f0, $f2
-/* 7EC2E4 802415D4 E6400038 */  swc1      $f0, 0x38($s2)
-/* 7EC2E8 802415D8 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 7EC2EC 802415DC C6220078 */  lwc1      $f2, 0x78($s1)
-/* 7EC2F0 802415E0 46020000 */  add.s     $f0, $f0, $f2
-/* 7EC2F4 802415E4 E640003C */  swc1      $f0, 0x3c($s2)
-/* 7EC2F8 802415E8 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 7EC2FC 802415EC C622007C */  lwc1      $f2, 0x7c($s1)
-/* 7EC300 802415F0 46020000 */  add.s     $f0, $f0, $f2
-/* 7EC304 802415F4 E6400040 */  swc1      $f0, 0x40($s2)
-/* 7EC308 802415F8 8E230070 */  lw        $v1, 0x70($s1)
-/* 7EC30C 802415FC 2463FFFF */  addiu     $v1, $v1, -1
-/* 7EC310 80241600 2C620001 */  sltiu     $v0, $v1, 1
-/* 7EC314 80241604 AE230070 */  sw        $v1, 0x70($s1)
-/* 7EC318 80241608 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 7EC31C 8024160C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7EC320 80241610 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7EC324 80241614 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7EC328 80241618 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 7EC32C 8024161C 00021040 */  sll       $v0, $v0, 1
-/* 7EC330 80241620 03E00008 */  jr        $ra
-/* 7EC334 80241624 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242078_7ECD88.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242078_7ECD88.s
deleted file mode 100644
index 5592ea8fd1..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242078_7ECD88.s
+++ /dev/null
@@ -1,70 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242078_7ECD88
-/* 7ECD88 80242078 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* 7ECD8C 8024207C AFB10014 */  sw        $s1, 0x14($sp)
-/* 7ECD90 80242080 0080882D */  daddu     $s1, $a0, $zero
-/* 7ECD94 80242084 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 7ECD98 80242088 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7ECD9C 8024208C F7B80030 */  sdc1      $f24, 0x30($sp)
-/* 7ECDA0 80242090 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* 7ECDA4 80242094 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 7ECDA8 80242098 8E30000C */  lw        $s0, 0xc($s1)
-/* 7ECDAC 8024209C 8E050000 */  lw        $a1, ($s0)
-/* 7ECDB0 802420A0 0C0B1EAF */  jal       get_variable
-/* 7ECDB4 802420A4 26100004 */   addiu    $s0, $s0, 4
-/* 7ECDB8 802420A8 8E050000 */  lw        $a1, ($s0)
-/* 7ECDBC 802420AC 26100004 */  addiu     $s0, $s0, 4
-/* 7ECDC0 802420B0 4482C000 */  mtc1      $v0, $f24
-/* 7ECDC4 802420B4 00000000 */  nop       
-/* 7ECDC8 802420B8 4680C620 */  cvt.s.w   $f24, $f24
-/* 7ECDCC 802420BC 0C0B1EAF */  jal       get_variable
-/* 7ECDD0 802420C0 0220202D */   daddu    $a0, $s1, $zero
-/* 7ECDD4 802420C4 8E050000 */  lw        $a1, ($s0)
-/* 7ECDD8 802420C8 26100004 */  addiu     $s0, $s0, 4
-/* 7ECDDC 802420CC 4482B000 */  mtc1      $v0, $f22
-/* 7ECDE0 802420D0 00000000 */  nop       
-/* 7ECDE4 802420D4 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 7ECDE8 802420D8 0C0B1EAF */  jal       get_variable
-/* 7ECDEC 802420DC 0220202D */   daddu    $a0, $s1, $zero
-/* 7ECDF0 802420E0 8E050000 */  lw        $a1, ($s0)
-/* 7ECDF4 802420E4 4482A000 */  mtc1      $v0, $f20
-/* 7ECDF8 802420E8 00000000 */  nop       
-/* 7ECDFC 802420EC 4680A520 */  cvt.s.w   $f20, $f20
-/* 7ECE00 802420F0 0C0B1EAF */  jal       get_variable
-/* 7ECE04 802420F4 0220202D */   daddu    $a0, $s1, $zero
-/* 7ECE08 802420F8 44820000 */  mtc1      $v0, $f0
-/* 7ECE0C 802420FC 00000000 */  nop       
-/* 7ECE10 80242100 46800020 */  cvt.s.w   $f0, $f0
-/* 7ECE14 80242104 46160001 */  sub.s     $f0, $f0, $f22
-/* 7ECE18 80242108 4618A501 */  sub.s     $f20, $f20, $f24
-/* 7ECE1C 8024210C 46140003 */  div.s     $f0, $f0, $f20
-/* 7ECE20 80242110 46180602 */  mul.s     $f24, $f0, $f24
-/* 7ECE24 80242114 00000000 */  nop       
-/* 7ECE28 80242118 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* 7ECE2C 8024211C 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* 7ECE30 80242120 C4420028 */  lwc1      $f2, 0x28($v0)
-/* 7ECE34 80242124 46020002 */  mul.s     $f0, $f0, $f2
-/* 7ECE38 80242128 00000000 */  nop       
-/* 7ECE3C 8024212C 4618B581 */  sub.s     $f22, $f22, $f24
-/* 7ECE40 80242130 46160000 */  add.s     $f0, $f0, $f22
-/* 7ECE44 80242134 C4420030 */  lwc1      $f2, 0x30($v0)
-/* 7ECE48 80242138 4600103C */  c.lt.s    $f2, $f0
-/* 7ECE4C 8024213C 00000000 */  nop       
-/* 7ECE50 80242140 45000003 */  bc1f      .L80242150
-/* 7ECE54 80242144 24020001 */   addiu    $v0, $zero, 1
-/* 7ECE58 80242148 08090855 */  j         .L80242154
-/* 7ECE5C 8024214C AE200084 */   sw       $zero, 0x84($s1)
-.L80242150:
-/* 7ECE60 80242150 AE220084 */  sw        $v0, 0x84($s1)
-.L80242154:
-/* 7ECE64 80242154 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 7ECE68 80242158 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7ECE6C 8024215C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7ECE70 80242160 D7B80030 */  ldc1      $f24, 0x30($sp)
-/* 7ECE74 80242164 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* 7ECE78 80242168 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 7ECE7C 8024216C 24020002 */  addiu     $v0, $zero, 2
-/* 7ECE80 80242170 03E00008 */  jr        $ra
-/* 7ECE84 80242174 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242E20_8036A0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242E20_8036A0.s
deleted file mode 100644
index 7dedd216dc..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242E20_8036A0.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242E20_8036A0
-/* 8036A0 80242E20 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 8036A4 80242E24 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8036A8 80242E28 0080882D */  daddu     $s1, $a0, $zero
-/* 8036AC 80242E2C AFB00010 */  sw        $s0, 0x10($sp)
-/* 8036B0 80242E30 00A0802D */  daddu     $s0, $a1, $zero
-/* 8036B4 80242E34 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 8036B8 80242E38 AFB20018 */  sw        $s2, 0x18($sp)
-/* 8036BC 80242E3C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 8036C0 80242E40 0C00EABB */  jal       get_npc_unsafe
-/* 8036C4 80242E44 2404FFFC */   addiu    $a0, $zero, -4
-/* 8036C8 80242E48 12000017 */  beqz      $s0, .L80242EA8
-/* 8036CC 80242E4C 0040902D */   daddu    $s2, $v0, $zero
-/* 8036D0 80242E50 0220202D */  daddu     $a0, $s1, $zero
-/* 8036D4 80242E54 3C05FE36 */  lui       $a1, 0xfe36
-/* 8036D8 80242E58 0C0B210B */  jal       get_float_variable
-/* 8036DC 80242E5C 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 8036E0 80242E60 0220202D */  daddu     $a0, $s1, $zero
-/* 8036E4 80242E64 3C05FE36 */  lui       $a1, 0xfe36
-/* 8036E8 80242E68 3C014270 */  lui       $at, 0x4270
-/* 8036EC 80242E6C 4481A000 */  mtc1      $at, $f20
-/* 8036F0 80242E70 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 8036F4 80242E74 46140003 */  div.s     $f0, $f0, $f20
-/* 8036F8 80242E78 0C0B210B */  jal       get_float_variable
-/* 8036FC 80242E7C E6200074 */   swc1     $f0, 0x74($s1)
-/* 803700 80242E80 0220202D */  daddu     $a0, $s1, $zero
-/* 803704 80242E84 3C05FE36 */  lui       $a1, 0xfe36
-/* 803708 80242E88 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 80370C 80242E8C 46140003 */  div.s     $f0, $f0, $f20
-/* 803710 80242E90 0C0B210B */  jal       get_float_variable
-/* 803714 80242E94 E6200078 */   swc1     $f0, 0x78($s1)
-/* 803718 80242E98 46140003 */  div.s     $f0, $f0, $f20
-/* 80371C 80242E9C 2402003C */  addiu     $v0, $zero, 0x3c
-/* 803720 80242EA0 E620007C */  swc1      $f0, 0x7c($s1)
-/* 803724 80242EA4 AE220070 */  sw        $v0, 0x70($s1)
-.L80242EA8:
-/* 803728 80242EA8 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 80372C 80242EAC C6220074 */  lwc1      $f2, 0x74($s1)
-/* 803730 80242EB0 46020000 */  add.s     $f0, $f0, $f2
-/* 803734 80242EB4 E6400038 */  swc1      $f0, 0x38($s2)
-/* 803738 80242EB8 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 80373C 80242EBC C6220078 */  lwc1      $f2, 0x78($s1)
-/* 803740 80242EC0 46020000 */  add.s     $f0, $f0, $f2
-/* 803744 80242EC4 E640003C */  swc1      $f0, 0x3c($s2)
-/* 803748 80242EC8 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 80374C 80242ECC C622007C */  lwc1      $f2, 0x7c($s1)
-/* 803750 80242ED0 46020000 */  add.s     $f0, $f0, $f2
-/* 803754 80242ED4 E6400040 */  swc1      $f0, 0x40($s2)
-/* 803758 80242ED8 8E230070 */  lw        $v1, 0x70($s1)
-/* 80375C 80242EDC 2463FFFF */  addiu     $v1, $v1, -1
-/* 803760 80242EE0 2C620001 */  sltiu     $v0, $v1, 1
-/* 803764 80242EE4 AE230070 */  sw        $v1, 0x70($s1)
-/* 803768 80242EE8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 80376C 80242EEC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 803770 80242EF0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 803774 80242EF4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 803778 80242EF8 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 80377C 80242EFC 00021040 */  sll       $v0, $v0, 1
-/* 803780 80242F00 03E00008 */  jr        $ra
-/* 803784 80242F04 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802426D0_825990.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802426D0_825990.s
deleted file mode 100644
index f7c22a373e..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802426D0_825990.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802426D0_825990
-/* 825990 802426D0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 825994 802426D4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 825998 802426D8 0080882D */  daddu     $s1, $a0, $zero
-/* 82599C 802426DC AFB00010 */  sw        $s0, 0x10($sp)
-/* 8259A0 802426E0 00A0802D */  daddu     $s0, $a1, $zero
-/* 8259A4 802426E4 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 8259A8 802426E8 AFB20018 */  sw        $s2, 0x18($sp)
-/* 8259AC 802426EC F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 8259B0 802426F0 0C00EABB */  jal       get_npc_unsafe
-/* 8259B4 802426F4 2404FFFC */   addiu    $a0, $zero, -4
-/* 8259B8 802426F8 12000017 */  beqz      $s0, .L80242758
-/* 8259BC 802426FC 0040902D */   daddu    $s2, $v0, $zero
-/* 8259C0 80242700 0220202D */  daddu     $a0, $s1, $zero
-/* 8259C4 80242704 3C05FE36 */  lui       $a1, 0xfe36
-/* 8259C8 80242708 0C0B210B */  jal       get_float_variable
-/* 8259CC 8024270C 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 8259D0 80242710 0220202D */  daddu     $a0, $s1, $zero
-/* 8259D4 80242714 3C05FE36 */  lui       $a1, 0xfe36
-/* 8259D8 80242718 3C014270 */  lui       $at, 0x4270
-/* 8259DC 8024271C 4481A000 */  mtc1      $at, $f20
-/* 8259E0 80242720 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 8259E4 80242724 46140003 */  div.s     $f0, $f0, $f20
-/* 8259E8 80242728 0C0B210B */  jal       get_float_variable
-/* 8259EC 8024272C E6200074 */   swc1     $f0, 0x74($s1)
-/* 8259F0 80242730 0220202D */  daddu     $a0, $s1, $zero
-/* 8259F4 80242734 3C05FE36 */  lui       $a1, 0xfe36
-/* 8259F8 80242738 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 8259FC 8024273C 46140003 */  div.s     $f0, $f0, $f20
-/* 825A00 80242740 0C0B210B */  jal       get_float_variable
-/* 825A04 80242744 E6200078 */   swc1     $f0, 0x78($s1)
-/* 825A08 80242748 46140003 */  div.s     $f0, $f0, $f20
-/* 825A0C 8024274C 2402003C */  addiu     $v0, $zero, 0x3c
-/* 825A10 80242750 E620007C */  swc1      $f0, 0x7c($s1)
-/* 825A14 80242754 AE220070 */  sw        $v0, 0x70($s1)
-.L80242758:
-/* 825A18 80242758 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 825A1C 8024275C C6220074 */  lwc1      $f2, 0x74($s1)
-/* 825A20 80242760 46020000 */  add.s     $f0, $f0, $f2
-/* 825A24 80242764 E6400038 */  swc1      $f0, 0x38($s2)
-/* 825A28 80242768 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 825A2C 8024276C C6220078 */  lwc1      $f2, 0x78($s1)
-/* 825A30 80242770 46020000 */  add.s     $f0, $f0, $f2
-/* 825A34 80242774 E640003C */  swc1      $f0, 0x3c($s2)
-/* 825A38 80242778 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 825A3C 8024277C C622007C */  lwc1      $f2, 0x7c($s1)
-/* 825A40 80242780 46020000 */  add.s     $f0, $f0, $f2
-/* 825A44 80242784 E6400040 */  swc1      $f0, 0x40($s2)
-/* 825A48 80242788 8E230070 */  lw        $v1, 0x70($s1)
-/* 825A4C 8024278C 2463FFFF */  addiu     $v1, $v1, -1
-/* 825A50 80242790 2C620001 */  sltiu     $v0, $v1, 1
-/* 825A54 80242794 AE230070 */  sw        $v1, 0x70($s1)
-/* 825A58 80242798 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 825A5C 8024279C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 825A60 802427A0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 825A64 802427A4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 825A68 802427A8 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 825A6C 802427AC 00021040 */  sll       $v0, $v0, 1
-/* 825A70 802427B0 03E00008 */  jr        $ra
-/* 825A74 802427B4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802413C0_832BC0.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802413C0_832BC0.s
deleted file mode 100644
index 63ba3c5753..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802413C0_832BC0.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802413C0_832BC0
-/* 832BC0 802413C0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 832BC4 802413C4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 832BC8 802413C8 0080882D */  daddu     $s1, $a0, $zero
-/* 832BCC 802413CC AFB00010 */  sw        $s0, 0x10($sp)
-/* 832BD0 802413D0 00A0802D */  daddu     $s0, $a1, $zero
-/* 832BD4 802413D4 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 832BD8 802413D8 AFB20018 */  sw        $s2, 0x18($sp)
-/* 832BDC 802413DC F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 832BE0 802413E0 0C00EABB */  jal       get_npc_unsafe
-/* 832BE4 802413E4 2404FFFC */   addiu    $a0, $zero, -4
-/* 832BE8 802413E8 12000017 */  beqz      $s0, .L80241448
-/* 832BEC 802413EC 0040902D */   daddu    $s2, $v0, $zero
-/* 832BF0 802413F0 0220202D */  daddu     $a0, $s1, $zero
-/* 832BF4 802413F4 3C05FE36 */  lui       $a1, 0xfe36
-/* 832BF8 802413F8 0C0B210B */  jal       get_float_variable
-/* 832BFC 802413FC 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 832C00 80241400 0220202D */  daddu     $a0, $s1, $zero
-/* 832C04 80241404 3C05FE36 */  lui       $a1, 0xfe36
-/* 832C08 80241408 3C014270 */  lui       $at, 0x4270
-/* 832C0C 8024140C 4481A000 */  mtc1      $at, $f20
-/* 832C10 80241410 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 832C14 80241414 46140003 */  div.s     $f0, $f0, $f20
-/* 832C18 80241418 0C0B210B */  jal       get_float_variable
-/* 832C1C 8024141C E6200074 */   swc1     $f0, 0x74($s1)
-/* 832C20 80241420 0220202D */  daddu     $a0, $s1, $zero
-/* 832C24 80241424 3C05FE36 */  lui       $a1, 0xfe36
-/* 832C28 80241428 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 832C2C 8024142C 46140003 */  div.s     $f0, $f0, $f20
-/* 832C30 80241430 0C0B210B */  jal       get_float_variable
-/* 832C34 80241434 E6200078 */   swc1     $f0, 0x78($s1)
-/* 832C38 80241438 46140003 */  div.s     $f0, $f0, $f20
-/* 832C3C 8024143C 2402003C */  addiu     $v0, $zero, 0x3c
-/* 832C40 80241440 E620007C */  swc1      $f0, 0x7c($s1)
-/* 832C44 80241444 AE220070 */  sw        $v0, 0x70($s1)
-.L80241448:
-/* 832C48 80241448 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 832C4C 8024144C C6220074 */  lwc1      $f2, 0x74($s1)
-/* 832C50 80241450 46020000 */  add.s     $f0, $f0, $f2
-/* 832C54 80241454 E6400038 */  swc1      $f0, 0x38($s2)
-/* 832C58 80241458 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 832C5C 8024145C C6220078 */  lwc1      $f2, 0x78($s1)
-/* 832C60 80241460 46020000 */  add.s     $f0, $f0, $f2
-/* 832C64 80241464 E640003C */  swc1      $f0, 0x3c($s2)
-/* 832C68 80241468 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 832C6C 8024146C C622007C */  lwc1      $f2, 0x7c($s1)
-/* 832C70 80241470 46020000 */  add.s     $f0, $f0, $f2
-/* 832C74 80241474 E6400040 */  swc1      $f0, 0x40($s2)
-/* 832C78 80241478 8E230070 */  lw        $v1, 0x70($s1)
-/* 832C7C 8024147C 2463FFFF */  addiu     $v1, $v1, -1
-/* 832C80 80241480 2C620001 */  sltiu     $v0, $v1, 1
-/* 832C84 80241484 AE230070 */  sw        $v1, 0x70($s1)
-/* 832C88 80241488 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 832C8C 8024148C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 832C90 80241490 8FB10014 */  lw        $s1, 0x14($sp)
-/* 832C94 80241494 8FB00010 */  lw        $s0, 0x10($sp)
-/* 832C98 80241498 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 832C9C 8024149C 00021040 */  sll       $v0, $v0, 1
-/* 832CA0 802414A0 03E00008 */  jr        $ra
-/* 832CA4 802414A4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241370_843F40.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241370_843F40.s
deleted file mode 100644
index 43bf452bf7..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241370_843F40.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241370_843F40
-/* 843F40 80241370 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 843F44 80241374 AFB10014 */  sw        $s1, 0x14($sp)
-/* 843F48 80241378 0080882D */  daddu     $s1, $a0, $zero
-/* 843F4C 8024137C AFB00010 */  sw        $s0, 0x10($sp)
-/* 843F50 80241380 00A0802D */  daddu     $s0, $a1, $zero
-/* 843F54 80241384 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 843F58 80241388 AFB20018 */  sw        $s2, 0x18($sp)
-/* 843F5C 8024138C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 843F60 80241390 0C00EABB */  jal       get_npc_unsafe
-/* 843F64 80241394 2404FFFC */   addiu    $a0, $zero, -4
-/* 843F68 80241398 12000017 */  beqz      $s0, .L802413F8
-/* 843F6C 8024139C 0040902D */   daddu    $s2, $v0, $zero
-/* 843F70 802413A0 0220202D */  daddu     $a0, $s1, $zero
-/* 843F74 802413A4 3C05FE36 */  lui       $a1, 0xfe36
-/* 843F78 802413A8 0C0B210B */  jal       get_float_variable
-/* 843F7C 802413AC 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 843F80 802413B0 0220202D */  daddu     $a0, $s1, $zero
-/* 843F84 802413B4 3C05FE36 */  lui       $a1, 0xfe36
-/* 843F88 802413B8 3C014270 */  lui       $at, 0x4270
-/* 843F8C 802413BC 4481A000 */  mtc1      $at, $f20
-/* 843F90 802413C0 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 843F94 802413C4 46140003 */  div.s     $f0, $f0, $f20
-/* 843F98 802413C8 0C0B210B */  jal       get_float_variable
-/* 843F9C 802413CC E6200074 */   swc1     $f0, 0x74($s1)
-/* 843FA0 802413D0 0220202D */  daddu     $a0, $s1, $zero
-/* 843FA4 802413D4 3C05FE36 */  lui       $a1, 0xfe36
-/* 843FA8 802413D8 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 843FAC 802413DC 46140003 */  div.s     $f0, $f0, $f20
-/* 843FB0 802413E0 0C0B210B */  jal       get_float_variable
-/* 843FB4 802413E4 E6200078 */   swc1     $f0, 0x78($s1)
-/* 843FB8 802413E8 46140003 */  div.s     $f0, $f0, $f20
-/* 843FBC 802413EC 2402003C */  addiu     $v0, $zero, 0x3c
-/* 843FC0 802413F0 E620007C */  swc1      $f0, 0x7c($s1)
-/* 843FC4 802413F4 AE220070 */  sw        $v0, 0x70($s1)
-.L802413F8:
-/* 843FC8 802413F8 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 843FCC 802413FC C6220074 */  lwc1      $f2, 0x74($s1)
-/* 843FD0 80241400 46020000 */  add.s     $f0, $f0, $f2
-/* 843FD4 80241404 E6400038 */  swc1      $f0, 0x38($s2)
-/* 843FD8 80241408 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 843FDC 8024140C C6220078 */  lwc1      $f2, 0x78($s1)
-/* 843FE0 80241410 46020000 */  add.s     $f0, $f0, $f2
-/* 843FE4 80241414 E640003C */  swc1      $f0, 0x3c($s2)
-/* 843FE8 80241418 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 843FEC 8024141C C622007C */  lwc1      $f2, 0x7c($s1)
-/* 843FF0 80241420 46020000 */  add.s     $f0, $f0, $f2
-/* 843FF4 80241424 E6400040 */  swc1      $f0, 0x40($s2)
-/* 843FF8 80241428 8E230070 */  lw        $v1, 0x70($s1)
-/* 843FFC 8024142C 2463FFFF */  addiu     $v1, $v1, -1
-/* 844000 80241430 2C620001 */  sltiu     $v0, $v1, 1
-/* 844004 80241434 AE230070 */  sw        $v1, 0x70($s1)
-/* 844008 80241438 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 84400C 8024143C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 844010 80241440 8FB10014 */  lw        $s1, 0x14($sp)
-/* 844014 80241444 8FB00010 */  lw        $s0, 0x10($sp)
-/* 844018 80241448 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 84401C 8024144C 00021040 */  sll       $v0, $v0, 1
-/* 844020 80241450 03E00008 */  jr        $ra
-/* 844024 80241454 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242230_8543A0.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242230_8543A0.s
deleted file mode 100644
index 0cb1bb647a..0000000000
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242230_8543A0.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242230_8543A0
-/* 8543A0 80242230 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 8543A4 80242234 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8543A8 80242238 0080882D */  daddu     $s1, $a0, $zero
-/* 8543AC 8024223C AFB00010 */  sw        $s0, 0x10($sp)
-/* 8543B0 80242240 00A0802D */  daddu     $s0, $a1, $zero
-/* 8543B4 80242244 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 8543B8 80242248 AFB20018 */  sw        $s2, 0x18($sp)
-/* 8543BC 8024224C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 8543C0 80242250 0C00EABB */  jal       get_npc_unsafe
-/* 8543C4 80242254 2404FFFC */   addiu    $a0, $zero, -4
-/* 8543C8 80242258 12000017 */  beqz      $s0, .L802422B8
-/* 8543CC 8024225C 0040902D */   daddu    $s2, $v0, $zero
-/* 8543D0 80242260 0220202D */  daddu     $a0, $s1, $zero
-/* 8543D4 80242264 3C05FE36 */  lui       $a1, 0xfe36
-/* 8543D8 80242268 0C0B210B */  jal       get_float_variable
-/* 8543DC 8024226C 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 8543E0 80242270 0220202D */  daddu     $a0, $s1, $zero
-/* 8543E4 80242274 3C05FE36 */  lui       $a1, 0xfe36
-/* 8543E8 80242278 3C014270 */  lui       $at, 0x4270
-/* 8543EC 8024227C 4481A000 */  mtc1      $at, $f20
-/* 8543F0 80242280 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 8543F4 80242284 46140003 */  div.s     $f0, $f0, $f20
-/* 8543F8 80242288 0C0B210B */  jal       get_float_variable
-/* 8543FC 8024228C E6200074 */   swc1     $f0, 0x74($s1)
-/* 854400 80242290 0220202D */  daddu     $a0, $s1, $zero
-/* 854404 80242294 3C05FE36 */  lui       $a1, 0xfe36
-/* 854408 80242298 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 85440C 8024229C 46140003 */  div.s     $f0, $f0, $f20
-/* 854410 802422A0 0C0B210B */  jal       get_float_variable
-/* 854414 802422A4 E6200078 */   swc1     $f0, 0x78($s1)
-/* 854418 802422A8 46140003 */  div.s     $f0, $f0, $f20
-/* 85441C 802422AC 2402003C */  addiu     $v0, $zero, 0x3c
-/* 854420 802422B0 E620007C */  swc1      $f0, 0x7c($s1)
-/* 854424 802422B4 AE220070 */  sw        $v0, 0x70($s1)
-.L802422B8:
-/* 854428 802422B8 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 85442C 802422BC C6220074 */  lwc1      $f2, 0x74($s1)
-/* 854430 802422C0 46020000 */  add.s     $f0, $f0, $f2
-/* 854434 802422C4 E6400038 */  swc1      $f0, 0x38($s2)
-/* 854438 802422C8 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 85443C 802422CC C6220078 */  lwc1      $f2, 0x78($s1)
-/* 854440 802422D0 46020000 */  add.s     $f0, $f0, $f2
-/* 854444 802422D4 E640003C */  swc1      $f0, 0x3c($s2)
-/* 854448 802422D8 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 85444C 802422DC C622007C */  lwc1      $f2, 0x7c($s1)
-/* 854450 802422E0 46020000 */  add.s     $f0, $f0, $f2
-/* 854454 802422E4 E6400040 */  swc1      $f0, 0x40($s2)
-/* 854458 802422E8 8E230070 */  lw        $v1, 0x70($s1)
-/* 85445C 802422EC 2463FFFF */  addiu     $v1, $v1, -1
-/* 854460 802422F0 2C620001 */  sltiu     $v0, $v1, 1
-/* 854464 802422F4 AE230070 */  sw        $v1, 0x70($s1)
-/* 854468 802422F8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 85446C 802422FC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 854470 80242300 8FB10014 */  lw        $s1, 0x14($sp)
-/* 854474 80242304 8FB00010 */  lw        $s0, 0x10($sp)
-/* 854478 80242308 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 85447C 8024230C 00021040 */  sll       $v0, $v0, 1
-/* 854480 80242310 03E00008 */  jr        $ra
-/* 854484 80242314 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241C78_9C7058.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241C78_9C7058.s
deleted file mode 100644
index 1d6636bac3..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241C78_9C7058.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241C78_9C7058
-/* 9C7058 80241C78 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 9C705C 80241C7C AFB10014 */  sw        $s1, 0x14($sp)
-/* 9C7060 80241C80 0080882D */  daddu     $s1, $a0, $zero
-/* 9C7064 80241C84 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9C7068 80241C88 00A0802D */  daddu     $s0, $a1, $zero
-/* 9C706C 80241C8C AFBF001C */  sw        $ra, 0x1c($sp)
-/* 9C7070 80241C90 AFB20018 */  sw        $s2, 0x18($sp)
-/* 9C7074 80241C94 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 9C7078 80241C98 0C00EABB */  jal       get_npc_unsafe
-/* 9C707C 80241C9C 2404FFFC */   addiu    $a0, $zero, -4
-/* 9C7080 80241CA0 12000017 */  beqz      $s0, .L80241D00
-/* 9C7084 80241CA4 0040902D */   daddu    $s2, $v0, $zero
-/* 9C7088 80241CA8 0220202D */  daddu     $a0, $s1, $zero
-/* 9C708C 80241CAC 3C05FE36 */  lui       $a1, 0xfe36
-/* 9C7090 80241CB0 0C0B210B */  jal       get_float_variable
-/* 9C7094 80241CB4 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 9C7098 80241CB8 0220202D */  daddu     $a0, $s1, $zero
-/* 9C709C 80241CBC 3C05FE36 */  lui       $a1, 0xfe36
-/* 9C70A0 80241CC0 3C014270 */  lui       $at, 0x4270
-/* 9C70A4 80241CC4 4481A000 */  mtc1      $at, $f20
-/* 9C70A8 80241CC8 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 9C70AC 80241CCC 46140003 */  div.s     $f0, $f0, $f20
-/* 9C70B0 80241CD0 0C0B210B */  jal       get_float_variable
-/* 9C70B4 80241CD4 E6200074 */   swc1     $f0, 0x74($s1)
-/* 9C70B8 80241CD8 0220202D */  daddu     $a0, $s1, $zero
-/* 9C70BC 80241CDC 3C05FE36 */  lui       $a1, 0xfe36
-/* 9C70C0 80241CE0 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 9C70C4 80241CE4 46140003 */  div.s     $f0, $f0, $f20
-/* 9C70C8 80241CE8 0C0B210B */  jal       get_float_variable
-/* 9C70CC 80241CEC E6200078 */   swc1     $f0, 0x78($s1)
-/* 9C70D0 80241CF0 46140003 */  div.s     $f0, $f0, $f20
-/* 9C70D4 80241CF4 2402003C */  addiu     $v0, $zero, 0x3c
-/* 9C70D8 80241CF8 E620007C */  swc1      $f0, 0x7c($s1)
-/* 9C70DC 80241CFC AE220070 */  sw        $v0, 0x70($s1)
-.L80241D00:
-/* 9C70E0 80241D00 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 9C70E4 80241D04 C6220074 */  lwc1      $f2, 0x74($s1)
-/* 9C70E8 80241D08 46020000 */  add.s     $f0, $f0, $f2
-/* 9C70EC 80241D0C E6400038 */  swc1      $f0, 0x38($s2)
-/* 9C70F0 80241D10 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 9C70F4 80241D14 C6220078 */  lwc1      $f2, 0x78($s1)
-/* 9C70F8 80241D18 46020000 */  add.s     $f0, $f0, $f2
-/* 9C70FC 80241D1C E640003C */  swc1      $f0, 0x3c($s2)
-/* 9C7100 80241D20 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 9C7104 80241D24 C622007C */  lwc1      $f2, 0x7c($s1)
-/* 9C7108 80241D28 46020000 */  add.s     $f0, $f0, $f2
-/* 9C710C 80241D2C E6400040 */  swc1      $f0, 0x40($s2)
-/* 9C7110 80241D30 8E230070 */  lw        $v1, 0x70($s1)
-/* 9C7114 80241D34 2463FFFF */  addiu     $v1, $v1, -1
-/* 9C7118 80241D38 2C620001 */  sltiu     $v0, $v1, 1
-/* 9C711C 80241D3C AE230070 */  sw        $v1, 0x70($s1)
-/* 9C7120 80241D40 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 9C7124 80241D44 8FB20018 */  lw        $s2, 0x18($sp)
-/* 9C7128 80241D48 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9C712C 80241D4C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9C7130 80241D50 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 9C7134 80241D54 00021040 */  sll       $v0, $v0, 1
-/* 9C7138 80241D58 03E00008 */  jr        $ra
-/* 9C713C 80241D5C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242820_9D9840.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242820_9D9840.s
deleted file mode 100644
index f1ec2096ef..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242820_9D9840.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242820_9D9840
-/* 9D9840 80242820 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 9D9844 80242824 AFB10014 */  sw        $s1, 0x14($sp)
-/* 9D9848 80242828 0080882D */  daddu     $s1, $a0, $zero
-/* 9D984C 8024282C AFB00010 */  sw        $s0, 0x10($sp)
-/* 9D9850 80242830 00A0802D */  daddu     $s0, $a1, $zero
-/* 9D9854 80242834 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 9D9858 80242838 AFB20018 */  sw        $s2, 0x18($sp)
-/* 9D985C 8024283C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 9D9860 80242840 0C00EABB */  jal       get_npc_unsafe
-/* 9D9864 80242844 2404FFFC */   addiu    $a0, $zero, -4
-/* 9D9868 80242848 12000017 */  beqz      $s0, .L802428A8
-/* 9D986C 8024284C 0040902D */   daddu    $s2, $v0, $zero
-/* 9D9870 80242850 0220202D */  daddu     $a0, $s1, $zero
-/* 9D9874 80242854 3C05FE36 */  lui       $a1, 0xfe36
-/* 9D9878 80242858 0C0B210B */  jal       get_float_variable
-/* 9D987C 8024285C 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* 9D9880 80242860 0220202D */  daddu     $a0, $s1, $zero
-/* 9D9884 80242864 3C05FE36 */  lui       $a1, 0xfe36
-/* 9D9888 80242868 3C014270 */  lui       $at, 0x4270
-/* 9D988C 8024286C 4481A000 */  mtc1      $at, $f20
-/* 9D9890 80242870 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* 9D9894 80242874 46140003 */  div.s     $f0, $f0, $f20
-/* 9D9898 80242878 0C0B210B */  jal       get_float_variable
-/* 9D989C 8024287C E6200074 */   swc1     $f0, 0x74($s1)
-/* 9D98A0 80242880 0220202D */  daddu     $a0, $s1, $zero
-/* 9D98A4 80242884 3C05FE36 */  lui       $a1, 0xfe36
-/* 9D98A8 80242888 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* 9D98AC 8024288C 46140003 */  div.s     $f0, $f0, $f20
-/* 9D98B0 80242890 0C0B210B */  jal       get_float_variable
-/* 9D98B4 80242894 E6200078 */   swc1     $f0, 0x78($s1)
-/* 9D98B8 80242898 46140003 */  div.s     $f0, $f0, $f20
-/* 9D98BC 8024289C 2402003C */  addiu     $v0, $zero, 0x3c
-/* 9D98C0 802428A0 E620007C */  swc1      $f0, 0x7c($s1)
-/* 9D98C4 802428A4 AE220070 */  sw        $v0, 0x70($s1)
-.L802428A8:
-/* 9D98C8 802428A8 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 9D98CC 802428AC C6220074 */  lwc1      $f2, 0x74($s1)
-/* 9D98D0 802428B0 46020000 */  add.s     $f0, $f0, $f2
-/* 9D98D4 802428B4 E6400038 */  swc1      $f0, 0x38($s2)
-/* 9D98D8 802428B8 C640003C */  lwc1      $f0, 0x3c($s2)
-/* 9D98DC 802428BC C6220078 */  lwc1      $f2, 0x78($s1)
-/* 9D98E0 802428C0 46020000 */  add.s     $f0, $f0, $f2
-/* 9D98E4 802428C4 E640003C */  swc1      $f0, 0x3c($s2)
-/* 9D98E8 802428C8 C6400040 */  lwc1      $f0, 0x40($s2)
-/* 9D98EC 802428CC C622007C */  lwc1      $f2, 0x7c($s1)
-/* 9D98F0 802428D0 46020000 */  add.s     $f0, $f0, $f2
-/* 9D98F4 802428D4 E6400040 */  swc1      $f0, 0x40($s2)
-/* 9D98F8 802428D8 8E230070 */  lw        $v1, 0x70($s1)
-/* 9D98FC 802428DC 2463FFFF */  addiu     $v1, $v1, -1
-/* 9D9900 802428E0 2C620001 */  sltiu     $v0, $v1, 1
-/* 9D9904 802428E4 AE230070 */  sw        $v1, 0x70($s1)
-/* 9D9908 802428E8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 9D990C 802428EC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 9D9910 802428F0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9D9914 802428F4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9D9918 802428F8 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 9D991C 802428FC 00021040 */  sll       $v0, $v0, 1
-/* 9D9920 80242900 03E00008 */  jr        $ra
-/* 9D9924 80242904 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241610_CF9180.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241610_CF9180.s
deleted file mode 100644
index ada9d7a6c1..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241610_CF9180.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241610_CF9180
-/* CF9180 80241610 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* CF9184 80241614 AFB10014 */  sw        $s1, 0x14($sp)
-/* CF9188 80241618 0080882D */  daddu     $s1, $a0, $zero
-/* CF918C 8024161C AFB00010 */  sw        $s0, 0x10($sp)
-/* CF9190 80241620 00A0802D */  daddu     $s0, $a1, $zero
-/* CF9194 80241624 AFBF001C */  sw        $ra, 0x1c($sp)
-/* CF9198 80241628 AFB20018 */  sw        $s2, 0x18($sp)
-/* CF919C 8024162C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* CF91A0 80241630 0C00EABB */  jal       get_npc_unsafe
-/* CF91A4 80241634 2404FFFC */   addiu    $a0, $zero, -4
-/* CF91A8 80241638 12000017 */  beqz      $s0, .L80241698
-/* CF91AC 8024163C 0040902D */   daddu    $s2, $v0, $zero
-/* CF91B0 80241640 0220202D */  daddu     $a0, $s1, $zero
-/* CF91B4 80241644 3C05FE36 */  lui       $a1, 0xfe36
-/* CF91B8 80241648 0C0B210B */  jal       get_float_variable
-/* CF91BC 8024164C 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* CF91C0 80241650 0220202D */  daddu     $a0, $s1, $zero
-/* CF91C4 80241654 3C05FE36 */  lui       $a1, 0xfe36
-/* CF91C8 80241658 3C014270 */  lui       $at, 0x4270
-/* CF91CC 8024165C 4481A000 */  mtc1      $at, $f20
-/* CF91D0 80241660 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* CF91D4 80241664 46140003 */  div.s     $f0, $f0, $f20
-/* CF91D8 80241668 0C0B210B */  jal       get_float_variable
-/* CF91DC 8024166C E6200074 */   swc1     $f0, 0x74($s1)
-/* CF91E0 80241670 0220202D */  daddu     $a0, $s1, $zero
-/* CF91E4 80241674 3C05FE36 */  lui       $a1, 0xfe36
-/* CF91E8 80241678 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* CF91EC 8024167C 46140003 */  div.s     $f0, $f0, $f20
-/* CF91F0 80241680 0C0B210B */  jal       get_float_variable
-/* CF91F4 80241684 E6200078 */   swc1     $f0, 0x78($s1)
-/* CF91F8 80241688 46140003 */  div.s     $f0, $f0, $f20
-/* CF91FC 8024168C 2402003C */  addiu     $v0, $zero, 0x3c
-/* CF9200 80241690 E620007C */  swc1      $f0, 0x7c($s1)
-/* CF9204 80241694 AE220070 */  sw        $v0, 0x70($s1)
-.L80241698:
-/* CF9208 80241698 C6400038 */  lwc1      $f0, 0x38($s2)
-/* CF920C 8024169C C6220074 */  lwc1      $f2, 0x74($s1)
-/* CF9210 802416A0 46020000 */  add.s     $f0, $f0, $f2
-/* CF9214 802416A4 E6400038 */  swc1      $f0, 0x38($s2)
-/* CF9218 802416A8 C640003C */  lwc1      $f0, 0x3c($s2)
-/* CF921C 802416AC C6220078 */  lwc1      $f2, 0x78($s1)
-/* CF9220 802416B0 46020000 */  add.s     $f0, $f0, $f2
-/* CF9224 802416B4 E640003C */  swc1      $f0, 0x3c($s2)
-/* CF9228 802416B8 C6400040 */  lwc1      $f0, 0x40($s2)
-/* CF922C 802416BC C622007C */  lwc1      $f2, 0x7c($s1)
-/* CF9230 802416C0 46020000 */  add.s     $f0, $f0, $f2
-/* CF9234 802416C4 E6400040 */  swc1      $f0, 0x40($s2)
-/* CF9238 802416C8 8E230070 */  lw        $v1, 0x70($s1)
-/* CF923C 802416CC 2463FFFF */  addiu     $v1, $v1, -1
-/* CF9240 802416D0 2C620001 */  sltiu     $v0, $v1, 1
-/* CF9244 802416D4 AE230070 */  sw        $v1, 0x70($s1)
-/* CF9248 802416D8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* CF924C 802416DC 8FB20018 */  lw        $s2, 0x18($sp)
-/* CF9250 802416E0 8FB10014 */  lw        $s1, 0x14($sp)
-/* CF9254 802416E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* CF9258 802416E8 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* CF925C 802416EC 00021040 */  sll       $v0, $v0, 1
-/* CF9260 802416F0 03E00008 */  jr        $ra
-/* CF9264 802416F4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241A3C_D0716C.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241A3C_D0716C.s
deleted file mode 100644
index 60094ee900..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241A3C_D0716C.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241A3C_D0716C
-/* D0716C 80241A3C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* D07170 80241A40 AFB10014 */  sw        $s1, 0x14($sp)
-/* D07174 80241A44 0080882D */  daddu     $s1, $a0, $zero
-/* D07178 80241A48 AFB00010 */  sw        $s0, 0x10($sp)
-/* D0717C 80241A4C 00A0802D */  daddu     $s0, $a1, $zero
-/* D07180 80241A50 AFBF001C */  sw        $ra, 0x1c($sp)
-/* D07184 80241A54 AFB20018 */  sw        $s2, 0x18($sp)
-/* D07188 80241A58 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* D0718C 80241A5C 0C00EABB */  jal       get_npc_unsafe
-/* D07190 80241A60 2404FFFC */   addiu    $a0, $zero, -4
-/* D07194 80241A64 12000017 */  beqz      $s0, .L80241AC4
-/* D07198 80241A68 0040902D */   daddu    $s2, $v0, $zero
-/* D0719C 80241A6C 0220202D */  daddu     $a0, $s1, $zero
-/* D071A0 80241A70 3C05FE36 */  lui       $a1, 0xfe36
-/* D071A4 80241A74 0C0B210B */  jal       get_float_variable
-/* D071A8 80241A78 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* D071AC 80241A7C 0220202D */  daddu     $a0, $s1, $zero
-/* D071B0 80241A80 3C05FE36 */  lui       $a1, 0xfe36
-/* D071B4 80241A84 3C014270 */  lui       $at, 0x4270
-/* D071B8 80241A88 4481A000 */  mtc1      $at, $f20
-/* D071BC 80241A8C 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* D071C0 80241A90 46140003 */  div.s     $f0, $f0, $f20
-/* D071C4 80241A94 0C0B210B */  jal       get_float_variable
-/* D071C8 80241A98 E6200074 */   swc1     $f0, 0x74($s1)
-/* D071CC 80241A9C 0220202D */  daddu     $a0, $s1, $zero
-/* D071D0 80241AA0 3C05FE36 */  lui       $a1, 0xfe36
-/* D071D4 80241AA4 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* D071D8 80241AA8 46140003 */  div.s     $f0, $f0, $f20
-/* D071DC 80241AAC 0C0B210B */  jal       get_float_variable
-/* D071E0 80241AB0 E6200078 */   swc1     $f0, 0x78($s1)
-/* D071E4 80241AB4 46140003 */  div.s     $f0, $f0, $f20
-/* D071E8 80241AB8 2402003C */  addiu     $v0, $zero, 0x3c
-/* D071EC 80241ABC E620007C */  swc1      $f0, 0x7c($s1)
-/* D071F0 80241AC0 AE220070 */  sw        $v0, 0x70($s1)
-.L80241AC4:
-/* D071F4 80241AC4 C6400038 */  lwc1      $f0, 0x38($s2)
-/* D071F8 80241AC8 C6220074 */  lwc1      $f2, 0x74($s1)
-/* D071FC 80241ACC 46020000 */  add.s     $f0, $f0, $f2
-/* D07200 80241AD0 E6400038 */  swc1      $f0, 0x38($s2)
-/* D07204 80241AD4 C640003C */  lwc1      $f0, 0x3c($s2)
-/* D07208 80241AD8 C6220078 */  lwc1      $f2, 0x78($s1)
-/* D0720C 80241ADC 46020000 */  add.s     $f0, $f0, $f2
-/* D07210 80241AE0 E640003C */  swc1      $f0, 0x3c($s2)
-/* D07214 80241AE4 C6400040 */  lwc1      $f0, 0x40($s2)
-/* D07218 80241AE8 C622007C */  lwc1      $f2, 0x7c($s1)
-/* D0721C 80241AEC 46020000 */  add.s     $f0, $f0, $f2
-/* D07220 80241AF0 E6400040 */  swc1      $f0, 0x40($s2)
-/* D07224 80241AF4 8E230070 */  lw        $v1, 0x70($s1)
-/* D07228 80241AF8 2463FFFF */  addiu     $v1, $v1, -1
-/* D0722C 80241AFC 2C620001 */  sltiu     $v0, $v1, 1
-/* D07230 80241B00 AE230070 */  sw        $v1, 0x70($s1)
-/* D07234 80241B04 8FBF001C */  lw        $ra, 0x1c($sp)
-/* D07238 80241B08 8FB20018 */  lw        $s2, 0x18($sp)
-/* D0723C 80241B0C 8FB10014 */  lw        $s1, 0x14($sp)
-/* D07240 80241B10 8FB00010 */  lw        $s0, 0x10($sp)
-/* D07244 80241B14 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* D07248 80241B18 00021040 */  sll       $v0, $v0, 1
-/* D0724C 80241B1C 03E00008 */  jr        $ra
-/* D07250 80241B20 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802416E0_D3BCB0.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802416E0_D3BCB0.s
deleted file mode 100644
index 9fc9db0881..0000000000
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802416E0_D3BCB0.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802416E0_D3BCB0
-/* D3BCB0 802416E0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* D3BCB4 802416E4 AFB10014 */  sw        $s1, 0x14($sp)
-/* D3BCB8 802416E8 0080882D */  daddu     $s1, $a0, $zero
-/* D3BCBC 802416EC AFB00010 */  sw        $s0, 0x10($sp)
-/* D3BCC0 802416F0 00A0802D */  daddu     $s0, $a1, $zero
-/* D3BCC4 802416F4 AFBF001C */  sw        $ra, 0x1c($sp)
-/* D3BCC8 802416F8 AFB20018 */  sw        $s2, 0x18($sp)
-/* D3BCCC 802416FC F7B40020 */  sdc1      $f20, 0x20($sp)
-/* D3BCD0 80241700 0C00EABB */  jal       get_npc_unsafe
-/* D3BCD4 80241704 2404FFFC */   addiu    $a0, $zero, -4
-/* D3BCD8 80241708 12000017 */  beqz      $s0, .L80241768
-/* D3BCDC 8024170C 0040902D */   daddu    $s2, $v0, $zero
-/* D3BCE0 80241710 0220202D */  daddu     $a0, $s1, $zero
-/* D3BCE4 80241714 3C05FE36 */  lui       $a1, 0xfe36
-/* D3BCE8 80241718 0C0B210B */  jal       get_float_variable
-/* D3BCEC 8024171C 34A53C80 */   ori      $a1, $a1, 0x3c80
-/* D3BCF0 80241720 0220202D */  daddu     $a0, $s1, $zero
-/* D3BCF4 80241724 3C05FE36 */  lui       $a1, 0xfe36
-/* D3BCF8 80241728 3C014270 */  lui       $at, 0x4270
-/* D3BCFC 8024172C 4481A000 */  mtc1      $at, $f20
-/* D3BD00 80241730 34A53C85 */  ori       $a1, $a1, 0x3c85
-/* D3BD04 80241734 46140003 */  div.s     $f0, $f0, $f20
-/* D3BD08 80241738 0C0B210B */  jal       get_float_variable
-/* D3BD0C 8024173C E6200074 */   swc1     $f0, 0x74($s1)
-/* D3BD10 80241740 0220202D */  daddu     $a0, $s1, $zero
-/* D3BD14 80241744 3C05FE36 */  lui       $a1, 0xfe36
-/* D3BD18 80241748 34A53C81 */  ori       $a1, $a1, 0x3c81
-/* D3BD1C 8024174C 46140003 */  div.s     $f0, $f0, $f20
-/* D3BD20 80241750 0C0B210B */  jal       get_float_variable
-/* D3BD24 80241754 E6200078 */   swc1     $f0, 0x78($s1)
-/* D3BD28 80241758 46140003 */  div.s     $f0, $f0, $f20
-/* D3BD2C 8024175C 2402003C */  addiu     $v0, $zero, 0x3c
-/* D3BD30 80241760 E620007C */  swc1      $f0, 0x7c($s1)
-/* D3BD34 80241764 AE220070 */  sw        $v0, 0x70($s1)
-.L80241768:
-/* D3BD38 80241768 C6400038 */  lwc1      $f0, 0x38($s2)
-/* D3BD3C 8024176C C6220074 */  lwc1      $f2, 0x74($s1)
-/* D3BD40 80241770 46020000 */  add.s     $f0, $f0, $f2
-/* D3BD44 80241774 E6400038 */  swc1      $f0, 0x38($s2)
-/* D3BD48 80241778 C640003C */  lwc1      $f0, 0x3c($s2)
-/* D3BD4C 8024177C C6220078 */  lwc1      $f2, 0x78($s1)
-/* D3BD50 80241780 46020000 */  add.s     $f0, $f0, $f2
-/* D3BD54 80241784 E640003C */  swc1      $f0, 0x3c($s2)
-/* D3BD58 80241788 C6400040 */  lwc1      $f0, 0x40($s2)
-/* D3BD5C 8024178C C622007C */  lwc1      $f2, 0x7c($s1)
-/* D3BD60 80241790 46020000 */  add.s     $f0, $f0, $f2
-/* D3BD64 80241794 E6400040 */  swc1      $f0, 0x40($s2)
-/* D3BD68 80241798 8E230070 */  lw        $v1, 0x70($s1)
-/* D3BD6C 8024179C 2463FFFF */  addiu     $v1, $v1, -1
-/* D3BD70 802417A0 2C620001 */  sltiu     $v0, $v1, 1
-/* D3BD74 802417A4 AE230070 */  sw        $v1, 0x70($s1)
-/* D3BD78 802417A8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* D3BD7C 802417AC 8FB20018 */  lw        $s2, 0x18($sp)
-/* D3BD80 802417B0 8FB10014 */  lw        $s1, 0x14($sp)
-/* D3BD84 802417B4 8FB00010 */  lw        $s0, 0x10($sp)
-/* D3BD88 802417B8 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* D3BD8C 802417BC 00021040 */  sll       $v0, $v0, 1
-/* D3BD90 802417C0 03E00008 */  jr        $ra
-/* D3BD94 802417C4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c
index 6c830f1a9b..c6c01e1fc7 100644
--- a/src/world/area_dro/dro_01/95B7E0.c
+++ b/src/world/area_dro/dro_01/95B7E0.c
@@ -70,7 +70,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024228C_95D48C);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802422F0_95D4F0);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242380_95D580);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242468_95D668);
 
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index 79119f7cc0..5dc8d5f6cd 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024111C_96A2DC);
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80241180_96A340);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80241210_96A3D0);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802412F8_96A4B8);
 
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index 39e7b1af09..09ebdc0fa9 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -88,7 +88,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802432C0_A1E3C0);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243324_A1E424);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802433B4_A1E4B4);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024349C_A1E59C);
 
diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c
index ffbcd5fa49..3f6a1212bc 100644
--- a/src/world/area_jan/jan_02/B2C8A0.c
+++ b/src/world/area_jan/jan_02/B2C8A0.c
@@ -80,7 +80,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242430_B2E8A0);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242494_B2E904);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242524_B2E994);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024260C_B2EA7C);
 
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index 42110a0238..fb4a6ad2a2 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -120,7 +120,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802429B8_B37588);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242A1C_B375EC);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242AAC_B3767C);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242B94_B37764);
 
diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c
index dabb7538d5..126fc7b1eb 100644
--- a/src/world/area_kmr/kmr_02/8B0070.c
+++ b/src/world/area_kmr/kmr_02/8B0070.c
@@ -62,7 +62,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802411AC_8B121C);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241210_8B1280);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802412A0_8B1310);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241388_8B13F8);
 
diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c
index fab9255b53..947070a15b 100644
--- a/src/world/area_mac/mac_00/7EB340.c
+++ b/src/world/area_mac/mac_00/7EB340.c
@@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024144C_7EC15C);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802414B0_7EC1C0);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241540_7EC250);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241628_7EC338);
 
@@ -66,7 +66,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241A18_7EC728);
 
 #include "world/common/SetManyVars.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241BA4_7EC8B4);
+INCLUDE_ASM(ApiStatus, "world/area_mac/mac_00/7EB340", func_80241BA4_7EC8B4, ScriptInstance* script, s32 isInitialCall);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241D30_7ECA40);
 
@@ -80,7 +80,25 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241E80_7ECB90);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241FF0_7ECD00);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242078_7ECD88);
+ApiStatus func_80242078_7ECD88(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    PlayerStatus* playerStatus = PLAYER_STATUS;
+    f32 var0 = get_variable(script, *args++);
+    f32 var1 = get_variable(script, *args++);
+    f32 var2 = get_variable(script, *args++);
+    f32 var3 = get_variable(script, *args++);
+    f32 temp;
+
+    temp = (var3 - var1) / (var2 - var0);
+
+    if (playerStatus->position.z < ((temp * playerStatus->position.x) + (var1 - (temp * var0)))) {
+        script->varTable[0] = 0;
+    } else {
+        script->varTable[0] = 1;
+    }
+
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242178_7ECE88);
 
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index a58a831e4e..1c6e82fb0c 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -72,7 +72,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242D2C_8035AC);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242D90_803610);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242E20_8036A0);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242F08_803788);
 
diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c
index 743a8f3e88..2f9dab34c7 100644
--- a/src/world/area_mac/mac_02/823BF0.c
+++ b/src/world/area_mac/mac_02/823BF0.c
@@ -70,7 +70,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802425DC_82589C);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242640_825900);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802426D0_825990);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802427B8_825A78);
 
diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c
index d9ecc7e362..cd479148d1 100644
--- a/src/world/area_mac/mac_03/831B20.c
+++ b/src/world/area_mac/mac_03/831B20.c
@@ -48,7 +48,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802412CC_832ACC);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241330_832B30);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802413C0_832BC0);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802414A8_832CA8);
 
diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c
index 720e4bb115..db3265f824 100644
--- a/src/world/area_mac/mac_04/843030.c
+++ b/src/world/area_mac/mac_04/843030.c
@@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024127C_843E4C);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802412E0_843EB0);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241370_843F40);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241458_844028);
 
diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c
index 988afe6e52..e9195bf47e 100644
--- a/src/world/area_mac/mac_05/852170.c
+++ b/src/world/area_mac/mac_05/852170.c
@@ -78,7 +78,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024213C_8542AC);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802421A0_854310);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242230_8543A0);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242318_854488);
 
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index 7d13ba69b1..cc74b3b3b1 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -86,7 +86,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241B84_9C6F64);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241BE8_9C6FC8);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241C78_9C7058);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241D60_9C7140);
 
diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c
index 5a0850fdad..ad4f99f871 100644
--- a/src/world/area_nok/nok_02/9D7AA0.c
+++ b/src/world/area_nok/nok_02/9D7AA0.c
@@ -70,7 +70,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024272C_9D974C);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242790_9D97B0);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242820_9D9840);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242908_9D9928);
 
diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c
index b71f92c9ac..07aef28454 100644
--- a/src/world/area_sam/sam_01/CF7E80.c
+++ b/src/world/area_sam/sam_01/CF7E80.c
@@ -58,7 +58,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024151C_CF908C);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241580_CF90F0);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241610_CF9180);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802416F8_CF9268);
 
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index 76ec88b1d9..1cad9e8f54 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -66,7 +66,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241948_D07078);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802419AC_D070DC);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241A3C_D0716C);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241B24_D07254);
 
diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c
index 841f1b7b7f..184b1b44f0 100644
--- a/src/world/area_sam/sam_11/D3ADA0.c
+++ b/src/world/area_sam/sam_11/D3ADA0.c
@@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802415EC_D3BBBC);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241650_D3BC20);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802416E0_D3BCB0);
+#include "world/common/UnkMoveNpc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802417C8_D3BD98);
 
diff --git a/src/world/common/UnkMoveNpc.inc.c b/src/world/common/UnkMoveNpc.inc.c
new file mode 100644
index 0000000000..e77ac52f90
--- /dev/null
+++ b/src/world/common/UnkMoveNpc.inc.c
@@ -0,0 +1,19 @@
+#include "common.h"
+
+static ApiStatus UnkMoveNpc(ScriptInstance* script, s32 isInitialCall) {
+    Npc* npc = get_npc_unsafe(NpcId_PARTNER);
+
+    if (isInitialCall) {
+        script->functionTemp[1].f = get_float_variable(script, SI_VAR(0)) / 60.0f;
+        script->functionTemp[2].f = get_float_variable(script, SI_VAR(5)) / 60.0f;
+        script->functionTemp[3].f = get_float_variable(script, SI_VAR(1)) / 60.0f;
+        script->functionTemp[0].s = 60;
+    }
+
+    npc->pos.x += script->functionTemp[1].f;
+    npc->pos.y += script->functionTemp[2].f;
+    npc->pos.z += script->functionTemp[3].f;
+    script->functionTemp[0].s--;
+
+    return (script->functionTemp[0].s == 0) * ApiStatus_DONE2;
+}
diff --git a/tools/m2ctx.py b/tools/m2ctx.py
index f6c477f0eb..59821b9c5c 100755
--- a/tools/m2ctx.py
+++ b/tools/m2ctx.py
@@ -26,7 +26,7 @@ def get_c_file(directory):
 
 def import_c_file(in_file):
     in_file = os.path.relpath(in_file, root_dir)
-    cpp_command = ["gcc", "-E", "-P", "-Iinclude", "-D_LANGUAGE_C", "-ffreestanding", "-DF3DEX_GBI_2", in_file]
+    cpp_command = ["gcc", "-E", "-P", "-Iinclude", "-Isrc", "-D_LANGUAGE_C", "-ffreestanding", "-DF3DEX_GBI_2", in_file]
     try:
         return subprocess.check_output(cpp_command, cwd=root_dir, encoding="utf-8")
     except subprocess.CalledProcessError:
@@ -53,7 +53,7 @@ def main():
             sys.exit("Cannot find appropriate c file dir. In argumentless mode, run this script from the c file's corresponding asm dir.")
         c_file = get_c_file(c_dir_path)
         c_file_path = os.path.join(c_dir_path, c_file)
-    
+
     processed = import_c_file(c_file_path)
     processed_lines = processed.split("\n")
     output = []