diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240E84_D4DEC4.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240E84_D4DEC4.s
deleted file mode 100644
index 8dfb5b4304..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240E84_D4DEC4.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E84_D4DEC4
-/* D4DEC4 80240E84 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D4DEC8 80240E88 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D4DECC 80240E8C 0C00EAD2 */  jal       get_npc_safe
-/* D4DED0 80240E90 2404FFFC */   addiu    $a0, $zero, -4
-/* D4DED4 80240E94 0040202D */  daddu     $a0, $v0, $zero
-/* D4DED8 80240E98 10800004 */  beqz      $a0, .L80240EAC
-/* D4DEDC 80240E9C 3C03000A */   lui      $v1, 0xa
-/* D4DEE0 80240EA0 8C820000 */  lw        $v0, ($a0)
-/* D4DEE4 80240EA4 00431025 */  or        $v0, $v0, $v1
-/* D4DEE8 80240EA8 AC820000 */  sw        $v0, ($a0)
-.L80240EAC:
-/* D4DEEC 80240EAC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D4DEF0 80240EB0 03E00008 */  jr        $ra
-/* D4DEF4 80240EB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240E84_D50E74.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240E84_D50E74.s
deleted file mode 100644
index 427114b978..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240E84_D50E74.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E84_D50E74
-/* D50E74 80240E84 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D50E78 80240E88 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D50E7C 80240E8C 0C00EAD2 */  jal       get_npc_safe
-/* D50E80 80240E90 2404FFFC */   addiu    $a0, $zero, -4
-/* D50E84 80240E94 0040202D */  daddu     $a0, $v0, $zero
-/* D50E88 80240E98 10800004 */  beqz      $a0, .L80240EAC
-/* D50E8C 80240E9C 3C03000A */   lui      $v1, 0xa
-/* D50E90 80240EA0 8C820000 */  lw        $v0, ($a0)
-/* D50E94 80240EA4 00431025 */  or        $v0, $v0, $v1
-/* D50E98 80240EA8 AC820000 */  sw        $v0, ($a0)
-.L80240EAC:
-/* D50E9C 80240EAC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D50EA0 80240EB0 03E00008 */  jr        $ra
-/* D50EA4 80240EB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240E84_D56A34.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240E84_D56A34.s
deleted file mode 100644
index 47cd3c7dab..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240E84_D56A34.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E84_D56A34
-/* D56A34 80240E84 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D56A38 80240E88 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D56A3C 80240E8C 0C00EAD2 */  jal       get_npc_safe
-/* D56A40 80240E90 2404FFFC */   addiu    $a0, $zero, -4
-/* D56A44 80240E94 0040202D */  daddu     $a0, $v0, $zero
-/* D56A48 80240E98 10800004 */  beqz      $a0, .L80240EAC
-/* D56A4C 80240E9C 3C03000A */   lui      $v1, 0xa
-/* D56A50 80240EA0 8C820000 */  lw        $v0, ($a0)
-/* D56A54 80240EA4 00431025 */  or        $v0, $v0, $v1
-/* D56A58 80240EA8 AC820000 */  sw        $v0, ($a0)
-.L80240EAC:
-/* D56A5C 80240EAC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D56A60 80240EB0 03E00008 */  jr        $ra
-/* D56A64 80240EB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EB4_D582E4.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EB4_D582E4.s
deleted file mode 100644
index 624c7161a3..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EB4_D582E4.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB4_D582E4
-/* D582E4 80240EB4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D582E8 80240EB8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D582EC 80240EBC 0C00EAD2 */  jal       get_npc_safe
-/* D582F0 80240EC0 2404FFFC */   addiu    $a0, $zero, -4
-/* D582F4 80240EC4 0040202D */  daddu     $a0, $v0, $zero
-/* D582F8 80240EC8 10800004 */  beqz      $a0, .L80240EDC
-/* D582FC 80240ECC 3C03000A */   lui      $v1, 0xa
-/* D58300 80240ED0 8C820000 */  lw        $v0, ($a0)
-/* D58304 80240ED4 00431025 */  or        $v0, $v0, $v1
-/* D58308 80240ED8 AC820000 */  sw        $v0, ($a0)
-.L80240EDC:
-/* D5830C 80240EDC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D58310 80240EE0 03E00008 */  jr        $ra
-/* D58314 80240EE4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240E84_D59714.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240E84_D59714.s
deleted file mode 100644
index ac98ae42b0..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240E84_D59714.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E84_D59714
-/* D59714 80240E84 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D59718 80240E88 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D5971C 80240E8C 0C00EAD2 */  jal       get_npc_safe
-/* D59720 80240E90 2404FFFC */   addiu    $a0, $zero, -4
-/* D59724 80240E94 0040202D */  daddu     $a0, $v0, $zero
-/* D59728 80240E98 10800004 */  beqz      $a0, .L80240EAC
-/* D5972C 80240E9C 3C03000A */   lui      $v1, 0xa
-/* D59730 80240EA0 8C820000 */  lw        $v0, ($a0)
-/* D59734 80240EA4 00431025 */  or        $v0, $v0, $v1
-/* D59738 80240EA8 AC820000 */  sw        $v0, ($a0)
-.L80240EAC:
-/* D5973C 80240EAC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D59740 80240EB0 03E00008 */  jr        $ra
-/* D59744 80240EB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240E84_D60134.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240E84_D60134.s
deleted file mode 100644
index 4d9220e219..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240E84_D60134.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E84_D60134
-/* D60134 80240E84 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D60138 80240E88 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D6013C 80240E8C 0C00EAD2 */  jal       get_npc_safe
-/* D60140 80240E90 2404FFFC */   addiu    $a0, $zero, -4
-/* D60144 80240E94 0040202D */  daddu     $a0, $v0, $zero
-/* D60148 80240E98 10800004 */  beqz      $a0, .L80240EAC
-/* D6014C 80240E9C 3C03000A */   lui      $v1, 0xa
-/* D60150 80240EA0 8C820000 */  lw        $v0, ($a0)
-/* D60154 80240EA4 00431025 */  or        $v0, $v0, $v1
-/* D60158 80240EA8 AC820000 */  sw        $v0, ($a0)
-.L80240EAC:
-/* D6015C 80240EAC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D60160 80240EB0 03E00008 */  jr        $ra
-/* D60164 80240EB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240E84_D62384.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240E84_D62384.s
deleted file mode 100644
index 8bff1ad940..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240E84_D62384.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E84_D62384
-/* D62384 80240E84 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D62388 80240E88 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D6238C 80240E8C 0C00EAD2 */  jal       get_npc_safe
-/* D62390 80240E90 2404FFFC */   addiu    $a0, $zero, -4
-/* D62394 80240E94 0040202D */  daddu     $a0, $v0, $zero
-/* D62398 80240E98 10800004 */  beqz      $a0, .L80240EAC
-/* D6239C 80240E9C 3C03000A */   lui      $v1, 0xa
-/* D623A0 80240EA0 8C820000 */  lw        $v0, ($a0)
-/* D623A4 80240EA4 00431025 */  or        $v0, $v0, $v1
-/* D623A8 80240EA8 AC820000 */  sw        $v0, ($a0)
-.L80240EAC:
-/* D623AC 80240EAC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D623B0 80240EB0 03E00008 */  jr        $ra
-/* D623B4 80240EB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240EB4_D63BC4.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240EB4_D63BC4.s
deleted file mode 100644
index 6686656070..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240EB4_D63BC4.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB4_D63BC4
-/* D63BC4 80240EB4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D63BC8 80240EB8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D63BCC 80240EBC 0C00EAD2 */  jal       get_npc_safe
-/* D63BD0 80240EC0 2404FFFC */   addiu    $a0, $zero, -4
-/* D63BD4 80240EC4 0040202D */  daddu     $a0, $v0, $zero
-/* D63BD8 80240EC8 10800004 */  beqz      $a0, .L80240EDC
-/* D63BDC 80240ECC 3C03000A */   lui      $v1, 0xa
-/* D63BE0 80240ED0 8C820000 */  lw        $v0, ($a0)
-/* D63BE4 80240ED4 00431025 */  or        $v0, $v0, $v1
-/* D63BE8 80240ED8 AC820000 */  sw        $v0, ($a0)
-.L80240EDC:
-/* D63BEC 80240EDC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D63BF0 80240EE0 03E00008 */  jr        $ra
-/* D63BF4 80240EE4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240E84_D65464.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240E84_D65464.s
deleted file mode 100644
index 2eb3f0b55f..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240E84_D65464.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E84_D65464
-/* D65464 80240E84 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D65468 80240E88 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D6546C 80240E8C 0C00EAD2 */  jal       get_npc_safe
-/* D65470 80240E90 2404FFFC */   addiu    $a0, $zero, -4
-/* D65474 80240E94 0040202D */  daddu     $a0, $v0, $zero
-/* D65478 80240E98 10800004 */  beqz      $a0, .L80240EAC
-/* D6547C 80240E9C 3C03000A */   lui      $v1, 0xa
-/* D65480 80240EA0 8C820000 */  lw        $v0, ($a0)
-/* D65484 80240EA4 00431025 */  or        $v0, $v0, $v1
-/* D65488 80240EA8 AC820000 */  sw        $v0, ($a0)
-.L80240EAC:
-/* D6548C 80240EAC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D65490 80240EB0 03E00008 */  jr        $ra
-/* D65494 80240EB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240E84_D68B84.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240E84_D68B84.s
deleted file mode 100644
index 7c4795fc99..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240E84_D68B84.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E84_D68B84
-/* D68B84 80240E84 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D68B88 80240E88 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D68B8C 80240E8C 0C00EAD2 */  jal       get_npc_safe
-/* D68B90 80240E90 2404FFFC */   addiu    $a0, $zero, -4
-/* D68B94 80240E94 0040202D */  daddu     $a0, $v0, $zero
-/* D68B98 80240E98 10800004 */  beqz      $a0, .L80240EAC
-/* D68B9C 80240E9C 3C03000A */   lui      $v1, 0xa
-/* D68BA0 80240EA0 8C820000 */  lw        $v0, ($a0)
-/* D68BA4 80240EA4 00431025 */  or        $v0, $v0, $v1
-/* D68BA8 80240EA8 AC820000 */  sw        $v0, ($a0)
-.L80240EAC:
-/* D68BAC 80240EAC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D68BB0 80240EB0 03E00008 */  jr        $ra
-/* D68BB4 80240EB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240E84_D6A9A4.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240E84_D6A9A4.s
deleted file mode 100644
index ef4e1d4a84..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240E84_D6A9A4.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E84_D6A9A4
-/* D6A9A4 80240E84 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D6A9A8 80240E88 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D6A9AC 80240E8C 0C00EAD2 */  jal       get_npc_safe
-/* D6A9B0 80240E90 2404FFFC */   addiu    $a0, $zero, -4
-/* D6A9B4 80240E94 0040202D */  daddu     $a0, $v0, $zero
-/* D6A9B8 80240E98 10800004 */  beqz      $a0, .L80240EAC
-/* D6A9BC 80240E9C 3C03000A */   lui      $v1, 0xa
-/* D6A9C0 80240EA0 8C820000 */  lw        $v0, ($a0)
-/* D6A9C4 80240EA4 00431025 */  or        $v0, $v0, $v1
-/* D6A9C8 80240EA8 AC820000 */  sw        $v0, ($a0)
-.L80240EAC:
-/* D6A9CC 80240EAC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D6A9D0 80240EB0 03E00008 */  jr        $ra
-/* D6A9D4 80240EB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240E84_D6C4A4.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240E84_D6C4A4.s
deleted file mode 100644
index 2ef59400c7..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240E84_D6C4A4.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E84_D6C4A4
-/* D6C4A4 80240E84 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D6C4A8 80240E88 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D6C4AC 80240E8C 0C00EAD2 */  jal       get_npc_safe
-/* D6C4B0 80240E90 2404FFFC */   addiu    $a0, $zero, -4
-/* D6C4B4 80240E94 0040202D */  daddu     $a0, $v0, $zero
-/* D6C4B8 80240E98 10800004 */  beqz      $a0, .L80240EAC
-/* D6C4BC 80240E9C 3C03000A */   lui      $v1, 0xa
-/* D6C4C0 80240EA0 8C820000 */  lw        $v0, ($a0)
-/* D6C4C4 80240EA4 00431025 */  or        $v0, $v0, $v1
-/* D6C4C8 80240EA8 AC820000 */  sw        $v0, ($a0)
-.L80240EAC:
-/* D6C4CC 80240EAC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D6C4D0 80240EB0 03E00008 */  jr        $ra
-/* D6C4D4 80240EB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240E84_D6F834.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240E84_D6F834.s
deleted file mode 100644
index 20f27efd06..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240E84_D6F834.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E84_D6F834
-/* D6F834 80240E84 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D6F838 80240E88 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D6F83C 80240E8C 0C00EAD2 */  jal       get_npc_safe
-/* D6F840 80240E90 2404FFFC */   addiu    $a0, $zero, -4
-/* D6F844 80240E94 0040202D */  daddu     $a0, $v0, $zero
-/* D6F848 80240E98 10800004 */  beqz      $a0, .L80240EAC
-/* D6F84C 80240E9C 3C03000A */   lui      $v1, 0xa
-/* D6F850 80240EA0 8C820000 */  lw        $v0, ($a0)
-/* D6F854 80240EA4 00431025 */  or        $v0, $v0, $v1
-/* D6F858 80240EA8 AC820000 */  sw        $v0, ($a0)
-.L80240EAC:
-/* D6F85C 80240EAC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D6F860 80240EB0 03E00008 */  jr        $ra
-/* D6F864 80240EB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240E84_D77224.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240E84_D77224.s
deleted file mode 100644
index 0d92f872a7..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240E84_D77224.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E84_D77224
-/* D77224 80240E84 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D77228 80240E88 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D7722C 80240E8C 0C00EAD2 */  jal       get_npc_safe
-/* D77230 80240E90 2404FFFC */   addiu    $a0, $zero, -4
-/* D77234 80240E94 0040202D */  daddu     $a0, $v0, $zero
-/* D77238 80240E98 10800004 */  beqz      $a0, .L80240EAC
-/* D7723C 80240E9C 3C03000A */   lui      $v1, 0xa
-/* D77240 80240EA0 8C820000 */  lw        $v0, ($a0)
-/* D77244 80240EA4 00431025 */  or        $v0, $v0, $v1
-/* D77248 80240EA8 AC820000 */  sw        $v0, ($a0)
-.L80240EAC:
-/* D7724C 80240EAC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D77250 80240EB0 03E00008 */  jr        $ra
-/* D77254 80240EB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240EB4_D7A8A4.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240EB4_D7A8A4.s
deleted file mode 100644
index e01e22ac08..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240EB4_D7A8A4.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB4_D7A8A4
-/* D7A8A4 80240EB4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D7A8A8 80240EB8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D7A8AC 80240EBC 0C00EAD2 */  jal       get_npc_safe
-/* D7A8B0 80240EC0 2404FFFC */   addiu    $a0, $zero, -4
-/* D7A8B4 80240EC4 0040202D */  daddu     $a0, $v0, $zero
-/* D7A8B8 80240EC8 10800004 */  beqz      $a0, .L80240EDC
-/* D7A8BC 80240ECC 3C03000A */   lui      $v1, 0xa
-/* D7A8C0 80240ED0 8C820000 */  lw        $v0, ($a0)
-/* D7A8C4 80240ED4 00431025 */  or        $v0, $v0, $v1
-/* D7A8C8 80240ED8 AC820000 */  sw        $v0, ($a0)
-.L80240EDC:
-/* D7A8CC 80240EDC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D7A8D0 80240EE0 03E00008 */  jr        $ra
-/* D7A8D4 80240EE4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240EB4_D7C154.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240EB4_D7C154.s
deleted file mode 100644
index d7855298ad..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240EB4_D7C154.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB4_D7C154
-/* D7C154 80240EB4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D7C158 80240EB8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D7C15C 80240EBC 0C00EAD2 */  jal       get_npc_safe
-/* D7C160 80240EC0 2404FFFC */   addiu    $a0, $zero, -4
-/* D7C164 80240EC4 0040202D */  daddu     $a0, $v0, $zero
-/* D7C168 80240EC8 10800004 */  beqz      $a0, .L80240EDC
-/* D7C16C 80240ECC 3C03000A */   lui      $v1, 0xa
-/* D7C170 80240ED0 8C820000 */  lw        $v0, ($a0)
-/* D7C174 80240ED4 00431025 */  or        $v0, $v0, $v1
-/* D7C178 80240ED8 AC820000 */  sw        $v0, ($a0)
-.L80240EDC:
-/* D7C17C 80240EDC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D7C180 80240EE0 03E00008 */  jr        $ra
-/* D7C184 80240EE4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240E84_D7D9D4.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240E84_D7D9D4.s
deleted file mode 100644
index ea49f421f8..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240E84_D7D9D4.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E84_D7D9D4
-/* D7D9D4 80240E84 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D7D9D8 80240E88 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D7D9DC 80240E8C 0C00EAD2 */  jal       get_npc_safe
-/* D7D9E0 80240E90 2404FFFC */   addiu    $a0, $zero, -4
-/* D7D9E4 80240E94 0040202D */  daddu     $a0, $v0, $zero
-/* D7D9E8 80240E98 10800004 */  beqz      $a0, .L80240EAC
-/* D7D9EC 80240E9C 3C03000A */   lui      $v1, 0xa
-/* D7D9F0 80240EA0 8C820000 */  lw        $v0, ($a0)
-/* D7D9F4 80240EA4 00431025 */  or        $v0, $v0, $v1
-/* D7D9F8 80240EA8 AC820000 */  sw        $v0, ($a0)
-.L80240EAC:
-/* D7D9FC 80240EAC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D7DA00 80240EB0 03E00008 */  jr        $ra
-/* D7DA04 80240EB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240E84_D8A564.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240E84_D8A564.s
deleted file mode 100644
index 0ecd57a2de..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240E84_D8A564.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E84_D8A564
-/* D8A564 80240E84 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D8A568 80240E88 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D8A56C 80240E8C 0C00EAD2 */  jal       get_npc_safe
-/* D8A570 80240E90 2404FFFC */   addiu    $a0, $zero, -4
-/* D8A574 80240E94 0040202D */  daddu     $a0, $v0, $zero
-/* D8A578 80240E98 10800004 */  beqz      $a0, .L80240EAC
-/* D8A57C 80240E9C 3C03000A */   lui      $v1, 0xa
-/* D8A580 80240EA0 8C820000 */  lw        $v0, ($a0)
-/* D8A584 80240EA4 00431025 */  or        $v0, $v0, $v1
-/* D8A588 80240EA8 AC820000 */  sw        $v0, ($a0)
-.L80240EAC:
-/* D8A58C 80240EAC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D8A590 80240EB0 03E00008 */  jr        $ra
-/* D8A594 80240EB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240E84_D8C234.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240E84_D8C234.s
deleted file mode 100644
index ab40d19093..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240E84_D8C234.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E84_D8C234
-/* D8C234 80240E84 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D8C238 80240E88 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D8C23C 80240E8C 0C00EAD2 */  jal       get_npc_safe
-/* D8C240 80240E90 2404FFFC */   addiu    $a0, $zero, -4
-/* D8C244 80240E94 0040202D */  daddu     $a0, $v0, $zero
-/* D8C248 80240E98 10800004 */  beqz      $a0, .L80240EAC
-/* D8C24C 80240E9C 3C03000A */   lui      $v1, 0xa
-/* D8C250 80240EA0 8C820000 */  lw        $v0, ($a0)
-/* D8C254 80240EA4 00431025 */  or        $v0, $v0, $v1
-/* D8C258 80240EA8 AC820000 */  sw        $v0, ($a0)
-.L80240EAC:
-/* D8C25C 80240EAC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D8C260 80240EB0 03E00008 */  jr        $ra
-/* D8C264 80240EB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240E84_D8E0D4.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240E84_D8E0D4.s
deleted file mode 100644
index e7a0fc0d4b..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240E84_D8E0D4.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E84_D8E0D4
-/* D8E0D4 80240E84 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D8E0D8 80240E88 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D8E0DC 80240E8C 0C00EAD2 */  jal       get_npc_safe
-/* D8E0E0 80240E90 2404FFFC */   addiu    $a0, $zero, -4
-/* D8E0E4 80240E94 0040202D */  daddu     $a0, $v0, $zero
-/* D8E0E8 80240E98 10800004 */  beqz      $a0, .L80240EAC
-/* D8E0EC 80240E9C 3C03000A */   lui      $v1, 0xa
-/* D8E0F0 80240EA0 8C820000 */  lw        $v0, ($a0)
-/* D8E0F4 80240EA4 00431025 */  or        $v0, $v0, $v1
-/* D8E0F8 80240EA8 AC820000 */  sw        $v0, ($a0)
-.L80240EAC:
-/* D8E0FC 80240EAC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D8E100 80240EB0 03E00008 */  jr        $ra
-/* D8E104 80240EB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240EB4_D925B4.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240EB4_D925B4.s
deleted file mode 100644
index 54be3fa4c2..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240EB4_D925B4.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB4_D925B4
-/* D925B4 80240EB4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D925B8 80240EB8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D925BC 80240EBC 0C00EAD2 */  jal       get_npc_safe
-/* D925C0 80240EC0 2404FFFC */   addiu    $a0, $zero, -4
-/* D925C4 80240EC4 0040202D */  daddu     $a0, $v0, $zero
-/* D925C8 80240EC8 10800004 */  beqz      $a0, .L80240EDC
-/* D925CC 80240ECC 3C03000A */   lui      $v1, 0xa
-/* D925D0 80240ED0 8C820000 */  lw        $v0, ($a0)
-/* D925D4 80240ED4 00431025 */  or        $v0, $v0, $v1
-/* D925D8 80240ED8 AC820000 */  sw        $v0, ($a0)
-.L80240EDC:
-/* D925DC 80240EDC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D925E0 80240EE0 03E00008 */  jr        $ra
-/* D925E4 80240EE4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240EB4_D93DF4.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240EB4_D93DF4.s
deleted file mode 100644
index f713b605cf..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240EB4_D93DF4.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB4_D93DF4
-/* D93DF4 80240EB4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D93DF8 80240EB8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D93DFC 80240EBC 0C00EAD2 */  jal       get_npc_safe
-/* D93E00 80240EC0 2404FFFC */   addiu    $a0, $zero, -4
-/* D93E04 80240EC4 0040202D */  daddu     $a0, $v0, $zero
-/* D93E08 80240EC8 10800004 */  beqz      $a0, .L80240EDC
-/* D93E0C 80240ECC 3C03000A */   lui      $v1, 0xa
-/* D93E10 80240ED0 8C820000 */  lw        $v0, ($a0)
-/* D93E14 80240ED4 00431025 */  or        $v0, $v0, $v1
-/* D93E18 80240ED8 AC820000 */  sw        $v0, ($a0)
-.L80240EDC:
-/* D93E1C 80240EDC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D93E20 80240EE0 03E00008 */  jr        $ra
-/* D93E24 80240EE4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240EB4_D964A4.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240EB4_D964A4.s
deleted file mode 100644
index ffa191a56f..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240EB4_D964A4.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB4_D964A4
-/* D964A4 80240EB4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D964A8 80240EB8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D964AC 80240EBC 0C00EAD2 */  jal       get_npc_safe
-/* D964B0 80240EC0 2404FFFC */   addiu    $a0, $zero, -4
-/* D964B4 80240EC4 0040202D */  daddu     $a0, $v0, $zero
-/* D964B8 80240EC8 10800004 */  beqz      $a0, .L80240EDC
-/* D964BC 80240ECC 3C03000A */   lui      $v1, 0xa
-/* D964C0 80240ED0 8C820000 */  lw        $v0, ($a0)
-/* D964C4 80240ED4 00431025 */  or        $v0, $v0, $v1
-/* D964C8 80240ED8 AC820000 */  sw        $v0, ($a0)
-.L80240EDC:
-/* D964CC 80240EDC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D964D0 80240EE0 03E00008 */  jr        $ra
-/* D964D4 80240EE4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240EB4_D98744.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240EB4_D98744.s
deleted file mode 100644
index 2e97c7af1b..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240EB4_D98744.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EB4_D98744
-/* D98744 80240EB4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D98748 80240EB8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D9874C 80240EBC 0C00EAD2 */  jal       get_npc_safe
-/* D98750 80240EC0 2404FFFC */   addiu    $a0, $zero, -4
-/* D98754 80240EC4 0040202D */  daddu     $a0, $v0, $zero
-/* D98758 80240EC8 10800004 */  beqz      $a0, .L80240EDC
-/* D9875C 80240ECC 3C03000A */   lui      $v1, 0xa
-/* D98760 80240ED0 8C820000 */  lw        $v0, ($a0)
-/* D98764 80240ED4 00431025 */  or        $v0, $v0, $v1
-/* D98768 80240ED8 AC820000 */  sw        $v0, ($a0)
-.L80240EDC:
-/* D9876C 80240EDC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D98770 80240EE0 03E00008 */  jr        $ra
-/* D98774 80240EE4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240E84_D9A834.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240E84_D9A834.s
deleted file mode 100644
index b7a8aa4564..0000000000
--- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240E84_D9A834.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E84_D9A834
-/* D9A834 80240E84 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D9A838 80240E88 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D9A83C 80240E8C 0C00EAD2 */  jal       get_npc_safe
-/* D9A840 80240E90 2404FFFC */   addiu    $a0, $zero, -4
-/* D9A844 80240E94 0040202D */  daddu     $a0, $v0, $zero
-/* D9A848 80240E98 10800004 */  beqz      $a0, .L80240EAC
-/* D9A84C 80240E9C 3C03000A */   lui      $v1, 0xa
-/* D9A850 80240EA0 8C820000 */  lw        $v0, ($a0)
-/* D9A854 80240EA4 00431025 */  or        $v0, $v0, $v1
-/* D9A858 80240EA8 AC820000 */  sw        $v0, ($a0)
-.L80240EAC:
-/* D9A85C 80240EAC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D9A860 80240EB0 03E00008 */  jr        $ra
-/* D9A864 80240EB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240730_B1D180.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240730_B1D180.s
deleted file mode 100644
index 82316e70d3..0000000000
--- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240730_B1D180.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240730_B1D180
-/* B1D180 80240730 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B1D184 80240734 AFBF0010 */  sw        $ra, 0x10($sp)
-/* B1D188 80240738 0C00EAD2 */  jal       get_npc_safe
-/* B1D18C 8024073C 2404FFFC */   addiu    $a0, $zero, -4
-/* B1D190 80240740 0040202D */  daddu     $a0, $v0, $zero
-/* B1D194 80240744 10800004 */  beqz      $a0, .L80240758
-/* B1D198 80240748 3C03000A */   lui      $v1, 0xa
-/* B1D19C 8024074C 8C820000 */  lw        $v0, ($a0)
-/* B1D1A0 80240750 00431025 */  or        $v0, $v0, $v1
-/* B1D1A4 80240754 AC820000 */  sw        $v0, ($a0)
-.L80240758:
-/* B1D1A8 80240758 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B1D1AC 8024075C 03E00008 */  jr        $ra
-/* B1D1B0 80240760 27BD0018 */   addiu    $sp, $sp, 0x18
-/* B1D1B4 80240764 00000000 */  nop       
-/* B1D1B8 80240768 00000000 */  nop       
-/* B1D1BC 8024076C 00000000 */  nop       
diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c
index e2ecb1cf7f..4c4a52c140 100644
--- a/src/world/area_pra/pra_01/D4D060.c
+++ b/src/world/area_pra/pra_01/D4D060.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240870_D4D8B0);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240D3C_D4DD7C);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240E84_D4DEC4);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240EB8_D4DEF8);
 
diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c
index 5a717a9c36..3097814a6d 100644
--- a/src/world/area_pra/pra_02/D50010.c
+++ b/src/world/area_pra/pra_02/D50010.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240870_D50860);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240D3C_D50D2C);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240E84_D50E74);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240EB8_D50EA8);
 
diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c
index bf201d80df..f668913b8e 100644
--- a/src/world/area_pra/pra_05/D55BD0.c
+++ b/src/world/area_pra/pra_05/D55BD0.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240870_D56420);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240D3C_D568EC);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240E84_D56A34);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240EB8_D56A68);
 
diff --git a/src/world/area_pra/pra_06/D57430.c b/src/world/area_pra/pra_06/D57430.c
index ed0eb09e1f..4b470125ce 100644
--- a/src/world/area_pra/pra_06/D57430.c
+++ b/src/world/area_pra/pra_06/D57430.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_802408A0_D57CD0);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240D6C_D5819C);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240EB4_D582E4);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240EE8_D58318);
 
diff --git a/src/world/area_pra/pra_09/D588B0.c b/src/world/area_pra/pra_09/D588B0.c
index d67ca83f79..948dcf6cce 100644
--- a/src/world/area_pra/pra_09/D588B0.c
+++ b/src/world/area_pra/pra_09/D588B0.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240870_D59100);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240D3C_D595CC);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240E84_D59714);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240EB8_D59748);
 
