From c66590758eb35f276f4ddcb58e8e20e445b4e534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Fa=C3=9Fbender?=
 <31699028+Brotenko@users.noreply.github.com>
Date: Thu, 23 Sep 2021 10:55:12 +0200
Subject: [PATCH] Decompile dead functions (#426)

* decompile several dead functions and add more dead counterparts to existing functions to dead.h

* .

* Update EF2680.c
---
 include/dead.h                                |  22 +
 src/EE2040.c                                  |   1 +
 src/EED140.c                                  |  11 +-
 src/EEFAA0.c                                  |  12 +-
 src/EF2680.c                                  | 428 +++++++++++++++++-
 src/EF7A80.c                                  |  29 +-
 src/EF7FB0.c                                  |   5 +-
 src/EFEB00.c                                  |  51 ++-
 tools/ignored_funcs.txt                       |  28 +-
 .../EA0C10/func_802403EC_EA0CEC.s             |   2 +-
 .../EA0C10/func_80240518_EA0E18.s             |   8 +-
 .../EA0C10/func_802406CC_EA0FCC.s             |   6 +-
 .../EA0C10/func_80240CC8_EA15C8.s             |   6 +-
 .../EA0C10/func_80240DC4_EA16C4.s             |  26 +-
 .../EA0C10/func_80241894_EA2194.s             |   2 +-
 .../EA0C10/func_802419F4_EA22F4.s             |   2 +-
 .../EA0C10/func_80241DE4_EA26E4.s             |   2 +-
 .../EA0C10/func_80241F18_EA2818.s             |   4 +-
 .../EA0C10/func_802420FC_EA29FC.s             |   2 +-
 .../EA0C10/func_802425B0_EA2EB0.s             |   6 +-
 .../EA0C10/func_802427F0_EA30F0.s             |   8 +-
 .../EA36E0/func_80242E2C_EA372C.s             |   2 +-
 .../EA36E0/func_80242EC4_EA37C4.s             |   4 +-
 .../EA36E0/func_80242F9C_EA389C.s             |   4 +-
 .../EA8AE0/func_802404B8_EA8F98.s             |   6 +-
 .../EA8AE0/func_80240A14_EA94F4.s             |   8 +-
 .../EA8AE0/func_80240E2C_EA990C.s             |   4 +-
 .../EA8AE0/func_802415DC_EAA0BC.s             |   8 +-
 .../EB1170/func_80240484_EB12E4.s             |   8 +-
 .../EB8E90/func_80240040_EB8E90.s             |   2 +-
 .../EB8E90/func_80240198_EB8FE8.s             |   8 +-
 .../EB8E90/func_80240500_EB9350.s             |   4 +-
 .../EB8E90/func_8024085C_EB96AC.s             |   2 +-
 .../EB8E90/func_8024098C_EB97DC.s             |   4 +-
 .../EB8E90/func_80240BD4_EB9A24.s             |   2 +-
 .../EB9D90/func_80240F40_EB9D90.s             |   4 +-
 .../EB9D90/func_80240FB0_EB9E00.s             |  10 +-
 .../EB9D90/func_802410E4_EB9F34.s             |   8 +-
 .../EC2240/func_80240158_EC2358.s             |   8 +-
 .../ECAA80/func_80240D80_ECAA80.s             |  12 +-
 .../ECAA80/func_80241364_ECB064.s             |   4 +-
 .../ECAA80/func_802417CC_ECB4CC.s             |   8 +-
 .../ED0310/func_80240320_ED0310.s             |   2 +-
 .../ED0310/func_802404D0_ED04C0.s             |  18 +-
 .../ED0310/func_80240BB8_ED0BA8.s             |   8 +-
 .../ED0310/func_80241178_ED1168.s             |   8 +-
 .../ED0310/func_80241508_ED14F8.s             |   2 +-
 .../ED46D0/func_802404B0_ED46D0.s             |   2 +-
 .../ED8E20/func_80240274_ED9094.s             |   4 +-
 .../EDC020/func_802403F0_EDC3D0.s             |   8 +-
 .../EDEA00/func_802401C4_EDEB84.s             |   2 +-
 .../EDEA00/func_80240374_EDED34.s             |  18 +-
 .../EDEA00/func_80240A5C_EDF41C.s             |   8 +-
 .../EDEA00/func_8024101C_EDF9DC.s             |   8 +-
 .../EDEA00/func_802413AC_EDFD6C.s             |   2 +-
 .../EDEA00/func_802416E8_EE00A8.s             |   2 +-
 .../EDEA00/func_80241730_EE00F0.s             |  16 +-
 .../EDEA00/func_80241B94_EE0554.s             |   8 +-
 .../EDEA00/func_80241DE4_EE07A4.s             |  12 +-
 .../EDEA00/func_8024236C_EE0D2C.s             |   2 +-
 .../EDEA00/func_802424A0_EE0E60.s             |   4 +-
 .../EDEA00/func_80242684_EE1044.s             |   2 +-
 .../EDEA00/func_80242AF0_EE14B0.s             |  12 +-
 .../EE70C0/func_80240B10_EE70C0.s             |   2 +-
 .../EE70C0/func_80240CC0_EE7270.s             |  18 +-
 .../EE70C0/func_802413A8_EE7958.s             |   8 +-
 .../EE70C0/func_80241968_EE7F18.s             |   8 +-
 .../EE70C0/func_80241CF8_EE82A8.s             |   2 +-
 .../EE70C0/func_80242090_EE8640.s             |   8 +-
 .../EED140/func_80240040_EED140.s             |  45 --
 .../EED1E0/func_80240E18_EEDF18.s             |   4 +-
 .../EEDF50/func_80240E50_EEDF50.s             |   2 +-
 .../EEDF50/func_80241000_EEE100.s             |  18 +-
 .../EEDF50/func_802416E8_EEE7E8.s             |   8 +-
 .../EEDF50/func_80241CA8_EEEDA8.s             |   8 +-
 .../EEDF50/func_80242038_EEF138.s             |   2 +-
 .../EEDF50/func_80242374_EEF474.s             |   2 +-
 .../EEDF50/func_802424A4_EEF5A4.s             |   6 +-
 .../EEFAA0/func_802429A0_EEFAA0.s             |  18 -
 .../EF2680/func_80240070_EF2680.s             | 123 -----
 .../EF2680/func_80240220_EF2830.s             |  18 +-
 .../EF2680/func_80240908_EF2F18.s             | 225 ---------
 .../EF2680/func_80240C4C_EF325C.s             |  34 --
 .../EF2680/func_80240CC4_EF32D4.s             |  32 --
 .../EF2680/func_80240E64_EF3474.s             |  31 --
 .../EF2680/func_80240EC8_EF34D8.s             | 243 ----------
 .../EF2680/func_80241258_EF3868.s             |  79 ----
 .../EF2680/func_8024137C_EF398C.s             |  10 +-
 .../EF2680/func_80241594_EF3BA4.s             |  25 -
 .../EF2680/func_802415DC_EF3BEC.s             | 295 ------------
 .../EF2680/func_80241A40_EF4050.s             | 156 -------
 .../EF2680/func_80241C90_EF42A0.s             |  18 +-
 .../EF2680/func_8024219C_EF47AC.s             |  35 --
 .../EF2680/func_80242218_EF4828.s             |  93 ----
 .../EF2680/func_8024234C_EF495C.s             |  97 ----
 .../EF2680/func_802424B0_EF4AC0.s             |  38 --
 .../EF2680/func_80242530_EF4B40.s             |  10 +-
 .../EF2680/func_8024299C_EF4FAC.s             |  20 +-
 .../EF7A80/func_80240340_EF7DC0.s             |  25 -
 .../EF7FB0/func_80240530_EF7FB0.s             |  28 --
 .../EFEB00/func_802404D0_EFEFD0.s             |  32 --
 .../EFEB00/func_80240540_EFF040.s             |  76 ----
 .../EFEB00/func_80240660_EFF160.s             |  77 ----
 .../EFEB00/func_80240784_EFF284.s             |  15 -
 .../EFEB00/func_802407B0_EFF2B0.s             | 105 -----
 ver/us/symbol_addrs.txt                       |  22 +-
 ver/us/undefined_syms.txt                     |  32 +-
 107 files changed, 834 insertions(+), 2248 deletions(-)
 delete mode 100644 ver/us/asm/nonmatchings/EED140/func_80240040_EED140.s
 delete mode 100644 ver/us/asm/nonmatchings/EEFAA0/func_802429A0_EEFAA0.s
 delete mode 100644 ver/us/asm/nonmatchings/EF2680/func_80240070_EF2680.s
 delete mode 100644 ver/us/asm/nonmatchings/EF2680/func_80240908_EF2F18.s
 delete mode 100644 ver/us/asm/nonmatchings/EF2680/func_80240C4C_EF325C.s
 delete mode 100644 ver/us/asm/nonmatchings/EF2680/func_80240CC4_EF32D4.s
 delete mode 100644 ver/us/asm/nonmatchings/EF2680/func_80240E64_EF3474.s
 delete mode 100644 ver/us/asm/nonmatchings/EF2680/func_80240EC8_EF34D8.s
 delete mode 100644 ver/us/asm/nonmatchings/EF2680/func_80241258_EF3868.s
 delete mode 100644 ver/us/asm/nonmatchings/EF2680/func_80241594_EF3BA4.s
 delete mode 100644 ver/us/asm/nonmatchings/EF2680/func_802415DC_EF3BEC.s
 delete mode 100644 ver/us/asm/nonmatchings/EF2680/func_80241A40_EF4050.s
 delete mode 100644 ver/us/asm/nonmatchings/EF2680/func_8024219C_EF47AC.s
 delete mode 100644 ver/us/asm/nonmatchings/EF2680/func_80242218_EF4828.s
 delete mode 100644 ver/us/asm/nonmatchings/EF2680/func_8024234C_EF495C.s
 delete mode 100644 ver/us/asm/nonmatchings/EF2680/func_802424B0_EF4AC0.s
 delete mode 100644 ver/us/asm/nonmatchings/EF7A80/func_80240340_EF7DC0.s
 delete mode 100644 ver/us/asm/nonmatchings/EF7FB0/func_80240530_EF7FB0.s
 delete mode 100644 ver/us/asm/nonmatchings/EFEB00/func_802404D0_EFEFD0.s
 delete mode 100644 ver/us/asm/nonmatchings/EFEB00/func_80240540_EFF040.s
 delete mode 100644 ver/us/asm/nonmatchings/EFEB00/func_80240660_EFF160.s
 delete mode 100644 ver/us/asm/nonmatchings/EFEB00/func_80240784_EFF284.s
 delete mode 100644 ver/us/asm/nonmatchings/EFEB00/func_802407B0_EFF2B0.s

diff --git a/include/dead.h b/include/dead.h
index 035d3d9088..fc41aafed6 100644
--- a/include/dead.h
+++ b/include/dead.h
@@ -18,5 +18,27 @@
 #define clamp_angle dead_clamp_angle
 #define rand_int dead_rand_int
 #define gItemTable dead_gItemTable
+#define set_screen_overlay_params_back dead_set_screen_overlay_params_back
+#define get_npc_by_index dead_get_npc_by_index
+#define dist2D dead_dist2D
+#define sin_deg dead_sin_deg
+#define cos_deg dead_cos_deg
+#define gPlayerStatus dead_gPlayerStatus
+#define gPlayerActionState dead_gPlayerActionState
+#define is_point_within_region dead_is_point_within_region
+#define npc_raycast_down_sides dead_npc_raycast_down_sides
+#define func_800490B4 func_8004D1A4
+#define fx_emote dead_fx_emote
+#define ai_enemy_play_sound dead_ai_enemy_play_sound
+#define npc_move_heading dead_npc_move_heading
+#define get_clamped_angle_diff dead_get_clamped_angle_diff
+#define get_enemy dead_get_enemy
+#define npc_test_move_simple_with_slipping dead_npc_test_move_simple_with_slipping
+#define get_screen_coords dead_get_screen_coords
+#define func_800495A0 func_800495A0
+#define func_8004DAD8 func_800496B8
+#define func_8004D9C0 func_800496B8
+#define func_8004E024 func_80049C04
+#define func_8004A73C func_8004EB8C
 
 #endif
diff --git a/src/EE2040.c b/src/EE2040.c
index 5833531fed..16ec68e0fc 100644
--- a/src/EE2040.c
+++ b/src/EE2040.c
@@ -1,4 +1,5 @@
 #include "dead.h"
 #include "common.h"
 
+// Dead version of LoadPartyImage?
 INCLUDE_ASM(s32, "EE2040", func_80243680_EE2040);
diff --git a/src/EED140.c b/src/EED140.c
index 96117ce112..78e2dc85bc 100644
--- a/src/EED140.c
+++ b/src/EED140.c
@@ -1,4 +1,13 @@
 #include "dead.h"
 #include "common.h"
 
-INCLUDE_ASM(s32, "EED140", func_80240040_EED140);
+// Copy from UnkFunc43
+ApiStatus func_80240040_EED140(Evt* script, s32 isInitialCall) {
+    f32 var1 = script->varTable[0] - script->varTable[3];
+    f32 var2 = script->varTable[1] - script->varTable[4];
+    f32 var3 = script->varTable[2] - script->varTable[5];
+
+    script->varTable[0] = SQ(var1) + SQ(var2) + SQ(var3) < SQ(60.0f);
+
+    return ApiStatus_DONE2;
+}
diff --git a/src/EEFAA0.c b/src/EEFAA0.c
index c1275aaca7..e4b7f16e0d 100644
--- a/src/EEFAA0.c
+++ b/src/EEFAA0.c
@@ -1,4 +1,14 @@
 #include "dead.h"
 #include "common.h"
 
-INCLUDE_ASM(s32, "EEFAA0", func_802429A0_EEFAA0);
+// Copy from flo_16/UnkFunc44
+ApiStatus func_802429A0_EEFAA0(Evt* script, s32 isInitialCall) {
+    script->varTable[0] = 0;
+    do {} while (0);
+    if (gPlayerActionState == ACTION_STATE_GROUND_POUND) {
+        script->varTable[0] = 1;
+    } else if (gPlayerActionState == ACTION_STATE_ULTRA_POUND) {
+        script->varTable[0] = 1;
+    }
+    return ApiStatus_DONE2;
+}
diff --git a/src/EF2680.c b/src/EF2680.c
index a0ffa75b7c..cd0b7c613f 100644
--- a/src/EF2680.c
+++ b/src/EF2680.c
@@ -3,44 +3,444 @@
 
 #define NAMESPACE EF2680
 
-INCLUDE_ASM(s32, "EF2680", func_80240070_EF2680);
+void func_80240070_EF2680(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1);
+    if (is_point_within_region(enemy->territory->wander.wanderShape,
+            enemy->territory->wander.point.x, enemy->territory->wander.point.z,
+            npc->pos.x, npc->pos.z,
+            enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) {
+        npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
+    } else {
+        npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f);
+    }
+    npc->currentAnim.w = enemy->animList[1];
+    script->functionTemp[1] = 0;
+    if (enemy->territory->wander.moveSpeedOverride < 0) {
+        npc->moveSpeed = aiSettings->moveSpeed;
+    } else {
+        npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0;
+    }
+    enemy->varTable[4] = npc->pos.y * 100.0;
+    script->functionTemp[0] = 1;
+}
 
 INCLUDE_ASM(s32, "EF2680", func_80240220_EF2830);
 
 #include "world/common/DeadUnkNpcAIFunc1.inc.c"
 
-INCLUDE_ASM(s32, "EF2680", func_80240908_EF2F18);
+#include "world/common/UnkFunc4.inc.c"
 
-INCLUDE_ASM(s32, "EF2680", func_80240C4C_EF325C);
+#include "world/common/UnkNpcAIFunc2.inc.c"
 
-INCLUDE_ASM(s32, "EF2680", func_80240CC4_EF32D4);
+// Copy from flo_25 (CF2C10.c)
+extern f32 D_802444BC_EF6ACC[];
+
+void func_80240CC4_EF32D4(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    npc->pos.y += D_802444BC_EF6ACC[npc->duration++];
+    if (npc->duration >= 5) {
+        script->functionTemp[0] = 12;
+    }
+}
 
 #include "world/common/DeadUnkNpcAIFunc14.inc.c"
 
-INCLUDE_ASM(s32, "EF2680", func_80240E64_EF3474);
+#include "world/common/UnkNpcAIFunc3.inc.c"
 
-INCLUDE_ASM(s32, "EF2680", func_80240EC8_EF34D8);
+#include "world/common/UnkFunc6.inc.c"
 
-INCLUDE_ASM(s32, "EF2680", func_80241258_EF3868);
+#include "world/common/UnkFunc5.inc.c"
 
 INCLUDE_ASM(s32, "EF2680", func_8024137C_EF398C);
 
-INCLUDE_ASM(s32, "EF2680", func_80241594_EF3BA4);
+s32 func_80241594_EF3BA4(void) {
+    s32 i;
 
-INCLUDE_ASM(s32, "EF2680", func_802415DC_EF3BEC);
+    for (i = 50; i < 54; i++) {
+        if (get_enemy(i)->varTable[10] == 0) {
+            return i;
+        }
+    }
 
-INCLUDE_ASM(s32, "EF2680", func_80241A40_EF4050);
+    return -1;
+}
+
+void func_802415DC_EF3BEC(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    f32 x, y, z, w;
+    s32 var;
+    f32 temp_f20;
+    f32 temp_f22;
+    f32 temp_f24;
+    f32 var1 = enemy->varTable[4];
+    f32 var2 = enemy->varTable[3];
+    f32 var3;
+
+    temp_f22 = var1 / 100.0;
+    temp_f24 = var2 / 100.0;
+    if (npc->duration > 0) {
+        npc->duration--;
+    }
+    var3 = enemy->varTable[1];
+    temp_f20 = var3 / 100.0;
+
+    x = npc->pos.x;
+    y = npc->pos.y;
+    z = npc->pos.z;
+    w = 1000.0f;
+
+    npc_raycast_down_sides(npc->unk_80, &x, &y, &z, &w);
+    npc->pos.y = y + temp_f24 + (sin_deg(enemy->varTable[2]) * temp_f20);
+    enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC);
+
+    if (aiSettings->unk_14 >= 0) {
+        if (script->functionTemp[1] <= 0) {
+            script->functionTemp[1] = aiSettings->unk_14;
+            if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) != 0) {
+                fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
+                ai_enemy_play_sound(npc, 0x2F4, 0x200000);
+                x = npc->pos.x;
+                y = npc->pos.y;
+                z = npc->pos.z;
+                w = 1000.0f;
+                npc_raycast_down_sides(npc->unk_80, &x, &y, &z, &w);
+                npc->moveToPos.y = y + temp_f24;
+                script->functionTemp[0] = 12;
+                return;
+            }
+        }
+        script->functionTemp[1]--;
+    }
+
+    if (is_point_within_region(enemy->territory->wander.wanderShape, enemy->territory->wander.point.x,
+                               enemy->territory->wander.point.z, npc->pos.x, npc->pos.z, enemy->territory->wander.wanderSizeX,
+                               enemy->territory->wander.wanderSizeZ) != 0) {
+        npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
+    }
+
+    if (npc->turnAroundYawAdjustment == 0) {
+        if (npc->duration > 0) {
+            npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+            if (enemy->varTable[0] & 1) {
+                x = npc->pos.x;
+                y = temp_f22;
+                z = npc->pos.z;
+                w = 1000.0f;
+                npc_raycast_down_sides(npc->unk_80, &x, &y, &z, &w);
+                y += temp_f24;
+                w = y - temp_f22;
+                if (w > 2.0) {
+                    temp_f22 += 2.0;
+                } else if (w < -2.0) {
+                    temp_f22 -= 2.0;
+                } else {
+                    temp_f22 = y;
+                }
+                enemy->varTable[4] = (temp_f22 * 100.0);
+            }
+            if (npc->duration > 0) {
+                return;
+            }
+        }
+        script->functionTemp[0] = 2;
+        script->functionTemp[1] = (rand_int(1000) % 3) + 2;
+        if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || (script->functionTemp[1] == 0)) {
+            script->functionTemp[0] = 0;
+        }
+    }
+}
+
+void func_80241A40_EF4050(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    f32 x, y, z, w;
+    s32 var;
+    f32 var1 = enemy->varTable[3];
+    f32 var2;
+    f32 temp_f20;
+    f32 temp_f22;
+
+    temp_f22 = var1 / 100.0;
+    if (npc->duration > 0) {
+        npc->duration--;
+    }
+    var2 = enemy->varTable[1];
+    temp_f20 = var2 / 100.0;
+
+    x = npc->pos.x;
+    y = npc->pos.y;
+    z = npc->pos.z;
+    w = 1000.0f;
+
+    npc_raycast_down_sides(npc->unk_80, &x, &y, &z, &w);
+    npc->pos.y = y + temp_f22 + (sin_deg(enemy->varTable[2]) * temp_f20);
+    enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC);
+    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) != 0) {
+        fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
+        ai_enemy_play_sound(npc, 0x2F4, 0x200000);
+        script->functionTemp[0] = 12;
+        return;
+    }
+
+    if ((npc->turnAroundYawAdjustment == 0) && (npc->duration <= 0)) {
+        script->functionTemp[1]--;
+        if (script->functionTemp[1] > 0) {
+            npc->yaw = clamp_angle(npc->yaw + 180.0f);
+            npc->duration = (rand_int(1000) % 11) + 5;
+            return;
+        }
+        script->functionTemp[0] = 0;
+    }
+}
 
 INCLUDE_ASM(s32, "EF2680", func_80241C90_EF42A0);
 
-INCLUDE_ASM(s32, "EF2680", func_8024219C_EF47AC);
+#include "world/common/set_script_owner_npc_anim.inc.c"
 
-INCLUDE_ASM(s32, "EF2680", func_80242218_EF4828);
+#include "world/common/UnkDistFunc.inc.c"
 
-INCLUDE_ASM(s32, "EF2680", func_8024234C_EF495C);
+#include "world/common/UnkNpcAIFunc12.inc.c"
 
-INCLUDE_ASM(s32, "EF2680", func_802424B0_EF4AC0);
+#include "world/common/set_script_owner_npc_col_height.inc.c"
 
 INCLUDE_ASM(s32, "EF2680", func_80242530_EF4B40);
 
+// This should be roughly like this and is a copy from CD7350 (func_80242918_CD9BF8), but with the little extra block
+// at the beginning. I have to assume that is has to roughly look like below, but I can't get it to match.
+#ifdef NON_MATCHING
+ApiStatus func_8024299C_EF4FAC(Evt* script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    Bytecode* args = script->ptrReadPos;
+    EnemyTerritoryThing territory;
+    EnemyTerritoryThing* territoryPtr = &territory;
+    NpcAISettings* aiSettings = evt_get_variable(script, *args);
+    s32 var;
+    u32 x, y, z;
+    f32 x2, y2, z2, w2;
+    Npc* npc2;
+
+    territory.unk_00 = 0;
+    territory.shape = enemy->territory->wander.detectShape;
+    territory.pointX = enemy->territory->wander.detect.x;
+    territory.pointZ = enemy->territory->wander.detect.z;
+    territory.sizeX = enemy->territory->wander.detectSizeX;
+    territory.sizeZ = enemy->territory->wander.detectSizeZ;
+    territory.unk_18 = 65.0f;
+    territory.unk_1C = 0;
+
+    // God knows what happens here ----------------
+    enemy->territory->patrol.points[4].x = npc->pos.x;
+    enemy->territory->patrol.points[4].y = npc->pos.y;
+    enemy->territory->patrol.points[5].x = 0.0001f;
+    enemy->territory->patrol.points[5].y = 0.0001f;
+    enemy->territory->patrol.points[4].z = npc->pos.z;
+    // --------------------------------------------
+
+    if (isInitialCall) {
+        enemy->varTable[6] = npc->collisionHeight;
+        enemy->unk_B0 |= 8;
+    }
+
+    if (isInitialCall || (enemy->varTable[10] == 100)) {
+        script->functionTemp[0] = 100;
+        npc->duration = 0;
+        npc->currentAnim.w = enemy->animList[0];
+        npc->flags &= ~0x800;
+        enemy->flags |= 0x200000;
+        npc->flags = (npc->flags & ~0x200) | 8;
+        enemy->varTable[10] = 0;
+        enemy->varTable[11] = -1;
+        npc->pos.x = 0.0f;
+        npc->pos.y = -1000.0f;
+        npc->pos.z = 0.0f;
+    }
+
+    if (enemy->unk_B0 & 4) {
+        npc->duration = 0;
+        npc->collisionHeight = enemy->varTable[6];
+        enemy->unk_B0 &= ~4;
+        if (npc->flags & 0x800) {
+            npc->currentAnim.w = 0x4A0018;
+            npc->moveSpeed = 0.0f;
+            npc->jumpVelocity = 0.0f;
+            npc->jumpScale = 1.0f;
+            script->functionTemp[0] = 102;
+        } else {
+            fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var);
+            npc->currentAnim.w = enemy->animList[0];
+            script->functionTemp[1] = 0;
+            script->functionTemp[0] = 200;
+        }
+    }
+    get_screen_coords(0, npc->pos.x, npc->pos.y, npc->pos.z, &x, &y, &z);
+    if ((script->functionTemp[0] < 100) && ((x + 50) >= 421)) {
+        script->functionTemp[0] = 110;
+    }
+
+    switch (script->functionTemp[0]) {
+        case 0:
+            func_800495A0(script, aiSettings, territoryPtr);
+            npc->collisionHeight = enemy->varTable[6];
+            if (enemy->varTable[13] != 0) {
+                if (npc->pos.y <= 0.0) {
+                    npc->flags = (npc->flags & ~0x200) | 8;
+                } else {
+                    npc->flags = (npc->flags | 0x200) & ~8;
+                }
+            }
+            func_800496B8(script, aiSettings, territoryPtr);
+            break;
+
+        case 1:
+            func_800496B8(script, aiSettings, territoryPtr);
+            break;
+
+        case 2:
+            base_UnkNpcAIFunc1(script, aiSettings, territoryPtr);
+
+        case 3:
+            func_80049C04(script, aiSettings, territoryPtr);
+            break;
+
+        case 12:
+            N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr);
+
+        case 13:
+            N(UnkDistFunc)(script, aiSettings, territoryPtr);
+            npc->collisionHeight = enemy->varTable[6];
+            break;
+
+        case 14:
+            N(UnkNpcAIFunc12)(script, aiSettings, territoryPtr);
+            break;
+
+        case 15:
+            N(set_script_owner_npc_col_height)(script, aiSettings, territoryPtr);
+            break;
+
+        case 100:
+            if (enemy->varTable[10] != 2) {
+                break;
+            }
+            npc2 = get_npc_unsafe(get_enemy(enemy->varTable[11])->npcID);
+            if (npc2->yaw < 180.0) {
+                npc->pos.x = npc2->pos.x + 12.0;
+            } else {
+                npc->pos.x = npc2->pos.x - 12.0;
+            }
+            npc->pos.y = npc2->pos.y + 25.0;
+            npc->pos.z = npc2->pos.z + 1.0;
+            npc->rotation.y = 0.0f;
+            npc->flags |= 8;
+            npc->flags &= ~2;
+            npc->flags &= ~0x200;
+            npc->renderYaw = 0.0f;
+            npc->currentAnim.w = 0x4A0018;
+            script->functionTemp[0] = 101;
+
+        case 101:
+            if (enemy->varTable[10] != 3) {
+                break;
+            }
+            enemy->varTable[10] = 4;
+            npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
+            npc->moveSpeed = 2.5f;
+            npc->jumpVelocity = 8.0f;
+            npc->jumpScale = 0.8f;
+            npc->flags |= 0x800;
+            script->functionTemp[0] = 102;
+
+        case 102:
+            if (npc->moveSpeed > 0.0) {
+                x2 = npc->pos.x;
+                y2 = npc->pos.y;
+                z2 = npc->pos.z;
+                if (npc_test_move_simple_with_slipping(npc->unk_80, &x2, &y2, &z2, npc->moveSpeed, npc->yaw, npc->collisionHeight,
+                                  npc->collisionRadius) == 0) {
+                    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+                } else {
+                    npc->moveSpeed = 0.0f;
+                }
+            }
+
+
+            if (npc->jumpVelocity < 0.0) {
+                x2 = npc->pos.x;
+                y2 = npc->pos.y + 13.0;
+                z2 = npc->pos.z;
+                w2 = fabsf(npc->jumpVelocity) + 16.0;
+                if ((npc_raycast_down_sides(npc->unk_80, &x2, &y2, &z2, &w2) != 0) && (w2 <= (fabsf(npc->jumpVelocity) + 13.0))) {
+                    npc->pos.y = y2;
+                    enemy->territory->wander.point.x = npc->pos.x;
+                    enemy->territory->wander.point.y = npc->pos.y;
+                    enemy->territory->wander.point.z = npc->pos.z;
+                    enemy->territory->wander.detect.x = npc->pos.x;
+                    enemy->territory->wander.detect.y = npc->pos.y;
+                    enemy->territory->wander.detect.z = npc->pos.z;
+                    enemy->varTable[10] = 5;
+                    if (enemy->varTable[13] != 0) {
+                        if (npc->pos.y <= 0.0) {
+                            npc->flags = (npc->flags & ~0x200) | 8;
+                        } else {
+                            npc->flags = (npc->flags | 0x200) & ~8;
+                        }
+                    } else if (!enemy->territory->wander.isFlying) {
+                        npc->flags = (npc->flags | 0x200) & ~8;
+                    } else {
+                        npc->flags = (npc->flags & ~0x200) | 8;
+                    }
+                    npc->flags = (npc->flags | 0x40000) & ~0x800;
+                    npc->jumpVelocity = 0.0f;
+                    npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
+                    npc->currentAnim.w = 0x4A001A;
+                    npc->duration = 3;
+                    script->functionTemp[0] = 103;
+                    break;
+                }
+            }
+            npc->pos.y += npc->jumpVelocity;
+            npc->jumpVelocity -= npc->jumpScale;
+            break;
+
+        case 103:
+            npc->duration--;
+            if (npc->duration <= 0) {
+                npc->flags &= 0xFFFBFFFF;
+                npc->currentAnim.w = 0x4A0001;
+                script->functionTemp[0] = 0;
+            }
+            break;
+
+        case 110:
+            npc->duration = 30;
+            npc->pos.x = 0.0f;
+            npc->pos.z = 0.0f;
+            npc->pos.y = -1000.0f;
+            npc->flags = (npc->flags | 0xA) & ~0x200;
+            script->functionTemp[0] = 111;
+
+        case 111:
+            npc->duration--;
+            if (npc->duration <= 0) {
+                enemy->varTable[10] = 0;
+                script->functionTemp[0] = 100;
+            }
+            break;
+
+        case 200:
+            func_8004A73C(script);
+            break;
+
+    }
+    return ApiStatus_BLOCK;
+}
+#else
 INCLUDE_ASM(s32, "EF2680", func_8024299C_EF4FAC);
+#endif
diff --git a/src/EF7A80.c b/src/EF7A80.c
index 13f352984d..84d44d079f 100644
--- a/src/EF7A80.c
+++ b/src/EF7A80.c
@@ -9,6 +9,33 @@
 
 #include "common/DeadUnk1.inc.c"
 
-INCLUDE_ASM(s32, "EF7A80", func_80240340_EF7DC0);
+// Copy from flo_18
+typedef struct unk_effect {
+    char unk_00[0x30];
+    s32 unk_30;
+    s32 unk_34;
+    s32 unk_38;
+    char unk_3C[0x4];
+    s32 unk_40;
+    s32 unk_44;
+    s32 unk_48;
+} unk_effect;
+
+typedef struct temp {
+    char unk_00[0xC];
+    unk_effect* unk_0C;
+} temp;
+
+ApiStatus func_80240340_EF7DC0(Evt* script, s32 isInitialCall) {
+    temp* ptr = script->varTable[15];
+
+    ptr->unk_0C->unk_30 = 69;
+    ptr->unk_0C->unk_34 = 255;
+    ptr->unk_0C->unk_38 = 217;
+    ptr->unk_0C->unk_40 = 176;
+    ptr->unk_0C->unk_44 = 254;
+    ptr->unk_0C->unk_48 = 124;
+    return ApiStatus_DONE2;
+}
 
 #include "common/DeadUnkFloatFunc.inc.c"
diff --git a/src/EF7FB0.c b/src/EF7FB0.c
index bcb7732ad3..78a90da5fc 100644
--- a/src/EF7FB0.c
+++ b/src/EF7FB0.c
@@ -1,4 +1,7 @@
 #include "dead.h"
 #include "common.h"
 
-INCLUDE_ASM(s32, "EF7FB0", func_80240530_EF7FB0);
+ApiStatus func_80240530_EF7FB0(Evt* script, s32 isInitialCall) {
+    script->varTable[10] = atan2(script->varTable[0], script->varTable[2], script->varTable[3], script->varTable[5]);
+    return ApiStatus_DONE2;
+}
diff --git a/src/EFEB00.c b/src/EFEB00.c
index 276d29e638..2c525248f9 100644
--- a/src/EFEB00.c
+++ b/src/EFEB00.c
@@ -1,6 +1,9 @@
 #include "dead.h"
 #include "common.h"
 
+// This whole file seems to be a dead/unused flo map?
+// It especially shares a lot of familiarities with flo_19
+
 #define NAMESPACE EFEB00
 
 #include "world/common/DeadUnkTexturePanFunc.inc.c"
@@ -11,12 +14,50 @@
 
 #include "common/DeadUnkFloatFuncAbs.inc.c"
 
-INCLUDE_ASM(s32, "EFEB00", func_802404D0_EFEFD0);
+ApiStatus func_802404D0_EFEFD0(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 var1 = *args++;
+    s32 var2 = *args++;
 
-INCLUDE_ASM(s32, "EFEB00", func_80240540_EFF040);
+    evt_set_variable(script, var1, gPlayerStatus.spriteFacingAngle);
+    evt_set_variable(script, var2, gPlayerStatus.targetYaw);
 
-INCLUDE_ASM(s32, "EFEB00", func_80240660_EFF160);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "EFEB00", func_80240784_EFF284);
+ApiStatus func_80240540_EFF040(Evt* script, s32 isInitialCall) {
+    f32 temp_f20 = evt_get_variable(NULL, script->varTable[2]);
+    f32 dist = dist2D(0.0f, 0.0f, script->varTable[9], script->varTable[11]);
+    f32 temp_f22 = clamp_angle(atan2(0.0f, 0.0f, script->varTable[9], script->varTable[11]) - temp_f20);
+
+    temp_f20 = sin_deg(temp_f22);
+    gPlayerStatus.position.x = (dist * temp_f20) + 0.0f;
+    gPlayerStatus.position.y = evt_get_variable(NULL, script->varTable[10]) + evt_get_variable(NULL, script->varTable[3]);
+    temp_f20 = cos_deg(temp_f22);
+    gPlayerStatus.position.z = 0.0f - (dist * temp_f20);
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80240660_EFF160(Evt* script, s32 isInitialCall) {
+    Npc* npc = get_npc_by_index(0);
+    f32 temp_f20 = evt_get_variable(NULL, script->varTable[2]);
+    f32 dist = dist2D(0.0f, 0.0f, script->varTable[12], script->varTable[14]);
+    f32 clamped = clamp_angle(atan2(0.0f, 0.0f, script->varTable[12], script->varTable[14]) - temp_f20);
+
+    temp_f20 = sin_deg(clamped);
+    npc->pos.x = (dist * temp_f20) + 0.0f;
+    npc->pos.y = evt_get_variable(NULL, script->varTable[13]) + evt_get_variable(NULL, script->varTable[3]);
+    temp_f20 = cos_deg(clamped);
+    npc->pos.z = 0.0f - (dist * temp_f20);
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80240784_EFF284(Evt* script, s32 isInitialCall) {
+    set_screen_overlay_params_back(1, script->varTable[0]);
+    return ApiStatus_DONE2;
+}
+
+#include "common/DeadUnkFloatFunc.inc.c"
 
-INCLUDE_ASM(s32, "EFEB00", func_802407B0_EFF2B0);
diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt
index 95afbd61f3..a425bd8772 100644
--- a/tools/ignored_funcs.txt
+++ b/tools/ignored_funcs.txt
@@ -4,12 +4,12 @@ dead_set_main_pan_v = 0x8012607C;
 dead_set_aux_pan_u = 0x80126094;
 dead_set_aux_pan_v = 0x801260AC;
 dead_get_npc_unsafe = 0x8003E4BC; // get_npc_safe
-func_80075110 = 0x80075110;
-func_80042AF4 = 0x80042AF4;
-func_8002B1C4 = 0x8002B1C4;
-func_8002AF18 = 0x8002AF18;
+dead_fx_emote = 0x80075110;
+dead_get_enemy = 0x80042AF4;
+dead_dist2D = 0x8002B1C4;
+dead_get_clamped_angle_diff = 0x8002AF18;
 dead_clamp_angle = 0x8002AE14;
-func_8004D800 = 0x8004D800;
+dead_ai_enemy_play_sound = 0x8004D800;
 func_8002B28C = 0x8002B28C;
 dead_evt_get_variable = 0x802D4E8C;
 func_8004D9C0 = 0x8004D9C0;
@@ -23,19 +23,19 @@ func_8004E544 = 0x8004E544;
 func_8004E808 = 0x8004E808;
 func_8004EB8C = 0x8004EB8C;
 func_8004D1A4 = 0x8004D1A4;
-func_8003E424 = 0x8003E424;
+dead_npc_move_heading = 0x8003E424;
 func_80067040 = 0x80067040;
-func_800E5304 = 0x800E5304;
-func_800E423C = 0x800E423C;
-func_8004D0C4 = 0x8004D0C4;
+dead_npc_test_move_simple_with_slipping = 0x800E5304;
+dead_npc_raycast_down_sides = 0x800E423C;
+dead_is_point_within_region = 0x8004D0C4;
 func_8004D8E0 = 0x8004D8E0;
 dead_rand_int = 0x8002ACEC;
 func_8003E534 = 0x8003E534; // get_npc_safe
 func_8002BFD4 = 0x8002BFD4;
 func_8002C01C = 0x8002C01C;
 dead_evt_set_variable = 0x802D5468;
-func_8002B5DC = 0x8002B5DC;
-func_8002B640 = 0x8002B640;
+dead_sin_deg = 0x8002B5DC;
+dead_cos_deg = 0x8002B640;
 func_800F1EF8 = 0x800F1EF8;
 func_8015704C = 0x8015704C;
 dead_evt_get_float_variable = 0x802D57FC;
@@ -56,7 +56,7 @@ func_80077BD0 = 0x80077BD0;
 func_80041080 = 0x80041080;
 func_800F1D9C = 0x800F1D9C;
 func_800F1730 = 0x800F1730;
-func_8003C43C = 0x8003C43C;
+dead_get_npc_by_index = 0x8003C43C;
 dead_evt_set_float_variable = 0x802D5A10;
 func_800F1718 = 0x800F1718;
 func_800F16F4 = 0x800F16F4;
@@ -87,7 +87,7 @@ func_800F7278 = 0x800F7278;
 func_800F2E98 = 0x800F2E98;
 func_8003ED50 = 0x8003ED50;
 func_8003E5E8 = 0x8003E5E8;
-func_8002FCBC = 0x8002FCBC;
+dead_get_screen_coords = 0x8002FCBC;
 func_801574DC = 0x801574DC;
 func_80157118 = 0x80157118;
 func_8005F238 = 0x8005F238;
@@ -97,4 +97,4 @@ func_80130C64 = 0x80130C64;
 func_8002B45C = 0x8002B45C;
 func_801266F8 = 0x801266F8;
 func_80126734 = 0x80126734;
-func_80144194 = 0x80144194;
+dead_set_screen_overlay_params_back = 0x80144194;
diff --git a/ver/us/asm/nonmatchings/EA0C10/func_802403EC_EA0CEC.s b/ver/us/asm/nonmatchings/EA0C10/func_802403EC_EA0CEC.s
index b4304a8975..3a5b3fd436 100644
--- a/ver/us/asm/nonmatchings/EA0C10/func_802403EC_EA0CEC.s
+++ b/ver/us/asm/nonmatchings/EA0C10/func_802403EC_EA0CEC.s
@@ -47,7 +47,7 @@ glabel func_802403EC_EA0CEC
 /* EA0D94 80240494 0000302D */  daddu     $a2, $zero, $zero
 /* EA0D98 80240498 AFA30020 */  sw        $v1, 0x20($sp)
 /* EA0D9C 8024049C 2442FFFF */  addiu     $v0, $v0, -1
-/* EA0DA0 802404A0 0C01D444 */  jal       func_80075110
+/* EA0DA0 802404A0 0C01D444 */  jal       dead_fx_emote
 /* EA0DA4 802404A4 AFA2001C */   sw       $v0, 0x1c($sp)
 /* EA0DA8 802404A8 24020021 */  addiu     $v0, $zero, 0x21
 .L802404AC:
diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80240518_EA0E18.s b/ver/us/asm/nonmatchings/EA0C10/func_80240518_EA0E18.s
index da879a58cd..5fbd82accc 100644
--- a/ver/us/asm/nonmatchings/EA0C10/func_80240518_EA0E18.s
+++ b/ver/us/asm/nonmatchings/EA0C10/func_80240518_EA0E18.s
@@ -35,7 +35,7 @@ glabel func_80240518_EA0E18
 /* EA0E74 80240574 000218C0 */  sll       $v1, $v0, 3
 /* EA0E78 80240578 00431021 */  addu      $v0, $v0, $v1
 /* EA0E7C 8024057C 000210C0 */  sll       $v0, $v0, 3
-/* EA0E80 80240580 0C010ABD */  jal       func_80042AF4
+/* EA0E80 80240580 0C010ABD */  jal       dead_get_enemy
 /* EA0E84 80240584 00459021 */   addu     $s2, $v0, $a1
 /* EA0E88 80240588 3C148010 */  lui       $s4, %hi(dead_gPlayerStatusPtr)
 /* EA0E8C 8024058C 2694FC90 */  addiu     $s4, $s4, %lo(dead_gPlayerStatusPtr)
@@ -44,7 +44,7 @@ glabel func_80240518_EA0E18
 /* EA0E98 80240598 C60E0040 */  lwc1      $f14, 0x40($s0)
 /* EA0E9C 8024059C 8C660028 */  lw        $a2, 0x28($v1)
 /* EA0EA0 802405A0 8C670030 */  lw        $a3, 0x30($v1)
-/* EA0EA4 802405A4 0C00AC71 */  jal       func_8002B1C4
+/* EA0EA4 802405A4 0C00AC71 */  jal       dead_dist2D
 /* EA0EA8 802405A8 0040982D */   daddu    $s3, $v0, $zero
 /* EA0EAC 802405AC C6620074 */  lwc1      $f2, 0x74($s3)
 /* EA0EB0 802405B0 468010A0 */  cvt.s.w   $f2, $f2
@@ -57,7 +57,7 @@ glabel func_80240518_EA0E18
 /* EA0EC8 802405C8 C60E000C */  lwc1      $f14, 0xc($s0)
 /* EA0ECC 802405CC 3C014387 */  lui       $at, 0x4387
 /* EA0ED0 802405D0 4481A000 */  mtc1      $at, $f20
-/* EA0ED4 802405D4 0C00ABC6 */  jal       func_8002AF18
+/* EA0ED4 802405D4 0C00ABC6 */  jal       dead_get_clamped_angle_diff
 /* EA0ED8 802405D8 00000000 */   nop
 /* EA0EDC 802405DC 0C00AB85 */  jal       dead_clamp_angle
 /* EA0EE0 802405E0 46000306 */   mov.s    $f12, $f0
@@ -78,7 +78,7 @@ glabel func_80240518_EA0E18
 /* EA0F18 80240618 0C00ABDC */  jal       fio_validate_header_checksums
 /* EA0F1C 8024061C 8C470030 */   lw       $a3, 0x30($v0)
 /* EA0F20 80240620 4600A306 */  mov.s     $f12, $f20
-/* EA0F24 80240624 0C00ABC6 */  jal       func_8002AF18
+/* EA0F24 80240624 0C00ABC6 */  jal       dead_get_clamped_angle_diff
 /* EA0F28 80240628 46000386 */   mov.s    $f14, $f0
 /* EA0F2C 8024062C C6620078 */  lwc1      $f2, 0x78($s3)
 /* EA0F30 80240630 468010A0 */  cvt.s.w   $f2, $f2
diff --git a/ver/us/asm/nonmatchings/EA0C10/func_802406CC_EA0FCC.s b/ver/us/asm/nonmatchings/EA0C10/func_802406CC_EA0FCC.s
index dc55582cd3..2d97c44994 100644
--- a/ver/us/asm/nonmatchings/EA0C10/func_802406CC_EA0FCC.s
+++ b/ver/us/asm/nonmatchings/EA0C10/func_802406CC_EA0FCC.s
@@ -62,7 +62,7 @@ glabel func_802406CC_EA0FCC
 /* EA10A8 802407A8 00000000 */   nop
 .L802407AC:
 /* EA10AC 802407AC 86240008 */  lh        $a0, 8($s1)
-/* EA10B0 802407B0 0C010ABD */  jal       func_80042AF4
+/* EA10B0 802407B0 0C010ABD */  jal       dead_get_enemy
 /* EA10B4 802407B4 2484FFFF */   addiu    $a0, $a0, -1
 /* EA10B8 802407B8 0040802D */  daddu     $s0, $v0, $zero
 /* EA10BC 802407BC 0C00F92F */  jal       dead_get_npc_unsafe
@@ -77,7 +77,7 @@ glabel func_802406CC_EA0FCC
 /* EA10E0 802407E0 8E2500A8 */  lw        $a1, 0xa8($s1)
 /* EA10E4 802407E4 10A00003 */  beqz      $a1, .L802407F4
 /* EA10E8 802407E8 0260202D */   daddu    $a0, $s3, $zero
-/* EA10EC 802407EC 0C013600 */  jal       func_8004D800
+/* EA10EC 802407EC 0C013600 */  jal       dead_ai_enemy_play_sound
 /* EA10F0 802407F0 0000302D */   daddu    $a2, $zero, $zero
 .L802407F4:
 /* EA10F4 802407F4 27A40010 */  addiu     $a0, $sp, 0x10
@@ -133,7 +133,7 @@ glabel func_802406CC_EA0FCC
 /* EA11BC 802408BC AE820070 */   sw       $v0, 0x70($s4)
 .L802408C0:
 /* EA11C0 802408C0 86240008 */  lh        $a0, 8($s1)
-/* EA11C4 802408C4 0C010ABD */  jal       func_80042AF4
+/* EA11C4 802408C4 0C010ABD */  jal       dead_get_enemy
 /* EA11C8 802408C8 2484FFFF */   addiu    $a0, $a0, -1
 /* EA11CC 802408CC 0040802D */  daddu     $s0, $v0, $zero
 /* EA11D0 802408D0 0C00F92F */  jal       dead_get_npc_unsafe
diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80240CC8_EA15C8.s b/ver/us/asm/nonmatchings/EA0C10/func_80240CC8_EA15C8.s
index 39361c1d9e..2a6981184d 100644
--- a/ver/us/asm/nonmatchings/EA0C10/func_80240CC8_EA15C8.s
+++ b/ver/us/asm/nonmatchings/EA0C10/func_80240CC8_EA15C8.s
@@ -24,7 +24,7 @@ glabel func_80240CC8_EA15C8
 /* EA1614 80240D14 10400024 */  beqz      $v0, .L80240DA8
 /* EA1618 80240D18 0220202D */   daddu    $a0, $s1, $zero
 /* EA161C 80240D1C 24050322 */  addiu     $a1, $zero, 0x322
-/* EA1620 80240D20 0C013600 */  jal       func_8004D800
+/* EA1620 80240D20 0C013600 */  jal       dead_ai_enemy_play_sound
 /* EA1624 80240D24 0000302D */   daddu    $a2, $zero, $zero
 /* EA1628 80240D28 0000202D */  daddu     $a0, $zero, $zero
 /* EA162C 80240D2C 0220282D */  daddu     $a1, $s1, $zero
@@ -46,11 +46,11 @@ glabel func_80240CC8_EA15C8
 /* EA166C 80240D6C AFA20020 */  sw        $v0, 0x20($sp)
 /* EA1670 80240D70 E7A00010 */  swc1      $f0, 0x10($sp)
 /* EA1674 80240D74 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EA1678 80240D78 0C01D444 */  jal       func_80075110
+/* EA1678 80240D78 0C01D444 */  jal       dead_fx_emote
 /* EA167C 80240D7C E7A40018 */   swc1     $f4, 0x18($sp)
 /* EA1680 80240D80 0220202D */  daddu     $a0, $s1, $zero
 /* EA1684 80240D84 240502F4 */  addiu     $a1, $zero, 0x2f4
-/* EA1688 80240D88 0C013600 */  jal       func_8004D800
+/* EA1688 80240D88 0C013600 */  jal       dead_ai_enemy_play_sound
 /* EA168C 80240D8C 3C060020 */   lui      $a2, 0x20
 /* EA1690 80240D90 8E4200CC */  lw        $v0, 0xcc($s2)
 /* EA1694 80240D94 8C420020 */  lw        $v0, 0x20($v0)
diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80240DC4_EA16C4.s b/ver/us/asm/nonmatchings/EA0C10/func_80240DC4_EA16C4.s
index b0968d2620..7075c3c5e1 100644
--- a/ver/us/asm/nonmatchings/EA0C10/func_80240DC4_EA16C4.s
+++ b/ver/us/asm/nonmatchings/EA0C10/func_80240DC4_EA16C4.s
@@ -173,7 +173,7 @@ glabel func_80240DC4_EA16C4
 /* EA18F0 80240FF0 4600A000 */  add.s     $f0, $f20, $f0
 /* EA18F4 80240FF4 4406B000 */  mfc1      $a2, $f22
 /* EA18F8 80240FF8 44050000 */  mfc1      $a1, $f0
-/* EA18FC 80240FFC 0C00F909 */  jal       func_8003E424
+/* EA18FC 80240FFC 0C00F909 */  jal       dead_npc_move_heading
 /* EA1900 80241000 0220202D */   daddu    $a0, $s1, $zero
 /* EA1904 80241004 8EC20088 */  lw        $v0, 0x88($s6)
 /* EA1908 80241008 1440005D */  bnez      $v0, .L80241180
@@ -313,7 +313,7 @@ glabel func_80240DC4_EA16C4
 /* EA1B00 80241200 46800020 */  cvt.s.w   $f0, $f0
 /* EA1B04 80241204 E7A0001C */  swc1      $f0, 0x1c($sp)
 /* EA1B08 80241208 8E240080 */  lw        $a0, 0x80($s1)
-/* EA1B0C 8024120C 0C0394C1 */  jal       func_800E5304
+/* EA1B0C 8024120C 0C0394C1 */  jal       dead_npc_test_move_simple_with_slipping
 /* EA1B10 80241210 0200382D */   daddu    $a3, $s0, $zero
 /* EA1B14 80241214 104000CA */  beqz      $v0, .L80241540
 /* EA1B18 80241218 0280282D */   daddu    $a1, $s4, $zero
@@ -343,7 +343,7 @@ glabel func_80240DC4_EA16C4
 /* EA1B78 80241278 46800020 */  cvt.s.w   $f0, $f0
 /* EA1B7C 8024127C E7A0001C */  swc1      $f0, 0x1c($sp)
 /* EA1B80 80241280 8E240080 */  lw        $a0, 0x80($s1)
-/* EA1B84 80241284 0C0394C1 */  jal       func_800E5304
+/* EA1B84 80241284 0C0394C1 */  jal       dead_npc_test_move_simple_with_slipping
 /* EA1B88 80241288 0200382D */   daddu    $a3, $s0, $zero
 /* EA1B8C 8024128C 27A5002C */  addiu     $a1, $sp, 0x2c
 /* EA1B90 80241290 27A60030 */  addiu     $a2, $sp, 0x30
@@ -366,7 +366,7 @@ glabel func_80240DC4_EA16C4
 /* EA1BD4 802412D4 E7A00030 */  swc1      $f0, 0x30($sp)
 /* EA1BD8 802412D8 AFA30010 */  sw        $v1, 0x10($sp)
 /* EA1BDC 802412DC 8E240080 */  lw        $a0, 0x80($s1)
-/* EA1BE0 802412E0 0C03908F */  jal       func_800E423C
+/* EA1BE0 802412E0 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EA1BE4 802412E4 0040802D */   daddu    $s0, $v0, $zero
 /* EA1BE8 802412E8 1600001C */  bnez      $s0, .L8024135C
 /* EA1BEC 802412EC 00000000 */   nop
@@ -428,14 +428,14 @@ glabel func_80240DC4_EA16C4
 /* EA1CC8 802413C8 46800020 */  cvt.s.w   $f0, $f0
 /* EA1CCC 802413CC E7A0001C */  swc1      $f0, 0x1c($sp)
 /* EA1CD0 802413D0 8E240080 */  lw        $a0, 0x80($s1)
-/* EA1CD4 802413D4 0C0394C1 */  jal       func_800E5304
+/* EA1CD4 802413D4 0C0394C1 */  jal       dead_npc_test_move_simple_with_slipping
 /* EA1CD8 802413D8 27A70028 */   addiu    $a3, $sp, 0x28
 /* EA1CDC 802413DC 8FA60020 */  lw        $a2, 0x20($sp)
 /* EA1CE0 802413E0 8E020000 */  lw        $v0, ($s0)
 /* EA1CE4 802413E4 8FA70028 */  lw        $a3, 0x28($sp)
 /* EA1CE8 802413E8 C44C0028 */  lwc1      $f12, 0x28($v0)
 /* EA1CEC 802413EC C44E0030 */  lwc1      $f14, 0x30($v0)
-/* EA1CF0 802413F0 0C00AC71 */  jal       func_8002B1C4
+/* EA1CF0 802413F0 0C00AC71 */  jal       dead_dist2D
 /* EA1CF4 802413F4 24170001 */   addiu    $s7, $zero, 1
 /* EA1CF8 802413F8 46000506 */  mov.s     $f20, $f0
 /* EA1CFC 802413FC 8E030000 */  lw        $v1, ($s0)
@@ -486,7 +486,7 @@ glabel func_80240DC4_EA16C4
 /* EA1DAC 802414AC 46800020 */  cvt.s.w   $f0, $f0
 /* EA1DB0 802414B0 E7A0001C */  swc1      $f0, 0x1c($sp)
 /* EA1DB4 802414B4 8E240080 */  lw        $a0, 0x80($s1)
-/* EA1DB8 802414B8 0C0394C1 */  jal       func_800E5304
+/* EA1DB8 802414B8 0C0394C1 */  jal       dead_npc_test_move_simple_with_slipping
 /* EA1DBC 802414BC 27A70028 */   addiu    $a3, $sp, 0x28
 /* EA1DC0 802414C0 1040001F */  beqz      $v0, .L80241540
 /* EA1DC4 802414C4 00000000 */   nop
@@ -494,7 +494,7 @@ glabel func_80240DC4_EA16C4
 /* EA1DCC 802414CC 8EA20000 */  lw        $v0, ($s5)
 /* EA1DD0 802414D0 8FA70028 */  lw        $a3, 0x28($sp)
 /* EA1DD4 802414D4 C44C0028 */  lwc1      $f12, 0x28($v0)
-/* EA1DD8 802414D8 0C00AC71 */  jal       func_8002B1C4
+/* EA1DD8 802414D8 0C00AC71 */  jal       dead_dist2D
 /* EA1DDC 802414DC C44E0030 */   lwc1     $f14, 0x30($v0)
 /* EA1DE0 802414E0 46000506 */  mov.s     $f20, $f0
 /* EA1DE4 802414E4 8EA30000 */  lw        $v1, ($s5)
@@ -519,7 +519,7 @@ glabel func_80240DC4_EA16C4
 .L80241530:
 /* EA1E30 80241530 4406B000 */  mfc1      $a2, $f22
 /* EA1E34 80241534 4405A000 */  mfc1      $a1, $f20
-/* EA1E38 80241538 0C00F909 */  jal       func_8003E424
+/* EA1E38 80241538 0C00F909 */  jal       dead_npc_move_heading
 /* EA1E3C 8024153C 0220202D */   daddu    $a0, $s1, $zero
 .L80241540:
 /* EA1E40 80241540 C6400008 */  lwc1      $f0, 8($s2)
@@ -539,7 +539,7 @@ glabel func_80240DC4_EA16C4
 /* EA1E78 80241578 E7A00018 */  swc1      $f0, 0x18($sp)
 /* EA1E7C 8024157C 8E440004 */  lw        $a0, 4($s2)
 /* EA1E80 80241580 8E270038 */  lw        $a3, 0x38($s1)
-/* EA1E84 80241584 0C013431 */  jal       func_8004D0C4
+/* EA1E84 80241584 0C013431 */  jal       dead_is_point_within_region
 /* EA1E88 80241588 26330040 */   addiu    $s3, $s1, 0x40
 /* EA1E8C 8024158C 1040005A */  beqz      $v0, .L802416F8
 /* EA1E90 80241590 00000000 */   nop
@@ -559,7 +559,7 @@ glabel func_80240DC4_EA16C4
 /* EA1EC4 802415C4 C62C0038 */  lwc1      $f12, 0x38($s1)
 /* EA1EC8 802415C8 C62E0040 */  lwc1      $f14, 0x40($s1)
 /* EA1ECC 802415CC 44074000 */  mfc1      $a3, $f8
-/* EA1ED0 802415D0 0C00AC71 */  jal       func_8002B1C4
+/* EA1ED0 802415D0 0C00AC71 */  jal       dead_dist2D
 /* EA1ED4 802415D4 00000000 */   nop
 /* EA1ED8 802415D8 C6420010 */  lwc1      $f2, 0x10($s2)
 /* EA1EDC 802415DC 468010A0 */  cvt.s.w   $f2, $f2
@@ -665,7 +665,7 @@ glabel func_80240DC4_EA16C4
 /* EA2054 80241754 E7A00024 */  swc1      $f0, 0x24($sp)
 /* EA2058 80241758 AFA20010 */  sw        $v0, 0x10($sp)
 /* EA205C 8024175C 8E240080 */  lw        $a0, 0x80($s1)
-/* EA2060 80241760 0C03908F */  jal       func_800E423C
+/* EA2060 80241760 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EA2064 80241764 27A70028 */   addiu    $a3, $sp, 0x28
 /* EA2068 80241768 10400003 */  beqz      $v0, .L80241778
 /* EA206C 8024176C 00000000 */   nop
@@ -682,7 +682,7 @@ glabel func_80240DC4_EA16C4
 /* EA2094 80241794 0220202D */  daddu     $a0, $s1, $zero
 /* EA2098 80241798 24050321 */  addiu     $a1, $zero, 0x321
 /* EA209C 8024179C 0000302D */  daddu     $a2, $zero, $zero
-/* EA20A0 802417A0 0C013600 */  jal       func_8004D800
+/* EA20A0 802417A0 0C013600 */  jal       dead_ai_enemy_play_sound
 /* EA20A4 802417A4 E620000C */   swc1     $f0, 0xc($s1)
 /* EA20A8 802417A8 8EC200CC */  lw        $v0, 0xcc($s6)
 /* EA20AC 802417AC 8C420024 */  lw        $v0, 0x24($v0)
diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80241894_EA2194.s b/ver/us/asm/nonmatchings/EA0C10/func_80241894_EA2194.s
index c31d96e7a4..fb19487bcc 100644
--- a/ver/us/asm/nonmatchings/EA0C10/func_80241894_EA2194.s
+++ b/ver/us/asm/nonmatchings/EA0C10/func_80241894_EA2194.s
@@ -59,7 +59,7 @@ glabel func_80241894_EA2194
 /* EA2264 80241964 E7A00010 */  swc1      $f0, 0x10($sp)
 /* EA2268 80241968 E7A20014 */  swc1      $f2, 0x14($sp)
 /* EA226C 8024196C E7A40018 */  swc1      $f4, 0x18($sp)
-/* EA2270 80241970 0C01D444 */  jal       func_80075110
+/* EA2270 80241970 0C01D444 */  jal       dead_fx_emote
 /* EA2274 80241974 AFA20020 */   sw       $v0, 0x20($sp)
 /* EA2278 80241978 2402000D */  addiu     $v0, $zero, 0xd
 /* EA227C 8024197C AE220070 */  sw        $v0, 0x70($s1)
diff --git a/ver/us/asm/nonmatchings/EA0C10/func_802419F4_EA22F4.s b/ver/us/asm/nonmatchings/EA0C10/func_802419F4_EA22F4.s
index 5303a5147c..bb5ea8309a 100644
--- a/ver/us/asm/nonmatchings/EA0C10/func_802419F4_EA22F4.s
+++ b/ver/us/asm/nonmatchings/EA0C10/func_802419F4_EA22F4.s
@@ -49,7 +49,7 @@ glabel func_802419F4_EA22F4
 /* EA23A4 80241AA4 AFA20020 */  sw        $v0, 0x20($sp)
 /* EA23A8 80241AA8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* EA23AC 80241AAC E7A20014 */  swc1      $f2, 0x14($sp)
-/* EA23B0 80241AB0 0C01D444 */  jal       func_80075110
+/* EA23B0 80241AB0 0C01D444 */  jal       dead_fx_emote
 /* EA23B4 80241AB4 E7A40018 */   swc1     $f4, 0x18($sp)
 /* EA23B8 80241AB8 A600008E */  sh        $zero, 0x8e($s0)
 .L80241ABC:
diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80241DE4_EA26E4.s b/ver/us/asm/nonmatchings/EA0C10/func_80241DE4_EA26E4.s
index 05e42f261c..96803df29f 100644
--- a/ver/us/asm/nonmatchings/EA0C10/func_80241DE4_EA26E4.s
+++ b/ver/us/asm/nonmatchings/EA0C10/func_80241DE4_EA26E4.s
@@ -58,7 +58,7 @@ glabel func_80241DE4_EA26E4
 /* EA2790 80241E90 C60C0038 */  lwc1      $f12, 0x38($s0)
 /* EA2794 80241E94 C60E0040 */  lwc1      $f14, 0x40($s0)
 /* EA2798 80241E98 8C460028 */  lw        $a2, 0x28($v0)
-/* EA279C 80241E9C 0C00AC71 */  jal       func_8002B1C4
+/* EA279C 80241E9C 0C00AC71 */  jal       dead_dist2D
 /* EA27A0 80241EA0 8C470030 */   lw       $a3, 0x30($v0)
 /* EA27A4 80241EA4 C6020018 */  lwc1      $f2, 0x18($s0)
 /* EA27A8 80241EA8 46020003 */  div.s     $f0, $f0, $f2
diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80241F18_EA2818.s b/ver/us/asm/nonmatchings/EA0C10/func_80241F18_EA2818.s
index 4d8ac2df9f..c9bba212f6 100644
--- a/ver/us/asm/nonmatchings/EA0C10/func_80241F18_EA2818.s
+++ b/ver/us/asm/nonmatchings/EA0C10/func_80241F18_EA2818.s
@@ -59,14 +59,14 @@ glabel func_80241F18_EA2818
 /* EA28EC 80241FEC 46800020 */  cvt.s.w   $f0, $f0
 /* EA28F0 80241FF0 E7A0001C */  swc1      $f0, 0x1c($sp)
 /* EA28F4 80241FF4 8E040080 */  lw        $a0, 0x80($s0)
-/* EA28F8 80241FF8 0C0394C1 */  jal       func_800E5304
+/* EA28F8 80241FF8 0C0394C1 */  jal       dead_npc_test_move_simple_with_slipping
 /* EA28FC 80241FFC 27A70028 */   addiu    $a3, $sp, 0x28
 /* EA2900 80242000 0040902D */  daddu     $s2, $v0, $zero
 /* EA2904 80242004 16400005 */  bnez      $s2, .L8024201C
 /* EA2908 80242008 00000000 */   nop
 /* EA290C 8024200C 8E050018 */  lw        $a1, 0x18($s0)
 /* EA2910 80242010 8E06000C */  lw        $a2, 0xc($s0)
-/* EA2914 80242014 0C00F909 */  jal       func_8003E424
+/* EA2914 80242014 0C00F909 */  jal       dead_npc_move_heading
 /* EA2918 80242018 0200202D */   daddu    $a0, $s0, $zero
 .L8024201C:
 /* EA291C 8024201C 8602008E */  lh        $v0, 0x8e($s0)
diff --git a/ver/us/asm/nonmatchings/EA0C10/func_802420FC_EA29FC.s b/ver/us/asm/nonmatchings/EA0C10/func_802420FC_EA29FC.s
index 70af1fa19a..5685888e48 100644
--- a/ver/us/asm/nonmatchings/EA0C10/func_802420FC_EA29FC.s
+++ b/ver/us/asm/nonmatchings/EA0C10/func_802420FC_EA29FC.s
@@ -129,7 +129,7 @@ glabel func_802420FC_EA29FC
 /* EA2BC0 802422C0 AFA20020 */  sw        $v0, 0x20($sp)
 /* EA2BC4 802422C4 E7A00010 */  swc1      $f0, 0x10($sp)
 /* EA2BC8 802422C8 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EA2BCC 802422CC 0C01D444 */  jal       func_80075110
+/* EA2BCC 802422CC 0C01D444 */  jal       dead_fx_emote
 /* EA2BD0 802422D0 E7A40018 */   swc1     $f4, 0x18($sp)
 /* EA2BD4 802422D4 8E2200B0 */  lw        $v0, 0xb0($s1)
 /* EA2BD8 802422D8 2403FFFB */  addiu     $v1, $zero, -5
diff --git a/ver/us/asm/nonmatchings/EA0C10/func_802425B0_EA2EB0.s b/ver/us/asm/nonmatchings/EA0C10/func_802425B0_EA2EB0.s
index 5ff3d766ca..f3edc49afa 100644
--- a/ver/us/asm/nonmatchings/EA0C10/func_802425B0_EA2EB0.s
+++ b/ver/us/asm/nonmatchings/EA0C10/func_802425B0_EA2EB0.s
@@ -6,12 +6,12 @@ glabel func_802425B0_EA2EB0
 /* EA2EB4 802425B4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* EA2EB8 802425B8 0C00F94D */  jal       func_8003E534
 /* EA2EBC 802425BC 8C84014C */   lw       $a0, 0x14c($a0)
-/* EA2EC0 802425C0 3C038011 */  lui       $v1, %hi(D_80117578)
-/* EA2EC4 802425C4 24637578 */  addiu     $v1, $v1, %lo(D_80117578)
+/* EA2EC0 802425C0 3C038011 */  lui       $v1, %hi(dead_gPlayerStatus)
+/* EA2EC4 802425C4 24637578 */  addiu     $v1, $v1, %lo(dead_gPlayerStatus)
 /* EA2EC8 802425C8 C44C0038 */  lwc1      $f12, 0x38($v0)
 /* EA2ECC 802425CC C44E0040 */  lwc1      $f14, 0x40($v0)
 /* EA2ED0 802425D0 8C660028 */  lw        $a2, 0x28($v1)
-/* EA2ED4 802425D4 0C00AC71 */  jal       func_8002B1C4
+/* EA2ED4 802425D4 0C00AC71 */  jal       dead_dist2D
 /* EA2ED8 802425D8 8C670030 */   lw       $a3, 0x30($v1)
 /* EA2EDC 802425DC 3C014248 */  lui       $at, 0x4248
 /* EA2EE0 802425E0 44811000 */  mtc1      $at, $f2
diff --git a/ver/us/asm/nonmatchings/EA0C10/func_802427F0_EA30F0.s b/ver/us/asm/nonmatchings/EA0C10/func_802427F0_EA30F0.s
index 491c035195..499a2f0e21 100644
--- a/ver/us/asm/nonmatchings/EA0C10/func_802427F0_EA30F0.s
+++ b/ver/us/asm/nonmatchings/EA0C10/func_802427F0_EA30F0.s
@@ -38,8 +38,8 @@ glabel func_802427F0_EA30F0
 /* EA3174 80242874 4482C000 */  mtc1      $v0, $f24
 /* EA3178 80242878 00000000 */  nop
 /* EA317C 8024287C 4680C620 */  cvt.s.w   $f24, $f24
-/* EA3180 80242880 3C128011 */  lui       $s2, %hi(D_80117578)
-/* EA3184 80242884 26527578 */  addiu     $s2, $s2, %lo(D_80117578)
+/* EA3180 80242880 3C128011 */  lui       $s2, %hi(dead_gPlayerStatus)
+/* EA3184 80242884 26527578 */  addiu     $s2, $s2, %lo(dead_gPlayerStatus)
 /* EA3188 80242888 3C038008 */  lui       $v1, %hi(D_8007C760)
 /* EA318C 8024288C 8C63C760 */  lw        $v1, %lo(D_8007C760)($v1)
 /* EA3190 80242890 C64200A8 */  lwc1      $f2, 0xa8($s2)
@@ -72,7 +72,7 @@ glabel func_802427F0_EA30F0
 /* EA31F4 802428F4 46000586 */  mov.s     $f22, $f0
 /* EA31F8 802428F8 3C014170 */  lui       $at, 0x4170
 /* EA31FC 802428FC 4481A000 */  mtc1      $at, $f20
-/* EA3200 80242900 0C00AD77 */  jal       func_8002B5DC
+/* EA3200 80242900 0C00AD77 */  jal       dead_sin_deg
 /* EA3204 80242904 4600B306 */   mov.s    $f12, $f22
 /* EA3208 80242908 46140002 */  mul.s     $f0, $f0, $f20
 /* EA320C 8024290C 00000000 */  nop
@@ -86,7 +86,7 @@ glabel func_802427F0_EA30F0
 /* EA322C 8024292C 00000000 */  nop
 /* EA3230 80242930 4600E700 */  add.s     $f28, $f28, $f0
 /* EA3234 80242934 4602D680 */  add.s     $f26, $f26, $f2
-/* EA3238 80242938 0C00AD90 */  jal       func_8002B640
+/* EA3238 80242938 0C00AD90 */  jal       dead_cos_deg
 /* EA323C 8024293C 4600B306 */   mov.s    $f12, $f22
 /* EA3240 80242940 46140002 */  mul.s     $f0, $f0, $f20
 /* EA3244 80242944 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/EA36E0/func_80242E2C_EA372C.s b/ver/us/asm/nonmatchings/EA36E0/func_80242E2C_EA372C.s
index 51a7c39e44..a25d7ae23b 100644
--- a/ver/us/asm/nonmatchings/EA36E0/func_80242E2C_EA372C.s
+++ b/ver/us/asm/nonmatchings/EA36E0/func_80242E2C_EA372C.s
@@ -21,7 +21,7 @@ glabel func_80242E2C_EA372C
 /* EA376C 80242E6C E7A0001C */  swc1      $f0, 0x1c($sp)
 /* EA3770 80242E70 AFA00020 */  sw        $zero, 0x20($sp)
 /* EA3774 80242E74 E7A20024 */  swc1      $f2, 0x24($sp)
-/* EA3778 80242E78 0C03908F */  jal       func_800E423C
+/* EA3778 80242E78 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EA377C 80242E7C AFA20010 */   sw       $v0, 0x10($sp)
 /* EA3780 80242E80 1040000B */  beqz      $v0, .L80242EB0
 /* EA3784 80242E84 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/EA36E0/func_80242EC4_EA37C4.s b/ver/us/asm/nonmatchings/EA36E0/func_80242EC4_EA37C4.s
index c2e56ab553..d65be2073c 100644
--- a/ver/us/asm/nonmatchings/EA36E0/func_80242EC4_EA37C4.s
+++ b/ver/us/asm/nonmatchings/EA36E0/func_80242EC4_EA37C4.s
@@ -5,8 +5,8 @@ glabel func_80242EC4_EA37C4
 /* EA37C4 80242EC4 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* EA37C8 80242EC8 AFB00010 */  sw        $s0, 0x10($sp)
 /* EA37CC 80242ECC 0080802D */  daddu     $s0, $a0, $zero
-/* EA37D0 80242ED0 3C028011 */  lui       $v0, %hi(D_80117578)
-/* EA37D4 80242ED4 24427578 */  addiu     $v0, $v0, %lo(D_80117578)
+/* EA37D0 80242ED0 3C028011 */  lui       $v0, %hi(dead_gPlayerStatus)
+/* EA37D4 80242ED4 24427578 */  addiu     $v0, $v0, %lo(dead_gPlayerStatus)
 /* EA37D8 80242ED8 AFBF0014 */  sw        $ra, 0x14($sp)
 /* EA37DC 80242EDC C4400028 */  lwc1      $f0, 0x28($v0)
 /* EA37E0 80242EE0 C6020084 */  lwc1      $f2, 0x84($s0)
diff --git a/ver/us/asm/nonmatchings/EA36E0/func_80242F9C_EA389C.s b/ver/us/asm/nonmatchings/EA36E0/func_80242F9C_EA389C.s
index 23c1dc356d..50464ce86e 100644
--- a/ver/us/asm/nonmatchings/EA36E0/func_80242F9C_EA389C.s
+++ b/ver/us/asm/nonmatchings/EA36E0/func_80242F9C_EA389C.s
@@ -24,7 +24,7 @@ glabel func_80242F9C_EA389C
 /* EA38C0 80242FC0 46006307 */  neg.s     $f12, $f12
 /* EA38C4 80242FC4 46006321 */  cvt.d.s   $f12, $f12
 /* EA38C8 80242FC8 46346301 */  sub.d     $f12, $f12, $f20
-/* EA38CC 80242FCC 0C00AD90 */  jal       func_8002B640
+/* EA38CC 80242FCC 0C00AD90 */  jal       dead_cos_deg
 /* EA38D0 80242FD0 46206320 */   cvt.s.d  $f12, $f12
 /* EA38D4 80242FD4 3C014008 */  lui       $at, 0x4008
 /* EA38D8 80242FD8 44811800 */  mtc1      $at, $f3
@@ -42,7 +42,7 @@ glabel func_80242F9C_EA389C
 /* EA3908 80243008 46220001 */  sub.d     $f0, $f0, $f2
 /* EA390C 8024300C 4620010D */  trunc.w.d $f4, $f0
 /* EA3910 80243010 E6040098 */  swc1      $f4, 0x98($s0)
-/* EA3914 80243014 0C00AD77 */  jal       func_8002B5DC
+/* EA3914 80243014 0C00AD77 */  jal       dead_sin_deg
 /* EA3918 80243018 46206320 */   cvt.s.d  $f12, $f12
 /* EA391C 8024301C 3C014014 */  lui       $at, 0x4014
 /* EA3920 80243020 44811800 */  mtc1      $at, $f3
diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_802404B8_EA8F98.s b/ver/us/asm/nonmatchings/EA8AE0/func_802404B8_EA8F98.s
index c89b624a08..6d9da95534 100644
--- a/ver/us/asm/nonmatchings/EA8AE0/func_802404B8_EA8F98.s
+++ b/ver/us/asm/nonmatchings/EA8AE0/func_802404B8_EA8F98.s
@@ -15,8 +15,8 @@ glabel func_802404B8_EA8F98
 /* EA8FA4 802404C4 AFB00018 */  sw        $s0, 0x18($sp)
 /* EA8FA8 802404C8 8C910084 */  lw        $s1, 0x84($a0)
 /* EA8FAC 802404CC 86230044 */  lh        $v1, 0x44($s1)
-/* EA8FB0 802404D0 3C108011 */  lui       $s0, %hi(D_80117578)
-/* EA8FB4 802404D4 26107578 */  addiu     $s0, $s0, %lo(D_80117578)
+/* EA8FB0 802404D0 3C108011 */  lui       $s0, %hi(dead_gPlayerStatus)
+/* EA8FB4 802404D4 26107578 */  addiu     $s0, $s0, %lo(dead_gPlayerStatus)
 /* EA8FB8 802404D8 2C620005 */  sltiu     $v0, $v1, 5
 /* EA8FBC 802404DC 1040008A */  beqz      $v0, L80240708_EA91E8
 /* EA8FC0 802404E0 00031080 */   sll      $v0, $v1, 2
@@ -202,7 +202,7 @@ glabel L80240708_EA91E8
 /* EA9274 80240794 8622004C */  lh        $v0, 0x4c($s1)
 /* EA9278 80240798 44826000 */  mtc1      $v0, $f12
 /* EA927C 8024079C 00000000 */  nop
-/* EA9280 802407A0 0C00AD77 */  jal       func_8002B5DC
+/* EA9280 802407A0 0C00AD77 */  jal       dead_sin_deg
 /* EA9284 802407A4 46806320 */   cvt.s.w  $f12, $f12
 /* EA9288 802407A8 3C013F80 */  lui       $at, 0x3f80
 /* EA928C 802407AC 44811000 */  mtc1      $at, $f2
diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80240A14_EA94F4.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240A14_EA94F4.s
index 8f0a8ca7f8..7bb711e047 100644
--- a/ver/us/asm/nonmatchings/EA8AE0/func_80240A14_EA94F4.s
+++ b/ver/us/asm/nonmatchings/EA8AE0/func_80240A14_EA94F4.s
@@ -9,7 +9,7 @@ glabel func_80240A14_EA94F4
 /* EA9504 80240A24 8602004C */  lh        $v0, 0x4c($s0)
 /* EA9508 80240A28 44826000 */  mtc1      $v0, $f12
 /* EA950C 80240A2C 00000000 */  nop
-/* EA9510 80240A30 0C00AD77 */  jal       func_8002B5DC
+/* EA9510 80240A30 0C00AD77 */  jal       dead_sin_deg
 /* EA9514 80240A34 46806320 */   cvt.s.w  $f12, $f12
 /* EA9518 80240A38 3C013F80 */  lui       $at, 0x3f80
 /* EA951C 80240A3C 44811000 */  mtc1      $at, $f2
@@ -29,12 +29,12 @@ glabel func_80240A14_EA94F4
 /* EA9554 80240A74 44022000 */  mfc1      $v0, $f4
 /* EA9558 80240A78 00000000 */  nop
 /* EA955C 80240A7C A602004C */  sh        $v0, 0x4c($s0)
-/* EA9560 80240A80 3C028011 */  lui       $v0, %hi(D_80117578)
-/* EA9564 80240A84 24427578 */  addiu     $v0, $v0, %lo(D_80117578)
+/* EA9560 80240A80 3C028011 */  lui       $v0, %hi(dead_gPlayerStatus)
+/* EA9564 80240A84 24427578 */  addiu     $v0, $v0, %lo(dead_gPlayerStatus)
 /* EA9568 80240A88 C44C0028 */  lwc1      $f12, 0x28($v0)
 /* EA956C 80240A8C C44E0030 */  lwc1      $f14, 0x30($v0)
 /* EA9570 80240A90 8E060018 */  lw        $a2, 0x18($s0)
-/* EA9574 80240A94 0C00AC71 */  jal       func_8002B1C4
+/* EA9574 80240A94 0C00AC71 */  jal       dead_dist2D
 /* EA9578 80240A98 8E070020 */   lw       $a3, 0x20($s0)
 /* EA957C 80240A9C 3C0141F0 */  lui       $at, 0x41f0
 /* EA9580 80240AA0 44811000 */  mtc1      $at, $f2
diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80240E2C_EA990C.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240E2C_EA990C.s
index d374cad656..b9730fe162 100644
--- a/ver/us/asm/nonmatchings/EA8AE0/func_80240E2C_EA990C.s
+++ b/ver/us/asm/nonmatchings/EA8AE0/func_80240E2C_EA990C.s
@@ -273,11 +273,11 @@ glabel func_80240E2C_EA990C
 /* EA9CD0 802411F0 AFA50028 */  sw        $a1, 0x28($sp)
 /* EA9CD4 802411F4 AFA6002C */  sw        $a2, 0x2c($sp)
 /* EA9CD8 802411F8 AFA70030 */  sw        $a3, 0x30($sp)
-/* EA9CDC 802411FC 0C00AD77 */  jal       func_8002B5DC
+/* EA9CDC 802411FC 0C00AD77 */  jal       dead_sin_deg
 /* EA9CE0 80241200 AFA80034 */   sw       $t0, 0x34($sp)
 /* EA9CE4 80241204 46180502 */  mul.s     $f20, $f0, $f24
 /* EA9CE8 80241208 00000000 */  nop
-/* EA9CEC 8024120C 0C00AD90 */  jal       func_8002B640
+/* EA9CEC 8024120C 0C00AD90 */  jal       dead_cos_deg
 /* EA9CF0 80241210 4600B306 */   mov.s    $f12, $f22
 /* EA9CF4 80241214 46000007 */  neg.s     $f0, $f0
 /* EA9CF8 80241218 46180002 */  mul.s     $f0, $f0, $f24
diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_802415DC_EAA0BC.s b/ver/us/asm/nonmatchings/EA8AE0/func_802415DC_EAA0BC.s
index 501c1f06ea..7ff430bad7 100644
--- a/ver/us/asm/nonmatchings/EA8AE0/func_802415DC_EAA0BC.s
+++ b/ver/us/asm/nonmatchings/EA8AE0/func_802415DC_EAA0BC.s
@@ -38,8 +38,8 @@ glabel func_802415DC_EAA0BC
 /* EAA140 80241660 4482C000 */  mtc1      $v0, $f24
 /* EAA144 80241664 00000000 */  nop
 /* EAA148 80241668 4680C620 */  cvt.s.w   $f24, $f24
-/* EAA14C 8024166C 3C128011 */  lui       $s2, %hi(D_80117578)
-/* EAA150 80241670 26527578 */  addiu     $s2, $s2, %lo(D_80117578)
+/* EAA14C 8024166C 3C128011 */  lui       $s2, %hi(dead_gPlayerStatus)
+/* EAA150 80241670 26527578 */  addiu     $s2, $s2, %lo(dead_gPlayerStatus)
 /* EAA154 80241674 3C038008 */  lui       $v1, %hi(D_8007C760)
 /* EAA158 80241678 8C63C760 */  lw        $v1, %lo(D_8007C760)($v1)
 /* EAA15C 8024167C C64200A8 */  lwc1      $f2, 0xa8($s2)
@@ -72,7 +72,7 @@ glabel func_802415DC_EAA0BC
 /* EAA1C0 802416E0 46000586 */  mov.s     $f22, $f0
 /* EAA1C4 802416E4 3C014170 */  lui       $at, 0x4170
 /* EAA1C8 802416E8 4481A000 */  mtc1      $at, $f20
-/* EAA1CC 802416EC 0C00AD77 */  jal       func_8002B5DC
+/* EAA1CC 802416EC 0C00AD77 */  jal       dead_sin_deg
 /* EAA1D0 802416F0 4600B306 */   mov.s    $f12, $f22
 /* EAA1D4 802416F4 46140002 */  mul.s     $f0, $f0, $f20
 /* EAA1D8 802416F8 00000000 */  nop
@@ -86,7 +86,7 @@ glabel func_802415DC_EAA0BC
 /* EAA1F8 80241718 00000000 */  nop
 /* EAA1FC 8024171C 4600E700 */  add.s     $f28, $f28, $f0
 /* EAA200 80241720 4602D680 */  add.s     $f26, $f26, $f2
-/* EAA204 80241724 0C00AD90 */  jal       func_8002B640
+/* EAA204 80241724 0C00AD90 */  jal       dead_cos_deg
 /* EAA208 80241728 4600B306 */   mov.s    $f12, $f22
 /* EAA20C 8024172C 46140002 */  mul.s     $f0, $f0, $f20
 /* EAA210 80241730 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/EB1170/func_80240484_EB12E4.s b/ver/us/asm/nonmatchings/EB1170/func_80240484_EB12E4.s
index 7fc8e0541c..24dccaf780 100644
--- a/ver/us/asm/nonmatchings/EB1170/func_80240484_EB12E4.s
+++ b/ver/us/asm/nonmatchings/EB1170/func_80240484_EB12E4.s
@@ -38,8 +38,8 @@ glabel func_80240484_EB12E4
 /* EB1368 80240508 4482C000 */  mtc1      $v0, $f24
 /* EB136C 8024050C 00000000 */  nop
 /* EB1370 80240510 4680C620 */  cvt.s.w   $f24, $f24
-/* EB1374 80240514 3C128011 */  lui       $s2, %hi(D_80117578)
-/* EB1378 80240518 26527578 */  addiu     $s2, $s2, %lo(D_80117578)
+/* EB1374 80240514 3C128011 */  lui       $s2, %hi(dead_gPlayerStatus)
+/* EB1378 80240518 26527578 */  addiu     $s2, $s2, %lo(dead_gPlayerStatus)
 /* EB137C 8024051C 3C038008 */  lui       $v1, %hi(D_8007C760)
 /* EB1380 80240520 8C63C760 */  lw        $v1, %lo(D_8007C760)($v1)
 /* EB1384 80240524 C64200A8 */  lwc1      $f2, 0xa8($s2)
@@ -72,7 +72,7 @@ glabel func_80240484_EB12E4
 /* EB13E8 80240588 46000586 */  mov.s     $f22, $f0
 /* EB13EC 8024058C 3C014170 */  lui       $at, 0x4170
 /* EB13F0 80240590 4481A000 */  mtc1      $at, $f20
-/* EB13F4 80240594 0C00AD77 */  jal       func_8002B5DC
+/* EB13F4 80240594 0C00AD77 */  jal       dead_sin_deg
 /* EB13F8 80240598 4600B306 */   mov.s    $f12, $f22
 /* EB13FC 8024059C 46140002 */  mul.s     $f0, $f0, $f20
 /* EB1400 802405A0 00000000 */  nop
@@ -86,7 +86,7 @@ glabel func_80240484_EB12E4
 /* EB1420 802405C0 00000000 */  nop
 /* EB1424 802405C4 4600E700 */  add.s     $f28, $f28, $f0
 /* EB1428 802405C8 4602D680 */  add.s     $f26, $f26, $f2
-/* EB142C 802405CC 0C00AD90 */  jal       func_8002B640
+/* EB142C 802405CC 0C00AD90 */  jal       dead_cos_deg
 /* EB1430 802405D0 4600B306 */   mov.s    $f12, $f22
 /* EB1434 802405D4 46140002 */  mul.s     $f0, $f0, $f20
 /* EB1438 802405D8 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/EB8E90/func_80240040_EB8E90.s b/ver/us/asm/nonmatchings/EB8E90/func_80240040_EB8E90.s
index 0abf46e069..af572df089 100644
--- a/ver/us/asm/nonmatchings/EB8E90/func_80240040_EB8E90.s
+++ b/ver/us/asm/nonmatchings/EB8E90/func_80240040_EB8E90.s
@@ -49,7 +49,7 @@ glabel func_80240040_EB8E90
 /* EB8F20 802400D0 C444000C */  lwc1      $f4, 0xc($v0)
 /* EB8F24 802400D4 46802120 */  cvt.s.w   $f4, $f4
 /* EB8F28 802400D8 44072000 */  mfc1      $a3, $f4
-/* EB8F2C 802400DC 0C00AC71 */  jal       func_8002B1C4
+/* EB8F2C 802400DC 0C00AC71 */  jal       dead_dist2D
 /* EB8F30 802400E0 4600B386 */   mov.s    $f14, $f22
 /* EB8F34 802400E4 4614003C */  c.lt.s    $f0, $f20
 /* EB8F38 802400E8 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/EB8E90/func_80240198_EB8FE8.s b/ver/us/asm/nonmatchings/EB8E90/func_80240198_EB8FE8.s
index 48b659f049..c458700c25 100644
--- a/ver/us/asm/nonmatchings/EB8E90/func_80240198_EB8FE8.s
+++ b/ver/us/asm/nonmatchings/EB8E90/func_80240198_EB8FE8.s
@@ -51,11 +51,11 @@ glabel func_80240198_EB8FE8
 /* EB90A0 80240250 AFA20020 */  sw        $v0, 0x20($sp)
 /* EB90A4 80240254 E7A00010 */  swc1      $f0, 0x10($sp)
 /* EB90A8 80240258 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EB90AC 8024025C 0C01D444 */  jal       func_80075110
+/* EB90AC 8024025C 0C01D444 */  jal       dead_fx_emote
 /* EB90B0 80240260 E7A40018 */   swc1     $f4, 0x18($sp)
 /* EB90B4 80240264 0200202D */  daddu     $a0, $s0, $zero
 /* EB90B8 80240268 240502F4 */  addiu     $a1, $zero, 0x2f4
-/* EB90BC 8024026C 0C013600 */  jal       func_8004D800
+/* EB90BC 8024026C 0C013600 */  jal       dead_ai_enemy_play_sound
 /* EB90C0 80240270 3C060020 */   lui      $a2, 0x20
 /* EB90C4 80240274 8E220018 */  lw        $v0, 0x18($s1)
 /* EB90C8 80240278 9442002A */  lhu       $v0, 0x2a($v0)
@@ -108,13 +108,13 @@ glabel func_80240198_EB8FE8
 /* EB9170 80240320 8E050018 */  lw        $a1, 0x18($s0)
 /* EB9174 80240324 44060000 */  mfc1      $a2, $f0
 /* EB9178 80240328 0200202D */  daddu     $a0, $s0, $zero
-/* EB917C 8024032C 0C00F909 */  jal       func_8003E424
+/* EB917C 8024032C 0C00F909 */  jal       dead_npc_move_heading
 /* EB9180 80240330 AE06000C */   sw       $a2, 0xc($s0)
 /* EB9184 80240334 C60C0038 */  lwc1      $f12, 0x38($s0)
 /* EB9188 80240338 C60E0040 */  lwc1      $f14, 0x40($s0)
 /* EB918C 8024033C 4406B000 */  mfc1      $a2, $f22
 /* EB9190 80240340 4407A000 */  mfc1      $a3, $f20
-/* EB9194 80240344 0C00AC71 */  jal       func_8002B1C4
+/* EB9194 80240344 0C00AC71 */  jal       dead_dist2D
 /* EB9198 80240348 00000000 */   nop
 /* EB919C 8024034C C6020018 */  lwc1      $f2, 0x18($s0)
 /* EB91A0 80240350 4602003E */  c.le.s    $f0, $f2
diff --git a/ver/us/asm/nonmatchings/EB8E90/func_80240500_EB9350.s b/ver/us/asm/nonmatchings/EB8E90/func_80240500_EB9350.s
index 65566bb540..ee7dc44510 100644
--- a/ver/us/asm/nonmatchings/EB8E90/func_80240500_EB9350.s
+++ b/ver/us/asm/nonmatchings/EB8E90/func_80240500_EB9350.s
@@ -45,7 +45,7 @@ glabel func_80240500_EB9350
 /* EB93F0 802405A0 AFA20020 */  sw        $v0, 0x20($sp)
 /* EB93F4 802405A4 E7A00010 */  swc1      $f0, 0x10($sp)
 /* EB93F8 802405A8 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EB93FC 802405AC 0C01D444 */  jal       func_80075110
+/* EB93FC 802405AC 0C01D444 */  jal       dead_fx_emote
 /* EB9400 802405B0 E7A40018 */   swc1     $f4, 0x18($sp)
 /* EB9404 802405B4 3C028010 */  lui       $v0, %hi(dead_gPlayerStatusPtr)
 /* EB9408 802405B8 8C42FC90 */  lw        $v0, %lo(dead_gPlayerStatusPtr)($v0)
@@ -57,7 +57,7 @@ glabel func_80240500_EB9350
 /* EB9420 802405D0 0200202D */  daddu     $a0, $s0, $zero
 /* EB9424 802405D4 240502F4 */  addiu     $a1, $zero, 0x2f4
 /* EB9428 802405D8 3C060020 */  lui       $a2, 0x20
-/* EB942C 802405DC 0C013600 */  jal       func_8004D800
+/* EB942C 802405DC 0C013600 */  jal       dead_ai_enemy_play_sound
 /* EB9430 802405E0 E480000C */   swc1     $f0, 0xc($a0)
 /* EB9434 802405E4 8E220018 */  lw        $v0, 0x18($s1)
 /* EB9438 802405E8 9442002A */  lhu       $v0, 0x2a($v0)
diff --git a/ver/us/asm/nonmatchings/EB8E90/func_8024085C_EB96AC.s b/ver/us/asm/nonmatchings/EB8E90/func_8024085C_EB96AC.s
index 04f08b9774..b436354bdd 100644
--- a/ver/us/asm/nonmatchings/EB8E90/func_8024085C_EB96AC.s
+++ b/ver/us/asm/nonmatchings/EB8E90/func_8024085C_EB96AC.s
@@ -41,7 +41,7 @@ glabel func_8024085C_EB96AC
 /* EB973C 802408EC 8C470030 */   lw       $a3, 0x30($v0)
 /* EB9740 802408F0 46000506 */  mov.s     $f20, $f0
 /* EB9744 802408F4 C64C000C */  lwc1      $f12, 0xc($s2)
-/* EB9748 802408F8 0C00ABC6 */  jal       func_8002AF18
+/* EB9748 802408F8 0C00ABC6 */  jal       dead_get_clamped_angle_diff
 /* EB974C 802408FC 4600A386 */   mov.s    $f14, $f20
 /* EB9750 80240900 46000086 */  mov.s     $f2, $f0
 /* EB9754 80240904 8E02001C */  lw        $v0, 0x1c($s0)
diff --git a/ver/us/asm/nonmatchings/EB8E90/func_8024098C_EB97DC.s b/ver/us/asm/nonmatchings/EB8E90/func_8024098C_EB97DC.s
index d200454252..c5855af641 100644
--- a/ver/us/asm/nonmatchings/EB8E90/func_8024098C_EB97DC.s
+++ b/ver/us/asm/nonmatchings/EB8E90/func_8024098C_EB97DC.s
@@ -44,7 +44,7 @@ glabel func_8024098C_EB97DC
 /* EB9878 80240A28 AFA20020 */  sw        $v0, 0x20($sp)
 /* EB987C 80240A2C E7A00010 */  swc1      $f0, 0x10($sp)
 /* EB9880 80240A30 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EB9884 80240A34 0C01D444 */  jal       func_80075110
+/* EB9884 80240A34 0C01D444 */  jal       dead_fx_emote
 /* EB9888 80240A38 E7A40018 */   swc1     $f4, 0x18($sp)
 /* EB988C 80240A3C 8E4200CC */  lw        $v0, 0xcc($s2)
 /* EB9890 80240A40 8C430000 */  lw        $v1, ($v0)
@@ -58,7 +58,7 @@ glabel func_8024098C_EB97DC
 /* EB98AC 80240A5C 24050001 */   addiu    $a1, $zero, 1
 /* EB98B0 80240A60 8E050018 */  lw        $a1, 0x18($s0)
 /* EB98B4 80240A64 8E06000C */  lw        $a2, 0xc($s0)
-/* EB98B8 80240A68 0C00F909 */  jal       func_8003E424
+/* EB98B8 80240A68 0C00F909 */  jal       dead_npc_move_heading
 /* EB98BC 80240A6C 0200202D */   daddu    $a0, $s0, $zero
 /* EB98C0 80240A70 8602008E */  lh        $v0, 0x8e($s0)
 /* EB98C4 80240A74 9603008E */  lhu       $v1, 0x8e($s0)
diff --git a/ver/us/asm/nonmatchings/EB8E90/func_80240BD4_EB9A24.s b/ver/us/asm/nonmatchings/EB8E90/func_80240BD4_EB9A24.s
index ff0c2c7bcc..0e12edee38 100644
--- a/ver/us/asm/nonmatchings/EB8E90/func_80240BD4_EB9A24.s
+++ b/ver/us/asm/nonmatchings/EB8E90/func_80240BD4_EB9A24.s
@@ -131,7 +131,7 @@ glabel func_80240BD4_EB9A24
 /* EB9BEC 80240D9C E7A0003C */  swc1      $f0, 0x3c($sp)
 /* EB9BF0 80240DA0 AFA20010 */  sw        $v0, 0x10($sp)
 /* EB9BF4 80240DA4 8E440080 */  lw        $a0, 0x80($s2)
-/* EB9BF8 80240DA8 0C03908F */  jal       func_800E423C
+/* EB9BF8 80240DA8 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EB9BFC 80240DAC 27A70040 */   addiu    $a3, $sp, 0x40
 /* EB9C00 80240DB0 10400003 */  beqz      $v0, .L80240DC0
 /* EB9C04 80240DB4 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/EB9D90/func_80240F40_EB9D90.s b/ver/us/asm/nonmatchings/EB9D90/func_80240F40_EB9D90.s
index 9d8ad3f3b3..efb99b7f6c 100644
--- a/ver/us/asm/nonmatchings/EB9D90/func_80240F40_EB9D90.s
+++ b/ver/us/asm/nonmatchings/EB9D90/func_80240F40_EB9D90.s
@@ -6,8 +6,8 @@ glabel func_80240F40_EB9D90
 /* EB9D94 80240F44 AFB00010 */  sw        $s0, 0x10($sp)
 /* EB9D98 80240F48 0080802D */  daddu     $s0, $a0, $zero
 /* EB9D9C 80240F4C AFB20018 */  sw        $s2, 0x18($sp)
-/* EB9DA0 80240F50 3C128011 */  lui       $s2, %hi(D_80117578)
-/* EB9DA4 80240F54 26527578 */  addiu     $s2, $s2, %lo(D_80117578)
+/* EB9DA0 80240F50 3C128011 */  lui       $s2, %hi(dead_gPlayerStatus)
+/* EB9DA4 80240F54 26527578 */  addiu     $s2, $s2, %lo(dead_gPlayerStatus)
 /* EB9DA8 80240F58 AFBF001C */  sw        $ra, 0x1c($sp)
 /* EB9DAC 80240F5C AFB10014 */  sw        $s1, 0x14($sp)
 /* EB9DB0 80240F60 C64000A8 */  lwc1      $f0, 0xa8($s2)
diff --git a/ver/us/asm/nonmatchings/EB9D90/func_80240FB0_EB9E00.s b/ver/us/asm/nonmatchings/EB9D90/func_80240FB0_EB9E00.s
index 39064bca1a..26c906fcb2 100644
--- a/ver/us/asm/nonmatchings/EB9D90/func_80240FB0_EB9E00.s
+++ b/ver/us/asm/nonmatchings/EB9D90/func_80240FB0_EB9E00.s
@@ -28,7 +28,7 @@ glabel func_80240FB0_EB9E00
 /* EB9E5C 8024100C 4481D000 */  mtc1      $at, $f26
 /* EB9E60 80241010 44071000 */  mfc1      $a3, $f2
 /* EB9E64 80241014 4600C306 */  mov.s     $f12, $f24
-/* EB9E68 80241018 0C00AC71 */  jal       func_8002B1C4
+/* EB9E68 80241018 0C00AC71 */  jal       dead_dist2D
 /* EB9E6C 8024101C 4600D386 */   mov.s    $f14, $f26
 /* EB9E70 80241020 4600C306 */  mov.s     $f12, $f24
 /* EB9E74 80241024 4600D386 */  mov.s     $f14, $f26
@@ -43,13 +43,13 @@ glabel func_80240FB0_EB9E00
 /* EB9E98 80241048 0C00AB85 */  jal       dead_clamp_angle
 /* EB9E9C 8024104C 46140301 */   sub.s    $f12, $f0, $f20
 /* EB9EA0 80241050 46000506 */  mov.s     $f20, $f0
-/* EB9EA4 80241054 0C00AD77 */  jal       func_8002B5DC
+/* EB9EA4 80241054 0C00AD77 */  jal       dead_sin_deg
 /* EB9EA8 80241058 4600A306 */   mov.s    $f12, $f20
 /* EB9EAC 8024105C 4600B002 */  mul.s     $f0, $f22, $f0
 /* EB9EB0 80241060 00000000 */  nop
 /* EB9EB4 80241064 46180000 */  add.s     $f0, $f0, $f24
-/* EB9EB8 80241068 3C118011 */  lui       $s1, %hi(D_80117578)
-/* EB9EBC 8024106C 26317578 */  addiu     $s1, $s1, %lo(D_80117578)
+/* EB9EB8 80241068 3C118011 */  lui       $s1, %hi(dead_gPlayerStatus)
+/* EB9EBC 8024106C 26317578 */  addiu     $s1, $s1, %lo(dead_gPlayerStatus)
 /* EB9EC0 80241070 E6200028 */  swc1      $f0, 0x28($s1)
 /* EB9EC4 80241074 8E0500AC */  lw        $a1, 0xac($s0)
 /* EB9EC8 80241078 0C0B53A3 */  jal       dead_evt_get_variable
@@ -63,7 +63,7 @@ glabel func_80240FB0_EB9E00
 /* EB9EE8 80241098 44900000 */  mtc1      $s0, $f0
 /* EB9EEC 8024109C 00000000 */  nop
 /* EB9EF0 802410A0 46800020 */  cvt.s.w   $f0, $f0
-/* EB9EF4 802410A4 0C00AD90 */  jal       func_8002B640
+/* EB9EF4 802410A4 0C00AD90 */  jal       dead_cos_deg
 /* EB9EF8 802410A8 E620002C */   swc1     $f0, 0x2c($s1)
 /* EB9EFC 802410AC 4600B582 */  mul.s     $f22, $f22, $f0
 /* EB9F00 802410B0 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/EB9D90/func_802410E4_EB9F34.s b/ver/us/asm/nonmatchings/EB9D90/func_802410E4_EB9F34.s
index f1f56adeda..14ab10ca07 100644
--- a/ver/us/asm/nonmatchings/EB9D90/func_802410E4_EB9F34.s
+++ b/ver/us/asm/nonmatchings/EB9D90/func_802410E4_EB9F34.s
@@ -11,7 +11,7 @@ glabel func_802410E4_EB9F34
 /* EB9F4C 802410FC F7B80030 */  sdc1      $f24, 0x30($sp)
 /* EB9F50 80241100 F7B60028 */  sdc1      $f22, 0x28($sp)
 /* EB9F54 80241104 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* EB9F58 80241108 0C00F10F */  jal       func_8003C43C
+/* EB9F58 80241108 0C00F10F */  jal       dead_get_npc_by_index
 /* EB9F5C 8024110C 0000202D */   daddu    $a0, $zero, $zero
 /* EB9F60 80241110 0000202D */  daddu     $a0, $zero, $zero
 /* EB9F64 80241114 8E05008C */  lw        $a1, 0x8c($s0)
@@ -31,7 +31,7 @@ glabel func_802410E4_EB9F34
 /* EB9F9C 8024114C 4481D000 */  mtc1      $at, $f26
 /* EB9FA0 80241150 44071000 */  mfc1      $a3, $f2
 /* EB9FA4 80241154 4600C306 */  mov.s     $f12, $f24
-/* EB9FA8 80241158 0C00AC71 */  jal       func_8002B1C4
+/* EB9FA8 80241158 0C00AC71 */  jal       dead_dist2D
 /* EB9FAC 8024115C 4600D386 */   mov.s    $f14, $f26
 /* EB9FB0 80241160 4600C306 */  mov.s     $f12, $f24
 /* EB9FB4 80241164 4600D386 */  mov.s     $f14, $f26
@@ -46,7 +46,7 @@ glabel func_802410E4_EB9F34
 /* EB9FD8 80241188 0C00AB85 */  jal       dead_clamp_angle
 /* EB9FDC 8024118C 46140301 */   sub.s    $f12, $f0, $f20
 /* EB9FE0 80241190 46000506 */  mov.s     $f20, $f0
-/* EB9FE4 80241194 0C00AD77 */  jal       func_8002B5DC
+/* EB9FE4 80241194 0C00AD77 */  jal       dead_sin_deg
 /* EB9FE8 80241198 4600A306 */   mov.s    $f12, $f20
 /* EB9FEC 8024119C 4600B002 */  mul.s     $f0, $f22, $f0
 /* EB9FF0 802411A0 00000000 */  nop
@@ -64,7 +64,7 @@ glabel func_802410E4_EB9F34
 /* EBA020 802411D0 44900000 */  mtc1      $s0, $f0
 /* EBA024 802411D4 00000000 */  nop
 /* EBA028 802411D8 46800020 */  cvt.s.w   $f0, $f0
-/* EBA02C 802411DC 0C00AD90 */  jal       func_8002B640
+/* EBA02C 802411DC 0C00AD90 */  jal       dead_cos_deg
 /* EBA030 802411E0 E620003C */   swc1     $f0, 0x3c($s1)
 /* EBA034 802411E4 4600B582 */  mul.s     $f22, $f22, $f0
 /* EBA038 802411E8 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/EC2240/func_80240158_EC2358.s b/ver/us/asm/nonmatchings/EC2240/func_80240158_EC2358.s
index 0946410ab6..db8f921502 100644
--- a/ver/us/asm/nonmatchings/EC2240/func_80240158_EC2358.s
+++ b/ver/us/asm/nonmatchings/EC2240/func_80240158_EC2358.s
@@ -26,8 +26,8 @@ glabel func_80240158_EC2358
 /* EC2378 80240178 8C910148 */  lw        $s1, 0x148($a0)
 /* EC237C 8024017C 0C00F92F */  jal       dead_get_npc_unsafe
 /* EC2380 80240180 86240008 */   lh       $a0, 8($s1)
-/* EC2384 80240184 3C038011 */  lui       $v1, %hi(D_80117578)
-/* EC2388 80240188 24637578 */  addiu     $v1, $v1, %lo(D_80117578)
+/* EC2384 80240184 3C038011 */  lui       $v1, %hi(dead_gPlayerStatus)
+/* EC2388 80240188 24637578 */  addiu     $v1, $v1, %lo(dead_gPlayerStatus)
 /* EC238C 8024018C 0040802D */  daddu     $s0, $v0, $zero
 /* EC2390 80240190 3C01C352 */  lui       $at, 0xc352
 /* EC2394 80240194 4481B000 */  mtc1      $at, $f22
@@ -52,7 +52,7 @@ glabel func_80240158_EC2358
 /* EC23E0 802401E0 C60C0038 */  lwc1      $f12, 0x38($s0)
 /* EC23E4 802401E4 C60E0040 */  lwc1      $f14, 0x40($s0)
 /* EC23E8 802401E8 8FA60010 */  lw        $a2, 0x10($sp)
-/* EC23EC 802401EC 0C00AC71 */  jal       func_8002B1C4
+/* EC23EC 802401EC 0C00AC71 */  jal       dead_dist2D
 /* EC23F0 802401F0 8FA70014 */   lw       $a3, 0x14($sp)
 /* EC23F4 802401F4 3C014000 */  lui       $at, 0x4000
 /* EC23F8 802401F8 44811800 */  mtc1      $at, $f3
@@ -152,7 +152,7 @@ glabel func_80240158_EC2358
 /* EC2554 80240354 3C054000 */  lui       $a1, 0x4000
 /* EC2558 80240358 44060000 */  mfc1      $a2, $f0
 /* EC255C 8024035C 0200202D */  daddu     $a0, $s0, $zero
-/* EC2560 80240360 0C00F909 */  jal       func_8003E424
+/* EC2560 80240360 0C00F909 */  jal       dead_npc_move_heading
 /* EC2564 80240364 AC86000C */   sw       $a2, 0xc($a0)
 /* EC2568 80240368 080900F7 */  j         .L802403DC
 /* EC256C 8024036C 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/ECAA80/func_80240D80_ECAA80.s b/ver/us/asm/nonmatchings/ECAA80/func_80240D80_ECAA80.s
index 9e040bdaf6..b5ed061da6 100644
--- a/ver/us/asm/nonmatchings/ECAA80/func_80240D80_ECAA80.s
+++ b/ver/us/asm/nonmatchings/ECAA80/func_80240D80_ECAA80.s
@@ -55,7 +55,7 @@ glabel func_80240D80_ECAA80
 /* ECAB48 80240E48 460C0300 */   add.s    $f12, $f0, $f12
 /* ECAB4C 80240E4C 46000506 */  mov.s     $f20, $f0
 /* ECAB50 80240E50 C60C000C */  lwc1      $f12, 0xc($s0)
-/* ECAB54 80240E54 0C00ABC6 */  jal       func_8002AF18
+/* ECAB54 80240E54 0C00ABC6 */  jal       dead_get_clamped_angle_diff
 /* ECAB58 80240E58 4600A386 */   mov.s    $f14, $f20
 /* ECAB5C 80240E5C 46000086 */  mov.s     $f2, $f0
 /* ECAB60 80240E60 8E22001C */  lw        $v0, 0x1c($s1)
@@ -136,7 +136,7 @@ glabel func_80240D80_ECAA80
 /* ECAC84 80240F84 C60C0038 */  lwc1      $f12, 0x38($s0)
 /* ECAC88 80240F88 C60E0040 */  lwc1      $f14, 0x40($s0)
 /* ECAC8C 80240F8C 8FA60020 */  lw        $a2, 0x20($sp)
-/* ECAC90 80240F90 0C00AC71 */  jal       func_8002B1C4
+/* ECAC90 80240F90 0C00AC71 */  jal       dead_dist2D
 /* ECAC94 80240F94 8FA70028 */   lw       $a3, 0x28($sp)
 /* ECAC98 80240F98 46000586 */  mov.s     $f22, $f0
 /* ECAC9C 80240F9C C6020038 */  lwc1      $f2, 0x38($s0)
@@ -176,7 +176,7 @@ glabel func_80240D80_ECAA80
 /* ECAD24 80241024 C60C0038 */  lwc1      $f12, 0x38($s0)
 /* ECAD28 80241028 C60E0040 */  lwc1      $f14, 0x40($s0)
 /* ECAD2C 8024102C 8FA6002C */  lw        $a2, 0x2c($sp)
-/* ECAD30 80241030 0C00AC71 */  jal       func_8002B1C4
+/* ECAD30 80241030 0C00AC71 */  jal       dead_dist2D
 /* ECAD34 80241034 8FA70034 */   lw       $a3, 0x34($sp)
 /* ECAD38 80241038 46000606 */  mov.s     $f24, $f0
 .L8024103C:
@@ -215,7 +215,7 @@ glabel func_80240D80_ECAA80
 /* ECADBC 802410BC C60C0038 */  lwc1      $f12, 0x38($s0)
 /* ECADC0 802410C0 C60E0040 */  lwc1      $f14, 0x40($s0)
 /* ECADC4 802410C4 8FA60038 */  lw        $a2, 0x38($sp)
-/* ECADC8 802410C8 0C00AC71 */  jal       func_8002B1C4
+/* ECADC8 802410C8 0C00AC71 */  jal       dead_dist2D
 /* ECADCC 802410CC 8FA70040 */   lw       $a3, 0x40($sp)
 /* ECADD0 802410D0 46000686 */  mov.s     $f26, $f0
 .L802410D4:
@@ -223,7 +223,7 @@ glabel func_80240D80_ECAA80
 /* ECADD8 802410D8 8E820000 */  lw        $v0, ($s4)
 /* ECADDC 802410DC C60E0040 */  lwc1      $f14, 0x40($s0)
 /* ECADE0 802410E0 8C460028 */  lw        $a2, 0x28($v0)
-/* ECADE4 802410E4 0C00AC71 */  jal       func_8002B1C4
+/* ECADE4 802410E4 0C00AC71 */  jal       dead_dist2D
 /* ECADE8 802410E8 8C470030 */   lw       $a3, 0x30($v0)
 /* ECADEC 802410EC C6000018 */  lwc1      $f0, 0x18($s0)
 /* ECADF0 802410F0 3C013FF8 */  lui       $at, 0x3ff8
@@ -343,7 +343,7 @@ glabel func_80240D80_ECAA80
 /* ECAF90 80241290 46000506 */  mov.s     $f20, $f0
 .L80241294:
 /* ECAF94 80241294 C60C000C */  lwc1      $f12, 0xc($s0)
-/* ECAF98 80241298 0C00ABC6 */  jal       func_8002AF18
+/* ECAF98 80241298 0C00ABC6 */  jal       dead_get_clamped_angle_diff
 /* ECAF9C 8024129C 4600A386 */   mov.s    $f14, $f20
 /* ECAFA0 802412A0 46000086 */  mov.s     $f2, $f0
 /* ECAFA4 802412A4 8E22001C */  lw        $v0, 0x1c($s1)
diff --git a/ver/us/asm/nonmatchings/ECAA80/func_80241364_ECB064.s b/ver/us/asm/nonmatchings/ECAA80/func_80241364_ECB064.s
index 1e751fe0c9..d2f77482fa 100644
--- a/ver/us/asm/nonmatchings/ECAA80/func_80241364_ECB064.s
+++ b/ver/us/asm/nonmatchings/ECAA80/func_80241364_ECB064.s
@@ -43,7 +43,7 @@ glabel func_80241364_ECB064
 /* ECB0FC 802413FC AFA20020 */  sw        $v0, 0x20($sp)
 /* ECB100 80241400 E7A00010 */  swc1      $f0, 0x10($sp)
 /* ECB104 80241404 E7A20014 */  swc1      $f2, 0x14($sp)
-/* ECB108 80241408 0C01D444 */  jal       func_80075110
+/* ECB108 80241408 0C01D444 */  jal       dead_fx_emote
 /* ECB10C 8024140C E7A40018 */   swc1     $f4, 0x18($sp)
 /* ECB110 80241410 8E4200CC */  lw        $v0, 0xcc($s2)
 /* ECB114 80241414 8C430000 */  lw        $v1, ($v0)
@@ -77,7 +77,7 @@ glabel func_80241364_ECB064
 /* ECB178 80241478 00000000 */   nop
 /* ECB17C 8024147C 8E050018 */  lw        $a1, 0x18($s0)
 /* ECB180 80241480 8E06000C */  lw        $a2, 0xc($s0)
-/* ECB184 80241484 0C00F909 */  jal       func_8003E424
+/* ECB184 80241484 0C00F909 */  jal       dead_npc_move_heading
 /* ECB188 80241488 0200202D */   daddu    $a0, $s0, $zero
 .L8024148C:
 /* ECB18C 8024148C 8602008E */  lh        $v0, 0x8e($s0)
diff --git a/ver/us/asm/nonmatchings/ECAA80/func_802417CC_ECB4CC.s b/ver/us/asm/nonmatchings/ECAA80/func_802417CC_ECB4CC.s
index 9a54b49cbd..91f2896db1 100644
--- a/ver/us/asm/nonmatchings/ECAA80/func_802417CC_ECB4CC.s
+++ b/ver/us/asm/nonmatchings/ECAA80/func_802417CC_ECB4CC.s
@@ -38,8 +38,8 @@ glabel func_802417CC_ECB4CC
 /* ECB550 80241850 4482C000 */  mtc1      $v0, $f24
 /* ECB554 80241854 00000000 */  nop
 /* ECB558 80241858 4680C620 */  cvt.s.w   $f24, $f24
-/* ECB55C 8024185C 3C128011 */  lui       $s2, %hi(D_80117578)
-/* ECB560 80241860 26527578 */  addiu     $s2, $s2, %lo(D_80117578)
+/* ECB55C 8024185C 3C128011 */  lui       $s2, %hi(dead_gPlayerStatus)
+/* ECB560 80241860 26527578 */  addiu     $s2, $s2, %lo(dead_gPlayerStatus)
 /* ECB564 80241864 3C038008 */  lui       $v1, %hi(D_8007C760)
 /* ECB568 80241868 8C63C760 */  lw        $v1, %lo(D_8007C760)($v1)
 /* ECB56C 8024186C C64200A8 */  lwc1      $f2, 0xa8($s2)
@@ -72,7 +72,7 @@ glabel func_802417CC_ECB4CC
 /* ECB5D0 802418D0 46000586 */  mov.s     $f22, $f0
 /* ECB5D4 802418D4 3C014170 */  lui       $at, 0x4170
 /* ECB5D8 802418D8 4481A000 */  mtc1      $at, $f20
-/* ECB5DC 802418DC 0C00AD77 */  jal       func_8002B5DC
+/* ECB5DC 802418DC 0C00AD77 */  jal       dead_sin_deg
 /* ECB5E0 802418E0 4600B306 */   mov.s    $f12, $f22
 /* ECB5E4 802418E4 46140002 */  mul.s     $f0, $f0, $f20
 /* ECB5E8 802418E8 00000000 */  nop
@@ -86,7 +86,7 @@ glabel func_802417CC_ECB4CC
 /* ECB608 80241908 00000000 */  nop
 /* ECB60C 8024190C 4600E700 */  add.s     $f28, $f28, $f0
 /* ECB610 80241910 4602D680 */  add.s     $f26, $f26, $f2
-/* ECB614 80241914 0C00AD90 */  jal       func_8002B640
+/* ECB614 80241914 0C00AD90 */  jal       dead_cos_deg
 /* ECB618 80241918 4600B306 */   mov.s    $f12, $f22
 /* ECB61C 8024191C 46140002 */  mul.s     $f0, $f0, $f20
 /* ECB620 80241920 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/ED0310/func_80240320_ED0310.s b/ver/us/asm/nonmatchings/ED0310/func_80240320_ED0310.s
index e72df712e1..0a8f2e9b9d 100644
--- a/ver/us/asm/nonmatchings/ED0310/func_80240320_ED0310.s
+++ b/ver/us/asm/nonmatchings/ED0310/func_80240320_ED0310.s
@@ -51,7 +51,7 @@ glabel func_80240320_ED0310
 /* ED03AC 802403BC 46800020 */  cvt.s.w   $f0, $f0
 /* ED03B0 802403C0 E7A00018 */  swc1      $f0, 0x18($sp)
 /* ED03B4 802403C4 8C640018 */  lw        $a0, 0x18($v1)
-/* ED03B8 802403C8 0C013431 */  jal       func_8004D0C4
+/* ED03B8 802403C8 0C013431 */  jal       dead_is_point_within_region
 /* ED03BC 802403CC 8E070038 */   lw       $a3, 0x38($s0)
 /* ED03C0 802403D0 1040000E */  beqz      $v0, .L8024040C
 /* ED03C4 802403D4 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/ED0310/func_802404D0_ED04C0.s b/ver/us/asm/nonmatchings/ED0310/func_802404D0_ED04C0.s
index 8e53e2798b..5a64ad5756 100644
--- a/ver/us/asm/nonmatchings/ED0310/func_802404D0_ED04C0.s
+++ b/ver/us/asm/nonmatchings/ED0310/func_802404D0_ED04C0.s
@@ -92,7 +92,7 @@ glabel func_802404D0_ED04C0
 /* ED05F0 80240600 E7A60034 */  swc1      $f6, 0x34($sp)
 /* ED05F4 80240604 AFA20010 */  sw        $v0, 0x10($sp)
 /* ED05F8 80240608 8E040080 */  lw        $a0, 0x80($s0)
-/* ED05FC 8024060C 0C03908F */  jal       func_800E423C
+/* ED05FC 8024060C 0C03908F */  jal       dead_npc_raycast_down_sides
 /* ED0600 80240610 27A70030 */   addiu    $a3, $sp, 0x30
 /* ED0604 80240614 C7A00034 */  lwc1      $f0, 0x34($sp)
 /* ED0608 80240618 4600D001 */  sub.s     $f0, $f26, $f0
@@ -136,7 +136,7 @@ glabel func_802404D0_ED04C0
 /* ED0698 802406A8 E7A40034 */  swc1      $f4, 0x34($sp)
 /* ED069C 802406AC AFA20010 */  sw        $v0, 0x10($sp)
 /* ED06A0 802406B0 8E040080 */  lw        $a0, 0x80($s0)
-/* ED06A4 802406B4 0C03908F */  jal       func_800E423C
+/* ED06A4 802406B4 0C03908F */  jal       dead_npc_raycast_down_sides
 /* ED06A8 802406B8 27A70030 */   addiu    $a3, $sp, 0x30
 /* ED06AC 802406BC C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* ED06B0 802406C0 461A2100 */  add.s     $f4, $f4, $f26
@@ -172,7 +172,7 @@ glabel func_802404D0_ED04C0
 /* ED0720 80240730 1840002E */  blez      $v0, .L802407EC
 /* ED0724 80240734 00000000 */   nop
 /* ED0728 80240738 C62C0074 */  lwc1      $f12, 0x74($s1)
-/* ED072C 8024073C 0C00AD77 */  jal       func_8002B5DC
+/* ED072C 8024073C 0C00AD77 */  jal       dead_sin_deg
 /* ED0730 80240740 46806320 */   cvt.s.w  $f12, $f12
 /* ED0734 80240744 8E020000 */  lw        $v0, ($s0)
 /* ED0738 80240748 30420008 */  andi      $v0, $v0, 8
@@ -195,7 +195,7 @@ glabel func_802404D0_ED04C0
 /* ED0778 80240788 E7A60034 */  swc1      $f6, 0x34($sp)
 /* ED077C 8024078C AFA20010 */  sw        $v0, 0x10($sp)
 /* ED0780 80240790 8E040080 */  lw        $a0, 0x80($s0)
-/* ED0784 80240794 0C03908F */  jal       func_800E423C
+/* ED0784 80240794 0C03908F */  jal       dead_npc_raycast_down_sides
 /* ED0788 80240798 27A70030 */   addiu    $a3, $sp, 0x30
 .L8024079C:
 /* ED078C 8024079C 10400007 */  beqz      $v0, .L802407BC
@@ -276,13 +276,13 @@ glabel func_802404D0_ED04C0
 /* ED08AC 802408BC AFA20020 */  sw        $v0, 0x20($sp)
 /* ED08B0 802408C0 E7A00010 */  swc1      $f0, 0x10($sp)
 /* ED08B4 802408C4 E7A20014 */  swc1      $f2, 0x14($sp)
-/* ED08B8 802408C8 0C01D444 */  jal       func_80075110
+/* ED08B8 802408C8 0C01D444 */  jal       dead_fx_emote
 /* ED08BC 802408CC E7A40018 */   swc1     $f4, 0x18($sp)
 /* ED08C0 802408D0 0200202D */  daddu     $a0, $s0, $zero
 /* ED08C4 802408D4 240502F4 */  addiu     $a1, $zero, 0x2f4
 /* ED08C8 802408D8 C480003C */  lwc1      $f0, 0x3c($a0)
 /* ED08CC 802408DC 3C060020 */  lui       $a2, 0x20
-/* ED08D0 802408E0 0C013600 */  jal       func_8004D800
+/* ED08D0 802408E0 0C013600 */  jal       dead_ai_enemy_play_sound
 /* ED08D4 802408E4 E4800064 */   swc1     $f0, 0x64($a0)
 /* ED08D8 802408E8 8E220018 */  lw        $v0, 0x18($s1)
 /* ED08DC 802408EC 9442002A */  lhu       $v0, 0x2a($v0)
@@ -321,7 +321,7 @@ glabel func_802404D0_ED04C0
 /* ED094C 8024095C 46800020 */  cvt.s.w   $f0, $f0
 /* ED0950 80240960 E7A00018 */  swc1      $f0, 0x18($sp)
 /* ED0954 80240964 8C640018 */  lw        $a0, 0x18($v1)
-/* ED0958 80240968 0C013431 */  jal       func_8004D0C4
+/* ED0958 80240968 0C013431 */  jal       dead_is_point_within_region
 /* ED095C 8024096C 8E070038 */   lw       $a3, 0x38($s0)
 /* ED0960 80240970 1040001A */  beqz      $v0, .L802409DC
 /* ED0964 80240974 00000000 */   nop
@@ -331,7 +331,7 @@ glabel func_802404D0_ED04C0
 /* ED0974 80240984 C44C0000 */  lwc1      $f12, ($v0)
 /* ED0978 80240988 46806320 */  cvt.s.w   $f12, $f12
 /* ED097C 8024098C C44E0008 */  lwc1      $f14, 8($v0)
-/* ED0980 80240990 0C00AC71 */  jal       func_8002B1C4
+/* ED0980 80240990 0C00AC71 */  jal       dead_dist2D
 /* ED0984 80240994 468073A0 */   cvt.s.w  $f14, $f14
 /* ED0988 80240998 C6020018 */  lwc1      $f2, 0x18($s0)
 /* ED098C 8024099C 4600103C */  c.lt.s    $f2, $f0
@@ -363,7 +363,7 @@ glabel func_802404D0_ED04C0
 /* ED09F0 80240A00 00000000 */   nop
 /* ED09F4 80240A04 8E050018 */  lw        $a1, 0x18($s0)
 /* ED09F8 80240A08 8E06000C */  lw        $a2, 0xc($s0)
-/* ED09FC 80240A0C 0C00F909 */  jal       func_8003E424
+/* ED09FC 80240A0C 0C00F909 */  jal       dead_npc_move_heading
 /* ED0A00 80240A10 0200202D */   daddu    $a0, $s0, $zero
 .L80240A14:
 /* ED0A04 80240A14 C600003C */  lwc1      $f0, 0x3c($s0)
diff --git a/ver/us/asm/nonmatchings/ED0310/func_80240BB8_ED0BA8.s b/ver/us/asm/nonmatchings/ED0310/func_80240BB8_ED0BA8.s
index f824131f20..cae1a443a0 100644
--- a/ver/us/asm/nonmatchings/ED0310/func_80240BB8_ED0BA8.s
+++ b/ver/us/asm/nonmatchings/ED0310/func_80240BB8_ED0BA8.s
@@ -50,7 +50,7 @@ glabel func_80240BB8_ED0BA8
 /* ED0C58 80240C68 46800020 */  cvt.s.w   $f0, $f0
 /* ED0C5C 80240C6C 46000021 */  cvt.d.s   $f0, $f0
 /* ED0C60 80240C70 46220003 */  div.d     $f0, $f0, $f2
-/* ED0C64 80240C74 0C00AD77 */  jal       func_8002B5DC
+/* ED0C64 80240C74 0C00AD77 */  jal       dead_sin_deg
 /* ED0C68 80240C78 462005A0 */   cvt.s.d  $f22, $f0
 /* ED0C6C 80240C7C 8E020000 */  lw        $v0, ($s0)
 /* ED0C70 80240C80 30420008 */  andi      $v0, $v0, 8
@@ -73,7 +73,7 @@ glabel func_80240BB8_ED0BA8
 /* ED0CB0 80240CC0 E7A60034 */  swc1      $f6, 0x34($sp)
 /* ED0CB4 80240CC4 AFA20010 */  sw        $v0, 0x10($sp)
 /* ED0CB8 80240CC8 8E040080 */  lw        $a0, 0x80($s0)
-/* ED0CBC 80240CCC 0C03908F */  jal       func_800E423C
+/* ED0CBC 80240CCC 0C03908F */  jal       dead_npc_raycast_down_sides
 /* ED0CC0 80240CD0 27A70030 */   addiu    $a3, $sp, 0x30
 .L80240CD4:
 /* ED0CC4 80240CD4 10400007 */  beqz      $v0, .L80240CF4
@@ -148,13 +148,13 @@ glabel func_80240BB8_ED0BA8
 /* ED0DCC 80240DDC AFA20020 */  sw        $v0, 0x20($sp)
 /* ED0DD0 80240DE0 E7A00010 */  swc1      $f0, 0x10($sp)
 /* ED0DD4 80240DE4 E7A20014 */  swc1      $f2, 0x14($sp)
-/* ED0DD8 80240DE8 0C01D444 */  jal       func_80075110
+/* ED0DD8 80240DE8 0C01D444 */  jal       dead_fx_emote
 /* ED0DDC 80240DEC E7A40018 */   swc1     $f4, 0x18($sp)
 /* ED0DE0 80240DF0 0200202D */  daddu     $a0, $s0, $zero
 /* ED0DE4 80240DF4 240502F4 */  addiu     $a1, $zero, 0x2f4
 /* ED0DE8 80240DF8 C480003C */  lwc1      $f0, 0x3c($a0)
 /* ED0DEC 80240DFC 3C060020 */  lui       $a2, 0x20
-/* ED0DF0 80240E00 0C013600 */  jal       func_8004D800
+/* ED0DF0 80240E00 0C013600 */  jal       dead_ai_enemy_play_sound
 /* ED0DF4 80240E04 E4800064 */   swc1     $f0, 0x64($a0)
 /* ED0DF8 80240E08 8E220018 */  lw        $v0, 0x18($s1)
 /* ED0DFC 80240E0C 9442002A */  lhu       $v0, 0x2a($v0)
diff --git a/ver/us/asm/nonmatchings/ED0310/func_80241178_ED1168.s b/ver/us/asm/nonmatchings/ED0310/func_80241178_ED1168.s
index c521674ff4..fb8eba9ba0 100644
--- a/ver/us/asm/nonmatchings/ED0310/func_80241178_ED1168.s
+++ b/ver/us/asm/nonmatchings/ED0310/func_80241178_ED1168.s
@@ -35,7 +35,7 @@ glabel func_80241178_ED1168
 /* ED11E0 802411F0 46240003 */  div.d     $f0, $f0, $f4
 /* ED11E4 802411F4 46200520 */  cvt.s.d   $f20, $f0
 /* ED11E8 802411F8 46241083 */  div.d     $f2, $f2, $f4
-/* ED11EC 802411FC 0C00F909 */  jal       func_8003E424
+/* ED11EC 802411FC 0C00F909 */  jal       dead_npc_move_heading
 /* ED11F0 80241200 462015A0 */   cvt.s.d  $f22, $f2
 /* ED11F4 80241204 C604001C */  lwc1      $f4, 0x1c($s0)
 /* ED11F8 80241208 44801000 */  mtc1      $zero, $f2
@@ -70,7 +70,7 @@ glabel func_80241178_ED1168
 /* ED126C 8024127C E7A60024 */  swc1      $f6, 0x24($sp)
 /* ED1270 80241280 AFA20010 */  sw        $v0, 0x10($sp)
 /* ED1274 80241284 8E040080 */  lw        $a0, 0x80($s0)
-/* ED1278 80241288 0C03908F */  jal       func_800E423C
+/* ED1278 80241288 0C03908F */  jal       dead_npc_raycast_down_sides
 /* ED127C 8024128C 27A70020 */   addiu    $a3, $sp, 0x20
 .L80241290:
 /* ED1280 80241290 1040000B */  beqz      $v0, .L802412C0
@@ -118,7 +118,7 @@ glabel func_80241178_ED1168
 /* ED1320 80241330 8C470030 */   lw       $a3, 0x30($v0)
 /* ED1324 80241334 46000506 */  mov.s     $f20, $f0
 /* ED1328 80241338 C60C000C */  lwc1      $f12, 0xc($s0)
-/* ED132C 8024133C 0C00ABC6 */  jal       func_8002AF18
+/* ED132C 8024133C 0C00ABC6 */  jal       dead_get_clamped_angle_diff
 /* ED1330 80241340 4600A386 */   mov.s    $f14, $f20
 /* ED1334 80241344 46000086 */  mov.s     $f2, $f0
 /* ED1338 80241348 8E62001C */  lw        $v0, 0x1c($s3)
@@ -187,7 +187,7 @@ glabel func_80241178_ED1168
 /* ED1424 80241434 E7A00024 */  swc1      $f0, 0x24($sp)
 /* ED1428 80241438 AFA20010 */  sw        $v0, 0x10($sp)
 /* ED142C 8024143C 8E040080 */  lw        $a0, 0x80($s0)
-/* ED1430 80241440 0C03908F */  jal       func_800E423C
+/* ED1430 80241440 0C03908F */  jal       dead_npc_raycast_down_sides
 /* ED1434 80241444 27A70020 */   addiu    $a3, $sp, 0x20
 /* ED1438 80241448 10400015 */  beqz      $v0, .L802414A0
 /* ED143C 8024144C 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/ED0310/func_80241508_ED14F8.s b/ver/us/asm/nonmatchings/ED0310/func_80241508_ED14F8.s
index 9ea17f9641..ad564cd4b0 100644
--- a/ver/us/asm/nonmatchings/ED0310/func_80241508_ED14F8.s
+++ b/ver/us/asm/nonmatchings/ED0310/func_80241508_ED14F8.s
@@ -41,7 +41,7 @@ glabel func_80241508_ED14F8
 /* ED1580 80241590 E7A60024 */  swc1      $f6, 0x24($sp)
 /* ED1584 80241594 AFA20010 */  sw        $v0, 0x10($sp)
 /* ED1588 80241598 8C840080 */  lw        $a0, 0x80($a0)
-/* ED158C 8024159C 0C03908F */  jal       func_800E423C
+/* ED158C 8024159C 0C03908F */  jal       dead_npc_raycast_down_sides
 /* ED1590 802415A0 27A70020 */   addiu    $a3, $sp, 0x20
 /* ED1594 802415A4 C7A20024 */  lwc1      $f2, 0x24($sp)
 /* ED1598 802415A8 3C014059 */  lui       $at, 0x4059
diff --git a/ver/us/asm/nonmatchings/ED46D0/func_802404B0_ED46D0.s b/ver/us/asm/nonmatchings/ED46D0/func_802404B0_ED46D0.s
index fdb40138b9..c7f9d86824 100644
--- a/ver/us/asm/nonmatchings/ED46D0/func_802404B0_ED46D0.s
+++ b/ver/us/asm/nonmatchings/ED46D0/func_802404B0_ED46D0.s
@@ -242,7 +242,7 @@ glabel func_802404B0_ED46D0
 /* ED4A50 80240830 006A1821 */  addu      $v1, $v1, $t2
 /* ED4A54 80240834 44836000 */  mtc1      $v1, $f12
 /* ED4A58 80240838 00000000 */  nop
-/* ED4A5C 8024083C 0C00AD77 */  jal       func_8002B5DC
+/* ED4A5C 8024083C 0C00AD77 */  jal       dead_sin_deg
 /* ED4A60 80240840 46806320 */   cvt.s.w  $f12, $f12
 /* ED4A64 80240844 3C0143FA */  lui       $at, 0x43fa
 /* ED4A68 80240848 44811000 */  mtc1      $at, $f2
diff --git a/ver/us/asm/nonmatchings/ED8E20/func_80240274_ED9094.s b/ver/us/asm/nonmatchings/ED8E20/func_80240274_ED9094.s
index a9c969e883..ee649559b9 100644
--- a/ver/us/asm/nonmatchings/ED8E20/func_80240274_ED9094.s
+++ b/ver/us/asm/nonmatchings/ED8E20/func_80240274_ED9094.s
@@ -11,8 +11,8 @@ glabel func_80240274_ED9094
 /* ED90AC 8024028C 0C0B55FF */  jal       dead_evt_get_float_variable
 /* ED90B0 80240290 8C450000 */   lw       $a1, ($v0)
 /* ED90B4 80240294 27A40010 */  addiu     $a0, $sp, 0x10
-/* ED90B8 80240298 3C028011 */  lui       $v0, %hi(D_80117578)
-/* ED90BC 8024029C 24427578 */  addiu     $v0, $v0, %lo(D_80117578)
+/* ED90B8 80240298 3C028011 */  lui       $v0, %hi(dead_gPlayerStatus)
+/* ED90BC 8024029C 24427578 */  addiu     $v0, $v0, %lo(dead_gPlayerStatus)
 /* ED90C0 802402A0 44060000 */  mfc1      $a2, $f0
 /* ED90C4 802402A4 C4400028 */  lwc1      $f0, 0x28($v0)
 /* ED90C8 802402A8 C4420030 */  lwc1      $f2, 0x30($v0)
diff --git a/ver/us/asm/nonmatchings/EDC020/func_802403F0_EDC3D0.s b/ver/us/asm/nonmatchings/EDC020/func_802403F0_EDC3D0.s
index 596d6ec6a7..bcd976b329 100644
--- a/ver/us/asm/nonmatchings/EDC020/func_802403F0_EDC3D0.s
+++ b/ver/us/asm/nonmatchings/EDC020/func_802403F0_EDC3D0.s
@@ -38,8 +38,8 @@ glabel func_802403F0_EDC3D0
 /* EDC454 80240474 4482C000 */  mtc1      $v0, $f24
 /* EDC458 80240478 00000000 */  nop
 /* EDC45C 8024047C 4680C620 */  cvt.s.w   $f24, $f24
-/* EDC460 80240480 3C128011 */  lui       $s2, %hi(D_80117578)
-/* EDC464 80240484 26527578 */  addiu     $s2, $s2, %lo(D_80117578)
+/* EDC460 80240480 3C128011 */  lui       $s2, %hi(dead_gPlayerStatus)
+/* EDC464 80240484 26527578 */  addiu     $s2, $s2, %lo(dead_gPlayerStatus)
 /* EDC468 80240488 3C038008 */  lui       $v1, %hi(D_8007C760)
 /* EDC46C 8024048C 8C63C760 */  lw        $v1, %lo(D_8007C760)($v1)
 /* EDC470 80240490 C64200A8 */  lwc1      $f2, 0xa8($s2)
@@ -72,7 +72,7 @@ glabel func_802403F0_EDC3D0
 /* EDC4D4 802404F4 46000586 */  mov.s     $f22, $f0
 /* EDC4D8 802404F8 3C014170 */  lui       $at, 0x4170
 /* EDC4DC 802404FC 4481A000 */  mtc1      $at, $f20
-/* EDC4E0 80240500 0C00AD77 */  jal       func_8002B5DC
+/* EDC4E0 80240500 0C00AD77 */  jal       dead_sin_deg
 /* EDC4E4 80240504 4600B306 */   mov.s    $f12, $f22
 /* EDC4E8 80240508 46140002 */  mul.s     $f0, $f0, $f20
 /* EDC4EC 8024050C 00000000 */  nop
@@ -86,7 +86,7 @@ glabel func_802403F0_EDC3D0
 /* EDC50C 8024052C 00000000 */  nop
 /* EDC510 80240530 4600E700 */  add.s     $f28, $f28, $f0
 /* EDC514 80240534 4602D680 */  add.s     $f26, $f26, $f2
-/* EDC518 80240538 0C00AD90 */  jal       func_8002B640
+/* EDC518 80240538 0C00AD90 */  jal       dead_cos_deg
 /* EDC51C 8024053C 4600B306 */   mov.s    $f12, $f22
 /* EDC520 80240540 46140002 */  mul.s     $f0, $f0, $f20
 /* EDC524 80240544 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/EDEA00/func_802401C4_EDEB84.s b/ver/us/asm/nonmatchings/EDEA00/func_802401C4_EDEB84.s
index d4c7f2ab4c..26ada8799f 100644
--- a/ver/us/asm/nonmatchings/EDEA00/func_802401C4_EDEB84.s
+++ b/ver/us/asm/nonmatchings/EDEA00/func_802401C4_EDEB84.s
@@ -51,7 +51,7 @@ glabel func_802401C4_EDEB84
 /* EDEC20 80240260 46800020 */  cvt.s.w   $f0, $f0
 /* EDEC24 80240264 E7A00018 */  swc1      $f0, 0x18($sp)
 /* EDEC28 80240268 8C640018 */  lw        $a0, 0x18($v1)
-/* EDEC2C 8024026C 0C013431 */  jal       func_8004D0C4
+/* EDEC2C 8024026C 0C013431 */  jal       dead_is_point_within_region
 /* EDEC30 80240270 8E070038 */   lw       $a3, 0x38($s0)
 /* EDEC34 80240274 1040000E */  beqz      $v0, .L802402B0
 /* EDEC38 80240278 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80240374_EDED34.s b/ver/us/asm/nonmatchings/EDEA00/func_80240374_EDED34.s
index ff1b914c51..75df90ce58 100644
--- a/ver/us/asm/nonmatchings/EDEA00/func_80240374_EDED34.s
+++ b/ver/us/asm/nonmatchings/EDEA00/func_80240374_EDED34.s
@@ -92,7 +92,7 @@ glabel func_80240374_EDED34
 /* EDEE64 802404A4 E7A60034 */  swc1      $f6, 0x34($sp)
 /* EDEE68 802404A8 AFA20010 */  sw        $v0, 0x10($sp)
 /* EDEE6C 802404AC 8E040080 */  lw        $a0, 0x80($s0)
-/* EDEE70 802404B0 0C03908F */  jal       func_800E423C
+/* EDEE70 802404B0 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EDEE74 802404B4 27A70030 */   addiu    $a3, $sp, 0x30
 /* EDEE78 802404B8 C7A00034 */  lwc1      $f0, 0x34($sp)
 /* EDEE7C 802404BC 4600D001 */  sub.s     $f0, $f26, $f0
@@ -136,7 +136,7 @@ glabel func_80240374_EDED34
 /* EDEF0C 8024054C E7A40034 */  swc1      $f4, 0x34($sp)
 /* EDEF10 80240550 AFA20010 */  sw        $v0, 0x10($sp)
 /* EDEF14 80240554 8E040080 */  lw        $a0, 0x80($s0)
-/* EDEF18 80240558 0C03908F */  jal       func_800E423C
+/* EDEF18 80240558 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EDEF1C 8024055C 27A70030 */   addiu    $a3, $sp, 0x30
 /* EDEF20 80240560 C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* EDEF24 80240564 461A2100 */  add.s     $f4, $f4, $f26
@@ -172,7 +172,7 @@ glabel func_80240374_EDED34
 /* EDEF94 802405D4 1840002E */  blez      $v0, .L80240690
 /* EDEF98 802405D8 00000000 */   nop
 /* EDEF9C 802405DC C62C0074 */  lwc1      $f12, 0x74($s1)
-/* EDEFA0 802405E0 0C00AD77 */  jal       func_8002B5DC
+/* EDEFA0 802405E0 0C00AD77 */  jal       dead_sin_deg
 /* EDEFA4 802405E4 46806320 */   cvt.s.w  $f12, $f12
 /* EDEFA8 802405E8 8E020000 */  lw        $v0, ($s0)
 /* EDEFAC 802405EC 30420008 */  andi      $v0, $v0, 8
@@ -195,7 +195,7 @@ glabel func_80240374_EDED34
 /* EDEFEC 8024062C E7A60034 */  swc1      $f6, 0x34($sp)
 /* EDEFF0 80240630 AFA20010 */  sw        $v0, 0x10($sp)
 /* EDEFF4 80240634 8E040080 */  lw        $a0, 0x80($s0)
-/* EDEFF8 80240638 0C03908F */  jal       func_800E423C
+/* EDEFF8 80240638 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EDEFFC 8024063C 27A70030 */   addiu    $a3, $sp, 0x30
 .L80240640:
 /* EDF000 80240640 10400007 */  beqz      $v0, .L80240660
@@ -276,13 +276,13 @@ glabel func_80240374_EDED34
 /* EDF120 80240760 AFA20020 */  sw        $v0, 0x20($sp)
 /* EDF124 80240764 E7A00010 */  swc1      $f0, 0x10($sp)
 /* EDF128 80240768 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EDF12C 8024076C 0C01D444 */  jal       func_80075110
+/* EDF12C 8024076C 0C01D444 */  jal       dead_fx_emote
 /* EDF130 80240770 E7A40018 */   swc1     $f4, 0x18($sp)
 /* EDF134 80240774 0200202D */  daddu     $a0, $s0, $zero
 /* EDF138 80240778 240502F4 */  addiu     $a1, $zero, 0x2f4
 /* EDF13C 8024077C C480003C */  lwc1      $f0, 0x3c($a0)
 /* EDF140 80240780 3C060020 */  lui       $a2, 0x20
-/* EDF144 80240784 0C013600 */  jal       func_8004D800
+/* EDF144 80240784 0C013600 */  jal       dead_ai_enemy_play_sound
 /* EDF148 80240788 E4800064 */   swc1     $f0, 0x64($a0)
 /* EDF14C 8024078C 8E220018 */  lw        $v0, 0x18($s1)
 /* EDF150 80240790 9442002A */  lhu       $v0, 0x2a($v0)
@@ -321,7 +321,7 @@ glabel func_80240374_EDED34
 /* EDF1C0 80240800 46800020 */  cvt.s.w   $f0, $f0
 /* EDF1C4 80240804 E7A00018 */  swc1      $f0, 0x18($sp)
 /* EDF1C8 80240808 8C640018 */  lw        $a0, 0x18($v1)
-/* EDF1CC 8024080C 0C013431 */  jal       func_8004D0C4
+/* EDF1CC 8024080C 0C013431 */  jal       dead_is_point_within_region
 /* EDF1D0 80240810 8E070038 */   lw       $a3, 0x38($s0)
 /* EDF1D4 80240814 1040001A */  beqz      $v0, .L80240880
 /* EDF1D8 80240818 00000000 */   nop
@@ -331,7 +331,7 @@ glabel func_80240374_EDED34
 /* EDF1E8 80240828 C44C0000 */  lwc1      $f12, ($v0)
 /* EDF1EC 8024082C 46806320 */  cvt.s.w   $f12, $f12
 /* EDF1F0 80240830 C44E0008 */  lwc1      $f14, 8($v0)
-/* EDF1F4 80240834 0C00AC71 */  jal       func_8002B1C4
+/* EDF1F4 80240834 0C00AC71 */  jal       dead_dist2D
 /* EDF1F8 80240838 468073A0 */   cvt.s.w  $f14, $f14
 /* EDF1FC 8024083C C6020018 */  lwc1      $f2, 0x18($s0)
 /* EDF200 80240840 4600103C */  c.lt.s    $f2, $f0
@@ -363,7 +363,7 @@ glabel func_80240374_EDED34
 /* EDF264 802408A4 00000000 */   nop
 /* EDF268 802408A8 8E050018 */  lw        $a1, 0x18($s0)
 /* EDF26C 802408AC 8E06000C */  lw        $a2, 0xc($s0)
-/* EDF270 802408B0 0C00F909 */  jal       func_8003E424
+/* EDF270 802408B0 0C00F909 */  jal       dead_npc_move_heading
 /* EDF274 802408B4 0200202D */   daddu    $a0, $s0, $zero
 .L802408B8:
 /* EDF278 802408B8 C600003C */  lwc1      $f0, 0x3c($s0)
diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80240A5C_EDF41C.s b/ver/us/asm/nonmatchings/EDEA00/func_80240A5C_EDF41C.s
index 474c0830ec..3a474638ee 100644
--- a/ver/us/asm/nonmatchings/EDEA00/func_80240A5C_EDF41C.s
+++ b/ver/us/asm/nonmatchings/EDEA00/func_80240A5C_EDF41C.s
@@ -50,7 +50,7 @@ glabel func_80240A5C_EDF41C
 /* EDF4CC 80240B0C 46800020 */  cvt.s.w   $f0, $f0
 /* EDF4D0 80240B10 46000021 */  cvt.d.s   $f0, $f0
 /* EDF4D4 80240B14 46220003 */  div.d     $f0, $f0, $f2
-/* EDF4D8 80240B18 0C00AD77 */  jal       func_8002B5DC
+/* EDF4D8 80240B18 0C00AD77 */  jal       dead_sin_deg
 /* EDF4DC 80240B1C 462005A0 */   cvt.s.d  $f22, $f0
 /* EDF4E0 80240B20 8E020000 */  lw        $v0, ($s0)
 /* EDF4E4 80240B24 30420008 */  andi      $v0, $v0, 8
@@ -73,7 +73,7 @@ glabel func_80240A5C_EDF41C
 /* EDF524 80240B64 E7A60034 */  swc1      $f6, 0x34($sp)
 /* EDF528 80240B68 AFA20010 */  sw        $v0, 0x10($sp)
 /* EDF52C 80240B6C 8E040080 */  lw        $a0, 0x80($s0)
-/* EDF530 80240B70 0C03908F */  jal       func_800E423C
+/* EDF530 80240B70 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EDF534 80240B74 27A70030 */   addiu    $a3, $sp, 0x30
 .L80240B78:
 /* EDF538 80240B78 10400007 */  beqz      $v0, .L80240B98
@@ -148,13 +148,13 @@ glabel func_80240A5C_EDF41C
 /* EDF640 80240C80 AFA20020 */  sw        $v0, 0x20($sp)
 /* EDF644 80240C84 E7A00010 */  swc1      $f0, 0x10($sp)
 /* EDF648 80240C88 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EDF64C 80240C8C 0C01D444 */  jal       func_80075110
+/* EDF64C 80240C8C 0C01D444 */  jal       dead_fx_emote
 /* EDF650 80240C90 E7A40018 */   swc1     $f4, 0x18($sp)
 /* EDF654 80240C94 0200202D */  daddu     $a0, $s0, $zero
 /* EDF658 80240C98 240502F4 */  addiu     $a1, $zero, 0x2f4
 /* EDF65C 80240C9C C480003C */  lwc1      $f0, 0x3c($a0)
 /* EDF660 80240CA0 3C060020 */  lui       $a2, 0x20
-/* EDF664 80240CA4 0C013600 */  jal       func_8004D800
+/* EDF664 80240CA4 0C013600 */  jal       dead_ai_enemy_play_sound
 /* EDF668 80240CA8 E4800064 */   swc1     $f0, 0x64($a0)
 /* EDF66C 80240CAC 8E220018 */  lw        $v0, 0x18($s1)
 /* EDF670 80240CB0 9442002A */  lhu       $v0, 0x2a($v0)
diff --git a/ver/us/asm/nonmatchings/EDEA00/func_8024101C_EDF9DC.s b/ver/us/asm/nonmatchings/EDEA00/func_8024101C_EDF9DC.s
index 64c6a4ba3d..ab050c9fbd 100644
--- a/ver/us/asm/nonmatchings/EDEA00/func_8024101C_EDF9DC.s
+++ b/ver/us/asm/nonmatchings/EDEA00/func_8024101C_EDF9DC.s
@@ -35,7 +35,7 @@ glabel func_8024101C_EDF9DC
 /* EDFA54 80241094 46240003 */  div.d     $f0, $f0, $f4
 /* EDFA58 80241098 46200520 */  cvt.s.d   $f20, $f0
 /* EDFA5C 8024109C 46241083 */  div.d     $f2, $f2, $f4
-/* EDFA60 802410A0 0C00F909 */  jal       func_8003E424
+/* EDFA60 802410A0 0C00F909 */  jal       dead_npc_move_heading
 /* EDFA64 802410A4 462015A0 */   cvt.s.d  $f22, $f2
 /* EDFA68 802410A8 C604001C */  lwc1      $f4, 0x1c($s0)
 /* EDFA6C 802410AC 44801000 */  mtc1      $zero, $f2
@@ -70,7 +70,7 @@ glabel func_8024101C_EDF9DC
 /* EDFAE0 80241120 E7A60024 */  swc1      $f6, 0x24($sp)
 /* EDFAE4 80241124 AFA20010 */  sw        $v0, 0x10($sp)
 /* EDFAE8 80241128 8E040080 */  lw        $a0, 0x80($s0)
-/* EDFAEC 8024112C 0C03908F */  jal       func_800E423C
+/* EDFAEC 8024112C 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EDFAF0 80241130 27A70020 */   addiu    $a3, $sp, 0x20
 .L80241134:
 /* EDFAF4 80241134 1040000B */  beqz      $v0, .L80241164
@@ -118,7 +118,7 @@ glabel func_8024101C_EDF9DC
 /* EDFB94 802411D4 8C470030 */   lw       $a3, 0x30($v0)
 /* EDFB98 802411D8 46000506 */  mov.s     $f20, $f0
 /* EDFB9C 802411DC C60C000C */  lwc1      $f12, 0xc($s0)
-/* EDFBA0 802411E0 0C00ABC6 */  jal       func_8002AF18
+/* EDFBA0 802411E0 0C00ABC6 */  jal       dead_get_clamped_angle_diff
 /* EDFBA4 802411E4 4600A386 */   mov.s    $f14, $f20
 /* EDFBA8 802411E8 46000086 */  mov.s     $f2, $f0
 /* EDFBAC 802411EC 8E62001C */  lw        $v0, 0x1c($s3)
@@ -187,7 +187,7 @@ glabel func_8024101C_EDF9DC
 /* EDFC98 802412D8 E7A00024 */  swc1      $f0, 0x24($sp)
 /* EDFC9C 802412DC AFA20010 */  sw        $v0, 0x10($sp)
 /* EDFCA0 802412E0 8E040080 */  lw        $a0, 0x80($s0)
-/* EDFCA4 802412E4 0C03908F */  jal       func_800E423C
+/* EDFCA4 802412E4 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EDFCA8 802412E8 27A70020 */   addiu    $a3, $sp, 0x20
 /* EDFCAC 802412EC 10400015 */  beqz      $v0, .L80241344
 /* EDFCB0 802412F0 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/EDEA00/func_802413AC_EDFD6C.s b/ver/us/asm/nonmatchings/EDEA00/func_802413AC_EDFD6C.s
index 0fda6f1b51..5cd8bc967f 100644
--- a/ver/us/asm/nonmatchings/EDEA00/func_802413AC_EDFD6C.s
+++ b/ver/us/asm/nonmatchings/EDEA00/func_802413AC_EDFD6C.s
@@ -41,7 +41,7 @@ glabel func_802413AC_EDFD6C
 /* EDFDF4 80241434 E7A60024 */  swc1      $f6, 0x24($sp)
 /* EDFDF8 80241438 AFA20010 */  sw        $v0, 0x10($sp)
 /* EDFDFC 8024143C 8C840080 */  lw        $a0, 0x80($a0)
-/* EDFE00 80241440 0C03908F */  jal       func_800E423C
+/* EDFE00 80241440 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EDFE04 80241444 27A70020 */   addiu    $a3, $sp, 0x20
 /* EDFE08 80241448 C7A20024 */  lwc1      $f2, 0x24($sp)
 /* EDFE0C 8024144C 3C014059 */  lui       $at, 0x4059
diff --git a/ver/us/asm/nonmatchings/EDEA00/func_802416E8_EE00A8.s b/ver/us/asm/nonmatchings/EDEA00/func_802416E8_EE00A8.s
index 2b88cccb34..5d86388b24 100644
--- a/ver/us/asm/nonmatchings/EDEA00/func_802416E8_EE00A8.s
+++ b/ver/us/asm/nonmatchings/EDEA00/func_802416E8_EE00A8.s
@@ -7,7 +7,7 @@ glabel func_802416E8_EE00A8
 /* EE00B0 802416F0 24100032 */  addiu     $s0, $zero, 0x32
 /* EE00B4 802416F4 AFBF0014 */  sw        $ra, 0x14($sp)
 .L802416F8:
-/* EE00B8 802416F8 0C010ABD */  jal       func_80042AF4
+/* EE00B8 802416F8 0C010ABD */  jal       dead_get_enemy
 /* EE00BC 802416FC 0200202D */   daddu    $a0, $s0, $zero
 /* EE00C0 80241700 8C420094 */  lw        $v0, 0x94($v0)
 /* EE00C4 80241704 54400003 */  bnel      $v0, $zero, .L80241714
diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80241730_EE00F0.s b/ver/us/asm/nonmatchings/EDEA00/func_80241730_EE00F0.s
index e1cb8e3737..713a5d0411 100644
--- a/ver/us/asm/nonmatchings/EDEA00/func_80241730_EE00F0.s
+++ b/ver/us/asm/nonmatchings/EDEA00/func_80241730_EE00F0.s
@@ -65,10 +65,10 @@ glabel func_80241730_EE00F0
 /* EE01DC 8024181C 4626A503 */  div.d     $f20, $f20, $f6
 /* EE01E0 80241820 AFB30010 */  sw        $s3, 0x10($sp)
 /* EE01E4 80241824 8E040080 */  lw        $a0, 0x80($s0)
-/* EE01E8 80241828 0C03908F */  jal       func_800E423C
+/* EE01E8 80241828 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EE01EC 8024182C 4620A520 */   cvt.s.d  $f20, $f20
 /* EE01F0 80241830 C62C0074 */  lwc1      $f12, 0x74($s1)
-/* EE01F4 80241834 0C00AD77 */  jal       func_8002B5DC
+/* EE01F4 80241834 0C00AD77 */  jal       dead_sin_deg
 /* EE01F8 80241838 46806320 */   cvt.s.w  $f12, $f12
 /* EE01FC 8024183C 46140002 */  mul.s     $f0, $f0, $f20
 /* EE0200 80241840 00000000 */  nop
@@ -118,11 +118,11 @@ glabel func_80241730_EE00F0
 /* EE02B0 802418F0 AFA20020 */  sw        $v0, 0x20($sp)
 /* EE02B4 802418F4 E7A00010 */  swc1      $f0, 0x10($sp)
 /* EE02B8 802418F8 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EE02BC 802418FC 0C01D444 */  jal       func_80075110
+/* EE02BC 802418FC 0C01D444 */  jal       dead_fx_emote
 /* EE02C0 80241900 E7A40018 */   swc1     $f4, 0x18($sp)
 /* EE02C4 80241904 0200202D */  daddu     $a0, $s0, $zero
 /* EE02C8 80241908 240502F4 */  addiu     $a1, $zero, 0x2f4
-/* EE02CC 8024190C 0C013600 */  jal       func_8004D800
+/* EE02CC 8024190C 0C013600 */  jal       dead_ai_enemy_play_sound
 /* EE02D0 80241910 3C060020 */   lui      $a2, 0x20
 /* EE02D4 80241914 0280282D */  daddu     $a1, $s4, $zero
 /* EE02D8 80241918 C6000038 */  lwc1      $f0, 0x38($s0)
@@ -135,7 +135,7 @@ glabel func_80241730_EE00F0
 /* EE02F4 80241934 E7A40030 */  swc1      $f4, 0x30($sp)
 /* EE02F8 80241938 AFB30010 */  sw        $s3, 0x10($sp)
 /* EE02FC 8024193C 8E040080 */  lw        $a0, 0x80($s0)
-/* EE0300 80241940 0C03908F */  jal       func_800E423C
+/* EE0300 80241940 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EE0304 80241944 02C0382D */   daddu    $a3, $s6, $zero
 /* EE0308 80241948 C7A0002C */  lwc1      $f0, 0x2c($sp)
 /* EE030C 8024194C 46180000 */  add.s     $f0, $f0, $f24
@@ -167,7 +167,7 @@ glabel func_80241730_EE00F0
 /* EE0368 802419A8 46800020 */  cvt.s.w   $f0, $f0
 /* EE036C 802419AC E7A00018 */  swc1      $f0, 0x18($sp)
 /* EE0370 802419B0 8C640018 */  lw        $a0, 0x18($v1)
-/* EE0374 802419B4 0C013431 */  jal       func_8004D0C4
+/* EE0374 802419B4 0C013431 */  jal       dead_is_point_within_region
 /* EE0378 802419B8 8E070038 */   lw       $a3, 0x38($s0)
 /* EE037C 802419BC 1040000D */  beqz      $v0, .L802419F4
 /* EE0380 802419C0 00000000 */   nop
@@ -192,7 +192,7 @@ glabel func_80241730_EE00F0
 /* EE03C8 80241A08 240403E8 */   addiu    $a0, $zero, 0x3e8
 /* EE03CC 80241A0C 8E050018 */  lw        $a1, 0x18($s0)
 /* EE03D0 80241A10 8E06000C */  lw        $a2, 0xc($s0)
-/* EE03D4 80241A14 0C00F909 */  jal       func_8003E424
+/* EE03D4 80241A14 0C00F909 */  jal       dead_npc_move_heading
 /* EE03D8 80241A18 0200202D */   daddu    $a0, $s0, $zero
 /* EE03DC 80241A1C 8E22006C */  lw        $v0, 0x6c($s1)
 /* EE03E0 80241A20 30420001 */  andi      $v0, $v0, 1
@@ -210,7 +210,7 @@ glabel func_80241730_EE00F0
 /* EE0410 80241A50 E7A40034 */  swc1      $f4, 0x34($sp)
 /* EE0414 80241A54 AFA20010 */  sw        $v0, 0x10($sp)
 /* EE0418 80241A58 8E040080 */  lw        $a0, 0x80($s0)
-/* EE041C 80241A5C 0C03908F */  jal       func_800E423C
+/* EE041C 80241A5C 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EE0420 80241A60 27A70030 */   addiu    $a3, $sp, 0x30
 /* EE0424 80241A64 C7A0002C */  lwc1      $f0, 0x2c($sp)
 /* EE0428 80241A68 46180100 */  add.s     $f4, $f0, $f24
diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80241B94_EE0554.s b/ver/us/asm/nonmatchings/EDEA00/func_80241B94_EE0554.s
index a6bea4dfb5..cf35578b5f 100644
--- a/ver/us/asm/nonmatchings/EDEA00/func_80241B94_EE0554.s
+++ b/ver/us/asm/nonmatchings/EDEA00/func_80241B94_EE0554.s
@@ -51,10 +51,10 @@ glabel func_80241B94_EE0554
 /* EE0608 80241C48 4628A503 */  div.d     $f20, $f20, $f8
 /* EE060C 80241C4C AFA20010 */  sw        $v0, 0x10($sp)
 /* EE0610 80241C50 8E040080 */  lw        $a0, 0x80($s0)
-/* EE0614 80241C54 0C03908F */  jal       func_800E423C
+/* EE0614 80241C54 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EE0618 80241C58 4620A520 */   cvt.s.d  $f20, $f20
 /* EE061C 80241C5C C62C0074 */  lwc1      $f12, 0x74($s1)
-/* EE0620 80241C60 0C00AD77 */  jal       func_8002B5DC
+/* EE0620 80241C60 0C00AD77 */  jal       dead_sin_deg
 /* EE0624 80241C64 46806320 */   cvt.s.w  $f12, $f12
 /* EE0628 80241C68 46140002 */  mul.s     $f0, $f0, $f20
 /* EE062C 80241C6C 00000000 */  nop
@@ -98,11 +98,11 @@ glabel func_80241B94_EE0554
 /* EE06C4 80241D04 AFA20020 */  sw        $v0, 0x20($sp)
 /* EE06C8 80241D08 E7A00010 */  swc1      $f0, 0x10($sp)
 /* EE06CC 80241D0C E7A20014 */  swc1      $f2, 0x14($sp)
-/* EE06D0 80241D10 0C01D444 */  jal       func_80075110
+/* EE06D0 80241D10 0C01D444 */  jal       dead_fx_emote
 /* EE06D4 80241D14 E7A40018 */   swc1     $f4, 0x18($sp)
 /* EE06D8 80241D18 0200202D */  daddu     $a0, $s0, $zero
 /* EE06DC 80241D1C 240502F4 */  addiu     $a1, $zero, 0x2f4
-/* EE06E0 80241D20 0C013600 */  jal       func_8004D800
+/* EE06E0 80241D20 0C013600 */  jal       dead_ai_enemy_play_sound
 /* EE06E4 80241D24 3C060020 */   lui      $a2, 0x20
 /* EE06E8 80241D28 2402000C */  addiu     $v0, $zero, 0xc
 /* EE06EC 80241D2C 0809076F */  j         .L80241DBC
diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s b/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s
index d75e4200fb..740259a093 100644
--- a/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s
+++ b/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s
@@ -132,7 +132,7 @@ glabel func_80241DE4_EE07A4
 /* EE097C 80241FBC E640000C */   swc1     $f0, 0xc($s2)
 /* EE0980 80241FC0 0440000F */  bltz      $v0, .L80242000
 /* EE0984 80241FC4 AE62007C */   sw       $v0, 0x7c($s3)
-/* EE0988 80241FC8 0C010ABD */  jal       func_80042AF4
+/* EE0988 80241FC8 0C010ABD */  jal       dead_get_enemy
 /* EE098C 80241FCC 0040202D */   daddu    $a0, $v0, $zero
 /* EE0990 80241FD0 3C030049 */  lui       $v1, 0x49
 /* EE0994 80241FD4 0040202D */  daddu     $a0, $v0, $zero
@@ -206,7 +206,7 @@ glabel func_80241DE4_EE07A4
 /* EE0A80 802420C0 00021400 */  sll       $v0, $v0, 0x10
 /* EE0A84 802420C4 1C400027 */  bgtz      $v0, .L80242164
 /* EE0A88 802420C8 00000000 */   nop
-/* EE0A8C 802420CC 0C010ABD */  jal       func_80042AF4
+/* EE0A8C 802420CC 0C010ABD */  jal       dead_get_enemy
 /* EE0A90 802420D0 8E64007C */   lw       $a0, 0x7c($s3)
 /* EE0A94 802420D4 24030002 */  addiu     $v1, $zero, 2
 /* EE0A98 802420D8 AC430094 */  sw        $v1, 0x94($v0)
@@ -222,7 +222,7 @@ glabel func_80241DE4_EE07A4
 /* EE0ABC 802420FC 3C020049 */   lui      $v0, 0x49
 /* EE0AC0 80242100 34420015 */  ori       $v0, $v0, 0x15
 /* EE0AC4 80242104 AE420028 */  sw        $v0, 0x28($s2)
-/* EE0AC8 80242108 0C010ABD */  jal       func_80042AF4
+/* EE0AC8 80242108 0C010ABD */  jal       dead_get_enemy
 /* EE0ACC 8024210C 8E64007C */   lw       $a0, 0x7c($s3)
 /* EE0AD0 80242110 24030003 */  addiu     $v1, $zero, 3
 /* EE0AD4 80242114 AC430094 */  sw        $v1, 0x94($v0)
@@ -266,7 +266,7 @@ glabel func_80241DE4_EE07A4
 /* EE0B60 802421A0 8E020000 */  lw        $v0, ($s0)
 /* EE0B64 802421A4 E640000C */  swc1      $f0, 0xc($s2)
 /* EE0B68 802421A8 C44C0028 */  lwc1      $f12, 0x28($v0)
-/* EE0B6C 802421AC 0C00AC71 */  jal       func_8002B1C4
+/* EE0B6C 802421AC 0C00AC71 */  jal       dead_dist2D
 /* EE0B70 802421B0 C44E0030 */   lwc1     $f14, 0x30($v0)
 /* EE0B74 802421B4 C6A20008 */  lwc1      $f2, 8($s5)
 /* EE0B78 802421B8 468010A0 */  cvt.s.w   $f2, $f2
@@ -284,7 +284,7 @@ glabel func_80241DE4_EE07A4
 /* EE0BA8 802421E8 E7A20018 */  swc1      $f2, 0x18($sp)
 /* EE0BAC 802421EC 8EA40004 */  lw        $a0, 4($s5)
 /* EE0BB0 802421F0 8E470038 */  lw        $a3, 0x38($s2)
-/* EE0BB4 802421F4 0C013431 */  jal       func_8004D0C4
+/* EE0BB4 802421F4 0C013431 */  jal       dead_is_point_within_region
 /* EE0BB8 802421F8 46000506 */   mov.s    $f20, $f0
 /* EE0BBC 802421FC 14400031 */  bnez      $v0, .L802422C4
 /* EE0BC0 80242200 0000102D */   daddu    $v0, $zero, $zero
@@ -335,7 +335,7 @@ glabel func_80241DE4_EE07A4
 /* EE0C6C 802422AC 44050000 */  mfc1      $a1, $f0
 /* EE0C70 802422B0 8E46000C */  lw        $a2, 0xc($s2)
 /* EE0C74 802422B4 0240202D */  daddu     $a0, $s2, $zero
-/* EE0C78 802422B8 0C00F909 */  jal       func_8003E424
+/* EE0C78 802422B8 0C00F909 */  jal       dead_npc_move_heading
 /* EE0C7C 802422BC AC850018 */   sw       $a1, 0x18($a0)
 /* EE0C80 802422C0 0000102D */  daddu     $v0, $zero, $zero
 .L802422C4:
diff --git a/ver/us/asm/nonmatchings/EDEA00/func_8024236C_EE0D2C.s b/ver/us/asm/nonmatchings/EDEA00/func_8024236C_EE0D2C.s
index 49b429df00..60cd1db8d3 100644
--- a/ver/us/asm/nonmatchings/EDEA00/func_8024236C_EE0D2C.s
+++ b/ver/us/asm/nonmatchings/EDEA00/func_8024236C_EE0D2C.s
@@ -58,7 +58,7 @@ glabel func_8024236C_EE0D2C
 /* EE0DD8 80242418 C60C0038 */  lwc1      $f12, 0x38($s0)
 /* EE0DDC 8024241C C60E0040 */  lwc1      $f14, 0x40($s0)
 /* EE0DE0 80242420 8C460028 */  lw        $a2, 0x28($v0)
-/* EE0DE4 80242424 0C00AC71 */  jal       func_8002B1C4
+/* EE0DE4 80242424 0C00AC71 */  jal       dead_dist2D
 /* EE0DE8 80242428 8C470030 */   lw       $a3, 0x30($v0)
 /* EE0DEC 8024242C C6020018 */  lwc1      $f2, 0x18($s0)
 /* EE0DF0 80242430 46020003 */  div.s     $f0, $f0, $f2
diff --git a/ver/us/asm/nonmatchings/EDEA00/func_802424A0_EE0E60.s b/ver/us/asm/nonmatchings/EDEA00/func_802424A0_EE0E60.s
index ae658de1d8..7ff3c3f222 100644
--- a/ver/us/asm/nonmatchings/EDEA00/func_802424A0_EE0E60.s
+++ b/ver/us/asm/nonmatchings/EDEA00/func_802424A0_EE0E60.s
@@ -59,14 +59,14 @@ glabel func_802424A0_EE0E60
 /* EE0F34 80242574 46800020 */  cvt.s.w   $f0, $f0
 /* EE0F38 80242578 E7A0001C */  swc1      $f0, 0x1c($sp)
 /* EE0F3C 8024257C 8E040080 */  lw        $a0, 0x80($s0)
-/* EE0F40 80242580 0C0394C1 */  jal       func_800E5304
+/* EE0F40 80242580 0C0394C1 */  jal       dead_npc_test_move_simple_with_slipping
 /* EE0F44 80242584 27A70028 */   addiu    $a3, $sp, 0x28
 /* EE0F48 80242588 0040902D */  daddu     $s2, $v0, $zero
 /* EE0F4C 8024258C 16400005 */  bnez      $s2, .L802425A4
 /* EE0F50 80242590 00000000 */   nop
 /* EE0F54 80242594 8E050018 */  lw        $a1, 0x18($s0)
 /* EE0F58 80242598 8E06000C */  lw        $a2, 0xc($s0)
-/* EE0F5C 8024259C 0C00F909 */  jal       func_8003E424
+/* EE0F5C 8024259C 0C00F909 */  jal       dead_npc_move_heading
 /* EE0F60 802425A0 0200202D */   daddu    $a0, $s0, $zero
 .L802425A4:
 /* EE0F64 802425A4 8602008E */  lh        $v0, 0x8e($s0)
diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80242684_EE1044.s b/ver/us/asm/nonmatchings/EDEA00/func_80242684_EE1044.s
index f9d0d4daca..9691564751 100644
--- a/ver/us/asm/nonmatchings/EDEA00/func_80242684_EE1044.s
+++ b/ver/us/asm/nonmatchings/EDEA00/func_80242684_EE1044.s
@@ -129,7 +129,7 @@ glabel func_80242684_EE1044
 /* EE1208 80242848 AFA20020 */  sw        $v0, 0x20($sp)
 /* EE120C 8024284C E7A00010 */  swc1      $f0, 0x10($sp)
 /* EE1210 80242850 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EE1214 80242854 0C01D444 */  jal       func_80075110
+/* EE1214 80242854 0C01D444 */  jal       dead_fx_emote
 /* EE1218 80242858 E7A40018 */   swc1     $f4, 0x18($sp)
 /* EE121C 8024285C 8E2200B0 */  lw        $v0, 0xb0($s1)
 /* EE1220 80242860 2403FFFB */  addiu     $v1, $zero, -5
diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80242AF0_EE14B0.s b/ver/us/asm/nonmatchings/EDEA00/func_80242AF0_EE14B0.s
index 53f5b462ec..d3eb98d51e 100644
--- a/ver/us/asm/nonmatchings/EDEA00/func_80242AF0_EE14B0.s
+++ b/ver/us/asm/nonmatchings/EDEA00/func_80242AF0_EE14B0.s
@@ -147,7 +147,7 @@ glabel func_80242AF0_EE14B0
 /* EE16BC 80242CFC AFA20020 */  sw        $v0, 0x20($sp)
 /* EE16C0 80242D00 E7A00010 */  swc1      $f0, 0x10($sp)
 /* EE16C4 80242D04 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EE16C8 80242D08 0C01D444 */  jal       func_80075110
+/* EE16C8 80242D08 0C01D444 */  jal       dead_fx_emote
 /* EE16CC 80242D0C E7A40018 */   swc1     $f4, 0x18($sp)
 /* EE16D0 80242D10 8E4200CC */  lw        $v0, 0xcc($s2)
 /* EE16D4 80242D14 8C420000 */  lw        $v0, ($v0)
@@ -166,7 +166,7 @@ glabel func_80242AF0_EE14B0
 /* EE1700 80242D40 8E250038 */  lw        $a1, 0x38($s1)
 /* EE1704 80242D44 8E26003C */  lw        $a2, 0x3c($s1)
 /* EE1708 80242D48 8E270040 */  lw        $a3, 0x40($s1)
-/* EE170C 80242D4C 0C00BF2F */  jal       func_8002FCBC
+/* EE170C 80242D4C 0C00BF2F */  jal       dead_get_screen_coords
 /* EE1710 80242D50 0000202D */   daddu    $a0, $zero, $zero
 /* EE1714 80242D54 8EA20070 */  lw        $v0, 0x70($s5)
 /* EE1718 80242D58 28420064 */  slti      $v0, $v0, 0x64
@@ -314,7 +314,7 @@ glabel func_80242AF0_EE14B0
 /* EE190C 80242F4C 8E430094 */  lw        $v1, 0x94($s2)
 /* EE1910 80242F50 14620125 */  bne       $v1, $v0, .L802433E8
 /* EE1914 80242F54 00000000 */   nop
-/* EE1918 80242F58 0C010ABD */  jal       func_80042AF4
+/* EE1918 80242F58 0C010ABD */  jal       dead_get_enemy
 /* EE191C 80242F5C 8E440098 */   lw       $a0, 0x98($s2)
 /* EE1920 80242F60 0C00F92F */  jal       dead_get_npc_unsafe
 /* EE1924 80242F64 84440008 */   lh       $a0, 8($v0)
@@ -433,13 +433,13 @@ glabel func_80242AF0_EE14B0
 /* EE1AD8 80243118 46800020 */  cvt.s.w   $f0, $f0
 /* EE1ADC 8024311C E7A0001C */  swc1      $f0, 0x1c($sp)
 /* EE1AE0 80243120 8E240080 */  lw        $a0, 0x80($s1)
-/* EE1AE4 80243124 0C0394C1 */  jal       func_800E5304
+/* EE1AE4 80243124 0C0394C1 */  jal       dead_npc_test_move_simple_with_slipping
 /* EE1AE8 80243128 27A70060 */   addiu    $a3, $sp, 0x60
 /* EE1AEC 8024312C 54400005 */  bnel      $v0, $zero, .L80243144
 /* EE1AF0 80243130 AE200018 */   sw       $zero, 0x18($s1)
 /* EE1AF4 80243134 8E250018 */  lw        $a1, 0x18($s1)
 /* EE1AF8 80243138 8E26000C */  lw        $a2, 0xc($s1)
-/* EE1AFC 8024313C 0C00F909 */  jal       func_8003E424
+/* EE1AFC 8024313C 0C00F909 */  jal       dead_npc_move_heading
 /* EE1B00 80243140 0220202D */   daddu    $a0, $s1, $zero
 .L80243144:
 /* EE1B04 80243144 C620001C */  lwc1      $f0, 0x1c($s1)
@@ -475,7 +475,7 @@ glabel func_80242AF0_EE14B0
 /* EE1B7C 802431BC E7A00064 */  swc1      $f0, 0x64($sp)
 /* EE1B80 802431C0 AFA20010 */  sw        $v0, 0x10($sp)
 /* EE1B84 802431C4 8E240080 */  lw        $a0, 0x80($s1)
-/* EE1B88 802431C8 0C03908F */  jal       func_800E423C
+/* EE1B88 802431C8 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EE1B8C 802431CC 27A70060 */   addiu    $a3, $sp, 0x60
 /* EE1B90 802431D0 10400057 */  beqz      $v0, .L80243330
 /* EE1B94 802431D4 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80240B10_EE70C0.s b/ver/us/asm/nonmatchings/EE70C0/func_80240B10_EE70C0.s
index 9d0f4435b5..860a27833e 100644
--- a/ver/us/asm/nonmatchings/EE70C0/func_80240B10_EE70C0.s
+++ b/ver/us/asm/nonmatchings/EE70C0/func_80240B10_EE70C0.s
@@ -44,7 +44,7 @@ glabel func_80240B10_EE70C0
 /* EE715C 80240BAC 46800020 */  cvt.s.w   $f0, $f0
 /* EE7160 80240BB0 E7A00018 */  swc1      $f0, 0x18($sp)
 /* EE7164 80240BB4 8C640018 */  lw        $a0, 0x18($v1)
-/* EE7168 80240BB8 0C013431 */  jal       func_8004D0C4
+/* EE7168 80240BB8 0C013431 */  jal       dead_is_point_within_region
 /* EE716C 80240BBC 8E070038 */   lw       $a3, 0x38($s0)
 /* EE7170 80240BC0 1040000E */  beqz      $v0, .L80240BFC
 /* EE7174 80240BC4 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80240CC0_EE7270.s b/ver/us/asm/nonmatchings/EE70C0/func_80240CC0_EE7270.s
index f692604823..f933ea8ec2 100644
--- a/ver/us/asm/nonmatchings/EE70C0/func_80240CC0_EE7270.s
+++ b/ver/us/asm/nonmatchings/EE70C0/func_80240CC0_EE7270.s
@@ -82,7 +82,7 @@ glabel func_80240CC0_EE7270
 /* EE73A0 80240DF0 E7A60034 */  swc1      $f6, 0x34($sp)
 /* EE73A4 80240DF4 AFA20010 */  sw        $v0, 0x10($sp)
 /* EE73A8 80240DF8 8E040080 */  lw        $a0, 0x80($s0)
-/* EE73AC 80240DFC 0C03908F */  jal       func_800E423C
+/* EE73AC 80240DFC 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EE73B0 80240E00 27A70030 */   addiu    $a3, $sp, 0x30
 /* EE73B4 80240E04 C7A00034 */  lwc1      $f0, 0x34($sp)
 /* EE73B8 80240E08 4600D001 */  sub.s     $f0, $f26, $f0
@@ -126,7 +126,7 @@ glabel func_80240CC0_EE7270
 /* EE7448 80240E98 E7A40034 */  swc1      $f4, 0x34($sp)
 /* EE744C 80240E9C AFA20010 */  sw        $v0, 0x10($sp)
 /* EE7450 80240EA0 8E040080 */  lw        $a0, 0x80($s0)
-/* EE7454 80240EA4 0C03908F */  jal       func_800E423C
+/* EE7454 80240EA4 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EE7458 80240EA8 27A70030 */   addiu    $a3, $sp, 0x30
 /* EE745C 80240EAC C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* EE7460 80240EB0 461A2100 */  add.s     $f4, $f4, $f26
@@ -162,7 +162,7 @@ glabel func_80240CC0_EE7270
 /* EE74D0 80240F20 1840002E */  blez      $v0, .L80240FDC
 /* EE74D4 80240F24 00000000 */   nop
 /* EE74D8 80240F28 C62C0074 */  lwc1      $f12, 0x74($s1)
-/* EE74DC 80240F2C 0C00AD77 */  jal       func_8002B5DC
+/* EE74DC 80240F2C 0C00AD77 */  jal       dead_sin_deg
 /* EE74E0 80240F30 46806320 */   cvt.s.w  $f12, $f12
 /* EE74E4 80240F34 8E020000 */  lw        $v0, ($s0)
 /* EE74E8 80240F38 30420008 */  andi      $v0, $v0, 8
@@ -185,7 +185,7 @@ glabel func_80240CC0_EE7270
 /* EE7528 80240F78 E7A60034 */  swc1      $f6, 0x34($sp)
 /* EE752C 80240F7C AFA20010 */  sw        $v0, 0x10($sp)
 /* EE7530 80240F80 8E040080 */  lw        $a0, 0x80($s0)
-/* EE7534 80240F84 0C03908F */  jal       func_800E423C
+/* EE7534 80240F84 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EE7538 80240F88 27A70030 */   addiu    $a3, $sp, 0x30
 .L80240F8C:
 /* EE753C 80240F8C 10400007 */  beqz      $v0, .L80240FAC
@@ -266,13 +266,13 @@ glabel func_80240CC0_EE7270
 /* EE765C 802410AC AFA20020 */  sw        $v0, 0x20($sp)
 /* EE7660 802410B0 E7A00010 */  swc1      $f0, 0x10($sp)
 /* EE7664 802410B4 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EE7668 802410B8 0C01D444 */  jal       func_80075110
+/* EE7668 802410B8 0C01D444 */  jal       dead_fx_emote
 /* EE766C 802410BC E7A40018 */   swc1     $f4, 0x18($sp)
 /* EE7670 802410C0 0200202D */  daddu     $a0, $s0, $zero
 /* EE7674 802410C4 240502F4 */  addiu     $a1, $zero, 0x2f4
 /* EE7678 802410C8 C480003C */  lwc1      $f0, 0x3c($a0)
 /* EE767C 802410CC 3C060020 */  lui       $a2, 0x20
-/* EE7680 802410D0 0C013600 */  jal       func_8004D800
+/* EE7680 802410D0 0C013600 */  jal       dead_ai_enemy_play_sound
 /* EE7684 802410D4 E4800064 */   swc1     $f0, 0x64($a0)
 /* EE7688 802410D8 8E220018 */  lw        $v0, 0x18($s1)
 /* EE768C 802410DC 9442002A */  lhu       $v0, 0x2a($v0)
@@ -311,7 +311,7 @@ glabel func_80240CC0_EE7270
 /* EE76FC 8024114C 46800020 */  cvt.s.w   $f0, $f0
 /* EE7700 80241150 E7A00018 */  swc1      $f0, 0x18($sp)
 /* EE7704 80241154 8C640018 */  lw        $a0, 0x18($v1)
-/* EE7708 80241158 0C013431 */  jal       func_8004D0C4
+/* EE7708 80241158 0C013431 */  jal       dead_is_point_within_region
 /* EE770C 8024115C 8E070038 */   lw       $a3, 0x38($s0)
 /* EE7710 80241160 1040001A */  beqz      $v0, .L802411CC
 /* EE7714 80241164 00000000 */   nop
@@ -321,7 +321,7 @@ glabel func_80240CC0_EE7270
 /* EE7724 80241174 C44C0000 */  lwc1      $f12, ($v0)
 /* EE7728 80241178 46806320 */  cvt.s.w   $f12, $f12
 /* EE772C 8024117C C44E0008 */  lwc1      $f14, 8($v0)
-/* EE7730 80241180 0C00AC71 */  jal       func_8002B1C4
+/* EE7730 80241180 0C00AC71 */  jal       dead_dist2D
 /* EE7734 80241184 468073A0 */   cvt.s.w  $f14, $f14
 /* EE7738 80241188 C6020018 */  lwc1      $f2, 0x18($s0)
 /* EE773C 8024118C 4600103C */  c.lt.s    $f2, $f0
@@ -353,7 +353,7 @@ glabel func_80240CC0_EE7270
 /* EE77A0 802411F0 00000000 */   nop
 /* EE77A4 802411F4 8E050018 */  lw        $a1, 0x18($s0)
 /* EE77A8 802411F8 8E06000C */  lw        $a2, 0xc($s0)
-/* EE77AC 802411FC 0C00F909 */  jal       func_8003E424
+/* EE77AC 802411FC 0C00F909 */  jal       dead_npc_move_heading
 /* EE77B0 80241200 0200202D */   daddu    $a0, $s0, $zero
 .L80241204:
 /* EE77B4 80241204 C600003C */  lwc1      $f0, 0x3c($s0)
diff --git a/ver/us/asm/nonmatchings/EE70C0/func_802413A8_EE7958.s b/ver/us/asm/nonmatchings/EE70C0/func_802413A8_EE7958.s
index 1869fbe1b2..3eb214a182 100644
--- a/ver/us/asm/nonmatchings/EE70C0/func_802413A8_EE7958.s
+++ b/ver/us/asm/nonmatchings/EE70C0/func_802413A8_EE7958.s
@@ -50,7 +50,7 @@ glabel func_802413A8_EE7958
 /* EE7A08 80241458 46800020 */  cvt.s.w   $f0, $f0
 /* EE7A0C 8024145C 46000021 */  cvt.d.s   $f0, $f0
 /* EE7A10 80241460 46220003 */  div.d     $f0, $f0, $f2
-/* EE7A14 80241464 0C00AD77 */  jal       func_8002B5DC
+/* EE7A14 80241464 0C00AD77 */  jal       dead_sin_deg
 /* EE7A18 80241468 462005A0 */   cvt.s.d  $f22, $f0
 /* EE7A1C 8024146C 8E020000 */  lw        $v0, ($s0)
 /* EE7A20 80241470 30420008 */  andi      $v0, $v0, 8
@@ -73,7 +73,7 @@ glabel func_802413A8_EE7958
 /* EE7A60 802414B0 E7A60034 */  swc1      $f6, 0x34($sp)
 /* EE7A64 802414B4 AFA20010 */  sw        $v0, 0x10($sp)
 /* EE7A68 802414B8 8E040080 */  lw        $a0, 0x80($s0)
-/* EE7A6C 802414BC 0C03908F */  jal       func_800E423C
+/* EE7A6C 802414BC 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EE7A70 802414C0 27A70030 */   addiu    $a3, $sp, 0x30
 .L802414C4:
 /* EE7A74 802414C4 10400007 */  beqz      $v0, .L802414E4
@@ -148,13 +148,13 @@ glabel func_802413A8_EE7958
 /* EE7B7C 802415CC AFA20020 */  sw        $v0, 0x20($sp)
 /* EE7B80 802415D0 E7A00010 */  swc1      $f0, 0x10($sp)
 /* EE7B84 802415D4 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EE7B88 802415D8 0C01D444 */  jal       func_80075110
+/* EE7B88 802415D8 0C01D444 */  jal       dead_fx_emote
 /* EE7B8C 802415DC E7A40018 */   swc1     $f4, 0x18($sp)
 /* EE7B90 802415E0 0200202D */  daddu     $a0, $s0, $zero
 /* EE7B94 802415E4 240502F4 */  addiu     $a1, $zero, 0x2f4
 /* EE7B98 802415E8 C480003C */  lwc1      $f0, 0x3c($a0)
 /* EE7B9C 802415EC 3C060020 */  lui       $a2, 0x20
-/* EE7BA0 802415F0 0C013600 */  jal       func_8004D800
+/* EE7BA0 802415F0 0C013600 */  jal       dead_ai_enemy_play_sound
 /* EE7BA4 802415F4 E4800064 */   swc1     $f0, 0x64($a0)
 /* EE7BA8 802415F8 8E220018 */  lw        $v0, 0x18($s1)
 /* EE7BAC 802415FC 9442002A */  lhu       $v0, 0x2a($v0)
diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80241968_EE7F18.s b/ver/us/asm/nonmatchings/EE70C0/func_80241968_EE7F18.s
index bef887e8ef..43fa4538d9 100644
--- a/ver/us/asm/nonmatchings/EE70C0/func_80241968_EE7F18.s
+++ b/ver/us/asm/nonmatchings/EE70C0/func_80241968_EE7F18.s
@@ -35,7 +35,7 @@ glabel func_80241968_EE7F18
 /* EE7F90 802419E0 46240003 */  div.d     $f0, $f0, $f4
 /* EE7F94 802419E4 46200520 */  cvt.s.d   $f20, $f0
 /* EE7F98 802419E8 46241083 */  div.d     $f2, $f2, $f4
-/* EE7F9C 802419EC 0C00F909 */  jal       func_8003E424
+/* EE7F9C 802419EC 0C00F909 */  jal       dead_npc_move_heading
 /* EE7FA0 802419F0 462015A0 */   cvt.s.d  $f22, $f2
 /* EE7FA4 802419F4 C604001C */  lwc1      $f4, 0x1c($s0)
 /* EE7FA8 802419F8 44801000 */  mtc1      $zero, $f2
@@ -70,7 +70,7 @@ glabel func_80241968_EE7F18
 /* EE801C 80241A6C E7A60024 */  swc1      $f6, 0x24($sp)
 /* EE8020 80241A70 AFA20010 */  sw        $v0, 0x10($sp)
 /* EE8024 80241A74 8E040080 */  lw        $a0, 0x80($s0)
-/* EE8028 80241A78 0C03908F */  jal       func_800E423C
+/* EE8028 80241A78 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EE802C 80241A7C 27A70020 */   addiu    $a3, $sp, 0x20
 .L80241A80:
 /* EE8030 80241A80 1040000B */  beqz      $v0, .L80241AB0
@@ -118,7 +118,7 @@ glabel func_80241968_EE7F18
 /* EE80D0 80241B20 8C470030 */   lw       $a3, 0x30($v0)
 /* EE80D4 80241B24 46000506 */  mov.s     $f20, $f0
 /* EE80D8 80241B28 C60C000C */  lwc1      $f12, 0xc($s0)
-/* EE80DC 80241B2C 0C00ABC6 */  jal       func_8002AF18
+/* EE80DC 80241B2C 0C00ABC6 */  jal       dead_get_clamped_angle_diff
 /* EE80E0 80241B30 4600A386 */   mov.s    $f14, $f20
 /* EE80E4 80241B34 46000086 */  mov.s     $f2, $f0
 /* EE80E8 80241B38 8E62001C */  lw        $v0, 0x1c($s3)
@@ -187,7 +187,7 @@ glabel func_80241968_EE7F18
 /* EE81D4 80241C24 E7A00024 */  swc1      $f0, 0x24($sp)
 /* EE81D8 80241C28 AFA20010 */  sw        $v0, 0x10($sp)
 /* EE81DC 80241C2C 8E040080 */  lw        $a0, 0x80($s0)
-/* EE81E0 80241C30 0C03908F */  jal       func_800E423C
+/* EE81E0 80241C30 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EE81E4 80241C34 27A70020 */   addiu    $a3, $sp, 0x20
 /* EE81E8 80241C38 10400015 */  beqz      $v0, .L80241C90
 /* EE81EC 80241C3C 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80241CF8_EE82A8.s b/ver/us/asm/nonmatchings/EE70C0/func_80241CF8_EE82A8.s
index 1822223023..5bd49446ed 100644
--- a/ver/us/asm/nonmatchings/EE70C0/func_80241CF8_EE82A8.s
+++ b/ver/us/asm/nonmatchings/EE70C0/func_80241CF8_EE82A8.s
@@ -41,7 +41,7 @@ glabel func_80241CF8_EE82A8
 /* EE8330 80241D80 E7A60024 */  swc1      $f6, 0x24($sp)
 /* EE8334 80241D84 AFA20010 */  sw        $v0, 0x10($sp)
 /* EE8338 80241D88 8C840080 */  lw        $a0, 0x80($a0)
-/* EE833C 80241D8C 0C03908F */  jal       func_800E423C
+/* EE833C 80241D8C 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EE8340 80241D90 27A70020 */   addiu    $a3, $sp, 0x20
 /* EE8344 80241D94 C7A20024 */  lwc1      $f2, 0x24($sp)
 /* EE8348 80241D98 3C014059 */  lui       $at, 0x4059
diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80242090_EE8640.s b/ver/us/asm/nonmatchings/EE70C0/func_80242090_EE8640.s
index 7a8bcfb78d..66b22b9bb3 100644
--- a/ver/us/asm/nonmatchings/EE70C0/func_80242090_EE8640.s
+++ b/ver/us/asm/nonmatchings/EE70C0/func_80242090_EE8640.s
@@ -38,8 +38,8 @@ glabel func_80242090_EE8640
 /* EE86C4 80242114 4482C000 */  mtc1      $v0, $f24
 /* EE86C8 80242118 00000000 */  nop
 /* EE86CC 8024211C 4680C620 */  cvt.s.w   $f24, $f24
-/* EE86D0 80242120 3C128011 */  lui       $s2, %hi(D_80117578)
-/* EE86D4 80242124 26527578 */  addiu     $s2, $s2, %lo(D_80117578)
+/* EE86D0 80242120 3C128011 */  lui       $s2, %hi(dead_gPlayerStatus)
+/* EE86D4 80242124 26527578 */  addiu     $s2, $s2, %lo(dead_gPlayerStatus)
 /* EE86D8 80242128 3C038008 */  lui       $v1, %hi(D_8007C760)
 /* EE86DC 8024212C 8C63C760 */  lw        $v1, %lo(D_8007C760)($v1)
 /* EE86E0 80242130 C64200A8 */  lwc1      $f2, 0xa8($s2)
@@ -72,7 +72,7 @@ glabel func_80242090_EE8640
 /* EE8744 80242194 46000586 */  mov.s     $f22, $f0
 /* EE8748 80242198 3C014170 */  lui       $at, 0x4170
 /* EE874C 8024219C 4481A000 */  mtc1      $at, $f20
-/* EE8750 802421A0 0C00AD77 */  jal       func_8002B5DC
+/* EE8750 802421A0 0C00AD77 */  jal       dead_sin_deg
 /* EE8754 802421A4 4600B306 */   mov.s    $f12, $f22
 /* EE8758 802421A8 46140002 */  mul.s     $f0, $f0, $f20
 /* EE875C 802421AC 00000000 */  nop
@@ -86,7 +86,7 @@ glabel func_80242090_EE8640
 /* EE877C 802421CC 00000000 */  nop
 /* EE8780 802421D0 4600E700 */  add.s     $f28, $f28, $f0
 /* EE8784 802421D4 4602D680 */  add.s     $f26, $f26, $f2
-/* EE8788 802421D8 0C00AD90 */  jal       func_8002B640
+/* EE8788 802421D8 0C00AD90 */  jal       dead_cos_deg
 /* EE878C 802421DC 4600B306 */   mov.s    $f12, $f22
 /* EE8790 802421E0 46140002 */  mul.s     $f0, $f0, $f20
 /* EE8794 802421E4 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/EED140/func_80240040_EED140.s b/ver/us/asm/nonmatchings/EED140/func_80240040_EED140.s
deleted file mode 100644
index 94b93662d3..0000000000
--- a/ver/us/asm/nonmatchings/EED140/func_80240040_EED140.s
+++ /dev/null
@@ -1,45 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240040_EED140
-/* EED140 80240040 8C820084 */  lw        $v0, 0x84($a0)
-/* EED144 80240044 8C830090 */  lw        $v1, 0x90($a0)
-/* EED148 80240048 00431023 */  subu      $v0, $v0, $v1
-/* EED14C 8024004C 44821000 */  mtc1      $v0, $f2
-/* EED150 80240050 00000000 */  nop
-/* EED154 80240054 468010A0 */  cvt.s.w   $f2, $f2
-/* EED158 80240058 8C820088 */  lw        $v0, 0x88($a0)
-/* EED15C 8024005C 8C830094 */  lw        $v1, 0x94($a0)
-/* EED160 80240060 46021082 */  mul.s     $f2, $f2, $f2
-/* EED164 80240064 00000000 */  nop
-/* EED168 80240068 00431023 */  subu      $v0, $v0, $v1
-/* EED16C 8024006C 44822000 */  mtc1      $v0, $f4
-/* EED170 80240070 00000000 */  nop
-/* EED174 80240074 46802120 */  cvt.s.w   $f4, $f4
-/* EED178 80240078 8C82008C */  lw        $v0, 0x8c($a0)
-/* EED17C 8024007C 46042102 */  mul.s     $f4, $f4, $f4
-/* EED180 80240080 00000000 */  nop
-/* EED184 80240084 8C830098 */  lw        $v1, 0x98($a0)
-/* EED188 80240088 00431023 */  subu      $v0, $v0, $v1
-/* EED18C 8024008C 44820000 */  mtc1      $v0, $f0
-/* EED190 80240090 00000000 */  nop
-/* EED194 80240094 46800020 */  cvt.s.w   $f0, $f0
-/* EED198 80240098 46000002 */  mul.s     $f0, $f0, $f0
-/* EED19C 8024009C 00000000 */  nop
-/* EED1A0 802400A0 46041080 */  add.s     $f2, $f2, $f4
-/* EED1A4 802400A4 46001080 */  add.s     $f2, $f2, $f0
-/* EED1A8 802400A8 3C014561 */  lui       $at, 0x4561
-/* EED1AC 802400AC 44810000 */  mtc1      $at, $f0
-/* EED1B0 802400B0 00000000 */  nop
-/* EED1B4 802400B4 4600103C */  c.lt.s    $f2, $f0
-/* EED1B8 802400B8 00000000 */  nop
-/* EED1BC 802400BC 45010002 */  bc1t      .L802400C8
-/* EED1C0 802400C0 24020001 */   addiu    $v0, $zero, 1
-/* EED1C4 802400C4 0000102D */  daddu     $v0, $zero, $zero
-.L802400C8:
-/* EED1C8 802400C8 AC820084 */  sw        $v0, 0x84($a0)
-/* EED1CC 802400CC 03E00008 */  jr        $ra
-/* EED1D0 802400D0 24020002 */   addiu    $v0, $zero, 2
-/* EED1D4 802400D4 00000000 */  nop
-/* EED1D8 802400D8 00000000 */  nop
-/* EED1DC 802400DC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/EED1E0/func_80240E18_EEDF18.s b/ver/us/asm/nonmatchings/EED1E0/func_80240E18_EEDF18.s
index 3edf667860..2583d4ab5d 100644
--- a/ver/us/asm/nonmatchings/EED1E0/func_80240E18_EEDF18.s
+++ b/ver/us/asm/nonmatchings/EED1E0/func_80240E18_EEDF18.s
@@ -3,8 +3,8 @@
 
 glabel func_80240E18_EEDF18
 /* EEDF18 80240E18 AC800084 */  sw        $zero, 0x84($a0)
-/* EEDF1C 80240E1C 3C038011 */  lui       $v1, %hi(D_8011762C)
-/* EEDF20 80240E20 8063762C */  lb        $v1, %lo(D_8011762C)($v1)
+/* EEDF1C 80240E1C 3C038011 */  lui       $v1, %hi(dead_gPlayerActionState)
+/* EEDF20 80240E20 8063762C */  lb        $v1, %lo(dead_gPlayerActionState)($v1)
 /* EEDF24 80240E24 2402000E */  addiu     $v0, $zero, 0xe
 /* EEDF28 80240E28 10620004 */  beq       $v1, $v0, .L80240E3C
 /* EEDF2C 80240E2C 24020001 */   addiu    $v0, $zero, 1
diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80240E50_EEDF50.s b/ver/us/asm/nonmatchings/EEDF50/func_80240E50_EEDF50.s
index b731bb576b..059baab793 100644
--- a/ver/us/asm/nonmatchings/EEDF50/func_80240E50_EEDF50.s
+++ b/ver/us/asm/nonmatchings/EEDF50/func_80240E50_EEDF50.s
@@ -51,7 +51,7 @@ glabel func_80240E50_EEDF50
 /* EEDFEC 80240EEC 46800020 */  cvt.s.w   $f0, $f0
 /* EEDFF0 80240EF0 E7A00018 */  swc1      $f0, 0x18($sp)
 /* EEDFF4 80240EF4 8C640018 */  lw        $a0, 0x18($v1)
-/* EEDFF8 80240EF8 0C013431 */  jal       func_8004D0C4
+/* EEDFF8 80240EF8 0C013431 */  jal       dead_is_point_within_region
 /* EEDFFC 80240EFC 8E070038 */   lw       $a3, 0x38($s0)
 /* EEE000 80240F00 1040000E */  beqz      $v0, .L80240F3C
 /* EEE004 80240F04 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80241000_EEE100.s b/ver/us/asm/nonmatchings/EEDF50/func_80241000_EEE100.s
index ca78399084..32a63e889f 100644
--- a/ver/us/asm/nonmatchings/EEDF50/func_80241000_EEE100.s
+++ b/ver/us/asm/nonmatchings/EEDF50/func_80241000_EEE100.s
@@ -92,7 +92,7 @@ glabel func_80241000_EEE100
 /* EEE230 80241130 E7A60034 */  swc1      $f6, 0x34($sp)
 /* EEE234 80241134 AFA20010 */  sw        $v0, 0x10($sp)
 /* EEE238 80241138 8E040080 */  lw        $a0, 0x80($s0)
-/* EEE23C 8024113C 0C03908F */  jal       func_800E423C
+/* EEE23C 8024113C 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EEE240 80241140 27A70030 */   addiu    $a3, $sp, 0x30
 /* EEE244 80241144 C7A00034 */  lwc1      $f0, 0x34($sp)
 /* EEE248 80241148 4600D001 */  sub.s     $f0, $f26, $f0
@@ -136,7 +136,7 @@ glabel func_80241000_EEE100
 /* EEE2D8 802411D8 E7A40034 */  swc1      $f4, 0x34($sp)
 /* EEE2DC 802411DC AFA20010 */  sw        $v0, 0x10($sp)
 /* EEE2E0 802411E0 8E040080 */  lw        $a0, 0x80($s0)
-/* EEE2E4 802411E4 0C03908F */  jal       func_800E423C
+/* EEE2E4 802411E4 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EEE2E8 802411E8 27A70030 */   addiu    $a3, $sp, 0x30
 /* EEE2EC 802411EC C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* EEE2F0 802411F0 461A2100 */  add.s     $f4, $f4, $f26
@@ -172,7 +172,7 @@ glabel func_80241000_EEE100
 /* EEE360 80241260 1840002E */  blez      $v0, .L8024131C
 /* EEE364 80241264 00000000 */   nop
 /* EEE368 80241268 C62C0074 */  lwc1      $f12, 0x74($s1)
-/* EEE36C 8024126C 0C00AD77 */  jal       func_8002B5DC
+/* EEE36C 8024126C 0C00AD77 */  jal       dead_sin_deg
 /* EEE370 80241270 46806320 */   cvt.s.w  $f12, $f12
 /* EEE374 80241274 8E020000 */  lw        $v0, ($s0)
 /* EEE378 80241278 30420008 */  andi      $v0, $v0, 8
@@ -195,7 +195,7 @@ glabel func_80241000_EEE100
 /* EEE3B8 802412B8 E7A60034 */  swc1      $f6, 0x34($sp)
 /* EEE3BC 802412BC AFA20010 */  sw        $v0, 0x10($sp)
 /* EEE3C0 802412C0 8E040080 */  lw        $a0, 0x80($s0)
-/* EEE3C4 802412C4 0C03908F */  jal       func_800E423C
+/* EEE3C4 802412C4 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EEE3C8 802412C8 27A70030 */   addiu    $a3, $sp, 0x30
 .L802412CC:
 /* EEE3CC 802412CC 10400007 */  beqz      $v0, .L802412EC
@@ -276,13 +276,13 @@ glabel func_80241000_EEE100
 /* EEE4EC 802413EC AFA20020 */  sw        $v0, 0x20($sp)
 /* EEE4F0 802413F0 E7A00010 */  swc1      $f0, 0x10($sp)
 /* EEE4F4 802413F4 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EEE4F8 802413F8 0C01D444 */  jal       func_80075110
+/* EEE4F8 802413F8 0C01D444 */  jal       dead_fx_emote
 /* EEE4FC 802413FC E7A40018 */   swc1     $f4, 0x18($sp)
 /* EEE500 80241400 0200202D */  daddu     $a0, $s0, $zero
 /* EEE504 80241404 240502F4 */  addiu     $a1, $zero, 0x2f4
 /* EEE508 80241408 C480003C */  lwc1      $f0, 0x3c($a0)
 /* EEE50C 8024140C 3C060020 */  lui       $a2, 0x20
-/* EEE510 80241410 0C013600 */  jal       func_8004D800
+/* EEE510 80241410 0C013600 */  jal       dead_ai_enemy_play_sound
 /* EEE514 80241414 E4800064 */   swc1     $f0, 0x64($a0)
 /* EEE518 80241418 8E220018 */  lw        $v0, 0x18($s1)
 /* EEE51C 8024141C 9442002A */  lhu       $v0, 0x2a($v0)
@@ -321,7 +321,7 @@ glabel func_80241000_EEE100
 /* EEE58C 8024148C 46800020 */  cvt.s.w   $f0, $f0
 /* EEE590 80241490 E7A00018 */  swc1      $f0, 0x18($sp)
 /* EEE594 80241494 8C640018 */  lw        $a0, 0x18($v1)
-/* EEE598 80241498 0C013431 */  jal       func_8004D0C4
+/* EEE598 80241498 0C013431 */  jal       dead_is_point_within_region
 /* EEE59C 8024149C 8E070038 */   lw       $a3, 0x38($s0)
 /* EEE5A0 802414A0 1040001A */  beqz      $v0, .L8024150C
 /* EEE5A4 802414A4 00000000 */   nop
@@ -331,7 +331,7 @@ glabel func_80241000_EEE100
 /* EEE5B4 802414B4 C44C0000 */  lwc1      $f12, ($v0)
 /* EEE5B8 802414B8 46806320 */  cvt.s.w   $f12, $f12
 /* EEE5BC 802414BC C44E0008 */  lwc1      $f14, 8($v0)
-/* EEE5C0 802414C0 0C00AC71 */  jal       func_8002B1C4
+/* EEE5C0 802414C0 0C00AC71 */  jal       dead_dist2D
 /* EEE5C4 802414C4 468073A0 */   cvt.s.w  $f14, $f14
 /* EEE5C8 802414C8 C6020018 */  lwc1      $f2, 0x18($s0)
 /* EEE5CC 802414CC 4600103C */  c.lt.s    $f2, $f0
@@ -363,7 +363,7 @@ glabel func_80241000_EEE100
 /* EEE630 80241530 00000000 */   nop
 /* EEE634 80241534 8E050018 */  lw        $a1, 0x18($s0)
 /* EEE638 80241538 8E06000C */  lw        $a2, 0xc($s0)
-/* EEE63C 8024153C 0C00F909 */  jal       func_8003E424
+/* EEE63C 8024153C 0C00F909 */  jal       dead_npc_move_heading
 /* EEE640 80241540 0200202D */   daddu    $a0, $s0, $zero
 .L80241544:
 /* EEE644 80241544 C600003C */  lwc1      $f0, 0x3c($s0)
diff --git a/ver/us/asm/nonmatchings/EEDF50/func_802416E8_EEE7E8.s b/ver/us/asm/nonmatchings/EEDF50/func_802416E8_EEE7E8.s
index 7863201c4c..81f18b2042 100644
--- a/ver/us/asm/nonmatchings/EEDF50/func_802416E8_EEE7E8.s
+++ b/ver/us/asm/nonmatchings/EEDF50/func_802416E8_EEE7E8.s
@@ -50,7 +50,7 @@ glabel func_802416E8_EEE7E8
 /* EEE898 80241798 46800020 */  cvt.s.w   $f0, $f0
 /* EEE89C 8024179C 46000021 */  cvt.d.s   $f0, $f0
 /* EEE8A0 802417A0 46220003 */  div.d     $f0, $f0, $f2
-/* EEE8A4 802417A4 0C00AD77 */  jal       func_8002B5DC
+/* EEE8A4 802417A4 0C00AD77 */  jal       dead_sin_deg
 /* EEE8A8 802417A8 462005A0 */   cvt.s.d  $f22, $f0
 /* EEE8AC 802417AC 8E020000 */  lw        $v0, ($s0)
 /* EEE8B0 802417B0 30420008 */  andi      $v0, $v0, 8
@@ -73,7 +73,7 @@ glabel func_802416E8_EEE7E8
 /* EEE8F0 802417F0 E7A60034 */  swc1      $f6, 0x34($sp)
 /* EEE8F4 802417F4 AFA20010 */  sw        $v0, 0x10($sp)
 /* EEE8F8 802417F8 8E040080 */  lw        $a0, 0x80($s0)
-/* EEE8FC 802417FC 0C03908F */  jal       func_800E423C
+/* EEE8FC 802417FC 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EEE900 80241800 27A70030 */   addiu    $a3, $sp, 0x30
 .L80241804:
 /* EEE904 80241804 10400007 */  beqz      $v0, .L80241824
@@ -148,13 +148,13 @@ glabel func_802416E8_EEE7E8
 /* EEEA0C 8024190C AFA20020 */  sw        $v0, 0x20($sp)
 /* EEEA10 80241910 E7A00010 */  swc1      $f0, 0x10($sp)
 /* EEEA14 80241914 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EEEA18 80241918 0C01D444 */  jal       func_80075110
+/* EEEA18 80241918 0C01D444 */  jal       dead_fx_emote
 /* EEEA1C 8024191C E7A40018 */   swc1     $f4, 0x18($sp)
 /* EEEA20 80241920 0200202D */  daddu     $a0, $s0, $zero
 /* EEEA24 80241924 240502F4 */  addiu     $a1, $zero, 0x2f4
 /* EEEA28 80241928 C480003C */  lwc1      $f0, 0x3c($a0)
 /* EEEA2C 8024192C 3C060020 */  lui       $a2, 0x20
-/* EEEA30 80241930 0C013600 */  jal       func_8004D800
+/* EEEA30 80241930 0C013600 */  jal       dead_ai_enemy_play_sound
 /* EEEA34 80241934 E4800064 */   swc1     $f0, 0x64($a0)
 /* EEEA38 80241938 8E220018 */  lw        $v0, 0x18($s1)
 /* EEEA3C 8024193C 9442002A */  lhu       $v0, 0x2a($v0)
diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80241CA8_EEEDA8.s b/ver/us/asm/nonmatchings/EEDF50/func_80241CA8_EEEDA8.s
index 991d84a862..901e5bb841 100644
--- a/ver/us/asm/nonmatchings/EEDF50/func_80241CA8_EEEDA8.s
+++ b/ver/us/asm/nonmatchings/EEDF50/func_80241CA8_EEEDA8.s
@@ -35,7 +35,7 @@ glabel func_80241CA8_EEEDA8
 /* EEEE20 80241D20 46240003 */  div.d     $f0, $f0, $f4
 /* EEEE24 80241D24 46200520 */  cvt.s.d   $f20, $f0
 /* EEEE28 80241D28 46241083 */  div.d     $f2, $f2, $f4
-/* EEEE2C 80241D2C 0C00F909 */  jal       func_8003E424
+/* EEEE2C 80241D2C 0C00F909 */  jal       dead_npc_move_heading
 /* EEEE30 80241D30 462015A0 */   cvt.s.d  $f22, $f2
 /* EEEE34 80241D34 C604001C */  lwc1      $f4, 0x1c($s0)
 /* EEEE38 80241D38 44801000 */  mtc1      $zero, $f2
@@ -70,7 +70,7 @@ glabel func_80241CA8_EEEDA8
 /* EEEEAC 80241DAC E7A60024 */  swc1      $f6, 0x24($sp)
 /* EEEEB0 80241DB0 AFA20010 */  sw        $v0, 0x10($sp)
 /* EEEEB4 80241DB4 8E040080 */  lw        $a0, 0x80($s0)
-/* EEEEB8 80241DB8 0C03908F */  jal       func_800E423C
+/* EEEEB8 80241DB8 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EEEEBC 80241DBC 27A70020 */   addiu    $a3, $sp, 0x20
 .L80241DC0:
 /* EEEEC0 80241DC0 1040000B */  beqz      $v0, .L80241DF0
@@ -118,7 +118,7 @@ glabel func_80241CA8_EEEDA8
 /* EEEF60 80241E60 8C470030 */   lw       $a3, 0x30($v0)
 /* EEEF64 80241E64 46000506 */  mov.s     $f20, $f0
 /* EEEF68 80241E68 C60C000C */  lwc1      $f12, 0xc($s0)
-/* EEEF6C 80241E6C 0C00ABC6 */  jal       func_8002AF18
+/* EEEF6C 80241E6C 0C00ABC6 */  jal       dead_get_clamped_angle_diff
 /* EEEF70 80241E70 4600A386 */   mov.s    $f14, $f20
 /* EEEF74 80241E74 46000086 */  mov.s     $f2, $f0
 /* EEEF78 80241E78 8E62001C */  lw        $v0, 0x1c($s3)
@@ -187,7 +187,7 @@ glabel func_80241CA8_EEEDA8
 /* EEF064 80241F64 E7A00024 */  swc1      $f0, 0x24($sp)
 /* EEF068 80241F68 AFA20010 */  sw        $v0, 0x10($sp)
 /* EEF06C 80241F6C 8E040080 */  lw        $a0, 0x80($s0)
-/* EEF070 80241F70 0C03908F */  jal       func_800E423C
+/* EEF070 80241F70 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EEF074 80241F74 27A70020 */   addiu    $a3, $sp, 0x20
 /* EEF078 80241F78 10400015 */  beqz      $v0, .L80241FD0
 /* EEF07C 80241F7C 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80242038_EEF138.s b/ver/us/asm/nonmatchings/EEDF50/func_80242038_EEF138.s
index 6774eb05b8..95773b9f3a 100644
--- a/ver/us/asm/nonmatchings/EEDF50/func_80242038_EEF138.s
+++ b/ver/us/asm/nonmatchings/EEDF50/func_80242038_EEF138.s
@@ -41,7 +41,7 @@ glabel func_80242038_EEF138
 /* EEF1C0 802420C0 E7A60024 */  swc1      $f6, 0x24($sp)
 /* EEF1C4 802420C4 AFA20010 */  sw        $v0, 0x10($sp)
 /* EEF1C8 802420C8 8C840080 */  lw        $a0, 0x80($a0)
-/* EEF1CC 802420CC 0C03908F */  jal       func_800E423C
+/* EEF1CC 802420CC 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EEF1D0 802420D0 27A70020 */   addiu    $a3, $sp, 0x20
 /* EEF1D4 802420D4 C7A20024 */  lwc1      $f2, 0x24($sp)
 /* EEF1D8 802420D8 3C014059 */  lui       $at, 0x4059
diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80242374_EEF474.s b/ver/us/asm/nonmatchings/EEDF50/func_80242374_EEF474.s
index 395e4e8637..6ed8763409 100644
--- a/ver/us/asm/nonmatchings/EEDF50/func_80242374_EEF474.s
+++ b/ver/us/asm/nonmatchings/EEDF50/func_80242374_EEF474.s
@@ -41,7 +41,7 @@ glabel func_80242374_EEF474
 /* EEF504 80242404 8C470030 */   lw       $a3, 0x30($v0)
 /* EEF508 80242408 46000506 */  mov.s     $f20, $f0
 /* EEF50C 8024240C C64C000C */  lwc1      $f12, 0xc($s2)
-/* EEF510 80242410 0C00ABC6 */  jal       func_8002AF18
+/* EEF510 80242410 0C00ABC6 */  jal       dead_get_clamped_angle_diff
 /* EEF514 80242414 4600A386 */   mov.s    $f14, $f20
 /* EEF518 80242418 46000086 */  mov.s     $f2, $f0
 /* EEF51C 8024241C 8E02001C */  lw        $v0, 0x1c($s0)
diff --git a/ver/us/asm/nonmatchings/EEDF50/func_802424A4_EEF5A4.s b/ver/us/asm/nonmatchings/EEDF50/func_802424A4_EEF5A4.s
index b71d25442a..7534d88c09 100644
--- a/ver/us/asm/nonmatchings/EEDF50/func_802424A4_EEF5A4.s
+++ b/ver/us/asm/nonmatchings/EEDF50/func_802424A4_EEF5A4.s
@@ -50,7 +50,7 @@ glabel func_802424A4_EEF5A4
 /* EEF63C 8024253C AFA20020 */  sw        $v0, 0x20($sp)
 /* EEF640 80242540 E7A00010 */  swc1      $f0, 0x10($sp)
 /* EEF644 80242544 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EEF648 80242548 0C01D444 */  jal       func_80075110
+/* EEF648 80242548 0C01D444 */  jal       dead_fx_emote
 /* EEF64C 8024254C E7A40018 */   swc1     $f4, 0x18($sp)
 /* EEF650 80242550 8E4200CC */  lw        $v0, 0xcc($s2)
 /* EEF654 80242554 8C430000 */  lw        $v1, ($v0)
@@ -65,7 +65,7 @@ glabel func_802424A4_EEF5A4
 .L80242578:
 /* EEF678 80242578 8E050018 */  lw        $a1, 0x18($s0)
 /* EEF67C 8024257C 8E06000C */  lw        $a2, 0xc($s0)
-/* EEF680 80242580 0C00F909 */  jal       func_8003E424
+/* EEF680 80242580 0C00F909 */  jal       dead_npc_move_heading
 /* EEF684 80242584 0200202D */   daddu    $a0, $s0, $zero
 /* EEF688 80242588 8E020000 */  lw        $v0, ($s0)
 /* EEF68C 8024258C 30420008 */  andi      $v0, $v0, 8
@@ -97,7 +97,7 @@ glabel func_802424A4_EEF5A4
 /* EEF6F4 802425F4 E7A00038 */  swc1      $f0, 0x38($sp)
 /* EEF6F8 802425F8 AFA20010 */  sw        $v0, 0x10($sp)
 /* EEF6FC 802425FC 8E040080 */  lw        $a0, 0x80($s0)
-/* EEF700 80242600 0C03908F */  jal       func_800E423C
+/* EEF700 80242600 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EEF704 80242604 27A70034 */   addiu    $a3, $sp, 0x34
 /* EEF708 80242608 1040000A */  beqz      $v0, .L80242634
 /* EEF70C 8024260C 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/EEFAA0/func_802429A0_EEFAA0.s b/ver/us/asm/nonmatchings/EEFAA0/func_802429A0_EEFAA0.s
deleted file mode 100644
index acb623cdaf..0000000000
--- a/ver/us/asm/nonmatchings/EEFAA0/func_802429A0_EEFAA0.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802429A0_EEFAA0
-/* EEFAA0 802429A0 AC800084 */  sw        $zero, 0x84($a0)
-/* EEFAA4 802429A4 3C038011 */  lui       $v1, %hi(D_8011762C)
-/* EEFAA8 802429A8 8063762C */  lb        $v1, %lo(D_8011762C)($v1)
-/* EEFAAC 802429AC 2402000E */  addiu     $v0, $zero, 0xe
-/* EEFAB0 802429B0 10620004 */  beq       $v1, $v0, .L802429C4
-/* EEFAB4 802429B4 24020001 */   addiu    $v0, $zero, 1
-/* EEFAB8 802429B8 24020010 */  addiu     $v0, $zero, 0x10
-/* EEFABC 802429BC 14620002 */  bne       $v1, $v0, .L802429C8
-/* EEFAC0 802429C0 24020001 */   addiu    $v0, $zero, 1
-.L802429C4:
-/* EEFAC4 802429C4 AC820084 */  sw        $v0, 0x84($a0)
-.L802429C8:
-/* EEFAC8 802429C8 03E00008 */  jr        $ra
-/* EEFACC 802429CC 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/EF2680/func_80240070_EF2680.s b/ver/us/asm/nonmatchings/EF2680/func_80240070_EF2680.s
deleted file mode 100644
index 6fbd322ea4..0000000000
--- a/ver/us/asm/nonmatchings/EF2680/func_80240070_EF2680.s
+++ /dev/null
@@ -1,123 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-glabel D_802453B0_EF79C0
-.double 32767.0
-
-.section .text
-
-glabel func_80240070_EF2680
-/* EF2680 80240070 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* EF2684 80240074 AFB3002C */  sw        $s3, 0x2c($sp)
-/* EF2688 80240078 0080982D */  daddu     $s3, $a0, $zero
-/* EF268C 8024007C AFBF0030 */  sw        $ra, 0x30($sp)
-/* EF2690 80240080 AFB20028 */  sw        $s2, 0x28($sp)
-/* EF2694 80240084 AFB10024 */  sw        $s1, 0x24($sp)
-/* EF2698 80240088 AFB00020 */  sw        $s0, 0x20($sp)
-/* EF269C 8024008C 8E710148 */  lw        $s1, 0x148($s3)
-/* EF26A0 80240090 86240008 */  lh        $a0, 8($s1)
-/* EF26A4 80240094 0C00F92F */  jal       dead_get_npc_unsafe
-/* EF26A8 80240098 00A0902D */   daddu    $s2, $a1, $zero
-/* EF26AC 8024009C 8E440004 */  lw        $a0, 4($s2)
-/* EF26B0 802400A0 0040802D */  daddu     $s0, $v0, $zero
-/* EF26B4 802400A4 00041FC2 */  srl       $v1, $a0, 0x1f
-/* EF26B8 802400A8 00832021 */  addu      $a0, $a0, $v1
-/* EF26BC 802400AC 00042043 */  sra       $a0, $a0, 1
-/* EF26C0 802400B0 0C00AB3B */  jal       dead_rand_int
-/* EF26C4 802400B4 24840001 */   addiu    $a0, $a0, 1
-/* EF26C8 802400B8 8E430004 */  lw        $v1, 4($s2)
-/* EF26CC 802400BC 000327C2 */  srl       $a0, $v1, 0x1f
-/* EF26D0 802400C0 00641821 */  addu      $v1, $v1, $a0
-/* EF26D4 802400C4 00031843 */  sra       $v1, $v1, 1
-/* EF26D8 802400C8 00621821 */  addu      $v1, $v1, $v0
-/* EF26DC 802400CC A603008E */  sh        $v1, 0x8e($s0)
-/* EF26E0 802400D0 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* EF26E4 802400D4 C6000040 */  lwc1      $f0, 0x40($s0)
-/* EF26E8 802400D8 C4640000 */  lwc1      $f4, ($v1)
-/* EF26EC 802400DC 46802120 */  cvt.s.w   $f4, $f4
-/* EF26F0 802400E0 C4620008 */  lwc1      $f2, 8($v1)
-/* EF26F4 802400E4 468010A0 */  cvt.s.w   $f2, $f2
-/* EF26F8 802400E8 E7A00010 */  swc1      $f0, 0x10($sp)
-/* EF26FC 802400EC 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* EF2700 802400F0 44061000 */  mfc1      $a2, $f2
-/* EF2704 802400F4 C440000C */  lwc1      $f0, 0xc($v0)
-/* EF2708 802400F8 46800020 */  cvt.s.w   $f0, $f0
-/* EF270C 802400FC E7A00014 */  swc1      $f0, 0x14($sp)
-/* EF2710 80240100 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* EF2714 80240104 44052000 */  mfc1      $a1, $f4
-/* EF2718 80240108 C4400010 */  lwc1      $f0, 0x10($v0)
-/* EF271C 8024010C 46800020 */  cvt.s.w   $f0, $f0
-/* EF2720 80240110 E7A00018 */  swc1      $f0, 0x18($sp)
-/* EF2724 80240114 8C640018 */  lw        $a0, 0x18($v1)
-/* EF2728 80240118 0C013431 */  jal       func_8004D0C4
-/* EF272C 8024011C 8E070038 */   lw       $a3, 0x38($s0)
-/* EF2730 80240120 1040000E */  beqz      $v0, .L8024015C
-/* EF2734 80240124 00000000 */   nop
-/* EF2738 80240128 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* EF273C 8024012C C60C0038 */  lwc1      $f12, 0x38($s0)
-/* EF2740 80240130 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* EF2744 80240134 C4460000 */  lwc1      $f6, ($v0)
-/* EF2748 80240138 468031A0 */  cvt.s.w   $f6, $f6
-/* EF274C 8024013C 44063000 */  mfc1      $a2, $f6
-/* EF2750 80240140 C4460008 */  lwc1      $f6, 8($v0)
-/* EF2754 80240144 468031A0 */  cvt.s.w   $f6, $f6
-/* EF2758 80240148 44073000 */  mfc1      $a3, $f6
-/* EF275C 8024014C 0C00ABDC */  jal       fio_validate_header_checksums
-/* EF2760 80240150 00000000 */   nop
-/* EF2764 80240154 08090063 */  j         .L8024018C
-/* EF2768 80240158 E600000C */   swc1     $f0, 0xc($s0)
-.L8024015C:
-/* EF276C 8024015C 0C00AB3B */  jal       dead_rand_int
-/* EF2770 80240160 2404003C */   addiu    $a0, $zero, 0x3c
-/* EF2774 80240164 C60C000C */  lwc1      $f12, 0xc($s0)
-/* EF2778 80240168 44820000 */  mtc1      $v0, $f0
-/* EF277C 8024016C 00000000 */  nop
-/* EF2780 80240170 46800020 */  cvt.s.w   $f0, $f0
-/* EF2784 80240174 46006300 */  add.s     $f12, $f12, $f0
-/* EF2788 80240178 3C0141F0 */  lui       $at, 0x41f0
-/* EF278C 8024017C 44810000 */  mtc1      $at, $f0
-/* EF2790 80240180 0C00AB85 */  jal       dead_clamp_angle
-/* EF2794 80240184 46006301 */   sub.s    $f12, $f12, $f0
-/* EF2798 80240188 E600000C */  swc1      $f0, 0xc($s0)
-.L8024018C:
-/* EF279C 8024018C 8E2200CC */  lw        $v0, 0xcc($s1)
-/* EF27A0 80240190 8C420004 */  lw        $v0, 4($v0)
-/* EF27A4 80240194 AE020028 */  sw        $v0, 0x28($s0)
-/* EF27A8 80240198 AE600074 */  sw        $zero, 0x74($s3)
-/* EF27AC 8024019C 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* EF27B0 802401A0 8C420014 */  lw        $v0, 0x14($v0)
-/* EF27B4 802401A4 04410004 */  bgez      $v0, .L802401B8
-/* EF27B8 802401A8 00000000 */   nop
-/* EF27BC 802401AC C6400000 */  lwc1      $f0, ($s2)
-/* EF27C0 802401B0 08090076 */  j         .L802401D8
-/* EF27C4 802401B4 E6000018 */   swc1     $f0, 0x18($s0)
-.L802401B8:
-/* EF27C8 802401B8 3C018024 */  lui       $at, %hi(D_802453B0_EF79C0)
-/* EF27CC 802401BC D42253B0 */  ldc1      $f2, %lo(D_802453B0_EF79C0)($at)
-/* EF27D0 802401C0 44820000 */  mtc1      $v0, $f0
-/* EF27D4 802401C4 00000000 */  nop
-/* EF27D8 802401C8 46800021 */  cvt.d.w   $f0, $f0
-/* EF27DC 802401CC 46220003 */  div.d     $f0, $f0, $f2
-/* EF27E0 802401D0 46200020 */  cvt.s.d   $f0, $f0
-/* EF27E4 802401D4 E6000018 */  swc1      $f0, 0x18($s0)
-.L802401D8:
-/* EF27E8 802401D8 C600003C */  lwc1      $f0, 0x3c($s0)
-/* EF27EC 802401DC 3C014059 */  lui       $at, 0x4059
-/* EF27F0 802401E0 44811800 */  mtc1      $at, $f3
-/* EF27F4 802401E4 44801000 */  mtc1      $zero, $f2
-/* EF27F8 802401E8 46000021 */  cvt.d.s   $f0, $f0
-/* EF27FC 802401EC 46220002 */  mul.d     $f0, $f0, $f2
-/* EF2800 802401F0 00000000 */  nop
-/* EF2804 802401F4 24020001 */  addiu     $v0, $zero, 1
-/* EF2808 802401F8 4620018D */  trunc.w.d $f6, $f0
-/* EF280C 802401FC E626007C */  swc1      $f6, 0x7c($s1)
-/* EF2810 80240200 AE620070 */  sw        $v0, 0x70($s3)
-/* EF2814 80240204 8FBF0030 */  lw        $ra, 0x30($sp)
-/* EF2818 80240208 8FB3002C */  lw        $s3, 0x2c($sp)
-/* EF281C 8024020C 8FB20028 */  lw        $s2, 0x28($sp)
-/* EF2820 80240210 8FB10024 */  lw        $s1, 0x24($sp)
-/* EF2824 80240214 8FB00020 */  lw        $s0, 0x20($sp)
-/* EF2828 80240218 03E00008 */  jr        $ra
-/* EF282C 8024021C 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/EF2680/func_80240220_EF2830.s b/ver/us/asm/nonmatchings/EF2680/func_80240220_EF2830.s
index b2bad8b2a9..ac185ec2f8 100644
--- a/ver/us/asm/nonmatchings/EF2680/func_80240220_EF2830.s
+++ b/ver/us/asm/nonmatchings/EF2680/func_80240220_EF2830.s
@@ -92,7 +92,7 @@ glabel func_80240220_EF2830
 /* EF2960 80240350 E7A60034 */  swc1      $f6, 0x34($sp)
 /* EF2964 80240354 AFA20010 */  sw        $v0, 0x10($sp)
 /* EF2968 80240358 8E040080 */  lw        $a0, 0x80($s0)
-/* EF296C 8024035C 0C03908F */  jal       func_800E423C
+/* EF296C 8024035C 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EF2970 80240360 27A70030 */   addiu    $a3, $sp, 0x30
 /* EF2974 80240364 C7A00034 */  lwc1      $f0, 0x34($sp)
 /* EF2978 80240368 4600D001 */  sub.s     $f0, $f26, $f0
@@ -136,7 +136,7 @@ glabel func_80240220_EF2830
 /* EF2A08 802403F8 E7A40034 */  swc1      $f4, 0x34($sp)
 /* EF2A0C 802403FC AFA20010 */  sw        $v0, 0x10($sp)
 /* EF2A10 80240400 8E040080 */  lw        $a0, 0x80($s0)
-/* EF2A14 80240404 0C03908F */  jal       func_800E423C
+/* EF2A14 80240404 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EF2A18 80240408 27A70030 */   addiu    $a3, $sp, 0x30
 /* EF2A1C 8024040C C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* EF2A20 80240410 461A2100 */  add.s     $f4, $f4, $f26
@@ -172,7 +172,7 @@ glabel func_80240220_EF2830
 /* EF2A90 80240480 1840002E */  blez      $v0, .L8024053C
 /* EF2A94 80240484 00000000 */   nop
 /* EF2A98 80240488 C62C0074 */  lwc1      $f12, 0x74($s1)
-/* EF2A9C 8024048C 0C00AD77 */  jal       func_8002B5DC
+/* EF2A9C 8024048C 0C00AD77 */  jal       dead_sin_deg
 /* EF2AA0 80240490 46806320 */   cvt.s.w  $f12, $f12
 /* EF2AA4 80240494 8E020000 */  lw        $v0, ($s0)
 /* EF2AA8 80240498 30420008 */  andi      $v0, $v0, 8
@@ -195,7 +195,7 @@ glabel func_80240220_EF2830
 /* EF2AE8 802404D8 E7A60034 */  swc1      $f6, 0x34($sp)
 /* EF2AEC 802404DC AFA20010 */  sw        $v0, 0x10($sp)
 /* EF2AF0 802404E0 8E040080 */  lw        $a0, 0x80($s0)
-/* EF2AF4 802404E4 0C03908F */  jal       func_800E423C
+/* EF2AF4 802404E4 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EF2AF8 802404E8 27A70030 */   addiu    $a3, $sp, 0x30
 .L802404EC:
 /* EF2AFC 802404EC 10400007 */  beqz      $v0, .L8024050C
@@ -276,13 +276,13 @@ glabel func_80240220_EF2830
 /* EF2C1C 8024060C AFA20020 */  sw        $v0, 0x20($sp)
 /* EF2C20 80240610 E7A00010 */  swc1      $f0, 0x10($sp)
 /* EF2C24 80240614 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EF2C28 80240618 0C01D444 */  jal       func_80075110
+/* EF2C28 80240618 0C01D444 */  jal       dead_fx_emote
 /* EF2C2C 8024061C E7A40018 */   swc1     $f4, 0x18($sp)
 /* EF2C30 80240620 0200202D */  daddu     $a0, $s0, $zero
 /* EF2C34 80240624 240502F4 */  addiu     $a1, $zero, 0x2f4
 /* EF2C38 80240628 C480003C */  lwc1      $f0, 0x3c($a0)
 /* EF2C3C 8024062C 3C060020 */  lui       $a2, 0x20
-/* EF2C40 80240630 0C013600 */  jal       func_8004D800
+/* EF2C40 80240630 0C013600 */  jal       dead_ai_enemy_play_sound
 /* EF2C44 80240634 E4800064 */   swc1     $f0, 0x64($a0)
 /* EF2C48 80240638 8E220018 */  lw        $v0, 0x18($s1)
 /* EF2C4C 8024063C 9442002A */  lhu       $v0, 0x2a($v0)
@@ -321,7 +321,7 @@ glabel func_80240220_EF2830
 /* EF2CBC 802406AC 46800020 */  cvt.s.w   $f0, $f0
 /* EF2CC0 802406B0 E7A00018 */  swc1      $f0, 0x18($sp)
 /* EF2CC4 802406B4 8C640018 */  lw        $a0, 0x18($v1)
-/* EF2CC8 802406B8 0C013431 */  jal       func_8004D0C4
+/* EF2CC8 802406B8 0C013431 */  jal       dead_is_point_within_region
 /* EF2CCC 802406BC 8E070038 */   lw       $a3, 0x38($s0)
 /* EF2CD0 802406C0 1040001A */  beqz      $v0, .L8024072C
 /* EF2CD4 802406C4 00000000 */   nop
@@ -331,7 +331,7 @@ glabel func_80240220_EF2830
 /* EF2CE4 802406D4 C44C0000 */  lwc1      $f12, ($v0)
 /* EF2CE8 802406D8 46806320 */  cvt.s.w   $f12, $f12
 /* EF2CEC 802406DC C44E0008 */  lwc1      $f14, 8($v0)
-/* EF2CF0 802406E0 0C00AC71 */  jal       func_8002B1C4
+/* EF2CF0 802406E0 0C00AC71 */  jal       dead_dist2D
 /* EF2CF4 802406E4 468073A0 */   cvt.s.w  $f14, $f14
 /* EF2CF8 802406E8 C6020018 */  lwc1      $f2, 0x18($s0)
 /* EF2CFC 802406EC 4600103C */  c.lt.s    $f2, $f0
@@ -363,7 +363,7 @@ glabel func_80240220_EF2830
 /* EF2D60 80240750 00000000 */   nop
 /* EF2D64 80240754 8E050018 */  lw        $a1, 0x18($s0)
 /* EF2D68 80240758 8E06000C */  lw        $a2, 0xc($s0)
-/* EF2D6C 8024075C 0C00F909 */  jal       func_8003E424
+/* EF2D6C 8024075C 0C00F909 */  jal       dead_npc_move_heading
 /* EF2D70 80240760 0200202D */   daddu    $a0, $s0, $zero
 .L80240764:
 /* EF2D74 80240764 C600003C */  lwc1      $f0, 0x3c($s0)
diff --git a/ver/us/asm/nonmatchings/EF2680/func_80240908_EF2F18.s b/ver/us/asm/nonmatchings/EF2680/func_80240908_EF2F18.s
deleted file mode 100644
index 048fb6618f..0000000000
--- a/ver/us/asm/nonmatchings/EF2680/func_80240908_EF2F18.s
+++ /dev/null
@@ -1,225 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240908_EF2F18
-/* EF2F18 80240908 27BDFF88 */  addiu     $sp, $sp, -0x78
-/* EF2F1C 8024090C AFB3004C */  sw        $s3, 0x4c($sp)
-/* EF2F20 80240910 0080982D */  daddu     $s3, $a0, $zero
-/* EF2F24 80240914 AFBF0054 */  sw        $ra, 0x54($sp)
-/* EF2F28 80240918 AFB40050 */  sw        $s4, 0x50($sp)
-/* EF2F2C 8024091C AFB20048 */  sw        $s2, 0x48($sp)
-/* EF2F30 80240920 AFB10044 */  sw        $s1, 0x44($sp)
-/* EF2F34 80240924 AFB00040 */  sw        $s0, 0x40($sp)
-/* EF2F38 80240928 F7BA0070 */  sdc1      $f26, 0x70($sp)
-/* EF2F3C 8024092C F7B80068 */  sdc1      $f24, 0x68($sp)
-/* EF2F40 80240930 F7B60060 */  sdc1      $f22, 0x60($sp)
-/* EF2F44 80240934 F7B40058 */  sdc1      $f20, 0x58($sp)
-/* EF2F48 80240938 8E710148 */  lw        $s1, 0x148($s3)
-/* EF2F4C 8024093C 00A0902D */  daddu     $s2, $a1, $zero
-/* EF2F50 80240940 86240008 */  lh        $a0, 8($s1)
-/* EF2F54 80240944 0C00F92F */  jal       dead_get_npc_unsafe
-/* EF2F58 80240948 00C0A02D */   daddu    $s4, $a2, $zero
-/* EF2F5C 8024094C 0040802D */  daddu     $s0, $v0, $zero
-/* EF2F60 80240950 C6200078 */  lwc1      $f0, 0x78($s1)
-/* EF2F64 80240954 46800020 */  cvt.s.w   $f0, $f0
-/* EF2F68 80240958 46000021 */  cvt.d.s   $f0, $f0
-/* EF2F6C 8024095C 3C014059 */  lui       $at, 0x4059
-/* EF2F70 80240960 44811800 */  mtc1      $at, $f3
-/* EF2F74 80240964 44801000 */  mtc1      $zero, $f2
-/* EF2F78 80240968 8602008E */  lh        $v0, 0x8e($s0)
-/* EF2F7C 8024096C 9603008E */  lhu       $v1, 0x8e($s0)
-/* EF2F80 80240970 46220003 */  div.d     $f0, $f0, $f2
-/* EF2F84 80240974 46200620 */  cvt.s.d   $f24, $f0
-/* EF2F88 80240978 C6200088 */  lwc1      $f0, 0x88($s1)
-/* EF2F8C 8024097C 46800020 */  cvt.s.w   $f0, $f0
-/* EF2F90 80240980 46000021 */  cvt.d.s   $f0, $f0
-/* EF2F94 80240984 46220003 */  div.d     $f0, $f0, $f2
-/* EF2F98 80240988 46200020 */  cvt.s.d   $f0, $f0
-/* EF2F9C 8024098C 18400003 */  blez      $v0, .L8024099C
-/* EF2FA0 80240990 4600C680 */   add.s    $f26, $f24, $f0
-/* EF2FA4 80240994 2462FFFF */  addiu     $v0, $v1, -1
-/* EF2FA8 80240998 A602008E */  sh        $v0, 0x8e($s0)
-.L8024099C:
-/* EF2FAC 8024099C 8E220070 */  lw        $v0, 0x70($s1)
-/* EF2FB0 802409A0 18400034 */  blez      $v0, .L80240A74
-/* EF2FB4 802409A4 00000000 */   nop
-/* EF2FB8 802409A8 C62C0074 */  lwc1      $f12, 0x74($s1)
-/* EF2FBC 802409AC 46806320 */  cvt.s.w   $f12, $f12
-/* EF2FC0 802409B0 44820000 */  mtc1      $v0, $f0
-/* EF2FC4 802409B4 00000000 */  nop
-/* EF2FC8 802409B8 46800020 */  cvt.s.w   $f0, $f0
-/* EF2FCC 802409BC 46000021 */  cvt.d.s   $f0, $f0
-/* EF2FD0 802409C0 46220003 */  div.d     $f0, $f0, $f2
-/* EF2FD4 802409C4 0C00AD77 */  jal       func_8002B5DC
-/* EF2FD8 802409C8 462005A0 */   cvt.s.d  $f22, $f0
-/* EF2FDC 802409CC 8E020000 */  lw        $v0, ($s0)
-/* EF2FE0 802409D0 30420008 */  andi      $v0, $v0, 8
-/* EF2FE4 802409D4 10400003 */  beqz      $v0, .L802409E4
-/* EF2FE8 802409D8 46000506 */   mov.s    $f20, $f0
-/* EF2FEC 802409DC 08090289 */  j         .L80240A24
-/* EF2FF0 802409E0 0000102D */   daddu    $v0, $zero, $zero
-.L802409E4:
-/* EF2FF4 802409E4 27A50028 */  addiu     $a1, $sp, 0x28
-/* EF2FF8 802409E8 27A6002C */  addiu     $a2, $sp, 0x2c
-/* EF2FFC 802409EC C6000038 */  lwc1      $f0, 0x38($s0)
-/* EF3000 802409F0 C602003C */  lwc1      $f2, 0x3c($s0)
-/* EF3004 802409F4 C6040040 */  lwc1      $f4, 0x40($s0)
-/* EF3008 802409F8 3C01447A */  lui       $at, 0x447a
-/* EF300C 802409FC 44813000 */  mtc1      $at, $f6
-/* EF3010 80240A00 27A20034 */  addiu     $v0, $sp, 0x34
-/* EF3014 80240A04 E7A00028 */  swc1      $f0, 0x28($sp)
-/* EF3018 80240A08 E7A2002C */  swc1      $f2, 0x2c($sp)
-/* EF301C 80240A0C E7A40030 */  swc1      $f4, 0x30($sp)
-/* EF3020 80240A10 E7A60034 */  swc1      $f6, 0x34($sp)
-/* EF3024 80240A14 AFA20010 */  sw        $v0, 0x10($sp)
-/* EF3028 80240A18 8E040080 */  lw        $a0, 0x80($s0)
-/* EF302C 80240A1C 0C03908F */  jal       func_800E423C
-/* EF3030 80240A20 27A70030 */   addiu    $a3, $sp, 0x30
-.L80240A24:
-/* EF3034 80240A24 10400007 */  beqz      $v0, .L80240A44
-/* EF3038 80240A28 00000000 */   nop
-/* EF303C 80240A2C 4616A082 */  mul.s     $f2, $f20, $f22
-/* EF3040 80240A30 00000000 */  nop
-/* EF3044 80240A34 C7A0002C */  lwc1      $f0, 0x2c($sp)
-/* EF3048 80240A38 46180000 */  add.s     $f0, $f0, $f24
-/* EF304C 80240A3C 08090294 */  j         .L80240A50
-/* EF3050 80240A40 46020000 */   add.s    $f0, $f0, $f2
-.L80240A44:
-/* EF3054 80240A44 4616A002 */  mul.s     $f0, $f20, $f22
-/* EF3058 80240A48 00000000 */  nop
-/* EF305C 80240A4C 4600D000 */  add.s     $f0, $f26, $f0
-.L80240A50:
-/* EF3060 80240A50 E600003C */  swc1      $f0, 0x3c($s0)
-/* EF3064 80240A54 8E220074 */  lw        $v0, 0x74($s1)
-/* EF3068 80240A58 2442000A */  addiu     $v0, $v0, 0xa
-/* EF306C 80240A5C 44826000 */  mtc1      $v0, $f12
-/* EF3070 80240A60 00000000 */  nop
-/* EF3074 80240A64 0C00AB85 */  jal       dead_clamp_angle
-/* EF3078 80240A68 46806320 */   cvt.s.w  $f12, $f12
-/* EF307C 80240A6C 4600020D */  trunc.w.s $f8, $f0
-/* EF3080 80240A70 E6280074 */  swc1      $f8, 0x74($s1)
-.L80240A74:
-/* EF3084 80240A74 8E220090 */  lw        $v0, 0x90($s1)
-/* EF3088 80240A78 1C400040 */  bgtz      $v0, .L80240B7C
-/* EF308C 80240A7C 2442FFFF */   addiu    $v0, $v0, -1
-/* EF3090 80240A80 860200A8 */  lh        $v0, 0xa8($s0)
-/* EF3094 80240A84 C600003C */  lwc1      $f0, 0x3c($s0)
-/* EF3098 80240A88 44821000 */  mtc1      $v0, $f2
-/* EF309C 80240A8C 00000000 */  nop
-/* EF30A0 80240A90 468010A0 */  cvt.s.w   $f2, $f2
-/* EF30A4 80240A94 3C028010 */  lui       $v0, %hi(dead_gPlayerStatusPtr)
-/* EF30A8 80240A98 8C42FC90 */  lw        $v0, %lo(dead_gPlayerStatusPtr)($v0)
-/* EF30AC 80240A9C 46020000 */  add.s     $f0, $f0, $f2
-/* EF30B0 80240AA0 3C014024 */  lui       $at, 0x4024
-/* EF30B4 80240AA4 44812800 */  mtc1      $at, $f5
-/* EF30B8 80240AA8 44802000 */  mtc1      $zero, $f4
-/* EF30BC 80240AAC C442002C */  lwc1      $f2, 0x2c($v0)
-/* EF30C0 80240AB0 46000021 */  cvt.d.s   $f0, $f0
-/* EF30C4 80240AB4 46240000 */  add.d     $f0, $f0, $f4
-/* EF30C8 80240AB8 460010A1 */  cvt.d.s   $f2, $f2
-/* EF30CC 80240ABC 4620103C */  c.lt.d    $f2, $f0
-/* EF30D0 80240AC0 00000000 */  nop
-/* EF30D4 80240AC4 4500002E */  bc1f      .L80240B80
-/* EF30D8 80240AC8 0280202D */   daddu    $a0, $s4, $zero
-/* EF30DC 80240ACC 24020001 */  addiu     $v0, $zero, 1
-/* EF30E0 80240AD0 AFA20010 */  sw        $v0, 0x10($sp)
-/* EF30E4 80240AD4 8E460024 */  lw        $a2, 0x24($s2)
-/* EF30E8 80240AD8 8E470028 */  lw        $a3, 0x28($s2)
-/* EF30EC 80240ADC 0C013469 */  jal       func_8004D1A4
-/* EF30F0 80240AE0 0220282D */   daddu    $a1, $s1, $zero
-/* EF30F4 80240AE4 10400026 */  beqz      $v0, .L80240B80
-/* EF30F8 80240AE8 0000202D */   daddu    $a0, $zero, $zero
-/* EF30FC 80240AEC 0200282D */  daddu     $a1, $s0, $zero
-/* EF3100 80240AF0 0000302D */  daddu     $a2, $zero, $zero
-/* EF3104 80240AF4 2412000C */  addiu     $s2, $zero, 0xc
-/* EF3108 80240AF8 860300A8 */  lh        $v1, 0xa8($s0)
-/* EF310C 80240AFC 3C013F80 */  lui       $at, 0x3f80
-/* EF3110 80240B00 44810000 */  mtc1      $at, $f0
-/* EF3114 80240B04 3C014000 */  lui       $at, 0x4000
-/* EF3118 80240B08 44811000 */  mtc1      $at, $f2
-/* EF311C 80240B0C 3C01C1A0 */  lui       $at, 0xc1a0
-/* EF3120 80240B10 44812000 */  mtc1      $at, $f4
-/* EF3124 80240B14 44834000 */  mtc1      $v1, $f8
-/* EF3128 80240B18 00000000 */  nop
-/* EF312C 80240B1C 46804220 */  cvt.s.w   $f8, $f8
-/* EF3130 80240B20 44074000 */  mfc1      $a3, $f8
-/* EF3134 80240B24 27A20038 */  addiu     $v0, $sp, 0x38
-/* EF3138 80240B28 AFB2001C */  sw        $s2, 0x1c($sp)
-/* EF313C 80240B2C AFA20020 */  sw        $v0, 0x20($sp)
-/* EF3140 80240B30 E7A00010 */  swc1      $f0, 0x10($sp)
-/* EF3144 80240B34 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EF3148 80240B38 0C01D444 */  jal       func_80075110
-/* EF314C 80240B3C E7A40018 */   swc1     $f4, 0x18($sp)
-/* EF3150 80240B40 0200202D */  daddu     $a0, $s0, $zero
-/* EF3154 80240B44 240502F4 */  addiu     $a1, $zero, 0x2f4
-/* EF3158 80240B48 C480003C */  lwc1      $f0, 0x3c($a0)
-/* EF315C 80240B4C 3C060020 */  lui       $a2, 0x20
-/* EF3160 80240B50 0C013600 */  jal       func_8004D800
-/* EF3164 80240B54 E4800064 */   swc1     $f0, 0x64($a0)
-/* EF3168 80240B58 8E220018 */  lw        $v0, 0x18($s1)
-/* EF316C 80240B5C 9442002A */  lhu       $v0, 0x2a($v0)
-/* EF3170 80240B60 30420001 */  andi      $v0, $v0, 1
-/* EF3174 80240B64 10400003 */  beqz      $v0, .L80240B74
-/* EF3178 80240B68 2402000A */   addiu    $v0, $zero, 0xa
-/* EF317C 80240B6C 08090307 */  j         .L80240C1C
-/* EF3180 80240B70 AE620070 */   sw       $v0, 0x70($s3)
-.L80240B74:
-/* EF3184 80240B74 08090307 */  j         .L80240C1C
-/* EF3188 80240B78 AE720070 */   sw       $s2, 0x70($s3)
-.L80240B7C:
-/* EF318C 80240B7C AE220090 */  sw        $v0, 0x90($s1)
-.L80240B80:
-/* EF3190 80240B80 8602008C */  lh        $v0, 0x8c($s0)
-/* EF3194 80240B84 14400025 */  bnez      $v0, .L80240C1C
-/* EF3198 80240B88 00000000 */   nop
-/* EF319C 80240B8C 8602008E */  lh        $v0, 0x8e($s0)
-/* EF31A0 80240B90 1C400022 */  bgtz      $v0, .L80240C1C
-/* EF31A4 80240B94 00000000 */   nop
-/* EF31A8 80240B98 8E620074 */  lw        $v0, 0x74($s3)
-/* EF31AC 80240B9C 2442FFFF */  addiu     $v0, $v0, -1
-/* EF31B0 80240BA0 1840001D */  blez      $v0, .L80240C18
-/* EF31B4 80240BA4 AE620074 */   sw       $v0, 0x74($s3)
-/* EF31B8 80240BA8 8E220018 */  lw        $v0, 0x18($s1)
-/* EF31BC 80240BAC 9442002A */  lhu       $v0, 0x2a($v0)
-/* EF31C0 80240BB0 30420010 */  andi      $v0, $v0, 0x10
-/* EF31C4 80240BB4 14400007 */  bnez      $v0, .L80240BD4
-/* EF31C8 80240BB8 00000000 */   nop
-/* EF31CC 80240BBC C600000C */  lwc1      $f0, 0xc($s0)
-/* EF31D0 80240BC0 3C014334 */  lui       $at, 0x4334
-/* EF31D4 80240BC4 44816000 */  mtc1      $at, $f12
-/* EF31D8 80240BC8 0C00AB85 */  jal       dead_clamp_angle
-/* EF31DC 80240BCC 460C0300 */   add.s    $f12, $f0, $f12
-/* EF31E0 80240BD0 E600000C */  swc1      $f0, 0xc($s0)
-.L80240BD4:
-/* EF31E4 80240BD4 0C00AB3B */  jal       dead_rand_int
-/* EF31E8 80240BD8 240403E8 */   addiu    $a0, $zero, 0x3e8
-/* EF31EC 80240BDC 3C032E8B */  lui       $v1, 0x2e8b
-/* EF31F0 80240BE0 3463A2E9 */  ori       $v1, $v1, 0xa2e9
-/* EF31F4 80240BE4 00430018 */  mult      $v0, $v1
-/* EF31F8 80240BE8 00021FC3 */  sra       $v1, $v0, 0x1f
-/* EF31FC 80240BEC 00004010 */  mfhi      $t0
-/* EF3200 80240BF0 00082043 */  sra       $a0, $t0, 1
-/* EF3204 80240BF4 00832023 */  subu      $a0, $a0, $v1
-/* EF3208 80240BF8 00041840 */  sll       $v1, $a0, 1
-/* EF320C 80240BFC 00641821 */  addu      $v1, $v1, $a0
-/* EF3210 80240C00 00031880 */  sll       $v1, $v1, 2
-/* EF3214 80240C04 00641823 */  subu      $v1, $v1, $a0
-/* EF3218 80240C08 00431023 */  subu      $v0, $v0, $v1
-/* EF321C 80240C0C 24420005 */  addiu     $v0, $v0, 5
-/* EF3220 80240C10 08090307 */  j         .L80240C1C
-/* EF3224 80240C14 A602008E */   sh       $v0, 0x8e($s0)
-.L80240C18:
-/* EF3228 80240C18 AE600070 */  sw        $zero, 0x70($s3)
-.L80240C1C:
-/* EF322C 80240C1C 8FBF0054 */  lw        $ra, 0x54($sp)
-/* EF3230 80240C20 8FB40050 */  lw        $s4, 0x50($sp)
-/* EF3234 80240C24 8FB3004C */  lw        $s3, 0x4c($sp)
-/* EF3238 80240C28 8FB20048 */  lw        $s2, 0x48($sp)
-/* EF323C 80240C2C 8FB10044 */  lw        $s1, 0x44($sp)
-/* EF3240 80240C30 8FB00040 */  lw        $s0, 0x40($sp)
-/* EF3244 80240C34 D7BA0070 */  ldc1      $f26, 0x70($sp)
-/* EF3248 80240C38 D7B80068 */  ldc1      $f24, 0x68($sp)
-/* EF324C 80240C3C D7B60060 */  ldc1      $f22, 0x60($sp)
-/* EF3250 80240C40 D7B40058 */  ldc1      $f20, 0x58($sp)
-/* EF3254 80240C44 03E00008 */  jr        $ra
-/* EF3258 80240C48 27BD0078 */   addiu    $sp, $sp, 0x78
diff --git a/ver/us/asm/nonmatchings/EF2680/func_80240C4C_EF325C.s b/ver/us/asm/nonmatchings/EF2680/func_80240C4C_EF325C.s
deleted file mode 100644
index d070ebaf3b..0000000000
--- a/ver/us/asm/nonmatchings/EF2680/func_80240C4C_EF325C.s
+++ /dev/null
@@ -1,34 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240C4C_EF325C
-/* EF325C 80240C4C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* EF3260 80240C50 AFB20018 */  sw        $s2, 0x18($sp)
-/* EF3264 80240C54 0080902D */  daddu     $s2, $a0, $zero
-/* EF3268 80240C58 AFBF001C */  sw        $ra, 0x1c($sp)
-/* EF326C 80240C5C AFB10014 */  sw        $s1, 0x14($sp)
-/* EF3270 80240C60 AFB00010 */  sw        $s0, 0x10($sp)
-/* EF3274 80240C64 8E510148 */  lw        $s1, 0x148($s2)
-/* EF3278 80240C68 0C00F92F */  jal       dead_get_npc_unsafe
-/* EF327C 80240C6C 86240008 */   lh       $a0, 8($s1)
-/* EF3280 80240C70 0040802D */  daddu     $s0, $v0, $zero
-/* EF3284 80240C74 3C028010 */  lui       $v0, %hi(dead_gPlayerStatusPtr)
-/* EF3288 80240C78 8C42FC90 */  lw        $v0, %lo(dead_gPlayerStatusPtr)($v0)
-/* EF328C 80240C7C C60C0038 */  lwc1      $f12, 0x38($s0)
-/* EF3290 80240C80 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* EF3294 80240C84 A600008E */  sh        $zero, 0x8e($s0)
-/* EF3298 80240C88 8C460028 */  lw        $a2, 0x28($v0)
-/* EF329C 80240C8C 0C00ABDC */  jal       fio_validate_header_checksums
-/* EF32A0 80240C90 8C470030 */   lw       $a3, 0x30($v0)
-/* EF32A4 80240C94 E600000C */  swc1      $f0, 0xc($s0)
-/* EF32A8 80240C98 8E2200CC */  lw        $v0, 0xcc($s1)
-/* EF32AC 80240C9C 8C420020 */  lw        $v0, 0x20($v0)
-/* EF32B0 80240CA0 AE020028 */  sw        $v0, 0x28($s0)
-/* EF32B4 80240CA4 2402000B */  addiu     $v0, $zero, 0xb
-/* EF32B8 80240CA8 AE420070 */  sw        $v0, 0x70($s2)
-/* EF32BC 80240CAC 8FBF001C */  lw        $ra, 0x1c($sp)
-/* EF32C0 80240CB0 8FB20018 */  lw        $s2, 0x18($sp)
-/* EF32C4 80240CB4 8FB10014 */  lw        $s1, 0x14($sp)
-/* EF32C8 80240CB8 8FB00010 */  lw        $s0, 0x10($sp)
-/* EF32CC 80240CBC 03E00008 */  jr        $ra
-/* EF32D0 80240CC0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EF2680/func_80240CC4_EF32D4.s b/ver/us/asm/nonmatchings/EF2680/func_80240CC4_EF32D4.s
deleted file mode 100644
index 9f05e7f076..0000000000
--- a/ver/us/asm/nonmatchings/EF2680/func_80240CC4_EF32D4.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240CC4_EF32D4
-/* EF32D4 80240CC4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EF32D8 80240CC8 AFB00010 */  sw        $s0, 0x10($sp)
-/* EF32DC 80240CCC 0080802D */  daddu     $s0, $a0, $zero
-/* EF32E0 80240CD0 AFBF0014 */  sw        $ra, 0x14($sp)
-/* EF32E4 80240CD4 8E020148 */  lw        $v0, 0x148($s0)
-/* EF32E8 80240CD8 0C00F92F */  jal       dead_get_npc_unsafe
-/* EF32EC 80240CDC 84440008 */   lh       $a0, 8($v0)
-/* EF32F0 80240CE0 9443008E */  lhu       $v1, 0x8e($v0)
-/* EF32F4 80240CE4 C440003C */  lwc1      $f0, 0x3c($v0)
-/* EF32F8 80240CE8 24640001 */  addiu     $a0, $v1, 1
-/* EF32FC 80240CEC 00031C00 */  sll       $v1, $v1, 0x10
-/* EF3300 80240CF0 00031B83 */  sra       $v1, $v1, 0xe
-/* EF3304 80240CF4 A444008E */  sh        $a0, 0x8e($v0)
-/* EF3308 80240CF8 3C018024 */  lui       $at, %hi(D_802444BC_EF6ACC)
-/* EF330C 80240CFC 00230821 */  addu      $at, $at, $v1
-/* EF3310 80240D00 C42244BC */  lwc1      $f2, %lo(D_802444BC_EF6ACC)($at)
-/* EF3314 80240D04 8443008E */  lh        $v1, 0x8e($v0)
-/* EF3318 80240D08 46020000 */  add.s     $f0, $f0, $f2
-/* EF331C 80240D0C 28630005 */  slti      $v1, $v1, 5
-/* EF3320 80240D10 14600003 */  bnez      $v1, .L80240D20
-/* EF3324 80240D14 E440003C */   swc1     $f0, 0x3c($v0)
-/* EF3328 80240D18 2402000C */  addiu     $v0, $zero, 0xc
-/* EF332C 80240D1C AE020070 */  sw        $v0, 0x70($s0)
-.L80240D20:
-/* EF3330 80240D20 8FBF0014 */  lw        $ra, 0x14($sp)
-/* EF3334 80240D24 8FB00010 */  lw        $s0, 0x10($sp)
-/* EF3338 80240D28 03E00008 */  jr        $ra
-/* EF333C 80240D2C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/EF2680/func_80240E64_EF3474.s b/ver/us/asm/nonmatchings/EF2680/func_80240E64_EF3474.s
deleted file mode 100644
index 5699add292..0000000000
--- a/ver/us/asm/nonmatchings/EF2680/func_80240E64_EF3474.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E64_EF3474
-/* EF3474 80240E64 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EF3478 80240E68 AFB00010 */  sw        $s0, 0x10($sp)
-/* EF347C 80240E6C 0080802D */  daddu     $s0, $a0, $zero
-/* EF3480 80240E70 AFBF0014 */  sw        $ra, 0x14($sp)
-/* EF3484 80240E74 8E020148 */  lw        $v0, 0x148($s0)
-/* EF3488 80240E78 0C00F92F */  jal       dead_get_npc_unsafe
-/* EF348C 80240E7C 84440008 */   lh       $a0, 8($v0)
-/* EF3490 80240E80 0040202D */  daddu     $a0, $v0, $zero
-/* EF3494 80240E84 8482008E */  lh        $v0, 0x8e($a0)
-/* EF3498 80240E88 9483008E */  lhu       $v1, 0x8e($a0)
-/* EF349C 80240E8C 18400005 */  blez      $v0, .L80240EA4
-/* EF34A0 80240E90 2462FFFF */   addiu    $v0, $v1, -1
-/* EF34A4 80240E94 A482008E */  sh        $v0, 0x8e($a0)
-/* EF34A8 80240E98 00021400 */  sll       $v0, $v0, 0x10
-/* EF34AC 80240E9C 1C400006 */  bgtz      $v0, .L80240EB8
-/* EF34B0 80240EA0 00000000 */   nop
-.L80240EA4:
-/* EF34B4 80240EA4 8482008C */  lh        $v0, 0x8c($a0)
-/* EF34B8 80240EA8 14400003 */  bnez      $v0, .L80240EB8
-/* EF34BC 80240EAC 2402000E */   addiu    $v0, $zero, 0xe
-/* EF34C0 80240EB0 A480008E */  sh        $zero, 0x8e($a0)
-/* EF34C4 80240EB4 AE020070 */  sw        $v0, 0x70($s0)
-.L80240EB8:
-/* EF34C8 80240EB8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* EF34CC 80240EBC 8FB00010 */  lw        $s0, 0x10($sp)
-/* EF34D0 80240EC0 03E00008 */  jr        $ra
-/* EF34D4 80240EC4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/EF2680/func_80240EC8_EF34D8.s b/ver/us/asm/nonmatchings/EF2680/func_80240EC8_EF34D8.s
deleted file mode 100644
index a4e4cbb68f..0000000000
--- a/ver/us/asm/nonmatchings/EF2680/func_80240EC8_EF34D8.s
+++ /dev/null
@@ -1,243 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EC8_EF34D8
-/* EF34D8 80240EC8 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* EF34DC 80240ECC AFB20030 */  sw        $s2, 0x30($sp)
-/* EF34E0 80240ED0 0080902D */  daddu     $s2, $a0, $zero
-/* EF34E4 80240ED4 AFBF0038 */  sw        $ra, 0x38($sp)
-/* EF34E8 80240ED8 AFB30034 */  sw        $s3, 0x34($sp)
-/* EF34EC 80240EDC AFB1002C */  sw        $s1, 0x2c($sp)
-/* EF34F0 80240EE0 AFB00028 */  sw        $s0, 0x28($sp)
-/* EF34F4 80240EE4 F7B60048 */  sdc1      $f22, 0x48($sp)
-/* EF34F8 80240EE8 F7B40040 */  sdc1      $f20, 0x40($sp)
-/* EF34FC 80240EEC 8E510148 */  lw        $s1, 0x148($s2)
-/* EF3500 80240EF0 86240008 */  lh        $a0, 8($s1)
-/* EF3504 80240EF4 0C00F92F */  jal       dead_get_npc_unsafe
-/* EF3508 80240EF8 00A0982D */   daddu    $s3, $a1, $zero
-/* EF350C 80240EFC 0040802D */  daddu     $s0, $v0, $zero
-/* EF3510 80240F00 0200202D */  daddu     $a0, $s0, $zero
-/* EF3514 80240F04 C6220088 */  lwc1      $f2, 0x88($s1)
-/* EF3518 80240F08 468010A0 */  cvt.s.w   $f2, $f2
-/* EF351C 80240F0C 460010A1 */  cvt.d.s   $f2, $f2
-/* EF3520 80240F10 C604001C */  lwc1      $f4, 0x1c($s0)
-/* EF3524 80240F14 C6000014 */  lwc1      $f0, 0x14($s0)
-/* EF3528 80240F18 8E050018 */  lw        $a1, 0x18($s0)
-/* EF352C 80240F1C 46002100 */  add.s     $f4, $f4, $f0
-/* EF3530 80240F20 8E06000C */  lw        $a2, 0xc($s0)
-/* EF3534 80240F24 C6200078 */  lwc1      $f0, 0x78($s1)
-/* EF3538 80240F28 46800020 */  cvt.s.w   $f0, $f0
-/* EF353C 80240F2C E604001C */  swc1      $f4, 0x1c($s0)
-/* EF3540 80240F30 3C014059 */  lui       $at, 0x4059
-/* EF3544 80240F34 44812800 */  mtc1      $at, $f5
-/* EF3548 80240F38 44802000 */  mtc1      $zero, $f4
-/* EF354C 80240F3C 46000021 */  cvt.d.s   $f0, $f0
-/* EF3550 80240F40 46240003 */  div.d     $f0, $f0, $f4
-/* EF3554 80240F44 46200520 */  cvt.s.d   $f20, $f0
-/* EF3558 80240F48 46241083 */  div.d     $f2, $f2, $f4
-/* EF355C 80240F4C 0C00F909 */  jal       func_8003E424
-/* EF3560 80240F50 462015A0 */   cvt.s.d  $f22, $f2
-/* EF3564 80240F54 C604001C */  lwc1      $f4, 0x1c($s0)
-/* EF3568 80240F58 44801000 */  mtc1      $zero, $f2
-/* EF356C 80240F5C 44801800 */  mtc1      $zero, $f3
-/* EF3570 80240F60 46002021 */  cvt.d.s   $f0, $f4
-/* EF3574 80240F64 4620103E */  c.le.d    $f2, $f0
-/* EF3578 80240F68 00000000 */  nop
-/* EF357C 80240F6C 45000030 */  bc1f      .L80241030
-/* EF3580 80240F70 00000000 */   nop
-/* EF3584 80240F74 C600003C */  lwc1      $f0, 0x3c($s0)
-/* EF3588 80240F78 46040000 */  add.s     $f0, $f0, $f4
-/* EF358C 80240F7C E600003C */  swc1      $f0, 0x3c($s0)
-/* EF3590 80240F80 8E2200CC */  lw        $v0, 0xcc($s1)
-/* EF3594 80240F84 8C420024 */  lw        $v0, 0x24($v0)
-/* EF3598 80240F88 AE020028 */  sw        $v0, 0x28($s0)
-/* EF359C 80240F8C A2200007 */  sb        $zero, 7($s1)
-/* EF35A0 80240F90 8E020000 */  lw        $v0, ($s0)
-/* EF35A4 80240F94 30420008 */  andi      $v0, $v0, 8
-/* EF35A8 80240F98 14400011 */  bnez      $v0, .L80240FE0
-/* EF35AC 80240F9C 0000102D */   daddu    $v0, $zero, $zero
-/* EF35B0 80240FA0 27A50018 */  addiu     $a1, $sp, 0x18
-/* EF35B4 80240FA4 27A6001C */  addiu     $a2, $sp, 0x1c
-/* EF35B8 80240FA8 C6000038 */  lwc1      $f0, 0x38($s0)
-/* EF35BC 80240FAC C602003C */  lwc1      $f2, 0x3c($s0)
-/* EF35C0 80240FB0 C6040040 */  lwc1      $f4, 0x40($s0)
-/* EF35C4 80240FB4 3C01447A */  lui       $at, 0x447a
-/* EF35C8 80240FB8 44813000 */  mtc1      $at, $f6
-/* EF35CC 80240FBC 27A20024 */  addiu     $v0, $sp, 0x24
-/* EF35D0 80240FC0 E7A00018 */  swc1      $f0, 0x18($sp)
-/* EF35D4 80240FC4 E7A2001C */  swc1      $f2, 0x1c($sp)
-/* EF35D8 80240FC8 E7A40020 */  swc1      $f4, 0x20($sp)
-/* EF35DC 80240FCC E7A60024 */  swc1      $f6, 0x24($sp)
-/* EF35E0 80240FD0 AFA20010 */  sw        $v0, 0x10($sp)
-/* EF35E4 80240FD4 8E040080 */  lw        $a0, 0x80($s0)
-/* EF35E8 80240FD8 0C03908F */  jal       func_800E423C
-/* EF35EC 80240FDC 27A70020 */   addiu    $a3, $sp, 0x20
-.L80240FE0:
-/* EF35F0 80240FE0 1040000B */  beqz      $v0, .L80241010
-/* EF35F4 80240FE4 00000000 */   nop
-/* EF35F8 80240FE8 C7A0001C */  lwc1      $f0, 0x1c($sp)
-/* EF35FC 80240FEC 46140080 */  add.s     $f2, $f0, $f20
-/* EF3600 80240FF0 C600003C */  lwc1      $f0, 0x3c($s0)
-/* EF3604 80240FF4 4600103E */  c.le.s    $f2, $f0
-/* EF3608 80240FF8 00000000 */  nop
-/* EF360C 80240FFC 4500008D */  bc1f      .L80241234
-/* EF3610 80241000 00000000 */   nop
-/* EF3614 80241004 E602003C */  swc1      $f2, 0x3c($s0)
-/* EF3618 80241008 0809048D */  j         .L80241234
-/* EF361C 8024100C AE400070 */   sw       $zero, 0x70($s2)
-.L80241010:
-/* EF3620 80241010 C602003C */  lwc1      $f2, 0x3c($s0)
-/* EF3624 80241014 C6000064 */  lwc1      $f0, 0x64($s0)
-/* EF3628 80241018 4602003E */  c.le.s    $f0, $f2
-/* EF362C 8024101C 00000000 */  nop
-/* EF3630 80241020 45030084 */  bc1tl     .L80241234
-/* EF3634 80241024 AE400070 */   sw       $zero, 0x70($s2)
-/* EF3638 80241028 0809048D */  j         .L80241234
-/* EF363C 8024102C 00000000 */   nop
-.L80241030:
-/* EF3640 80241030 4622003C */  c.lt.d    $f0, $f2
-/* EF3644 80241034 00000000 */  nop
-/* EF3648 80241038 4500007E */  bc1f      .L80241234
-/* EF364C 8024103C 00000000 */   nop
-/* EF3650 80241040 9602008E */  lhu       $v0, 0x8e($s0)
-/* EF3654 80241044 24420001 */  addiu     $v0, $v0, 1
-/* EF3658 80241048 A602008E */  sh        $v0, 0x8e($s0)
-/* EF365C 8024104C 00021400 */  sll       $v0, $v0, 0x10
-/* EF3660 80241050 8E630020 */  lw        $v1, 0x20($s3)
-/* EF3664 80241054 00021403 */  sra       $v0, $v0, 0x10
-/* EF3668 80241058 0043102A */  slt       $v0, $v0, $v1
-/* EF366C 8024105C 14400026 */  bnez      $v0, .L802410F8
-/* EF3670 80241060 00000000 */   nop
-/* EF3674 80241064 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* EF3678 80241068 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* EF367C 8024106C 3C028010 */  lui       $v0, %hi(dead_gPlayerStatusPtr)
-/* EF3680 80241070 8C42FC90 */  lw        $v0, %lo(dead_gPlayerStatusPtr)($v0)
-/* EF3684 80241074 A600008E */  sh        $zero, 0x8e($s0)
-/* EF3688 80241078 8C460028 */  lw        $a2, 0x28($v0)
-/* EF368C 8024107C 0C00ABDC */  jal       fio_validate_header_checksums
-/* EF3690 80241080 8C470030 */   lw       $a3, 0x30($v0)
-/* EF3694 80241084 46000506 */  mov.s     $f20, $f0
-/* EF3698 80241088 C60C000C */  lwc1      $f12, 0xc($s0)
-/* EF369C 8024108C 0C00ABC6 */  jal       func_8002AF18
-/* EF36A0 80241090 4600A386 */   mov.s    $f14, $f20
-/* EF36A4 80241094 46000086 */  mov.s     $f2, $f0
-/* EF36A8 80241098 8E62001C */  lw        $v0, 0x1c($s3)
-/* EF36AC 8024109C 46001005 */  abs.s     $f0, $f2
-/* EF36B0 802410A0 44822000 */  mtc1      $v0, $f4
-/* EF36B4 802410A4 00000000 */  nop
-/* EF36B8 802410A8 46802120 */  cvt.s.w   $f4, $f4
-/* EF36BC 802410AC 4600203C */  c.lt.s    $f4, $f0
-/* EF36C0 802410B0 00000000 */  nop
-/* EF36C4 802410B4 4500000D */  bc1f      .L802410EC
-/* EF36C8 802410B8 00000000 */   nop
-/* EF36CC 802410BC 44800000 */  mtc1      $zero, $f0
-/* EF36D0 802410C0 C614000C */  lwc1      $f20, 0xc($s0)
-/* EF36D4 802410C4 4600103C */  c.lt.s    $f2, $f0
-/* EF36D8 802410C8 00000000 */  nop
-/* EF36DC 802410CC 45000006 */  bc1f      .L802410E8
-/* EF36E0 802410D0 00021023 */   negu     $v0, $v0
-/* EF36E4 802410D4 44820000 */  mtc1      $v0, $f0
-/* EF36E8 802410D8 00000000 */  nop
-/* EF36EC 802410DC 46800020 */  cvt.s.w   $f0, $f0
-/* EF36F0 802410E0 0809043B */  j         .L802410EC
-/* EF36F4 802410E4 4600A500 */   add.s    $f20, $f20, $f0
-.L802410E8:
-/* EF36F8 802410E8 4604A500 */  add.s     $f20, $f20, $f4
-.L802410EC:
-/* EF36FC 802410EC 0C00AB85 */  jal       dead_clamp_angle
-/* EF3700 802410F0 4600A306 */   mov.s    $f12, $f20
-/* EF3704 802410F4 E600000C */  swc1      $f0, 0xc($s0)
-.L802410F8:
-/* EF3708 802410F8 8E020000 */  lw        $v0, ($s0)
-/* EF370C 802410FC 30420008 */  andi      $v0, $v0, 8
-/* EF3710 80241100 1040000A */  beqz      $v0, .L8024112C
-/* EF3714 80241104 27A50018 */   addiu    $a1, $sp, 0x18
-/* EF3718 80241108 C602003C */  lwc1      $f2, 0x3c($s0)
-/* EF371C 8024110C C600001C */  lwc1      $f0, 0x1c($s0)
-/* EF3720 80241110 46001080 */  add.s     $f2, $f2, $f0
-/* EF3724 80241114 4616103C */  c.lt.s    $f2, $f22
-/* EF3728 80241118 00000000 */  nop
-/* EF372C 8024111C 45020045 */  bc1fl     .L80241234
-/* EF3730 80241120 E602003C */   swc1     $f2, 0x3c($s0)
-/* EF3734 80241124 0809048C */  j         .L80241230
-/* EF3738 80241128 E616003C */   swc1     $f22, 0x3c($s0)
-.L8024112C:
-/* EF373C 8024112C C6000038 */  lwc1      $f0, 0x38($s0)
-/* EF3740 80241130 27A6001C */  addiu     $a2, $sp, 0x1c
-/* EF3744 80241134 E7A00018 */  swc1      $f0, 0x18($sp)
-/* EF3748 80241138 860200A8 */  lh        $v0, 0xa8($s0)
-/* EF374C 8024113C C600001C */  lwc1      $f0, 0x1c($s0)
-/* EF3750 80241140 C604003C */  lwc1      $f4, 0x3c($s0)
-/* EF3754 80241144 44821000 */  mtc1      $v0, $f2
-/* EF3758 80241148 00000000 */  nop
-/* EF375C 8024114C 468010A0 */  cvt.s.w   $f2, $f2
-/* EF3760 80241150 46000005 */  abs.s     $f0, $f0
-/* EF3764 80241154 46020000 */  add.s     $f0, $f0, $f2
-/* EF3768 80241158 C6060040 */  lwc1      $f6, 0x40($s0)
-/* EF376C 8024115C 27A20024 */  addiu     $v0, $sp, 0x24
-/* EF3770 80241160 46022100 */  add.s     $f4, $f4, $f2
-/* EF3774 80241164 3C014024 */  lui       $at, 0x4024
-/* EF3778 80241168 44811800 */  mtc1      $at, $f3
-/* EF377C 8024116C 44801000 */  mtc1      $zero, $f2
-/* EF3780 80241170 46000021 */  cvt.d.s   $f0, $f0
-/* EF3784 80241174 46220000 */  add.d     $f0, $f0, $f2
-/* EF3788 80241178 E7A60020 */  swc1      $f6, 0x20($sp)
-/* EF378C 8024117C E7A4001C */  swc1      $f4, 0x1c($sp)
-/* EF3790 80241180 46200020 */  cvt.s.d   $f0, $f0
-/* EF3794 80241184 E7A00024 */  swc1      $f0, 0x24($sp)
-/* EF3798 80241188 AFA20010 */  sw        $v0, 0x10($sp)
-/* EF379C 8024118C 8E040080 */  lw        $a0, 0x80($s0)
-/* EF37A0 80241190 0C03908F */  jal       func_800E423C
-/* EF37A4 80241194 27A70020 */   addiu    $a3, $sp, 0x20
-/* EF37A8 80241198 10400015 */  beqz      $v0, .L802411F0
-/* EF37AC 8024119C 00000000 */   nop
-/* EF37B0 802411A0 860200A8 */  lh        $v0, 0xa8($s0)
-/* EF37B4 802411A4 C604001C */  lwc1      $f4, 0x1c($s0)
-/* EF37B8 802411A8 44820000 */  mtc1      $v0, $f0
-/* EF37BC 802411AC 00000000 */  nop
-/* EF37C0 802411B0 46800020 */  cvt.s.w   $f0, $f0
-/* EF37C4 802411B4 46002085 */  abs.s     $f2, $f4
-/* EF37C8 802411B8 46020000 */  add.s     $f0, $f0, $f2
-/* EF37CC 802411BC C7A20024 */  lwc1      $f2, 0x24($sp)
-/* EF37D0 802411C0 4600103E */  c.le.s    $f2, $f0
-/* EF37D4 802411C4 00000000 */  nop
-/* EF37D8 802411C8 45000005 */  bc1f      .L802411E0
-/* EF37DC 802411CC 00000000 */   nop
-/* EF37E0 802411D0 C7A0001C */  lwc1      $f0, 0x1c($sp)
-/* EF37E4 802411D4 AE00001C */  sw        $zero, 0x1c($s0)
-/* EF37E8 802411D8 0809048D */  j         .L80241234
-/* EF37EC 802411DC E600003C */   swc1     $f0, 0x3c($s0)
-.L802411E0:
-/* EF37F0 802411E0 C600003C */  lwc1      $f0, 0x3c($s0)
-/* EF37F4 802411E4 46040000 */  add.s     $f0, $f0, $f4
-/* EF37F8 802411E8 0809048D */  j         .L80241234
-/* EF37FC 802411EC E600003C */   swc1     $f0, 0x3c($s0)
-.L802411F0:
-/* EF3800 802411F0 C606003C */  lwc1      $f6, 0x3c($s0)
-/* EF3804 802411F4 860200A8 */  lh        $v0, 0xa8($s0)
-/* EF3808 802411F8 46163081 */  sub.s     $f2, $f6, $f22
-/* EF380C 802411FC 44820000 */  mtc1      $v0, $f0
-/* EF3810 80241200 00000000 */  nop
-/* EF3814 80241204 46800020 */  cvt.s.w   $f0, $f0
-/* EF3818 80241208 46001080 */  add.s     $f2, $f2, $f0
-/* EF381C 8024120C C604001C */  lwc1      $f4, 0x1c($s0)
-/* EF3820 80241210 46002005 */  abs.s     $f0, $f4
-/* EF3824 80241214 4602003C */  c.lt.s    $f0, $f2
-/* EF3828 80241218 00000000 */  nop
-/* EF382C 8024121C 45020005 */  bc1fl     .L80241234
-/* EF3830 80241220 AE00001C */   sw       $zero, 0x1c($s0)
-/* EF3834 80241224 46043000 */  add.s     $f0, $f6, $f4
-/* EF3838 80241228 0809048D */  j         .L80241234
-/* EF383C 8024122C E600003C */   swc1     $f0, 0x3c($s0)
-.L80241230:
-/* EF3840 80241230 AE00001C */  sw        $zero, 0x1c($s0)
-.L80241234:
-/* EF3844 80241234 8FBF0038 */  lw        $ra, 0x38($sp)
-/* EF3848 80241238 8FB30034 */  lw        $s3, 0x34($sp)
-/* EF384C 8024123C 8FB20030 */  lw        $s2, 0x30($sp)
-/* EF3850 80241240 8FB1002C */  lw        $s1, 0x2c($sp)
-/* EF3854 80241244 8FB00028 */  lw        $s0, 0x28($sp)
-/* EF3858 80241248 D7B60048 */  ldc1      $f22, 0x48($sp)
-/* EF385C 8024124C D7B40040 */  ldc1      $f20, 0x40($sp)
-/* EF3860 80241250 03E00008 */  jr        $ra
-/* EF3864 80241254 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/EF2680/func_80241258_EF3868.s b/ver/us/asm/nonmatchings/EF2680/func_80241258_EF3868.s
deleted file mode 100644
index e2e6a0eb48..0000000000
--- a/ver/us/asm/nonmatchings/EF2680/func_80241258_EF3868.s
+++ /dev/null
@@ -1,79 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241258_EF3868
-/* EF3868 80241258 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* EF386C 8024125C AFB00028 */  sw        $s0, 0x28($sp)
-/* EF3870 80241260 00A0802D */  daddu     $s0, $a1, $zero
-/* EF3874 80241264 AFB1002C */  sw        $s1, 0x2c($sp)
-/* EF3878 80241268 00C0882D */  daddu     $s1, $a2, $zero
-/* EF387C 8024126C AFBF0034 */  sw        $ra, 0x34($sp)
-/* EF3880 80241270 AFB20030 */  sw        $s2, 0x30($sp)
-/* EF3884 80241274 AE200070 */  sw        $zero, 0x70($s1)
-/* EF3888 80241278 8C830000 */  lw        $v1, ($a0)
-/* EF388C 8024127C 2402FDFF */  addiu     $v0, $zero, -0x201
-/* EF3890 80241280 A480008E */  sh        $zero, 0x8e($a0)
-/* EF3894 80241284 00621824 */  and       $v1, $v1, $v0
-/* EF3898 80241288 34650800 */  ori       $a1, $v1, 0x800
-/* EF389C 8024128C AC850000 */  sw        $a1, ($a0)
-/* EF38A0 80241290 8E0200D0 */  lw        $v0, 0xd0($s0)
-/* EF38A4 80241294 8C420034 */  lw        $v0, 0x34($v0)
-/* EF38A8 80241298 10400003 */  beqz      $v0, .L802412A8
-/* EF38AC 8024129C 00E0902D */   daddu    $s2, $a3, $zero
-/* EF38B0 802412A0 080904AC */  j         .L802412B0
-/* EF38B4 802412A4 34620808 */   ori      $v0, $v1, 0x808
-.L802412A8:
-/* EF38B8 802412A8 2402FFF7 */  addiu     $v0, $zero, -9
-/* EF38BC 802412AC 00A21024 */  and       $v0, $a1, $v0
-.L802412B0:
-/* EF38C0 802412B0 AC820000 */  sw        $v0, ($a0)
-/* EF38C4 802412B4 27A20024 */  addiu     $v0, $sp, 0x24
-/* EF38C8 802412B8 27A50018 */  addiu     $a1, $sp, 0x18
-/* EF38CC 802412BC C4800038 */  lwc1      $f0, 0x38($a0)
-/* EF38D0 802412C0 C482003C */  lwc1      $f2, 0x3c($a0)
-/* EF38D4 802412C4 C4840040 */  lwc1      $f4, 0x40($a0)
-/* EF38D8 802412C8 3C01447A */  lui       $at, 0x447a
-/* EF38DC 802412CC 44813000 */  mtc1      $at, $f6
-/* EF38E0 802412D0 27A6001C */  addiu     $a2, $sp, 0x1c
-/* EF38E4 802412D4 E7A00018 */  swc1      $f0, 0x18($sp)
-/* EF38E8 802412D8 E7A2001C */  swc1      $f2, 0x1c($sp)
-/* EF38EC 802412DC E7A40020 */  swc1      $f4, 0x20($sp)
-/* EF38F0 802412E0 E7A60024 */  swc1      $f6, 0x24($sp)
-/* EF38F4 802412E4 AFA20010 */  sw        $v0, 0x10($sp)
-/* EF38F8 802412E8 8C840080 */  lw        $a0, 0x80($a0)
-/* EF38FC 802412EC 0C03908F */  jal       func_800E423C
-/* EF3900 802412F0 27A70020 */   addiu    $a3, $sp, 0x20
-/* EF3904 802412F4 C7A20024 */  lwc1      $f2, 0x24($sp)
-/* EF3908 802412F8 3C014059 */  lui       $at, 0x4059
-/* EF390C 802412FC 44812800 */  mtc1      $at, $f5
-/* EF3910 80241300 44802000 */  mtc1      $zero, $f4
-/* EF3914 80241304 460010A1 */  cvt.d.s   $f2, $f2
-/* EF3918 80241308 46241082 */  mul.d     $f2, $f2, $f4
-/* EF391C 8024130C 00000000 */  nop
-/* EF3920 80241310 C7A0001C */  lwc1      $f0, 0x1c($sp)
-/* EF3924 80241314 46000021 */  cvt.d.s   $f0, $f0
-/* EF3928 80241318 46240002 */  mul.d     $f0, $f0, $f4
-/* EF392C 8024131C 00000000 */  nop
-/* EF3930 80241320 3C013FE0 */  lui       $at, 0x3fe0
-/* EF3934 80241324 44812800 */  mtc1      $at, $f5
-/* EF3938 80241328 44802000 */  mtc1      $zero, $f4
-/* EF393C 8024132C 00000000 */  nop
-/* EF3940 80241330 46241080 */  add.d     $f2, $f2, $f4
-/* EF3944 80241334 AE000074 */  sw        $zero, 0x74($s0)
-/* EF3948 80241338 46240000 */  add.d     $f0, $f0, $f4
-/* EF394C 8024133C AE000090 */  sw        $zero, 0x90($s0)
-/* EF3950 80241340 4620120D */  trunc.w.d $f8, $f2
-/* EF3954 80241344 E6080078 */  swc1      $f8, 0x78($s0)
-/* EF3958 80241348 4620020D */  trunc.w.d $f8, $f0
-/* EF395C 8024134C E6080088 */  swc1      $f8, 0x88($s0)
-/* EF3960 80241350 8E420014 */  lw        $v0, 0x14($s2)
-/* EF3964 80241354 AE220074 */  sw        $v0, 0x74($s1)
-/* EF3968 80241358 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* EF396C 8024135C 34420010 */  ori       $v0, $v0, 0x10
-/* EF3970 80241360 AE0200B0 */  sw        $v0, 0xb0($s0)
-/* EF3974 80241364 8FBF0034 */  lw        $ra, 0x34($sp)
-/* EF3978 80241368 8FB20030 */  lw        $s2, 0x30($sp)
-/* EF397C 8024136C 8FB1002C */  lw        $s1, 0x2c($sp)
-/* EF3980 80241370 8FB00028 */  lw        $s0, 0x28($sp)
-/* EF3984 80241374 03E00008 */  jr        $ra
-/* EF3988 80241378 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s b/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s
index b8d3e1ad20..c1b67124c5 100644
--- a/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s
+++ b/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s
@@ -64,7 +64,7 @@ glabel func_8024137C_EF398C
 /* EF3A5C 8024144C 0280202D */  daddu     $a0, $s4, $zero
 /* EF3A60 80241450 0240282D */  daddu     $a1, $s2, $zero
 /* EF3A64 80241454 02A0302D */  daddu     $a2, $s5, $zero
-/* EF3A68 80241458 0C090496 */  jal       func_80241258_EF3868
+/* EF3A68 80241458 0C090496 */  jal       EF2680_UnkFunc5
 /* EF3A6C 8024145C 0200382D */   daddu    $a3, $s0, $zero
 .L80241460:
 /* EF3A70 80241460 2402FFFE */  addiu     $v0, $zero, -2
@@ -109,14 +109,14 @@ glabel L802414DC_EF3AEC
 glabel L802414EC_EF3AFC
 /* EF3AFC 802414EC 02A0202D */  daddu     $a0, $s5, $zero
 /* EF3B00 802414F0 0200282D */  daddu     $a1, $s0, $zero
-/* EF3B04 802414F4 0C090242 */  jal       func_80240908_EF2F18
+/* EF3B04 802414F4 0C090242 */  jal       EF2680_UnkFunc4
 /* EF3B08 802414F8 0260302D */   daddu    $a2, $s3, $zero
 /* EF3B0C 802414FC 0809055C */  j         .L80241570
 /* EF3B10 80241500 0000102D */   daddu    $v0, $zero, $zero
 glabel L80241504_EF3B14
 /* EF3B14 80241504 02A0202D */  daddu     $a0, $s5, $zero
 /* EF3B18 80241508 0200282D */  daddu     $a1, $s0, $zero
-/* EF3B1C 8024150C 0C090313 */  jal       func_80240C4C_EF325C
+/* EF3B1C 8024150C 0C090313 */  jal       EF2680_UnkNpcAIFunc2
 /* EF3B20 80241510 0260302D */   daddu    $a2, $s3, $zero
 glabel L80241514_EF3B24
 /* EF3B24 80241514 02A0202D */  daddu     $a0, $s5, $zero
@@ -135,14 +135,14 @@ glabel L8024152C_EF3B3C
 glabel L80241544_EF3B54
 /* EF3B54 80241544 02A0202D */  daddu     $a0, $s5, $zero
 /* EF3B58 80241548 0200282D */  daddu     $a1, $s0, $zero
-/* EF3B5C 8024154C 0C090399 */  jal       func_80240E64_EF3474
+/* EF3B5C 8024154C 0C090399 */  jal       EF2680_UnkNpcAIFunc3
 /* EF3B60 80241550 0260302D */   daddu    $a2, $s3, $zero
 /* EF3B64 80241554 0809055C */  j         .L80241570
 /* EF3B68 80241558 0000102D */   daddu    $v0, $zero, $zero
 glabel L8024155C_EF3B6C
 /* EF3B6C 8024155C 02A0202D */  daddu     $a0, $s5, $zero
 /* EF3B70 80241560 0200282D */  daddu     $a1, $s0, $zero
-/* EF3B74 80241564 0C0903B2 */  jal       func_80240EC8_EF34D8
+/* EF3B74 80241564 0C0903B2 */  jal       EF2680_UnkFunc6
 /* EF3B78 80241568 0260302D */   daddu    $a2, $s3, $zero
 glabel L8024156C_EF3B7C
 /* EF3B7C 8024156C 0000102D */  daddu     $v0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/EF2680/func_80241594_EF3BA4.s b/ver/us/asm/nonmatchings/EF2680/func_80241594_EF3BA4.s
deleted file mode 100644
index 3b228fb3d0..0000000000
--- a/ver/us/asm/nonmatchings/EF2680/func_80241594_EF3BA4.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241594_EF3BA4
-/* EF3BA4 80241594 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EF3BA8 80241598 AFB00010 */  sw        $s0, 0x10($sp)
-/* EF3BAC 8024159C 24100032 */  addiu     $s0, $zero, 0x32
-/* EF3BB0 802415A0 AFBF0014 */  sw        $ra, 0x14($sp)
-.L802415A4:
-/* EF3BB4 802415A4 0C010ABD */  jal       func_80042AF4
-/* EF3BB8 802415A8 0200202D */   daddu    $a0, $s0, $zero
-/* EF3BBC 802415AC 8C420094 */  lw        $v0, 0x94($v0)
-/* EF3BC0 802415B0 54400003 */  bnel      $v0, $zero, .L802415C0
-/* EF3BC4 802415B4 26100001 */   addiu    $s0, $s0, 1
-/* EF3BC8 802415B8 08090573 */  j         .L802415CC
-/* EF3BCC 802415BC 0200102D */   daddu    $v0, $s0, $zero
-.L802415C0:
-/* EF3BD0 802415C0 2A020036 */  slti      $v0, $s0, 0x36
-/* EF3BD4 802415C4 1440FFF7 */  bnez      $v0, .L802415A4
-/* EF3BD8 802415C8 2402FFFF */   addiu    $v0, $zero, -1
-.L802415CC:
-/* EF3BDC 802415CC 8FBF0014 */  lw        $ra, 0x14($sp)
-/* EF3BE0 802415D0 8FB00010 */  lw        $s0, 0x10($sp)
-/* EF3BE4 802415D4 03E00008 */  jr        $ra
-/* EF3BE8 802415D8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/EF2680/func_802415DC_EF3BEC.s b/ver/us/asm/nonmatchings/EF2680/func_802415DC_EF3BEC.s
deleted file mode 100644
index 0abc18bc2e..0000000000
--- a/ver/us/asm/nonmatchings/EF2680/func_802415DC_EF3BEC.s
+++ /dev/null
@@ -1,295 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802415DC_EF3BEC
-/* EF3BEC 802415DC 27BDFF78 */  addiu     $sp, $sp, -0x88
-/* EF3BF0 802415E0 AFB20048 */  sw        $s2, 0x48($sp)
-/* EF3BF4 802415E4 0080902D */  daddu     $s2, $a0, $zero
-/* EF3BF8 802415E8 AFBF0064 */  sw        $ra, 0x64($sp)
-/* EF3BFC 802415EC AFBE0060 */  sw        $fp, 0x60($sp)
-/* EF3C00 802415F0 AFB7005C */  sw        $s7, 0x5c($sp)
-/* EF3C04 802415F4 AFB60058 */  sw        $s6, 0x58($sp)
-/* EF3C08 802415F8 AFB50054 */  sw        $s5, 0x54($sp)
-/* EF3C0C 802415FC AFB40050 */  sw        $s4, 0x50($sp)
-/* EF3C10 80241600 AFB3004C */  sw        $s3, 0x4c($sp)
-/* EF3C14 80241604 AFB10044 */  sw        $s1, 0x44($sp)
-/* EF3C18 80241608 AFB00040 */  sw        $s0, 0x40($sp)
-/* EF3C1C 8024160C F7BA0080 */  sdc1      $f26, 0x80($sp)
-/* EF3C20 80241610 F7B80078 */  sdc1      $f24, 0x78($sp)
-/* EF3C24 80241614 F7B60070 */  sdc1      $f22, 0x70($sp)
-/* EF3C28 80241618 F7B40068 */  sdc1      $f20, 0x68($sp)
-/* EF3C2C 8024161C 8E510148 */  lw        $s1, 0x148($s2)
-/* EF3C30 80241620 00A0B82D */  daddu     $s7, $a1, $zero
-/* EF3C34 80241624 86240008 */  lh        $a0, 8($s1)
-/* EF3C38 80241628 0C00F92F */  jal       dead_get_npc_unsafe
-/* EF3C3C 8024162C 00C0F02D */   daddu    $fp, $a2, $zero
-/* EF3C40 80241630 C620007C */  lwc1      $f0, 0x7c($s1)
-/* EF3C44 80241634 46800020 */  cvt.s.w   $f0, $f0
-/* EF3C48 80241638 46000021 */  cvt.d.s   $f0, $f0
-/* EF3C4C 8024163C 0040802D */  daddu     $s0, $v0, $zero
-/* EF3C50 80241640 3C014059 */  lui       $at, 0x4059
-/* EF3C54 80241644 44813800 */  mtc1      $at, $f7
-/* EF3C58 80241648 44803000 */  mtc1      $zero, $f6
-/* EF3C5C 8024164C 8602008E */  lh        $v0, 0x8e($s0)
-/* EF3C60 80241650 9603008E */  lhu       $v1, 0x8e($s0)
-/* EF3C64 80241654 46260003 */  div.d     $f0, $f0, $f6
-/* EF3C68 80241658 462005A0 */  cvt.s.d   $f22, $f0
-/* EF3C6C 8024165C C6200078 */  lwc1      $f0, 0x78($s1)
-/* EF3C70 80241660 46800020 */  cvt.s.w   $f0, $f0
-/* EF3C74 80241664 46000021 */  cvt.d.s   $f0, $f0
-/* EF3C78 80241668 46260003 */  div.d     $f0, $f0, $f6
-/* EF3C7C 8024166C 18400003 */  blez      $v0, .L8024167C
-/* EF3C80 80241670 46200620 */   cvt.s.d  $f24, $f0
-/* EF3C84 80241674 2462FFFF */  addiu     $v0, $v1, -1
-/* EF3C88 80241678 A602008E */  sh        $v0, 0x8e($s0)
-.L8024167C:
-/* EF3C8C 8024167C 27B40028 */  addiu     $s4, $sp, 0x28
-/* EF3C90 80241680 0280282D */  daddu     $a1, $s4, $zero
-/* EF3C94 80241684 27B5002C */  addiu     $s5, $sp, 0x2c
-/* EF3C98 80241688 02A0302D */  daddu     $a2, $s5, $zero
-/* EF3C9C 8024168C 27B60030 */  addiu     $s6, $sp, 0x30
-/* EF3CA0 80241690 02C0382D */  daddu     $a3, $s6, $zero
-/* EF3CA4 80241694 C6000038 */  lwc1      $f0, 0x38($s0)
-/* EF3CA8 80241698 C602003C */  lwc1      $f2, 0x3c($s0)
-/* EF3CAC 8024169C C6040040 */  lwc1      $f4, 0x40($s0)
-/* EF3CB0 802416A0 3C01447A */  lui       $at, 0x447a
-/* EF3CB4 802416A4 4481D000 */  mtc1      $at, $f26
-/* EF3CB8 802416A8 27B30034 */  addiu     $s3, $sp, 0x34
-/* EF3CBC 802416AC E7A00028 */  swc1      $f0, 0x28($sp)
-/* EF3CC0 802416B0 E7A2002C */  swc1      $f2, 0x2c($sp)
-/* EF3CC4 802416B4 E7A40030 */  swc1      $f4, 0x30($sp)
-/* EF3CC8 802416B8 E7BA0034 */  swc1      $f26, 0x34($sp)
-/* EF3CCC 802416BC C6340070 */  lwc1      $f20, 0x70($s1)
-/* EF3CD0 802416C0 4680A520 */  cvt.s.w   $f20, $f20
-/* EF3CD4 802416C4 4600A521 */  cvt.d.s   $f20, $f20
-/* EF3CD8 802416C8 4626A503 */  div.d     $f20, $f20, $f6
-/* EF3CDC 802416CC AFB30010 */  sw        $s3, 0x10($sp)
-/* EF3CE0 802416D0 8E040080 */  lw        $a0, 0x80($s0)
-/* EF3CE4 802416D4 0C03908F */  jal       func_800E423C
-/* EF3CE8 802416D8 4620A520 */   cvt.s.d  $f20, $f20
-/* EF3CEC 802416DC C62C0074 */  lwc1      $f12, 0x74($s1)
-/* EF3CF0 802416E0 0C00AD77 */  jal       func_8002B5DC
-/* EF3CF4 802416E4 46806320 */   cvt.s.w  $f12, $f12
-/* EF3CF8 802416E8 46140002 */  mul.s     $f0, $f0, $f20
-/* EF3CFC 802416EC 00000000 */  nop
-/* EF3D00 802416F0 C7A2002C */  lwc1      $f2, 0x2c($sp)
-/* EF3D04 802416F4 46181080 */  add.s     $f2, $f2, $f24
-/* EF3D08 802416F8 46001080 */  add.s     $f2, $f2, $f0
-/* EF3D0C 802416FC E602003C */  swc1      $f2, 0x3c($s0)
-/* EF3D10 80241700 8E220074 */  lw        $v0, 0x74($s1)
-/* EF3D14 80241704 2442000C */  addiu     $v0, $v0, 0xc
-/* EF3D18 80241708 44826000 */  mtc1      $v0, $f12
-/* EF3D1C 8024170C 00000000 */  nop
-/* EF3D20 80241710 0C00AB85 */  jal       dead_clamp_angle
-/* EF3D24 80241714 46806320 */   cvt.s.w  $f12, $f12
-/* EF3D28 80241718 4600020D */  trunc.w.s $f8, $f0
-/* EF3D2C 8024171C E6280074 */  swc1      $f8, 0x74($s1)
-/* EF3D30 80241720 8EE30014 */  lw        $v1, 0x14($s7)
-/* EF3D34 80241724 0460003C */  bltz      $v1, .L80241818
-/* EF3D38 80241728 00000000 */   nop
-/* EF3D3C 8024172C 8E420074 */  lw        $v0, 0x74($s2)
-/* EF3D40 80241730 1C400038 */  bgtz      $v0, .L80241814
-/* EF3D44 80241734 2442FFFF */   addiu    $v0, $v0, -1
-/* EF3D48 80241738 03C0202D */  daddu     $a0, $fp, $zero
-/* EF3D4C 8024173C AE430074 */  sw        $v1, 0x74($s2)
-/* EF3D50 80241740 AFA00010 */  sw        $zero, 0x10($sp)
-/* EF3D54 80241744 8EE6000C */  lw        $a2, 0xc($s7)
-/* EF3D58 80241748 8EE70010 */  lw        $a3, 0x10($s7)
-/* EF3D5C 8024174C 0C013469 */  jal       func_8004D1A4
-/* EF3D60 80241750 0220282D */   daddu    $a1, $s1, $zero
-/* EF3D64 80241754 1040002D */  beqz      $v0, .L8024180C
-/* EF3D68 80241758 0000202D */   daddu    $a0, $zero, $zero
-/* EF3D6C 8024175C 0200282D */  daddu     $a1, $s0, $zero
-/* EF3D70 80241760 0000302D */  daddu     $a2, $zero, $zero
-/* EF3D74 80241764 860300A8 */  lh        $v1, 0xa8($s0)
-/* EF3D78 80241768 3C013F80 */  lui       $at, 0x3f80
-/* EF3D7C 8024176C 44810000 */  mtc1      $at, $f0
-/* EF3D80 80241770 3C014000 */  lui       $at, 0x4000
-/* EF3D84 80241774 44811000 */  mtc1      $at, $f2
-/* EF3D88 80241778 3C01C1A0 */  lui       $at, 0xc1a0
-/* EF3D8C 8024177C 44812000 */  mtc1      $at, $f4
-/* EF3D90 80241780 2402000F */  addiu     $v0, $zero, 0xf
-/* EF3D94 80241784 AFA2001C */  sw        $v0, 0x1c($sp)
-/* EF3D98 80241788 44834000 */  mtc1      $v1, $f8
-/* EF3D9C 8024178C 00000000 */  nop
-/* EF3DA0 80241790 46804220 */  cvt.s.w   $f8, $f8
-/* EF3DA4 80241794 44074000 */  mfc1      $a3, $f8
-/* EF3DA8 80241798 27A20038 */  addiu     $v0, $sp, 0x38
-/* EF3DAC 8024179C AFA20020 */  sw        $v0, 0x20($sp)
-/* EF3DB0 802417A0 E7A00010 */  swc1      $f0, 0x10($sp)
-/* EF3DB4 802417A4 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EF3DB8 802417A8 0C01D444 */  jal       func_80075110
-/* EF3DBC 802417AC E7A40018 */   swc1     $f4, 0x18($sp)
-/* EF3DC0 802417B0 0200202D */  daddu     $a0, $s0, $zero
-/* EF3DC4 802417B4 240502F4 */  addiu     $a1, $zero, 0x2f4
-/* EF3DC8 802417B8 0C013600 */  jal       func_8004D800
-/* EF3DCC 802417BC 3C060020 */   lui      $a2, 0x20
-/* EF3DD0 802417C0 0280282D */  daddu     $a1, $s4, $zero
-/* EF3DD4 802417C4 C6000038 */  lwc1      $f0, 0x38($s0)
-/* EF3DD8 802417C8 C602003C */  lwc1      $f2, 0x3c($s0)
-/* EF3DDC 802417CC C6040040 */  lwc1      $f4, 0x40($s0)
-/* EF3DE0 802417D0 02A0302D */  daddu     $a2, $s5, $zero
-/* EF3DE4 802417D4 E7BA0034 */  swc1      $f26, 0x34($sp)
-/* EF3DE8 802417D8 E7A00028 */  swc1      $f0, 0x28($sp)
-/* EF3DEC 802417DC E7A2002C */  swc1      $f2, 0x2c($sp)
-/* EF3DF0 802417E0 E7A40030 */  swc1      $f4, 0x30($sp)
-/* EF3DF4 802417E4 AFB30010 */  sw        $s3, 0x10($sp)
-/* EF3DF8 802417E8 8E040080 */  lw        $a0, 0x80($s0)
-/* EF3DFC 802417EC 0C03908F */  jal       func_800E423C
-/* EF3E00 802417F0 02C0382D */   daddu    $a3, $s6, $zero
-/* EF3E04 802417F4 C7A0002C */  lwc1      $f0, 0x2c($sp)
-/* EF3E08 802417F8 46180000 */  add.s     $f0, $f0, $f24
-/* EF3E0C 802417FC 2402000C */  addiu     $v0, $zero, 0xc
-/* EF3E10 80241800 E6000064 */  swc1      $f0, 0x64($s0)
-/* EF3E14 80241804 08090680 */  j         .L80241A00
-/* EF3E18 80241808 AE420070 */   sw       $v0, 0x70($s2)
-.L8024180C:
-/* EF3E1C 8024180C 8E420074 */  lw        $v0, 0x74($s2)
-/* EF3E20 80241810 2442FFFF */  addiu     $v0, $v0, -1
-.L80241814:
-/* EF3E24 80241814 AE420074 */  sw        $v0, 0x74($s2)
-.L80241818:
-/* EF3E28 80241818 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* EF3E2C 8024181C C6000040 */  lwc1      $f0, 0x40($s0)
-/* EF3E30 80241820 C4620000 */  lwc1      $f2, ($v1)
-/* EF3E34 80241824 468010A0 */  cvt.s.w   $f2, $f2
-/* EF3E38 80241828 C4640008 */  lwc1      $f4, 8($v1)
-/* EF3E3C 8024182C 46802120 */  cvt.s.w   $f4, $f4
-/* EF3E40 80241830 E7A00010 */  swc1      $f0, 0x10($sp)
-/* EF3E44 80241834 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* EF3E48 80241838 44051000 */  mfc1      $a1, $f2
-/* EF3E4C 8024183C C440000C */  lwc1      $f0, 0xc($v0)
-/* EF3E50 80241840 46800020 */  cvt.s.w   $f0, $f0
-/* EF3E54 80241844 E7A00014 */  swc1      $f0, 0x14($sp)
-/* EF3E58 80241848 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* EF3E5C 8024184C 44062000 */  mfc1      $a2, $f4
-/* EF3E60 80241850 C4400010 */  lwc1      $f0, 0x10($v0)
-/* EF3E64 80241854 46800020 */  cvt.s.w   $f0, $f0
-/* EF3E68 80241858 E7A00018 */  swc1      $f0, 0x18($sp)
-/* EF3E6C 8024185C 8C640018 */  lw        $a0, 0x18($v1)
-/* EF3E70 80241860 0C013431 */  jal       func_8004D0C4
-/* EF3E74 80241864 8E070038 */   lw       $a3, 0x38($s0)
-/* EF3E78 80241868 1040000D */  beqz      $v0, .L802418A0
-/* EF3E7C 8024186C 00000000 */   nop
-/* EF3E80 80241870 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* EF3E84 80241874 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* EF3E88 80241878 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* EF3E8C 8024187C C4480000 */  lwc1      $f8, ($v0)
-/* EF3E90 80241880 46804220 */  cvt.s.w   $f8, $f8
-/* EF3E94 80241884 44064000 */  mfc1      $a2, $f8
-/* EF3E98 80241888 C4480008 */  lwc1      $f8, 8($v0)
-/* EF3E9C 8024188C 46804220 */  cvt.s.w   $f8, $f8
-/* EF3EA0 80241890 44074000 */  mfc1      $a3, $f8
-/* EF3EA4 80241894 0C00ABDC */  jal       fio_validate_header_checksums
-/* EF3EA8 80241898 00000000 */   nop
-/* EF3EAC 8024189C E600000C */  swc1      $f0, 0xc($s0)
-.L802418A0:
-/* EF3EB0 802418A0 8602008C */  lh        $v0, 0x8c($s0)
-/* EF3EB4 802418A4 14400056 */  bnez      $v0, .L80241A00
-/* EF3EB8 802418A8 00000000 */   nop
-/* EF3EBC 802418AC 8602008E */  lh        $v0, 0x8e($s0)
-/* EF3EC0 802418B0 1840003D */  blez      $v0, .L802419A8
-/* EF3EC4 802418B4 240403E8 */   addiu    $a0, $zero, 0x3e8
-/* EF3EC8 802418B8 8E050018 */  lw        $a1, 0x18($s0)
-/* EF3ECC 802418BC 8E06000C */  lw        $a2, 0xc($s0)
-/* EF3ED0 802418C0 0C00F909 */  jal       func_8003E424
-/* EF3ED4 802418C4 0200202D */   daddu    $a0, $s0, $zero
-/* EF3ED8 802418C8 8E22006C */  lw        $v0, 0x6c($s1)
-/* EF3EDC 802418CC 30420001 */  andi      $v0, $v0, 1
-/* EF3EE0 802418D0 10400032 */  beqz      $v0, .L8024199C
-/* EF3EE4 802418D4 27A50028 */   addiu    $a1, $sp, 0x28
-/* EF3EE8 802418D8 27A6002C */  addiu     $a2, $sp, 0x2c
-/* EF3EEC 802418DC C6000038 */  lwc1      $f0, 0x38($s0)
-/* EF3EF0 802418E0 C6020040 */  lwc1      $f2, 0x40($s0)
-/* EF3EF4 802418E4 3C01447A */  lui       $at, 0x447a
-/* EF3EF8 802418E8 44812000 */  mtc1      $at, $f4
-/* EF3EFC 802418EC 27A20034 */  addiu     $v0, $sp, 0x34
-/* EF3F00 802418F0 E7B6002C */  swc1      $f22, 0x2c($sp)
-/* EF3F04 802418F4 E7A00028 */  swc1      $f0, 0x28($sp)
-/* EF3F08 802418F8 E7A20030 */  swc1      $f2, 0x30($sp)
-/* EF3F0C 802418FC E7A40034 */  swc1      $f4, 0x34($sp)
-/* EF3F10 80241900 AFA20010 */  sw        $v0, 0x10($sp)
-/* EF3F14 80241904 8E040080 */  lw        $a0, 0x80($s0)
-/* EF3F18 80241908 0C03908F */  jal       func_800E423C
-/* EF3F1C 8024190C 27A70030 */   addiu    $a3, $sp, 0x30
-/* EF3F20 80241910 C7A0002C */  lwc1      $f0, 0x2c($sp)
-/* EF3F24 80241914 46180100 */  add.s     $f4, $f0, $f24
-/* EF3F28 80241918 3C014000 */  lui       $at, 0x4000
-/* EF3F2C 8024191C 44813800 */  mtc1      $at, $f7
-/* EF3F30 80241920 44803000 */  mtc1      $zero, $f6
-/* EF3F34 80241924 46162001 */  sub.s     $f0, $f4, $f22
-/* EF3F38 80241928 E7A4002C */  swc1      $f4, 0x2c($sp)
-/* EF3F3C 8024192C 460000A1 */  cvt.d.s   $f2, $f0
-/* EF3F40 80241930 4622303C */  c.lt.d    $f6, $f2
-/* EF3F44 80241934 00000000 */  nop
-/* EF3F48 80241938 45000005 */  bc1f      .L80241950
-/* EF3F4C 8024193C E7A00034 */   swc1     $f0, 0x34($sp)
-/* EF3F50 80241940 4600B021 */  cvt.d.s   $f0, $f22
-/* EF3F54 80241944 46260000 */  add.d     $f0, $f0, $f6
-/* EF3F58 80241948 0809065F */  j         .L8024197C
-/* EF3F5C 8024194C 462005A0 */   cvt.s.d  $f22, $f0
-.L80241950:
-/* EF3F60 80241950 3C01C000 */  lui       $at, 0xc000
-/* EF3F64 80241954 44810800 */  mtc1      $at, $f1
-/* EF3F68 80241958 44800000 */  mtc1      $zero, $f0
-/* EF3F6C 8024195C 00000000 */  nop
-/* EF3F70 80241960 4620103C */  c.lt.d    $f2, $f0
-/* EF3F74 80241964 00000000 */  nop
-/* EF3F78 80241968 45020004 */  bc1fl     .L8024197C
-/* EF3F7C 8024196C 46002586 */   mov.s    $f22, $f4
-/* EF3F80 80241970 4600B021 */  cvt.d.s   $f0, $f22
-/* EF3F84 80241974 46260001 */  sub.d     $f0, $f0, $f6
-/* EF3F88 80241978 462005A0 */  cvt.s.d   $f22, $f0
-.L8024197C:
-/* EF3F8C 8024197C 3C014059 */  lui       $at, 0x4059
-/* EF3F90 80241980 44811800 */  mtc1      $at, $f3
-/* EF3F94 80241984 44801000 */  mtc1      $zero, $f2
-/* EF3F98 80241988 4600B021 */  cvt.d.s   $f0, $f22
-/* EF3F9C 8024198C 46220002 */  mul.d     $f0, $f0, $f2
-/* EF3FA0 80241990 00000000 */  nop
-/* EF3FA4 80241994 4620020D */  trunc.w.d $f8, $f0
-/* EF3FA8 80241998 E628007C */  swc1      $f8, 0x7c($s1)
-.L8024199C:
-/* EF3FAC 8024199C 8602008E */  lh        $v0, 0x8e($s0)
-/* EF3FB0 802419A0 1C400017 */  bgtz      $v0, .L80241A00
-/* EF3FB4 802419A4 240403E8 */   addiu    $a0, $zero, 0x3e8
-.L802419A8:
-/* EF3FB8 802419A8 24020002 */  addiu     $v0, $zero, 2
-/* EF3FBC 802419AC 0C00AB3B */  jal       dead_rand_int
-/* EF3FC0 802419B0 AE420070 */   sw       $v0, 0x70($s2)
-/* EF3FC4 802419B4 3C035555 */  lui       $v1, 0x5555
-/* EF3FC8 802419B8 34635556 */  ori       $v1, $v1, 0x5556
-/* EF3FCC 802419BC 00430018 */  mult      $v0, $v1
-/* EF3FD0 802419C0 000227C3 */  sra       $a0, $v0, 0x1f
-/* EF3FD4 802419C4 00004010 */  mfhi      $t0
-/* EF3FD8 802419C8 01042023 */  subu      $a0, $t0, $a0
-/* EF3FDC 802419CC 00041840 */  sll       $v1, $a0, 1
-/* EF3FE0 802419D0 00641821 */  addu      $v1, $v1, $a0
-/* EF3FE4 802419D4 00431023 */  subu      $v0, $v0, $v1
-/* EF3FE8 802419D8 24430002 */  addiu     $v1, $v0, 2
-/* EF3FEC 802419DC AE430074 */  sw        $v1, 0x74($s2)
-/* EF3FF0 802419E0 8EE2002C */  lw        $v0, 0x2c($s7)
-/* EF3FF4 802419E4 58400006 */  blezl     $v0, .L80241A00
-/* EF3FF8 802419E8 AE400070 */   sw       $zero, 0x70($s2)
-/* EF3FFC 802419EC 8EE20004 */  lw        $v0, 4($s7)
-/* EF4000 802419F0 58400003 */  blezl     $v0, .L80241A00
-/* EF4004 802419F4 AE400070 */   sw       $zero, 0x70($s2)
-/* EF4008 802419F8 50600001 */  beql      $v1, $zero, .L80241A00
-/* EF400C 802419FC AE400070 */   sw       $zero, 0x70($s2)
-.L80241A00:
-/* EF4010 80241A00 8FBF0064 */  lw        $ra, 0x64($sp)
-/* EF4014 80241A04 8FBE0060 */  lw        $fp, 0x60($sp)
-/* EF4018 80241A08 8FB7005C */  lw        $s7, 0x5c($sp)
-/* EF401C 80241A0C 8FB60058 */  lw        $s6, 0x58($sp)
-/* EF4020 80241A10 8FB50054 */  lw        $s5, 0x54($sp)
-/* EF4024 80241A14 8FB40050 */  lw        $s4, 0x50($sp)
-/* EF4028 80241A18 8FB3004C */  lw        $s3, 0x4c($sp)
-/* EF402C 80241A1C 8FB20048 */  lw        $s2, 0x48($sp)
-/* EF4030 80241A20 8FB10044 */  lw        $s1, 0x44($sp)
-/* EF4034 80241A24 8FB00040 */  lw        $s0, 0x40($sp)
-/* EF4038 80241A28 D7BA0080 */  ldc1      $f26, 0x80($sp)
-/* EF403C 80241A2C D7B80078 */  ldc1      $f24, 0x78($sp)
-/* EF4040 80241A30 D7B60070 */  ldc1      $f22, 0x70($sp)
-/* EF4044 80241A34 D7B40068 */  ldc1      $f20, 0x68($sp)
-/* EF4048 80241A38 03E00008 */  jr        $ra
-/* EF404C 80241A3C 27BD0088 */   addiu    $sp, $sp, 0x88
diff --git a/ver/us/asm/nonmatchings/EF2680/func_80241A40_EF4050.s b/ver/us/asm/nonmatchings/EF2680/func_80241A40_EF4050.s
deleted file mode 100644
index fb51331ed6..0000000000
--- a/ver/us/asm/nonmatchings/EF2680/func_80241A40_EF4050.s
+++ /dev/null
@@ -1,156 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241A40_EF4050
-/* EF4050 80241A40 27BDFF98 */  addiu     $sp, $sp, -0x68
-/* EF4054 80241A44 AFB20048 */  sw        $s2, 0x48($sp)
-/* EF4058 80241A48 0080902D */  daddu     $s2, $a0, $zero
-/* EF405C 80241A4C AFBF0054 */  sw        $ra, 0x54($sp)
-/* EF4060 80241A50 AFB40050 */  sw        $s4, 0x50($sp)
-/* EF4064 80241A54 AFB3004C */  sw        $s3, 0x4c($sp)
-/* EF4068 80241A58 AFB10044 */  sw        $s1, 0x44($sp)
-/* EF406C 80241A5C AFB00040 */  sw        $s0, 0x40($sp)
-/* EF4070 80241A60 F7B60060 */  sdc1      $f22, 0x60($sp)
-/* EF4074 80241A64 F7B40058 */  sdc1      $f20, 0x58($sp)
-/* EF4078 80241A68 8E510148 */  lw        $s1, 0x148($s2)
-/* EF407C 80241A6C 00A0982D */  daddu     $s3, $a1, $zero
-/* EF4080 80241A70 86240008 */  lh        $a0, 8($s1)
-/* EF4084 80241A74 0C00F92F */  jal       dead_get_npc_unsafe
-/* EF4088 80241A78 00C0A02D */   daddu    $s4, $a2, $zero
-/* EF408C 80241A7C 0040802D */  daddu     $s0, $v0, $zero
-/* EF4090 80241A80 C6200078 */  lwc1      $f0, 0x78($s1)
-/* EF4094 80241A84 46800020 */  cvt.s.w   $f0, $f0
-/* EF4098 80241A88 46000021 */  cvt.d.s   $f0, $f0
-/* EF409C 80241A8C 3C014059 */  lui       $at, 0x4059
-/* EF40A0 80241A90 44814800 */  mtc1      $at, $f9
-/* EF40A4 80241A94 44804000 */  mtc1      $zero, $f8
-/* EF40A8 80241A98 8602008E */  lh        $v0, 0x8e($s0)
-/* EF40AC 80241A9C 9603008E */  lhu       $v1, 0x8e($s0)
-/* EF40B0 80241AA0 46280003 */  div.d     $f0, $f0, $f8
-/* EF40B4 80241AA4 18400003 */  blez      $v0, .L80241AB4
-/* EF40B8 80241AA8 462005A0 */   cvt.s.d  $f22, $f0
-/* EF40BC 80241AAC 2462FFFF */  addiu     $v0, $v1, -1
-/* EF40C0 80241AB0 A602008E */  sh        $v0, 0x8e($s0)
-.L80241AB4:
-/* EF40C4 80241AB4 27A50028 */  addiu     $a1, $sp, 0x28
-/* EF40C8 80241AB8 27A6002C */  addiu     $a2, $sp, 0x2c
-/* EF40CC 80241ABC 27A70030 */  addiu     $a3, $sp, 0x30
-/* EF40D0 80241AC0 C6000038 */  lwc1      $f0, 0x38($s0)
-/* EF40D4 80241AC4 C602003C */  lwc1      $f2, 0x3c($s0)
-/* EF40D8 80241AC8 C6040040 */  lwc1      $f4, 0x40($s0)
-/* EF40DC 80241ACC 3C01447A */  lui       $at, 0x447a
-/* EF40E0 80241AD0 44813000 */  mtc1      $at, $f6
-/* EF40E4 80241AD4 27A20034 */  addiu     $v0, $sp, 0x34
-/* EF40E8 80241AD8 E7A00028 */  swc1      $f0, 0x28($sp)
-/* EF40EC 80241ADC E7A2002C */  swc1      $f2, 0x2c($sp)
-/* EF40F0 80241AE0 E7A40030 */  swc1      $f4, 0x30($sp)
-/* EF40F4 80241AE4 E7A60034 */  swc1      $f6, 0x34($sp)
-/* EF40F8 80241AE8 C6340070 */  lwc1      $f20, 0x70($s1)
-/* EF40FC 80241AEC 4680A520 */  cvt.s.w   $f20, $f20
-/* EF4100 80241AF0 4600A521 */  cvt.d.s   $f20, $f20
-/* EF4104 80241AF4 4628A503 */  div.d     $f20, $f20, $f8
-/* EF4108 80241AF8 AFA20010 */  sw        $v0, 0x10($sp)
-/* EF410C 80241AFC 8E040080 */  lw        $a0, 0x80($s0)
-/* EF4110 80241B00 0C03908F */  jal       func_800E423C
-/* EF4114 80241B04 4620A520 */   cvt.s.d  $f20, $f20
-/* EF4118 80241B08 C62C0074 */  lwc1      $f12, 0x74($s1)
-/* EF411C 80241B0C 0C00AD77 */  jal       func_8002B5DC
-/* EF4120 80241B10 46806320 */   cvt.s.w  $f12, $f12
-/* EF4124 80241B14 46140002 */  mul.s     $f0, $f0, $f20
-/* EF4128 80241B18 00000000 */  nop
-/* EF412C 80241B1C C7A2002C */  lwc1      $f2, 0x2c($sp)
-/* EF4130 80241B20 46161080 */  add.s     $f2, $f2, $f22
-/* EF4134 80241B24 46001080 */  add.s     $f2, $f2, $f0
-/* EF4138 80241B28 E602003C */  swc1      $f2, 0x3c($s0)
-/* EF413C 80241B2C 8E220074 */  lw        $v0, 0x74($s1)
-/* EF4140 80241B30 2442000C */  addiu     $v0, $v0, 0xc
-/* EF4144 80241B34 44826000 */  mtc1      $v0, $f12
-/* EF4148 80241B38 00000000 */  nop
-/* EF414C 80241B3C 0C00AB85 */  jal       dead_clamp_angle
-/* EF4150 80241B40 46806320 */   cvt.s.w  $f12, $f12
-/* EF4154 80241B44 4600028D */  trunc.w.s $f10, $f0
-/* EF4158 80241B48 E62A0074 */  swc1      $f10, 0x74($s1)
-/* EF415C 80241B4C 0280202D */  daddu     $a0, $s4, $zero
-/* EF4160 80241B50 24020001 */  addiu     $v0, $zero, 1
-/* EF4164 80241B54 AFA20010 */  sw        $v0, 0x10($sp)
-/* EF4168 80241B58 8E660024 */  lw        $a2, 0x24($s3)
-/* EF416C 80241B5C 8E670028 */  lw        $a3, 0x28($s3)
-/* EF4170 80241B60 0C013469 */  jal       func_8004D1A4
-/* EF4174 80241B64 0220282D */   daddu    $a1, $s1, $zero
-/* EF4178 80241B68 1040001D */  beqz      $v0, .L80241BE0
-/* EF417C 80241B6C 0000202D */   daddu    $a0, $zero, $zero
-/* EF4180 80241B70 0200282D */  daddu     $a1, $s0, $zero
-/* EF4184 80241B74 0000302D */  daddu     $a2, $zero, $zero
-/* EF4188 80241B78 860300A8 */  lh        $v1, 0xa8($s0)
-/* EF418C 80241B7C 3C013F80 */  lui       $at, 0x3f80
-/* EF4190 80241B80 44810000 */  mtc1      $at, $f0
-/* EF4194 80241B84 3C014000 */  lui       $at, 0x4000
-/* EF4198 80241B88 44811000 */  mtc1      $at, $f2
-/* EF419C 80241B8C 3C01C1A0 */  lui       $at, 0xc1a0
-/* EF41A0 80241B90 44812000 */  mtc1      $at, $f4
-/* EF41A4 80241B94 2402000F */  addiu     $v0, $zero, 0xf
-/* EF41A8 80241B98 AFA2001C */  sw        $v0, 0x1c($sp)
-/* EF41AC 80241B9C 44835000 */  mtc1      $v1, $f10
-/* EF41B0 80241BA0 00000000 */  nop
-/* EF41B4 80241BA4 468052A0 */  cvt.s.w   $f10, $f10
-/* EF41B8 80241BA8 44075000 */  mfc1      $a3, $f10
-/* EF41BC 80241BAC 27A20038 */  addiu     $v0, $sp, 0x38
-/* EF41C0 80241BB0 AFA20020 */  sw        $v0, 0x20($sp)
-/* EF41C4 80241BB4 E7A00010 */  swc1      $f0, 0x10($sp)
-/* EF41C8 80241BB8 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EF41CC 80241BBC 0C01D444 */  jal       func_80075110
-/* EF41D0 80241BC0 E7A40018 */   swc1     $f4, 0x18($sp)
-/* EF41D4 80241BC4 0200202D */  daddu     $a0, $s0, $zero
-/* EF41D8 80241BC8 240502F4 */  addiu     $a1, $zero, 0x2f4
-/* EF41DC 80241BCC 0C013600 */  jal       func_8004D800
-/* EF41E0 80241BD0 3C060020 */   lui      $a2, 0x20
-/* EF41E4 80241BD4 2402000C */  addiu     $v0, $zero, 0xc
-/* EF41E8 80241BD8 0809071A */  j         .L80241C68
-/* EF41EC 80241BDC AE420070 */   sw       $v0, 0x70($s2)
-.L80241BE0:
-/* EF41F0 80241BE0 8602008C */  lh        $v0, 0x8c($s0)
-/* EF41F4 80241BE4 14400020 */  bnez      $v0, .L80241C68
-/* EF41F8 80241BE8 00000000 */   nop
-/* EF41FC 80241BEC 8602008E */  lh        $v0, 0x8e($s0)
-/* EF4200 80241BF0 1C40001D */  bgtz      $v0, .L80241C68
-/* EF4204 80241BF4 00000000 */   nop
-/* EF4208 80241BF8 8E420074 */  lw        $v0, 0x74($s2)
-/* EF420C 80241BFC 2442FFFF */  addiu     $v0, $v0, -1
-/* EF4210 80241C00 18400018 */  blez      $v0, .L80241C64
-/* EF4214 80241C04 AE420074 */   sw       $v0, 0x74($s2)
-/* EF4218 80241C08 C600000C */  lwc1      $f0, 0xc($s0)
-/* EF421C 80241C0C 3C014334 */  lui       $at, 0x4334
-/* EF4220 80241C10 44816000 */  mtc1      $at, $f12
-/* EF4224 80241C14 0C00AB85 */  jal       dead_clamp_angle
-/* EF4228 80241C18 460C0300 */   add.s    $f12, $f0, $f12
-/* EF422C 80241C1C 240403E8 */  addiu     $a0, $zero, 0x3e8
-/* EF4230 80241C20 0C00AB3B */  jal       dead_rand_int
-/* EF4234 80241C24 E600000C */   swc1     $f0, 0xc($s0)
-/* EF4238 80241C28 3C032E8B */  lui       $v1, 0x2e8b
-/* EF423C 80241C2C 3463A2E9 */  ori       $v1, $v1, 0xa2e9
-/* EF4240 80241C30 00430018 */  mult      $v0, $v1
-/* EF4244 80241C34 00021FC3 */  sra       $v1, $v0, 0x1f
-/* EF4248 80241C38 00004010 */  mfhi      $t0
-/* EF424C 80241C3C 00082043 */  sra       $a0, $t0, 1
-/* EF4250 80241C40 00832023 */  subu      $a0, $a0, $v1
-/* EF4254 80241C44 00041840 */  sll       $v1, $a0, 1
-/* EF4258 80241C48 00641821 */  addu      $v1, $v1, $a0
-/* EF425C 80241C4C 00031880 */  sll       $v1, $v1, 2
-/* EF4260 80241C50 00641823 */  subu      $v1, $v1, $a0
-/* EF4264 80241C54 00431023 */  subu      $v0, $v0, $v1
-/* EF4268 80241C58 24420005 */  addiu     $v0, $v0, 5
-/* EF426C 80241C5C 0809071A */  j         .L80241C68
-/* EF4270 80241C60 A602008E */   sh       $v0, 0x8e($s0)
-.L80241C64:
-/* EF4274 80241C64 AE400070 */  sw        $zero, 0x70($s2)
-.L80241C68:
-/* EF4278 80241C68 8FBF0054 */  lw        $ra, 0x54($sp)
-/* EF427C 80241C6C 8FB40050 */  lw        $s4, 0x50($sp)
-/* EF4280 80241C70 8FB3004C */  lw        $s3, 0x4c($sp)
-/* EF4284 80241C74 8FB20048 */  lw        $s2, 0x48($sp)
-/* EF4288 80241C78 8FB10044 */  lw        $s1, 0x44($sp)
-/* EF428C 80241C7C 8FB00040 */  lw        $s0, 0x40($sp)
-/* EF4290 80241C80 D7B60060 */  ldc1      $f22, 0x60($sp)
-/* EF4294 80241C84 D7B40058 */  ldc1      $f20, 0x58($sp)
-/* EF4298 80241C88 03E00008 */  jr        $ra
-/* EF429C 80241C8C 27BD0068 */   addiu    $sp, $sp, 0x68
diff --git a/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s b/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s
index 7d0f52f3d1..a6fdba34d0 100644
--- a/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s
+++ b/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s
@@ -59,7 +59,7 @@ glabel func_80241C90_EF42A0
 /* EF4378 80241D68 0240202D */  daddu     $a0, $s2, $zero
 /* EF437C 80241D6C 0260282D */  daddu     $a1, $s3, $zero
 /* EF4380 80241D70 0280302D */  daddu     $a2, $s4, $zero
-/* EF4384 80241D74 0C090496 */  jal       func_80241258_EF3868
+/* EF4384 80241D74 0C090496 */  jal       EF2680_UnkFunc5
 /* EF4388 80241D78 02C0382D */   daddu    $a3, $s6, $zero
 /* EF438C 80241D7C AE800070 */  sw        $zero, 0x70($s4)
 .L80241D80:
@@ -132,7 +132,7 @@ glabel func_80241C90_EF42A0
 /* EF4478 80241E68 E640000C */   swc1     $f0, 0xc($s2)
 /* EF447C 80241E6C 0440000F */  bltz      $v0, .L80241EAC
 /* EF4480 80241E70 AE62007C */   sw       $v0, 0x7c($s3)
-/* EF4484 80241E74 0C010ABD */  jal       func_80042AF4
+/* EF4484 80241E74 0C010ABD */  jal       dead_get_enemy
 /* EF4488 80241E78 0040202D */   daddu    $a0, $v0, $zero
 /* EF448C 80241E7C 3C030049 */  lui       $v1, 0x49
 /* EF4490 80241E80 0040202D */  daddu     $a0, $v0, $zero
@@ -171,13 +171,13 @@ glabel func_80241C90_EF42A0
 .L80241EF8:
 /* EF4508 80241EF8 0280202D */  daddu     $a0, $s4, $zero
 /* EF450C 80241EFC 02C0282D */  daddu     $a1, $s6, $zero
-/* EF4510 80241F00 0C090399 */  jal       func_80240E64_EF3474
+/* EF4510 80241F00 0C090399 */  jal       EF2680_UnkNpcAIFunc3
 /* EF4514 80241F04 02A0302D */   daddu    $a2, $s5, $zero
 /* EF4518 80241F08 080907C7 */  j         .L80241F1C
 /* EF451C 80241F0C 00000000 */   nop
 .L80241F10:
 /* EF4520 80241F10 02C0282D */  daddu     $a1, $s6, $zero
-/* EF4524 80241F14 0C0903B2 */  jal       func_80240EC8_EF34D8
+/* EF4524 80241F14 0C0903B2 */  jal       EF2680_UnkFunc6
 /* EF4528 80241F18 02A0302D */   daddu    $a2, $s5, $zero
 .L80241F1C:
 /* EF452C 80241F1C 8E830070 */  lw        $v1, 0x70($s4)
@@ -206,7 +206,7 @@ glabel func_80241C90_EF42A0
 /* EF457C 80241F6C 00021400 */  sll       $v0, $v0, 0x10
 /* EF4580 80241F70 1C400027 */  bgtz      $v0, .L80242010
 /* EF4584 80241F74 00000000 */   nop
-/* EF4588 80241F78 0C010ABD */  jal       func_80042AF4
+/* EF4588 80241F78 0C010ABD */  jal       dead_get_enemy
 /* EF458C 80241F7C 8E64007C */   lw       $a0, 0x7c($s3)
 /* EF4590 80241F80 24030002 */  addiu     $v1, $zero, 2
 /* EF4594 80241F84 AC430094 */  sw        $v1, 0x94($v0)
@@ -222,7 +222,7 @@ glabel func_80241C90_EF42A0
 /* EF45B8 80241FA8 3C020049 */   lui      $v0, 0x49
 /* EF45BC 80241FAC 34420015 */  ori       $v0, $v0, 0x15
 /* EF45C0 80241FB0 AE420028 */  sw        $v0, 0x28($s2)
-/* EF45C4 80241FB4 0C010ABD */  jal       func_80042AF4
+/* EF45C4 80241FB4 0C010ABD */  jal       dead_get_enemy
 /* EF45C8 80241FB8 8E64007C */   lw       $a0, 0x7c($s3)
 /* EF45CC 80241FBC 24030003 */  addiu     $v1, $zero, 3
 /* EF45D0 80241FC0 AC430094 */  sw        $v1, 0x94($v0)
@@ -266,7 +266,7 @@ glabel func_80241C90_EF42A0
 /* EF465C 8024204C 8E020000 */  lw        $v0, ($s0)
 /* EF4660 80242050 E640000C */  swc1      $f0, 0xc($s2)
 /* EF4664 80242054 C44C0028 */  lwc1      $f12, 0x28($v0)
-/* EF4668 80242058 0C00AC71 */  jal       func_8002B1C4
+/* EF4668 80242058 0C00AC71 */  jal       dead_dist2D
 /* EF466C 8024205C C44E0030 */   lwc1     $f14, 0x30($v0)
 /* EF4670 80242060 C6A20008 */  lwc1      $f2, 8($s5)
 /* EF4674 80242064 468010A0 */  cvt.s.w   $f2, $f2
@@ -284,7 +284,7 @@ glabel func_80241C90_EF42A0
 /* EF46A4 80242094 E7A20018 */  swc1      $f2, 0x18($sp)
 /* EF46A8 80242098 8EA40004 */  lw        $a0, 4($s5)
 /* EF46AC 8024209C 8E470038 */  lw        $a3, 0x38($s2)
-/* EF46B0 802420A0 0C013431 */  jal       func_8004D0C4
+/* EF46B0 802420A0 0C013431 */  jal       dead_is_point_within_region
 /* EF46B4 802420A4 46000506 */   mov.s    $f20, $f0
 /* EF46B8 802420A8 14400031 */  bnez      $v0, .L80242170
 /* EF46BC 802420AC 0000102D */   daddu    $v0, $zero, $zero
@@ -335,7 +335,7 @@ glabel func_80241C90_EF42A0
 /* EF4768 80242158 44050000 */  mfc1      $a1, $f0
 /* EF476C 8024215C 8E46000C */  lw        $a2, 0xc($s2)
 /* EF4770 80242160 0240202D */  daddu     $a0, $s2, $zero
-/* EF4774 80242164 0C00F909 */  jal       func_8003E424
+/* EF4774 80242164 0C00F909 */  jal       dead_npc_move_heading
 /* EF4778 80242168 AC850018 */   sw       $a1, 0x18($a0)
 /* EF477C 8024216C 0000102D */  daddu     $v0, $zero, $zero
 .L80242170:
diff --git a/ver/us/asm/nonmatchings/EF2680/func_8024219C_EF47AC.s b/ver/us/asm/nonmatchings/EF2680/func_8024219C_EF47AC.s
deleted file mode 100644
index 686315ea8e..0000000000
--- a/ver/us/asm/nonmatchings/EF2680/func_8024219C_EF47AC.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024219C_EF47AC
-/* EF47AC 8024219C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* EF47B0 802421A0 AFB20018 */  sw        $s2, 0x18($sp)
-/* EF47B4 802421A4 0080902D */  daddu     $s2, $a0, $zero
-/* EF47B8 802421A8 AFBF001C */  sw        $ra, 0x1c($sp)
-/* EF47BC 802421AC AFB10014 */  sw        $s1, 0x14($sp)
-/* EF47C0 802421B0 AFB00010 */  sw        $s0, 0x10($sp)
-/* EF47C4 802421B4 8E510148 */  lw        $s1, 0x148($s2)
-/* EF47C8 802421B8 0C00F92F */  jal       dead_get_npc_unsafe
-/* EF47CC 802421BC 86240008 */   lh       $a0, 8($s1)
-/* EF47D0 802421C0 0040802D */  daddu     $s0, $v0, $zero
-/* EF47D4 802421C4 8E2300CC */  lw        $v1, 0xcc($s1)
-/* EF47D8 802421C8 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* EF47DC 802421CC 8C630020 */  lw        $v1, 0x20($v1)
-/* EF47E0 802421D0 AE030028 */  sw        $v1, 0x28($s0)
-/* EF47E4 802421D4 96220076 */  lhu       $v0, 0x76($s1)
-/* EF47E8 802421D8 A602008E */  sh        $v0, 0x8e($s0)
-/* EF47EC 802421DC 3C028010 */  lui       $v0, %hi(dead_gPlayerStatusPtr)
-/* EF47F0 802421E0 8C42FC90 */  lw        $v0, %lo(dead_gPlayerStatusPtr)($v0)
-/* EF47F4 802421E4 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* EF47F8 802421E8 8C460028 */  lw        $a2, 0x28($v0)
-/* EF47FC 802421EC 0C00ABDC */  jal       fio_validate_header_checksums
-/* EF4800 802421F0 8C470030 */   lw       $a3, 0x30($v0)
-/* EF4804 802421F4 2402000D */  addiu     $v0, $zero, 0xd
-/* EF4808 802421F8 E600000C */  swc1      $f0, 0xc($s0)
-/* EF480C 802421FC AE420070 */  sw        $v0, 0x70($s2)
-/* EF4810 80242200 8FBF001C */  lw        $ra, 0x1c($sp)
-/* EF4814 80242204 8FB20018 */  lw        $s2, 0x18($sp)
-/* EF4818 80242208 8FB10014 */  lw        $s1, 0x14($sp)
-/* EF481C 8024220C 8FB00010 */  lw        $s0, 0x10($sp)
-/* EF4820 80242210 03E00008 */  jr        $ra
-/* EF4824 80242214 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EF2680/func_80242218_EF4828.s b/ver/us/asm/nonmatchings/EF2680/func_80242218_EF4828.s
deleted file mode 100644
index 018828a2bd..0000000000
--- a/ver/us/asm/nonmatchings/EF2680/func_80242218_EF4828.s
+++ /dev/null
@@ -1,93 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-glabel D_80245408_EF7A18
-.double 0.8
-
-.section .text
-
-glabel func_80242218_EF4828
-/* EF4828 80242218 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* EF482C 8024221C AFB3001C */  sw        $s3, 0x1c($sp)
-/* EF4830 80242220 0080982D */  daddu     $s3, $a0, $zero
-/* EF4834 80242224 AFBF0020 */  sw        $ra, 0x20($sp)
-/* EF4838 80242228 AFB20018 */  sw        $s2, 0x18($sp)
-/* EF483C 8024222C AFB10014 */  sw        $s1, 0x14($sp)
-/* EF4840 80242230 AFB00010 */  sw        $s0, 0x10($sp)
-/* EF4844 80242234 8E710148 */  lw        $s1, 0x148($s3)
-/* EF4848 80242238 86240008 */  lh        $a0, 8($s1)
-/* EF484C 8024223C 0C00F92F */  jal       dead_get_npc_unsafe
-/* EF4850 80242240 00A0902D */   daddu    $s2, $a1, $zero
-/* EF4854 80242244 0040802D */  daddu     $s0, $v0, $zero
-/* EF4858 80242248 8602008E */  lh        $v0, 0x8e($s0)
-/* EF485C 8024224C 9603008E */  lhu       $v1, 0x8e($s0)
-/* EF4860 80242250 18400005 */  blez      $v0, .L80242268
-/* EF4864 80242254 2462FFFF */   addiu    $v0, $v1, -1
-/* EF4868 80242258 A602008E */  sh        $v0, 0x8e($s0)
-/* EF486C 8024225C 00021400 */  sll       $v0, $v0, 0x10
-/* EF4870 80242260 1C400033 */  bgtz      $v0, .L80242330
-/* EF4874 80242264 00000000 */   nop
-.L80242268:
-/* EF4878 80242268 8602008C */  lh        $v0, 0x8c($s0)
-/* EF487C 8024226C 14400030 */  bnez      $v0, .L80242330
-/* EF4880 80242270 00000000 */   nop
-/* EF4884 80242274 8E2200CC */  lw        $v0, 0xcc($s1)
-/* EF4888 80242278 8C420024 */  lw        $v0, 0x24($v0)
-/* EF488C 8024227C AE020028 */  sw        $v0, 0x28($s0)
-/* EF4890 80242280 C6400018 */  lwc1      $f0, 0x18($s2)
-/* EF4894 80242284 E6000018 */  swc1      $f0, 0x18($s0)
-/* EF4898 80242288 8E230088 */  lw        $v1, 0x88($s1)
-/* EF489C 8024228C 24020005 */  addiu     $v0, $zero, 5
-/* EF48A0 80242290 10620005 */  beq       $v1, $v0, .L802422A8
-/* EF48A4 80242294 00000000 */   nop
-/* EF48A8 80242298 10600003 */  beqz      $v1, .L802422A8
-/* EF48AC 8024229C 24020001 */   addiu    $v0, $zero, 1
-/* EF48B0 802422A0 14620006 */  bne       $v1, $v0, .L802422BC
-/* EF48B4 802422A4 00000000 */   nop
-.L802422A8:
-/* EF48B8 802422A8 8E220084 */  lw        $v0, 0x84($s1)
-/* EF48BC 802422AC 00021FC2 */  srl       $v1, $v0, 0x1f
-/* EF48C0 802422B0 00431021 */  addu      $v0, $v0, $v1
-/* EF48C4 802422B4 00021043 */  sra       $v0, $v0, 1
-/* EF48C8 802422B8 A60200A8 */  sh        $v0, 0xa8($s0)
-.L802422BC:
-/* EF48CC 802422BC 3C028010 */  lui       $v0, %hi(dead_gPlayerStatusPtr)
-/* EF48D0 802422C0 8C42FC90 */  lw        $v0, %lo(dead_gPlayerStatusPtr)($v0)
-/* EF48D4 802422C4 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* EF48D8 802422C8 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* EF48DC 802422CC 8C460028 */  lw        $a2, 0x28($v0)
-/* EF48E0 802422D0 0C00AC71 */  jal       func_8002B1C4
-/* EF48E4 802422D4 8C470030 */   lw       $a3, 0x30($v0)
-/* EF48E8 802422D8 C6020018 */  lwc1      $f2, 0x18($s0)
-/* EF48EC 802422DC 46020003 */  div.s     $f0, $f0, $f2
-/* EF48F0 802422E0 3C018024 */  lui       $at, %hi(D_80245408_EF7A18)
-/* EF48F4 802422E4 D4225408 */  ldc1      $f2, %lo(D_80245408_EF7A18)($at)
-/* EF48F8 802422E8 46000021 */  cvt.d.s   $f0, $f0
-/* EF48FC 802422EC 46220000 */  add.d     $f0, $f0, $f2
-/* EF4900 802422F0 4620010D */  trunc.w.d $f4, $f0
-/* EF4904 802422F4 44022000 */  mfc1      $v0, $f4
-/* EF4908 802422F8 00000000 */  nop
-/* EF490C 802422FC A602008E */  sh        $v0, 0x8e($s0)
-/* EF4910 80242300 00021400 */  sll       $v0, $v0, 0x10
-/* EF4914 80242304 8E230078 */  lw        $v1, 0x78($s1)
-/* EF4918 80242308 00021403 */  sra       $v0, $v0, 0x10
-/* EF491C 8024230C 0043102A */  slt       $v0, $v0, $v1
-/* EF4920 80242310 10400003 */  beqz      $v0, .L80242320
-/* EF4924 80242314 00000000 */   nop
-/* EF4928 80242318 9622007A */  lhu       $v0, 0x7a($s1)
-/* EF492C 8024231C A602008E */  sh        $v0, 0x8e($s0)
-.L80242320:
-/* EF4930 80242320 8602008E */  lh        $v0, 0x8e($s0)
-/* EF4934 80242324 AE22007C */  sw        $v0, 0x7c($s1)
-/* EF4938 80242328 2402000E */  addiu     $v0, $zero, 0xe
-/* EF493C 8024232C AE620070 */  sw        $v0, 0x70($s3)
-.L80242330:
-/* EF4940 80242330 8FBF0020 */  lw        $ra, 0x20($sp)
-/* EF4944 80242334 8FB3001C */  lw        $s3, 0x1c($sp)
-/* EF4948 80242338 8FB20018 */  lw        $s2, 0x18($sp)
-/* EF494C 8024233C 8FB10014 */  lw        $s1, 0x14($sp)
-/* EF4950 80242340 8FB00010 */  lw        $s0, 0x10($sp)
-/* EF4954 80242344 03E00008 */  jr        $ra
-/* EF4958 80242348 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/EF2680/func_8024234C_EF495C.s b/ver/us/asm/nonmatchings/EF2680/func_8024234C_EF495C.s
deleted file mode 100644
index 4658aae078..0000000000
--- a/ver/us/asm/nonmatchings/EF2680/func_8024234C_EF495C.s
+++ /dev/null
@@ -1,97 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024234C_EF495C
-/* EF495C 8024234C 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* EF4960 80242350 AFB3003C */  sw        $s3, 0x3c($sp)
-/* EF4964 80242354 0080982D */  daddu     $s3, $a0, $zero
-/* EF4968 80242358 AFBF0040 */  sw        $ra, 0x40($sp)
-/* EF496C 8024235C AFB20038 */  sw        $s2, 0x38($sp)
-/* EF4970 80242360 AFB10034 */  sw        $s1, 0x34($sp)
-/* EF4974 80242364 AFB00030 */  sw        $s0, 0x30($sp)
-/* EF4978 80242368 8E710148 */  lw        $s1, 0x148($s3)
-/* EF497C 8024236C 0C00F92F */  jal       dead_get_npc_unsafe
-/* EF4980 80242370 86240008 */   lh       $a0, 8($s1)
-/* EF4984 80242374 0040802D */  daddu     $s0, $v0, $zero
-/* EF4988 80242378 8E22007C */  lw        $v0, 0x7c($s1)
-/* EF498C 8024237C 8603008E */  lh        $v1, 0x8e($s0)
-/* EF4990 80242380 2442FFFF */  addiu     $v0, $v0, -1
-/* EF4994 80242384 14620012 */  bne       $v1, $v0, .L802423D0
-/* EF4998 80242388 00000000 */   nop
-/* EF499C 8024238C C6000038 */  lwc1      $f0, 0x38($s0)
-/* EF49A0 80242390 4600020D */  trunc.w.s $f8, $f0
-/* EF49A4 80242394 44024000 */  mfc1      $v0, $f8
-/* EF49A8 80242398 00000000 */  nop
-/* EF49AC 8024239C A6220010 */  sh        $v0, 0x10($s1)
-/* EF49B0 802423A0 C600003C */  lwc1      $f0, 0x3c($s0)
-/* EF49B4 802423A4 4600020D */  trunc.w.s $f8, $f0
-/* EF49B8 802423A8 44024000 */  mfc1      $v0, $f8
-/* EF49BC 802423AC 00000000 */  nop
-/* EF49C0 802423B0 A6220012 */  sh        $v0, 0x12($s1)
-/* EF49C4 802423B4 C6000040 */  lwc1      $f0, 0x40($s0)
-/* EF49C8 802423B8 24020001 */  addiu     $v0, $zero, 1
-/* EF49CC 802423BC A2220007 */  sb        $v0, 7($s1)
-/* EF49D0 802423C0 4600020D */  trunc.w.s $f8, $f0
-/* EF49D4 802423C4 44024000 */  mfc1      $v0, $f8
-/* EF49D8 802423C8 00000000 */  nop
-/* EF49DC 802423CC A6220014 */  sh        $v0, 0x14($s1)
-.L802423D0:
-/* EF49E0 802423D0 C6000038 */  lwc1      $f0, 0x38($s0)
-/* EF49E4 802423D4 C602003C */  lwc1      $f2, 0x3c($s0)
-/* EF49E8 802423D8 C6040040 */  lwc1      $f4, 0x40($s0)
-/* EF49EC 802423DC C6060018 */  lwc1      $f6, 0x18($s0)
-/* EF49F0 802423E0 E7A00020 */  swc1      $f0, 0x20($sp)
-/* EF49F4 802423E4 E7A20024 */  swc1      $f2, 0x24($sp)
-/* EF49F8 802423E8 E7A40028 */  swc1      $f4, 0x28($sp)
-/* EF49FC 802423EC E7A60010 */  swc1      $f6, 0x10($sp)
-/* EF4A00 802423F0 C600000C */  lwc1      $f0, 0xc($s0)
-/* EF4A04 802423F4 E7A00014 */  swc1      $f0, 0x14($sp)
-/* EF4A08 802423F8 860200A8 */  lh        $v0, 0xa8($s0)
-/* EF4A0C 802423FC 27A50020 */  addiu     $a1, $sp, 0x20
-/* EF4A10 80242400 44820000 */  mtc1      $v0, $f0
-/* EF4A14 80242404 00000000 */  nop
-/* EF4A18 80242408 46800020 */  cvt.s.w   $f0, $f0
-/* EF4A1C 8024240C E7A00018 */  swc1      $f0, 0x18($sp)
-/* EF4A20 80242410 860200A6 */  lh        $v0, 0xa6($s0)
-/* EF4A24 80242414 27A60024 */  addiu     $a2, $sp, 0x24
-/* EF4A28 80242418 44820000 */  mtc1      $v0, $f0
-/* EF4A2C 8024241C 00000000 */  nop
-/* EF4A30 80242420 46800020 */  cvt.s.w   $f0, $f0
-/* EF4A34 80242424 E7A0001C */  swc1      $f0, 0x1c($sp)
-/* EF4A38 80242428 8E040080 */  lw        $a0, 0x80($s0)
-/* EF4A3C 8024242C 0C0394C1 */  jal       func_800E5304
-/* EF4A40 80242430 27A70028 */   addiu    $a3, $sp, 0x28
-/* EF4A44 80242434 0040902D */  daddu     $s2, $v0, $zero
-/* EF4A48 80242438 16400005 */  bnez      $s2, .L80242450
-/* EF4A4C 8024243C 00000000 */   nop
-/* EF4A50 80242440 8E050018 */  lw        $a1, 0x18($s0)
-/* EF4A54 80242444 8E06000C */  lw        $a2, 0xc($s0)
-/* EF4A58 80242448 0C00F909 */  jal       func_8003E424
-/* EF4A5C 8024244C 0200202D */   daddu    $a0, $s0, $zero
-.L80242450:
-/* EF4A60 80242450 8602008E */  lh        $v0, 0x8e($s0)
-/* EF4A64 80242454 9603008E */  lhu       $v1, 0x8e($s0)
-/* EF4A68 80242458 18400007 */  blez      $v0, .L80242478
-/* EF4A6C 8024245C 2462FFFF */   addiu    $v0, $v1, -1
-/* EF4A70 80242460 A602008E */  sh        $v0, 0x8e($s0)
-/* EF4A74 80242464 00021400 */  sll       $v0, $v0, 0x10
-/* EF4A78 80242468 18400003 */  blez      $v0, .L80242478
-/* EF4A7C 8024246C 00000000 */   nop
-/* EF4A80 80242470 12400008 */  beqz      $s2, .L80242494
-/* EF4A84 80242474 00000000 */   nop
-.L80242478:
-/* EF4A88 80242478 8E2200CC */  lw        $v0, 0xcc($s1)
-/* EF4A8C 8024247C A2200007 */  sb        $zero, 7($s1)
-/* EF4A90 80242480 8C420028 */  lw        $v0, 0x28($v0)
-/* EF4A94 80242484 A600008E */  sh        $zero, 0x8e($s0)
-/* EF4A98 80242488 AE020028 */  sw        $v0, 0x28($s0)
-/* EF4A9C 8024248C 2402000F */  addiu     $v0, $zero, 0xf
-/* EF4AA0 80242490 AE620070 */  sw        $v0, 0x70($s3)
-.L80242494:
-/* EF4AA4 80242494 8FBF0040 */  lw        $ra, 0x40($sp)
-/* EF4AA8 80242498 8FB3003C */  lw        $s3, 0x3c($sp)
-/* EF4AAC 8024249C 8FB20038 */  lw        $s2, 0x38($sp)
-/* EF4AB0 802424A0 8FB10034 */  lw        $s1, 0x34($sp)
-/* EF4AB4 802424A4 8FB00030 */  lw        $s0, 0x30($sp)
-/* EF4AB8 802424A8 03E00008 */  jr        $ra
-/* EF4ABC 802424AC 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/EF2680/func_802424B0_EF4AC0.s b/ver/us/asm/nonmatchings/EF2680/func_802424B0_EF4AC0.s
deleted file mode 100644
index 25598ddeb1..0000000000
--- a/ver/us/asm/nonmatchings/EF2680/func_802424B0_EF4AC0.s
+++ /dev/null
@@ -1,38 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802424B0_EF4AC0
-/* EF4AC0 802424B0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* EF4AC4 802424B4 AFB10014 */  sw        $s1, 0x14($sp)
-/* EF4AC8 802424B8 0080882D */  daddu     $s1, $a0, $zero
-/* EF4ACC 802424BC AFBF0018 */  sw        $ra, 0x18($sp)
-/* EF4AD0 802424C0 AFB00010 */  sw        $s0, 0x10($sp)
-/* EF4AD4 802424C4 8E300148 */  lw        $s0, 0x148($s1)
-/* EF4AD8 802424C8 0C00F92F */  jal       dead_get_npc_unsafe
-/* EF4ADC 802424CC 86040008 */   lh       $a0, 8($s0)
-/* EF4AE0 802424D0 0040202D */  daddu     $a0, $v0, $zero
-/* EF4AE4 802424D4 9482008E */  lhu       $v0, 0x8e($a0)
-/* EF4AE8 802424D8 24030003 */  addiu     $v1, $zero, 3
-/* EF4AEC 802424DC 24420001 */  addiu     $v0, $v0, 1
-/* EF4AF0 802424E0 A482008E */  sh        $v0, 0x8e($a0)
-/* EF4AF4 802424E4 00021400 */  sll       $v0, $v0, 0x10
-/* EF4AF8 802424E8 00021403 */  sra       $v0, $v0, 0x10
-/* EF4AFC 802424EC 14430003 */  bne       $v0, $v1, .L802424FC
-/* EF4B00 802424F0 00000000 */   nop
-/* EF4B04 802424F4 96020086 */  lhu       $v0, 0x86($s0)
-/* EF4B08 802424F8 A48200A8 */  sh        $v0, 0xa8($a0)
-.L802424FC:
-/* EF4B0C 802424FC 8482008E */  lh        $v0, 0x8e($a0)
-/* EF4B10 80242500 8E030080 */  lw        $v1, 0x80($s0)
-/* EF4B14 80242504 0043102A */  slt       $v0, $v0, $v1
-/* EF4B18 80242508 14400004 */  bnez      $v0, .L8024251C
-/* EF4B1C 8024250C 00000000 */   nop
-/* EF4B20 80242510 96020086 */  lhu       $v0, 0x86($s0)
-/* EF4B24 80242514 A48200A8 */  sh        $v0, 0xa8($a0)
-/* EF4B28 80242518 AE200070 */  sw        $zero, 0x70($s1)
-.L8024251C:
-/* EF4B2C 8024251C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* EF4B30 80242520 8FB10014 */  lw        $s1, 0x14($sp)
-/* EF4B34 80242524 8FB00010 */  lw        $s0, 0x10($sp)
-/* EF4B38 80242528 03E00008 */  jr        $ra
-/* EF4B3C 8024252C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EF2680/func_80242530_EF4B40.s b/ver/us/asm/nonmatchings/EF2680/func_80242530_EF4B40.s
index e66446ade1..ca47bcca49 100644
--- a/ver/us/asm/nonmatchings/EF2680/func_80242530_EF4B40.s
+++ b/ver/us/asm/nonmatchings/EF2680/func_80242530_EF4B40.s
@@ -129,7 +129,7 @@ glabel func_80242530_EF4B40
 /* EF4D04 802426F4 AFA20020 */  sw        $v0, 0x20($sp)
 /* EF4D08 802426F8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* EF4D0C 802426FC E7A20014 */  swc1      $f2, 0x14($sp)
-/* EF4D10 80242700 0C01D444 */  jal       func_80075110
+/* EF4D10 80242700 0C01D444 */  jal       dead_fx_emote
 /* EF4D14 80242704 E7A40018 */   swc1     $f4, 0x18($sp)
 /* EF4D18 80242708 8E2200B0 */  lw        $v0, 0xb0($s1)
 /* EF4D1C 8024270C 2403FFFB */  addiu     $v1, $zero, -5
@@ -250,25 +250,25 @@ glabel func_80242530_EF4B40
 .L802428AC:
 /* EF4EBC 802428AC 0260202D */  daddu     $a0, $s3, $zero
 /* EF4EC0 802428B0 0280282D */  daddu     $a1, $s4, $zero
-/* EF4EC4 802428B4 0C090867 */  jal       func_8024219C_EF47AC
+/* EF4EC4 802428B4 0C090867 */  jal       EF2680_set_script_owner_npc_anim
 /* EF4EC8 802428B8 02A0302D */   daddu    $a2, $s5, $zero
 /* EF4ECC 802428BC 0260202D */  daddu     $a0, $s3, $zero
 .L802428C0:
 /* EF4ED0 802428C0 0280282D */  daddu     $a1, $s4, $zero
-/* EF4ED4 802428C4 0C090886 */  jal       func_80242218_EF4828
+/* EF4ED4 802428C4 0C090886 */  jal       EF2680_UnkDistFunc
 /* EF4ED8 802428C8 02A0302D */   daddu    $a2, $s5, $zero
 /* EF4EDC 802428CC 08090A42 */  j         .L80242908
 /* EF4EE0 802428D0 00000000 */   nop
 .L802428D4:
 /* EF4EE4 802428D4 0260202D */  daddu     $a0, $s3, $zero
 /* EF4EE8 802428D8 0280282D */  daddu     $a1, $s4, $zero
-/* EF4EEC 802428DC 0C0908D3 */  jal       func_8024234C_EF495C
+/* EF4EEC 802428DC 0C0908D3 */  jal       EF2680_UnkNpcAIFunc12
 /* EF4EF0 802428E0 02A0302D */   daddu    $a2, $s5, $zero
 /* EF4EF4 802428E4 08090A42 */  j         .L80242908
 /* EF4EF8 802428E8 00000000 */   nop
 .L802428EC:
 /* EF4EFC 802428EC 0280282D */  daddu     $a1, $s4, $zero
-/* EF4F00 802428F0 0C09092C */  jal       func_802424B0_EF4AC0
+/* EF4F00 802428F0 0C09092C */  jal       EF2680_set_script_owner_npc_col_height
 /* EF4F04 802428F4 02A0302D */   daddu    $a2, $s5, $zero
 /* EF4F08 802428F8 08090A42 */  j         .L80242908
 /* EF4F0C 802428FC 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/EF2680/func_8024299C_EF4FAC.s b/ver/us/asm/nonmatchings/EF2680/func_8024299C_EF4FAC.s
index a69ae18840..8518a3e1f8 100644
--- a/ver/us/asm/nonmatchings/EF2680/func_8024299C_EF4FAC.s
+++ b/ver/us/asm/nonmatchings/EF2680/func_8024299C_EF4FAC.s
@@ -147,7 +147,7 @@ glabel func_8024299C_EF4FAC
 /* EF51B8 80242BA8 AFA20020 */  sw        $v0, 0x20($sp)
 /* EF51BC 80242BAC E7A00010 */  swc1      $f0, 0x10($sp)
 /* EF51C0 80242BB0 E7A20014 */  swc1      $f2, 0x14($sp)
-/* EF51C4 80242BB4 0C01D444 */  jal       func_80075110
+/* EF51C4 80242BB4 0C01D444 */  jal       dead_fx_emote
 /* EF51C8 80242BB8 E7A40018 */   swc1     $f4, 0x18($sp)
 /* EF51CC 80242BBC 8E4200CC */  lw        $v0, 0xcc($s2)
 /* EF51D0 80242BC0 8C420000 */  lw        $v0, ($v0)
@@ -166,7 +166,7 @@ glabel func_8024299C_EF4FAC
 /* EF51FC 80242BEC 8E250038 */  lw        $a1, 0x38($s1)
 /* EF5200 80242BF0 8E26003C */  lw        $a2, 0x3c($s1)
 /* EF5204 80242BF4 8E270040 */  lw        $a3, 0x40($s1)
-/* EF5208 80242BF8 0C00BF2F */  jal       func_8002FCBC
+/* EF5208 80242BF8 0C00BF2F */  jal       dead_get_screen_coords
 /* EF520C 80242BFC 0000202D */   daddu    $a0, $zero, $zero
 /* EF5210 80242C00 8EA20070 */  lw        $v0, 0x70($s5)
 /* EF5214 80242C04 28420064 */  slti      $v0, $v0, 0x64
@@ -286,12 +286,12 @@ glabel func_8024299C_EF4FAC
 /* EF53AC 80242D9C 00000000 */   nop
 .L80242DA0:
 /* EF53B0 80242DA0 0260282D */  daddu     $a1, $s3, $zero
-/* EF53B4 80242DA4 0C090867 */  jal       func_8024219C_EF47AC
+/* EF53B4 80242DA4 0C090867 */  jal       EF2680_set_script_owner_npc_anim
 /* EF53B8 80242DA8 0280302D */   daddu    $a2, $s4, $zero
 .L80242DAC:
 /* EF53BC 80242DAC 02A0202D */  daddu     $a0, $s5, $zero
 /* EF53C0 80242DB0 0260282D */  daddu     $a1, $s3, $zero
-/* EF53C4 80242DB4 0C090886 */  jal       func_80242218_EF4828
+/* EF53C4 80242DB4 0C090886 */  jal       EF2680_UnkDistFunc
 /* EF53C8 80242DB8 0280302D */   daddu    $a2, $s4, $zero
 /* EF53CC 80242DBC 96420086 */  lhu       $v0, 0x86($s2)
 /* EF53D0 80242DC0 08090CA5 */  j         .L80243294
@@ -299,14 +299,14 @@ glabel func_8024299C_EF4FAC
 .L80242DC8:
 /* EF53D8 80242DC8 02A0202D */  daddu     $a0, $s5, $zero
 /* EF53DC 80242DCC 0260282D */  daddu     $a1, $s3, $zero
-/* EF53E0 80242DD0 0C0908D3 */  jal       func_8024234C_EF495C
+/* EF53E0 80242DD0 0C0908D3 */  jal       EF2680_UnkNpcAIFunc12
 /* EF53E4 80242DD4 0280302D */   daddu    $a2, $s4, $zero
 /* EF53E8 80242DD8 08090CA5 */  j         .L80243294
 /* EF53EC 80242DDC 00000000 */   nop
 .L80242DE0:
 /* EF53F0 80242DE0 02A0202D */  daddu     $a0, $s5, $zero
 /* EF53F4 80242DE4 0260282D */  daddu     $a1, $s3, $zero
-/* EF53F8 80242DE8 0C09092C */  jal       func_802424B0_EF4AC0
+/* EF53F8 80242DE8 0C09092C */  jal       EF2680_set_script_owner_npc_col_height
 /* EF53FC 80242DEC 0280302D */   daddu    $a2, $s4, $zero
 /* EF5400 80242DF0 08090CA5 */  j         .L80243294
 /* EF5404 80242DF4 00000000 */   nop
@@ -314,7 +314,7 @@ glabel func_8024299C_EF4FAC
 /* EF5408 80242DF8 8E430094 */  lw        $v1, 0x94($s2)
 /* EF540C 80242DFC 14620125 */  bne       $v1, $v0, .L80243294
 /* EF5410 80242E00 00000000 */   nop
-/* EF5414 80242E04 0C010ABD */  jal       func_80042AF4
+/* EF5414 80242E04 0C010ABD */  jal       dead_get_enemy
 /* EF5418 80242E08 8E440098 */   lw       $a0, 0x98($s2)
 /* EF541C 80242E0C 0C00F92F */  jal       dead_get_npc_unsafe
 /* EF5420 80242E10 84440008 */   lh       $a0, 8($v0)
@@ -433,13 +433,13 @@ glabel func_8024299C_EF4FAC
 /* EF55D4 80242FC4 46800020 */  cvt.s.w   $f0, $f0
 /* EF55D8 80242FC8 E7A0001C */  swc1      $f0, 0x1c($sp)
 /* EF55DC 80242FCC 8E240080 */  lw        $a0, 0x80($s1)
-/* EF55E0 80242FD0 0C0394C1 */  jal       func_800E5304
+/* EF55E0 80242FD0 0C0394C1 */  jal       dead_npc_test_move_simple_with_slipping
 /* EF55E4 80242FD4 27A70060 */   addiu    $a3, $sp, 0x60
 /* EF55E8 80242FD8 54400005 */  bnel      $v0, $zero, .L80242FF0
 /* EF55EC 80242FDC AE200018 */   sw       $zero, 0x18($s1)
 /* EF55F0 80242FE0 8E250018 */  lw        $a1, 0x18($s1)
 /* EF55F4 80242FE4 8E26000C */  lw        $a2, 0xc($s1)
-/* EF55F8 80242FE8 0C00F909 */  jal       func_8003E424
+/* EF55F8 80242FE8 0C00F909 */  jal       dead_npc_move_heading
 /* EF55FC 80242FEC 0220202D */   daddu    $a0, $s1, $zero
 .L80242FF0:
 /* EF5600 80242FF0 C620001C */  lwc1      $f0, 0x1c($s1)
@@ -475,7 +475,7 @@ glabel func_8024299C_EF4FAC
 /* EF5678 80243068 E7A00064 */  swc1      $f0, 0x64($sp)
 /* EF567C 8024306C AFA20010 */  sw        $v0, 0x10($sp)
 /* EF5680 80243070 8E240080 */  lw        $a0, 0x80($s1)
-/* EF5684 80243074 0C03908F */  jal       func_800E423C
+/* EF5684 80243074 0C03908F */  jal       dead_npc_raycast_down_sides
 /* EF5688 80243078 27A70060 */   addiu    $a3, $sp, 0x60
 /* EF568C 8024307C 10400057 */  beqz      $v0, .L802431DC
 /* EF5690 80243080 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/EF7A80/func_80240340_EF7DC0.s b/ver/us/asm/nonmatchings/EF7A80/func_80240340_EF7DC0.s
deleted file mode 100644
index 1d75a809aa..0000000000
--- a/ver/us/asm/nonmatchings/EF7A80/func_80240340_EF7DC0.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240340_EF7DC0
-/* EF7DC0 80240340 8C8400C0 */  lw        $a0, 0xc0($a0)
-/* EF7DC4 80240344 8C83000C */  lw        $v1, 0xc($a0)
-/* EF7DC8 80240348 24020045 */  addiu     $v0, $zero, 0x45
-/* EF7DCC 8024034C AC620030 */  sw        $v0, 0x30($v1)
-/* EF7DD0 80240350 8C83000C */  lw        $v1, 0xc($a0)
-/* EF7DD4 80240354 240200FF */  addiu     $v0, $zero, 0xff
-/* EF7DD8 80240358 AC620034 */  sw        $v0, 0x34($v1)
-/* EF7DDC 8024035C 8C83000C */  lw        $v1, 0xc($a0)
-/* EF7DE0 80240360 240200D9 */  addiu     $v0, $zero, 0xd9
-/* EF7DE4 80240364 AC620038 */  sw        $v0, 0x38($v1)
-/* EF7DE8 80240368 8C83000C */  lw        $v1, 0xc($a0)
-/* EF7DEC 8024036C 240200B0 */  addiu     $v0, $zero, 0xb0
-/* EF7DF0 80240370 AC620040 */  sw        $v0, 0x40($v1)
-/* EF7DF4 80240374 8C83000C */  lw        $v1, 0xc($a0)
-/* EF7DF8 80240378 240200FE */  addiu     $v0, $zero, 0xfe
-/* EF7DFC 8024037C AC620044 */  sw        $v0, 0x44($v1)
-/* EF7E00 80240380 8C83000C */  lw        $v1, 0xc($a0)
-/* EF7E04 80240384 2402007C */  addiu     $v0, $zero, 0x7c
-/* EF7E08 80240388 AC620048 */  sw        $v0, 0x48($v1)
-/* EF7E0C 8024038C 03E00008 */  jr        $ra
-/* EF7E10 80240390 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/EF7FB0/func_80240530_EF7FB0.s b/ver/us/asm/nonmatchings/EF7FB0/func_80240530_EF7FB0.s
deleted file mode 100644
index 8871bfb0d6..0000000000
--- a/ver/us/asm/nonmatchings/EF7FB0/func_80240530_EF7FB0.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240530_EF7FB0
-/* EF7FB0 80240530 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EF7FB4 80240534 AFB00010 */  sw        $s0, 0x10($sp)
-/* EF7FB8 80240538 0080802D */  daddu     $s0, $a0, $zero
-/* EF7FBC 8024053C AFBF0014 */  sw        $ra, 0x14($sp)
-/* EF7FC0 80240540 C60C0084 */  lwc1      $f12, 0x84($s0)
-/* EF7FC4 80240544 46806320 */  cvt.s.w   $f12, $f12
-/* EF7FC8 80240548 C6020090 */  lwc1      $f2, 0x90($s0)
-/* EF7FCC 8024054C 468010A0 */  cvt.s.w   $f2, $f2
-/* EF7FD0 80240550 44061000 */  mfc1      $a2, $f2
-/* EF7FD4 80240554 C6020098 */  lwc1      $f2, 0x98($s0)
-/* EF7FD8 80240558 468010A0 */  cvt.s.w   $f2, $f2
-/* EF7FDC 8024055C 44071000 */  mfc1      $a3, $f2
-/* EF7FE0 80240560 C60E008C */  lwc1      $f14, 0x8c($s0)
-/* EF7FE4 80240564 0C00ABDC */  jal       fio_validate_header_checksums
-/* EF7FE8 80240568 468073A0 */   cvt.s.w  $f14, $f14
-/* EF7FEC 8024056C 4600008D */  trunc.w.s $f2, $f0
-/* EF7FF0 80240570 E60200AC */  swc1      $f2, 0xac($s0)
-/* EF7FF4 80240574 8FBF0014 */  lw        $ra, 0x14($sp)
-/* EF7FF8 80240578 8FB00010 */  lw        $s0, 0x10($sp)
-/* EF7FFC 8024057C 24020002 */  addiu     $v0, $zero, 2
-/* EF8000 80240580 03E00008 */  jr        $ra
-/* EF8004 80240584 27BD0018 */   addiu    $sp, $sp, 0x18
-/* EF8008 80240588 00000000 */  nop
-/* EF800C 8024058C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/EFEB00/func_802404D0_EFEFD0.s b/ver/us/asm/nonmatchings/EFEB00/func_802404D0_EFEFD0.s
deleted file mode 100644
index 3d3c51327b..0000000000
--- a/ver/us/asm/nonmatchings/EFEB00/func_802404D0_EFEFD0.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802404D0_EFEFD0
-/* EFEFD0 802404D0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* EFEFD4 802404D4 AFB00010 */  sw        $s0, 0x10($sp)
-/* EFEFD8 802404D8 0080802D */  daddu     $s0, $a0, $zero
-/* EFEFDC 802404DC AFB20018 */  sw        $s2, 0x18($sp)
-/* EFEFE0 802404E0 3C128011 */  lui       $s2, %hi(D_80117578)
-/* EFEFE4 802404E4 26527578 */  addiu     $s2, $s2, %lo(D_80117578)
-/* EFEFE8 802404E8 AFBF001C */  sw        $ra, 0x1c($sp)
-/* EFEFEC 802404EC AFB10014 */  sw        $s1, 0x14($sp)
-/* EFEFF0 802404F0 C64000A8 */  lwc1      $f0, 0xa8($s2)
-/* EFEFF4 802404F4 8E02000C */  lw        $v0, 0xc($s0)
-/* EFEFF8 802404F8 4600008D */  trunc.w.s $f2, $f0
-/* EFEFFC 802404FC 44061000 */  mfc1      $a2, $f2
-/* EFF000 80240500 8C450000 */  lw        $a1, ($v0)
-/* EFF004 80240504 0C0B551A */  jal       dead_evt_set_variable
-/* EFF008 80240508 8C510004 */   lw       $s1, 4($v0)
-/* EFF00C 8024050C 0200202D */  daddu     $a0, $s0, $zero
-/* EFF010 80240510 C6400080 */  lwc1      $f0, 0x80($s2)
-/* EFF014 80240514 4600008D */  trunc.w.s $f2, $f0
-/* EFF018 80240518 44061000 */  mfc1      $a2, $f2
-/* EFF01C 8024051C 0C0B551A */  jal       dead_evt_set_variable
-/* EFF020 80240520 0220282D */   daddu    $a1, $s1, $zero
-/* EFF024 80240524 8FBF001C */  lw        $ra, 0x1c($sp)
-/* EFF028 80240528 8FB20018 */  lw        $s2, 0x18($sp)
-/* EFF02C 8024052C 8FB10014 */  lw        $s1, 0x14($sp)
-/* EFF030 80240530 8FB00010 */  lw        $s0, 0x10($sp)
-/* EFF034 80240534 24020002 */  addiu     $v0, $zero, 2
-/* EFF038 80240538 03E00008 */  jr        $ra
-/* EFF03C 8024053C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EFEB00/func_80240540_EFF040.s b/ver/us/asm/nonmatchings/EFEB00/func_80240540_EFF040.s
deleted file mode 100644
index 111156c1bb..0000000000
--- a/ver/us/asm/nonmatchings/EFEB00/func_80240540_EFF040.s
+++ /dev/null
@@ -1,76 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240540_EFF040
-/* EFF040 80240540 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* EFF044 80240544 AFB00010 */  sw        $s0, 0x10($sp)
-/* EFF048 80240548 0080802D */  daddu     $s0, $a0, $zero
-/* EFF04C 8024054C AFBF0018 */  sw        $ra, 0x18($sp)
-/* EFF050 80240550 AFB10014 */  sw        $s1, 0x14($sp)
-/* EFF054 80240554 F7B80030 */  sdc1      $f24, 0x30($sp)
-/* EFF058 80240558 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* EFF05C 8024055C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* EFF060 80240560 8E05008C */  lw        $a1, 0x8c($s0)
-/* EFF064 80240564 4480B000 */  mtc1      $zero, $f22
-/* EFF068 80240568 0C0B53A3 */  jal       dead_evt_get_variable
-/* EFF06C 8024056C 0000202D */   daddu    $a0, $zero, $zero
-/* EFF070 80240570 4600B306 */  mov.s     $f12, $f22
-/* EFF074 80240574 C60200A8 */  lwc1      $f2, 0xa8($s0)
-/* EFF078 80240578 468010A0 */  cvt.s.w   $f2, $f2
-/* EFF07C 8024057C 44061000 */  mfc1      $a2, $f2
-/* EFF080 80240580 C60200B0 */  lwc1      $f2, 0xb0($s0)
-/* EFF084 80240584 468010A0 */  cvt.s.w   $f2, $f2
-/* EFF088 80240588 44071000 */  mfc1      $a3, $f2
-/* EFF08C 8024058C 4482A000 */  mtc1      $v0, $f20
-/* EFF090 80240590 00000000 */  nop
-/* EFF094 80240594 4680A520 */  cvt.s.w   $f20, $f20
-/* EFF098 80240598 0C00AC71 */  jal       func_8002B1C4
-/* EFF09C 8024059C 4600B386 */   mov.s    $f14, $f22
-/* EFF0A0 802405A0 4600B306 */  mov.s     $f12, $f22
-/* EFF0A4 802405A4 4600B386 */  mov.s     $f14, $f22
-/* EFF0A8 802405A8 C60200A8 */  lwc1      $f2, 0xa8($s0)
-/* EFF0AC 802405AC 468010A0 */  cvt.s.w   $f2, $f2
-/* EFF0B0 802405B0 44061000 */  mfc1      $a2, $f2
-/* EFF0B4 802405B4 C60200B0 */  lwc1      $f2, 0xb0($s0)
-/* EFF0B8 802405B8 468010A0 */  cvt.s.w   $f2, $f2
-/* EFF0BC 802405BC 44071000 */  mfc1      $a3, $f2
-/* EFF0C0 802405C0 0C00ABDC */  jal       fio_validate_header_checksums
-/* EFF0C4 802405C4 46000606 */   mov.s    $f24, $f0
-/* EFF0C8 802405C8 0C00AB85 */  jal       dead_clamp_angle
-/* EFF0CC 802405CC 46140301 */   sub.s    $f12, $f0, $f20
-/* EFF0D0 802405D0 46000506 */  mov.s     $f20, $f0
-/* EFF0D4 802405D4 0C00AD77 */  jal       func_8002B5DC
-/* EFF0D8 802405D8 4600A306 */   mov.s    $f12, $f20
-/* EFF0DC 802405DC 4600C002 */  mul.s     $f0, $f24, $f0
-/* EFF0E0 802405E0 00000000 */  nop
-/* EFF0E4 802405E4 46160000 */  add.s     $f0, $f0, $f22
-/* EFF0E8 802405E8 3C118011 */  lui       $s1, %hi(D_80117578)
-/* EFF0EC 802405EC 26317578 */  addiu     $s1, $s1, %lo(D_80117578)
-/* EFF0F0 802405F0 E6200028 */  swc1      $f0, 0x28($s1)
-/* EFF0F4 802405F4 8E0500AC */  lw        $a1, 0xac($s0)
-/* EFF0F8 802405F8 0C0B53A3 */  jal       dead_evt_get_variable
-/* EFF0FC 802405FC 0000202D */   daddu    $a0, $zero, $zero
-/* EFF100 80240600 0000202D */  daddu     $a0, $zero, $zero
-/* EFF104 80240604 8E050090 */  lw        $a1, 0x90($s0)
-/* EFF108 80240608 0C0B53A3 */  jal       dead_evt_get_variable
-/* EFF10C 8024060C 0040802D */   daddu    $s0, $v0, $zero
-/* EFF110 80240610 4600A306 */  mov.s     $f12, $f20
-/* EFF114 80240614 02028021 */  addu      $s0, $s0, $v0
-/* EFF118 80240618 44900000 */  mtc1      $s0, $f0
-/* EFF11C 8024061C 00000000 */  nop
-/* EFF120 80240620 46800020 */  cvt.s.w   $f0, $f0
-/* EFF124 80240624 0C00AD90 */  jal       func_8002B640
-/* EFF128 80240628 E620002C */   swc1     $f0, 0x2c($s1)
-/* EFF12C 8024062C 4600C602 */  mul.s     $f24, $f24, $f0
-/* EFF130 80240630 00000000 */  nop
-/* EFF134 80240634 4618B581 */  sub.s     $f22, $f22, $f24
-/* EFF138 80240638 E6360030 */  swc1      $f22, 0x30($s1)
-/* EFF13C 8024063C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* EFF140 80240640 8FB10014 */  lw        $s1, 0x14($sp)
-/* EFF144 80240644 8FB00010 */  lw        $s0, 0x10($sp)
-/* EFF148 80240648 D7B80030 */  ldc1      $f24, 0x30($sp)
-/* EFF14C 8024064C D7B60028 */  ldc1      $f22, 0x28($sp)
-/* EFF150 80240650 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* EFF154 80240654 24020002 */  addiu     $v0, $zero, 2
-/* EFF158 80240658 03E00008 */  jr        $ra
-/* EFF15C 8024065C 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/EFEB00/func_80240660_EFF160.s b/ver/us/asm/nonmatchings/EFEB00/func_80240660_EFF160.s
deleted file mode 100644
index 91bf5b3077..0000000000
--- a/ver/us/asm/nonmatchings/EFEB00/func_80240660_EFF160.s
+++ /dev/null
@@ -1,77 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240660_EFF160
-/* EFF160 80240660 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* EFF164 80240664 AFB00010 */  sw        $s0, 0x10($sp)
-/* EFF168 80240668 0080802D */  daddu     $s0, $a0, $zero
-/* EFF16C 8024066C AFBF0018 */  sw        $ra, 0x18($sp)
-/* EFF170 80240670 AFB10014 */  sw        $s1, 0x14($sp)
-/* EFF174 80240674 F7B80030 */  sdc1      $f24, 0x30($sp)
-/* EFF178 80240678 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* EFF17C 8024067C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* EFF180 80240680 0C00F10F */  jal       func_8003C43C
-/* EFF184 80240684 0000202D */   daddu    $a0, $zero, $zero
-/* EFF188 80240688 0000202D */  daddu     $a0, $zero, $zero
-/* EFF18C 8024068C 8E05008C */  lw        $a1, 0x8c($s0)
-/* EFF190 80240690 4480B000 */  mtc1      $zero, $f22
-/* EFF194 80240694 0C0B53A3 */  jal       dead_evt_get_variable
-/* EFF198 80240698 0040882D */   daddu    $s1, $v0, $zero
-/* EFF19C 8024069C 4600B306 */  mov.s     $f12, $f22
-/* EFF1A0 802406A0 C60200B4 */  lwc1      $f2, 0xb4($s0)
-/* EFF1A4 802406A4 468010A0 */  cvt.s.w   $f2, $f2
-/* EFF1A8 802406A8 44061000 */  mfc1      $a2, $f2
-/* EFF1AC 802406AC C60200BC */  lwc1      $f2, 0xbc($s0)
-/* EFF1B0 802406B0 468010A0 */  cvt.s.w   $f2, $f2
-/* EFF1B4 802406B4 44071000 */  mfc1      $a3, $f2
-/* EFF1B8 802406B8 4482A000 */  mtc1      $v0, $f20
-/* EFF1BC 802406BC 00000000 */  nop
-/* EFF1C0 802406C0 4680A520 */  cvt.s.w   $f20, $f20
-/* EFF1C4 802406C4 0C00AC71 */  jal       func_8002B1C4
-/* EFF1C8 802406C8 4600B386 */   mov.s    $f14, $f22
-/* EFF1CC 802406CC 4600B306 */  mov.s     $f12, $f22
-/* EFF1D0 802406D0 4600B386 */  mov.s     $f14, $f22
-/* EFF1D4 802406D4 C60200B4 */  lwc1      $f2, 0xb4($s0)
-/* EFF1D8 802406D8 468010A0 */  cvt.s.w   $f2, $f2
-/* EFF1DC 802406DC 44061000 */  mfc1      $a2, $f2
-/* EFF1E0 802406E0 C60200BC */  lwc1      $f2, 0xbc($s0)
-/* EFF1E4 802406E4 468010A0 */  cvt.s.w   $f2, $f2
-/* EFF1E8 802406E8 44071000 */  mfc1      $a3, $f2
-/* EFF1EC 802406EC 0C00ABDC */  jal       fio_validate_header_checksums
-/* EFF1F0 802406F0 46000606 */   mov.s    $f24, $f0
-/* EFF1F4 802406F4 0C00AB85 */  jal       dead_clamp_angle
-/* EFF1F8 802406F8 46140301 */   sub.s    $f12, $f0, $f20
-/* EFF1FC 802406FC 46000506 */  mov.s     $f20, $f0
-/* EFF200 80240700 0C00AD77 */  jal       func_8002B5DC
-/* EFF204 80240704 4600A306 */   mov.s    $f12, $f20
-/* EFF208 80240708 4600C002 */  mul.s     $f0, $f24, $f0
-/* EFF20C 8024070C 00000000 */  nop
-/* EFF210 80240710 46160000 */  add.s     $f0, $f0, $f22
-/* EFF214 80240714 E6200038 */  swc1      $f0, 0x38($s1)
-/* EFF218 80240718 8E0500B8 */  lw        $a1, 0xb8($s0)
-/* EFF21C 8024071C 0C0B53A3 */  jal       dead_evt_get_variable
-/* EFF220 80240720 0000202D */   daddu    $a0, $zero, $zero
-/* EFF224 80240724 0000202D */  daddu     $a0, $zero, $zero
-/* EFF228 80240728 8E050090 */  lw        $a1, 0x90($s0)
-/* EFF22C 8024072C 0C0B53A3 */  jal       dead_evt_get_variable
-/* EFF230 80240730 0040802D */   daddu    $s0, $v0, $zero
-/* EFF234 80240734 4600A306 */  mov.s     $f12, $f20
-/* EFF238 80240738 02028021 */  addu      $s0, $s0, $v0
-/* EFF23C 8024073C 44900000 */  mtc1      $s0, $f0
-/* EFF240 80240740 00000000 */  nop
-/* EFF244 80240744 46800020 */  cvt.s.w   $f0, $f0
-/* EFF248 80240748 0C00AD90 */  jal       func_8002B640
-/* EFF24C 8024074C E620003C */   swc1     $f0, 0x3c($s1)
-/* EFF250 80240750 4600C602 */  mul.s     $f24, $f24, $f0
-/* EFF254 80240754 00000000 */  nop
-/* EFF258 80240758 4618B581 */  sub.s     $f22, $f22, $f24
-/* EFF25C 8024075C E6360040 */  swc1      $f22, 0x40($s1)
-/* EFF260 80240760 8FBF0018 */  lw        $ra, 0x18($sp)
-/* EFF264 80240764 8FB10014 */  lw        $s1, 0x14($sp)
-/* EFF268 80240768 8FB00010 */  lw        $s0, 0x10($sp)
-/* EFF26C 8024076C D7B80030 */  ldc1      $f24, 0x30($sp)
-/* EFF270 80240770 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* EFF274 80240774 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* EFF278 80240778 24020002 */  addiu     $v0, $zero, 2
-/* EFF27C 8024077C 03E00008 */  jr        $ra
-/* EFF280 80240780 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/EFEB00/func_80240784_EFF284.s b/ver/us/asm/nonmatchings/EFEB00/func_80240784_EFF284.s
deleted file mode 100644
index 11a91c05c9..0000000000
--- a/ver/us/asm/nonmatchings/EFEB00/func_80240784_EFF284.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240784_EFF284
-/* EFF284 80240784 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EFF288 80240788 AFBF0010 */  sw        $ra, 0x10($sp)
-/* EFF28C 8024078C C4800084 */  lwc1      $f0, 0x84($a0)
-/* EFF290 80240790 46800020 */  cvt.s.w   $f0, $f0
-/* EFF294 80240794 44050000 */  mfc1      $a1, $f0
-/* EFF298 80240798 0C051065 */  jal       func_80144194
-/* EFF29C 8024079C 24040001 */   addiu    $a0, $zero, 1
-/* EFF2A0 802407A0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* EFF2A4 802407A4 24020002 */  addiu     $v0, $zero, 2
-/* EFF2A8 802407A8 03E00008 */  jr        $ra
-/* EFF2AC 802407AC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/EFEB00/func_802407B0_EFF2B0.s b/ver/us/asm/nonmatchings/EFEB00/func_802407B0_EFF2B0.s
deleted file mode 100644
index 78d76db961..0000000000
--- a/ver/us/asm/nonmatchings/EFEB00/func_802407B0_EFF2B0.s
+++ /dev/null
@@ -1,105 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802407B0_EFF2B0
-/* EFF2B0 802407B0 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* EFF2B4 802407B4 AFB20018 */  sw        $s2, 0x18($sp)
-/* EFF2B8 802407B8 0080902D */  daddu     $s2, $a0, $zero
-/* EFF2BC 802407BC AFBF0028 */  sw        $ra, 0x28($sp)
-/* EFF2C0 802407C0 AFB50024 */  sw        $s5, 0x24($sp)
-/* EFF2C4 802407C4 AFB40020 */  sw        $s4, 0x20($sp)
-/* EFF2C8 802407C8 AFB3001C */  sw        $s3, 0x1c($sp)
-/* EFF2CC 802407CC AFB10014 */  sw        $s1, 0x14($sp)
-/* EFF2D0 802407D0 AFB00010 */  sw        $s0, 0x10($sp)
-/* EFF2D4 802407D4 F7B80040 */  sdc1      $f24, 0x40($sp)
-/* EFF2D8 802407D8 F7B60038 */  sdc1      $f22, 0x38($sp)
-/* EFF2DC 802407DC F7B40030 */  sdc1      $f20, 0x30($sp)
-/* EFF2E0 802407E0 8E50000C */  lw        $s0, 0xc($s2)
-/* EFF2E4 802407E4 8E140000 */  lw        $s4, ($s0)
-/* EFF2E8 802407E8 26100004 */  addiu     $s0, $s0, 4
-/* EFF2EC 802407EC 0C0B53A3 */  jal       dead_evt_get_variable
-/* EFF2F0 802407F0 0280282D */   daddu    $a1, $s4, $zero
-/* EFF2F4 802407F4 0040982D */  daddu     $s3, $v0, $zero
-/* EFF2F8 802407F8 8E150000 */  lw        $s5, ($s0)
-/* EFF2FC 802407FC 26100004 */  addiu     $s0, $s0, 4
-/* EFF300 80240800 8E050000 */  lw        $a1, ($s0)
-/* EFF304 80240804 26100004 */  addiu     $s0, $s0, 4
-/* EFF308 80240808 0C0B55FF */  jal       dead_evt_get_float_variable
-/* EFF30C 8024080C 0240202D */   daddu    $a0, $s2, $zero
-/* EFF310 80240810 8E050000 */  lw        $a1, ($s0)
-/* EFF314 80240814 26100004 */  addiu     $s0, $s0, 4
-/* EFF318 80240818 0240202D */  daddu     $a0, $s2, $zero
-/* EFF31C 8024081C 0C0B55FF */  jal       dead_evt_get_float_variable
-/* EFF320 80240820 46000606 */   mov.s    $f24, $f0
-/* EFF324 80240824 8E050000 */  lw        $a1, ($s0)
-/* EFF328 80240828 26100004 */  addiu     $s0, $s0, 4
-/* EFF32C 8024082C 0240202D */  daddu     $a0, $s2, $zero
-/* EFF330 80240830 0C0B53A3 */  jal       dead_evt_get_variable
-/* EFF334 80240834 46000506 */   mov.s    $f20, $f0
-/* EFF338 80240838 8E050000 */  lw        $a1, ($s0)
-/* EFF33C 8024083C 26100004 */  addiu     $s0, $s0, 4
-/* EFF340 80240840 0240202D */  daddu     $a0, $s2, $zero
-/* EFF344 80240844 0C0B53A3 */  jal       dead_evt_get_variable
-/* EFF348 80240848 0040882D */   daddu    $s1, $v0, $zero
-/* EFF34C 8024084C 0240202D */  daddu     $a0, $s2, $zero
-/* EFF350 80240850 8E050000 */  lw        $a1, ($s0)
-/* EFF354 80240854 0C0B55FF */  jal       dead_evt_get_float_variable
-/* EFF358 80240858 0040802D */   daddu    $s0, $v0, $zero
-/* EFF35C 8024085C 3C014334 */  lui       $at, 0x4334
-/* EFF360 80240860 44811000 */  mtc1      $at, $f2
-/* EFF364 80240864 3C014049 */  lui       $at, 0x4049
-/* EFF368 80240868 34210FD8 */  ori       $at, $at, 0xfd8
-/* EFF36C 8024086C 44812000 */  mtc1      $at, $f4
-/* EFF370 80240870 46020003 */  div.s     $f0, $f0, $f2
-/* EFF374 80240874 46040582 */  mul.s     $f22, $f0, $f4
-/* EFF378 80240878 00000000 */  nop
-/* EFF37C 8024087C 4618A501 */  sub.s     $f20, $f20, $f24
-/* EFF380 80240880 3C013F00 */  lui       $at, 0x3f00
-/* EFF384 80240884 44810000 */  mtc1      $at, $f0
-/* EFF388 80240888 00000000 */  nop
-/* EFF38C 8024088C 4600A502 */  mul.s     $f20, $f20, $f0
-/* EFF390 80240890 00000000 */  nop
-/* EFF394 80240894 12000007 */  beqz      $s0, .L802408B4
-/* EFF398 80240898 0233102A */   slt      $v0, $s1, $s3
-/* EFF39C 8024089C 10400005 */  beqz      $v0, .L802408B4
-/* EFF3A0 802408A0 0240202D */   daddu    $a0, $s2, $zero
-/* EFF3A4 802408A4 0220982D */  daddu     $s3, $s1, $zero
-/* EFF3A8 802408A8 0280282D */  daddu     $a1, $s4, $zero
-/* EFF3AC 802408AC 0C0B551A */  jal       dead_evt_set_variable
-/* EFF3B0 802408B0 0220302D */   daddu    $a2, $s1, $zero
-.L802408B4:
-/* EFF3B4 802408B4 3C014049 */  lui       $at, 0x4049
-/* EFF3B8 802408B8 34210FD8 */  ori       $at, $at, 0xfd8
-/* EFF3BC 802408BC 44810000 */  mtc1      $at, $f0
-/* EFF3C0 802408C0 44936000 */  mtc1      $s3, $f12
-/* EFF3C4 802408C4 00000000 */  nop
-/* EFF3C8 802408C8 46806320 */  cvt.s.w   $f12, $f12
-/* EFF3CC 802408CC 46006302 */  mul.s     $f12, $f12, $f0
-/* EFF3D0 802408D0 00000000 */  nop
-/* EFF3D4 802408D4 44910000 */  mtc1      $s1, $f0
-/* EFF3D8 802408D8 00000000 */  nop
-/* EFF3DC 802408DC 46800020 */  cvt.s.w   $f0, $f0
-/* EFF3E0 802408E0 46006303 */  div.s     $f12, $f12, $f0
-/* EFF3E4 802408E4 0C00AD30 */  jal       dead_cos_rad
-/* EFF3E8 802408E8 46166300 */   add.s    $f12, $f12, $f22
-/* EFF3EC 802408EC 4600A002 */  mul.s     $f0, $f20, $f0
-/* EFF3F0 802408F0 00000000 */  nop
-/* EFF3F4 802408F4 4614C080 */  add.s     $f2, $f24, $f20
-/* EFF3F8 802408F8 46001081 */  sub.s     $f2, $f2, $f0
-/* EFF3FC 802408FC 0240202D */  daddu     $a0, $s2, $zero
-/* EFF400 80240900 44061000 */  mfc1      $a2, $f2
-/* EFF404 80240904 0C0B5684 */  jal       dead_evt_set_float_variable
-/* EFF408 80240908 02A0282D */   daddu    $a1, $s5, $zero
-/* EFF40C 8024090C 8FBF0028 */  lw        $ra, 0x28($sp)
-/* EFF410 80240910 8FB50024 */  lw        $s5, 0x24($sp)
-/* EFF414 80240914 8FB40020 */  lw        $s4, 0x20($sp)
-/* EFF418 80240918 8FB3001C */  lw        $s3, 0x1c($sp)
-/* EFF41C 8024091C 8FB20018 */  lw        $s2, 0x18($sp)
-/* EFF420 80240920 8FB10014 */  lw        $s1, 0x14($sp)
-/* EFF424 80240924 8FB00010 */  lw        $s0, 0x10($sp)
-/* EFF428 80240928 D7B80040 */  ldc1      $f24, 0x40($sp)
-/* EFF42C 8024092C D7B60038 */  ldc1      $f22, 0x38($sp)
-/* EFF430 80240930 D7B40030 */  ldc1      $f20, 0x30($sp)
-/* EFF434 80240934 24020002 */  addiu     $v0, $zero, 2
-/* EFF438 80240938 03E00008 */  jr        $ra
-/* EFF43C 8024093C 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
index 66258be791..760ee5847f 100644
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@@ -18071,22 +18071,22 @@ func_80240040_EF2650 = 0x80240040; // type:func rom:0xEF2650
 func_80240070_EF2680 = 0x80240070; // type:func rom:0xEF2680
 func_80240220_EF2830 = 0x80240220; // type:func rom:0xEF2830
 EF2680_DeadUnkNpcAIFunc1 = 0x80240848; // type:func rom:0xEF2E58
-func_80240908_EF2F18 = 0x80240908; // type:func rom:0xEF2F18
-func_80240C4C_EF325C = 0x80240C4C; // type:func rom:0xEF325C
+EF2680_UnkFunc4 = 0x80240908; // type:func rom:0xEF2F18
+EF2680_UnkNpcAIFunc2 = 0x80240C4C; // type:func rom:0xEF325C
 func_80240CC4_EF32D4 = 0x80240CC4; // type:func rom:0xEF32D4
 EF2680_DeadUnkNpcAIFunc14 = 0x80240D30; // type:func rom:0xEF3340
-func_80240E64_EF3474 = 0x80240E64; // type:func rom:0xEF3474
-func_80240EC8_EF34D8 = 0x80240EC8; // type:func rom:0xEF34D8
-func_80241258_EF3868 = 0x80241258; // type:func rom:0xEF3868
+EF2680_UnkNpcAIFunc3 = 0x80240E64; // type:func rom:0xEF3474
+EF2680_UnkFunc6 = 0x80240EC8; // type:func rom:0xEF34D8
+EF2680_UnkFunc5 = 0x80241258; // type:func rom:0xEF3868
 func_8024137C_EF398C = 0x8024137C; // type:func rom:0xEF398C
 func_80241594_EF3BA4 = 0x80241594; // type:func rom:0xEF3BA4
 func_802415DC_EF3BEC = 0x802415DC; // type:func rom:0xEF3BEC
 func_80241A40_EF4050 = 0x80241A40; // type:func rom:0xEF4050
 func_80241C90_EF42A0 = 0x80241C90; // type:func rom:0xEF42A0
-func_8024219C_EF47AC = 0x8024219C; // type:func rom:0xEF47AC
-func_80242218_EF4828 = 0x80242218; // type:func rom:0xEF4828
-func_8024234C_EF495C = 0x8024234C; // type:func rom:0xEF495C
-func_802424B0_EF4AC0 = 0x802424B0; // type:func rom:0xEF4AC0
+EF2680_set_script_owner_npc_anim = 0x8024219C; // type:func rom:0xEF47AC
+EF2680_UnkDistFunc = 0x80242218; // type:func rom:0xEF4828
+EF2680_UnkNpcAIFunc12 = 0x8024234C; // type:func rom:0xEF495C
+EF2680_set_script_owner_npc_col_height = 0x802424B0; // type:func rom:0xEF4AC0
 func_80242530_EF4B40 = 0x80242530; // type:func rom:0xEF4B40
 func_8024299C_EF4FAC = 0x8024299C; // type:func rom:0xEF4FAC
 D_802444BC_EF6ACC = 0x802444BC; // type:data rom:0xEF6ACC
@@ -18837,9 +18837,9 @@ gPlayerData = 0x8010F290; // size:0x340
 gSpinHistoryPosAngle = 0x8010F6B8; // type:data
 D_80117160 = 0x80117160; // type:data
 D_80117163 = 0x80117163; // type:data
-D_80117578 = 0x80117578; // type:data
+dead_gPlayerStatus = 0x80117578; // type:data
 D_80117604 = 0x80117604; // type:data
-D_8011762C = 0x8011762C; // type:data
+dead_gPlayerActionState = 0x8011762C; // type:data
 D_80117840 = 0x80117840; // type:data
 D_80117848 = 0x80117848; // type:data
 D_80117852 = 0x80117852; // type:data
diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt
index 2673224f69..cefc867b94 100644
--- a/ver/us/undefined_syms.txt
+++ b/ver/us/undefined_syms.txt
@@ -66,9 +66,9 @@ D_80026AC7 = 0x80026AC7;
 D_8004AA85 = 0x8004AA85;
 D_80117160 = 0x80117160;
 D_80117163 = 0x80117163;
-D_80117578 = 0x80117578;
+dead_gPlayerStatus = 0x80117578;
 D_80117604 = 0x80117604;
-D_8011762C = 0x8011762C;
+dead_gPlayerActionState = 0x8011762C;
 D_80117840 = 0x80117840;
 D_80117848 = 0x80117848;
 D_80117852 = 0x80117852;
@@ -1751,12 +1751,12 @@ dead_set_main_pan_v = 0x8012607C;
 dead_set_aux_pan_u = 0x80126094;
 dead_set_aux_pan_v = 0x801260AC;
 dead_get_npc_unsafe = 0x8003E4BC;
-func_80075110 = 0x80075110;
-func_80042AF4 = 0x80042AF4;
-func_8002B1C4 = 0x8002B1C4;
-func_8002AF18 = 0x8002AF18;
+dead_fx_emote = 0x80075110;
+dead_get_enemy = 0x80042AF4;
+dead_dist2D = 0x8002B1C4;
+dead_get_clamped_angle_diff = 0x8002AF18;
 dead_clamp_angle = 0x8002AE14;
-func_8004D800 = 0x8004D800;
+dead_ai_enemy_play_sound = 0x8004D800;
 func_8002B28C = 0x8002B28C;
 func_8004D9C0 = 0x8004D9C0;
 func_8004DAD8 = 0x8004DAD8;
@@ -1769,18 +1769,18 @@ func_8004E544 = 0x8004E544;
 func_8004E808 = 0x8004E808;
 func_8004EB8C = 0x8004EB8C;
 func_8004D1A4 = 0x8004D1A4;
-func_8003E424 = 0x8003E424;
+dead_npc_move_heading = 0x8003E424;
 func_80067040 = 0x80067040;
-func_800E5304 = 0x800E5304;
-func_800E423C = 0x800E423C;
-func_8004D0C4 = 0x8004D0C4;
+dead_npc_test_move_simple_with_slipping = 0x800E5304;
+dead_npc_raycast_down_sides = 0x800E423C;
+dead_is_point_within_region = 0x8004D0C4;
 func_8004D8E0 = 0x8004D8E0;
 dead_rand_int = 0x8002ACEC;
 func_8003E534 = 0x8003E534;
 func_8002BFD4 = 0x8002BFD4;
 func_8002C01C = 0x8002C01C;
-func_8002B5DC = 0x8002B5DC;
-func_8002B640 = 0x8002B640;
+dead_sin_deg = 0x8002B5DC;
+dead_cos_deg = 0x8002B640;
 func_800F1EF8 = 0x800F1EF8;
 func_8015704C = 0x8015704C;
 func_80077C30 = 0x80077C30;
@@ -1799,7 +1799,7 @@ func_80077BD0 = 0x80077BD0;
 func_80041080 = 0x80041080;
 func_800F1D9C = 0x800F1D9C;
 func_800F1730 = 0x800F1730;
-func_8003C43C = 0x8003C43C;
+dead_get_npc_by_index = 0x8003C43C;
 func_800F1718 = 0x800F1718;
 func_800F16F4 = 0x800F16F4;
 func_80125270 = 0x80125270;
@@ -1828,7 +1828,7 @@ func_800F7278 = 0x800F7278;
 func_800F2E98 = 0x800F2E98;
 func_8003ED50 = 0x8003ED50;
 func_8003E5E8 = 0x8003E5E8;
-func_8002FCBC = 0x8002FCBC;
+dead_get_screen_coords = 0x8002FCBC;
 func_801574DC = 0x801574DC;
 func_80157118 = 0x80157118;
 func_8005F238 = 0x8005F238;
@@ -1838,5 +1838,5 @@ func_80130C64 = 0x80130C64;
 func_8002B45C = 0x8002B45C;
 func_801266F8 = 0x801266F8;
 func_80126734 = 0x80126734;
-func_80144194 = 0x80144194;
+dead_set_screen_overlay_params_back = 0x80144194;
 dead_gItemTable = 0x8008D2C0;