diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241800_8B1870.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241800_8B1870.s
deleted file mode 100644
index c5ffcb1770..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241800_8B1870.s
+++ /dev/null
@@ -1,78 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241800_8B1870
-/* 8B1870 80241800 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 8B1874 80241804 AFB3003C */  sw        $s3, 0x3c($sp)
-/* 8B1878 80241808 0080982D */  daddu     $s3, $a0, $zero
-/* 8B187C 8024180C AFBF0040 */  sw        $ra, 0x40($sp)
-/* 8B1880 80241810 AFB20038 */  sw        $s2, 0x38($sp)
-/* 8B1884 80241814 AFB10034 */  sw        $s1, 0x34($sp)
-/* 8B1888 80241818 AFB00030 */  sw        $s0, 0x30($sp)
-/* 8B188C 8024181C 8E720148 */  lw        $s2, 0x148($s3)
-/* 8B1890 80241820 00A0882D */  daddu     $s1, $a1, $zero
-/* 8B1894 80241824 86440008 */  lh        $a0, 8($s2)
-/* 8B1898 80241828 0C00EABB */  jal       get_npc_unsafe
-/* 8B189C 8024182C 00C0802D */   daddu    $s0, $a2, $zero
-/* 8B18A0 80241830 0200202D */  daddu     $a0, $s0, $zero
-/* 8B18A4 80241834 0240282D */  daddu     $a1, $s2, $zero
-/* 8B18A8 80241838 24030001 */  addiu     $v1, $zero, 1
-/* 8B18AC 8024183C AFA30010 */  sw        $v1, 0x10($sp)
-/* 8B18B0 80241840 8E260018 */  lw        $a2, 0x18($s1)
-/* 8B18B4 80241844 8E27001C */  lw        $a3, 0x1c($s1)
-/* 8B18B8 80241848 0C01242D */  jal       func_800490B4
-/* 8B18BC 8024184C 0040802D */   daddu    $s0, $v0, $zero
-/* 8B18C0 80241850 1440001D */  bnez      $v0, .L802418C8
-/* 8B18C4 80241854 24040002 */   addiu    $a0, $zero, 2
-/* 8B18C8 80241858 0200282D */  daddu     $a1, $s0, $zero
-/* 8B18CC 8024185C 0000302D */  daddu     $a2, $zero, $zero
-/* 8B18D0 80241860 860300A8 */  lh        $v1, 0xa8($s0)
-/* 8B18D4 80241864 3C013F80 */  lui       $at, 0x3f80
-/* 8B18D8 80241868 44810000 */  mtc1      $at, $f0
-/* 8B18DC 8024186C 3C014000 */  lui       $at, 0x4000
-/* 8B18E0 80241870 44811000 */  mtc1      $at, $f2
-/* 8B18E4 80241874 3C01C1A0 */  lui       $at, 0xc1a0
-/* 8B18E8 80241878 44812000 */  mtc1      $at, $f4
-/* 8B18EC 8024187C 2402000F */  addiu     $v0, $zero, 0xf
-/* 8B18F0 80241880 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 8B18F4 80241884 44833000 */  mtc1      $v1, $f6
-/* 8B18F8 80241888 00000000 */  nop       
-/* 8B18FC 8024188C 468031A0 */  cvt.s.w   $f6, $f6
-/* 8B1900 80241890 44073000 */  mfc1      $a3, $f6
-/* 8B1904 80241894 27A20028 */  addiu     $v0, $sp, 0x28
-/* 8B1908 80241898 AFA20020 */  sw        $v0, 0x20($sp)
-/* 8B190C 8024189C E7A00010 */  swc1      $f0, 0x10($sp)
-/* 8B1910 802418A0 E7A20014 */  swc1      $f2, 0x14($sp)
-/* 8B1914 802418A4 0C01BFA4 */  jal       fx_emote
-/* 8B1918 802418A8 E7A40018 */   swc1     $f4, 0x18($sp)
-/* 8B191C 802418AC 8E4200CC */  lw        $v0, 0xcc($s2)
-/* 8B1920 802418B0 8C430000 */  lw        $v1, ($v0)
-/* 8B1924 802418B4 24020019 */  addiu     $v0, $zero, 0x19
-/* 8B1928 802418B8 A602008E */  sh        $v0, 0x8e($s0)
-/* 8B192C 802418BC 2402000E */  addiu     $v0, $zero, 0xe
-/* 8B1930 802418C0 0809063F */  j         .L802418FC
-/* 8B1934 802418C4 AE030028 */   sw       $v1, 0x28($s0)
-.L802418C8:
-/* 8B1938 802418C8 8E050018 */  lw        $a1, 0x18($s0)
-/* 8B193C 802418CC 8E06000C */  lw        $a2, 0xc($s0)
-/* 8B1940 802418D0 0C00EA95 */  jal       npc_move_heading
-/* 8B1944 802418D4 0200202D */   daddu    $a0, $s0, $zero
-/* 8B1948 802418D8 0200202D */  daddu     $a0, $s0, $zero
-/* 8B194C 802418DC 0C00F598 */  jal       func_8003D660
-/* 8B1950 802418E0 24050001 */   addiu    $a1, $zero, 1
-/* 8B1954 802418E4 9602008E */  lhu       $v0, 0x8e($s0)
-/* 8B1958 802418E8 2442FFFF */  addiu     $v0, $v0, -1
-/* 8B195C 802418EC A602008E */  sh        $v0, 0x8e($s0)
-/* 8B1960 802418F0 00021400 */  sll       $v0, $v0, 0x10
-/* 8B1964 802418F4 14400002 */  bnez      $v0, .L80241900
-/* 8B1968 802418F8 2402000C */   addiu    $v0, $zero, 0xc
-.L802418FC:
-/* 8B196C 802418FC AE620070 */  sw        $v0, 0x70($s3)
-.L80241900:
-/* 8B1970 80241900 8FBF0040 */  lw        $ra, 0x40($sp)
-/* 8B1974 80241904 8FB3003C */  lw        $s3, 0x3c($sp)
-/* 8B1978 80241908 8FB20038 */  lw        $s2, 0x38($sp)
-/* 8B197C 8024190C 8FB10034 */  lw        $s1, 0x34($sp)
-/* 8B1980 80241910 8FB00030 */  lw        $s0, 0x30($sp)
-/* 8B1984 80241914 03E00008 */  jr        $ra
-/* 8B1988 80241918 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s
index 5acce523b1..509cc0f2c6 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s
@@ -133,7 +133,7 @@ glabel func_80241C18_8B1C88
 /* 8B1E74 80241E04 02A0302D */   daddu    $a2, $s5, $zero
 /* 8B1E78 80241E08 0280202D */  daddu     $a0, $s4, $zero
 /* 8B1E7C 80241E0C 0260282D */  daddu     $a1, $s3, $zero
-/* 8B1E80 80241E10 0C090600 */  jal       func_80241800_8B1870
+/* 8B1E80 80241E10 0C090600 */  jal       UnkNpcAIFunc11
 /* 8B1E84 80241E14 02A0302D */   daddu    $a2, $s5, $zero
 /* 8B1E88 80241E18 0809079A */  j         .L80241E68
 /* 8B1E8C 80241E1C 00000000 */   nop      
diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802403DC_8D419C.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802403DC_8D419C.s
deleted file mode 100644
index 0f8c8f4647..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802403DC_8D419C.s
+++ /dev/null
@@ -1,78 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802403DC_8D419C
-/* 8D419C 802403DC 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 8D41A0 802403E0 AFB3003C */  sw        $s3, 0x3c($sp)
-/* 8D41A4 802403E4 0080982D */  daddu     $s3, $a0, $zero
-/* 8D41A8 802403E8 AFBF0040 */  sw        $ra, 0x40($sp)
-/* 8D41AC 802403EC AFB20038 */  sw        $s2, 0x38($sp)
-/* 8D41B0 802403F0 AFB10034 */  sw        $s1, 0x34($sp)
-/* 8D41B4 802403F4 AFB00030 */  sw        $s0, 0x30($sp)
-/* 8D41B8 802403F8 8E720148 */  lw        $s2, 0x148($s3)
-/* 8D41BC 802403FC 00A0882D */  daddu     $s1, $a1, $zero
-/* 8D41C0 80240400 86440008 */  lh        $a0, 8($s2)
-/* 8D41C4 80240404 0C00EABB */  jal       get_npc_unsafe
-/* 8D41C8 80240408 00C0802D */   daddu    $s0, $a2, $zero
-/* 8D41CC 8024040C 0200202D */  daddu     $a0, $s0, $zero
-/* 8D41D0 80240410 0240282D */  daddu     $a1, $s2, $zero
-/* 8D41D4 80240414 24030001 */  addiu     $v1, $zero, 1
-/* 8D41D8 80240418 AFA30010 */  sw        $v1, 0x10($sp)
-/* 8D41DC 8024041C 8E260018 */  lw        $a2, 0x18($s1)
-/* 8D41E0 80240420 8E27001C */  lw        $a3, 0x1c($s1)
-/* 8D41E4 80240424 0C01242D */  jal       func_800490B4
-/* 8D41E8 80240428 0040802D */   daddu    $s0, $v0, $zero
-/* 8D41EC 8024042C 1440001D */  bnez      $v0, .L802404A4
-/* 8D41F0 80240430 24040002 */   addiu    $a0, $zero, 2
-/* 8D41F4 80240434 0200282D */  daddu     $a1, $s0, $zero
-/* 8D41F8 80240438 0000302D */  daddu     $a2, $zero, $zero
-/* 8D41FC 8024043C 860300A8 */  lh        $v1, 0xa8($s0)
-/* 8D4200 80240440 3C013F80 */  lui       $at, 0x3f80
-/* 8D4204 80240444 44810000 */  mtc1      $at, $f0
-/* 8D4208 80240448 3C014000 */  lui       $at, 0x4000
-/* 8D420C 8024044C 44811000 */  mtc1      $at, $f2
-/* 8D4210 80240450 3C01C1A0 */  lui       $at, 0xc1a0
-/* 8D4214 80240454 44812000 */  mtc1      $at, $f4
-/* 8D4218 80240458 2402000F */  addiu     $v0, $zero, 0xf
-/* 8D421C 8024045C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 8D4220 80240460 44833000 */  mtc1      $v1, $f6
-/* 8D4224 80240464 00000000 */  nop       
-/* 8D4228 80240468 468031A0 */  cvt.s.w   $f6, $f6
-/* 8D422C 8024046C 44073000 */  mfc1      $a3, $f6
-/* 8D4230 80240470 27A20028 */  addiu     $v0, $sp, 0x28
-/* 8D4234 80240474 AFA20020 */  sw        $v0, 0x20($sp)
-/* 8D4238 80240478 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 8D423C 8024047C E7A20014 */  swc1      $f2, 0x14($sp)
-/* 8D4240 80240480 0C01BFA4 */  jal       fx_emote
-/* 8D4244 80240484 E7A40018 */   swc1     $f4, 0x18($sp)
-/* 8D4248 80240488 8E4200CC */  lw        $v0, 0xcc($s2)
-/* 8D424C 8024048C 8C430000 */  lw        $v1, ($v0)
-/* 8D4250 80240490 24020019 */  addiu     $v0, $zero, 0x19
-/* 8D4254 80240494 A602008E */  sh        $v0, 0x8e($s0)
-/* 8D4258 80240498 2402000E */  addiu     $v0, $zero, 0xe
-/* 8D425C 8024049C 08090136 */  j         .L802404D8
-/* 8D4260 802404A0 AE030028 */   sw       $v1, 0x28($s0)
-.L802404A4:
-/* 8D4264 802404A4 8E050018 */  lw        $a1, 0x18($s0)
-/* 8D4268 802404A8 8E06000C */  lw        $a2, 0xc($s0)
-/* 8D426C 802404AC 0C00EA95 */  jal       npc_move_heading
-/* 8D4270 802404B0 0200202D */   daddu    $a0, $s0, $zero
-/* 8D4274 802404B4 0200202D */  daddu     $a0, $s0, $zero
-/* 8D4278 802404B8 0C00F598 */  jal       func_8003D660
-/* 8D427C 802404BC 24050001 */   addiu    $a1, $zero, 1
-/* 8D4280 802404C0 9602008E */  lhu       $v0, 0x8e($s0)
-/* 8D4284 802404C4 2442FFFF */  addiu     $v0, $v0, -1
-/* 8D4288 802404C8 A602008E */  sh        $v0, 0x8e($s0)
-/* 8D428C 802404CC 00021400 */  sll       $v0, $v0, 0x10
-/* 8D4290 802404D0 14400002 */  bnez      $v0, .L802404DC
-/* 8D4294 802404D4 2402000C */   addiu    $v0, $zero, 0xc
-.L802404D8:
-/* 8D4298 802404D8 AE620070 */  sw        $v0, 0x70($s3)
-.L802404DC:
-/* 8D429C 802404DC 8FBF0040 */  lw        $ra, 0x40($sp)
-/* 8D42A0 802404E0 8FB3003C */  lw        $s3, 0x3c($sp)
-/* 8D42A4 802404E4 8FB20038 */  lw        $s2, 0x38($sp)
-/* 8D42A8 802404E8 8FB10034 */  lw        $s1, 0x34($sp)
-/* 8D42AC 802404EC 8FB00030 */  lw        $s0, 0x30($sp)
-/* 8D42B0 802404F0 03E00008 */  jr        $ra
-/* 8D42B4 802404F4 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s
index 619090bf4d..29753b9ec3 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s
@@ -133,7 +133,7 @@ glabel func_802407F4_8D45B4
 /* 8D47A0 802409E0 02A0302D */   daddu    $a2, $s5, $zero
 /* 8D47A4 802409E4 0280202D */  daddu     $a0, $s4, $zero
 /* 8D47A8 802409E8 0260282D */  daddu     $a1, $s3, $zero
-/* 8D47AC 802409EC 0C0900F7 */  jal       func_802403DC_8D419C
+/* 8D47AC 802409EC 0C0900F7 */  jal       UnkNpcAIFunc11
 /* 8D47B0 802409F0 02A0302D */   daddu    $a2, $s5, $zero
 /* 8D47B4 802409F4 08090291 */  j         .L80240A44
 /* 8D47B8 802409F8 00000000 */   nop
diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024074C_8DA84C.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024074C_8DA84C.s
deleted file mode 100644
index 6d12212740..0000000000
--- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024074C_8DA84C.s
+++ /dev/null
@@ -1,78 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024074C_8DA84C
-/* 8DA84C 8024074C 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 8DA850 80240750 AFB3003C */  sw        $s3, 0x3c($sp)
-/* 8DA854 80240754 0080982D */  daddu     $s3, $a0, $zero
-/* 8DA858 80240758 AFBF0040 */  sw        $ra, 0x40($sp)
-/* 8DA85C 8024075C AFB20038 */  sw        $s2, 0x38($sp)
-/* 8DA860 80240760 AFB10034 */  sw        $s1, 0x34($sp)
-/* 8DA864 80240764 AFB00030 */  sw        $s0, 0x30($sp)
-/* 8DA868 80240768 8E720148 */  lw        $s2, 0x148($s3)
-/* 8DA86C 8024076C 00A0882D */  daddu     $s1, $a1, $zero
-/* 8DA870 80240770 86440008 */  lh        $a0, 8($s2)
-/* 8DA874 80240774 0C00EABB */  jal       get_npc_unsafe
-/* 8DA878 80240778 00C0802D */   daddu    $s0, $a2, $zero
-/* 8DA87C 8024077C 0200202D */  daddu     $a0, $s0, $zero
-/* 8DA880 80240780 0240282D */  daddu     $a1, $s2, $zero
-/* 8DA884 80240784 24030001 */  addiu     $v1, $zero, 1
-/* 8DA888 80240788 AFA30010 */  sw        $v1, 0x10($sp)
-/* 8DA88C 8024078C 8E260018 */  lw        $a2, 0x18($s1)
-/* 8DA890 80240790 8E27001C */  lw        $a3, 0x1c($s1)
-/* 8DA894 80240794 0C01242D */  jal       func_800490B4
-/* 8DA898 80240798 0040802D */   daddu    $s0, $v0, $zero
-/* 8DA89C 8024079C 1440001D */  bnez      $v0, .L80240814
-/* 8DA8A0 802407A0 24040002 */   addiu    $a0, $zero, 2
-/* 8DA8A4 802407A4 0200282D */  daddu     $a1, $s0, $zero
-/* 8DA8A8 802407A8 0000302D */  daddu     $a2, $zero, $zero
-/* 8DA8AC 802407AC 860300A8 */  lh        $v1, 0xa8($s0)
-/* 8DA8B0 802407B0 3C013F80 */  lui       $at, 0x3f80
-/* 8DA8B4 802407B4 44810000 */  mtc1      $at, $f0
-/* 8DA8B8 802407B8 3C014000 */  lui       $at, 0x4000
-/* 8DA8BC 802407BC 44811000 */  mtc1      $at, $f2
-/* 8DA8C0 802407C0 3C01C1A0 */  lui       $at, 0xc1a0
-/* 8DA8C4 802407C4 44812000 */  mtc1      $at, $f4
-/* 8DA8C8 802407C8 2402000F */  addiu     $v0, $zero, 0xf
-/* 8DA8CC 802407CC AFA2001C */  sw        $v0, 0x1c($sp)
-/* 8DA8D0 802407D0 44833000 */  mtc1      $v1, $f6
-/* 8DA8D4 802407D4 00000000 */  nop       
-/* 8DA8D8 802407D8 468031A0 */  cvt.s.w   $f6, $f6
-/* 8DA8DC 802407DC 44073000 */  mfc1      $a3, $f6
-/* 8DA8E0 802407E0 27A20028 */  addiu     $v0, $sp, 0x28
-/* 8DA8E4 802407E4 AFA20020 */  sw        $v0, 0x20($sp)
-/* 8DA8E8 802407E8 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 8DA8EC 802407EC E7A20014 */  swc1      $f2, 0x14($sp)
-/* 8DA8F0 802407F0 0C01BFA4 */  jal       fx_emote
-/* 8DA8F4 802407F4 E7A40018 */   swc1     $f4, 0x18($sp)
-/* 8DA8F8 802407F8 8E4200CC */  lw        $v0, 0xcc($s2)
-/* 8DA8FC 802407FC 8C430000 */  lw        $v1, ($v0)
-/* 8DA900 80240800 24020019 */  addiu     $v0, $zero, 0x19
-/* 8DA904 80240804 A602008E */  sh        $v0, 0x8e($s0)
-/* 8DA908 80240808 2402000E */  addiu     $v0, $zero, 0xe
-/* 8DA90C 8024080C 08090212 */  j         .L80240848
-/* 8DA910 80240810 AE030028 */   sw       $v1, 0x28($s0)
-.L80240814:
-/* 8DA914 80240814 8E050018 */  lw        $a1, 0x18($s0)
-/* 8DA918 80240818 8E06000C */  lw        $a2, 0xc($s0)
-/* 8DA91C 8024081C 0C00EA95 */  jal       npc_move_heading
-/* 8DA920 80240820 0200202D */   daddu    $a0, $s0, $zero
-/* 8DA924 80240824 0200202D */  daddu     $a0, $s0, $zero
-/* 8DA928 80240828 0C00F598 */  jal       func_8003D660
-/* 8DA92C 8024082C 24050001 */   addiu    $a1, $zero, 1
-/* 8DA930 80240830 9602008E */  lhu       $v0, 0x8e($s0)
-/* 8DA934 80240834 2442FFFF */  addiu     $v0, $v0, -1
-/* 8DA938 80240838 A602008E */  sh        $v0, 0x8e($s0)
-/* 8DA93C 8024083C 00021400 */  sll       $v0, $v0, 0x10
-/* 8DA940 80240840 14400002 */  bnez      $v0, .L8024084C
-/* 8DA944 80240844 2402000C */   addiu    $v0, $zero, 0xc
-.L80240848:
-/* 8DA948 80240848 AE620070 */  sw        $v0, 0x70($s3)
-.L8024084C:
-/* 8DA94C 8024084C 8FBF0040 */  lw        $ra, 0x40($sp)
-/* 8DA950 80240850 8FB3003C */  lw        $s3, 0x3c($sp)
-/* 8DA954 80240854 8FB20038 */  lw        $s2, 0x38($sp)
-/* 8DA958 80240858 8FB10034 */  lw        $s1, 0x34($sp)
-/* 8DA95C 8024085C 8FB00030 */  lw        $s0, 0x30($sp)
-/* 8DA960 80240860 03E00008 */  jr        $ra
-/* 8DA964 80240864 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s
index 809e4ad3ac..d2ded110ad 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s
@@ -133,7 +133,7 @@ glabel func_80240B64_8DAC64
 /* 8DAE50 80240D50 02A0302D */   daddu    $a2, $s5, $zero
 /* 8DAE54 80240D54 0280202D */  daddu     $a0, $s4, $zero
 /* 8DAE58 80240D58 0260282D */  daddu     $a1, $s3, $zero
