From d801c72075ce73897e744dc242def797e4c1335b Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sat, 21 Nov 2020 23:47:41 -0500
Subject: [PATCH] UnkNpcAIFunc7

---
 .../area_dgb/dgb_02/C2EBA0/func_8024006C_C2EC0C.s |  2 +-
 .../area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s |  2 +-
 .../area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s |  2 +-
 .../area_dgb/dgb_03/C31730/func_802402BC_C3179C.s |  2 +-
 .../area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s |  2 +-
 .../area_dgb/dgb_03/C31730/func_802419B0_C32E90.s |  2 +-
 .../area_dgb/dgb_03/C31730/func_80242480_C33960.s |  2 +-
 .../area_dgb/dgb_05/C3AA10/func_802400CC_C3AADC.s |  2 +-
 .../area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s |  2 +-
 .../area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s |  2 +-
 .../area_dgb/dgb_07/C3DBF0/func_8024006C_C3DC5C.s |  2 +-
 .../area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s |  2 +-
 .../area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s |  2 +-
 .../area_dgb/dgb_08/C3FDB0/func_80240EFC_C40CAC.s |  2 +-
 .../area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s |  2 +-
 .../area_dgb/dgb_09/C46BE0/func_8024006C_C46C4C.s |  2 +-
 .../area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s |  2 +-
 .../area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s |  2 +-
 .../area_dgb/dgb_15/C4F510/func_8024006C_C4F57C.s |  2 +-
 .../area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s |  2 +-
 .../area_dgb/dgb_16/C52540/func_8024006C_C525AC.s |  2 +-
 .../area_dgb/dgb_16/C52540/func_80240E20_C53360.s |  2 +-
 .../area_dgb/dgb_16/C52540/func_80241170_C536B0.s |  2 +-
 .../area_jan/jan_05/B4B260/func_80241EE8_B4C958.s |  2 +-
 .../area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s |  2 +-
 .../area_jan/jan_06/B52F70/func_80241888_B540B8.s |  2 +-
 .../area_jan/jan_06/B52F70/func_80241E38_B54668.s |  2 +-
 .../area_jan/jan_06/B52F70/func_802420EC_B5491C.s |  2 +-
 .../area_jan/jan_07/B59870/func_80240280_B59AF0.s |  2 +-
 .../area_jan/jan_07/B59870/func_80240830_B5A0A0.s |  2 +-
 .../area_jan/jan_07/B59870/func_80240AE4_B5A354.s |  2 +-
 .../area_jan/jan_08/B5F650/func_802416D4_B5F984.s |  2 +-
 .../area_jan/jan_08/B5F650/func_80241C84_B5FF34.s |  2 +-
 .../area_jan/jan_08/B5F650/func_80241F38_B601E8.s |  2 +-
 .../area_jan/jan_09/B663F0/func_80240BC0_B66670.s |  2 +-
 .../area_jan/jan_09/B663F0/func_80241170_B66C20.s |  2 +-
 .../area_jan/jan_09/B663F0/func_80241424_B66ED4.s |  2 +-
 .../area_jan/jan_12/B73570/func_80240740_B737F0.s |  2 +-
 .../area_jan/jan_12/B73570/func_80240CF0_B73DA0.s |  2 +-
 .../area_jan/jan_12/B73570/func_80240FA4_B74054.s |  2 +-
 .../area_kzn/kzn_03/C61020/func_80240C64_C61974.s |  2 +-
 .../area_kzn/kzn_03/C61020/func_80241214_C61F24.s |  2 +-
 .../area_kzn/kzn_08/C71ED0/func_802425A8_C73A28.s |  2 +-
 .../area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s |  2 +-
 .../area_kzn/kzn_09/C77D00/func_8024108C_C77D6C.s |  2 +-
 .../area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s |  2 +-
 .../area_kzn/kzn_17/C85DC0/func_8024037C_C85E2C.s |  2 +-
 .../area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s |  2 +-
 .../area_mim/mim_01/B93940/func_8024056C_B939AC.s |  2 +-
 .../area_mim/mim_01/B93940/func_80240B1C_B93F5C.s |  2 +-
 .../area_mim/mim_05/BA07A0/func_802400DC_BA080C.s |  2 +-
 .../area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s |  2 +-
 .../area_mim/mim_06/BA4CF0/func_802405DC_BA4D5C.s |  2 +-
 .../area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s |  2 +-
 .../area_mim/mim_08/BAD940/func_80241604_BAEF44.s |  2 +-
 .../area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s |  2 +-
 .../area_pra/pra_35/D8D270/func_80241E1C_D8F06C.s |  2 +-
 .../area_pra/pra_35/D8D270/func_802423CC_D8F61C.s |  2 +-
 .../area_pra/pra_35/D8D270/func_80242698_D8F8E8.s |  2 +-
 .../area_pra/pra_37/D92F40/func_80240FBC_D93EFC.s |  2 +-
 .../area_pra/pra_37/D92F40/func_8024156C_D944AC.s |  2 +-
 .../area_sam/sam_03/D110C0/func_802400BC_D1117C.s |  2 +-
 .../area_sam/sam_03/D110C0/func_8024066C_D1172C.s |  2 +-
 .../area_sam/sam_05/D187E0/func_8024006C_D1884C.s |  2 +-
 .../area_sam/sam_05/D187E0/func_8024061C_D18DFC.s |  2 +-
 .../area_sam/sam_07/D2BD30/func_802406BC_D2C3EC.s |  2 +-
 .../area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s |  2 +-
 .../area_sam/sam_08/D309C0/func_80240DAC_D30A2C.s |  2 +-
 .../area_sam/sam_08/D309C0/func_8024135C_D30FDC.s |  2 +-
 .../area_sam/sam_10/D37BD0/func_8024043C_D37C3C.s |  2 +-
 .../area_sam/sam_10/D37BD0/func_802409EC_D381EC.s |  2 +-
 src/world/area_dgb/dgb_02/C2EBA0.c                |  2 +-
 src/world/area_dgb/dgb_03/C31730.c                |  2 +-
 src/world/area_dgb/dgb_05/C3AA10.c                |  2 +-
 src/world/area_dgb/dgb_07/C3DBF0.c                |  2 +-
 src/world/area_dgb/dgb_08/C3FDB0.c                |  2 +-
 src/world/area_dgb/dgb_09/C46BE0.c                |  2 +-
 src/world/area_dgb/dgb_15/C4F510.c                |  2 +-
 src/world/area_dgb/dgb_16/C52540.c                |  2 +-
 src/world/area_jan/jan_05/B4B260.c                |  2 +-
 src/world/area_jan/jan_06/B52F70.c                |  2 +-
 src/world/area_jan/jan_07/B59870.c                |  2 +-
 src/world/area_jan/jan_08/B5F650.c                |  2 +-
 src/world/area_jan/jan_09/B663F0.c                |  2 +-
 src/world/area_jan/jan_12/B73570.c                |  2 +-
 src/world/area_kzn/kzn_03/C61020.c                |  2 +-
 src/world/area_kzn/kzn_08/C71ED0.c                |  2 +-
 src/world/area_kzn/kzn_09/C77D00.c                |  2 +-
 src/world/area_kzn/kzn_17/C85DC0.c                |  2 +-
 src/world/area_mim/mim_01/B93940.c                |  2 +-
 src/world/area_mim/mim_05/BA07A0.c                |  2 +-
 src/world/area_mim/mim_06/BA4CF0.c                |  2 +-
 src/world/area_mim/mim_08/BAD940.c                |  2 +-
 src/world/area_pra/pra_35/D8D270.c                |  2 +-
 src/world/area_pra/pra_37/D92F40.c                |  2 +-
 src/world/area_sam/sam_03/D110C0.c                |  2 +-
 src/world/area_sam/sam_05/D187E0.c                |  2 +-
 src/world/area_sam/sam_07/D2BD30.c                |  2 +-
 src/world/area_sam/sam_08/D309C0.c                |  2 +-
 src/world/area_sam/sam_10/D37BD0.c                |  2 +-
 src/world/common/UnkNpcAIFunc7.inc.c              | 15 +++++++++++++++
 101 files changed, 115 insertions(+), 100 deletions(-)
 create mode 100644 src/world/common/UnkNpcAIFunc7.inc.c

diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024006C_C2EC0C.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024006C_C2EC0C.s
index df3db0ebc5..a30f1edbdd 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024006C_C2EC0C.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024006C_C2EC0C.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8024006C_C2EC0C
+glabel UnkNpcAIFunc7
 /* C2EC0C 8024006C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C2EC10 80240070 AFB10014 */  sw        $s1, 0x14($sp)
 /* C2EC14 80240074 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s
index 2c39e35e7a..75f8c30d2e 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s
@@ -153,7 +153,7 @@ glabel func_8024061C_C2F1BC
 /* C2F3F4 80240854 00000000 */   nop      
 /* C2F3F8 80240858 0C090000 */  jal       UnkNpcAIFunc6
 /* C2F3FC 8024085C 0240202D */   daddu    $a0, $s2, $zero
-/* C2F400 80240860 0C09001B */  jal       func_8024006C_C2EC0C
+/* C2F400 80240860 0C09001B */  jal       UnkNpcAIFunc7
 /* C2F404 80240864 0240202D */   daddu    $a0, $s2, $zero
 /* C2F408 80240868 8E430070 */  lw        $v1, 0x70($s2)
 /* C2F40C 8024086C 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s
index 16b0a036e7..d9febe053a 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s
@@ -174,7 +174,7 @@ glabel func_802410D4_C2FC74
 /* C2FF00 80241360 2402001F */  addiu     $v0, $zero, 0x1f
 /* C2FF04 80241364 14620025 */  bne       $v1, $v0, .L802413FC
 /* C2FF08 80241368 00000000 */   nop      
-/* C2FF0C 8024136C 0C09001B */  jal       func_8024006C_C2EC0C
+/* C2FF0C 8024136C 0C09001B */  jal       UnkNpcAIFunc7
 /* C2FF10 80241370 0240202D */   daddu    $a0, $s2, $zero
 /* C2FF14 80241374 8E430070 */  lw        $v1, 0x70($s2)
 /* C2FF18 80241378 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802402BC_C3179C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802402BC_C3179C.s
index c609d5bb5b..e5f1fd1252 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802402BC_C3179C.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802402BC_C3179C.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_802402BC_C3179C
+glabel UnkNpcAIFunc7
 /* C3179C 802402BC 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C317A0 802402C0 AFB10014 */  sw        $s1, 0x14($sp)
 /* C317A4 802402C4 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s
index faf1d5ee0e..a54d76ea41 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s
@@ -153,7 +153,7 @@ glabel func_8024086C_C31D4C
 /* C31F84 80240AA4 00000000 */   nop      
 /* C31F88 80240AA8 0C090094 */  jal       UnkNpcAIFunc6
 /* C31F8C 80240AAC 0240202D */   daddu    $a0, $s2, $zero
-/* C31F90 80240AB0 0C0900AF */  jal       func_802402BC_C3179C
+/* C31F90 80240AB0 0C0900AF */  jal       UnkNpcAIFunc7
 /* C31F94 80240AB4 0240202D */   daddu    $a0, $s2, $zero
 /* C31F98 80240AB8 8E430070 */  lw        $v1, 0x70($s2)
 /* C31F9C 80240ABC 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s
index 0bbf765455..ad994a9d19 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s
@@ -159,7 +159,7 @@ glabel func_802419B0_C32E90
 /* C330E0 80241C00 00000000 */   nop      
 /* C330E4 80241C04 0C090094 */  jal       UnkNpcAIFunc6
 /* C330E8 80241C08 0240202D */   daddu    $a0, $s2, $zero
-/* C330EC 80241C0C 0C0900AF */  jal       func_802402BC_C3179C
+/* C330EC 80241C0C 0C0900AF */  jal       UnkNpcAIFunc7
 /* C330F0 80241C10 0240202D */   daddu    $a0, $s2, $zero
 /* C330F4 80241C14 8E430070 */  lw        $v1, 0x70($s2)
 /* C330F8 80241C18 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s
index f9768a170d..fc99bca25f 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s
@@ -174,7 +174,7 @@ glabel func_80242480_C33960
 /* C33BEC 8024270C 2402001F */  addiu     $v0, $zero, 0x1f
 /* C33BF0 80242710 14620025 */  bne       $v1, $v0, .L802427A8
 /* C33BF4 80242714 00000000 */   nop      
-/* C33BF8 80242718 0C0900AF */  jal       func_802402BC_C3179C
+/* C33BF8 80242718 0C0900AF */  jal       UnkNpcAIFunc7
 /* C33BFC 8024271C 0240202D */   daddu    $a0, $s2, $zero
 /* C33C00 80242720 8E430070 */  lw        $v1, 0x70($s2)
 /* C33C04 80242724 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802400CC_C3AADC.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802400CC_C3AADC.s
index 17ad61f51f..fa0126ed39 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802400CC_C3AADC.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802400CC_C3AADC.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_802400CC_C3AADC
+glabel UnkNpcAIFunc7
 /* C3AADC 802400CC 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C3AAE0 802400D0 AFB10014 */  sw        $s1, 0x14($sp)
 /* C3AAE4 802400D4 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s
index 3525206df6..1db7e8175f 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s
@@ -174,7 +174,7 @@ glabel func_80240E80_C3B890
 /* C3BB1C 8024110C 2402001F */  addiu     $v0, $zero, 0x1f
 /* C3BB20 80241110 14620025 */  bne       $v1, $v0, .L802411A8
 /* C3BB24 80241114 00000000 */   nop      
-/* C3BB28 80241118 0C090033 */  jal       func_802400CC_C3AADC
+/* C3BB28 80241118 0C090033 */  jal       UnkNpcAIFunc7
 /* C3BB2C 8024111C 0240202D */   daddu    $a0, $s2, $zero
 /* C3BB30 80241120 8E430070 */  lw        $v1, 0x70($s2)
 /* C3BB34 80241124 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s
index 78d68309cf..5fc7efcb05 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s
@@ -153,7 +153,7 @@ glabel func_802411D0_C3BBE0
 /* C3BE18 80241408 00000000 */   nop      
 /* C3BE1C 8024140C 0C090018 */  jal       UnkNpcAIFunc6
 /* C3BE20 80241410 0240202D */   daddu    $a0, $s2, $zero
-/* C3BE24 80241414 0C090033 */  jal       func_802400CC_C3AADC
+/* C3BE24 80241414 0C090033 */  jal       UnkNpcAIFunc7
 /* C3BE28 80241418 0240202D */   daddu    $a0, $s2, $zero
 /* C3BE2C 8024141C 8E430070 */  lw        $v1, 0x70($s2)
 /* C3BE30 80241420 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024006C_C3DC5C.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024006C_C3DC5C.s
index 650d2d48f1..2b4d2174ef 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024006C_C3DC5C.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024006C_C3DC5C.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8024006C_C3DC5C
+glabel UnkNpcAIFunc7
 /* C3DC5C 8024006C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C3DC60 80240070 AFB10014 */  sw        $s1, 0x14($sp)
 /* C3DC64 80240074 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s
index 92b1aed05f..1337142ed0 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s
@@ -174,7 +174,7 @@ glabel func_80240E20_C3EA10
 /* C3EC9C 802410AC 2402001F */  addiu     $v0, $zero, 0x1f
 /* C3ECA0 802410B0 14620025 */  bne       $v1, $v0, .L80241148
 /* C3ECA4 802410B4 00000000 */   nop      