diff --git a/src/world/area_pra/pra_10/D5F2D0.c b/src/world/area_pra/pra_10/D5F2D0.c
index fd0651402a..18e69f25e4 100644
--- a/src/world/area_pra/pra_10/D5F2D0.c
+++ b/src/world/area_pra/pra_10/D5F2D0.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240870_D5FB20);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240D3C_D5FFEC);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240E84_D60134);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240EB8_D60168);
 
diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c
index b5aa5bfc93..157dcaa453 100644
--- a/src/world/area_pra/pra_11/D61520.c
+++ b/src/world/area_pra/pra_11/D61520.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240870_D61D70);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240D3C_D6223C);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240E84_D62384);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240EB8_D623B8);
 
diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c
index 9b32793842..e6a282951e 100644
--- a/src/world/area_pra/pra_12/D62D10.c
+++ b/src/world/area_pra/pra_12/D62D10.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_802408A0_D635B0);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240D6C_D63A7C);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240EB4_D63BC4);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240EE8_D63BF8);
 
diff --git a/src/world/area_pra/pra_13/D64600.c b/src/world/area_pra/pra_13/D64600.c
index 9a21ebe91b..40ff60dd41 100644
--- a/src/world/area_pra/pra_13/D64600.c
+++ b/src/world/area_pra/pra_13/D64600.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240870_D64E50);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240D3C_D6531C);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240E84_D65464);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240EB8_D65498);
 
diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c
index 1e1f1de106..7e70472d23 100644
--- a/src/world/area_pra/pra_14/D67D20.c
+++ b/src/world/area_pra/pra_14/D67D20.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240870_D68570);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240D3C_D68A3C);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240E84_D68B84);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240EB8_D68BB8);
 
diff --git a/src/world/area_pra/pra_16/D69B40.c b/src/world/area_pra/pra_16/D69B40.c
index 391b3757e6..36d322fd09 100644
--- a/src/world/area_pra/pra_16/D69B40.c
+++ b/src/world/area_pra/pra_16/D69B40.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240870_D6A390);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240D3C_D6A85C);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240E84_D6A9A4);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240EB8_D6A9D8);
 
diff --git a/src/world/area_pra/pra_18/D6B640.c b/src/world/area_pra/pra_18/D6B640.c
index 7d917ce6ca..e0ca39a5f8 100644
--- a/src/world/area_pra/pra_18/D6B640.c
+++ b/src/world/area_pra/pra_18/D6B640.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240870_D6BE90);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240D3C_D6C35C);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240E84_D6C4A4);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240EB8_D6C4D8);
 
diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c
index 0f5c4f0e22..78e20b9389 100644
--- a/src/world/area_pra/pra_19/D6E9D0.c
+++ b/src/world/area_pra/pra_19/D6E9D0.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240870_D6F220);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240D3C_D6F6EC);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240E84_D6F834);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240EB8_D6F868);
 