-/* 8DAE5C 80240D5C 0C0901D3 */  jal       func_8024074C_8DA84C
+/* 8DAE5C 80240D5C 0C0901D3 */  jal       UnkNpcAIFunc11
 /* 8DAE60 80240D60 02A0302D */   daddu    $a2, $s5, $zero
 /* 8DAE64 80240D64 0809036D */  j         .L80240DB4
 /* 8DAE68 80240D68 00000000 */   nop      
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802403DC_9C57BC.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802403DC_9C57BC.s
deleted file mode 100644
index 7eb6cc8a1b..0000000000
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802403DC_9C57BC.s
+++ /dev/null
@@ -1,78 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802403DC_9C57BC
-/* 9C57BC 802403DC 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 9C57C0 802403E0 AFB3003C */  sw        $s3, 0x3c($sp)
-/* 9C57C4 802403E4 0080982D */  daddu     $s3, $a0, $zero
-/* 9C57C8 802403E8 AFBF0040 */  sw        $ra, 0x40($sp)
-/* 9C57CC 802403EC AFB20038 */  sw        $s2, 0x38($sp)
-/* 9C57D0 802403F0 AFB10034 */  sw        $s1, 0x34($sp)
-/* 9C57D4 802403F4 AFB00030 */  sw        $s0, 0x30($sp)
-/* 9C57D8 802403F8 8E720148 */  lw        $s2, 0x148($s3)
-/* 9C57DC 802403FC 00A0882D */  daddu     $s1, $a1, $zero
-/* 9C57E0 80240400 86440008 */  lh        $a0, 8($s2)
-/* 9C57E4 80240404 0C00EABB */  jal       get_npc_unsafe
-/* 9C57E8 80240408 00C0802D */   daddu    $s0, $a2, $zero
-/* 9C57EC 8024040C 0200202D */  daddu     $a0, $s0, $zero
-/* 9C57F0 80240410 0240282D */  daddu     $a1, $s2, $zero
-/* 9C57F4 80240414 24030001 */  addiu     $v1, $zero, 1
-/* 9C57F8 80240418 AFA30010 */  sw        $v1, 0x10($sp)
-/* 9C57FC 8024041C 8E260018 */  lw        $a2, 0x18($s1)
-/* 9C5800 80240420 8E27001C */  lw        $a3, 0x1c($s1)
-/* 9C5804 80240424 0C01242D */  jal       func_800490B4
-/* 9C5808 80240428 0040802D */   daddu    $s0, $v0, $zero
-/* 9C580C 8024042C 1440001D */  bnez      $v0, .L802404A4
-/* 9C5810 80240430 24040002 */   addiu    $a0, $zero, 2
-/* 9C5814 80240434 0200282D */  daddu     $a1, $s0, $zero
-/* 9C5818 80240438 0000302D */  daddu     $a2, $zero, $zero
-/* 9C581C 8024043C 860300A8 */  lh        $v1, 0xa8($s0)
-/* 9C5820 80240440 3C013F80 */  lui       $at, 0x3f80
-/* 9C5824 80240444 44810000 */  mtc1      $at, $f0
-/* 9C5828 80240448 3C014000 */  lui       $at, 0x4000
-/* 9C582C 8024044C 44811000 */  mtc1      $at, $f2
-/* 9C5830 80240450 3C01C1A0 */  lui       $at, 0xc1a0
-/* 9C5834 80240454 44812000 */  mtc1      $at, $f4
-/* 9C5838 80240458 2402000F */  addiu     $v0, $zero, 0xf
-/* 9C583C 8024045C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 9C5840 80240460 44833000 */  mtc1      $v1, $f6
-/* 9C5844 80240464 00000000 */  nop       
-/* 9C5848 80240468 468031A0 */  cvt.s.w   $f6, $f6
-/* 9C584C 8024046C 44073000 */  mfc1      $a3, $f6
-/* 9C5850 80240470 27A20028 */  addiu     $v0, $sp, 0x28
-/* 9C5854 80240474 AFA20020 */  sw        $v0, 0x20($sp)
-/* 9C5858 80240478 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 9C585C 8024047C E7A20014 */  swc1      $f2, 0x14($sp)
-/* 9C5860 80240480 0C01BFA4 */  jal       fx_emote
-/* 9C5864 80240484 E7A40018 */   swc1     $f4, 0x18($sp)
-/* 9C5868 80240488 8E4200CC */  lw        $v0, 0xcc($s2)
-/* 9C586C 8024048C 8C430000 */  lw        $v1, ($v0)
-/* 9C5870 80240490 24020019 */  addiu     $v0, $zero, 0x19
-/* 9C5874 80240494 A602008E */  sh        $v0, 0x8e($s0)
-/* 9C5878 80240498 2402000E */  addiu     $v0, $zero, 0xe
-/* 9C587C 8024049C 08090136 */  j         .L802404D8
-/* 9C5880 802404A0 AE030028 */   sw       $v1, 0x28($s0)
-.L802404A4:
-/* 9C5884 802404A4 8E050018 */  lw        $a1, 0x18($s0)
-/* 9C5888 802404A8 8E06000C */  lw        $a2, 0xc($s0)
-/* 9C588C 802404AC 0C00EA95 */  jal       npc_move_heading
-/* 9C5890 802404B0 0200202D */   daddu    $a0, $s0, $zero
-/* 9C5894 802404B4 0200202D */  daddu     $a0, $s0, $zero
-/* 9C5898 802404B8 0C00F598 */  jal       func_8003D660
-/* 9C589C 802404BC 24050001 */   addiu    $a1, $zero, 1
-/* 9C58A0 802404C0 9602008E */  lhu       $v0, 0x8e($s0)
-/* 9C58A4 802404C4 2442FFFF */  addiu     $v0, $v0, -1
-/* 9C58A8 802404C8 A602008E */  sh        $v0, 0x8e($s0)
-/* 9C58AC 802404CC 00021400 */  sll       $v0, $v0, 0x10
-/* 9C58B0 802404D0 14400002 */  bnez      $v0, .L802404DC
-/* 9C58B4 802404D4 2402000C */   addiu    $v0, $zero, 0xc
-.L802404D8:
-/* 9C58B8 802404D8 AE620070 */  sw        $v0, 0x70($s3)
-.L802404DC:
-/* 9C58BC 802404DC 8FBF0040 */  lw        $ra, 0x40($sp)
-/* 9C58C0 802404E0 8FB3003C */  lw        $s3, 0x3c($sp)
-/* 9C58C4 802404E4 8FB20038 */  lw        $s2, 0x38($sp)
-/* 9C58C8 802404E8 8FB10034 */  lw        $s1, 0x34($sp)
-/* 9C58CC 802404EC 8FB00030 */  lw        $s0, 0x30($sp)
-/* 9C58D0 802404F0 03E00008 */  jr        $ra
-/* 9C58D4 802404F4 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s
index 9d6483f508..e055e94d78 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s
@@ -133,7 +133,7 @@ glabel func_802407F4_9C5BD4
 /* 9C5DC0 802409E0 02A0302D */   daddu    $a2, $s5, $zero
 /* 9C5DC4 802409E4 0280202D */  daddu     $a0, $s4, $zero
 /* 9C5DC8 802409E8 0260282D */  daddu     $a1, $s3, $zero
-/* 9C5DCC 802409EC 0C0900F7 */  jal       func_802403DC_9C57BC
+/* 9C5DCC 802409EC 0C0900F7 */  jal       UnkNpcAIFunc11
 /* 9C5DD0 802409F0 02A0302D */   daddu    $a2, $s5, $zero
 /* 9C5DD4 802409F4 08090291 */  j         .L80240A44
 /* 9C5DD8 802409F8 00000000 */   nop      
diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802412B8_D9E788.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802412B8_D9E788.s
deleted file mode 100644
index 423691a376..0000000000
--- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802412B8_D9E788.s
+++ /dev/null
@@ -1,78 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802412B8_D9E788
-/* D9E788 802412B8 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* D9E78C 802412BC AFB3003C */  sw        $s3, 0x3c($sp)
-/* D9E790 802412C0 0080982D */  daddu     $s3, $a0, $zero
-/* D9E794 802412C4 AFBF0040 */  sw        $ra, 0x40($sp)
-/* D9E798 802412C8 AFB20038 */  sw        $s2, 0x38($sp)
-/* D9E79C 802412CC AFB10034 */  sw        $s1, 0x34($sp)
-/* D9E7A0 802412D0 AFB00030 */  sw        $s0, 0x30($sp)
-/* D9E7A4 802412D4 8E720148 */  lw        $s2, 0x148($s3)
-/* D9E7A8 802412D8 00A0882D */  daddu     $s1, $a1, $zero
-/* D9E7AC 802412DC 86440008 */  lh        $a0, 8($s2)
-/* D9E7B0 802412E0 0C00EABB */  jal       get_npc_unsafe
-/* D9E7B4 802412E4 00C0802D */   daddu    $s0, $a2, $zero
-/* D9E7B8 802412E8 0200202D */  daddu     $a0, $s0, $zero
-/* D9E7BC 802412EC 0240282D */  daddu     $a1, $s2, $zero
-/* D9E7C0 802412F0 24030001 */  addiu     $v1, $zero, 1
-/* D9E7C4 802412F4 AFA30010 */  sw        $v1, 0x10($sp)
-/* D9E7C8 802412F8 8E260018 */  lw        $a2, 0x18($s1)
-/* D9E7CC 802412FC 8E27001C */  lw        $a3, 0x1c($s1)
-/* D9E7D0 80241300 0C01242D */  jal       func_800490B4
-/* D9E7D4 80241304 0040802D */   daddu    $s0, $v0, $zero
-/* D9E7D8 80241308 1440001D */  bnez      $v0, .L80241380
-/* D9E7DC 8024130C 24040002 */   addiu    $a0, $zero, 2
-/* D9E7E0 80241310 0200282D */  daddu     $a1, $s0, $zero
-/* D9E7E4 80241314 0000302D */  daddu     $a2, $zero, $zero
-/* D9E7E8 80241318 860300A8 */  lh        $v1, 0xa8($s0)
-/* D9E7EC 8024131C 3C013F80 */  lui       $at, 0x3f80
-/* D9E7F0 80241320 44810000 */  mtc1      $at, $f0
-/* D9E7F4 80241324 3C014000 */  lui       $at, 0x4000
-/* D9E7F8 80241328 44811000 */  mtc1      $at, $f2
-/* D9E7FC 8024132C 3C01C1A0 */  lui       $at, 0xc1a0
-/* D9E800 80241330 44812000 */  mtc1      $at, $f4
-/* D9E804 80241334 2402000F */  addiu     $v0, $zero, 0xf
-/* D9E808 80241338 AFA2001C */  sw        $v0, 0x1c($sp)
-/* D9E80C 8024133C 44833000 */  mtc1      $v1, $f6
-/* D9E810 80241340 00000000 */  nop       
-/* D9E814 80241344 468031A0 */  cvt.s.w   $f6, $f6
-/* D9E818 80241348 44073000 */  mfc1      $a3, $f6
-/* D9E81C 8024134C 27A20028 */  addiu     $v0, $sp, 0x28
-/* D9E820 80241350 AFA20020 */  sw        $v0, 0x20($sp)
-/* D9E824 80241354 E7A00010 */  swc1      $f0, 0x10($sp)
-/* D9E828 80241358 E7A20014 */  swc1      $f2, 0x14($sp)
-/* D9E82C 8024135C 0C01BFA4 */  jal       fx_emote
-/* D9E830 80241360 E7A40018 */   swc1     $f4, 0x18($sp)
-/* D9E834 80241364 8E4200CC */  lw        $v0, 0xcc($s2)
-/* D9E838 80241368 8C430000 */  lw        $v1, ($v0)
-/* D9E83C 8024136C 24020019 */  addiu     $v0, $zero, 0x19
-/* D9E840 80241370 A602008E */  sh        $v0, 0x8e($s0)
-/* D9E844 80241374 2402000E */  addiu     $v0, $zero, 0xe
-/* D9E848 80241378 080904ED */  j         .L802413B4
-/* D9E84C 8024137C AE030028 */   sw       $v1, 0x28($s0)
-.L80241380:
-/* D9E850 80241380 8E050018 */  lw        $a1, 0x18($s0)
-/* D9E854 80241384 8E06000C */  lw        $a2, 0xc($s0)
-/* D9E858 80241388 0C00EA95 */  jal       npc_move_heading
-/* D9E85C 8024138C 0200202D */   daddu    $a0, $s0, $zero
-/* D9E860 80241390 0200202D */  daddu     $a0, $s0, $zero
-/* D9E864 80241394 0C00F598 */  jal       func_8003D660
-/* D9E868 80241398 24050001 */   addiu    $a1, $zero, 1
-/* D9E86C 8024139C 9602008E */  lhu       $v0, 0x8e($s0)
-/* D9E870 802413A0 2442FFFF */  addiu     $v0, $v0, -1
-/* D9E874 802413A4 A602008E */  sh        $v0, 0x8e($s0)
-/* D9E878 802413A8 00021400 */  sll       $v0, $v0, 0x10
-/* D9E87C 802413AC 14400002 */  bnez      $v0, .L802413B8
-/* D9E880 802413B0 2402000C */   addiu    $v0, $zero, 0xc
-.L802413B4:
-/* D9E884 802413B4 AE620070 */  sw        $v0, 0x70($s3)
-.L802413B8:
-/* D9E888 802413B8 8FBF0040 */  lw        $ra, 0x40($sp)
-/* D9E88C 802413BC 8FB3003C */  lw        $s3, 0x3c($sp)
-/* D9E890 802413C0 8FB20038 */  lw        $s2, 0x38($sp)
-/* D9E894 802413C4 8FB10034 */  lw        $s1, 0x34($sp)
-/* D9E898 802413C8 8FB00030 */  lw        $s0, 0x30($sp)
-/* D9E89C 802413CC 03E00008 */  jr        $ra
-/* D9E8A0 802413D0 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s
index 3901a71c4f..ddf0acce42 100644
--- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s
+++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s
@@ -133,7 +133,7 @@ glabel func_802416D0_D9EBA0
 /* D9ED8C 802418BC 02A0302D */   daddu    $a2, $s5, $zero
 /* D9ED90 802418C0 0280202D */  daddu     $a0, $s4, $zero
 /* D9ED94 802418C4 0260282D */  daddu     $a1, $s3, $zero
-/* D9ED98 802418C8 0C0904AE */  jal       func_802412B8_D9E788
+/* D9ED98 802418C8 0C0904AE */  jal       UnkNpcAIFunc11
 /* D9ED9C 802418CC 02A0302D */   daddu    $a2, $s5, $zero
 /* D9EDA0 802418D0 08090648 */  j         .L80241920
 /* D9EDA4 802418D4 00000000 */   nop      
diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_8024074C_93FCFC.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_8024074C_93FCFC.s
deleted file mode 100644
index 492cee23f4..0000000000
--- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_8024074C_93FCFC.s
+++ /dev/null
@@ -1,78 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024074C_93FCFC
-/* 93FCFC 8024074C 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 93FD00 80240750 AFB3003C */  sw        $s3, 0x3c($sp)
-/* 93FD04 80240754 0080982D */  daddu     $s3, $a0, $zero
-/* 93FD08 80240758 AFBF0040 */  sw        $ra, 0x40($sp)
-/* 93FD0C 8024075C AFB20038 */  sw        $s2, 0x38($sp)
-/* 93FD10 80240760 AFB10034 */  sw        $s1, 0x34($sp)
-/* 93FD14 80240764 AFB00030 */  sw        $s0, 0x30($sp)
-/* 93FD18 80240768 8E720148 */  lw        $s2, 0x148($s3)
-/* 93FD1C 8024076C 00A0882D */  daddu     $s1, $a1, $zero
-/* 93FD20 80240770 86440008 */  lh        $a0, 8($s2)
-/* 93FD24 80240774 0C00EABB */  jal       get_npc_unsafe
-/* 93FD28 80240778 00C0802D */   daddu    $s0, $a2, $zero
-/* 93FD2C 8024077C 0200202D */  daddu     $a0, $s0, $zero
-/* 93FD30 80240780 0240282D */  daddu     $a1, $s2, $zero
-/* 93FD34 80240784 24030001 */  addiu     $v1, $zero, 1
-/* 93FD38 80240788 AFA30010 */  sw        $v1, 0x10($sp)
-/* 93FD3C 8024078C 8E260018 */  lw        $a2, 0x18($s1)
-/* 93FD40 80240790 8E27001C */  lw        $a3, 0x1c($s1)
-/* 93FD44 80240794 0C01242D */  jal       func_800490B4
-/* 93FD48 80240798 0040802D */   daddu    $s0, $v0, $zero
-/* 93FD4C 8024079C 1440001D */  bnez      $v0, .L80240814
-/* 93FD50 802407A0 24040002 */   addiu    $a0, $zero, 2
-/* 93FD54 802407A4 0200282D */  daddu     $a1, $s0, $zero
-/* 93FD58 802407A8 0000302D */  daddu     $a2, $zero, $zero
-/* 93FD5C 802407AC 860300A8 */  lh        $v1, 0xa8($s0)
-/* 93FD60 802407B0 3C013F80 */  lui       $at, 0x3f80
-/* 93FD64 802407B4 44810000 */  mtc1      $at, $f0
-/* 93FD68 802407B8 3C014000 */  lui       $at, 0x4000
-/* 93FD6C 802407BC 44811000 */  mtc1      $at, $f2
-/* 93FD70 802407C0 3C01C1A0 */  lui       $at, 0xc1a0
-/* 93FD74 802407C4 44812000 */  mtc1      $at, $f4
-/* 93FD78 802407C8 2402000F */  addiu     $v0, $zero, 0xf
-/* 93FD7C 802407CC AFA2001C */  sw        $v0, 0x1c($sp)
-/* 93FD80 802407D0 44833000 */  mtc1      $v1, $f6
-/* 93FD84 802407D4 00000000 */  nop       
-/* 93FD88 802407D8 468031A0 */  cvt.s.w   $f6, $f6
-/* 93FD8C 802407DC 44073000 */  mfc1      $a3, $f6
-/* 93FD90 802407E0 27A20028 */  addiu     $v0, $sp, 0x28
-/* 93FD94 802407E4 AFA20020 */  sw        $v0, 0x20($sp)
-/* 93FD98 802407E8 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 93FD9C 802407EC E7A20014 */  swc1      $f2, 0x14($sp)
-/* 93FDA0 802407F0 0C01BFA4 */  jal       fx_emote
-/* 93FDA4 802407F4 E7A40018 */   swc1     $f4, 0x18($sp)
-/* 93FDA8 802407F8 8E4200CC */  lw        $v0, 0xcc($s2)
-/* 93FDAC 802407FC 8C430000 */  lw        $v1, ($v0)
-/* 93FDB0 80240800 24020019 */  addiu     $v0, $zero, 0x19
-/* 93FDB4 80240804 A602008E */  sh        $v0, 0x8e($s0)
-/* 93FDB8 80240808 2402000E */  addiu     $v0, $zero, 0xe
-/* 93FDBC 8024080C 08090212 */  j         .L80240848
-/* 93FDC0 80240810 AE030028 */   sw       $v1, 0x28($s0)
-.L80240814:
-/* 93FDC4 80240814 8E050018 */  lw        $a1, 0x18($s0)
-/* 93FDC8 80240818 8E06000C */  lw        $a2, 0xc($s0)
-/* 93FDCC 8024081C 0C00EA95 */  jal       npc_move_heading
-/* 93FDD0 80240820 0200202D */   daddu    $a0, $s0, $zero
-/* 93FDD4 80240824 0200202D */  daddu     $a0, $s0, $zero
-/* 93FDD8 80240828 0C00F598 */  jal       func_8003D660
-/* 93FDDC 8024082C 24050001 */   addiu    $a1, $zero, 1
-/* 93FDE0 80240830 9602008E */  lhu       $v0, 0x8e($s0)
-/* 93FDE4 80240834 2442FFFF */  addiu     $v0, $v0, -1
-/* 93FDE8 80240838 A602008E */  sh        $v0, 0x8e($s0)
-/* 93FDEC 8024083C 00021400 */  sll       $v0, $v0, 0x10
-/* 93FDF0 80240840 14400002 */  bnez      $v0, .L8024084C
-/* 93FDF4 80240844 2402000C */   addiu    $v0, $zero, 0xc
-.L80240848:
-/* 93FDF8 80240848 AE620070 */  sw        $v0, 0x70($s3)
-.L8024084C:
-/* 93FDFC 8024084C 8FBF0040 */  lw        $ra, 0x40($sp)
-/* 93FE00 80240850 8FB3003C */  lw        $s3, 0x3c($sp)
-/* 93FE04 80240854 8FB20038 */  lw        $s2, 0x38($sp)
-/* 93FE08 80240858 8FB10034 */  lw        $s1, 0x34($sp)
-/* 93FE0C 8024085C 8FB00030 */  lw        $s0, 0x30($sp)
-/* 93FE10 80240860 03E00008 */  jr        $ra
-/* 93FE14 80240864 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s
index 4221306272..368e8e3f24 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s
@@ -133,7 +133,7 @@ glabel func_80240B64_940114
 /* 940300 80240D50 02A0302D */   daddu    $a2, $s5, $zero
 /* 940304 80240D54 0280202D */  daddu     $a0, $s4, $zero
 /* 940308 80240D58 0260282D */  daddu     $a1, $s3, $zero
-/* 94030C 80240D5C 0C0901D3 */  jal       func_8024074C_93FCFC
+/* 94030C 80240D5C 0C0901D3 */  jal       UnkNpcAIFunc11
 /* 940310 80240D60 02A0302D */   daddu    $a2, $s5, $zero
 /* 940314 80240D64 0809036D */  j         .L80240DB4
 /* 940318 80240D68 00000000 */   nop      
diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240FA0_99D930.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240FA0_99D930.s
deleted file mode 100644
index deadecb571..0000000000
--- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240FA0_99D930.s
+++ /dev/null
@@ -1,78 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240FA0_99D930
-/* 99D930 80240FA0 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 99D934 80240FA4 AFB3003C */  sw        $s3, 0x3c($sp)
-/* 99D938 80240FA8 0080982D */  daddu     $s3, $a0, $zero
-/* 99D93C 80240FAC AFBF0040 */  sw        $ra, 0x40($sp)
-/* 99D940 80240FB0 AFB20038 */  sw        $s2, 0x38($sp)
-/* 99D944 80240FB4 AFB10034 */  sw        $s1, 0x34($sp)
-/* 99D948 80240FB8 AFB00030 */  sw        $s0, 0x30($sp)
-/* 99D94C 80240FBC 8E720148 */  lw        $s2, 0x148($s3)
-/* 99D950 80240FC0 00A0882D */  daddu     $s1, $a1, $zero
-/* 99D954 80240FC4 86440008 */  lh        $a0, 8($s2)
-/* 99D958 80240FC8 0C00EABB */  jal       get_npc_unsafe
-/* 99D95C 80240FCC 00C0802D */   daddu    $s0, $a2, $zero
-/* 99D960 80240FD0 0200202D */  daddu     $a0, $s0, $zero
-/* 99D964 80240FD4 0240282D */  daddu     $a1, $s2, $zero
-/* 99D968 80240FD8 24030001 */  addiu     $v1, $zero, 1
-/* 99D96C 80240FDC AFA30010 */  sw        $v1, 0x10($sp)
-/* 99D970 80240FE0 8E260018 */  lw        $a2, 0x18($s1)
-/* 99D974 80240FE4 8E27001C */  lw        $a3, 0x1c($s1)
-/* 99D978 80240FE8 0C01242D */  jal       func_800490B4
-/* 99D97C 80240FEC 0040802D */   daddu    $s0, $v0, $zero
-/* 99D980 80240FF0 1440001D */  bnez      $v0, .L80241068
-/* 99D984 80240FF4 24040002 */   addiu    $a0, $zero, 2
-/* 99D988 80240FF8 0200282D */  daddu     $a1, $s0, $zero
-/* 99D98C 80240FFC 0000302D */  daddu     $a2, $zero, $zero
-/* 99D990 80241000 860300A8 */  lh        $v1, 0xa8($s0)
-/* 99D994 80241004 3C013F80 */  lui       $at, 0x3f80
-/* 99D998 80241008 44810000 */  mtc1      $at, $f0
-/* 99D99C 8024100C 3C014000 */  lui       $at, 0x4000
-/* 99D9A0 80241010 44811000 */  mtc1      $at, $f2
-/* 99D9A4 80241014 3C01C1A0 */  lui       $at, 0xc1a0
-/* 99D9A8 80241018 44812000 */  mtc1      $at, $f4
-/* 99D9AC 8024101C 2402000F */  addiu     $v0, $zero, 0xf
-/* 99D9B0 80241020 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 99D9B4 80241024 44833000 */  mtc1      $v1, $f6
-/* 99D9B8 80241028 00000000 */  nop       
-/* 99D9BC 8024102C 468031A0 */  cvt.s.w   $f6, $f6
-/* 99D9C0 80241030 44073000 */  mfc1      $a3, $f6
-/* 99D9C4 80241034 27A20028 */  addiu     $v0, $sp, 0x28
-/* 99D9C8 80241038 AFA20020 */  sw        $v0, 0x20($sp)
-/* 99D9CC 8024103C E7A00010 */  swc1      $f0, 0x10($sp)
-/* 99D9D0 80241040 E7A20014 */  swc1      $f2, 0x14($sp)
-/* 99D9D4 80241044 0C01BFA4 */  jal       fx_emote
-/* 99D9D8 80241048 E7A40018 */   swc1     $f4, 0x18($sp)
-/* 99D9DC 8024104C 8E4200CC */  lw        $v0, 0xcc($s2)
-/* 99D9E0 80241050 8C430000 */  lw        $v1, ($v0)
-/* 99D9E4 80241054 24020019 */  addiu     $v0, $zero, 0x19
-/* 99D9E8 80241058 A602008E */  sh        $v0, 0x8e($s0)
-/* 99D9EC 8024105C 2402000E */  addiu     $v0, $zero, 0xe
-/* 99D9F0 80241060 08090427 */  j         .L8024109C
-/* 99D9F4 80241064 AE030028 */   sw       $v1, 0x28($s0)
-.L80241068:
-/* 99D9F8 80241068 8E050018 */  lw        $a1, 0x18($s0)
-/* 99D9FC 8024106C 8E06000C */  lw        $a2, 0xc($s0)
-/* 99DA00 80241070 0C00EA95 */  jal       npc_move_heading
-/* 99DA04 80241074 0200202D */   daddu    $a0, $s0, $zero
-/* 99DA08 80241078 0200202D */  daddu     $a0, $s0, $zero
-/* 99DA0C 8024107C 0C00F598 */  jal       func_8003D660
-/* 99DA10 80241080 24050001 */   addiu    $a1, $zero, 1
-/* 99DA14 80241084 9602008E */  lhu       $v0, 0x8e($s0)
-/* 99DA18 80241088 2442FFFF */  addiu     $v0, $v0, -1
-/* 99DA1C 8024108C A602008E */  sh        $v0, 0x8e($s0)
-/* 99DA20 80241090 00021400 */  sll       $v0, $v0, 0x10
-/* 99DA24 80241094 14400002 */  bnez      $v0, .L802410A0
-/* 99DA28 80241098 2402000C */   addiu    $v0, $zero, 0xc
-.L8024109C:
-/* 99DA2C 8024109C AE620070 */  sw        $v0, 0x70($s3)
-.L802410A0:
-/* 99DA30 802410A0 8FBF0040 */  lw        $ra, 0x40($sp)
-/* 99DA34 802410A4 8FB3003C */  lw        $s3, 0x3c($sp)
-/* 99DA38 802410A8 8FB20038 */  lw        $s2, 0x38($sp)
-/* 99DA3C 802410AC 8FB10034 */  lw        $s1, 0x34($sp)
-/* 99DA40 802410B0 8FB00030 */  lw        $s0, 0x30($sp)
-/* 99DA44 802410B4 03E00008 */  jr        $ra
-/* 99DA48 802410B8 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s
index b74b0df06a..b6a7588135 100644
--- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s
+++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s
@@ -133,7 +133,7 @@ glabel func_802413B8_99DD48
 /* 99DF34 802415A4 02A0302D */   daddu    $a2, $s5, $zero
 /* 99DF38 802415A8 0280202D */  daddu     $a0, $s4, $zero
 /* 99DF3C 802415AC 0260282D */  daddu     $a1, $s3, $zero
-/* 99DF40 802415B0 0C0903E8 */  jal       func_80240FA0_99D930
+/* 99DF40 802415B0 0C0903E8 */  jal       UnkNpcAIFunc11
 /* 99DF44 802415B4 02A0302D */   daddu    $a2, $s5, $zero
 /* 99DF48 802415B8 08090582 */  j         .L80241608
 /* 99DF4C 802415BC 00000000 */   nop      
diff --git a/include/functions.h b/include/functions.h
index aab81a1b7d..7be9596b37 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -126,6 +126,7 @@ Npc* get_npc_safe(NpcId npcId);
 Npc* get_npc_unsafe(NpcId npcId);
 Npc* resolve_npc(ScriptInstance* script, NpcId npcIdOrPtr);
 void set_npc_yaw(Npc* npcPtr, f32 angle);