-/* C3ECA8 802410B8 0C09001B */  jal       func_8024006C_C3DC5C
+/* C3ECA8 802410B8 0C09001B */  jal       UnkNpcAIFunc7
 /* C3ECAC 802410BC 0240202D */   daddu    $a0, $s2, $zero
 /* C3ECB0 802410C0 8E430070 */  lw        $v1, 0x70($s2)
 /* C3ECB4 802410C4 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s
index 8ca442ef6f..ec40049435 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s
@@ -153,7 +153,7 @@ glabel func_80241170_C3ED60
 /* C3EF98 802413A8 00000000 */   nop      
 /* C3EF9C 802413AC 0C090000 */  jal       UnkNpcAIFunc6
 /* C3EFA0 802413B0 0240202D */   daddu    $a0, $s2, $zero
-/* C3EFA4 802413B4 0C09001B */  jal       func_8024006C_C3DC5C
+/* C3EFA4 802413B4 0C09001B */  jal       UnkNpcAIFunc7
 /* C3EFA8 802413B8 0240202D */   daddu    $a0, $s2, $zero
 /* C3EFAC 802413BC 8E430070 */  lw        $v1, 0x70($s2)
 /* C3EFB0 802413C0 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240EFC_C40CAC.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240EFC_C40CAC.s
index 99f70ce678..314a07dfae 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240EFC_C40CAC.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240EFC_C40CAC.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80240EFC_C40CAC
+glabel UnkNpcAIFunc7
 /* C40CAC 80240EFC 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C40CB0 80240F00 AFB10014 */  sw        $s1, 0x14($sp)
 /* C40CB4 80240F04 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s
index 1c7db9b124..b8bcbec829 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s
@@ -153,7 +153,7 @@ glabel func_802414AC_C4125C
 /* C41494 802416E4 00000000 */   nop      
 /* C41498 802416E8 0C0903A4 */  jal       UnkNpcAIFunc6
 /* C4149C 802416EC 0240202D */   daddu    $a0, $s2, $zero
-/* C414A0 802416F0 0C0903BF */  jal       func_80240EFC_C40CAC
+/* C414A0 802416F0 0C0903BF */  jal       UnkNpcAIFunc7
 /* C414A4 802416F4 0240202D */   daddu    $a0, $s2, $zero
 /* C414A8 802416F8 8E430070 */  lw        $v1, 0x70($s2)
 /* C414AC 802416FC 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024006C_C46C4C.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024006C_C46C4C.s
index 3e6e856ef3..d3ba5c5e07 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024006C_C46C4C.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024006C_C46C4C.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8024006C_C46C4C
+glabel UnkNpcAIFunc7
 /* C46C4C 8024006C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C46C50 80240070 AFB10014 */  sw        $s1, 0x14($sp)
 /* C46C54 80240074 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s
index 82ff184cce..1427006391 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s
@@ -153,7 +153,7 @@ glabel func_8024061C_C471FC
 /* C47434 80240854 00000000 */   nop      
 /* C47438 80240858 0C090000 */  jal       UnkNpcAIFunc6
 /* C4743C 8024085C 0240202D */   daddu    $a0, $s2, $zero
-/* C47440 80240860 0C09001B */  jal       func_8024006C_C46C4C
+/* C47440 80240860 0C09001B */  jal       UnkNpcAIFunc7
 /* C47444 80240864 0240202D */   daddu    $a0, $s2, $zero
 /* C47448 80240868 8E430070 */  lw        $v1, 0x70($s2)
 /* C4744C 8024086C 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s
index 87736fe262..e072022b19 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s
@@ -174,7 +174,7 @@ glabel func_802410D4_C47CB4
 /* C47F40 80241360 2402001F */  addiu     $v0, $zero, 0x1f
 /* C47F44 80241364 14620025 */  bne       $v1, $v0, .L802413FC
 /* C47F48 80241368 00000000 */   nop      
-/* C47F4C 8024136C 0C09001B */  jal       func_8024006C_C46C4C
+/* C47F4C 8024136C 0C09001B */  jal       UnkNpcAIFunc7
 /* C47F50 80241370 0240202D */   daddu    $a0, $s2, $zero
 /* C47F54 80241374 8E430070 */  lw        $v1, 0x70($s2)
 /* C47F58 80241378 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024006C_C4F57C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024006C_C4F57C.s
index e6ea1103f7..a685eb64fc 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024006C_C4F57C.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024006C_C4F57C.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8024006C_C4F57C
+glabel UnkNpcAIFunc7
 /* C4F57C 8024006C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C4F580 80240070 AFB10014 */  sw        $s1, 0x14($sp)
 /* C4F584 80240074 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s
index 98950f3736..47f6286eb9 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s
@@ -153,7 +153,7 @@ glabel func_8024061C_C4FB2C
 /* C4FD64 80240854 00000000 */   nop      
 /* C4FD68 80240858 0C090000 */  jal       UnkNpcAIFunc6
 /* C4FD6C 8024085C 0240202D */   daddu    $a0, $s2, $zero
-/* C4FD70 80240860 0C09001B */  jal       func_8024006C_C4F57C
+/* C4FD70 80240860 0C09001B */  jal       UnkNpcAIFunc7
 /* C4FD74 80240864 0240202D */   daddu    $a0, $s2, $zero
 /* C4FD78 80240868 8E430070 */  lw        $v1, 0x70($s2)
 /* C4FD7C 8024086C 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024006C_C525AC.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024006C_C525AC.s
index 839fd0407b..4787e4b4d3 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024006C_C525AC.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024006C_C525AC.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8024006C_C525AC
+glabel UnkNpcAIFunc7
 /* C525AC 8024006C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C525B0 80240070 AFB10014 */  sw        $s1, 0x14($sp)
 /* C525B4 80240074 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s
index 60a5de8a98..29e77b515c 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s
@@ -174,7 +174,7 @@ glabel func_80240E20_C53360
 /* C535EC 802410AC 2402001F */  addiu     $v0, $zero, 0x1f
 /* C535F0 802410B0 14620025 */  bne       $v1, $v0, .L80241148
 /* C535F4 802410B4 00000000 */   nop      
-/* C535F8 802410B8 0C09001B */  jal       func_8024006C_C525AC
+/* C535F8 802410B8 0C09001B */  jal       UnkNpcAIFunc7
 /* C535FC 802410BC 0240202D */   daddu    $a0, $s2, $zero
 /* C53600 802410C0 8E430070 */  lw        $v1, 0x70($s2)
 /* C53604 802410C4 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s
index c51f138d10..2028a09131 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s
@@ -153,7 +153,7 @@ glabel func_80241170_C536B0
 /* C538E8 802413A8 00000000 */   nop      
 /* C538EC 802413AC 0C090000 */  jal       UnkNpcAIFunc6
 /* C538F0 802413B0 0240202D */   daddu    $a0, $s2, $zero
-/* C538F4 802413B4 0C09001B */  jal       func_8024006C_C525AC
+/* C538F4 802413B4 0C09001B */  jal       UnkNpcAIFunc7
 /* C538F8 802413B8 0240202D */   daddu    $a0, $s2, $zero
 /* C538FC 802413BC 8E430070 */  lw        $v1, 0x70($s2)
 /* C53900 802413C0 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s
index 326900dabf..e25bbcec13 100644
--- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s
+++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s
@@ -153,7 +153,7 @@ glabel func_80241EE8_B4C958
 /* B4CB90 80242120 00000000 */   nop
 /* B4CB94 80242124 0C090633 */  jal       UnkNpcAIFunc6
 /* B4CB98 80242128 0240202D */   daddu    $a0, $s2, $zero
-/* B4CB9C 8024212C 0C09064E */  jal       func_80241938_B4C3A8
+/* B4CB9C 8024212C 0C09064E */  jal       UnkNpcAIFunc7
 /* B4CBA0 80242130 0240202D */   daddu    $a0, $s2, $zero
 /* B4CBA4 80242134 8E430070 */  lw        $v1, 0x70($s2)
 /* B4CBA8 80242138 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s
index fdd5eb82f4..16e42eee11 100644
--- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s
+++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s
@@ -153,7 +153,7 @@ glabel func_8024219C_B4CC0C
 /* B4CE44 802423D4 00000000 */   nop
 /* B4CE48 802423D8 0C090633 */  jal       UnkNpcAIFunc6
 /* B4CE4C 802423DC 0240202D */   daddu    $a0, $s2, $zero