diff --git a/src/world/area_pra/pra_20/D763C0.c b/src/world/area_pra/pra_20/D763C0.c
index 3e63fc1db9..5d7b22b4ad 100644
--- a/src/world/area_pra/pra_20/D763C0.c
+++ b/src/world/area_pra/pra_20/D763C0.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240870_D76C10);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240D3C_D770DC);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240E84_D77224);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240EB8_D77258);
 
diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c
index 43aee5fc08..74151e82da 100644
--- a/src/world/area_pra/pra_27/D799F0.c
+++ b/src/world/area_pra/pra_27/D799F0.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_802408A0_D7A290);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240D6C_D7A75C);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240EB4_D7A8A4);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240EE8_D7A8D8);
 
diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c
index b6851b8fee..531a598a3a 100644
--- a/src/world/area_pra/pra_28/D7B2A0.c
+++ b/src/world/area_pra/pra_28/D7B2A0.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_802408A0_D7BB40);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240D6C_D7C00C);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240EB4_D7C154);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240EE8_D7C188);
 
diff --git a/src/world/area_pra/pra_29/D7CB70.c b/src/world/area_pra/pra_29/D7CB70.c
index 2dd9150934..c89d236d24 100644
--- a/src/world/area_pra/pra_29/D7CB70.c
+++ b/src/world/area_pra/pra_29/D7CB70.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240870_D7D3C0);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240D3C_D7D88C);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240E84_D7D9D4);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240EB8_D7DA08);
 