+void npc_move_heading(Npc* npc, f32 speed, f32 yaw);
 
 f32 dist2D(f32 ax, f32 ay, f32 bx, f32 by);
 f32 dist3D(f32 ax, f32 ay, f32 az, f32 bx, f32 by, f32 bz);
diff --git a/include/map.h b/include/map.h
index 1278918d5b..b91d409e0f 100644
--- a/include/map.h
+++ b/include/map.h
@@ -249,6 +249,8 @@ typedef struct {
 Enemy* get_enemy(NpcId npcId);
 MapConfig* get_current_map_header(void);
 
+s32 func_800490B4(s32 arg0, Enemy* arg1, f32 arg2, s32 arg3, s32 arg4);
+
 /// Zero-terminated.
 Area gAreas[29];
 
diff --git a/src/code_13870_len_6980.c b/src/code_13870_len_6980.c
index 518b1b319e..3199d38f7f 100644
--- a/src/code_13870_len_6980.c
+++ b/src/code_13870_len_6980.c
@@ -52,7 +52,7 @@ INCLUDE_ASM(s32, "code_13870_len_6980", appendGfx_npc);
 
 INCLUDE_ASM(s32, "code_13870_len_6980", render_npcs);
 
-INCLUDE_ASM(s32, "code_13870_len_6980", npc_move_heading);
+INCLUDE_ASM(void, "code_13870_len_6980", npc_move_heading, Npc* npc, f32 speed, f32 yaw);
 
 INCLUDE_ASM(Npc*, "code_13870_len_6980", get_npc_unsafe, NpcId npcId);
 
diff --git a/src/code_20ec0_len_5040.c b/src/code_20ec0_len_5040.c
index 1892b83b2f..8cafd4fc3c 100644
--- a/src/code_20ec0_len_5040.c
+++ b/src/code_20ec0_len_5040.c
@@ -184,7 +184,7 @@ s32 is_point_within_region(s32 shape, f32 pointX, f32 pointY, f32 centerX, f32 c
     }
 }
 
-INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800490B4);
+INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800490B4, s32 arg0, Enemy* arg1, f32 arg2, s32 arg3, s32 arg4);
 
 INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800493EC);
 
diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c
index 611a56e154..a368d24022 100644
--- a/src/world/area_kmr/kmr_02/8B0070.c
+++ b/src/world/area_kmr/kmr_02/8B0070.c
@@ -76,7 +76,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802414D8_8B1548);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802416D0_8B1740);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241800_8B1870);
+# include "world/common/UnkNpcAIFunc11.inc.c"
 
 # include "world/common/UnkNpcAIFunc10.inc.c"
 
diff --git a/src/world/area_kmr/kmr_07/8D3DC0.c b/src/world/area_kmr/kmr_07/8D3DC0.c
index 64cd4a3d5e..6b077c9632 100644
--- a/src/world/area_kmr/kmr_07/8D3DC0.c
+++ b/src/world/area_kmr/kmr_07/8D3DC0.c
@@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802400B4_8D3E74);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802402AC_8D406C);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802403DC_8D419C);
+# include "world/common/UnkNpcAIFunc11.inc.c"
 
 # include "world/common/UnkNpcAIFunc10.inc.c"
 
@@ -20,4 +20,18 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802405EC_8D43AC);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802407F4_8D45B4);
 
+// see func_802402BC_8D878C
+#ifdef NON_MATCHING
+ApiStatus func_80240A6C_8D482C(ScriptInstance* script, s32 isInitialCall) {
+    Entity* entity = get_entity_by_index(get_variable(NULL, SI_MAP_VAR(0)));
+
+    if (entity == NULL) {
+        return ApiStatus_BLOCK;
+    }
+
+    play_model_animation(entity->unk_14, 0x1E4);
+    return ApiStatus_DONE2;
+}
+#else
 INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_80240A6C_8D482C);
+#endif
diff --git a/src/world/area_kmr/kmr_11/8DA3A0.c b/src/world/area_kmr/kmr_11/8DA3A0.c
index 6a9db35f7b..7677fcd2b5 100644
--- a/src/world/area_kmr/kmr_11/8DA3A0.c
+++ b/src/world/area_kmr/kmr_11/8DA3A0.c
@@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240424_8DA524);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_8024061C_8DA71C);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_8024074C_8DA84C);
+# include "world/common/UnkNpcAIFunc11.inc.c"
 
 # include "world/common/UnkNpcAIFunc10.inc.c"
 
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index ae1fd3127c..17f61f0fff 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802400B4_9C5494);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802402AC_9C568C);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802403DC_9C57BC);
+# include "world/common/UnkNpcAIFunc11.inc.c"
 
 # include "world/common/UnkNpcAIFunc10.inc.c"
 
diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c
index 9006163461..2003d12f88 100644
--- a/src/world/area_omo/omo_02/D9D510.c
+++ b/src/world/area_omo/omo_02/D9D510.c
@@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240F90_D9E460);
 
 INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241188_D9E658);
 
-INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_802412B8_D9E788);
+# include "world/common/UnkNpcAIFunc11.inc.c"
 
 # include "world/common/UnkNpcAIFunc10.inc.c"
 
diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c
index 50f47e2c46..a4ed5bca78 100644
--- a/src/world/area_sbk/sbk_30/93F5B0.c
+++ b/src/world/area_sbk/sbk_30/93F5B0.c
@@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240424_93F9D4);
 
 INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_8024061C_93FBCC);
 
-INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_8024074C_93FCFC);
+# include "world/common/UnkNpcAIFunc11.inc.c"
 
 # include "world/common/UnkNpcAIFunc10.inc.c"
 
diff --git a/src/world/area_trd/trd_01/99CD80.c b/src/world/area_trd/trd_01/99CD80.c
index b846e0cff7..12e6d93c27 100644
--- a/src/world/area_trd/trd_01/99CD80.c
+++ b/src/world/area_trd/trd_01/99CD80.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240C78_99D608);
 
 INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240E70_99D800);
 
-INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240FA0_99D930);
+# include "world/common/UnkNpcAIFunc11.inc.c"
 
 # include "world/common/UnkNpcAIFunc10.inc.c"
 
diff --git a/src/world/common/UnkNpcAIFunc11.inc.c b/src/world/common/UnkNpcAIFunc11.inc.c
new file mode 100644
index 0000000000..00a783472a
--- /dev/null
+++ b/src/world/common/UnkNpcAIFunc11.inc.c
@@ -0,0 +1,23 @@
+#include "common.h"
+#include "map.h"
+
+static void UnkNpcAIFunc11(ScriptInstance* script, NpcAISettings* aiSettings, s32 arg2) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if (func_800490B4(arg2, enemy, aiSettings->chaseSpeed, aiSettings->unk_1C, 1) == 0) {
+        s32* something;
+
+        fx_emote(2, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &something);
+        npc->currentAnim = enemy->animList[0];
+        npc->duration = 25;
+        script->functionTemp[0].s = 14;
+    } else {
+        npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+        func_8003D660(npc, 1);
+        npc->duration--;
+        if ((npc->duration << 0x10) == 0) {
+            script->functionTemp[0].s = 12;
+        }
+    }
+}