-/* B4CE50 802423E0 0C09064E */  jal       func_80241938_B4C3A8
+/* B4CE50 802423E0 0C09064E */  jal       UnkNpcAIFunc7
 /* B4CE54 802423E4 0240202D */   daddu    $a0, $s2, $zero
 /* B4CE58 802423E8 8E430070 */  lw        $v1, 0x70($s2)
 /* B4CE5C 802423EC 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241888_B540B8.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241888_B540B8.s
index 3a56e24358..ceb4518f66 100644
--- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241888_B540B8.s
+++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241888_B540B8.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80241888_B540B8
+glabel UnkNpcAIFunc7
 /* B540B8 80241888 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* B540BC 8024188C AFB10014 */  sw        $s1, 0x14($sp)
 /* B540C0 80241890 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s
index ebcc620dfa..2dce097fa3 100644
--- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s
+++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s
@@ -153,7 +153,7 @@ glabel func_80241E38_B54668
 /* B548A0 80242070 00000000 */   nop      
 /* B548A4 80242074 0C090607 */  jal       UnkNpcAIFunc6
 /* B548A8 80242078 0240202D */   daddu    $a0, $s2, $zero
-/* B548AC 8024207C 0C090622 */  jal       func_80241888_B540B8
+/* B548AC 8024207C 0C090622 */  jal       UnkNpcAIFunc7
 /* B548B0 80242080 0240202D */   daddu    $a0, $s2, $zero
 /* B548B4 80242084 8E430070 */  lw        $v1, 0x70($s2)
 /* B548B8 80242088 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s
index 31dba0a4f0..e84d161a0c 100644
--- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s
+++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s
@@ -153,7 +153,7 @@ glabel func_802420EC_B5491C
 /* B54B54 80242324 00000000 */   nop      
 /* B54B58 80242328 0C090607 */  jal       UnkNpcAIFunc6
 /* B54B5C 8024232C 0240202D */   daddu    $a0, $s2, $zero
-/* B54B60 80242330 0C090622 */  jal       func_80241888_B540B8
+/* B54B60 80242330 0C090622 */  jal       UnkNpcAIFunc7
 /* B54B64 80242334 0240202D */   daddu    $a0, $s2, $zero
 /* B54B68 80242338 8E430070 */  lw        $v1, 0x70($s2)
 /* B54B6C 8024233C 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240280_B59AF0.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240280_B59AF0.s
index 1073480651..fd3ba15f05 100644
--- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240280_B59AF0.s
+++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240280_B59AF0.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80240280_B59AF0
+glabel UnkNpcAIFunc7
 /* B59AF0 80240280 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* B59AF4 80240284 AFB10014 */  sw        $s1, 0x14($sp)
 /* B59AF8 80240288 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s
index 4c75987dff..79ecb0888a 100644
--- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s
+++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s
@@ -153,7 +153,7 @@ glabel func_80240830_B5A0A0
 /* B5A2D8 80240A68 00000000 */   nop      
 /* B5A2DC 80240A6C 0C090085 */  jal       UnkNpcAIFunc6
 /* B5A2E0 80240A70 0240202D */   daddu    $a0, $s2, $zero
-/* B5A2E4 80240A74 0C0900A0 */  jal       func_80240280_B59AF0
+/* B5A2E4 80240A74 0C0900A0 */  jal       UnkNpcAIFunc7
 /* B5A2E8 80240A78 0240202D */   daddu    $a0, $s2, $zero
 /* B5A2EC 80240A7C 8E430070 */  lw        $v1, 0x70($s2)
 /* B5A2F0 80240A80 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s
index 7c63600649..083b58525a 100644
--- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s
+++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s
@@ -153,7 +153,7 @@ glabel func_80240AE4_B5A354
 /* B5A58C 80240D1C 00000000 */   nop      
 /* B5A590 80240D20 0C090085 */  jal       UnkNpcAIFunc6
 /* B5A594 80240D24 0240202D */   daddu    $a0, $s2, $zero
-/* B5A598 80240D28 0C0900A0 */  jal       func_80240280_B59AF0
+/* B5A598 80240D28 0C0900A0 */  jal       UnkNpcAIFunc7
 /* B5A59C 80240D2C 0240202D */   daddu    $a0, $s2, $zero
 /* B5A5A0 80240D30 8E430070 */  lw        $v1, 0x70($s2)
 /* B5A5A4 80240D34 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802416D4_B5F984.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802416D4_B5F984.s
index ff1e37b259..0007e403f9 100644
--- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802416D4_B5F984.s
+++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802416D4_B5F984.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_802416D4_B5F984
+glabel UnkNpcAIFunc7
 /* B5F984 802416D4 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* B5F988 802416D8 AFB10014 */  sw        $s1, 0x14($sp)
 /* B5F98C 802416DC 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s
index 4bf34d2055..67913b5ec9 100644
--- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s
+++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s
@@ -153,7 +153,7 @@ glabel func_80241C84_B5FF34
 /* B6016C 80241EBC 00000000 */   nop      
 /* B60170 80241EC0 0C09059A */  jal       UnkNpcAIFunc6
 /* B60174 80241EC4 0240202D */   daddu    $a0, $s2, $zero
-/* B60178 80241EC8 0C0905B5 */  jal       func_802416D4_B5F984
+/* B60178 80241EC8 0C0905B5 */  jal       UnkNpcAIFunc7
 /* B6017C 80241ECC 0240202D */   daddu    $a0, $s2, $zero
 /* B60180 80241ED0 8E430070 */  lw        $v1, 0x70($s2)
 /* B60184 80241ED4 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s
index eff32b0c5d..ea57464184 100644
--- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s
+++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s
@@ -153,7 +153,7 @@ glabel func_80241F38_B601E8
 /* B60420 80242170 00000000 */   nop      
 /* B60424 80242174 0C09059A */  jal       UnkNpcAIFunc6
 /* B60428 80242178 0240202D */   daddu    $a0, $s2, $zero
-/* B6042C 8024217C 0C0905B5 */  jal       func_802416D4_B5F984
+/* B6042C 8024217C 0C0905B5 */  jal       UnkNpcAIFunc7
 /* B60430 80242180 0240202D */   daddu    $a0, $s2, $zero
 /* B60434 80242184 8E430070 */  lw        $v1, 0x70($s2)
 /* B60438 80242188 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240BC0_B66670.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240BC0_B66670.s
index 162bde7b22..63fdc7fb28 100644
--- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240BC0_B66670.s
+++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240BC0_B66670.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80240BC0_B66670
+glabel UnkNpcAIFunc7
 /* B66670 80240BC0 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* B66674 80240BC4 AFB10014 */  sw        $s1, 0x14($sp)
 /* B66678 80240BC8 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s
index 0311bcca9f..01457a320a 100644
--- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s
+++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s
@@ -153,7 +153,7 @@ glabel func_80241170_B66C20
 /* B66E58 802413A8 00000000 */   nop      
 /* B66E5C 802413AC 0C0902D5 */  jal       UnkNpcAIFunc6
 /* B66E60 802413B0 0240202D */   daddu    $a0, $s2, $zero
-/* B66E64 802413B4 0C0902F0 */  jal       func_80240BC0_B66670
+/* B66E64 802413B4 0C0902F0 */  jal       UnkNpcAIFunc7
 /* B66E68 802413B8 0240202D */   daddu    $a0, $s2, $zero
 /* B66E6C 802413BC 8E430070 */  lw        $v1, 0x70($s2)
 /* B66E70 802413C0 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s
index 6f125ec16c..e06f59cba5 100644
--- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s
+++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s
@@ -153,7 +153,7 @@ glabel func_80241424_B66ED4
 /* B6710C 8024165C 00000000 */   nop      
 /* B67110 80241660 0C0902D5 */  jal       UnkNpcAIFunc6
 /* B67114 80241664 0240202D */   daddu    $a0, $s2, $zero
