diff --git a/.gitignore b/.gitignore
index 19a8313dde..0fa95cda4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ expected/
 /tools/to_rename.txt
 /ver/current
 /ver/*/assets
+ctx.c.m2c
 
 # Build artifacts
 build.ninja
diff --git a/include/dead.h b/include/dead.h
index f80dd43437..d9d12e8455 100644
--- a/include/dead.h
+++ b/include/dead.h
@@ -3,6 +3,9 @@
 #ifndef _DEAD_H_
 #define _DEAD_H_
 
+// There can be multiple invalid references to a symbol from the dead code,
+// so some symbols here have a "2" suffix.
+
 #define gCameras dead_gCameras
 #define evt_get_variable dead_evt_get_variable
 #define evt_set_variable dead_evt_set_variable
@@ -55,6 +58,35 @@
 #define playFX_7B dead_playFX_7B
 #define dist3D dead_dist3D
 #define subtract_hp dead_subtract_hp
+#define get_entity_by_index dead_get_entity_by_index
+#define playFX_52 dead_playFX_52
+#define playFX_33 dead_playFX_33
+#define set_screen_overlay_color dead_set_screen_overlay_color
+#define set_screen_overlay_params_front dead_set_screen_overlay_params_front
+#define playFX_82 dead_playFX_82
+#define set_message_images dead_set_message_images
+#define general_heap_free dead_general_heap_free
+#define decode_yay0 dead_decode_yay0
+#define load_asset_by_name dead_load_asset_by_name
+#define gCollisionStatus dead_gCollisionStatus
+#define switch_to_partner dead_switch_to_partner
+#define set_npc_yaw dead_set_npc_yaw
+#define disable_npc_shadow dead_disable_npc_shadow
+#define func_800EB2A4 func_800F2E98
+#define partner_clear_player_tracking dead_partner_clear_player_tracking
+#define sfx_play_sound_with_params dead_sfx_play_sound_with_params
+#define sfx_get_spatialized_sound_params dead_sfx_get_spatialized_sound_params
+#define npc_test_move_simple_without_slipping dead_npc_test_move_simple_without_slipping
+#define func_8003D660 func_80041080
+#define get_item_entity dead_get_item_entity
+#define gOverrideFlags dead_gOverrideFlags
+#define set_message_msg dead_set_message_msg
+#define gPlayerData dead_gPlayerData
+#define D_8008EF20 D_80094900
+#define increment_status_menu_disabled dead_increment_status_menu_disabled
+#define decrement_status_menu_disabled dead_decrement_status_menu_disabled
+#define sync_status_menu dead_sync_status_menu
+#define set_max_SP dead_set_max_SP
 //#define sqrtf dead_sqrtf // <- This somehow breaks things
 
 #endif
diff --git a/include/enums.h b/include/enums.h
index 60f9ecd220..182838ebe8 100644
--- a/include/enums.h
+++ b/include/enums.h
@@ -530,6 +530,7 @@ enum SoundIDs {
     SOUND_UNKNOWN_167               = 359,
     SOUND_UNKNOWN_172               = 370,
     SOUND_UNKNOWN_17B               = 379,
+    SOUND_UNKNOWN_194               = 404,
     SOUND_BASIC_DOOR_OPEN           = 449,
     SOUND_BASIC_DOOR_CLOSE,
     SOUND_METAL_DOOR_OPEN,
diff --git a/include/functions.h b/include/functions.h
index 8ef94accbf..18dc44a714 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -470,8 +470,6 @@ void crash_screen_init(void);
 void crash_screen_set_draw_info(u16* frameBufPtr, s16 width, s16 height);
 
 // Dead functions:
-//Npc* dead_get_npc_safe(s32 npcId); // get_npc_safe
-void func_80077BD0(s32, s32, s32, s32, s32, s32);
 void func_8006CAC0(float mf[4][4], float x, float y, float z);
 
 void func_800495A0(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory);
diff --git a/include/variables.h b/include/variables.h
index e92fdb6cc2..6b6e6df66e 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -412,4 +412,7 @@ extern StaticEntityData D_802E9D1C;
 extern StaticEntityData D_802E9D40;
 extern StaticEntityData D_802E9D64;
 
+// Temporary dead stuff
+extern PartnerActionStatus dead_gPartnerActionStatus2;
+
 #endif
diff --git a/src/EA0C10.c b/src/EA0C10.c
index a53504b0df..d500dd19af 100644
--- a/src/EA0C10.c
+++ b/src/EA0C10.c
@@ -105,7 +105,7 @@ INCLUDE_ASM(s32, "EA0C10", func_8024267C_EA2F7C);
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
-INCLUDE_ASM(s32, "EA0C10", func_802427F0_EA30F0);
+#include "world/common/AddPlayerHandsOffset.inc.c"
 
 INCLUDE_ASM(s32, "EA0C10", func_802429C0_EA32C0);
 
diff --git a/src/EA6FD0.c b/src/EA6FD0.c
index 3e6fbd1a3b..a2be79c89e 100644
--- a/src/EA6FD0.c
+++ b/src/EA6FD0.c
@@ -1,6 +1,8 @@
 #include "dead.h"
 #include "common.h"
 
+#define NAMESPACE EA6FD0
+
 s32 func_80240000_EA6FD0(void) {
     s32 temp = evt_get_variable(NULL, EVT_STORY_PROGRESS);
 
diff --git a/src/EA7320.c b/src/EA7320.c
index 897e6de0f3..7541ebbd45 100644
--- a/src/EA7320.c
+++ b/src/EA7320.c
@@ -3,21 +3,11 @@
 
 #define NAMESPACE EA7320
 
-extern s16 D_80169B12;
+#include "world/common/SetCamera0Flag1000.inc.c"
 
-ApiStatus func_80240350_EA7320(Evt* script, s32 isInitialCall) {
-    Camera* camera = &gCameras[0];
-
-    camera->flags |= 0x1000;
-    return ApiStatus_DONE2;
-}
-
-ApiStatus func_8024036C_EA733C(Evt* script, s32 isInitialCall) {
-    gCameras->flags &= ~0x1000;
-    return ApiStatus_DONE2;
-}
+#include "world/common/UnsetCamera0Flag1000.inc.c"
 
 ApiStatus func_80240388_EA7358(Evt* script, s32 isInitialCall) {
-    evt_set_variable(script, *script->ptrReadPos, D_80169B12);
+    evt_set_variable(script, *script->ptrReadPos, dead_gCollisionStatus.pushingAgainstWall);
     return ApiStatus_DONE2;
 }
diff --git a/src/EA8AE0.c b/src/EA8AE0.c
index 2c9ae4b5b9..ac1ddf4230 100644
--- a/src/EA8AE0.c
+++ b/src/EA8AE0.c
@@ -45,7 +45,7 @@ INCLUDE_ASM(s32, "EA8AE0", func_80241468_EA9F48);
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
-INCLUDE_ASM(s32, "EA8AE0", func_802415DC_EAA0BC);
+#include "world/common/AddPlayerHandsOffset.inc.c"
 
 INCLUDE_ASM(s32, "EA8AE0", func_802417AC_EAA28C);
 
diff --git a/src/EB1170.c b/src/EB1170.c
index 82a84e33b3..c280cea4e2 100644
--- a/src/EB1170.c
+++ b/src/EB1170.c
@@ -4,7 +4,6 @@
 #define NAMESPACE EB1170
 
 extern s32 func_80059AC8(s32, s32);
-extern s16 D_80169B12;
 extern s32 D_802417E4_EB2644;
 extern s32 D_802417E8_EB2648;
 extern s32 D_802442D0[];
@@ -17,7 +16,7 @@ INCLUDE_ASM(s32, "EB1170", func_80240310_EB1170);
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
-INCLUDE_ASM(s32, "EB1170", func_80240484_EB12E4);
+#include "world/common/AddPlayerHandsOffset.inc.c"
 
 // LW %LO issue.
 #ifdef NON_MATCHING
@@ -91,6 +90,6 @@ ApiStatus func_80240A68_EB18C8(Evt* script, s32 isInitialCall) {
 ApiStatus func_80240A8C_EB18EC(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    evt_set_variable(script, *args++, D_80169B12);
+    evt_set_variable(script, *args++, dead_gCollisionStatus.pushingAgainstWall);
     return ApiStatus_DONE2;
 }
diff --git a/src/EB5130.c b/src/EB5130.c
index 22f95a0380..afee812b43 100644
--- a/src/EB5130.c
+++ b/src/EB5130.c
@@ -7,9 +7,7 @@
 
 #include "world/common/DeadUnkTexturePanFunc2.inc.c"
 
-extern s16 D_80169B12;
-
 ApiStatus func_8024030C_EB543C(Evt* script, s32 isInitialCall) {
-    evt_set_variable(script, *script->ptrReadPos, D_80169B12);
+    evt_set_variable(script, *script->ptrReadPos, dead_gCollisionStatus.pushingAgainstWall);
     return ApiStatus_DONE2;
 }
diff --git a/src/EB5470.c b/src/EB5470.c
index b5e14e4a18..091e01c79b 100644
--- a/src/EB5470.c
+++ b/src/EB5470.c
@@ -1,6 +1,14 @@
 #include "dead.h"
 #include "common.h"
 
-INCLUDE_ASM(s32, "EB5470", func_80240340_EB5470);
+#define NAMESPACE EB5470
 
-INCLUDE_ASM(s32, "EB5470", func_8024036C_EB549C);
+ApiStatus func_80240340_EB5470(Evt* script, s32 isInitialCall) {
+    evt_set_variable(script, *script->ptrReadPos, dead_gCollisionStatus.pushingAgainstWall);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_8024036C_EB549C(Evt* script, s32 isInitialCall) {
+    func_80059AC8(0, 1);
+    return ApiStatus_DONE2;
+}
diff --git a/src/EB7540.c b/src/EB7540.c
index 05c529ba4f..afc9462e2c 100644
--- a/src/EB7540.c
+++ b/src/EB7540.c
@@ -1,12 +1,14 @@
 #include "dead.h"
 #include "common.h"
 
+#define NAMESPACE EB7540
+
 INCLUDE_ASM(s32, "EB7540", func_80240310_EB7540);
 
-INCLUDE_ASM(s32, "EB7540", func_802403D8_EB7608);
+#include "world/common/GetEntityPosition.inc.c"
 
 INCLUDE_ASM(s32, "EB7540", func_80240478_EB76A8);
 
-INCLUDE_ASM(s32, "EB7540", func_80240504_EB7734);
+#include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
 INCLUDE_ASM(s32, "EB7540", func_80240520_EB7750);
diff --git a/src/EB8E50.c b/src/EB8E50.c
index 2f74eeb41a..a06670e815 100644
--- a/src/EB8E50.c
+++ b/src/EB8E50.c
@@ -1,6 +1,8 @@
 #include "dead.h"
 #include "common.h"
 
+#define NAMESPACE EB8E50
+
 const char ascii_EC2000[] = "mac_01";
 const char ascii_EC2008[] = "flo_14";
 const char ascii_EC2010[] = "flo_23";
@@ -11,6 +13,6 @@ const char ascii_EC2030[] = "flo_08";
 static const f64 rodata_alignment = 0.0;
 
 ApiStatus func_80240000_EB8E50(void) {
-    func_80077BD0(0, 0, 0, 0, 0, 0);
+    dead_playFX_82(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/EB8E90.c b/src/EB8E90.c
index 83a7931fbf..3a48099cf9 100644
--- a/src/EB8E90.c
+++ b/src/EB8E90.c
@@ -1,30 +1,41 @@
 #include "dead.h"
 #include "common.h"
 
+// Copy of flo_00? (C9DF60)
+
 #define NAMESPACE EB8E90
 
-INCLUDE_ASM(s32, "EB8E90", func_80240040_EB8E90);
+#include "world/common/UnkNpcAIFunc24.inc.c"
 
-INCLUDE_ASM(s32, "EB8E90", func_80240198_EB8FE8);
+#include "world/common/UnkFunc13.inc.c"
 
 #include "world/common/DeadUnkNpcAIFunc1.inc.c"
 
-INCLUDE_ASM(s32, "EB8E90", func_80240500_EB9350);
+#include "world/common/UnkFunc14.inc.c"
 
-INCLUDE_ASM(s32, "EB8E90", func_802406BC_EB950C);
+#include "world/common/UnkNpcAIFunc25.inc.c"
 
-INCLUDE_ASM(s32, "EB8E90", func_80240770_EB95C0);
+#include "world/common/NpcJumpFunc2.inc.c"
 
-INCLUDE_ASM(s32, "EB8E90", func_802407E4_EB9634);
+#include "world/common/NpcJumpFunc.inc.c"
 
-INCLUDE_ASM(s32, "EB8E90", func_8024085C_EB96AC);
+#include "world/common/UnkNpcAIFunc13.inc.c"
 
-INCLUDE_ASM(s32, "EB8E90", func_8024098C_EB97DC);
+#include "world/common/UnkFunc15.inc.c"
 
-INCLUDE_ASM(s32, "EB8E90", func_80240AAC_EB98FC);
+#include "world/common/UnkNpcDurationFlagFunc.inc.c"
 
-INCLUDE_ASM(s32, "EB8E90", func_80240B14_EB9964);
+#include "world/common/UnkFunc16.inc.c"
 
+// See func_80240BD4_C9EAF4 in C9DF60.c
 INCLUDE_ASM(s32, "EB8E90", func_80240BD4_EB9A24);
 
-INCLUDE_ASM(s32, "EB8E90", func_80240EFC_EB9D4C);
+ApiStatus N(PostChapter6StatUpdate)(Evt* script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+
+    set_max_SP(6);
+    playerData->curHP = playerData->curMaxHP;
+    playerData->curFP = playerData->curMaxFP;
+    sync_status_menu();
+    return ApiStatus_DONE2;
+}
diff --git a/src/EB9D90.c b/src/EB9D90.c
index c3d7610483..b2f4f9549a 100644
--- a/src/EB9D90.c
+++ b/src/EB9D90.c
@@ -1,21 +1,66 @@
 #include "dead.h"
 #include "common.h"
 
+// Copy of flo_00? (C9EE30)
+
+#define NAMESPACE EB9D90
+
 static char* N(exit_str_0) = "flo_07";
 static char* N(exit_str_1) = "\0\0\0\0";
 static char* N(exit_str_2) = "sam_11";
 static char* N(exit_str_3) = "flo_19";
 
-INCLUDE_ASM(s32, "EB9D90", func_80240F40_EB9D90);
+//INCLUDE_ASM(s32, "EB9D90", func_80240F40_EB9D90);
+ApiStatus func_80240F40_EB9D90(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 var1 = *args++;
+    s32 var2 = *args++;
 
-INCLUDE_ASM(s32, "EB9D90", func_80240FB0_EB9E00);
+    evt_set_variable(script, var1, gPlayerStatus.spriteFacingAngle);
+    evt_set_variable(script, var2, gPlayerStatus.targetYaw);
 
-INCLUDE_ASM(s32, "EB9D90", func_802410E4_EB9F34);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "EB9D90", func_8024121C_EBA06C);
+ApiStatus func_80240FB0_EB9E00(Evt* script, s32 isInitialCall) {
+    f32 var1 = evt_get_variable(NULL, script->varTable[2]);
+    f32 dist = dist2D(-83.0f, 87.0f, script->varTable[9], script->varTable[11]);
+    f32 clamped = clamp_angle(atan2(-83.0f, 87.0f, script->varTable[9], script->varTable[11]) - var1);
 
-INCLUDE_ASM(s32, "EB9D90", func_802413AC_EBA1FC);
+    var1 = sin_deg(clamped);
+    gPlayerStatus.position.x = (dist * var1) + -83.0f;
+    gPlayerStatus.position.y = evt_get_variable(NULL, script->varTable[10]) + evt_get_variable(NULL, script->varTable[3]);
+    var1 = cos_deg(clamped);
+    gPlayerStatus.position.z = 87.0f - (dist * var1);
 
-INCLUDE_ASM(s32, "EB9D90", func_802413CC_EBA21C);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "EB9D90", func_802413EC_EBA23C);
+ApiStatus func_802410E4_EB9F34(Evt* script, s32 isInitialCall) {
+    Npc* npc = get_npc_by_index(0);
+    f32 temp_f20 = evt_get_variable(NULL, script->varTable[2]);
+    f32 dist = dist2D(-83.0f, 87.0f, script->varTable[12], script->varTable[14]);
+    f32 clamped = clamp_angle(atan2(-83.0f, 87.0f, script->varTable[12], script->varTable[14]) - temp_f20);
+
+    temp_f20 = sin_deg(clamped);
+    npc->pos.x = (dist * temp_f20) + -83.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 = 87.0f - (dist * temp_f20);
+
+    return ApiStatus_DONE2;
+}
+
+#include "common/UnkFloatFunc.inc.c"
+
+#include "world/common/SyncStatusMenu.inc.c"
+
+ApiStatus func_802413CC_EBA21C(Evt* script, s32 isInitialCall) {
+    increment_status_menu_disabled();
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_802413EC_EBA23C(Evt* script, s32 isInitialCall) {
+    decrement_status_menu_disabled();
+    return ApiStatus_DONE2;
+}
diff --git a/src/EC2240.c b/src/EC2240.c
index 872b28975a..3ea91767af 100644
--- a/src/EC2240.c
+++ b/src/EC2240.c
@@ -1,6 +1,8 @@
 #include "dead.h"
 #include "common.h"
 
+// Copy of flo_03 (CA72E0)
+
 #define NAMESPACE EC2240
 
 const char* ascii_EC7170 = "flo_09";
@@ -11,4 +13,63 @@ INCLUDE_ASM(s32, "EC2240", func_80240040_EC2240);
 
 #include "world/common/DeadGetItemName.inc.c"
 
+//const char* D_80244F98_EC7198 = "touch_choro\n";
+
+#ifdef NON_MATCHING //TODO(data)
+ApiStatus func_80240158_EC2358(Evt* script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    f32 clamp = clamp_angle(atan2(-210.0f, -183.0f, gPlayerStatus.position.x, gPlayerStatus.position.z) + 180.0f);
+    f32 sp10 = -210.0f;
+    f32 sp14 = -183.0f;
+
+    f32 temp_f20;
+    f32 temp_f4_2;
+    f64 temp_f4;
+    f32 phi_f2;
+
+    add_vec2D_polar(&sp10, &sp14, 46.0f, clamp);
+    temp_f4 = dist2D(npc->pos.x, npc->pos.z, sp10, sp14);
+    if (temp_f4 > 2.0) {
+        temp_f20 = clamp_angle(atan2(-210.0f, -183.0f, npc->pos.x, npc->pos.z));
+        temp_f4_2 = temp_f20 - clamp_angle(atan2(-210.0f, -183.0f, sp10, sp14));
+        if (abs(temp_f4_2) >= 0x15) {
+            phi_f2 = temp_f4_2;
+            if (temp_f4_2 >= 180.0f) {
+                phi_f2 = temp_f4_2 - 360.0f;
+            }
+            if (phi_f2 <= -180.0f) {
+                phi_f2 += 360.0f;
+            }
+            if (temp_f4_2 == phi_f2) {
+                sp10 = -210.0f;
+                sp14 = -183.0f;
+                if (temp_f4_2 >= 0.0f) {
+                    clamp = clamp_angle(temp_f20 - 20.0f);
+                } else {
+                    clamp = clamp_angle(temp_f20 + 20.0f);
+                }
+                add_vec2D_polar(&sp10, &sp14, 46.0f, clamp);
+            } else {
+                osSyncPrintf("cccc\n");
+            }
+        }
+        npc->currentAnim.w = enemy->animList[2];
+        npc->yaw = atan2(npc->pos.x, npc->pos.z, sp10, sp14);
+        npc_move_heading(npc, 2.0f, npc->yaw);
+    } else if (temp_f4 > 0.2) {
+        npc->yaw = atan2(npc->pos.x, npc->pos.z, sp10, sp14);
+        npc->pos.x = sp10;
+        npc->pos.z = sp14;
+        npc->currentAnim.w = enemy->animList[1];
+    } else {
+        npc->pos.x = sp10;
+        npc->pos.z = sp14;
+        npc->currentAnim.w = enemy->animList[0];
+    }
+    return ApiStatus_BLOCK;
+}
+#else
 INCLUDE_ASM(s32, "EC2240", func_80240158_EC2358);
+#endif
diff --git a/src/EC2610.c b/src/EC2610.c
index 0083de50e1..91a10fff95 100644
--- a/src/EC2610.c
+++ b/src/EC2610.c
@@ -3,4 +3,4 @@
 
 #define NAMESPACE EC2610
 
-#import "world/common/DeadFoliage.inc.c"
+#include "world/common/DeadFoliage.inc.c"
diff --git a/src/EC71B0.c b/src/EC71B0.c
index 7e1021f7b0..a5d2bd78f6 100644
--- a/src/EC71B0.c
+++ b/src/EC71B0.c
@@ -7,6 +7,6 @@
 
 #include "world/common/DeadUnkTexturePanFunc2.inc.c"
 
-INCLUDE_ASM(s32, "EC71B0", func_8024030C_EC74BC);
+#include "world/common/SpawnSunEffect.inc.c"
 
 INCLUDE_ASM(s32, "EC71B0", func_80240344_EC74F4);
diff --git a/src/EC7590.c b/src/EC7590.c
index 6f92d36ad8..aa4790f612 100644
--- a/src/EC7590.c
+++ b/src/EC7590.c
@@ -3,7 +3,7 @@
 
 #define NAMESPACE EC7590
 
-#import "world/common/DeadFoliage.inc.c"
+#include "world/common/DeadFoliage.inc.c"
 
 INCLUDE_ASM(s32, "EC7590", func_8024061C_EC77CC);
 
diff --git a/src/EC9D00.c b/src/EC9D00.c
index 0e2f936dcc..0c150bfe2d 100644
--- a/src/EC9D00.c
+++ b/src/EC9D00.c
@@ -3,36 +3,39 @@
 
 #define NAMESPACE EC9D00
 
-INCLUDE_ASM(s32, "EC9D00", func_80240000_EC9D00);
+#define gPartnerActionStatus dead_gPartnerActionStatus2
 
-INCLUDE_ASM(s32, "EC9D00", func_8024001C_EC9D1C);
+extern s32 D_80094900[11][4];
 
-INCLUDE_ASM(s32, "EC9D00", func_8024003C_EC9D3C);
+#include "world/common/SetOverrideFlags_40.inc.c"
 
-INCLUDE_ASM(s32, "EC9D00", func_80240068_EC9D68);
+#include "world/common/UnkFunc17.inc.c"
 
-INCLUDE_ASM(s32, "EC9D00", func_802400D4_EC9DD4);
+ApiStatus func_8024003C_EC9D3C(Evt* script, s32 isInitialCall) {
+    func_802F3B00(evt_get_variable(script, *script->ptrReadPos));
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "EC9D00", func_80240120_EC9E20);
+#include "world/common/UnkFunc18.inc.c"
 
 INCLUDE_ASM(s32, "EC9D00", func_802401CC_EC9ECC);
 
-INCLUDE_ASM(s32, "EC9D00", func_8024041C_ECA11C);
+#include "world/common/SwitchToPartner.inc.c"
 
-INCLUDE_ASM(s32, "EC9D00", func_80240448_ECA148);
+#include "world/common/UnkFunc19.inc.c"
 
-INCLUDE_ASM(s32, "EC9D00", func_80240480_ECA180);
+#include "world/common/UnkFunc20.inc.c"
 
-INCLUDE_ASM(s32, "EC9D00", func_80240510_ECA210);
+#include "world/common/UnkFunc39.inc.c"
 
-INCLUDE_ASM(s32, "EC9D00", func_80240544_ECA244);
+#include "world/common/UnkFunc21.inc.c"
 
-INCLUDE_ASM(s32, "EC9D00", func_802405A8_ECA2A8);
+#include "world/common/UnkFunc22.inc.c"
 
 INCLUDE_ASM(s32, "EC9D00", func_80240600_ECA300);
 
-INCLUDE_ASM(s32, "EC9D00", func_80240B38_ECA838);
+#include "world/common/UnkFunc23.inc.c"
 
 #include "world/common/DeadUnkPartnerPosFuncs.inc.c"
 
-INCLUDE_ASM(s32, "EC9D00", func_80240D08_ECAA08);
+#include "world/common/UnkFunc40.inc.c"
diff --git a/src/ECAA80.c b/src/ECAA80.c
index 656d5371e4..57be5922c1 100644
--- a/src/ECAA80.c
+++ b/src/ECAA80.c
@@ -1,21 +1,144 @@
 #include "dead.h"
 #include "common.h"
 
+// Copy of flo_08? (CAFAC0)
+
 #define NAMESPACE ECAA80
 
 extern s32 D_802462F0[];
+extern s32 D_80246460_EC9D00[91];
+extern s32 D_802465CC;
 
-INCLUDE_ASM(s32, "ECAA80", func_80240D80_ECAA80);
+void func_80240D80_ECAA80(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    f32 temp_f0;
+    f32 temp_f20;
+    f64 temp_f2;
+    f32 phi_f22;
+    f32 phi_f24;
+    f32 phi_f26;
+    s32 phi_s3;
+
+    f32 subroutine_arg8;
+    f32 subroutine_arg9;
+    f32 subroutine_argA;
+    f32 subroutine_argB;
+    f32 subroutine_argC;
+    f32 subroutine_argD;
+    f32 subroutine_argE;
+    f32 subroutine_argF;
+    f32 subroutine_arg10;
+
+    npc->duration = npcAISettings->unk_20 / 2 + rand_int(npcAISettings->unk_20 / 2 + 1);
+    npc->currentAnim.w = enemy->animList[3];
+    npc->moveSpeed = npcAISettings->chaseSpeed;
+    phi_s3 = FALSE;
+
+    temp_f20 = clamp_angle(atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x,
+                                 gPlayerStatusPtr->position.z) + 180.0f);
+    temp_f0 = get_clamped_angle_diff(npc->yaw, temp_f20);
+    if (npcAISettings->unk_1C.s < fabsf(temp_f0)) {
+        temp_f20 = npc->yaw;
+        if (temp_f0 < 0.0f) {
+            temp_f20 += -npcAISettings->unk_1C.s;
+        } else {
+            temp_f20 += npcAISettings->unk_1C.s;
+        }
+    }
+
+    npc->yaw = clamp_angle(temp_f20);
+
+    subroutine_arg8 = npc->pos.x;
+    subroutine_arg9 = npc->pos.y;
+    subroutine_argA = npc->pos.z;
+
+    temp_f20 = clamp_angle(atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x,
+                                 gPlayerStatusPtr->position.z) + 180.0f);
+    phi_f22 = 0.0f;
+    phi_f24 = 0.0f;
+    phi_f26 = 0.0f;
+
+    if (npc_test_move_simple_without_slipping(npc->unk_80, &subroutine_arg8, &subroutine_arg9, &subroutine_argA, npc->moveSpeed * 4.5, temp_f20,
+                      npc->collisionHeight, npc->collisionRadius)) {
+        phi_f22 = dist2D(npc->pos.x, npc->pos.z, subroutine_arg8, subroutine_argA);
+
+        subroutine_argB = npc->pos.x;
+        subroutine_argC = npc->pos.y;
+        subroutine_argD = npc->pos.z;
+
+        if (npc_test_move_simple_without_slipping(npc->unk_80, &subroutine_argB, &subroutine_argC, &subroutine_argD, npc->moveSpeed * 4.5,
+                          clamp_angle(temp_f20 + 35.0f), npc->collisionHeight, npc->collisionRadius)) {
+            phi_f24 = dist2D(npc->pos.x, npc->pos.z, subroutine_argB, subroutine_argD);
+        }
+
+        subroutine_argE = npc->pos.x;
+        subroutine_argF = npc->pos.y;
+        subroutine_arg10 = npc->pos.z;
+
+        if (npc_test_move_simple_without_slipping(npc->unk_80, &subroutine_argE, &subroutine_argF, &subroutine_arg10, npc->moveSpeed * 4.5,
+                          clamp_angle(temp_f20 - 35.0f), npc->collisionHeight, npc->collisionRadius)) {
+            phi_f26 = dist2D(npc->pos.x, npc->pos.z, subroutine_argE, subroutine_arg10);
+        }
+
+        dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
+
+        if ((phi_f22 < npc->moveSpeed * 1.5) && (phi_f24 < npc->moveSpeed * 1.5) && (phi_f26 < npc->moveSpeed * 1.5) &&
+            (func_800490B4(territory, enemy, npcAISettings->alertRadius, npcAISettings->unk_10.f, 0))) {
+            phi_s3 = TRUE;
+        }
+
+        if (!phi_s3) {
+            if ((phi_f24 < phi_f22) && (phi_f26 < phi_f24)) {
+                temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_arg8, subroutine_argA);
+            } else if ((phi_f24 < phi_f22) && (phi_f24 < phi_f26)) {
+                temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_arg8, subroutine_argA);
+            } else if ((phi_f22 < phi_f24) && (phi_f26 < phi_f22)) {
+                temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argB, subroutine_argD);
+            } else if ((phi_f26 < phi_f24) && (phi_f22 < phi_f26)) {
+                temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argB, subroutine_argD);
+            } else if ((phi_f22 < phi_f26) && (phi_f24 < phi_f22)) {
+                temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argE, subroutine_arg10);
+            } else if ((phi_f24 < phi_f26) && (phi_f22 < phi_f24)) {
+                temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argE, subroutine_arg10);
+            }
+
+            temp_f0 = get_clamped_angle_diff(npc->yaw, temp_f20);
+            if (npcAISettings->unk_1C.s < fabsf(temp_f0)) {
+                temp_f20 = npc->yaw;
+                if (temp_f0 < 0.0f) {
+                    temp_f20 += -npcAISettings->unk_1C.s;
+                } else {
+                    temp_f20 += npcAISettings->unk_1C.s;
+                }
+            }
+            npc->yaw = clamp_angle(temp_f20);
+        }
+    }
+    if (phi_s3) {
+        npc->duration = 0xA;
+        npc->currentAnim.w = enemy->animList[8];
+    }
+    script->functionTemp[0] = 0xD;
+}
 
 INCLUDE_ASM(s32, "ECAA80", func_80241364_ECB064);
 
-INCLUDE_ASM(s32, "ECAA80", func_802414C8_ECB1C8);
+void func_802414C8_ECB1C8(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
+    Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID);
+
+    npc->duration--;
+    if (npc->duration == 0) {
+        script->functionTemp[0] = 0;
+    }
+}
 
 INCLUDE_ASM(s32, "ECAA80", func_8024150C_ECB20C);
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
-INCLUDE_ASM(s32, "ECAA80", func_802417CC_ECB4CC);
+#include "world/common/AddPlayerHandsOffset.inc.c"
 
 INCLUDE_ASM(s32, "ECAA80", func_8024199C_ECB69C);
 
@@ -40,8 +163,43 @@ ApiStatus func_80241A28_ECB728(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "ECAA80", func_80241AC4_ECB7C4);
+ApiStatus func_80241AC4_ECB7C4(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 itemIdx = evt_get_variable(script, *args++);
+    s32 var1 = evt_get_variable(script, *args++);
+    s32 var2 = evt_get_variable(script, *args++);
+    s32 var3 = evt_get_variable(script, *args++);
+    ItemEntity* item = get_item_entity(itemIdx);
 
-INCLUDE_ASM(s32, "ECAA80", func_80241B88_ECB888);
+    item->position.x = var1;
+    item->position.y = var2;
+    item->position.z = var3;
 
-INCLUDE_ASM(s32, "ECAA80", func_80241BF8_ECB8F8);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80241B88_ECB888(Evt* script, s32 isInitialCall) {
+    s32 itemId = evt_get_variable(script, *script->ptrReadPos);
+    StaticItem* item = &gItemTable[itemId];
+
+    if (itemId == ITEM_YUMMY_MEAL) {
+        script->varTable[9] = 2;
+    } else if (item->typeFlags & 0x80) {
+        script->varTable[9] = 1;
+    } else {
+        script->varTable[9] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80241BF8_ECB8F8(Evt* script, s32 isInitialCall) {
+    s32 i;
+
+    for (i = 0; i <= 90; i++) {
+        D_80246460_EC9D00[i] = 128 + i;
+    }
+
+    D_802465CC = 0;
+    return ApiStatus_DONE2;
+}
diff --git a/src/ECB930.c b/src/ECB930.c
index 54b5c668e7..8372f1d197 100644
--- a/src/ECB930.c
+++ b/src/ECB930.c
@@ -3,4 +3,4 @@
 
 #define NAMESPACE ECB930
 
-#import "world/common/DeadFoliage.inc.c"
+#include "world/common/DeadFoliage.inc.c"
diff --git a/src/ECBB70.c b/src/ECBB70.c
index 7a00471e22..dfb15f37b7 100644
--- a/src/ECBB70.c
+++ b/src/ECBB70.c
@@ -1,4 +1,6 @@
 #include "dead.h"
 #include "common.h"
 
-INCLUDE_ASM(s32, "ECBB70", func_80241E70_ECBB70);
+#define NAMESPACE ECBB70
+
+#include "world/common/UnkFunc43.inc.c"
diff --git a/src/ED0030.c b/src/ED0030.c
index 64f8815baf..053d2b3947 100644
--- a/src/ED0030.c
+++ b/src/ED0030.c
@@ -1,4 +1,6 @@
 #include "dead.h"
 #include "common.h"
 
-INCLUDE_ASM(s32, "ED0030", func_80240040_ED0030);
+#define NAMESPACE ED0030
+
+#include "world/common/UnkFunc43.inc.c"
diff --git a/src/ED00D0.c b/src/ED00D0.c
index f601168954..49e6d9cedb 100644
--- a/src/ED00D0.c
+++ b/src/ED00D0.c
@@ -3,4 +3,4 @@
 
 #define NAMESPACE ED00D0
 
-#import "world/common/DeadFoliage.inc.c"
+#include "world/common/DeadFoliage.inc.c"
diff --git a/src/ED4220.c b/src/ED4220.c
index a3c5ad3b97..b259594f2f 100644
--- a/src/ED4220.c
+++ b/src/ED4220.c
@@ -1,4 +1,13 @@
 #include "dead.h"
 #include "common.h"
 
-INCLUDE_ASM(s32, "ED4220", func_80240000_ED4220);
+// Copy of flo_10 (CBP200.c)
+
+#define NAMESPACE ED4220
+
+s32 func_80240000_ED4220(void) {
+    if (evt_get_variable(NULL, EVT_STORY_PROGRESS) <= 0x30) {
+        return MESSAGE_ID(0x19, 0x0119);
+    }
+    return MESSAGE_ID(0x19, 0x011A);
+}
diff --git a/src/ED42A0.c b/src/ED42A0.c
index 4201933370..458e44da37 100644
--- a/src/ED42A0.c
+++ b/src/ED42A0.c
@@ -9,4 +9,4 @@ INCLUDE_ASM(s32, "ED42A0", func_80240080_ED42A0);
 
 #include "world/common/DeadUnkTexturePanFunc.inc.c"
 
-INCLUDE_ASM(s32, "ED42A0", func_802402BC_ED44DC);
+#include "world/common/DeadUnkTexturePanFunc2.inc.c"
diff --git a/src/ED46D0.c b/src/ED46D0.c
index 821bc6898f..a1566b8bc9 100644
--- a/src/ED46D0.c
+++ b/src/ED46D0.c
@@ -1,5 +1,9 @@
 #include "dead.h"
-#include "common.h"
+#include "common.h",
+
+// Copy of flo_10? (CBP6B0.c)
+
+#define NAMESPACE ED46D0
 
 INCLUDE_ASM(s32, "ED46D0", func_802404B0_ED46D0);
 
diff --git a/src/ED5540.c b/src/ED5540.c
index fff68d8682..fe7fbfad01 100644
--- a/src/ED5540.c
+++ b/src/ED5540.c
@@ -3,4 +3,4 @@
 
 #define NAMESPACE ED5540
 
-#import "world/common/DeadFoliage.inc.c"
+#include "world/common/DeadFoliage.inc.c"
diff --git a/src/ED8E20.c b/src/ED8E20.c
index f68117eec2..78dc75482c 100644
--- a/src/ED8E20.c
+++ b/src/ED8E20.c
@@ -1,7 +1,8 @@
 #include "dead.h"
 #include "common.h"
 
-extern s16 D_80169B12;
+#define NAMESPACE ED8E20
+
 extern GameStatus* D_80079430;
 extern f32 D_800B8DEC;
 
@@ -10,13 +11,10 @@ typedef struct DokanModelInfo {
     /* 0x04 */ Vec3f position;
 } DokanModelInfo;
 
-ApiStatus func_80240000_ED8E20(Evt* script, s32 isInitialCall) {
-    gPlayerStatusPtr->animFlags |= 0x100000;
-    return ApiStatus_DONE2;
-}
+#include "world/common/SetPlayerStatusAnimFlags100000.inc.c"
 
 ApiStatus func_80240020_ED8E40(Evt* script, s32 isInitialCall) {
-    script->varTable[0] = (s32)D_80169B12;
+    script->varTable[0] = dead_gCollisionStatus.pushingAgainstWall;
     return ApiStatus_DONE2;
 }
 
@@ -43,26 +41,11 @@ ApiStatus func_802400F0_ED8F10(Evt* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "ED8E20", func_802400F0_ED8F10);
 #endif
 
-ApiStatus func_80240208_ED9028(Evt* script, s32 isInitialCall) {
-    script->varTable[0] = clamp_angle(gCameras[gCurrentCameraID].currentYaw + 180.0f);
-    return ApiStatus_DONE2;
-}
+#include "world/common/GetCurrentCameraYawClamped180.inc.c"
 
-ApiStatus func_80240274_ED9094(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    f32 temp_a2 = evt_get_float_variable(script, *args++);
-    f32 playerX = gPlayerStatus.position.x;
-    f32 playerY = gPlayerStatus.position.y;
-    f32 playerZ = gPlayerStatus.position.z;
-
-    add_vec2D_polar(&playerX, &playerZ, temp_a2, gPlayerStatus.targetYaw);
-    evt_set_float_variable(script, EVT_VAR(0), playerX);
-    evt_set_float_variable(script, EVT_VAR(1), playerY);
-    evt_set_float_variable(script, EVT_VAR(2), playerZ);
-    return ApiStatus_DONE2;
-}
+#include "world/common/SomeXYZFunc2.inc.c"
 
 ApiStatus func_80240318_ED9138(Evt* script, s32 isInitialCall) {
-    func_80077BD0(0, 0, 0, 0, 0, 0);
+    dead_playFX_82(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/EDBFE0.c b/src/EDBFE0.c
index af26a400e6..e277d5c396 100644
--- a/src/EDBFE0.c
+++ b/src/EDBFE0.c
@@ -1,4 +1,9 @@
 #include "dead.h"
 #include "common.h"
 
-INCLUDE_ASM(s32, "EDBFE0", func_80240000_EDBFE0);
+#define NAMESPACE ED8FE0
+
+ApiStatus func_80240000_EDBFE0(Evt *script, s32 isInitialCall) {
+    dead_playFX_82(0, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
diff --git a/src/EDC020.c b/src/EDC020.c
index 68b98d1c34..93023d7174 100644
--- a/src/EDC020.c
+++ b/src/EDC020.c
@@ -5,7 +5,7 @@
 
 extern s32 D_802429E0[];
 
-#import "world/common/DeadFoliage.inc.c"
+#include "world/common/DeadFoliage.inc.c"
 
 INCLUDE_ASM(s32, "EDC020", func_8024027C_EDC25C);
 
@@ -13,7 +13,7 @@ INCLUDE_ASM(s32, "EDC020", func_8024027C_EDC25C);
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
-INCLUDE_ASM(s32, "EDC020", func_802403F0_EDC3D0);
+#include "world/common/AddPlayerHandsOffset.inc.c"
 
 INCLUDE_ASM(s32, "EDC020", func_802405C0_EDC5A0);
 
diff --git a/src/EDE9C0.c b/src/EDE9C0.c
index 6c6ae8aae0..b3e7464924 100644
--- a/src/EDE9C0.c
+++ b/src/EDE9C0.c
@@ -1,4 +1,9 @@
 #include "dead.h"
 #include "common.h"
 
-INCLUDE_ASM(s32, "EDE9C0", func_80240000_EDE9C0);
+#define NAMESPACE EDE9C0
+
+ApiStatus func_80240000_EDE9C0(Evt *script, s32 isInitialCall) {
+    dead_playFX_82(0, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
diff --git a/src/EDEA00.c b/src/EDEA00.c
index 71cfde335f..d43cc83a80 100644
--- a/src/EDEA00.c
+++ b/src/EDEA00.c
@@ -1,11 +1,13 @@
 #include "dead.h"
 #include "common.h"
 
+// Copy of flo_13?
+
 #define NAMESPACE EDEA00
 
 extern f32 D_802441DC_EE2B9C[];
 
-INCLUDE_ASM(s32, "EDEA00", func_80240040_EDEA00);
+#include "world/common/UnkFunc41.inc.c"
 
 #include "world/common/UnkNpcAIFunc23.inc.c"
 
@@ -37,11 +39,146 @@ void func_80240E18_EDF7D8(Evt* script, NpcAISettings* aiSettings, EnemyTerritory
 
 INCLUDE_ASM(s32, "EDEA00", func_802414D0_EDFE90);
 
-INCLUDE_ASM(s32, "EDEA00", func_802416E8_EE00A8);
+s32 func_802416E8_EE00A8(void) {
+    s32 i;
 
-INCLUDE_ASM(s32, "EDEA00", func_80241730_EE00F0);
+    for (i = 50; i < 56; i++) {
+        if (get_enemy(i)->varTable[10] == 0) {
+            return i;
+        }
+    }
 
-INCLUDE_ASM(s32, "EDEA00", func_80241B94_EE0554);
+    return -1;
+}
+
+void func_80241730_EE00F0(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_80241B94_EE0554(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, "EDEA00", func_80241DE4_EE07A4);
 
@@ -57,8 +194,48 @@ INCLUDE_ASM(s32, "EDEA00", func_80242684_EE1044);
 
 INCLUDE_ASM(s32, "EDEA00", func_80242AF0_EE14B0);
 
-INCLUDE_ASM(s32, "EDEA00", pause_interp_text_scroll_EE1DD8);
+#include "world/common/UnkFunc42.inc.c"
 
-INCLUDE_ASM(s32, "EDEA00", func_80243470_EE1E30);
+ApiStatus func_80243470_EE1E30(Evt* script, s32 isInitialCall) {
+    Npc* npc = get_npc_unsafe(1);
+    s16 param1;
+    s16 param2;
 
-INCLUDE_ASM(s32, "EDEA00", func_80243584_EE1F44);
+    script->functionTemp[1] = evt_get_variable(script, *script->ptrReadPos);
+
+    if (isInitialCall) {
+        script->functionTemp[0] = 0;
+    }
+    if (script->functionTemp[0] == (script->functionTemp[0] / 5) * 5) {
+
+        sfx_get_spatialized_sound_params(npc->pos.x, npc->pos.y, npc->pos.z,
+                                         &param1, &param2, 0x200002);
+
+        sfx_play_sound_with_params(0x295, param1, param2,
+                                   update_lerp(0, 500.0f, 0.0f, script->functionTemp[0], script->functionTemp[1]));
+    }
+
+    script->functionTemp[0]++;
+    return (script->functionTemp[1] < script->functionTemp[0]) * ApiStatus_DONE2;
+}
+
+ApiStatus func_80243584_EE1F44(Evt* script, s32 isInitialCall) {
+    Npc* npc = get_npc_unsafe(0);
+    s16 param1;
+    s16 param2;
+
+    if (isInitialCall) {
+        script->functionTemp[0] = 0;
+    }
+    if (script->functionTemp[0] == (script->functionTemp[0] / 5) * 5) {
+
+        sfx_get_spatialized_sound_params(npc->pos.x, npc->pos.y, npc->pos.z,
+                                         &param1, &param2, 0x200002);
+
+        sfx_play_sound_with_params(0x295, param1, param2,
+                                   update_lerp(0, 500.0f, 0.0f, script->functionTemp[0], 0x50));
+    }
+
+    script->functionTemp[0]++;
+    return (script->functionTemp[0] > 0x50) * ApiStatus_DONE2;
+}
diff --git a/src/EE2040.c b/src/EE2040.c
index 74deabb9d9..bd0ed95fc6 100644
--- a/src/EE2040.c
+++ b/src/EE2040.c
@@ -1,32 +1,8 @@
 #include "dead.h"
 #include "common.h"
 
-typedef struct UnkStructEE2040 {
-    /* 0x00 */ s32* unk_00;
-    /* 0x04 */ s32* unk_04;
-    /* 0x08 */ s16 unk_08[2];
-    /* 0x0C */ s32 unk_0C;
-    /* 0x10 */ s32 unk_10;
-} UnkStructEE2040;
+#define NAMESPACE EE2040
 
-extern s32 D_80247BF0;
-extern s32 D_80247DF0;
-extern UnkStructEE2040 D_8024BB80;
+#define PARTY_IMAGE "party_pokopi"
 
-// Dead version of LoadPartyImage?
-ApiStatus func_80243680_EE2040(Evt* script, s32 isInitialCall) {
-    s32 sp10;
-    s32 temp_s0;
-
-    temp_s0 = func_8005F238("party_pokopi", &sp10);
-    func_80074070(temp_s0, &D_80247BF0);
-    func_8002BF68(temp_s0);
-    D_8024BB80.unk_00 = &D_80247DF0;
-    D_8024BB80.unk_08[0] = 0x96;
-    D_8024BB80.unk_08[1] = 0x69;
-    D_8024BB80.unk_0C = 2;
-    D_8024BB80.unk_04 = &D_80247BF0;
-    D_8024BB80.unk_10 = 1;
-    func_80130C64(&D_8024BB80);
-    return ApiStatus_DONE2;
-}
+#include "world/common/LoadPartyImage.inc.c"
diff --git a/src/EE65B0.c b/src/EE65B0.c
index d65bb44225..7946935efa 100644
--- a/src/EE65B0.c
+++ b/src/EE65B0.c
@@ -1,21 +1,49 @@
 #include "dead.h"
 #include "common.h"
 
+// Copy of flo_14?
+
 #define NAMESPACE EE65B0
 
 #include "world/common/DeadUnkTexturePanFunc.inc.c"
 
 #include "world/common/DeadUnkTexturePanFunc2.inc.c"
 
-INCLUDE_ASM(s32, "EE65B0", func_8024030C_EE68BC);
+ApiStatus func_8024030C_EE68BC(Evt *script, s32 isInitialCall) {
+    dead_playFX_82(0, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "EE65B0", func_80240340_EE68F0);
+#include "world/common/UnkFunc43.inc.c"
 
-INCLUDE_ASM(s32, "EE65B0", func_802403D4_EE6984);
+ApiStatus func_802403D4_EE6984(Evt* script, s32 isInitialCall) {
+    if (gPlayerData.currentPartner == PARTNER_NONE) {
+        script->varTable[14] = 0;
+        return ApiStatus_DONE2;
+    }
 
-INCLUDE_ASM(s32, "EE65B0", func_8024042C_EE69DC);
+    script->varTable[14] = 1;
+    evt_set_variable(NULL, EVT_MAP_VAR(0), get_npc_unsafe(-4)->flags);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "EE65B0", func_8024046C_EE6A1C);
+ApiStatus func_8024042C_EE69DC(Evt* script, s32 isInitialCall) {
+    Npc* npc = get_npc_unsafe(-4);
+
+    npc->flags = evt_get_variable(NULL, EVT_MAP_VAR(0));
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_8024046C_EE6A1C(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    script->functionTemp[0] = evt_get_variable(script, *args++);
+    script->functionTemp[1] = evt_get_variable(script, *args++);
+    script->functionTemp[2] = evt_get_variable(script, *args++);
+    sfx_adjust_env_sound_pos(SOUND_UNKNOWN_194, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]);
+
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "EE65B0", func_80240504_EE6AB4);
 
diff --git a/src/EE70C0.c b/src/EE70C0.c
index 8439fc41cb..66900187b7 100644
--- a/src/EE70C0.c
+++ b/src/EE70C0.c
@@ -7,6 +7,7 @@ extern s32 D_802453E0_EEB990[];
 extern f32 D_802444F0_EEAAA0[];
 
 INCLUDE_ASM(s32, "EE70C0", func_80240B10_EE70C0);
+//#include "world/common/UnkNpcAIFunc23.inc.c"
 
 INCLUDE_ASM(s32, "EE70C0", func_80240CC0_EE7270);
 
@@ -38,7 +39,7 @@ INCLUDE_ASM(s32, "EE70C0", func_80241E1C_EE83CC);
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
-INCLUDE_ASM(s32, "EE70C0", func_80242090_EE8640);
+#include "world/common/AddPlayerHandsOffset.inc.c"
 
 INCLUDE_ASM(s32, "EE70C0", func_80242260_EE8810);
 
diff --git a/src/EE8940.c b/src/EE8940.c
index 7cccb5adca..f99937252e 100644
--- a/src/EE8940.c
+++ b/src/EE8940.c
@@ -1,4 +1,6 @@
 #include "dead.h"
 #include "common.h"
 
+#define NAMESPACE EE8940
+
 INCLUDE_ASM(s32, "EE8940", func_80242390_EE8940);
diff --git a/src/EED140.c b/src/EED140.c
index 78e2dc85bc..5fcb95084a 100644
--- a/src/EED140.c
+++ b/src/EED140.c
@@ -1,13 +1,6 @@
 #include "dead.h"
 #include "common.h"
 
-// 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];
+#define NAMESPACE EED140
 
-    script->varTable[0] = SQ(var1) + SQ(var2) + SQ(var3) < SQ(60.0f);
-
-    return ApiStatus_DONE2;
-}
+#include "world/common/UnkFunc43.inc.c"
diff --git a/src/EED1E0.c b/src/EED1E0.c
index f3a45652fd..6a8aa40149 100644
--- a/src/EED1E0.c
+++ b/src/EED1E0.c
@@ -3,80 +3,41 @@
 
 #define NAMESPACE EED1E0
 
-extern s32 D_80094900[];
-extern s8 D_80117852;
-extern s32 D_800A15A8;
-extern s8 D_80117160[];
+#define gPartnerActionStatus dead_gPartnerActionStatus2
 
-ApiStatus func_802400E0_EED1E0(Evt* script, s32 isInitialCall) {
-    D_800A15A8 |= 0x40;
-    return ApiStatus_DONE2;
-}
+extern s32 D_80094900[11][4];
 
-ApiStatus func_802400FC_EED1FC(Evt* script, s32 isInitialCall) {
-    D_800A15A8 &= ~0x40;
-    return ApiStatus_DONE2;
-}
+#include "world/common/SetOverrideFlags_40.inc.c"
+
+#include "world/common/UnkFunc17.inc.c"
 
 ApiStatus func_8024011C_EED21C(Evt* script, s32 isInitialCall) {
     func_802F3B00(evt_get_variable(script, *script->ptrReadPos));
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "EED1E0", func_80240148_EED248);
-
-INCLUDE_ASM(s32, "EED1E0", func_802401B4_EED2B4);
-
-INCLUDE_ASM(s32, "EED1E0", func_80240200_EED300);
+#include "world/common/UnkFunc18.inc.c"
 
 INCLUDE_ASM(s32, "EED1E0", func_802402AC_EED3AC);
 
-ApiStatus func_802404FC_EED5FC(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    func_800F2D5C(evt_get_variable(script, *args++));
-    return ApiStatus_DONE2;
-}
+#include "world/common/SwitchToPartner.inc.c"
 
-ApiStatus func_80240528_EED628(Evt* script, s32 isInitialCall) {
-    func_80130C74(D_80094900[D_80117852 * 4], 0);
-    return ApiStatus_DONE2;
-}
+#include "world/common/UnkFunc19.inc.c"
 
-INCLUDE_ASM(s32, "EED1E0", func_80240560_EED660);
+#include "world/common/UnkFunc20.inc.c"
 
-ApiStatus func_802405F0_EED6F0(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32* temp_v0 = evt_get_variable(script, *args++);
+#include "world/common/UnkFunc39.inc.c"
 
-    *temp_v0 |= 0x10;
-    return ApiStatus_DONE2;
-}
+#include "world/common/UnkFunc21.inc.c"
 
-INCLUDE_ASM(s32, "EED1E0", func_80240624_EED724);
-
-INCLUDE_ASM(s32, "EED1E0", func_80240688_EED788);
+#include "world/common/UnkFunc22.inc.c"
 
 INCLUDE_ASM(s32, "EED1E0", func_802406E0_EED7E0);
 
-INCLUDE_ASM(s32, "EED1E0", func_80240C18_EEDD18);
+#include "world/common/UnkFunc23.inc.c"
 
 #include "world/common/DeadUnkPartnerPosFuncs.inc.c"
 
-ApiStatus func_80240DE8_EEDEE8(Evt* script, s32 isInitialCall) {
-    script->varTable[0] = FALSE;
-    if (D_80117160[0] != 0 && D_80117160[3] == 3) {
-        script->varTable[0] = TRUE;
-    }
-    return ApiStatus_DONE2;
-}
+#include "world/common/UnkFunc40.inc.c"
 
-ApiStatus func_80240E18_EEDF18(Evt* script, s32 isInitialCall) {
-    script->varTable[0] = FALSE;
-
-    do {} while (0);
-
-    if (gPlayerActionState == ACTION_STATE_GROUND_POUND || gPlayerActionState == ACTION_STATE_ULTRA_POUND) {
-        script->varTable[0] = TRUE;
-    }
-    return ApiStatus_DONE2;
-}
+#include "world/common/UnkFunc44.inc.c"
diff --git a/src/EEDF50.c b/src/EEDF50.c
index 3c044234be..5c78db89d8 100644
--- a/src/EEDF50.c
+++ b/src/EEDF50.c
@@ -35,10 +35,10 @@ void func_80241AA4_EEEBA4(Evt* script, NpcAISettings* aiSettings, EnemyTerritory
 
 INCLUDE_ASM(s32, "EEDF50", func_8024215C_EEF25C);
 
-INCLUDE_ASM(s32, "EEDF50", func_80242374_EEF474);
+#include "world/common/UnkNpcAIFunc13.inc.c"
 
-INCLUDE_ASM(s32, "EEDF50", func_802424A4_EEF5A4);
+#include "world/common/UnkNpcAIFunc34.inc.c"
 
-INCLUDE_ASM(s32, "EEDF50", func_80242724_EEF824);
+#include "world/common/UnkFunc45.inc.c"
 
 INCLUDE_ASM(s32, "EEDF50", func_80242780_EEF880);
diff --git a/src/EEFAA0.c b/src/EEFAA0.c
index e4b7f16e0d..b92394214c 100644
--- a/src/EEFAA0.c
+++ b/src/EEFAA0.c
@@ -1,6 +1,8 @@
 #include "dead.h"
 #include "common.h"
 
+#define NAMESPACE EEFAA0
+
 // Copy from flo_16/UnkFunc44
 ApiStatus func_802429A0_EEFAA0(Evt* script, s32 isInitialCall) {
     script->varTable[0] = 0;
diff --git a/src/EF2650.c b/src/EF2650.c
index 681a8bca2b..f3d250283c 100644
--- a/src/EF2650.c
+++ b/src/EF2650.c
@@ -1,6 +1,8 @@
 #include "dead.h"
 #include "common.h"
 
+#define NAMESPACE EF2650
+
 extern s16 D_80169B16;
 
 ApiStatus func_80240040_EF2650(Evt* script, s32 isInitialCall) {
diff --git a/src/EF7FB0.c b/src/EF7FB0.c
index 78a90da5fc..8b4cefdad1 100644
--- a/src/EF7FB0.c
+++ b/src/EF7FB0.c
@@ -1,7 +1,6 @@
 #include "dead.h"
 #include "common.h"
 
-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;
-}
+#define NAMESPACE EF7FB0
+
+#include "world/common/UnkFunc42.inc.c"
diff --git a/src/common/DeadUnk1.inc.c b/src/common/DeadUnk1.inc.c
index 615006be78..183b8d9481 100644
--- a/src/common/DeadUnk1.inc.c
+++ b/src/common/DeadUnk1.inc.c
@@ -1,6 +1,6 @@
 #include "common.h"
 
 ApiStatus N(DeadUnk1)(Evt* script, s32 isInitialCall) {
-    func_80077BD0(1, 0, 0, 0, 0, 0);
+    dead_playFX_82(1, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_arn/arn_04/events.c b/src/world/area_arn/arn_04/events.c
index c29fc5edab..adf4dbd526 100644
--- a/src/world/area_arn/arn_04/events.c
+++ b/src/world/area_arn/arn_04/events.c
@@ -458,6 +458,7 @@ void N(func_80241040_BE47F0)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit
             posY = npc->pos.y;
             posZ = npc->pos.z;
             posW = 1000.0f;
+
             npc_raycast_down_sides(npc->unk_80, &posX, &posY, &posZ, &posW);
             if (vt1 < (vt3 - posW)) {
                 enemy->varTable[0] |= 0x10;
diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c
index 7415d54f23..75c46c065b 100644
--- a/src/world/area_flo/flo_16/CD2C80.c
+++ b/src/world/area_flo/flo_16/CD2C80.c
@@ -574,50 +574,7 @@ ApiStatus N(func_8024215C_CD3F8C)(Evt* script, s32 isInitialCall) {
 
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
-void N(func_80242478_CD42A8)(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;
-    s32 flag;
-    f32 temp_f6;
-
-    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) {
-        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
-        npc->currentAnim.w = enemy->animList[0];
-        npc->duration = 30;
-        script->functionTemp[0] = 20;
-        enemy->varTable[9] = 30;
-        return;
-    }
-
-    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-    flag = 0;
-    if (!(npc->flags & 8)) {
-        x = npc->pos.x;
-        y = npc->pos.y + npc->collisionHeight;
-        z = npc->pos.z;
-        w = npc->collisionHeight + 3.0;
-        if ((npc_raycast_down_sides(npc->unk_80, &x, &y, &z, &w) != 0) && (w < npc->collisionHeight)) {
-            flag = 1;
-        }
-    }
-
-    if (flag) {
-        npc->pos.y = y + 1.0;
-    } else {
-        temp_f6 = npc->pos.y - (gPlayerStatusPtr->position.y + 6.0);
-        if ((temp_f6 < 0.0) || (temp_f6 > 4.0)) {
-            temp_f6 = -temp_f6;
-            npc->pos.y += temp_f6 * 0.06;
-        }
-    }
-    if (npc->duration > 0) {
-        npc->duration--;
-        return;
-    }
-    script->functionTemp[0] = 12;
-}
+#include "world/common/UnkNpcAIFunc34.inc.c"
 
 #include "world/common/UnkFunc45.inc.c"
 
@@ -670,7 +627,7 @@ ApiStatus N(func_80242754_CD4584)(Evt* script, s32 isInitialCall) {
         case 12:
             N(UnkNpcAIFunc13)(script, aiSettings, territoryPtr);
         case 13:
-            N(func_80242478_CD42A8)(script, aiSettings, territoryPtr);
+            N(UnkNpcAIFunc34)(script, aiSettings, territoryPtr);
             break;
         case 20:
             N(UnkFunc45)(script, aiSettings, territoryPtr);
diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c
index 760bcb78b2..f1379137c6 100644
--- a/src/world/area_flo/flo_25/CF2C10.c
+++ b/src/world/area_flo/flo_25/CF2C10.c
@@ -735,50 +735,8 @@ ApiStatus N(func_8024134C_CF3F1C)(Evt* script, s32 isInitialCall) {
 
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
-void N(func_80241668_CF4238)(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;
-    s32 flag;
-    f32 temp_f6;
 
-    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) {
-        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
-        npc->currentAnim.w = enemy->animList[0];
-        npc->duration = 30;
-        script->functionTemp[0] = 20;
-        enemy->varTable[9] = 30;
-        return;
-    }
-
-    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-    flag = 0;
-    if (!(npc->flags & 8)) {
-        x = npc->pos.x;
-        y = npc->pos.y + npc->collisionHeight;
-        z = npc->pos.z;
-        w = npc->collisionHeight + 3.0;
-        if ((npc_raycast_down_sides(npc->unk_80, &x, &y, &z, &w) != 0) && (w < npc->collisionHeight)) {
-            flag = 1;
-        }
-    }
-
-    if (flag) {
-        npc->pos.y = y + 1.0;
-    } else {
-        temp_f6 = npc->pos.y - (gPlayerStatusPtr->position.y + 6.0);
-        if ((temp_f6 < 0.0) || (temp_f6 > 4.0)) {
-            temp_f6 = -temp_f6;
-            npc->pos.y += temp_f6 * 0.06;
-        }
-    }
-    if (npc->duration > 0) {
-        npc->duration--;
-        return;
-    }
-    script->functionTemp[0] = 12;
-}
+#include "world/common/UnkNpcAIFunc34.inc.c"
 
 #include "world/common/UnkFunc45.inc.c"
 
@@ -832,7 +790,7 @@ ApiStatus N(func_80241944_CF4514)(Evt* script, s32 isInitialCall) {
         case 12:
             N(UnkNpcAIFunc13)(script, aiSettings, territoryPtr);
         case 13:
-            N(func_80241668_CF4238)(script, aiSettings, territoryPtr);
+            N(UnkNpcAIFunc34)(script, aiSettings, territoryPtr);
             break;
         case 20:
             N(UnkFunc45)(script, aiSettings, territoryPtr);
diff --git a/src/world/area_hos/hos_02/A17210.c b/src/world/area_hos/hos_02/A17210.c
index 2057000982..3a05a401f1 100644
--- a/src/world/area_hos/hos_02/A17210.c
+++ b/src/world/area_hos/hos_02/A17210.c
@@ -96,53 +96,9 @@ ApiStatus N(func_802422FC_A1851C)(Evt* script, s32 isInitialCall) {
 
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
+
 INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80242618_A18838);
-/*
-void N(func_80242618_A18838)(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;
-    s32 flag;
-    f32 temp_f6;
-
-    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) {
-        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
-        npc->currentAnim = enemy->animList[0];
-        npc->duration = 30;
-        script->functionTemp[0] = 20;
-        enemy->varTable[9] = 30;
-        return;
-    }
-
-    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-    flag = 0;
-    if (!(npc->flags & 8)) {
-        x = npc->pos.x;
-        y = npc->pos.y + npc->collisionHeight;
-        z = npc->pos.z;
-        w = npc->collisionHeight + 3.0;
-        if ((npc_raycast_down_sides(npc->unk_80, &x, &y, &z, &w) != 0) && (w < npc->collisionHeight)) {
-            flag = 1;
-        }
-    }
-
-    if (flag) {
-        npc->pos.y = y + 1.0;
-    } else {
-        temp_f6 = npc->pos.y - (gPlayerStatusPtr->position.y + 6.0);
-        if ((temp_f6 < 0.0) || (temp_f6 > 4.0)) {
-            temp_f6 = -temp_f6;
-            npc->pos.y += temp_f6 * 0.06;
-        }
-    }
-    if (npc->duration > 0) {
-        npc->duration--;
-        return;
-    }
-    script->functionTemp[0] = 12;
-}
-*/
+//#include "world/common/UnkNpcAIFunc34.inc.c"
 
 #include "world/common/UnkFunc45.inc.c"
 
diff --git a/src/world/area_jan/jan_00/B20540.c b/src/world/area_jan/jan_00/B20540.c
index b3018c8afc..9013972cd5 100644
--- a/src/world/area_jan/jan_00/B20540.c
+++ b/src/world/area_jan/jan_00/B20540.c
@@ -1,4 +1,5 @@
 #include "jan_00.h"
+#include "effects.h"
 
 #include "world/common/UnkTexturePanFunc.inc.c"
 
diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c
index c175b63c76..ad3b4b17dd 100644
--- a/src/world/area_kzn/kzn_02/C5AC20.c
+++ b/src/world/area_kzn/kzn_02/C5AC20.c
@@ -97,52 +97,7 @@ ApiStatus N(func_802417EC_C5BF2C)(Evt* script, s32 isInitialCall) {
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241B08_C5C248);
-/*
-void N(func_80241B08_C5C248)(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;
-    s32 flag;
-    f32 temp_f6;
-
-    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) {
-        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
-        npc->currentAnim = enemy->animList[0];
-        npc->duration = 30;
-        script->functionTemp[0] = 20;
-        enemy->varTable[9] = 30;
-        return;
-    }
-
-    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-    flag = 0;
-    if (!(npc->flags & 8)) {
-        x = npc->pos.x;
-        y = npc->pos.y + npc->collisionHeight;
-        z = npc->pos.z;
-        w = npc->collisionHeight + 3.0;
-        if ((npc_raycast_down_sides(npc->unk_80, &x, &y, &z, &w) != 0) && (w < npc->collisionHeight)) {
-            flag = 1;
-        }
-    }
-
-    if (flag) {
-        npc->pos.y = y + 1.0;
-    } else {
-        temp_f6 = npc->pos.y - (gPlayerStatusPtr->position.y + 6.0);
-        if ((temp_f6 < 0.0) || (temp_f6 > 4.0)) {
-            temp_f6 = -temp_f6;
-            npc->pos.y += temp_f6 * 0.06;
-        }
-    }
-    if (npc->duration > 0) {
-        npc->duration--;
-        return;
-    }
-    script->functionTemp[0] = 12;
-}
-*/
+//#include "world/common/UnkNpcAIFunc34.inc.c"
 
 #include "world/common/UnkFunc45.inc.c"
 
diff --git a/src/world/area_kzn/kzn_07/C6EA50.c b/src/world/area_kzn/kzn_07/C6EA50.c
index 61a44df1c2..d37abdc7c2 100644
--- a/src/world/area_kzn/kzn_07/C6EA50.c
+++ b/src/world/area_kzn/kzn_07/C6EA50.c
@@ -100,53 +100,9 @@ ApiStatus N(func_80241B2C_C6FE5C)(Evt* script, s32 isInitialCall) {
 
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
+
 INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241E48_C70178);
-/*
-void N(func_80241E48_C70178)(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;
-    s32 flag;
-    f32 temp_f6;
-
-    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) {
-        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
-        npc->currentAnim = enemy->animList[0];
-        npc->duration = 30;
-        script->functionTemp[0] = 20;
-        enemy->varTable[9] = 30;
-        return;
-    }
-
-    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-    flag = 0;
-    if (!(npc->flags & 8)) {
-        x = npc->pos.x;
-        y = npc->pos.y + npc->collisionHeight;
-        z = npc->pos.z;
-        w = npc->collisionHeight + 3.0;
-        if ((npc_raycast_down_sides(npc->unk_80, &x, &y, &z, &w) != 0) && (w < npc->collisionHeight)) {
-            flag = 1;
-        }
-    }
-
-    if (flag) {
-        npc->pos.y = y + 1.0;
-    } else {
-        temp_f6 = npc->pos.y - (gPlayerStatusPtr->position.y + 6.0);
-        if ((temp_f6 < 0.0) || (temp_f6 > 4.0)) {
-            temp_f6 = -temp_f6;
-            npc->pos.y += temp_f6 * 0.06;
-        }
-    }
-    if (npc->duration > 0) {
-        npc->duration--;
-        return;
-    }
-    script->functionTemp[0] = 12;
-}
-*/
+//#include "world/common/UnkNpcAIFunc34.inc.c"
 
 #include "world/common/UnkFunc45.inc.c"
 
diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c
index e2258adc58..4fb90b03ec 100644
--- a/src/world/area_kzn/kzn_08/C71ED0.c
+++ b/src/world/area_kzn/kzn_08/C71ED0.c
@@ -97,52 +97,7 @@ ApiStatus N(func_80241D5C_C731DC)(Evt* script, s32 isInitialCall) {
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242078_C734F8);
-/*
-void N(func_80242078_C734F8)(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;
-    s32 flag;
-    f32 temp_f6;
-
-    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) {
-        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
-        npc->currentAnim = enemy->animList[0];
-        npc->duration = 30;
-        script->functionTemp[0] = 20;
-        enemy->varTable[9] = 30;
-        return;
-    }
-
-    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-    flag = 0;
-    if (!(npc->flags & 8)) {
-        x = npc->pos.x;
-        y = npc->pos.y + npc->collisionHeight;
-        z = npc->pos.z;
-        w = npc->collisionHeight + 3.0;
-        if ((npc_raycast_down_sides(npc->unk_80, &x, &y, &z, &w) != 0) && (w < npc->collisionHeight)) {
-            flag = 1;
-        }
-    }
-
-    if (flag) {
-        npc->pos.y = y + 1.0;
-    } else {
-        temp_f6 = npc->pos.y - (gPlayerStatusPtr->position.y + 6.0);
-        if ((temp_f6 < 0.0) || (temp_f6 > 4.0)) {
-            temp_f6 = -temp_f6;
-            npc->pos.y += temp_f6 * 0.06;
-        }
-    }
-    if (npc->duration > 0) {
-        npc->duration--;
-        return;
-    }
-    script->functionTemp[0] = 12;
-}
-*/
+//#include "world/common/UnkNpcAIFunc34.inc.c"
 
 #include "world/common/UnkFunc45.inc.c"
 
diff --git a/src/world/area_kzn/kzn_11/C80600.c b/src/world/area_kzn/kzn_11/C80600.c
index 3a19d0b3f5..a83b577034 100644
--- a/src/world/area_kzn/kzn_11/C80600.c
+++ b/src/world/area_kzn/kzn_11/C80600.c
@@ -97,52 +97,7 @@ ApiStatus N(func_8024176C_C8190C)(Evt* script, s32 isInitialCall) {
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241A88_C81C28);
-/*
-void N(func_80241A88_C81C28)(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;
-    s32 flag;
-    f32 temp_f6;
-
-    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) {
-        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
-        npc->currentAnim = enemy->animList[0];
-        npc->duration = 30;
-        script->functionTemp[0] = 20;
-        enemy->varTable[9] = 30;
-        return;
-    }
-
-    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-    flag = 0;
-    if (!(npc->flags & 8)) {
-        x = npc->pos.x;
-        y = npc->pos.y + npc->collisionHeight;
-        z = npc->pos.z;
-        w = npc->collisionHeight + 3.0;
-        if ((npc_raycast_down_sides(npc->unk_80, &x, &y, &z, &w) != 0) && (w < npc->collisionHeight)) {
-            flag = 1;
-        }
-    }
-
-    if (flag) {
-        npc->pos.y = y + 1.0;
-    } else {
-        temp_f6 = npc->pos.y - (gPlayerStatusPtr->position.y + 6.0);
-        if ((temp_f6 < 0.0) || (temp_f6 > 4.0)) {
-            temp_f6 = -temp_f6;
-            npc->pos.y += temp_f6 * 0.06;
-        }
-    }
-    if (npc->duration > 0) {
-        npc->duration--;
-        return;
-    }
-    script->functionTemp[0] = 12;
-}
-*/
+//#include "world/common/UnkNpcAIFunc34.inc.c"
 
 #include "world/common/UnkFunc45.inc.c"
 
diff --git a/src/world/common/DeadUnkNpcAIFunc14.inc.c b/src/world/common/DeadUnkNpcAIFunc14.inc.c
index d5de691778..007205f0e0 100644
--- a/src/world/common/DeadUnkNpcAIFunc14.inc.c
+++ b/src/world/common/DeadUnkNpcAIFunc14.inc.c
@@ -1,7 +1,7 @@
 #include "common.h"
 #include "map.h"
 
-void N(DeadUnkNpcAIFunc14)(Evt* script, NpcAISettings* aiSettings) {
+void N(DeadUnkNpcAIFunc14)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
     f32 vt5 = enemy->varTable[5];
diff --git a/src/world/common/UnkNpcAIFunc34.inc.c b/src/world/common/UnkNpcAIFunc34.inc.c
new file mode 100644
index 0000000000..41a658bc96
--- /dev/null
+++ b/src/world/common/UnkNpcAIFunc34.inc.c
@@ -0,0 +1,48 @@
+#include "common.h"
+#include "map.h"
+#include "effects.h"
+
+void N(UnkNpcAIFunc34)(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;
+    s32 flag;
+    f32 temp_f6;
+
+    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) {
+        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
+        npc->currentAnim.w = enemy->animList[0];
+        npc->duration = 30;
+        script->functionTemp[0] = 20;
+        enemy->varTable[9] = 30;
+        return;
+    }
+
+    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+    flag = 0;
+    if (!(npc->flags & 8)) {
+        x = npc->pos.x;
+        y = npc->pos.y + npc->collisionHeight;
+        z = npc->pos.z;
+        w = npc->collisionHeight + 3.0;
+        if ((npc_raycast_down_sides(npc->unk_80, &x, &y, &z, &w) != 0) && (w < npc->collisionHeight)) {
+            flag = 1;
+        }
+    }
+
+    if (flag) {
+        npc->pos.y = y + 1.0;
+    } else {
+        temp_f6 = npc->pos.y - (gPlayerStatusPtr->position.y + 6.0);
+        if ((temp_f6 < 0.0) || (temp_f6 > 4.0)) {
+            temp_f6 = -temp_f6;
+            npc->pos.y += temp_f6 * 0.06;
+        }
+    }
+    if (npc->duration > 0) {
+        npc->duration--;
+        return;
+    }
+    script->functionTemp[0] = 12;
+}
diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt
index 381852058d..0c6194265e 100644
--- a/tools/ignored_funcs.txt
+++ b/tools/ignored_funcs.txt
@@ -50,16 +50,16 @@ func_80128510 = 0x80128510;
 func_8012DFE8 = 0x8012DFE8;
 func_8002AA2C = 0x8002AA2C;
 func_80059AC8 = 0x80059AC8;
-func_80118BB0 = 0x80118BB0;
+dead_get_entity_by_index = 0x80118BB0;
 dead_cos_rad = 0x8002B4C0;
-func_80077BD0 = 0x80077BD0;
+dead_playFX_82 = 0x80077BD0;
 func_80041080 = 0x80041080;
-func_800F1D9C = 0x800F1D9C;
-func_800F1730 = 0x800F1730;
+dead_set_max_SP = 0x800F1D9C;
+dead_sync_status_menu = 0x800F1730;
 dead_get_npc_by_index = 0x8003C43C;
 dead_evt_set_float_variable = 0x802D5A10;
-func_800F1718 = 0x800F1718;
-func_800F16F4 = 0x800F16F4;
+dead_increment_status_menu_disabled = 0x800F1718;
+dead_decrement_status_menu_disabled = 0x800F16F4;
 func_80125270 = 0x80125270;
 func_80124F44 = 0x80124F44;
 func_8006CAC0 = 0x8006CAC0;
@@ -68,32 +68,32 @@ func_802F3B00 = 0x802F3B00;
 func_800FCD0C = 0x800FCD0C;
 func_800F9260 = 0x800F9260;
 func_800F93E8 = 0x800F93E8;
-func_800F2D5C = 0x800F2D5C;
-func_80130C74 = 0x80130C74;
-func_800769D0 = 0x800769D0;
-func_80075E30 = 0x80075E30;
+dead_switch_to_partner = 0x800F2D5C;
+dead_set_message_msg = 0x80130C74;
+dead_playFX_52 = 0x800769D0;
+dead_playFX_33 = 0x80075E30;
 func_8002B524 = 0x8002B524;
 func_8002BF18 = 0x8002BF18;
 func_80076970 = 0x80076970;
-func_80144200 = 0x80144200;
-func_80144178 = 0x80144178;
+dead_set_screen_overlay_color = 0x80144200;
+dead_set_screen_overlay_params_front = 0x80144178;
 dead_playFX_11 = 0x80075170;
-func_800E53AC = 0x800E53AC;
-func_8013CF98 = 0x8013CF98;
+dead_npc_test_move_simple_without_slipping = 0x800E53AC;
+dead_get_item_entity = 0x8013CF98;
 func_80066FE0 = 0x80066FE0;
 func_8002A910 = 0x8002A910;
 func_8005F128 = 0x8005F128;
-func_800F7278 = 0x800F7278;
+dead_partner_clear_player_tracking = 0x800F7278;
 func_800F2E98 = 0x800F2E98;
-func_8003ED50 = 0x8003ED50;
-func_8003E5E8 = 0x8003E5E8;
+dead_set_npc_yaw = 0x8003ED50;
+dead_disable_npc_shadow = 0x8003E5E8;
 dead_get_screen_coords = 0x8002FCBC;
-func_801574DC = 0x801574DC;
-func_80157118 = 0x80157118;
-func_8005F238 = 0x8005F238;
-func_80074070 = 0x80074070;
-func_8002BF68 = 0x8002BF68;
-func_80130C64 = 0x80130C64;
+dead_sfx_get_spatialized_sound_params = 0x801574DC;
+dead_sfx_play_sound_with_params = 0x80157118;
+dead_load_asset_by_name = 0x8005F238;
+dead_decode_yay0 = 0x80074070;
+dead_general_heap_free = 0x8002BF68;
+dead_set_message_images = 0x80130C64;
 func_8002B45C = 0x8002B45C;
 func_801266F8 = 0x801266F8;
 func_80126734 = 0x80126734;
diff --git a/ver/us/asm/data/EA3A80.data.s b/ver/us/asm/data/EA3A80.data.s
index 47fb659c15..586d206556 100644
--- a/ver/us/asm/data/EA3A80.data.s
+++ b/ver/us/asm/data/EA3A80.data.s
@@ -108,7 +108,7 @@ glabel D_802441BC_EA4ABC
 .word 0x00000000
 
 glabel D_802441C0_EA4AC0
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_802427F0_EA30F0, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802441C0_EA4AC0, 0x00000010, 0x00000000, D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802441C0_EA4AC0, 0x00000010, 0x00000000, D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244354_EA4C54
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/EA7390.data.s b/ver/us/asm/data/EA7390.data.s
index 6f71dde935..e39da7f6ed 100644
--- a/ver/us/asm/data/EA7390.data.s
+++ b/ver/us/asm/data/EA7390.data.s
@@ -51,7 +51,7 @@ glabel D_80241360_EA8330
 .word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000022, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, D_80240E44_EA7E14, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x800483E0, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802413B4_EA8384
-.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000064, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000064, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000001, func_80240350_EA7320, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x0000011D, 0x00000019, 0x00000023, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000190, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x0000011D, 0x00000019, 0x00000023, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x00000321, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00360017, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00360001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00360004, 0x00360001, 0x00000000, 0x001000FF, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x00000322, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00360018, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000001, func_8024036C_EA733C, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8680, 0x00000024, 0x00000002, 0xF840609E, 0x00000001, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000064, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000064, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000001, EA7320_SetCamera0Flag1000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x0000011D, 0x00000019, 0x00000023, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000190, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x0000011D, 0x00000019, 0x00000023, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x00000321, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00360017, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00360001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00360004, 0x00360001, 0x00000000, 0x001000FF, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x00000322, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00360018, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000001, EA7320_UnsetCamera0Flag1000, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8680, 0x00000024, 0x00000002, 0xF840609E, 0x00000001, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241618_EA85E8
 .word 0x0000000A, 0x00000002, 0xF840609E, 0x00000000, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, D_802413B4_EA8384, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x800483E0, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/EAA810.data.s b/ver/us/asm/data/EAA810.data.s
index e54038eb17..c864b56c32 100644
--- a/ver/us/asm/data/EAA810.data.s
+++ b/ver/us/asm/data/EAA810.data.s
@@ -156,7 +156,7 @@ glabel D_80243DDC_EAC8BC
 .word 0x00000000
 
 glabel D_80243DE0_EAC8C0
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_802415DC_EAA0BC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243DE0_EAC8C0, 0x00000010, 0x00000000, D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243DE0_EAC8C0, 0x00000010, 0x00000000, D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243F74_EACA54
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/EB1920.data.s b/ver/us/asm/data/EB1920.data.s
index 9860e3ac33..19f63788a6 100644
--- a/ver/us/asm/data/EB1920.data.s
+++ b/ver/us/asm/data/EB1920.data.s
@@ -63,7 +63,7 @@ glabel D_802417E8_EB2648
 .word 0x00000000
 
 glabel D_802417EC_EB264C
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_80240484_EB12E4, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_802417EC_EB264C, 0x00000010, 0x00000000, D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_802417EC_EB264C, 0x00000010, 0x00000000, D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241980_EB27E0
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/EB7850.data.s b/ver/us/asm/data/EB7850.data.s
index d90c14c6c9..fdc986ad18 100644
--- a/ver/us/asm/data/EB7850.data.s
+++ b/ver/us/asm/data/EB7850.data.s
@@ -66,7 +66,7 @@ glabel D_802410F4_EB8324
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000003, 0xFE363C80, 0x00000044, 0x00000001, D_80241028_EB8258, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0x00000032, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000F, D_80240F40_EB8170, 0x00000004, 0x00000004, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0xFFFFFFEC, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000A, D_80240F70_EB81A0, 0x00000003, 0x00000004, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0x0000000A, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000F, D_80240F94_EB81C4, 0x00000005, 0x00000004, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0xFFFFFFCE, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x00000014, D_80240FD0_EB8200, 0x00000006, 0x00000004, 0x00000023, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000001, 0xFE363C84, 0x0000000A, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000029, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000043, 0x00000004, func_80240478_EB76A8, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802E5160, 0xFE363C8E, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241418_EB8648
-.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE6F8, 0x0000000A, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000001, func_80240504_EB7734, 0x00000044, 0x00000001, D_80240E98_EB80C8, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000C12, 0x000000A0, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000028, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000000, 0x0000000A, 0xFE363C80, 0xFFFFFFFB, 0x00000043, 0x00000004, 0x802DE510, 0xFFFFFFF6, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFFFFFFF6, 0xFE363C80, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000B18, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80049370, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802410F4_EB8324, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000007, 0x8011A58C, 0x802F92E0, 0x00000000, 0x00000A5A, 0x00000000, 0x00000094, D_80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240520_EB7750, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, func_802403D8_EB7608, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C83, 0x00000BB8, 0x0000000A, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, func_80240310_EB7540, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, 0x802D78AC, 0x80241C18, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE6F8, 0x0000000A, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000001, EB7540_UnsetCamera0MoveFlag1, 0x00000044, 0x00000001, D_80240E98_EB80C8, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000C12, 0x000000A0, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000028, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000000, 0x0000000A, 0xFE363C80, 0xFFFFFFFB, 0x00000043, 0x00000004, 0x802DE510, 0xFFFFFFF6, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFFFFFFF6, 0xFE363C80, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000B18, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80049370, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802410F4_EB8324, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000007, 0x8011A58C, 0x802F92E0, 0x00000000, 0x00000A5A, 0x00000000, 0x00000094, D_80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240520_EB7750, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, EB7540_GetEntityPosition, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C83, 0x00000BB8, 0x0000000A, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, func_80240310_EB7540, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, 0x802D78AC, 0x80241C18, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802417AC_EB89DC
 .word 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00160008, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, D_80241418_EB8648, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/EBA260.data.s b/ver/us/asm/data/EBA260.data.s
index b2af3c030c..8e1bbc400f 100644
--- a/ver/us/asm/data/EBA260.data.s
+++ b/ver/us/asm/data/EBA260.data.s
@@ -111,7 +111,7 @@ glabel D_802441B8_EBD008
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802442AC_EBD0FC
-.word 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001A, 0x00000043, 0x00000005, 0x802DB210, 0x00000006, 0xFE363C83, 0xFE363C84, 0xFE363C82, 0x00000043, 0x00000003, 0x802DF124, 0x00000006, 0x00000000, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0x00000006, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFE7, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF251E680, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0x00000012, 0xFFFFFFF8, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802DFB28, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, 0x802DD810, 0x00000006, 0x00170003, 0x00170001, 0x00000200, 0x001100D8, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0x00000012, 0xFFFFFFF7, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000168, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x00000006, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x80048DA0, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x00000006, 0x00170004, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001001F, 0x00000043, 0x00000003, 0x802E0324, 0x00000139, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802E0324, 0x00000188, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000052, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000003, 0x802DB654, 0x00000006, 0x00170001, 0x00000043, 0x00000003, 0x80048DA0, 0x00000006, 0x00000001, 0x00000043, 0x00000001, func_80240EFC_EB9D4C, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D0196, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802DC654, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000006, 0x00170003, 0x00170001, 0x00000200, 0x001100D9, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFE7, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000006, 0x00170003, 0x00170001, 0x00000200, 0x001100DA, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000006, 0x00040000, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000019, 0x00000043, 0x00000005, 0x802DC654, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000708, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C82, 0xFE363C83, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x00000006, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000006, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0x000000B4, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C83, 0xFE363C85, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB210, 0x00000006, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000006, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802DD70C, 0x00000006, 0x00002045, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000003B, 0x00000046, 0x00000001, D_80243398_EBC1E8, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001A, 0x00000043, 0x00000005, 0x802DB210, 0x00000006, 0xFE363C83, 0xFE363C84, 0xFE363C82, 0x00000043, 0x00000003, 0x802DF124, 0x00000006, 0x00000000, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0x00000006, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFE7, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF251E680, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0x00000012, 0xFFFFFFF8, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802DFB28, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, 0x802DD810, 0x00000006, 0x00170003, 0x00170001, 0x00000200, 0x001100D8, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0x00000012, 0xFFFFFFF7, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000168, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x00000006, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x80048DA0, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x00000006, 0x00170004, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001001F, 0x00000043, 0x00000003, 0x802E0324, 0x00000139, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802E0324, 0x00000188, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000052, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000003, 0x802DB654, 0x00000006, 0x00170001, 0x00000043, 0x00000003, 0x80048DA0, 0x00000006, 0x00000001, 0x00000043, 0x00000001, EB8E90_PostChapter6StatUpdate, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D0196, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802DC654, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000006, 0x00170003, 0x00170001, 0x00000200, 0x001100D9, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFE7, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000006, 0x00170003, 0x00170001, 0x00000200, 0x001100DA, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000006, 0x00040000, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000019, 0x00000043, 0x00000005, 0x802DC654, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000708, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C82, 0xFE363C83, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x00000006, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000006, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0x000000B4, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C83, 0xFE363C85, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB210, 0x00000006, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000006, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802DD70C, 0x00000006, 0x00002045, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000003B, 0x00000046, 0x00000001, D_80243398_EBC1E8, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244C24_EBDA74
 .word 0x00000043, 0x00000002, 0x802D796C, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, D_802441B8_EBD008, 0x00000044, 0x00000001, D_802442AC_EBD0FC, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -180,22 +180,22 @@ glabel D_802477A0_EC05F0
 .word 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A6E80, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000051, 0xF24A7976, 0xFE363C80, 0xF24A8069, 0x00000043, 0x00000006, 0x802D60E4, 0x00000051, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802D7634, 0x0000002E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024781C_EC066C
-.word 0x0000000A, 0x00000002, 0xF97188AC, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000001, 0x802E01B8, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000024, 0x00000002, 0xF97188AC, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C89, 0xF2498E80, 0x00000024, 0x00000002, 0xFE363C8A, 0xF24AD280, 0x00000024, 0x00000002, 0xFE363C8B, 0xF24C6E80, 0x00000024, 0x00000002, 0xFE363C8C, 0xF2499E80, 0x00000024, 0x00000002, 0xFE363C8D, 0xF24ADA80, 0x00000024, 0x00000002, 0xFE363C8E, 0xF24CBE80, 0x00000043, 0x00000004, 0x802DE754, 0xFE363C89, 0xFE363C8B, 0x00000008, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFC, 0xFE363C8C, 0xFE363C8D, 0xFE363C8E, 0x00000005, 0x00000043, 0x00000002, 0x802E37A0, 0x0000019C, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007B, 0x00000001, 0x00000008, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010004, 0x00000043, 0x00000003, func_80240F40_EB9D90, 0xFE363C83, 0xFE363C84, 0x00000014, 0x00000001, 0xFE363C84, 0x00000018, 0x00000001, 0x0000005A, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x0000001B, 0x00000001, 0x0000010E, 0x00000024, 0x00000002, 0xF9718890, 0x00000001, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000051, 0xF24A7976, 0xF24A8280, 0xF24A8069, 0x00000043, 0x00000002, 0x802D7634, 0x0000002E, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, func_8024121C_EBA06C, 0xFE363C8F, 0xFE363C80, 0x00000000, 0x000002BC, 0x00000320, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_802477A0_EC05F0, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A6E80, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000001, func_80240FB0_EB9E00, 0x00000043, 0x00000001, func_802410E4_EB9F34, 0x0000000A, 0x00000002, 0xFE363C8F, 0x0000015E, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D78AC, 0x802493A8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF97188AC, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000001, 0x802E01B8, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000024, 0x00000002, 0xF97188AC, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C89, 0xF2498E80, 0x00000024, 0x00000002, 0xFE363C8A, 0xF24AD280, 0x00000024, 0x00000002, 0xFE363C8B, 0xF24C6E80, 0x00000024, 0x00000002, 0xFE363C8C, 0xF2499E80, 0x00000024, 0x00000002, 0xFE363C8D, 0xF24ADA80, 0x00000024, 0x00000002, 0xFE363C8E, 0xF24CBE80, 0x00000043, 0x00000004, 0x802DE754, 0xFE363C89, 0xFE363C8B, 0x00000008, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFC, 0xFE363C8C, 0xFE363C8D, 0xFE363C8E, 0x00000005, 0x00000043, 0x00000002, 0x802E37A0, 0x0000019C, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007B, 0x00000001, 0x00000008, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010004, 0x00000043, 0x00000003, func_80240F40_EB9D90, 0xFE363C83, 0xFE363C84, 0x00000014, 0x00000001, 0xFE363C84, 0x00000018, 0x00000001, 0x0000005A, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x0000001B, 0x00000001, 0x0000010E, 0x00000024, 0x00000002, 0xF9718890, 0x00000001, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000051, 0xF24A7976, 0xF24A8280, 0xF24A8069, 0x00000043, 0x00000002, 0x802D7634, 0x0000002E, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, EB9D90_UnkFloatFunc, 0xFE363C8F, 0xFE363C80, 0x00000000, 0x000002BC, 0x00000320, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_802477A0_EC05F0, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A6E80, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000001, func_80240FB0_EB9E00, 0x00000043, 0x00000001, func_802410E4_EB9F34, 0x0000000A, 0x00000002, 0xFE363C8F, 0x0000015E, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D78AC, 0x802493A8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247BFC_EC0A4C
-.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE6F8, 0x0000000A, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0xF2498E80, 0x00000024, 0x00000002, 0xFE363C8A, 0xF24AD280, 0x00000024, 0x00000002, 0xFE363C8B, 0xF24C6E80, 0x00000024, 0x00000002, 0xFE363C8C, 0xF2499E80, 0x00000024, 0x00000002, 0xFE363C8D, 0xF24AD680, 0x00000024, 0x00000002, 0xFE363C8E, 0xF24CBE80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010004, 0x00000014, 0x00000001, 0xF9718890, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000023, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000051, 0xF24A7976, 0xF24A8280, 0xF24A8069, 0x00000043, 0x00000002, 0x802D7634, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000078, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, func_8024121C_EBA06C, 0xFE363C8F, 0xFE363C80, 0x00000046, 0x00000000, 0x00000078, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_802477A0_EC05F0, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A6E80, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000001, func_80240FB0_EB9E00, 0x00000043, 0x00000001, func_802410E4_EB9F34, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DC8D0, 0xFFFFFFFC, 0x00000043, 0x00000002, 0x802DE674, 0x00000001, 0x00000043, 0x00000005, 0x802DEF08, 0x0000000A, 0x00000000, 0x0000006E, 0x00000014, 0x00000043, 0x00000002, 0x802DE6F8, 0x0000000A, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x00000030, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF97188AC, 0x00000000, 0x00000043, 0x00000002, 0x802E3908, 0x0000019D, 0x00000046, 0x00000001, D_80241500_EBA350, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE6F8, 0x0000000A, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0xF2498E80, 0x00000024, 0x00000002, 0xFE363C8A, 0xF24AD280, 0x00000024, 0x00000002, 0xFE363C8B, 0xF24C6E80, 0x00000024, 0x00000002, 0xFE363C8C, 0xF2499E80, 0x00000024, 0x00000002, 0xFE363C8D, 0xF24AD680, 0x00000024, 0x00000002, 0xFE363C8E, 0xF24CBE80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010004, 0x00000014, 0x00000001, 0xF9718890, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000023, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000051, 0xF24A7976, 0xF24A8280, 0xF24A8069, 0x00000043, 0x00000002, 0x802D7634, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000078, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, EB9D90_UnkFloatFunc, 0xFE363C8F, 0xFE363C80, 0x00000046, 0x00000000, 0x00000078, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_802477A0_EC05F0, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A6E80, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000001, func_80240FB0_EB9E00, 0x00000043, 0x00000001, func_802410E4_EB9F34, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DC8D0, 0xFFFFFFFC, 0x00000043, 0x00000002, 0x802DE674, 0x00000001, 0x00000043, 0x00000005, 0x802DEF08, 0x0000000A, 0x00000000, 0x0000006E, 0x00000014, 0x00000043, 0x00000002, 0x802DE6F8, 0x0000000A, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x00000030, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF97188AC, 0x00000000, 0x00000043, 0x00000002, 0x802E3908, 0x0000019D, 0x00000046, 0x00000001, D_80241500_EBA350, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247FDC_EC0E2C
-.word 0x00000043, 0x00000004, 0x802D7AC0, 0x0000002F, 0x0000019B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, func_8024121C_EBA06C, 0xFE363C8F, 0xFE363C80, 0x00000000, 0xF24A7E80, 0x00000064, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_802475B8_EC0408, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x000004B0, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, func_8024121C_EBA06C, 0xFE363C8F, 0xFE363C80, 0xFFFFFD44, 0x00000000, 0x000004B0, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000044, 0x00000001, D_80246880_EBF6D0, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000044, 0x00000001, D_802474B8_EC0308, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000016, 0x00000001, 0x000000FA, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000041, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AAC80, 0xF24A5E80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000320, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C8F, 0x00000226, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000007, 0x802E3444, 0x00000000, 0x00000032, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, 0x802E3330, 0x00000001, 0x00000BB8, 0x00000043, 0x00000003, 0x802D78AC, 0x802493A8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, 0x802D7AC0, 0x0000002F, 0x0000019B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, EB9D90_UnkFloatFunc, 0xFE363C8F, 0xFE363C80, 0x00000000, 0xF24A7E80, 0x00000064, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_802475B8_EC0408, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x000004B0, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, EB9D90_UnkFloatFunc, 0xFE363C8F, 0xFE363C80, 0xFFFFFD44, 0x00000000, 0x000004B0, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000044, 0x00000001, D_80246880_EBF6D0, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000044, 0x00000001, D_802474B8_EC0308, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000016, 0x00000001, 0x000000FA, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000041, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AAC80, 0xF24A5E80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000320, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C8F, 0x00000226, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000007, 0x802E3444, 0x00000000, 0x00000032, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, 0x802E3330, 0x00000001, 0x00000BB8, 0x00000043, 0x00000003, 0x802D78AC, 0x802493A8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024837C_EC11CC
-.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000003, 0x802DEF5C, 0x000000C8, 0x00000000, 0x00000043, 0x00000004, 0x802DE510, 0xFFFFFFC4, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFFFFFFEC, 0x00000000, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000041, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AAC80, 0xF24A5E80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000320, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000014, 0x00000043, 0x00000008, func_8024121C_EBA06C, 0xFE363C8F, 0xFE363C80, 0xF24A7A80, 0xF24A7E80, 0x00000064, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_80247724_EC0574, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000002E, 0x7FFFFE00, 0x00000043, 0x00000005, 0x802DDEEC, 0x0011000A, 0x00000000, 0x00000032, 0xFFFFFF38, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000003, 0x802DEF5C, 0x000000C8, 0x00000000, 0x00000043, 0x00000004, 0x802DE510, 0xFFFFFFC4, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFFFFFFEC, 0x00000000, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000041, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AAC80, 0xF24A5E80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000320, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000014, 0x00000043, 0x00000008, EB9D90_UnkFloatFunc, 0xFE363C8F, 0xFE363C80, 0xF24A7A80, 0xF24A7E80, 0x00000064, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_80247724_EC0574, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000002E, 0x7FFFFE00, 0x00000043, 0x00000005, 0x802DDEEC, 0x0011000A, 0x00000000, 0x00000032, 0xFFFFFF38, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802485C8_EC1418
 .word 0x00000059, 0x00000058, 0x0000005A, 0x00000000
 
 glabel D_802485D8_EC1428
-.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000004, 0x802DFED0, 0xFFFFFFAB, 0x00000055, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x0000000A, 0x00000002, 0xF84060DB, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802E2E80, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000043, 0x00000002, 0x802E2E80, 0x00000000, 0x00000043, 0x00000004, 0x802E20AC, 0xFFFFFFAB, 0x00000055, 0x0000001C, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000059, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060006, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000007, 0x802E4310, 0x00000059, 0xFFFFFFAD, 0x00000000, 0x00000057, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x0000001C, 0x00000000, 0x00000014, 0x00000001, 0xF9718891, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DDEEC, 0x00110008, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000024, 0x00000002, 0xF9718891, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802DDEEC, 0x00110009, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000059, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF84060DB, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060DC, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802E2E80, 0x00000001, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000043, 0x00000002, 0x802E2E80, 0x00000000, 0x00000043, 0x00000004, 0x802E20AC, 0xFFFFFFAB, 0x00000055, 0x0000001C, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000058, 0x00000043, 0x00000002, 0x802E461C, 0xFD050F8B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060006, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000007, 0x802E4310, 0x00000058, 0xFFFFFFAD, 0x00000000, 0x00000057, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x0000001C, 0x00000000, 0x00000014, 0x00000001, 0xF9718891, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DDEEC, 0x00110008, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000024, 0x00000002, 0xF9718891, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802DDEEC, 0x00110009, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000058, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF84060DC, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802E2E80, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000043, 0x00000002, 0x802E2E80, 0x00000000, 0x00000043, 0x00000004, 0x802E20AC, 0xFFFFFFAB, 0x00000055, 0x0000001C, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x0000005A, 0x00000043, 0x00000002, 0x802E461C, 0xFD050F8B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060006, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000001, func_802413AC_EBA1FC, 0x00000043, 0x00000007, 0x802E4310, 0x0000005A, 0xFFFFFFAD, 0x00000000, 0x00000057, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802E461C, 0xFD050F8B, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, 0x802DE754, 0xFFFFFFC4, 0x0000001E, 0x00000014, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x00000030, 0x7FFFFE00, 0x00000043, 0x00000003, 0x802DEF5C, 0x000000C8, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000007, 0x802E3444, 0x00000001, 0x0000007B, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, 0x802E3330, 0x00000000, 0x00000BB8, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFFFFFFAB, 0x00000000, 0x0000004B, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFFFFFFAB, 0x00000000, 0x0000004B, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, D_80247FDC_EC0E2C, 0x00000023, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000004, 0x802DFED0, 0xFFFFFFAB, 0x00000055, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x0000000A, 0x00000002, 0xF84060DB, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802E2E80, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000043, 0x00000002, 0x802E2E80, 0x00000000, 0x00000043, 0x00000004, 0x802E20AC, 0xFFFFFFAB, 0x00000055, 0x0000001C, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000059, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060006, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000007, 0x802E4310, 0x00000059, 0xFFFFFFAD, 0x00000000, 0x00000057, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x0000001C, 0x00000000, 0x00000014, 0x00000001, 0xF9718891, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DDEEC, 0x00110008, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000024, 0x00000002, 0xF9718891, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802DDEEC, 0x00110009, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000059, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF84060DB, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060DC, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802E2E80, 0x00000001, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000043, 0x00000002, 0x802E2E80, 0x00000000, 0x00000043, 0x00000004, 0x802E20AC, 0xFFFFFFAB, 0x00000055, 0x0000001C, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000058, 0x00000043, 0x00000002, 0x802E461C, 0xFD050F8B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060006, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000007, 0x802E4310, 0x00000058, 0xFFFFFFAD, 0x00000000, 0x00000057, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x0000001C, 0x00000000, 0x00000014, 0x00000001, 0xF9718891, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DDEEC, 0x00110008, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000024, 0x00000002, 0xF9718891, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802DDEEC, 0x00110009, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000058, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF84060DC, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802E2E80, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000043, 0x00000002, 0x802E2E80, 0x00000000, 0x00000043, 0x00000004, 0x802E20AC, 0xFFFFFFAB, 0x00000055, 0x0000001C, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x0000005A, 0x00000043, 0x00000002, 0x802E461C, 0xFD050F8B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060006, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000001, EB9D90_SyncStatusMenu, 0x00000043, 0x00000007, 0x802E4310, 0x0000005A, 0xFFFFFFAD, 0x00000000, 0x00000057, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802E461C, 0xFD050F8B, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, 0x802DE754, 0xFFFFFFC4, 0x0000001E, 0x00000014, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x00000030, 0x7FFFFE00, 0x00000043, 0x00000003, 0x802DEF5C, 0x000000C8, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000007, 0x802E3444, 0x00000001, 0x0000007B, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, 0x802E3330, 0x00000000, 0x00000BB8, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFFFFFFAB, 0x00000000, 0x0000004B, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFFFFFFAB, 0x00000000, 0x0000004B, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, D_80247FDC_EC0E2C, 0x00000023, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248D6C_EC1BBC
 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1FB4, 0xFFFFFFAB, 0x00000055, 0x00000014, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DFABC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802413CC_EBA21C, 0x00000046, 0x00000001, D_802485D8_EC1428, 0x00000043, 0x00000001, func_802413EC_EBA23C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/EC78F0.data.s b/ver/us/asm/data/EC78F0.data.s
index 0aebd7d9ae..f9f9625c0b 100644
--- a/ver/us/asm/data/EC78F0.data.s
+++ b/ver/us/asm/data/EC78F0.data.s
@@ -27,7 +27,7 @@ glabel D_80240C74_EC7E24
 .word 0x00000047, 0x00000005, D_80240C18_EC7DC8, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80240CA0_EC7E50
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80242B0C_EC9CBC, 0x00000046, 0x00000001, D_802428C4_EC9A74, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000006, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000129, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017F, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBF, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000125, 0x00000024, 0x00000002, 0xFE363C81, 0x00000047, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000071, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000015, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C82, 0x00000093, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF0E, 0x00000024, 0x00000002, 0xFE363C84, 0x00000014, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF42, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFAF, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF96, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE84, 0x00000024, 0x00000002, 0xFE363C81, 0x00000055, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408D0_EC7A80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFB50, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408D0_EC7A80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, D_80241C14_EC8DC4, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240C74_EC7E24, 0x00000044, 0x00000001, 0x80285C70, 0x00000044, 0x00000001, D_802424F4_EC96A4, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802407A0_EC7950, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_8024030C_EC74BC, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240344_EC74F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_80242B0C_EC9CBC, 0x00000046, 0x00000001, D_802428C4_EC9A74, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000006, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000129, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017F, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBF, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000125, 0x00000024, 0x00000002, 0xFE363C81, 0x00000047, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000071, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000015, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C82, 0x00000093, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF0E, 0x00000024, 0x00000002, 0xFE363C84, 0x00000014, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF42, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFAF, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF96, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE84, 0x00000024, 0x00000002, 0xFE363C81, 0x00000055, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_EC7B1C, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408D0_EC7A80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFB50, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408D0_EC7A80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, D_80241C14_EC8DC4, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240C74_EC7E24, 0x00000044, 0x00000001, 0x80285C70, 0x00000044, 0x00000001, D_802424F4_EC96A4, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802407A0_EC7950, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EC71B0_SpawnSunEffect, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240344_EC74F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
 
 glabel D_80241220_EC83D0
 .word 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EC7590_DeadTransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, EC7590_DeadTransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/ECBC10.data.s b/ver/us/asm/data/ECBC10.data.s
index dd71357cfa..cd22fce378 100644
--- a/ver/us/asm/data/ECBC10.data.s
+++ b/ver/us/asm/data/ECBC10.data.s
@@ -21,10 +21,10 @@ glabel D_80242038_ECBD38
 .word 0x430C0000, 0x43340000, 0x435C0000
 
 glabel D_80242044_ECBD44
-.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, func_80240544_ECA244, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, func_80240B38_ECA838, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, func_80240B38_ECA838, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_EC9D3C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_802405A8_ECA2A8, 0x00000043, 0x00000001, EC9D00_DeadUnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EC9D00_DeadUnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EC9D00_DeadUnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_ECA300, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, EC9D00_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, EC9D00_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, EC9D00_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_EC9D3C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, EC9D00_UnkFunc22, 0x00000043, 0x00000001, EC9D00_DeadUnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EC9D00_DeadUnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EC9D00_DeadUnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_ECA300, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802421A8_ECBEA8
-.word 0x0000000A, 0x00000002, 0xF84060FA, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x80048290, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D08_ECAA08, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000001, 0x00200000, 0x00000043, 0x00000001, func_80240000_EC9D00, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80240480_ECA180, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, 0x802E4064, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240120_EC9E20, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240510_ECA210, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_EC9D1C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_EC9ECC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240510_ECA210, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_EC9D1C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_ECA11C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, 0x802DE138, 0x001E000D, 0x00000043, 0x00000001, 0x802DE040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240510_ECA210, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_EC9D1C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242044_ECBD44, 0x00000043, 0x00000003, func_80240068_EC9D68, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FA, 0x00000001, 0x00000043, 0x00000002, func_80240510_ECA210, 0xFE363C89, 0x00000043, 0x00000001, func_80240448_ECA148, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_EC9D1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF84060FA, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x80048290, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EC9D00_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000001, 0x00200000, 0x00000043, 0x00000001, EC9D00_SetOverrideFlags_40, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EC9D00_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, 0x802E4064, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, EC9D00_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, EC9D00_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_EC9ECC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, EC9D00_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, EC9D00_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, 0x802DE138, 0x001E000D, 0x00000043, 0x00000001, 0x802DE040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, EC9D00_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242044_ECBD44, 0x00000043, 0x00000003, EC9D00_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FA, 0x00000001, 0x00000043, 0x00000002, EC9D00_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, EC9D00_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242628_ECC328
 .word 0x00000043, 0x00000007, 0x8011A58C, 0x802F8DC0, 0xFFFFFCF4, 0x00000078, 0xFFFFFF92, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, 0x8011A8C0, 0xF84060FA, 0x00000043, 0x00000002, 0x8011A804, D_802421A8_ECBEA8, 0x00000043, 0x00000007, 0x802E4310, 0x0000015C, 0x000001FE, 0x00000000, 0xFFFFFFA6, 0x00000011, 0xF84060E5, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -78,7 +78,7 @@ glabel D_802430BC_ECCDBC
 .word 0x00000000
 
 glabel D_802430C0_ECCDC0
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3C8C, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EDC, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_802417CC_ECB4CC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802419F0_ECB6F0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3C8C, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EDC, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, ECAA80_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802419F0_ECB6F0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802431F4_ECCEF4
 .word 0x00000043, 0x00000002, func_80241A28_ECB728, 0xFE363C80, 0x0000004E, 0x00000006, D_802430C0_ECCDC0, 0x00000010, 0x00000000, D_802462F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024199C_ECB69C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -144,7 +144,7 @@ glabel D_80245944_ECF644
 .word 0x00000024, 0x00000002, 0xF971889D, 0x00000000, 0x00000024, 0x00000002, 0xF971889E, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80245920_ECF620, 0x00000047, 0x00000005, D_802452D0_ECEFD0, 0x00001000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802452D0_ECEFD0, 0x00100000, D_80245934_ECF634, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80245C6C_ECF96C
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_80241E70_ECBB70, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, ECBB70_UnkFunc43, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80245F8C_ECFC8C
 .word 0x00000043, 0x00000002, 0x802D6400, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C83, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C85, 0x0000003E, 0x00000024, 0x00000002, 0xFE363C86, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_80245C6C_ECF96C, 0x00000043, 0x00000002, 0x802D6400, 0x00000036, 0x00000024, 0x00000002, 0xFE363C83, 0x00000036, 0x00000024, 0x00000002, 0xFE363C84, 0x00000037, 0x00000024, 0x00000002, 0xFE363C85, 0x00000038, 0x00000024, 0x00000002, 0xFE363C86, 0x00000039, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_80245C6C_ECF96C, 0x00000043, 0x00000002, 0x802D6400, 0x00000030, 0x00000024, 0x00000002, 0xFE363C83, 0x00000030, 0x00000024, 0x00000002, 0xFE363C84, 0x00000031, 0x00000024, 0x00000002, 0xFE363C85, 0x00000032, 0x00000024, 0x00000002, 0xFE363C86, 0x00000033, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_80245C6C_ECF96C, 0x00000043, 0x00000002, 0x802D6400, 0x00000043, 0x00000024, 0x00000002, 0xFE363C83, 0x00000043, 0x00000024, 0x00000002, 0xFE363C84, 0x00000042, 0x00000024, 0x00000002, 0xFE363C85, 0x00000044, 0x00000024, 0x00000002, 0xFE363C86, 0x00000045, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000AE, 0x00000044, 0x00000001, D_80245C6C_ECF96C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/ED1840.data.s b/ver/us/asm/data/ED1840.data.s
index bddeab6cd3..146c56cdf6 100644
--- a/ver/us/asm/data/ED1840.data.s
+++ b/ver/us/asm/data/ED1840.data.s
@@ -24,7 +24,7 @@ glabel D_80241CCC_ED1CBC
 .word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, D_8024417C_ED416C, 0x00000044, 0x00000001, D_8024260C_ED25FC, 0x00000044, 0x00000001, D_802434D8_ED34C8, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE01, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFFC, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEC1, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED2, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFE0, 0x00000024, 0x00000002, 0xFE363C83, 0x00000074, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0x00000033, 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000024, 0x00000002, 0xFE363C82, 0x0000008D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0x000000EA, 0x00000024, 0x00000002, 0xFE363C81, 0x00000026, 0x00000024, 0x00000002, 0xFE363C82, 0x000001F6, 0x00000024, 0x00000002, 0xFE363C83, 0x00000062, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFDF3, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF5D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF6C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000205, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFA5, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, D_80241920_ED1910, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241C84_ED1C74, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, D_802418B0_ED18A0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ECFFF0_DeadUnk1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802422EC_ED22DC
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_80240040_ED0030, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, ED0030_UnkFunc43, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024260C_ED25FC
 .word 0x00000043, 0x00000002, 0x802D6400, 0x00000045, 0x00000024, 0x00000002, 0xFE363C83, 0x00000045, 0x00000024, 0x00000002, 0xFE363C84, 0x00000046, 0x00000024, 0x00000002, 0xFE363C85, 0x00000047, 0x00000024, 0x00000002, 0xFE363C86, 0x00000048, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422EC_ED22DC, 0x00000043, 0x00000002, 0x802D6400, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C84, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C86, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000AE, 0x00000044, 0x00000001, D_802422EC_ED22DC, 0x00000043, 0x00000002, 0x802D6400, 0x00000053, 0x00000024, 0x00000002, 0xFE363C83, 0x00000053, 0x00000024, 0x00000002, 0xFE363C84, 0x00000054, 0x00000024, 0x00000002, 0xFE363C85, 0x00000055, 0x00000024, 0x00000002, 0xFE363C86, 0x00000056, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422EC_ED22DC, 0x00000043, 0x00000002, 0x802D6400, 0x00000059, 0x00000024, 0x00000002, 0xFE363C83, 0x00000059, 0x00000024, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C85, 0x0000005B, 0x00000024, 0x00000002, 0xFE363C86, 0x0000005C, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422EC_ED22DC, 0x00000043, 0x00000002, 0x802D6400, 0x00000061, 0x00000024, 0x00000002, 0xFE363C83, 0x00000061, 0x00000024, 0x00000002, 0xFE363C84, 0x00000062, 0x00000024, 0x00000002, 0xFE363C85, 0x00000063, 0x00000024, 0x00000002, 0xFE363C86, 0x00000064, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422EC_ED22DC, 0x00000043, 0x00000002, 0x802D6400, 0x00000067, 0x00000024, 0x00000002, 0xFE363C83, 0x00000067, 0x00000024, 0x00000002, 0xFE363C84, 0x00000068, 0x00000024, 0x00000002, 0xFE363C85, 0x00000069, 0x00000024, 0x00000002, 0xFE363C86, 0x0000006A, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422EC_ED22DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, ED00D0_DeadTransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, ED00D0_DeadTransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/ED5780.data.s b/ver/us/asm/data/ED5780.data.s
index 30524afc46..6c513682db 100644
--- a/ver/us/asm/data/ED5780.data.s
+++ b/ver/us/asm/data/ED5780.data.s
@@ -36,7 +36,7 @@ glabel D_80241DA4_ED5FC4
 .word 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241E04_ED6024
-.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, ED42A0_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802402BC_ED44DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, ED42A0_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ED42A0_DeadUnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241EA0_ED60C0
 .word 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFFCE, 0x000000AA, 0x00000181, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D6C60, 0x00000038, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/ED9170.data.s b/ver/us/asm/data/ED9170.data.s
index 4e9ad28f57..722ed61540 100644
--- a/ver/us/asm/data/ED9170.data.s
+++ b/ver/us/asm/data/ED9170.data.s
@@ -9,13 +9,13 @@ glabel D_80240410_ED9230
 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024072C_ED954C
-.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000043, 0x00000001, func_802400F0_ED8F10, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000002, D_802DFEB8, 0x00000100, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240020_ED8E40, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000043, 0x00000001, func_802400F0_ED8F10, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000900, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, func_80240274_ED9094, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000043, 0x00000001, func_802400F0_ED8F10, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000002, D_802DFEB8, 0x00000100, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240020_ED8E40, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000043, 0x00000001, func_802400F0_ED8F10, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000900, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, ED8E20_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80240E70_ED9C90
 .word 0x00000043, 0x00000001, func_80240034_ED8E54, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240F4C_ED9D6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80240F4C_ED9D6C
-.word 0x00000043, 0x00000001, func_80240000_ED8E20, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, func_802400F0_ED8F10, 0x00000043, 0x00000004, 0x802DE754, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, func_802400F0_ED8F10, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DF380, 0x00200000, 0x00000001, 0x00000043, 0x00000001, func_80240208_ED9028, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, 0x802DF380, 0x00200000, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000800, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DFABC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, D_802DF3F0, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, func_80240000_ED8E20, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, func_802400F0_ED8F10, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000800, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, func_80240274_ED9094, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, ED8E20_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, func_802400F0_ED8F10, 0x00000043, 0x00000004, 0x802DE754, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, func_802400F0_ED8F10, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DF380, 0x00200000, 0x00000001, 0x00000043, 0x00000001, ED8E20_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, 0x802DF380, 0x00200000, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000800, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DFABC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, D_802DF3F0, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, ED8E20_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, func_802400F0_ED8F10, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000800, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, ED8E20_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024145C_EDA27C
 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x802431A8, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/EDC6D0.data.s b/ver/us/asm/data/EDC6D0.data.s
index e4da65ee93..db1b16044d 100644
--- a/ver/us/asm/data/EDC6D0.data.s
+++ b/ver/us/asm/data/EDC6D0.data.s
@@ -45,7 +45,7 @@ glabel D_80241854_EDD834
 .word 0x00000000
 
 glabel D_80241858_EDD838
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_802403F0_EDC3D0, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240614_EDC5F4, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EDC020_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240614_EDC5F4, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024199C_EDD97C
 .word 0x00000043, 0x00000002, func_8024064C_EDC62C, 0xFE363C80, 0x0000004E, 0x00000006, D_80241858_EDD838, 0x00000010, 0x00000000, D_802429E0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802405C0_EDC5A0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/EE20E0.data.s b/ver/us/asm/data/EE20E0.data.s
index 9129107245..31a425633e 100644
--- a/ver/us/asm/data/EE20E0.data.s
+++ b/ver/us/asm/data/EE20E0.data.s
@@ -75,10 +75,10 @@ glabel D_802444E8_EE2EA8
 .word 0x41200000, 0x00000000, 0x42340000, 0xC2B40000, 0x41A00000, 0x42340000, 0xC33E0000, 0x42700000, 0x42340000, 0xC3910000, 0x430C0000, 0x42340000, 0xC3C30000, 0x43960000, 0x42340000
 
 glabel D_80244524_EE2EE4
-.word 0x00000043, 0x00000005, 0x802DC654, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000001, pause_interp_text_scroll_EE1DD8, 0x00000043, 0x00000004, 0x802DC064, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000043, 0x00000004, 0x802E1D58, 0xFFFFFFFC, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000005, 0x802DC654, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000001, EDEA00_UnkFunc42, 0x00000043, 0x00000004, 0x802DC064, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000043, 0x00000004, 0x802E1D58, 0xFFFFFFFC, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244628_EE2FE8
-.word 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000001, pause_interp_text_scroll_EE1DD8, 0x00000043, 0x00000004, 0x802DC064, 0x00000001, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000043, 0x00000004, 0x802E1D58, 0xFFFFFFFC, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000033, 0x00000043, 0x00000004, 0x802E1D58, 0x00000000, 0x00000001, 0xFE363C8B, 0x00000043, 0x00000004, 0x802DC064, 0x00000000, 0xFE363C8B, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000001, EDEA00_UnkFunc42, 0x00000043, 0x00000004, 0x802DC064, 0x00000001, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000043, 0x00000004, 0x802E1D58, 0xFFFFFFFC, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000033, 0x00000043, 0x00000004, 0x802E1D58, 0x00000000, 0x00000001, 0xFE363C8B, 0x00000043, 0x00000004, 0x802DC064, 0x00000000, 0xFE363C8B, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244774_EE3134
 .word 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802DC654, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802DC654, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000005, 0x802DB210, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -93,7 +93,7 @@ glabel D_802450DC_EE3A9C
 .word 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802E20AC, 0xFE363C80, 0xFE363C82, 0x00000078, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24A9080, 0xF24A5C80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DC3E0, 0x00000001, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC0004, 0x00CC0001, 0x00000000, 0x001100B4, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0x00000001, 0x00000001, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000258, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AA280, 0xF24A5A80, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000082, 0xFFFFFF38, 0x00000043, 0x00000004, 0x802D9284, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80243470_EE1E30, 0x00000037, 0x00000057, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000001, 0x00000100, 0x00000001, 0x00000045, 0x00000002, D_80244628_EE2FE8, 0xFE363C89, 0x00000043, 0x00000005, func_802E2A80, 0x00000037, D_802444E8_EE2EA8, 0x00000005, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000002, 0x802DCB18, 0x00000008, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000005, 0x001100B5, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000001, 0x802DCEE8, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024550C_EE3ECC
-.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000A, 0x00080004, 0x00000000, 0x001100A2, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFFFFFEDE, 0x00000078, 0x0000002D, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00080001, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000010E, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC0004, 0x00CC0001, 0x00000005, 0x001100A3, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0007, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24A9080, 0xF24A6280, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000082, 0xFFFFFF38, 0x00000043, 0x00000004, 0x802D9284, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000190, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000082, 0x0000003C, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80243470_EE1E30, 0x00000050, 0x00000057, 0x00000000, 0x00000045, 0x00000002, D_80244628_EE2FE8, 0xFE363C89, 0x00000043, 0x00000005, func_802E2A80, 0x00000050, D_802444AC_EE2E6C, 0x00000005, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0009, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24A9080, 0xF24A5C80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100A4, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC0008, 0x00CC0008, 0x00000000, 0x001100A5, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000B, 0x00080003, 0x00000000, 0x001100A6, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00080001, 0x00000043, 0x00000005, 0x802DD82C, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000015E, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC000A, 0x00CC0009, 0x00000000, 0x001100A7, 0x00000043, 0x00000002, 0x802DE138, 0x001E0020, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_80244950_EE3310, 0x00000008, 0x00000001, 0x0000000A, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD848, 0x00000001, 0x00CC0004, 0x00CC0001, 0x00000000, 0x001100A9, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010029, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000B, 0x00080003, 0x00000000, 0x001100AA, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00080001, 0x00000043, 0x00000005, 0x802DD82C, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000015E, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000B, 0x00080003, 0x00000000, 0x001100AB, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE138, 0x001E0021, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AC, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AD, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AE, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AF, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0x00000001, 0x0000005A, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0009, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC000A, 0x00CC0009, 0x00000005, 0x001100B0, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100B1, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC000A, 0x00CC0009, 0x00000005, 0x001100B2, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100B3, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000057, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, 0x802DB57C, 0x00000000, 0xF24A8880, 0x00000043, 0x00000005, 0x802DB78C, 0x00000000, 0xFE363C80, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, func_80240040_EDEA00, 0x00000000, 0x00000008, 0x00000043, 0x00000001, func_80243680_EE2040, 0x00000044, 0x00000001, D_8024397C_EE233C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D0190, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, D_802439A8_EE2368, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000033, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000046, 0x00000001, D_802450DC_EE3A9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000A, 0x00080004, 0x00000000, 0x001100A2, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFFFFFEDE, 0x00000078, 0x0000002D, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00080001, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000010E, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC0004, 0x00CC0001, 0x00000005, 0x001100A3, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0007, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24A9080, 0xF24A6280, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000082, 0xFFFFFF38, 0x00000043, 0x00000004, 0x802D9284, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000190, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000082, 0x0000003C, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80243470_EE1E30, 0x00000050, 0x00000057, 0x00000000, 0x00000045, 0x00000002, D_80244628_EE2FE8, 0xFE363C89, 0x00000043, 0x00000005, func_802E2A80, 0x00000050, D_802444AC_EE2E6C, 0x00000005, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0009, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24A9080, 0xF24A5C80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100A4, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC0008, 0x00CC0008, 0x00000000, 0x001100A5, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000B, 0x00080003, 0x00000000, 0x001100A6, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00080001, 0x00000043, 0x00000005, 0x802DD82C, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000015E, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC000A, 0x00CC0009, 0x00000000, 0x001100A7, 0x00000043, 0x00000002, 0x802DE138, 0x001E0020, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_80244950_EE3310, 0x00000008, 0x00000001, 0x0000000A, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD848, 0x00000001, 0x00CC0004, 0x00CC0001, 0x00000000, 0x001100A9, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010029, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000B, 0x00080003, 0x00000000, 0x001100AA, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00080001, 0x00000043, 0x00000005, 0x802DD82C, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000015E, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000B, 0x00080003, 0x00000000, 0x001100AB, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE138, 0x001E0021, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AC, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AD, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AE, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AF, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0x00000001, 0x0000005A, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0009, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC000A, 0x00CC0009, 0x00000005, 0x001100B0, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100B1, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC000A, 0x00CC0009, 0x00000005, 0x001100B2, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100B3, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000057, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, 0x802DB57C, 0x00000000, 0xF24A8880, 0x00000043, 0x00000005, 0x802DB78C, 0x00000000, 0xFE363C80, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, EDEA00_UnkFunc41, 0x00000000, 0x00000008, 0x00000043, 0x00000001, EE2040_LoadPartyImage, 0x00000044, 0x00000001, D_8024397C_EE233C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D0190, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, D_802439A8_EE2368, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000033, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000046, 0x00000001, D_802450DC_EE3A9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80246100_EE4AC0
 .word 0x00000043, 0x00000002, 0x8004861C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00080004, 0x00000043, 0x00000004, 0x802D8FA8, 0x00000000, 0x00000006, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ABE80, 0xF24A5C80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000044, 0x00000001, D_8024550C_EE3ECC, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/EE8970.data.s b/ver/us/asm/data/EE8970.data.s
index aa112dd229..dad2f8fe31 100644
--- a/ver/us/asm/data/EE8970.data.s
+++ b/ver/us/asm/data/EE8970.data.s
@@ -30,7 +30,7 @@ glabel D_80242C30_EE91E0
 .word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242EDC_EE948C
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_80240340_EE68F0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, EE65B0_UnkFunc43, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802431FC_EE97AC
 .word 0x00000000
@@ -87,7 +87,7 @@ glabel D_80244630_EEABE0
 .word 0x00000000
 
 glabel D_80244634_EEABE4
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3C8C, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EDC, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_80242090_EE8640, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802422B4_EE8864, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3C8C, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EDC, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EE70C0_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802422B4_EE8864, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244768_EEAD18
 .word 0x00000043, 0x00000002, func_802422EC_EE889C, 0xFE363C80, 0x0000004E, 0x00000006, D_80244634_EEABE4, 0x00000010, 0x00000000, D_802453E0_EEB990, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242260_EE8810, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/EEFAD0.data.s b/ver/us/asm/data/EEFAD0.data.s
index 2ba4f74c7f..dde214221f 100644
--- a/ver/us/asm/data/EEFAD0.data.s
+++ b/ver/us/asm/data/EEFAD0.data.s
@@ -27,7 +27,7 @@ glabel D_80242F00_EF0000
 .word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802431AC_EF02AC
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_80240040_EED140, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, EED140_UnkFunc43, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802434CC_EF05CC
 .word 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000014, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD1C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC9, 0x00000024, 0x00000002, 0xFE363C84, 0x00000064, 0x00000044, 0x00000001, D_80242F00_EF0000, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FA, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0x000002D5, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC9, 0x00000024, 0x00000002, 0xFE363C84, 0x000000B4, 0x00000044, 0x00000001, D_80242F00_EF0000, 0x00000043, 0x00000002, 0x802D6400, 0x00000041, 0x00000024, 0x00000002, 0xFE363C83, 0x00000041, 0x00000024, 0x00000002, 0xFE363C84, 0x00000042, 0x00000024, 0x00000002, 0xFE363C85, 0x00000043, 0x00000024, 0x00000002, 0xFE363C86, 0x00000044, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802431AC_EF02AC, 0x00000043, 0x00000002, 0x802D6400, 0x00000047, 0x00000024, 0x00000002, 0xFE363C83, 0x00000047, 0x00000024, 0x00000002, 0xFE363C84, 0x00000048, 0x00000024, 0x00000002, 0xFE363C85, 0x00000049, 0x00000024, 0x00000002, 0xFE363C86, 0x0000004A, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000AE, 0x00000044, 0x00000001, D_802431AC_EF02AC, 0x00000043, 0x00000002, 0x802D6400, 0x0000004F, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000050, 0x00000024, 0x00000002, 0xFE363C85, 0x00000051, 0x00000024, 0x00000002, 0xFE363C86, 0x00000052, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802431AC_EF02AC, 0x00000043, 0x00000002, 0x802D6400, 0x00000055, 0x00000024, 0x00000002, 0xFE363C83, 0x00000055, 0x00000024, 0x00000002, 0xFE363C84, 0x00000056, 0x00000024, 0x00000002, 0xFE363C85, 0x00000057, 0x00000024, 0x00000002, 0xFE363C86, 0x00000058, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802431AC_EF02AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
@@ -45,10 +45,10 @@ glabel D_802437B8_EF08B8
 .word 0x430C0000, 0x43340000, 0x435C0000
 
 glabel D_802437C4_EF08C4
-.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, func_80240624_EED724, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, func_80240C18_EEDD18, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, func_80240C18_EEDD18, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024011C_EED21C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_80240688_EED788, 0x00000043, 0x00000001, EED1E0_DeadUnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EED1E0_DeadUnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EED1E0_DeadUnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802406E0_EED7E0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, EED1E0_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, EED1E0_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, EED1E0_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024011C_EED21C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, EED1E0_UnkFunc22, 0x00000043, 0x00000001, EED1E0_DeadUnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EED1E0_DeadUnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EED1E0_DeadUnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802406E0_EED7E0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243928_EF0A28
-.word 0x0000000A, 0x00000002, 0xF84060FB, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x80048290, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240DE8_EEDEE8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000001, 0x00200000, 0x00000043, 0x00000001, func_802400E0_EED1E0, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80240560_EED660, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, 0x802E4064, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240200_EED300, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802405F0_EED6F0, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802400FC_EED1FC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802402AC_EED3AC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_802405F0_EED6F0, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802400FC_EED1FC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_802404FC_EED5FC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, 0x802DE138, 0x001E000D, 0x00000043, 0x00000001, 0x802DE040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_802405F0_EED6F0, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802400FC_EED1FC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802437C4_EF08C4, 0x00000043, 0x00000003, func_80240148_EED248, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FB, 0x00000001, 0x00000043, 0x00000002, func_802405F0_EED6F0, 0xFE363C89, 0x00000043, 0x00000001, func_80240528_EED628, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802400FC_EED1FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF84060FB, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x80048290, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EED1E0_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000001, 0x00200000, 0x00000043, 0x00000001, EED1E0_SetOverrideFlags_40, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EED1E0_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, 0x802E4064, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, EED1E0_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, EED1E0_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802402AC_EED3AC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, EED1E0_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, EED1E0_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, 0x802DE138, 0x001E000D, 0x00000043, 0x00000001, 0x802DE040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, EED1E0_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802437C4_EF08C4, 0x00000043, 0x00000003, EED1E0_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FB, 0x00000001, 0x00000043, 0x00000002, EED1E0_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, EED1E0_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243DA8_EF0EA8
 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D83DC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -57,7 +57,7 @@ glabel D_80243E10_EF0F10
 .word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE6F8, 0x00000006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000045, 0x00000002, D_80243DA8_EF0EA8, 0xFE363C8A, 0x00000043, 0x00000002, 0x802DE674, 0xF24A7D4D, 0x00000043, 0x00000005, 0x802DEF08, 0x000001C2, 0x000000B4, 0xFFFFFF88, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6F8, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243EE0_EF0FE0
-.word 0x0000000A, 0x00000002, 0xF97188A7, 0x00000000, 0x00000043, 0x00000001, func_80240E18_EEDF18, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x0000026C, 0x00000294, 0x00000043, 0x00000007, 0x802E4310, 0x0000015C, 0x00000280, 0x00000091, 0xFFFFFF9C, 0x0000000D, 0xF84060EC, 0x00000024, 0x00000002, 0xF97188A7, 0x00000001, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF97188A7, 0x00000000, 0x00000043, 0x00000001, EED1E0_UnkFunc44, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x0000026C, 0x00000294, 0x00000043, 0x00000007, 0x802E4310, 0x0000015C, 0x00000280, 0x00000091, 0xFFFFFF9C, 0x0000000D, 0xF84060EC, 0x00000024, 0x00000002, 0xF97188A7, 0x00000001, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243FA4_EF10A4
 .word 0x00000024, 0x00000002, 0xF97188A7, 0x00000000, 0x00000047, 0x00000005, D_80243EE0_EF0FE0, 0x00000080, 0x00000014, 0x00000001, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F8DC0, 0x0000015E, 0x000000F0, 0xFFFFFF9C, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, 0x8011A8C0, 0xF84060FB, 0x00000043, 0x00000002, 0x8011A804, D_80243928_EF0A28, 0x00000043, 0x00000007, 0x8011A58C, 0x802F8EE0, 0x000001D8, 0x00000064, 0xFFFFFF9C, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, D_80243E10_EF0F10, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/nonmatchings/EA0C10/func_802427F0_EA30F0.s b/ver/us/asm/nonmatchings/EA0C10/func_802427F0_EA30F0.s
deleted file mode 100644
index 98e17ab4e4..0000000000
--- a/ver/us/asm/nonmatchings/EA0C10/func_802427F0_EA30F0.s
+++ /dev/null
@@ -1,122 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802427F0_EA30F0
-/* EA30F0 802427F0 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* EA30F4 802427F4 AFB10014 */  sw        $s1, 0x14($sp)
-/* EA30F8 802427F8 0080882D */  daddu     $s1, $a0, $zero
-/* EA30FC 802427FC AFBF0024 */  sw        $ra, 0x24($sp)
-/* EA3100 80242800 AFB40020 */  sw        $s4, 0x20($sp)
-/* EA3104 80242804 AFB3001C */  sw        $s3, 0x1c($sp)
-/* EA3108 80242808 AFB20018 */  sw        $s2, 0x18($sp)
-/* EA310C 8024280C AFB00010 */  sw        $s0, 0x10($sp)
-/* EA3110 80242810 F7BC0048 */  sdc1      $f28, 0x48($sp)
-/* EA3114 80242814 F7BA0040 */  sdc1      $f26, 0x40($sp)
-/* EA3118 80242818 F7B80038 */  sdc1      $f24, 0x38($sp)
-/* EA311C 8024281C F7B60030 */  sdc1      $f22, 0x30($sp)
-/* EA3120 80242820 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* EA3124 80242824 8E30000C */  lw        $s0, 0xc($s1)
-/* EA3128 80242828 8E130000 */  lw        $s3, ($s0)
-/* EA312C 8024282C 26100004 */  addiu     $s0, $s0, 4
-/* EA3130 80242830 0C0B53A3 */  jal       dead_evt_get_variable
-/* EA3134 80242834 0260282D */   daddu    $a1, $s3, $zero
-/* EA3138 80242838 4482E000 */  mtc1      $v0, $f28
-/* EA313C 8024283C 00000000 */  nop
-/* EA3140 80242840 4680E720 */  cvt.s.w   $f28, $f28
-/* EA3144 80242844 8E140000 */  lw        $s4, ($s0)
-/* EA3148 80242848 26100004 */  addiu     $s0, $s0, 4
-/* EA314C 8024284C 0220202D */  daddu     $a0, $s1, $zero
-/* EA3150 80242850 0C0B53A3 */  jal       dead_evt_get_variable
-/* EA3154 80242854 0280282D */   daddu    $a1, $s4, $zero
-/* EA3158 80242858 4482D000 */  mtc1      $v0, $f26
-/* EA315C 8024285C 00000000 */  nop
-/* EA3160 80242860 4680D6A0 */  cvt.s.w   $f26, $f26
-/* EA3164 80242864 8E100000 */  lw        $s0, ($s0)
-/* EA3168 80242868 0220202D */  daddu     $a0, $s1, $zero
-/* EA316C 8024286C 0C0B53A3 */  jal       dead_evt_get_variable
-/* EA3170 80242870 0200282D */   daddu    $a1, $s0, $zero
-/* EA3174 80242874 4482C000 */  mtc1      $v0, $f24
-/* EA3178 80242878 00000000 */  nop
-/* EA317C 8024287C 4680C620 */  cvt.s.w   $f24, $f24
-/* EA3180 80242880 3C128011 */  lui       $s2, %hi(dead_gPlayerStatus)
-/* EA3184 80242884 26527578 */  addiu     $s2, $s2, %lo(dead_gPlayerStatus)
-/* EA3188 80242888 3C038008 */  lui       $v1, %hi(dead_gCurrentCameraID)
-/* EA318C 8024288C 8C63C760 */  lw        $v1, %lo(dead_gCurrentCameraID)($v1)
-/* EA3190 80242890 C64200A8 */  lwc1      $f2, 0xa8($s2)
-/* EA3194 80242894 44800000 */  mtc1      $zero, $f0
-/* EA3198 80242898 00031080 */  sll       $v0, $v1, 2
-/* EA319C 8024289C 00431021 */  addu      $v0, $v0, $v1
-/* EA31A0 802428A0 00021080 */  sll       $v0, $v0, 2
-/* EA31A4 802428A4 00431023 */  subu      $v0, $v0, $v1
-/* EA31A8 802428A8 000218C0 */  sll       $v1, $v0, 3
-/* EA31AC 802428AC 00431021 */  addu      $v0, $v0, $v1
-/* EA31B0 802428B0 000210C0 */  sll       $v0, $v0, 3
-/* EA31B4 802428B4 46001032 */  c.eq.s    $f2, $f0
-/* EA31B8 802428B8 3C01800C */  lui       $at, %hi(D_800B8DEC)
-/* EA31BC 802428BC 00220821 */  addu      $at, $at, $v0
-/* EA31C0 802428C0 C4368DEC */  lwc1      $f22, %lo(D_800B8DEC)($at)
-/* EA31C4 802428C4 45000005 */  bc1f      .L802428DC
-/* EA31C8 802428C8 00000000 */   nop
-/* EA31CC 802428CC 3C0142C8 */  lui       $at, 0x42c8
-/* EA31D0 802428D0 44810000 */  mtc1      $at, $f0
-/* EA31D4 802428D4 08090A3B */  j         .L802428EC
-/* EA31D8 802428D8 4600B581 */   sub.s    $f22, $f22, $f0
-.L802428DC:
-/* EA31DC 802428DC 3C0142C8 */  lui       $at, 0x42c8
-/* EA31E0 802428E0 44810000 */  mtc1      $at, $f0
-/* EA31E4 802428E4 00000000 */  nop
-/* EA31E8 802428E8 4600B580 */  add.s     $f22, $f22, $f0
-.L802428EC:
-/* EA31EC 802428EC 0C00AB85 */  jal       dead_clamp_angle
-/* EA31F0 802428F0 4600B306 */   mov.s    $f12, $f22
-/* EA31F4 802428F4 46000586 */  mov.s     $f22, $f0
-/* EA31F8 802428F8 3C014170 */  lui       $at, 0x4170
-/* EA31FC 802428FC 4481A000 */  mtc1      $at, $f20
-/* 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
-/* EA3210 80242910 864200B0 */  lh        $v0, 0xb0($s2)
-/* EA3214 80242914 3C013F00 */  lui       $at, 0x3f00
-/* EA3218 80242918 44812000 */  mtc1      $at, $f4
-/* EA321C 8024291C 44821000 */  mtc1      $v0, $f2
-/* EA3220 80242920 00000000 */  nop
-/* EA3224 80242924 468010A0 */  cvt.s.w   $f2, $f2
-/* EA3228 80242928 46041082 */  mul.s     $f2, $f2, $f4
-/* EA322C 8024292C 00000000 */  nop
-/* EA3230 80242930 4600E700 */  add.s     $f28, $f28, $f0
-/* EA3234 80242934 4602D680 */  add.s     $f26, $f26, $f2
-/* 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
-/* EA3248 80242948 0220202D */  daddu     $a0, $s1, $zero
-/* EA324C 8024294C 0260282D */  daddu     $a1, $s3, $zero
-/* EA3250 80242950 4600E18D */  trunc.w.s $f6, $f28
-/* EA3254 80242954 44063000 */  mfc1      $a2, $f6
-/* EA3258 80242958 0C0B551A */  jal       dead_evt_set_variable
-/* EA325C 8024295C 4600C601 */   sub.s    $f24, $f24, $f0
-/* EA3260 80242960 0220202D */  daddu     $a0, $s1, $zero
-/* EA3264 80242964 4600D18D */  trunc.w.s $f6, $f26
-/* EA3268 80242968 44063000 */  mfc1      $a2, $f6
-/* EA326C 8024296C 0C0B551A */  jal       dead_evt_set_variable
-/* EA3270 80242970 0280282D */   daddu    $a1, $s4, $zero
-/* EA3274 80242974 0220202D */  daddu     $a0, $s1, $zero
-/* EA3278 80242978 4600C18D */  trunc.w.s $f6, $f24
-/* EA327C 8024297C 44063000 */  mfc1      $a2, $f6
-/* EA3280 80242980 0C0B551A */  jal       dead_evt_set_variable
-/* EA3284 80242984 0200282D */   daddu    $a1, $s0, $zero
-/* EA3288 80242988 8FBF0024 */  lw        $ra, 0x24($sp)
-/* EA328C 8024298C 8FB40020 */  lw        $s4, 0x20($sp)
-/* EA3290 80242990 8FB3001C */  lw        $s3, 0x1c($sp)
-/* EA3294 80242994 8FB20018 */  lw        $s2, 0x18($sp)
-/* EA3298 80242998 8FB10014 */  lw        $s1, 0x14($sp)
-/* EA329C 8024299C 8FB00010 */  lw        $s0, 0x10($sp)
-/* EA32A0 802429A0 D7BC0048 */  ldc1      $f28, 0x48($sp)
-/* EA32A4 802429A4 D7BA0040 */  ldc1      $f26, 0x40($sp)
-/* EA32A8 802429A8 D7B80038 */  ldc1      $f24, 0x38($sp)
-/* EA32AC 802429AC D7B60030 */  ldc1      $f22, 0x30($sp)
-/* EA32B0 802429B0 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* EA32B4 802429B4 24020002 */  addiu     $v0, $zero, 2
-/* EA32B8 802429B8 03E00008 */  jr        $ra
-/* EA32BC 802429BC 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/EA36E0/func_80242E00_EA3700.s b/ver/us/asm/nonmatchings/EA36E0/func_80242E00_EA3700.s
index f0b6e41316..bd74fe9700 100644
--- a/ver/us/asm/nonmatchings/EA36E0/func_80242E00_EA3700.s
+++ b/ver/us/asm/nonmatchings/EA36E0/func_80242E00_EA3700.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel filemenu_set_cursor_goal_pos_EA3700
-/* EA3700 80242E00 3C038011 */  lui       $v1, %hi(D_80117160)
-/* EA3704 80242E04 24637160 */  addiu     $v1, $v1, %lo(D_80117160)
+/* EA3700 80242E00 3C038011 */  lui       $v1, %hi(dead_gPartnerActionStatus2)
+/* EA3704 80242E04 24637160 */  addiu     $v1, $v1, %lo(dead_gPartnerActionStatus2)
 /* EA3708 80242E08 80620000 */  lb        $v0, ($v1)
 /* EA370C 80242E0C 10400004 */  beqz      $v0, .L80242E20
 /* EA3710 80242E10 2402FFFF */   addiu    $v0, $zero, -1
diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_802415DC_EAA0BC.s b/ver/us/asm/nonmatchings/EA8AE0/func_802415DC_EAA0BC.s
deleted file mode 100644
index 019a0e62e5..0000000000
--- a/ver/us/asm/nonmatchings/EA8AE0/func_802415DC_EAA0BC.s
+++ /dev/null
@@ -1,122 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802415DC_EAA0BC
-/* EAA0BC 802415DC 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* EAA0C0 802415E0 AFB10014 */  sw        $s1, 0x14($sp)
-/* EAA0C4 802415E4 0080882D */  daddu     $s1, $a0, $zero
-/* EAA0C8 802415E8 AFBF0024 */  sw        $ra, 0x24($sp)
-/* EAA0CC 802415EC AFB40020 */  sw        $s4, 0x20($sp)
-/* EAA0D0 802415F0 AFB3001C */  sw        $s3, 0x1c($sp)
-/* EAA0D4 802415F4 AFB20018 */  sw        $s2, 0x18($sp)
-/* EAA0D8 802415F8 AFB00010 */  sw        $s0, 0x10($sp)
-/* EAA0DC 802415FC F7BC0048 */  sdc1      $f28, 0x48($sp)
-/* EAA0E0 80241600 F7BA0040 */  sdc1      $f26, 0x40($sp)
-/* EAA0E4 80241604 F7B80038 */  sdc1      $f24, 0x38($sp)
-/* EAA0E8 80241608 F7B60030 */  sdc1      $f22, 0x30($sp)
-/* EAA0EC 8024160C F7B40028 */  sdc1      $f20, 0x28($sp)
-/* EAA0F0 80241610 8E30000C */  lw        $s0, 0xc($s1)
-/* EAA0F4 80241614 8E130000 */  lw        $s3, ($s0)
-/* EAA0F8 80241618 26100004 */  addiu     $s0, $s0, 4
-/* EAA0FC 8024161C 0C0B53A3 */  jal       dead_evt_get_variable
-/* EAA100 80241620 0260282D */   daddu    $a1, $s3, $zero
-/* EAA104 80241624 4482E000 */  mtc1      $v0, $f28
-/* EAA108 80241628 00000000 */  nop
-/* EAA10C 8024162C 4680E720 */  cvt.s.w   $f28, $f28
-/* EAA110 80241630 8E140000 */  lw        $s4, ($s0)
-/* EAA114 80241634 26100004 */  addiu     $s0, $s0, 4
-/* EAA118 80241638 0220202D */  daddu     $a0, $s1, $zero
-/* EAA11C 8024163C 0C0B53A3 */  jal       dead_evt_get_variable
-/* EAA120 80241640 0280282D */   daddu    $a1, $s4, $zero
-/* EAA124 80241644 4482D000 */  mtc1      $v0, $f26
-/* EAA128 80241648 00000000 */  nop
-/* EAA12C 8024164C 4680D6A0 */  cvt.s.w   $f26, $f26
-/* EAA130 80241650 8E100000 */  lw        $s0, ($s0)
-/* EAA134 80241654 0220202D */  daddu     $a0, $s1, $zero
-/* EAA138 80241658 0C0B53A3 */  jal       dead_evt_get_variable
-/* EAA13C 8024165C 0200282D */   daddu    $a1, $s0, $zero
-/* EAA140 80241660 4482C000 */  mtc1      $v0, $f24
-/* EAA144 80241664 00000000 */  nop
-/* EAA148 80241668 4680C620 */  cvt.s.w   $f24, $f24
-/* EAA14C 8024166C 3C128011 */  lui       $s2, %hi(dead_gPlayerStatus)
-/* EAA150 80241670 26527578 */  addiu     $s2, $s2, %lo(dead_gPlayerStatus)
-/* EAA154 80241674 3C038008 */  lui       $v1, %hi(dead_gCurrentCameraID)
-/* EAA158 80241678 8C63C760 */  lw        $v1, %lo(dead_gCurrentCameraID)($v1)
-/* EAA15C 8024167C C64200A8 */  lwc1      $f2, 0xa8($s2)
-/* EAA160 80241680 44800000 */  mtc1      $zero, $f0
-/* EAA164 80241684 00031080 */  sll       $v0, $v1, 2
-/* EAA168 80241688 00431021 */  addu      $v0, $v0, $v1
-/* EAA16C 8024168C 00021080 */  sll       $v0, $v0, 2
-/* EAA170 80241690 00431023 */  subu      $v0, $v0, $v1
-/* EAA174 80241694 000218C0 */  sll       $v1, $v0, 3
-/* EAA178 80241698 00431021 */  addu      $v0, $v0, $v1
-/* EAA17C 8024169C 000210C0 */  sll       $v0, $v0, 3
-/* EAA180 802416A0 46001032 */  c.eq.s    $f2, $f0
-/* EAA184 802416A4 3C01800C */  lui       $at, %hi(D_800B8DEC)
-/* EAA188 802416A8 00220821 */  addu      $at, $at, $v0
-/* EAA18C 802416AC C4368DEC */  lwc1      $f22, %lo(D_800B8DEC)($at)
-/* EAA190 802416B0 45000005 */  bc1f      .L802416C8
-/* EAA194 802416B4 00000000 */   nop
-/* EAA198 802416B8 3C0142C8 */  lui       $at, 0x42c8
-/* EAA19C 802416BC 44810000 */  mtc1      $at, $f0
-/* EAA1A0 802416C0 080905B6 */  j         .L802416D8
-/* EAA1A4 802416C4 4600B581 */   sub.s    $f22, $f22, $f0
-.L802416C8:
-/* EAA1A8 802416C8 3C0142C8 */  lui       $at, 0x42c8
-/* EAA1AC 802416CC 44810000 */  mtc1      $at, $f0
-/* EAA1B0 802416D0 00000000 */  nop
-/* EAA1B4 802416D4 4600B580 */  add.s     $f22, $f22, $f0
-.L802416D8:
-/* EAA1B8 802416D8 0C00AB85 */  jal       dead_clamp_angle
-/* EAA1BC 802416DC 4600B306 */   mov.s    $f12, $f22
-/* EAA1C0 802416E0 46000586 */  mov.s     $f22, $f0
-/* EAA1C4 802416E4 3C014170 */  lui       $at, 0x4170
-/* EAA1C8 802416E8 4481A000 */  mtc1      $at, $f20
-/* 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
-/* EAA1DC 802416FC 864200B0 */  lh        $v0, 0xb0($s2)
-/* EAA1E0 80241700 3C013F00 */  lui       $at, 0x3f00
-/* EAA1E4 80241704 44812000 */  mtc1      $at, $f4
-/* EAA1E8 80241708 44821000 */  mtc1      $v0, $f2
-/* EAA1EC 8024170C 00000000 */  nop
-/* EAA1F0 80241710 468010A0 */  cvt.s.w   $f2, $f2
-/* EAA1F4 80241714 46041082 */  mul.s     $f2, $f2, $f4
-/* EAA1F8 80241718 00000000 */  nop
-/* EAA1FC 8024171C 4600E700 */  add.s     $f28, $f28, $f0
-/* EAA200 80241720 4602D680 */  add.s     $f26, $f26, $f2
-/* 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
-/* EAA214 80241734 0220202D */  daddu     $a0, $s1, $zero
-/* EAA218 80241738 0260282D */  daddu     $a1, $s3, $zero
-/* EAA21C 8024173C 4600E18D */  trunc.w.s $f6, $f28
-/* EAA220 80241740 44063000 */  mfc1      $a2, $f6
-/* EAA224 80241744 0C0B551A */  jal       dead_evt_set_variable
-/* EAA228 80241748 4600C601 */   sub.s    $f24, $f24, $f0
-/* EAA22C 8024174C 0220202D */  daddu     $a0, $s1, $zero
-/* EAA230 80241750 4600D18D */  trunc.w.s $f6, $f26
-/* EAA234 80241754 44063000 */  mfc1      $a2, $f6
-/* EAA238 80241758 0C0B551A */  jal       dead_evt_set_variable
-/* EAA23C 8024175C 0280282D */   daddu    $a1, $s4, $zero
-/* EAA240 80241760 0220202D */  daddu     $a0, $s1, $zero
-/* EAA244 80241764 4600C18D */  trunc.w.s $f6, $f24
-/* EAA248 80241768 44063000 */  mfc1      $a2, $f6
-/* EAA24C 8024176C 0C0B551A */  jal       dead_evt_set_variable
-/* EAA250 80241770 0200282D */   daddu    $a1, $s0, $zero
-/* EAA254 80241774 8FBF0024 */  lw        $ra, 0x24($sp)
-/* EAA258 80241778 8FB40020 */  lw        $s4, 0x20($sp)
-/* EAA25C 8024177C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* EAA260 80241780 8FB20018 */  lw        $s2, 0x18($sp)
-/* EAA264 80241784 8FB10014 */  lw        $s1, 0x14($sp)
-/* EAA268 80241788 8FB00010 */  lw        $s0, 0x10($sp)
-/* EAA26C 8024178C D7BC0048 */  ldc1      $f28, 0x48($sp)
-/* EAA270 80241790 D7BA0040 */  ldc1      $f26, 0x40($sp)
-/* EAA274 80241794 D7B80038 */  ldc1      $f24, 0x38($sp)
-/* EAA278 80241798 D7B60030 */  ldc1      $f22, 0x30($sp)
-/* EAA27C 8024179C D7B40028 */  ldc1      $f20, 0x28($sp)
-/* EAA280 802417A0 24020002 */  addiu     $v0, $zero, 2
-/* EAA284 802417A4 03E00008 */  jr        $ra
-/* EAA288 802417A8 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/EB1170/func_80240484_EB12E4.s b/ver/us/asm/nonmatchings/EB1170/func_80240484_EB12E4.s
deleted file mode 100644
index 21a423c639..0000000000
--- a/ver/us/asm/nonmatchings/EB1170/func_80240484_EB12E4.s
+++ /dev/null
@@ -1,122 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240484_EB12E4
-/* EB12E4 80240484 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* EB12E8 80240488 AFB10014 */  sw        $s1, 0x14($sp)
-/* EB12EC 8024048C 0080882D */  daddu     $s1, $a0, $zero
-/* EB12F0 80240490 AFBF0024 */  sw        $ra, 0x24($sp)
-/* EB12F4 80240494 AFB40020 */  sw        $s4, 0x20($sp)
-/* EB12F8 80240498 AFB3001C */  sw        $s3, 0x1c($sp)
-/* EB12FC 8024049C AFB20018 */  sw        $s2, 0x18($sp)
-/* EB1300 802404A0 AFB00010 */  sw        $s0, 0x10($sp)
-/* EB1304 802404A4 F7BC0048 */  sdc1      $f28, 0x48($sp)
-/* EB1308 802404A8 F7BA0040 */  sdc1      $f26, 0x40($sp)
-/* EB130C 802404AC F7B80038 */  sdc1      $f24, 0x38($sp)
-/* EB1310 802404B0 F7B60030 */  sdc1      $f22, 0x30($sp)
-/* EB1314 802404B4 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* EB1318 802404B8 8E30000C */  lw        $s0, 0xc($s1)
-/* EB131C 802404BC 8E130000 */  lw        $s3, ($s0)
-/* EB1320 802404C0 26100004 */  addiu     $s0, $s0, 4
-/* EB1324 802404C4 0C0B53A3 */  jal       dead_evt_get_variable
-/* EB1328 802404C8 0260282D */   daddu    $a1, $s3, $zero
-/* EB132C 802404CC 4482E000 */  mtc1      $v0, $f28
-/* EB1330 802404D0 00000000 */  nop
-/* EB1334 802404D4 4680E720 */  cvt.s.w   $f28, $f28
-/* EB1338 802404D8 8E140000 */  lw        $s4, ($s0)
-/* EB133C 802404DC 26100004 */  addiu     $s0, $s0, 4
-/* EB1340 802404E0 0220202D */  daddu     $a0, $s1, $zero
-/* EB1344 802404E4 0C0B53A3 */  jal       dead_evt_get_variable
-/* EB1348 802404E8 0280282D */   daddu    $a1, $s4, $zero
-/* EB134C 802404EC 4482D000 */  mtc1      $v0, $f26
-/* EB1350 802404F0 00000000 */  nop
-/* EB1354 802404F4 4680D6A0 */  cvt.s.w   $f26, $f26
-/* EB1358 802404F8 8E100000 */  lw        $s0, ($s0)
-/* EB135C 802404FC 0220202D */  daddu     $a0, $s1, $zero
-/* EB1360 80240500 0C0B53A3 */  jal       dead_evt_get_variable
-/* EB1364 80240504 0200282D */   daddu    $a1, $s0, $zero
-/* EB1368 80240508 4482C000 */  mtc1      $v0, $f24
-/* EB136C 8024050C 00000000 */  nop
-/* EB1370 80240510 4680C620 */  cvt.s.w   $f24, $f24
-/* EB1374 80240514 3C128011 */  lui       $s2, %hi(dead_gPlayerStatus)
-/* EB1378 80240518 26527578 */  addiu     $s2, $s2, %lo(dead_gPlayerStatus)
-/* EB137C 8024051C 3C038008 */  lui       $v1, %hi(dead_gCurrentCameraID)
-/* EB1380 80240520 8C63C760 */  lw        $v1, %lo(dead_gCurrentCameraID)($v1)
-/* EB1384 80240524 C64200A8 */  lwc1      $f2, 0xa8($s2)
-/* EB1388 80240528 44800000 */  mtc1      $zero, $f0
-/* EB138C 8024052C 00031080 */  sll       $v0, $v1, 2
-/* EB1390 80240530 00431021 */  addu      $v0, $v0, $v1
-/* EB1394 80240534 00021080 */  sll       $v0, $v0, 2
-/* EB1398 80240538 00431023 */  subu      $v0, $v0, $v1
-/* EB139C 8024053C 000218C0 */  sll       $v1, $v0, 3
-/* EB13A0 80240540 00431021 */  addu      $v0, $v0, $v1
-/* EB13A4 80240544 000210C0 */  sll       $v0, $v0, 3
-/* EB13A8 80240548 46001032 */  c.eq.s    $f2, $f0
-/* EB13AC 8024054C 3C01800C */  lui       $at, %hi(D_800B8DEC)
-/* EB13B0 80240550 00220821 */  addu      $at, $at, $v0
-/* EB13B4 80240554 C4368DEC */  lwc1      $f22, %lo(D_800B8DEC)($at)
-/* EB13B8 80240558 45000005 */  bc1f      .L80240570
-/* EB13BC 8024055C 00000000 */   nop
-/* EB13C0 80240560 3C0142C8 */  lui       $at, 0x42c8
-/* EB13C4 80240564 44810000 */  mtc1      $at, $f0
-/* EB13C8 80240568 08090160 */  j         .L80240580
-/* EB13CC 8024056C 4600B581 */   sub.s    $f22, $f22, $f0
-.L80240570:
-/* EB13D0 80240570 3C0142C8 */  lui       $at, 0x42c8
-/* EB13D4 80240574 44810000 */  mtc1      $at, $f0
-/* EB13D8 80240578 00000000 */  nop
-/* EB13DC 8024057C 4600B580 */  add.s     $f22, $f22, $f0
-.L80240580:
-/* EB13E0 80240580 0C00AB85 */  jal       dead_clamp_angle
-/* EB13E4 80240584 4600B306 */   mov.s    $f12, $f22
-/* EB13E8 80240588 46000586 */  mov.s     $f22, $f0
-/* EB13EC 8024058C 3C014170 */  lui       $at, 0x4170
-/* EB13F0 80240590 4481A000 */  mtc1      $at, $f20
-/* 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
-/* EB1404 802405A4 864200B0 */  lh        $v0, 0xb0($s2)
-/* EB1408 802405A8 3C013F00 */  lui       $at, 0x3f00
-/* EB140C 802405AC 44812000 */  mtc1      $at, $f4
-/* EB1410 802405B0 44821000 */  mtc1      $v0, $f2
-/* EB1414 802405B4 00000000 */  nop
-/* EB1418 802405B8 468010A0 */  cvt.s.w   $f2, $f2
-/* EB141C 802405BC 46041082 */  mul.s     $f2, $f2, $f4
-/* EB1420 802405C0 00000000 */  nop
-/* EB1424 802405C4 4600E700 */  add.s     $f28, $f28, $f0
-/* EB1428 802405C8 4602D680 */  add.s     $f26, $f26, $f2
-/* 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
-/* EB143C 802405DC 0220202D */  daddu     $a0, $s1, $zero
-/* EB1440 802405E0 0260282D */  daddu     $a1, $s3, $zero
-/* EB1444 802405E4 4600E18D */  trunc.w.s $f6, $f28
-/* EB1448 802405E8 44063000 */  mfc1      $a2, $f6
-/* EB144C 802405EC 0C0B551A */  jal       dead_evt_set_variable
-/* EB1450 802405F0 4600C601 */   sub.s    $f24, $f24, $f0
-/* EB1454 802405F4 0220202D */  daddu     $a0, $s1, $zero
-/* EB1458 802405F8 4600D18D */  trunc.w.s $f6, $f26
-/* EB145C 802405FC 44063000 */  mfc1      $a2, $f6
-/* EB1460 80240600 0C0B551A */  jal       dead_evt_set_variable
-/* EB1464 80240604 0280282D */   daddu    $a1, $s4, $zero
-/* EB1468 80240608 0220202D */  daddu     $a0, $s1, $zero
-/* EB146C 8024060C 4600C18D */  trunc.w.s $f6, $f24
-/* EB1470 80240610 44063000 */  mfc1      $a2, $f6
-/* EB1474 80240614 0C0B551A */  jal       dead_evt_set_variable
-/* EB1478 80240618 0200282D */   daddu    $a1, $s0, $zero
-/* EB147C 8024061C 8FBF0024 */  lw        $ra, 0x24($sp)
-/* EB1480 80240620 8FB40020 */  lw        $s4, 0x20($sp)
-/* EB1484 80240624 8FB3001C */  lw        $s3, 0x1c($sp)
-/* EB1488 80240628 8FB20018 */  lw        $s2, 0x18($sp)
-/* EB148C 8024062C 8FB10014 */  lw        $s1, 0x14($sp)
-/* EB1490 80240630 8FB00010 */  lw        $s0, 0x10($sp)
-/* EB1494 80240634 D7BC0048 */  ldc1      $f28, 0x48($sp)
-/* EB1498 80240638 D7BA0040 */  ldc1      $f26, 0x40($sp)
-/* EB149C 8024063C D7B80038 */  ldc1      $f24, 0x38($sp)
-/* EB14A0 80240640 D7B60030 */  ldc1      $f22, 0x30($sp)
-/* EB14A4 80240644 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* EB14A8 80240648 24020002 */  addiu     $v0, $zero, 2
-/* EB14AC 8024064C 03E00008 */  jr        $ra
-/* EB14B0 80240650 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/EB5470/func_80240340_EB5470.s b/ver/us/asm/nonmatchings/EB5470/func_80240340_EB5470.s
deleted file mode 100644
index dd71179743..0000000000
--- a/ver/us/asm/nonmatchings/EB5470/func_80240340_EB5470.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240340_EB5470
-/* EB5470 80240340 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EB5474 80240344 AFBF0010 */  sw        $ra, 0x10($sp)
-/* EB5478 80240348 8C82000C */  lw        $v0, 0xc($a0)
-/* EB547C 8024034C 3C068017 */  lui       $a2, %hi(D_80169B12)
-/* EB5480 80240350 84C69B12 */  lh        $a2, %lo(D_80169B12)($a2)
-/* EB5484 80240354 0C0B551A */  jal       dead_evt_set_variable
-/* EB5488 80240358 8C450000 */   lw       $a1, ($v0)
-/* EB548C 8024035C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* EB5490 80240360 24020002 */  addiu     $v0, $zero, 2
-/* EB5494 80240364 03E00008 */  jr        $ra
-/* EB5498 80240368 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/EB5470/func_8024036C_EB549C.s b/ver/us/asm/nonmatchings/EB5470/func_8024036C_EB549C.s
deleted file mode 100644
index bab5464c5f..0000000000
--- a/ver/us/asm/nonmatchings/EB5470/func_8024036C_EB549C.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024036C_EB549C
-/* EB549C 8024036C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EB54A0 80240370 0000202D */  daddu     $a0, $zero, $zero
-/* EB54A4 80240374 AFBF0010 */  sw        $ra, 0x10($sp)
-/* EB54A8 80240378 0C0166B2 */  jal       func_80059AC8
-/* EB54AC 8024037C 24050001 */   addiu    $a1, $zero, 1
-/* EB54B0 80240380 8FBF0010 */  lw        $ra, 0x10($sp)
-/* EB54B4 80240384 24020002 */  addiu     $v0, $zero, 2
-/* EB54B8 80240388 03E00008 */  jr        $ra
-/* EB54BC 8024038C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/EB7540/func_80240310_EB7540.s b/ver/us/asm/nonmatchings/EB7540/func_80240310_EB7540.s
index 3903aa14f4..8420ad2034 100644
--- a/ver/us/asm/nonmatchings/EB7540/func_80240310_EB7540.s
+++ b/ver/us/asm/nonmatchings/EB7540/func_80240310_EB7540.s
@@ -36,7 +36,7 @@ glabel func_80240310_EB7540
 /* EB75BC 8024038C 4482A000 */  mtc1      $v0, $f20
 /* EB75C0 80240390 00000000 */  nop
 /* EB75C4 80240394 4680A520 */  cvt.s.w   $f20, $f20
-/* EB75C8 80240398 0C0462EC */  jal       func_80118BB0
+/* EB75C8 80240398 0C0462EC */  jal       dead_get_entity_by_index
 /* EB75CC 8024039C 0240202D */   daddu    $a0, $s2, $zero
 /* EB75D0 802403A0 0040182D */  daddu     $v1, $v0, $zero
 /* EB75D4 802403A4 E4780048 */  swc1      $f24, 0x48($v1)
diff --git a/ver/us/asm/nonmatchings/EB7540/func_802403D8_EB7608.s b/ver/us/asm/nonmatchings/EB7540/func_802403D8_EB7608.s
deleted file mode 100644
index 9c7cc0d5cf..0000000000
--- a/ver/us/asm/nonmatchings/EB7540/func_802403D8_EB7608.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802403D8_EB7608
-/* EB7608 802403D8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* EB760C 802403DC AFB20018 */  sw        $s2, 0x18($sp)
-/* EB7610 802403E0 0080902D */  daddu     $s2, $a0, $zero
-/* EB7614 802403E4 AFBF001C */  sw        $ra, 0x1c($sp)
-/* EB7618 802403E8 AFB10014 */  sw        $s1, 0x14($sp)
-/* EB761C 802403EC AFB00010 */  sw        $s0, 0x10($sp)
-/* EB7620 802403F0 8E50000C */  lw        $s0, 0xc($s2)
-/* EB7624 802403F4 8E050000 */  lw        $a1, ($s0)
-/* EB7628 802403F8 0C0B53A3 */  jal       dead_evt_get_variable
-/* EB762C 802403FC 26100004 */   addiu    $s0, $s0, 4
-/* EB7630 80240400 0C0462EC */  jal       func_80118BB0
-/* EB7634 80240404 0040202D */   daddu    $a0, $v0, $zero
-/* EB7638 80240408 8E050000 */  lw        $a1, ($s0)
-/* EB763C 8024040C 26100004 */  addiu     $s0, $s0, 4
-/* EB7640 80240410 0040882D */  daddu     $s1, $v0, $zero
-/* EB7644 80240414 C6200048 */  lwc1      $f0, 0x48($s1)
-/* EB7648 80240418 4600008D */  trunc.w.s $f2, $f0
-/* EB764C 8024041C 44061000 */  mfc1      $a2, $f2
-/* EB7650 80240420 0C0B551A */  jal       dead_evt_set_variable
-/* EB7654 80240424 0240202D */   daddu    $a0, $s2, $zero
-/* EB7658 80240428 8E050000 */  lw        $a1, ($s0)
-/* EB765C 8024042C 26100004 */  addiu     $s0, $s0, 4
-/* EB7660 80240430 C620004C */  lwc1      $f0, 0x4c($s1)
-/* EB7664 80240434 4600008D */  trunc.w.s $f2, $f0
-/* EB7668 80240438 44061000 */  mfc1      $a2, $f2
-/* EB766C 8024043C 0C0B551A */  jal       dead_evt_set_variable
-/* EB7670 80240440 0240202D */   daddu    $a0, $s2, $zero
-/* EB7674 80240444 C6200050 */  lwc1      $f0, 0x50($s1)
-/* EB7678 80240448 8E050000 */  lw        $a1, ($s0)
-/* EB767C 8024044C 4600008D */  trunc.w.s $f2, $f0
-/* EB7680 80240450 44061000 */  mfc1      $a2, $f2
-/* EB7684 80240454 0C0B551A */  jal       dead_evt_set_variable
-/* EB7688 80240458 0240202D */   daddu    $a0, $s2, $zero
-/* EB768C 8024045C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* EB7690 80240460 8FB20018 */  lw        $s2, 0x18($sp)
-/* EB7694 80240464 8FB10014 */  lw        $s1, 0x14($sp)
-/* EB7698 80240468 8FB00010 */  lw        $s0, 0x10($sp)
-/* EB769C 8024046C 24020002 */  addiu     $v0, $zero, 2
-/* EB76A0 80240470 03E00008 */  jr        $ra
-/* EB76A4 80240474 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EB7540/func_80240504_EB7734.s b/ver/us/asm/nonmatchings/EB7540/func_80240504_EB7734.s
deleted file mode 100644
index 5ca32c7bbc..0000000000
--- a/ver/us/asm/nonmatchings/EB7540/func_80240504_EB7734.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240504_EB7734
-/* EB7734 80240504 3C03800C */  lui       $v1, %hi(dead_gCameras)
-/* EB7738 80240508 24638D80 */  addiu     $v1, $v1, %lo(dead_gCameras)
-/* EB773C 8024050C 94620002 */  lhu       $v0, 2($v1)
-/* EB7740 80240510 3042FFFE */  andi      $v0, $v0, 0xfffe
-/* EB7744 80240514 A4620002 */  sh        $v0, 2($v1)
-/* EB7748 80240518 03E00008 */  jr        $ra
-/* EB774C 8024051C 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/EB7540/func_80240520_EB7750.s b/ver/us/asm/nonmatchings/EB7540/func_80240520_EB7750.s
index 9a0447a862..ca4894687c 100644
--- a/ver/us/asm/nonmatchings/EB7540/func_80240520_EB7750.s
+++ b/ver/us/asm/nonmatchings/EB7540/func_80240520_EB7750.s
@@ -16,7 +16,7 @@ glabel func_80240520_EB7750
 /* EB7760 80240530 AFB10014 */  sw        $s1, 0x14($sp)
 /* EB7764 80240534 AFB00010 */  sw        $s0, 0x10($sp)
 /* EB7768 80240538 8E4400AC */  lw        $a0, 0xac($s2)
-/* EB776C 8024053C 0C0462EC */  jal       func_80118BB0
+/* EB776C 8024053C 0C0462EC */  jal       dead_get_entity_by_index
 /* EB7770 80240540 00A0802D */   daddu    $s0, $a1, $zero
 /* EB7774 80240544 12000004 */  beqz      $s0, .L80240558
 /* EB7778 80240548 0040882D */   daddu    $s1, $v0, $zero
diff --git a/ver/us/asm/nonmatchings/EB8E90/func_80240040_EB8E90.s b/ver/us/asm/nonmatchings/EB8E90/func_80240040_EB8E90.s
deleted file mode 100644
index af572df089..0000000000
--- a/ver/us/asm/nonmatchings/EB8E90/func_80240040_EB8E90.s
+++ /dev/null
@@ -1,102 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-glabel D_802491F0_EC2040
-.double 32767.0
-
-.section .text
-
-glabel func_80240040_EB8E90
-/* EB8E90 80240040 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* EB8E94 80240044 AFB50024 */  sw        $s5, 0x24($sp)
-/* EB8E98 80240048 0080A82D */  daddu     $s5, $a0, $zero
-/* EB8E9C 8024004C AFBF002C */  sw        $ra, 0x2c($sp)
-/* EB8EA0 80240050 AFB60028 */  sw        $s6, 0x28($sp)
-/* EB8EA4 80240054 AFB40020 */  sw        $s4, 0x20($sp)
-/* EB8EA8 80240058 AFB3001C */  sw        $s3, 0x1c($sp)
-/* EB8EAC 8024005C AFB20018 */  sw        $s2, 0x18($sp)
-/* EB8EB0 80240060 AFB10014 */  sw        $s1, 0x14($sp)
-/* EB8EB4 80240064 AFB00010 */  sw        $s0, 0x10($sp)
-/* EB8EB8 80240068 F7B80040 */  sdc1      $f24, 0x40($sp)
-/* EB8EBC 8024006C F7B60038 */  sdc1      $f22, 0x38($sp)
-/* EB8EC0 80240070 F7B40030 */  sdc1      $f20, 0x30($sp)
-/* EB8EC4 80240074 8EB30148 */  lw        $s3, 0x148($s5)
-/* EB8EC8 80240078 86640008 */  lh        $a0, 8($s3)
-/* EB8ECC 8024007C 0C00F92F */  jal       dead_get_npc_unsafe
-/* EB8ED0 80240080 00A0B02D */   daddu    $s6, $a1, $zero
-/* EB8ED4 80240084 0040A02D */  daddu     $s4, $v0, $zero
-/* EB8ED8 80240088 AEA00074 */  sw        $zero, 0x74($s5)
-/* EB8EDC 8024008C C6980038 */  lwc1      $f24, 0x38($s4)
-/* EB8EE0 80240090 C6960040 */  lwc1      $f22, 0x40($s4)
-/* EB8EE4 80240094 0000902D */  daddu     $s2, $zero, $zero
-/* EB8EE8 80240098 AEA00078 */  sw        $zero, 0x78($s5)
-/* EB8EEC 8024009C 8E6300D0 */  lw        $v1, 0xd0($s3)
-/* EB8EF0 802400A0 8C620000 */  lw        $v0, ($v1)
-/* EB8EF4 802400A4 3C0146FF */  lui       $at, 0x46ff
-/* EB8EF8 802400A8 3421FE00 */  ori       $at, $at, 0xfe00
-/* EB8EFC 802400AC 4481A000 */  mtc1      $at, $f20
-/* EB8F00 802400B0 18400018 */  blez      $v0, .L80240114
-/* EB8F04 802400B4 0240802D */   daddu    $s0, $s2, $zero
-/* EB8F08 802400B8 0240882D */  daddu     $s1, $s2, $zero
-.L802400BC:
-/* EB8F0C 802400BC 02231021 */  addu      $v0, $s1, $v1
-/* EB8F10 802400C0 4600C306 */  mov.s     $f12, $f24
-/* EB8F14 802400C4 C4440004 */  lwc1      $f4, 4($v0)
-/* EB8F18 802400C8 46802120 */  cvt.s.w   $f4, $f4
-/* EB8F1C 802400CC 44062000 */  mfc1      $a2, $f4
-/* 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       dead_dist2D
-/* EB8F30 802400E0 4600B386 */   mov.s    $f14, $f22
-/* EB8F34 802400E4 4614003C */  c.lt.s    $f0, $f20
-/* EB8F38 802400E8 00000000 */  nop
-/* EB8F3C 802400EC 45000003 */  bc1f      .L802400FC
-/* EB8F40 802400F0 2631000C */   addiu    $s1, $s1, 0xc
-/* EB8F44 802400F4 46000506 */  mov.s     $f20, $f0
-/* EB8F48 802400F8 AEB20078 */  sw        $s2, 0x78($s5)
-.L802400FC:
-/* EB8F4C 802400FC 8E6300D0 */  lw        $v1, 0xd0($s3)
-/* EB8F50 80240100 26100001 */  addiu     $s0, $s0, 1
-/* EB8F54 80240104 8C620000 */  lw        $v0, ($v1)
-/* EB8F58 80240108 0202102A */  slt       $v0, $s0, $v0
-/* EB8F5C 8024010C 1440FFEB */  bnez      $v0, .L802400BC
-/* EB8F60 80240110 26520001 */   addiu    $s2, $s2, 1
-.L80240114:
-/* EB8F64 80240114 8E6200CC */  lw        $v0, 0xcc($s3)
-/* EB8F68 80240118 8C420004 */  lw        $v0, 4($v0)
-/* EB8F6C 8024011C AE820028 */  sw        $v0, 0x28($s4)
-/* EB8F70 80240120 8E6200D0 */  lw        $v0, 0xd0($s3)
-/* EB8F74 80240124 8C42007C */  lw        $v0, 0x7c($v0)
-/* EB8F78 80240128 04410004 */  bgez      $v0, .L8024013C
-/* EB8F7C 8024012C 00000000 */   nop
-/* EB8F80 80240130 C6C00000 */  lwc1      $f0, ($s6)
-/* EB8F84 80240134 08090057 */  j         .L8024015C
-/* EB8F88 80240138 E6800018 */   swc1     $f0, 0x18($s4)
-.L8024013C:
-/* EB8F8C 8024013C 3C018025 */  lui       $at, %hi(D_802491F0_EC2040)
-/* EB8F90 80240140 D42291F0 */  ldc1      $f2, %lo(D_802491F0_EC2040)($at)
-/* EB8F94 80240144 44820000 */  mtc1      $v0, $f0
-/* EB8F98 80240148 00000000 */  nop
-/* EB8F9C 8024014C 46800021 */  cvt.d.w   $f0, $f0
-/* EB8FA0 80240150 46220003 */  div.d     $f0, $f0, $f2
-/* EB8FA4 80240154 46200020 */  cvt.s.d   $f0, $f0
-/* EB8FA8 80240158 E6800018 */  swc1      $f0, 0x18($s4)
-.L8024015C:
-/* EB8FAC 8024015C 24020001 */  addiu     $v0, $zero, 1
-/* EB8FB0 80240160 AEA20070 */  sw        $v0, 0x70($s5)
-/* EB8FB4 80240164 8FBF002C */  lw        $ra, 0x2c($sp)
-/* EB8FB8 80240168 8FB60028 */  lw        $s6, 0x28($sp)
-/* EB8FBC 8024016C 8FB50024 */  lw        $s5, 0x24($sp)
-/* EB8FC0 80240170 8FB40020 */  lw        $s4, 0x20($sp)
-/* EB8FC4 80240174 8FB3001C */  lw        $s3, 0x1c($sp)
-/* EB8FC8 80240178 8FB20018 */  lw        $s2, 0x18($sp)
-/* EB8FCC 8024017C 8FB10014 */  lw        $s1, 0x14($sp)
-/* EB8FD0 80240180 8FB00010 */  lw        $s0, 0x10($sp)
-/* EB8FD4 80240184 D7B80040 */  ldc1      $f24, 0x40($sp)
-/* EB8FD8 80240188 D7B60038 */  ldc1      $f22, 0x38($sp)
-/* EB8FDC 8024018C D7B40030 */  ldc1      $f20, 0x30($sp)
-/* EB8FE0 80240190 03E00008 */  jr        $ra
-/* EB8FE4 80240194 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/EB8E90/func_80240198_EB8FE8.s b/ver/us/asm/nonmatchings/EB8E90/func_80240198_EB8FE8.s
deleted file mode 100644
index c458700c25..0000000000
--- a/ver/us/asm/nonmatchings/EB8E90/func_80240198_EB8FE8.s
+++ /dev/null
@@ -1,183 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240198_EB8FE8
-/* EB8FE8 80240198 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* EB8FEC 8024019C AFB20038 */  sw        $s2, 0x38($sp)
-/* EB8FF0 802401A0 0080902D */  daddu     $s2, $a0, $zero
-/* EB8FF4 802401A4 AFBF0044 */  sw        $ra, 0x44($sp)
-/* EB8FF8 802401A8 AFB40040 */  sw        $s4, 0x40($sp)
-/* EB8FFC 802401AC AFB3003C */  sw        $s3, 0x3c($sp)
-/* EB9000 802401B0 AFB10034 */  sw        $s1, 0x34($sp)
-/* EB9004 802401B4 AFB00030 */  sw        $s0, 0x30($sp)
-/* EB9008 802401B8 F7B60050 */  sdc1      $f22, 0x50($sp)
-/* EB900C 802401BC F7B40048 */  sdc1      $f20, 0x48($sp)
-/* EB9010 802401C0 8E510148 */  lw        $s1, 0x148($s2)
-/* EB9014 802401C4 00A0982D */  daddu     $s3, $a1, $zero
-/* EB9018 802401C8 86240008 */  lh        $a0, 8($s1)
-/* EB901C 802401CC 0C00F92F */  jal       dead_get_npc_unsafe
-/* EB9020 802401D0 00C0A02D */   daddu    $s4, $a2, $zero
-/* EB9024 802401D4 8E630014 */  lw        $v1, 0x14($s3)
-/* EB9028 802401D8 04600030 */  bltz      $v1, .L8024029C
-/* EB902C 802401DC 0040802D */   daddu    $s0, $v0, $zero
-/* EB9030 802401E0 8E420074 */  lw        $v0, 0x74($s2)
-/* EB9034 802401E4 1C40002C */  bgtz      $v0, .L80240298
-/* EB9038 802401E8 2442FFFF */   addiu    $v0, $v0, -1
-/* EB903C 802401EC 0280202D */  daddu     $a0, $s4, $zero
-/* EB9040 802401F0 AE430074 */  sw        $v1, 0x74($s2)
-/* EB9044 802401F4 AFA00010 */  sw        $zero, 0x10($sp)
-/* EB9048 802401F8 8E66000C */  lw        $a2, 0xc($s3)
-/* EB904C 802401FC 8E670010 */  lw        $a3, 0x10($s3)
-/* EB9050 80240200 0C013469 */  jal       func_8004D1A4
-/* EB9054 80240204 0220282D */   daddu    $a1, $s1, $zero
-/* EB9058 80240208 10400021 */  beqz      $v0, .L80240290
-/* EB905C 8024020C 0000202D */   daddu    $a0, $zero, $zero
-/* EB9060 80240210 0200282D */  daddu     $a1, $s0, $zero
-/* EB9064 80240214 0000302D */  daddu     $a2, $zero, $zero
-/* EB9068 80240218 860300A8 */  lh        $v1, 0xa8($s0)
-/* EB906C 8024021C 3C013F80 */  lui       $at, 0x3f80
-/* EB9070 80240220 44810000 */  mtc1      $at, $f0
-/* EB9074 80240224 3C014000 */  lui       $at, 0x4000
-/* EB9078 80240228 44811000 */  mtc1      $at, $f2
-/* EB907C 8024022C 3C01C1A0 */  lui       $at, 0xc1a0
-/* EB9080 80240230 44812000 */  mtc1      $at, $f4
-/* EB9084 80240234 2402000F */  addiu     $v0, $zero, 0xf
-/* EB9088 80240238 AFA2001C */  sw        $v0, 0x1c($sp)
-/* EB908C 8024023C 44833000 */  mtc1      $v1, $f6
-/* EB9090 80240240 00000000 */  nop
-/* EB9094 80240244 468031A0 */  cvt.s.w   $f6, $f6
-/* EB9098 80240248 44073000 */  mfc1      $a3, $f6
-/* EB909C 8024024C 27A20028 */  addiu     $v0, $sp, 0x28
-/* 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       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       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)
-/* EB90CC 8024027C 30420001 */  andi      $v0, $v0, 1
-/* EB90D0 80240280 14400064 */  bnez      $v0, .L80240414
-/* EB90D4 80240284 2402000A */   addiu    $v0, $zero, 0xa
-/* EB90D8 80240288 08090105 */  j         .L80240414
-/* EB90DC 8024028C 2402000C */   addiu    $v0, $zero, 0xc
-.L80240290:
-/* EB90E0 80240290 8E420074 */  lw        $v0, 0x74($s2)
-/* EB90E4 80240294 2442FFFF */  addiu     $v0, $v0, -1
-.L80240298:
-/* EB90E8 80240298 AE420074 */  sw        $v0, 0x74($s2)
-.L8024029C:
-/* EB90EC 8024029C 8602008C */  lh        $v0, 0x8c($s0)
-/* EB90F0 802402A0 1440005D */  bnez      $v0, .L80240418
-/* EB90F4 802402A4 00000000 */   nop
-/* EB90F8 802402A8 C6000018 */  lwc1      $f0, 0x18($s0)
-/* EB90FC 802402AC 3C014010 */  lui       $at, 0x4010
-/* EB9100 802402B0 44811800 */  mtc1      $at, $f3
-/* EB9104 802402B4 44801000 */  mtc1      $zero, $f2
-/* EB9108 802402B8 46000021 */  cvt.d.s   $f0, $f0
-/* EB910C 802402BC 4622003C */  c.lt.d    $f0, $f2
-/* EB9110 802402C0 00000000 */  nop
-/* EB9114 802402C4 45000003 */  bc1f      .L802402D4
-/* EB9118 802402C8 0200202D */   daddu    $a0, $s0, $zero
-/* EB911C 802402CC 080900B6 */  j         .L802402D8
-/* EB9120 802402D0 0000282D */   daddu    $a1, $zero, $zero
-.L802402D4:
-/* EB9124 802402D4 24050001 */  addiu     $a1, $zero, 1
-.L802402D8:
-/* EB9128 802402D8 0C010420 */  jal       func_80041080
-/* EB912C 802402DC 00000000 */   nop
-/* EB9130 802402E0 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* EB9134 802402E4 8E430078 */  lw        $v1, 0x78($s2)
-/* EB9138 802402E8 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* EB913C 802402EC 00031040 */  sll       $v0, $v1, 1
-/* EB9140 802402F0 00431021 */  addu      $v0, $v0, $v1
-/* EB9144 802402F4 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* EB9148 802402F8 00021080 */  sll       $v0, $v0, 2
-/* EB914C 802402FC 00431021 */  addu      $v0, $v0, $v1
-/* EB9150 80240300 C4560004 */  lwc1      $f22, 4($v0)
-/* EB9154 80240304 4680B5A0 */  cvt.s.w   $f22, $f22
-/* EB9158 80240308 C454000C */  lwc1      $f20, 0xc($v0)
-/* EB915C 8024030C 4680A520 */  cvt.s.w   $f20, $f20
-/* EB9160 80240310 4406B000 */  mfc1      $a2, $f22
-/* EB9164 80240314 4407A000 */  mfc1      $a3, $f20
-/* EB9168 80240318 0C00ABDC */  jal       fio_validate_header_checksums
-/* EB916C 8024031C 00000000 */   nop
-/* EB9170 80240320 8E050018 */  lw        $a1, 0x18($s0)
-/* EB9174 80240324 44060000 */  mfc1      $a2, $f0
-/* EB9178 80240328 0200202D */  daddu     $a0, $s0, $zero
-/* 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       dead_dist2D
-/* EB9198 80240348 00000000 */   nop
-/* EB919C 8024034C C6020018 */  lwc1      $f2, 0x18($s0)
-/* EB91A0 80240350 4602003E */  c.le.s    $f0, $f2
-/* EB91A4 80240354 00000000 */  nop
-/* EB91A8 80240358 4500002F */  bc1f      .L80240418
-/* EB91AC 8024035C 240403E8 */   addiu    $a0, $zero, 0x3e8
-/* EB91B0 80240360 24020002 */  addiu     $v0, $zero, 2
-/* EB91B4 80240364 0C00AB3B */  jal       dead_rand_int
-/* EB91B8 80240368 AE420070 */   sw       $v0, 0x70($s2)
-/* EB91BC 8024036C 3C035555 */  lui       $v1, 0x5555
-/* EB91C0 80240370 34635556 */  ori       $v1, $v1, 0x5556
-/* EB91C4 80240374 00430018 */  mult      $v0, $v1
-/* EB91C8 80240378 000227C3 */  sra       $a0, $v0, 0x1f
-/* EB91CC 8024037C 00004010 */  mfhi      $t0
-/* EB91D0 80240380 01042023 */  subu      $a0, $t0, $a0
-/* EB91D4 80240384 00041840 */  sll       $v1, $a0, 1
-/* EB91D8 80240388 00641821 */  addu      $v1, $v1, $a0
-/* EB91DC 8024038C 00431023 */  subu      $v0, $v0, $v1
-/* EB91E0 80240390 24430002 */  addiu     $v1, $v0, 2
-/* EB91E4 80240394 AE430074 */  sw        $v1, 0x74($s2)
-/* EB91E8 80240398 8E62002C */  lw        $v0, 0x2c($s3)
-/* EB91EC 8024039C 18400009 */  blez      $v0, .L802403C4
-/* EB91F0 802403A0 24020004 */   addiu    $v0, $zero, 4
-/* EB91F4 802403A4 8E620004 */  lw        $v0, 4($s3)
-/* EB91F8 802403A8 18400006 */  blez      $v0, .L802403C4
-/* EB91FC 802403AC 24020004 */   addiu    $v0, $zero, 4
-/* EB9200 802403B0 8E620008 */  lw        $v0, 8($s3)
-/* EB9204 802403B4 18400003 */  blez      $v0, .L802403C4
-/* EB9208 802403B8 24020004 */   addiu    $v0, $zero, 4
-/* EB920C 802403BC 14600002 */  bnez      $v1, .L802403C8
-/* EB9210 802403C0 00000000 */   nop
-.L802403C4:
-/* EB9214 802403C4 AE420070 */  sw        $v0, 0x70($s2)
-.L802403C8:
-/* EB9218 802403C8 0C00AB3B */  jal       dead_rand_int
-/* EB921C 802403CC 24042710 */   addiu    $a0, $zero, 0x2710
-/* EB9220 802403D0 3C0351EB */  lui       $v1, 0x51eb
-/* EB9224 802403D4 3463851F */  ori       $v1, $v1, 0x851f
-/* EB9228 802403D8 00430018 */  mult      $v0, $v1
-/* EB922C 802403DC 00021FC3 */  sra       $v1, $v0, 0x1f
-/* EB9230 802403E0 00004010 */  mfhi      $t0
-/* EB9234 802403E4 00082143 */  sra       $a0, $t0, 5
-/* EB9238 802403E8 00832023 */  subu      $a0, $a0, $v1
-/* EB923C 802403EC 00041840 */  sll       $v1, $a0, 1
-/* EB9240 802403F0 00641821 */  addu      $v1, $v1, $a0
-/* EB9244 802403F4 000318C0 */  sll       $v1, $v1, 3
-/* EB9248 802403F8 00641821 */  addu      $v1, $v1, $a0
-/* EB924C 802403FC 00031880 */  sll       $v1, $v1, 2
-/* EB9250 80240400 8E640004 */  lw        $a0, 4($s3)
-/* EB9254 80240404 00431023 */  subu      $v0, $v0, $v1
-/* EB9258 80240408 0044102A */  slt       $v0, $v0, $a0
-/* EB925C 8024040C 10400002 */  beqz      $v0, .L80240418
-/* EB9260 80240410 24020004 */   addiu    $v0, $zero, 4
-.L80240414:
-/* EB9264 80240414 AE420070 */  sw        $v0, 0x70($s2)
-.L80240418:
-/* EB9268 80240418 8FBF0044 */  lw        $ra, 0x44($sp)
-/* EB926C 8024041C 8FB40040 */  lw        $s4, 0x40($sp)
-/* EB9270 80240420 8FB3003C */  lw        $s3, 0x3c($sp)
-/* EB9274 80240424 8FB20038 */  lw        $s2, 0x38($sp)
-/* EB9278 80240428 8FB10034 */  lw        $s1, 0x34($sp)
-/* EB927C 8024042C 8FB00030 */  lw        $s0, 0x30($sp)
-/* EB9280 80240430 D7B60050 */  ldc1      $f22, 0x50($sp)
-/* EB9284 80240434 D7B40048 */  ldc1      $f20, 0x48($sp)
-/* EB9288 80240438 03E00008 */  jr        $ra
-/* EB928C 8024043C 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/asm/nonmatchings/EB8E90/func_80240500_EB9350.s b/ver/us/asm/nonmatchings/EB8E90/func_80240500_EB9350.s
deleted file mode 100644
index ee7dc44510..0000000000
--- a/ver/us/asm/nonmatchings/EB8E90/func_80240500_EB9350.s
+++ /dev/null
@@ -1,120 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240500_EB9350
-/* EB9350 80240500 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* EB9354 80240504 AFB40040 */  sw        $s4, 0x40($sp)
-/* EB9358 80240508 0080A02D */  daddu     $s4, $a0, $zero
-/* EB935C 8024050C AFBF0044 */  sw        $ra, 0x44($sp)
-/* EB9360 80240510 AFB3003C */  sw        $s3, 0x3c($sp)
-/* EB9364 80240514 AFB20038 */  sw        $s2, 0x38($sp)
-/* EB9368 80240518 AFB10034 */  sw        $s1, 0x34($sp)
-/* EB936C 8024051C AFB00030 */  sw        $s0, 0x30($sp)
-/* EB9370 80240520 8E910148 */  lw        $s1, 0x148($s4)
-/* EB9374 80240524 00A0902D */  daddu     $s2, $a1, $zero
-/* EB9378 80240528 86240008 */  lh        $a0, 8($s1)
-/* EB937C 8024052C 0C00F92F */  jal       dead_get_npc_unsafe
-/* EB9380 80240530 00C0982D */   daddu    $s3, $a2, $zero
-/* EB9384 80240534 8E430014 */  lw        $v1, 0x14($s2)
-/* EB9388 80240538 04600031 */  bltz      $v1, .L80240600
-/* EB938C 8024053C 0040802D */   daddu    $s0, $v0, $zero
-/* EB9390 80240540 0260202D */  daddu     $a0, $s3, $zero
-/* EB9394 80240544 AFA00010 */  sw        $zero, 0x10($sp)
-/* EB9398 80240548 8E460024 */  lw        $a2, 0x24($s2)
-/* EB939C 8024054C 8E470028 */  lw        $a3, 0x28($s2)
-/* EB93A0 80240550 0C013469 */  jal       func_8004D1A4
-/* EB93A4 80240554 0220282D */   daddu    $a1, $s1, $zero
-/* EB93A8 80240558 10400029 */  beqz      $v0, .L80240600
-/* EB93AC 8024055C 0000202D */   daddu    $a0, $zero, $zero
-/* EB93B0 80240560 0200282D */  daddu     $a1, $s0, $zero
-/* EB93B4 80240564 0000302D */  daddu     $a2, $zero, $zero
-/* EB93B8 80240568 860300A8 */  lh        $v1, 0xa8($s0)
-/* EB93BC 8024056C 3C013F80 */  lui       $at, 0x3f80
-/* EB93C0 80240570 44810000 */  mtc1      $at, $f0
-/* EB93C4 80240574 3C014000 */  lui       $at, 0x4000
-/* EB93C8 80240578 44811000 */  mtc1      $at, $f2
-/* EB93CC 8024057C 3C01C1A0 */  lui       $at, 0xc1a0
-/* EB93D0 80240580 44812000 */  mtc1      $at, $f4
-/* EB93D4 80240584 2402000F */  addiu     $v0, $zero, 0xf
-/* EB93D8 80240588 AFA2001C */  sw        $v0, 0x1c($sp)
-/* EB93DC 8024058C 44833000 */  mtc1      $v1, $f6
-/* EB93E0 80240590 00000000 */  nop
-/* EB93E4 80240594 468031A0 */  cvt.s.w   $f6, $f6
-/* EB93E8 80240598 44073000 */  mfc1      $a3, $f6
-/* EB93EC 8024059C 27A20028 */  addiu     $v0, $sp, 0x28
-/* 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       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)
-/* EB940C 802405BC C60C0038 */  lwc1      $f12, 0x38($s0)
-/* EB9410 802405C0 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* EB9414 802405C4 8C460028 */  lw        $a2, 0x28($v0)
-/* EB9418 802405C8 0C00ABDC */  jal       fio_validate_header_checksums
-/* EB941C 802405CC 8C470030 */   lw       $a3, 0x30($v0)
-/* EB9420 802405D0 0200202D */  daddu     $a0, $s0, $zero
-/* EB9424 802405D4 240502F4 */  addiu     $a1, $zero, 0x2f4
-/* EB9428 802405D8 3C060020 */  lui       $a2, 0x20
-/* 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)
-/* EB943C 802405EC 30420001 */  andi      $v0, $v0, 1
-/* EB9440 802405F0 14400029 */  bnez      $v0, .L80240698
-/* EB9444 802405F4 2402000A */   addiu    $v0, $zero, 0xa
-/* EB9448 802405F8 080901A6 */  j         .L80240698
-/* EB944C 802405FC 2402000C */   addiu    $v0, $zero, 0xc
-.L80240600:
-/* EB9450 80240600 8602008C */  lh        $v0, 0x8c($s0)
-/* EB9454 80240604 14400025 */  bnez      $v0, .L8024069C
-/* EB9458 80240608 00000000 */   nop
-/* EB945C 8024060C 9602008E */  lhu       $v0, 0x8e($s0)
-/* EB9460 80240610 2442FFFF */  addiu     $v0, $v0, -1
-/* EB9464 80240614 A602008E */  sh        $v0, 0x8e($s0)
-/* EB9468 80240618 00021400 */  sll       $v0, $v0, 0x10
-/* EB946C 8024061C 1440001F */  bnez      $v0, .L8024069C
-/* EB9470 80240620 00000000 */   nop
-/* EB9474 80240624 8E820074 */  lw        $v0, 0x74($s4)
-/* EB9478 80240628 2442FFFF */  addiu     $v0, $v0, -1
-/* EB947C 8024062C 10400019 */  beqz      $v0, .L80240694
-/* EB9480 80240630 AE820074 */   sw       $v0, 0x74($s4)
-/* EB9484 80240634 8E220018 */  lw        $v0, 0x18($s1)
-/* EB9488 80240638 9442002A */  lhu       $v0, 0x2a($v0)
-/* EB948C 8024063C 30420010 */  andi      $v0, $v0, 0x10
-/* EB9490 80240640 14400007 */  bnez      $v0, .L80240660
-/* EB9494 80240644 00000000 */   nop
-/* EB9498 80240648 C600000C */  lwc1      $f0, 0xc($s0)
-/* EB949C 8024064C 3C014334 */  lui       $at, 0x4334
-/* EB94A0 80240650 44816000 */  mtc1      $at, $f12
-/* EB94A4 80240654 0C00AB85 */  jal       dead_clamp_angle
-/* EB94A8 80240658 460C0300 */   add.s    $f12, $f0, $f12
-/* EB94AC 8024065C E600000C */  swc1      $f0, 0xc($s0)
-.L80240660:
-/* EB94B0 80240660 8E440008 */  lw        $a0, 8($s2)
-/* EB94B4 80240664 000417C2 */  srl       $v0, $a0, 0x1f
-/* EB94B8 80240668 00822021 */  addu      $a0, $a0, $v0
-/* EB94BC 8024066C 00042043 */  sra       $a0, $a0, 1
-/* EB94C0 80240670 0C00AB3B */  jal       dead_rand_int
-/* EB94C4 80240674 24840001 */   addiu    $a0, $a0, 1
-/* EB94C8 80240678 8E430008 */  lw        $v1, 8($s2)
-/* EB94CC 8024067C 000327C2 */  srl       $a0, $v1, 0x1f
-/* EB94D0 80240680 00641821 */  addu      $v1, $v1, $a0
-/* EB94D4 80240684 00031843 */  sra       $v1, $v1, 1
-/* EB94D8 80240688 00621821 */  addu      $v1, $v1, $v0
-/* EB94DC 8024068C 080901A7 */  j         .L8024069C
-/* EB94E0 80240690 A603008E */   sh       $v1, 0x8e($s0)
-.L80240694:
-/* EB94E4 80240694 24020004 */  addiu     $v0, $zero, 4
-.L80240698:
-/* EB94E8 80240698 AE820070 */  sw        $v0, 0x70($s4)
-.L8024069C:
-/* EB94EC 8024069C 8FBF0044 */  lw        $ra, 0x44($sp)
-/* EB94F0 802406A0 8FB40040 */  lw        $s4, 0x40($sp)
-/* EB94F4 802406A4 8FB3003C */  lw        $s3, 0x3c($sp)
-/* EB94F8 802406A8 8FB20038 */  lw        $s2, 0x38($sp)
-/* EB94FC 802406AC 8FB10034 */  lw        $s1, 0x34($sp)
-/* EB9500 802406B0 8FB00030 */  lw        $s0, 0x30($sp)
-/* EB9504 802406B4 03E00008 */  jr        $ra
-/* EB9508 802406B8 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/EB8E90/func_802406BC_EB950C.s b/ver/us/asm/nonmatchings/EB8E90/func_802406BC_EB950C.s
deleted file mode 100644
index 762cbb6a03..0000000000
--- a/ver/us/asm/nonmatchings/EB8E90/func_802406BC_EB950C.s
+++ /dev/null
@@ -1,59 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-glabel D_802491F8_EC2048
-.double 32767.0
-
-.section .text
-
-glabel func_802406BC_EB950C
-/* EB950C 802406BC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* EB9510 802406C0 AFB10014 */  sw        $s1, 0x14($sp)
-/* EB9514 802406C4 0080882D */  daddu     $s1, $a0, $zero
-/* EB9518 802406C8 AFBF001C */  sw        $ra, 0x1c($sp)
-/* EB951C 802406CC AFB20018 */  sw        $s2, 0x18($sp)
-/* EB9520 802406D0 AFB00010 */  sw        $s0, 0x10($sp)
-/* EB9524 802406D4 8E300148 */  lw        $s0, 0x148($s1)
-/* EB9528 802406D8 86040008 */  lh        $a0, 8($s0)
-/* EB952C 802406DC 0C00F92F */  jal       dead_get_npc_unsafe
-/* EB9530 802406E0 00A0902D */   daddu    $s2, $a1, $zero
-/* EB9534 802406E4 8E230078 */  lw        $v1, 0x78($s1)
-/* EB9538 802406E8 24630001 */  addiu     $v1, $v1, 1
-/* EB953C 802406EC AE230078 */  sw        $v1, 0x78($s1)
-/* EB9540 802406F0 8E0400D0 */  lw        $a0, 0xd0($s0)
-/* EB9544 802406F4 8C840000 */  lw        $a0, ($a0)
-/* EB9548 802406F8 0064182A */  slt       $v1, $v1, $a0
-/* EB954C 802406FC 14600002 */  bnez      $v1, .L80240708
-/* EB9550 80240700 0040282D */   daddu    $a1, $v0, $zero
-/* EB9554 80240704 AE200078 */  sw        $zero, 0x78($s1)
-.L80240708:
-/* EB9558 80240708 8E0200CC */  lw        $v0, 0xcc($s0)
-/* EB955C 8024070C 8C420004 */  lw        $v0, 4($v0)
-/* EB9560 80240710 ACA20028 */  sw        $v0, 0x28($a1)
-/* EB9564 80240714 8E0200D0 */  lw        $v0, 0xd0($s0)
-/* EB9568 80240718 8C42007C */  lw        $v0, 0x7c($v0)
-/* EB956C 8024071C 04410004 */  bgez      $v0, .L80240730
-/* EB9570 80240720 00000000 */   nop
-/* EB9574 80240724 C6400000 */  lwc1      $f0, ($s2)
-/* EB9578 80240728 080901D4 */  j         .L80240750
-/* EB957C 8024072C E4A00018 */   swc1     $f0, 0x18($a1)
-.L80240730:
-/* EB9580 80240730 3C018025 */  lui       $at, %hi(D_802491F8_EC2048)
-/* EB9584 80240734 D42291F8 */  ldc1      $f2, %lo(D_802491F8_EC2048)($at)
-/* EB9588 80240738 44820000 */  mtc1      $v0, $f0
-/* EB958C 8024073C 00000000 */  nop
-/* EB9590 80240740 46800021 */  cvt.d.w   $f0, $f0
-/* EB9594 80240744 46220003 */  div.d     $f0, $f0, $f2
-/* EB9598 80240748 46200020 */  cvt.s.d   $f0, $f0
-/* EB959C 8024074C E4A00018 */  swc1      $f0, 0x18($a1)
-.L80240750:
-/* EB95A0 80240750 24020001 */  addiu     $v0, $zero, 1
-/* EB95A4 80240754 AE220070 */  sw        $v0, 0x70($s1)
-/* EB95A8 80240758 8FBF001C */  lw        $ra, 0x1c($sp)
-/* EB95AC 8024075C 8FB20018 */  lw        $s2, 0x18($sp)
-/* EB95B0 80240760 8FB10014 */  lw        $s1, 0x14($sp)
-/* EB95B4 80240764 8FB00010 */  lw        $s0, 0x10($sp)
-/* EB95B8 80240768 03E00008 */  jr        $ra
-/* EB95BC 8024076C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EB8E90/func_80240770_EB95C0.s b/ver/us/asm/nonmatchings/EB8E90/func_80240770_EB95C0.s
deleted file mode 100644
index 5845ef9b49..0000000000
--- a/ver/us/asm/nonmatchings/EB8E90/func_80240770_EB95C0.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240770_EB95C0
-/* EB95C0 80240770 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* EB95C4 80240774 AFB10014 */  sw        $s1, 0x14($sp)
-/* EB95C8 80240778 0080882D */  daddu     $s1, $a0, $zero
-/* EB95CC 8024077C AFBF0018 */  sw        $ra, 0x18($sp)
-/* EB95D0 80240780 AFB00010 */  sw        $s0, 0x10($sp)
-/* EB95D4 80240784 8E300148 */  lw        $s0, 0x148($s1)
-/* EB95D8 80240788 0C00F92F */  jal       dead_get_npc_unsafe
-/* EB95DC 8024078C 86040008 */   lh       $a0, 8($s0)
-/* EB95E0 80240790 8E0300CC */  lw        $v1, 0xcc($s0)
-/* EB95E4 80240794 3C014120 */  lui       $at, 0x4120
-/* EB95E8 80240798 44812000 */  mtc1      $at, $f4
-/* EB95EC 8024079C 3C014000 */  lui       $at, 0x4000
-/* EB95F0 802407A0 44810000 */  mtc1      $at, $f0
-/* EB95F4 802407A4 C442003C */  lwc1      $f2, 0x3c($v0)
-/* EB95F8 802407A8 8C640010 */  lw        $a0, 0x10($v1)
-/* EB95FC 802407AC 8C430000 */  lw        $v1, ($v0)
-/* EB9600 802407B0 E444001C */  swc1      $f4, 0x1c($v0)
-/* EB9604 802407B4 E4400014 */  swc1      $f0, 0x14($v0)
-/* EB9608 802407B8 E4420064 */  swc1      $f2, 0x64($v0)
-/* EB960C 802407BC 34630800 */  ori       $v1, $v1, 0x800
-/* EB9610 802407C0 AC430000 */  sw        $v1, ($v0)
-/* EB9614 802407C4 AC440028 */  sw        $a0, 0x28($v0)
-/* EB9618 802407C8 2402000B */  addiu     $v0, $zero, 0xb
-/* EB961C 802407CC AE220070 */  sw        $v0, 0x70($s1)
-/* EB9620 802407D0 8FBF0018 */  lw        $ra, 0x18($sp)
-/* EB9624 802407D4 8FB10014 */  lw        $s1, 0x14($sp)
-/* EB9628 802407D8 8FB00010 */  lw        $s0, 0x10($sp)
-/* EB962C 802407DC 03E00008 */  jr        $ra
-/* EB9630 802407E0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EB8E90/func_802407E4_EB9634.s b/ver/us/asm/nonmatchings/EB8E90/func_802407E4_EB9634.s
deleted file mode 100644
index a5e0e3f2e8..0000000000
--- a/ver/us/asm/nonmatchings/EB8E90/func_802407E4_EB9634.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802407E4_EB9634
-/* EB9634 802407E4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EB9638 802407E8 AFB00010 */  sw        $s0, 0x10($sp)
-/* EB963C 802407EC 0080802D */  daddu     $s0, $a0, $zero
-/* EB9640 802407F0 AFBF0014 */  sw        $ra, 0x14($sp)
-/* EB9644 802407F4 8E020148 */  lw        $v0, 0x148($s0)
-/* EB9648 802407F8 0C00F92F */  jal       dead_get_npc_unsafe
-/* EB964C 802407FC 84440008 */   lh       $a0, 8($v0)
-/* EB9650 80240800 0040202D */  daddu     $a0, $v0, $zero
-/* EB9654 80240804 C482003C */  lwc1      $f2, 0x3c($a0)
-/* EB9658 80240808 C480001C */  lwc1      $f0, 0x1c($a0)
-/* EB965C 8024080C 46001080 */  add.s     $f2, $f2, $f0
-/* EB9660 80240810 C4840014 */  lwc1      $f4, 0x14($a0)
-/* EB9664 80240814 46040001 */  sub.s     $f0, $f0, $f4
-/* EB9668 80240818 C4840064 */  lwc1      $f4, 0x64($a0)
-/* EB966C 8024081C 4602203C */  c.lt.s    $f4, $f2
-/* EB9670 80240820 E482003C */  swc1      $f2, 0x3c($a0)
-/* EB9674 80240824 45010009 */  bc1t      .L8024084C
-/* EB9678 80240828 E480001C */   swc1     $f0, 0x1c($a0)
-/* EB967C 8024082C 8C820000 */  lw        $v0, ($a0)
-/* EB9680 80240830 2403F7FF */  addiu     $v1, $zero, -0x801
-/* EB9684 80240834 E484003C */  swc1      $f4, 0x3c($a0)
-/* EB9688 80240838 AC80001C */  sw        $zero, 0x1c($a0)
-/* EB968C 8024083C 00431024 */  and       $v0, $v0, $v1
-/* EB9690 80240840 AC820000 */  sw        $v0, ($a0)
-/* EB9694 80240844 2402000C */  addiu     $v0, $zero, 0xc
-/* EB9698 80240848 AE020070 */  sw        $v0, 0x70($s0)
-.L8024084C:
-/* EB969C 8024084C 8FBF0014 */  lw        $ra, 0x14($sp)
-/* EB96A0 80240850 8FB00010 */  lw        $s0, 0x10($sp)
-/* EB96A4 80240854 03E00008 */  jr        $ra
-/* EB96A8 80240858 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/EB8E90/func_8024085C_EB96AC.s b/ver/us/asm/nonmatchings/EB8E90/func_8024085C_EB96AC.s
deleted file mode 100644
index b436354bdd..0000000000
--- a/ver/us/asm/nonmatchings/EB8E90/func_8024085C_EB96AC.s
+++ /dev/null
@@ -1,82 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024085C_EB96AC
-/* EB96AC 8024085C 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* EB96B0 80240860 AFB3001C */  sw        $s3, 0x1c($sp)
-/* EB96B4 80240864 0080982D */  daddu     $s3, $a0, $zero
-/* EB96B8 80240868 AFBF0020 */  sw        $ra, 0x20($sp)
-/* EB96BC 8024086C AFB20018 */  sw        $s2, 0x18($sp)
-/* EB96C0 80240870 AFB10014 */  sw        $s1, 0x14($sp)
-/* EB96C4 80240874 AFB00010 */  sw        $s0, 0x10($sp)
-/* EB96C8 80240878 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* EB96CC 8024087C 8E710148 */  lw        $s1, 0x148($s3)
-/* EB96D0 80240880 86240008 */  lh        $a0, 8($s1)
-/* EB96D4 80240884 0C00F92F */  jal       dead_get_npc_unsafe
-/* EB96D8 80240888 00A0802D */   daddu    $s0, $a1, $zero
-/* EB96DC 8024088C 8E040020 */  lw        $a0, 0x20($s0)
-/* EB96E0 80240890 0040902D */  daddu     $s2, $v0, $zero
-/* EB96E4 80240894 00041FC2 */  srl       $v1, $a0, 0x1f
-/* EB96E8 80240898 00832021 */  addu      $a0, $a0, $v1
-/* EB96EC 8024089C 00042043 */  sra       $a0, $a0, 1
-/* EB96F0 802408A0 0C00AB3B */  jal       dead_rand_int
-/* EB96F4 802408A4 24840001 */   addiu    $a0, $a0, 1
-/* EB96F8 802408A8 8E030020 */  lw        $v1, 0x20($s0)
-/* EB96FC 802408AC C64C0038 */  lwc1      $f12, 0x38($s2)
-/* EB9700 802408B0 000327C2 */  srl       $a0, $v1, 0x1f
-/* EB9704 802408B4 00641821 */  addu      $v1, $v1, $a0
-/* EB9708 802408B8 00031843 */  sra       $v1, $v1, 1
-/* EB970C 802408BC 00621821 */  addu      $v1, $v1, $v0
-/* EB9710 802408C0 A643008E */  sh        $v1, 0x8e($s2)
-/* EB9714 802408C4 8E2200CC */  lw        $v0, 0xcc($s1)
-/* EB9718 802408C8 C64E0040 */  lwc1      $f14, 0x40($s2)
-/* EB971C 802408CC 8C42000C */  lw        $v0, 0xc($v0)
-/* EB9720 802408D0 AE420028 */  sw        $v0, 0x28($s2)
-/* EB9724 802408D4 C6000018 */  lwc1      $f0, 0x18($s0)
-/* EB9728 802408D8 3C028010 */  lui       $v0, %hi(dead_gPlayerStatusPtr)
-/* EB972C 802408DC 8C42FC90 */  lw        $v0, %lo(dead_gPlayerStatusPtr)($v0)
-/* EB9730 802408E0 E6400018 */  swc1      $f0, 0x18($s2)
-/* EB9734 802408E4 8C460028 */  lw        $a2, 0x28($v0)
-/* EB9738 802408E8 0C00ABDC */  jal       fio_validate_header_checksums
-/* 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       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)
-/* EB9758 80240908 46001005 */  abs.s     $f0, $f2
-/* EB975C 8024090C 44822000 */  mtc1      $v0, $f4
-/* EB9760 80240910 00000000 */  nop
-/* EB9764 80240914 46802120 */  cvt.s.w   $f4, $f4
-/* EB9768 80240918 4600203C */  c.lt.s    $f4, $f0
-/* EB976C 8024091C 00000000 */  nop
-/* EB9770 80240920 4500000D */  bc1f      .L80240958
-/* EB9774 80240924 00000000 */   nop
-/* EB9778 80240928 44800000 */  mtc1      $zero, $f0
-/* EB977C 8024092C C654000C */  lwc1      $f20, 0xc($s2)
-/* EB9780 80240930 4600103C */  c.lt.s    $f2, $f0
-/* EB9784 80240934 00000000 */  nop
-/* EB9788 80240938 45000006 */  bc1f      .L80240954
-/* EB978C 8024093C 00021023 */   negu     $v0, $v0
-/* EB9790 80240940 44820000 */  mtc1      $v0, $f0
-/* EB9794 80240944 00000000 */  nop
-/* EB9798 80240948 46800020 */  cvt.s.w   $f0, $f0
-/* EB979C 8024094C 08090256 */  j         .L80240958
-/* EB97A0 80240950 4600A500 */   add.s    $f20, $f20, $f0
-.L80240954:
-/* EB97A4 80240954 4604A500 */  add.s     $f20, $f20, $f4
-.L80240958:
-/* EB97A8 80240958 0C00AB85 */  jal       dead_clamp_angle
-/* EB97AC 8024095C 4600A306 */   mov.s    $f12, $f20
-/* EB97B0 80240960 2402000D */  addiu     $v0, $zero, 0xd
-/* EB97B4 80240964 E640000C */  swc1      $f0, 0xc($s2)
-/* EB97B8 80240968 AE620070 */  sw        $v0, 0x70($s3)
-/* EB97BC 8024096C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* EB97C0 80240970 8FB3001C */  lw        $s3, 0x1c($sp)
-/* EB97C4 80240974 8FB20018 */  lw        $s2, 0x18($sp)
-/* EB97C8 80240978 8FB10014 */  lw        $s1, 0x14($sp)
-/* EB97CC 8024097C 8FB00010 */  lw        $s0, 0x10($sp)
-/* EB97D0 80240980 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* EB97D4 80240984 03E00008 */  jr        $ra
-/* EB97D8 80240988 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/EB8E90/func_8024098C_EB97DC.s b/ver/us/asm/nonmatchings/EB8E90/func_8024098C_EB97DC.s
deleted file mode 100644
index c5855af641..0000000000
--- a/ver/us/asm/nonmatchings/EB8E90/func_8024098C_EB97DC.s
+++ /dev/null
@@ -1,80 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024098C_EB97DC
-/* EB97DC 8024098C 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* EB97E0 80240990 AFB3003C */  sw        $s3, 0x3c($sp)
-/* EB97E4 80240994 0080982D */  daddu     $s3, $a0, $zero
-/* EB97E8 80240998 AFBF0040 */  sw        $ra, 0x40($sp)
-/* EB97EC 8024099C AFB20038 */  sw        $s2, 0x38($sp)
-/* EB97F0 802409A0 AFB10034 */  sw        $s1, 0x34($sp)
-/* EB97F4 802409A4 AFB00030 */  sw        $s0, 0x30($sp)
-/* EB97F8 802409A8 8E720148 */  lw        $s2, 0x148($s3)
-/* EB97FC 802409AC 00A0882D */  daddu     $s1, $a1, $zero
-/* EB9800 802409B0 86440008 */  lh        $a0, 8($s2)
-/* EB9804 802409B4 0C00F92F */  jal       dead_get_npc_unsafe
-/* EB9808 802409B8 00C0802D */   daddu    $s0, $a2, $zero
-/* EB980C 802409BC 0200202D */  daddu     $a0, $s0, $zero
-/* EB9810 802409C0 0240282D */  daddu     $a1, $s2, $zero
-/* EB9814 802409C4 24030001 */  addiu     $v1, $zero, 1
-/* EB9818 802409C8 AFA30010 */  sw        $v1, 0x10($sp)
-/* EB981C 802409CC 8E260024 */  lw        $a2, 0x24($s1)
-/* EB9820 802409D0 8E270028 */  lw        $a3, 0x28($s1)
-/* EB9824 802409D4 0C013469 */  jal       func_8004D1A4
-/* EB9828 802409D8 0040802D */   daddu    $s0, $v0, $zero
-/* EB982C 802409DC 1440001E */  bnez      $v0, .L80240A58
-/* EB9830 802409E0 0200202D */   daddu    $a0, $s0, $zero
-/* EB9834 802409E4 24040002 */  addiu     $a0, $zero, 2
-/* EB9838 802409E8 0200282D */  daddu     $a1, $s0, $zero
-/* EB983C 802409EC 0000302D */  daddu     $a2, $zero, $zero
-/* EB9840 802409F0 860300A8 */  lh        $v1, 0xa8($s0)
-/* EB9844 802409F4 3C013F80 */  lui       $at, 0x3f80
-/* EB9848 802409F8 44810000 */  mtc1      $at, $f0
-/* EB984C 802409FC 3C014000 */  lui       $at, 0x4000
-/* EB9850 80240A00 44811000 */  mtc1      $at, $f2
-/* EB9854 80240A04 3C01C1A0 */  lui       $at, 0xc1a0
-/* EB9858 80240A08 44812000 */  mtc1      $at, $f4
-/* EB985C 80240A0C 2402000F */  addiu     $v0, $zero, 0xf
-/* EB9860 80240A10 AFA2001C */  sw        $v0, 0x1c($sp)
-/* EB9864 80240A14 44833000 */  mtc1      $v1, $f6
-/* EB9868 80240A18 00000000 */  nop
-/* EB986C 80240A1C 468031A0 */  cvt.s.w   $f6, $f6
-/* EB9870 80240A20 44073000 */  mfc1      $a3, $f6
-/* EB9874 80240A24 27A20028 */  addiu     $v0, $sp, 0x28
-/* 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       dead_fx_emote
-/* EB9888 80240A38 E7A40018 */   swc1     $f4, 0x18($sp)
-/* EB988C 80240A3C 8E4200CC */  lw        $v0, 0xcc($s2)
-/* EB9890 80240A40 8C430000 */  lw        $v1, ($v0)
-/* EB9894 80240A44 24020019 */  addiu     $v0, $zero, 0x19
-/* EB9898 80240A48 A602008E */  sh        $v0, 0x8e($s0)
-/* EB989C 80240A4C 2402000E */  addiu     $v0, $zero, 0xe
-/* EB98A0 80240A50 080902A3 */  j         .L80240A8C
-/* EB98A4 80240A54 AE030028 */   sw       $v1, 0x28($s0)
-.L80240A58:
-/* EB98A8 80240A58 0C010420 */  jal       func_80041080
-/* 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       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)
-/* EB98C8 80240A78 18400003 */  blez      $v0, .L80240A88
-/* EB98CC 80240A7C 2462FFFF */   addiu    $v0, $v1, -1
-/* EB98D0 80240A80 080902A4 */  j         .L80240A90
-/* EB98D4 80240A84 A602008E */   sh       $v0, 0x8e($s0)
-.L80240A88:
-/* EB98D8 80240A88 2402000C */  addiu     $v0, $zero, 0xc
-.L80240A8C:
-/* EB98DC 80240A8C AE620070 */  sw        $v0, 0x70($s3)
-.L80240A90:
-/* EB98E0 80240A90 8FBF0040 */  lw        $ra, 0x40($sp)
-/* EB98E4 80240A94 8FB3003C */  lw        $s3, 0x3c($sp)
-/* EB98E8 80240A98 8FB20038 */  lw        $s2, 0x38($sp)
-/* EB98EC 80240A9C 8FB10034 */  lw        $s1, 0x34($sp)
-/* EB98F0 80240AA0 8FB00030 */  lw        $s0, 0x30($sp)
-/* EB98F4 80240AA4 03E00008 */  jr        $ra
-/* EB98F8 80240AA8 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/EB8E90/func_80240AAC_EB98FC.s b/ver/us/asm/nonmatchings/EB8E90/func_80240AAC_EB98FC.s
deleted file mode 100644
index f1021b4aa1..0000000000
--- a/ver/us/asm/nonmatchings/EB8E90/func_80240AAC_EB98FC.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240AAC_EB98FC
-/* EB98FC 80240AAC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* EB9900 80240AB0 AFB10014 */  sw        $s1, 0x14($sp)
-/* EB9904 80240AB4 0080882D */  daddu     $s1, $a0, $zero
-/* EB9908 80240AB8 AFBF0018 */  sw        $ra, 0x18($sp)
-/* EB990C 80240ABC AFB00010 */  sw        $s0, 0x10($sp)
-/* EB9910 80240AC0 8E300148 */  lw        $s0, 0x148($s1)
-/* EB9914 80240AC4 0C00F92F */  jal       dead_get_npc_unsafe
-/* EB9918 80240AC8 86040008 */   lh       $a0, 8($s0)
-/* EB991C 80240ACC 9443008E */  lhu       $v1, 0x8e($v0)
-/* EB9920 80240AD0 2463FFFF */  addiu     $v1, $v1, -1
-/* EB9924 80240AD4 A443008E */  sh        $v1, 0x8e($v0)
-/* EB9928 80240AD8 00031C00 */  sll       $v1, $v1, 0x10
-/* EB992C 80240ADC 14600008 */  bnez      $v1, .L80240B00
-/* EB9930 80240AE0 00000000 */   nop
-/* EB9934 80240AE4 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* EB9938 80240AE8 30420080 */  andi      $v0, $v0, 0x80
-/* EB993C 80240AEC 10400003 */  beqz      $v0, .L80240AFC
-/* EB9940 80240AF0 2402000F */   addiu    $v0, $zero, 0xf
-/* EB9944 80240AF4 080902C0 */  j         .L80240B00
-/* EB9948 80240AF8 AE220070 */   sw       $v0, 0x70($s1)
-.L80240AFC:
-/* EB994C 80240AFC AE200070 */  sw        $zero, 0x70($s1)
-.L80240B00:
-/* EB9950 80240B00 8FBF0018 */  lw        $ra, 0x18($sp)
-/* EB9954 80240B04 8FB10014 */  lw        $s1, 0x14($sp)
-/* EB9958 80240B08 8FB00010 */  lw        $s0, 0x10($sp)
-/* EB995C 80240B0C 03E00008 */  jr        $ra
-/* EB9960 80240B10 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EB8E90/func_80240B14_EB9964.s b/ver/us/asm/nonmatchings/EB8E90/func_80240B14_EB9964.s
deleted file mode 100644
index b733948ea1..0000000000
--- a/ver/us/asm/nonmatchings/EB8E90/func_80240B14_EB9964.s
+++ /dev/null
@@ -1,55 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240B14_EB9964
-/* EB9964 80240B14 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* EB9968 80240B18 AFB10014 */  sw        $s1, 0x14($sp)
-/* EB996C 80240B1C 0080882D */  daddu     $s1, $a0, $zero
-/* EB9970 80240B20 AFBF001C */  sw        $ra, 0x1c($sp)
-/* EB9974 80240B24 AFB20018 */  sw        $s2, 0x18($sp)
-/* EB9978 80240B28 AFB00010 */  sw        $s0, 0x10($sp)
-/* EB997C 80240B2C 8E300148 */  lw        $s0, 0x148($s1)
-/* EB9980 80240B30 86040008 */  lh        $a0, 8($s0)
-/* EB9984 80240B34 0C00F92F */  jal       dead_get_npc_unsafe
-/* EB9988 80240B38 00A0902D */   daddu    $s2, $a1, $zero
-/* EB998C 80240B3C 8E0300D0 */  lw        $v1, 0xd0($s0)
-/* EB9990 80240B40 8E240078 */  lw        $a0, 0x78($s1)
-/* EB9994 80240B44 8C630000 */  lw        $v1, ($v1)
-/* EB9998 80240B48 0083182A */  slt       $v1, $a0, $v1
-/* EB999C 80240B4C 10600013 */  beqz      $v1, .L80240B9C
-/* EB99A0 80240B50 0040302D */   daddu    $a2, $v0, $zero
-/* EB99A4 80240B54 00041040 */  sll       $v0, $a0, 1
-/* EB99A8 80240B58 00441021 */  addu      $v0, $v0, $a0
-/* EB99AC 80240B5C 00022880 */  sll       $a1, $v0, 2
-.L80240B60:
-/* EB99B0 80240B60 8E0300D0 */  lw        $v1, 0xd0($s0)
-/* EB99B4 80240B64 C4C2003C */  lwc1      $f2, 0x3c($a2)
-/* EB99B8 80240B68 00A31021 */  addu      $v0, $a1, $v1
-/* EB99BC 80240B6C C4400008 */  lwc1      $f0, 8($v0)
-/* EB99C0 80240B70 46800020 */  cvt.s.w   $f0, $f0
-/* EB99C4 80240B74 4602003E */  c.le.s    $f0, $f2
-/* EB99C8 80240B78 00000000 */  nop
-/* EB99CC 80240B7C 45020003 */  bc1fl     .L80240B8C
-/* EB99D0 80240B80 24840001 */   addiu    $a0, $a0, 1
-/* EB99D4 80240B84 080902E7 */  j         .L80240B9C
-/* EB99D8 80240B88 AE240078 */   sw       $a0, 0x78($s1)
-.L80240B8C:
-/* EB99DC 80240B8C 8C620000 */  lw        $v0, ($v1)
-/* EB99E0 80240B90 0082102A */  slt       $v0, $a0, $v0
-/* EB99E4 80240B94 1440FFF2 */  bnez      $v0, .L80240B60
-/* EB99E8 80240B98 24A5000C */   addiu    $a1, $a1, 0xc
-.L80240B9C:
-/* EB99EC 80240B9C C6400000 */  lwc1      $f0, ($s2)
-/* EB99F0 80240BA0 E4C00018 */  swc1      $f0, 0x18($a2)
-/* EB99F4 80240BA4 8E0200CC */  lw        $v0, 0xcc($s0)
-/* EB99F8 80240BA8 8C420004 */  lw        $v0, 4($v0)
-/* EB99FC 80240BAC ACC20028 */  sw        $v0, 0x28($a2)
-/* EB9A00 80240BB0 24020001 */  addiu     $v0, $zero, 1
-/* EB9A04 80240BB4 AE200074 */  sw        $zero, 0x74($s1)
-/* EB9A08 80240BB8 AE220070 */  sw        $v0, 0x70($s1)
-/* EB9A0C 80240BBC 8FBF001C */  lw        $ra, 0x1c($sp)
-/* EB9A10 80240BC0 8FB20018 */  lw        $s2, 0x18($sp)
-/* EB9A14 80240BC4 8FB10014 */  lw        $s1, 0x14($sp)
-/* EB9A18 80240BC8 8FB00010 */  lw        $s0, 0x10($sp)
-/* EB9A1C 80240BCC 03E00008 */  jr        $ra
-/* EB9A20 80240BD0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EB8E90/func_80240BD4_EB9A24.s b/ver/us/asm/nonmatchings/EB8E90/func_80240BD4_EB9A24.s
index 0e12edee38..7a48696666 100644
--- a/ver/us/asm/nonmatchings/EB8E90/func_80240BD4_EB9A24.s
+++ b/ver/us/asm/nonmatchings/EB8E90/func_80240BD4_EB9A24.s
@@ -150,12 +150,12 @@ glabel func_80240BD4_EB9A24
 glabel L80240DE4_EB9C34
 /* EB9C34 80240DE4 02A0202D */  daddu     $a0, $s5, $zero
 /* EB9C38 80240DE8 0260282D */  daddu     $a1, $s3, $zero
-/* EB9C3C 80240DEC 0C090010 */  jal       func_80240040_EB8E90
+/* EB9C3C 80240DEC 0C090010 */  jal       EB8E90_UnkNpcAIFunc24
 /* EB9C40 80240DF0 0280302D */   daddu    $a2, $s4, $zero
 glabel L80240DF4_EB9C44
 /* EB9C44 80240DF4 02A0202D */  daddu     $a0, $s5, $zero
 /* EB9C48 80240DF8 0260282D */  daddu     $a1, $s3, $zero
-/* EB9C4C 80240DFC 0C090066 */  jal       func_80240198_EB8FE8
+/* EB9C4C 80240DFC 0C090066 */  jal       EB8E90_UnkFunc13
 /* EB9C50 80240E00 0280302D */   daddu    $a2, $s4, $zero
 /* EB9C54 80240E04 080903B5 */  j         L80240ED4_EB9D24
 /* EB9C58 80240E08 00000000 */   nop
@@ -167,52 +167,52 @@ glabel L80240E0C_EB9C5C
 glabel L80240E1C_EB9C6C
 /* EB9C6C 80240E1C 02A0202D */  daddu     $a0, $s5, $zero
 /* EB9C70 80240E20 0260282D */  daddu     $a1, $s3, $zero
-/* EB9C74 80240E24 0C090140 */  jal       func_80240500_EB9350
+/* EB9C74 80240E24 0C090140 */  jal       EB8E90_UnkFunc14
 /* EB9C78 80240E28 0280302D */   daddu    $a2, $s4, $zero
 /* EB9C7C 80240E2C 080903B5 */  j         L80240ED4_EB9D24
 /* EB9C80 80240E30 00000000 */   nop
 glabel L80240E34_EB9C84
 /* EB9C84 80240E34 02A0202D */  daddu     $a0, $s5, $zero
 /* EB9C88 80240E38 0260282D */  daddu     $a1, $s3, $zero
-/* EB9C8C 80240E3C 0C0901AF */  jal       func_802406BC_EB950C
+/* EB9C8C 80240E3C 0C0901AF */  jal       EB8E90_UnkNpcAIFunc25
 /* EB9C90 80240E40 0280302D */   daddu    $a2, $s4, $zero
 /* EB9C94 80240E44 080903B5 */  j         L80240ED4_EB9D24
 /* EB9C98 80240E48 00000000 */   nop
 glabel L80240E4C_EB9C9C
 /* EB9C9C 80240E4C 02A0202D */  daddu     $a0, $s5, $zero
 /* EB9CA0 80240E50 0260282D */  daddu     $a1, $s3, $zero
-/* EB9CA4 80240E54 0C0901DC */  jal       func_80240770_EB95C0
+/* EB9CA4 80240E54 0C0901DC */  jal       EB8E90_NpcJumpFunc2
 /* EB9CA8 80240E58 0280302D */   daddu    $a2, $s4, $zero
 glabel L80240E5C_EB9CAC
 /* EB9CAC 80240E5C 02A0202D */  daddu     $a0, $s5, $zero
 /* EB9CB0 80240E60 0260282D */  daddu     $a1, $s3, $zero
-/* EB9CB4 80240E64 0C0901F9 */  jal       func_802407E4_EB9634
+/* EB9CB4 80240E64 0C0901F9 */  jal       EB8E90_NpcJumpFunc
 /* EB9CB8 80240E68 0280302D */   daddu    $a2, $s4, $zero
 /* EB9CBC 80240E6C 080903B5 */  j         L80240ED4_EB9D24
 /* EB9CC0 80240E70 00000000 */   nop
 glabel L80240E74_EB9CC4
 /* EB9CC4 80240E74 02A0202D */  daddu     $a0, $s5, $zero
 /* EB9CC8 80240E78 0260282D */  daddu     $a1, $s3, $zero
-/* EB9CCC 80240E7C 0C090217 */  jal       func_8024085C_EB96AC
+/* EB9CCC 80240E7C 0C090217 */  jal       EB8E90_UnkNpcAIFunc13
 /* EB9CD0 80240E80 0280302D */   daddu    $a2, $s4, $zero
 glabel L80240E84_EB9CD4
 /* EB9CD4 80240E84 02A0202D */  daddu     $a0, $s5, $zero
 /* EB9CD8 80240E88 0260282D */  daddu     $a1, $s3, $zero
-/* EB9CDC 80240E8C 0C090263 */  jal       func_8024098C_EB97DC
+/* EB9CDC 80240E8C 0C090263 */  jal       EB8E90_UnkFunc15
 /* EB9CE0 80240E90 0280302D */   daddu    $a2, $s4, $zero
 /* EB9CE4 80240E94 080903B5 */  j         L80240ED4_EB9D24
 /* EB9CE8 80240E98 00000000 */   nop
 glabel L80240E9C_EB9CEC
 /* EB9CEC 80240E9C 02A0202D */  daddu     $a0, $s5, $zero
 /* EB9CF0 80240EA0 0260282D */  daddu     $a1, $s3, $zero
-/* EB9CF4 80240EA4 0C0902AB */  jal       func_80240AAC_EB98FC
+/* EB9CF4 80240EA4 0C0902AB */  jal       EB8E90_UnkNpcDurationFlagFunc
 /* EB9CF8 80240EA8 0280302D */   daddu    $a2, $s4, $zero
 /* EB9CFC 80240EAC 080903B5 */  j         L80240ED4_EB9D24
 /* EB9D00 80240EB0 00000000 */   nop
 glabel L80240EB4_EB9D04
 /* EB9D04 80240EB4 02A0202D */  daddu     $a0, $s5, $zero
 /* EB9D08 80240EB8 0260282D */  daddu     $a1, $s3, $zero
-/* EB9D0C 80240EBC 0C0902C5 */  jal       func_80240B14_EB9964
+/* EB9D0C 80240EBC 0C0902C5 */  jal       EB8E90_UnkFunc16
 /* EB9D10 80240EC0 0280302D */   daddu    $a2, $s4, $zero
 /* EB9D14 80240EC4 080903B5 */  j         L80240ED4_EB9D24
 /* EB9D18 80240EC8 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/EB8E90/func_80240EFC_EB9D4C.s b/ver/us/asm/nonmatchings/EB8E90/func_80240EFC_EB9D4C.s
deleted file mode 100644
index a91c451b22..0000000000
--- a/ver/us/asm/nonmatchings/EB8E90/func_80240EFC_EB9D4C.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EFC_EB9D4C
-/* EB9D4C 80240EFC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EB9D50 80240F00 AFBF0010 */  sw        $ra, 0x10($sp)
-/* EB9D54 80240F04 0C03C767 */  jal       func_800F1D9C
-/* EB9D58 80240F08 24040006 */   addiu    $a0, $zero, 6
-/* EB9D5C 80240F0C 3C028011 */  lui       $v0, %hi(D_80117840)
-/* EB9D60 80240F10 24427840 */  addiu     $v0, $v0, %lo(D_80117840)
-/* EB9D64 80240F14 90430003 */  lbu       $v1, 3($v0)
-/* EB9D68 80240F18 90440006 */  lbu       $a0, 6($v0)
-/* EB9D6C 80240F1C A0430002 */  sb        $v1, 2($v0)
-/* EB9D70 80240F20 0C03C5CC */  jal       func_800F1730
-/* EB9D74 80240F24 A0440005 */   sb       $a0, 5($v0)
-/* EB9D78 80240F28 8FBF0010 */  lw        $ra, 0x10($sp)
-/* EB9D7C 80240F2C 24020002 */  addiu     $v0, $zero, 2
-/* EB9D80 80240F30 03E00008 */  jr        $ra
-/* EB9D84 80240F34 27BD0018 */   addiu    $sp, $sp, 0x18
-/* EB9D88 80240F38 00000000 */  nop
-/* EB9D8C 80240F3C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/EB9D90/func_80240F40_EB9D90.s b/ver/us/asm/nonmatchings/EB9D90/func_80240F40_EB9D90.s
deleted file mode 100644
index efb99b7f6c..0000000000
--- a/ver/us/asm/nonmatchings/EB9D90/func_80240F40_EB9D90.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240F40_EB9D90
-/* EB9D90 80240F40 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 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(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)
-/* EB9DB4 80240F64 8E02000C */  lw        $v0, 0xc($s0)
-/* EB9DB8 80240F68 4600008D */  trunc.w.s $f2, $f0
-/* EB9DBC 80240F6C 44061000 */  mfc1      $a2, $f2
-/* EB9DC0 80240F70 8C450000 */  lw        $a1, ($v0)
-/* EB9DC4 80240F74 0C0B551A */  jal       dead_evt_set_variable
-/* EB9DC8 80240F78 8C510004 */   lw       $s1, 4($v0)
-/* EB9DCC 80240F7C 0200202D */  daddu     $a0, $s0, $zero
-/* EB9DD0 80240F80 C6400080 */  lwc1      $f0, 0x80($s2)
-/* EB9DD4 80240F84 4600008D */  trunc.w.s $f2, $f0
-/* EB9DD8 80240F88 44061000 */  mfc1      $a2, $f2
-/* EB9DDC 80240F8C 0C0B551A */  jal       dead_evt_set_variable
-/* EB9DE0 80240F90 0220282D */   daddu    $a1, $s1, $zero
-/* EB9DE4 80240F94 8FBF001C */  lw        $ra, 0x1c($sp)
-/* EB9DE8 80240F98 8FB20018 */  lw        $s2, 0x18($sp)
-/* EB9DEC 80240F9C 8FB10014 */  lw        $s1, 0x14($sp)
-/* EB9DF0 80240FA0 8FB00010 */  lw        $s0, 0x10($sp)
-/* EB9DF4 80240FA4 24020002 */  addiu     $v0, $zero, 2
-/* EB9DF8 80240FA8 03E00008 */  jr        $ra
-/* EB9DFC 80240FAC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EB9D90/func_80240FB0_EB9E00.s b/ver/us/asm/nonmatchings/EB9D90/func_80240FB0_EB9E00.s
deleted file mode 100644
index 26c906fcb2..0000000000
--- a/ver/us/asm/nonmatchings/EB9D90/func_80240FB0_EB9E00.s
+++ /dev/null
@@ -1,81 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240FB0_EB9E00
-/* EB9E00 80240FB0 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* EB9E04 80240FB4 AFB00010 */  sw        $s0, 0x10($sp)
-/* EB9E08 80240FB8 0080802D */  daddu     $s0, $a0, $zero
-/* EB9E0C 80240FBC AFBF0018 */  sw        $ra, 0x18($sp)
-/* EB9E10 80240FC0 AFB10014 */  sw        $s1, 0x14($sp)
-/* EB9E14 80240FC4 F7BA0038 */  sdc1      $f26, 0x38($sp)
-/* EB9E18 80240FC8 F7B80030 */  sdc1      $f24, 0x30($sp)
-/* EB9E1C 80240FCC F7B60028 */  sdc1      $f22, 0x28($sp)
-/* EB9E20 80240FD0 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* EB9E24 80240FD4 8E05008C */  lw        $a1, 0x8c($s0)
-/* EB9E28 80240FD8 0C0B53A3 */  jal       dead_evt_get_variable
-/* EB9E2C 80240FDC 0000202D */   daddu    $a0, $zero, $zero
-/* EB9E30 80240FE0 C60200A8 */  lwc1      $f2, 0xa8($s0)
-/* EB9E34 80240FE4 468010A0 */  cvt.s.w   $f2, $f2
-/* EB9E38 80240FE8 44061000 */  mfc1      $a2, $f2
-/* EB9E3C 80240FEC C60200B0 */  lwc1      $f2, 0xb0($s0)
-/* EB9E40 80240FF0 468010A0 */  cvt.s.w   $f2, $f2
-/* EB9E44 80240FF4 4482A000 */  mtc1      $v0, $f20
-/* EB9E48 80240FF8 00000000 */  nop
-/* EB9E4C 80240FFC 4680A520 */  cvt.s.w   $f20, $f20
-/* EB9E50 80241000 3C01C2A6 */  lui       $at, 0xc2a6
-/* EB9E54 80241004 4481C000 */  mtc1      $at, $f24
-/* EB9E58 80241008 3C0142AE */  lui       $at, 0x42ae
-/* EB9E5C 8024100C 4481D000 */  mtc1      $at, $f26
-/* EB9E60 80241010 44071000 */  mfc1      $a3, $f2
-/* EB9E64 80241014 4600C306 */  mov.s     $f12, $f24
-/* 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
-/* EB9E78 80241028 C60200A8 */  lwc1      $f2, 0xa8($s0)
-/* EB9E7C 8024102C 468010A0 */  cvt.s.w   $f2, $f2
-/* EB9E80 80241030 44061000 */  mfc1      $a2, $f2
-/* EB9E84 80241034 C60200B0 */  lwc1      $f2, 0xb0($s0)
-/* EB9E88 80241038 468010A0 */  cvt.s.w   $f2, $f2
-/* EB9E8C 8024103C 44071000 */  mfc1      $a3, $f2
-/* EB9E90 80241040 0C00ABDC */  jal       fio_validate_header_checksums
-/* EB9E94 80241044 46000586 */   mov.s    $f22, $f0
-/* 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       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(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
-/* EB9ECC 8024107C 0000202D */   daddu    $a0, $zero, $zero
-/* EB9ED0 80241080 0000202D */  daddu     $a0, $zero, $zero
-/* EB9ED4 80241084 8E050090 */  lw        $a1, 0x90($s0)
-/* EB9ED8 80241088 0C0B53A3 */  jal       dead_evt_get_variable
-/* EB9EDC 8024108C 0040802D */   daddu    $s0, $v0, $zero
-/* EB9EE0 80241090 4600A306 */  mov.s     $f12, $f20
-/* EB9EE4 80241094 02028021 */  addu      $s0, $s0, $v0
-/* EB9EE8 80241098 44900000 */  mtc1      $s0, $f0
-/* EB9EEC 8024109C 00000000 */  nop
-/* EB9EF0 802410A0 46800020 */  cvt.s.w   $f0, $f0
-/* 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
-/* EB9F04 802410B4 4616D681 */  sub.s     $f26, $f26, $f22
-/* EB9F08 802410B8 E63A0030 */  swc1      $f26, 0x30($s1)
-/* EB9F0C 802410BC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* EB9F10 802410C0 8FB10014 */  lw        $s1, 0x14($sp)
-/* EB9F14 802410C4 8FB00010 */  lw        $s0, 0x10($sp)
-/* EB9F18 802410C8 D7BA0038 */  ldc1      $f26, 0x38($sp)
-/* EB9F1C 802410CC D7B80030 */  ldc1      $f24, 0x30($sp)
-/* EB9F20 802410D0 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* EB9F24 802410D4 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* EB9F28 802410D8 24020002 */  addiu     $v0, $zero, 2
-/* EB9F2C 802410DC 03E00008 */  jr        $ra
-/* EB9F30 802410E0 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/EB9D90/func_802410E4_EB9F34.s b/ver/us/asm/nonmatchings/EB9D90/func_802410E4_EB9F34.s
deleted file mode 100644
index 14ab10ca07..0000000000
--- a/ver/us/asm/nonmatchings/EB9D90/func_802410E4_EB9F34.s
+++ /dev/null
@@ -1,82 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802410E4_EB9F34
-/* EB9F34 802410E4 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* EB9F38 802410E8 AFB00010 */  sw        $s0, 0x10($sp)
-/* EB9F3C 802410EC 0080802D */  daddu     $s0, $a0, $zero
-/* EB9F40 802410F0 AFBF0018 */  sw        $ra, 0x18($sp)
-/* EB9F44 802410F4 AFB10014 */  sw        $s1, 0x14($sp)
-/* EB9F48 802410F8 F7BA0038 */  sdc1      $f26, 0x38($sp)
-/* 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       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)
-/* EB9F68 80241118 0C0B53A3 */  jal       dead_evt_get_variable
-/* EB9F6C 8024111C 0040882D */   daddu    $s1, $v0, $zero
-/* EB9F70 80241120 C60200B4 */  lwc1      $f2, 0xb4($s0)
-/* EB9F74 80241124 468010A0 */  cvt.s.w   $f2, $f2
-/* EB9F78 80241128 44061000 */  mfc1      $a2, $f2
-/* EB9F7C 8024112C C60200BC */  lwc1      $f2, 0xbc($s0)
-/* EB9F80 80241130 468010A0 */  cvt.s.w   $f2, $f2
-/* EB9F84 80241134 4482A000 */  mtc1      $v0, $f20
-/* EB9F88 80241138 00000000 */  nop
-/* EB9F8C 8024113C 4680A520 */  cvt.s.w   $f20, $f20
-/* EB9F90 80241140 3C01C2A6 */  lui       $at, 0xc2a6
-/* EB9F94 80241144 4481C000 */  mtc1      $at, $f24
-/* EB9F98 80241148 3C0142AE */  lui       $at, 0x42ae
-/* EB9F9C 8024114C 4481D000 */  mtc1      $at, $f26
-/* EB9FA0 80241150 44071000 */  mfc1      $a3, $f2
-/* EB9FA4 80241154 4600C306 */  mov.s     $f12, $f24
-/* 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
-/* EB9FB8 80241168 C60200B4 */  lwc1      $f2, 0xb4($s0)
-/* EB9FBC 8024116C 468010A0 */  cvt.s.w   $f2, $f2
-/* EB9FC0 80241170 44061000 */  mfc1      $a2, $f2
-/* EB9FC4 80241174 C60200BC */  lwc1      $f2, 0xbc($s0)
-/* EB9FC8 80241178 468010A0 */  cvt.s.w   $f2, $f2
-/* EB9FCC 8024117C 44071000 */  mfc1      $a3, $f2
-/* EB9FD0 80241180 0C00ABDC */  jal       fio_validate_header_checksums
-/* EB9FD4 80241184 46000586 */   mov.s    $f22, $f0
-/* 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       dead_sin_deg
-/* EB9FE8 80241198 4600A306 */   mov.s    $f12, $f20
-/* EB9FEC 8024119C 4600B002 */  mul.s     $f0, $f22, $f0
-/* EB9FF0 802411A0 00000000 */  nop
-/* EB9FF4 802411A4 46180000 */  add.s     $f0, $f0, $f24
-/* EB9FF8 802411A8 E6200038 */  swc1      $f0, 0x38($s1)
-/* EB9FFC 802411AC 8E0500B8 */  lw        $a1, 0xb8($s0)
-/* EBA000 802411B0 0C0B53A3 */  jal       dead_evt_get_variable
-/* EBA004 802411B4 0000202D */   daddu    $a0, $zero, $zero
-/* EBA008 802411B8 0000202D */  daddu     $a0, $zero, $zero
-/* EBA00C 802411BC 8E050090 */  lw        $a1, 0x90($s0)
-/* EBA010 802411C0 0C0B53A3 */  jal       dead_evt_get_variable
-/* EBA014 802411C4 0040802D */   daddu    $s0, $v0, $zero
-/* EBA018 802411C8 4600A306 */  mov.s     $f12, $f20
-/* EBA01C 802411CC 02028021 */  addu      $s0, $s0, $v0
-/* EBA020 802411D0 44900000 */  mtc1      $s0, $f0
-/* EBA024 802411D4 00000000 */  nop
-/* EBA028 802411D8 46800020 */  cvt.s.w   $f0, $f0
-/* 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
-/* EBA03C 802411EC 4616D681 */  sub.s     $f26, $f26, $f22
-/* EBA040 802411F0 E63A0040 */  swc1      $f26, 0x40($s1)
-/* EBA044 802411F4 8FBF0018 */  lw        $ra, 0x18($sp)
-/* EBA048 802411F8 8FB10014 */  lw        $s1, 0x14($sp)
-/* EBA04C 802411FC 8FB00010 */  lw        $s0, 0x10($sp)
-/* EBA050 80241200 D7BA0038 */  ldc1      $f26, 0x38($sp)
-/* EBA054 80241204 D7B80030 */  ldc1      $f24, 0x30($sp)
-/* EBA058 80241208 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* EBA05C 8024120C D7B40020 */  ldc1      $f20, 0x20($sp)
-/* EBA060 80241210 24020002 */  addiu     $v0, $zero, 2
-/* EBA064 80241214 03E00008 */  jr        $ra
-/* EBA068 80241218 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/EB9D90/func_8024121C_EBA06C.s b/ver/us/asm/nonmatchings/EB9D90/func_8024121C_EBA06C.s
deleted file mode 100644
index db1973c802..0000000000
--- a/ver/us/asm/nonmatchings/EB9D90/func_8024121C_EBA06C.s
+++ /dev/null
@@ -1,105 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024121C_EBA06C
-/* EBA06C 8024121C 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* EBA070 80241220 AFB20018 */  sw        $s2, 0x18($sp)
-/* EBA074 80241224 0080902D */  daddu     $s2, $a0, $zero
-/* EBA078 80241228 AFBF0028 */  sw        $ra, 0x28($sp)
-/* EBA07C 8024122C AFB50024 */  sw        $s5, 0x24($sp)
-/* EBA080 80241230 AFB40020 */  sw        $s4, 0x20($sp)
-/* EBA084 80241234 AFB3001C */  sw        $s3, 0x1c($sp)
-/* EBA088 80241238 AFB10014 */  sw        $s1, 0x14($sp)
-/* EBA08C 8024123C AFB00010 */  sw        $s0, 0x10($sp)
-/* EBA090 80241240 F7B80040 */  sdc1      $f24, 0x40($sp)
-/* EBA094 80241244 F7B60038 */  sdc1      $f22, 0x38($sp)
-/* EBA098 80241248 F7B40030 */  sdc1      $f20, 0x30($sp)
-/* EBA09C 8024124C 8E50000C */  lw        $s0, 0xc($s2)
-/* EBA0A0 80241250 8E140000 */  lw        $s4, ($s0)
-/* EBA0A4 80241254 26100004 */  addiu     $s0, $s0, 4
-/* EBA0A8 80241258 0C0B53A3 */  jal       dead_evt_get_variable
-/* EBA0AC 8024125C 0280282D */   daddu    $a1, $s4, $zero
-/* EBA0B0 80241260 0040982D */  daddu     $s3, $v0, $zero
-/* EBA0B4 80241264 8E150000 */  lw        $s5, ($s0)
-/* EBA0B8 80241268 26100004 */  addiu     $s0, $s0, 4
-/* EBA0BC 8024126C 8E050000 */  lw        $a1, ($s0)
-/* EBA0C0 80241270 26100004 */  addiu     $s0, $s0, 4
-/* EBA0C4 80241274 0C0B55FF */  jal       dead_evt_get_float_variable
-/* EBA0C8 80241278 0240202D */   daddu    $a0, $s2, $zero
-/* EBA0CC 8024127C 8E050000 */  lw        $a1, ($s0)
-/* EBA0D0 80241280 26100004 */  addiu     $s0, $s0, 4
-/* EBA0D4 80241284 0240202D */  daddu     $a0, $s2, $zero
-/* EBA0D8 80241288 0C0B55FF */  jal       dead_evt_get_float_variable
-/* EBA0DC 8024128C 46000606 */   mov.s    $f24, $f0
-/* EBA0E0 80241290 8E050000 */  lw        $a1, ($s0)
-/* EBA0E4 80241294 26100004 */  addiu     $s0, $s0, 4
-/* EBA0E8 80241298 0240202D */  daddu     $a0, $s2, $zero
-/* EBA0EC 8024129C 0C0B53A3 */  jal       dead_evt_get_variable
-/* EBA0F0 802412A0 46000506 */   mov.s    $f20, $f0
-/* EBA0F4 802412A4 8E050000 */  lw        $a1, ($s0)
-/* EBA0F8 802412A8 26100004 */  addiu     $s0, $s0, 4
-/* EBA0FC 802412AC 0240202D */  daddu     $a0, $s2, $zero
-/* EBA100 802412B0 0C0B53A3 */  jal       dead_evt_get_variable
-/* EBA104 802412B4 0040882D */   daddu    $s1, $v0, $zero
-/* EBA108 802412B8 0240202D */  daddu     $a0, $s2, $zero
-/* EBA10C 802412BC 8E050000 */  lw        $a1, ($s0)
-/* EBA110 802412C0 0C0B55FF */  jal       dead_evt_get_float_variable
-/* EBA114 802412C4 0040802D */   daddu    $s0, $v0, $zero
-/* EBA118 802412C8 3C014334 */  lui       $at, 0x4334
-/* EBA11C 802412CC 44811000 */  mtc1      $at, $f2
-/* EBA120 802412D0 3C014049 */  lui       $at, 0x4049
-/* EBA124 802412D4 34210FD8 */  ori       $at, $at, 0xfd8
-/* EBA128 802412D8 44812000 */  mtc1      $at, $f4
-/* EBA12C 802412DC 46020003 */  div.s     $f0, $f0, $f2
-/* EBA130 802412E0 46040582 */  mul.s     $f22, $f0, $f4
-/* EBA134 802412E4 00000000 */  nop
-/* EBA138 802412E8 4618A501 */  sub.s     $f20, $f20, $f24
-/* EBA13C 802412EC 3C013F00 */  lui       $at, 0x3f00
-/* EBA140 802412F0 44810000 */  mtc1      $at, $f0
-/* EBA144 802412F4 00000000 */  nop
-/* EBA148 802412F8 4600A502 */  mul.s     $f20, $f20, $f0
-/* EBA14C 802412FC 00000000 */  nop
-/* EBA150 80241300 12000007 */  beqz      $s0, .L80241320
-/* EBA154 80241304 0233102A */   slt      $v0, $s1, $s3
-/* EBA158 80241308 10400005 */  beqz      $v0, .L80241320
-/* EBA15C 8024130C 0240202D */   daddu    $a0, $s2, $zero
-/* EBA160 80241310 0220982D */  daddu     $s3, $s1, $zero
-/* EBA164 80241314 0280282D */  daddu     $a1, $s4, $zero
-/* EBA168 80241318 0C0B551A */  jal       dead_evt_set_variable
-/* EBA16C 8024131C 0220302D */   daddu    $a2, $s1, $zero
-.L80241320:
-/* EBA170 80241320 3C014049 */  lui       $at, 0x4049
-/* EBA174 80241324 34210FD8 */  ori       $at, $at, 0xfd8
-/* EBA178 80241328 44810000 */  mtc1      $at, $f0
-/* EBA17C 8024132C 44936000 */  mtc1      $s3, $f12
-/* EBA180 80241330 00000000 */  nop
-/* EBA184 80241334 46806320 */  cvt.s.w   $f12, $f12
-/* EBA188 80241338 46006302 */  mul.s     $f12, $f12, $f0
-/* EBA18C 8024133C 00000000 */  nop
-/* EBA190 80241340 44910000 */  mtc1      $s1, $f0
-/* EBA194 80241344 00000000 */  nop
-/* EBA198 80241348 46800020 */  cvt.s.w   $f0, $f0
-/* EBA19C 8024134C 46006303 */  div.s     $f12, $f12, $f0
-/* EBA1A0 80241350 0C00AD30 */  jal       dead_cos_rad
-/* EBA1A4 80241354 46166300 */   add.s    $f12, $f12, $f22
-/* EBA1A8 80241358 4600A002 */  mul.s     $f0, $f20, $f0
-/* EBA1AC 8024135C 00000000 */  nop
-/* EBA1B0 80241360 4614C080 */  add.s     $f2, $f24, $f20
-/* EBA1B4 80241364 46001081 */  sub.s     $f2, $f2, $f0
-/* EBA1B8 80241368 0240202D */  daddu     $a0, $s2, $zero
-/* EBA1BC 8024136C 44061000 */  mfc1      $a2, $f2
-/* EBA1C0 80241370 0C0B5684 */  jal       dead_evt_set_float_variable
-/* EBA1C4 80241374 02A0282D */   daddu    $a1, $s5, $zero
-/* EBA1C8 80241378 8FBF0028 */  lw        $ra, 0x28($sp)
-/* EBA1CC 8024137C 8FB50024 */  lw        $s5, 0x24($sp)
-/* EBA1D0 80241380 8FB40020 */  lw        $s4, 0x20($sp)
-/* EBA1D4 80241384 8FB3001C */  lw        $s3, 0x1c($sp)
-/* EBA1D8 80241388 8FB20018 */  lw        $s2, 0x18($sp)
-/* EBA1DC 8024138C 8FB10014 */  lw        $s1, 0x14($sp)
-/* EBA1E0 80241390 8FB00010 */  lw        $s0, 0x10($sp)
-/* EBA1E4 80241394 D7B80040 */  ldc1      $f24, 0x40($sp)
-/* EBA1E8 80241398 D7B60038 */  ldc1      $f22, 0x38($sp)
-/* EBA1EC 8024139C D7B40030 */  ldc1      $f20, 0x30($sp)
-/* EBA1F0 802413A0 24020002 */  addiu     $v0, $zero, 2
-/* EBA1F4 802413A4 03E00008 */  jr        $ra
-/* EBA1F8 802413A8 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/EB9D90/func_802413AC_EBA1FC.s b/ver/us/asm/nonmatchings/EB9D90/func_802413AC_EBA1FC.s
deleted file mode 100644
index d4ed8bc0c4..0000000000
--- a/ver/us/asm/nonmatchings/EB9D90/func_802413AC_EBA1FC.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802413AC_EBA1FC
-/* EBA1FC 802413AC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EBA200 802413B0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* EBA204 802413B4 0C03C5CC */  jal       func_800F1730
-/* EBA208 802413B8 00000000 */   nop
-/* EBA20C 802413BC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* EBA210 802413C0 24020002 */  addiu     $v0, $zero, 2
-/* EBA214 802413C4 03E00008 */  jr        $ra
-/* EBA218 802413C8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/EB9D90/func_802413CC_EBA21C.s b/ver/us/asm/nonmatchings/EB9D90/func_802413CC_EBA21C.s
deleted file mode 100644
index c64ae09ba0..0000000000
--- a/ver/us/asm/nonmatchings/EB9D90/func_802413CC_EBA21C.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802413CC_EBA21C
-/* EBA21C 802413CC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EBA220 802413D0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* EBA224 802413D4 0C03C5C6 */  jal       func_800F1718
-/* EBA228 802413D8 00000000 */   nop
-/* EBA22C 802413DC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* EBA230 802413E0 24020002 */  addiu     $v0, $zero, 2
-/* EBA234 802413E4 03E00008 */  jr        $ra
-/* EBA238 802413E8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/EB9D90/func_802413EC_EBA23C.s b/ver/us/asm/nonmatchings/EB9D90/func_802413EC_EBA23C.s
deleted file mode 100644
index a6a5379e03..0000000000
--- a/ver/us/asm/nonmatchings/EB9D90/func_802413EC_EBA23C.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802413EC_EBA23C
-/* EBA23C 802413EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EBA240 802413F0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* EBA244 802413F4 0C03C5BD */  jal       func_800F16F4
-/* EBA248 802413F8 00000000 */   nop
-/* EBA24C 802413FC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* EBA250 80241400 24020002 */  addiu     $v0, $zero, 2
-/* EBA254 80241404 03E00008 */  jr        $ra
-/* EBA258 80241408 27BD0018 */   addiu    $sp, $sp, 0x18
-/* EBA25C 8024140C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/EC71B0/func_8024030C_EC74BC.s b/ver/us/asm/nonmatchings/EC71B0/func_8024030C_EC74BC.s
deleted file mode 100644
index 65c762411b..0000000000
--- a/ver/us/asm/nonmatchings/EC71B0/func_8024030C_EC74BC.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024030C_EC74BC
-/* EC74BC 8024030C 44800000 */  mtc1      $zero, $f0
-/* EC74C0 80240310 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* EC74C4 80240314 44050000 */  mfc1      $a1, $f0
-/* EC74C8 80240318 0000202D */  daddu     $a0, $zero, $zero
-/* EC74CC 8024031C AFBF0018 */  sw        $ra, 0x18($sp)
-/* EC74D0 80240320 AFA00014 */  sw        $zero, 0x14($sp)
-/* EC74D4 80240324 E7A00010 */  swc1      $f0, 0x10($sp)
-/* EC74D8 80240328 00A0302D */  daddu     $a2, $a1, $zero
-/* EC74DC 8024032C 0C01DEF4 */  jal       func_80077BD0
-/* EC74E0 80240330 00A0382D */   daddu    $a3, $a1, $zero
-/* EC74E4 80240334 8FBF0018 */  lw        $ra, 0x18($sp)
-/* EC74E8 80240338 24020002 */  addiu     $v0, $zero, 2
-/* EC74EC 8024033C 03E00008 */  jr        $ra
-/* EC74F0 80240340 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EC9D00/func_80240000_EC9D00.s b/ver/us/asm/nonmatchings/EC9D00/func_80240000_EC9D00.s
deleted file mode 100644
index 8383675774..0000000000
--- a/ver/us/asm/nonmatchings/EC9D00/func_80240000_EC9D00.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_EC9D00
-/* EC9D00 80240000 3C03800A */  lui       $v1, %hi(D_800A15A8)
-/* EC9D04 80240004 246315A8 */  addiu     $v1, $v1, %lo(D_800A15A8)
-/* EC9D08 80240008 8C620000 */  lw        $v0, ($v1)
-/* EC9D0C 8024000C 34420040 */  ori       $v0, $v0, 0x40
-/* EC9D10 80240010 AC620000 */  sw        $v0, ($v1)
-/* EC9D14 80240014 03E00008 */  jr        $ra
-/* EC9D18 80240018 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/EC9D00/func_8024001C_EC9D1C.s b/ver/us/asm/nonmatchings/EC9D00/func_8024001C_EC9D1C.s
deleted file mode 100644
index 84a8d3e0d4..0000000000
--- a/ver/us/asm/nonmatchings/EC9D00/func_8024001C_EC9D1C.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024001C_EC9D1C
-/* EC9D1C 8024001C 3C02800A */  lui       $v0, %hi(D_800A15A8)
-/* EC9D20 80240020 244215A8 */  addiu     $v0, $v0, %lo(D_800A15A8)
-/* EC9D24 80240024 8C430000 */  lw        $v1, ($v0)
-/* EC9D28 80240028 2404FFBF */  addiu     $a0, $zero, -0x41
-/* EC9D2C 8024002C 00641824 */  and       $v1, $v1, $a0
-/* EC9D30 80240030 AC430000 */  sw        $v1, ($v0)
-/* EC9D34 80240034 03E00008 */  jr        $ra
-/* EC9D38 80240038 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/EC9D00/func_8024003C_EC9D3C.s b/ver/us/asm/nonmatchings/EC9D00/func_8024003C_EC9D3C.s
deleted file mode 100644
index 9f1418a212..0000000000
--- a/ver/us/asm/nonmatchings/EC9D00/func_8024003C_EC9D3C.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024003C_EC9D3C
-/* EC9D3C 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EC9D40 80240040 AFBF0010 */  sw        $ra, 0x10($sp)
-/* EC9D44 80240044 8C82000C */  lw        $v0, 0xc($a0)
-/* EC9D48 80240048 0C0B53A3 */  jal       dead_evt_get_variable
-/* EC9D4C 8024004C 8C450000 */   lw       $a1, ($v0)
-/* EC9D50 80240050 0C0BCEC0 */  jal       func_802F3B00
-/* EC9D54 80240054 0040202D */   daddu    $a0, $v0, $zero
-/* EC9D58 80240058 8FBF0010 */  lw        $ra, 0x10($sp)
-/* EC9D5C 8024005C 24020002 */  addiu     $v0, $zero, 2
-/* EC9D60 80240060 03E00008 */  jr        $ra
-/* EC9D64 80240064 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/EC9D00/func_80240068_EC9D68.s b/ver/us/asm/nonmatchings/EC9D00/func_80240068_EC9D68.s
deleted file mode 100644
index 5929235abd..0000000000
--- a/ver/us/asm/nonmatchings/EC9D00/func_80240068_EC9D68.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240068_EC9D68
-/* EC9D68 80240068 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* EC9D6C 8024006C AFB00010 */  sw        $s0, 0x10($sp)
-/* EC9D70 80240070 0080802D */  daddu     $s0, $a0, $zero
-/* EC9D74 80240074 AFBF0018 */  sw        $ra, 0x18($sp)
-/* EC9D78 80240078 AFB10014 */  sw        $s1, 0x14($sp)
-/* EC9D7C 8024007C 8E11000C */  lw        $s1, 0xc($s0)
-/* EC9D80 80240080 8E250000 */  lw        $a1, ($s1)
-/* EC9D84 80240084 0C0B53A3 */  jal       dead_evt_get_variable
-/* EC9D88 80240088 26310004 */   addiu    $s1, $s1, 4
-/* EC9D8C 8024008C 0200202D */  daddu     $a0, $s0, $zero
-/* EC9D90 80240090 3C038011 */  lui       $v1, %hi(D_80117840)
-/* EC9D94 80240094 24637840 */  addiu     $v1, $v1, %lo(D_80117840)
-/* EC9D98 80240098 000210C0 */  sll       $v0, $v0, 3
-/* EC9D9C 8024009C 00431021 */  addu      $v0, $v0, $v1
-/* EC9DA0 802400A0 90460015 */  lbu       $a2, 0x15($v0)
-/* EC9DA4 802400A4 8E250000 */  lw        $a1, ($s1)
-/* EC9DA8 802400A8 24C60001 */  addiu     $a2, $a2, 1
-/* EC9DAC 802400AC A0460015 */  sb        $a2, 0x15($v0)
-/* EC9DB0 802400B0 00063600 */  sll       $a2, $a2, 0x18
-/* EC9DB4 802400B4 0C0B551A */  jal       dead_evt_set_variable
-/* EC9DB8 802400B8 00063603 */   sra      $a2, $a2, 0x18
-/* EC9DBC 802400BC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* EC9DC0 802400C0 8FB10014 */  lw        $s1, 0x14($sp)
-/* EC9DC4 802400C4 8FB00010 */  lw        $s0, 0x10($sp)
-/* EC9DC8 802400C8 24020002 */  addiu     $v0, $zero, 2
-/* EC9DCC 802400CC 03E00008 */  jr        $ra
-/* EC9DD0 802400D0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EC9D00/func_802400D4_EC9DD4.s b/ver/us/asm/nonmatchings/EC9D00/func_802400D4_EC9DD4.s
deleted file mode 100644
index 43e8a4d399..0000000000
--- a/ver/us/asm/nonmatchings/EC9D00/func_802400D4_EC9DD4.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802400D4_EC9DD4
-/* EC9DD4 802400D4 3C028011 */  lui       $v0, %hi(D_80117840)
-/* EC9DD8 802400D8 24427840 */  addiu     $v0, $v0, %lo(D_80117840)
-/* EC9DDC 802400DC 000420C0 */  sll       $a0, $a0, 3
-/* EC9DE0 802400E0 00822021 */  addu      $a0, $a0, $v0
-/* EC9DE4 802400E4 90820014 */  lbu       $v0, 0x14($a0)
-/* EC9DE8 802400E8 10400009 */  beqz      $v0, .L80240110
-/* EC9DEC 802400EC 00000000 */   nop
-/* EC9DF0 802400F0 90820015 */  lbu       $v0, 0x15($a0)
-/* EC9DF4 802400F4 00022600 */  sll       $a0, $v0, 0x18
-/* EC9DF8 802400F8 00041E03 */  sra       $v1, $a0, 0x18
-/* EC9DFC 802400FC 00051400 */  sll       $v0, $a1, 0x10
-/* EC9E00 80240100 00021403 */  sra       $v0, $v0, 0x10
-/* EC9E04 80240104 0043102A */  slt       $v0, $v0, $v1
-/* EC9E08 80240108 10400003 */  beqz      $v0, .L80240118
-/* EC9E0C 8024010C 00000000 */   nop
-.L80240110:
-/* EC9E10 80240110 03E00008 */  jr        $ra
-/* EC9E14 80240114 2402FFFF */   addiu    $v0, $zero, -1
-.L80240118:
-/* EC9E18 80240118 03E00008 */  jr        $ra
-/* EC9E1C 8024011C 00041603 */   sra      $v0, $a0, 0x18
diff --git a/ver/us/asm/nonmatchings/EC9D00/func_80240120_EC9E20.s b/ver/us/asm/nonmatchings/EC9D00/func_80240120_EC9E20.s
deleted file mode 100644
index aa2d327e9f..0000000000
--- a/ver/us/asm/nonmatchings/EC9D00/func_80240120_EC9E20.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240120_EC9E20
-/* EC9E20 80240120 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* EC9E24 80240124 AFB3001C */  sw        $s3, 0x1c($sp)
-/* EC9E28 80240128 0080982D */  daddu     $s3, $a0, $zero
-/* EC9E2C 8024012C AFB00010 */  sw        $s0, 0x10($sp)
-/* EC9E30 80240130 24100001 */  addiu     $s0, $zero, 1
-/* EC9E34 80240134 AFB40020 */  sw        $s4, 0x20($sp)
-/* EC9E38 80240138 2414FFFF */  addiu     $s4, $zero, -1
-/* EC9E3C 8024013C AFB50024 */  sw        $s5, 0x24($sp)
-/* EC9E40 80240140 0200A82D */  daddu     $s5, $s0, $zero
-/* EC9E44 80240144 AFB10014 */  sw        $s1, 0x14($sp)
-/* EC9E48 80240148 3C118011 */  lui       $s1, %hi(D_80117848)
-/* EC9E4C 8024014C 26317848 */  addiu     $s1, $s1, %lo(D_80117848)
-/* EC9E50 80240150 AFBF0028 */  sw        $ra, 0x28($sp)
-/* EC9E54 80240154 AFB20018 */  sw        $s2, 0x18($sp)
-/* EC9E58 80240158 8E6200B4 */  lw        $v0, 0xb4($s3)
-/* EC9E5C 8024015C 0280182D */  daddu     $v1, $s4, $zero
-/* EC9E60 80240160 AE630084 */  sw        $v1, 0x84($s3)
-/* EC9E64 80240164 00021027 */  nor       $v0, $zero, $v0
-/* EC9E68 80240168 000217C2 */  srl       $v0, $v0, 0x1f
-/* EC9E6C 8024016C 00029400 */  sll       $s2, $v0, 0x10
-.L80240170:
-/* EC9E70 80240170 92220014 */  lbu       $v0, 0x14($s1)
-/* EC9E74 80240174 50400008 */  beql      $v0, $zero, .L80240198
-/* EC9E78 80240178 26100001 */   addiu    $s0, $s0, 1
-/* EC9E7C 8024017C 0200202D */  daddu     $a0, $s0, $zero
-/* EC9E80 80240180 0C090035 */  jal       func_802400D4_EC9DD4
-/* EC9E84 80240184 00122C03 */   sra      $a1, $s2, 0x10
-/* EC9E88 80240188 10540003 */  beq       $v0, $s4, .L80240198
-/* EC9E8C 8024018C 26100001 */   addiu    $s0, $s0, 1
-/* EC9E90 80240190 08090069 */  j         .L802401A4
-/* EC9E94 80240194 AE750084 */   sw       $s5, 0x84($s3)
-.L80240198:
-/* EC9E98 80240198 2A02000C */  slti      $v0, $s0, 0xc
-/* EC9E9C 8024019C 1440FFF4 */  bnez      $v0, .L80240170
-/* EC9EA0 802401A0 26310008 */   addiu    $s1, $s1, 8
-.L802401A4:
-/* EC9EA4 802401A4 8FBF0028 */  lw        $ra, 0x28($sp)
-/* EC9EA8 802401A8 8FB50024 */  lw        $s5, 0x24($sp)
-/* EC9EAC 802401AC 8FB40020 */  lw        $s4, 0x20($sp)
-/* EC9EB0 802401B0 8FB3001C */  lw        $s3, 0x1c($sp)
-/* EC9EB4 802401B4 8FB20018 */  lw        $s2, 0x18($sp)
-/* EC9EB8 802401B8 8FB10014 */  lw        $s1, 0x14($sp)
-/* EC9EBC 802401BC 8FB00010 */  lw        $s0, 0x10($sp)
-/* EC9EC0 802401C0 24020002 */  addiu     $v0, $zero, 2
-/* EC9EC4 802401C4 03E00008 */  jr        $ra
-/* EC9EC8 802401C8 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/EC9D00/func_802401CC_EC9ECC.s b/ver/us/asm/nonmatchings/EC9D00/func_802401CC_EC9ECC.s
index 2482adf557..d9823af7ff 100644
--- a/ver/us/asm/nonmatchings/EC9D00/func_802401CC_EC9ECC.s
+++ b/ver/us/asm/nonmatchings/EC9D00/func_802401CC_EC9ECC.s
@@ -6,8 +6,8 @@ glabel func_802401CC_EC9ECC
 /* EC9ED0 802401D0 AFB5002C */  sw        $s5, 0x2c($sp)
 /* EC9ED4 802401D4 0080A82D */  daddu     $s5, $a0, $zero
 /* EC9ED8 802401D8 AFBE0038 */  sw        $fp, 0x38($sp)
-/* EC9EDC 802401DC 3C1E8011 */  lui       $fp, %hi(D_80117840)
-/* EC9EE0 802401E0 27DE7840 */  addiu     $fp, $fp, %lo(D_80117840)
+/* EC9EDC 802401DC 3C1E8011 */  lui       $fp, %hi(dead_gPlayerData)
+/* EC9EE0 802401E0 27DE7840 */  addiu     $fp, $fp, %lo(dead_gPlayerData)
 /* EC9EE4 802401E4 AFBF003C */  sw        $ra, 0x3c($sp)
 /* EC9EE8 802401E8 AFB70034 */  sw        $s7, 0x34($sp)
 /* EC9EEC 802401EC AFB60030 */  sw        $s6, 0x30($sp)
@@ -49,7 +49,7 @@ glabel func_802401CC_EC9ECC
 /* EC9F78 80240278 AE300108 */  sw        $s0, 0x108($s1)
 /* EC9F7C 8024027C 8C420000 */  lw        $v0, ($v0)
 /* EC9F80 80240280 02E0282D */  daddu     $a1, $s7, $zero
-/* EC9F84 80240284 0C090035 */  jal       func_802400D4_EC9DD4
+/* EC9F84 80240284 0C090035 */  jal       EC9D00_UnkFunc37
 /* EC9F88 80240288 AE220084 */   sw       $v0, 0x84($s1)
 /* EC9F8C 8024028C 0040202D */  daddu     $a0, $v0, $zero
 /* EC9F90 80240290 04800011 */  bltz      $a0, .L802402D8
diff --git a/ver/us/asm/nonmatchings/EC9D00/func_8024041C_ECA11C.s b/ver/us/asm/nonmatchings/EC9D00/func_8024041C_ECA11C.s
deleted file mode 100644
index aff8f6ef8d..0000000000
--- a/ver/us/asm/nonmatchings/EC9D00/func_8024041C_ECA11C.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024041C_ECA11C
-/* ECA11C 8024041C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* ECA120 80240420 AFBF0010 */  sw        $ra, 0x10($sp)
-/* ECA124 80240424 8C82000C */  lw        $v0, 0xc($a0)
-/* ECA128 80240428 0C0B53A3 */  jal       dead_evt_get_variable
-/* ECA12C 8024042C 8C450000 */   lw       $a1, ($v0)
-/* ECA130 80240430 0C03CB57 */  jal       func_800F2D5C
-/* ECA134 80240434 0040202D */   daddu    $a0, $v0, $zero
-/* ECA138 80240438 8FBF0010 */  lw        $ra, 0x10($sp)
-/* ECA13C 8024043C 24020002 */  addiu     $v0, $zero, 2
-/* ECA140 80240440 03E00008 */  jr        $ra
-/* ECA144 80240444 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/EC9D00/func_80240448_ECA148.s b/ver/us/asm/nonmatchings/EC9D00/func_80240448_ECA148.s
deleted file mode 100644
index 1335208e53..0000000000
--- a/ver/us/asm/nonmatchings/EC9D00/func_80240448_ECA148.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240448_ECA148
-/* ECA148 80240448 3C028011 */  lui       $v0, %hi(D_80117852)
-/* ECA14C 8024044C 80427852 */  lb        $v0, %lo(D_80117852)($v0)
-/* ECA150 80240450 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* ECA154 80240454 AFBF0010 */  sw        $ra, 0x10($sp)
-/* ECA158 80240458 00021100 */  sll       $v0, $v0, 4
-/* ECA15C 8024045C 3C048009 */  lui       $a0, %hi(D_80094900)
-/* ECA160 80240460 00822021 */  addu      $a0, $a0, $v0
-/* ECA164 80240464 8C844900 */  lw        $a0, %lo(D_80094900)($a0)
-/* ECA168 80240468 0C04C31D */  jal       func_80130C74
-/* ECA16C 8024046C 0000282D */   daddu    $a1, $zero, $zero
-/* ECA170 80240470 8FBF0010 */  lw        $ra, 0x10($sp)
-/* ECA174 80240474 24020002 */  addiu     $v0, $zero, 2
-/* ECA178 80240478 03E00008 */  jr        $ra
-/* ECA17C 8024047C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/EC9D00/func_80240480_ECA180.s b/ver/us/asm/nonmatchings/EC9D00/func_80240480_ECA180.s
deleted file mode 100644
index a1e74b2b81..0000000000
--- a/ver/us/asm/nonmatchings/EC9D00/func_80240480_ECA180.s
+++ /dev/null
@@ -1,40 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240480_ECA180
-/* ECA180 80240480 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* ECA184 80240484 AFB1001C */  sw        $s1, 0x1c($sp)
-/* ECA188 80240488 0080882D */  daddu     $s1, $a0, $zero
-/* ECA18C 8024048C AFBF0020 */  sw        $ra, 0x20($sp)
-/* ECA190 80240490 AFB00018 */  sw        $s0, 0x18($sp)
-/* ECA194 80240494 8E30000C */  lw        $s0, 0xc($s1)
-/* ECA198 80240498 8E050000 */  lw        $a1, ($s0)
-/* ECA19C 8024049C 0C0B53A3 */  jal       dead_evt_get_variable
-/* ECA1A0 802404A0 26100004 */   addiu    $s0, $s0, 4
-/* ECA1A4 802404A4 0C0462EC */  jal       func_80118BB0
-/* ECA1A8 802404A8 0040202D */   daddu    $a0, $v0, $zero
-/* ECA1AC 802404AC 8E100000 */  lw        $s0, ($s0)
-/* ECA1B0 802404B0 C444004C */  lwc1      $f4, 0x4c($v0)
-/* ECA1B4 802404B4 3C014148 */  lui       $at, 0x4148
-/* ECA1B8 802404B8 44810000 */  mtc1      $at, $f0
-/* ECA1BC 802404BC 3C013F33 */  lui       $at, 0x3f33
-/* ECA1C0 802404C0 34213333 */  ori       $at, $at, 0x3333
-/* ECA1C4 802404C4 44811000 */  mtc1      $at, $f2
-/* ECA1C8 802404C8 AFA00014 */  sw        $zero, 0x14($sp)
-/* ECA1CC 802404CC 46002100 */  add.s     $f4, $f4, $f0
-/* ECA1D0 802404D0 E7A20010 */  swc1      $f2, 0x10($sp)
-/* ECA1D4 802404D4 8C450048 */  lw        $a1, 0x48($v0)
-/* ECA1D8 802404D8 8C470050 */  lw        $a3, 0x50($v0)
-/* ECA1DC 802404DC 44062000 */  mfc1      $a2, $f4
-/* ECA1E0 802404E0 0C01DA74 */  jal       func_800769D0
-/* ECA1E4 802404E4 0000202D */   daddu    $a0, $zero, $zero
-/* ECA1E8 802404E8 0220202D */  daddu     $a0, $s1, $zero
-/* ECA1EC 802404EC 0200282D */  daddu     $a1, $s0, $zero
-/* ECA1F0 802404F0 0C0B551A */  jal       dead_evt_set_variable
-/* ECA1F4 802404F4 0040302D */   daddu    $a2, $v0, $zero
-/* ECA1F8 802404F8 8FBF0020 */  lw        $ra, 0x20($sp)
-/* ECA1FC 802404FC 8FB1001C */  lw        $s1, 0x1c($sp)
-/* ECA200 80240500 8FB00018 */  lw        $s0, 0x18($sp)
-/* ECA204 80240504 24020002 */  addiu     $v0, $zero, 2
-/* ECA208 80240508 03E00008 */  jr        $ra
-/* ECA20C 8024050C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/EC9D00/func_80240510_ECA210.s b/ver/us/asm/nonmatchings/EC9D00/func_80240510_ECA210.s
deleted file mode 100644
index a1ec49381b..0000000000
--- a/ver/us/asm/nonmatchings/EC9D00/func_80240510_ECA210.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240510_ECA210
-/* ECA210 80240510 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* ECA214 80240514 AFBF0010 */  sw        $ra, 0x10($sp)
-/* ECA218 80240518 8C82000C */  lw        $v0, 0xc($a0)
-/* ECA21C 8024051C 0C0B53A3 */  jal       dead_evt_get_variable
-/* ECA220 80240520 8C450000 */   lw       $a1, ($v0)
-/* ECA224 80240524 0040202D */  daddu     $a0, $v0, $zero
-/* ECA228 80240528 8C830000 */  lw        $v1, ($a0)
-/* ECA22C 8024052C 34630010 */  ori       $v1, $v1, 0x10
-/* ECA230 80240530 AC830000 */  sw        $v1, ($a0)
-/* ECA234 80240534 8FBF0010 */  lw        $ra, 0x10($sp)
-/* ECA238 80240538 24020002 */  addiu     $v0, $zero, 2
-/* ECA23C 8024053C 03E00008 */  jr        $ra
-/* ECA240 80240540 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/EC9D00/func_80240544_ECA244.s b/ver/us/asm/nonmatchings/EC9D00/func_80240544_ECA244.s
deleted file mode 100644
index fca9ef3eb7..0000000000
--- a/ver/us/asm/nonmatchings/EC9D00/func_80240544_ECA244.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240544_ECA244
-/* ECA244 80240544 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* ECA248 80240548 AFBF0018 */  sw        $ra, 0x18($sp)
-/* ECA24C 8024054C 8C82000C */  lw        $v0, 0xc($a0)
-/* ECA250 80240550 0C0B53A3 */  jal       dead_evt_get_variable
-/* ECA254 80240554 8C450000 */   lw       $a1, ($v0)
-/* ECA258 80240558 0C0462EC */  jal       func_80118BB0
-/* ECA25C 8024055C 0040202D */   daddu    $a0, $v0, $zero
-/* ECA260 80240560 3C013F80 */  lui       $at, 0x3f80
-/* ECA264 80240564 44810000 */  mtc1      $at, $f0
-/* ECA268 80240568 C442004C */  lwc1      $f2, 0x4c($v0)
-/* ECA26C 8024056C E7A00010 */  swc1      $f0, 0x10($sp)
-/* ECA270 80240570 3C014148 */  lui       $at, 0x4148
-/* ECA274 80240574 44810000 */  mtc1      $at, $f0
-/* ECA278 80240578 2403004B */  addiu     $v1, $zero, 0x4b
-/* ECA27C 8024057C AFA30014 */  sw        $v1, 0x14($sp)
-/* ECA280 80240580 46001080 */  add.s     $f2, $f2, $f0
-/* ECA284 80240584 8C450048 */  lw        $a1, 0x48($v0)
-/* ECA288 80240588 8C470050 */  lw        $a3, 0x50($v0)
-/* ECA28C 8024058C 44061000 */  mfc1      $a2, $f2
-/* ECA290 80240590 0C01D78C */  jal       func_80075E30
-/* ECA294 80240594 24040004 */   addiu    $a0, $zero, 4
-/* ECA298 80240598 8FBF0018 */  lw        $ra, 0x18($sp)
-/* ECA29C 8024059C 24020002 */  addiu     $v0, $zero, 2
-/* ECA2A0 802405A0 03E00008 */  jr        $ra
-/* ECA2A4 802405A4 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EC9D00/func_802405A8_ECA2A8.s b/ver/us/asm/nonmatchings/EC9D00/func_802405A8_ECA2A8.s
deleted file mode 100644
index 821e875841..0000000000
--- a/ver/us/asm/nonmatchings/EC9D00/func_802405A8_ECA2A8.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802405A8_ECA2A8
-/* ECA2A8 802405A8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* ECA2AC 802405AC AFBF0018 */  sw        $ra, 0x18($sp)
-/* ECA2B0 802405B0 0C00F94D */  jal       dead_get_npc_safe
-/* ECA2B4 802405B4 2404FFFC */   addiu    $a0, $zero, -4
-/* ECA2B8 802405B8 C444003C */  lwc1      $f4, 0x3c($v0)
-/* ECA2BC 802405BC 3C014148 */  lui       $at, 0x4148
-/* ECA2C0 802405C0 44811000 */  mtc1      $at, $f2
-/* ECA2C4 802405C4 3C013F80 */  lui       $at, 0x3f80
-/* ECA2C8 802405C8 44810000 */  mtc1      $at, $f0
-/* ECA2CC 802405CC 2403001E */  addiu     $v1, $zero, 0x1e
-/* ECA2D0 802405D0 AFA30014 */  sw        $v1, 0x14($sp)
-/* ECA2D4 802405D4 46022100 */  add.s     $f4, $f4, $f2
-/* ECA2D8 802405D8 E7A00010 */  swc1      $f0, 0x10($sp)
-/* ECA2DC 802405DC 8C450038 */  lw        $a1, 0x38($v0)
-/* ECA2E0 802405E0 8C470040 */  lw        $a3, 0x40($v0)
-/* ECA2E4 802405E4 44062000 */  mfc1      $a2, $f4
-/* ECA2E8 802405E8 0C01D78C */  jal       func_80075E30
-/* ECA2EC 802405EC 24040009 */   addiu    $a0, $zero, 9
-/* ECA2F0 802405F0 8FBF0018 */  lw        $ra, 0x18($sp)
-/* ECA2F4 802405F4 24020002 */  addiu     $v0, $zero, 2
-/* ECA2F8 802405F8 03E00008 */  jr        $ra
-/* ECA2FC 802405FC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s b/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s
index 52bb158f74..b122710941 100644
--- a/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s
+++ b/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s
@@ -52,7 +52,7 @@ glabel func_80240600_ECA300
 /* ECA3BC 802406BC 4480A000 */  mtc1      $zero, $f20
 /* ECA3C0 802406C0 0C0B53A3 */  jal       dead_evt_get_variable
 /* ECA3C4 802406C4 0240802D */   daddu    $s0, $s2, $zero
-/* ECA3C8 802406C8 0C0462EC */  jal       func_80118BB0
+/* ECA3C8 802406C8 0C0462EC */  jal       dead_get_entity_by_index
 /* ECA3CC 802406CC 0040202D */   daddu    $a0, $v0, $zero
 /* ECA3D0 802406D0 AE42005C */  sw        $v0, 0x5c($s2)
 .L802406D4:
diff --git a/ver/us/asm/nonmatchings/EC9D00/func_80240B38_ECA838.s b/ver/us/asm/nonmatchings/EC9D00/func_80240B38_ECA838.s
deleted file mode 100644
index e5738d4709..0000000000
--- a/ver/us/asm/nonmatchings/EC9D00/func_80240B38_ECA838.s
+++ /dev/null
@@ -1,92 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240B38_ECA838
-/* ECA838 80240B38 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* ECA83C 80240B3C AFB10014 */  sw        $s1, 0x14($sp)
-/* ECA840 80240B40 0080882D */  daddu     $s1, $a0, $zero
-/* ECA844 80240B44 AFB20018 */  sw        $s2, 0x18($sp)
-/* ECA848 80240B48 AFBF001C */  sw        $ra, 0x1c($sp)
-/* ECA84C 80240B4C AFB00010 */  sw        $s0, 0x10($sp)
-/* ECA850 80240B50 8E30000C */  lw        $s0, 0xc($s1)
-/* ECA854 80240B54 10A00010 */  beqz      $a1, .L80240B98
-/* ECA858 80240B58 0000902D */   daddu    $s2, $zero, $zero
-/* ECA85C 80240B5C 8E050000 */  lw        $a1, ($s0)
-/* ECA860 80240B60 0C0B53A3 */  jal       dead_evt_get_variable
-/* ECA864 80240B64 26100004 */   addiu    $s0, $s0, 4
-/* ECA868 80240B68 AE220084 */  sw        $v0, 0x84($s1)
-/* ECA86C 80240B6C 8E050000 */  lw        $a1, ($s0)
-/* ECA870 80240B70 0C0B53A3 */  jal       dead_evt_get_variable
-/* ECA874 80240B74 0220202D */   daddu    $a0, $s1, $zero
-/* ECA878 80240B78 0240202D */  daddu     $a0, $s2, $zero
-/* ECA87C 80240B7C 240500D0 */  addiu     $a1, $zero, 0xd0
-/* ECA880 80240B80 00A0302D */  daddu     $a2, $a1, $zero
-/* ECA884 80240B84 00A0382D */  daddu     $a3, $a1, $zero
-/* ECA888 80240B88 AE220088 */  sw        $v0, 0x88($s1)
-/* ECA88C 80240B8C AE200070 */  sw        $zero, 0x70($s1)
-/* ECA890 80240B90 0C051080 */  jal       func_80144200
-/* ECA894 80240B94 AE200074 */   sw       $zero, 0x74($s1)
-.L80240B98:
-/* ECA898 80240B98 8E230070 */  lw        $v1, 0x70($s1)
-/* ECA89C 80240B9C 24040001 */  addiu     $a0, $zero, 1
-/* ECA8A0 80240BA0 10640019 */  beq       $v1, $a0, .L80240C08
-/* ECA8A4 80240BA4 28620002 */   slti     $v0, $v1, 2
-/* ECA8A8 80240BA8 10400005 */  beqz      $v0, .L80240BC0
-/* ECA8AC 80240BAC 24020002 */   addiu    $v0, $zero, 2
-/* ECA8B0 80240BB0 10600007 */  beqz      $v1, .L80240BD0
-/* ECA8B4 80240BB4 240500FF */   addiu    $a1, $zero, 0xff
-/* ECA8B8 80240BB8 08090312 */  j         .L80240C48
-/* ECA8BC 80240BBC 00000000 */   nop
-.L80240BC0:
-/* ECA8C0 80240BC0 10620019 */  beq       $v1, $v0, .L80240C28
-/* ECA8C4 80240BC4 00000000 */   nop
-/* ECA8C8 80240BC8 08090312 */  j         .L80240C48
-/* ECA8CC 80240BCC 00000000 */   nop
-.L80240BD0:
-/* ECA8D0 80240BD0 8E220074 */  lw        $v0, 0x74($s1)
-/* ECA8D4 80240BD4 14450004 */  bne       $v0, $a1, .L80240BE8
-/* ECA8D8 80240BD8 00000000 */   nop
-/* ECA8DC 80240BDC AE240070 */  sw        $a0, 0x70($s1)
-/* ECA8E0 80240BE0 AE200078 */  sw        $zero, 0x78($s1)
-/* ECA8E4 80240BE4 8E220074 */  lw        $v0, 0x74($s1)
-.L80240BE8:
-/* ECA8E8 80240BE8 8E230084 */  lw        $v1, 0x84($s1)
-/* ECA8EC 80240BEC 00431021 */  addu      $v0, $v0, $v1
-/* ECA8F0 80240BF0 AE220074 */  sw        $v0, 0x74($s1)
-/* ECA8F4 80240BF4 28420100 */  slti      $v0, $v0, 0x100
-/* ECA8F8 80240BF8 50400013 */  beql      $v0, $zero, .L80240C48
-/* ECA8FC 80240BFC AE250074 */   sw       $a1, 0x74($s1)
-/* ECA900 80240C00 08090312 */  j         .L80240C48
-/* ECA904 80240C04 00000000 */   nop
-.L80240C08:
-/* ECA908 80240C08 8E220078 */  lw        $v0, 0x78($s1)
-/* ECA90C 80240C0C 24420001 */  addiu     $v0, $v0, 1
-/* ECA910 80240C10 AE220078 */  sw        $v0, 0x78($s1)
-/* ECA914 80240C14 28420002 */  slti      $v0, $v0, 2
-/* ECA918 80240C18 1440000B */  bnez      $v0, .L80240C48
-/* ECA91C 80240C1C 24020002 */   addiu    $v0, $zero, 2
-/* ECA920 80240C20 08090312 */  j         .L80240C48
-/* ECA924 80240C24 AE220070 */   sw       $v0, 0x70($s1)
-.L80240C28:
-/* ECA928 80240C28 8E230074 */  lw        $v1, 0x74($s1)
-/* ECA92C 80240C2C 50600001 */  beql      $v1, $zero, .L80240C34
-/* ECA930 80240C30 24120001 */   addiu    $s2, $zero, 1
-.L80240C34:
-/* ECA934 80240C34 8E220088 */  lw        $v0, 0x88($s1)
-/* ECA938 80240C38 00621023 */  subu      $v0, $v1, $v0
-/* ECA93C 80240C3C 04410002 */  bgez      $v0, .L80240C48
-/* ECA940 80240C40 AE220074 */   sw       $v0, 0x74($s1)
-/* ECA944 80240C44 AE200074 */  sw        $zero, 0x74($s1)
-.L80240C48:
-/* ECA948 80240C48 C6200074 */  lwc1      $f0, 0x74($s1)
-/* ECA94C 80240C4C 46800020 */  cvt.s.w   $f0, $f0
-/* ECA950 80240C50 44050000 */  mfc1      $a1, $f0
-/* ECA954 80240C54 0C05105E */  jal       func_80144178
-/* ECA958 80240C58 24040001 */   addiu    $a0, $zero, 1
-/* ECA95C 80240C5C 0240102D */  daddu     $v0, $s2, $zero
-/* ECA960 80240C60 8FBF001C */  lw        $ra, 0x1c($sp)
-/* ECA964 80240C64 8FB20018 */  lw        $s2, 0x18($sp)
-/* ECA968 80240C68 8FB10014 */  lw        $s1, 0x14($sp)
-/* ECA96C 80240C6C 8FB00010 */  lw        $s0, 0x10($sp)
-/* ECA970 80240C70 03E00008 */  jr        $ra
-/* ECA974 80240C74 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EC9D00/func_80240D08_ECAA08.s b/ver/us/asm/nonmatchings/EC9D00/func_80240D08_ECAA08.s
deleted file mode 100644
index 46f2a998e7..0000000000
--- a/ver/us/asm/nonmatchings/EC9D00/func_80240D08_ECAA08.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240D08_ECAA08
-/* ECAA08 80240D08 3C038011 */  lui       $v1, %hi(D_80117160)
-/* ECAA0C 80240D0C 24637160 */  addiu     $v1, $v1, %lo(D_80117160)
-/* ECAA10 80240D10 AC800084 */  sw        $zero, 0x84($a0)
-/* ECAA14 80240D14 80620000 */  lb        $v0, ($v1)
-/* ECAA18 80240D18 10400005 */  beqz      $v0, .L80240D30
-/* ECAA1C 80240D1C 24020003 */   addiu    $v0, $zero, 3
-/* ECAA20 80240D20 80630003 */  lb        $v1, 3($v1)
-/* ECAA24 80240D24 14620002 */  bne       $v1, $v0, .L80240D30
-/* ECAA28 80240D28 24020001 */   addiu    $v0, $zero, 1
-/* ECAA2C 80240D2C AC820084 */  sw        $v0, 0x84($a0)
-.L80240D30:
-/* ECAA30 80240D30 03E00008 */  jr        $ra
-/* ECAA34 80240D34 24020002 */   addiu    $v0, $zero, 2
-/* ECAA38 80240D38 00000000 */  nop
-/* ECAA3C 80240D3C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/ECAA80/func_80240D80_ECAA80.s b/ver/us/asm/nonmatchings/ECAA80/func_80240D80_ECAA80.s
deleted file mode 100644
index b5ed061da6..0000000000
--- a/ver/us/asm/nonmatchings/ECAA80/func_80240D80_ECAA80.s
+++ /dev/null
@@ -1,401 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240D80_ECAA80
-/* ECAA80 80240D80 27BDFF68 */  addiu     $sp, $sp, -0x98
-/* ECAA84 80240D84 AFB60060 */  sw        $s6, 0x60($sp)
-/* ECAA88 80240D88 0080B02D */  daddu     $s6, $a0, $zero
-/* ECAA8C 80240D8C AFBF0064 */  sw        $ra, 0x64($sp)
-/* ECAA90 80240D90 AFB5005C */  sw        $s5, 0x5c($sp)
-/* ECAA94 80240D94 AFB40058 */  sw        $s4, 0x58($sp)
-/* ECAA98 80240D98 AFB30054 */  sw        $s3, 0x54($sp)
-/* ECAA9C 80240D9C AFB20050 */  sw        $s2, 0x50($sp)
-/* ECAAA0 80240DA0 AFB1004C */  sw        $s1, 0x4c($sp)
-/* ECAAA4 80240DA4 AFB00048 */  sw        $s0, 0x48($sp)
-/* ECAAA8 80240DA8 F7BE0090 */  sdc1      $f30, 0x90($sp)
-/* ECAAAC 80240DAC F7BC0088 */  sdc1      $f28, 0x88($sp)
-/* ECAAB0 80240DB0 F7BA0080 */  sdc1      $f26, 0x80($sp)
-/* ECAAB4 80240DB4 F7B80078 */  sdc1      $f24, 0x78($sp)
-/* ECAAB8 80240DB8 F7B60070 */  sdc1      $f22, 0x70($sp)
-/* ECAABC 80240DBC F7B40068 */  sdc1      $f20, 0x68($sp)
-/* ECAAC0 80240DC0 8ED20148 */  lw        $s2, 0x148($s6)
-/* ECAAC4 80240DC4 00A0882D */  daddu     $s1, $a1, $zero
-/* ECAAC8 80240DC8 86440008 */  lh        $a0, 8($s2)
-/* ECAACC 80240DCC 0C00F92F */  jal       dead_get_npc_unsafe
-/* ECAAD0 80240DD0 00C0A82D */   daddu    $s5, $a2, $zero
-/* ECAAD4 80240DD4 8E240020 */  lw        $a0, 0x20($s1)
-/* ECAAD8 80240DD8 0040802D */  daddu     $s0, $v0, $zero
-/* ECAADC 80240DDC 00041FC2 */  srl       $v1, $a0, 0x1f
-/* ECAAE0 80240DE0 00832021 */  addu      $a0, $a0, $v1
-/* ECAAE4 80240DE4 00042043 */  sra       $a0, $a0, 1
-/* ECAAE8 80240DE8 0C00AB3B */  jal       dead_rand_int
-/* ECAAEC 80240DEC 24840001 */   addiu    $a0, $a0, 1
-/* ECAAF0 80240DF0 8E230020 */  lw        $v1, 0x20($s1)
-/* ECAAF4 80240DF4 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* ECAAF8 80240DF8 000327C2 */  srl       $a0, $v1, 0x1f
-/* ECAAFC 80240DFC 00641821 */  addu      $v1, $v1, $a0
-/* ECAB00 80240E00 00031843 */  sra       $v1, $v1, 1
-/* ECAB04 80240E04 00621821 */  addu      $v1, $v1, $v0
-/* ECAB08 80240E08 A603008E */  sh        $v1, 0x8e($s0)
-/* ECAB0C 80240E0C 8E4200CC */  lw        $v0, 0xcc($s2)
-/* ECAB10 80240E10 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* ECAB14 80240E14 8C42000C */  lw        $v0, 0xc($v0)
-/* ECAB18 80240E18 AE020028 */  sw        $v0, 0x28($s0)
-/* ECAB1C 80240E1C C6200018 */  lwc1      $f0, 0x18($s1)
-/* ECAB20 80240E20 3C028010 */  lui       $v0, %hi(dead_gPlayerStatusPtr)
-/* ECAB24 80240E24 8C42FC90 */  lw        $v0, %lo(dead_gPlayerStatusPtr)($v0)
-/* ECAB28 80240E28 E6000018 */  swc1      $f0, 0x18($s0)
-/* ECAB2C 80240E2C 8C460028 */  lw        $a2, 0x28($v0)
-/* ECAB30 80240E30 8C470030 */  lw        $a3, 0x30($v0)
-/* ECAB34 80240E34 0C00ABDC */  jal       fio_validate_header_checksums
-/* ECAB38 80240E38 0000982D */   daddu    $s3, $zero, $zero
-/* ECAB3C 80240E3C 3C014334 */  lui       $at, 0x4334
-/* ECAB40 80240E40 44816000 */  mtc1      $at, $f12
-/* ECAB44 80240E44 0C00AB85 */  jal       dead_clamp_angle
-/* 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       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)
-/* ECAB64 80240E64 46001005 */  abs.s     $f0, $f2
-/* ECAB68 80240E68 44822000 */  mtc1      $v0, $f4
-/* ECAB6C 80240E6C 00000000 */  nop
-/* ECAB70 80240E70 46802120 */  cvt.s.w   $f4, $f4
-/* ECAB74 80240E74 4600203C */  c.lt.s    $f4, $f0
-/* ECAB78 80240E78 00000000 */  nop
-/* ECAB7C 80240E7C 4500000D */  bc1f      .L80240EB4
-/* ECAB80 80240E80 00000000 */   nop
-/* ECAB84 80240E84 44800000 */  mtc1      $zero, $f0
-/* ECAB88 80240E88 C614000C */  lwc1      $f20, 0xc($s0)
-/* ECAB8C 80240E8C 4600103C */  c.lt.s    $f2, $f0
-/* ECAB90 80240E90 00000000 */  nop
-/* ECAB94 80240E94 45000006 */  bc1f      .L80240EB0
-/* ECAB98 80240E98 00021023 */   negu     $v0, $v0
-/* ECAB9C 80240E9C 44820000 */  mtc1      $v0, $f0
-/* ECABA0 80240EA0 00000000 */  nop
-/* ECABA4 80240EA4 46800020 */  cvt.s.w   $f0, $f0
-/* ECABA8 80240EA8 080903AD */  j         .L80240EB4
-/* ECABAC 80240EAC 4600A500 */   add.s    $f20, $f20, $f0
-.L80240EB0:
-/* ECABB0 80240EB0 4604A500 */  add.s     $f20, $f20, $f4
-.L80240EB4:
-/* ECABB4 80240EB4 0C00AB85 */  jal       dead_clamp_angle
-/* ECABB8 80240EB8 4600A306 */   mov.s    $f12, $f20
-/* ECABBC 80240EBC 3C148010 */  lui       $s4, %hi(dead_gPlayerStatusPtr)
-/* ECABC0 80240EC0 2694FC90 */  addiu     $s4, $s4, %lo(dead_gPlayerStatusPtr)
-/* ECABC4 80240EC4 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* ECABC8 80240EC8 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* ECABCC 80240ECC 8E820000 */  lw        $v0, ($s4)
-/* ECABD0 80240ED0 C602003C */  lwc1      $f2, 0x3c($s0)
-/* ECABD4 80240ED4 E600000C */  swc1      $f0, 0xc($s0)
-/* ECABD8 80240ED8 46006006 */  mov.s     $f0, $f12
-/* ECABDC 80240EDC 8C460028 */  lw        $a2, 0x28($v0)
-/* ECABE0 80240EE0 8C470030 */  lw        $a3, 0x30($v0)
-/* ECABE4 80240EE4 46007106 */  mov.s     $f4, $f14
-/* ECABE8 80240EE8 E7A00020 */  swc1      $f0, 0x20($sp)
-/* ECABEC 80240EEC E7A20024 */  swc1      $f2, 0x24($sp)
-/* ECABF0 80240EF0 0C00ABDC */  jal       fio_validate_header_checksums
-/* ECABF4 80240EF4 E7A40028 */   swc1     $f4, 0x28($sp)
-/* ECABF8 80240EF8 3C014334 */  lui       $at, 0x4334
-/* ECABFC 80240EFC 44816000 */  mtc1      $at, $f12
-/* ECAC00 80240F00 0C00AB85 */  jal       dead_clamp_angle
-/* ECAC04 80240F04 460C0300 */   add.s    $f12, $f0, $f12
-/* ECAC08 80240F08 C6020018 */  lwc1      $f2, 0x18($s0)
-/* ECAC0C 80240F0C 3C014012 */  lui       $at, 0x4012
-/* ECAC10 80240F10 4481E800 */  mtc1      $at, $f29
-/* ECAC14 80240F14 4480E000 */  mtc1      $zero, $f28
-/* ECAC18 80240F18 460010A1 */  cvt.d.s   $f2, $f2
-/* ECAC1C 80240F1C 463C1082 */  mul.d     $f2, $f2, $f28
-/* ECAC20 80240F20 00000000 */  nop
-/* ECAC24 80240F24 46000506 */  mov.s     $f20, $f0
-/* ECAC28 80240F28 27A50020 */  addiu     $a1, $sp, 0x20
-/* ECAC2C 80240F2C 27A60024 */  addiu     $a2, $sp, 0x24
-/* ECAC30 80240F30 27A70028 */  addiu     $a3, $sp, 0x28
-/* ECAC34 80240F34 E7B40014 */  swc1      $f20, 0x14($sp)
-/* ECAC38 80240F38 462010A0 */  cvt.s.d   $f2, $f2
-/* ECAC3C 80240F3C E7A20010 */  swc1      $f2, 0x10($sp)
-/* ECAC40 80240F40 860200A8 */  lh        $v0, 0xa8($s0)
-/* ECAC44 80240F44 4480B000 */  mtc1      $zero, $f22
-/* ECAC48 80240F48 44820000 */  mtc1      $v0, $f0
-/* ECAC4C 80240F4C 00000000 */  nop
-/* ECAC50 80240F50 46800020 */  cvt.s.w   $f0, $f0
-/* ECAC54 80240F54 E7A00018 */  swc1      $f0, 0x18($sp)
-/* ECAC58 80240F58 860200A6 */  lh        $v0, 0xa6($s0)
-/* ECAC5C 80240F5C 4600B606 */  mov.s     $f24, $f22
-/* ECAC60 80240F60 44820000 */  mtc1      $v0, $f0
-/* ECAC64 80240F64 00000000 */  nop
-/* ECAC68 80240F68 46800020 */  cvt.s.w   $f0, $f0
-/* ECAC6C 80240F6C E7A0001C */  swc1      $f0, 0x1c($sp)
-/* ECAC70 80240F70 8E040080 */  lw        $a0, 0x80($s0)
-/* ECAC74 80240F74 0C0394EB */  jal       func_800E53AC
-/* ECAC78 80240F78 4600C686 */   mov.s    $f26, $f24
-/* ECAC7C 80240F7C 104000E1 */  beqz      $v0, .L80241304
-/* ECAC80 80240F80 00000000 */   nop
-/* 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       dead_dist2D
-/* ECAC94 80240F94 8FA70028 */   lw       $a3, 0x28($sp)
-/* ECAC98 80240F98 46000586 */  mov.s     $f22, $f0
-/* ECAC9C 80240F9C C6020038 */  lwc1      $f2, 0x38($s0)
-/* ECACA0 80240FA0 C604003C */  lwc1      $f4, 0x3c($s0)
-/* ECACA4 80240FA4 3C01420C */  lui       $at, 0x420c
-/* ECACA8 80240FA8 4481F000 */  mtc1      $at, $f30
-/* ECACAC 80240FAC C6000040 */  lwc1      $f0, 0x40($s0)
-/* ECACB0 80240FB0 461EA300 */  add.s     $f12, $f20, $f30
-/* ECACB4 80240FB4 E7A2002C */  swc1      $f2, 0x2c($sp)
-/* ECACB8 80240FB8 E7A40030 */  swc1      $f4, 0x30($sp)
-/* ECACBC 80240FBC 0C00AB85 */  jal       dead_clamp_angle
-/* ECACC0 80240FC0 E7A00034 */   swc1     $f0, 0x34($sp)
-/* ECACC4 80240FC4 C6020018 */  lwc1      $f2, 0x18($s0)
-/* ECACC8 80240FC8 460010A1 */  cvt.d.s   $f2, $f2
-/* ECACCC 80240FCC 463C1082 */  mul.d     $f2, $f2, $f28
-/* ECACD0 80240FD0 00000000 */  nop
-/* ECACD4 80240FD4 E7A00014 */  swc1      $f0, 0x14($sp)
-/* ECACD8 80240FD8 462010A0 */  cvt.s.d   $f2, $f2
-/* ECACDC 80240FDC E7A20010 */  swc1      $f2, 0x10($sp)
-/* ECACE0 80240FE0 860200A8 */  lh        $v0, 0xa8($s0)
-/* ECACE4 80240FE4 27A5002C */  addiu     $a1, $sp, 0x2c
-/* ECACE8 80240FE8 44820000 */  mtc1      $v0, $f0
-/* ECACEC 80240FEC 00000000 */  nop
-/* ECACF0 80240FF0 46800020 */  cvt.s.w   $f0, $f0
-/* ECACF4 80240FF4 E7A00018 */  swc1      $f0, 0x18($sp)
-/* ECACF8 80240FF8 860200A6 */  lh        $v0, 0xa6($s0)
-/* ECACFC 80240FFC 27A60030 */  addiu     $a2, $sp, 0x30
-/* ECAD00 80241000 44820000 */  mtc1      $v0, $f0
-/* ECAD04 80241004 00000000 */  nop
-/* ECAD08 80241008 46800020 */  cvt.s.w   $f0, $f0
-/* ECAD0C 8024100C E7A0001C */  swc1      $f0, 0x1c($sp)
-/* ECAD10 80241010 8E040080 */  lw        $a0, 0x80($s0)
-/* ECAD14 80241014 0C0394EB */  jal       func_800E53AC
-/* ECAD18 80241018 27A70034 */   addiu    $a3, $sp, 0x34
-/* ECAD1C 8024101C 10400007 */  beqz      $v0, .L8024103C
-/* ECAD20 80241020 00000000 */   nop
-/* 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       dead_dist2D
-/* ECAD34 80241034 8FA70034 */   lw       $a3, 0x34($sp)
-/* ECAD38 80241038 46000606 */  mov.s     $f24, $f0
-.L8024103C:
-/* ECAD3C 8024103C C6000038 */  lwc1      $f0, 0x38($s0)
-/* ECAD40 80241040 C602003C */  lwc1      $f2, 0x3c($s0)
-/* ECAD44 80241044 C6040040 */  lwc1      $f4, 0x40($s0)
-/* ECAD48 80241048 461EA301 */  sub.s     $f12, $f20, $f30
-/* ECAD4C 8024104C E7A00038 */  swc1      $f0, 0x38($sp)
-/* ECAD50 80241050 E7A2003C */  swc1      $f2, 0x3c($sp)
-/* ECAD54 80241054 0C00AB85 */  jal       dead_clamp_angle
-/* ECAD58 80241058 E7A40040 */   swc1     $f4, 0x40($sp)
-/* ECAD5C 8024105C C6020018 */  lwc1      $f2, 0x18($s0)
-/* ECAD60 80241060 460010A1 */  cvt.d.s   $f2, $f2
-/* ECAD64 80241064 463C1082 */  mul.d     $f2, $f2, $f28
-/* ECAD68 80241068 00000000 */  nop
-/* ECAD6C 8024106C E7A00014 */  swc1      $f0, 0x14($sp)
-/* ECAD70 80241070 462010A0 */  cvt.s.d   $f2, $f2
-/* ECAD74 80241074 E7A20010 */  swc1      $f2, 0x10($sp)
-/* ECAD78 80241078 860200A8 */  lh        $v0, 0xa8($s0)
-/* ECAD7C 8024107C 27A50038 */  addiu     $a1, $sp, 0x38
-/* ECAD80 80241080 44820000 */  mtc1      $v0, $f0
-/* ECAD84 80241084 00000000 */  nop
-/* ECAD88 80241088 46800020 */  cvt.s.w   $f0, $f0
-/* ECAD8C 8024108C E7A00018 */  swc1      $f0, 0x18($sp)
-/* ECAD90 80241090 860200A6 */  lh        $v0, 0xa6($s0)
-/* ECAD94 80241094 27A6003C */  addiu     $a2, $sp, 0x3c
-/* ECAD98 80241098 44820000 */  mtc1      $v0, $f0
-/* ECAD9C 8024109C 00000000 */  nop
-/* ECADA0 802410A0 46800020 */  cvt.s.w   $f0, $f0
-/* ECADA4 802410A4 E7A0001C */  swc1      $f0, 0x1c($sp)
-/* ECADA8 802410A8 8E040080 */  lw        $a0, 0x80($s0)
-/* ECADAC 802410AC 0C0394EB */  jal       func_800E53AC
-/* ECADB0 802410B0 27A70040 */   addiu    $a3, $sp, 0x40
-/* ECADB4 802410B4 10400007 */  beqz      $v0, .L802410D4
-/* ECADB8 802410B8 00000000 */   nop
-/* 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       dead_dist2D
-/* ECADCC 802410CC 8FA70040 */   lw       $a3, 0x40($sp)
-/* ECADD0 802410D0 46000686 */  mov.s     $f26, $f0
-.L802410D4:
-/* ECADD4 802410D4 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* ECADD8 802410D8 8E820000 */  lw        $v0, ($s4)
-/* ECADDC 802410DC C60E0040 */  lwc1      $f14, 0x40($s0)
-/* ECADE0 802410E0 8C460028 */  lw        $a2, 0x28($v0)
-/* 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
-/* ECADF4 802410F4 44811800 */  mtc1      $at, $f3
-/* ECADF8 802410F8 44801000 */  mtc1      $zero, $f2
-/* ECADFC 802410FC 46000021 */  cvt.d.s   $f0, $f0
-/* ECAE00 80241100 46220082 */  mul.d     $f2, $f0, $f2
-/* ECAE04 80241104 00000000 */  nop
-/* ECAE08 80241108 4600B021 */  cvt.d.s   $f0, $f22
-/* ECAE0C 8024110C 4622003C */  c.lt.d    $f0, $f2
-/* ECAE10 80241110 00000000 */  nop
-/* ECAE14 80241114 45000012 */  bc1f      .L80241160
-/* ECAE18 80241118 00000000 */   nop
-/* ECAE1C 8024111C 4600C021 */  cvt.d.s   $f0, $f24
-/* ECAE20 80241120 4622003C */  c.lt.d    $f0, $f2
-/* ECAE24 80241124 00000000 */  nop
-/* ECAE28 80241128 4500000D */  bc1f      .L80241160
-/* ECAE2C 8024112C 00000000 */   nop
-/* ECAE30 80241130 4600D021 */  cvt.d.s   $f0, $f26
-/* ECAE34 80241134 4622003C */  c.lt.d    $f0, $f2
-/* ECAE38 80241138 00000000 */  nop
-/* ECAE3C 8024113C 45000008 */  bc1f      .L80241160
-/* ECAE40 80241140 02A0202D */   daddu    $a0, $s5, $zero
-/* ECAE44 80241144 AFA00010 */  sw        $zero, 0x10($sp)
-/* ECAE48 80241148 8E26000C */  lw        $a2, 0xc($s1)
-/* ECAE4C 8024114C 8E270010 */  lw        $a3, 0x10($s1)
-/* ECAE50 80241150 0C013469 */  jal       func_8004D1A4
-/* ECAE54 80241154 0240282D */   daddu    $a1, $s2, $zero
-/* ECAE58 80241158 54400001 */  bnel      $v0, $zero, .L80241160
-/* ECAE5C 8024115C 24130001 */   addiu    $s3, $zero, 1
-.L80241160:
-/* ECAE60 80241160 1660006A */  bnez      $s3, .L8024130C
-/* ECAE64 80241164 2402000A */   addiu    $v0, $zero, 0xa
-/* ECAE68 80241168 4616C03C */  c.lt.s    $f24, $f22
-/* ECAE6C 8024116C 00000000 */  nop
-/* ECAE70 80241170 4500000C */  bc1f      .L802411A4
-/* ECAE74 80241174 00000000 */   nop
-/* ECAE78 80241178 4618D03C */  c.lt.s    $f26, $f24
-/* ECAE7C 8024117C 00000000 */  nop
-/* ECAE80 80241180 45000006 */  bc1f      .L8024119C
-/* ECAE84 80241184 00000000 */   nop
-/* ECAE88 80241188 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* ECAE8C 8024118C C60E0040 */  lwc1      $f14, 0x40($s0)
-/* ECAE90 80241190 8FA60020 */  lw        $a2, 0x20($sp)
-/* ECAE94 80241194 080904A2 */  j         .L80241288
-/* ECAE98 80241198 8FA70028 */   lw       $a3, 0x28($sp)
-.L8024119C:
-/* ECAE9C 8024119C 4616C03C */  c.lt.s    $f24, $f22
-/* ECAEA0 802411A0 00000000 */  nop
-.L802411A4:
-/* ECAEA4 802411A4 4500000A */  bc1f      .L802411D0
-/* ECAEA8 802411A8 00000000 */   nop
-/* ECAEAC 802411AC 461AC03C */  c.lt.s    $f24, $f26
-/* ECAEB0 802411B0 00000000 */  nop
-/* ECAEB4 802411B4 45000006 */  bc1f      .L802411D0
-/* ECAEB8 802411B8 00000000 */   nop
-/* ECAEBC 802411BC C60C0038 */  lwc1      $f12, 0x38($s0)
-/* ECAEC0 802411C0 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* ECAEC4 802411C4 8FA60020 */  lw        $a2, 0x20($sp)
-/* ECAEC8 802411C8 080904A2 */  j         .L80241288
-/* ECAECC 802411CC 8FA70028 */   lw       $a3, 0x28($sp)
-.L802411D0:
-/* ECAED0 802411D0 4618B03C */  c.lt.s    $f22, $f24
-/* ECAED4 802411D4 00000000 */  nop
-/* ECAED8 802411D8 4500000A */  bc1f      .L80241204
-/* ECAEDC 802411DC 00000000 */   nop
-/* ECAEE0 802411E0 4616D03C */  c.lt.s    $f26, $f22
-/* ECAEE4 802411E4 00000000 */  nop
-/* ECAEE8 802411E8 45000006 */  bc1f      .L80241204
-/* ECAEEC 802411EC 00000000 */   nop
-/* ECAEF0 802411F0 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* ECAEF4 802411F4 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* ECAEF8 802411F8 8FA6002C */  lw        $a2, 0x2c($sp)
-/* ECAEFC 802411FC 080904A2 */  j         .L80241288
-/* ECAF00 80241200 8FA70034 */   lw       $a3, 0x34($sp)
-.L80241204:
-/* ECAF04 80241204 4618D03C */  c.lt.s    $f26, $f24
-/* ECAF08 80241208 00000000 */  nop
-/* ECAF0C 8024120C 4500000A */  bc1f      .L80241238
-/* ECAF10 80241210 00000000 */   nop
-/* ECAF14 80241214 461AB03C */  c.lt.s    $f22, $f26
-/* ECAF18 80241218 00000000 */  nop
-/* ECAF1C 8024121C 45000008 */  bc1f      .L80241240
-/* ECAF20 80241220 00000000 */   nop
-/* ECAF24 80241224 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* ECAF28 80241228 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* ECAF2C 8024122C 8FA6002C */  lw        $a2, 0x2c($sp)
-/* ECAF30 80241230 080904A2 */  j         .L80241288
-/* ECAF34 80241234 8FA70034 */   lw       $a3, 0x34($sp)
-.L80241238:
-/* ECAF38 80241238 461AB03C */  c.lt.s    $f22, $f26
-/* ECAF3C 8024123C 00000000 */  nop
-.L80241240:
-/* ECAF40 80241240 45000005 */  bc1f      .L80241258
-/* ECAF44 80241244 00000000 */   nop
-/* ECAF48 80241248 4616C03C */  c.lt.s    $f24, $f22
-/* ECAF4C 8024124C 00000000 */  nop
-/* ECAF50 80241250 45010009 */  bc1t      .L80241278
-/* ECAF54 80241254 00000000 */   nop
-.L80241258:
-/* ECAF58 80241258 461AC03C */  c.lt.s    $f24, $f26
-/* ECAF5C 8024125C 00000000 */  nop
-/* ECAF60 80241260 4500000C */  bc1f      .L80241294
-/* ECAF64 80241264 00000000 */   nop
-/* ECAF68 80241268 4618B03C */  c.lt.s    $f22, $f24
-/* ECAF6C 8024126C 00000000 */  nop
-/* ECAF70 80241270 45000008 */  bc1f      .L80241294
-/* ECAF74 80241274 00000000 */   nop
-.L80241278:
-/* ECAF78 80241278 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* ECAF7C 8024127C C60E0040 */  lwc1      $f14, 0x40($s0)
-/* ECAF80 80241280 8FA60038 */  lw        $a2, 0x38($sp)
-/* ECAF84 80241284 8FA70040 */  lw        $a3, 0x40($sp)
-.L80241288:
-/* ECAF88 80241288 0C00ABDC */  jal       fio_validate_header_checksums
-/* ECAF8C 8024128C 00000000 */   nop
-/* ECAF90 80241290 46000506 */  mov.s     $f20, $f0
-.L80241294:
-/* ECAF94 80241294 C60C000C */  lwc1      $f12, 0xc($s0)
-/* 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)
-/* ECAFA8 802412A8 46001005 */  abs.s     $f0, $f2
-/* ECAFAC 802412AC 44822000 */  mtc1      $v0, $f4
-/* ECAFB0 802412B0 00000000 */  nop
-/* ECAFB4 802412B4 46802120 */  cvt.s.w   $f4, $f4
-/* ECAFB8 802412B8 4600203C */  c.lt.s    $f4, $f0
-/* ECAFBC 802412BC 00000000 */  nop
-/* ECAFC0 802412C0 4500000D */  bc1f      .L802412F8
-/* ECAFC4 802412C4 00000000 */   nop
-/* ECAFC8 802412C8 44800000 */  mtc1      $zero, $f0
-/* ECAFCC 802412CC C614000C */  lwc1      $f20, 0xc($s0)
-/* ECAFD0 802412D0 4600103C */  c.lt.s    $f2, $f0
-/* ECAFD4 802412D4 00000000 */  nop
-/* ECAFD8 802412D8 45000006 */  bc1f      .L802412F4
-/* ECAFDC 802412DC 00021023 */   negu     $v0, $v0
-/* ECAFE0 802412E0 44820000 */  mtc1      $v0, $f0
-/* ECAFE4 802412E4 00000000 */  nop
-/* ECAFE8 802412E8 46800020 */  cvt.s.w   $f0, $f0
-/* ECAFEC 802412EC 080904BE */  j         .L802412F8
-/* ECAFF0 802412F0 4600A500 */   add.s    $f20, $f20, $f0
-.L802412F4:
-/* ECAFF4 802412F4 4604A500 */  add.s     $f20, $f20, $f4
-.L802412F8:
-/* ECAFF8 802412F8 0C00AB85 */  jal       dead_clamp_angle
-/* ECAFFC 802412FC 4600A306 */   mov.s    $f12, $f20
-/* ECB000 80241300 E600000C */  swc1      $f0, 0xc($s0)
-.L80241304:
-/* ECB004 80241304 12600005 */  beqz      $s3, .L8024131C
-/* ECB008 80241308 2402000A */   addiu    $v0, $zero, 0xa
-.L8024130C:
-/* ECB00C 8024130C A602008E */  sh        $v0, 0x8e($s0)
-/* ECB010 80241310 8E4200CC */  lw        $v0, 0xcc($s2)
-/* ECB014 80241314 8C420020 */  lw        $v0, 0x20($v0)
-/* ECB018 80241318 AE020028 */  sw        $v0, 0x28($s0)
-.L8024131C:
-/* ECB01C 8024131C 2402000D */  addiu     $v0, $zero, 0xd
-/* ECB020 80241320 AEC20070 */  sw        $v0, 0x70($s6)
-/* ECB024 80241324 8FBF0064 */  lw        $ra, 0x64($sp)
-/* ECB028 80241328 8FB60060 */  lw        $s6, 0x60($sp)
-/* ECB02C 8024132C 8FB5005C */  lw        $s5, 0x5c($sp)
-/* ECB030 80241330 8FB40058 */  lw        $s4, 0x58($sp)
-/* ECB034 80241334 8FB30054 */  lw        $s3, 0x54($sp)
-/* ECB038 80241338 8FB20050 */  lw        $s2, 0x50($sp)
-/* ECB03C 8024133C 8FB1004C */  lw        $s1, 0x4c($sp)
-/* ECB040 80241340 8FB00048 */  lw        $s0, 0x48($sp)
-/* ECB044 80241344 D7BE0090 */  ldc1      $f30, 0x90($sp)
-/* ECB048 80241348 D7BC0088 */  ldc1      $f28, 0x88($sp)
-/* ECB04C 8024134C D7BA0080 */  ldc1      $f26, 0x80($sp)
-/* ECB050 80241350 D7B80078 */  ldc1      $f24, 0x78($sp)
-/* ECB054 80241354 D7B60070 */  ldc1      $f22, 0x70($sp)
-/* ECB058 80241358 D7B40068 */  ldc1      $f20, 0x68($sp)
-/* ECB05C 8024135C 03E00008 */  jr        $ra
-/* ECB060 80241360 27BD0098 */   addiu    $sp, $sp, 0x98
diff --git a/ver/us/asm/nonmatchings/ECAA80/func_802414C8_ECB1C8.s b/ver/us/asm/nonmatchings/ECAA80/func_802414C8_ECB1C8.s
deleted file mode 100644
index 0bcda036a3..0000000000
--- a/ver/us/asm/nonmatchings/ECAA80/func_802414C8_ECB1C8.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802414C8_ECB1C8
-/* ECB1C8 802414C8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* ECB1CC 802414CC AFB00010 */  sw        $s0, 0x10($sp)
-/* ECB1D0 802414D0 0080802D */  daddu     $s0, $a0, $zero
-/* ECB1D4 802414D4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* ECB1D8 802414D8 8E020148 */  lw        $v0, 0x148($s0)
-/* ECB1DC 802414DC 0C00F92F */  jal       dead_get_npc_unsafe
-/* ECB1E0 802414E0 84440008 */   lh       $a0, 8($v0)
-/* ECB1E4 802414E4 9443008E */  lhu       $v1, 0x8e($v0)
-/* ECB1E8 802414E8 2463FFFF */  addiu     $v1, $v1, -1
-/* ECB1EC 802414EC A443008E */  sh        $v1, 0x8e($v0)
-/* ECB1F0 802414F0 00031C00 */  sll       $v1, $v1, 0x10
-/* ECB1F4 802414F4 50600001 */  beql      $v1, $zero, .L802414FC
-/* ECB1F8 802414F8 AE000070 */   sw       $zero, 0x70($s0)
-.L802414FC:
-/* ECB1FC 802414FC 8FBF0014 */  lw        $ra, 0x14($sp)
-/* ECB200 80241500 8FB00010 */  lw        $s0, 0x10($sp)
-/* ECB204 80241504 03E00008 */  jr        $ra
-/* ECB208 80241508 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/ECAA80/func_802417CC_ECB4CC.s b/ver/us/asm/nonmatchings/ECAA80/func_802417CC_ECB4CC.s
deleted file mode 100644
index 873c4c8702..0000000000
--- a/ver/us/asm/nonmatchings/ECAA80/func_802417CC_ECB4CC.s
+++ /dev/null
@@ -1,122 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802417CC_ECB4CC
-/* ECB4CC 802417CC 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* ECB4D0 802417D0 AFB10014 */  sw        $s1, 0x14($sp)
-/* ECB4D4 802417D4 0080882D */  daddu     $s1, $a0, $zero
-/* ECB4D8 802417D8 AFBF0024 */  sw        $ra, 0x24($sp)
-/* ECB4DC 802417DC AFB40020 */  sw        $s4, 0x20($sp)
-/* ECB4E0 802417E0 AFB3001C */  sw        $s3, 0x1c($sp)
-/* ECB4E4 802417E4 AFB20018 */  sw        $s2, 0x18($sp)
-/* ECB4E8 802417E8 AFB00010 */  sw        $s0, 0x10($sp)
-/* ECB4EC 802417EC F7BC0048 */  sdc1      $f28, 0x48($sp)
-/* ECB4F0 802417F0 F7BA0040 */  sdc1      $f26, 0x40($sp)
-/* ECB4F4 802417F4 F7B80038 */  sdc1      $f24, 0x38($sp)
-/* ECB4F8 802417F8 F7B60030 */  sdc1      $f22, 0x30($sp)
-/* ECB4FC 802417FC F7B40028 */  sdc1      $f20, 0x28($sp)
-/* ECB500 80241800 8E30000C */  lw        $s0, 0xc($s1)
-/* ECB504 80241804 8E130000 */  lw        $s3, ($s0)
-/* ECB508 80241808 26100004 */  addiu     $s0, $s0, 4
-/* ECB50C 8024180C 0C0B53A3 */  jal       dead_evt_get_variable
-/* ECB510 80241810 0260282D */   daddu    $a1, $s3, $zero
-/* ECB514 80241814 4482E000 */  mtc1      $v0, $f28
-/* ECB518 80241818 00000000 */  nop
-/* ECB51C 8024181C 4680E720 */  cvt.s.w   $f28, $f28
-/* ECB520 80241820 8E140000 */  lw        $s4, ($s0)
-/* ECB524 80241824 26100004 */  addiu     $s0, $s0, 4
-/* ECB528 80241828 0220202D */  daddu     $a0, $s1, $zero
-/* ECB52C 8024182C 0C0B53A3 */  jal       dead_evt_get_variable
-/* ECB530 80241830 0280282D */   daddu    $a1, $s4, $zero
-/* ECB534 80241834 4482D000 */  mtc1      $v0, $f26
-/* ECB538 80241838 00000000 */  nop
-/* ECB53C 8024183C 4680D6A0 */  cvt.s.w   $f26, $f26
-/* ECB540 80241840 8E100000 */  lw        $s0, ($s0)
-/* ECB544 80241844 0220202D */  daddu     $a0, $s1, $zero
-/* ECB548 80241848 0C0B53A3 */  jal       dead_evt_get_variable
-/* ECB54C 8024184C 0200282D */   daddu    $a1, $s0, $zero
-/* ECB550 80241850 4482C000 */  mtc1      $v0, $f24
-/* ECB554 80241854 00000000 */  nop
-/* ECB558 80241858 4680C620 */  cvt.s.w   $f24, $f24
-/* ECB55C 8024185C 3C128011 */  lui       $s2, %hi(dead_gPlayerStatus)
-/* ECB560 80241860 26527578 */  addiu     $s2, $s2, %lo(dead_gPlayerStatus)
-/* ECB564 80241864 3C038008 */  lui       $v1, %hi(dead_gCurrentCameraID)
-/* ECB568 80241868 8C63C760 */  lw        $v1, %lo(dead_gCurrentCameraID)($v1)
-/* ECB56C 8024186C C64200A8 */  lwc1      $f2, 0xa8($s2)
-/* ECB570 80241870 44800000 */  mtc1      $zero, $f0
-/* ECB574 80241874 00031080 */  sll       $v0, $v1, 2
-/* ECB578 80241878 00431021 */  addu      $v0, $v0, $v1
-/* ECB57C 8024187C 00021080 */  sll       $v0, $v0, 2
-/* ECB580 80241880 00431023 */  subu      $v0, $v0, $v1
-/* ECB584 80241884 000218C0 */  sll       $v1, $v0, 3
-/* ECB588 80241888 00431021 */  addu      $v0, $v0, $v1
-/* ECB58C 8024188C 000210C0 */  sll       $v0, $v0, 3
-/* ECB590 80241890 46001032 */  c.eq.s    $f2, $f0
-/* ECB594 80241894 3C01800C */  lui       $at, %hi(D_800B8DEC)
-/* ECB598 80241898 00220821 */  addu      $at, $at, $v0
-/* ECB59C 8024189C C4368DEC */  lwc1      $f22, %lo(D_800B8DEC)($at)
-/* ECB5A0 802418A0 45000005 */  bc1f      .L802418B8
-/* ECB5A4 802418A4 00000000 */   nop
-/* ECB5A8 802418A8 3C0142C8 */  lui       $at, 0x42c8
-/* ECB5AC 802418AC 44810000 */  mtc1      $at, $f0
-/* ECB5B0 802418B0 08090632 */  j         .L802418C8
-/* ECB5B4 802418B4 4600B581 */   sub.s    $f22, $f22, $f0
-.L802418B8:
-/* ECB5B8 802418B8 3C0142C8 */  lui       $at, 0x42c8
-/* ECB5BC 802418BC 44810000 */  mtc1      $at, $f0
-/* ECB5C0 802418C0 00000000 */  nop
-/* ECB5C4 802418C4 4600B580 */  add.s     $f22, $f22, $f0
-.L802418C8:
-/* ECB5C8 802418C8 0C00AB85 */  jal       dead_clamp_angle
-/* ECB5CC 802418CC 4600B306 */   mov.s    $f12, $f22
-/* ECB5D0 802418D0 46000586 */  mov.s     $f22, $f0
-/* ECB5D4 802418D4 3C014170 */  lui       $at, 0x4170
-/* ECB5D8 802418D8 4481A000 */  mtc1      $at, $f20
-/* 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
-/* ECB5EC 802418EC 864200B0 */  lh        $v0, 0xb0($s2)
-/* ECB5F0 802418F0 3C013F00 */  lui       $at, 0x3f00
-/* ECB5F4 802418F4 44812000 */  mtc1      $at, $f4
-/* ECB5F8 802418F8 44821000 */  mtc1      $v0, $f2
-/* ECB5FC 802418FC 00000000 */  nop
-/* ECB600 80241900 468010A0 */  cvt.s.w   $f2, $f2
-/* ECB604 80241904 46041082 */  mul.s     $f2, $f2, $f4
-/* ECB608 80241908 00000000 */  nop
-/* ECB60C 8024190C 4600E700 */  add.s     $f28, $f28, $f0
-/* ECB610 80241910 4602D680 */  add.s     $f26, $f26, $f2
-/* 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
-/* ECB624 80241924 0220202D */  daddu     $a0, $s1, $zero
-/* ECB628 80241928 0260282D */  daddu     $a1, $s3, $zero
-/* ECB62C 8024192C 4600E18D */  trunc.w.s $f6, $f28
-/* ECB630 80241930 44063000 */  mfc1      $a2, $f6
-/* ECB634 80241934 0C0B551A */  jal       dead_evt_set_variable
-/* ECB638 80241938 4600C601 */   sub.s    $f24, $f24, $f0
-/* ECB63C 8024193C 0220202D */  daddu     $a0, $s1, $zero
-/* ECB640 80241940 4600D18D */  trunc.w.s $f6, $f26
-/* ECB644 80241944 44063000 */  mfc1      $a2, $f6
-/* ECB648 80241948 0C0B551A */  jal       dead_evt_set_variable
-/* ECB64C 8024194C 0280282D */   daddu    $a1, $s4, $zero
-/* ECB650 80241950 0220202D */  daddu     $a0, $s1, $zero
-/* ECB654 80241954 4600C18D */  trunc.w.s $f6, $f24
-/* ECB658 80241958 44063000 */  mfc1      $a2, $f6
-/* ECB65C 8024195C 0C0B551A */  jal       dead_evt_set_variable
-/* ECB660 80241960 0200282D */   daddu    $a1, $s0, $zero
-/* ECB664 80241964 8FBF0024 */  lw        $ra, 0x24($sp)
-/* ECB668 80241968 8FB40020 */  lw        $s4, 0x20($sp)
-/* ECB66C 8024196C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* ECB670 80241970 8FB20018 */  lw        $s2, 0x18($sp)
-/* ECB674 80241974 8FB10014 */  lw        $s1, 0x14($sp)
-/* ECB678 80241978 8FB00010 */  lw        $s0, 0x10($sp)
-/* ECB67C 8024197C D7BC0048 */  ldc1      $f28, 0x48($sp)
-/* ECB680 80241980 D7BA0040 */  ldc1      $f26, 0x40($sp)
-/* ECB684 80241984 D7B80038 */  ldc1      $f24, 0x38($sp)
-/* ECB688 80241988 D7B60030 */  ldc1      $f22, 0x30($sp)
-/* ECB68C 8024198C D7B40028 */  ldc1      $f20, 0x28($sp)
-/* ECB690 80241990 24020002 */  addiu     $v0, $zero, 2
-/* ECB694 80241994 03E00008 */  jr        $ra
-/* ECB698 80241998 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/ECAA80/func_80241AC4_ECB7C4.s b/ver/us/asm/nonmatchings/ECAA80/func_80241AC4_ECB7C4.s
deleted file mode 100644
index 357325d3bc..0000000000
--- a/ver/us/asm/nonmatchings/ECAA80/func_80241AC4_ECB7C4.s
+++ /dev/null
@@ -1,53 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241AC4_ECB7C4
-/* ECB7C4 80241AC4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* ECB7C8 80241AC8 AFB10014 */  sw        $s1, 0x14($sp)
-/* ECB7CC 80241ACC 0080882D */  daddu     $s1, $a0, $zero
-/* ECB7D0 80241AD0 AFBF0020 */  sw        $ra, 0x20($sp)
-/* ECB7D4 80241AD4 AFB3001C */  sw        $s3, 0x1c($sp)
-/* ECB7D8 80241AD8 AFB20018 */  sw        $s2, 0x18($sp)
-/* ECB7DC 80241ADC AFB00010 */  sw        $s0, 0x10($sp)
-/* ECB7E0 80241AE0 8E30000C */  lw        $s0, 0xc($s1)
-/* ECB7E4 80241AE4 8E050000 */  lw        $a1, ($s0)
-/* ECB7E8 80241AE8 0C0B53A3 */  jal       dead_evt_get_variable
-/* ECB7EC 80241AEC 26100004 */   addiu    $s0, $s0, 4
-/* ECB7F0 80241AF0 8E050000 */  lw        $a1, ($s0)
-/* ECB7F4 80241AF4 26100004 */  addiu     $s0, $s0, 4
-/* ECB7F8 80241AF8 0220202D */  daddu     $a0, $s1, $zero
-/* ECB7FC 80241AFC 0C0B53A3 */  jal       dead_evt_get_variable
-/* ECB800 80241B00 0040982D */   daddu    $s3, $v0, $zero
-/* ECB804 80241B04 8E050000 */  lw        $a1, ($s0)
-/* ECB808 80241B08 26100004 */  addiu     $s0, $s0, 4
-/* ECB80C 80241B0C 0220202D */  daddu     $a0, $s1, $zero
-/* ECB810 80241B10 0C0B53A3 */  jal       dead_evt_get_variable
-/* ECB814 80241B14 0040902D */   daddu    $s2, $v0, $zero
-/* ECB818 80241B18 0220202D */  daddu     $a0, $s1, $zero
-/* ECB81C 80241B1C 8E050000 */  lw        $a1, ($s0)
-/* ECB820 80241B20 0C0B53A3 */  jal       dead_evt_get_variable
-/* ECB824 80241B24 0040882D */   daddu    $s1, $v0, $zero
-/* ECB828 80241B28 0260202D */  daddu     $a0, $s3, $zero
-/* ECB82C 80241B2C 0C04F3E6 */  jal       func_8013CF98
-/* ECB830 80241B30 0040802D */   daddu    $s0, $v0, $zero
-/* ECB834 80241B34 0040182D */  daddu     $v1, $v0, $zero
-/* ECB838 80241B38 44920000 */  mtc1      $s2, $f0
-/* ECB83C 80241B3C 00000000 */  nop
-/* ECB840 80241B40 46800020 */  cvt.s.w   $f0, $f0
-/* ECB844 80241B44 E4600008 */  swc1      $f0, 8($v1)
-/* ECB848 80241B48 44910000 */  mtc1      $s1, $f0
-/* ECB84C 80241B4C 00000000 */  nop
-/* ECB850 80241B50 46800020 */  cvt.s.w   $f0, $f0
-/* ECB854 80241B54 E460000C */  swc1      $f0, 0xc($v1)
-/* ECB858 80241B58 44900000 */  mtc1      $s0, $f0
-/* ECB85C 80241B5C 00000000 */  nop
-/* ECB860 80241B60 46800020 */  cvt.s.w   $f0, $f0
-/* ECB864 80241B64 E4600010 */  swc1      $f0, 0x10($v1)
-/* ECB868 80241B68 8FBF0020 */  lw        $ra, 0x20($sp)
-/* ECB86C 80241B6C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* ECB870 80241B70 8FB20018 */  lw        $s2, 0x18($sp)
-/* ECB874 80241B74 8FB10014 */  lw        $s1, 0x14($sp)
-/* ECB878 80241B78 8FB00010 */  lw        $s0, 0x10($sp)
-/* ECB87C 80241B7C 24020002 */  addiu     $v0, $zero, 2
-/* ECB880 80241B80 03E00008 */  jr        $ra
-/* ECB884 80241B84 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/ECAA80/func_80241B88_ECB888.s b/ver/us/asm/nonmatchings/ECAA80/func_80241B88_ECB888.s
deleted file mode 100644
index 5edbabb2c4..0000000000
--- a/ver/us/asm/nonmatchings/ECAA80/func_80241B88_ECB888.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241B88_ECB888
-/* ECB888 80241B88 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* ECB88C 80241B8C AFB00010 */  sw        $s0, 0x10($sp)
-/* ECB890 80241B90 0080802D */  daddu     $s0, $a0, $zero
-/* ECB894 80241B94 AFBF0014 */  sw        $ra, 0x14($sp)
-/* ECB898 80241B98 8E02000C */  lw        $v0, 0xc($s0)
-/* ECB89C 80241B9C 0C0B53A3 */  jal       dead_evt_get_variable
-/* ECB8A0 80241BA0 8C450000 */   lw       $a1, ($v0)
-/* ECB8A4 80241BA4 3C048009 */  lui       $a0, %hi(dead_gItemTable)
-/* ECB8A8 80241BA8 2484D2C0 */  addiu     $a0, $a0, %lo(dead_gItemTable)
-/* ECB8AC 80241BAC 00021940 */  sll       $v1, $v0, 5
-/* ECB8B0 80241BB0 00642021 */  addu      $a0, $v1, $a0
-/* ECB8B4 80241BB4 240300BB */  addiu     $v1, $zero, 0xbb
-/* ECB8B8 80241BB8 14430003 */  bne       $v0, $v1, .L80241BC8
-/* ECB8BC 80241BBC 24020002 */   addiu    $v0, $zero, 2
-/* ECB8C0 80241BC0 080906F9 */  j         .L80241BE4
-/* ECB8C4 80241BC4 AE0200A8 */   sw       $v0, 0xa8($s0)
-.L80241BC8:
-/* ECB8C8 80241BC8 94820018 */  lhu       $v0, 0x18($a0)
-/* ECB8CC 80241BCC 30420080 */  andi      $v0, $v0, 0x80
-/* ECB8D0 80241BD0 10400003 */  beqz      $v0, .L80241BE0
-/* ECB8D4 80241BD4 24020001 */   addiu    $v0, $zero, 1
-/* ECB8D8 80241BD8 080906F9 */  j         .L80241BE4
-/* ECB8DC 80241BDC AE0200A8 */   sw       $v0, 0xa8($s0)
-.L80241BE0:
-/* ECB8E0 80241BE0 AE0000A8 */  sw        $zero, 0xa8($s0)
-.L80241BE4:
-/* ECB8E4 80241BE4 8FBF0014 */  lw        $ra, 0x14($sp)
-/* ECB8E8 80241BE8 8FB00010 */  lw        $s0, 0x10($sp)
-/* ECB8EC 80241BEC 24020002 */  addiu     $v0, $zero, 2
-/* ECB8F0 80241BF0 03E00008 */  jr        $ra
-/* ECB8F4 80241BF4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/ECAA80/func_80241BF8_ECB8F8.s b/ver/us/asm/nonmatchings/ECAA80/func_80241BF8_ECB8F8.s
deleted file mode 100644
index b1f91920e3..0000000000
--- a/ver/us/asm/nonmatchings/ECAA80/func_80241BF8_ECB8F8.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241BF8_ECB8F8
-/* ECB8F8 80241BF8 2404005A */  addiu     $a0, $zero, 0x5a
-/* ECB8FC 80241BFC 3C038024 */  lui       $v1, %hi(D_802465C8_915C78)
-/* ECB900 80241C00 246365C8 */  addiu     $v1, $v1, %lo(D_802465C8_915C78)
-/* ECB904 80241C04 240200DA */  addiu     $v0, $zero, 0xda
-.L80241C08:
-/* ECB908 80241C08 AC620000 */  sw        $v0, ($v1)
-/* ECB90C 80241C0C 2463FFFC */  addiu     $v1, $v1, -4
-/* ECB910 80241C10 2484FFFF */  addiu     $a0, $a0, -1
-/* ECB914 80241C14 0481FFFC */  bgez      $a0, .L80241C08
-/* ECB918 80241C18 2442FFFF */   addiu    $v0, $v0, -1
-/* ECB91C 80241C1C 3C018024 */  lui       $at, %hi(D_802465CC)
-/* ECB920 80241C20 AC2065CC */  sw        $zero, %lo(D_802465CC)($at)
-/* ECB924 80241C24 03E00008 */  jr        $ra
-/* ECB928 80241C28 24020002 */   addiu    $v0, $zero, 2
-/* ECB92C 80241C2C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/ECBB70/func_80241E70_ECBB70.s b/ver/us/asm/nonmatchings/ECBB70/func_80241E70_ECBB70.s
deleted file mode 100644
index 278ea15a0c..0000000000
--- a/ver/us/asm/nonmatchings/ECBB70/func_80241E70_ECBB70.s
+++ /dev/null
@@ -1,45 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241E70_ECBB70
-/* ECBB70 80241E70 8C820084 */  lw        $v0, 0x84($a0)
-/* ECBB74 80241E74 8C830090 */  lw        $v1, 0x90($a0)
-/* ECBB78 80241E78 00431023 */  subu      $v0, $v0, $v1
-/* ECBB7C 80241E7C 44821000 */  mtc1      $v0, $f2
-/* ECBB80 80241E80 00000000 */  nop
-/* ECBB84 80241E84 468010A0 */  cvt.s.w   $f2, $f2
-/* ECBB88 80241E88 8C820088 */  lw        $v0, 0x88($a0)
-/* ECBB8C 80241E8C 8C830094 */  lw        $v1, 0x94($a0)
-/* ECBB90 80241E90 46021082 */  mul.s     $f2, $f2, $f2
-/* ECBB94 80241E94 00000000 */  nop
-/* ECBB98 80241E98 00431023 */  subu      $v0, $v0, $v1
-/* ECBB9C 80241E9C 44822000 */  mtc1      $v0, $f4
-/* ECBBA0 80241EA0 00000000 */  nop
-/* ECBBA4 80241EA4 46802120 */  cvt.s.w   $f4, $f4
-/* ECBBA8 80241EA8 8C82008C */  lw        $v0, 0x8c($a0)
-/* ECBBAC 80241EAC 46042102 */  mul.s     $f4, $f4, $f4
-/* ECBBB0 80241EB0 00000000 */  nop
-/* ECBBB4 80241EB4 8C830098 */  lw        $v1, 0x98($a0)
-/* ECBBB8 80241EB8 00431023 */  subu      $v0, $v0, $v1
-/* ECBBBC 80241EBC 44820000 */  mtc1      $v0, $f0
-/* ECBBC0 80241EC0 00000000 */  nop
-/* ECBBC4 80241EC4 46800020 */  cvt.s.w   $f0, $f0
-/* ECBBC8 80241EC8 46000002 */  mul.s     $f0, $f0, $f0
-/* ECBBCC 80241ECC 00000000 */  nop
-/* ECBBD0 80241ED0 46041080 */  add.s     $f2, $f2, $f4
-/* ECBBD4 80241ED4 46001080 */  add.s     $f2, $f2, $f0
-/* ECBBD8 80241ED8 3C014561 */  lui       $at, 0x4561
-/* ECBBDC 80241EDC 44810000 */  mtc1      $at, $f0
-/* ECBBE0 80241EE0 00000000 */  nop
-/* ECBBE4 80241EE4 4600103C */  c.lt.s    $f2, $f0
-/* ECBBE8 80241EE8 00000000 */  nop
-/* ECBBEC 80241EEC 45010002 */  bc1t      .L80241EF8
-/* ECBBF0 80241EF0 24020001 */   addiu    $v0, $zero, 1
-/* ECBBF4 80241EF4 0000102D */  daddu     $v0, $zero, $zero
-.L80241EF8:
-/* ECBBF8 80241EF8 AC820084 */  sw        $v0, 0x84($a0)
-/* ECBBFC 80241EFC 03E00008 */  jr        $ra
-/* ECBC00 80241F00 24020002 */   addiu    $v0, $zero, 2
-/* ECBC04 80241F04 00000000 */  nop
-/* ECBC08 80241F08 00000000 */  nop
-/* ECBC0C 80241F0C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/ED0030/func_80240040_ED0030.s b/ver/us/asm/nonmatchings/ED0030/func_80240040_ED0030.s
deleted file mode 100644
index 0686f01380..0000000000
--- a/ver/us/asm/nonmatchings/ED0030/func_80240040_ED0030.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_ED0030
-/* ED0030 80240040 8C820084 */  lw        $v0, 0x84($a0)
-/* ED0034 80240044 8C830090 */  lw        $v1, 0x90($a0)
-/* ED0038 80240048 00431023 */  subu      $v0, $v0, $v1
-/* ED003C 8024004C 44821000 */  mtc1      $v0, $f2
-/* ED0040 80240050 00000000 */  nop
-/* ED0044 80240054 468010A0 */  cvt.s.w   $f2, $f2
-/* ED0048 80240058 8C820088 */  lw        $v0, 0x88($a0)
-/* ED004C 8024005C 8C830094 */  lw        $v1, 0x94($a0)
-/* ED0050 80240060 46021082 */  mul.s     $f2, $f2, $f2
-/* ED0054 80240064 00000000 */  nop
-/* ED0058 80240068 00431023 */  subu      $v0, $v0, $v1
-/* ED005C 8024006C 44822000 */  mtc1      $v0, $f4
-/* ED0060 80240070 00000000 */  nop
-/* ED0064 80240074 46802120 */  cvt.s.w   $f4, $f4
-/* ED0068 80240078 8C82008C */  lw        $v0, 0x8c($a0)
-/* ED006C 8024007C 46042102 */  mul.s     $f4, $f4, $f4
-/* ED0070 80240080 00000000 */  nop
-/* ED0074 80240084 8C830098 */  lw        $v1, 0x98($a0)
-/* ED0078 80240088 00431023 */  subu      $v0, $v0, $v1
-/* ED007C 8024008C 44820000 */  mtc1      $v0, $f0
-/* ED0080 80240090 00000000 */  nop
-/* ED0084 80240094 46800020 */  cvt.s.w   $f0, $f0
-/* ED0088 80240098 46000002 */  mul.s     $f0, $f0, $f0
-/* ED008C 8024009C 00000000 */  nop
-/* ED0090 802400A0 46041080 */  add.s     $f2, $f2, $f4
-/* ED0094 802400A4 46001080 */  add.s     $f2, $f2, $f0
-/* ED0098 802400A8 3C014561 */  lui       $at, 0x4561
-/* ED009C 802400AC 44810000 */  mtc1      $at, $f0
-/* ED00A0 802400B0 00000000 */  nop
-/* ED00A4 802400B4 4600103C */  c.lt.s    $f2, $f0
-/* ED00A8 802400B8 00000000 */  nop
-/* ED00AC 802400BC 45010002 */  bc1t      .L802400C8
-/* ED00B0 802400C0 24020001 */   addiu    $v0, $zero, 1
-/* ED00B4 802400C4 0000102D */  daddu     $v0, $zero, $zero
-.L802400C8:
-/* ED00B8 802400C8 AC820084 */  sw        $v0, 0x84($a0)
-/* ED00BC 802400CC 03E00008 */  jr        $ra
-/* ED00C0 802400D0 24020002 */   addiu    $v0, $zero, 2
-/* ED00C4 802400D4 00000000 */  nop
-/* ED00C8 802400D8 00000000 */  nop
-/* ED00CC 802400DC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/ED4220/func_80240000_ED4220.s b/ver/us/asm/nonmatchings/ED4220/func_80240000_ED4220.s
deleted file mode 100644
index 12ae97ea74..0000000000
--- a/ver/us/asm/nonmatchings/ED4220/func_80240000_ED4220.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_ED4220
-/* ED4220 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* ED4224 80240004 AFBF0010 */  sw        $ra, 0x10($sp)
-/* ED4228 80240008 3C05F5DE */  lui       $a1, 0xf5de
-/* ED422C 8024000C 34A50180 */  ori       $a1, $a1, 0x180
-/* ED4230 80240010 0C0B53A3 */  jal       dead_evt_get_variable
-/* ED4234 80240014 0000202D */   daddu    $a0, $zero, $zero
-/* ED4238 80240018 28430031 */  slti      $v1, $v0, 0x31
-/* ED423C 8024001C 3C020019 */  lui       $v0, 0x19
-/* ED4240 80240020 14600003 */  bnez      $v1, .L80240030
-/* ED4244 80240024 34420119 */   ori      $v0, $v0, 0x119
-/* ED4248 80240028 3C020019 */  lui       $v0, 0x19
-/* ED424C 8024002C 3442011A */  ori       $v0, $v0, 0x11a
-.L80240030:
-/* ED4250 80240030 8FBF0010 */  lw        $ra, 0x10($sp)
-/* ED4254 80240034 03E00008 */  jr        $ra
-/* ED4258 80240038 27BD0018 */   addiu    $sp, $sp, 0x18
-/* ED425C 8024003C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/ED42A0/func_802402BC_ED44DC.s b/ver/us/asm/nonmatchings/ED42A0/func_802402BC_ED44DC.s
deleted file mode 100644
index 2cfa691104..0000000000
--- a/ver/us/asm/nonmatchings/ED42A0/func_802402BC_ED44DC.s
+++ /dev/null
@@ -1,146 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402BC_ED44DC
-/* ED44DC 802402BC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* ED44E0 802402C0 AFB00010 */  sw        $s0, 0x10($sp)
-/* ED44E4 802402C4 0080802D */  daddu     $s0, $a0, $zero
-/* ED44E8 802402C8 10A00005 */  beqz      $a1, .L802402E0
-/* ED44EC 802402CC AFBF0014 */   sw       $ra, 0x14($sp)
-/* ED44F0 802402D0 AE000070 */  sw        $zero, 0x70($s0)
-/* ED44F4 802402D4 AE000074 */  sw        $zero, 0x74($s0)
-/* ED44F8 802402D8 AE000078 */  sw        $zero, 0x78($s0)
-/* ED44FC 802402DC AE00007C */  sw        $zero, 0x7c($s0)
-.L802402E0:
-/* ED4500 802402E0 8E020070 */  lw        $v0, 0x70($s0)
-/* ED4504 802402E4 1440000E */  bnez      $v0, .L80240320
-/* ED4508 802402E8 00000000 */   nop
-/* ED450C 802402EC 8E0300A8 */  lw        $v1, 0xa8($s0)
-/* ED4510 802402F0 8E020088 */  lw        $v0, 0x88($s0)
-/* ED4514 802402F4 00621821 */  addu      $v1, $v1, $v0
-/* ED4518 802402F8 04610004 */  bgez      $v1, .L8024030C
-/* ED451C 802402FC AE0300A8 */   sw       $v1, 0xa8($s0)
-/* ED4520 80240300 3C020002 */  lui       $v0, 2
-/* ED4524 80240304 080900C7 */  j         .L8024031C
-/* ED4528 80240308 00621021 */   addu     $v0, $v1, $v0
-.L8024030C:
-/* ED452C 8024030C 3C040002 */  lui       $a0, 2
-/* ED4530 80240310 0083102A */  slt       $v0, $a0, $v1
-/* ED4534 80240314 10400002 */  beqz      $v0, .L80240320
-/* ED4538 80240318 00641023 */   subu     $v0, $v1, $a0
-.L8024031C:
-/* ED453C 8024031C AE0200A8 */  sw        $v0, 0xa8($s0)
-.L80240320:
-/* ED4540 80240320 8E020074 */  lw        $v0, 0x74($s0)
-/* ED4544 80240324 1440000E */  bnez      $v0, .L80240360
-/* ED4548 80240328 00000000 */   nop
-/* ED454C 8024032C 8E0300AC */  lw        $v1, 0xac($s0)
-/* ED4550 80240330 8E02008C */  lw        $v0, 0x8c($s0)
-/* ED4554 80240334 00621821 */  addu      $v1, $v1, $v0
-/* ED4558 80240338 04610004 */  bgez      $v1, .L8024034C
-/* ED455C 8024033C AE0300AC */   sw       $v1, 0xac($s0)
-/* ED4560 80240340 3C020002 */  lui       $v0, 2
-/* ED4564 80240344 080900D7 */  j         .L8024035C
-/* ED4568 80240348 00621021 */   addu     $v0, $v1, $v0
-.L8024034C:
-/* ED456C 8024034C 3C040002 */  lui       $a0, 2
-/* ED4570 80240350 0083102A */  slt       $v0, $a0, $v1
-/* ED4574 80240354 10400002 */  beqz      $v0, .L80240360
-/* ED4578 80240358 00641023 */   subu     $v0, $v1, $a0
-.L8024035C:
-/* ED457C 8024035C AE0200AC */  sw        $v0, 0xac($s0)
-.L80240360:
-/* ED4580 80240360 8E020078 */  lw        $v0, 0x78($s0)
-/* ED4584 80240364 1440000E */  bnez      $v0, .L802403A0
-/* ED4588 80240368 00000000 */   nop
-/* ED458C 8024036C 8E0300B0 */  lw        $v1, 0xb0($s0)
-/* ED4590 80240370 8E020090 */  lw        $v0, 0x90($s0)
-/* ED4594 80240374 00621821 */  addu      $v1, $v1, $v0
-/* ED4598 80240378 04610004 */  bgez      $v1, .L8024038C
-/* ED459C 8024037C AE0300B0 */   sw       $v1, 0xb0($s0)
-/* ED45A0 80240380 3C020002 */  lui       $v0, 2
-/* ED45A4 80240384 080900E7 */  j         .L8024039C
-/* ED45A8 80240388 00621021 */   addu     $v0, $v1, $v0
-.L8024038C:
-/* ED45AC 8024038C 3C040002 */  lui       $a0, 2
-/* ED45B0 80240390 0083102A */  slt       $v0, $a0, $v1
-/* ED45B4 80240394 10400002 */  beqz      $v0, .L802403A0
-/* ED45B8 80240398 00641023 */   subu     $v0, $v1, $a0
-.L8024039C:
-/* ED45BC 8024039C AE0200B0 */  sw        $v0, 0xb0($s0)
-.L802403A0:
-/* ED45C0 802403A0 8E02007C */  lw        $v0, 0x7c($s0)
-/* ED45C4 802403A4 1440000E */  bnez      $v0, .L802403E0
-/* ED45C8 802403A8 00000000 */   nop
-/* ED45CC 802403AC 8E0300B4 */  lw        $v1, 0xb4($s0)
-/* ED45D0 802403B0 8E020094 */  lw        $v0, 0x94($s0)
-/* ED45D4 802403B4 00621821 */  addu      $v1, $v1, $v0
-/* ED45D8 802403B8 04610004 */  bgez      $v1, .L802403CC
-/* ED45DC 802403BC AE0300B4 */   sw       $v1, 0xb4($s0)
-/* ED45E0 802403C0 3C020002 */  lui       $v0, 2
-/* ED45E4 802403C4 080900F7 */  j         .L802403DC
-/* ED45E8 802403C8 00621021 */   addu     $v0, $v1, $v0
-.L802403CC:
-/* ED45EC 802403CC 3C040002 */  lui       $a0, 2
-/* ED45F0 802403D0 0083102A */  slt       $v0, $a0, $v1
-/* ED45F4 802403D4 10400002 */  beqz      $v0, .L802403E0
-/* ED45F8 802403D8 00641023 */   subu     $v0, $v1, $a0
-.L802403DC:
-/* ED45FC 802403DC AE0200B4 */  sw        $v0, 0xb4($s0)
-.L802403E0:
-/* ED4600 802403E0 8E040084 */  lw        $a0, 0x84($s0)
-/* ED4604 802403E4 0C049819 */  jal       dead_set_main_pan_u
-/* ED4608 802403E8 8E0500A8 */   lw       $a1, 0xa8($s0)
-/* ED460C 802403EC 8E040084 */  lw        $a0, 0x84($s0)
-/* ED4610 802403F0 0C04981F */  jal       dead_set_main_pan_v
-/* ED4614 802403F4 8E0500AC */   lw       $a1, 0xac($s0)
-/* ED4618 802403F8 8E040084 */  lw        $a0, 0x84($s0)
-/* ED461C 802403FC 0C049825 */  jal       dead_set_aux_pan_u
-/* ED4620 80240400 8E0500B0 */   lw       $a1, 0xb0($s0)
-/* ED4624 80240404 8E040084 */  lw        $a0, 0x84($s0)
-/* ED4628 80240408 0C04982B */  jal       dead_set_aux_pan_v
-/* ED462C 8024040C 8E0500B4 */   lw       $a1, 0xb4($s0)
-/* ED4630 80240410 8E020070 */  lw        $v0, 0x70($s0)
-/* ED4634 80240414 8E030078 */  lw        $v1, 0x78($s0)
-/* ED4638 80240418 8E040098 */  lw        $a0, 0x98($s0)
-/* ED463C 8024041C 24420001 */  addiu     $v0, $v0, 1
-/* ED4640 80240420 AE020070 */  sw        $v0, 0x70($s0)
-/* ED4644 80240424 8E020074 */  lw        $v0, 0x74($s0)
-/* ED4648 80240428 24630001 */  addiu     $v1, $v1, 1
-/* ED464C 8024042C AE030078 */  sw        $v1, 0x78($s0)
-/* ED4650 80240430 8E030070 */  lw        $v1, 0x70($s0)
-/* ED4654 80240434 24420001 */  addiu     $v0, $v0, 1
-/* ED4658 80240438 AE020074 */  sw        $v0, 0x74($s0)
-/* ED465C 8024043C 8E02007C */  lw        $v0, 0x7c($s0)
-/* ED4660 80240440 0064182A */  slt       $v1, $v1, $a0
-/* ED4664 80240444 24420001 */  addiu     $v0, $v0, 1
-/* ED4668 80240448 14600002 */  bnez      $v1, .L80240454
-/* ED466C 8024044C AE02007C */   sw       $v0, 0x7c($s0)
-/* ED4670 80240450 AE000070 */  sw        $zero, 0x70($s0)
-.L80240454:
-/* ED4674 80240454 8E020074 */  lw        $v0, 0x74($s0)
-/* ED4678 80240458 8E03009C */  lw        $v1, 0x9c($s0)
-/* ED467C 8024045C 0043102A */  slt       $v0, $v0, $v1
-/* ED4680 80240460 50400001 */  beql      $v0, $zero, .L80240468
-/* ED4684 80240464 AE000074 */   sw       $zero, 0x74($s0)
-.L80240468:
-/* ED4688 80240468 8E020078 */  lw        $v0, 0x78($s0)
-/* ED468C 8024046C 8E0300A0 */  lw        $v1, 0xa0($s0)
-/* ED4690 80240470 0043102A */  slt       $v0, $v0, $v1
-/* ED4694 80240474 50400001 */  beql      $v0, $zero, .L8024047C
-/* ED4698 80240478 AE000078 */   sw       $zero, 0x78($s0)
-.L8024047C:
-/* ED469C 8024047C 8E02007C */  lw        $v0, 0x7c($s0)
-/* ED46A0 80240480 8E0300A4 */  lw        $v1, 0xa4($s0)
-/* ED46A4 80240484 0043102A */  slt       $v0, $v0, $v1
-/* ED46A8 80240488 50400001 */  beql      $v0, $zero, .L80240490
-/* ED46AC 8024048C AE00007C */   sw       $zero, 0x7c($s0)
-.L80240490:
-/* ED46B0 80240490 8FBF0014 */  lw        $ra, 0x14($sp)
-/* ED46B4 80240494 8FB00010 */  lw        $s0, 0x10($sp)
-/* ED46B8 80240498 0000102D */  daddu     $v0, $zero, $zero
-/* ED46BC 8024049C 03E00008 */  jr        $ra
-/* ED46C0 802404A0 27BD0018 */   addiu    $sp, $sp, 0x18
-/* ED46C4 802404A4 00000000 */  nop
-/* ED46C8 802404A8 00000000 */  nop
-/* ED46CC 802404AC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/ED8E20/func_80240034_ED8E54.s b/ver/us/asm/nonmatchings/ED8E20/func_80240034_ED8E54.s
index ec9dfa228c..a47696c138 100644
--- a/ver/us/asm/nonmatchings/ED8E20/func_80240034_ED8E54.s
+++ b/ver/us/asm/nonmatchings/ED8E20/func_80240034_ED8E54.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240034_ED8E54
-/* ED8E54 80240034 3C038017 */  lui       $v1, %hi(D_80169B12)
-/* ED8E58 80240038 84639B12 */  lh        $v1, %lo(D_80169B12)($v1)
+/* ED8E54 80240034 3C038017 */  lui       $v1, %hi(dead_gCollisionStatus)
+/* ED8E58 80240038 84639B12 */  lh        $v1, %lo(dead_gCollisionStatus)($v1)
 /* ED8E5C 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* ED8E60 80240040 AFB00010 */  sw        $s0, 0x10($sp)
 /* ED8E64 80240044 0080802D */  daddu     $s0, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/EDBFE0/func_80240000_EDBFE0.s b/ver/us/asm/nonmatchings/EDBFE0/func_80240000_EDBFE0.s
deleted file mode 100644
index 56eb1bbea8..0000000000
--- a/ver/us/asm/nonmatchings/EDBFE0/func_80240000_EDBFE0.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_EDBFE0
-/* EDBFE0 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* EDBFE4 80240004 0000202D */  daddu     $a0, $zero, $zero
-/* EDBFE8 80240008 0080282D */  daddu     $a1, $a0, $zero
-/* EDBFEC 8024000C 0080302D */  daddu     $a2, $a0, $zero
-/* EDBFF0 80240010 0080382D */  daddu     $a3, $a0, $zero
-/* EDBFF4 80240014 AFBF0018 */  sw        $ra, 0x18($sp)
-/* EDBFF8 80240018 AFA00010 */  sw        $zero, 0x10($sp)
-/* EDBFFC 8024001C 0C01DEF4 */  jal       func_80077BD0
-/* EDC000 80240020 AFA00014 */   sw       $zero, 0x14($sp)
-/* EDC004 80240024 8FBF0018 */  lw        $ra, 0x18($sp)
-/* EDC008 80240028 24020002 */  addiu     $v0, $zero, 2
-/* EDC00C 8024002C 03E00008 */  jr        $ra
-/* EDC010 80240030 27BD0020 */   addiu    $sp, $sp, 0x20
-/* EDC014 80240034 00000000 */  nop
-/* EDC018 80240038 00000000 */  nop
-/* EDC01C 8024003C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/EDC020/func_802403F0_EDC3D0.s b/ver/us/asm/nonmatchings/EDC020/func_802403F0_EDC3D0.s
deleted file mode 100644
index 3785c07f3f..0000000000
--- a/ver/us/asm/nonmatchings/EDC020/func_802403F0_EDC3D0.s
+++ /dev/null
@@ -1,122 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802403F0_EDC3D0
-/* EDC3D0 802403F0 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* EDC3D4 802403F4 AFB10014 */  sw        $s1, 0x14($sp)
-/* EDC3D8 802403F8 0080882D */  daddu     $s1, $a0, $zero
-/* EDC3DC 802403FC AFBF0024 */  sw        $ra, 0x24($sp)
-/* EDC3E0 80240400 AFB40020 */  sw        $s4, 0x20($sp)
-/* EDC3E4 80240404 AFB3001C */  sw        $s3, 0x1c($sp)
-/* EDC3E8 80240408 AFB20018 */  sw        $s2, 0x18($sp)
-/* EDC3EC 8024040C AFB00010 */  sw        $s0, 0x10($sp)
-/* EDC3F0 80240410 F7BC0048 */  sdc1      $f28, 0x48($sp)
-/* EDC3F4 80240414 F7BA0040 */  sdc1      $f26, 0x40($sp)
-/* EDC3F8 80240418 F7B80038 */  sdc1      $f24, 0x38($sp)
-/* EDC3FC 8024041C F7B60030 */  sdc1      $f22, 0x30($sp)
-/* EDC400 80240420 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* EDC404 80240424 8E30000C */  lw        $s0, 0xc($s1)
-/* EDC408 80240428 8E130000 */  lw        $s3, ($s0)
-/* EDC40C 8024042C 26100004 */  addiu     $s0, $s0, 4
-/* EDC410 80240430 0C0B53A3 */  jal       dead_evt_get_variable
-/* EDC414 80240434 0260282D */   daddu    $a1, $s3, $zero
-/* EDC418 80240438 4482E000 */  mtc1      $v0, $f28
-/* EDC41C 8024043C 00000000 */  nop
-/* EDC420 80240440 4680E720 */  cvt.s.w   $f28, $f28
-/* EDC424 80240444 8E140000 */  lw        $s4, ($s0)
-/* EDC428 80240448 26100004 */  addiu     $s0, $s0, 4
-/* EDC42C 8024044C 0220202D */  daddu     $a0, $s1, $zero
-/* EDC430 80240450 0C0B53A3 */  jal       dead_evt_get_variable
-/* EDC434 80240454 0280282D */   daddu    $a1, $s4, $zero
-/* EDC438 80240458 4482D000 */  mtc1      $v0, $f26
-/* EDC43C 8024045C 00000000 */  nop
-/* EDC440 80240460 4680D6A0 */  cvt.s.w   $f26, $f26
-/* EDC444 80240464 8E100000 */  lw        $s0, ($s0)
-/* EDC448 80240468 0220202D */  daddu     $a0, $s1, $zero
-/* EDC44C 8024046C 0C0B53A3 */  jal       dead_evt_get_variable
-/* EDC450 80240470 0200282D */   daddu    $a1, $s0, $zero
-/* EDC454 80240474 4482C000 */  mtc1      $v0, $f24
-/* EDC458 80240478 00000000 */  nop
-/* EDC45C 8024047C 4680C620 */  cvt.s.w   $f24, $f24
-/* EDC460 80240480 3C128011 */  lui       $s2, %hi(dead_gPlayerStatus)
-/* EDC464 80240484 26527578 */  addiu     $s2, $s2, %lo(dead_gPlayerStatus)
-/* EDC468 80240488 3C038008 */  lui       $v1, %hi(dead_gCurrentCameraID)
-/* EDC46C 8024048C 8C63C760 */  lw        $v1, %lo(dead_gCurrentCameraID)($v1)
-/* EDC470 80240490 C64200A8 */  lwc1      $f2, 0xa8($s2)
-/* EDC474 80240494 44800000 */  mtc1      $zero, $f0
-/* EDC478 80240498 00031080 */  sll       $v0, $v1, 2
-/* EDC47C 8024049C 00431021 */  addu      $v0, $v0, $v1
-/* EDC480 802404A0 00021080 */  sll       $v0, $v0, 2
-/* EDC484 802404A4 00431023 */  subu      $v0, $v0, $v1
-/* EDC488 802404A8 000218C0 */  sll       $v1, $v0, 3
-/* EDC48C 802404AC 00431021 */  addu      $v0, $v0, $v1
-/* EDC490 802404B0 000210C0 */  sll       $v0, $v0, 3
-/* EDC494 802404B4 46001032 */  c.eq.s    $f2, $f0
-/* EDC498 802404B8 3C01800C */  lui       $at, %hi(D_800B8DEC)
-/* EDC49C 802404BC 00220821 */  addu      $at, $at, $v0
-/* EDC4A0 802404C0 C4368DEC */  lwc1      $f22, %lo(D_800B8DEC)($at)
-/* EDC4A4 802404C4 45000005 */  bc1f      .L802404DC
-/* EDC4A8 802404C8 00000000 */   nop
-/* EDC4AC 802404CC 3C0142C8 */  lui       $at, 0x42c8
-/* EDC4B0 802404D0 44810000 */  mtc1      $at, $f0
-/* EDC4B4 802404D4 0809013B */  j         .L802404EC
-/* EDC4B8 802404D8 4600B581 */   sub.s    $f22, $f22, $f0
-.L802404DC:
-/* EDC4BC 802404DC 3C0142C8 */  lui       $at, 0x42c8
-/* EDC4C0 802404E0 44810000 */  mtc1      $at, $f0
-/* EDC4C4 802404E4 00000000 */  nop
-/* EDC4C8 802404E8 4600B580 */  add.s     $f22, $f22, $f0
-.L802404EC:
-/* EDC4CC 802404EC 0C00AB85 */  jal       dead_clamp_angle
-/* EDC4D0 802404F0 4600B306 */   mov.s    $f12, $f22
-/* EDC4D4 802404F4 46000586 */  mov.s     $f22, $f0
-/* EDC4D8 802404F8 3C014170 */  lui       $at, 0x4170
-/* EDC4DC 802404FC 4481A000 */  mtc1      $at, $f20
-/* 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
-/* EDC4F0 80240510 864200B0 */  lh        $v0, 0xb0($s2)
-/* EDC4F4 80240514 3C013F00 */  lui       $at, 0x3f00
-/* EDC4F8 80240518 44812000 */  mtc1      $at, $f4
-/* EDC4FC 8024051C 44821000 */  mtc1      $v0, $f2
-/* EDC500 80240520 00000000 */  nop
-/* EDC504 80240524 468010A0 */  cvt.s.w   $f2, $f2
-/* EDC508 80240528 46041082 */  mul.s     $f2, $f2, $f4
-/* EDC50C 8024052C 00000000 */  nop
-/* EDC510 80240530 4600E700 */  add.s     $f28, $f28, $f0
-/* EDC514 80240534 4602D680 */  add.s     $f26, $f26, $f2
-/* 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
-/* EDC528 80240548 0220202D */  daddu     $a0, $s1, $zero
-/* EDC52C 8024054C 0260282D */  daddu     $a1, $s3, $zero
-/* EDC530 80240550 4600E18D */  trunc.w.s $f6, $f28
-/* EDC534 80240554 44063000 */  mfc1      $a2, $f6
-/* EDC538 80240558 0C0B551A */  jal       dead_evt_set_variable
-/* EDC53C 8024055C 4600C601 */   sub.s    $f24, $f24, $f0
-/* EDC540 80240560 0220202D */  daddu     $a0, $s1, $zero
-/* EDC544 80240564 4600D18D */  trunc.w.s $f6, $f26
-/* EDC548 80240568 44063000 */  mfc1      $a2, $f6
-/* EDC54C 8024056C 0C0B551A */  jal       dead_evt_set_variable
-/* EDC550 80240570 0280282D */   daddu    $a1, $s4, $zero
-/* EDC554 80240574 0220202D */  daddu     $a0, $s1, $zero
-/* EDC558 80240578 4600C18D */  trunc.w.s $f6, $f24
-/* EDC55C 8024057C 44063000 */  mfc1      $a2, $f6
-/* EDC560 80240580 0C0B551A */  jal       dead_evt_set_variable
-/* EDC564 80240584 0200282D */   daddu    $a1, $s0, $zero
-/* EDC568 80240588 8FBF0024 */  lw        $ra, 0x24($sp)
-/* EDC56C 8024058C 8FB40020 */  lw        $s4, 0x20($sp)
-/* EDC570 80240590 8FB3001C */  lw        $s3, 0x1c($sp)
-/* EDC574 80240594 8FB20018 */  lw        $s2, 0x18($sp)
-/* EDC578 80240598 8FB10014 */  lw        $s1, 0x14($sp)
-/* EDC57C 8024059C 8FB00010 */  lw        $s0, 0x10($sp)
-/* EDC580 802405A0 D7BC0048 */  ldc1      $f28, 0x48($sp)
-/* EDC584 802405A4 D7BA0040 */  ldc1      $f26, 0x40($sp)
-/* EDC588 802405A8 D7B80038 */  ldc1      $f24, 0x38($sp)
-/* EDC58C 802405AC D7B60030 */  ldc1      $f22, 0x30($sp)
-/* EDC590 802405B0 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* EDC594 802405B4 24020002 */  addiu     $v0, $zero, 2
-/* EDC598 802405B8 03E00008 */  jr        $ra
-/* EDC59C 802405BC 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/EDE9C0/func_80240000_EDE9C0.s b/ver/us/asm/nonmatchings/EDE9C0/func_80240000_EDE9C0.s
deleted file mode 100644
index 51e1b80718..0000000000
--- a/ver/us/asm/nonmatchings/EDE9C0/func_80240000_EDE9C0.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_EDE9C0
-/* EDE9C0 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* EDE9C4 80240004 0000202D */  daddu     $a0, $zero, $zero
-/* EDE9C8 80240008 0080282D */  daddu     $a1, $a0, $zero
-/* EDE9CC 8024000C 0080302D */  daddu     $a2, $a0, $zero
-/* EDE9D0 80240010 0080382D */  daddu     $a3, $a0, $zero
-/* EDE9D4 80240014 AFBF0018 */  sw        $ra, 0x18($sp)
-/* EDE9D8 80240018 AFA00010 */  sw        $zero, 0x10($sp)
-/* EDE9DC 8024001C 0C01DEF4 */  jal       func_80077BD0
-/* EDE9E0 80240020 AFA00014 */   sw       $zero, 0x14($sp)
-/* EDE9E4 80240024 8FBF0018 */  lw        $ra, 0x18($sp)
-/* EDE9E8 80240028 24020002 */  addiu     $v0, $zero, 2
-/* EDE9EC 8024002C 03E00008 */  jr        $ra
-/* EDE9F0 80240030 27BD0020 */   addiu    $sp, $sp, 0x20
-/* EDE9F4 80240034 00000000 */  nop
-/* EDE9F8 80240038 00000000 */  nop
-/* EDE9FC 8024003C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80240040_EDEA00.s b/ver/us/asm/nonmatchings/EDEA00/func_80240040_EDEA00.s
deleted file mode 100644
index 0deae8d7b2..0000000000
--- a/ver/us/asm/nonmatchings/EDEA00/func_80240040_EDEA00.s
+++ /dev/null
@@ -1,109 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240040_EDEA00
-/* EDEA00 80240040 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* EDEA04 80240044 AFB20018 */  sw        $s2, 0x18($sp)
-/* EDEA08 80240048 0080902D */  daddu     $s2, $a0, $zero
-/* EDEA0C 8024004C AFB10014 */  sw        $s1, 0x14($sp)
-/* EDEA10 80240050 00A0882D */  daddu     $s1, $a1, $zero
-/* EDEA14 80240054 AFBF0024 */  sw        $ra, 0x24($sp)
-/* EDEA18 80240058 AFB40020 */  sw        $s4, 0x20($sp)
-/* EDEA1C 8024005C AFB3001C */  sw        $s3, 0x1c($sp)
-/* EDEA20 80240060 AFB00010 */  sw        $s0, 0x10($sp)
-/* EDEA24 80240064 8E50000C */  lw        $s0, 0xc($s2)
-/* EDEA28 80240068 8E050000 */  lw        $a1, ($s0)
-/* EDEA2C 8024006C 0C0B53A3 */  jal       dead_evt_get_variable
-/* EDEA30 80240070 26100004 */   addiu    $s0, $s0, 4
-/* EDEA34 80240074 0240202D */  daddu     $a0, $s2, $zero
-/* EDEA38 80240078 8E050000 */  lw        $a1, ($s0)
-/* EDEA3C 8024007C 0C0B53A3 */  jal       dead_evt_get_variable
-/* EDEA40 80240080 0040802D */   daddu    $s0, $v0, $zero
-/* EDEA44 80240084 0200202D */  daddu     $a0, $s0, $zero
-/* EDEA48 80240088 0C00F94D */  jal       dead_get_npc_safe
-/* EDEA4C 8024008C 0040A02D */   daddu    $s4, $v0, $zero
-/* EDEA50 80240090 3C138011 */  lui       $s3, %hi(D_80117840)
-/* EDEA54 80240094 26737840 */  addiu     $s3, $s3, %lo(D_80117840)
-/* EDEA58 80240098 12200006 */  beqz      $s1, .L802400B4
-/* EDEA5C 8024009C 0040802D */   daddu    $s0, $v0, $zero
-/* EDEA60 802400A0 82620012 */  lb        $v0, 0x12($s3)
-/* EDEA64 802400A4 54400003 */  bnel      $v0, $zero, .L802400B4
-/* EDEA68 802400A8 AE400070 */   sw       $zero, 0x70($s2)
-/* EDEA6C 802400AC 24020002 */  addiu     $v0, $zero, 2
-/* EDEA70 802400B0 AE420070 */  sw        $v0, 0x70($s2)
-.L802400B4:
-/* EDEA74 802400B4 8E430070 */  lw        $v1, 0x70($s2)
-/* EDEA78 802400B8 24110001 */  addiu     $s1, $zero, 1
-/* EDEA7C 802400BC 10710013 */  beq       $v1, $s1, .L8024010C
-/* EDEA80 802400C0 28620002 */   slti     $v0, $v1, 2
-/* EDEA84 802400C4 10400005 */  beqz      $v0, .L802400DC
-/* EDEA88 802400C8 24020002 */   addiu    $v0, $zero, 2
-/* EDEA8C 802400CC 10600009 */  beqz      $v1, .L802400F4
-/* EDEA90 802400D0 0000102D */   daddu    $v0, $zero, $zero
-/* EDEA94 802400D4 08090069 */  j         .L802401A4
-/* EDEA98 802400D8 00000000 */   nop
-.L802400DC:
-/* EDEA9C 802400DC 10620013 */  beq       $v1, $v0, .L8024012C
-/* EDEAA0 802400E0 24020003 */   addiu    $v0, $zero, 3
-/* EDEAA4 802400E4 1062001E */  beq       $v1, $v0, .L80240160
-/* EDEAA8 802400E8 0000102D */   daddu    $v0, $zero, $zero
-/* EDEAAC 802400EC 08090069 */  j         .L802401A4
-/* EDEAB0 802400F0 00000000 */   nop
-.L802400F4:
-/* EDEAB4 802400F4 0C03CB57 */  jal       func_800F2D5C
-/* EDEAB8 802400F8 0000202D */   daddu    $a0, $zero, $zero
-/* EDEABC 802400FC 2402001E */  addiu     $v0, $zero, 0x1e
-/* EDEAC0 80240100 AE420074 */  sw        $v0, 0x74($s2)
-/* EDEAC4 80240104 08090068 */  j         .L802401A0
-/* EDEAC8 80240108 AE510070 */   sw       $s1, 0x70($s2)
-.L8024010C:
-/* EDEACC 8024010C 8E420074 */  lw        $v0, 0x74($s2)
-/* EDEAD0 80240110 2403FFFF */  addiu     $v1, $zero, -1
-/* EDEAD4 80240114 2442FFFF */  addiu     $v0, $v0, -1
-/* EDEAD8 80240118 14430021 */  bne       $v0, $v1, .L802401A0
-/* EDEADC 8024011C AE420074 */   sw       $v0, 0x74($s2)
-/* EDEAE0 80240120 24020002 */  addiu     $v0, $zero, 2
-/* EDEAE4 80240124 08090068 */  j         .L802401A0
-/* EDEAE8 80240128 AE420070 */   sw       $v0, 0x70($s2)
-.L8024012C:
-/* EDEAEC 8024012C 0200202D */  daddu     $a0, $s0, $zero
-/* EDEAF0 80240130 00141600 */  sll       $v0, $s4, 0x18
-/* EDEAF4 80240134 00021543 */  sra       $v0, $v0, 0x15
-/* EDEAF8 80240138 02621021 */  addu      $v0, $s3, $v0
-/* EDEAFC 8024013C A2740012 */  sb        $s4, 0x12($s3)
-/* EDEB00 80240140 0C03DC9E */  jal       func_800F7278
-/* EDEB04 80240144 A0510014 */   sb       $s1, 0x14($v0)
-/* EDEB08 80240148 82640012 */  lb        $a0, 0x12($s3)
-/* EDEB0C 8024014C 0C03CBA6 */  jal       func_800F2E98
-/* EDEB10 80240150 00000000 */   nop
-/* EDEB14 80240154 24020003 */  addiu     $v0, $zero, 3
-/* EDEB18 80240158 08090068 */  j         .L802401A0
-/* EDEB1C 8024015C AE420070 */   sw       $v0, 0x70($s2)
-.L80240160:
-/* EDEB20 80240160 0C00F94D */  jal       dead_get_npc_safe
-/* EDEB24 80240164 2404FFFC */   addiu    $a0, $zero, -4
-/* EDEB28 80240168 8E05000C */  lw        $a1, 0xc($s0)
-/* EDEB2C 8024016C 0C00FB54 */  jal       func_8003ED50
-/* EDEB30 80240170 0040202D */   daddu    $a0, $v0, $zero
-/* EDEB34 80240174 0200202D */  daddu     $a0, $s0, $zero
-/* EDEB38 80240178 8E020000 */  lw        $v0, ($s0)
-/* EDEB3C 8024017C 2403FFFB */  addiu     $v1, $zero, -5
-/* EDEB40 80240180 00431024 */  and       $v0, $v0, $v1
-/* EDEB44 80240184 0C00F97A */  jal       func_8003E5E8
-/* EDEB48 80240188 AE020000 */   sw       $v0, ($s0)
-/* EDEB4C 8024018C 3C01C47A */  lui       $at, 0xc47a
-/* EDEB50 80240190 44810000 */  mtc1      $at, $f0
-/* EDEB54 80240194 24020002 */  addiu     $v0, $zero, 2
-/* EDEB58 80240198 08090069 */  j         .L802401A4
-/* EDEB5C 8024019C E600003C */   swc1     $f0, 0x3c($s0)
-.L802401A0:
-/* EDEB60 802401A0 0000102D */  daddu     $v0, $zero, $zero
-.L802401A4:
-/* EDEB64 802401A4 8FBF0024 */  lw        $ra, 0x24($sp)
-/* EDEB68 802401A8 8FB40020 */  lw        $s4, 0x20($sp)
-/* EDEB6C 802401AC 8FB3001C */  lw        $s3, 0x1c($sp)
-/* EDEB70 802401B0 8FB20018 */  lw        $s2, 0x18($sp)
-/* EDEB74 802401B4 8FB10014 */  lw        $s1, 0x14($sp)
-/* EDEB78 802401B8 8FB00010 */  lw        $s0, 0x10($sp)
-/* EDEB7C 802401BC 03E00008 */  jr        $ra
-/* EDEB80 802401C0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/EDEA00/func_802416E8_EE00A8.s b/ver/us/asm/nonmatchings/EDEA00/func_802416E8_EE00A8.s
deleted file mode 100644
index 5d86388b24..0000000000
--- a/ver/us/asm/nonmatchings/EDEA00/func_802416E8_EE00A8.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802416E8_EE00A8
-/* EE00A8 802416E8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EE00AC 802416EC AFB00010 */  sw        $s0, 0x10($sp)
-/* EE00B0 802416F0 24100032 */  addiu     $s0, $zero, 0x32
-/* EE00B4 802416F4 AFBF0014 */  sw        $ra, 0x14($sp)
-.L802416F8:
-/* 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
-/* EE00C8 80241708 26100001 */   addiu    $s0, $s0, 1
-/* EE00CC 8024170C 080905C8 */  j         .L80241720
-/* EE00D0 80241710 0200102D */   daddu    $v0, $s0, $zero
-.L80241714:
-/* EE00D4 80241714 2A020038 */  slti      $v0, $s0, 0x38
-/* EE00D8 80241718 1440FFF7 */  bnez      $v0, .L802416F8
-/* EE00DC 8024171C 2402FFFF */   addiu    $v0, $zero, -1
-.L80241720:
-/* EE00E0 80241720 8FBF0014 */  lw        $ra, 0x14($sp)
-/* EE00E4 80241724 8FB00010 */  lw        $s0, 0x10($sp)
-/* EE00E8 80241728 03E00008 */  jr        $ra
-/* EE00EC 8024172C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80241730_EE00F0.s b/ver/us/asm/nonmatchings/EDEA00/func_80241730_EE00F0.s
deleted file mode 100644
index 713a5d0411..0000000000
--- a/ver/us/asm/nonmatchings/EDEA00/func_80241730_EE00F0.s
+++ /dev/null
@@ -1,295 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241730_EE00F0
-/* EE00F0 80241730 27BDFF78 */  addiu     $sp, $sp, -0x88
-/* EE00F4 80241734 AFB20048 */  sw        $s2, 0x48($sp)
-/* EE00F8 80241738 0080902D */  daddu     $s2, $a0, $zero
-/* EE00FC 8024173C AFBF0064 */  sw        $ra, 0x64($sp)
-/* EE0100 80241740 AFBE0060 */  sw        $fp, 0x60($sp)
-/* EE0104 80241744 AFB7005C */  sw        $s7, 0x5c($sp)
-/* EE0108 80241748 AFB60058 */  sw        $s6, 0x58($sp)
-/* EE010C 8024174C AFB50054 */  sw        $s5, 0x54($sp)
-/* EE0110 80241750 AFB40050 */  sw        $s4, 0x50($sp)
-/* EE0114 80241754 AFB3004C */  sw        $s3, 0x4c($sp)
-/* EE0118 80241758 AFB10044 */  sw        $s1, 0x44($sp)
-/* EE011C 8024175C AFB00040 */  sw        $s0, 0x40($sp)
-/* EE0120 80241760 F7BA0080 */  sdc1      $f26, 0x80($sp)
-/* EE0124 80241764 F7B80078 */  sdc1      $f24, 0x78($sp)
-/* EE0128 80241768 F7B60070 */  sdc1      $f22, 0x70($sp)
-/* EE012C 8024176C F7B40068 */  sdc1      $f20, 0x68($sp)
-/* EE0130 80241770 8E510148 */  lw        $s1, 0x148($s2)
-/* EE0134 80241774 00A0B82D */  daddu     $s7, $a1, $zero
-/* EE0138 80241778 86240008 */  lh        $a0, 8($s1)
-/* EE013C 8024177C 0C00F92F */  jal       dead_get_npc_unsafe
-/* EE0140 80241780 00C0F02D */   daddu    $fp, $a2, $zero
-/* EE0144 80241784 C620007C */  lwc1      $f0, 0x7c($s1)
-/* EE0148 80241788 46800020 */  cvt.s.w   $f0, $f0
-/* EE014C 8024178C 46000021 */  cvt.d.s   $f0, $f0
-/* EE0150 80241790 0040802D */  daddu     $s0, $v0, $zero
-/* EE0154 80241794 3C014059 */  lui       $at, 0x4059
-/* EE0158 80241798 44813800 */  mtc1      $at, $f7
-/* EE015C 8024179C 44803000 */  mtc1      $zero, $f6
-/* EE0160 802417A0 8602008E */  lh        $v0, 0x8e($s0)
-/* EE0164 802417A4 9603008E */  lhu       $v1, 0x8e($s0)
-/* EE0168 802417A8 46260003 */  div.d     $f0, $f0, $f6
-/* EE016C 802417AC 462005A0 */  cvt.s.d   $f22, $f0
-/* EE0170 802417B0 C6200078 */  lwc1      $f0, 0x78($s1)
-/* EE0174 802417B4 46800020 */  cvt.s.w   $f0, $f0
-/* EE0178 802417B8 46000021 */  cvt.d.s   $f0, $f0
-/* EE017C 802417BC 46260003 */  div.d     $f0, $f0, $f6
-/* EE0180 802417C0 18400003 */  blez      $v0, .L802417D0
-/* EE0184 802417C4 46200620 */   cvt.s.d  $f24, $f0
-/* EE0188 802417C8 2462FFFF */  addiu     $v0, $v1, -1
-/* EE018C 802417CC A602008E */  sh        $v0, 0x8e($s0)
-.L802417D0:
-/* EE0190 802417D0 27B40028 */  addiu     $s4, $sp, 0x28
-/* EE0194 802417D4 0280282D */  daddu     $a1, $s4, $zero
-/* EE0198 802417D8 27B5002C */  addiu     $s5, $sp, 0x2c
-/* EE019C 802417DC 02A0302D */  daddu     $a2, $s5, $zero
-/* EE01A0 802417E0 27B60030 */  addiu     $s6, $sp, 0x30
-/* EE01A4 802417E4 02C0382D */  daddu     $a3, $s6, $zero
-/* EE01A8 802417E8 C6000038 */  lwc1      $f0, 0x38($s0)
-/* EE01AC 802417EC C602003C */  lwc1      $f2, 0x3c($s0)
-/* EE01B0 802417F0 C6040040 */  lwc1      $f4, 0x40($s0)
-/* EE01B4 802417F4 3C01447A */  lui       $at, 0x447a
-/* EE01B8 802417F8 4481D000 */  mtc1      $at, $f26
-/* EE01BC 802417FC 27B30034 */  addiu     $s3, $sp, 0x34
-/* EE01C0 80241800 E7A00028 */  swc1      $f0, 0x28($sp)
-/* EE01C4 80241804 E7A2002C */  swc1      $f2, 0x2c($sp)
-/* EE01C8 80241808 E7A40030 */  swc1      $f4, 0x30($sp)
-/* EE01CC 8024180C E7BA0034 */  swc1      $f26, 0x34($sp)
-/* EE01D0 80241810 C6340070 */  lwc1      $f20, 0x70($s1)
-/* EE01D4 80241814 4680A520 */  cvt.s.w   $f20, $f20
-/* EE01D8 80241818 4600A521 */  cvt.d.s   $f20, $f20
-/* 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       dead_npc_raycast_down_sides
-/* EE01EC 8024182C 4620A520 */   cvt.s.d  $f20, $f20
-/* EE01F0 80241830 C62C0074 */  lwc1      $f12, 0x74($s1)
-/* 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
-/* EE0204 80241844 C7A2002C */  lwc1      $f2, 0x2c($sp)
-/* EE0208 80241848 46181080 */  add.s     $f2, $f2, $f24
-/* EE020C 8024184C 46001080 */  add.s     $f2, $f2, $f0
-/* EE0210 80241850 E602003C */  swc1      $f2, 0x3c($s0)
-/* EE0214 80241854 8E220074 */  lw        $v0, 0x74($s1)
-/* EE0218 80241858 2442000C */  addiu     $v0, $v0, 0xc
-/* EE021C 8024185C 44826000 */  mtc1      $v0, $f12
-/* EE0220 80241860 00000000 */  nop
-/* EE0224 80241864 0C00AB85 */  jal       dead_clamp_angle
-/* EE0228 80241868 46806320 */   cvt.s.w  $f12, $f12
-/* EE022C 8024186C 4600020D */  trunc.w.s $f8, $f0
-/* EE0230 80241870 E6280074 */  swc1      $f8, 0x74($s1)
-/* EE0234 80241874 8EE30014 */  lw        $v1, 0x14($s7)
-/* EE0238 80241878 0460003C */  bltz      $v1, .L8024196C
-/* EE023C 8024187C 00000000 */   nop
-/* EE0240 80241880 8E420074 */  lw        $v0, 0x74($s2)
-/* EE0244 80241884 1C400038 */  bgtz      $v0, .L80241968
-/* EE0248 80241888 2442FFFF */   addiu    $v0, $v0, -1
-/* EE024C 8024188C 03C0202D */  daddu     $a0, $fp, $zero
-/* EE0250 80241890 AE430074 */  sw        $v1, 0x74($s2)
-/* EE0254 80241894 AFA00010 */  sw        $zero, 0x10($sp)
-/* EE0258 80241898 8EE6000C */  lw        $a2, 0xc($s7)
-/* EE025C 8024189C 8EE70010 */  lw        $a3, 0x10($s7)
-/* EE0260 802418A0 0C013469 */  jal       func_8004D1A4
-/* EE0264 802418A4 0220282D */   daddu    $a1, $s1, $zero
-/* EE0268 802418A8 1040002D */  beqz      $v0, .L80241960
-/* EE026C 802418AC 0000202D */   daddu    $a0, $zero, $zero
-/* EE0270 802418B0 0200282D */  daddu     $a1, $s0, $zero
-/* EE0274 802418B4 0000302D */  daddu     $a2, $zero, $zero
-/* EE0278 802418B8 860300A8 */  lh        $v1, 0xa8($s0)
-/* EE027C 802418BC 3C013F80 */  lui       $at, 0x3f80
-/* EE0280 802418C0 44810000 */  mtc1      $at, $f0
-/* EE0284 802418C4 3C014000 */  lui       $at, 0x4000
-/* EE0288 802418C8 44811000 */  mtc1      $at, $f2
-/* EE028C 802418CC 3C01C1A0 */  lui       $at, 0xc1a0
-/* EE0290 802418D0 44812000 */  mtc1      $at, $f4
-/* EE0294 802418D4 2402000F */  addiu     $v0, $zero, 0xf
-/* EE0298 802418D8 AFA2001C */  sw        $v0, 0x1c($sp)
-/* EE029C 802418DC 44834000 */  mtc1      $v1, $f8
-/* EE02A0 802418E0 00000000 */  nop
-/* EE02A4 802418E4 46804220 */  cvt.s.w   $f8, $f8
-/* EE02A8 802418E8 44074000 */  mfc1      $a3, $f8
-/* EE02AC 802418EC 27A20038 */  addiu     $v0, $sp, 0x38
-/* 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       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       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)
-/* EE02DC 8024191C C602003C */  lwc1      $f2, 0x3c($s0)
-/* EE02E0 80241920 C6040040 */  lwc1      $f4, 0x40($s0)
-/* EE02E4 80241924 02A0302D */  daddu     $a2, $s5, $zero
-/* EE02E8 80241928 E7BA0034 */  swc1      $f26, 0x34($sp)
-/* EE02EC 8024192C E7A00028 */  swc1      $f0, 0x28($sp)
-/* EE02F0 80241930 E7A2002C */  swc1      $f2, 0x2c($sp)
-/* 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       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
-/* EE0310 80241950 2402000C */  addiu     $v0, $zero, 0xc
-/* EE0314 80241954 E6000064 */  swc1      $f0, 0x64($s0)
-/* EE0318 80241958 080906D5 */  j         .L80241B54
-/* EE031C 8024195C AE420070 */   sw       $v0, 0x70($s2)
-.L80241960:
-/* EE0320 80241960 8E420074 */  lw        $v0, 0x74($s2)
-/* EE0324 80241964 2442FFFF */  addiu     $v0, $v0, -1
-.L80241968:
-/* EE0328 80241968 AE420074 */  sw        $v0, 0x74($s2)
-.L8024196C:
-/* EE032C 8024196C 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* EE0330 80241970 C6000040 */  lwc1      $f0, 0x40($s0)
-/* EE0334 80241974 C4620000 */  lwc1      $f2, ($v1)
-/* EE0338 80241978 468010A0 */  cvt.s.w   $f2, $f2
-/* EE033C 8024197C C4640008 */  lwc1      $f4, 8($v1)
-/* EE0340 80241980 46802120 */  cvt.s.w   $f4, $f4
-/* EE0344 80241984 E7A00010 */  swc1      $f0, 0x10($sp)
-/* EE0348 80241988 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* EE034C 8024198C 44051000 */  mfc1      $a1, $f2
-/* EE0350 80241990 C440000C */  lwc1      $f0, 0xc($v0)
-/* EE0354 80241994 46800020 */  cvt.s.w   $f0, $f0
-/* EE0358 80241998 E7A00014 */  swc1      $f0, 0x14($sp)
-/* EE035C 8024199C 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* EE0360 802419A0 44062000 */  mfc1      $a2, $f4
-/* EE0364 802419A4 C4400010 */  lwc1      $f0, 0x10($v0)
-/* 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       dead_is_point_within_region
-/* EE0378 802419B8 8E070038 */   lw       $a3, 0x38($s0)
-/* EE037C 802419BC 1040000D */  beqz      $v0, .L802419F4
-/* EE0380 802419C0 00000000 */   nop
-/* EE0384 802419C4 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* EE0388 802419C8 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* EE038C 802419CC C60E0040 */  lwc1      $f14, 0x40($s0)
-/* EE0390 802419D0 C4480000 */  lwc1      $f8, ($v0)
-/* EE0394 802419D4 46804220 */  cvt.s.w   $f8, $f8
-/* EE0398 802419D8 44064000 */  mfc1      $a2, $f8
-/* EE039C 802419DC C4480008 */  lwc1      $f8, 8($v0)
-/* EE03A0 802419E0 46804220 */  cvt.s.w   $f8, $f8
-/* EE03A4 802419E4 44074000 */  mfc1      $a3, $f8
-/* EE03A8 802419E8 0C00ABDC */  jal       fio_validate_header_checksums
-/* EE03AC 802419EC 00000000 */   nop
-/* EE03B0 802419F0 E600000C */  swc1      $f0, 0xc($s0)
-.L802419F4:
-/* EE03B4 802419F4 8602008C */  lh        $v0, 0x8c($s0)
-/* EE03B8 802419F8 14400056 */  bnez      $v0, .L80241B54
-/* EE03BC 802419FC 00000000 */   nop
-/* EE03C0 80241A00 8602008E */  lh        $v0, 0x8e($s0)
-/* EE03C4 80241A04 1840003D */  blez      $v0, .L80241AFC
-/* 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       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
-/* EE03E4 80241A24 10400032 */  beqz      $v0, .L80241AF0
-/* EE03E8 80241A28 27A50028 */   addiu    $a1, $sp, 0x28
-/* EE03EC 80241A2C 27A6002C */  addiu     $a2, $sp, 0x2c
-/* EE03F0 80241A30 C6000038 */  lwc1      $f0, 0x38($s0)
-/* EE03F4 80241A34 C6020040 */  lwc1      $f2, 0x40($s0)
-/* EE03F8 80241A38 3C01447A */  lui       $at, 0x447a
-/* EE03FC 80241A3C 44812000 */  mtc1      $at, $f4
-/* EE0400 80241A40 27A20034 */  addiu     $v0, $sp, 0x34
-/* EE0404 80241A44 E7B6002C */  swc1      $f22, 0x2c($sp)
-/* EE0408 80241A48 E7A00028 */  swc1      $f0, 0x28($sp)
-/* EE040C 80241A4C E7A20030 */  swc1      $f2, 0x30($sp)
-/* 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       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
-/* EE042C 80241A6C 3C014000 */  lui       $at, 0x4000
-/* EE0430 80241A70 44813800 */  mtc1      $at, $f7
-/* EE0434 80241A74 44803000 */  mtc1      $zero, $f6
-/* EE0438 80241A78 46162001 */  sub.s     $f0, $f4, $f22
-/* EE043C 80241A7C E7A4002C */  swc1      $f4, 0x2c($sp)
-/* EE0440 80241A80 460000A1 */  cvt.d.s   $f2, $f0
-/* EE0444 80241A84 4622303C */  c.lt.d    $f6, $f2
-/* EE0448 80241A88 00000000 */  nop
-/* EE044C 80241A8C 45000005 */  bc1f      .L80241AA4
-/* EE0450 80241A90 E7A00034 */   swc1     $f0, 0x34($sp)
-/* EE0454 80241A94 4600B021 */  cvt.d.s   $f0, $f22
-/* EE0458 80241A98 46260000 */  add.d     $f0, $f0, $f6
-/* EE045C 80241A9C 080906B4 */  j         .L80241AD0
-/* EE0460 80241AA0 462005A0 */   cvt.s.d  $f22, $f0
-.L80241AA4:
-/* EE0464 80241AA4 3C01C000 */  lui       $at, 0xc000
-/* EE0468 80241AA8 44810800 */  mtc1      $at, $f1
-/* EE046C 80241AAC 44800000 */  mtc1      $zero, $f0
-/* EE0470 80241AB0 00000000 */  nop
-/* EE0474 80241AB4 4620103C */  c.lt.d    $f2, $f0
-/* EE0478 80241AB8 00000000 */  nop
-/* EE047C 80241ABC 45020004 */  bc1fl     .L80241AD0
-/* EE0480 80241AC0 46002586 */   mov.s    $f22, $f4
-/* EE0484 80241AC4 4600B021 */  cvt.d.s   $f0, $f22
-/* EE0488 80241AC8 46260001 */  sub.d     $f0, $f0, $f6
-/* EE048C 80241ACC 462005A0 */  cvt.s.d   $f22, $f0
-.L80241AD0:
-/* EE0490 80241AD0 3C014059 */  lui       $at, 0x4059
-/* EE0494 80241AD4 44811800 */  mtc1      $at, $f3
-/* EE0498 80241AD8 44801000 */  mtc1      $zero, $f2
-/* EE049C 80241ADC 4600B021 */  cvt.d.s   $f0, $f22
-/* EE04A0 80241AE0 46220002 */  mul.d     $f0, $f0, $f2
-/* EE04A4 80241AE4 00000000 */  nop
-/* EE04A8 80241AE8 4620020D */  trunc.w.d $f8, $f0
-/* EE04AC 80241AEC E628007C */  swc1      $f8, 0x7c($s1)
-.L80241AF0:
-/* EE04B0 80241AF0 8602008E */  lh        $v0, 0x8e($s0)
-/* EE04B4 80241AF4 1C400017 */  bgtz      $v0, .L80241B54
-/* EE04B8 80241AF8 240403E8 */   addiu    $a0, $zero, 0x3e8
-.L80241AFC:
-/* EE04BC 80241AFC 24020002 */  addiu     $v0, $zero, 2
-/* EE04C0 80241B00 0C00AB3B */  jal       dead_rand_int
-/* EE04C4 80241B04 AE420070 */   sw       $v0, 0x70($s2)
-/* EE04C8 80241B08 3C035555 */  lui       $v1, 0x5555
-/* EE04CC 80241B0C 34635556 */  ori       $v1, $v1, 0x5556
-/* EE04D0 80241B10 00430018 */  mult      $v0, $v1
-/* EE04D4 80241B14 000227C3 */  sra       $a0, $v0, 0x1f
-/* EE04D8 80241B18 00004010 */  mfhi      $t0
-/* EE04DC 80241B1C 01042023 */  subu      $a0, $t0, $a0
-/* EE04E0 80241B20 00041840 */  sll       $v1, $a0, 1
-/* EE04E4 80241B24 00641821 */  addu      $v1, $v1, $a0
-/* EE04E8 80241B28 00431023 */  subu      $v0, $v0, $v1
-/* EE04EC 80241B2C 24430002 */  addiu     $v1, $v0, 2
-/* EE04F0 80241B30 AE430074 */  sw        $v1, 0x74($s2)
-/* EE04F4 80241B34 8EE2002C */  lw        $v0, 0x2c($s7)
-/* EE04F8 80241B38 58400006 */  blezl     $v0, .L80241B54
-/* EE04FC 80241B3C AE400070 */   sw       $zero, 0x70($s2)
-/* EE0500 80241B40 8EE20004 */  lw        $v0, 4($s7)
-/* EE0504 80241B44 58400003 */  blezl     $v0, .L80241B54
-/* EE0508 80241B48 AE400070 */   sw       $zero, 0x70($s2)
-/* EE050C 80241B4C 50600001 */  beql      $v1, $zero, .L80241B54
-/* EE0510 80241B50 AE400070 */   sw       $zero, 0x70($s2)
-.L80241B54:
-/* EE0514 80241B54 8FBF0064 */  lw        $ra, 0x64($sp)
-/* EE0518 80241B58 8FBE0060 */  lw        $fp, 0x60($sp)
-/* EE051C 80241B5C 8FB7005C */  lw        $s7, 0x5c($sp)
-/* EE0520 80241B60 8FB60058 */  lw        $s6, 0x58($sp)
-/* EE0524 80241B64 8FB50054 */  lw        $s5, 0x54($sp)
-/* EE0528 80241B68 8FB40050 */  lw        $s4, 0x50($sp)
-/* EE052C 80241B6C 8FB3004C */  lw        $s3, 0x4c($sp)
-/* EE0530 80241B70 8FB20048 */  lw        $s2, 0x48($sp)
-/* EE0534 80241B74 8FB10044 */  lw        $s1, 0x44($sp)
-/* EE0538 80241B78 8FB00040 */  lw        $s0, 0x40($sp)
-/* EE053C 80241B7C D7BA0080 */  ldc1      $f26, 0x80($sp)
-/* EE0540 80241B80 D7B80078 */  ldc1      $f24, 0x78($sp)
-/* EE0544 80241B84 D7B60070 */  ldc1      $f22, 0x70($sp)
-/* EE0548 80241B88 D7B40068 */  ldc1      $f20, 0x68($sp)
-/* EE054C 80241B8C 03E00008 */  jr        $ra
-/* EE0550 80241B90 27BD0088 */   addiu    $sp, $sp, 0x88
diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80241B94_EE0554.s b/ver/us/asm/nonmatchings/EDEA00/func_80241B94_EE0554.s
deleted file mode 100644
index cf35578b5f..0000000000
--- a/ver/us/asm/nonmatchings/EDEA00/func_80241B94_EE0554.s
+++ /dev/null
@@ -1,156 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241B94_EE0554
-/* EE0554 80241B94 27BDFF98 */  addiu     $sp, $sp, -0x68
-/* EE0558 80241B98 AFB20048 */  sw        $s2, 0x48($sp)
-/* EE055C 80241B9C 0080902D */  daddu     $s2, $a0, $zero
-/* EE0560 80241BA0 AFBF0054 */  sw        $ra, 0x54($sp)
-/* EE0564 80241BA4 AFB40050 */  sw        $s4, 0x50($sp)
-/* EE0568 80241BA8 AFB3004C */  sw        $s3, 0x4c($sp)
-/* EE056C 80241BAC AFB10044 */  sw        $s1, 0x44($sp)
-/* EE0570 80241BB0 AFB00040 */  sw        $s0, 0x40($sp)
-/* EE0574 80241BB4 F7B60060 */  sdc1      $f22, 0x60($sp)
-/* EE0578 80241BB8 F7B40058 */  sdc1      $f20, 0x58($sp)
-/* EE057C 80241BBC 8E510148 */  lw        $s1, 0x148($s2)
-/* EE0580 80241BC0 00A0982D */  daddu     $s3, $a1, $zero
-/* EE0584 80241BC4 86240008 */  lh        $a0, 8($s1)
-/* EE0588 80241BC8 0C00F92F */  jal       dead_get_npc_unsafe
-/* EE058C 80241BCC 00C0A02D */   daddu    $s4, $a2, $zero
-/* EE0590 80241BD0 0040802D */  daddu     $s0, $v0, $zero
-/* EE0594 80241BD4 C6200078 */  lwc1      $f0, 0x78($s1)
-/* EE0598 80241BD8 46800020 */  cvt.s.w   $f0, $f0
-/* EE059C 80241BDC 46000021 */  cvt.d.s   $f0, $f0
-/* EE05A0 80241BE0 3C014059 */  lui       $at, 0x4059
-/* EE05A4 80241BE4 44814800 */  mtc1      $at, $f9
-/* EE05A8 80241BE8 44804000 */  mtc1      $zero, $f8
-/* EE05AC 80241BEC 8602008E */  lh        $v0, 0x8e($s0)
-/* EE05B0 80241BF0 9603008E */  lhu       $v1, 0x8e($s0)
-/* EE05B4 80241BF4 46280003 */  div.d     $f0, $f0, $f8
-/* EE05B8 80241BF8 18400003 */  blez      $v0, .L80241C08
-/* EE05BC 80241BFC 462005A0 */   cvt.s.d  $f22, $f0
-/* EE05C0 80241C00 2462FFFF */  addiu     $v0, $v1, -1
-/* EE05C4 80241C04 A602008E */  sh        $v0, 0x8e($s0)
-.L80241C08:
-/* EE05C8 80241C08 27A50028 */  addiu     $a1, $sp, 0x28
-/* EE05CC 80241C0C 27A6002C */  addiu     $a2, $sp, 0x2c
-/* EE05D0 80241C10 27A70030 */  addiu     $a3, $sp, 0x30
-/* EE05D4 80241C14 C6000038 */  lwc1      $f0, 0x38($s0)
-/* EE05D8 80241C18 C602003C */  lwc1      $f2, 0x3c($s0)
-/* EE05DC 80241C1C C6040040 */  lwc1      $f4, 0x40($s0)
-/* EE05E0 80241C20 3C01447A */  lui       $at, 0x447a
-/* EE05E4 80241C24 44813000 */  mtc1      $at, $f6
-/* EE05E8 80241C28 27A20034 */  addiu     $v0, $sp, 0x34
-/* EE05EC 80241C2C E7A00028 */  swc1      $f0, 0x28($sp)
-/* EE05F0 80241C30 E7A2002C */  swc1      $f2, 0x2c($sp)
-/* EE05F4 80241C34 E7A40030 */  swc1      $f4, 0x30($sp)
-/* EE05F8 80241C38 E7A60034 */  swc1      $f6, 0x34($sp)
-/* EE05FC 80241C3C C6340070 */  lwc1      $f20, 0x70($s1)
-/* EE0600 80241C40 4680A520 */  cvt.s.w   $f20, $f20
-/* EE0604 80241C44 4600A521 */  cvt.d.s   $f20, $f20
-/* 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       dead_npc_raycast_down_sides
-/* EE0618 80241C58 4620A520 */   cvt.s.d  $f20, $f20
-/* EE061C 80241C5C C62C0074 */  lwc1      $f12, 0x74($s1)
-/* 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
-/* EE0630 80241C70 C7A2002C */  lwc1      $f2, 0x2c($sp)
-/* EE0634 80241C74 46161080 */  add.s     $f2, $f2, $f22
-/* EE0638 80241C78 46001080 */  add.s     $f2, $f2, $f0
-/* EE063C 80241C7C E602003C */  swc1      $f2, 0x3c($s0)
-/* EE0640 80241C80 8E220074 */  lw        $v0, 0x74($s1)
-/* EE0644 80241C84 2442000C */  addiu     $v0, $v0, 0xc
-/* EE0648 80241C88 44826000 */  mtc1      $v0, $f12
-/* EE064C 80241C8C 00000000 */  nop
-/* EE0650 80241C90 0C00AB85 */  jal       dead_clamp_angle
-/* EE0654 80241C94 46806320 */   cvt.s.w  $f12, $f12
-/* EE0658 80241C98 4600028D */  trunc.w.s $f10, $f0
-/* EE065C 80241C9C E62A0074 */  swc1      $f10, 0x74($s1)
-/* EE0660 80241CA0 0280202D */  daddu     $a0, $s4, $zero
-/* EE0664 80241CA4 24020001 */  addiu     $v0, $zero, 1
-/* EE0668 80241CA8 AFA20010 */  sw        $v0, 0x10($sp)
-/* EE066C 80241CAC 8E660024 */  lw        $a2, 0x24($s3)
-/* EE0670 80241CB0 8E670028 */  lw        $a3, 0x28($s3)
-/* EE0674 80241CB4 0C013469 */  jal       func_8004D1A4
-/* EE0678 80241CB8 0220282D */   daddu    $a1, $s1, $zero
-/* EE067C 80241CBC 1040001D */  beqz      $v0, .L80241D34
-/* EE0680 80241CC0 0000202D */   daddu    $a0, $zero, $zero
-/* EE0684 80241CC4 0200282D */  daddu     $a1, $s0, $zero
-/* EE0688 80241CC8 0000302D */  daddu     $a2, $zero, $zero
-/* EE068C 80241CCC 860300A8 */  lh        $v1, 0xa8($s0)
-/* EE0690 80241CD0 3C013F80 */  lui       $at, 0x3f80
-/* EE0694 80241CD4 44810000 */  mtc1      $at, $f0
-/* EE0698 80241CD8 3C014000 */  lui       $at, 0x4000
-/* EE069C 80241CDC 44811000 */  mtc1      $at, $f2
-/* EE06A0 80241CE0 3C01C1A0 */  lui       $at, 0xc1a0
-/* EE06A4 80241CE4 44812000 */  mtc1      $at, $f4
-/* EE06A8 80241CE8 2402000F */  addiu     $v0, $zero, 0xf
-/* EE06AC 80241CEC AFA2001C */  sw        $v0, 0x1c($sp)
-/* EE06B0 80241CF0 44835000 */  mtc1      $v1, $f10
-/* EE06B4 80241CF4 00000000 */  nop
-/* EE06B8 80241CF8 468052A0 */  cvt.s.w   $f10, $f10
-/* EE06BC 80241CFC 44075000 */  mfc1      $a3, $f10
-/* EE06C0 80241D00 27A20038 */  addiu     $v0, $sp, 0x38
-/* 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       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       dead_ai_enemy_play_sound
-/* EE06E4 80241D24 3C060020 */   lui      $a2, 0x20
-/* EE06E8 80241D28 2402000C */  addiu     $v0, $zero, 0xc
-/* EE06EC 80241D2C 0809076F */  j         .L80241DBC
-/* EE06F0 80241D30 AE420070 */   sw       $v0, 0x70($s2)
-.L80241D34:
-/* EE06F4 80241D34 8602008C */  lh        $v0, 0x8c($s0)
-/* EE06F8 80241D38 14400020 */  bnez      $v0, .L80241DBC
-/* EE06FC 80241D3C 00000000 */   nop
-/* EE0700 80241D40 8602008E */  lh        $v0, 0x8e($s0)
-/* EE0704 80241D44 1C40001D */  bgtz      $v0, .L80241DBC
-/* EE0708 80241D48 00000000 */   nop
-/* EE070C 80241D4C 8E420074 */  lw        $v0, 0x74($s2)
-/* EE0710 80241D50 2442FFFF */  addiu     $v0, $v0, -1
-/* EE0714 80241D54 18400018 */  blez      $v0, .L80241DB8
-/* EE0718 80241D58 AE420074 */   sw       $v0, 0x74($s2)
-/* EE071C 80241D5C C600000C */  lwc1      $f0, 0xc($s0)
-/* EE0720 80241D60 3C014334 */  lui       $at, 0x4334
-/* EE0724 80241D64 44816000 */  mtc1      $at, $f12
-/* EE0728 80241D68 0C00AB85 */  jal       dead_clamp_angle
-/* EE072C 80241D6C 460C0300 */   add.s    $f12, $f0, $f12
-/* EE0730 80241D70 240403E8 */  addiu     $a0, $zero, 0x3e8
-/* EE0734 80241D74 0C00AB3B */  jal       dead_rand_int
-/* EE0738 80241D78 E600000C */   swc1     $f0, 0xc($s0)
-/* EE073C 80241D7C 3C032E8B */  lui       $v1, 0x2e8b
-/* EE0740 80241D80 3463A2E9 */  ori       $v1, $v1, 0xa2e9
-/* EE0744 80241D84 00430018 */  mult      $v0, $v1
-/* EE0748 80241D88 00021FC3 */  sra       $v1, $v0, 0x1f
-/* EE074C 80241D8C 00004010 */  mfhi      $t0
-/* EE0750 80241D90 00082043 */  sra       $a0, $t0, 1
-/* EE0754 80241D94 00832023 */  subu      $a0, $a0, $v1
-/* EE0758 80241D98 00041840 */  sll       $v1, $a0, 1
-/* EE075C 80241D9C 00641821 */  addu      $v1, $v1, $a0
-/* EE0760 80241DA0 00031880 */  sll       $v1, $v1, 2
-/* EE0764 80241DA4 00641823 */  subu      $v1, $v1, $a0
-/* EE0768 80241DA8 00431023 */  subu      $v0, $v0, $v1
-/* EE076C 80241DAC 24420005 */  addiu     $v0, $v0, 5
-/* EE0770 80241DB0 0809076F */  j         .L80241DBC
-/* EE0774 80241DB4 A602008E */   sh       $v0, 0x8e($s0)
-.L80241DB8:
-/* EE0778 80241DB8 AE400070 */  sw        $zero, 0x70($s2)
-.L80241DBC:
-/* EE077C 80241DBC 8FBF0054 */  lw        $ra, 0x54($sp)
-/* EE0780 80241DC0 8FB40050 */  lw        $s4, 0x50($sp)
-/* EE0784 80241DC4 8FB3004C */  lw        $s3, 0x4c($sp)
-/* EE0788 80241DC8 8FB20048 */  lw        $s2, 0x48($sp)
-/* EE078C 80241DCC 8FB10044 */  lw        $s1, 0x44($sp)
-/* EE0790 80241DD0 8FB00040 */  lw        $s0, 0x40($sp)
-/* EE0794 80241DD4 D7B60060 */  ldc1      $f22, 0x60($sp)
-/* EE0798 80241DD8 D7B40058 */  ldc1      $f20, 0x58($sp)
-/* EE079C 80241DDC 03E00008 */  jr        $ra
-/* EE07A0 80241DE0 27BD0068 */   addiu    $sp, $sp, 0x68
diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80243470_EE1E30.s b/ver/us/asm/nonmatchings/EDEA00/func_80243470_EE1E30.s
deleted file mode 100644
index be3878c87f..0000000000
--- a/ver/us/asm/nonmatchings/EDEA00/func_80243470_EE1E30.s
+++ /dev/null
@@ -1,75 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243470_EE1E30
-/* EE1E30 80243470 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* EE1E34 80243474 AFB3002C */  sw        $s3, 0x2c($sp)
-/* EE1E38 80243478 0080982D */  daddu     $s3, $a0, $zero
-/* EE1E3C 8024347C AFB00020 */  sw        $s0, 0x20($sp)
-/* EE1E40 80243480 00A0802D */  daddu     $s0, $a1, $zero
-/* EE1E44 80243484 24040001 */  addiu     $a0, $zero, 1
-/* EE1E48 80243488 AFBF0030 */  sw        $ra, 0x30($sp)
-/* EE1E4C 8024348C AFB20028 */  sw        $s2, 0x28($sp)
-/* EE1E50 80243490 0C00F92F */  jal       dead_get_npc_unsafe
-/* EE1E54 80243494 AFB10024 */   sw       $s1, 0x24($sp)
-/* EE1E58 80243498 8E63000C */  lw        $v1, 0xc($s3)
-/* EE1E5C 8024349C 0260202D */  daddu     $a0, $s3, $zero
-/* EE1E60 802434A0 8C650000 */  lw        $a1, ($v1)
-/* EE1E64 802434A4 0C0B53A3 */  jal       dead_evt_get_variable
-/* EE1E68 802434A8 0040902D */   daddu    $s2, $v0, $zero
-/* EE1E6C 802434AC 12000002 */  beqz      $s0, .L802434B8
-/* EE1E70 802434B0 AE620074 */   sw       $v0, 0x74($s3)
-/* EE1E74 802434B4 AE600070 */  sw        $zero, 0x70($s3)
-.L802434B8:
-/* EE1E78 802434B8 3C026666 */  lui       $v0, 0x6666
-/* EE1E7C 802434BC 8E640070 */  lw        $a0, 0x70($s3)
-/* EE1E80 802434C0 34426667 */  ori       $v0, $v0, 0x6667
-/* EE1E84 802434C4 00820018 */  mult      $a0, $v0
-/* EE1E88 802434C8 000417C3 */  sra       $v0, $a0, 0x1f
-/* EE1E8C 802434CC 00004010 */  mfhi      $t0
-/* EE1E90 802434D0 00081843 */  sra       $v1, $t0, 1
-/* EE1E94 802434D4 00621823 */  subu      $v1, $v1, $v0
-/* EE1E98 802434D8 00031080 */  sll       $v0, $v1, 2
-/* EE1E9C 802434DC 00431021 */  addu      $v0, $v0, $v1
-/* EE1EA0 802434E0 1482001B */  bne       $a0, $v0, .L80243550
-/* EE1EA4 802434E4 3C020020 */   lui      $v0, 0x20
-/* EE1EA8 802434E8 34420002 */  ori       $v0, $v0, 2
-/* EE1EAC 802434EC 27B1001A */  addiu     $s1, $sp, 0x1a
-/* EE1EB0 802434F0 27B00018 */  addiu     $s0, $sp, 0x18
-/* EE1EB4 802434F4 AFB10010 */  sw        $s1, 0x10($sp)
-/* EE1EB8 802434F8 AFA20014 */  sw        $v0, 0x14($sp)
-/* EE1EBC 802434FC 8E460040 */  lw        $a2, 0x40($s2)
-/* EE1EC0 80243500 C64C0038 */  lwc1      $f12, 0x38($s2)
-/* EE1EC4 80243504 C64E003C */  lwc1      $f14, 0x3c($s2)
-/* EE1EC8 80243508 0C055D37 */  jal       func_801574DC
-/* EE1ECC 8024350C 0200382D */   daddu    $a3, $s0, $zero
-/* EE1ED0 80243510 3C0543FA */  lui       $a1, 0x43fa
-/* EE1ED4 80243514 8E620074 */  lw        $v0, 0x74($s3)
-/* EE1ED8 80243518 0000202D */  daddu     $a0, $zero, $zero
-/* EE1EDC 8024351C AFA20010 */  sw        $v0, 0x10($sp)
-/* EE1EE0 80243520 8E670070 */  lw        $a3, 0x70($s3)
-/* EE1EE4 80243524 0C00ADA9 */  jal       dead_update_lerp
-/* EE1EE8 80243528 0000302D */   daddu    $a2, $zero, $zero
-/* EE1EEC 8024352C 24040295 */  addiu     $a0, $zero, 0x295
-/* EE1EF0 80243530 4600008D */  trunc.w.s $f2, $f0
-/* EE1EF4 80243534 44071000 */  mfc1      $a3, $f2
-/* EE1EF8 80243538 00000000 */  nop
-/* EE1EFC 8024353C 00073C00 */  sll       $a3, $a3, 0x10
-/* EE1F00 80243540 92050001 */  lbu       $a1, 1($s0)
-/* EE1F04 80243544 92260001 */  lbu       $a2, 1($s1)
-/* EE1F08 80243548 0C055C46 */  jal       func_80157118
-/* EE1F0C 8024354C 00073C03 */   sra      $a3, $a3, 0x10
-.L80243550:
-/* EE1F10 80243550 8E630070 */  lw        $v1, 0x70($s3)
-/* EE1F14 80243554 8E620074 */  lw        $v0, 0x74($s3)
-/* EE1F18 80243558 24630001 */  addiu     $v1, $v1, 1
-/* EE1F1C 8024355C 0043102A */  slt       $v0, $v0, $v1
-/* EE1F20 80243560 AE630070 */  sw        $v1, 0x70($s3)
-/* EE1F24 80243564 8FBF0030 */  lw        $ra, 0x30($sp)
-/* EE1F28 80243568 8FB3002C */  lw        $s3, 0x2c($sp)
-/* EE1F2C 8024356C 8FB20028 */  lw        $s2, 0x28($sp)
-/* EE1F30 80243570 8FB10024 */  lw        $s1, 0x24($sp)
-/* EE1F34 80243574 8FB00020 */  lw        $s0, 0x20($sp)
-/* EE1F38 80243578 00021040 */  sll       $v0, $v0, 1
-/* EE1F3C 8024357C 03E00008 */  jr        $ra
-/* EE1F40 80243580 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80243584_EE1F44.s b/ver/us/asm/nonmatchings/EDEA00/func_80243584_EE1F44.s
deleted file mode 100644
index cdf6e9daf9..0000000000
--- a/ver/us/asm/nonmatchings/EDEA00/func_80243584_EE1F44.s
+++ /dev/null
@@ -1,69 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243584_EE1F44
-/* EE1F44 80243584 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* EE1F48 80243588 AFB20028 */  sw        $s2, 0x28($sp)
-/* EE1F4C 8024358C 0080902D */  daddu     $s2, $a0, $zero
-/* EE1F50 80243590 AFB00020 */  sw        $s0, 0x20($sp)
-/* EE1F54 80243594 00A0802D */  daddu     $s0, $a1, $zero
-/* EE1F58 80243598 0000202D */  daddu     $a0, $zero, $zero
-/* EE1F5C 8024359C AFBF002C */  sw        $ra, 0x2c($sp)
-/* EE1F60 802435A0 0C00F92F */  jal       dead_get_npc_unsafe
-/* EE1F64 802435A4 AFB10024 */   sw       $s1, 0x24($sp)
-/* EE1F68 802435A8 12000002 */  beqz      $s0, .L802435B4
-/* EE1F6C 802435AC 0040282D */   daddu    $a1, $v0, $zero
-/* EE1F70 802435B0 AE400070 */  sw        $zero, 0x70($s2)
-.L802435B4:
-/* EE1F74 802435B4 3C026666 */  lui       $v0, 0x6666
-/* EE1F78 802435B8 8E440070 */  lw        $a0, 0x70($s2)
-/* EE1F7C 802435BC 34426667 */  ori       $v0, $v0, 0x6667
-/* EE1F80 802435C0 00820018 */  mult      $a0, $v0
-/* EE1F84 802435C4 000417C3 */  sra       $v0, $a0, 0x1f
-/* EE1F88 802435C8 00004010 */  mfhi      $t0
-/* EE1F8C 802435CC 00081843 */  sra       $v1, $t0, 1
-/* EE1F90 802435D0 00621823 */  subu      $v1, $v1, $v0
-/* EE1F94 802435D4 00031080 */  sll       $v0, $v1, 2
-/* EE1F98 802435D8 00431021 */  addu      $v0, $v0, $v1
-/* EE1F9C 802435DC 1482001B */  bne       $a0, $v0, .L8024364C
-/* EE1FA0 802435E0 3C020020 */   lui      $v0, 0x20
-/* EE1FA4 802435E4 34420002 */  ori       $v0, $v0, 2
-/* EE1FA8 802435E8 27B1001A */  addiu     $s1, $sp, 0x1a
-/* EE1FAC 802435EC 27B00018 */  addiu     $s0, $sp, 0x18
-/* EE1FB0 802435F0 AFB10010 */  sw        $s1, 0x10($sp)
-/* EE1FB4 802435F4 AFA20014 */  sw        $v0, 0x14($sp)
-/* EE1FB8 802435F8 8CA60040 */  lw        $a2, 0x40($a1)
-/* EE1FBC 802435FC C4AC0038 */  lwc1      $f12, 0x38($a1)
-/* EE1FC0 80243600 C4AE003C */  lwc1      $f14, 0x3c($a1)
-/* EE1FC4 80243604 0C055D37 */  jal       func_801574DC
-/* EE1FC8 80243608 0200382D */   daddu    $a3, $s0, $zero
-/* EE1FCC 8024360C 0000202D */  daddu     $a0, $zero, $zero
-/* EE1FD0 80243610 3C0543FA */  lui       $a1, 0x43fa
-/* EE1FD4 80243614 24020050 */  addiu     $v0, $zero, 0x50
-/* EE1FD8 80243618 AFA20010 */  sw        $v0, 0x10($sp)
-/* EE1FDC 8024361C 8E470070 */  lw        $a3, 0x70($s2)
-/* EE1FE0 80243620 0C00ADA9 */  jal       dead_update_lerp
-/* EE1FE4 80243624 0000302D */   daddu    $a2, $zero, $zero
-/* EE1FE8 80243628 24040295 */  addiu     $a0, $zero, 0x295
-/* EE1FEC 8024362C 4600008D */  trunc.w.s $f2, $f0
-/* EE1FF0 80243630 44071000 */  mfc1      $a3, $f2
-/* EE1FF4 80243634 00000000 */  nop
-/* EE1FF8 80243638 00073C00 */  sll       $a3, $a3, 0x10
-/* EE1FFC 8024363C 92050001 */  lbu       $a1, 1($s0)
-/* EE2000 80243640 92260001 */  lbu       $a2, 1($s1)
-/* EE2004 80243644 0C055C46 */  jal       func_80157118
-/* EE2008 80243648 00073C03 */   sra      $a3, $a3, 0x10
-.L8024364C:
-/* EE200C 8024364C 8E430070 */  lw        $v1, 0x70($s2)
-/* EE2010 80243650 24630001 */  addiu     $v1, $v1, 1
-/* EE2014 80243654 28620051 */  slti      $v0, $v1, 0x51
-/* EE2018 80243658 38420001 */  xori      $v0, $v0, 1
-/* EE201C 8024365C AE430070 */  sw        $v1, 0x70($s2)
-/* EE2020 80243660 8FBF002C */  lw        $ra, 0x2c($sp)
-/* EE2024 80243664 8FB20028 */  lw        $s2, 0x28($sp)
-/* EE2028 80243668 8FB10024 */  lw        $s1, 0x24($sp)
-/* EE202C 8024366C 8FB00020 */  lw        $s0, 0x20($sp)
-/* EE2030 80243670 00021040 */  sll       $v0, $v0, 1
-/* EE2034 80243674 03E00008 */  jr        $ra
-/* EE2038 80243678 27BD0030 */   addiu    $sp, $sp, 0x30
-/* EE203C 8024367C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/EDEA00/pause_interp_text_scroll_EE1DD8.s b/ver/us/asm/nonmatchings/EDEA00/pause_interp_text_scroll_EE1DD8.s
deleted file mode 100644
index cf559e9562..0000000000
--- a/ver/us/asm/nonmatchings/EDEA00/pause_interp_text_scroll_EE1DD8.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel pause_interp_text_scroll_EE1DD8
-/* EE1DD8 80243418 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EE1DDC 8024341C AFB00010 */  sw        $s0, 0x10($sp)
-/* EE1DE0 80243420 0080802D */  daddu     $s0, $a0, $zero
-/* EE1DE4 80243424 AFBF0014 */  sw        $ra, 0x14($sp)
-/* EE1DE8 80243428 C60C0084 */  lwc1      $f12, 0x84($s0)
-/* EE1DEC 8024342C 46806320 */  cvt.s.w   $f12, $f12
-/* EE1DF0 80243430 C6020090 */  lwc1      $f2, 0x90($s0)
-/* EE1DF4 80243434 468010A0 */  cvt.s.w   $f2, $f2
-/* EE1DF8 80243438 44061000 */  mfc1      $a2, $f2
-/* EE1DFC 8024343C C6020098 */  lwc1      $f2, 0x98($s0)
-/* EE1E00 80243440 468010A0 */  cvt.s.w   $f2, $f2
-/* EE1E04 80243444 44071000 */  mfc1      $a3, $f2
-/* EE1E08 80243448 C60E008C */  lwc1      $f14, 0x8c($s0)
-/* EE1E0C 8024344C 0C00ABDC */  jal       fio_validate_header_checksums
-/* EE1E10 80243450 468073A0 */   cvt.s.w  $f14, $f14
-/* EE1E14 80243454 4600008D */  trunc.w.s $f2, $f0
-/* EE1E18 80243458 E60200AC */  swc1      $f2, 0xac($s0)
-/* EE1E1C 8024345C 8FBF0014 */  lw        $ra, 0x14($sp)
-/* EE1E20 80243460 8FB00010 */  lw        $s0, 0x10($sp)
-/* EE1E24 80243464 24020002 */  addiu     $v0, $zero, 2
-/* EE1E28 80243468 03E00008 */  jr        $ra
-/* EE1E2C 8024346C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/EE65B0/func_8024030C_EE68BC.s b/ver/us/asm/nonmatchings/EE65B0/func_8024030C_EE68BC.s
deleted file mode 100644
index 510a4f1881..0000000000
--- a/ver/us/asm/nonmatchings/EE65B0/func_8024030C_EE68BC.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024030C_EE68BC
-/* EE68BC 8024030C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* EE68C0 80240310 0000202D */  daddu     $a0, $zero, $zero
-/* EE68C4 80240314 0080282D */  daddu     $a1, $a0, $zero
-/* EE68C8 80240318 0080302D */  daddu     $a2, $a0, $zero
-/* EE68CC 8024031C 0080382D */  daddu     $a3, $a0, $zero
-/* EE68D0 80240320 AFBF0018 */  sw        $ra, 0x18($sp)
-/* EE68D4 80240324 AFA00010 */  sw        $zero, 0x10($sp)
-/* EE68D8 80240328 0C01DEF4 */  jal       func_80077BD0
-/* EE68DC 8024032C AFA00014 */   sw       $zero, 0x14($sp)
-/* EE68E0 80240330 8FBF0018 */  lw        $ra, 0x18($sp)
-/* EE68E4 80240334 24020002 */  addiu     $v0, $zero, 2
-/* EE68E8 80240338 03E00008 */  jr        $ra
-/* EE68EC 8024033C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EE65B0/func_80240340_EE68F0.s b/ver/us/asm/nonmatchings/EE65B0/func_80240340_EE68F0.s
deleted file mode 100644
index 79c2d4e2a6..0000000000
--- a/ver/us/asm/nonmatchings/EE65B0/func_80240340_EE68F0.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240340_EE68F0
-/* EE68F0 80240340 8C820084 */  lw        $v0, 0x84($a0)
-/* EE68F4 80240344 8C830090 */  lw        $v1, 0x90($a0)
-/* EE68F8 80240348 00431023 */  subu      $v0, $v0, $v1
-/* EE68FC 8024034C 44821000 */  mtc1      $v0, $f2
-/* EE6900 80240350 00000000 */  nop
-/* EE6904 80240354 468010A0 */  cvt.s.w   $f2, $f2
-/* EE6908 80240358 8C820088 */  lw        $v0, 0x88($a0)
-/* EE690C 8024035C 8C830094 */  lw        $v1, 0x94($a0)
-/* EE6910 80240360 46021082 */  mul.s     $f2, $f2, $f2
-/* EE6914 80240364 00000000 */  nop
-/* EE6918 80240368 00431023 */  subu      $v0, $v0, $v1
-/* EE691C 8024036C 44822000 */  mtc1      $v0, $f4
-/* EE6920 80240370 00000000 */  nop
-/* EE6924 80240374 46802120 */  cvt.s.w   $f4, $f4
-/* EE6928 80240378 8C82008C */  lw        $v0, 0x8c($a0)
-/* EE692C 8024037C 46042102 */  mul.s     $f4, $f4, $f4
-/* EE6930 80240380 00000000 */  nop
-/* EE6934 80240384 8C830098 */  lw        $v1, 0x98($a0)
-/* EE6938 80240388 00431023 */  subu      $v0, $v0, $v1
-/* EE693C 8024038C 44820000 */  mtc1      $v0, $f0
-/* EE6940 80240390 00000000 */  nop
-/* EE6944 80240394 46800020 */  cvt.s.w   $f0, $f0
-/* EE6948 80240398 46000002 */  mul.s     $f0, $f0, $f0
-/* EE694C 8024039C 00000000 */  nop
-/* EE6950 802403A0 46041080 */  add.s     $f2, $f2, $f4
-/* EE6954 802403A4 46001080 */  add.s     $f2, $f2, $f0
-/* EE6958 802403A8 3C014561 */  lui       $at, 0x4561
-/* EE695C 802403AC 44810000 */  mtc1      $at, $f0
-/* EE6960 802403B0 00000000 */  nop
-/* EE6964 802403B4 4600103C */  c.lt.s    $f2, $f0
-/* EE6968 802403B8 00000000 */  nop
-/* EE696C 802403BC 45010002 */  bc1t      .L802403C8
-/* EE6970 802403C0 24020001 */   addiu    $v0, $zero, 1
-/* EE6974 802403C4 0000102D */  daddu     $v0, $zero, $zero
-.L802403C8:
-/* EE6978 802403C8 AC820084 */  sw        $v0, 0x84($a0)
-/* EE697C 802403CC 03E00008 */  jr        $ra
-/* EE6980 802403D0 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/EE65B0/func_802403D4_EE6984.s b/ver/us/asm/nonmatchings/EE65B0/func_802403D4_EE6984.s
deleted file mode 100644
index 3d2254cb6b..0000000000
--- a/ver/us/asm/nonmatchings/EE65B0/func_802403D4_EE6984.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802403D4_EE6984
-/* EE6984 802403D4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EE6988 802403D8 3C028011 */  lui       $v0, %hi(D_80117852)
-/* EE698C 802403DC 80427852 */  lb        $v0, %lo(D_80117852)($v0)
-/* EE6990 802403E0 0080182D */  daddu     $v1, $a0, $zero
-/* EE6994 802403E4 1040000C */  beqz      $v0, .L80240418
-/* EE6998 802403E8 AFBF0010 */   sw       $ra, 0x10($sp)
-/* EE699C 802403EC 2404FFFC */  addiu     $a0, $zero, -4
-/* EE69A0 802403F0 24020001 */  addiu     $v0, $zero, 1
-/* EE69A4 802403F4 0C00F92F */  jal       dead_get_npc_unsafe
-/* EE69A8 802403F8 AC6200BC */   sw       $v0, 0xbc($v1)
-/* EE69AC 802403FC 0000202D */  daddu     $a0, $zero, $zero
-/* EE69B0 80240400 3C05FD05 */  lui       $a1, 0xfd05
-/* EE69B4 80240404 8C460000 */  lw        $a2, ($v0)
-/* EE69B8 80240408 0C0B551A */  jal       dead_evt_set_variable
-/* EE69BC 8024040C 34A50F80 */   ori      $a1, $a1, 0xf80
-/* EE69C0 80240410 08090108 */  j         .L80240420
-/* EE69C4 80240414 24020002 */   addiu    $v0, $zero, 2
-.L80240418:
-/* EE69C8 80240418 AC6000BC */  sw        $zero, 0xbc($v1)
-/* EE69CC 8024041C 24020002 */  addiu     $v0, $zero, 2
-.L80240420:
-/* EE69D0 80240420 8FBF0010 */  lw        $ra, 0x10($sp)
-/* EE69D4 80240424 03E00008 */  jr        $ra
-/* EE69D8 80240428 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/EE65B0/func_8024042C_EE69DC.s b/ver/us/asm/nonmatchings/EE65B0/func_8024042C_EE69DC.s
deleted file mode 100644
index 3b63e46a33..0000000000
--- a/ver/us/asm/nonmatchings/EE65B0/func_8024042C_EE69DC.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024042C_EE69DC
-/* EE69DC 8024042C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EE69E0 80240430 2404FFFC */  addiu     $a0, $zero, -4
-/* EE69E4 80240434 AFBF0014 */  sw        $ra, 0x14($sp)
-/* EE69E8 80240438 0C00F92F */  jal       dead_get_npc_unsafe
-/* EE69EC 8024043C AFB00010 */   sw       $s0, 0x10($sp)
-/* EE69F0 80240440 0000202D */  daddu     $a0, $zero, $zero
-/* EE69F4 80240444 3C05FD05 */  lui       $a1, 0xfd05
-/* EE69F8 80240448 34A50F80 */  ori       $a1, $a1, 0xf80
-/* EE69FC 8024044C 0C0B53A3 */  jal       dead_evt_get_variable
-/* EE6A00 80240450 0040802D */   daddu    $s0, $v0, $zero
-/* EE6A04 80240454 AE020000 */  sw        $v0, ($s0)
-/* EE6A08 80240458 8FBF0014 */  lw        $ra, 0x14($sp)
-/* EE6A0C 8024045C 8FB00010 */  lw        $s0, 0x10($sp)
-/* EE6A10 80240460 24020002 */  addiu     $v0, $zero, 2
-/* EE6A14 80240464 03E00008 */  jr        $ra
-/* EE6A18 80240468 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/EE65B0/func_8024046C_EE6A1C.s b/ver/us/asm/nonmatchings/EE65B0/func_8024046C_EE6A1C.s
deleted file mode 100644
index 059cf2bb18..0000000000
--- a/ver/us/asm/nonmatchings/EE65B0/func_8024046C_EE6A1C.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024046C_EE6A1C
-/* EE6A1C 8024046C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* EE6A20 80240470 AFB1001C */  sw        $s1, 0x1c($sp)
-/* EE6A24 80240474 0080882D */  daddu     $s1, $a0, $zero
-/* EE6A28 80240478 AFBF0020 */  sw        $ra, 0x20($sp)
-/* EE6A2C 8024047C AFB00018 */  sw        $s0, 0x18($sp)
-/* EE6A30 80240480 8E30000C */  lw        $s0, 0xc($s1)
-/* EE6A34 80240484 8E050000 */  lw        $a1, ($s0)
-/* EE6A38 80240488 0C0B53A3 */  jal       dead_evt_get_variable
-/* EE6A3C 8024048C 26100004 */   addiu    $s0, $s0, 4
-/* EE6A40 80240490 AE220070 */  sw        $v0, 0x70($s1)
-/* EE6A44 80240494 8E050000 */  lw        $a1, ($s0)
-/* EE6A48 80240498 26100004 */  addiu     $s0, $s0, 4
-/* EE6A4C 8024049C 0C0B53A3 */  jal       dead_evt_get_variable
-/* EE6A50 802404A0 0220202D */   daddu    $a0, $s1, $zero
-/* EE6A54 802404A4 AE220074 */  sw        $v0, 0x74($s1)
-/* EE6A58 802404A8 8E050000 */  lw        $a1, ($s0)
-/* EE6A5C 802404AC 0C0B53A3 */  jal       dead_evt_get_variable
-/* EE6A60 802404B0 0220202D */   daddu    $a0, $s1, $zero
-/* EE6A64 802404B4 24040194 */  addiu     $a0, $zero, 0x194
-/* EE6A68 802404B8 0000282D */  daddu     $a1, $zero, $zero
-/* EE6A6C 802404BC C6200070 */  lwc1      $f0, 0x70($s1)
-/* EE6A70 802404C0 46800020 */  cvt.s.w   $f0, $f0
-/* EE6A74 802404C4 C6220074 */  lwc1      $f2, 0x74($s1)
-/* EE6A78 802404C8 468010A0 */  cvt.s.w   $f2, $f2
-/* EE6A7C 802404CC 44060000 */  mfc1      $a2, $f0
-/* EE6A80 802404D0 44071000 */  mfc1      $a3, $f2
-/* EE6A84 802404D4 44820000 */  mtc1      $v0, $f0
-/* EE6A88 802404D8 00000000 */  nop
-/* EE6A8C 802404DC 46800020 */  cvt.s.w   $f0, $f0
-/* EE6A90 802404E0 AE220078 */  sw        $v0, 0x78($s1)
-/* EE6A94 802404E4 0C055C13 */  jal       dead_sfx_adjust_env_sound_pos
-/* EE6A98 802404E8 E7A00010 */   swc1     $f0, 0x10($sp)
-/* EE6A9C 802404EC 8FBF0020 */  lw        $ra, 0x20($sp)
-/* EE6AA0 802404F0 8FB1001C */  lw        $s1, 0x1c($sp)
-/* EE6AA4 802404F4 8FB00018 */  lw        $s0, 0x18($sp)
-/* EE6AA8 802404F8 24020002 */  addiu     $v0, $zero, 2
-/* EE6AAC 802404FC 03E00008 */  jr        $ra
-/* EE6AB0 80240500 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80240B10_EE70C0.s b/ver/us/asm/nonmatchings/EE70C0/func_80240B10_EE70C0.s
index 860a27833e..c20db306be 100644
--- a/ver/us/asm/nonmatchings/EE70C0/func_80240B10_EE70C0.s
+++ b/ver/us/asm/nonmatchings/EE70C0/func_80240B10_EE70C0.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80240B10_EE70C0
+glabel EE70C0_UnkNpcAIFunc23
 /* EE70C0 80240B10 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* EE70C4 80240B14 AFB3002C */  sw        $s3, 0x2c($sp)
 /* EE70C8 80240B18 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s b/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s
index 513634de35..f2e1bf28d8 100644
--- a/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s
+++ b/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s
@@ -85,7 +85,7 @@ glabel func_80241E1C_EE83CC
 glabel L80241F54_EE8504
 /* EE8504 80241F54 02A0202D */  daddu     $a0, $s5, $zero
 /* EE8508 80241F58 0200282D */  daddu     $a1, $s0, $zero
-/* EE850C 80241F5C 0C0902C4 */  jal       func_80240B10_EE70C0
+/* EE850C 80241F5C 0C0902C4 */  jal       EE70C0_UnkNpcAIFunc23
 /* EE8510 80241F60 0260302D */   daddu    $a2, $s3, $zero
 glabel L80241F64_EE8514
 /* EE8514 80241F64 02A0202D */  daddu     $a0, $s5, $zero
diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80242090_EE8640.s b/ver/us/asm/nonmatchings/EE70C0/func_80242090_EE8640.s
deleted file mode 100644
index b1078e09bd..0000000000
--- a/ver/us/asm/nonmatchings/EE70C0/func_80242090_EE8640.s
+++ /dev/null
@@ -1,122 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242090_EE8640
-/* EE8640 80242090 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* EE8644 80242094 AFB10014 */  sw        $s1, 0x14($sp)
-/* EE8648 80242098 0080882D */  daddu     $s1, $a0, $zero
-/* EE864C 8024209C AFBF0024 */  sw        $ra, 0x24($sp)
-/* EE8650 802420A0 AFB40020 */  sw        $s4, 0x20($sp)
-/* EE8654 802420A4 AFB3001C */  sw        $s3, 0x1c($sp)
-/* EE8658 802420A8 AFB20018 */  sw        $s2, 0x18($sp)
-/* EE865C 802420AC AFB00010 */  sw        $s0, 0x10($sp)
-/* EE8660 802420B0 F7BC0048 */  sdc1      $f28, 0x48($sp)
-/* EE8664 802420B4 F7BA0040 */  sdc1      $f26, 0x40($sp)
-/* EE8668 802420B8 F7B80038 */  sdc1      $f24, 0x38($sp)
-/* EE866C 802420BC F7B60030 */  sdc1      $f22, 0x30($sp)
-/* EE8670 802420C0 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* EE8674 802420C4 8E30000C */  lw        $s0, 0xc($s1)
-/* EE8678 802420C8 8E130000 */  lw        $s3, ($s0)
-/* EE867C 802420CC 26100004 */  addiu     $s0, $s0, 4
-/* EE8680 802420D0 0C0B53A3 */  jal       dead_evt_get_variable
-/* EE8684 802420D4 0260282D */   daddu    $a1, $s3, $zero
-/* EE8688 802420D8 4482E000 */  mtc1      $v0, $f28
-/* EE868C 802420DC 00000000 */  nop
-/* EE8690 802420E0 4680E720 */  cvt.s.w   $f28, $f28
-/* EE8694 802420E4 8E140000 */  lw        $s4, ($s0)
-/* EE8698 802420E8 26100004 */  addiu     $s0, $s0, 4
-/* EE869C 802420EC 0220202D */  daddu     $a0, $s1, $zero
-/* EE86A0 802420F0 0C0B53A3 */  jal       dead_evt_get_variable
-/* EE86A4 802420F4 0280282D */   daddu    $a1, $s4, $zero
-/* EE86A8 802420F8 4482D000 */  mtc1      $v0, $f26
-/* EE86AC 802420FC 00000000 */  nop
-/* EE86B0 80242100 4680D6A0 */  cvt.s.w   $f26, $f26
-/* EE86B4 80242104 8E100000 */  lw        $s0, ($s0)
-/* EE86B8 80242108 0220202D */  daddu     $a0, $s1, $zero
-/* EE86BC 8024210C 0C0B53A3 */  jal       dead_evt_get_variable
-/* EE86C0 80242110 0200282D */   daddu    $a1, $s0, $zero
-/* EE86C4 80242114 4482C000 */  mtc1      $v0, $f24
-/* EE86C8 80242118 00000000 */  nop
-/* EE86CC 8024211C 4680C620 */  cvt.s.w   $f24, $f24
-/* EE86D0 80242120 3C128011 */  lui       $s2, %hi(dead_gPlayerStatus)
-/* EE86D4 80242124 26527578 */  addiu     $s2, $s2, %lo(dead_gPlayerStatus)
-/* EE86D8 80242128 3C038008 */  lui       $v1, %hi(dead_gCurrentCameraID)
-/* EE86DC 8024212C 8C63C760 */  lw        $v1, %lo(dead_gCurrentCameraID)($v1)
-/* EE86E0 80242130 C64200A8 */  lwc1      $f2, 0xa8($s2)
-/* EE86E4 80242134 44800000 */  mtc1      $zero, $f0
-/* EE86E8 80242138 00031080 */  sll       $v0, $v1, 2
-/* EE86EC 8024213C 00431021 */  addu      $v0, $v0, $v1
-/* EE86F0 80242140 00021080 */  sll       $v0, $v0, 2
-/* EE86F4 80242144 00431023 */  subu      $v0, $v0, $v1
-/* EE86F8 80242148 000218C0 */  sll       $v1, $v0, 3
-/* EE86FC 8024214C 00431021 */  addu      $v0, $v0, $v1
-/* EE8700 80242150 000210C0 */  sll       $v0, $v0, 3
-/* EE8704 80242154 46001032 */  c.eq.s    $f2, $f0
-/* EE8708 80242158 3C01800C */  lui       $at, %hi(D_800B8DEC)
-/* EE870C 8024215C 00220821 */  addu      $at, $at, $v0
-/* EE8710 80242160 C4368DEC */  lwc1      $f22, %lo(D_800B8DEC)($at)
-/* EE8714 80242164 45000005 */  bc1f      .L8024217C
-/* EE8718 80242168 00000000 */   nop
-/* EE871C 8024216C 3C0142C8 */  lui       $at, 0x42c8
-/* EE8720 80242170 44810000 */  mtc1      $at, $f0
-/* EE8724 80242174 08090863 */  j         .L8024218C
-/* EE8728 80242178 4600B581 */   sub.s    $f22, $f22, $f0
-.L8024217C:
-/* EE872C 8024217C 3C0142C8 */  lui       $at, 0x42c8
-/* EE8730 80242180 44810000 */  mtc1      $at, $f0
-/* EE8734 80242184 00000000 */  nop
-/* EE8738 80242188 4600B580 */  add.s     $f22, $f22, $f0
-.L8024218C:
-/* EE873C 8024218C 0C00AB85 */  jal       dead_clamp_angle
-/* EE8740 80242190 4600B306 */   mov.s    $f12, $f22
-/* EE8744 80242194 46000586 */  mov.s     $f22, $f0
-/* EE8748 80242198 3C014170 */  lui       $at, 0x4170
-/* EE874C 8024219C 4481A000 */  mtc1      $at, $f20
-/* 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
-/* EE8760 802421B0 864200B0 */  lh        $v0, 0xb0($s2)
-/* EE8764 802421B4 3C013F00 */  lui       $at, 0x3f00
-/* EE8768 802421B8 44812000 */  mtc1      $at, $f4
-/* EE876C 802421BC 44821000 */  mtc1      $v0, $f2
-/* EE8770 802421C0 00000000 */  nop
-/* EE8774 802421C4 468010A0 */  cvt.s.w   $f2, $f2
-/* EE8778 802421C8 46041082 */  mul.s     $f2, $f2, $f4
-/* EE877C 802421CC 00000000 */  nop
-/* EE8780 802421D0 4600E700 */  add.s     $f28, $f28, $f0
-/* EE8784 802421D4 4602D680 */  add.s     $f26, $f26, $f2
-/* 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
-/* EE8798 802421E8 0220202D */  daddu     $a0, $s1, $zero
-/* EE879C 802421EC 0260282D */  daddu     $a1, $s3, $zero
-/* EE87A0 802421F0 4600E18D */  trunc.w.s $f6, $f28
-/* EE87A4 802421F4 44063000 */  mfc1      $a2, $f6
-/* EE87A8 802421F8 0C0B551A */  jal       dead_evt_set_variable
-/* EE87AC 802421FC 4600C601 */   sub.s    $f24, $f24, $f0
-/* EE87B0 80242200 0220202D */  daddu     $a0, $s1, $zero
-/* EE87B4 80242204 4600D18D */  trunc.w.s $f6, $f26
-/* EE87B8 80242208 44063000 */  mfc1      $a2, $f6
-/* EE87BC 8024220C 0C0B551A */  jal       dead_evt_set_variable
-/* EE87C0 80242210 0280282D */   daddu    $a1, $s4, $zero
-/* EE87C4 80242214 0220202D */  daddu     $a0, $s1, $zero
-/* EE87C8 80242218 4600C18D */  trunc.w.s $f6, $f24
-/* EE87CC 8024221C 44063000 */  mfc1      $a2, $f6
-/* EE87D0 80242220 0C0B551A */  jal       dead_evt_set_variable
-/* EE87D4 80242224 0200282D */   daddu    $a1, $s0, $zero
-/* EE87D8 80242228 8FBF0024 */  lw        $ra, 0x24($sp)
-/* EE87DC 8024222C 8FB40020 */  lw        $s4, 0x20($sp)
-/* EE87E0 80242230 8FB3001C */  lw        $s3, 0x1c($sp)
-/* EE87E4 80242234 8FB20018 */  lw        $s2, 0x18($sp)
-/* EE87E8 80242238 8FB10014 */  lw        $s1, 0x14($sp)
-/* EE87EC 8024223C 8FB00010 */  lw        $s0, 0x10($sp)
-/* EE87F0 80242240 D7BC0048 */  ldc1      $f28, 0x48($sp)
-/* EE87F4 80242244 D7BA0040 */  ldc1      $f26, 0x40($sp)
-/* EE87F8 80242248 D7B80038 */  ldc1      $f24, 0x38($sp)
-/* EE87FC 8024224C D7B60030 */  ldc1      $f22, 0x30($sp)
-/* EE8800 80242250 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* EE8804 80242254 24020002 */  addiu     $v0, $zero, 2
-/* EE8808 80242258 03E00008 */  jr        $ra
-/* EE880C 8024225C 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/EED1E0/func_80240148_EED248.s b/ver/us/asm/nonmatchings/EED1E0/func_80240148_EED248.s
deleted file mode 100644
index 165a629d8e..0000000000
--- a/ver/us/asm/nonmatchings/EED1E0/func_80240148_EED248.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240148_EED248
-/* EED248 80240148 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* EED24C 8024014C AFB00010 */  sw        $s0, 0x10($sp)
-/* EED250 80240150 0080802D */  daddu     $s0, $a0, $zero
-/* EED254 80240154 AFBF0018 */  sw        $ra, 0x18($sp)
-/* EED258 80240158 AFB10014 */  sw        $s1, 0x14($sp)
-/* EED25C 8024015C 8E11000C */  lw        $s1, 0xc($s0)
-/* EED260 80240160 8E250000 */  lw        $a1, ($s1)
-/* EED264 80240164 0C0B53A3 */  jal       dead_evt_get_variable
-/* EED268 80240168 26310004 */   addiu    $s1, $s1, 4
-/* EED26C 8024016C 0200202D */  daddu     $a0, $s0, $zero
-/* EED270 80240170 3C038011 */  lui       $v1, %hi(D_80117840)
-/* EED274 80240174 24637840 */  addiu     $v1, $v1, %lo(D_80117840)
-/* EED278 80240178 000210C0 */  sll       $v0, $v0, 3
-/* EED27C 8024017C 00431021 */  addu      $v0, $v0, $v1
-/* EED280 80240180 90460015 */  lbu       $a2, 0x15($v0)
-/* EED284 80240184 8E250000 */  lw        $a1, ($s1)
-/* EED288 80240188 24C60001 */  addiu     $a2, $a2, 1
-/* EED28C 8024018C A0460015 */  sb        $a2, 0x15($v0)
-/* EED290 80240190 00063600 */  sll       $a2, $a2, 0x18
-/* EED294 80240194 0C0B551A */  jal       dead_evt_set_variable
-/* EED298 80240198 00063603 */   sra      $a2, $a2, 0x18
-/* EED29C 8024019C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* EED2A0 802401A0 8FB10014 */  lw        $s1, 0x14($sp)
-/* EED2A4 802401A4 8FB00010 */  lw        $s0, 0x10($sp)
-/* EED2A8 802401A8 24020002 */  addiu     $v0, $zero, 2
-/* EED2AC 802401AC 03E00008 */  jr        $ra
-/* EED2B0 802401B0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EED1E0/func_802401B4_EED2B4.s b/ver/us/asm/nonmatchings/EED1E0/func_802401B4_EED2B4.s
deleted file mode 100644
index f1e12f3e79..0000000000
--- a/ver/us/asm/nonmatchings/EED1E0/func_802401B4_EED2B4.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802401B4_EED2B4
-/* EED2B4 802401B4 3C028011 */  lui       $v0, %hi(D_80117840)
-/* EED2B8 802401B8 24427840 */  addiu     $v0, $v0, %lo(D_80117840)
-/* EED2BC 802401BC 000420C0 */  sll       $a0, $a0, 3
-/* EED2C0 802401C0 00822021 */  addu      $a0, $a0, $v0
-/* EED2C4 802401C4 90820014 */  lbu       $v0, 0x14($a0)
-/* EED2C8 802401C8 10400009 */  beqz      $v0, .L802401F0
-/* EED2CC 802401CC 00000000 */   nop
-/* EED2D0 802401D0 90820015 */  lbu       $v0, 0x15($a0)
-/* EED2D4 802401D4 00022600 */  sll       $a0, $v0, 0x18
-/* EED2D8 802401D8 00041E03 */  sra       $v1, $a0, 0x18
-/* EED2DC 802401DC 00051400 */  sll       $v0, $a1, 0x10
-/* EED2E0 802401E0 00021403 */  sra       $v0, $v0, 0x10
-/* EED2E4 802401E4 0043102A */  slt       $v0, $v0, $v1
-/* EED2E8 802401E8 10400003 */  beqz      $v0, .L802401F8
-/* EED2EC 802401EC 00000000 */   nop
-.L802401F0:
-/* EED2F0 802401F0 03E00008 */  jr        $ra
-/* EED2F4 802401F4 2402FFFF */   addiu    $v0, $zero, -1
-.L802401F8:
-/* EED2F8 802401F8 03E00008 */  jr        $ra
-/* EED2FC 802401FC 00041603 */   sra      $v0, $a0, 0x18
diff --git a/ver/us/asm/nonmatchings/EED1E0/func_80240200_EED300.s b/ver/us/asm/nonmatchings/EED1E0/func_80240200_EED300.s
deleted file mode 100644
index 24bb2e85a1..0000000000
--- a/ver/us/asm/nonmatchings/EED1E0/func_80240200_EED300.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240200_EED300
-/* EED300 80240200 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* EED304 80240204 AFB3001C */  sw        $s3, 0x1c($sp)
-/* EED308 80240208 0080982D */  daddu     $s3, $a0, $zero
-/* EED30C 8024020C AFB00010 */  sw        $s0, 0x10($sp)
-/* EED310 80240210 24100001 */  addiu     $s0, $zero, 1
-/* EED314 80240214 AFB40020 */  sw        $s4, 0x20($sp)
-/* EED318 80240218 2414FFFF */  addiu     $s4, $zero, -1
-/* EED31C 8024021C AFB50024 */  sw        $s5, 0x24($sp)
-/* EED320 80240220 0200A82D */  daddu     $s5, $s0, $zero
-/* EED324 80240224 AFB10014 */  sw        $s1, 0x14($sp)
-/* EED328 80240228 3C118011 */  lui       $s1, %hi(D_80117848)
-/* EED32C 8024022C 26317848 */  addiu     $s1, $s1, %lo(D_80117848)
-/* EED330 80240230 AFBF0028 */  sw        $ra, 0x28($sp)
-/* EED334 80240234 AFB20018 */  sw        $s2, 0x18($sp)
-/* EED338 80240238 8E6200B4 */  lw        $v0, 0xb4($s3)
-/* EED33C 8024023C 0280182D */  daddu     $v1, $s4, $zero
-/* EED340 80240240 AE630084 */  sw        $v1, 0x84($s3)
-/* EED344 80240244 00021027 */  nor       $v0, $zero, $v0
-/* EED348 80240248 000217C2 */  srl       $v0, $v0, 0x1f
-/* EED34C 8024024C 00029400 */  sll       $s2, $v0, 0x10
-.L80240250:
-/* EED350 80240250 92220014 */  lbu       $v0, 0x14($s1)
-/* EED354 80240254 50400008 */  beql      $v0, $zero, .L80240278
-/* EED358 80240258 26100001 */   addiu    $s0, $s0, 1
-/* EED35C 8024025C 0200202D */  daddu     $a0, $s0, $zero
-/* EED360 80240260 0C09006D */  jal       func_802401B4_EED2B4
-/* EED364 80240264 00122C03 */   sra      $a1, $s2, 0x10
-/* EED368 80240268 10540003 */  beq       $v0, $s4, .L80240278
-/* EED36C 8024026C 26100001 */   addiu    $s0, $s0, 1
-/* EED370 80240270 080900A1 */  j         .L80240284
-/* EED374 80240274 AE750084 */   sw       $s5, 0x84($s3)
-.L80240278:
-/* EED378 80240278 2A02000C */  slti      $v0, $s0, 0xc
-/* EED37C 8024027C 1440FFF4 */  bnez      $v0, .L80240250
-/* EED380 80240280 26310008 */   addiu    $s1, $s1, 8
-.L80240284:
-/* EED384 80240284 8FBF0028 */  lw        $ra, 0x28($sp)
-/* EED388 80240288 8FB50024 */  lw        $s5, 0x24($sp)
-/* EED38C 8024028C 8FB40020 */  lw        $s4, 0x20($sp)
-/* EED390 80240290 8FB3001C */  lw        $s3, 0x1c($sp)
-/* EED394 80240294 8FB20018 */  lw        $s2, 0x18($sp)
-/* EED398 80240298 8FB10014 */  lw        $s1, 0x14($sp)
-/* EED39C 8024029C 8FB00010 */  lw        $s0, 0x10($sp)
-/* EED3A0 802402A0 24020002 */  addiu     $v0, $zero, 2
-/* EED3A4 802402A4 03E00008 */  jr        $ra
-/* EED3A8 802402A8 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/EED1E0/func_802402AC_EED3AC.s b/ver/us/asm/nonmatchings/EED1E0/func_802402AC_EED3AC.s
index 3671ae9fdf..828c456c7e 100644
--- a/ver/us/asm/nonmatchings/EED1E0/func_802402AC_EED3AC.s
+++ b/ver/us/asm/nonmatchings/EED1E0/func_802402AC_EED3AC.s
@@ -6,8 +6,8 @@ glabel func_802402AC_EED3AC
 /* EED3B0 802402B0 AFB5002C */  sw        $s5, 0x2c($sp)
 /* EED3B4 802402B4 0080A82D */  daddu     $s5, $a0, $zero
 /* EED3B8 802402B8 AFBE0038 */  sw        $fp, 0x38($sp)
-/* EED3BC 802402BC 3C1E8011 */  lui       $fp, %hi(D_80117840)
-/* EED3C0 802402C0 27DE7840 */  addiu     $fp, $fp, %lo(D_80117840)
+/* EED3BC 802402BC 3C1E8011 */  lui       $fp, %hi(dead_gPlayerData)
+/* EED3C0 802402C0 27DE7840 */  addiu     $fp, $fp, %lo(dead_gPlayerData)
 /* EED3C4 802402C4 AFBF003C */  sw        $ra, 0x3c($sp)
 /* EED3C8 802402C8 AFB70034 */  sw        $s7, 0x34($sp)
 /* EED3CC 802402CC AFB60030 */  sw        $s6, 0x30($sp)
@@ -49,7 +49,7 @@ glabel func_802402AC_EED3AC
 /* EED458 80240358 AE300108 */  sw        $s0, 0x108($s1)
 /* EED45C 8024035C 8C420000 */  lw        $v0, ($v0)
 /* EED460 80240360 02E0282D */  daddu     $a1, $s7, $zero
-/* EED464 80240364 0C09006D */  jal       func_802401B4_EED2B4
+/* EED464 80240364 0C09006D */  jal       EED1E0_UnkFunc37
 /* EED468 80240368 AE220084 */   sw       $v0, 0x84($s1)
 /* EED46C 8024036C 0040202D */  daddu     $a0, $v0, $zero
 /* EED470 80240370 04800011 */  bltz      $a0, .L802403B8
diff --git a/ver/us/asm/nonmatchings/EED1E0/func_80240560_EED660.s b/ver/us/asm/nonmatchings/EED1E0/func_80240560_EED660.s
deleted file mode 100644
index 2aea6fb8c4..0000000000
--- a/ver/us/asm/nonmatchings/EED1E0/func_80240560_EED660.s
+++ /dev/null
@@ -1,40 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240560_EED660
-/* EED660 80240560 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* EED664 80240564 AFB1001C */  sw        $s1, 0x1c($sp)
-/* EED668 80240568 0080882D */  daddu     $s1, $a0, $zero
-/* EED66C 8024056C AFBF0020 */  sw        $ra, 0x20($sp)
-/* EED670 80240570 AFB00018 */  sw        $s0, 0x18($sp)
-/* EED674 80240574 8E30000C */  lw        $s0, 0xc($s1)
-/* EED678 80240578 8E050000 */  lw        $a1, ($s0)
-/* EED67C 8024057C 0C0B53A3 */  jal       dead_evt_get_variable
-/* EED680 80240580 26100004 */   addiu    $s0, $s0, 4
-/* EED684 80240584 0C0462EC */  jal       func_80118BB0
-/* EED688 80240588 0040202D */   daddu    $a0, $v0, $zero
-/* EED68C 8024058C 8E100000 */  lw        $s0, ($s0)
-/* EED690 80240590 C444004C */  lwc1      $f4, 0x4c($v0)
-/* EED694 80240594 3C014148 */  lui       $at, 0x4148
-/* EED698 80240598 44810000 */  mtc1      $at, $f0
-/* EED69C 8024059C 3C013F33 */  lui       $at, 0x3f33
-/* EED6A0 802405A0 34213333 */  ori       $at, $at, 0x3333
-/* EED6A4 802405A4 44811000 */  mtc1      $at, $f2
-/* EED6A8 802405A8 AFA00014 */  sw        $zero, 0x14($sp)
-/* EED6AC 802405AC 46002100 */  add.s     $f4, $f4, $f0
-/* EED6B0 802405B0 E7A20010 */  swc1      $f2, 0x10($sp)
-/* EED6B4 802405B4 8C450048 */  lw        $a1, 0x48($v0)
-/* EED6B8 802405B8 8C470050 */  lw        $a3, 0x50($v0)
-/* EED6BC 802405BC 44062000 */  mfc1      $a2, $f4
-/* EED6C0 802405C0 0C01DA74 */  jal       func_800769D0
-/* EED6C4 802405C4 0000202D */   daddu    $a0, $zero, $zero
-/* EED6C8 802405C8 0220202D */  daddu     $a0, $s1, $zero
-/* EED6CC 802405CC 0200282D */  daddu     $a1, $s0, $zero
-/* EED6D0 802405D0 0C0B551A */  jal       dead_evt_set_variable
-/* EED6D4 802405D4 0040302D */   daddu    $a2, $v0, $zero
-/* EED6D8 802405D8 8FBF0020 */  lw        $ra, 0x20($sp)
-/* EED6DC 802405DC 8FB1001C */  lw        $s1, 0x1c($sp)
-/* EED6E0 802405E0 8FB00018 */  lw        $s0, 0x18($sp)
-/* EED6E4 802405E4 24020002 */  addiu     $v0, $zero, 2
-/* EED6E8 802405E8 03E00008 */  jr        $ra
-/* EED6EC 802405EC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/EED1E0/func_80240624_EED724.s b/ver/us/asm/nonmatchings/EED1E0/func_80240624_EED724.s
deleted file mode 100644
index 34df774976..0000000000
--- a/ver/us/asm/nonmatchings/EED1E0/func_80240624_EED724.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240624_EED724
-/* EED724 80240624 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* EED728 80240628 AFBF0018 */  sw        $ra, 0x18($sp)
-/* EED72C 8024062C 8C82000C */  lw        $v0, 0xc($a0)
-/* EED730 80240630 0C0B53A3 */  jal       dead_evt_get_variable
-/* EED734 80240634 8C450000 */   lw       $a1, ($v0)
-/* EED738 80240638 0C0462EC */  jal       func_80118BB0
-/* EED73C 8024063C 0040202D */   daddu    $a0, $v0, $zero
-/* EED740 80240640 3C013F80 */  lui       $at, 0x3f80
-/* EED744 80240644 44810000 */  mtc1      $at, $f0
-/* EED748 80240648 C442004C */  lwc1      $f2, 0x4c($v0)
-/* EED74C 8024064C E7A00010 */  swc1      $f0, 0x10($sp)
-/* EED750 80240650 3C014148 */  lui       $at, 0x4148
-/* EED754 80240654 44810000 */  mtc1      $at, $f0
-/* EED758 80240658 2403004B */  addiu     $v1, $zero, 0x4b
-/* EED75C 8024065C AFA30014 */  sw        $v1, 0x14($sp)
-/* EED760 80240660 46001080 */  add.s     $f2, $f2, $f0
-/* EED764 80240664 8C450048 */  lw        $a1, 0x48($v0)
-/* EED768 80240668 8C470050 */  lw        $a3, 0x50($v0)
-/* EED76C 8024066C 44061000 */  mfc1      $a2, $f2
-/* EED770 80240670 0C01D78C */  jal       func_80075E30
-/* EED774 80240674 24040004 */   addiu    $a0, $zero, 4
-/* EED778 80240678 8FBF0018 */  lw        $ra, 0x18($sp)
-/* EED77C 8024067C 24020002 */  addiu     $v0, $zero, 2
-/* EED780 80240680 03E00008 */  jr        $ra
-/* EED784 80240684 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EED1E0/func_80240688_EED788.s b/ver/us/asm/nonmatchings/EED1E0/func_80240688_EED788.s
deleted file mode 100644
index fcd0c74771..0000000000
--- a/ver/us/asm/nonmatchings/EED1E0/func_80240688_EED788.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240688_EED788
-/* EED788 80240688 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* EED78C 8024068C AFBF0018 */  sw        $ra, 0x18($sp)
-/* EED790 80240690 0C00F94D */  jal       dead_get_npc_safe
-/* EED794 80240694 2404FFFC */   addiu    $a0, $zero, -4
-/* EED798 80240698 C444003C */  lwc1      $f4, 0x3c($v0)
-/* EED79C 8024069C 3C014148 */  lui       $at, 0x4148
-/* EED7A0 802406A0 44811000 */  mtc1      $at, $f2
-/* EED7A4 802406A4 3C013F80 */  lui       $at, 0x3f80
-/* EED7A8 802406A8 44810000 */  mtc1      $at, $f0
-/* EED7AC 802406AC 2403001E */  addiu     $v1, $zero, 0x1e
-/* EED7B0 802406B0 AFA30014 */  sw        $v1, 0x14($sp)
-/* EED7B4 802406B4 46022100 */  add.s     $f4, $f4, $f2
-/* EED7B8 802406B8 E7A00010 */  swc1      $f0, 0x10($sp)
-/* EED7BC 802406BC 8C450038 */  lw        $a1, 0x38($v0)
-/* EED7C0 802406C0 8C470040 */  lw        $a3, 0x40($v0)
-/* EED7C4 802406C4 44062000 */  mfc1      $a2, $f4
-/* EED7C8 802406C8 0C01D78C */  jal       func_80075E30
-/* EED7CC 802406CC 24040009 */   addiu    $a0, $zero, 9
-/* EED7D0 802406D0 8FBF0018 */  lw        $ra, 0x18($sp)
-/* EED7D4 802406D4 24020002 */  addiu     $v0, $zero, 2
-/* EED7D8 802406D8 03E00008 */  jr        $ra
-/* EED7DC 802406DC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s b/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s
index 39ca49be39..5b8b5d8178 100644
--- a/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s
+++ b/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s
@@ -52,7 +52,7 @@ glabel func_802406E0_EED7E0
 /* EED89C 8024079C 4480A000 */  mtc1      $zero, $f20
 /* EED8A0 802407A0 0C0B53A3 */  jal       dead_evt_get_variable
 /* EED8A4 802407A4 0240802D */   daddu    $s0, $s2, $zero
-/* EED8A8 802407A8 0C0462EC */  jal       func_80118BB0
+/* EED8A8 802407A8 0C0462EC */  jal       dead_get_entity_by_index
 /* EED8AC 802407AC 0040202D */   daddu    $a0, $v0, $zero
 /* EED8B0 802407B0 AE42005C */  sw        $v0, 0x5c($s2)
 .L802407B4:
diff --git a/ver/us/asm/nonmatchings/EED1E0/func_80240C18_EEDD18.s b/ver/us/asm/nonmatchings/EED1E0/func_80240C18_EEDD18.s
deleted file mode 100644
index 2bd42f2591..0000000000
--- a/ver/us/asm/nonmatchings/EED1E0/func_80240C18_EEDD18.s
+++ /dev/null
@@ -1,92 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240C18_EEDD18
-/* EEDD18 80240C18 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* EEDD1C 80240C1C AFB10014 */  sw        $s1, 0x14($sp)
-/* EEDD20 80240C20 0080882D */  daddu     $s1, $a0, $zero
-/* EEDD24 80240C24 AFB20018 */  sw        $s2, 0x18($sp)
-/* EEDD28 80240C28 AFBF001C */  sw        $ra, 0x1c($sp)
-/* EEDD2C 80240C2C AFB00010 */  sw        $s0, 0x10($sp)
-/* EEDD30 80240C30 8E30000C */  lw        $s0, 0xc($s1)
-/* EEDD34 80240C34 10A00010 */  beqz      $a1, .L80240C78
-/* EEDD38 80240C38 0000902D */   daddu    $s2, $zero, $zero
-/* EEDD3C 80240C3C 8E050000 */  lw        $a1, ($s0)
-/* EEDD40 80240C40 0C0B53A3 */  jal       dead_evt_get_variable
-/* EEDD44 80240C44 26100004 */   addiu    $s0, $s0, 4
-/* EEDD48 80240C48 AE220084 */  sw        $v0, 0x84($s1)
-/* EEDD4C 80240C4C 8E050000 */  lw        $a1, ($s0)
-/* EEDD50 80240C50 0C0B53A3 */  jal       dead_evt_get_variable
-/* EEDD54 80240C54 0220202D */   daddu    $a0, $s1, $zero
-/* EEDD58 80240C58 0240202D */  daddu     $a0, $s2, $zero
-/* EEDD5C 80240C5C 240500D0 */  addiu     $a1, $zero, 0xd0
-/* EEDD60 80240C60 00A0302D */  daddu     $a2, $a1, $zero
-/* EEDD64 80240C64 00A0382D */  daddu     $a3, $a1, $zero
-/* EEDD68 80240C68 AE220088 */  sw        $v0, 0x88($s1)
-/* EEDD6C 80240C6C AE200070 */  sw        $zero, 0x70($s1)
-/* EEDD70 80240C70 0C051080 */  jal       func_80144200
-/* EEDD74 80240C74 AE200074 */   sw       $zero, 0x74($s1)
-.L80240C78:
-/* EEDD78 80240C78 8E230070 */  lw        $v1, 0x70($s1)
-/* EEDD7C 80240C7C 24040001 */  addiu     $a0, $zero, 1
-/* EEDD80 80240C80 10640019 */  beq       $v1, $a0, .L80240CE8
-/* EEDD84 80240C84 28620002 */   slti     $v0, $v1, 2
-/* EEDD88 80240C88 10400005 */  beqz      $v0, .L80240CA0
-/* EEDD8C 80240C8C 24020002 */   addiu    $v0, $zero, 2
-/* EEDD90 80240C90 10600007 */  beqz      $v1, .L80240CB0
-/* EEDD94 80240C94 240500FF */   addiu    $a1, $zero, 0xff
-/* EEDD98 80240C98 0809034A */  j         .L80240D28
-/* EEDD9C 80240C9C 00000000 */   nop
-.L80240CA0:
-/* EEDDA0 80240CA0 10620019 */  beq       $v1, $v0, .L80240D08
-/* EEDDA4 80240CA4 00000000 */   nop
-/* EEDDA8 80240CA8 0809034A */  j         .L80240D28
-/* EEDDAC 80240CAC 00000000 */   nop
-.L80240CB0:
-/* EEDDB0 80240CB0 8E220074 */  lw        $v0, 0x74($s1)
-/* EEDDB4 80240CB4 14450004 */  bne       $v0, $a1, .L80240CC8
-/* EEDDB8 80240CB8 00000000 */   nop
-/* EEDDBC 80240CBC AE240070 */  sw        $a0, 0x70($s1)
-/* EEDDC0 80240CC0 AE200078 */  sw        $zero, 0x78($s1)
-/* EEDDC4 80240CC4 8E220074 */  lw        $v0, 0x74($s1)
-.L80240CC8:
-/* EEDDC8 80240CC8 8E230084 */  lw        $v1, 0x84($s1)
-/* EEDDCC 80240CCC 00431021 */  addu      $v0, $v0, $v1
-/* EEDDD0 80240CD0 AE220074 */  sw        $v0, 0x74($s1)
-/* EEDDD4 80240CD4 28420100 */  slti      $v0, $v0, 0x100
-/* EEDDD8 80240CD8 50400013 */  beql      $v0, $zero, .L80240D28
-/* EEDDDC 80240CDC AE250074 */   sw       $a1, 0x74($s1)
-/* EEDDE0 80240CE0 0809034A */  j         .L80240D28
-/* EEDDE4 80240CE4 00000000 */   nop
-.L80240CE8:
-/* EEDDE8 80240CE8 8E220078 */  lw        $v0, 0x78($s1)
-/* EEDDEC 80240CEC 24420001 */  addiu     $v0, $v0, 1
-/* EEDDF0 80240CF0 AE220078 */  sw        $v0, 0x78($s1)
-/* EEDDF4 80240CF4 28420002 */  slti      $v0, $v0, 2
-/* EEDDF8 80240CF8 1440000B */  bnez      $v0, .L80240D28
-/* EEDDFC 80240CFC 24020002 */   addiu    $v0, $zero, 2
-/* EEDE00 80240D00 0809034A */  j         .L80240D28
-/* EEDE04 80240D04 AE220070 */   sw       $v0, 0x70($s1)
-.L80240D08:
-/* EEDE08 80240D08 8E230074 */  lw        $v1, 0x74($s1)
-/* EEDE0C 80240D0C 50600001 */  beql      $v1, $zero, .L80240D14
-/* EEDE10 80240D10 24120001 */   addiu    $s2, $zero, 1
-.L80240D14:
-/* EEDE14 80240D14 8E220088 */  lw        $v0, 0x88($s1)
-/* EEDE18 80240D18 00621023 */  subu      $v0, $v1, $v0
-/* EEDE1C 80240D1C 04410002 */  bgez      $v0, .L80240D28
-/* EEDE20 80240D20 AE220074 */   sw       $v0, 0x74($s1)
-/* EEDE24 80240D24 AE200074 */  sw        $zero, 0x74($s1)
-.L80240D28:
-/* EEDE28 80240D28 C6200074 */  lwc1      $f0, 0x74($s1)
-/* EEDE2C 80240D2C 46800020 */  cvt.s.w   $f0, $f0
-/* EEDE30 80240D30 44050000 */  mfc1      $a1, $f0
-/* EEDE34 80240D34 0C05105E */  jal       func_80144178
-/* EEDE38 80240D38 24040001 */   addiu    $a0, $zero, 1
-/* EEDE3C 80240D3C 0240102D */  daddu     $v0, $s2, $zero
-/* EEDE40 80240D40 8FBF001C */  lw        $ra, 0x1c($sp)
-/* EEDE44 80240D44 8FB20018 */  lw        $s2, 0x18($sp)
-/* EEDE48 80240D48 8FB10014 */  lw        $s1, 0x14($sp)
-/* EEDE4C 80240D4C 8FB00010 */  lw        $s0, 0x10($sp)
-/* EEDE50 80240D50 03E00008 */  jr        $ra
-/* EEDE54 80240D54 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80242374_EEF474.s b/ver/us/asm/nonmatchings/EEDF50/func_80242374_EEF474.s
deleted file mode 100644
index 6ed8763409..0000000000
--- a/ver/us/asm/nonmatchings/EEDF50/func_80242374_EEF474.s
+++ /dev/null
@@ -1,82 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242374_EEF474
-/* EEF474 80242374 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* EEF478 80242378 AFB3001C */  sw        $s3, 0x1c($sp)
-/* EEF47C 8024237C 0080982D */  daddu     $s3, $a0, $zero
-/* EEF480 80242380 AFBF0020 */  sw        $ra, 0x20($sp)
-/* EEF484 80242384 AFB20018 */  sw        $s2, 0x18($sp)
-/* EEF488 80242388 AFB10014 */  sw        $s1, 0x14($sp)
-/* EEF48C 8024238C AFB00010 */  sw        $s0, 0x10($sp)
-/* EEF490 80242390 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* EEF494 80242394 8E710148 */  lw        $s1, 0x148($s3)
-/* EEF498 80242398 86240008 */  lh        $a0, 8($s1)
-/* EEF49C 8024239C 0C00F92F */  jal       dead_get_npc_unsafe
-/* EEF4A0 802423A0 00A0802D */   daddu    $s0, $a1, $zero
-/* EEF4A4 802423A4 8E040020 */  lw        $a0, 0x20($s0)
-/* EEF4A8 802423A8 0040902D */  daddu     $s2, $v0, $zero
-/* EEF4AC 802423AC 00041FC2 */  srl       $v1, $a0, 0x1f
-/* EEF4B0 802423B0 00832021 */  addu      $a0, $a0, $v1
-/* EEF4B4 802423B4 00042043 */  sra       $a0, $a0, 1
-/* EEF4B8 802423B8 0C00AB3B */  jal       dead_rand_int
-/* EEF4BC 802423BC 24840001 */   addiu    $a0, $a0, 1
-/* EEF4C0 802423C0 8E030020 */  lw        $v1, 0x20($s0)
-/* EEF4C4 802423C4 C64C0038 */  lwc1      $f12, 0x38($s2)
-/* EEF4C8 802423C8 000327C2 */  srl       $a0, $v1, 0x1f
-/* EEF4CC 802423CC 00641821 */  addu      $v1, $v1, $a0
-/* EEF4D0 802423D0 00031843 */  sra       $v1, $v1, 1
-/* EEF4D4 802423D4 00621821 */  addu      $v1, $v1, $v0
-/* EEF4D8 802423D8 A643008E */  sh        $v1, 0x8e($s2)
-/* EEF4DC 802423DC 8E2200CC */  lw        $v0, 0xcc($s1)
-/* EEF4E0 802423E0 C64E0040 */  lwc1      $f14, 0x40($s2)
-/* EEF4E4 802423E4 8C42000C */  lw        $v0, 0xc($v0)
-/* EEF4E8 802423E8 AE420028 */  sw        $v0, 0x28($s2)
-/* EEF4EC 802423EC C6000018 */  lwc1      $f0, 0x18($s0)
-/* EEF4F0 802423F0 3C028010 */  lui       $v0, %hi(dead_gPlayerStatusPtr)
-/* EEF4F4 802423F4 8C42FC90 */  lw        $v0, %lo(dead_gPlayerStatusPtr)($v0)
-/* EEF4F8 802423F8 E6400018 */  swc1      $f0, 0x18($s2)
-/* EEF4FC 802423FC 8C460028 */  lw        $a2, 0x28($v0)
-/* EEF500 80242400 0C00ABDC */  jal       fio_validate_header_checksums
-/* 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       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)
-/* EEF520 80242420 46001005 */  abs.s     $f0, $f2
-/* EEF524 80242424 44822000 */  mtc1      $v0, $f4
-/* EEF528 80242428 00000000 */  nop
-/* EEF52C 8024242C 46802120 */  cvt.s.w   $f4, $f4
-/* EEF530 80242430 4600203C */  c.lt.s    $f4, $f0
-/* EEF534 80242434 00000000 */  nop
-/* EEF538 80242438 4500000D */  bc1f      .L80242470
-/* EEF53C 8024243C 00000000 */   nop
-/* EEF540 80242440 44800000 */  mtc1      $zero, $f0
-/* EEF544 80242444 C654000C */  lwc1      $f20, 0xc($s2)
-/* EEF548 80242448 4600103C */  c.lt.s    $f2, $f0
-/* EEF54C 8024244C 00000000 */  nop
-/* EEF550 80242450 45000006 */  bc1f      .L8024246C
-/* EEF554 80242454 00021023 */   negu     $v0, $v0
-/* EEF558 80242458 44820000 */  mtc1      $v0, $f0
-/* EEF55C 8024245C 00000000 */  nop
-/* EEF560 80242460 46800020 */  cvt.s.w   $f0, $f0
-/* EEF564 80242464 0809091C */  j         .L80242470
-/* EEF568 80242468 4600A500 */   add.s    $f20, $f20, $f0
-.L8024246C:
-/* EEF56C 8024246C 4604A500 */  add.s     $f20, $f20, $f4
-.L80242470:
-/* EEF570 80242470 0C00AB85 */  jal       dead_clamp_angle
-/* EEF574 80242474 4600A306 */   mov.s    $f12, $f20
-/* EEF578 80242478 2402000D */  addiu     $v0, $zero, 0xd
-/* EEF57C 8024247C E640000C */  swc1      $f0, 0xc($s2)
-/* EEF580 80242480 AE620070 */  sw        $v0, 0x70($s3)
-/* EEF584 80242484 8FBF0020 */  lw        $ra, 0x20($sp)
-/* EEF588 80242488 8FB3001C */  lw        $s3, 0x1c($sp)
-/* EEF58C 8024248C 8FB20018 */  lw        $s2, 0x18($sp)
-/* EEF590 80242490 8FB10014 */  lw        $s1, 0x14($sp)
-/* EEF594 80242494 8FB00010 */  lw        $s0, 0x10($sp)
-/* EEF598 80242498 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* EEF59C 8024249C 03E00008 */  jr        $ra
-/* EEF5A0 802424A0 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/EEDF50/func_802424A4_EEF5A4.s b/ver/us/asm/nonmatchings/EEDF50/func_802424A4_EEF5A4.s
deleted file mode 100644
index 7534d88c09..0000000000
--- a/ver/us/asm/nonmatchings/EEDF50/func_802424A4_EEF5A4.s
+++ /dev/null
@@ -1,179 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-glabel D_802454A8_EF25A8
-.double 0.06
-
-.section .text
-
-glabel func_802424A4_EEF5A4
-/* EEF5A4 802424A4 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* EEF5A8 802424A8 AFB3004C */  sw        $s3, 0x4c($sp)
-/* EEF5AC 802424AC 0080982D */  daddu     $s3, $a0, $zero
-/* EEF5B0 802424B0 AFBF0050 */  sw        $ra, 0x50($sp)
-/* EEF5B4 802424B4 AFB20048 */  sw        $s2, 0x48($sp)
-/* EEF5B8 802424B8 AFB10044 */  sw        $s1, 0x44($sp)
-/* EEF5BC 802424BC AFB00040 */  sw        $s0, 0x40($sp)
-/* EEF5C0 802424C0 8E720148 */  lw        $s2, 0x148($s3)
-/* EEF5C4 802424C4 00A0882D */  daddu     $s1, $a1, $zero
-/* EEF5C8 802424C8 86440008 */  lh        $a0, 8($s2)
-/* EEF5CC 802424CC 0C00F92F */  jal       dead_get_npc_unsafe
-/* EEF5D0 802424D0 00C0802D */   daddu    $s0, $a2, $zero
-/* EEF5D4 802424D4 0200202D */  daddu     $a0, $s0, $zero
-/* EEF5D8 802424D8 0240282D */  daddu     $a1, $s2, $zero
-/* EEF5DC 802424DC 24030001 */  addiu     $v1, $zero, 1
-/* EEF5E0 802424E0 AFA30010 */  sw        $v1, 0x10($sp)
-/* EEF5E4 802424E4 8E260024 */  lw        $a2, 0x24($s1)
-/* EEF5E8 802424E8 8E270028 */  lw        $a3, 0x28($s1)
-/* EEF5EC 802424EC 0C013469 */  jal       func_8004D1A4
-/* EEF5F0 802424F0 0040802D */   daddu    $s0, $v0, $zero
-/* EEF5F4 802424F4 14400020 */  bnez      $v0, .L80242578
-/* EEF5F8 802424F8 24040002 */   addiu    $a0, $zero, 2
-/* EEF5FC 802424FC 0200282D */  daddu     $a1, $s0, $zero
-/* EEF600 80242500 0000302D */  daddu     $a2, $zero, $zero
-/* EEF604 80242504 860300A8 */  lh        $v1, 0xa8($s0)
-/* EEF608 80242508 3C013F80 */  lui       $at, 0x3f80
-/* EEF60C 8024250C 44810000 */  mtc1      $at, $f0
-/* EEF610 80242510 3C014000 */  lui       $at, 0x4000
-/* EEF614 80242514 44811000 */  mtc1      $at, $f2
-/* EEF618 80242518 3C01C1A0 */  lui       $at, 0xc1a0
-/* EEF61C 8024251C 44812000 */  mtc1      $at, $f4
-/* EEF620 80242520 2402000F */  addiu     $v0, $zero, 0xf
-/* EEF624 80242524 AFA2001C */  sw        $v0, 0x1c($sp)
-/* EEF628 80242528 44834000 */  mtc1      $v1, $f8
-/* EEF62C 8024252C 00000000 */  nop
-/* EEF630 80242530 46804220 */  cvt.s.w   $f8, $f8
-/* EEF634 80242534 44074000 */  mfc1      $a3, $f8
-/* EEF638 80242538 27A20028 */  addiu     $v0, $sp, 0x28
-/* 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       dead_fx_emote
-/* EEF64C 8024254C E7A40018 */   swc1     $f4, 0x18($sp)
-/* EEF650 80242550 8E4200CC */  lw        $v0, 0xcc($s2)
-/* EEF654 80242554 8C430000 */  lw        $v1, ($v0)
-/* EEF658 80242558 2402001E */  addiu     $v0, $zero, 0x1e
-/* EEF65C 8024255C A602008E */  sh        $v0, 0x8e($s0)
-/* EEF660 80242560 24020014 */  addiu     $v0, $zero, 0x14
-/* EEF664 80242564 AE030028 */  sw        $v1, 0x28($s0)
-/* EEF668 80242568 AE620070 */  sw        $v0, 0x70($s3)
-/* EEF66C 8024256C 2402001E */  addiu     $v0, $zero, 0x1e
-/* EEF670 80242570 080909C2 */  j         .L80242708
-/* EEF674 80242574 AE420090 */   sw       $v0, 0x90($s2)
-.L80242578:
-/* EEF678 80242578 8E050018 */  lw        $a1, 0x18($s0)
-/* EEF67C 8024257C 8E06000C */  lw        $a2, 0xc($s0)
-/* 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
-/* EEF690 80242590 14400028 */  bnez      $v0, .L80242634
-/* EEF694 80242594 0000882D */   daddu    $s1, $zero, $zero
-/* EEF698 80242598 27A5002C */  addiu     $a1, $sp, 0x2c
-/* EEF69C 8024259C 27A60030 */  addiu     $a2, $sp, 0x30
-/* EEF6A0 802425A0 860200A8 */  lh        $v0, 0xa8($s0)
-/* EEF6A4 802425A4 C6000038 */  lwc1      $f0, 0x38($s0)
-/* EEF6A8 802425A8 44821000 */  mtc1      $v0, $f2
-/* EEF6AC 802425AC 00000000 */  nop
-/* EEF6B0 802425B0 468010A0 */  cvt.s.w   $f2, $f2
-/* EEF6B4 802425B4 E7A0002C */  swc1      $f0, 0x2c($sp)
-/* EEF6B8 802425B8 860200A8 */  lh        $v0, 0xa8($s0)
-/* EEF6BC 802425BC C604003C */  lwc1      $f4, 0x3c($s0)
-/* EEF6C0 802425C0 C6060040 */  lwc1      $f6, 0x40($s0)
-/* EEF6C4 802425C4 44820000 */  mtc1      $v0, $f0
-/* EEF6C8 802425C8 00000000 */  nop
-/* EEF6CC 802425CC 46800021 */  cvt.d.w   $f0, $f0
-/* EEF6D0 802425D0 46022100 */  add.s     $f4, $f4, $f2
-/* EEF6D4 802425D4 3C014008 */  lui       $at, 0x4008
-/* EEF6D8 802425D8 44811800 */  mtc1      $at, $f3
-/* EEF6DC 802425DC 44801000 */  mtc1      $zero, $f2
-/* EEF6E0 802425E0 27A20038 */  addiu     $v0, $sp, 0x38
-/* EEF6E4 802425E4 46220000 */  add.d     $f0, $f0, $f2
-/* EEF6E8 802425E8 E7A60034 */  swc1      $f6, 0x34($sp)
-/* EEF6EC 802425EC E7A40030 */  swc1      $f4, 0x30($sp)
-/* EEF6F0 802425F0 46200020 */  cvt.s.d   $f0, $f0
-/* 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       dead_npc_raycast_down_sides
-/* EEF704 80242604 27A70034 */   addiu    $a3, $sp, 0x34
-/* EEF708 80242608 1040000A */  beqz      $v0, .L80242634
-/* EEF70C 8024260C 00000000 */   nop
-/* EEF710 80242610 860200A8 */  lh        $v0, 0xa8($s0)
-/* EEF714 80242614 C7A20038 */  lwc1      $f2, 0x38($sp)
-/* EEF718 80242618 44820000 */  mtc1      $v0, $f0
-/* EEF71C 8024261C 00000000 */  nop
-/* EEF720 80242620 46800020 */  cvt.s.w   $f0, $f0
-/* EEF724 80242624 4600103C */  c.lt.s    $f2, $f0
-/* EEF728 80242628 00000000 */  nop
-/* EEF72C 8024262C 45030001 */  bc1tl     .L80242634
-/* EEF730 80242630 24110001 */   addiu    $s1, $zero, 1
-.L80242634:
-/* EEF734 80242634 12200008 */  beqz      $s1, .L80242658
-/* EEF738 80242638 00000000 */   nop
-/* EEF73C 8024263C C7A00030 */  lwc1      $f0, 0x30($sp)
-/* EEF740 80242640 3C013FF0 */  lui       $at, 0x3ff0
-/* EEF744 80242644 44811800 */  mtc1      $at, $f3
-/* EEF748 80242648 44801000 */  mtc1      $zero, $f2
-/* EEF74C 8024264C 46000021 */  cvt.d.s   $f0, $f0
-/* EEF750 80242650 080909B8 */  j         .L802426E0
-/* EEF754 80242654 46220000 */   add.d    $f0, $f0, $f2
-.L80242658:
-/* EEF758 80242658 3C028010 */  lui       $v0, %hi(dead_gPlayerStatusPtr)
-/* EEF75C 8024265C 8C42FC90 */  lw        $v0, %lo(dead_gPlayerStatusPtr)($v0)
-/* EEF760 80242660 3C014018 */  lui       $at, 0x4018
-/* EEF764 80242664 44811800 */  mtc1      $at, $f3
-/* EEF768 80242668 44801000 */  mtc1      $zero, $f2
-/* EEF76C 8024266C C440002C */  lwc1      $f0, 0x2c($v0)
-/* EEF770 80242670 C604003C */  lwc1      $f4, 0x3c($s0)
-/* EEF774 80242674 46000021 */  cvt.d.s   $f0, $f0
-/* EEF778 80242678 46220000 */  add.d     $f0, $f0, $f2
-/* EEF77C 8024267C 46002121 */  cvt.d.s   $f4, $f4
-/* EEF780 80242680 46202001 */  sub.d     $f0, $f4, $f0
-/* EEF784 80242684 462001A0 */  cvt.s.d   $f6, $f0
-/* EEF788 80242688 44800000 */  mtc1      $zero, $f0
-/* EEF78C 8024268C 44800800 */  mtc1      $zero, $f1
-/* EEF790 80242690 460030A1 */  cvt.d.s   $f2, $f6
-/* EEF794 80242694 4620103C */  c.lt.d    $f2, $f0
-/* EEF798 80242698 00000000 */  nop
-/* EEF79C 8024269C 45010009 */  bc1t      .L802426C4
-/* EEF7A0 802426A0 00000000 */   nop
-/* EEF7A4 802426A4 3C014010 */  lui       $at, 0x4010
-/* EEF7A8 802426A8 44810800 */  mtc1      $at, $f1
-/* EEF7AC 802426AC 44800000 */  mtc1      $zero, $f0
-/* EEF7B0 802426B0 00000000 */  nop
-/* EEF7B4 802426B4 4622003C */  c.lt.d    $f0, $f2
-/* EEF7B8 802426B8 00000000 */  nop
-/* EEF7BC 802426BC 4500000A */  bc1f      .L802426E8
-/* EEF7C0 802426C0 00000000 */   nop
-.L802426C4:
-/* EEF7C4 802426C4 3C018024 */  lui       $at, %hi(D_802454A8_EF25A8)
-/* EEF7C8 802426C8 D42254A8 */  ldc1      $f2, %lo(D_802454A8_EF25A8)($at)
-/* EEF7CC 802426CC 46003187 */  neg.s     $f6, $f6
-/* EEF7D0 802426D0 46003021 */  cvt.d.s   $f0, $f6
-/* EEF7D4 802426D4 46220002 */  mul.d     $f0, $f0, $f2
-/* EEF7D8 802426D8 00000000 */  nop
-/* EEF7DC 802426DC 46202000 */  add.d     $f0, $f4, $f0
-.L802426E0:
-/* EEF7E0 802426E0 46200020 */  cvt.s.d   $f0, $f0
-/* EEF7E4 802426E4 E600003C */  swc1      $f0, 0x3c($s0)
-.L802426E8:
-/* EEF7E8 802426E8 8602008E */  lh        $v0, 0x8e($s0)
-/* EEF7EC 802426EC 9603008E */  lhu       $v1, 0x8e($s0)
-/* EEF7F0 802426F0 18400003 */  blez      $v0, .L80242700
-/* EEF7F4 802426F4 2462FFFF */   addiu    $v0, $v1, -1
-/* EEF7F8 802426F8 080909C2 */  j         .L80242708
-/* EEF7FC 802426FC A602008E */   sh       $v0, 0x8e($s0)
-.L80242700:
-/* EEF800 80242700 2402000C */  addiu     $v0, $zero, 0xc
-/* EEF804 80242704 AE620070 */  sw        $v0, 0x70($s3)
-.L80242708:
-/* EEF808 80242708 8FBF0050 */  lw        $ra, 0x50($sp)
-/* EEF80C 8024270C 8FB3004C */  lw        $s3, 0x4c($sp)
-/* EEF810 80242710 8FB20048 */  lw        $s2, 0x48($sp)
-/* EEF814 80242714 8FB10044 */  lw        $s1, 0x44($sp)
-/* EEF818 80242718 8FB00040 */  lw        $s0, 0x40($sp)
-/* EEF81C 8024271C 03E00008 */  jr        $ra
-/* EEF820 80242720 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80242724_EEF824.s b/ver/us/asm/nonmatchings/EEDF50/func_80242724_EEF824.s
deleted file mode 100644
index d6bde1b38c..0000000000
--- a/ver/us/asm/nonmatchings/EEDF50/func_80242724_EEF824.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242724_EEF824
-/* EEF824 80242724 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* EEF828 80242728 AFB10014 */  sw        $s1, 0x14($sp)
-/* EEF82C 8024272C 0080882D */  daddu     $s1, $a0, $zero
-/* EEF830 80242730 AFBF0018 */  sw        $ra, 0x18($sp)
-/* EEF834 80242734 AFB00010 */  sw        $s0, 0x10($sp)
-/* EEF838 80242738 8E300148 */  lw        $s0, 0x148($s1)
-/* EEF83C 8024273C 0C00F92F */  jal       dead_get_npc_unsafe
-/* EEF840 80242740 86040008 */   lh       $a0, 8($s0)
-/* EEF844 80242744 0040182D */  daddu     $v1, $v0, $zero
-/* EEF848 80242748 9462008E */  lhu       $v0, 0x8e($v1)
-/* EEF84C 8024274C 2442FFFF */  addiu     $v0, $v0, -1
-/* EEF850 80242750 A462008E */  sh        $v0, 0x8e($v1)
-/* EEF854 80242754 00021400 */  sll       $v0, $v0, 0x10
-/* EEF858 80242758 1C400004 */  bgtz      $v0, .L8024276C
-/* EEF85C 8024275C 00000000 */   nop
-/* EEF860 80242760 AE000074 */  sw        $zero, 0x74($s0)
-/* EEF864 80242764 A460008E */  sh        $zero, 0x8e($v1)
-/* EEF868 80242768 AE200070 */  sw        $zero, 0x70($s1)
-.L8024276C:
-/* EEF86C 8024276C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* EEF870 80242770 8FB10014 */  lw        $s1, 0x14($sp)
-/* EEF874 80242774 8FB00010 */  lw        $s0, 0x10($sp)
-/* EEF878 80242778 03E00008 */  jr        $ra
-/* EEF87C 8024277C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s b/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s
index 3e95c2b1fe..b227645455 100644
--- a/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s
+++ b/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s
@@ -129,19 +129,19 @@ glabel L8024291C_EEFA1C
 glabel L80242934_EEFA34
 /* EEFA34 80242934 0280202D */  daddu     $a0, $s4, $zero
 /* EEFA38 80242938 0200282D */  daddu     $a1, $s0, $zero
-/* EEFA3C 8024293C 0C0908DD */  jal       func_80242374_EEF474
+/* EEFA3C 8024293C 0C0908DD */  jal       EEDF50_UnkNpcAIFunc13
 /* EEFA40 80242940 0260302D */   daddu    $a2, $s3, $zero
 glabel L80242944_EEFA44
 /* EEFA44 80242944 0280202D */  daddu     $a0, $s4, $zero
 /* EEFA48 80242948 0200282D */  daddu     $a1, $s0, $zero
-/* EEFA4C 8024294C 0C090929 */  jal       func_802424A4_EEF5A4
+/* EEFA4C 8024294C 0C090929 */  jal       EEDF50_UnkNpcAIFunc34
 /* EEFA50 80242950 0260302D */   daddu    $a2, $s3, $zero
 /* EEFA54 80242954 08090A5C */  j         .L80242970
 /* EEFA58 80242958 0000102D */   daddu    $v0, $zero, $zero
 glabel L8024295C_EEFA5C
 /* EEFA5C 8024295C 0280202D */  daddu     $a0, $s4, $zero
 /* EEFA60 80242960 0200282D */  daddu     $a1, $s0, $zero
-/* EEFA64 80242964 0C0909C9 */  jal       func_80242724_EEF824
+/* EEFA64 80242964 0C0909C9 */  jal       EEDF50_UnkFunc45
 /* EEFA68 80242968 0260302D */   daddu    $a2, $s3, $zero
 glabel L8024296C_EEFA6C
 /* EEFA6C 8024296C 0000102D */  daddu     $v0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618_A18838.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618_A18838.s
index a4ba138b6f..996d34a6dc 100644
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618_A18838.s
+++ b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618_A18838.s
@@ -8,7 +8,7 @@ glabel D_80244E78_A1B098
 
 .section .text
 
-glabel func_80242618_A18838
+glabel hos_02_UnkNpcAIFunc34
 /* A18838 80242618 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* A1883C 8024261C AFB3004C */  sw        $s3, 0x4c($sp)
 /* A18840 80242620 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s
index f42ce83b6d..aa9c4f9cc7 100644
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s
+++ b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s
@@ -123,7 +123,7 @@ glabel L80242A7C_A18C9C
 glabel L80242A8C_A18CAC
 /* A18CAC 80242A8C 0280202D */  daddu     $a0, $s4, $zero
 /* A18CB0 80242A90 0200282D */  daddu     $a1, $s0, $zero
-/* A18CB4 80242A94 0C090986 */  jal       func_80242618_A18838
+/* A18CB4 80242A94 0C090986 */  jal       hos_02_UnkNpcAIFunc34
 /* A18CB8 80242A98 0260302D */   daddu    $a2, $s3, $zero
 /* A18CBC 80242A9C 08090AAE */  j         .L80242AB8
 /* A18CC0 80242AA0 0000102D */   daddu    $v0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241B08_C5C248.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241B08_C5C248.s
index 7e04a054f3..addb8b14d9 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241B08_C5C248.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241B08_C5C248.s
@@ -8,7 +8,7 @@ glabel D_80246558_C60C98
 
 .section .text
 
-glabel func_80241B08_C5C248
+glabel hzn_02_UnkNpcAIFunc34
 /* C5C248 80241B08 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* C5C24C 80241B0C AFB3004C */  sw        $s3, 0x4c($sp)
 /* C5C250 80241B10 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s
index e32fd4cd5f..a504a18d77 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s
@@ -123,7 +123,7 @@ glabel L80241F6C_C5C6AC
 glabel L80241F7C_C5C6BC
 /* C5C6BC 80241F7C 0280202D */  daddu     $a0, $s4, $zero
 /* C5C6C0 80241F80 0200282D */  daddu     $a1, $s0, $zero
-/* C5C6C4 80241F84 0C0906C2 */  jal       func_80241B08_C5C248
+/* C5C6C4 80241F84 0C0906C2 */  jal       hzn_02_UnkNpcAIFunc34
 /* C5C6C8 80241F88 0260302D */   daddu    $a2, $s3, $zero
 /* C5C6CC 80241F8C 080907EA */  j         .L80241FA8
 /* C5C6D0 80241F90 0000102D */   daddu    $v0, $zero, $zero
diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
index b840a07250..02d476b997 100644
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@@ -9165,7 +9165,6 @@ D_802463C0_915A70 = 0x802463C0; // type:data rom:0x915A70
 D_802463C8_915A78 = 0x802463C8; // type:data rom:0x915A78
 D_802463D0_915A80 = 0x802463D0; // type:data rom:0x915A80
 D_802465C0_915C70 = 0x802465C0; // type:data rom:0x915C70
-D_802465C8_915C78 = 0x802465C8; // type:data rom:0x915C78
 D_802465D0_915C80 = 0x802465D0; // type:data rom:0x915C80
 D_802465D8_915C88 = 0x802465D8; // type:data rom:0x915C88
 D_802465E0_915C90 = 0x802465E0; // type:data rom:0x915C90
@@ -10705,7 +10704,7 @@ hos_02_UnkFunc6 = 0x80241E48; // type:func rom:0xA18068
 hos_02_UnkFunc5 = 0x802421D8; // type:func rom:0xA183F8
 func_802422FC_A1851C = 0x802422FC; // type:func rom:0xA1851C
 hos_02_UnkNpcAIFunc13 = 0x802424E8; // type:func rom:0xA18708
-func_80242618_A18838 = 0x80242618; // type:func rom:0xA18838
+hos_02_UnkNpcAIFunc34 = 0x80242618; // type:func rom:0xA18838
 hos_02_UnkFunc45 = 0x80242898; // type:func rom:0xA18AB8
 func_802428F4_A18B14 = 0x802428F4; // type:func rom:0xA18B14
 D_802433AC_A195CC = 0x802433AC; // type:data rom:0xA195CC
@@ -14403,7 +14402,7 @@ kzn_02_UnkFunc6 = 0x80241338; // type:func rom:0xC5BA78
 kzn_02_UnkFunc5 = 0x802416C8; // type:func rom:0xC5BE08
 func_802417EC_C5BF2C = 0x802417EC; // type:func rom:0xC5BF2C
 kzn_02_UnkNpcAIFunc13 = 0x802419D8; // type:func rom:0xC5C118
-func_80241B08_C5C248 = 0x80241B08; // type:func rom:0xC5C248
+hzn_02_UnkNpcAIFunc34 = 0x80241B08; // type:func rom:0xC5C248
 kzn_02_UnkFunc45 = 0x80241D88; // type:func rom:0xC5C4C8
 func_80241DE4_C5C524 = 0x80241DE4; // type:func rom:0xC5C524
 func_80241FCC_C5C70C = 0x80241FCC; // type:func rom:0xC5C70C
@@ -15561,7 +15560,7 @@ flo_16_UnkFunc6 = 0x80241CA8; // type:func rom:0xCD3AD8
 flo_16_UnkFunc5 = 0x80242038; // type:func rom:0xCD3E68
 flo_16_func_8024215C_CD3F8C = 0x8024215C; // type:func rom:0xCD3F8C
 flo_16_UnkNpcAIFunc13 = 0x80242348; // type:func rom:0xCD4178
-flo_16_func_80242478_CD42A8 = 0x80242478; // type:func rom:0xCD42A8
+flo_16_UnkNpcAIFunc34 = 0x80242478; // type:func rom:0xCD42A8
 flo_16_UnkFunc45 = 0x802426F8; // type:func rom:0xCD4528
 flo_16_func_80242754_CD4584 = 0x80242754; // type:func rom:0xCD4584
 flo_16_func_80242940_CD4770 = 0x80242940; // type:func rom:0xCD4770
@@ -15930,7 +15929,7 @@ flo_25_UnkFunc6 = 0x80240E98; // type:func rom:0xCF3A68
 flo_25_UnkFunc5 = 0x80241228; // type:func rom:0xCF3DF8
 flo_25_func_8024134C_CF3F1C = 0x8024134C; // type:func rom:0xCF3F1C
 flo_25_UnkNpcAIFunc13 = 0x80241538; // type:func rom:0xCF4108
-flo_25_func_80241668_CF4238 = 0x80241668; // type:func rom:0xCF4238
+flo_25_UnkNpcAIFunc34 = 0x80241668; // type:func rom:0xCF4238
 flo_25_UnkFunc45 = 0x802418E8; // type:func rom:0xCF44B8
 flo_25_func_80241944_CF4514 = 0x80241944; // type:func rom:0xCF4514
 flo_25_GetNpcCollisionHeight = 0x80241B2C; // type:func rom:0xCF46FC
@@ -17774,7 +17773,7 @@ func_80242608_EA2F08 = 0x80242608; // type:func rom:0xEA2F08
 func_8024267C_EA2F7C = 0x8024267C; // type:func rom:0xEA2F7C
 EA0C10_DeadGetItemName = 0x80242730; // type:func rom:0xEA3030
 EA0C10_GetNpcCollisionHeight = 0x80242794; // type:func rom:0xEA3094
-func_802427F0_EA30F0 = 0x802427F0; // type:func rom:0xEA30F0
+EA0C10_AddPlayerHandsOffset = 0x802427F0; // type:func rom:0xEA30F0
 func_802429C0_EA32C0 = 0x802429C0; // type:func rom:0xEA32C0
 func_80242A14_EA3314 = 0x80242A14; // type:func rom:0xEA3314
 func_80242A4C_EA334C = 0x80242A4C; // type:func rom:0xEA334C
@@ -17810,8 +17809,8 @@ D_802466C8_EA6FC8 = 0x802466C8; // type:data rom:0xEA6FC8
 func_80240000_EA6FD0 = 0x80240000; // type:func rom:0xEA6FD0
 EA7010_DeadUnkTexturePanFunc = 0x80240040; // type:func rom:0xEA7010
 EA7010_DeadUnkTexturePanFunc2 = 0x80240164; // type:func rom:0xEA7134
-func_80240350_EA7320 = 0x80240350; // type:func rom:0xEA7320
-func_8024036C_EA733C = 0x8024036C; // type:func rom:0xEA733C
+EA7320_SetCamera0Flag1000 = 0x80240350; // type:func rom:0xEA7320
+EA7320_UnsetCamera0Flag1000 = 0x8024036C; // type:func rom:0xEA733C
 func_80240388_EA7358 = 0x80240388; // type:func rom:0xEA7358
 EA8AE0_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEA8AE0
 EA8AE0_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEA8C04
@@ -17832,7 +17831,7 @@ func_8024140C_EA9EEC = 0x8024140C; // type:func rom:0xEA9EEC
 func_80241468_EA9F48 = 0x80241468; // type:func rom:0xEA9F48
 EA8AE0_DeadGetItemName = 0x8024151C; // type:func rom:0xEA9FFC
 EA8AE0_GetNpcCollisionHeight = 0x80241580; // type:func rom:0xEAA060
-func_802415DC_EAA0BC = 0x802415DC; // type:func rom:0xEAA0BC
+EA8AE0_AddPlayerHandsOffset = 0x802415DC; // type:func rom:0xEAA0BC
 func_802417AC_EAA28C = 0x802417AC; // type:func rom:0xEAA28C
 func_80241800_EAA2E0 = 0x80241800; // type:func rom:0xEAA2E0
 func_80241838_EAA318 = 0x80241838; // type:func rom:0xEAA318
@@ -17852,7 +17851,7 @@ EB0E60_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEB0F84
 func_80240310_EB1170 = 0x80240310; // type:func rom:0xEB1170
 EB1170_DeadGetItemName = 0x802403C4; // type:func rom:0xEB1224
 EB1170_GetNpcCollisionHeight = 0x80240428; // type:func rom:0xEB1288
-func_80240484_EB12E4 = 0x80240484; // type:func rom:0xEB12E4
+EB1170_AddPlayerHandsOffset = 0x80240484; // type:func rom:0xEB12E4
 func_80240654_EB14B4 = 0x80240654; // type:func rom:0xEB14B4
 func_802406A8_EB1508 = 0x802406A8; // type:func rom:0xEB1508
 func_802406E0_EB1540 = 0x802406E0; // type:func rom:0xEB1540
@@ -17873,32 +17872,32 @@ func_8024036C_EB549C = 0x8024036C; // type:func rom:0xEB549C
 EB7230_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEB7230
 EB7230_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEB7354
 func_80240310_EB7540 = 0x80240310; // type:func rom:0xEB7540
-func_802403D8_EB7608 = 0x802403D8; // type:func rom:0xEB7608
+EB7540_GetEntityPosition = 0x802403D8; // type:func rom:0xEB7608
 func_80240478_EB76A8 = 0x80240478; // type:func rom:0xEB76A8
-func_80240504_EB7734 = 0x80240504; // type:func rom:0xEB7734
+EB7540_UnsetCamera0MoveFlag1 = 0x80240504; // type:func rom:0xEB7734
 func_80240520_EB7750 = 0x80240520; // type:func rom:0xEB7750
 D_80241C10_EB8E40 = 0x80241C10; // type:data rom:0xEB8E40
 func_80240000_EB8E50 = 0x80240000; // type:func rom:0xEB8E50
-func_80240040_EB8E90 = 0x80240040; // type:func rom:0xEB8E90
-func_80240198_EB8FE8 = 0x80240198; // type:func rom:0xEB8FE8
+EB8E90_UnkNpcAIFunc24 = 0x80240040; // type:func rom:0xEB8E90
+EB8E90_UnkFunc13 = 0x80240198; // type:func rom:0xEB8FE8
 EB8E90_DeadUnkNpcAIFunc1 = 0x80240440; // type:func rom:0xEB9290
-func_80240500_EB9350 = 0x80240500; // type:func rom:0xEB9350
-func_802406BC_EB950C = 0x802406BC; // type:func rom:0xEB950C
-func_80240770_EB95C0 = 0x80240770; // type:func rom:0xEB95C0
-func_802407E4_EB9634 = 0x802407E4; // type:func rom:0xEB9634
-func_8024085C_EB96AC = 0x8024085C; // type:func rom:0xEB96AC
-func_8024098C_EB97DC = 0x8024098C; // type:func rom:0xEB97DC
-func_80240AAC_EB98FC = 0x80240AAC; // type:func rom:0xEB98FC
-func_80240B14_EB9964 = 0x80240B14; // type:func rom:0xEB9964
+EB8E90_UnkFunc14 = 0x80240500; // type:func rom:0xEB9350
+EB8E90_UnkNpcAIFunc25 = 0x802406BC; // type:func rom:0xEB950C
+EB8E90_NpcJumpFunc2 = 0x80240770; // type:func rom:0xEB95C0
+EB8E90_NpcJumpFunc = 0x802407E4; // type:func rom:0xEB9634
+EB8E90_UnkNpcAIFunc13 = 0x8024085C; // type:func rom:0xEB96AC
+EB8E90_UnkFunc15 = 0x8024098C; // type:func rom:0xEB97DC
+EB8E90_UnkNpcDurationFlagFunc = 0x80240AAC; // type:func rom:0xEB98FC
+EB8E90_UnkFunc16 = 0x80240B14; // type:func rom:0xEB9964
 func_80240BD4_EB9A24 = 0x80240BD4; // type:func rom:0xEB9A24
-func_80240EFC_EB9D4C = 0x80240EFC; // type:func rom:0xEB9D4C
+EB8E90_PostChapter6StatUpdate = 0x80240EFC; // type:func rom:0xEB9D4C
 func_80240F40_EB9D90 = 0x80240F40; // type:func rom:0xEB9D90
 func_80240FB0_EB9E00 = 0x80240FB0; // type:func rom:0xEB9E00
 func_802410E4_EB9F34 = 0x802410E4; // type:func rom:0xEB9F34
-func_8024121C_EBA06C = 0x8024121C; // type:func rom:0xEBA06C
-func_802413AC_EBA1FC = 0x802413AC; // type:func rom:0xEBA1FC
+EB9D90_UnkFloatFunc = 0x8024121C; // type:func rom:0xEBA06C
+EB9D90_SyncStatusMenu = 0x802413AC; // type:func rom:0xEBA1FC
 func_802413CC_EBA21C = 0x802413CC; // type:func rom:0xEBA21C
-func_802413EC_EBA23C = 0x802413EC; // type:func rom:0xEBA23C
+EB9D90_SyncStatusMenu = 0x802413EC; // type:func rom:0xEBA23C
 ascii_EC2000 = 0x802491B0; // type:data rom:0xEC2000
 ascii_EC2008 = 0x802491B8; // type:data rom:0xEC2008
 ascii_EC2010 = 0x802491C0; // type:data rom:0xEC2010
@@ -17920,38 +17919,38 @@ D_80244F90_EC7190 = 0x80244F90; // type:data rom:0xEC7190
 D_80244F98_EC7198 = 0x80244F98; // type:data rom:0xEC7198
 EC71B0_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEC71B0
 EC71B0_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEC72D4
-func_8024030C_EC74BC = 0x8024030C; // type:func rom:0xEC74BC
+EC71B0_SpawnSunEffect = 0x8024030C; // type:func rom:0xEC74BC
 func_80240344_EC74F4 = 0x80240344; // type:func rom:0xEC74F4
 EC7590_foliage_setup_shear_mtx = 0x802403E0; // type:func rom:0xEC7590
 EC7590_DeadTransformFoliage = 0x80240450; // type:func rom:0xEC7600
 func_8024061C_EC77CC = 0x8024061C; // type:func rom:0xEC77CC
 EC7590_DeadGetItemName = 0x802406D0; // type:func rom:0xEC7880
 D_80241BB0_EC8D60 = 0x80241BB0; // type:data rom:0xEC8D60
-func_80240000_EC9D00 = 0x80240000; // type:func rom:0xEC9D00
-func_8024001C_EC9D1C = 0x8024001C; // type:func rom:0xEC9D1C
+EC9D00_SetOverrideFlags_40 = 0x80240000; // type:func rom:0xEC9D00
+EC9D00_UnkFunc17 = 0x8024001C; // type:func rom:0xEC9D1C
 func_8024003C_EC9D3C = 0x8024003C; // type:func rom:0xEC9D3C
-func_80240068_EC9D68 = 0x80240068; // type:func rom:0xEC9D68
-func_802400D4_EC9DD4 = 0x802400D4; // type:func rom:0xEC9DD4
-func_80240120_EC9E20 = 0x80240120; // type:func rom:0xEC9E20
+EC9D00_UnkFunc18 = 0x80240068; // type:func rom:0xEC9D68
+EC9D00_UnkFunc37 = 0x802400D4; // type:func rom:0xEC9DD4
+EC9D00_UnkFunc38 = 0x80240120; // type:func rom:0xEC9E20
 func_802401CC_EC9ECC = 0x802401CC; // type:func rom:0xEC9ECC
-func_8024041C_ECA11C = 0x8024041C; // type:func rom:0xECA11C
-func_80240448_ECA148 = 0x80240448; // type:func rom:0xECA148
-func_80240480_ECA180 = 0x80240480; // type:func rom:0xECA180
-func_80240510_ECA210 = 0x80240510; // type:func rom:0xECA210
-func_80240544_ECA244 = 0x80240544; // type:func rom:0xECA244
-func_802405A8_ECA2A8 = 0x802405A8; // type:func rom:0xECA2A8
+EC9D00_SwitchToPartner = 0x8024041C; // type:func rom:0xECA11C
+EC9D00_UnkFunc18 = 0x80240448; // type:func rom:0xECA148
+EC9D00_UnkFunc20 = 0x80240480; // type:func rom:0xECA180
+EC9D00_UnkFunc39 = 0x80240510; // type:func rom:0xECA210
+EC9D00_UnkFunc21 = 0x80240544; // type:func rom:0xECA244
+EC9D00_UnkFunc22 = 0x802405A8; // type:func rom:0xECA2A8
 func_80240600_ECA300 = 0x80240600; // type:func rom:0xECA300
-func_80240B38_ECA838 = 0x80240B38; // type:func rom:0xECA838
+EC9D00_UnkFunc23 = 0x80240B38; // type:func rom:0xECA838
 EC9D00_DeadUnkPartnerPosFunc = 0x80240C78; // type:func rom:0xECA978
 EC9D00_DeadUnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0xECA9C0
-func_80240D08_ECAA08 = 0x80240D08; // type:func rom:0xECAA08
+EC9D00_UnkFunc40 = 0x80240D08; // type:func rom:0xECAA08
 ECAA40_DeadUnk1 = 0x80240D40; // type:func rom:0xECAA40
 func_80240D80_ECAA80 = 0x80240D80; // type:func rom:0xECAA80
 func_80241364_ECB064 = 0x80241364; // type:func rom:0xECB064
 func_802414C8_ECB1C8 = 0x802414C8; // type:func rom:0xECB1C8
 func_8024150C_ECB20C = 0x8024150C; // type:func rom:0xECB20C
 ECAA80_GetNpcCollisionHeight = 0x80241770; // type:func rom:0xECB470
-func_802417CC_ECB4CC = 0x802417CC; // type:func rom:0xECB4CC
+ECAA80_AddPlayerHandsOffset = 0x802417CC; // type:func rom:0xECB4CC
 func_8024199C_ECB69C = 0x8024199C; // type:func rom:0xECB69C
 func_802419F0_ECB6F0 = 0x802419F0; // type:func rom:0xECB6F0
 func_80241A28_ECB728 = 0x80241A28; // type:func rom:0xECB728
@@ -17960,7 +17959,7 @@ func_80241B88_ECB888 = 0x80241B88; // type:func rom:0xECB888
 func_80241BF8_ECB8F8 = 0x80241BF8; // type:func rom:0xECB8F8
 ECB930_foliage_setup_shear_mtx = 0x80241C30; // type:func rom:0xECB930
 ECB930_DeadTransformFoliage = 0x80241CA0; // type:func rom:0xECB9A0
-func_80241E70_ECBB70 = 0x80241E70; // type:func rom:0xECBB70
+ECBB70_UnkFunc43 = 0x80241E70; // type:func rom:0xECBB70
 D_80241FE0_ECBCE0 = 0x80241FE0; // type:data rom:0xECBCE0
 D_80241FE8_ECBCE8 = 0x80241FE8; // type:data rom:0xECBCE8
 D_80241FF8_ECBCF8 = 0x80241FF8; // type:data rom:0xECBCF8
@@ -17968,7 +17967,7 @@ D_80242038_ECBD38 = 0x80242038; // type:data rom:0xECBD38
 D_802430B8_ECCDB8 = 0x802430B8; // type:data rom:0xECCDB8
 D_802430BC_ECCDBC = 0x802430BC; // type:data rom:0xECCDBC
 ECFFF0_DeadUnk1 = 0x80240000; // type:func rom:0xECFFF0
-func_80240040_ED0030 = 0x80240040; // type:func rom:0xED0030
+ED0030_UnkFunc43 = 0x80240040; // type:func rom:0xED0030
 ED00D0_foliage_setup_shear_mtx = 0x802400E0; // type:func rom:0xED00D0
 ED00D0_DeadTransformFoliage = 0x80240150; // type:func rom:0xED0140
 ED0310_UnkNpcAIFunc23 = 0x80240320; // type:func rom:0xED0310
@@ -17991,7 +17990,7 @@ ED4260_DeadUnk1 = 0x80240040; // type:func rom:0xED4260
 func_80240080_ED42A0 = 0x80240080; // type:func rom:0xED42A0
 ED42A0_DeadGetItemName = 0x80240134; // type:func rom:0xED4354
 ED42A0_DeadUnkTexturePanFunc = 0x80240198; // type:func rom:0xED43B8
-func_802402BC_ED44DC = 0x802402BC; // type:func rom:0xED44DC
+ED42A0_DeadUnkTexturePanFunc2 = 0x802402BC; // type:func rom:0xED44DC
 func_802404B0_ED46D0 = 0x802404B0; // type:func rom:0xED46D0
 func_80240B10_ED4D30 = 0x80240B10; // type:func rom:0xED4D30
 ED5540_foliage_setup_shear_mtx = 0x80241320; // type:func rom:0xED5540
@@ -18000,12 +17999,12 @@ D_80241DA0_ED5FC0 = 0x80241DA0; // type:data rom:0xED5FC0
 D_80244160_ED8380 = 0x80244160; // type:data rom:0xED8380
 D_80244BB8_ED8DD8 = 0x80244BB8; // type:data rom:0xED8DD8
 D_80244BEC_ED8E0C = 0x80244BEC; // type:data rom:0xED8E0C
-func_80240000_ED8E20 = 0x80240000; // type:func rom:0xED8E20
+ED8E20_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xED8E20
 func_80240020_ED8E40 = 0x80240020; // type:func rom:0xED8E40
 func_80240034_ED8E54 = 0x80240034; // type:func rom:0xED8E54
 func_802400F0_ED8F10 = 0x802400F0; // type:func rom:0xED8F10
-func_80240208_ED9028 = 0x80240208; // type:func rom:0xED9028
-func_80240274_ED9094 = 0x80240274; // type:func rom:0xED9094
+ED8E20_GetCurrentCameraYawClamped180 = 0x80240208; // type:func rom:0xED9028
+ED8E20_SomeXYZFunc2 = 0x80240274; // type:func rom:0xED9094
 func_80240318_ED9138 = 0x80240318; // type:func rom:0xED9138
 D_80243170_EDBF90 = 0x80243170; // type:data rom:0xEDBF90
 func_80240000_EDBFE0 = 0x80240000; // type:func rom:0xEDBFE0
@@ -18014,7 +18013,7 @@ EDC020_DeadTransformFoliage = 0x802400B0; // type:func rom:0xEDC090
 func_8024027C_EDC25C = 0x8024027C; // type:func rom:0xEDC25C
 EDC020_DeadGetItemName = 0x80240330; // type:func rom:0xEDC310
 EDC020_GetNpcCollisionHeight = 0x80240394; // type:func rom:0xEDC374
-func_802403F0_EDC3D0 = 0x802403F0; // type:func rom:0xEDC3D0
+EDC020_AddPlayerHandsOffset = 0x802403F0; // type:func rom:0xEDC3D0
 func_802405C0_EDC5A0 = 0x802405C0; // type:func rom:0xEDC5A0
 func_80240614_EDC5F4 = 0x80240614; // type:func rom:0xEDC5F4
 func_8024064C_EDC62C = 0x8024064C; // type:func rom:0xEDC62C
@@ -18022,7 +18021,7 @@ D_802417EC_EDD7CC = 0x802417EC; // type:data rom:0xEDD7CC
 D_80241850_EDD830 = 0x80241850; // type:data rom:0xEDD830
 D_80241854_EDD834 = 0x80241854; // type:data rom:0xEDD834
 func_80240000_EDE9C0 = 0x80240000; // type:func rom:0xEDE9C0
-func_80240040_EDEA00 = 0x80240040; // type:func rom:0xEDEA00
+EDEA00_UnkFunc41 = 0x80240040; // type:func rom:0xEDEA00
 EDEA00_UnkNpcAIFunc23 = 0x802401C4; // type:func rom:0xEDEB84
 func_80240374_EDED34 = 0x80240374; // type:func rom:0xEDED34
 EDEA00_DeadUnkNpcAIFunc1 = 0x8024099C; // type:func rom:0xEDF35C
@@ -18044,10 +18043,10 @@ EDEA00_UnkNpcAIFunc12 = 0x802424A0; // type:func rom:0xEE0E60
 EDEA00_set_script_owner_npc_col_height = 0x80242604; // type:func rom:0xEE0FC4
 func_80242684_EE1044 = 0x80242684; // type:func rom:0xEE1044
 func_80242AF0_EE14B0 = 0x80242AF0; // type:func rom:0xEE14B0
-pause_interp_text_scroll_EE1DD8 = 0x80243418; // type:func rom:0xEE1DD8
+EDEA00_UnkFunc42 = 0x80243418; // type:func rom:0xEE1DD8
 func_80243470_EE1E30 = 0x80243470; // type:func rom:0xEE1E30
 func_80243584_EE1F44 = 0x80243584; // type:func rom:0xEE1F44
-func_80243680_EE2040 = 0x80243680; // type:func rom:0xEE2040
+EE2040_LoadPartyImage = 0x80243680; // type:func rom:0xEE2040
 D_802441DC_EE2B9C = 0x802441DC; // type:data rom:0xEE2B9C
 D_80247AF0_EE64B0 = 0x80247AF0; // type:data rom:0xEE64B0
 D_80247AF8_EE64B8 = 0x80247AF8; // type:data rom:0xEE64B8
@@ -18059,13 +18058,13 @@ D_80247BE0_EE65A0 = 0x80247BE0; // type:data rom:0xEE65A0
 EE65B0_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEE65B0
 EE65B0_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEE66D4
 func_8024030C_EE68BC = 0x8024030C; // type:func rom:0xEE68BC
-func_80240340_EE68F0 = 0x80240340; // type:func rom:0xEE68F0
+EE65B0_UnkFunc43 = 0x80240340; // type:func rom:0xEE68F0
 func_802403D4_EE6984 = 0x802403D4; // type:func rom:0xEE6984
 func_8024042C_EE69DC = 0x8024042C; // type:func rom:0xEE69DC
 func_8024046C_EE6A1C = 0x8024046C; // type:func rom:0xEE6A1C
 func_80240504_EE6AB4 = 0x80240504; // type:func rom:0xEE6AB4
 func_802407D4_EE6D84 = 0x802407D4; // type:func rom:0xEE6D84
-func_80240B10_EE70C0 = 0x80240B10; // type:func rom:0xEE70C0
+EE70C0_UnkNpcAIFunc23 = 0x80240B10; // type:func rom:0xEE70C0
 func_80240CC0_EE7270 = 0x80240CC0; // type:func rom:0xEE7270
 EE70C0_DeadUnkNpcAIFunc1 = 0x802412E8; // type:func rom:0xEE7898
 EE70C0_UnkFunc4 = 0x802413A8; // type:func rom:0xEE7958
@@ -18077,7 +18076,7 @@ EE70C0_UnkFunc6 = 0x80241968; // type:func rom:0xEE7F18
 EE70C0_UnkFunc5 = 0x80241CF8; // type:func rom:0xEE82A8
 func_80241E1C_EE83CC = 0x80241E1C; // type:func rom:0xEE83CC
 EE70C0_GetNpcCollisionHeight = 0x80242034; // type:func rom:0xEE85E4
-func_80242090_EE8640 = 0x80242090; // type:func rom:0xEE8640
+EE70C0_AddPlayerHandsOffset = 0x80242090; // type:func rom:0xEE8640
 func_80242260_EE8810 = 0x80242260; // type:func rom:0xEE8810
 func_802422B4_EE8864 = 0x802422B4; // type:func rom:0xEE8864
 func_802422EC_EE889C = 0x802422EC; // type:func rom:0xEE889C
@@ -18099,26 +18098,26 @@ D_80245388_EEB938 = 0x80245388; // type:data rom:0xEEB938
 D_80245390_EEB940 = 0x80245390; // type:data rom:0xEEB940
 D_802453E0_EEB990 = 0x802453E0; // type:data rom:0xEEB990
 EED100_DeadUnk1 = 0x80240000; // type:func rom:0xEED100
-func_80240040_EED140 = 0x80240040; // type:func rom:0xEED140
-func_802400E0_EED1E0 = 0x802400E0; // type:func rom:0xEED1E0
-func_802400FC_EED1FC = 0x802400FC; // type:func rom:0xEED1FC
+EED140_UnkFunc43 = 0x80240040; // type:func rom:0xEED140
+EED1E0_SetOverrideFlags_40 = 0x802400E0; // type:func rom:0xEED1E0
+EED1E0_UnkFunc17 = 0x802400FC; // type:func rom:0xEED1FC
 func_8024011C_EED21C = 0x8024011C; // type:func rom:0xEED21C
-func_80240148_EED248 = 0x80240148; // type:func rom:0xEED248
-func_802401B4_EED2B4 = 0x802401B4; // type:func rom:0xEED2B4
-func_80240200_EED300 = 0x80240200; // type:func rom:0xEED300
+EED1E0_UnkFunc18 = 0x80240148; // type:func rom:0xEED248
+EED1E0_UnkFunc37 = 0x802401B4; // type:func rom:0xEED2B4
+EED1E0_UnkFunc38 = 0x80240200; // type:func rom:0xEED300
 func_802402AC_EED3AC = 0x802402AC; // type:func rom:0xEED3AC
-func_802404FC_EED5FC = 0x802404FC; // type:func rom:0xEED5FC
-func_80240528_EED628 = 0x80240528; // type:func rom:0xEED628
-func_80240560_EED660 = 0x80240560; // type:func rom:0xEED660
-func_802405F0_EED6F0 = 0x802405F0; // type:func rom:0xEED6F0
-func_80240624_EED724 = 0x80240624; // type:func rom:0xEED724
-func_80240688_EED788 = 0x80240688; // type:func rom:0xEED788
+EED1E0_SwitchToPartner = 0x802404FC; // type:func rom:0xEED5FC
+EED1E0_UnkFunc18 = 0x80240528; // type:func rom:0xEED628
+EED1E0_UnkFunc20 = 0x80240560; // type:func rom:0xEED660
+EED1E0_UnkFunc39 = 0x802405F0; // type:func rom:0xEED6F0
+EED1E0_UnkFunc21 = 0x80240624; // type:func rom:0xEED724
+EED1E0_UnkFunc22 = 0x80240688; // type:func rom:0xEED788
 func_802406E0_EED7E0 = 0x802406E0; // type:func rom:0xEED7E0
-func_80240C18_EEDD18 = 0x80240C18; // type:func rom:0xEEDD18
+EED1E0_UnkFunc23 = 0x80240C18; // type:func rom:0xEEDD18
 EED1E0_DeadUnkPartnerPosFunc = 0x80240D58; // type:func rom:0xEEDE58
 EED1E0_DeadUnkPartnerPosFunc2 = 0x80240DA0; // type:func rom:0xEEDEA0
-func_80240DE8_EEDEE8 = 0x80240DE8; // type:func rom:0xEEDEE8
-func_80240E18_EEDF18 = 0x80240E18; // type:func rom:0xEEDF18
+EED1E0_UnkFunc40 = 0x80240DE8; // type:func rom:0xEEDEE8
+EED1E0_UnkFunc44 = 0x80240E18; // type:func rom:0xEEDF18
 EEDF50_UnkNpcAIFunc23 = 0x80240E50; // type:func rom:0xEEDF50
 func_80241000_EEE100 = 0x80241000; // type:func rom:0xEEE100
 EEDF50_DeadUnkNpcAIFunc1 = 0x80241628; // type:func rom:0xEEE728
@@ -18130,9 +18129,9 @@ EEDF50_UnkNpcAIFunc3 = 0x80241C44; // type:func rom:0xEEED44
 EEDF50_UnkFunc6 = 0x80241CA8; // type:func rom:0xEEEDA8
 EEDF50_UnkFunc5 = 0x80242038; // type:func rom:0xEEF138
 func_8024215C_EEF25C = 0x8024215C; // type:func rom:0xEEF25C
-func_80242374_EEF474 = 0x80242374; // type:func rom:0xEEF474
-func_802424A4_EEF5A4 = 0x802424A4; // type:func rom:0xEEF5A4
-func_80242724_EEF824 = 0x80242724; // type:func rom:0xEEF824
+EEDF50_UnkNpcAIFunc13 = 0x80242374; // type:func rom:0xEEF474
+EEDF50_UnkNpcAIFunc34 = 0x802424A4; // type:func rom:0xEEF5A4
+EEDF50_UnkFunc45 = 0x80242724; // type:func rom:0xEEF824
 func_80242780_EEF880 = 0x80242780; // type:func rom:0xEEF880
 func_802429A0_EEFAA0 = 0x802429A0; // type:func rom:0xEEFAA0
 D_80243760_EF0860 = 0x80243760; // type:data rom:0xEF0860
@@ -18178,7 +18177,7 @@ EF7A80_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEF7BA4
 EF7A80_DeadUnk1 = 0x8024030C; // type:func rom:0xEF7D8C
 func_80240340_EF7DC0 = 0x80240340; // type:func rom:0xEF7DC0
 EF7A80_DeadUnkFloatFunc = 0x80240394; // type:func rom:0xEF7E14
-func_80240530_EF7FB0 = 0x80240530; // type:func rom:0xEF7FB0
+EF7FB0_UnkFunc42 = 0x80240530; // type:func rom:0xEF7FB0
 EF8010_foliage_setup_shear_mtx = 0x80240590; // type:func rom:0xEF8010
 EF8010_DeadTransformFoliage = 0x80240600; // type:func rom:0xEF8080
 EFEB00_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEFEB00
@@ -18475,7 +18474,7 @@ D_800A0F58 = 0x800A0F58; // type:data
 D_800A1530 = 0x800A1530; // type:data
 dead_gCurrentCamID = 0x800A158C; // type:data
 D_800A15A4 = 0x800A15A4; // type:data
-D_800A15A8 = 0x800A15A8; // type:data
+dead_gOverrideFlags = 0x800A15A8; // type:data
 D_800A15C4 = 0x800A15C4; // type:data
 D_800A15CC = 0x800A15CC; // type:data
 D_800A3510 = 0x800A3510; // type:data
@@ -18915,13 +18914,11 @@ gPlayerAnimation = 0x8010F080; //
 D_8010F250 = 0x8010F250; // type:data
 gPlayerData = 0x8010F290; // size:0x340
 gSpinHistoryPosAngle = 0x8010F6B8; // type:data
-D_80117160 = 0x80117160; // type:data
+dead_gPartnerActionStatus2 = 0x80117160; // type:data
 dead_gPartnerActionStatus = 0x80117163; // type:data
 dead_gPlayerStatus = 0x80117578; // type:data
 dead_gPlayerActionState = 0x8011762C; // type:data
-D_80117840 = 0x80117840; // type:data
-D_80117848 = 0x80117848; // type:data
-D_80117852 = 0x80117852; // type:data
+dead_gPlayerData = 0x80117840; // type:data
 _render_transition_stencil = 0x80136A80; // type:func
 get_default_variation_for_song = 0x8014A430; //
 D_8014F120 = 0x8014F120; // type:data
@@ -19160,7 +19157,7 @@ D_8015C7D2 = 0x8015C7D2; // type:data
 D_8015C7D8 = 0x8015C7D8; // type:data
 D_8015C7E0 = 0x8015C7E0; // type:data
 D_80164000 = 0x80164000; // type:data
-D_80169B12 = 0x80169B12; // type:data
+dead_gCollisionStatus = 0x80169B12; // type:data
 D_80169B16 = 0x80169B16; // type:data
 D_80197000 = 0x80197000; // type:data
 D_801A6000 = 0x801A6000; // type:data
diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt
index f0e288c9d9..716629b626 100644
--- a/ver/us/undefined_syms.txt
+++ b/ver/us/undefined_syms.txt
@@ -324,7 +324,6 @@ D_8015C7D2 = 0x8015C7D2;
 D_8015C7D8 = 0x8015C7D8;
 D_8015C7E0 = 0x8015C7E0;
 D_80164000 = 0x80164000;
-D_80169B12 = 0x80169B12;
 D_80169B16 = 0x80169B16;
 D_80197000 = 0x80197000;
 D_801A6000 = 0x801A6000;
@@ -468,6 +467,7 @@ D_80246260 = 0x80246260;
 D_802462F0 = 0x802462F0;
 D_80246300 = 0x80246300;
 D_80246424 = 0x80246424;
+D_80246460_EC9D00 = 0x80246460;
 D_8024652C = 0x8024652C;
 D_80246530 = 0x80246530;
 D_80246534 = 0x80246534;
@@ -1426,7 +1426,6 @@ D_800A0F50 = 0x800A0F50;
 D_800A0F58 = 0x800A0F58;
 D_800A1530 = 0x800A1530;
 D_800A15A4 = 0x800A15A4;
-D_800A15A8 = 0x800A15A8;
 D_800A15C4 = 0x800A15C4;
 D_800A15CC = 0x800A15CC;
 D_800A3510 = 0x800A3510;
@@ -1789,14 +1788,14 @@ func_80128510 = 0x80128510;
 func_8012DFE8 = 0x8012DFE8;
 func_8002AA2C = 0x8002AA2C;
 func_80059AC8 = 0x80059AC8;
-func_80118BB0 = 0x80118BB0;
-func_80077BD0 = 0x80077BD0;
+dead_get_entity_by_index = 0x80118BB0;
+dead_playFX_82 = 0x80077BD0;
 func_80041080 = 0x80041080;
-func_800F1D9C = 0x800F1D9C;
-func_800F1730 = 0x800F1730;
+dead_set_max_SP = 0x800F1D9C;
+dead_sync_status_menu = 0x800F1730;
 dead_get_npc_by_index = 0x8003C43C;
-func_800F1718 = 0x800F1718;
-func_800F16F4 = 0x800F16F4;
+dead_increment_status_menu_disabled = 0x800F1718;
+dead_decrement_status_menu_disabled = 0x800F16F4;
 func_80125270 = 0x80125270;
 func_80124F44 = 0x80124F44;
 func_8006CAC0 = 0x8006CAC0;
@@ -1805,31 +1804,31 @@ func_802F3B00 = 0x802F3B00;
 func_800FCD0C = 0x800FCD0C;
 func_800F9260 = 0x800F9260;
 func_800F93E8 = 0x800F93E8;
-func_800F2D5C = 0x800F2D5C;
-func_80130C74 = 0x80130C74;
-func_800769D0 = 0x800769D0;
-func_80075E30 = 0x80075E30;
+dead_switch_to_partner = 0x800F2D5C;
+dead_set_message_msg = 0x80130C74;
+dead_playFX_52 = 0x800769D0;
+dead_playFX_33 = 0x80075E30;
 func_8002B524 = 0x8002B524;
 func_8002BF18 = 0x8002BF18;
 func_80076970 = 0x80076970;
-func_80144200 = 0x80144200;
-func_80144178 = 0x80144178;
-func_800E53AC = 0x800E53AC;
-func_8013CF98 = 0x8013CF98;
+dead_set_screen_overlay_color = 0x80144200;
+dead_set_screen_overlay_params_front = 0x80144178;
+dead_npc_test_move_simple_without_slipping = 0x800E53AC;
+dead_get_item_entity = 0x8013CF98;
 func_80066FE0 = 0x80066FE0;
 func_8002A910 = 0x8002A910;
 func_8005F128 = 0x8005F128;
-func_800F7278 = 0x800F7278;
+dead_partner_clear_player_tracking = 0x800F7278;
 func_800F2E98 = 0x800F2E98;
-func_8003ED50 = 0x8003ED50;
-func_8003E5E8 = 0x8003E5E8;
+dead_set_npc_yaw = 0x8003ED50;
+dead_disable_npc_shadow = 0x8003E5E8;
 dead_get_screen_coords = 0x8002FCBC;
-func_801574DC = 0x801574DC;
-func_80157118 = 0x80157118;
-func_8005F238 = 0x8005F238;
-func_80074070 = 0x80074070;
-func_8002BF68 = 0x8002BF68;
-func_80130C64 = 0x80130C64;
+dead_sfx_get_spatialized_sound_params = 0x801574DC;
+dead_sfx_play_sound_with_params = 0x80157118;
+dead_load_asset_by_name = 0x8005F238;
+dead_decode_yay0 = 0x80074070;
+dead_general_heap_free = 0x8002BF68;
+dead_set_message_images = 0x80130C64;
 func_8002B45C = 0x8002B45C;
 func_801266F8 = 0x801266F8;
 func_80126734 = 0x80126734;
@@ -1838,7 +1837,7 @@ dead_gItemTable = 0x8008D2C0;
 dead_gPartnerActionStatus = 0x80117163;
 dead_gPlayerStatus = 0x80117578;
 dead_gPlayerActionState = 0x8011762C;
-D_80117160 = 0x80117160;
-D_80117840 = 0x80117840;
-D_80117848 = 0x80117848;
-D_80117852 = 0x80117852;
+dead_gPartnerActionStatus2 = 0x80117160;
+dead_gPlayerData = 0x80117840;
+dead_gCollisionStatus = 0x80169B12;
+dead_gOverrideFlags = 0x800A15A8;