diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240EB8_D50EA8.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240EB8_D50EA8.s
deleted file mode 100644
index 0edde74182..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240EB8_D50EA8.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB8_D50EA8
-/* D50EA8 80240EB8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D50EAC 80240EBC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D50EB0 80240EC0 0C00EAD2 */  jal       get_npc_safe
-/* D50EB4 80240EC4 2404FFFC */   addiu    $a0, $zero, -4
-/* D50EB8 80240EC8 0040202D */  daddu     $a0, $v0, $zero
-/* D50EBC 80240ECC 10800004 */  beqz      $a0, .L80240EE0
-/* D50EC0 80240ED0 3C030008 */   lui      $v1, 8
-/* D50EC4 80240ED4 8C820000 */  lw        $v0, ($a0)
-/* D50EC8 80240ED8 00431025 */  or        $v0, $v0, $v1
-/* D50ECC 80240EDC AC820000 */  sw        $v0, ($a0)
-.L80240EE0:
-/* D50ED0 80240EE0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D50ED4 80240EE4 03E00008 */  jr        $ra
-/* D50ED8 80240EE8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240EB8_D56A68.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240EB8_D56A68.s
deleted file mode 100644
index c42acfe516..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240EB8_D56A68.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB8_D56A68
-/* D56A68 80240EB8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D56A6C 80240EBC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D56A70 80240EC0 0C00EAD2 */  jal       get_npc_safe
-/* D56A74 80240EC4 2404FFFC */   addiu    $a0, $zero, -4
-/* D56A78 80240EC8 0040202D */  daddu     $a0, $v0, $zero
-/* D56A7C 80240ECC 10800004 */  beqz      $a0, .L80240EE0
-/* D56A80 80240ED0 3C030008 */   lui      $v1, 8
-/* D56A84 80240ED4 8C820000 */  lw        $v0, ($a0)
-/* D56A88 80240ED8 00431025 */  or        $v0, $v0, $v1
-/* D56A8C 80240EDC AC820000 */  sw        $v0, ($a0)
-.L80240EE0:
-/* D56A90 80240EE0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D56A94 80240EE4 03E00008 */  jr        $ra
-/* D56A98 80240EE8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EE8_D58318.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EE8_D58318.s
deleted file mode 100644
index 66f6fd48e4..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EE8_D58318.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EE8_D58318
-/* D58318 80240EE8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D5831C 80240EEC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D58320 80240EF0 0C00EAD2 */  jal       get_npc_safe
-/* D58324 80240EF4 2404FFFC */   addiu    $a0, $zero, -4
-/* D58328 80240EF8 0040202D */  daddu     $a0, $v0, $zero
-/* D5832C 80240EFC 10800004 */  beqz      $a0, .L80240F10
-/* D58330 80240F00 3C030008 */   lui      $v1, 8
-/* D58334 80240F04 8C820000 */  lw        $v0, ($a0)
-/* D58338 80240F08 00431025 */  or        $v0, $v0, $v1
-/* D5833C 80240F0C AC820000 */  sw        $v0, ($a0)
-.L80240F10:
-/* D58340 80240F10 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D58344 80240F14 03E00008 */  jr        $ra
-/* D58348 80240F18 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240EB8_D59748.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240EB8_D59748.s
deleted file mode 100644
index 3fe8b0982e..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240EB8_D59748.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB8_D59748
-/* D59748 80240EB8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D5974C 80240EBC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D59750 80240EC0 0C00EAD2 */  jal       get_npc_safe
-/* D59754 80240EC4 2404FFFC */   addiu    $a0, $zero, -4
-/* D59758 80240EC8 0040202D */  daddu     $a0, $v0, $zero
-/* D5975C 80240ECC 10800004 */  beqz      $a0, .L80240EE0
-/* D59760 80240ED0 3C030008 */   lui      $v1, 8
-/* D59764 80240ED4 8C820000 */  lw        $v0, ($a0)
-/* D59768 80240ED8 00431025 */  or        $v0, $v0, $v1
-/* D5976C 80240EDC AC820000 */  sw        $v0, ($a0)
-.L80240EE0:
-/* D59770 80240EE0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D59774 80240EE4 03E00008 */  jr        $ra
-/* D59778 80240EE8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240EB8_D60168.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240EB8_D60168.s
deleted file mode 100644
index 111c1decf6..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240EB8_D60168.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB8_D60168
-/* D60168 80240EB8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D6016C 80240EBC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D60170 80240EC0 0C00EAD2 */  jal       get_npc_safe
-/* D60174 80240EC4 2404FFFC */   addiu    $a0, $zero, -4
-/* D60178 80240EC8 0040202D */  daddu     $a0, $v0, $zero
-/* D6017C 80240ECC 10800004 */  beqz      $a0, .L80240EE0
-/* D60180 80240ED0 3C030008 */   lui      $v1, 8
-/* D60184 80240ED4 8C820000 */  lw        $v0, ($a0)
-/* D60188 80240ED8 00431025 */  or        $v0, $v0, $v1
-/* D6018C 80240EDC AC820000 */  sw        $v0, ($a0)
-.L80240EE0:
-/* D60190 80240EE0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D60194 80240EE4 03E00008 */  jr        $ra
-/* D60198 80240EE8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240EB8_D623B8.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240EB8_D623B8.s
deleted file mode 100644
index a8347c5c70..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240EB8_D623B8.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB8_D623B8
-/* D623B8 80240EB8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D623BC 80240EBC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D623C0 80240EC0 0C00EAD2 */  jal       get_npc_safe
-/* D623C4 80240EC4 2404FFFC */   addiu    $a0, $zero, -4
-/* D623C8 80240EC8 0040202D */  daddu     $a0, $v0, $zero
-/* D623CC 80240ECC 10800004 */  beqz      $a0, .L80240EE0
-/* D623D0 80240ED0 3C030008 */   lui      $v1, 8
-/* D623D4 80240ED4 8C820000 */  lw        $v0, ($a0)
-/* D623D8 80240ED8 00431025 */  or        $v0, $v0, $v1
-/* D623DC 80240EDC AC820000 */  sw        $v0, ($a0)
-.L80240EE0:
-/* D623E0 80240EE0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D623E4 80240EE4 03E00008 */  jr        $ra
-/* D623E8 80240EE8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240EE8_D63BF8.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240EE8_D63BF8.s
deleted file mode 100644
index e7d256a906..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240EE8_D63BF8.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EE8_D63BF8
-/* D63BF8 80240EE8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D63BFC 80240EEC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D63C00 80240EF0 0C00EAD2 */  jal       get_npc_safe
-/* D63C04 80240EF4 2404FFFC */   addiu    $a0, $zero, -4
-/* D63C08 80240EF8 0040202D */  daddu     $a0, $v0, $zero
-/* D63C0C 80240EFC 10800004 */  beqz      $a0, .L80240F10
-/* D63C10 80240F00 3C030008 */   lui      $v1, 8
-/* D63C14 80240F04 8C820000 */  lw        $v0, ($a0)
-/* D63C18 80240F08 00431025 */  or        $v0, $v0, $v1
-/* D63C1C 80240F0C AC820000 */  sw        $v0, ($a0)
-.L80240F10:
-/* D63C20 80240F10 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D63C24 80240F14 03E00008 */  jr        $ra
-/* D63C28 80240F18 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240EB8_D65498.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240EB8_D65498.s
deleted file mode 100644
index b4618eed55..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240EB8_D65498.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB8_D65498
-/* D65498 80240EB8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D6549C 80240EBC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D654A0 80240EC0 0C00EAD2 */  jal       get_npc_safe
-/* D654A4 80240EC4 2404FFFC */   addiu    $a0, $zero, -4
-/* D654A8 80240EC8 0040202D */  daddu     $a0, $v0, $zero
-/* D654AC 80240ECC 10800004 */  beqz      $a0, .L80240EE0
-/* D654B0 80240ED0 3C030008 */   lui      $v1, 8
-/* D654B4 80240ED4 8C820000 */  lw        $v0, ($a0)
-/* D654B8 80240ED8 00431025 */  or        $v0, $v0, $v1
-/* D654BC 80240EDC AC820000 */  sw        $v0, ($a0)
-.L80240EE0:
-/* D654C0 80240EE0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D654C4 80240EE4 03E00008 */  jr        $ra
-/* D654C8 80240EE8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240EB8_D68BB8.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240EB8_D68BB8.s
deleted file mode 100644
index ce465a9a10..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240EB8_D68BB8.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB8_D68BB8
-/* D68BB8 80240EB8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D68BBC 80240EBC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D68BC0 80240EC0 0C00EAD2 */  jal       get_npc_safe
-/* D68BC4 80240EC4 2404FFFC */   addiu    $a0, $zero, -4
-/* D68BC8 80240EC8 0040202D */  daddu     $a0, $v0, $zero
-/* D68BCC 80240ECC 10800004 */  beqz      $a0, .L80240EE0
-/* D68BD0 80240ED0 3C030008 */   lui      $v1, 8
-/* D68BD4 80240ED4 8C820000 */  lw        $v0, ($a0)
-/* D68BD8 80240ED8 00431025 */  or        $v0, $v0, $v1
-/* D68BDC 80240EDC AC820000 */  sw        $v0, ($a0)
-.L80240EE0:
-/* D68BE0 80240EE0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D68BE4 80240EE4 03E00008 */  jr        $ra
-/* D68BE8 80240EE8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240EB8_D6A9D8.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240EB8_D6A9D8.s
deleted file mode 100644
index 8f095a59f8..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240EB8_D6A9D8.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB8_D6A9D8
-/* D6A9D8 80240EB8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D6A9DC 80240EBC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D6A9E0 80240EC0 0C00EAD2 */  jal       get_npc_safe
-/* D6A9E4 80240EC4 2404FFFC */   addiu    $a0, $zero, -4
-/* D6A9E8 80240EC8 0040202D */  daddu     $a0, $v0, $zero
-/* D6A9EC 80240ECC 10800004 */  beqz      $a0, .L80240EE0
-/* D6A9F0 80240ED0 3C030008 */   lui      $v1, 8
-/* D6A9F4 80240ED4 8C820000 */  lw        $v0, ($a0)
-/* D6A9F8 80240ED8 00431025 */  or        $v0, $v0, $v1
-/* D6A9FC 80240EDC AC820000 */  sw        $v0, ($a0)
-.L80240EE0:
-/* D6AA00 80240EE0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D6AA04 80240EE4 03E00008 */  jr        $ra
-/* D6AA08 80240EE8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240EB8_D6C4D8.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240EB8_D6C4D8.s
deleted file mode 100644
index a913222bc8..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240EB8_D6C4D8.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB8_D6C4D8
-/* D6C4D8 80240EB8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D6C4DC 80240EBC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D6C4E0 80240EC0 0C00EAD2 */  jal       get_npc_safe
-/* D6C4E4 80240EC4 2404FFFC */   addiu    $a0, $zero, -4
-/* D6C4E8 80240EC8 0040202D */  daddu     $a0, $v0, $zero
-/* D6C4EC 80240ECC 10800004 */  beqz      $a0, .L80240EE0
-/* D6C4F0 80240ED0 3C030008 */   lui      $v1, 8
-/* D6C4F4 80240ED4 8C820000 */  lw        $v0, ($a0)
-/* D6C4F8 80240ED8 00431025 */  or        $v0, $v0, $v1
-/* D6C4FC 80240EDC AC820000 */  sw        $v0, ($a0)
-.L80240EE0:
-/* D6C500 80240EE0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D6C504 80240EE4 03E00008 */  jr        $ra
-/* D6C508 80240EE8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240EB8_D6F868.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240EB8_D6F868.s
deleted file mode 100644
index 239337dd86..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240EB8_D6F868.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB8_D6F868
-/* D6F868 80240EB8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D6F86C 80240EBC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D6F870 80240EC0 0C00EAD2 */  jal       get_npc_safe
-/* D6F874 80240EC4 2404FFFC */   addiu    $a0, $zero, -4
-/* D6F878 80240EC8 0040202D */  daddu     $a0, $v0, $zero
-/* D6F87C 80240ECC 10800004 */  beqz      $a0, .L80240EE0
-/* D6F880 80240ED0 3C030008 */   lui      $v1, 8
-/* D6F884 80240ED4 8C820000 */  lw        $v0, ($a0)
-/* D6F888 80240ED8 00431025 */  or        $v0, $v0, $v1
-/* D6F88C 80240EDC AC820000 */  sw        $v0, ($a0)
-.L80240EE0:
-/* D6F890 80240EE0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D6F894 80240EE4 03E00008 */  jr        $ra
-/* D6F898 80240EE8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240EB8_D77258.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240EB8_D77258.s
deleted file mode 100644
index 29bbc75b9b..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240EB8_D77258.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB8_D77258
-/* D77258 80240EB8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D7725C 80240EBC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D77260 80240EC0 0C00EAD2 */  jal       get_npc_safe
-/* D77264 80240EC4 2404FFFC */   addiu    $a0, $zero, -4
-/* D77268 80240EC8 0040202D */  daddu     $a0, $v0, $zero
-/* D7726C 80240ECC 10800004 */  beqz      $a0, .L80240EE0
-/* D77270 80240ED0 3C030008 */   lui      $v1, 8
-/* D77274 80240ED4 8C820000 */  lw        $v0, ($a0)
-/* D77278 80240ED8 00431025 */  or        $v0, $v0, $v1
-/* D7727C 80240EDC AC820000 */  sw        $v0, ($a0)
-.L80240EE0:
-/* D77280 80240EE0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D77284 80240EE4 03E00008 */  jr        $ra
-/* D77288 80240EE8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240EE8_D7A8D8.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240EE8_D7A8D8.s
deleted file mode 100644
index 002b084bc4..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240EE8_D7A8D8.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EE8_D7A8D8
-/* D7A8D8 80240EE8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D7A8DC 80240EEC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D7A8E0 80240EF0 0C00EAD2 */  jal       get_npc_safe
-/* D7A8E4 80240EF4 2404FFFC */   addiu    $a0, $zero, -4
-/* D7A8E8 80240EF8 0040202D */  daddu     $a0, $v0, $zero
-/* D7A8EC 80240EFC 10800004 */  beqz      $a0, .L80240F10
-/* D7A8F0 80240F00 3C030008 */   lui      $v1, 8
-/* D7A8F4 80240F04 8C820000 */  lw        $v0, ($a0)
-/* D7A8F8 80240F08 00431025 */  or        $v0, $v0, $v1
-/* D7A8FC 80240F0C AC820000 */  sw        $v0, ($a0)
-.L80240F10:
-/* D7A900 80240F10 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D7A904 80240F14 03E00008 */  jr        $ra
-/* D7A908 80240F18 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240EE8_D7C188.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240EE8_D7C188.s
deleted file mode 100644
index 757f35800e..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240EE8_D7C188.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EE8_D7C188
-/* D7C188 80240EE8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D7C18C 80240EEC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D7C190 80240EF0 0C00EAD2 */  jal       get_npc_safe
-/* D7C194 80240EF4 2404FFFC */   addiu    $a0, $zero, -4
-/* D7C198 80240EF8 0040202D */  daddu     $a0, $v0, $zero
-/* D7C19C 80240EFC 10800004 */  beqz      $a0, .L80240F10
-/* D7C1A0 80240F00 3C030008 */   lui      $v1, 8
-/* D7C1A4 80240F04 8C820000 */  lw        $v0, ($a0)
-/* D7C1A8 80240F08 00431025 */  or        $v0, $v0, $v1
-/* D7C1AC 80240F0C AC820000 */  sw        $v0, ($a0)
-.L80240F10:
-/* D7C1B0 80240F10 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D7C1B4 80240F14 03E00008 */  jr        $ra
-/* D7C1B8 80240F18 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240EB8_D7DA08.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240EB8_D7DA08.s
deleted file mode 100644
index 1dd8da396c..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240EB8_D7DA08.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB8_D7DA08
-/* D7DA08 80240EB8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D7DA0C 80240EBC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D7DA10 80240EC0 0C00EAD2 */  jal       get_npc_safe
-/* D7DA14 80240EC4 2404FFFC */   addiu    $a0, $zero, -4
-/* D7DA18 80240EC8 0040202D */  daddu     $a0, $v0, $zero
-/* D7DA1C 80240ECC 10800004 */  beqz      $a0, .L80240EE0
-/* D7DA20 80240ED0 3C030008 */   lui      $v1, 8
-/* D7DA24 80240ED4 8C820000 */  lw        $v0, ($a0)
-/* D7DA28 80240ED8 00431025 */  or        $v0, $v0, $v1
-/* D7DA2C 80240EDC AC820000 */  sw        $v0, ($a0)
-.L80240EE0:
-/* D7DA30 80240EE0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D7DA34 80240EE4 03E00008 */  jr        $ra
-/* D7DA38 80240EE8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240EB8_D8A598.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240EB8_D8A598.s
deleted file mode 100644
index 61122c3eb9..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240EB8_D8A598.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB8_D8A598
-/* D8A598 80240EB8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D8A59C 80240EBC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D8A5A0 80240EC0 0C00EAD2 */  jal       get_npc_safe
-/* D8A5A4 80240EC4 2404FFFC */   addiu    $a0, $zero, -4
-/* D8A5A8 80240EC8 0040202D */  daddu     $a0, $v0, $zero
-/* D8A5AC 80240ECC 10800004 */  beqz      $a0, .L80240EE0
-/* D8A5B0 80240ED0 3C030008 */   lui      $v1, 8
-/* D8A5B4 80240ED4 8C820000 */  lw        $v0, ($a0)
-/* D8A5B8 80240ED8 00431025 */  or        $v0, $v0, $v1
-/* D8A5BC 80240EDC AC820000 */  sw        $v0, ($a0)
-.L80240EE0:
-/* D8A5C0 80240EE0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D8A5C4 80240EE4 03E00008 */  jr        $ra
-/* D8A5C8 80240EE8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240EB8_D8C268.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240EB8_D8C268.s
deleted file mode 100644
index b24a0e3087..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240EB8_D8C268.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB8_D8C268
-/* D8C268 80240EB8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D8C26C 80240EBC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D8C270 80240EC0 0C00EAD2 */  jal       get_npc_safe
-/* D8C274 80240EC4 2404FFFC */   addiu    $a0, $zero, -4
-/* D8C278 80240EC8 0040202D */  daddu     $a0, $v0, $zero
-/* D8C27C 80240ECC 10800004 */  beqz      $a0, .L80240EE0
-/* D8C280 80240ED0 3C030008 */   lui      $v1, 8
-/* D8C284 80240ED4 8C820000 */  lw        $v0, ($a0)
-/* D8C288 80240ED8 00431025 */  or        $v0, $v0, $v1
-/* D8C28C 80240EDC AC820000 */  sw        $v0, ($a0)
-.L80240EE0:
-/* D8C290 80240EE0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D8C294 80240EE4 03E00008 */  jr        $ra
-/* D8C298 80240EE8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240EB8_D8E108.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240EB8_D8E108.s
deleted file mode 100644
index c70b3cbbde..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240EB8_D8E108.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB8_D8E108
-/* D8E108 80240EB8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D8E10C 80240EBC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D8E110 80240EC0 0C00EAD2 */  jal       get_npc_safe
-/* D8E114 80240EC4 2404FFFC */   addiu    $a0, $zero, -4
-/* D8E118 80240EC8 0040202D */  daddu     $a0, $v0, $zero
-/* D8E11C 80240ECC 10800004 */  beqz      $a0, .L80240EE0
-/* D8E120 80240ED0 3C030008 */   lui      $v1, 8
-/* D8E124 80240ED4 8C820000 */  lw        $v0, ($a0)
-/* D8E128 80240ED8 00431025 */  or        $v0, $v0, $v1
-/* D8E12C 80240EDC AC820000 */  sw        $v0, ($a0)
-.L80240EE0:
-/* D8E130 80240EE0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D8E134 80240EE4 03E00008 */  jr        $ra
-/* D8E138 80240EE8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240EE8_D925E8.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240EE8_D925E8.s
deleted file mode 100644
index 31bc9968b3..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240EE8_D925E8.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EE8_D925E8
-/* D925E8 80240EE8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D925EC 80240EEC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D925F0 80240EF0 0C00EAD2 */  jal       get_npc_safe
-/* D925F4 80240EF4 2404FFFC */   addiu    $a0, $zero, -4
-/* D925F8 80240EF8 0040202D */  daddu     $a0, $v0, $zero
-/* D925FC 80240EFC 10800004 */  beqz      $a0, .L80240F10
-/* D92600 80240F00 3C030008 */   lui      $v1, 8
-/* D92604 80240F04 8C820000 */  lw        $v0, ($a0)
-/* D92608 80240F08 00431025 */  or        $v0, $v0, $v1
-/* D9260C 80240F0C AC820000 */  sw        $v0, ($a0)
-.L80240F10:
-/* D92610 80240F10 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D92614 80240F14 03E00008 */  jr        $ra
-/* D92618 80240F18 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240EE8_D93E28.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240EE8_D93E28.s
deleted file mode 100644
index d5e5e070a7..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240EE8_D93E28.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EE8_D93E28
-/* D93E28 80240EE8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D93E2C 80240EEC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D93E30 80240EF0 0C00EAD2 */  jal       get_npc_safe
-/* D93E34 80240EF4 2404FFFC */   addiu    $a0, $zero, -4
-/* D93E38 80240EF8 0040202D */  daddu     $a0, $v0, $zero
-/* D93E3C 80240EFC 10800004 */  beqz      $a0, .L80240F10
-/* D93E40 80240F00 3C030008 */   lui      $v1, 8
-/* D93E44 80240F04 8C820000 */  lw        $v0, ($a0)
-/* D93E48 80240F08 00431025 */  or        $v0, $v0, $v1
-/* D93E4C 80240F0C AC820000 */  sw        $v0, ($a0)
-.L80240F10:
-/* D93E50 80240F10 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D93E54 80240F14 03E00008 */  jr        $ra
-/* D93E58 80240F18 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240EE8_D964D8.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240EE8_D964D8.s
deleted file mode 100644
index 6c37085265..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240EE8_D964D8.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EE8_D964D8
-/* D964D8 80240EE8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D964DC 80240EEC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D964E0 80240EF0 0C00EAD2 */  jal       get_npc_safe
-/* D964E4 80240EF4 2404FFFC */   addiu    $a0, $zero, -4
-/* D964E8 80240EF8 0040202D */  daddu     $a0, $v0, $zero
-/* D964EC 80240EFC 10800004 */  beqz      $a0, .L80240F10
-/* D964F0 80240F00 3C030008 */   lui      $v1, 8
-/* D964F4 80240F04 8C820000 */  lw        $v0, ($a0)
-/* D964F8 80240F08 00431025 */  or        $v0, $v0, $v1
-/* D964FC 80240F0C AC820000 */  sw        $v0, ($a0)
-.L80240F10:
-/* D96500 80240F10 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D96504 80240F14 03E00008 */  jr        $ra
-/* D96508 80240F18 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240EE8_D98778.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240EE8_D98778.s
deleted file mode 100644
index b05aed2582..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240EE8_D98778.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EE8_D98778
-/* D98778 80240EE8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D9877C 80240EEC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D98780 80240EF0 0C00EAD2 */  jal       get_npc_safe
-/* D98784 80240EF4 2404FFFC */   addiu    $a0, $zero, -4
-/* D98788 80240EF8 0040202D */  daddu     $a0, $v0, $zero
-/* D9878C 80240EFC 10800004 */  beqz      $a0, .L80240F10
-/* D98790 80240F00 3C030008 */   lui      $v1, 8
-/* D98794 80240F04 8C820000 */  lw        $v0, ($a0)
-/* D98798 80240F08 00431025 */  or        $v0, $v0, $v1
-/* D9879C 80240F0C AC820000 */  sw        $v0, ($a0)
-.L80240F10:
-/* D987A0 80240F10 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D987A4 80240F14 03E00008 */  jr        $ra
-/* D987A8 80240F18 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240EB8_D9A868.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240EB8_D9A868.s
deleted file mode 100644
index f0f8949c32..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240EB8_D9A868.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB8_D9A868
-/* D9A868 80240EB8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D9A86C 80240EBC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D9A870 80240EC0 0C00EAD2 */  jal       get_npc_safe
-/* D9A874 80240EC4 2404FFFC */   addiu    $a0, $zero, -4
-/* D9A878 80240EC8 0040202D */  daddu     $a0, $v0, $zero
-/* D9A87C 80240ECC 10800004 */  beqz      $a0, .L80240EE0
-/* D9A880 80240ED0 3C030008 */   lui      $v1, 8
-/* D9A884 80240ED4 8C820000 */  lw        $v0, ($a0)
-/* D9A888 80240ED8 00431025 */  or        $v0, $v0, $v1
-/* D9A88C 80240EDC AC820000 */  sw        $v0, ($a0)
-.L80240EE0:
-/* D9A890 80240EE0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D9A894 80240EE4 03E00008 */  jr        $ra
-/* D9A898 80240EE8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c
index 3097814a6d..8026d68869 100644
--- a/src/world/area_pra/pra_02/D50010.c
+++ b/src/world/area_pra/pra_02/D50010.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240D3C_D50D2C);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240EB8_D50EA8);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240EEC_D50EDC);
 
diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c
index f668913b8e..8e66aa4bb4 100644
--- a/src/world/area_pra/pra_05/D55BD0.c
+++ b/src/world/area_pra/pra_05/D55BD0.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240D3C_D568EC);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240EB8_D56A68);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240EEC_D56A9C);
 
diff --git a/src/world/area_pra/pra_06/D57430.c b/src/world/area_pra/pra_06/D57430.c
index 4b470125ce..4fcde46580 100644
--- a/src/world/area_pra/pra_06/D57430.c
+++ b/src/world/area_pra/pra_06/D57430.c
@@ -24,6 +24,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240D6C_D5819C);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240EE8_D58318);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240F1C_D5834C);
diff --git a/src/world/area_pra/pra_09/D588B0.c b/src/world/area_pra/pra_09/D588B0.c
index 948dcf6cce..293e81f764 100644
--- a/src/world/area_pra/pra_09/D588B0.c
+++ b/src/world/area_pra/pra_09/D588B0.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240D3C_D595CC);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240EB8_D59748);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240EEC_D5977C);
 
diff --git a/src/world/area_pra/pra_10/D5F2D0.c b/src/world/area_pra/pra_10/D5F2D0.c
index 18e69f25e4..a030e21ad9 100644
--- a/src/world/area_pra/pra_10/D5F2D0.c
+++ b/src/world/area_pra/pra_10/D5F2D0.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240D3C_D5FFEC);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240EB8_D60168);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240EEC_D6019C);
 
diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c
index 157dcaa453..353803b993 100644
--- a/src/world/area_pra/pra_11/D61520.c
+++ b/src/world/area_pra/pra_11/D61520.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240D3C_D6223C);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240EB8_D623B8);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240EEC_D623EC);
 
diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c
index e6a282951e..fab556b915 100644
--- a/src/world/area_pra/pra_12/D62D10.c
+++ b/src/world/area_pra/pra_12/D62D10.c
@@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240D6C_D63A7C);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240EE8_D63BF8);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240F1C_D63C2C);
 
diff --git a/src/world/area_pra/pra_13/D64600.c b/src/world/area_pra/pra_13/D64600.c
index 40ff60dd41..1494d4e8d5 100644
--- a/src/world/area_pra/pra_13/D64600.c
+++ b/src/world/area_pra/pra_13/D64600.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240D3C_D6531C);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240EB8_D65498);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240EEC_D654CC);
 
diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c
index 7e70472d23..67376a1e4f 100644
--- a/src/world/area_pra/pra_14/D67D20.c
+++ b/src/world/area_pra/pra_14/D67D20.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240D3C_D68A3C);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240EB8_D68BB8);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240EEC_D68BEC);
 
diff --git a/src/world/area_pra/pra_16/D69B40.c b/src/world/area_pra/pra_16/D69B40.c
index 36d322fd09..6ef3f80fb4 100644
--- a/src/world/area_pra/pra_16/D69B40.c
+++ b/src/world/area_pra/pra_16/D69B40.c
@@ -22,6 +22,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240D3C_D6A85C);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240EB8_D6A9D8);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240EEC_D6AA0C);
diff --git a/src/world/area_pra/pra_18/D6B640.c b/src/world/area_pra/pra_18/D6B640.c
index e0ca39a5f8..3791e03e3e 100644
--- a/src/world/area_pra/pra_18/D6B640.c
+++ b/src/world/area_pra/pra_18/D6B640.c
@@ -22,6 +22,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240D3C_D6C35C);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240EB8_D6C4D8);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240EEC_D6C50C);
diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c
index 78e20b9389..5be0072900 100644
--- a/src/world/area_pra/pra_19/D6E9D0.c
+++ b/src/world/area_pra/pra_19/D6E9D0.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240D3C_D6F6EC);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240EB8_D6F868);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240EEC_D6F89C);
 
diff --git a/src/world/area_pra/pra_20/D763C0.c b/src/world/area_pra/pra_20/D763C0.c
index 5d7b22b4ad..eaa094499c 100644
--- a/src/world/area_pra/pra_20/D763C0.c
+++ b/src/world/area_pra/pra_20/D763C0.c
@@ -22,6 +22,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240D3C_D770DC);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240EB8_D77258);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240EEC_D7728C);
diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c
index 74151e82da..625d9e6c89 100644
--- a/src/world/area_pra/pra_27/D799F0.c
+++ b/src/world/area_pra/pra_27/D799F0.c
@@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240D6C_D7A75C);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240EE8_D7A8D8);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240F1C_D7A90C);
 
diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c
index 531a598a3a..e8ab8778ba 100644
--- a/src/world/area_pra/pra_28/D7B2A0.c
+++ b/src/world/area_pra/pra_28/D7B2A0.c
@@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240D6C_D7C00C);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240EE8_D7C188);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240F1C_D7C1BC);
 
diff --git a/src/world/area_pra/pra_29/D7CB70.c b/src/world/area_pra/pra_29/D7CB70.c
index c89d236d24..1f57ea2527 100644
--- a/src/world/area_pra/pra_29/D7CB70.c
+++ b/src/world/area_pra/pra_29/D7CB70.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240D3C_D7D88C);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240EB8_D7DA08);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240EEC_D7DA3C);
 
diff --git a/src/world/area_pra/pra_33/D89700.c b/src/world/area_pra/pra_33/D89700.c
index e4c05fb24c..8d38aaa200 100644
--- a/src/world/area_pra/pra_33/D89700.c
+++ b/src/world/area_pra/pra_33/D89700.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240D3C_D8A41C);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240EB8_D8A598);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240EEC_D8A5CC);
 
diff --git a/src/world/area_pra/pra_34/D8B3D0.c b/src/world/area_pra/pra_34/D8B3D0.c
index 5455353dc1..813cb0d124 100644
--- a/src/world/area_pra/pra_34/D8B3D0.c
+++ b/src/world/area_pra/pra_34/D8B3D0.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240D3C_D8C0EC);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240EB8_D8C268);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240EEC_D8C29C);
 
diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c
index d927e60f51..6bdc664fcb 100644
--- a/src/world/area_pra/pra_35/D8D270.c
+++ b/src/world/area_pra/pra_35/D8D270.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240D3C_D8DF8C);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240EB8_D8E108);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240EEC_D8E13C);
 
diff --git a/src/world/area_pra/pra_36/D91700.c b/src/world/area_pra/pra_36/D91700.c
index 8ebdcb0ce4..fb5c68d026 100644
--- a/src/world/area_pra/pra_36/D91700.c
+++ b/src/world/area_pra/pra_36/D91700.c
@@ -24,6 +24,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240D6C_D9246C);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240EE8_D925E8);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240F1C_D9261C);
diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c
index 9fb868b1cc..d4a591bbba 100644
--- a/src/world/area_pra/pra_37/D92F40.c
+++ b/src/world/area_pra/pra_37/D92F40.c
@@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240D6C_D93CAC);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240EE8_D93E28);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240F1C_D93E5C);
 
diff --git a/src/world/area_pra/pra_38/D955F0.c b/src/world/area_pra/pra_38/D955F0.c
index 31f13b1f02..7c53934195 100644
--- a/src/world/area_pra/pra_38/D955F0.c
+++ b/src/world/area_pra/pra_38/D955F0.c
@@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240D6C_D9635C);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240EE8_D964D8);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240F1C_D9650C);
 
diff --git a/src/world/area_pra/pra_39/D97890.c b/src/world/area_pra/pra_39/D97890.c
index 1259c57aad..f7ab229344 100644
--- a/src/world/area_pra/pra_39/D97890.c
+++ b/src/world/area_pra/pra_39/D97890.c
@@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240D6C_D985FC);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240EE8_D98778);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240F1C_D987AC);
 
diff --git a/src/world/area_pra/pra_40/D999D0.c b/src/world/area_pra/pra_40/D999D0.c
index 713425c07a..7a53d17de4 100644
--- a/src/world/area_pra/pra_40/D999D0.c
+++ b/src/world/area_pra/pra_40/D999D0.c
@@ -22,6 +22,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240D3C_D9A6EC);
 
 #include "world/common/SetPartnerFlagsA0000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240EB8_D9A868);
+#include "world/common/SetPartnerFlags80000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240EEC_D9A89C);
diff --git a/src/world/common/SetPartnerFlags80000.inc.c b/src/world/common/SetPartnerFlags80000.inc.c
new file mode 100644
index 0000000000..e0d34f7810
--- /dev/null
+++ b/src/world/common/SetPartnerFlags80000.inc.c
@@ -0,0 +1,9 @@
+#include "common.h"
+
+static void SetPartnerFlags80000(void) {
+    Npc* partner = get_npc_safe(NpcId_PARTNER);
+
+    if (partner != NULL) {
+        partner->flags |= 0x80000;
+    }
+}