-/* B67118 80241668 0C0902F0 */  jal       func_80240BC0_B66670
+/* B67118 80241668 0C0902F0 */  jal       UnkNpcAIFunc7
 /* B6711C 8024166C 0240202D */   daddu    $a0, $s2, $zero
 /* B67120 80241670 8E430070 */  lw        $v1, 0x70($s2)
 /* B67124 80241674 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240740_B737F0.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240740_B737F0.s
index 63a4ff8f2d..604576092c 100644
--- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240740_B737F0.s
+++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240740_B737F0.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80240740_B737F0
+glabel UnkNpcAIFunc7
 /* B737F0 80240740 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* B737F4 80240744 AFB10014 */  sw        $s1, 0x14($sp)
 /* B737F8 80240748 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s
index c72711f5e9..fa57b8e92b 100644
--- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s
+++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s
@@ -153,7 +153,7 @@ glabel func_80240CF0_B73DA0
 /* B73FD8 80240F28 00000000 */   nop      
 /* B73FDC 80240F2C 0C0901B5 */  jal       UnkNpcAIFunc6
 /* B73FE0 80240F30 0240202D */   daddu    $a0, $s2, $zero
-/* B73FE4 80240F34 0C0901D0 */  jal       func_80240740_B737F0
+/* B73FE4 80240F34 0C0901D0 */  jal       UnkNpcAIFunc7
 /* B73FE8 80240F38 0240202D */   daddu    $a0, $s2, $zero
 /* B73FEC 80240F3C 8E430070 */  lw        $v1, 0x70($s2)
 /* B73FF0 80240F40 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s
index 88a14684b0..8b875d39e8 100644
--- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s
+++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s
@@ -153,7 +153,7 @@ glabel func_80240FA4_B74054
 /* B7428C 802411DC 00000000 */   nop      
 /* B74290 802411E0 0C0901B5 */  jal       UnkNpcAIFunc6
 /* B74294 802411E4 0240202D */   daddu    $a0, $s2, $zero
-/* B74298 802411E8 0C0901D0 */  jal       func_80240740_B737F0
+/* B74298 802411E8 0C0901D0 */  jal       UnkNpcAIFunc7
 /* B7429C 802411EC 0240202D */   daddu    $a0, $s2, $zero
 /* B742A0 802411F0 8E430070 */  lw        $v1, 0x70($s2)
 /* B742A4 802411F4 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240C64_C61974.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240C64_C61974.s
index e9406010e5..b36c547974 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240C64_C61974.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240C64_C61974.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80240C64_C61974
+glabel UnkNpcAIFunc7
 /* C61974 80240C64 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C61978 80240C68 AFB10014 */  sw        $s1, 0x14($sp)
 /* C6197C 80240C6C 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s
index 3775e0ea4d..41251c6067 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s
@@ -153,7 +153,7 @@ glabel func_80241214_C61F24
 /* C6215C 8024144C 00000000 */   nop      
 /* C62160 80241450 0C0902FE */  jal       UnkNpcAIFunc6
 /* C62164 80241454 0240202D */   daddu    $a0, $s2, $zero
-/* C62168 80241458 0C090319 */  jal       func_80240C64_C61974
+/* C62168 80241458 0C090319 */  jal       UnkNpcAIFunc7
 /* C6216C 8024145C 0240202D */   daddu    $a0, $s2, $zero
 /* C62170 80241460 8E430070 */  lw        $v1, 0x70($s2)
 /* C62174 80241464 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802425A8_C73A28.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802425A8_C73A28.s
index 5dd365e38d..f31beb78bd 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802425A8_C73A28.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802425A8_C73A28.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_802425A8_C73A28
+glabel UnkNpcAIFunc7
 /* C73A28 802425A8 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C73A2C 802425AC AFB10014 */  sw        $s1, 0x14($sp)
 /* C73A30 802425B0 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s
index b33ee8ad2a..372306fe5e 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s
@@ -153,7 +153,7 @@ glabel func_80242B58_C73FD8
 /* C74210 80242D90 00000000 */   nop      
 /* C74214 80242D94 0C09094F */  jal       UnkNpcAIFunc6
 /* C74218 80242D98 0240202D */   daddu    $a0, $s2, $zero
-/* C7421C 80242D9C 0C09096A */  jal       func_802425A8_C73A28
+/* C7421C 80242D9C 0C09096A */  jal       UnkNpcAIFunc7
 /* C74220 80242DA0 0240202D */   daddu    $a0, $s2, $zero
 /* C74224 80242DA4 8E430070 */  lw        $v1, 0x70($s2)
 /* C74228 80242DA8 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024108C_C77D6C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024108C_C77D6C.s
index 62a8f3ea01..94262e2ad8 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024108C_C77D6C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024108C_C77D6C.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8024108C_C77D6C
+glabel UnkNpcAIFunc7
 /* C77D6C 8024108C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C77D70 80241090 AFB10014 */  sw        $s1, 0x14($sp)
 /* C77D74 80241094 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s
index cb00d57462..f034be043e 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s
@@ -153,7 +153,7 @@ glabel func_8024163C_C7831C
 /* C78554 80241874 00000000 */   nop      
 /* C78558 80241878 0C090408 */  jal       UnkNpcAIFunc6
 /* C7855C 8024187C 0240202D */   daddu    $a0, $s2, $zero
-/* C78560 80241880 0C090423 */  jal       func_8024108C_C77D6C
+/* C78560 80241880 0C090423 */  jal       UnkNpcAIFunc7
 /* C78564 80241884 0240202D */   daddu    $a0, $s2, $zero
 /* C78568 80241888 8E430070 */  lw        $v1, 0x70($s2)
 /* C7856C 8024188C 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024037C_C85E2C.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024037C_C85E2C.s
index 24b9be23a5..782b732eb0 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024037C_C85E2C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024037C_C85E2C.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8024037C_C85E2C
+glabel UnkNpcAIFunc7
 /* C85E2C 8024037C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C85E30 80240380 AFB10014 */  sw        $s1, 0x14($sp)
 /* C85E34 80240384 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s
index 2abc561033..7831214053 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s
@@ -153,7 +153,7 @@ glabel func_8024092C_C863DC
 /* C86614 80240B64 00000000 */   nop      
 /* C86618 80240B68 0C0900C4 */  jal       UnkNpcAIFunc6
 /* C8661C 80240B6C 0240202D */   daddu    $a0, $s2, $zero
-/* C86620 80240B70 0C0900DF */  jal       func_8024037C_C85E2C
+/* C86620 80240B70 0C0900DF */  jal       UnkNpcAIFunc7
 /* C86624 80240B74 0240202D */   daddu    $a0, $s2, $zero
 /* C86628 80240B78 8E430070 */  lw        $v1, 0x70($s2)
 /* C8662C 80240B7C 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_8024056C_B939AC.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_8024056C_B939AC.s
index b20e906739..4f83127125 100644
--- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_8024056C_B939AC.s
+++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_8024056C_B939AC.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8024056C_B939AC
+glabel UnkNpcAIFunc7
 /* B939AC 8024056C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* B939B0 80240570 AFB10014 */  sw        $s1, 0x14($sp)
 /* B939B4 80240574 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s
index 9b0e5bee87..0b92792a16 100644
--- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s
+++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s
@@ -153,7 +153,7 @@ glabel func_80240B1C_B93F5C
 /* B94194 80240D54 00000000 */   nop      
 /* B94198 80240D58 0C090140 */  jal       UnkNpcAIFunc6
 /* B9419C 80240D5C 0240202D */   daddu    $a0, $s2, $zero