diff --git a/src/world/area_pra/pra_33/D89700.c b/src/world/area_pra/pra_33/D89700.c
index ede01555ae..e4c05fb24c 100644
--- a/src/world/area_pra/pra_33/D89700.c
+++ b/src/world/area_pra/pra_33/D89700.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240870_D89F50);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240D3C_D8A41C);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240E84_D8A564);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240EB8_D8A598);
 
diff --git a/src/world/area_pra/pra_34/D8B3D0.c b/src/world/area_pra/pra_34/D8B3D0.c
index 72db02105c..5455353dc1 100644
--- a/src/world/area_pra/pra_34/D8B3D0.c
+++ b/src/world/area_pra/pra_34/D8B3D0.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240870_D8BC20);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240D3C_D8C0EC);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240E84_D8C234);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240EB8_D8C268);
 
diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c
index e24510b74b..d927e60f51 100644
--- a/src/world/area_pra/pra_35/D8D270.c
+++ b/src/world/area_pra/pra_35/D8D270.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240870_D8DAC0);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240D3C_D8DF8C);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240E84_D8E0D4);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240EB8_D8E108);
 
diff --git a/src/world/area_pra/pra_36/D91700.c b/src/world/area_pra/pra_36/D91700.c
index 9cc5ab43a0..8ebdcb0ce4 100644
--- a/src/world/area_pra/pra_36/D91700.c
+++ b/src/world/area_pra/pra_36/D91700.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_802408A0_D91FA0);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240D6C_D9246C);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240EB4_D925B4);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240EE8_D925E8);
 
diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c
index 1f08c6cf20..9fb868b1cc 100644
--- a/src/world/area_pra/pra_37/D92F40.c
+++ b/src/world/area_pra/pra_37/D92F40.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_802408A0_D937E0);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240D6C_D93CAC);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240EB4_D93DF4);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240EE8_D93E28);
 
diff --git a/src/world/area_pra/pra_38/D955F0.c b/src/world/area_pra/pra_38/D955F0.c
index 4c6846773c..31f13b1f02 100644
--- a/src/world/area_pra/pra_38/D955F0.c
+++ b/src/world/area_pra/pra_38/D955F0.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_802408A0_D95E90);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240D6C_D9635C);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240EB4_D964A4);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240EE8_D964D8);
 
diff --git a/src/world/area_pra/pra_39/D97890.c b/src/world/area_pra/pra_39/D97890.c
index 9e28d9a7cc..1259c57aad 100644
--- a/src/world/area_pra/pra_39/D97890.c
+++ b/src/world/area_pra/pra_39/D97890.c
@@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_802408A0_D98130);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240D6C_D985FC);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240EB4_D98744);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240EE8_D98778);
 
diff --git a/src/world/area_pra/pra_40/D999D0.c b/src/world/area_pra/pra_40/D999D0.c
index e75a438370..713425c07a 100644
--- a/src/world/area_pra/pra_40/D999D0.c
+++ b/src/world/area_pra/pra_40/D999D0.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240870_D9A220);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240D3C_D9A6EC);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240E84_D9A834);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240EB8_D9A868);
 
diff --git a/src/world/area_tst/tst_11/B1CA50.c b/src/world/area_tst/tst_11/B1CA50.c
index 9328e0cb7b..a7811683c6 100644
--- a/src/world/area_tst/tst_11/B1CA50.c
+++ b/src/world/area_tst/tst_11/B1CA50.c
@@ -14,4 +14,4 @@ INCLUDE_ASM(s32, "world/area_tst/tst_11/B1CA50", func_802403B8_B1CE08);
 
 INCLUDE_ASM(s32, "world/area_tst/tst_11/B1CA50", func_802406D4_B1D124);
 
-INCLUDE_ASM(s32, "world/area_tst/tst_11/B1CA50", func_80240730_B1D180);
+#include "world/common/SetPartnerFlagsA0000.inc.c"
diff --git a/src/world/common/SetPartnerFlagsA0000.inc.c b/src/world/common/SetPartnerFlagsA0000.inc.c
new file mode 100644
index 0000000000..80d76efe06
--- /dev/null
+++ b/src/world/common/SetPartnerFlagsA0000.inc.c
@@ -0,0 +1,9 @@
+#include "common.h"
+
+static void SetPartnerFlagsA0000(void) {
+    Npc* partner = get_npc_safe(NpcId_PARTNER);
+
+    if (partner != NULL) {
+        partner->flags |= 0xA0000;
+    }
+}