-/* B941A0 80240D60 0C09015B */  jal       func_8024056C_B939AC
+/* B941A0 80240D60 0C09015B */  jal       UnkNpcAIFunc7
 /* B941A4 80240D64 0240202D */   daddu    $a0, $s2, $zero
 /* B941A8 80240D68 8E430070 */  lw        $v1, 0x70($s2)
 /* B941AC 80240D6C 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802400DC_BA080C.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802400DC_BA080C.s
index 199e967854..828f343631 100644
--- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802400DC_BA080C.s
+++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802400DC_BA080C.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_802400DC_BA080C
+glabel UnkNpcAIFunc7
 /* BA080C 802400DC 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* BA0810 802400E0 AFB10014 */  sw        $s1, 0x14($sp)
 /* BA0814 802400E4 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s
index 63dac87992..2aff10a52f 100644
--- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s
+++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s
@@ -153,7 +153,7 @@ glabel func_8024068C_BA0DBC
 /* BA0FF4 802408C4 00000000 */   nop      
 /* BA0FF8 802408C8 0C09001C */  jal       UnkNpcAIFunc6
 /* BA0FFC 802408CC 0240202D */   daddu    $a0, $s2, $zero
-/* BA1000 802408D0 0C090037 */  jal       func_802400DC_BA080C
+/* BA1000 802408D0 0C090037 */  jal       UnkNpcAIFunc7
 /* BA1004 802408D4 0240202D */   daddu    $a0, $s2, $zero
 /* BA1008 802408D8 8E430070 */  lw        $v1, 0x70($s2)
 /* BA100C 802408DC 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802405DC_BA4D5C.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802405DC_BA4D5C.s
index 93bea96856..65435e5b32 100644
--- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802405DC_BA4D5C.s
+++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_802405DC_BA4D5C.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_802405DC_BA4D5C
+glabel UnkNpcAIFunc7
 /* BA4D5C 802405DC 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* BA4D60 802405E0 AFB10014 */  sw        $s1, 0x14($sp)
 /* BA4D64 802405E4 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s
index 09fe56d0f2..02467f718c 100644
--- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s
+++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s
@@ -153,7 +153,7 @@ glabel func_80240B8C_BA530C
 /* BA5544 80240DC4 00000000 */   nop      
 /* BA5548 80240DC8 0C09015C */  jal       UnkNpcAIFunc6
 /* BA554C 80240DCC 0240202D */   daddu    $a0, $s2, $zero
-/* BA5550 80240DD0 0C090177 */  jal       func_802405DC_BA4D5C
+/* BA5550 80240DD0 0C090177 */  jal       UnkNpcAIFunc7
 /* BA5554 80240DD4 0240202D */   daddu    $a0, $s2, $zero
 /* BA5558 80240DD8 8E430070 */  lw        $v1, 0x70($s2)
 /* BA555C 80240DDC 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241604_BAEF44.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241604_BAEF44.s
index 41adc3eca9..5965cf51bb 100644
--- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241604_BAEF44.s
+++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241604_BAEF44.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80241604_BAEF44
+glabel UnkNpcAIFunc7
 /* BAEF44 80241604 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* BAEF48 80241608 AFB10014 */  sw        $s1, 0x14($sp)
 /* BAEF4C 8024160C 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s
index 3055110ce8..6232661d79 100644
--- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s
+++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s
@@ -153,7 +153,7 @@ glabel func_80241BB4_BAF4F4
 /* BAF72C 80241DEC 00000000 */   nop      
 /* BAF730 80241DF0 0C090566 */  jal       UnkNpcAIFunc6
 /* BAF734 80241DF4 0240202D */   daddu    $a0, $s2, $zero
-/* BAF738 80241DF8 0C090581 */  jal       func_80241604_BAEF44
+/* BAF738 80241DF8 0C090581 */  jal       UnkNpcAIFunc7
 /* BAF73C 80241DFC 0240202D */   daddu    $a0, $s2, $zero
 /* BAF740 80241E00 8E430070 */  lw        $v1, 0x70($s2)
 /* BAF744 80241E04 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241E1C_D8F06C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241E1C_D8F06C.s
index 130c95ae9e..8d15a8ac12 100644
--- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241E1C_D8F06C.s
+++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241E1C_D8F06C.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80241E1C_D8F06C
+glabel UnkNpcAIFunc7
 /* D8F06C 80241E1C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* D8F070 80241E20 AFB10014 */  sw        $s1, 0x14($sp)
 /* D8F074 80241E24 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s
index 166fb8c810..b8bf60cd99 100644
--- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s
+++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s
@@ -159,7 +159,7 @@ glabel func_802423CC_D8F61C
 /* D8F86C 8024261C 00000000 */   nop      
 /* D8F870 80242620 0C09076C */  jal       UnkNpcAIFunc6
 /* D8F874 80242624 0240202D */   daddu    $a0, $s2, $zero
-/* D8F878 80242628 0C090787 */  jal       func_80241E1C_D8F06C
+/* D8F878 80242628 0C090787 */  jal       UnkNpcAIFunc7
 /* D8F87C 8024262C 0240202D */   daddu    $a0, $s2, $zero
 /* D8F880 80242630 8E430070 */  lw        $v1, 0x70($s2)
 /* D8F884 80242634 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s
index 5e6a098fc4..967992e351 100644
--- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s
+++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s
@@ -153,7 +153,7 @@ glabel func_80242698_D8F8E8
 /* D8FB20 802428D0 00000000 */   nop      
 /* D8FB24 802428D4 0C09076C */  jal       UnkNpcAIFunc6
 /* D8FB28 802428D8 0240202D */   daddu    $a0, $s2, $zero
-/* D8FB2C 802428DC 0C090787 */  jal       func_80241E1C_D8F06C
+/* D8FB2C 802428DC 0C090787 */  jal       UnkNpcAIFunc7
 /* D8FB30 802428E0 0240202D */   daddu    $a0, $s2, $zero
 /* D8FB34 802428E4 8E430070 */  lw        $v1, 0x70($s2)
 /* D8FB38 802428E8 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240FBC_D93EFC.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240FBC_D93EFC.s
index 6e196424e2..cbc46863c6 100644
--- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240FBC_D93EFC.s
+++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240FBC_D93EFC.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80240FBC_D93EFC
+glabel UnkNpcAIFunc7
 /* D93EFC 80240FBC 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* D93F00 80240FC0 AFB10014 */  sw        $s1, 0x14($sp)
 /* D93F04 80240FC4 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s
index e69c4c29a6..6db0643e2c 100644
--- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s
+++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s
@@ -153,7 +153,7 @@ glabel func_8024156C_D944AC
 /* D946E4 802417A4 00000000 */   nop      
 /* D946E8 802417A8 0C0903D4 */  jal       UnkNpcAIFunc6
 /* D946EC 802417AC 0240202D */   daddu    $a0, $s2, $zero
-/* D946F0 802417B0 0C0903EF */  jal       func_80240FBC_D93EFC
+/* D946F0 802417B0 0C0903EF */  jal       UnkNpcAIFunc7
 /* D946F4 802417B4 0240202D */   daddu    $a0, $s2, $zero
 /* D946F8 802417B8 8E430070 */  lw        $v1, 0x70($s2)
 /* D946FC 802417BC 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_802400BC_D1117C.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_802400BC_D1117C.s
index 3ebdb78f6a..8712b610f1 100644
--- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_802400BC_D1117C.s
+++ b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_802400BC_D1117C.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_802400BC_D1117C
+glabel UnkNpcAIFunc7
 /* D1117C 802400BC 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* D11180 802400C0 AFB10014 */  sw        $s1, 0x14($sp)
 /* D11184 802400C4 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s
index 8a81e2ee5e..f29746705a 100644
--- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s
+++ b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s
@@ -153,7 +153,7 @@ glabel func_8024066C_D1172C
 /* D11964 802408A4 00000000 */   nop      
 /* D11968 802408A8 0C090014 */  jal       UnkNpcAIFunc6
 /* D1196C 802408AC 0240202D */   daddu    $a0, $s2, $zero
-/* D11970 802408B0 0C09002F */  jal       func_802400BC_D1117C
+/* D11970 802408B0 0C09002F */  jal       UnkNpcAIFunc7
 /* D11974 802408B4 0240202D */   daddu    $a0, $s2, $zero
 /* D11978 802408B8 8E430070 */  lw        $v1, 0x70($s2)
 /* D1197C 802408BC 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024006C_D1884C.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024006C_D1884C.s
index 742e943ad5..db90faad74 100644
--- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024006C_D1884C.s
+++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024006C_D1884C.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8024006C_D1884C
+glabel UnkNpcAIFunc7
 /* D1884C 8024006C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* D18850 80240070 AFB10014 */  sw        $s1, 0x14($sp)
 /* D18854 80240074 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s
index fe3cfbb475..94dbde66d3 100644
--- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s
+++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s
@@ -153,7 +153,7 @@ glabel func_8024061C_D18DFC
 /* D19034 80240854 00000000 */   nop      
 /* D19038 80240858 0C090000 */  jal       UnkNpcAIFunc6
 /* D1903C 8024085C 0240202D */   daddu    $a0, $s2, $zero
-/* D19040 80240860 0C09001B */  jal       func_8024006C_D1884C
+/* D19040 80240860 0C09001B */  jal       UnkNpcAIFunc7
 /* D19044 80240864 0240202D */   daddu    $a0, $s2, $zero
 /* D19048 80240868 8E430070 */  lw        $v1, 0x70($s2)
 /* D1904C 8024086C 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_802406BC_D2C3EC.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_802406BC_D2C3EC.s
index 77af27fa6b..ecff8c9213 100644
--- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_802406BC_D2C3EC.s
+++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_802406BC_D2C3EC.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_802406BC_D2C3EC
+glabel UnkNpcAIFunc7
 /* D2C3EC 802406BC 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* D2C3F0 802406C0 AFB10014 */  sw        $s1, 0x14($sp)
 /* D2C3F4 802406C4 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s
index 5382e80464..8e74ee8648 100644
--- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s
+++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s
@@ -153,7 +153,7 @@ glabel func_80240C6C_D2C99C
 /* D2CBD4 80240EA4 00000000 */   nop      
 /* D2CBD8 80240EA8 0C090194 */  jal       UnkNpcAIFunc6
 /* D2CBDC 80240EAC 0240202D */   daddu    $a0, $s2, $zero
-/* D2CBE0 80240EB0 0C0901AF */  jal       func_802406BC_D2C3EC
+/* D2CBE0 80240EB0 0C0901AF */  jal       UnkNpcAIFunc7
 /* D2CBE4 80240EB4 0240202D */   daddu    $a0, $s2, $zero
 /* D2CBE8 80240EB8 8E430070 */  lw        $v1, 0x70($s2)
 /* D2CBEC 80240EBC 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240DAC_D30A2C.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240DAC_D30A2C.s
index 8a249da4c0..273cc72c92 100644
--- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240DAC_D30A2C.s
+++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240DAC_D30A2C.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80240DAC_D30A2C
+glabel UnkNpcAIFunc7
 /* D30A2C 80240DAC 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* D30A30 80240DB0 AFB10014 */  sw        $s1, 0x14($sp)
 /* D30A34 80240DB4 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s
index f7f28b1553..1db942b2d5 100644
--- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s
+++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s
@@ -153,7 +153,7 @@ glabel func_8024135C_D30FDC
 /* D31214 80241594 00000000 */   nop      
 /* D31218 80241598 0C090350 */  jal       UnkNpcAIFunc6
 /* D3121C 8024159C 0240202D */   daddu    $a0, $s2, $zero
-/* D31220 802415A0 0C09036B */  jal       func_80240DAC_D30A2C
+/* D31220 802415A0 0C09036B */  jal       UnkNpcAIFunc7
 /* D31224 802415A4 0240202D */   daddu    $a0, $s2, $zero
 /* D31228 802415A8 8E430070 */  lw        $v1, 0x70($s2)
 /* D3122C 802415AC 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024043C_D37C3C.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024043C_D37C3C.s
index 778a400932..5f8b7fa77c 100644
--- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024043C_D37C3C.s
+++ b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024043C_D37C3C.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_8024043C_D37C3C
+glabel UnkNpcAIFunc7
 /* D37C3C 8024043C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* D37C40 80240440 AFB10014 */  sw        $s1, 0x14($sp)
 /* D37C44 80240444 0080882D */  daddu     $s1, $a0, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s
index 8f32456dbb..7a9f078264 100644
--- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s
+++ b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s
@@ -153,7 +153,7 @@ glabel func_802409EC_D381EC
 /* D38424 80240C24 00000000 */   nop      
 /* D38428 80240C28 0C0900F4 */  jal       UnkNpcAIFunc6
 /* D3842C 80240C2C 0240202D */   daddu    $a0, $s2, $zero
-/* D38430 80240C30 0C09010F */  jal       func_8024043C_D37C3C
+/* D38430 80240C30 0C09010F */  jal       UnkNpcAIFunc7
 /* D38434 80240C34 0240202D */   daddu    $a0, $s2, $zero
 /* D38438 80240C38 8E430070 */  lw        $v1, 0x70($s2)
 /* D3843C 80240C3C 24020020 */  addiu     $v0, $zero, 0x20
diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c
index 22a3f119ef..4d79036c51 100644
--- a/src/world/area_dgb/dgb_02/C2EBA0.c
+++ b/src/world/area_dgb/dgb_02/C2EBA0.c
@@ -2,7 +2,7 @@
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_8024006C_C2EC0C);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_802400DC_C2EC7C);
 
diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c
index 3248c90a14..b1bec91aff 100644
--- a/src/world/area_dgb/dgb_03/C31730.c
+++ b/src/world/area_dgb/dgb_03/C31730.c
@@ -2,7 +2,7 @@
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802402BC_C3179C);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024032C_C3180C);
 
diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c
index 5e1fd0f66d..f3f3702e93 100644
--- a/src/world/area_dgb/dgb_05/C3AA10.c
+++ b/src/world/area_dgb/dgb_05/C3AA10.c
@@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240030_C3AA40);
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_802400CC_C3AADC);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_8024013C_C3AB4C);
 
diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c
index d8b50b42ea..a9170c50fe 100644
--- a/src/world/area_dgb/dgb_07/C3DBF0.c
+++ b/src/world/area_dgb/dgb_07/C3DBF0.c
@@ -2,7 +2,7 @@
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_8024006C_C3DC5C);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_802400DC_C3DCCC);
 
diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c
index 6ecd5cb56d..e2b5397d81 100644
--- a/src/world/area_dgb/dgb_08/C3FDB0.c
+++ b/src/world/area_dgb/dgb_08/C3FDB0.c
@@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240B94_C40944);
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240EFC_C40CAC);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240F6C_C40D1C);
 
diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c
index 5e190b98d6..edcd0c2093 100644
--- a/src/world/area_dgb/dgb_09/C46BE0.c
+++ b/src/world/area_dgb/dgb_09/C46BE0.c
@@ -2,7 +2,7 @@
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_8024006C_C46C4C);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802400DC_C46CBC);
 
diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c
index 6df27a965b..75e2647972 100644
--- a/src/world/area_dgb/dgb_15/C4F510.c
+++ b/src/world/area_dgb/dgb_15/C4F510.c
@@ -2,7 +2,7 @@
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_8024006C_C4F57C);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802400DC_C4F5EC);
 
diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c
index 17e9bbdc41..ee13e88388 100644
--- a/src/world/area_dgb/dgb_16/C52540.c
+++ b/src/world/area_dgb/dgb_16/C52540.c
@@ -2,7 +2,7 @@
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_8024006C_C525AC);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_802400DC_C5261C);
 
diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c
index 26eaa10f61..a52c4fd795 100644
--- a/src/world/area_jan/jan_05/B4B260.c
+++ b/src/world/area_jan/jan_05/B4B260.c
@@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241708_B4C178);
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241938_B4C3A8);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802419A8_B4C418);
 
diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c
index 71e182fc51..c546006e2c 100644
--- a/src/world/area_jan/jan_06/B52F70.c
+++ b/src/world/area_jan/jan_06/B52F70.c
@@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241658_B53E88);
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241888_B540B8);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802418F8_B54128);
 
diff --git a/src/world/area_jan/jan_07/B59870.c b/src/world/area_jan/jan_07/B59870.c
index 8417f5d846..12f4a0c23c 100644
--- a/src/world/area_jan/jan_07/B59870.c
+++ b/src/world/area_jan/jan_07/B59870.c
@@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240050_B598C0);
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240280_B59AF0);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_802402F0_B59B60);
 
diff --git a/src/world/area_jan/jan_08/B5F650.c b/src/world/area_jan/jan_08/B5F650.c
index d99635437c..8677371132 100644
--- a/src/world/area_jan/jan_08/B5F650.c
+++ b/src/world/area_jan/jan_08/B5F650.c
@@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802414A4_B5F754);
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802416D4_B5F984);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241744_B5F9F4);
 
diff --git a/src/world/area_jan/jan_09/B663F0.c b/src/world/area_jan/jan_09/B663F0.c
index 541053c2cd..3d5e9348a8 100644
--- a/src/world/area_jan/jan_09/B663F0.c
+++ b/src/world/area_jan/jan_09/B663F0.c
@@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240990_B66440);
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240BC0_B66670);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240C30_B666E0);
 
diff --git a/src/world/area_jan/jan_12/B73570.c b/src/world/area_jan/jan_12/B73570.c
index bb8646ef22..f12208dae0 100644
--- a/src/world/area_jan/jan_12/B73570.c
+++ b/src/world/area_jan/jan_12/B73570.c
@@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240510_B735C0);
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240740_B737F0);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_802407B0_B73860);
 
diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c
index 06f20dbfbe..622b21ef17 100644
--- a/src/world/area_kzn/kzn_03/C61020.c
+++ b/src/world/area_kzn/kzn_03/C61020.c
@@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_802406A4_C613B4);
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240C64_C61974);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240CD4_C619E4);
 
diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c
index b31469d7ca..3acdf579eb 100644
--- a/src/world/area_kzn/kzn_08/C71ED0.c
+++ b/src/world/area_kzn/kzn_08/C71ED0.c
@@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242354_C737D4);
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802425A8_C73A28);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242618_C73A98);
 
diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c
index 25d74dabf6..d52e02d926 100644
--- a/src/world/area_kzn/kzn_09/C77D00.c
+++ b/src/world/area_kzn/kzn_09/C77D00.c
@@ -2,7 +2,7 @@
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024108C_C77D6C);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802410FC_C77DDC);
 
diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c
index 5a90774c31..dda486d710 100644
--- a/src/world/area_kzn/kzn_17/C85DC0.c
+++ b/src/world/area_kzn/kzn_17/C85DC0.c
@@ -2,7 +2,7 @@
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_8024037C_C85E2C);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_802403EC_C85E9C);
 
diff --git a/src/world/area_mim/mim_01/B93940.c b/src/world/area_mim/mim_01/B93940.c
index 58a5b6b409..c68c3aea47 100644
--- a/src/world/area_mim/mim_01/B93940.c
+++ b/src/world/area_mim/mim_01/B93940.c
@@ -2,7 +2,7 @@
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_8024056C_B939AC);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_802405DC_B93A1C);
 
diff --git a/src/world/area_mim/mim_05/BA07A0.c b/src/world/area_mim/mim_05/BA07A0.c
index 43ba5c2cc6..f2240f894d 100644
--- a/src/world/area_mim/mim_05/BA07A0.c
+++ b/src/world/area_mim/mim_05/BA07A0.c
@@ -2,7 +2,7 @@
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_802400DC_BA080C);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_8024014C_BA087C);
 
diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c
index 332952c3e1..5bd34de39b 100644
--- a/src/world/area_mim/mim_06/BA4CF0.c
+++ b/src/world/area_mim/mim_06/BA4CF0.c
@@ -2,7 +2,7 @@
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_802405DC_BA4D5C);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_8024064C_BA4DCC);
 
diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c
index 0927c51018..62edd0f24b 100644
--- a/src/world/area_mim/mim_08/BAD940.c
+++ b/src/world/area_mim/mim_08/BAD940.c
@@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_802413AC_BAECEC);
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241604_BAEF44);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241674_BAEFB4);
 
diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c
index fb445ee7db..4b2306afd9 100644
--- a/src/world/area_pra/pra_35/D8D270.c
+++ b/src/world/area_pra/pra_35/D8D270.c
@@ -52,7 +52,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241AB4_D8ED04);
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241E1C_D8F06C);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241E8C_D8F0DC);
 
diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c
index ec7d43d634..f9203e82b3 100644
--- a/src/world/area_pra/pra_37/D92F40.c
+++ b/src/world/area_pra/pra_37/D92F40.c
@@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240F1C_D93E5C);
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240FBC_D93EFC);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_8024102C_D93F6C);
 
diff --git a/src/world/area_sam/sam_03/D110C0.c b/src/world/area_sam/sam_03/D110C0.c
index 4cc3ba79d1..44e3c3855e 100644
--- a/src/world/area_sam/sam_03/D110C0.c
+++ b/src/world/area_sam/sam_03/D110C0.c
@@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_80240000_D110C0);
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_802400BC_D1117C);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_8024012C_D111EC);
 
diff --git a/src/world/area_sam/sam_05/D187E0.c b/src/world/area_sam/sam_05/D187E0.c
index fd6b86d027..2cfaf70d64 100644
--- a/src/world/area_sam/sam_05/D187E0.c
+++ b/src/world/area_sam/sam_05/D187E0.c
@@ -2,7 +2,7 @@
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_8024006C_D1884C);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_802400DC_D188BC);
 
diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c
index 1e3020356f..95801c8019 100644
--- a/src/world/area_sam/sam_07/D2BD30.c
+++ b/src/world/area_sam/sam_07/D2BD30.c
@@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802405B0_D2C2E0);
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802406BC_D2C3EC);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_8024072C_D2C45C);
 
diff --git a/src/world/area_sam/sam_08/D309C0.c b/src/world/area_sam/sam_08/D309C0.c
index ff84c9033b..ddc4be40af 100644
--- a/src/world/area_sam/sam_08/D309C0.c
+++ b/src/world/area_sam/sam_08/D309C0.c
@@ -2,7 +2,7 @@
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240DAC_D30A2C);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240E1C_D30A9C);
 
diff --git a/src/world/area_sam/sam_10/D37BD0.c b/src/world/area_sam/sam_10/D37BD0.c
index ace3aae127..cf9e60dea6 100644
--- a/src/world/area_sam/sam_10/D37BD0.c
+++ b/src/world/area_sam/sam_10/D37BD0.c
@@ -2,7 +2,7 @@
 
 #include "world/common/UnkNpcAIFunc6.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_10/D37BD0", func_8024043C_D37C3C);
+#include "world/common/UnkNpcAIFunc7.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_10/D37BD0", func_802404AC_D37CAC);
 
diff --git a/src/world/common/UnkNpcAIFunc7.inc.c b/src/world/common/UnkNpcAIFunc7.inc.c
new file mode 100644
index 0000000000..b343138841
--- /dev/null
+++ b/src/world/common/UnkNpcAIFunc7.inc.c
@@ -0,0 +1,15 @@
+#include "common.h"
+#include "map.h"
+
+static void UnkNpcAIFunc7(ScriptInstance* script) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    npc->duration--;
+    if ((npc->duration << 0x10) <= 0) {
+        enemy->varTable[0] = 3;
+        npc->duration = enemy->varTable[2];
+        npc->currentAnim = enemy->animList[9];
+        script->functionTemp[0].s = 32;
+    }
+}