diff --git a/include/functions.h b/include/functions.h
index bfd9cee915..200e91b19c 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -428,8 +428,6 @@ s32 partner_is_flying(void);
 void partner_flying_update_motion(Npc* partner);
 void partner_clear_player_tracking(Npc* partner);
 
-void set_background_color_blend(u8 r, u8 g, u8 b, u8 a);
-
 void partner_set_tether_distance(f32);
 
 void btl_delete_player_actor(Actor* player);
@@ -498,6 +496,7 @@ void set_item_entity_position(s32 itemEntityIndex, f32 x, f32 y, f32 z);
 ItemEntity* get_item_entity(s32 itemEntityIndex);
 s32 make_item_entity_nodelay(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pickupVar);
 void set_item_entity_flags(s32 itemEntityIndex, s32 flag);
+void clear_item_entity_flags(s32 index, s32 flags);
 
 s32 create_generic_entity_frontUI(void (*updateFunc)(void), void (*drawFunc)(void));
 DynamicEntity* get_generic_entity(s32 idx);
diff --git a/include/model.h b/include/model.h
index ea04e57513..9882b11951 100644
--- a/include/model.h
+++ b/include/model.h
@@ -188,4 +188,6 @@ void set_custom_gfx_builders(s32 customGfxIndex, ModelCustomGfxBuilderFunc pre,
 void mdl_make_local_vertex_copy(s32 arg0, u16 treeIdx, s32);
 void play_model_animation_starting_from(s32 index, s32 animPos, s32 framesToSkip);
 
+void set_background_color_blend(u8 r, u8 g, u8 b, u8 a);
+
 #endif
diff --git a/include/variables.h b/include/variables.h
index c8432624f2..12505e8572 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -177,6 +177,7 @@ extern s32 D_8009A678;
 
 extern u8 D_800779B0;
 extern u32 D_80078174;
+extern s32 D_8008EEC0[12]; // partner IDs
 extern u8 D_800A0963;
 
 extern s32 D_802EA310[];
diff --git a/src/18C790.c b/src/18C790.c
index 8a3e101c5f..f06e88f884 100644
--- a/src/18C790.c
+++ b/src/18C790.c
@@ -2,6 +2,7 @@
 #include "effects.h"
 #include "hud_element.h"
 #include "ld_addrs.h"
+#include "model.h"
 #include "script_api/battle.h"
 #include "entity.h"
 #include "sprite/npc/BattleGoombario.h"
diff --git a/src/18F340.c b/src/18F340.c
index efef816f0a..8e73f4aa32 100644
--- a/src/18F340.c
+++ b/src/18F340.c
@@ -1,5 +1,6 @@
 #include "common.h"
 #include "effects.h"
+#include "model.h"
 #include "hud_element.h"
 #include "script_api/battle.h"
 #include "sprite/npc/Twink.h"
diff --git a/src/415D90.c b/src/415D90.c
index 48cb9aa17f..b32fdea3ac 100644
--- a/src/415D90.c
+++ b/src/415D90.c
@@ -2125,7 +2125,6 @@ s32 can_btl_state_update_switch_to_player(void) {
     }
 }
 
-extern s32 D_8008EEC0[];
 extern s32 D_8008EEF0[];
 
 s32 func_802A58D0(void) {
@@ -2881,7 +2880,7 @@ void btl_state_update_player_menu(void) {
             if (battleStatus->unk_4C[4] < 0) {
                 battleStatus->unk_4C[4] = 0;
             }
-            D_802ACCD0.popupType = 0;
+            D_802ACCD0.popupType = POPUP_TYPE_USE_ITEM;
             D_802ACCD0.numEntries = p;
             D_802ACCD0.initialPos = battleStatus->unk_4C[4];
             func_800F513C(&D_802ACCD0);
@@ -2974,7 +2973,7 @@ void btl_state_update_player_menu(void) {
             if (battleStatus->unk_4C[4] < 0) {
                 battleStatus->unk_4C[4] = 0;
             }
-            D_802ACCD0.popupType = 0;
+            D_802ACCD0.popupType = POPUP_TYPE_USE_ITEM;
             D_802ACCD0.numEntries = p;
             D_802ACCD0.unk_31C = 0;
             D_802ACCD0.unk_320 = 0;
@@ -3178,7 +3177,7 @@ void btl_state_update_player_menu(void) {
                 btl_set_state(0x16);
                 break;
             }
-            D_802ACCD0.popupType = 0;
+            D_802ACCD0.popupType = POPUP_TYPE_USE_ITEM;
             if (battleStatus->selectedMoveID == 0x35) {
                 D_802ACCD0.popupType = 100;
                 D_802ACCD0.unk_31C = 1;
@@ -3440,7 +3439,7 @@ void btl_state_update_player_menu(void) {
             if (battleStatus->unk_4C[5] < 0) {
                 battleStatus->unk_4C[5] = 0;
             }
-            D_802ACCD0.popupType = 1;
+            D_802ACCD0.popupType = POPUP_MENU_SWITCH_PARTNER;
             D_802ACCD0.numEntries = p;
             D_802ACCD0.initialPos = D_8008EEF0[playerData->currentPartner] - 1;
             D_802ACCD0.unk_31C = 0;
diff --git a/src/7fd10_len_b40.c b/src/7fd10_len_b40.c
index 74c6a9be30..7b80dedc7c 100644
--- a/src/7fd10_len_b40.c
+++ b/src/7fd10_len_b40.c
@@ -22,7 +22,6 @@ BSS char D_8010CD14[0xA];
 BSS s32 D_8010CD20;
 BSS char D_8010CD24[0xC];
 
-extern s32 D_8008EEC0[12];
 extern s32 D_8008EEF0[];
 
 void func_800E6860(void) {
diff --git a/src/C50A0.c b/src/C50A0.c
index 18b64557b9..9b38078bae 100644
--- a/src/C50A0.c
+++ b/src/C50A0.c
@@ -2695,7 +2695,7 @@ block_47: // TODO required to match
                         numEntries++;
                     }
                 }
-                menu->popupType = 2;
+                menu->popupType = POPUP_MENU_THROW_AWAY_ITEM;
                 menu->numEntries = numEntries;
                 menu->initialPos = 0;
                 create_popup_menu(menu);
diff --git a/src/actor_api.c b/src/actor_api.c
index ca3e977808..a5b37b8116 100644
--- a/src/actor_api.c
+++ b/src/actor_api.c
@@ -2477,7 +2477,7 @@ s32 func_8026E558(Evt* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "actor_api", func_8026E558);
 #endif
 
-ApiStatus GetTargetListLength(Evt* script) {
+ApiStatus GetTargetListLength(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     evt_set_variable(script, *args++, get_actor(script->owner1.actorID)->targetListLength);
diff --git a/src/battle/item/fire_flower.c b/src/battle/item/fire_flower.c
index 5d8f9b546e..78dc38a423 100644
--- a/src/battle/item/fire_flower.c
+++ b/src/battle/item/fire_flower.c
@@ -1,5 +1,6 @@
 #include "fire_flower.h"
 #include "effects.h"
+#include "model.h"
 
 #include "ItemRefund.inc.c"
 
diff --git a/src/battle/item/fright_jar.c b/src/battle/item/fright_jar.c
index 46d4d979bd..942c225e4b 100644
--- a/src/battle/item/fright_jar.c
+++ b/src/battle/item/fright_jar.c
@@ -1,4 +1,5 @@
 #include "fright_jar.h"
+#include "model.h"
 
 #include "ItemRefund.inc.c"
 
diff --git a/src/battle/item/shooting_star.c b/src/battle/item/shooting_star.c
index 9e9dbae17a..d4b0f524dd 100644
--- a/src/battle/item/shooting_star.c
+++ b/src/battle/item/shooting_star.c
@@ -1,5 +1,6 @@
 #include "shooting_star.h"
 #include "effects.h"
+#include "model.h"
 
 #include "ItemRefund.inc.c"
 
diff --git a/src/battle/item/snowman_doll.c b/src/battle/item/snowman_doll.c
index 243b7ba299..b13d2c6d26 100644
--- a/src/battle/item/snowman_doll.c
+++ b/src/battle/item/snowman_doll.c
@@ -1,5 +1,6 @@
 #include "snowman_doll.h"
 #include "effects.h"
+#include "model.h"
 
 #include "ItemRefund.inc.c"
 
diff --git a/src/battle/item/stop_watch.c b/src/battle/item/stop_watch.c
index bb054a1f3e..3022dc5c78 100644
--- a/src/battle/item/stop_watch.c
+++ b/src/battle/item/stop_watch.c
@@ -1,4 +1,5 @@
 #include "stop_watch.h"
+#include "model.h"
 
 #include "ItemRefund.inc.c"
 
diff --git a/src/battle/item/thunder_bolt.c b/src/battle/item/thunder_bolt.c
index b44aae4047..ff20ee7749 100644
--- a/src/battle/item/thunder_bolt.c
+++ b/src/battle/item/thunder_bolt.c
@@ -1,5 +1,6 @@
 #include "thunder_bolt.h"
 #include "effects.h"
+#include "model.h"
 
 #include "ItemRefund.inc.c"
 
diff --git a/src/battle/item/thunder_rage.c b/src/battle/item/thunder_rage.c
index d9567d540b..082e2110ff 100644
--- a/src/battle/item/thunder_rage.c
+++ b/src/battle/item/thunder_rage.c
@@ -1,5 +1,6 @@
 #include "thunder_rage.h"
 #include "effects.h"
+#include "model.h"
 
 #include "ItemRefund.inc.c"
 
diff --git a/src/battle/star/peach_beam/7997B0.c b/src/battle/star/peach_beam/7997B0.c
index 640621c5ef..3ee4bdaa1f 100644
--- a/src/battle/star/peach_beam/7997B0.c
+++ b/src/battle/star/peach_beam/7997B0.c
@@ -1,5 +1,6 @@
 #include "common.h"
 #include "script_api/battle.h"
+#include "model.h"
 
 #define NAMESPACE battle_star_peach_beam
 
diff --git a/src/battle/star/star_beam/796FC0.c b/src/battle/star/star_beam/796FC0.c
index 98f4a5c27c..ac878e1f76 100644
--- a/src/battle/star/star_beam/796FC0.c
+++ b/src/battle/star/star_beam/796FC0.c
@@ -1,6 +1,7 @@
 #include "common.h"
 #include "script_api/battle.h"
 #include "effects.h"
+#include "model.h"
 
 #define NAMESPACE battle_star_star_beam
 
diff --git a/src/battle/star/up_and_away/7952E0.c b/src/battle/star/up_and_away/7952E0.c
index 86e632aeb7..0bba3b0016 100644
--- a/src/battle/star/up_and_away/7952E0.c
+++ b/src/battle/star/up_and_away/7952E0.c
@@ -3,6 +3,7 @@
 #include "script_api/battle.h"
 #include "sprite/npc/BattleKalmar.h"
 #include "entity.h"
+#include "model.h"
 
 extern EntityModelScript D_80283EE8;
 
diff --git a/src/common/FadeBackgroundToBlack.inc.c b/src/common/FadeBackgroundToBlack.inc.c
index 54358c3b92..04ccbbbaab 100644
--- a/src/common/FadeBackgroundToBlack.inc.c
+++ b/src/common/FadeBackgroundToBlack.inc.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "model.h"
 #include "npc.h"
 
 ApiStatus N(FadeBackgroundToBlack)(Evt* script, s32 isInitialCall) {
diff --git a/src/common/SetBackgroundAlpha.inc.c b/src/common/SetBackgroundAlpha.inc.c
index 5fab5f4f7d..15afa04659 100644
--- a/src/common/SetBackgroundAlpha.inc.c
+++ b/src/common/SetBackgroundAlpha.inc.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "model.h"
 
 ApiStatus N(SetBackgroundAlpha)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/common/UnfadeBackgroundToBlack.inc.c b/src/common/UnfadeBackgroundToBlack.inc.c
index dc418d465d..11d69c345c 100644
--- a/src/common/UnfadeBackgroundToBlack.inc.c
+++ b/src/common/UnfadeBackgroundToBlack.inc.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "model.h"
 #include "map.h"
 
 ApiStatus N(UnfadeBackgroundToBlack)(Evt* script, s32 isInitialCall) {
diff --git a/src/common/UnkBackgroundFunc.inc.c b/src/common/UnkBackgroundFunc.inc.c
index 1fc7171773..8d7367a0ee 100644
--- a/src/common/UnkBackgroundFunc.inc.c
+++ b/src/common/UnkBackgroundFunc.inc.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "model.h"
 
 ApiStatus N(UnkBackgroundFunc)(Evt* script, s32 isInitialCall) {
     if (isInitialCall) {
diff --git a/src/common/UnkBackgroundFunc2.inc.c b/src/common/UnkBackgroundFunc2.inc.c
index 7127febfb5..a7d952b9df 100644
--- a/src/common/UnkBackgroundFunc2.inc.c
+++ b/src/common/UnkBackgroundFunc2.inc.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "model.h"
 
 ApiStatus N(UnkBackgroundFunc2)(Evt* script, s32 isInitialCall) {
     if (isInitialCall) {
diff --git a/src/common/UnkBackgroundFunc3.inc.c b/src/common/UnkBackgroundFunc3.inc.c
index 921daa8b29..dd130acdc5 100644
--- a/src/common/UnkBackgroundFunc3.inc.c
+++ b/src/common/UnkBackgroundFunc3.inc.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "model.h"
 
 ApiStatus N(UnkBackgroundFunc3)(Evt* script, s32 isInitialCall) {
     mdl_set_all_fog_mode(1);
diff --git a/src/encounter.c b/src/encounter.c
index 1d168c5e99..47ea9d42f3 100644
--- a/src/encounter.c
+++ b/src/encounter.c
@@ -6,6 +6,7 @@
 #include "hud_element.h"
 #include "world/partners.h"
 #include "sprite.h"
+#include "model.h"
 #include "sprite/npc/BattleMerlee.h"
 
 ApiStatus ShowMerleeCoinMessage(Evt* script, s32 isInitialCall);
diff --git a/src/evt/player_api.c b/src/evt/player_api.c
index bf6f630df3..43011eb915 100644
--- a/src/evt/player_api.c
+++ b/src/evt/player_api.c
@@ -823,7 +823,7 @@ ApiStatus func_802D2C14(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-ApiStatus SetPlayerPushVelocity(Evt* script) {
+ApiStatus SetPlayerPushVelocity(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     f32 x = evt_get_variable(script, *args++);
     f32 y;
diff --git a/src/world/area_dro/dro_02/npc_merlee.c b/src/world/area_dro/dro_02/npc_merlee.c
index 55fd42e4e3..73ca24191b 100644
--- a/src/world/area_dro/dro_02/npc_merlee.c
+++ b/src/world/area_dro/dro_02/npc_merlee.c
@@ -1,4 +1,5 @@
 #include "dro_02.h"
+#include "model.h"
 
 // cards used during Merlee's ritual
 typedef struct RitualCard {
@@ -329,7 +330,7 @@ void N(card_worker_update)(void) {
             N(RitualCards)[0].spriteID = 1;
             N(RitualCards)[0].rasterIndex = 12;
             N(RitualCards)[0].xoffset = 2;
-            
+
             N(RitualCards)[1].unk_00 = 1;
             N(RitualCards)[1].pos.x = 200.0f;
             N(RitualCards)[1].pos.y = 0.0f;
@@ -339,7 +340,7 @@ void N(card_worker_update)(void) {
             N(RitualCards)[1].spriteID = 1;
             N(RitualCards)[1].rasterIndex = 48;
             N(RitualCards)[1].xoffset = 0;
-       
+
 
             N(RitualCards)[2].spriteID = 8;
             N(RitualCards)[2].rasterIndex = 5;
diff --git a/src/world/area_end/end_01/end_01_4_opera_float.c b/src/world/area_end/end_01/end_01_4_opera_float.c
index 37dc26811d..d68a719778 100644
--- a/src/world/area_end/end_01/end_01_4_opera_float.c
+++ b/src/world/area_end/end_01/end_01_4_opera_float.c
@@ -1,5 +1,6 @@
 #include "end_01.h"
 #include "effects.h"
+#include "model.h"
 
 extern s32 N(SpotlightsAlpha);
 
@@ -13,14 +14,14 @@ API_CALLABLE(N(FadeInWorld)) {
     if (isInitialCall) {
         script->functionTemp[1] = 255;
     }
-    
+
     script->functionTemp[1] -= 10;
     if (script->functionTemp[1] < 0) {
         script->functionTemp[1] = 0;
     }
-    
+
     set_background_color_blend(0, 0, 0, script->functionTemp[1]);
-    
+
     if (script->functionTemp[1] == 0) {
         func_8011B950(MODEL_Root, -1, 0, 0);
         return ApiStatus_DONE2;
@@ -60,13 +61,13 @@ API_CALLABLE(N(SkateInCirclePenguin1)) {
         script->functionTempF[3] = 180.0f;
         script->functionTemp[0] = 72;
     }
-    
+
     npc = script->functionTempPtr[1];
     script->functionTempF[3] = clamp_angle(script->functionTempF[3] - 5.0f);
     npc->pos.x = npc->pos.x + (cos_deg(script->functionTempF[3]) * 6.0f);
     npc->pos.z = npc->pos.z + (sin_deg(script->functionTempF[3]) * 2.5f);
     npc->renderYaw = clamp_angle(180.0f - script->functionTempF[3]);
-    
+
     script->functionTemp[0]--;
     if (script->functionTemp[0] == 0) {
         return ApiStatus_DONE1;
@@ -87,13 +88,13 @@ API_CALLABLE(N(SkateInCirclePenguin2)) {
         script->functionTempF[3] = 180.0f;
         script->functionTemp[0] = 72;
     }
-    
+
     npc = script->functionTempPtr[1];
     script->functionTempF[3] = clamp_angle(script->functionTempF[3] + 5.0f);
     npc->pos.x = npc->pos.x + (cos_deg(script->functionTempF[3]) * 6.0f);
     npc->pos.z = npc->pos.z + (sin_deg(script->functionTempF[3]) * 2.5f);
     npc->renderYaw = clamp_angle(180.0f - script->functionTempF[3]);
-    
+
     script->functionTemp[0]--;
     if (script->functionTemp[0] == 0) {
         return ApiStatus_DONE1;
@@ -105,7 +106,7 @@ API_CALLABLE(N(SkateInCirclePenguin2)) {
 API_CALLABLE(N(SetSpotlightsAlpha)) {
     Bytecode* args = script->ptrReadPos;
     N(SpotlightsAlpha) = evt_get_variable(script, *args++);
-    
+
     return ApiStatus_DONE2;
 }
 
diff --git a/src/world/area_hos/hos_04/A27AA0.c b/src/world/area_hos/hos_04/A27AA0.c
index 7a1bb972b3..5b1ca6bcc5 100644
--- a/src/world/area_hos/hos_04/A27AA0.c
+++ b/src/world/area_hos/hos_04/A27AA0.c
@@ -93,7 +93,7 @@ void func_80240BD0_A27AA0(s32** arg0) {
     }
 }
 
-ApiStatus func_80240E40_A27D10(Evt* script) {
+ApiStatus func_80240E40_A27D10(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     set_curtain_draw_callback((void (*)) evt_get_variable(script, *args++));
diff --git a/src/world/area_hos/hos_05/A2AAC0.c b/src/world/area_hos/hos_05/A2AAC0.c
index bca647b750..b750c6c28f 100644
--- a/src/world/area_hos/hos_05/A2AAC0.c
+++ b/src/world/area_hos/hos_05/A2AAC0.c
@@ -30,8 +30,21 @@ typedef struct UnkHosStruct {
     /* 0x60 */ char unk_6E[0x2];
 } UnkHosStruct; // size = 0x60
 
+extern f32 D_8024963C_A3387C[];
 extern f32 D_8024987C_A33ABC;
 extern f32 D_802498A8_A33AE8;
+extern f32 D_802498D0_A33B10;
+extern u16* D_802498D4_A33B14;
+extern f32 D_802498D8_A33B18;
+extern f32 D_802498DC_A33B1C;
+extern f32 D_802498E0_A33B20;
+extern f32 D_802498E4_A33B24;
+extern f32 D_802498E8_A33B28;
+extern f32 D_802498EC_A33B2C;
+extern f32 D_802498F0_A33B30;
+extern f32 D_802498F4_A33B34;
+extern s32 D_802498F8_A33B38;
+extern s32 D_802498FC_A33B3C;
 extern s32 D_80249900_A33B40;
 extern f32 D_80249904_A33B44;
 extern s32 D_80249908_A33B48;
@@ -242,9 +255,57 @@ void func_802410E4_A2B324(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32*
     *arg5 = arg1 + ((arg2 - arg1) * var_f12_2);
 }
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241274_A2B4B4);
+ApiStatus func_80241274_A2B4B4(Evt* script, s32 isInitialCall) {
+    Camera* camera = &gCameras[gCurrentCameraID];
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_8024146C_A2B6AC);
+    if (nuGfxCfb_ptr == D_802498D4_A33B14) {
+        return ApiStatus_BLOCK;
+    }
+    D_802498D4_A33B14 = nuGfxCfb_ptr;
+    func_80241044_A2B284(250.0f, 0.0f, D_802498D0_A33B10, 0.5f, &D_802498D0_A33B10);
+    func_802410E4_A2B324(2, 130.4f, D_8024963C_A3387C[1], 0.0f, 470.0f, &D_802498D8_A33B18);
+    func_80241044_A2B284(12.4f, D_8024963C_A3387C[2], D_802498DC_A33B1C, 0.05f, &D_802498DC_A33B1C);
+    func_80241044_A2B284(-16.8f, D_8024963C_A3387C[9], D_802498E0_A33B20, 0.05f, &D_802498E0_A33B20);
+    func_80241044_A2B284(62.0f, 49.0f, D_802498E4_A33B24, 0.1f, &D_802498E4_A33B24);
+    func_80240D54_A2AF94(0, D_802498E4_A33B24);
+    camera->controlSettings.boomLength = D_802498D8_A33B18;
+    camera->controlSettings.boomPitch = D_802498DC_A33B1C;
+    camera->controlSettings.viewPitch = D_802498E0_A33B20;
+    camera->controlSettings.posB.x = sin_deg(D_802498D0_A33B10) * 500.0f;
+    camera->controlSettings.posB.z = cos_deg(D_802498D0_A33B10) * -500.0f;
+    camera->panActive = TRUE;
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_8024146C_A2B6AC(Evt* script, s32 isInitialCall) {
+    Camera* camera = &gCameras[gCurrentCameraID];
+
+    if (nuGfxCfb_ptr == D_802498D4_A33B14) {
+        return ApiStatus_BLOCK;
+    }
+    D_802498D4_A33B14 = nuGfxCfb_ptr;
+    func_80241044_A2B284(250.0f, 0.0f, D_802498D0_A33B10, 0.5f, &D_802498D0_A33B10);
+    func_802410E4_A2B324(2, 130.4f, D_8024963C_A3387C[1], (f32) D_802498FC_A33B3C, 470.0f, &D_802498E8_A33B28);
+    func_80241044_A2B284(12.4f, D_8024963C_A3387C[2], D_802498EC_A33B2C, 0.05f, &D_802498EC_A33B2C);
+    func_80241044_A2B284(-16.8f, D_8024963C_A3387C[9], D_802498F0_A33B30, 0.05f, &D_802498F0_A33B30);
+    func_80241044_A2B284(62.0f, 49.0f, D_802498F4_A33B34, 0.1f, &D_802498F4_A33B34);
+    func_80240D54_A2AF94(0, D_802498F4_A33B34);
+    camera->controlSettings.boomLength = D_802498E8_A33B28;
+    camera->controlSettings.boomPitch = D_802498EC_A33B2C;
+    camera->controlSettings.viewPitch = D_802498F0_A33B30;
+    camera->controlSettings.posB.x = sin_deg(D_802498D0_A33B10) * 500.0f;
+    camera->controlSettings.posB.z = cos_deg(D_802498D0_A33B10) * -500.0f;
+    camera->panActive = TRUE;
+    D_802498FC_A33B3C++;
+    if (D_802498D0_A33B10 == 0.0f) {
+        D_802498F8_A33B38++;
+    }
+
+    if (D_802498F8_A33B38 <= 30) {
+        return ApiStatus_BLOCK;
+    }
+    return ApiStatus_DONE1;
+}
 
 ApiStatus func_802416BC_A2B8FC(Evt* script, s32 isInitialCall) {
     Camera* camera = &gCameras[gCurrentCameraID];
diff --git a/src/world/area_jan/jan_00/jan_00_2_npc.c b/src/world/area_jan/jan_00/jan_00_2_npc.c
index 1339b39149..f08cdab0ac 100644
--- a/src/world/area_jan/jan_00/jan_00_2_npc.c
+++ b/src/world/area_jan/jan_00/jan_00_2_npc.c
@@ -145,11 +145,135 @@ API_CALLABLE(func_80240B4C_B2108C) {
 INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240B4C_B2108C);
 #endif
 
-API_CALLABLE(func_80240CF8_B21238);
-INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240CF8_B21238);
+ApiStatus func_80240CF8_B21238(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    Npc* npc0 = get_npc_safe(0);
+    Npc* npc1;
+    Npc* partner;
+    f32 theta;
+    f32 x, y, z;
+    f32 temp_f22;
 
-API_CALLABLE(func_80240F14_B21454);
-INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240F14_B21454);
+    if (isInitialCall) {
+        script->functionTemp[0] = evt_get_variable(script, *args++);
+
+        switch (script->functionTemp[0]) {
+            case 0:
+                script->functionTemp[1] = 55;
+                break;
+            case 1:
+                script->functionTemp[1] = 85;
+                break;
+            default:
+                script->functionTemp[1] = 25;
+                break;
+        }
+    }
+    temp_f22 = script->functionTemp[1];
+    theta = -npc0->yaw;
+    x = ((npc0->pos.x + 30.0f) - 75.0f) + (sin_deg(theta) * temp_f22);
+    z = npc0->pos.z + (cos_deg(theta) * temp_f22);
+    y = npc0->pos.y + 50.0f;
+
+    switch (script->functionTemp[0]) {
+        case 0:
+            gPlayerStatus.position.x = x;
+            gPlayerStatus.position.y = y;
+            gPlayerStatus.position.z = z;
+            npc0->colliderPos.x = npc0->pos.x;
+            npc0->colliderPos.y = npc0->pos.y;
+            npc0->colliderPos.z = npc0->pos.z;
+            npc0->flags |= NPC_FLAG_DIRTY_SHADOW;
+            break;
+        case 1:
+            partner = get_npc_safe(NPC_PARTNER);
+            if (partner == NULL) {
+                return ApiStatus_DONE2;
+            }
+            partner->pos.x = x;
+            partner->pos.y = y;
+            partner->pos.z = z;
+            partner->colliderPos.x = partner->pos.x;
+            partner->colliderPos.y = partner->pos.y;
+            partner->colliderPos.z = partner->pos.z;
+            partner->flags |= NPC_FLAG_DIRTY_SHADOW;
+            break;
+        case 2:
+            npc1 = get_npc_safe(1);
+            npc1->pos.x = x;
+            npc1->pos.y = y;
+            npc1->pos.z = z;
+            npc1->colliderPos.x = npc1->pos.x;
+            npc1->colliderPos.y = npc1->pos.y;
+            npc1->colliderPos.z = npc1->pos.z;
+            npc1->flags |= NPC_FLAG_DIRTY_SHADOW;
+            break;
+    }
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus func_80240F14_B21454(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    Npc* npc = get_npc_safe(0);
+
+    if (isInitialCall) {
+        script->functionTemp[0] = evt_get_variable(script, *args++);
+        switch (script->functionTemp[0]) {
+            case 0:
+                script->functionTemp[2] = 0;
+                script->functionTemp[1] = 90;
+                npc->pos.x = 158.0f;
+                npc->pos.y = -50.0f;
+                npc->pos.z = -38.0f;
+                break;
+            case 1:
+                script->functionTemp[2] = 10;
+                script->functionTemp[1] = 200;
+                npc->pos.x = -442.0f;
+                npc->pos.y = -50.0f;
+                npc->pos.z = -38.0f;
+                break;
+        }
+    }
+
+    switch (script->functionTemp[2]) {
+        case 0:
+            npc->currentAnim = 0xB60001;
+            npc->yaw -= 1.0f;
+            npc->pos.x -= 3.0f;
+            script->functionTemp[1]--;
+            if (script->functionTemp[1] <= 0) {
+                script->functionTemp[2] = 1;
+                script->functionTemp[1] = 90;
+            }
+            break;
+        case 1:
+            npc->yaw -= 1.0f;
+            npc->pos.x -= 3.0f;
+            script->functionTemp[1]--;
+            if (script->functionTemp[1] <= 0) {
+                script->functionTemp[2] = 2;
+                script->functionTemp[1] = 120;
+            }
+            break;
+        case 2:
+            npc->pos.x -= 3.0f;
+            script->functionTemp[1]--;
+            if (script->functionTemp[1] <= 0) {
+                return ApiStatus_DONE2;
+            }
+            break;
+        case 10:
+            npc->yaw = 90.0f;
+            npc->pos.x += 3.0f;
+            script->functionTemp[1]--;
+            if (script->functionTemp[1] <= 0) {
+                return ApiStatus_DONE2;
+            }
+            break;
+    }
+    return ApiStatus_BLOCK;
+}
 
 API_CALLABLE(func_80241134_B21674) {
     Npc* npc = get_npc_safe(2);
@@ -163,8 +287,6 @@ API_CALLABLE(func_80241134_B21674) {
     return ApiStatus_BLOCK;
 }
 
-MAP_DATA_SECTION_START
-
 EvtScript N(D_80242D90_B232D0) = {
     EVT_CALL(func_80240CF8_B21238, LVar0)
     EVT_RETURN
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index aa623ff12a..ee0c19936e 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -93,4 +93,24 @@ extern EffectInstance* N(Quizmo_VannaTEffect);
 extern s32 N(LetterDelivery_SavedNpcAnim);
 #include "world/common/todo/LetterDelivery.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242F1C_B37AEC);
+extern s32 D_8024A5AC_B3F17C[];
+
+ApiStatus func_80242F1C_B37AEC(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    PlayerData* playerData = &gPlayerData;
+    s32 outVar = *args++;
+    s32 outVal = 0;
+    s32* it;
+    s32 i;
+
+    for (i = 0; i < ARRAY_COUNT(playerData->invItems); i++) {
+        it = D_8024A5AC_B3F17C;
+        while (*it != 0) {
+            if (playerData->invItems[i] == *it++) {
+                outVal++;
+            }
+        }
+    }
+    evt_set_variable(script, outVar, outVal);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c
index 588e203057..a064482c3c 100644
--- a/src/world/area_jan/jan_05/B4B260.c
+++ b/src/world/area_jan/jan_05/B4B260.c
@@ -10,7 +10,7 @@
 #include "common/foliage.inc.c"
 #define NAMESPACE jan_05
 
-ApiStatus func_8024268C_B4D0FC(Evt* script) {
+ApiStatus func_8024268C_B4D0FC(Evt* script, s32 isInitialCall) {
     if (get_enemy_safe(0) == NULL) {
         script->varTable[0] = FALSE;
     } else {
diff --git a/src/world/area_kkj/kkj_13/AD6200.c b/src/world/area_kkj/kkj_13/AD6200.c
index e97e5b1dc6..dd298e846e 100644
--- a/src/world/area_kkj/kkj_13/AD6200.c
+++ b/src/world/area_kkj/kkj_13/AD6200.c
@@ -1,4 +1,5 @@
 #include "kkj_13.h"
+#include "effects.h"
 
 ApiStatus func_80240330_AD6200(Evt* script, s32 isInitialCall) {
     Npc* npc = get_npc_safe(1);
diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c
index 0004475899..22fb708b24 100644
--- a/src/world/area_kmr/kmr_02/8B0070.c
+++ b/src/world/area_kmr/kmr_02/8B0070.c
@@ -1,5 +1,6 @@
 #include "kmr_02.h"
 #include "effects.h"
+#include "model.h"
 
 static char* N(exit_str_0) = "kmr_05";
 static char* N(exit_str_1) = "kmr_00";
@@ -10,7 +11,25 @@ static char* N(exit_str_3) = "";
 
 #include "world/common/entity/Pipe.inc.c"
 
+extern s32 D_80244B2C_8B4B9C[];
+
+// reg swap & data migration
+#ifdef NON_MATCHING
+ApiStatus func_802402E0_8B0350(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 npcID = evt_get_variable(script, *args++);
+    s32* var_s0 = D_80244B2C_8B4B9C[evt_get_variable(script, *args++)];
+    Enemy* enemy = get_enemy(npcID);
+    s32 i;
+
+    for (i = 0; i < 14; i++) {
+        enemy->territory->temp[i] = *var_s0++;
+    }
+    return ApiStatus_DONE2;
+}
+#else
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802402E0_8B0350);
+#endif
 
 ApiStatus func_80240370_8B03E0(Evt* script, s32 isInitialCall) {
     set_map_change_fade_rate(1);
@@ -79,6 +98,7 @@ ApiStatus func_802422F8_8B2368(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
+// duplicate of func_802402E0_8B0350
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242394_8B2404);
 
 extern s32 N(LetterDelivery_SavedNpcAnim);
@@ -128,7 +148,7 @@ ApiStatus func_802427EC_8B285C(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-ApiStatus func_8024280C_8B287C(Evt* script) {
+ApiStatus func_8024280C_8B287C(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     Npc* npc = resolve_npc(script, 0);
 
@@ -247,7 +267,26 @@ ApiStatus func_80242F28_8B2F98(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242F7C_8B2FEC);
+extern s16 D_8024E538_8BE5A8[];
+
+ApiStatus func_80242F7C_8B2FEC(Evt* script, s32 isInitialCall) {
+    Npc* npc;
+
+    if (isInitialCall) {
+        script->functionTemp[1] = 0.0f;
+        script->functionTempPtr[2] = get_npc_safe(script->owner2.npcID);
+        script->functionTemp[3] = D_8024E538_8BE5A8[script->owner2.npcID];
+    }
+
+    if (script->functionTemp[3] != 0) {
+        script->functionTemp[3]--;
+        return ApiStatus_BLOCK;
+    }
+    npc = script->functionTempPtr[2];
+    npc->verticalRenderOffset = sin_deg(script->functionTempF[1]) * 1.5f;
+    script->functionTempF[1] = clamp_angle(script->functionTempF[1] + 18.0f);
+    return ApiStatus_BLOCK;
+}
 
 ApiStatus func_80243034_8B30A4(Evt* script, s32 isInitialCall) {
     get_item_entity(script->varTable[0])->scale = 0.6f;
diff --git a/src/world/area_kmr/kmr_11/8DA3A0.c b/src/world/area_kmr/kmr_11/8DA3A0.c
index bf8e8e1b53..0f6262a394 100644
--- a/src/world/area_kmr/kmr_11/8DA3A0.c
+++ b/src/world/area_kmr/kmr_11/8DA3A0.c
@@ -1,7 +1,7 @@
 #include "kmr_11.h"
 #include "effects.h"
 
-ApiStatus func_802402A0_8DA3A0(Evt* script) {
+ApiStatus func_802402A0_8DA3A0(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     f32 temp_f24 = evt_get_float_variable(script, *args++);
     f32 temp_f22 = evt_get_float_variable(script, *args++);
@@ -11,7 +11,7 @@ ApiStatus func_802402A0_8DA3A0(Evt* script) {
     fx_lens_flare(0, temp_f24, temp_f22, temp_f20, t4);
     return ApiStatus_DONE2;
 }
-ApiStatus func_80240344_8DA444(Evt* script) {
+ApiStatus func_80240344_8DA444(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     gCameras[CAM_DEFAULT].vfov = evt_get_float_variable(script, *args++);
diff --git a/src/world/area_kmr/kmr_20/8ED5A0.c b/src/world/area_kmr/kmr_20/8ED5A0.c
index 772dff7a61..616b166a6a 100644
--- a/src/world/area_kmr/kmr_20/8ED5A0.c
+++ b/src/world/area_kmr/kmr_20/8ED5A0.c
@@ -1,4 +1,5 @@
 #include "kmr_20.h"
+#include "model.h"
 
 #define NAMESPACE dup_kmr_20
 #include "world/common/entity/Pipe.inc.c"
diff --git a/src/world/area_kmr/kmr_20/8EDB70.c b/src/world/area_kmr/kmr_20/8EDB70.c
index 1bbef2d269..05db486be1 100644
--- a/src/world/area_kmr/kmr_20/8EDB70.c
+++ b/src/world/area_kmr/kmr_20/8EDB70.c
@@ -1,4 +1,5 @@
 #include "kmr_20.h"
+#include "model.h"
 
 #define NAMESPACE dup2_kmr_20
 #include "world/common/entity/Pipe.inc.c"
diff --git a/src/world/area_kmr/kmr_22/8FF680.c b/src/world/area_kmr/kmr_22/8FF680.c
index 0e1a081227..d51b81ebac 100644
--- a/src/world/area_kmr/kmr_22/8FF680.c
+++ b/src/world/area_kmr/kmr_22/8FF680.c
@@ -1,6 +1,64 @@
 #include "kmr_22.h"
+#include "effects.h"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF680", func_80240010_8FF680);
+extern s16 D_80240DE0_900450[];
+extern EffectInstance* D_802483C0;
+extern s32 D_802483C4;
+
+ApiStatus func_80240010_8FF680(Evt* script, s32 isInitialCall) {
+    s32 var_s0 = script->varTable[0];
+    s32 x, y;
+    s32 xOffset = 0;
+
+    if (var_s0 == 0) {
+        var_s0 = 9;
+        xOffset = 38;
+    }
+
+    if (isInitialCall) {
+        set_curtain_scale_goal(1.0f);
+        D_802483C0 = fx_chapter_change(var_s0, 100.0f, 100.0f, 0.0f, 1.0f, 0);
+        D_802483C4 = 0;
+    }
+
+    x = xOffset + 117;
+    if (D_802483C4 >= 0) {
+        if (D_802483C4 < 0x14) {
+            x -= D_80240DE0_900450[D_802483C4];
+        }
+    } else {
+        x = xOffset - 193;
+    }
+    y = 58;
+    D_802483C0->data.chapterChange->chapterPos.x = x;
+    D_802483C0->data.chapterChange->chapterPos.y = y;
+
+    x = xOffset + 117;
+    if (D_802483C4 >= 10) {
+        if (D_802483C4 < 30) {
+            y -= D_80240DE0_900450[D_802483C4 - 10];
+        }
+    } else {
+        y = -252;
+    }
+    D_802483C0->data.chapterChange->endOfPos.x = x;
+    D_802483C0->data.chapterChange->endOfPos.y = y;
+
+    x = 280;
+    if (D_802483C4 >= 20) {
+        if (D_802483C4 < 40) {
+            x += D_80240DE0_900450[D_802483C4 - 20];
+        }
+    } else {
+        x = 590;
+    }
+    y = 90;
+    D_802483C0->data.chapterChange->unk_40 = x;
+    D_802483C0->data.chapterChange->unk_44 = y;
+    D_802483C4++;
+
+    return ApiStatus_BLOCK;
+}
 
 ApiStatus func_802401E0_8FF850(Evt* script, s32 isInitialCall) {
     set_curtain_scale_goal(2.0f);
diff --git a/src/world/area_kmr/kmr_22/8FF8B0.c b/src/world/area_kmr/kmr_22/8FF8B0.c
index cb8151c0e4..c31eb9bd22 100644
--- a/src/world/area_kmr/kmr_22/8FF8B0.c
+++ b/src/world/area_kmr/kmr_22/8FF8B0.c
@@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_80240314_8FF984);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_80240418_8FFA88);
 
-ApiStatus func_802404E4_8FFB54(Evt* script) {
+ApiStatus func_802404E4_8FFB54(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     evt_get_variable(script, *args++);
@@ -38,6 +38,11 @@ ApiStatus func_80240B3C_9001AC(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_80240B4C_9001BC);
+ApiStatus func_80240B4C_9001BC(Evt* script, s32 isInitialCall) {
+    evt_set_variable(script, MapVar(0), (s32) heap_malloc(0x780)); // TODO what is this
+    D_802483D0 = -1;
+    create_generic_entity_world(NULL, func_80240B00_900170);
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_80240BA8_900218);
diff --git a/src/world/area_kpa/kpa_03/A4A410.c b/src/world/area_kpa/kpa_03/A4A410.c
index 955d52e60f..0da852a561 100644
--- a/src/world/area_kpa/kpa_03/A4A410.c
+++ b/src/world/area_kpa/kpa_03/A4A410.c
@@ -1,6 +1,6 @@
 #include "kpa_03.h"
 
-ApiStatus func_80241E50_A4A410(Evt* script) {
+ApiStatus func_80241E50_A4A410(Evt* script, s32 isInitialCall) {
     PlayerStatus* playerStatus = &gPlayerStatus;
 
     if (playerStatus->lastGoodPosition.y >= 0) {
diff --git a/src/world/area_kpa/kpa_81/A78510.c b/src/world/area_kpa/kpa_81/A78510.c
index 331d745b7c..d01e5fbfa3 100644
--- a/src/world/area_kpa/kpa_81/A78510.c
+++ b/src/world/area_kpa/kpa_81/A78510.c
@@ -9,9 +9,9 @@ extern s32 N(ItemChoice_SelectedItemID);
 
 // Needs data migrated
 #ifdef NON_MATCHING
-ApiStatus func_8024027C_A7873C(Evt* script, s32 isInitialCall) { 
+ApiStatus func_8024027C_A7873C(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    
+
     if (isInitialCall) {
         kpa_81_ItemChoice_HasSelectedItem = 0;
     }
@@ -20,7 +20,7 @@ ApiStatus func_8024027C_A7873C(Evt* script, s32 isInitialCall) {
         evt_set_variable(script, *args++, kpa_81_ItemChoice_SelectedItemID);
         return ApiStatus_DONE2;
     }
-    
+
     return ApiStatus_BLOCK;
 }
 #else
@@ -29,9 +29,9 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_8024027C_A7873C);
 
 // Needs data migrated
 #ifdef NON_MATCHING
-ApiStatus func_802402D0_A78790(Evt* script, s32 isInitialCall) { 
+ApiStatus func_802402D0_A78790(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    
+
     kpa_81_ItemChoice_SelectedItemID = evt_get_variable(script, *args++);
     kpa_81_ItemChoice_HasSelectedItem = 1;
     return ApiStatus_DONE2;
@@ -47,7 +47,26 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
 }
 #endif
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_80240308_A787C8);
+extern s32 kpa_81_D_80242040[];
+
+ApiStatus func_80240308_A787C8(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            kpa_81_D_80242040[i] = ptr[i];
+        }
+        kpa_81_D_80242040[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            kpa_81_D_80242040[i] = i + 16;
+            kpa_81_D_80242040[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 extern s32 D_80242208[];
 
diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c
index 2bce104f9a..287f3abbbf 100644
--- a/src/world/area_mac/mac_00/7EB340.c
+++ b/src/world/area_mac/mac_00/7EB340.c
@@ -1,5 +1,6 @@
 #include "mac_00.h"
 #include "effects.h"
+#include "model.h"
 
 #define CHUCK_QUIZMO_NPC_ID 6
 
@@ -73,13 +74,96 @@ ApiStatus func_80241A18_7EC728(Evt* script, s32 isInitialCall) {
 extern s32 N(LetterDelivery_SavedNpcAnim);
 #include "world/common/todo/LetterDelivery.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241DA0_7ECAB0);
+typedef struct UnkMac00 {
+    /* 0x00 */ s32 unk_00;
+    /* 0x04 */ s32 unk_04;
+    /* 0x08 */ s32 unk_08;
+    /* 0x0C */ s32 unk_0C;
+    /* 0x10 */ s32 unk_10;
+} UnkMac00; // size = 0x14
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241E04_7ECB14);
+extern UnkMac00 D_80248F18_7F3C28[36];
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241E80_7ECB90);
+ApiStatus func_80241DA0_7ECAB0(Evt* script, s32 isInitialCall) {
+    UnkMac00* it = D_80248F18_7F3C28;
+    u32 i;
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241FF0_7ECD00);
+    for (i = 0; i < ARRAY_COUNT(D_80248F18_7F3C28); i++, it++) {
+        evt_set_variable(script, it->unk_10, 0);
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80241E04_7ECB14(Evt* script, s32 isInitialCall) {
+    UnkMac00* it = D_80248F18_7F3C28;
+    u32 i;
+
+    for (i = 0; i < ARRAY_COUNT(D_80248F18_7F3C28); i++, it++) {
+        s32 t1 = evt_get_variable(script, GameByte(0));
+
+        evt_set_variable(script, it->unk_08, t1 >= it->unk_04);
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80241E80_7ECB90(Evt* script, s32 isInitialCall) {
+    UnkMac00* it = D_80248F18_7F3C28;
+    s32 cond = FALSE;
+    s32 count = 0;
+    u32 i;
+
+    for (i = 0; i < ARRAY_COUNT(D_80248F18_7F3C28); i++, it++) {
+        if (evt_get_variable(script, it->unk_08) != 0) {
+            if (evt_get_variable(script, it->unk_0C) == 0) {
+                cond = TRUE;
+                break;
+            } else {
+                if (evt_get_variable(script, it->unk_10) == 0) {
+                    count++;
+                }
+            }
+        }
+    }
+
+    if (!cond) {
+        it = D_80248F18_7F3C28;
+        i = 0;
+        if (count != 0) {
+            s32 temp_s6 = rand_int(count - 1);
+
+            count = 0;
+
+            for (i = cond; i < ARRAY_COUNT(D_80248F18_7F3C28); i++, it++) {
+                if (evt_get_variable(script, it->unk_08) != 0 &&
+                    evt_get_variable(script, it->unk_10) == 0 &&
+                    count++ >= temp_s6)
+                {
+                    break;
+                }
+            }
+        }
+    }
+    script->varTable[0] = i;
+    script->varTable[1] = it->unk_00;
+    script->varTable[2] = cond;
+    evt_set_variable(script, it->unk_0C, 1);
+    evt_set_variable(script, it->unk_10, 1);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80241FF0_7ECD00(Evt* script, s32 isInitialCall) {
+    UnkMac00* it = D_80248F18_7F3C28;
+    s32 count = 0;
+    u32 i;
+
+    for (i = 0; i < ARRAY_COUNT(D_80248F18_7F3C28); i++, it++) {
+        if (evt_get_variable(script, it->unk_08) != 0 && evt_get_variable(script, it->unk_10) == 0) {
+            count++;
+        }
+    }
+    script->varTable[0] = count;
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/todo/UnkPositionFunc.inc.c"
 
diff --git a/src/world/area_mac/mac_01/801700.c b/src/world/area_mac/mac_01/801700.c
index 12c0f0ab69..3d3f29cb28 100644
--- a/src/world/area_mac/mac_01/801700.c
+++ b/src/world/area_mac/mac_01/801700.c
@@ -1,5 +1,33 @@
 #include "mac_01.h"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/801700", func_80240E80_801700);
+typedef struct UnkMac01 {
+    /* 0x00 */ s32 unk_00;
+    /* 0x04 */ s32 unk_04;
+    /* 0x08 */ s32 unk_08;
+} UnkMac01; // size = 0xC
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/801700", func_80240ED8_801758);
+extern UnkMac01 D_802485E8_808E68[26];
+
+ApiStatus func_80240E80_801700(Evt* script, s32 isInitialCall) {
+    s32 idx = evt_get_variable(script, GameByte(349));
+
+    script->varTable[0] = D_802485E8_808E68[idx].unk_00;
+    script->varTable[1] = D_802485E8_808E68[idx].unk_04;
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80240ED8_801758(Evt* script, s32 isInitialCall) {
+    s32 temp_a0 = evt_get_variable(script, GameByte(0));
+    UnkMac01* it;
+    s32 i;
+
+    it = &D_802485E8_808E68[ARRAY_COUNT(D_802485E8_808E68) - 1];
+
+    for (i = ARRAY_COUNT(D_802485E8_808E68) - 1; i >= 0; i--, it--) {
+        if (temp_a0 >= it->unk_08) {
+            break;
+        }
+    }
+    evt_set_variable(script, GameByte(349), i);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index 1c58b3086b..def06d3895 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -1,5 +1,8 @@
 #include "mac_01.h"
 #include "model.h"
+#include "hud_element.h"
+
+extern IconHudScriptPair gItemHudScripts[];
 
 #define CHUCK_QUIZMO_NPC_ID 5
 
@@ -50,15 +53,65 @@ ApiStatus func_80243380_803C00(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243494_803D14);
+ApiStatus func_80243494_803D14(Evt* script, s32 isInitialCall) {
+    UnkEntityStruct* temp_v0 = (UnkEntityStruct*) evt_get_variable(NULL, MapVar(10));
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243500_803D80);
+    func_8013A854(temp_v0->foldID);
+    free_generic_entity(temp_v0->entityID);
+    heap_free(temp_v0);
+    evt_set_variable(script, MapVar(10), NULL);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802435C0_803E40);
+ApiStatus func_80243500_803D80(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 x = evt_get_float_variable(script, *args++);
+    s32 y = evt_get_float_variable(script, *args++);
+    s32 z = evt_get_float_variable(script, *args++);
+    UnkEntityStruct* temp_v0 = (UnkEntityStruct*) evt_get_variable(NULL, MapVar(10));
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243680_803F00);
+    temp_v0->pos.x = x;
+    temp_v0->pos.y = y;
+    temp_v0->pos.z = z;
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243740_803FC0);
+ApiStatus func_802435C0_803E40(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 x = evt_get_float_variable(script, *args++);
+    s32 y = evt_get_float_variable(script, *args++);
+    s32 z = evt_get_float_variable(script, *args++);
+    UnkEntityStruct* temp_v0 = (UnkEntityStruct*) evt_get_variable(NULL, MapVar(10));
+
+    temp_v0->rot.x = x;
+    temp_v0->rot.y = y;
+    temp_v0->rot.z = z;
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80243680_803F00(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 x = evt_get_float_variable(script, *args++);
+    s32 y = evt_get_float_variable(script, *args++);
+    s32 z = evt_get_float_variable(script, *args++);
+    UnkEntityStruct* temp_v0 = (UnkEntityStruct*) evt_get_variable(NULL, MapVar(10));
+
+    temp_v0->scale.x = x;
+    temp_v0->scale.y = y;
+    temp_v0->scale.z = z;
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80243740_803FC0(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 spriteIndex = evt_get_variable(script, *args++);
+    s32 rasterIndex = evt_get_variable(script, *args++);
+    UnkEntityStruct* temp_v0 = (UnkEntityStruct*) evt_get_variable(NULL, MapVar(10));
+
+    temp_v0->spriteIndex = spriteIndex;
+    temp_v0->rasterIndex = rasterIndex;
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/atomic/ToadHouse.inc.c"
 
@@ -102,7 +155,24 @@ extern s32 N(LetterDelivery_SavedNpcAnim);
 
 #include "world/common/todo/GetPlayerCoins.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802440FC_80497C);
+ApiStatus func_802440FC_80497C(Evt* script, s32 isInitialCall) {
+    if (isInitialCall) {
+        set_mdl_custom_gfx_set(get_model_from_list_index(get_model_list_index_from_tree_index(0x2B)), -1, 3);
+        set_mdl_custom_gfx_set(get_model_from_list_index(get_model_list_index_from_tree_index(0x2A)), -1, 3);
+        set_mdl_custom_gfx_set(get_model_from_list_index(get_model_list_index_from_tree_index(0x29)), -1, 3);
+        set_model_env_color_parameters(255, 255, 255, 0, 0, 0);
+        script->functionTemp[0] = 255;
+    }
+    script->functionTemp[0] -= 4;
+    if (script->functionTemp[0] < 64) {
+        script->functionTemp[0] = 64;
+    }
+    set_model_env_color_parameters(script->functionTemp[0], script->functionTemp[0], script->functionTemp[0], 0, 0, 0);
+    if (script->functionTemp[0] == 64) {
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}
 
 ApiStatus func_802441EC_804A6C(Evt* script, s32 isInitialCall) {
     if (isInitialCall) {
@@ -142,11 +212,88 @@ ApiStatus func_802441EC_804A6C(Evt* script, s32 isInitialCall) {
     return ApiStatus_BLOCK;
 }
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244308_804B88);
+ApiStatus func_80244308_804B88(Evt* script, s32 isInitialCall) {
+    if (isInitialCall) {
+        script->functionTemp[0] = 64;
+    }
+    script->functionTemp[0] += 4;
+    if (script->functionTemp[0] > 255) {
+        script->functionTemp[0] = 255;
+    }
+    set_model_env_color_parameters(script->functionTemp[0], script->functionTemp[0], script->functionTemp[0], 0, 0, 0);
+    if (script->functionTemp[0] == 255) {
+        set_mdl_custom_gfx_set(get_model_from_list_index(get_model_list_index_from_tree_index(0x2B)), -1, 0);
+        set_mdl_custom_gfx_set(get_model_from_list_index(get_model_list_index_from_tree_index(0x2A)), -1, 0);
+        set_mdl_custom_gfx_set(get_model_from_list_index(get_model_list_index_from_tree_index(0x29)), -1, 0);
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802443E0_804C60);
+// identical to hos_06 func
+// TODO may not be motionBlurFlame
+ApiStatus func_802443E0_804C60(Evt* script, s32 isInitialCall) {
+    EffectInstance* effects[3];
+    Matrix4f sp28, sp68;
+    f32 tx;
+    f32 ty;
+    f32 temp_f24;
+    f32 temp_f28;
+    f32 temp_f30;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802446AC_804F2C);
+    if (isInitialCall) {
+        script->functionTemp[0] = 180;
+        script->functionTempPtr[1] = (EffectInstance*) evt_get_variable(script, ArrayVar(3));
+        script->functionTempPtr[2] = (EffectInstance*) evt_get_variable(script, ArrayVar(4));
+        script->functionTempPtr[3] = (EffectInstance*) evt_get_variable(script, ArrayVar(5));
+    }
+
+    effects[0] = script->functionTempPtr[1];
+    effects[1] = script->functionTempPtr[2];
+    effects[2] = script->functionTempPtr[3];
+    temp_f30 = (sin_deg(script->functionTemp[0]) * 10.0f) + 10.0f;
+    temp_f28 = (sin_deg(script->functionTemp[0]) * 25.0f) + 10.0f;
+    temp_f24 = script->functionTemp[0] * 10;
+
+    for (i = 0; i < ARRAY_COUNT(effects); i++) {
+        guRotateF(sp28, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f);
+        guRotateF(sp68, i * 120, 0.0f, 0.0f, 1.0f);
+        guMtxCatF(sp68, sp28, sp28);
+        tx = temp_f30 * sin_deg(temp_f24);
+        ty = temp_f28 * cos_deg(temp_f24);
+        guTranslateF(sp68, tx, ty, 0.0f);
+        guMtxCatF(sp68, sp28, sp28);
+        effects[i]->data.motionBlurFlame->pos.x = sp28[3][0];
+        effects[i]->data.motionBlurFlame->pos.y = sp28[3][1];
+        effects[i]->data.motionBlurFlame->pos.z = sp28[3][2];
+    }
+
+    script->functionTemp[0]--;
+    if (script->functionTemp[0] < 16) {
+        for (i = 0; i < ARRAY_COUNT(effects); i++) {
+            effects[i]->data.motionBlurFlame->unk_4C = script->functionTemp[0];
+        }
+    }
+
+    if (script->functionTemp[0] < 0) {
+        for (i = 0; i < ARRAY_COUNT(effects); i++) {
+            remove_effect(effects[i]);
+        }
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}
+
+// identical to hos_06 func
+ApiStatus func_802446AC_804F2C(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++);
+
+    // TODO effect may be wrong
+    effect->data.energyOrbWave->unk_1C++;
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/todo/UnkPositionFunc.inc.c"
 
@@ -219,33 +366,307 @@ ApiStatus func_802448A0_805120(Evt* script, s32 isInitialCall) {
     return ApiStatus_BLOCK;
 }
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244984_805204);
+ApiStatus func_80244984_805204(Evt* script, s32 isInitialCall) {
+    s32 flagBase = GameFlag(1664);
+    s32 count = 0;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802449F8_805278);
+    for (i = 0; i < 16; i++) {
+        if (evt_get_variable(NULL, flagBase + i) == 0) {
+            count++;
+        }
+    }
+    script->varTable[0] = count;
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", pause_tabs_draw_stats_805418);
+ApiStatus func_802449F8_805278(Evt* script, s32 isInitialCall) {
+    s32 temp_s3 = -evt_get_variable(NULL, MapVar(1));
+    s32 temp_s4 = evt_get_variable(NULL, MapVar(0));
+    Npc* npc = script->varTablePtr[7];
+    Enemy* enemy = get_enemy(2);
+    f32 theta = (temp_s3 / 180.0f) * PI;
+    f32 sinTheta = sin_rad(theta);
+    f32 cosTheta = cos_rad(theta);
+    f32 vt0 = script->varTable[0];
+    f32 vt1 = script->varTable[1];
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", pause_tabs_draw_badges_805540);
+    script->varTable[4] = script->varTable[2] + (s32) ((vt0 * cosTheta) - (vt1 * sinTheta));
+    script->varTable[5] = script->varTable[3] + (s32) ((vt0 * sinTheta) + (vt1 * cosTheta));
+
+    if (temp_s3 == 0) {
+        npc->currentAnim = 0xA70001;
+        enemy->flags &= ~ENEMY_FLAGS_8000000;
+    } else {
+        npc->currentAnim = 0xA70002;
+        enemy->flags |= ENEMY_FLAGS_8000000;
+    }
+
+    if (temp_s3 == -60) {
+        npc->flags |= NPC_FLAG_2;
+    } else {
+        npc->flags &= ~NPC_FLAG_2;
+    }
+
+    if (temp_s4 != 0) {
+        npc->currentAnim = 0xA70006;
+    }
+    return ApiStatus_DONE2;
+}
+
+void func_80244B98_805418(void) {
+    s32 temp_s0 = evt_get_variable(NULL, MapVar(0));
+    Vtx* sp10;
+    Vtx* sp14;
+    s32 numCopied;
+    s32 i;
+
+    mdl_get_copied_vertices(0, &sp10, &sp14, &numCopied);
+
+    for (i = 0; i < numCopied; i++) {
+        if (sp10[i].v.ob[0] == -0x4E) {
+            Vtx* v14 = &sp14[i];
+
+            if (sp10[i].v.ob[1] == 0) {
+                v14->v.ob[1] = sp10[i].v.ob[1] - (temp_s0 / 4);
+            } else {
+                v14->v.ob[1] = sp10[i].v.ob[1] + (temp_s0 / 4);
+            }
+        } else if (sp10[i].v.ob[0] == -0x10) {
+            Vtx* v14 = &sp14[i];
+
+            if (sp10[i].v.ob[1] == 0) {
+                v14->v.ob[1] = sp10[i].v.ob[1] - (temp_s0 / 4);
+            } else {
+                v14->v.ob[1] = sp10[i].v.ob[1] + (temp_s0 / 4);
+            }
+        }
+    }
+
+    gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(0));
+}
+
+// flag clearing counterpart of UnkMachiFunc
+ApiStatus func_80244CC0_805540(Evt* script, s32 isInitialCall) {
+    if (evt_get_variable(NULL, GF_MAC01_RowfBadgeAvailableA) == 0) {
+        clear_item_entity_flags(gGameStatusPtr->shopItemEntities[0].index, ITEM_ENTITY_FLAGS_40);
+    }
+    if (evt_get_variable(NULL, GF_MAC01_RowfBadgeAvailableB) == 0) {
+        clear_item_entity_flags(gGameStatusPtr->shopItemEntities[1].index, ITEM_ENTITY_FLAGS_40);
+    }
+    if (evt_get_variable(NULL, GF_MAC01_RowfBadgeAvailableC) == 0) {
+        clear_item_entity_flags(gGameStatusPtr->shopItemEntities[2].index, ITEM_ENTITY_FLAGS_40);
+    }
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/todo/UnkMachiFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244E10_805690);
+ApiStatus func_80244E10_805690(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 idx = evt_get_variable(script, *args++);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244E90_805710);
+    set_item_entity_position(
+        gGameStatusPtr->shopItemEntities[idx].index,
+        script->varTable[0], script->varTable[1], script->varTable[2] + 6
+    );
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244F5C_8057DC);
+typedef struct UnkMac01 {
+    /* 0x00 */ s32 unk_00;
+    /* 0x04 */ s32 unk_04;
+    /* 0x08 */ s32 unk_08;
+    /* 0x0C */ s32 unk_0C;
+    /* 0x10 */ s32 unk_10;
+} UnkMac01; // size = 0x14
+// same as UnkMac00 ?
+
+extern UnkMac01 D_80256ADC_81735C[19];
+extern UnkMac01 D_80256AEC_81736C[];
+extern PopupMenu D_80262C38;
+
+ApiStatus func_80244E90_805710(Evt* script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    s32 var_s2 = -1;
+    u32 i;
+
+    for (i = 0; i < ARRAY_COUNT(D_80256ADC_81735C); i++) {
+        if (playerData->partners[D_80256ADC_81735C[i].unk_00].enabled &&
+            (evt_get_variable(NULL, GameFlag(153 + i)) != 0))
+        {
+            if (evt_get_variable(NULL, GameFlag(172 + i)) == 0) {
+                var_s2 = 1;
+                break;
+            } else {
+                var_s2 = 0;
+            }
+        }
+    }
+    script->varTable[0] = var_s2;
+    return ApiStatus_DONE2;
+}
+
+s32 func_80244F5C_8057DC(s32 arg0) {
+    s32 ret = 0;
+    u32 i;
+
+    for (i = 0; i < ARRAY_COUNT(D_80256ADC_81735C); i++) {
+        if (D_80256ADC_81735C[i].unk_00 == arg0 && evt_get_variable(NULL, GameFlag(153 + i)) != 0) {
+            if (ret == 0) {
+                ret = 1;
+            }
+            if (evt_get_variable(NULL, GameFlag(172 + i)) == 0) {
+                ret = 2;
+                break;
+            }
+        }
+    }
+    return ret;
+}
 
 ApiStatus func_80245018_805898(Evt* script, s32 isInitialCall) {
     D_80262F68 = 0;
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245028_8058A8);
+ApiStatus func_80245028_8058A8(Evt* script, s32 isInitialCall) {
+    PopupMenu* menu = &D_80262C38;
+    PartnerPopupProperties* temp_s2;
+    PlayerData* playerData = &gPlayerData;
+    s32 partnerID;
+    s32 cond;
+    s32 numEntries;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024522C_805AAC);
+    if (isInitialCall) {
+        numEntries = 0;
+
+        for (i = 1; i < 12; i++) {
+            partnerID = D_8008EEC0[i];
+            if (playerData->partners[partnerID].enabled && partnerID != PARTNER_GOOMPA) {
+                temp_s2 = &gPartnerPopupProperties[partnerID];
+                cond = func_80244F5C_8057DC(partnerID);
+                if (cond) {
+                    menu->ptrIcon[numEntries] = wPartnerHudScripts[partnerID];
+                    menu->userIndex[numEntries] = partnerID;
+                    menu->enabled[numEntries] = TRUE;
+                    menu->nameMsg[numEntries] = temp_s2->nameMsg;
+                    menu->descMsg[numEntries] = temp_s2->worldDescMsg;
+                    menu->value[numEntries] = playerData->partners[partnerID].level;
+                    if (cond == TRUE) {
+                        menu->enabled[numEntries] = FALSE;
+                        menu->ptrIcon[numEntries] = wDisabledPartnerHudScripts[partnerID];
+                    }
+                    numEntries++;
+                }
+            }
+        }
+        menu->popupType = POPUP_MENU_D;
+        menu->numEntries = numEntries;
+        menu->initialPos = D_80262F68;
+        create_popup_menu(menu);
+        func_800E98C4();
+        close_status_menu();
+        script->functionTemp[0] = 0;
+    }
+
+    if (script->functionTemp[0] == 0) {
+        script->functionTemp[1] = menu->result;
+        if (script->functionTemp[1] != 0) {
+            hide_popup_menu();
+        } else {
+            return ApiStatus_BLOCK;
+        }
+    }
+
+    script->functionTemp[0]++;
+    if (script->functionTemp[0] < 20) {
+        return ApiStatus_BLOCK;
+    }
+
+    destroy_popup_menu();
+    if (script->functionTemp[1] == 0xFF) {
+        script->varTable[1] = -1;
+        return ApiStatus_DONE2;
+    }
+    partnerID = menu->userIndex[script->functionTemp[1] - 1];
+    script->varTable[1] = partnerID; // TODO required to match (use of partnerID temp)
+    D_80262F68 = script->functionTemp[1] - 1;
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_8024522C_805AAC(Evt* script, s32 isInitialCall) {
+    s32 vt10 = script->varTable[10];
+    PopupMenu* menu = &D_80262C38;
+    IconHudScriptPair* scriptPair;
+    s32 temp_a0;
+    s32 temp_a1;
+    s32 temp_s0;
+    s32 numEntries;
+    u32 i;
+
+    if (isInitialCall) {
+        numEntries = 0;
+
+        for (i = 0; i < ARRAY_COUNT(D_80256ADC_81735C); i++) {
+            temp_s0 = evt_get_variable(NULL, GameFlag(153 + i));
+            temp_a0 = evt_get_variable(NULL, GameFlag(172 + i));
+            if (temp_s0 != 0 && vt10 == D_80256ADC_81735C[i].unk_00) {
+                scriptPair = &gItemHudScripts[gItemTable[84].hudElemID];
+                menu->userIndex[numEntries] = i;
+                menu->nameMsg[numEntries] = D_80256ADC_81735C[i].unk_08;
+                menu->descMsg[numEntries] = D_80256ADC_81735C[i].unk_0C;
+                menu->value[numEntries] = 0;
+                if (temp_a0 != 0) {
+                    menu->ptrIcon[numEntries] = scriptPair->disabled;
+                    menu->enabled[numEntries] = FALSE;
+                } else {
+                    menu->ptrIcon[numEntries] = scriptPair->enabled;
+                    menu->enabled[numEntries] = TRUE;
+                }
+                numEntries++;
+            }
+        }
+        menu->popupType = 8;
+        menu->numEntries = numEntries;
+        menu->initialPos = 0;
+        create_popup_menu(menu);
+        func_800E98C4();
+        close_status_menu();
+        script->functionTemp[0] = 0;
+    }
+
+    if (script->functionTemp[0] == 0) {
+        script->functionTemp[1] = menu->result;
+        if (script->functionTemp[1] != 0) {
+            hide_popup_menu();
+        } else {
+            return ApiStatus_BLOCK;
+        }
+    }
+
+    script->functionTemp[0]++;
+    if (script->functionTemp[0] < 20) {
+        return ApiStatus_BLOCK;
+    }
+
+    destroy_popup_menu();
+    if (script->functionTemp[1] == 0xFF) {
+        script->varTable[1] = -1;
+        return ApiStatus_DONE2;
+    }
+    temp_a1 = menu->userIndex[script->functionTemp[1] - 1];
+    script->varTable[1] = temp_a1;
+    script->varTable[0] = D_80256AEC_81736C[temp_a1].unk_00;
+    evt_set_variable(NULL, GameFlag(temp_a1 + 172), 1);
+    return ApiStatus_DONE2;
+}
 
 ApiStatus func_80245440_805CC0(Evt* script, s32 isInitialCall) {
-    if (gPlayerData.currentPartner == script->varTable[10]) {
+    PlayerData* playerData = &gPlayerData;
+
+    if (playerData->currentPartner == script->varTable[10]) {
         script->varTable[1] = 0;
         return ApiStatus_DONE2;
     }
diff --git a/src/world/area_mac/mac_02/8238B0.c b/src/world/area_mac/mac_02/8238B0.c
index bf897de0ad..32a28f9fc7 100644
--- a/src/world/area_mac/mac_02/8238B0.c
+++ b/src/world/area_mac/mac_02/8238B0.c
@@ -1,4 +1,5 @@
 #include "mac_02.h"
+#include "model.h"
 
 ApiStatus func_802405F0_8238B0(Evt* script, s32 isInitialCall) {
     Npc* npc;
diff --git a/src/world/area_mac/mac_04/842D90.c b/src/world/area_mac/mac_04/842D90.c
index da503e705e..9257e82542 100644
--- a/src/world/area_mac/mac_04/842D90.c
+++ b/src/world/area_mac/mac_04/842D90.c
@@ -1,7 +1,7 @@
 #include "mac_04.h"
 
-// matches if func_8011B950 is declared to return s32, but that breaks other funcs
-#ifdef NON_MATCHING
+s32 set_background_color_blend(s32, s32, s32, s32);
+
 ApiStatus func_802401C0_842D90(Evt* script, s32 isInitialCall) {
     func_8011B950(0x9E, -1, 1, 1);
     set_background_color_blend(0, 0, 0, 255);
@@ -10,6 +10,3 @@ ApiStatus func_802401C0_842D90(Evt* script, s32 isInitialCall) {
     gCameras[CAM_DEFAULT].bgColor[2] = 0;
     return ApiStatus_DONE2;
 }
-#else
-INCLUDE_ASM(s32, "world/area_mac/mac_04/842D90", func_802401C0_842D90);
-#endif
diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c
index ef3a203ae8..d5b850d78a 100644
--- a/src/world/area_mac/mac_05/852170.c
+++ b/src/world/area_mac/mac_05/852170.c
@@ -91,7 +91,7 @@ extern s32 N(LetterDelivery_SavedNpcAnim);
 
 // float stuff
 #ifdef NON_MATCHING
-ApiStatus func_80242A90_854C00(Evt* script) {
+ApiStatus func_80242A90_854C00(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     s32 temp_s1 = evt_get_variable(script, *args++);
     s32 temp_s3 = *args++;
@@ -147,7 +147,73 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A90_854C00);
 
 static char* N(exit_str_2) = "mac_06";
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242C78_854DE8);
+// maybe a duplicate, not sure if the NPCs are the same
+API_CALLABLE(func_80242C78_854DE8) {
+    Bytecode* args = script->ptrReadPos;
+    Npc* npc0 = get_npc_safe(0);
+    Npc* npc1;
+    Npc* partner;
+    f32 forward, radius;
+    f32 x, y, z;
+
+    if (isInitialCall) {
+        script->functionTemp[0] = evt_get_variable(script, *args++);
+        switch (script->functionTemp[0]) {
+            case 0:
+                script->functionTemp[1] = 55;
+                break;
+            case 1:
+                script->functionTemp[1] = 85;
+                break;
+            default:
+                script->functionTemp[1] = 25;
+               break;
+        }
+    }
+
+    radius = script->functionTemp[1];
+    forward = -npc0->yaw;
+    x = npc0->pos.x + 30.0f + sin_deg(forward) * radius;
+    z = npc0->pos.z + cos_deg(forward) * radius;
+    y = npc0->pos.y + 50.0f;
+
+    switch (script->functionTemp[0]) {
+        case 0:
+            gPlayerStatus.position.x = x;
+            gPlayerStatus.position.y = y;
+            gPlayerStatus.position.z = z;
+            npc0->colliderPos.x = npc0->pos.x;
+            npc0->colliderPos.y = npc0->pos.y;
+            npc0->colliderPos.z = npc0->pos.z;
+            npc0->flags |= NPC_FLAG_DIRTY_SHADOW;
+            break;
+        case 1:
+            partner = get_npc_safe(NPC_PARTNER);
+            if (partner == NULL) {
+                return ApiStatus_DONE2;
+            }
+            partner->pos.x = x;
+            partner->pos.y = y;
+            partner->pos.z = z;
+            partner->colliderPos.x = partner->pos.x;
+            partner->colliderPos.y = partner->pos.y;
+            partner->colliderPos.z = partner->pos.z;
+            partner->flags |= NPC_FLAG_DIRTY_SHADOW;
+            break;
+        case 2:
+            npc1 = get_npc_safe(1);
+            npc1->pos.x = x;
+            npc1->pos.y = y;
+            npc1->pos.z = z;
+            npc1->colliderPos.x = npc1->pos.x;
+            npc1->colliderPos.y = npc1->pos.y;
+            npc1->colliderPos.z = npc1->pos.z;
+            npc1->flags |= NPC_FLAG_DIRTY_SHADOW;
+            break;
+    }
+
+    return ApiStatus_BLOCK;
+}
 
 ApiStatus func_80242E84_854FF4(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_mac/mac_05/855F20.c b/src/world/area_mac/mac_05/855F20.c
index cecb396012..ea2ffdf937 100644
--- a/src/world/area_mac/mac_05/855F20.c
+++ b/src/world/area_mac/mac_05/855F20.c
@@ -2,8 +2,76 @@
 
 extern f32 D_80252744_8648B4;
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/855F20", func_80243DB0_855F20);
+// ordering
+#ifdef NON_MATCHING
+void func_80243DB0_855F20(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5) {
+    f32 temp_f0;
+    f32 temp_f0_2;
+    f32 temp_f12;
+    f32 temp_f2_2;
+    f32 temp_f4;
+    f32 temp_f8;
+    f32 var_f6;
+    s32 temp_f10;
+    f64 temp_f2;
+
+    if (arg2 <= 0.5f) {
+        temp_f2 = (f64) arg2;
+        var_f6 = (arg1 * temp_f2) + temp_f2;
+    } else {
+        var_f6 = (arg2 + arg1) - (arg2 * arg1);
+    }
+
+    if (var_f6 == 0.0f) {
+        *arg5 = 0.0f;
+        *arg4 = 0.0f;
+        *arg3 = 0.0f;
+        return;
+    }
+    temp_f12 = arg0 * 6.0f;
+    temp_f8 = (2.0f * arg2) - var_f6;
+    temp_f4 = (s32) temp_f12;
+    temp_f0 = var_f6 * ((var_f6 - temp_f8) / var_f6) * (temp_f12 - temp_f4);
+    temp_f2_2 = temp_f8 + temp_f0;
+    temp_f0_2 = var_f6 - temp_f0;
+    temp_f10 = (s32) temp_f4;
+    switch (temp_f10) {
+        case 0:
+            *arg3 = var_f6;
+            *arg4 = temp_f2_2;
+            *arg5 = temp_f8;
+            break;
+        case 1:
+            *arg3 = temp_f0_2;
+            *arg4 = var_f6;
+            *arg5 = temp_f8;
+            break;
+        case 2:
+            *arg3 = temp_f8;
+            *arg4 = var_f6;
+            *arg5 = temp_f2_2;
+            break;
+        case 3:
+            *arg3 = temp_f8;
+            *arg4 = temp_f0_2;
+            *arg5 = var_f6;
+            break;
+        case 4:
+            *arg3 = temp_f2_2;
+            *arg4 = temp_f8;
+            *arg5 = var_f6;
+            break;
+        case 5:
+            *arg3 = var_f6;
+            *arg4 = temp_f8;
+            *arg5 = temp_f0_2;
+            break;
+    }
+}
+#else
 void func_80243DB0_855F20(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5);
+INCLUDE_ASM(s32, "world/area_mac/mac_05/855F20", func_80243DB0_855F20);
+#endif
 
 void func_80243F0C_85607C(s32 index) {
     Vtx* first;
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index 1cfb233819..1ee2620c15 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -134,9 +134,24 @@ ApiStatus func_802427C0_9C7BA0(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242804_9C7BE4);
+extern s16 D_80250810_9D5BF0[];
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242858_9C7C38);
+ApiStatus func_80242804_9C7BE4(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 idx = evt_get_variable(script, *args++);
+
+    snd_ambient_80055848(D_80250810_9D5BF0[idx]);
+    au_ambience_set_volume(D_80250810_9D5BF0[idx], 1500, 127);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80242858_9C7C38(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 idx = evt_get_variable(script, *args++);
+
+    au_ambience_set_volume(D_80250810_9D5BF0[idx], 1500, 1);
+    return ApiStatus_DONE2;
+}
 
 ApiStatus func_80242898_9C7C78(Evt* script, s32 isInitialCall) {
     snd_ambient_80055848(4);
diff --git a/src/world/area_nok/nok_02/9DA8F0.c b/src/world/area_nok/nok_02/9DA8F0.c
index f323239018..2122823456 100644
--- a/src/world/area_nok/nok_02/9DA8F0.c
+++ b/src/world/area_nok/nok_02/9DA8F0.c
@@ -98,7 +98,7 @@ ApiStatus func_80243D14_9DAD34(Evt* script, s32 isInitialCall) {
 #include "world/common/todo/GetItemName.inc.c"
 #define NAMESPACE nok_02
 
-ApiStatus func_80243EC8_9DAEE8(Evt* script) {
+ApiStatus func_80243EC8_9DAEE8(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     if ((evt_get_variable(script, *args++) % 4) != 0) {
diff --git a/src/world/area_nok/nok_13/A01420.c b/src/world/area_nok/nok_13/A01420.c
index f1a26b1940..362c67c5ab 100644
--- a/src/world/area_nok/nok_13/A01420.c
+++ b/src/world/area_nok/nok_13/A01420.c
@@ -2,7 +2,7 @@
 
 #include "world/common/util/MonitorPlayerOrbiting.inc.c"
 
-ApiStatus func_80241360_A01960(Evt* script) {
+ApiStatus func_80241360_A01960(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     s32 a0 = *args++;
 
diff --git a/src/world/area_obk/obk_01/BBD1A0.c b/src/world/area_obk/obk_01/BBD1A0.c
index 6073b42801..2726a4d234 100644
--- a/src/world/area_obk/obk_01/BBD1A0.c
+++ b/src/world/area_obk/obk_01/BBD1A0.c
@@ -22,9 +22,47 @@ INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_8024007C_BBD21C);
 
 INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_80240098_BBD238);
 
-INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_802406AC_BBD84C);
+// unused?
+ApiStatus func_802406AC_BBD84C(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* var; // TODO what is this?
+    s32 temp_a1;
 
-INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_80240730_BBD8D0);
+    if (isInitialCall) {
+        var = (s32*) evt_get_variable(script, *args++);
+        script->functionTemp[1] = *var;
+    }
+
+    var = script->functionTempPtr[1];
+    if (gGameStatusPtr->pressedButtons[0] & BUTTON_A) {
+        if (*var & 4) {
+            script->varTable[0] = 1;
+        } else {
+            script->varTable[0] = 0;
+        }
+        *var &= ~2;
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus func_80240730_BBD8D0(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* var; // TODO what is this?
+    s32 temp_a1;
+
+    if (isInitialCall) {
+        var = (s32*) evt_get_variable(script, *args++);
+        script->functionTemp[1] = *var;
+    }
+
+    var = script->functionTempPtr[1];
+    if (*var & 4) {
+        *var &= ~2;
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}
 
 ApiStatus func_80240790_BBD930(Evt* script, s32 isInitialCall) {
     ItemEntity* item = get_item_entity(script->varTable[0]);
diff --git a/src/world/area_obk/obk_01/BBD980.c b/src/world/area_obk/obk_01/BBD980.c
index 38e61da584..bb7be57a4e 100644
--- a/src/world/area_obk/obk_01/BBD980.c
+++ b/src/world/area_obk/obk_01/BBD980.c
@@ -21,7 +21,26 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240BB0_BBDD50);
+extern s32 obk_01_802458F0[];
+
+ApiStatus func_80240BB0_BBDD50(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            obk_01_802458F0[i] = ptr[i];
+        }
+        obk_01_802458F0[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            obk_01_802458F0[i] = i + 16;
+            obk_01_802458F0[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 extern s32 N(LetterDelivery_SavedNpcAnim);
 #include "world/common/todo/LetterDelivery.inc.c"
diff --git a/src/world/area_obk/obk_04/BC7EB0.c b/src/world/area_obk/obk_04/BC7EB0.c
index 8cf11b7958..79f335556a 100644
--- a/src/world/area_obk/obk_04/BC7EB0.c
+++ b/src/world/area_obk/obk_04/BC7EB0.c
@@ -52,8 +52,25 @@ void func_8024022C_BC808C(void) {
     get_npc_unsafe(8)->unk_A2 = 0;
 }
 
-s32 func_802402A0_BC8100(s32);
-INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_802402A0_BC8100);
+s32 func_802402A0_BC8100(s32 arg0) {
+    s32 ret = 12;
+
+    switch (arg0) {
+        case 0:
+            ret = 12;
+            break;
+        case 1:
+            ret = 100;
+            break;
+        case 2:
+            ret = 13;
+            break;
+        case 3:
+            ret = 14;
+            break;
+    }
+    return ret;
+}
 
 ApiStatus func_802402F4_BC8154(Evt* script, s32 isInitialCall) {
     Npc* npc = get_npc_unsafe(script->owner2.npcID);
@@ -132,7 +149,84 @@ ApiStatus func_802405B4_BC8414(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
+// float regalloc
+#ifdef NON_MATCHING
+ApiStatus func_80240624_BC8484(Evt* script, s32 isInitialCall) {
+    Npc* npc = get_npc_unsafe(script->owner2.npcID);
+    Npc* npc2 = npc->blur.any;
+    f32 temp_f10;
+    f32 temp_f12;
+    f32 temp_f14;
+    f32 temp_f2;
+    f32 temp_f4;
+    f32 temp_f6;
+    s32* temp_s2;
+    f32 yaw;
+    f32 new_var;
+    f32 f1;
+
+
+    temp_s2 = npc2->blur.any;
+    switch (script->functionTemp[1]) {
+        case 0:
+            npc->yaw = clamp_angle(script->functionTemp[2] + npc2->yaw);
+            if (*temp_s2 == 1) {
+                script->functionTemp[1] = 1;
+                npc->duration = rand_int(20) + 10;
+            }
+            break;
+        case 1:
+            npc->yaw = clamp_angle(script->functionTemp[2] + npc2->yaw);
+            npc->duration--;
+            if (npc->duration == 0) {
+                sfx_play_sound_at_position(0xB000000F, 0, npc->pos.x, npc->pos.y, npc->pos.z);
+                script->functionTemp[1] = 2;
+                npc->duration = 0;
+                npc->moveToPos.x = npc->pos.x;
+                npc->moveToPos.y = npc->pos.y;
+                npc->moveToPos.z = npc->pos.z;
+            }
+            break;
+        case 2:
+            npc->yaw = clamp_angle(script->functionTemp[2] + npc2->yaw);
+            new_var = npc->yaw;
+            npc->pos.x = npc2->pos.x;
+            npc->pos.z = npc2->pos.z;
+            npc_move_heading(npc, npc2->planarFlyDist, new_var);
+            temp_f4 = (40.0f - npc->duration) / 40.0f;
+            temp_f12 = npc->pos.z;
+            f1 = (npc->pos.x - npc->moveToPos.x) * (temp_f4 * temp_f4);
+            temp_f6 = (npc->pos.z - npc->moveToPos.z) * (temp_f4 * temp_f4);
+            temp_f2 = npc2->pos.y + 1000.0f;
+            npc->pos.x -= f1;
+            npc->pos.y = temp_f2;
+            npc->pos.y -= (npc->pos.y - npc->moveToPos.y) * ((temp_f4 * temp_f4) * temp_f4);
+            npc->pos.z = temp_f12 - temp_f6;
+            npc->duration++;
+            if (npc->duration == 40) {
+                script->functionTemp[1] = 12;
+            }
+            break;
+        case 12:
+        case 13:
+        case 14:
+            yaw = clamp_angle(script->functionTemp[2] + npc2->yaw);
+            npc->yaw = yaw;
+            script->functionTemp[1] = func_802402A0_BC8100(evt_get_variable(script, MapVar(3)));
+            npc->pos.x = npc2->pos.x;
+            npc->pos.z = npc2->pos.z;
+            npc_move_heading(npc, npc2->planarFlyDist, yaw);
+            npc->pos.y = npc2->pos.y + 1000.0f;
+            break;
+        case 100:
+            script->functionTemp[1] = func_802402A0_BC8100(evt_get_variable(script, MapVar(3)));
+            break;
+    }
+    return ApiStatus_DONE2;
+}
+#else
 INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240624_BC8484);
+#endif
 
 ApiStatus func_80240910_BC8770(Evt* script, s32 isInitialCall) {
     if (gPlayerStatus.position.y < -50.0f) {
@@ -193,7 +287,7 @@ ApiStatus func_80240A58_BC88B8(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-ApiStatus func_80240C10_BC8A70(Evt* script) {
+ApiStatus func_80240C10_BC8A70(Evt* script, s32 isInitialCall) {
     Npc npc;
 
     npc.pos.x = 0;
diff --git a/src/world/area_obk/obk_09/BDABA0.c b/src/world/area_obk/obk_09/BDABA0.c
index 986132563a..120a89dac7 100644
--- a/src/world/area_obk/obk_09/BDABA0.c
+++ b/src/world/area_obk/obk_09/BDABA0.c
@@ -1,6 +1,6 @@
 #include "obk_09.h"
 
-ApiStatus func_802403F0_BDABA0(Evt* script) {
+ApiStatus func_802403F0_BDABA0(Evt* script, s32 isInitialCall) {
     get_item_entity(script->varTable[0])->scale = 0.6f;
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_osr/osr_01/AB0350.c b/src/world/area_osr/osr_01/AB0350.c
index 161978e110..f82c56b079 100644
--- a/src/world/area_osr/osr_01/AB0350.c
+++ b/src/world/area_osr/osr_01/AB0350.c
@@ -52,7 +52,26 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
 }
 #endif
 
-INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240730_AB0720);
+extern s32 osr_01_D_80242180[];
+
+ApiStatus func_80240730_AB0720(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            osr_01_D_80242180[i] = ptr[i];
+        }
+        osr_01_D_80242180[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            osr_01_D_80242180[i] = i + 16;
+            osr_01_D_80242180[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 extern s32 N(LetterDelivery_SavedNpcAnim);
 #include "world/common/todo/LetterDelivery.inc.c"
diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c
index 13dfe58461..406c988913 100644
--- a/src/world/area_pra/pra_02/D50010.c
+++ b/src/world/area_pra/pra_02/D50010.c
@@ -19,7 +19,26 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802411D8_D511C8);
+extern s32 pra_02_D_80243CC0[];
+
+ApiStatus func_802411D8_D511C8(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            pra_02_D_80243CC0[i] = ptr[i];
+        }
+        pra_02_D_80243CC0[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            pra_02_D_80243CC0[i] = i + 16;
+            pra_02_D_80243CC0[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 extern s32 D_80243E88_846A58[];
 
@@ -48,7 +67,7 @@ ApiStatus func_80241274_D51264(Evt* script, s32 isInitialCall) {
 
 #include "world/common/todo/UnkFunc44.inc.c"
 
-ApiStatus func_802414A8_D51498(Evt* script) {
+ApiStatus func_802414A8_D51498(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     s32 entityIdx = evt_get_variable(script, *args++);
     f32 x = evt_get_float_variable(script, *args++);
diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c
index 749b456af5..ed1e36ae4c 100644
--- a/src/world/area_pra/pra_19/D6E9D0.c
+++ b/src/world/area_pra/pra_19/D6E9D0.c
@@ -140,7 +140,7 @@ void func_802415E0_D6FF90(void* data) {
     spr_draw_player_sprite(2, 0, 0, 0, sp18);
 }
 
-ApiStatus func_802416F8_D700A8(Evt* script) {
+ApiStatus func_802416F8_D700A8(Evt* script, s32 isInitialCall) {
     gPlayerStatus.spriteFacingAngle = script->varTable[0];
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c
index e37b7d31a9..ea45a94f36 100644
--- a/src/world/area_sam/sam_06/D203E0.c
+++ b/src/world/area_sam/sam_06/D203E0.c
@@ -1,4 +1,5 @@
 #include "sam_06.h"
+#include "model.h"
 
 #include "world/common/enemy/ai/FlyingAI.inc.c"
 
diff --git a/src/world/area_sam/sam_11/D3A930.c b/src/world/area_sam/sam_11/D3A930.c
index 93cf3c47d9..5ce52545bb 100644
--- a/src/world/area_sam/sam_11/D3A930.c
+++ b/src/world/area_sam/sam_11/D3A930.c
@@ -1,4 +1,5 @@
 #include "sam_11.h"
+#include "model.h"
 
 extern s32 D_80243CC0_D3E290;
 extern s32 D_80243CC4_D3E294;
diff --git a/src/world/area_tik/tik_15/890190.c b/src/world/area_tik/tik_15/890190.c
index d3f6efee60..30cf377ff2 100644
--- a/src/world/area_tik/tik_15/890190.c
+++ b/src/world/area_tik/tik_15/890190.c
@@ -16,7 +16,7 @@ ApiStatus func_80240A78_890618(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-ApiStatus func_80240AA4_890644(Evt* script) {
+ApiStatus func_80240AA4_890644(Evt* script, s32 isInitialCall) {
     script->varTable[0] = get_item_empty_count();
     return ApiStatus_DONE2;
 }
diff --git a/src/world/common/atomic/Quizmo.inc.c b/src/world/common/atomic/Quizmo.inc.c
index d8a106fa80..41f7c968e1 100644
--- a/src/world/common/atomic/Quizmo.inc.c
+++ b/src/world/common/atomic/Quizmo.inc.c
@@ -1,5 +1,6 @@
 #include "common.h"
 #include "effects.h"
+#include "model.h"
 
 // TODO, can we remove this once all data disasm'ed?
 extern QuizRequirement N(Quizmo_Requirements)[];
diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c
index 3150cae428..05d100129e 100644
--- a/src/world/common/complete/Quizmo.inc.c
+++ b/src/world/common/complete/Quizmo.inc.c
@@ -1,6 +1,7 @@
 #include "common.h"
 #include "message_ids.h"
 #include "effects.h"
+#include "model.h"
 #include "sprite/npc/ChuckQuizmo.h"
 
 #ifndef CHUCK_QUIZMO_NPC_ID
diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c
index 50eb306e4a..b6fc8e13ea 100644
--- a/src/world/script_api/7E0E80.c
+++ b/src/world/script_api/7E0E80.c
@@ -368,15 +368,15 @@ void shop_open_item_select_popup(s32 mode) {
 
     switch (mode) {
         case 0:
-            popupType = 5;
+            popupType = POPUP_MENU_SELL_ITEM;
             numItemSlots = 10;
             break;
         case 1:
-            popupType = 6;
+            popupType = POPUP_MENU_CHECK_ITEM;
             numItemSlots = 10;
             break;
         default:
-            popupType = 7;
+            popupType = POPUP_MENU_CLAIM_ITEM;
             numItemSlots = 32;
             break;
     }
diff --git a/src/world/script_api/7E2AA0.c b/src/world/script_api/7E2AA0.c
index a6ea6fa3d7..a8716e604d 100644
--- a/src/world/script_api/7E2AA0.c
+++ b/src/world/script_api/7E2AA0.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "model.h"
 
 void set_current_item_entity_render_group(s32);
 s32 get_current_item_entity_render_group(void);
@@ -158,7 +159,7 @@ ApiStatus MakeDoorAdvanced(Evt* script, s32 isInitialCall) {
     door->unk_1C.z = door->unk_14.z;
     door->unk_24.x = door->unk_0C.x;
     door->unk_24.z = door->unk_0C.z;
-    
+
     door->bgColor[0] = gCameras[CAM_DEFAULT].bgColor[0];
     door->bgColor[1] = gCameras[CAM_DEFAULT].bgColor[1];
     door->bgColor[2] = gCameras[CAM_DEFAULT].bgColor[2];
@@ -190,7 +191,7 @@ ApiStatus func_80282314(Evt* script, s32 isInitialCall) {
 
 ApiStatus GetDoorState(Evt* script, s32 isInitialCall) {
     AdvancedDoor* door = script->functionTempPtr[1];
-    
+
     script->varTable[0] = door->state;
     return ApiStatus_DONE2;
 }
@@ -218,7 +219,7 @@ ApiStatus func_802823B0(Evt* script, s32 isInitialCall) {
     AdvancedDoor* door = script->functionTempPtr[1];
     s32 index = evt_get_variable(script, *args++);
     s32 scriptID = evt_get_variable(script, *args++);
-    
+
     door->scriptIDs[index] = scriptID;
     return ApiStatus_DONE2;
 }
@@ -226,7 +227,7 @@ ApiStatus func_802823B0(Evt* script, s32 isInitialCall) {
 ApiStatus func_80282414(Evt* script, s32 isInitialCall) {
     AdvancedDoor* door = script->varTablePtr[1];
     s32 alpha, r, g, b;
-    
+
     if (isInitialCall) {
         if (script->varTable[0] == 0) {
             func_8011B950(script->varTable[15], -1, 1, 1);
@@ -249,7 +250,7 @@ ApiStatus func_80282414(Evt* script, s32 isInitialCall) {
     gCameras[CAM_DEFAULT].bgColor[0] = r;
     gCameras[CAM_DEFAULT].bgColor[1] = g;
     gCameras[CAM_DEFAULT].bgColor[2] = b;
-    
+
     if (script->functionTemp[1] >= 255) {
         if (script->varTable[0] == 3) {
             func_8011B950(script->varTable[15], -1, 0, 1);
@@ -297,11 +298,11 @@ ApiStatus func_80282634(Evt* script, s32 isInitialCall) {
     s32 endOfList;
     s32 mask;
     s32 i;
-    
+
     if (npcList == NULL) {
         return ApiStatus_DONE2;
     }
-    
+
     for (i = 0; i < MAX_NPCS; i++) {
         Npc* npc = get_npc_by_index(i);
         if (npc != NULL) {
@@ -321,10 +322,10 @@ ApiStatus func_80282634(Evt* script, s32 isInitialCall) {
         }
         npc = get_npc_safe(*npcList++);
         if (npc != NULL) {
-            npc->flags &= mask; 
+            npc->flags &= mask;
         }
     } while (TRUE);
-    
+
     return ApiStatus_DONE2;
 }
 
@@ -335,7 +336,7 @@ ApiStatus func_80282700(Evt* script, s32 isInitialCall) {
     if (door->npcList == NULL) {
         return ApiStatus_DONE2;
     }
-    
+
     for (i = 0; i < MAX_NPCS; i++) {
         Npc* npc = get_npc_by_index(i);
         if (npc != NULL) {
@@ -344,7 +345,7 @@ ApiStatus func_80282700(Evt* script, s32 isInitialCall) {
             }
         }
     }
-    
+
     return ApiStatus_DONE2;
 }
 
@@ -358,7 +359,7 @@ ApiStatus SetNewItemVisGroup(Evt* script, s32 isInitialCall) {
 
 ApiStatus RestorePrevItemVisGroup(Evt* script, s32 isInitialCall) {
     AdvancedDoor* door = script->functionTempPtr[1];
-    
+
     set_current_item_entity_render_group(door->prevItemVisGroup);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/script_api/7E3700.c b/src/world/script_api/7E3700.c
index 75465f2f91..1c213bb2b6 100644
--- a/src/world/script_api/7E3700.c
+++ b/src/world/script_api/7E3700.c
@@ -251,7 +251,7 @@ ApiStatus CheckActionState(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-ApiStatus func_80283240(Evt* script) {
+ApiStatus func_80283240(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     Bytecode outVar = *args++;
     Bytecode* sourceToFind = (Bytecode*)evt_get_variable(script, *args++);
diff --git a/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s b/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s
index 858a8ef99f..e42591a980 100644
--- a/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s
@@ -348,7 +348,7 @@ dlabel D_802555AC_815E2C
 .word 0x00000258, 0x00000000, 0x00000256, 0x00000000, 0x00000253, 0x00000000, 0x0000024E, 0x00000000, 0x00000247, 0x00000000, 0x0000023E, 0x00000000, 0x00000232, 0x00000000, 0x00000223, 0x00000000, 0x00000211, 0x00000000, 0x000001FD, 0x00000000, 0x000001E9, 0x00000000, 0x000001D5, 0x00000000, 0x000001C1, 0x00000000, 0x000001AD, 0x00000000, 0x00000199, 0x00000000, 0x00000185, 0x00000000, 0x00000171, 0x00000000, 0x0000015D, 0x00000000, 0x00000149, 0x00000000, 0x00000135, 0x00000000, 0x00000121, 0x00000000, 0x0000010D, 0x00000000, 0x000000F9, 0x00000000, 0x000000E5, 0x00000000, 0x000000D1, 0x00000000, 0x000000BD, 0x00000000, 0x000000A9, 0x00000000, 0x00000095, 0x00000000, 0x00000081, 0x00000000, 0x0000006D, 0x00000000, 0x00000059, 0x00000000, 0x00000045, 0x00000000, 0x00000031, 0x00000000, 0x0000001D, 0x00000000, 0x00000009, 0x00000000, 0xFFFFFFF5, 0xFFFFFFF5, 0xFFFFFFF0, 0xFFFFFFF0, 0xFFFFFFEE, 0xFFFFFFEE, 0xFFFFFFED, 0xFFFFFFED, 0xFFFFFFED, 0xFFFFFFED, 0xFFFFFFED, 0xFFFFFFED, 0xFFFFFFED, 0xFFFFFFED, 0xFFFFFFF1, 0xFFFFFFF1, 0xFFFFFFFB, 0xFFFFFFFB, 0x00000002, 0x00000002, 0x00000003, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
 
 dlabel D_8025573C_815FBC
-.word 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000001, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000010E, 0x00000056, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000000A9, 0x00000000, 0xFFFFFF24, 0x00000025, 0x0000010F, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF24, 0x0000001E, 0x00000009, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000094, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF88, 0x0000000A, 0x00000007, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24AA280, 0x00000043, 0x00000005, TranslateModel, 0x00000096, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x00000005, 0x00000007, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24AA280, 0x00000043, 0x00000005, TranslateModel, 0x00000098, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000008D, 0x00000001, 0x00000043, 0x00000001, pause_tabs_draw_badges_805540, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000043, 0x000000AA, 0x00000000, 0x00000030, 0x00000001, D_802555AC_815E2C, 0x00000005, 0x00000001, 0x00000032, 0x00000032, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000006, RotateGroup, 0x00000093, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24AA280, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000043, 0x00000006, RotateGroup, 0x00000091, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24D9A80, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000043, 0x00000005, ScaleGroup, 0x00000093, 0xFE363C80, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFFFFFF2B, 0x00000006, 0x00000100, 0x00000010, 0x0000000A, 0x00000002, 0xF8405C84, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000040, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C85, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000003F, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C86, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000003E, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000001, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000010E, 0x00000056, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000000A9, 0x00000000, 0xFFFFFF24, 0x00000025, 0x0000010F, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF24, 0x0000001E, 0x00000009, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000094, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF88, 0x0000000A, 0x00000007, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24AA280, 0x00000043, 0x00000005, TranslateModel, 0x00000096, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x00000005, 0x00000007, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24AA280, 0x00000043, 0x00000005, TranslateModel, 0x00000098, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000008D, 0x00000001, 0x00000043, 0x00000001, func_80244CC0_805540, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000043, 0x000000AA, 0x00000000, 0x00000030, 0x00000001, D_802555AC_815E2C, 0x00000005, 0x00000001, 0x00000032, 0x00000032, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000006, RotateGroup, 0x00000093, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24AA280, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000043, 0x00000006, RotateGroup, 0x00000091, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24D9A80, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000043, 0x00000005, ScaleGroup, 0x00000093, 0xFE363C80, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFFFFFF2B, 0x00000006, 0x00000100, 0x00000010, 0x0000000A, 0x00000002, 0xF8405C84, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000040, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C85, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000003F, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C86, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000003E, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80255B30_8163B0
 .word 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C84, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000040, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C85, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003F, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C86, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003E, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFFFFFF24, 0xFFFFFFCA, 0x00000105, 0x00000010, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000043, 0x000000AC, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000258, 0x00000032, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000093, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24AA280, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000043, 0x00000006, RotateGroup, 0x00000091, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24D9A80, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000043, 0x00000005, ScaleGroup, 0x00000093, 0xFE363C80, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000008D, 0x00000000, 0x00000043, 0x00000001, mac_01_UnkMachiFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF24, 0x00000000, 0x00000014, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000094, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000000AB, 0x00000000, 0xFFFFFF24, 0x00000025, 0x0000010F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF88, 0x00000000, 0x0000000A, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24AA280, 0x00000043, 0x00000005, TranslateModel, 0x00000096, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000064, 0x00000000, 0x00000005, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24AA280, 0x00000043, 0x00000005, TranslateModel, 0x00000098, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001F, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -360,7 +360,7 @@ dlabel D_80255FEC_81686C
 .word 0x0000000A, 0x00000002, 0xFD050F8D, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8E, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFD050F8D, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8E, 0x00000002, 0x00000046, 0x00000001, D_80255B30_8163B0, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8E, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802560B4_816934
-.word 0x00000024, 0x00000002, 0xFD050F8D, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8E, 0x00000000, 0x00000024, 0x00000002, 0xF97188C0, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFB6, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8025460C_814E8C, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80254BB4_815434, 0x00000018, 0x00000001, 0xFFFFFFF3, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802546EC_814F6C, 0x00000024, 0x00000002, 0xF97188C0, 0x00000001, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C82, 0x00000001, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802546EC_814F6C, 0x00000024, 0x00000002, 0xF97188C0, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80254860_8150E0, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFF06, 0x00000000, 0x00000127, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF97188C1, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x00000092, 0x00000200, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000091, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003F, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000040, 0x7FFFFE00, 0x00000043, 0x00000006, RotateGroup, 0x00000091, 0x0000003C, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000093, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ScaleGroup, 0x00000093, 0xF24A7FB4, 0x00000001, 0xF24A7FB4, 0x00000024, 0x00000002, 0xFD050F81, 0x0000003C, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000000, 0x0000008D, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000000, pause_tabs_draw_stats_805418, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000008D, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF97188C0, 0x00000001, 0x00000047, 0x00000005, D_80255F60_8167E0, 0x00000080, 0x00000042, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80255FEC_81686C, 0x00000080, 0x0000000E, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetModelFlags, 0x0000008E, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x0000008F, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x00000090, 0x00000004, 0x00000000, 0x00000043, 0x00000001, mac_01_UnkMachiFunc, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C84, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x00000090, 0x00000043, 0x00000002, func_80244E10_805690, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C85, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x0000008F, 0x00000043, 0x00000002, func_80244E10_805690, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C86, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x0000008E, 0x00000043, 0x00000002, func_80244E10_805690, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFD050F8D, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8E, 0x00000000, 0x00000024, 0x00000002, 0xF97188C0, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFB6, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8025460C_814E8C, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80254BB4_815434, 0x00000018, 0x00000001, 0xFFFFFFF3, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802546EC_814F6C, 0x00000024, 0x00000002, 0xF97188C0, 0x00000001, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C82, 0x00000001, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802546EC_814F6C, 0x00000024, 0x00000002, 0xF97188C0, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80254860_8150E0, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFF06, 0x00000000, 0x00000127, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF97188C1, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x00000092, 0x00000200, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000091, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003F, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000040, 0x7FFFFE00, 0x00000043, 0x00000006, RotateGroup, 0x00000091, 0x0000003C, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000093, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ScaleGroup, 0x00000093, 0xF24A7FB4, 0x00000001, 0xF24A7FB4, 0x00000024, 0x00000002, 0xFD050F81, 0x0000003C, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000000, 0x0000008D, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000000, func_80244B98_805418, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000008D, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF97188C0, 0x00000001, 0x00000047, 0x00000005, D_80255F60_8167E0, 0x00000080, 0x00000042, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80255FEC_81686C, 0x00000080, 0x0000000E, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetModelFlags, 0x0000008E, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x0000008F, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x00000090, 0x00000004, 0x00000000, 0x00000043, 0x00000001, mac_01_UnkMachiFunc, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C84, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x00000090, 0x00000043, 0x00000002, func_80244E10_805690, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C85, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x0000008F, 0x00000043, 0x00000002, func_80244E10_805690, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C86, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x0000008E, 0x00000043, 0x00000002, func_80244E10_805690, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802564C0_816D40
 .word 0x00000043, 0x00000005, SetNpcScale, 0x00000002, 0xF24A7D80, 0xF24A7D80, 0xF24A7D80, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF1A, 0x00000000, 0x00000140, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFFFFFFA6, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00A70001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFB6, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802549F8_815278, 0x00000018, 0x00000001, 0xFFFFFFCA, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80254A28_8152A8, 0x0000000A, 0x00000002, 0xF8405C83, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80255280_815B00, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFECF, 0x00000000, 0x0000014A, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF3, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80254A58_8152D8, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80255500_815D80, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C82, 0x00000001, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80254A58_8152D8, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80255500_815D80, 0x00000012, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80254B44_8153C4, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274_A2B4B4.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274_A2B4B4.s
deleted file mode 100644
index 1618cf60e1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274_A2B4B4.s
+++ /dev/null
@@ -1,132 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241274_A2B4B4
-/* A2B4B4 80241274 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* A2B4B8 80241278 3C04800B */  lui       $a0, %hi(gCameras)
-/* A2B4BC 8024127C 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
-/* A2B4C0 80241280 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* A2B4C4 80241284 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* A2B4C8 80241288 3C05800A */  lui       $a1, %hi(nuGfxCfb_ptr)
-/* A2B4CC 8024128C 8CA5A64C */  lw        $a1, %lo(nuGfxCfb_ptr)($a1)
-/* A2B4D0 80241290 3C088025 */  lui       $t0, %hi(D_802498D4_A33B14)
-/* A2B4D4 80241294 250898D4 */  addiu     $t0, $t0, %lo(D_802498D4_A33B14)
-/* A2B4D8 80241298 AFBF0030 */  sw        $ra, 0x30($sp)
-/* A2B4DC 8024129C AFB5002C */  sw        $s5, 0x2c($sp)
-/* A2B4E0 802412A0 AFB40028 */  sw        $s4, 0x28($sp)
-/* A2B4E4 802412A4 AFB30024 */  sw        $s3, 0x24($sp)
-/* A2B4E8 802412A8 AFB20020 */  sw        $s2, 0x20($sp)
-/* A2B4EC 802412AC AFB1001C */  sw        $s1, 0x1c($sp)
-/* A2B4F0 802412B0 AFB00018 */  sw        $s0, 0x18($sp)
-/* A2B4F4 802412B4 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* A2B4F8 802412B8 00031080 */  sll       $v0, $v1, 2
-/* A2B4FC 802412BC 00431021 */  addu      $v0, $v0, $v1
-/* A2B500 802412C0 00021080 */  sll       $v0, $v0, 2
-/* A2B504 802412C4 00431023 */  subu      $v0, $v0, $v1
-/* A2B508 802412C8 000218C0 */  sll       $v1, $v0, 3
-/* A2B50C 802412CC 00431021 */  addu      $v0, $v0, $v1
-/* A2B510 802412D0 000210C0 */  sll       $v0, $v0, 3
-/* A2B514 802412D4 8D030000 */  lw        $v1, ($t0)
-/* A2B518 802412D8 10A30059 */  beq       $a1, $v1, .L80241440
-/* A2B51C 802412DC 0044A821 */   addu     $s5, $v0, $a0
-/* A2B520 802412E0 3C138025 */  lui       $s3, %hi(D_802498D0_A33B10)
-/* A2B524 802412E4 267398D0 */  addiu     $s3, $s3, %lo(D_802498D0_A33B10)
-/* A2B528 802412E8 3C01437A */  lui       $at, 0x437a
-/* A2B52C 802412EC 44816000 */  mtc1      $at, $f12
-/* A2B530 802412F0 8E660000 */  lw        $a2, ($s3)
-/* A2B534 802412F4 3C073F00 */  lui       $a3, 0x3f00
-/* A2B538 802412F8 4480A000 */  mtc1      $zero, $f20
-/* A2B53C 802412FC AD050000 */  sw        $a1, ($t0)
-/* A2B540 80241300 AFB30010 */  sw        $s3, 0x10($sp)
-/* A2B544 80241304 0C090411 */  jal       func_80241044_A2B284
-/* A2B548 80241308 4600A386 */   mov.s    $f14, $f20
-/* A2B54C 8024130C 24040002 */  addiu     $a0, $zero, 2
-/* A2B550 80241310 3C108025 */  lui       $s0, %hi(D_8024963C_A3387C)
-/* A2B554 80241314 2610963C */  addiu     $s0, $s0, %lo(D_8024963C_A3387C)
-/* A2B558 80241318 3C054302 */  lui       $a1, 0x4302
-/* A2B55C 8024131C 34A56666 */  ori       $a1, $a1, 0x6666
-/* A2B560 80241320 8E060004 */  lw        $a2, 4($s0)
-/* A2B564 80241324 4407A000 */  mfc1      $a3, $f20
-/* A2B568 80241328 3C0143EB */  lui       $at, 0x43eb
-/* A2B56C 8024132C 44810000 */  mtc1      $at, $f0
-/* A2B570 80241330 3C148025 */  lui       $s4, %hi(D_802498D8_A33B18)
-/* A2B574 80241334 269498D8 */  addiu     $s4, $s4, %lo(D_802498D8_A33B18)
-/* A2B578 80241338 AFB40014 */  sw        $s4, 0x14($sp)
-/* A2B57C 8024133C 0C090439 */  jal       func_802410E4_A2B324
-/* A2B580 80241340 E7A00010 */   swc1     $f0, 0x10($sp)
-/* A2B584 80241344 3C128025 */  lui       $s2, %hi(D_802498DC_A33B1C)
-/* A2B588 80241348 265298DC */  addiu     $s2, $s2, %lo(D_802498DC_A33B1C)
-/* A2B58C 8024134C 3C014146 */  lui       $at, 0x4146
-/* A2B590 80241350 34216666 */  ori       $at, $at, 0x6666
-/* A2B594 80241354 44816000 */  mtc1      $at, $f12
-/* A2B598 80241358 C60E0008 */  lwc1      $f14, 8($s0)
-/* A2B59C 8024135C 3C013D4C */  lui       $at, 0x3d4c
-/* A2B5A0 80241360 3421CCCD */  ori       $at, $at, 0xcccd
-/* A2B5A4 80241364 4481A000 */  mtc1      $at, $f20
-/* A2B5A8 80241368 8E460000 */  lw        $a2, ($s2)
-/* A2B5AC 8024136C 4407A000 */  mfc1      $a3, $f20
-/* A2B5B0 80241370 0C090411 */  jal       func_80241044_A2B284
-/* A2B5B4 80241374 AFB20010 */   sw       $s2, 0x10($sp)
-/* A2B5B8 80241378 3C118025 */  lui       $s1, %hi(D_802498E0_A33B20)
-/* A2B5BC 8024137C 263198E0 */  addiu     $s1, $s1, %lo(D_802498E0_A33B20)
-/* A2B5C0 80241380 3C01C186 */  lui       $at, 0xc186
-/* A2B5C4 80241384 34216666 */  ori       $at, $at, 0x6666
-/* A2B5C8 80241388 44816000 */  mtc1      $at, $f12
-/* A2B5CC 8024138C C60E0024 */  lwc1      $f14, 0x24($s0)
-/* A2B5D0 80241390 8E260000 */  lw        $a2, ($s1)
-/* A2B5D4 80241394 4407A000 */  mfc1      $a3, $f20
-/* A2B5D8 80241398 0C090411 */  jal       func_80241044_A2B284
-/* A2B5DC 8024139C AFB10010 */   sw       $s1, 0x10($sp)
-/* A2B5E0 802413A0 3C108025 */  lui       $s0, %hi(D_802498E4_A33B24)
-/* A2B5E4 802413A4 261098E4 */  addiu     $s0, $s0, %lo(D_802498E4_A33B24)
-/* A2B5E8 802413A8 3C014278 */  lui       $at, 0x4278
-/* A2B5EC 802413AC 44816000 */  mtc1      $at, $f12
-/* A2B5F0 802413B0 3C014244 */  lui       $at, 0x4244
-/* A2B5F4 802413B4 44817000 */  mtc1      $at, $f14
-/* A2B5F8 802413B8 8E060000 */  lw        $a2, ($s0)
-/* A2B5FC 802413BC 3C073DCC */  lui       $a3, 0x3dcc
-/* A2B600 802413C0 34E7CCCD */  ori       $a3, $a3, 0xcccd
-/* A2B604 802413C4 0C090411 */  jal       func_80241044_A2B284
-/* A2B608 802413C8 AFB00010 */   sw       $s0, 0x10($sp)
-/* A2B60C 802413CC 8E050000 */  lw        $a1, ($s0)
-/* A2B610 802413D0 0C090355 */  jal       func_80240D54_A2AF94
-/* A2B614 802413D4 0000202D */   daddu    $a0, $zero, $zero
-/* A2B618 802413D8 C6800000 */  lwc1      $f0, ($s4)
-/* A2B61C 802413DC C66C0000 */  lwc1      $f12, ($s3)
-/* A2B620 802413E0 C6420000 */  lwc1      $f2, ($s2)
-/* A2B624 802413E4 C6240000 */  lwc1      $f4, ($s1)
-/* A2B628 802413E8 E6A004DC */  swc1      $f0, 0x4dc($s5)
-/* A2B62C 802413EC E6A204E0 */  swc1      $f2, 0x4e0($s5)
-/* A2B630 802413F0 0C00A8BB */  jal       sin_deg
-/* A2B634 802413F4 E6A404FC */   swc1     $f4, 0x4fc($s5)
-/* A2B638 802413F8 3C0143FA */  lui       $at, 0x43fa
-/* A2B63C 802413FC 44811000 */  mtc1      $at, $f2
-/* A2B640 80241400 00000000 */  nop
-/* A2B644 80241404 46020002 */  mul.s     $f0, $f0, $f2
-/* A2B648 80241408 00000000 */  nop
-/* A2B64C 8024140C C66C0000 */  lwc1      $f12, ($s3)
-/* A2B650 80241410 0C00A8D4 */  jal       cos_deg
-/* A2B654 80241414 E6A004F0 */   swc1     $f0, 0x4f0($s5)
-/* A2B658 80241418 3C01C3FA */  lui       $at, 0xc3fa
-/* A2B65C 8024141C 44811000 */  mtc1      $at, $f2
-/* A2B660 80241420 00000000 */  nop
-/* A2B664 80241424 46020002 */  mul.s     $f0, $f0, $f2
-/* A2B668 80241428 00000000 */  nop
-/* A2B66C 8024142C 24020002 */  addiu     $v0, $zero, 2
-/* A2B670 80241430 24030001 */  addiu     $v1, $zero, 1
-/* A2B674 80241434 A6A30506 */  sh        $v1, 0x506($s5)
-/* A2B678 80241438 08090511 */  j         .L80241444
-/* A2B67C 8024143C E6A004F8 */   swc1     $f0, 0x4f8($s5)
-.L80241440:
-/* A2B680 80241440 0000102D */  daddu     $v0, $zero, $zero
-.L80241444:
-/* A2B684 80241444 8FBF0030 */  lw        $ra, 0x30($sp)
-/* A2B688 80241448 8FB5002C */  lw        $s5, 0x2c($sp)
-/* A2B68C 8024144C 8FB40028 */  lw        $s4, 0x28($sp)
-/* A2B690 80241450 8FB30024 */  lw        $s3, 0x24($sp)
-/* A2B694 80241454 8FB20020 */  lw        $s2, 0x20($sp)
-/* A2B698 80241458 8FB1001C */  lw        $s1, 0x1c($sp)
-/* A2B69C 8024145C 8FB00018 */  lw        $s0, 0x18($sp)
-/* A2B6A0 80241460 D7B40038 */  ldc1      $f20, 0x38($sp)
-/* A2B6A4 80241464 03E00008 */  jr        $ra
-/* A2B6A8 80241468 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024146C_A2B6AC.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024146C_A2B6AC.s
deleted file mode 100644
index 78d8de46dc..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024146C_A2B6AC.s
+++ /dev/null
@@ -1,155 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024146C_A2B6AC
-/* A2B6AC 8024146C 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* A2B6B0 80241470 3C04800B */  lui       $a0, %hi(gCameras)
-/* A2B6B4 80241474 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
-/* A2B6B8 80241478 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* A2B6BC 8024147C 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* A2B6C0 80241480 3C05800A */  lui       $a1, %hi(nuGfxCfb_ptr)
-/* A2B6C4 80241484 8CA5A64C */  lw        $a1, %lo(nuGfxCfb_ptr)($a1)
-/* A2B6C8 80241488 3C088025 */  lui       $t0, %hi(D_802498D4_A33B14)
-/* A2B6CC 8024148C 250898D4 */  addiu     $t0, $t0, %lo(D_802498D4_A33B14)
-/* A2B6D0 80241490 AFBF0034 */  sw        $ra, 0x34($sp)
-/* A2B6D4 80241494 AFB60030 */  sw        $s6, 0x30($sp)
-/* A2B6D8 80241498 AFB5002C */  sw        $s5, 0x2c($sp)
-/* A2B6DC 8024149C AFB40028 */  sw        $s4, 0x28($sp)
-/* A2B6E0 802414A0 AFB30024 */  sw        $s3, 0x24($sp)
-/* A2B6E4 802414A4 AFB20020 */  sw        $s2, 0x20($sp)
-/* A2B6E8 802414A8 AFB1001C */  sw        $s1, 0x1c($sp)
-/* A2B6EC 802414AC AFB00018 */  sw        $s0, 0x18($sp)
-/* A2B6F0 802414B0 F7B60040 */  sdc1      $f22, 0x40($sp)
-/* A2B6F4 802414B4 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* A2B6F8 802414B8 00031080 */  sll       $v0, $v1, 2
-/* A2B6FC 802414BC 00431021 */  addu      $v0, $v0, $v1
-/* A2B700 802414C0 00021080 */  sll       $v0, $v0, 2
-/* A2B704 802414C4 00431023 */  subu      $v0, $v0, $v1
-/* A2B708 802414C8 000218C0 */  sll       $v1, $v0, 3
-/* A2B70C 802414CC 00431021 */  addu      $v0, $v0, $v1
-/* A2B710 802414D0 000210C0 */  sll       $v0, $v0, 3
-/* A2B714 802414D4 8D030000 */  lw        $v1, ($t0)
-/* A2B718 802414D8 14A30003 */  bne       $a1, $v1, .L802414E8
-/* A2B71C 802414DC 0044B021 */   addu     $s6, $v0, $a0
-/* A2B720 802414E0 080905A3 */  j         .L8024168C
-/* A2B724 802414E4 0000102D */   daddu    $v0, $zero, $zero
-.L802414E8:
-/* A2B728 802414E8 3C138025 */  lui       $s3, %hi(D_802498D0_A33B10)
-/* A2B72C 802414EC 267398D0 */  addiu     $s3, $s3, %lo(D_802498D0_A33B10)
-/* A2B730 802414F0 3C01437A */  lui       $at, 0x437a
-/* A2B734 802414F4 44816000 */  mtc1      $at, $f12
-/* A2B738 802414F8 8E660000 */  lw        $a2, ($s3)
-/* A2B73C 802414FC 3C073F00 */  lui       $a3, 0x3f00
-/* A2B740 80241500 4480B000 */  mtc1      $zero, $f22
-/* A2B744 80241504 AD050000 */  sw        $a1, ($t0)
-/* A2B748 80241508 AFB30010 */  sw        $s3, 0x10($sp)
-/* A2B74C 8024150C 0C090411 */  jal       func_80241044_A2B284
-/* A2B750 80241510 4600B386 */   mov.s    $f14, $f22
-/* A2B754 80241514 24040002 */  addiu     $a0, $zero, 2
-/* A2B758 80241518 3C108025 */  lui       $s0, %hi(D_8024963C_A3387C)
-/* A2B75C 8024151C 2610963C */  addiu     $s0, $s0, %lo(D_8024963C_A3387C)
-/* A2B760 80241520 3C148025 */  lui       $s4, %hi(D_802498FC_A33B3C)
-/* A2B764 80241524 269498FC */  addiu     $s4, $s4, %lo(D_802498FC_A33B3C)
-/* A2B768 80241528 C6800000 */  lwc1      $f0, ($s4)
-/* A2B76C 8024152C 46800020 */  cvt.s.w   $f0, $f0
-/* A2B770 80241530 3C054302 */  lui       $a1, 0x4302
-/* A2B774 80241534 34A56666 */  ori       $a1, $a1, 0x6666
-/* A2B778 80241538 8E060004 */  lw        $a2, 4($s0)
-/* A2B77C 8024153C 44070000 */  mfc1      $a3, $f0
-/* A2B780 80241540 3C0143EB */  lui       $at, 0x43eb
-/* A2B784 80241544 44810000 */  mtc1      $at, $f0
-/* A2B788 80241548 3C158025 */  lui       $s5, %hi(D_802498E8_A33B28)
-/* A2B78C 8024154C 26B598E8 */  addiu     $s5, $s5, %lo(D_802498E8_A33B28)
-/* A2B790 80241550 AFB50014 */  sw        $s5, 0x14($sp)
-/* A2B794 80241554 0C090439 */  jal       func_802410E4_A2B324
-/* A2B798 80241558 E7A00010 */   swc1     $f0, 0x10($sp)
-/* A2B79C 8024155C 3C128025 */  lui       $s2, %hi(D_802498EC_A33B2C)
-/* A2B7A0 80241560 265298EC */  addiu     $s2, $s2, %lo(D_802498EC_A33B2C)
-/* A2B7A4 80241564 3C014146 */  lui       $at, 0x4146
-/* A2B7A8 80241568 34216666 */  ori       $at, $at, 0x6666
-/* A2B7AC 8024156C 44816000 */  mtc1      $at, $f12
-/* A2B7B0 80241570 C60E0008 */  lwc1      $f14, 8($s0)
-/* A2B7B4 80241574 3C013D4C */  lui       $at, 0x3d4c
-/* A2B7B8 80241578 3421CCCD */  ori       $at, $at, 0xcccd
-/* A2B7BC 8024157C 4481A000 */  mtc1      $at, $f20
-/* A2B7C0 80241580 8E460000 */  lw        $a2, ($s2)
-/* A2B7C4 80241584 4407A000 */  mfc1      $a3, $f20
-/* A2B7C8 80241588 0C090411 */  jal       func_80241044_A2B284
-/* A2B7CC 8024158C AFB20010 */   sw       $s2, 0x10($sp)
-/* A2B7D0 80241590 3C118025 */  lui       $s1, %hi(D_802498F0_A33B30)
-/* A2B7D4 80241594 263198F0 */  addiu     $s1, $s1, %lo(D_802498F0_A33B30)
-/* A2B7D8 80241598 3C01C186 */  lui       $at, 0xc186
-/* A2B7DC 8024159C 34216666 */  ori       $at, $at, 0x6666
-/* A2B7E0 802415A0 44816000 */  mtc1      $at, $f12
-/* A2B7E4 802415A4 C60E0024 */  lwc1      $f14, 0x24($s0)
-/* A2B7E8 802415A8 8E260000 */  lw        $a2, ($s1)
-/* A2B7EC 802415AC 4407A000 */  mfc1      $a3, $f20
-/* A2B7F0 802415B0 0C090411 */  jal       func_80241044_A2B284
-/* A2B7F4 802415B4 AFB10010 */   sw       $s1, 0x10($sp)
-/* A2B7F8 802415B8 3C108025 */  lui       $s0, %hi(D_802498F4_A33B34)
-/* A2B7FC 802415BC 261098F4 */  addiu     $s0, $s0, %lo(D_802498F4_A33B34)
-/* A2B800 802415C0 3C014278 */  lui       $at, 0x4278
-/* A2B804 802415C4 44816000 */  mtc1      $at, $f12
-/* A2B808 802415C8 3C014244 */  lui       $at, 0x4244
-/* A2B80C 802415CC 44817000 */  mtc1      $at, $f14
-/* A2B810 802415D0 8E060000 */  lw        $a2, ($s0)
-/* A2B814 802415D4 3C073DCC */  lui       $a3, 0x3dcc
-/* A2B818 802415D8 34E7CCCD */  ori       $a3, $a3, 0xcccd
-/* A2B81C 802415DC 0C090411 */  jal       func_80241044_A2B284
-/* A2B820 802415E0 AFB00010 */   sw       $s0, 0x10($sp)
-/* A2B824 802415E4 8E050000 */  lw        $a1, ($s0)
-/* A2B828 802415E8 0C090355 */  jal       func_80240D54_A2AF94
-/* A2B82C 802415EC 0000202D */   daddu    $a0, $zero, $zero
-/* A2B830 802415F0 C6A00000 */  lwc1      $f0, ($s5)
-/* A2B834 802415F4 C66C0000 */  lwc1      $f12, ($s3)
-/* A2B838 802415F8 C6420000 */  lwc1      $f2, ($s2)
-/* A2B83C 802415FC C6240000 */  lwc1      $f4, ($s1)
-/* A2B840 80241600 E6C004DC */  swc1      $f0, 0x4dc($s6)
-/* A2B844 80241604 E6C204E0 */  swc1      $f2, 0x4e0($s6)
-/* A2B848 80241608 0C00A8BB */  jal       sin_deg
-/* A2B84C 8024160C E6C404FC */   swc1     $f4, 0x4fc($s6)
-/* A2B850 80241610 3C0143FA */  lui       $at, 0x43fa
-/* A2B854 80241614 44811000 */  mtc1      $at, $f2
-/* A2B858 80241618 00000000 */  nop
-/* A2B85C 8024161C 46020002 */  mul.s     $f0, $f0, $f2
-/* A2B860 80241620 00000000 */  nop
-/* A2B864 80241624 C66C0000 */  lwc1      $f12, ($s3)
-/* A2B868 80241628 0C00A8D4 */  jal       cos_deg
-/* A2B86C 8024162C E6C004F0 */   swc1     $f0, 0x4f0($s6)
-/* A2B870 80241630 3C01C3FA */  lui       $at, 0xc3fa
-/* A2B874 80241634 44811000 */  mtc1      $at, $f2
-/* A2B878 80241638 24020001 */  addiu     $v0, $zero, 1
-/* A2B87C 8024163C A6C20506 */  sh        $v0, 0x506($s6)
-/* A2B880 80241640 46020002 */  mul.s     $f0, $f0, $f2
-/* A2B884 80241644 00000000 */  nop
-/* A2B888 80241648 8E820000 */  lw        $v0, ($s4)
-/* A2B88C 8024164C C6620000 */  lwc1      $f2, ($s3)
-/* A2B890 80241650 24420001 */  addiu     $v0, $v0, 1
-/* A2B894 80241654 AE820000 */  sw        $v0, ($s4)
-/* A2B898 80241658 46161032 */  c.eq.s    $f2, $f22
-/* A2B89C 8024165C 00000000 */  nop
-/* A2B8A0 80241660 45000006 */  bc1f      .L8024167C
-/* A2B8A4 80241664 E6C004F8 */   swc1     $f0, 0x4f8($s6)
-/* A2B8A8 80241668 3C038025 */  lui       $v1, %hi(D_802498F8_A33B38)
-/* A2B8AC 8024166C 246398F8 */  addiu     $v1, $v1, %lo(D_802498F8_A33B38)
-/* A2B8B0 80241670 8C620000 */  lw        $v0, ($v1)
-/* A2B8B4 80241674 24420001 */  addiu     $v0, $v0, 1
-/* A2B8B8 80241678 AC620000 */  sw        $v0, ($v1)
-.L8024167C:
-/* A2B8BC 8024167C 3C028025 */  lui       $v0, %hi(D_802498F8_A33B38)
-/* A2B8C0 80241680 8C4298F8 */  lw        $v0, %lo(D_802498F8_A33B38)($v0)
-/* A2B8C4 80241684 2842001F */  slti      $v0, $v0, 0x1f
-/* A2B8C8 80241688 38420001 */  xori      $v0, $v0, 1
-.L8024168C:
-/* A2B8CC 8024168C 8FBF0034 */  lw        $ra, 0x34($sp)
-/* A2B8D0 80241690 8FB60030 */  lw        $s6, 0x30($sp)
-/* A2B8D4 80241694 8FB5002C */  lw        $s5, 0x2c($sp)
-/* A2B8D8 80241698 8FB40028 */  lw        $s4, 0x28($sp)
-/* A2B8DC 8024169C 8FB30024 */  lw        $s3, 0x24($sp)
-/* A2B8E0 802416A0 8FB20020 */  lw        $s2, 0x20($sp)
-/* A2B8E4 802416A4 8FB1001C */  lw        $s1, 0x1c($sp)
-/* A2B8E8 802416A8 8FB00018 */  lw        $s0, 0x18($sp)
-/* A2B8EC 802416AC D7B60040 */  ldc1      $f22, 0x40($sp)
-/* A2B8F0 802416B0 D7B40038 */  ldc1      $f20, 0x38($sp)
-/* A2B8F4 802416B4 03E00008 */  jr        $ra
-/* A2B8F8 802416B8 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240CF8_B21238.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240CF8_B21238.s
deleted file mode 100644
index 57671d8de0..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240CF8_B21238.s
+++ /dev/null
@@ -1,150 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240CF8_B21238
-/* B21238 80240CF8 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* B2123C 80240CFC AFB3001C */  sw        $s3, 0x1c($sp)
-/* B21240 80240D00 0080982D */  daddu     $s3, $a0, $zero
-/* B21244 80240D04 AFB00010 */  sw        $s0, 0x10($sp)
-/* B21248 80240D08 00A0802D */  daddu     $s0, $a1, $zero
-/* B2124C 80240D0C AFBF0020 */  sw        $ra, 0x20($sp)
-/* B21250 80240D10 AFB20018 */  sw        $s2, 0x18($sp)
-/* B21254 80240D14 AFB10014 */  sw        $s1, 0x14($sp)
-/* B21258 80240D18 F7B80038 */  sdc1      $f24, 0x38($sp)
-/* B2125C 80240D1C F7B60030 */  sdc1      $f22, 0x30($sp)
-/* B21260 80240D20 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* B21264 80240D24 8E72000C */  lw        $s2, 0xc($s3)
-/* B21268 80240D28 0C00EAD2 */  jal       get_npc_safe
-/* B2126C 80240D2C 0000202D */   daddu    $a0, $zero, $zero
-/* B21270 80240D30 12000010 */  beqz      $s0, .L80240D74
-/* B21274 80240D34 0040882D */   daddu    $s1, $v0, $zero
-/* B21278 80240D38 8E450000 */  lw        $a1, ($s2)
-/* B2127C 80240D3C 0C0B1EAF */  jal       evt_get_variable
-/* B21280 80240D40 0260202D */   daddu    $a0, $s3, $zero
-/* B21284 80240D44 0040182D */  daddu     $v1, $v0, $zero
-/* B21288 80240D48 10600006 */  beqz      $v1, .L80240D64
-/* B2128C 80240D4C AE630070 */   sw       $v1, 0x70($s3)
-/* B21290 80240D50 24020001 */  addiu     $v0, $zero, 1
-/* B21294 80240D54 10620005 */  beq       $v1, $v0, .L80240D6C
-/* B21298 80240D58 24020019 */   addiu    $v0, $zero, 0x19
-/* B2129C 80240D5C 0809035D */  j         .L80240D74
-/* B212A0 80240D60 AE620074 */   sw       $v0, 0x74($s3)
-.L80240D64:
-/* B212A4 80240D64 0809035C */  j         .L80240D70
-/* B212A8 80240D68 24020037 */   addiu    $v0, $zero, 0x37
-.L80240D6C:
-/* B212AC 80240D6C 24020055 */  addiu     $v0, $zero, 0x55
-.L80240D70:
-/* B212B0 80240D70 AE620074 */  sw        $v0, 0x74($s3)
-.L80240D74:
-/* B212B4 80240D74 C634000C */  lwc1      $f20, 0xc($s1)
-/* B212B8 80240D78 C6760074 */  lwc1      $f22, 0x74($s3)
-/* B212BC 80240D7C 4680B5A0 */  cvt.s.w   $f22, $f22
-/* B212C0 80240D80 4600A507 */  neg.s     $f20, $f20
-/* B212C4 80240D84 0C00A8BB */  jal       sin_deg
-/* B212C8 80240D88 4600A306 */   mov.s    $f12, $f20
-/* B212CC 80240D8C 46160002 */  mul.s     $f0, $f0, $f22
-/* B212D0 80240D90 00000000 */  nop
-/* B212D4 80240D94 C6220038 */  lwc1      $f2, 0x38($s1)
-/* B212D8 80240D98 3C0141F0 */  lui       $at, 0x41f0
-/* B212DC 80240D9C 44812000 */  mtc1      $at, $f4
-/* B212E0 80240DA0 00000000 */  nop
-/* B212E4 80240DA4 46041080 */  add.s     $f2, $f2, $f4
-/* B212E8 80240DA8 3C014296 */  lui       $at, 0x4296
-/* B212EC 80240DAC 44812000 */  mtc1      $at, $f4
-/* B212F0 80240DB0 00000000 */  nop
-/* B212F4 80240DB4 46041081 */  sub.s     $f2, $f2, $f4
-/* B212F8 80240DB8 46001600 */  add.s     $f24, $f2, $f0
-/* B212FC 80240DBC 0C00A8D4 */  jal       cos_deg
-/* B21300 80240DC0 4600A306 */   mov.s    $f12, $f20
-/* B21304 80240DC4 46160002 */  mul.s     $f0, $f0, $f22
-/* B21308 80240DC8 00000000 */  nop
-/* B2130C 80240DCC 24020001 */  addiu     $v0, $zero, 1
-/* B21310 80240DD0 C6220040 */  lwc1      $f2, 0x40($s1)
-/* B21314 80240DD4 C624003C */  lwc1      $f4, 0x3c($s1)
-/* B21318 80240DD8 46001580 */  add.s     $f22, $f2, $f0
-/* B2131C 80240DDC 3C014248 */  lui       $at, 0x4248
-/* B21320 80240DE0 44810000 */  mtc1      $at, $f0
-/* B21324 80240DE4 8E640070 */  lw        $a0, 0x70($s3)
-/* B21328 80240DE8 1082001C */  beq       $a0, $v0, .L80240E5C
-/* B2132C 80240DEC 46002500 */   add.s    $f20, $f4, $f0
-/* B21330 80240DF0 28820002 */  slti      $v0, $a0, 2
-/* B21334 80240DF4 10400005 */  beqz      $v0, .L80240E0C
-/* B21338 80240DF8 24020002 */   addiu    $v0, $zero, 2
-/* B2133C 80240DFC 10800007 */  beqz      $a0, .L80240E1C
-/* B21340 80240E00 0000102D */   daddu    $v0, $zero, $zero
-/* B21344 80240E04 080903BB */  j         .L80240EEC
-/* B21348 80240E08 00000000 */   nop
-.L80240E0C:
-/* B2134C 80240E0C 10820027 */  beq       $a0, $v0, .L80240EAC
-/* B21350 80240E10 0000102D */   daddu    $v0, $zero, $zero
-/* B21354 80240E14 080903BB */  j         .L80240EEC
-/* B21358 80240E18 00000000 */   nop
-.L80240E1C:
-/* B2135C 80240E1C 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* B21360 80240E20 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* B21364 80240E24 3C030001 */  lui       $v1, 1
-/* B21368 80240E28 E4580028 */  swc1      $f24, 0x28($v0)
-/* B2136C 80240E2C E454002C */  swc1      $f20, 0x2c($v0)
-/* B21370 80240E30 E4560030 */  swc1      $f22, 0x30($v0)
-/* B21374 80240E34 C6200038 */  lwc1      $f0, 0x38($s1)
-/* B21378 80240E38 C622003C */  lwc1      $f2, 0x3c($s1)
-/* B2137C 80240E3C 8E220000 */  lw        $v0, ($s1)
-/* B21380 80240E40 C6240040 */  lwc1      $f4, 0x40($s1)
-/* B21384 80240E44 00431025 */  or        $v0, $v0, $v1
-/* B21388 80240E48 E620006C */  swc1      $f0, 0x6c($s1)
-/* B2138C 80240E4C E6220070 */  swc1      $f2, 0x70($s1)
-/* B21390 80240E50 E6240074 */  swc1      $f4, 0x74($s1)
-/* B21394 80240E54 080903BA */  j         .L80240EE8
-/* B21398 80240E58 AE220000 */   sw       $v0, ($s1)
-.L80240E5C:
-/* B2139C 80240E5C 0C00EAD2 */  jal       get_npc_safe
-/* B213A0 80240E60 2404FFFC */   addiu    $a0, $zero, -4
-/* B213A4 80240E64 0040202D */  daddu     $a0, $v0, $zero
-/* B213A8 80240E68 54800003 */  bnel      $a0, $zero, .L80240E78
-/* B213AC 80240E6C E4980038 */   swc1     $f24, 0x38($a0)
-/* B213B0 80240E70 080903BB */  j         .L80240EEC
-/* B213B4 80240E74 24020002 */   addiu    $v0, $zero, 2
-.L80240E78:
-/* B213B8 80240E78 4600C006 */  mov.s     $f0, $f24
-/* B213BC 80240E7C E494003C */  swc1      $f20, 0x3c($a0)
-/* B213C0 80240E80 4600A086 */  mov.s     $f2, $f20
-/* B213C4 80240E84 E4960040 */  swc1      $f22, 0x40($a0)
-/* B213C8 80240E88 4600B106 */  mov.s     $f4, $f22
-/* B213CC 80240E8C 8C820000 */  lw        $v0, ($a0)
-/* B213D0 80240E90 3C030001 */  lui       $v1, 1
-/* B213D4 80240E94 E480006C */  swc1      $f0, 0x6c($a0)
-/* B213D8 80240E98 E4820070 */  swc1      $f2, 0x70($a0)
-/* B213DC 80240E9C E4840074 */  swc1      $f4, 0x74($a0)
-/* B213E0 80240EA0 00431025 */  or        $v0, $v0, $v1
-/* B213E4 80240EA4 080903BA */  j         .L80240EE8
-/* B213E8 80240EA8 AC820000 */   sw       $v0, ($a0)
-.L80240EAC:
-/* B213EC 80240EAC 0C00EAD2 */  jal       get_npc_safe
-/* B213F0 80240EB0 24040001 */   addiu    $a0, $zero, 1
-/* B213F4 80240EB4 E4580038 */  swc1      $f24, 0x38($v0)
-/* B213F8 80240EB8 4600C006 */  mov.s     $f0, $f24
-/* B213FC 80240EBC E454003C */  swc1      $f20, 0x3c($v0)
-/* B21400 80240EC0 4600A086 */  mov.s     $f2, $f20
-/* B21404 80240EC4 E4560040 */  swc1      $f22, 0x40($v0)
-/* B21408 80240EC8 4600B106 */  mov.s     $f4, $f22
-/* B2140C 80240ECC 8C430000 */  lw        $v1, ($v0)
-/* B21410 80240ED0 3C040001 */  lui       $a0, 1
-/* B21414 80240ED4 E440006C */  swc1      $f0, 0x6c($v0)
-/* B21418 80240ED8 E4420070 */  swc1      $f2, 0x70($v0)
-/* B2141C 80240EDC E4440074 */  swc1      $f4, 0x74($v0)
-/* B21420 80240EE0 00641825 */  or        $v1, $v1, $a0
-/* B21424 80240EE4 AC430000 */  sw        $v1, ($v0)
-.L80240EE8:
-/* B21428 80240EE8 0000102D */  daddu     $v0, $zero, $zero
-.L80240EEC:
-/* B2142C 80240EEC 8FBF0020 */  lw        $ra, 0x20($sp)
-/* B21430 80240EF0 8FB3001C */  lw        $s3, 0x1c($sp)
-/* B21434 80240EF4 8FB20018 */  lw        $s2, 0x18($sp)
-/* B21438 80240EF8 8FB10014 */  lw        $s1, 0x14($sp)
-/* B2143C 80240EFC 8FB00010 */  lw        $s0, 0x10($sp)
-/* B21440 80240F00 D7B80038 */  ldc1      $f24, 0x38($sp)
-/* B21444 80240F04 D7B60030 */  ldc1      $f22, 0x30($sp)
-/* B21448 80240F08 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* B2144C 80240F0C 03E00008 */  jr        $ra
-/* B21450 80240F10 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240F14_B21454.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240F14_B21454.s
deleted file mode 100644
index 7d399c22df..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240F14_B21454.s
+++ /dev/null
@@ -1,151 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240F14_B21454
-/* B21454 80240F14 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* B21458 80240F18 AFB20018 */  sw        $s2, 0x18($sp)
-/* B2145C 80240F1C 0080902D */  daddu     $s2, $a0, $zero
-/* B21460 80240F20 AFB00010 */  sw        $s0, 0x10($sp)
-/* B21464 80240F24 00A0802D */  daddu     $s0, $a1, $zero
-/* B21468 80240F28 AFBF0020 */  sw        $ra, 0x20($sp)
-/* B2146C 80240F2C AFB3001C */  sw        $s3, 0x1c($sp)
-/* B21470 80240F30 AFB10014 */  sw        $s1, 0x14($sp)
-/* B21474 80240F34 8E53000C */  lw        $s3, 0xc($s2)
-/* B21478 80240F38 0C00EAD2 */  jal       get_npc_safe
-/* B2147C 80240F3C 0000202D */   daddu    $a0, $zero, $zero
-/* B21480 80240F40 12000021 */  beqz      $s0, .L80240FC8
-/* B21484 80240F44 0040882D */   daddu    $s1, $v0, $zero
-/* B21488 80240F48 8E650000 */  lw        $a1, ($s3)
-/* B2148C 80240F4C 0C0B1EAF */  jal       evt_get_variable
-/* B21490 80240F50 0240202D */   daddu    $a0, $s2, $zero
-/* B21494 80240F54 0040182D */  daddu     $v1, $v0, $zero
-/* B21498 80240F58 10600006 */  beqz      $v1, .L80240F74
-/* B2149C 80240F5C AE430070 */   sw       $v1, 0x70($s2)
-/* B214A0 80240F60 24020001 */  addiu     $v0, $zero, 1
-/* B214A4 80240F64 1062000C */  beq       $v1, $v0, .L80240F98
-/* B214A8 80240F68 2402000A */   addiu    $v0, $zero, 0xa
-/* B214AC 80240F6C 080903F2 */  j         .L80240FC8
-/* B214B0 80240F70 00000000 */   nop
-.L80240F74:
-/* B214B4 80240F74 3C01431E */  lui       $at, 0x431e
-/* B214B8 80240F78 44810000 */  mtc1      $at, $f0
-/* B214BC 80240F7C 3C01C248 */  lui       $at, 0xc248
-/* B214C0 80240F80 44811000 */  mtc1      $at, $f2
-/* B214C4 80240F84 3C01C218 */  lui       $at, 0xc218
-/* B214C8 80240F88 44812000 */  mtc1      $at, $f4
-/* B214CC 80240F8C 2402005A */  addiu     $v0, $zero, 0x5a
-/* B214D0 80240F90 080903EE */  j         .L80240FB8
-/* B214D4 80240F94 AE400078 */   sw       $zero, 0x78($s2)
-.L80240F98:
-/* B214D8 80240F98 3C01C3DD */  lui       $at, 0xc3dd
-/* B214DC 80240F9C 44810000 */  mtc1      $at, $f0
-/* B214E0 80240FA0 3C01C248 */  lui       $at, 0xc248
-/* B214E4 80240FA4 44811000 */  mtc1      $at, $f2
-/* B214E8 80240FA8 3C01C218 */  lui       $at, 0xc218
-/* B214EC 80240FAC 44812000 */  mtc1      $at, $f4
-/* B214F0 80240FB0 AE420078 */  sw        $v0, 0x78($s2)
-/* B214F4 80240FB4 240200C8 */  addiu     $v0, $zero, 0xc8
-.L80240FB8:
-/* B214F8 80240FB8 AE420074 */  sw        $v0, 0x74($s2)
-/* B214FC 80240FBC E6200038 */  swc1      $f0, 0x38($s1)
-/* B21500 80240FC0 E622003C */  swc1      $f2, 0x3c($s1)
-/* B21504 80240FC4 E6240040 */  swc1      $f4, 0x40($s1)
-.L80240FC8:
-/* B21508 80240FC8 8E430078 */  lw        $v1, 0x78($s2)
-/* B2150C 80240FCC 24040001 */  addiu     $a0, $zero, 1
-/* B21510 80240FD0 10640022 */  beq       $v1, $a0, .L8024105C
-/* B21514 80240FD4 28620002 */   slti     $v0, $v1, 2
-/* B21518 80240FD8 10400005 */  beqz      $v0, .L80240FF0
-/* B2151C 80240FDC 24020002 */   addiu    $v0, $zero, 2
-/* B21520 80240FE0 10600009 */  beqz      $v1, .L80241008
-/* B21524 80240FE4 0000102D */   daddu    $v0, $zero, $zero
-/* B21528 80240FE8 08090446 */  j         .L80241118
-/* B2152C 80240FEC 00000000 */   nop
-.L80240FF0:
-/* B21530 80240FF0 1062002D */  beq       $v1, $v0, .L802410A8
-/* B21534 80240FF4 2402000A */   addiu    $v0, $zero, 0xa
-/* B21538 80240FF8 10620037 */  beq       $v1, $v0, .L802410D8
-/* B2153C 80240FFC 0000102D */   daddu    $v0, $zero, $zero
-/* B21540 80241000 08090446 */  j         .L80241118
-/* B21544 80241004 00000000 */   nop
-.L80241008:
-/* B21548 80241008 3C0200B6 */  lui       $v0, 0xb6
-/* B2154C 8024100C C624000C */  lwc1      $f4, 0xc($s1)
-/* B21550 80241010 3C013F80 */  lui       $at, 0x3f80
-/* B21554 80241014 44810000 */  mtc1      $at, $f0
-/* B21558 80241018 3C014040 */  lui       $at, 0x4040
-/* B2155C 8024101C 44811000 */  mtc1      $at, $f2
-/* B21560 80241020 46002101 */  sub.s     $f4, $f4, $f0
-/* B21564 80241024 C6200038 */  lwc1      $f0, 0x38($s1)
-/* B21568 80241028 34420001 */  ori       $v0, $v0, 1
-/* B2156C 8024102C 46020001 */  sub.s     $f0, $f0, $f2
-/* B21570 80241030 AE220028 */  sw        $v0, 0x28($s1)
-/* B21574 80241034 E624000C */  swc1      $f4, 0xc($s1)
-/* B21578 80241038 E6200038 */  swc1      $f0, 0x38($s1)
-/* B2157C 8024103C 8E420074 */  lw        $v0, 0x74($s2)
-/* B21580 80241040 2442FFFF */  addiu     $v0, $v0, -1
-/* B21584 80241044 1C400033 */  bgtz      $v0, .L80241114
-/* B21588 80241048 AE420074 */   sw       $v0, 0x74($s2)
-/* B2158C 8024104C 2402005A */  addiu     $v0, $zero, 0x5a
-/* B21590 80241050 AE440078 */  sw        $a0, 0x78($s2)
-/* B21594 80241054 08090445 */  j         .L80241114
-/* B21598 80241058 AE420074 */   sw       $v0, 0x74($s2)
-.L8024105C:
-/* B2159C 8024105C C624000C */  lwc1      $f4, 0xc($s1)
-/* B215A0 80241060 3C013F80 */  lui       $at, 0x3f80
-/* B215A4 80241064 44810000 */  mtc1      $at, $f0
-/* B215A8 80241068 3C014040 */  lui       $at, 0x4040
-/* B215AC 8024106C 44811000 */  mtc1      $at, $f2
-/* B215B0 80241070 46002101 */  sub.s     $f4, $f4, $f0
-/* B215B4 80241074 C6200038 */  lwc1      $f0, 0x38($s1)
-/* B215B8 80241078 46020001 */  sub.s     $f0, $f0, $f2
-/* B215BC 8024107C E624000C */  swc1      $f4, 0xc($s1)
-/* B215C0 80241080 E6200038 */  swc1      $f0, 0x38($s1)
-/* B215C4 80241084 8E420074 */  lw        $v0, 0x74($s2)
-/* B215C8 80241088 2442FFFF */  addiu     $v0, $v0, -1
-/* B215CC 8024108C 1C400021 */  bgtz      $v0, .L80241114
-/* B215D0 80241090 AE420074 */   sw       $v0, 0x74($s2)
-/* B215D4 80241094 24020002 */  addiu     $v0, $zero, 2
-/* B215D8 80241098 AE420078 */  sw        $v0, 0x78($s2)
-/* B215DC 8024109C 24020078 */  addiu     $v0, $zero, 0x78
-/* B215E0 802410A0 08090445 */  j         .L80241114
-/* B215E4 802410A4 AE420074 */   sw       $v0, 0x74($s2)
-.L802410A8:
-/* B215E8 802410A8 C6200038 */  lwc1      $f0, 0x38($s1)
-/* B215EC 802410AC 3C014040 */  lui       $at, 0x4040
-/* B215F0 802410B0 44811000 */  mtc1      $at, $f2
-/* B215F4 802410B4 00000000 */  nop
-/* B215F8 802410B8 46020001 */  sub.s     $f0, $f0, $f2
-/* B215FC 802410BC E6200038 */  swc1      $f0, 0x38($s1)
-/* B21600 802410C0 8E420074 */  lw        $v0, 0x74($s2)
-/* B21604 802410C4 2442FFFF */  addiu     $v0, $v0, -1
-/* B21608 802410C8 1C400012 */  bgtz      $v0, .L80241114
-/* B2160C 802410CC AE420074 */   sw       $v0, 0x74($s2)
-/* B21610 802410D0 08090446 */  j         .L80241118
-/* B21614 802410D4 24020002 */   addiu    $v0, $zero, 2
-.L802410D8:
-/* B21618 802410D8 C6220038 */  lwc1      $f2, 0x38($s1)
-/* B2161C 802410DC 3C014040 */  lui       $at, 0x4040
-/* B21620 802410E0 44810000 */  mtc1      $at, $f0
-/* B21624 802410E4 00000000 */  nop
-/* B21628 802410E8 46001080 */  add.s     $f2, $f2, $f0
-/* B2162C 802410EC 3C0142B4 */  lui       $at, 0x42b4
-/* B21630 802410F0 44810000 */  mtc1      $at, $f0
-/* B21634 802410F4 00000000 */  nop
-/* B21638 802410F8 E620000C */  swc1      $f0, 0xc($s1)
-/* B2163C 802410FC E6220038 */  swc1      $f2, 0x38($s1)
-/* B21640 80241100 8E430074 */  lw        $v1, 0x74($s2)
-/* B21644 80241104 24020002 */  addiu     $v0, $zero, 2
-/* B21648 80241108 2463FFFF */  addiu     $v1, $v1, -1
-/* B2164C 8024110C 18600002 */  blez      $v1, .L80241118
-/* B21650 80241110 AE430074 */   sw       $v1, 0x74($s2)
-.L80241114:
-/* B21654 80241114 0000102D */  daddu     $v0, $zero, $zero
-.L80241118:
-/* B21658 80241118 8FBF0020 */  lw        $ra, 0x20($sp)
-/* B2165C 8024111C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* B21660 80241120 8FB20018 */  lw        $s2, 0x18($sp)
-/* B21664 80241124 8FB10014 */  lw        $s1, 0x14($sp)
-/* B21668 80241128 8FB00010 */  lw        $s0, 0x10($sp)
-/* B2166C 8024112C 03E00008 */  jr        $ra
-/* B21670 80241130 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C_B37AEC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C_B37AEC.s
deleted file mode 100644
index 7eed769076..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C_B37AEC.s
+++ /dev/null
@@ -1,41 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242F1C_B37AEC
-/* B37AEC 80242F1C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B37AF0 80242F20 0000302D */  daddu     $a2, $zero, $zero
-/* B37AF4 80242F24 00C0482D */  daddu     $t1, $a2, $zero
-/* B37AF8 80242F28 AFBF0010 */  sw        $ra, 0x10($sp)
-/* B37AFC 80242F2C 8C82000C */  lw        $v0, 0xc($a0)
-/* B37B00 80242F30 3C088011 */  lui       $t0, %hi(gPlayerData)
-/* B37B04 80242F34 2508F290 */  addiu     $t0, $t0, %lo(gPlayerData)
-/* B37B08 80242F38 8C450000 */  lw        $a1, ($v0)
-.L80242F3C:
-/* B37B0C 80242F3C 3C038025 */  lui       $v1, %hi(D_8024A5AC_B3F17C)
-/* B37B10 80242F40 2463A5AC */  addiu     $v1, $v1, %lo(D_8024A5AC_B3F17C)
-/* B37B14 80242F44 8C620000 */  lw        $v0, ($v1)
-/* B37B18 80242F48 5040000A */  beql      $v0, $zero, .L80242F74
-/* B37B1C 80242F4C 25290001 */   addiu    $t1, $t1, 1
-/* B37B20 80242F50 850701B4 */  lh        $a3, 0x1b4($t0)
-.L80242F54:
-/* B37B24 80242F54 8C620000 */  lw        $v0, ($v1)
-/* B37B28 80242F58 14E20002 */  bne       $a3, $v0, .L80242F64
-/* B37B2C 80242F5C 24630004 */   addiu    $v1, $v1, 4
-/* B37B30 80242F60 24C60001 */  addiu     $a2, $a2, 1
-.L80242F64:
-/* B37B34 80242F64 8C620000 */  lw        $v0, ($v1)
-/* B37B38 80242F68 1440FFFA */  bnez      $v0, .L80242F54
-/* B37B3C 80242F6C 00000000 */   nop
-/* B37B40 80242F70 25290001 */  addiu     $t1, $t1, 1
-.L80242F74:
-/* B37B44 80242F74 2922000A */  slti      $v0, $t1, 0xa
-/* B37B48 80242F78 1440FFF0 */  bnez      $v0, .L80242F3C
-/* B37B4C 80242F7C 25080002 */   addiu    $t0, $t0, 2
-/* B37B50 80242F80 0C0B2026 */  jal       evt_set_variable
-/* B37B54 80242F84 00000000 */   nop
-/* B37B58 80242F88 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B37B5C 80242F8C 24020002 */  addiu     $v0, $zero, 2
-/* B37B60 80242F90 03E00008 */  jr        $ra
-/* B37B64 80242F94 27BD0018 */   addiu    $sp, $sp, 0x18
-/* B37B68 80242F98 00000000 */  nop
-/* B37B6C 80242F9C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F7C_8B2FEC.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F7C_8B2FEC.s
deleted file mode 100644
index d00dcf4023..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F7C_8B2FEC.s
+++ /dev/null
@@ -1,53 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242F7C_8B2FEC
-/* 8B2FEC 80242F7C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 8B2FF0 80242F80 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8B2FF4 80242F84 0080882D */  daddu     $s1, $a0, $zero
-/* 8B2FF8 80242F88 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 8B2FFC 80242F8C 10A0000B */  beqz      $a1, .L80242FBC
-/* 8B3000 80242F90 AFB00010 */   sw       $s0, 0x10($sp)
-/* 8B3004 80242F94 8E24014C */  lw        $a0, 0x14c($s1)
-/* 8B3008 80242F98 0C00EAD2 */  jal       get_npc_safe
-/* 8B300C 80242F9C AE200074 */   sw       $zero, 0x74($s1)
-/* 8B3010 80242FA0 8E23014C */  lw        $v1, 0x14c($s1)
-/* 8B3014 80242FA4 AE220078 */  sw        $v0, 0x78($s1)
-/* 8B3018 80242FA8 00031840 */  sll       $v1, $v1, 1
-/* 8B301C 80242FAC 3C028025 */  lui       $v0, %hi(D_8024E538_8BE5A8)
-/* 8B3020 80242FB0 00431021 */  addu      $v0, $v0, $v1
-/* 8B3024 80242FB4 8442E538 */  lh        $v0, %lo(D_8024E538_8BE5A8)($v0)
-/* 8B3028 80242FB8 AE22007C */  sw        $v0, 0x7c($s1)
-.L80242FBC:
-/* 8B302C 80242FBC 8E22007C */  lw        $v0, 0x7c($s1)
-/* 8B3030 80242FC0 14400015 */  bnez      $v0, .L80243018
-/* 8B3034 80242FC4 2442FFFF */   addiu    $v0, $v0, -1
-/* 8B3038 80242FC8 C62C0074 */  lwc1      $f12, 0x74($s1)
-/* 8B303C 80242FCC 0C00A8BB */  jal       sin_deg
-/* 8B3040 80242FD0 8E300078 */   lw       $s0, 0x78($s1)
-/* 8B3044 80242FD4 3C013FC0 */  lui       $at, 0x3fc0
-/* 8B3048 80242FD8 44811000 */  mtc1      $at, $f2
-/* 8B304C 80242FDC 00000000 */  nop
-/* 8B3050 80242FE0 46020002 */  mul.s     $f0, $f0, $f2
-/* 8B3054 80242FE4 00000000 */  nop
-/* 8B3058 80242FE8 3C014190 */  lui       $at, 0x4190
-/* 8B305C 80242FEC 44816000 */  mtc1      $at, $f12
-/* 8B3060 80242FF0 4600010D */  trunc.w.s $f4, $f0
-/* 8B3064 80242FF4 44022000 */  mfc1      $v0, $f4
-/* 8B3068 80242FF8 00000000 */  nop
-/* 8B306C 80242FFC A20200AB */  sb        $v0, 0xab($s0)
-/* 8B3070 80243000 C6200074 */  lwc1      $f0, 0x74($s1)
-/* 8B3074 80243004 0C00A6C9 */  jal       clamp_angle
-/* 8B3078 80243008 460C0300 */   add.s    $f12, $f0, $f12
-/* 8B307C 8024300C 0000102D */  daddu     $v0, $zero, $zero
-/* 8B3080 80243010 08090C08 */  j         .L80243020
-/* 8B3084 80243014 E6200074 */   swc1     $f0, 0x74($s1)
-.L80243018:
-/* 8B3088 80243018 AE22007C */  sw        $v0, 0x7c($s1)
-/* 8B308C 8024301C 0000102D */  daddu     $v0, $zero, $zero
-.L80243020:
-/* 8B3090 80243020 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8B3094 80243024 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8B3098 80243028 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8B309C 8024302C 03E00008 */  jr        $ra
-/* 8B30A0 80243030 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240010_8FF680.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240010_8FF680.s
deleted file mode 100644
index 36fd43ea5b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240010_8FF680.s
+++ /dev/null
@@ -1,128 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240010_8FF680
-/* 8FF680 80240010 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 8FF684 80240014 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 8FF688 80240018 AFB1001C */  sw        $s1, 0x1c($sp)
-/* 8FF68C 8024001C AFB00018 */  sw        $s0, 0x18($sp)
-/* 8FF690 80240020 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* 8FF694 80240024 8C900084 */  lw        $s0, 0x84($a0)
-/* 8FF698 80240028 16000003 */  bnez      $s0, .L80240038
-/* 8FF69C 8024002C 0000882D */   daddu    $s1, $zero, $zero
-/* 8FF6A0 80240030 24100009 */  addiu     $s0, $zero, 9
-/* 8FF6A4 80240034 24110026 */  addiu     $s1, $zero, 0x26
-.L80240038:
-/* 8FF6A8 80240038 10A00012 */  beqz      $a1, .L80240084
-/* 8FF6AC 8024003C 00000000 */   nop
-/* 8FF6B0 80240040 3C013F80 */  lui       $at, 0x3f80
-/* 8FF6B4 80240044 4481A000 */  mtc1      $at, $f20
-/* 8FF6B8 80240048 0C00AFB7 */  jal       set_curtain_scale_goal
-/* 8FF6BC 8024004C 4600A306 */   mov.s    $f12, $f20
-/* 8FF6C0 80240050 3C0142C8 */  lui       $at, 0x42c8
-/* 8FF6C4 80240054 44810000 */  mtc1      $at, $f0
-/* 8FF6C8 80240058 0200202D */  daddu     $a0, $s0, $zero
-/* 8FF6CC 8024005C 44050000 */  mfc1      $a1, $f0
-/* 8FF6D0 80240060 0000382D */  daddu     $a3, $zero, $zero
-/* 8FF6D4 80240064 E7B40010 */  swc1      $f20, 0x10($sp)
-/* 8FF6D8 80240068 AFA00014 */  sw        $zero, 0x14($sp)
-/* 8FF6DC 8024006C 0C01C97C */  jal       fx_chapter_change
-/* 8FF6E0 80240070 00A0302D */   daddu    $a2, $a1, $zero
-/* 8FF6E4 80240074 3C018025 */  lui       $at, %hi(D_802483C0)
-/* 8FF6E8 80240078 AC2283C0 */  sw        $v0, %lo(D_802483C0)($at)
-/* 8FF6EC 8024007C 3C018025 */  lui       $at, %hi(D_802483C4)
-/* 8FF6F0 80240080 AC2083C4 */  sw        $zero, %lo(D_802483C4)($at)
-.L80240084:
-/* 8FF6F4 80240084 3C038025 */  lui       $v1, %hi(D_802483C4)
-/* 8FF6F8 80240088 8C6383C4 */  lw        $v1, %lo(D_802483C4)($v1)
-/* 8FF6FC 8024008C 04600009 */  bltz      $v1, .L802400B4
-/* 8FF700 80240090 26240075 */   addiu    $a0, $s1, 0x75
-/* 8FF704 80240094 28620014 */  slti      $v0, $v1, 0x14
-/* 8FF708 80240098 10400007 */  beqz      $v0, .L802400B8
-/* 8FF70C 8024009C 00031040 */   sll      $v0, $v1, 1
-/* 8FF710 802400A0 3C018024 */  lui       $at, %hi(D_80240DE0_900450)
-/* 8FF714 802400A4 00220821 */  addu      $at, $at, $v0
-/* 8FF718 802400A8 84220DE0 */  lh        $v0, %lo(D_80240DE0_900450)($at)
-/* 8FF71C 802400AC 0809002E */  j         .L802400B8
-/* 8FF720 802400B0 00822023 */   subu     $a0, $a0, $v0
-.L802400B4:
-/* 8FF724 802400B4 2624FF3F */  addiu     $a0, $s1, -0xc1
-.L802400B8:
-/* 8FF728 802400B8 2406003A */  addiu     $a2, $zero, 0x3a
-/* 8FF72C 802400BC 3C038025 */  lui       $v1, %hi(D_802483C0)
-/* 8FF730 802400C0 8C6383C0 */  lw        $v1, %lo(D_802483C0)($v1)
-/* 8FF734 802400C4 44840000 */  mtc1      $a0, $f0
-/* 8FF738 802400C8 00000000 */  nop
-/* 8FF73C 802400CC 46800020 */  cvt.s.w   $f0, $f0
-/* 8FF740 802400D0 8C62000C */  lw        $v0, 0xc($v1)
-/* 8FF744 802400D4 E4400004 */  swc1      $f0, 4($v0)
-/* 8FF748 802400D8 8C62000C */  lw        $v0, 0xc($v1)
-/* 8FF74C 802400DC 3C038025 */  lui       $v1, %hi(D_802483C4)
-/* 8FF750 802400E0 8C6383C4 */  lw        $v1, %lo(D_802483C4)($v1)
-/* 8FF754 802400E4 44860000 */  mtc1      $a2, $f0
-/* 8FF758 802400E8 00000000 */  nop
-/* 8FF75C 802400EC 46800020 */  cvt.s.w   $f0, $f0
-/* 8FF760 802400F0 E4400008 */  swc1      $f0, 8($v0)
-/* 8FF764 802400F4 2862000A */  slti      $v0, $v1, 0xa
-/* 8FF768 802400F8 1440000A */  bnez      $v0, .L80240124
-/* 8FF76C 802400FC 26240075 */   addiu    $a0, $s1, 0x75
-/* 8FF770 80240100 2862001E */  slti      $v0, $v1, 0x1e
-/* 8FF774 80240104 10400008 */  beqz      $v0, .L80240128
-/* 8FF778 80240108 2462FFF6 */   addiu    $v0, $v1, -0xa
-/* 8FF77C 8024010C 00021040 */  sll       $v0, $v0, 1
-/* 8FF780 80240110 3C018024 */  lui       $at, %hi(D_80240DE0_900450)
-/* 8FF784 80240114 00220821 */  addu      $at, $at, $v0
-/* 8FF788 80240118 84220DE0 */  lh        $v0, %lo(D_80240DE0_900450)($at)
-/* 8FF78C 8024011C 0809004A */  j         .L80240128
-/* 8FF790 80240120 00C23023 */   subu     $a2, $a2, $v0
-.L80240124:
-/* 8FF794 80240124 2406FF04 */  addiu     $a2, $zero, -0xfc
-.L80240128:
-/* 8FF798 80240128 3C038025 */  lui       $v1, %hi(D_802483C0)
-/* 8FF79C 8024012C 8C6383C0 */  lw        $v1, %lo(D_802483C0)($v1)
-/* 8FF7A0 80240130 44840000 */  mtc1      $a0, $f0
-/* 8FF7A4 80240134 00000000 */  nop
-/* 8FF7A8 80240138 46800020 */  cvt.s.w   $f0, $f0
-/* 8FF7AC 8024013C 8C62000C */  lw        $v0, 0xc($v1)
-/* 8FF7B0 80240140 E4400010 */  swc1      $f0, 0x10($v0)
-/* 8FF7B4 80240144 8C62000C */  lw        $v0, 0xc($v1)
-/* 8FF7B8 80240148 3C038025 */  lui       $v1, %hi(D_802483C4)
-/* 8FF7BC 8024014C 8C6383C4 */  lw        $v1, %lo(D_802483C4)($v1)
-/* 8FF7C0 80240150 44860000 */  mtc1      $a2, $f0
-/* 8FF7C4 80240154 00000000 */  nop
-/* 8FF7C8 80240158 46800020 */  cvt.s.w   $f0, $f0
-/* 8FF7CC 8024015C E4400014 */  swc1      $f0, 0x14($v0)
-/* 8FF7D0 80240160 28620014 */  slti      $v0, $v1, 0x14
-/* 8FF7D4 80240164 1440000A */  bnez      $v0, .L80240190
-/* 8FF7D8 80240168 24040118 */   addiu    $a0, $zero, 0x118
-/* 8FF7DC 8024016C 28620028 */  slti      $v0, $v1, 0x28
-/* 8FF7E0 80240170 10400008 */  beqz      $v0, .L80240194
-/* 8FF7E4 80240174 2462FFEC */   addiu    $v0, $v1, -0x14
-/* 8FF7E8 80240178 00021040 */  sll       $v0, $v0, 1
-/* 8FF7EC 8024017C 3C018024 */  lui       $at, %hi(D_80240DE0_900450)
-/* 8FF7F0 80240180 00220821 */  addu      $at, $at, $v0
-/* 8FF7F4 80240184 84220DE0 */  lh        $v0, %lo(D_80240DE0_900450)($at)
-/* 8FF7F8 80240188 08090065 */  j         .L80240194
-/* 8FF7FC 8024018C 00442021 */   addu     $a0, $v0, $a0
-.L80240190:
-/* 8FF800 80240190 2404024E */  addiu     $a0, $zero, 0x24e
-.L80240194:
-/* 8FF804 80240194 3C058025 */  lui       $a1, %hi(D_802483C0)
-/* 8FF808 80240198 8CA583C0 */  lw        $a1, %lo(D_802483C0)($a1)
-/* 8FF80C 8024019C 8CA3000C */  lw        $v1, 0xc($a1)
-/* 8FF810 802401A0 2406005A */  addiu     $a2, $zero, 0x5a
-/* 8FF814 802401A4 AC640040 */  sw        $a0, 0x40($v1)
-/* 8FF818 802401A8 3C048025 */  lui       $a0, %hi(D_802483C4)
-/* 8FF81C 802401AC 248483C4 */  addiu     $a0, $a0, %lo(D_802483C4)
-/* 8FF820 802401B0 8C830000 */  lw        $v1, ($a0)
-/* 8FF824 802401B4 8CA5000C */  lw        $a1, 0xc($a1)
-/* 8FF828 802401B8 24630001 */  addiu     $v1, $v1, 1
-/* 8FF82C 802401BC AC830000 */  sw        $v1, ($a0)
-/* 8FF830 802401C0 ACA60044 */  sw        $a2, 0x44($a1)
-/* 8FF834 802401C4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 8FF838 802401C8 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 8FF83C 802401CC 8FB00018 */  lw        $s0, 0x18($sp)
-/* 8FF840 802401D0 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* 8FF844 802401D4 0000102D */  daddu     $v0, $zero, $zero
-/* 8FF848 802401D8 03E00008 */  jr        $ra
-/* 8FF84C 802401DC 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B4C_9001BC.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B4C_9001BC.s
deleted file mode 100644
index 028c4dba22..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B4C_9001BC.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240B4C_9001BC
-/* 9001BC 80240B4C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9001C0 80240B50 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9001C4 80240B54 0080802D */  daddu     $s0, $a0, $zero
-/* 9001C8 80240B58 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 9001CC 80240B5C 0C00AB39 */  jal       heap_malloc
-/* 9001D0 80240B60 24040780 */   addiu    $a0, $zero, 0x780
-/* 9001D4 80240B64 0200202D */  daddu     $a0, $s0, $zero
-/* 9001D8 80240B68 3C05FD05 */  lui       $a1, 0xfd05
-/* 9001DC 80240B6C 34A50F80 */  ori       $a1, $a1, 0xf80
-/* 9001E0 80240B70 0C0B2026 */  jal       evt_set_variable
-/* 9001E4 80240B74 0040302D */   daddu    $a2, $v0, $zero
-/* 9001E8 80240B78 2402FFFF */  addiu     $v0, $zero, -1
-/* 9001EC 80240B7C 3C058024 */  lui       $a1, %hi(func_80240B00_900170)
-/* 9001F0 80240B80 24A50B00 */  addiu     $a1, $a1, %lo(func_80240B00_900170)
-/* 9001F4 80240B84 3C018025 */  lui       $at, %hi(D_802483D0)
-/* 9001F8 80240B88 AC2283D0 */  sw        $v0, %lo(D_802483D0)($at)
-/* 9001FC 80240B8C 0C048C56 */  jal       create_generic_entity_world
-/* 900200 80240B90 0000202D */   daddu    $a0, $zero, $zero
-/* 900204 80240B94 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 900208 80240B98 8FB00010 */  lw        $s0, 0x10($sp)
-/* 90020C 80240B9C 24020002 */  addiu     $v0, $zero, 2
-/* 900210 80240BA0 03E00008 */  jr        $ra
-/* 900214 80240BA4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308_A787C8.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308_A787C8.s
deleted file mode 100644
index ec04cae913..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308_A787C8.s
+++ /dev/null
@@ -1,48 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240308_A787C8
-/* A787C8 80240308 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A787CC 8024030C AFBF0010 */  sw        $ra, 0x10($sp)
-/* A787D0 80240310 8C82000C */  lw        $v0, 0xc($a0)
-/* A787D4 80240314 0C0B1EAF */  jal       evt_get_variable
-/* A787D8 80240318 8C450000 */   lw       $a1, ($v0)
-/* A787DC 8024031C 0040182D */  daddu     $v1, $v0, $zero
-/* A787E0 80240320 10600012 */  beqz      $v1, .L8024036C
-/* A787E4 80240324 0000202D */   daddu    $a0, $zero, $zero
-/* A787E8 80240328 8C620000 */  lw        $v0, ($v1)
-/* A787EC 8024032C 5040000A */  beql      $v0, $zero, .L80240358
-/* A787F0 80240330 00041080 */   sll      $v0, $a0, 2
-/* A787F4 80240334 3C058024 */  lui       $a1, %hi(func_80242040_8B20B0)
-/* A787F8 80240338 24A52040 */  addiu     $a1, $a1, %lo(func_80242040_8B20B0)
-.L8024033C:
-/* A787FC 8024033C 24630004 */  addiu     $v1, $v1, 4
-/* A78800 80240340 24840001 */  addiu     $a0, $a0, 1
-/* A78804 80240344 ACA20000 */  sw        $v0, ($a1)
-/* A78808 80240348 8C620000 */  lw        $v0, ($v1)
-/* A7880C 8024034C 1440FFFB */  bnez      $v0, .L8024033C
-/* A78810 80240350 24A50004 */   addiu    $a1, $a1, 4
-/* A78814 80240354 00041080 */  sll       $v0, $a0, 2
-.L80240358:
-/* A78818 80240358 3C018024 */  lui       $at, %hi(func_80242040_8B20B0)
-/* A7881C 8024035C 00220821 */  addu      $at, $at, $v0
-/* A78820 80240360 AC202040 */  sw        $zero, %lo(func_80242040_8B20B0)($at)
-/* A78824 80240364 080900E5 */  j         .L80240394
-/* A78828 80240368 00000000 */   nop
-.L8024036C:
-/* A7882C 8024036C 3C038024 */  lui       $v1, %hi(func_80242040_8B20B0)
-/* A78830 80240370 24632040 */  addiu     $v1, $v1, %lo(func_80242040_8B20B0)
-/* A78834 80240374 0060282D */  daddu     $a1, $v1, $zero
-.L80240378:
-/* A78838 80240378 24820010 */  addiu     $v0, $a0, 0x10
-/* A7883C 8024037C AC620000 */  sw        $v0, ($v1)
-/* A78840 80240380 24630004 */  addiu     $v1, $v1, 4
-/* A78844 80240384 24840001 */  addiu     $a0, $a0, 1
-/* A78848 80240388 28820070 */  slti      $v0, $a0, 0x70
-/* A7884C 8024038C 1440FFFA */  bnez      $v0, .L80240378
-/* A78850 80240390 ACA001C0 */   sw       $zero, 0x1c0($a1)
-.L80240394:
-/* A78854 80240394 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A78858 80240398 24020002 */  addiu     $v0, $zero, 2
-/* A7885C 8024039C 03E00008 */  jr        $ra
-/* A78860 802403A0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241DA0_7ECAB0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241DA0_7ECAB0.s
deleted file mode 100644
index cdf50d601a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241DA0_7ECAB0.s
+++ /dev/null
@@ -1,30 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241DA0_7ECAB0
-/* 7ECAB0 80241DA0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7ECAB4 80241DA4 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7ECAB8 80241DA8 0080902D */  daddu     $s2, $a0, $zero
-/* 7ECABC 80241DAC AFB10014 */  sw        $s1, 0x14($sp)
-/* 7ECAC0 80241DB0 3C118025 */  lui       $s1, %hi(D_80248F18_7F3C28)
-/* 7ECAC4 80241DB4 26318F18 */  addiu     $s1, $s1, %lo(D_80248F18_7F3C28)
-/* 7ECAC8 80241DB8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7ECACC 80241DBC 0000802D */  daddu     $s0, $zero, $zero
-/* 7ECAD0 80241DC0 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 7ECAD4 80241DC4 26100001 */  addiu     $s0, $s0, 1
-.L80241DC8:
-/* 7ECAD8 80241DC8 8E250010 */  lw        $a1, 0x10($s1)
-/* 7ECADC 80241DCC 26310014 */  addiu     $s1, $s1, 0x14
-/* 7ECAE0 80241DD0 0240202D */  daddu     $a0, $s2, $zero
-/* 7ECAE4 80241DD4 0C0B2026 */  jal       evt_set_variable
-/* 7ECAE8 80241DD8 0000302D */   daddu    $a2, $zero, $zero
-/* 7ECAEC 80241DDC 2E020024 */  sltiu     $v0, $s0, 0x24
-/* 7ECAF0 80241DE0 1440FFF9 */  bnez      $v0, .L80241DC8
-/* 7ECAF4 80241DE4 26100001 */   addiu    $s0, $s0, 1
-/* 7ECAF8 80241DE8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 7ECAFC 80241DEC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7ECB00 80241DF0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7ECB04 80241DF4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7ECB08 80241DF8 24020002 */  addiu     $v0, $zero, 2
-/* 7ECB0C 80241DFC 03E00008 */  jr        $ra
-/* 7ECB10 80241E00 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E04_7ECB14.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E04_7ECB14.s
deleted file mode 100644
index 771fb8b399..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E04_7ECB14.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241E04_7ECB14
-/* 7ECB14 80241E04 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7ECB18 80241E08 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7ECB1C 80241E0C 0080902D */  daddu     $s2, $a0, $zero
-/* 7ECB20 80241E10 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7ECB24 80241E14 0000882D */  daddu     $s1, $zero, $zero
-/* 7ECB28 80241E18 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7ECB2C 80241E1C 3C108025 */  lui       $s0, %hi(D_80248F20_7F3C30)
-/* 7ECB30 80241E20 26108F20 */  addiu     $s0, $s0, %lo(D_80248F20_7F3C30)
-/* 7ECB34 80241E24 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 7ECB38 80241E28 0240202D */  daddu     $a0, $s2, $zero
-.L80241E2C:
-/* 7ECB3C 80241E2C 3C05F5DE */  lui       $a1, 0xf5de
-/* 7ECB40 80241E30 0C0B1EAF */  jal       evt_get_variable
-/* 7ECB44 80241E34 34A50180 */   ori      $a1, $a1, 0x180
-/* 7ECB48 80241E38 0240202D */  daddu     $a0, $s2, $zero
-/* 7ECB4C 80241E3C 26310001 */  addiu     $s1, $s1, 1
-/* 7ECB50 80241E40 8E050000 */  lw        $a1, ($s0)
-/* 7ECB54 80241E44 8E03FFFC */  lw        $v1, -4($s0)
-/* 7ECB58 80241E48 26100014 */  addiu     $s0, $s0, 0x14
-/* 7ECB5C 80241E4C 0043102A */  slt       $v0, $v0, $v1
-/* 7ECB60 80241E50 0C0B2026 */  jal       evt_set_variable
-/* 7ECB64 80241E54 38460001 */   xori     $a2, $v0, 1
-/* 7ECB68 80241E58 2E220024 */  sltiu     $v0, $s1, 0x24
-/* 7ECB6C 80241E5C 1440FFF3 */  bnez      $v0, .L80241E2C
-/* 7ECB70 80241E60 0240202D */   daddu    $a0, $s2, $zero
-/* 7ECB74 80241E64 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 7ECB78 80241E68 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7ECB7C 80241E6C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7ECB80 80241E70 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7ECB84 80241E74 24020002 */  addiu     $v0, $zero, 2
-/* 7ECB88 80241E78 03E00008 */  jr        $ra
-/* 7ECB8C 80241E7C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80_7ECB90.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80_7ECB90.s
deleted file mode 100644
index 9b179a1a5c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80_7ECB90.s
+++ /dev/null
@@ -1,105 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241E80_7ECB90
-/* 7ECB90 80241E80 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 7ECB94 80241E84 AFB40020 */  sw        $s4, 0x20($sp)
-/* 7ECB98 80241E88 0080A02D */  daddu     $s4, $a0, $zero
-/* 7ECB9C 80241E8C AFB3001C */  sw        $s3, 0x1c($sp)
-/* 7ECBA0 80241E90 3C138025 */  lui       $s3, %hi(D_80248F18_7F3C28)
-/* 7ECBA4 80241E94 26738F18 */  addiu     $s3, $s3, %lo(D_80248F18_7F3C28)
-/* 7ECBA8 80241E98 AFB50024 */  sw        $s5, 0x24($sp)
-/* 7ECBAC 80241E9C 0000A82D */  daddu     $s5, $zero, $zero
-/* 7ECBB0 80241EA0 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7ECBB4 80241EA4 02A0902D */  daddu     $s2, $s5, $zero
-/* 7ECBB8 80241EA8 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7ECBBC 80241EAC 02A0882D */  daddu     $s1, $s5, $zero
-/* 7ECBC0 80241EB0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7ECBC4 80241EB4 26700010 */  addiu     $s0, $s3, 0x10
-/* 7ECBC8 80241EB8 AFBF002C */  sw        $ra, 0x2c($sp)
-/* 7ECBCC 80241EBC AFB60028 */  sw        $s6, 0x28($sp)
-.L80241EC0:
-/* 7ECBD0 80241EC0 8E05FFF8 */  lw        $a1, -8($s0)
-/* 7ECBD4 80241EC4 0C0B1EAF */  jal       evt_get_variable
-/* 7ECBD8 80241EC8 0280202D */   daddu    $a0, $s4, $zero
-/* 7ECBDC 80241ECC 5040000E */  beql      $v0, $zero, .L80241F08
-/* 7ECBE0 80241ED0 26310001 */   addiu    $s1, $s1, 1
-/* 7ECBE4 80241ED4 8E05FFFC */  lw        $a1, -4($s0)
-/* 7ECBE8 80241ED8 0C0B1EAF */  jal       evt_get_variable
-/* 7ECBEC 80241EDC 0280202D */   daddu    $a0, $s4, $zero
-/* 7ECBF0 80241EE0 14400003 */  bnez      $v0, .L80241EF0
-/* 7ECBF4 80241EE4 00000000 */   nop
-/* 7ECBF8 80241EE8 080907C6 */  j         .L80241F18
-/* 7ECBFC 80241EEC 24150001 */   addiu    $s5, $zero, 1
-.L80241EF0:
-/* 7ECC00 80241EF0 8E050000 */  lw        $a1, ($s0)
-/* 7ECC04 80241EF4 0C0B1EAF */  jal       evt_get_variable
-/* 7ECC08 80241EF8 0280202D */   daddu    $a0, $s4, $zero
-/* 7ECC0C 80241EFC 50400001 */  beql      $v0, $zero, .L80241F04
-/* 7ECC10 80241F00 26520001 */   addiu    $s2, $s2, 1
-.L80241F04:
-/* 7ECC14 80241F04 26310001 */  addiu     $s1, $s1, 1
-.L80241F08:
-/* 7ECC18 80241F08 26100014 */  addiu     $s0, $s0, 0x14
-/* 7ECC1C 80241F0C 2E220024 */  sltiu     $v0, $s1, 0x24
-/* 7ECC20 80241F10 1440FFEB */  bnez      $v0, .L80241EC0
-/* 7ECC24 80241F14 26730014 */   addiu    $s3, $s3, 0x14
-.L80241F18:
-/* 7ECC28 80241F18 56A0001F */  bnel      $s5, $zero, .L80241F98
-/* 7ECC2C 80241F1C AE910084 */   sw       $s1, 0x84($s4)
-/* 7ECC30 80241F20 3C138025 */  lui       $s3, %hi(D_80248F18_7F3C28)
-/* 7ECC34 80241F24 26738F18 */  addiu     $s3, $s3, %lo(D_80248F18_7F3C28)
-/* 7ECC38 80241F28 1240001A */  beqz      $s2, .L80241F94
-/* 7ECC3C 80241F2C 0000882D */   daddu    $s1, $zero, $zero
-/* 7ECC40 80241F30 0C00A67F */  jal       rand_int
-/* 7ECC44 80241F34 2644FFFF */   addiu    $a0, $s2, -1
-/* 7ECC48 80241F38 0040B02D */  daddu     $s6, $v0, $zero
-/* 7ECC4C 80241F3C 0220902D */  daddu     $s2, $s1, $zero
-/* 7ECC50 80241F40 02A0882D */  daddu     $s1, $s5, $zero
-/* 7ECC54 80241F44 26700010 */  addiu     $s0, $s3, 0x10
-.L80241F48:
-/* 7ECC58 80241F48 8E05FFF8 */  lw        $a1, -8($s0)
-/* 7ECC5C 80241F4C 0C0B1EAF */  jal       evt_get_variable
-/* 7ECC60 80241F50 0280202D */   daddu    $a0, $s4, $zero
-/* 7ECC64 80241F54 5040000B */  beql      $v0, $zero, .L80241F84
-/* 7ECC68 80241F58 26310001 */   addiu    $s1, $s1, 1
-/* 7ECC6C 80241F5C 8E050000 */  lw        $a1, ($s0)
-/* 7ECC70 80241F60 0C0B1EAF */  jal       evt_get_variable
-/* 7ECC74 80241F64 0280202D */   daddu    $a0, $s4, $zero
-/* 7ECC78 80241F68 54400006 */  bnel      $v0, $zero, .L80241F84
-/* 7ECC7C 80241F6C 26310001 */   addiu    $s1, $s1, 1
-/* 7ECC80 80241F70 0240102D */  daddu     $v0, $s2, $zero
-/* 7ECC84 80241F74 0056102A */  slt       $v0, $v0, $s6
-/* 7ECC88 80241F78 10400006 */  beqz      $v0, .L80241F94
-/* 7ECC8C 80241F7C 26520001 */   addiu    $s2, $s2, 1
-/* 7ECC90 80241F80 26310001 */  addiu     $s1, $s1, 1
-.L80241F84:
-/* 7ECC94 80241F84 26100014 */  addiu     $s0, $s0, 0x14
-/* 7ECC98 80241F88 2E220024 */  sltiu     $v0, $s1, 0x24
-/* 7ECC9C 80241F8C 1440FFEE */  bnez      $v0, .L80241F48
-/* 7ECCA0 80241F90 26730014 */   addiu    $s3, $s3, 0x14
-.L80241F94:
-/* 7ECCA4 80241F94 AE910084 */  sw        $s1, 0x84($s4)
-.L80241F98:
-/* 7ECCA8 80241F98 8E620000 */  lw        $v0, ($s3)
-/* 7ECCAC 80241F9C 0280202D */  daddu     $a0, $s4, $zero
-/* 7ECCB0 80241FA0 AE95008C */  sw        $s5, 0x8c($s4)
-/* 7ECCB4 80241FA4 AE820088 */  sw        $v0, 0x88($s4)
-/* 7ECCB8 80241FA8 8E65000C */  lw        $a1, 0xc($s3)
-/* 7ECCBC 80241FAC 0C0B2026 */  jal       evt_set_variable
-/* 7ECCC0 80241FB0 24060001 */   addiu    $a2, $zero, 1
-/* 7ECCC4 80241FB4 0280202D */  daddu     $a0, $s4, $zero
-/* 7ECCC8 80241FB8 8E650010 */  lw        $a1, 0x10($s3)
-/* 7ECCCC 80241FBC 0C0B2026 */  jal       evt_set_variable
-/* 7ECCD0 80241FC0 24060001 */   addiu    $a2, $zero, 1
-/* 7ECCD4 80241FC4 8FBF002C */  lw        $ra, 0x2c($sp)
-/* 7ECCD8 80241FC8 8FB60028 */  lw        $s6, 0x28($sp)
-/* 7ECCDC 80241FCC 8FB50024 */  lw        $s5, 0x24($sp)
-/* 7ECCE0 80241FD0 8FB40020 */  lw        $s4, 0x20($sp)
-/* 7ECCE4 80241FD4 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 7ECCE8 80241FD8 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7ECCEC 80241FDC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7ECCF0 80241FE0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7ECCF4 80241FE4 24020002 */  addiu     $v0, $zero, 2
-/* 7ECCF8 80241FE8 03E00008 */  jr        $ra
-/* 7ECCFC 80241FEC 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241FF0_7ECD00.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241FF0_7ECD00.s
deleted file mode 100644
index 6e62c9c503..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241FF0_7ECD00.s
+++ /dev/null
@@ -1,41 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241FF0_7ECD00
-/* 7ECD00 80241FF0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 7ECD04 80241FF4 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 7ECD08 80241FF8 0080982D */  daddu     $s3, $a0, $zero
-/* 7ECD0C 80241FFC AFB20018 */  sw        $s2, 0x18($sp)
-/* 7ECD10 80242000 0000902D */  daddu     $s2, $zero, $zero
-/* 7ECD14 80242004 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7ECD18 80242008 0240882D */  daddu     $s1, $s2, $zero
-/* 7ECD1C 8024200C AFB00010 */  sw        $s0, 0x10($sp)
-/* 7ECD20 80242010 3C108025 */  lui       $s0, %hi(D_80248F28_7F3C38)
-/* 7ECD24 80242014 26108F28 */  addiu     $s0, $s0, %lo(D_80248F28_7F3C38)
-/* 7ECD28 80242018 AFBF0020 */  sw        $ra, 0x20($sp)
-.L8024201C:
-/* 7ECD2C 8024201C 8E05FFF8 */  lw        $a1, -8($s0)
-/* 7ECD30 80242020 0C0B1EAF */  jal       evt_get_variable
-/* 7ECD34 80242024 0260202D */   daddu    $a0, $s3, $zero
-/* 7ECD38 80242028 50400007 */  beql      $v0, $zero, .L80242048
-/* 7ECD3C 8024202C 26310001 */   addiu    $s1, $s1, 1
-/* 7ECD40 80242030 8E050000 */  lw        $a1, ($s0)
-/* 7ECD44 80242034 0C0B1EAF */  jal       evt_get_variable
-/* 7ECD48 80242038 0260202D */   daddu    $a0, $s3, $zero
-/* 7ECD4C 8024203C 50400001 */  beql      $v0, $zero, .L80242044
-/* 7ECD50 80242040 26520001 */   addiu    $s2, $s2, 1
-.L80242044:
-/* 7ECD54 80242044 26310001 */  addiu     $s1, $s1, 1
-.L80242048:
-/* 7ECD58 80242048 2E220024 */  sltiu     $v0, $s1, 0x24
-/* 7ECD5C 8024204C 1440FFF3 */  bnez      $v0, .L8024201C
-/* 7ECD60 80242050 26100014 */   addiu    $s0, $s0, 0x14
-/* 7ECD64 80242054 AE720084 */  sw        $s2, 0x84($s3)
-/* 7ECD68 80242058 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 7ECD6C 8024205C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 7ECD70 80242060 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7ECD74 80242064 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7ECD78 80242068 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7ECD7C 8024206C 24020002 */  addiu     $v0, $zero, 2
-/* 7ECD80 80242070 03E00008 */  jr        $ra
-/* 7ECD84 80242074 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240E80_801700.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240E80_801700.s
deleted file mode 100644
index d5a477b756..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240E80_801700.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E80_801700
-/* 801700 80240E80 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 801704 80240E84 AFB00010 */  sw        $s0, 0x10($sp)
-/* 801708 80240E88 0080802D */  daddu     $s0, $a0, $zero
-/* 80170C 80240E8C 3C05F5DE */  lui       $a1, 0xf5de
-/* 801710 80240E90 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 801714 80240E94 0C0B1EAF */  jal       evt_get_variable
-/* 801718 80240E98 34A502DD */   ori      $a1, $a1, 0x2dd
-/* 80171C 80240E9C 3C048025 */  lui       $a0, %hi(D_802485E8_808E68)
-/* 801720 80240EA0 248485E8 */  addiu     $a0, $a0, %lo(D_802485E8_808E68)
-/* 801724 80240EA4 00021840 */  sll       $v1, $v0, 1
-/* 801728 80240EA8 00621821 */  addu      $v1, $v1, $v0
-/* 80172C 80240EAC 00031880 */  sll       $v1, $v1, 2
-/* 801730 80240EB0 00641821 */  addu      $v1, $v1, $a0
-/* 801734 80240EB4 8C620000 */  lw        $v0, ($v1)
-/* 801738 80240EB8 AE020084 */  sw        $v0, 0x84($s0)
-/* 80173C 80240EBC 8C630004 */  lw        $v1, 4($v1)
-/* 801740 80240EC0 AE030088 */  sw        $v1, 0x88($s0)
-/* 801744 80240EC4 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 801748 80240EC8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 80174C 80240ECC 24020002 */  addiu     $v0, $zero, 2
-/* 801750 80240ED0 03E00008 */  jr        $ra
-/* 801754 80240ED4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8_801758.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8_801758.s
deleted file mode 100644
index 1a88066b03..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8_801758.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240ED8_801758
-/* 801758 80240ED8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 80175C 80240EDC AFB00010 */  sw        $s0, 0x10($sp)
-/* 801760 80240EE0 0080802D */  daddu     $s0, $a0, $zero
-/* 801764 80240EE4 3C05F5DE */  lui       $a1, 0xf5de
-/* 801768 80240EE8 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 80176C 80240EEC 0C0B1EAF */  jal       evt_get_variable
-/* 801770 80240EF0 34A50180 */   ori      $a1, $a1, 0x180
-/* 801774 80240EF4 0040202D */  daddu     $a0, $v0, $zero
-/* 801778 80240EF8 3C038025 */  lui       $v1, %hi(D_80248714_808F94)
-/* 80177C 80240EFC 24638714 */  addiu     $v1, $v1, %lo(D_80248714_808F94)
-/* 801780 80240F00 24060019 */  addiu     $a2, $zero, 0x19
-.L80240F04:
-/* 801784 80240F04 8C620008 */  lw        $v0, 8($v1)
-/* 801788 80240F08 0082102A */  slt       $v0, $a0, $v0
-/* 80178C 80240F0C 50400005 */  beql      $v0, $zero, .L80240F24
-/* 801790 80240F10 0200202D */   daddu    $a0, $s0, $zero
-/* 801794 80240F14 24C6FFFF */  addiu     $a2, $a2, -1
-/* 801798 80240F18 04C1FFFA */  bgez      $a2, .L80240F04
-/* 80179C 80240F1C 2463FFF4 */   addiu    $v1, $v1, -0xc
-/* 8017A0 80240F20 0200202D */  daddu     $a0, $s0, $zero
-.L80240F24:
-/* 8017A4 80240F24 3C05F5DE */  lui       $a1, 0xf5de
-/* 8017A8 80240F28 0C0B2026 */  jal       evt_set_variable
-/* 8017AC 80240F2C 34A502DD */   ori      $a1, $a1, 0x2dd
-/* 8017B0 80240F30 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8017B4 80240F34 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8017B8 80240F38 24020002 */  addiu     $v0, $zero, 2
-/* 8017BC 80240F3C 03E00008 */  jr        $ra
-/* 8017C0 80240F40 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 8017C4 80240F44 00000000 */  nop
-/* 8017C8 80240F48 00000000 */  nop
-/* 8017CC 80240F4C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243494_803D14.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243494_803D14.s
deleted file mode 100644
index 3287515a82..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243494_803D14.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243494_803D14
-/* 803D14 80243494 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 803D18 80243498 AFB10014 */  sw        $s1, 0x14($sp)
-/* 803D1C 8024349C 0080882D */  daddu     $s1, $a0, $zero
-/* 803D20 802434A0 0000202D */  daddu     $a0, $zero, $zero
-/* 803D24 802434A4 3C05FD05 */  lui       $a1, 0xfd05
-/* 803D28 802434A8 34A50F8A */  ori       $a1, $a1, 0xf8a
-/* 803D2C 802434AC AFBF0018 */  sw        $ra, 0x18($sp)
-/* 803D30 802434B0 0C0B1EAF */  jal       evt_get_variable
-/* 803D34 802434B4 AFB00010 */   sw       $s0, 0x10($sp)
-/* 803D38 802434B8 0040802D */  daddu     $s0, $v0, $zero
-/* 803D3C 802434BC 0C04EA15 */  jal       func_8013A854
-/* 803D40 802434C0 8E040000 */   lw       $a0, ($s0)
-/* 803D44 802434C4 0C048D70 */  jal       free_generic_entity
-/* 803D48 802434C8 8E040004 */   lw       $a0, 4($s0)
-/* 803D4C 802434CC 0C00AB4B */  jal       heap_free
-/* 803D50 802434D0 0200202D */   daddu    $a0, $s0, $zero
-/* 803D54 802434D4 0220202D */  daddu     $a0, $s1, $zero
-/* 803D58 802434D8 3C05FD05 */  lui       $a1, 0xfd05
-/* 803D5C 802434DC 34A50F8A */  ori       $a1, $a1, 0xf8a
-/* 803D60 802434E0 0C0B2026 */  jal       evt_set_variable
-/* 803D64 802434E4 0000302D */   daddu    $a2, $zero, $zero
-/* 803D68 802434E8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 803D6C 802434EC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 803D70 802434F0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 803D74 802434F4 24020002 */  addiu     $v0, $zero, 2
-/* 803D78 802434F8 03E00008 */  jr        $ra
-/* 803D7C 802434FC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243500_803D80.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243500_803D80.s
deleted file mode 100644
index 3e56436374..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243500_803D80.s
+++ /dev/null
@@ -1,52 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243500_803D80
-/* 803D80 80243500 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 803D84 80243504 AFB10014 */  sw        $s1, 0x14($sp)
-/* 803D88 80243508 0080882D */  daddu     $s1, $a0, $zero
-/* 803D8C 8024350C AFBF001C */  sw        $ra, 0x1c($sp)
-/* 803D90 80243510 AFB20018 */  sw        $s2, 0x18($sp)
-/* 803D94 80243514 AFB00010 */  sw        $s0, 0x10($sp)
-/* 803D98 80243518 8E30000C */  lw        $s0, 0xc($s1)
-/* 803D9C 8024351C 8E050000 */  lw        $a1, ($s0)
-/* 803DA0 80243520 0C0B210B */  jal       evt_get_float_variable
-/* 803DA4 80243524 26100004 */   addiu    $s0, $s0, 4
-/* 803DA8 80243528 8E050000 */  lw        $a1, ($s0)
-/* 803DAC 8024352C 26100004 */  addiu     $s0, $s0, 4
-/* 803DB0 80243530 4600008D */  trunc.w.s $f2, $f0
-/* 803DB4 80243534 44121000 */  mfc1      $s2, $f2
-/* 803DB8 80243538 0C0B210B */  jal       evt_get_float_variable
-/* 803DBC 8024353C 0220202D */   daddu    $a0, $s1, $zero
-/* 803DC0 80243540 0220202D */  daddu     $a0, $s1, $zero
-/* 803DC4 80243544 8E050000 */  lw        $a1, ($s0)
-/* 803DC8 80243548 4600008D */  trunc.w.s $f2, $f0
-/* 803DCC 8024354C 44111000 */  mfc1      $s1, $f2
-/* 803DD0 80243550 0C0B210B */  jal       evt_get_float_variable
-/* 803DD4 80243554 00000000 */   nop
-/* 803DD8 80243558 0000202D */  daddu     $a0, $zero, $zero
-/* 803DDC 8024355C 3C05FD05 */  lui       $a1, 0xfd05
-/* 803DE0 80243560 4600008D */  trunc.w.s $f2, $f0
-/* 803DE4 80243564 44101000 */  mfc1      $s0, $f2
-/* 803DE8 80243568 0C0B1EAF */  jal       evt_get_variable
-/* 803DEC 8024356C 34A50F8A */   ori      $a1, $a1, 0xf8a
-/* 803DF0 80243570 0040182D */  daddu     $v1, $v0, $zero
-/* 803DF4 80243574 44920000 */  mtc1      $s2, $f0
-/* 803DF8 80243578 00000000 */  nop
-/* 803DFC 8024357C 46800020 */  cvt.s.w   $f0, $f0
-/* 803E00 80243580 E4600010 */  swc1      $f0, 0x10($v1)
-/* 803E04 80243584 44910000 */  mtc1      $s1, $f0
-/* 803E08 80243588 00000000 */  nop
-/* 803E0C 8024358C 46800020 */  cvt.s.w   $f0, $f0
-/* 803E10 80243590 E4600014 */  swc1      $f0, 0x14($v1)
-/* 803E14 80243594 44900000 */  mtc1      $s0, $f0
-/* 803E18 80243598 00000000 */  nop
-/* 803E1C 8024359C 46800020 */  cvt.s.w   $f0, $f0
-/* 803E20 802435A0 E4600018 */  swc1      $f0, 0x18($v1)
-/* 803E24 802435A4 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 803E28 802435A8 8FB20018 */  lw        $s2, 0x18($sp)
-/* 803E2C 802435AC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 803E30 802435B0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 803E34 802435B4 24020002 */  addiu     $v0, $zero, 2
-/* 803E38 802435B8 03E00008 */  jr        $ra
-/* 803E3C 802435BC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802435C0_803E40.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802435C0_803E40.s
deleted file mode 100644
index 4219448cad..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802435C0_803E40.s
+++ /dev/null
@@ -1,52 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802435C0_803E40
-/* 803E40 802435C0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 803E44 802435C4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 803E48 802435C8 0080882D */  daddu     $s1, $a0, $zero
-/* 803E4C 802435CC AFBF001C */  sw        $ra, 0x1c($sp)
-/* 803E50 802435D0 AFB20018 */  sw        $s2, 0x18($sp)
-/* 803E54 802435D4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 803E58 802435D8 8E30000C */  lw        $s0, 0xc($s1)
-/* 803E5C 802435DC 8E050000 */  lw        $a1, ($s0)
-/* 803E60 802435E0 0C0B210B */  jal       evt_get_float_variable
-/* 803E64 802435E4 26100004 */   addiu    $s0, $s0, 4
-/* 803E68 802435E8 8E050000 */  lw        $a1, ($s0)
-/* 803E6C 802435EC 26100004 */  addiu     $s0, $s0, 4
-/* 803E70 802435F0 4600008D */  trunc.w.s $f2, $f0
-/* 803E74 802435F4 44121000 */  mfc1      $s2, $f2
-/* 803E78 802435F8 0C0B210B */  jal       evt_get_float_variable
-/* 803E7C 802435FC 0220202D */   daddu    $a0, $s1, $zero
-/* 803E80 80243600 0220202D */  daddu     $a0, $s1, $zero
-/* 803E84 80243604 8E050000 */  lw        $a1, ($s0)
-/* 803E88 80243608 4600008D */  trunc.w.s $f2, $f0
-/* 803E8C 8024360C 44111000 */  mfc1      $s1, $f2
-/* 803E90 80243610 0C0B210B */  jal       evt_get_float_variable
-/* 803E94 80243614 00000000 */   nop
-/* 803E98 80243618 0000202D */  daddu     $a0, $zero, $zero
-/* 803E9C 8024361C 3C05FD05 */  lui       $a1, 0xfd05
-/* 803EA0 80243620 4600008D */  trunc.w.s $f2, $f0
-/* 803EA4 80243624 44101000 */  mfc1      $s0, $f2
-/* 803EA8 80243628 0C0B1EAF */  jal       evt_get_variable
-/* 803EAC 8024362C 34A50F8A */   ori      $a1, $a1, 0xf8a
-/* 803EB0 80243630 0040182D */  daddu     $v1, $v0, $zero
-/* 803EB4 80243634 44920000 */  mtc1      $s2, $f0
-/* 803EB8 80243638 00000000 */  nop
-/* 803EBC 8024363C 46800020 */  cvt.s.w   $f0, $f0
-/* 803EC0 80243640 E460001C */  swc1      $f0, 0x1c($v1)
-/* 803EC4 80243644 44910000 */  mtc1      $s1, $f0
-/* 803EC8 80243648 00000000 */  nop
-/* 803ECC 8024364C 46800020 */  cvt.s.w   $f0, $f0
-/* 803ED0 80243650 E4600020 */  swc1      $f0, 0x20($v1)
-/* 803ED4 80243654 44900000 */  mtc1      $s0, $f0
-/* 803ED8 80243658 00000000 */  nop
-/* 803EDC 8024365C 46800020 */  cvt.s.w   $f0, $f0
-/* 803EE0 80243660 E4600024 */  swc1      $f0, 0x24($v1)
-/* 803EE4 80243664 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 803EE8 80243668 8FB20018 */  lw        $s2, 0x18($sp)
-/* 803EEC 8024366C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 803EF0 80243670 8FB00010 */  lw        $s0, 0x10($sp)
-/* 803EF4 80243674 24020002 */  addiu     $v0, $zero, 2
-/* 803EF8 80243678 03E00008 */  jr        $ra
-/* 803EFC 8024367C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243680_803F00.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243680_803F00.s
deleted file mode 100644
index 5e354c7a48..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243680_803F00.s
+++ /dev/null
@@ -1,52 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243680_803F00
-/* 803F00 80243680 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 803F04 80243684 AFB10014 */  sw        $s1, 0x14($sp)
-/* 803F08 80243688 0080882D */  daddu     $s1, $a0, $zero
-/* 803F0C 8024368C AFBF001C */  sw        $ra, 0x1c($sp)
-/* 803F10 80243690 AFB20018 */  sw        $s2, 0x18($sp)
-/* 803F14 80243694 AFB00010 */  sw        $s0, 0x10($sp)
-/* 803F18 80243698 8E30000C */  lw        $s0, 0xc($s1)
-/* 803F1C 8024369C 8E050000 */  lw        $a1, ($s0)
-/* 803F20 802436A0 0C0B210B */  jal       evt_get_float_variable
-/* 803F24 802436A4 26100004 */   addiu    $s0, $s0, 4
-/* 803F28 802436A8 8E050000 */  lw        $a1, ($s0)
-/* 803F2C 802436AC 26100004 */  addiu     $s0, $s0, 4
-/* 803F30 802436B0 4600008D */  trunc.w.s $f2, $f0
-/* 803F34 802436B4 44121000 */  mfc1      $s2, $f2
-/* 803F38 802436B8 0C0B210B */  jal       evt_get_float_variable
-/* 803F3C 802436BC 0220202D */   daddu    $a0, $s1, $zero
-/* 803F40 802436C0 0220202D */  daddu     $a0, $s1, $zero
-/* 803F44 802436C4 8E050000 */  lw        $a1, ($s0)
-/* 803F48 802436C8 4600008D */  trunc.w.s $f2, $f0
-/* 803F4C 802436CC 44111000 */  mfc1      $s1, $f2
-/* 803F50 802436D0 0C0B210B */  jal       evt_get_float_variable
-/* 803F54 802436D4 00000000 */   nop
-/* 803F58 802436D8 0000202D */  daddu     $a0, $zero, $zero
-/* 803F5C 802436DC 3C05FD05 */  lui       $a1, 0xfd05
-/* 803F60 802436E0 4600008D */  trunc.w.s $f2, $f0
-/* 803F64 802436E4 44101000 */  mfc1      $s0, $f2
-/* 803F68 802436E8 0C0B1EAF */  jal       evt_get_variable
-/* 803F6C 802436EC 34A50F8A */   ori      $a1, $a1, 0xf8a
-/* 803F70 802436F0 0040182D */  daddu     $v1, $v0, $zero
-/* 803F74 802436F4 44920000 */  mtc1      $s2, $f0
-/* 803F78 802436F8 00000000 */  nop
-/* 803F7C 802436FC 46800020 */  cvt.s.w   $f0, $f0
-/* 803F80 80243700 E4600028 */  swc1      $f0, 0x28($v1)
-/* 803F84 80243704 44910000 */  mtc1      $s1, $f0
-/* 803F88 80243708 00000000 */  nop
-/* 803F8C 8024370C 46800020 */  cvt.s.w   $f0, $f0
-/* 803F90 80243710 E460002C */  swc1      $f0, 0x2c($v1)
-/* 803F94 80243714 44900000 */  mtc1      $s0, $f0
-/* 803F98 80243718 00000000 */  nop
-/* 803F9C 8024371C 46800020 */  cvt.s.w   $f0, $f0
-/* 803FA0 80243720 E4600030 */  swc1      $f0, 0x30($v1)
-/* 803FA4 80243724 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 803FA8 80243728 8FB20018 */  lw        $s2, 0x18($sp)
-/* 803FAC 8024372C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 803FB0 80243730 8FB00010 */  lw        $s0, 0x10($sp)
-/* 803FB4 80243734 24020002 */  addiu     $v0, $zero, 2
-/* 803FB8 80243738 03E00008 */  jr        $ra
-/* 803FBC 8024373C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243740_803FC0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243740_803FC0.s
deleted file mode 100644
index b4dc5f4500..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243740_803FC0.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243740_803FC0
-/* 803FC0 80243740 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 803FC4 80243744 AFB10014 */  sw        $s1, 0x14($sp)
-/* 803FC8 80243748 0080882D */  daddu     $s1, $a0, $zero
-/* 803FCC 8024374C AFBF0018 */  sw        $ra, 0x18($sp)
-/* 803FD0 80243750 AFB00010 */  sw        $s0, 0x10($sp)
-/* 803FD4 80243754 8E30000C */  lw        $s0, 0xc($s1)
-/* 803FD8 80243758 8E050000 */  lw        $a1, ($s0)
-/* 803FDC 8024375C 0C0B1EAF */  jal       evt_get_variable
-/* 803FE0 80243760 26100004 */   addiu    $s0, $s0, 4
-/* 803FE4 80243764 0220202D */  daddu     $a0, $s1, $zero
-/* 803FE8 80243768 8E050000 */  lw        $a1, ($s0)
-/* 803FEC 8024376C 0C0B1EAF */  jal       evt_get_variable
-/* 803FF0 80243770 0040882D */   daddu    $s1, $v0, $zero
-/* 803FF4 80243774 0000202D */  daddu     $a0, $zero, $zero
-/* 803FF8 80243778 3C05FD05 */  lui       $a1, 0xfd05
-/* 803FFC 8024377C 34A50F8A */  ori       $a1, $a1, 0xf8a
-/* 804000 80243780 0C0B1EAF */  jal       evt_get_variable
-/* 804004 80243784 0040802D */   daddu    $s0, $v0, $zero
-/* 804008 80243788 0040182D */  daddu     $v1, $v0, $zero
-/* 80400C 8024378C AC710008 */  sw        $s1, 8($v1)
-/* 804010 80243790 AC70000C */  sw        $s0, 0xc($v1)
-/* 804014 80243794 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 804018 80243798 8FB10014 */  lw        $s1, 0x14($sp)
-/* 80401C 8024379C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 804020 802437A0 24020002 */  addiu     $v0, $zero, 2
-/* 804024 802437A4 03E00008 */  jr        $ra
-/* 804028 802437A8 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440FC_80497C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440FC_80497C.s
deleted file mode 100644
index 9c68942c79..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440FC_80497C.s
+++ /dev/null
@@ -1,66 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802440FC_80497C
-/* 80497C 802440FC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 804980 80244100 AFB00018 */  sw        $s0, 0x18($sp)
-/* 804984 80244104 0080802D */  daddu     $s0, $a0, $zero
-/* 804988 80244108 10A00022 */  beqz      $a1, .L80244194
-/* 80498C 8024410C AFBF001C */   sw       $ra, 0x1c($sp)
-/* 804990 80244110 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* 804994 80244114 2404002B */   addiu    $a0, $zero, 0x2b
-/* 804998 80244118 0C046B4C */  jal       get_model_from_list_index
-/* 80499C 8024411C 0040202D */   daddu    $a0, $v0, $zero
-/* 8049A0 80244120 0040202D */  daddu     $a0, $v0, $zero
-/* 8049A4 80244124 2405FFFF */  addiu     $a1, $zero, -1
-/* 8049A8 80244128 0C046F1F */  jal       set_mdl_custom_gfx_set
-/* 8049AC 8024412C 24060003 */   addiu    $a2, $zero, 3
-/* 8049B0 80244130 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* 8049B4 80244134 2404002A */   addiu    $a0, $zero, 0x2a
-/* 8049B8 80244138 0C046B4C */  jal       get_model_from_list_index
-/* 8049BC 8024413C 0040202D */   daddu    $a0, $v0, $zero
-/* 8049C0 80244140 0040202D */  daddu     $a0, $v0, $zero
-/* 8049C4 80244144 2405FFFF */  addiu     $a1, $zero, -1
-/* 8049C8 80244148 0C046F1F */  jal       set_mdl_custom_gfx_set
-/* 8049CC 8024414C 24060003 */   addiu    $a2, $zero, 3
-/* 8049D0 80244150 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* 8049D4 80244154 24040029 */   addiu    $a0, $zero, 0x29
-/* 8049D8 80244158 0C046B4C */  jal       get_model_from_list_index
-/* 8049DC 8024415C 0040202D */   daddu    $a0, $v0, $zero
-/* 8049E0 80244160 0040202D */  daddu     $a0, $v0, $zero
-/* 8049E4 80244164 2405FFFF */  addiu     $a1, $zero, -1
-/* 8049E8 80244168 0C046F1F */  jal       set_mdl_custom_gfx_set
-/* 8049EC 8024416C 24060003 */   addiu    $a2, $zero, 3
-/* 8049F0 80244170 240400FF */  addiu     $a0, $zero, 0xff
-/* 8049F4 80244174 0080282D */  daddu     $a1, $a0, $zero
-/* 8049F8 80244178 0080302D */  daddu     $a2, $a0, $zero
-/* 8049FC 8024417C 0000382D */  daddu     $a3, $zero, $zero
-/* 804A00 80244180 AFA00010 */  sw        $zero, 0x10($sp)
-/* 804A04 80244184 0C046FE6 */  jal       set_model_env_color_parameters
-/* 804A08 80244188 AFA00014 */   sw       $zero, 0x14($sp)
-/* 804A0C 8024418C 240200FF */  addiu     $v0, $zero, 0xff
-/* 804A10 80244190 AE020070 */  sw        $v0, 0x70($s0)
-.L80244194:
-/* 804A14 80244194 8E020070 */  lw        $v0, 0x70($s0)
-/* 804A18 80244198 2442FFFC */  addiu     $v0, $v0, -4
-/* 804A1C 8024419C AE020070 */  sw        $v0, 0x70($s0)
-/* 804A20 802441A0 28420040 */  slti      $v0, $v0, 0x40
-/* 804A24 802441A4 10400002 */  beqz      $v0, .L802441B0
-/* 804A28 802441A8 24020040 */   addiu    $v0, $zero, 0x40
-/* 804A2C 802441AC AE020070 */  sw        $v0, 0x70($s0)
-.L802441B0:
-/* 804A30 802441B0 92040073 */  lbu       $a0, 0x73($s0)
-/* 804A34 802441B4 0000382D */  daddu     $a3, $zero, $zero
-/* 804A38 802441B8 AFA00010 */  sw        $zero, 0x10($sp)
-/* 804A3C 802441BC AFA00014 */  sw        $zero, 0x14($sp)
-/* 804A40 802441C0 0080282D */  daddu     $a1, $a0, $zero
-/* 804A44 802441C4 0C046FE6 */  jal       set_model_env_color_parameters
-/* 804A48 802441C8 0080302D */   daddu    $a2, $a0, $zero
-/* 804A4C 802441CC 8E020070 */  lw        $v0, 0x70($s0)
-/* 804A50 802441D0 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 804A54 802441D4 8FB00018 */  lw        $s0, 0x18($sp)
-/* 804A58 802441D8 38420040 */  xori      $v0, $v0, 0x40
-/* 804A5C 802441DC 2C420001 */  sltiu     $v0, $v0, 1
-/* 804A60 802441E0 00021040 */  sll       $v0, $v0, 1
-/* 804A64 802441E4 03E00008 */  jr        $ra
-/* 804A68 802441E8 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244308_804B88.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244308_804B88.s
deleted file mode 100644
index f4d1de0cf2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244308_804B88.s
+++ /dev/null
@@ -1,61 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80244308_804B88
-/* 804B88 80244308 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 804B8C 8024430C AFB00018 */  sw        $s0, 0x18($sp)
-/* 804B90 80244310 0080802D */  daddu     $s0, $a0, $zero
-/* 804B94 80244314 10A00003 */  beqz      $a1, .L80244324
-/* 804B98 80244318 AFBF001C */   sw       $ra, 0x1c($sp)
-/* 804B9C 8024431C 24020040 */  addiu     $v0, $zero, 0x40
-/* 804BA0 80244320 AE020070 */  sw        $v0, 0x70($s0)
-.L80244324:
-/* 804BA4 80244324 8E020070 */  lw        $v0, 0x70($s0)
-/* 804BA8 80244328 24420004 */  addiu     $v0, $v0, 4
-/* 804BAC 8024432C AE020070 */  sw        $v0, 0x70($s0)
-/* 804BB0 80244330 28420100 */  slti      $v0, $v0, 0x100
-/* 804BB4 80244334 14400002 */  bnez      $v0, .L80244340
-/* 804BB8 80244338 240200FF */   addiu    $v0, $zero, 0xff
-/* 804BBC 8024433C AE020070 */  sw        $v0, 0x70($s0)
-.L80244340:
-/* 804BC0 80244340 92040073 */  lbu       $a0, 0x73($s0)
-/* 804BC4 80244344 0000382D */  daddu     $a3, $zero, $zero
-/* 804BC8 80244348 AFA00010 */  sw        $zero, 0x10($sp)
-/* 804BCC 8024434C AFA00014 */  sw        $zero, 0x14($sp)
-/* 804BD0 80244350 0080282D */  daddu     $a1, $a0, $zero
-/* 804BD4 80244354 0C046FE6 */  jal       set_model_env_color_parameters
-/* 804BD8 80244358 0080302D */   daddu    $a2, $a0, $zero
-/* 804BDC 8024435C 8E030070 */  lw        $v1, 0x70($s0)
-/* 804BE0 80244360 240200FF */  addiu     $v0, $zero, 0xff
-/* 804BE4 80244364 1462001A */  bne       $v1, $v0, .L802443D0
-/* 804BE8 80244368 0000102D */   daddu    $v0, $zero, $zero
-/* 804BEC 8024436C 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* 804BF0 80244370 2404002B */   addiu    $a0, $zero, 0x2b
-/* 804BF4 80244374 0C046B4C */  jal       get_model_from_list_index
-/* 804BF8 80244378 0040202D */   daddu    $a0, $v0, $zero
-/* 804BFC 8024437C 0040202D */  daddu     $a0, $v0, $zero
-/* 804C00 80244380 2405FFFF */  addiu     $a1, $zero, -1
-/* 804C04 80244384 0C046F1F */  jal       set_mdl_custom_gfx_set
-/* 804C08 80244388 0000302D */   daddu    $a2, $zero, $zero
-/* 804C0C 8024438C 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* 804C10 80244390 2404002A */   addiu    $a0, $zero, 0x2a
-/* 804C14 80244394 0C046B4C */  jal       get_model_from_list_index
-/* 804C18 80244398 0040202D */   daddu    $a0, $v0, $zero
-/* 804C1C 8024439C 0040202D */  daddu     $a0, $v0, $zero
-/* 804C20 802443A0 2405FFFF */  addiu     $a1, $zero, -1
-/* 804C24 802443A4 0C046F1F */  jal       set_mdl_custom_gfx_set
-/* 804C28 802443A8 0000302D */   daddu    $a2, $zero, $zero
-/* 804C2C 802443AC 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* 804C30 802443B0 24040029 */   addiu    $a0, $zero, 0x29
-/* 804C34 802443B4 0C046B4C */  jal       get_model_from_list_index
-/* 804C38 802443B8 0040202D */   daddu    $a0, $v0, $zero
-/* 804C3C 802443BC 0040202D */  daddu     $a0, $v0, $zero
-/* 804C40 802443C0 2405FFFF */  addiu     $a1, $zero, -1
-/* 804C44 802443C4 0C046F1F */  jal       set_mdl_custom_gfx_set
-/* 804C48 802443C8 0000302D */   daddu    $a2, $zero, $zero
-/* 804C4C 802443CC 24020002 */  addiu     $v0, $zero, 2
-.L802443D0:
-/* 804C50 802443D0 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 804C54 802443D4 8FB00018 */  lw        $s0, 0x18($sp)
-/* 804C58 802443D8 03E00008 */  jr        $ra
-/* 804C5C 802443DC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802443E0_804C60.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802443E0_804C60.s
deleted file mode 100644
index f4ae0188f4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802443E0_804C60.s
+++ /dev/null
@@ -1,189 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802443E0_804C60
-/* 804C60 802443E0 27BDFF08 */  addiu     $sp, $sp, -0xf8
-/* 804C64 802443E4 AFB300B4 */  sw        $s3, 0xb4($sp)
-/* 804C68 802443E8 AFBF00C0 */  sw        $ra, 0xc0($sp)
-/* 804C6C 802443EC AFB500BC */  sw        $s5, 0xbc($sp)
-/* 804C70 802443F0 AFB400B8 */  sw        $s4, 0xb8($sp)
-/* 804C74 802443F4 AFB200B0 */  sw        $s2, 0xb0($sp)
-/* 804C78 802443F8 AFB100AC */  sw        $s1, 0xac($sp)
-/* 804C7C 802443FC AFB000A8 */  sw        $s0, 0xa8($sp)
-/* 804C80 80244400 F7BE00F0 */  sdc1      $f30, 0xf0($sp)
-/* 804C84 80244404 F7BC00E8 */  sdc1      $f28, 0xe8($sp)
-/* 804C88 80244408 F7BA00E0 */  sdc1      $f26, 0xe0($sp)
-/* 804C8C 8024440C F7B800D8 */  sdc1      $f24, 0xd8($sp)
-/* 804C90 80244410 F7B600D0 */  sdc1      $f22, 0xd0($sp)
-/* 804C94 80244414 F7B400C8 */  sdc1      $f20, 0xc8($sp)
-/* 804C98 80244418 10A00011 */  beqz      $a1, .L80244460
-/* 804C9C 8024441C 0080982D */   daddu    $s3, $a0, $zero
-/* 804CA0 80244420 3C05F4AC */  lui       $a1, 0xf4ac
-/* 804CA4 80244424 34A5D483 */  ori       $a1, $a1, 0xd483
-/* 804CA8 80244428 240200B4 */  addiu     $v0, $zero, 0xb4
-/* 804CAC 8024442C 0C0B1EAF */  jal       evt_get_variable
-/* 804CB0 80244430 AE620070 */   sw       $v0, 0x70($s3)
-/* 804CB4 80244434 0260202D */  daddu     $a0, $s3, $zero
-/* 804CB8 80244438 3C05F4AC */  lui       $a1, 0xf4ac
-/* 804CBC 8024443C 34A5D484 */  ori       $a1, $a1, 0xd484
-/* 804CC0 80244440 0C0B1EAF */  jal       evt_get_variable
-/* 804CC4 80244444 AE620074 */   sw       $v0, 0x74($s3)
-/* 804CC8 80244448 0260202D */  daddu     $a0, $s3, $zero
-/* 804CCC 8024444C 3C05F4AC */  lui       $a1, 0xf4ac
-/* 804CD0 80244450 34A5D485 */  ori       $a1, $a1, 0xd485
-/* 804CD4 80244454 0C0B1EAF */  jal       evt_get_variable
-/* 804CD8 80244458 AE620078 */   sw       $v0, 0x78($s3)
-/* 804CDC 8024445C AE62007C */  sw        $v0, 0x7c($s3)
-.L80244460:
-/* 804CE0 80244460 0000882D */  daddu     $s1, $zero, $zero
-/* 804CE4 80244464 8E620074 */  lw        $v0, 0x74($s3)
-/* 804CE8 80244468 3C014120 */  lui       $at, 0x4120
-/* 804CEC 8024446C 4481A000 */  mtc1      $at, $f20
-/* 804CF0 80244470 27B00028 */  addiu     $s0, $sp, 0x28
-/* 804CF4 80244474 AFA20018 */  sw        $v0, 0x18($sp)
-/* 804CF8 80244478 8E620078 */  lw        $v0, 0x78($s3)
-/* 804CFC 8024447C 3C15800B */  lui       $s5, %hi(gCameras)
-/* 804D00 80244480 26B51D80 */  addiu     $s5, $s5, %lo(gCameras)
-/* 804D04 80244484 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 804D08 80244488 8E62007C */  lw        $v0, 0x7c($s3)
-/* 804D0C 8024448C AFA20020 */  sw        $v0, 0x20($sp)
-/* 804D10 80244490 C66C0070 */  lwc1      $f12, 0x70($s3)
-/* 804D14 80244494 46806320 */  cvt.s.w   $f12, $f12
-/* 804D18 80244498 0C00A8BB */  jal       sin_deg
-/* 804D1C 8024449C 27B20068 */   addiu    $s2, $sp, 0x68
-/* 804D20 802444A0 46140002 */  mul.s     $f0, $f0, $f20
-/* 804D24 802444A4 00000000 */  nop
-/* 804D28 802444A8 0220A02D */  daddu     $s4, $s1, $zero
-/* 804D2C 802444AC C66C0070 */  lwc1      $f12, 0x70($s3)
-/* 804D30 802444B0 46806320 */  cvt.s.w   $f12, $f12
-/* 804D34 802444B4 4480B000 */  mtc1      $zero, $f22
-/* 804D38 802444B8 3C013F80 */  lui       $at, 0x3f80
-/* 804D3C 802444BC 4481D000 */  mtc1      $at, $f26
-/* 804D40 802444C0 0C00A8BB */  jal       sin_deg
-/* 804D44 802444C4 46140780 */   add.s    $f30, $f0, $f20
-/* 804D48 802444C8 3C0141C8 */  lui       $at, 0x41c8
-/* 804D4C 802444CC 44811000 */  mtc1      $at, $f2
-/* 804D50 802444D0 8E630070 */  lw        $v1, 0x70($s3)
-/* 804D54 802444D4 46020002 */  mul.s     $f0, $f0, $f2
-/* 804D58 802444D8 00000000 */  nop
-/* 804D5C 802444DC 00031080 */  sll       $v0, $v1, 2
-/* 804D60 802444E0 00431021 */  addu      $v0, $v0, $v1
-/* 804D64 802444E4 00021040 */  sll       $v0, $v0, 1
-/* 804D68 802444E8 4482C000 */  mtc1      $v0, $f24
-/* 804D6C 802444EC 00000000 */  nop
-/* 804D70 802444F0 4680C620 */  cvt.s.w   $f24, $f24
-/* 804D74 802444F4 46140700 */  add.s     $f28, $f0, $f20
-.L802444F8:
-/* 804D78 802444F8 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* 804D7C 802444FC 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* 804D80 80244500 4406B000 */  mfc1      $a2, $f22
-/* 804D84 80244504 00031080 */  sll       $v0, $v1, 2
-/* 804D88 80244508 00431021 */  addu      $v0, $v0, $v1
-/* 804D8C 8024450C 00021080 */  sll       $v0, $v0, 2
-/* 804D90 80244510 00431023 */  subu      $v0, $v0, $v1
-/* 804D94 80244514 000218C0 */  sll       $v1, $v0, 3
-/* 804D98 80244518 00431021 */  addu      $v0, $v0, $v1
-/* 804D9C 8024451C 000210C0 */  sll       $v0, $v0, 3
-/* 804DA0 80244520 00551021 */  addu      $v0, $v0, $s5
-/* 804DA4 80244524 C440006C */  lwc1      $f0, 0x6c($v0)
-/* 804DA8 80244528 4407D000 */  mfc1      $a3, $f26
-/* 804DAC 8024452C 46000007 */  neg.s     $f0, $f0
-/* 804DB0 80244530 44050000 */  mfc1      $a1, $f0
-/* 804DB4 80244534 0200202D */  daddu     $a0, $s0, $zero
-/* 804DB8 80244538 0C019EC8 */  jal       guRotateF
-/* 804DBC 8024453C E7B60010 */   swc1     $f22, 0x10($sp)
-/* 804DC0 80244540 44942000 */  mtc1      $s4, $f4
-/* 804DC4 80244544 00000000 */  nop
-/* 804DC8 80244548 46802120 */  cvt.s.w   $f4, $f4
-/* 804DCC 8024454C 4406B000 */  mfc1      $a2, $f22
-/* 804DD0 80244550 4407B000 */  mfc1      $a3, $f22
-/* 804DD4 80244554 44052000 */  mfc1      $a1, $f4
-/* 804DD8 80244558 0240202D */  daddu     $a0, $s2, $zero
-/* 804DDC 8024455C 0C019EC8 */  jal       guRotateF
-/* 804DE0 80244560 E7BA0010 */   swc1     $f26, 0x10($sp)
-/* 804DE4 80244564 0240202D */  daddu     $a0, $s2, $zero
-/* 804DE8 80244568 0200282D */  daddu     $a1, $s0, $zero
-/* 804DEC 8024456C 0C019D80 */  jal       guMtxCatF
-/* 804DF0 80244570 0200302D */   daddu    $a2, $s0, $zero
-/* 804DF4 80244574 0C00A8BB */  jal       sin_deg
-/* 804DF8 80244578 4600C306 */   mov.s    $f12, $f24
-/* 804DFC 8024457C 4600F502 */  mul.s     $f20, $f30, $f0
-/* 804E00 80244580 00000000 */  nop
-/* 804E04 80244584 0C00A8D4 */  jal       cos_deg
-/* 804E08 80244588 4600C306 */   mov.s    $f12, $f24
-/* 804E0C 8024458C 4600E002 */  mul.s     $f0, $f28, $f0
-/* 804E10 80244590 00000000 */  nop
-/* 804E14 80244594 4407B000 */  mfc1      $a3, $f22
-/* 804E18 80244598 44060000 */  mfc1      $a2, $f0
-/* 804E1C 8024459C 4405A000 */  mfc1      $a1, $f20
-/* 804E20 802445A0 0C019E40 */  jal       guTranslateF
-/* 804E24 802445A4 0240202D */   daddu    $a0, $s2, $zero
-/* 804E28 802445A8 0240202D */  daddu     $a0, $s2, $zero
-/* 804E2C 802445AC 0200282D */  daddu     $a1, $s0, $zero
-/* 804E30 802445B0 0C019D80 */  jal       guMtxCatF
-/* 804E34 802445B4 0200302D */   daddu    $a2, $s0, $zero
-/* 804E38 802445B8 00111880 */  sll       $v1, $s1, 2
-/* 804E3C 802445BC 27A40018 */  addiu     $a0, $sp, 0x18
-/* 804E40 802445C0 00831821 */  addu      $v1, $a0, $v1
-/* 804E44 802445C4 8C620000 */  lw        $v0, ($v1)
-/* 804E48 802445C8 C7A00058 */  lwc1      $f0, 0x58($sp)
-/* 804E4C 802445CC 8C42000C */  lw        $v0, 0xc($v0)
-/* 804E50 802445D0 E4400010 */  swc1      $f0, 0x10($v0)
-/* 804E54 802445D4 8C620000 */  lw        $v0, ($v1)
-/* 804E58 802445D8 C7A0005C */  lwc1      $f0, 0x5c($sp)
-/* 804E5C 802445DC 8C42000C */  lw        $v0, 0xc($v0)
-/* 804E60 802445E0 E4400014 */  swc1      $f0, 0x14($v0)
-/* 804E64 802445E4 8C620000 */  lw        $v0, ($v1)
-/* 804E68 802445E8 C7A00060 */  lwc1      $f0, 0x60($sp)
-/* 804E6C 802445EC 8C42000C */  lw        $v0, 0xc($v0)
-/* 804E70 802445F0 26310001 */  addiu     $s1, $s1, 1
-/* 804E74 802445F4 E4400018 */  swc1      $f0, 0x18($v0)
-/* 804E78 802445F8 2A220003 */  slti      $v0, $s1, 3
-/* 804E7C 802445FC 1440FFBE */  bnez      $v0, .L802444F8
-/* 804E80 80244600 26940078 */   addiu    $s4, $s4, 0x78
-/* 804E84 80244604 8E620070 */  lw        $v0, 0x70($s3)
-/* 804E88 80244608 2442FFFF */  addiu     $v0, $v0, -1
-/* 804E8C 8024460C AE620070 */  sw        $v0, 0x70($s3)
-/* 804E90 80244610 28420010 */  slti      $v0, $v0, 0x10
-/* 804E94 80244614 1040000A */  beqz      $v0, .L80244640
-/* 804E98 80244618 00000000 */   nop
-/* 804E9C 8024461C 0000882D */  daddu     $s1, $zero, $zero
-.L80244620:
-/* 804EA0 80244620 8C820000 */  lw        $v0, ($a0)
-/* 804EA4 80244624 8C43000C */  lw        $v1, 0xc($v0)
-/* 804EA8 80244628 8E620070 */  lw        $v0, 0x70($s3)
-/* 804EAC 8024462C 26310001 */  addiu     $s1, $s1, 1
-/* 804EB0 80244630 AC62004C */  sw        $v0, 0x4c($v1)
-/* 804EB4 80244634 2A220003 */  slti      $v0, $s1, 3
-/* 804EB8 80244638 1440FFF9 */  bnez      $v0, .L80244620
-/* 804EBC 8024463C 24840004 */   addiu    $a0, $a0, 4
-.L80244640:
-/* 804EC0 80244640 8E620070 */  lw        $v0, 0x70($s3)
-/* 804EC4 80244644 0441000A */  bgez      $v0, .L80244670
-/* 804EC8 80244648 0000102D */   daddu    $v0, $zero, $zero
-/* 804ECC 8024464C 0000882D */  daddu     $s1, $zero, $zero
-/* 804ED0 80244650 27B00018 */  addiu     $s0, $sp, 0x18
-.L80244654:
-/* 804ED4 80244654 8E040000 */  lw        $a0, ($s0)
-/* 804ED8 80244658 26100004 */  addiu     $s0, $s0, 4
-/* 804EDC 8024465C 0C016914 */  jal       remove_effect
-/* 804EE0 80244660 26310001 */   addiu    $s1, $s1, 1
-/* 804EE4 80244664 2A220003 */  slti      $v0, $s1, 3
-/* 804EE8 80244668 1440FFFA */  bnez      $v0, .L80244654
-/* 804EEC 8024466C 24020002 */   addiu    $v0, $zero, 2
-.L80244670:
-/* 804EF0 80244670 8FBF00C0 */  lw        $ra, 0xc0($sp)
-/* 804EF4 80244674 8FB500BC */  lw        $s5, 0xbc($sp)
-/* 804EF8 80244678 8FB400B8 */  lw        $s4, 0xb8($sp)
-/* 804EFC 8024467C 8FB300B4 */  lw        $s3, 0xb4($sp)
-/* 804F00 80244680 8FB200B0 */  lw        $s2, 0xb0($sp)
-/* 804F04 80244684 8FB100AC */  lw        $s1, 0xac($sp)
-/* 804F08 80244688 8FB000A8 */  lw        $s0, 0xa8($sp)
-/* 804F0C 8024468C D7BE00F0 */  ldc1      $f30, 0xf0($sp)
-/* 804F10 80244690 D7BC00E8 */  ldc1      $f28, 0xe8($sp)
-/* 804F14 80244694 D7BA00E0 */  ldc1      $f26, 0xe0($sp)
-/* 804F18 80244698 D7B800D8 */  ldc1      $f24, 0xd8($sp)
-/* 804F1C 8024469C D7B600D0 */  ldc1      $f22, 0xd0($sp)
-/* 804F20 802446A0 D7B400C8 */  ldc1      $f20, 0xc8($sp)
-/* 804F24 802446A4 03E00008 */  jr        $ra
-/* 804F28 802446A8 27BD00F8 */   addiu    $sp, $sp, 0xf8
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446AC_804F2C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446AC_804F2C.s
deleted file mode 100644
index 01f4b3cac1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446AC_804F2C.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802446AC_804F2C
-/* 804F2C 802446AC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 804F30 802446B0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 804F34 802446B4 8C82000C */  lw        $v0, 0xc($a0)
-/* 804F38 802446B8 0C0B1EAF */  jal       evt_get_variable
-/* 804F3C 802446BC 8C450000 */   lw       $a1, ($v0)
-/* 804F40 802446C0 8C44000C */  lw        $a0, 0xc($v0)
-/* 804F44 802446C4 8C83001C */  lw        $v1, 0x1c($a0)
-/* 804F48 802446C8 24630001 */  addiu     $v1, $v1, 1
-/* 804F4C 802446CC AC83001C */  sw        $v1, 0x1c($a0)
-/* 804F50 802446D0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 804F54 802446D4 24020002 */  addiu     $v0, $zero, 2
-/* 804F58 802446D8 03E00008 */  jr        $ra
-/* 804F5C 802446DC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244984_805204.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244984_805204.s
deleted file mode 100644
index 93bd5e8e74..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244984_805204.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80244984_805204
-/* 805204 80244984 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 805208 80244988 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 80520C 8024498C 0080982D */  daddu     $s3, $a0, $zero
-/* 805210 80244990 AFB20018 */  sw        $s2, 0x18($sp)
-/* 805214 80244994 3C12F840 */  lui       $s2, 0xf840
-/* 805218 80244998 36526200 */  ori       $s2, $s2, 0x6200
-/* 80521C 8024499C AFB10014 */  sw        $s1, 0x14($sp)
-/* 805220 802449A0 0000882D */  daddu     $s1, $zero, $zero
-/* 805224 802449A4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 805228 802449A8 0220802D */  daddu     $s0, $s1, $zero
-/* 80522C 802449AC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 805230 802449B0 0000202D */  daddu     $a0, $zero, $zero
-.L802449B4:
-/* 805234 802449B4 0C0B1EAF */  jal       evt_get_variable
-/* 805238 802449B8 02502821 */   addu     $a1, $s2, $s0
-/* 80523C 802449BC 50400001 */  beql      $v0, $zero, .L802449C4
-/* 805240 802449C0 26310001 */   addiu    $s1, $s1, 1
-.L802449C4:
-/* 805244 802449C4 26100001 */  addiu     $s0, $s0, 1
-/* 805248 802449C8 2A020010 */  slti      $v0, $s0, 0x10
-/* 80524C 802449CC 1440FFF9 */  bnez      $v0, .L802449B4
-/* 805250 802449D0 0000202D */   daddu    $a0, $zero, $zero
-/* 805254 802449D4 AE710084 */  sw        $s1, 0x84($s3)
-/* 805258 802449D8 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 80525C 802449DC 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 805260 802449E0 8FB20018 */  lw        $s2, 0x18($sp)
-/* 805264 802449E4 8FB10014 */  lw        $s1, 0x14($sp)
-/* 805268 802449E8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 80526C 802449EC 24020002 */  addiu     $v0, $zero, 2
-/* 805270 802449F0 03E00008 */  jr        $ra
-/* 805274 802449F4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802449F8_805278.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802449F8_805278.s
deleted file mode 100644
index 0670d9d45a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802449F8_805278.s
+++ /dev/null
@@ -1,113 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802449F8_805278
-/* 805278 802449F8 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 80527C 802449FC AFB00010 */  sw        $s0, 0x10($sp)
-/* 805280 80244A00 0080802D */  daddu     $s0, $a0, $zero
-/* 805284 80244A04 0000202D */  daddu     $a0, $zero, $zero
-/* 805288 80244A08 3C05FD05 */  lui       $a1, 0xfd05
-/* 80528C 80244A0C AFBF0024 */  sw        $ra, 0x24($sp)
-/* 805290 80244A10 AFB40020 */  sw        $s4, 0x20($sp)
-/* 805294 80244A14 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 805298 80244A18 AFB20018 */  sw        $s2, 0x18($sp)
-/* 80529C 80244A1C AFB10014 */  sw        $s1, 0x14($sp)
-/* 8052A0 80244A20 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* 8052A4 80244A24 0C0B1EAF */  jal       evt_get_variable
-/* 8052A8 80244A28 34A50F81 */   ori      $a1, $a1, 0xf81
-/* 8052AC 80244A2C 0000202D */  daddu     $a0, $zero, $zero
-/* 8052B0 80244A30 3C05FD05 */  lui       $a1, 0xfd05
-/* 8052B4 80244A34 34A50F80 */  ori       $a1, $a1, 0xf80
-/* 8052B8 80244A38 0C0B1EAF */  jal       evt_get_variable
-/* 8052BC 80244A3C 00029823 */   negu     $s3, $v0
-/* 8052C0 80244A40 24040002 */  addiu     $a0, $zero, 2
-/* 8052C4 80244A44 8E1100A0 */  lw        $s1, 0xa0($s0)
-/* 8052C8 80244A48 0C00FB3A */  jal       get_enemy
-/* 8052CC 80244A4C 0040A02D */   daddu    $s4, $v0, $zero
-/* 8052D0 80244A50 4493A000 */  mtc1      $s3, $f20
-/* 8052D4 80244A54 00000000 */  nop
-/* 8052D8 80244A58 4680A520 */  cvt.s.w   $f20, $f20
-/* 8052DC 80244A5C 3C014334 */  lui       $at, 0x4334
-/* 8052E0 80244A60 44810000 */  mtc1      $at, $f0
-/* 8052E4 80244A64 3C014049 */  lui       $at, 0x4049
-/* 8052E8 80244A68 34210FD8 */  ori       $at, $at, 0xfd8
-/* 8052EC 80244A6C 44811000 */  mtc1      $at, $f2
-/* 8052F0 80244A70 4600A503 */  div.s     $f20, $f20, $f0
-/* 8052F4 80244A74 4602A502 */  mul.s     $f20, $f20, $f2
-/* 8052F8 80244A78 00000000 */  nop
-/* 8052FC 80244A7C 0040902D */  daddu     $s2, $v0, $zero
-/* 805300 80244A80 0C00A85B */  jal       sin_rad
-/* 805304 80244A84 4600A306 */   mov.s    $f12, $f20
-/* 805308 80244A88 4600A306 */  mov.s     $f12, $f20
-/* 80530C 80244A8C 0C00A874 */  jal       cos_rad
-/* 805310 80244A90 46000506 */   mov.s    $f20, $f0
-/* 805314 80244A94 C6060084 */  lwc1      $f6, 0x84($s0)
-/* 805318 80244A98 468031A0 */  cvt.s.w   $f6, $f6
-/* 80531C 80244A9C 46003102 */  mul.s     $f4, $f6, $f0
-/* 805320 80244AA0 00000000 */  nop
-/* 805324 80244AA4 C6020088 */  lwc1      $f2, 0x88($s0)
-/* 805328 80244AA8 468010A0 */  cvt.s.w   $f2, $f2
-/* 80532C 80244AAC 46141202 */  mul.s     $f8, $f2, $f20
-/* 805330 80244AB0 00000000 */  nop
-/* 805334 80244AB4 46143182 */  mul.s     $f6, $f6, $f20
-/* 805338 80244AB8 00000000 */  nop
-/* 80533C 80244ABC 46001082 */  mul.s     $f2, $f2, $f0
-/* 805340 80244AC0 00000000 */  nop
-/* 805344 80244AC4 46082101 */  sub.s     $f4, $f4, $f8
-/* 805348 80244AC8 8E02008C */  lw        $v0, 0x8c($s0)
-/* 80534C 80244ACC 46023180 */  add.s     $f6, $f6, $f2
-/* 805350 80244AD0 4600228D */  trunc.w.s $f10, $f4
-/* 805354 80244AD4 44035000 */  mfc1      $v1, $f10
-/* 805358 80244AD8 00000000 */  nop
-/* 80535C 80244ADC 00431021 */  addu      $v0, $v0, $v1
-/* 805360 80244AE0 AE020094 */  sw        $v0, 0x94($s0)
-/* 805364 80244AE4 8E020090 */  lw        $v0, 0x90($s0)
-/* 805368 80244AE8 4600328D */  trunc.w.s $f10, $f6
-/* 80536C 80244AEC 44035000 */  mfc1      $v1, $f10
-/* 805370 80244AF0 00000000 */  nop
-/* 805374 80244AF4 00431021 */  addu      $v0, $v0, $v1
-/* 805378 80244AF8 16600009 */  bnez      $s3, .L80244B20
-/* 80537C 80244AFC AE020098 */   sw       $v0, 0x98($s0)
-/* 805380 80244B00 3C0200A7 */  lui       $v0, 0xa7
-/* 805384 80244B04 34420001 */  ori       $v0, $v0, 1
-/* 805388 80244B08 3C03F7FF */  lui       $v1, 0xf7ff
-/* 80538C 80244B0C AE220028 */  sw        $v0, 0x28($s1)
-/* 805390 80244B10 8E420000 */  lw        $v0, ($s2)
-/* 805394 80244B14 3463FFFF */  ori       $v1, $v1, 0xffff
-/* 805398 80244B18 080912CE */  j         .L80244B38
-/* 80539C 80244B1C 00431024 */   and      $v0, $v0, $v1
-.L80244B20:
-/* 8053A0 80244B20 3C0200A7 */  lui       $v0, 0xa7
-/* 8053A4 80244B24 34420002 */  ori       $v0, $v0, 2
-/* 8053A8 80244B28 AE220028 */  sw        $v0, 0x28($s1)
-/* 8053AC 80244B2C 8E420000 */  lw        $v0, ($s2)
-/* 8053B0 80244B30 3C030800 */  lui       $v1, 0x800
-/* 8053B4 80244B34 00431025 */  or        $v0, $v0, $v1
-.L80244B38:
-/* 8053B8 80244B38 AE420000 */  sw        $v0, ($s2)
-/* 8053BC 80244B3C 2402FFC4 */  addiu     $v0, $zero, -0x3c
-/* 8053C0 80244B40 16620004 */  bne       $s3, $v0, .L80244B54
-/* 8053C4 80244B44 2403FFFD */   addiu    $v1, $zero, -3
-/* 8053C8 80244B48 8E220000 */  lw        $v0, ($s1)
-/* 8053CC 80244B4C 080912D7 */  j         .L80244B5C
-/* 8053D0 80244B50 34420002 */   ori      $v0, $v0, 2
-.L80244B54:
-/* 8053D4 80244B54 8E220000 */  lw        $v0, ($s1)
-/* 8053D8 80244B58 00431024 */  and       $v0, $v0, $v1
-.L80244B5C:
-/* 8053DC 80244B5C 12800004 */  beqz      $s4, .L80244B70
-/* 8053E0 80244B60 AE220000 */   sw       $v0, ($s1)
-/* 8053E4 80244B64 3C0200A7 */  lui       $v0, 0xa7
-/* 8053E8 80244B68 34420006 */  ori       $v0, $v0, 6
-/* 8053EC 80244B6C AE220028 */  sw        $v0, 0x28($s1)
-.L80244B70:
-/* 8053F0 80244B70 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 8053F4 80244B74 8FB40020 */  lw        $s4, 0x20($sp)
-/* 8053F8 80244B78 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 8053FC 80244B7C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 805400 80244B80 8FB10014 */  lw        $s1, 0x14($sp)
-/* 805404 80244B84 8FB00010 */  lw        $s0, 0x10($sp)
-/* 805408 80244B88 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* 80540C 80244B8C 24020002 */  addiu     $v0, $zero, 2
-/* 805410 80244B90 03E00008 */  jr        $ra
-/* 805414 80244B94 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E10_805690.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E10_805690.s
deleted file mode 100644
index b2e63c1e35..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E10_805690.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80244E10_805690
-/* 805690 80244E10 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 805694 80244E14 AFB00010 */  sw        $s0, 0x10($sp)
-/* 805698 80244E18 0080802D */  daddu     $s0, $a0, $zero
-/* 80569C 80244E1C AFBF0014 */  sw        $ra, 0x14($sp)
-/* 8056A0 80244E20 8E02000C */  lw        $v0, 0xc($s0)
-/* 8056A4 80244E24 0C0B1EAF */  jal       evt_get_variable
-/* 8056A8 80244E28 8C450000 */   lw       $a1, ($v0)
-/* 8056AC 80244E2C C6000084 */  lwc1      $f0, 0x84($s0)
-/* 8056B0 80244E30 46800020 */  cvt.s.w   $f0, $f0
-/* 8056B4 80244E34 00021100 */  sll       $v0, $v0, 4
-/* 8056B8 80244E38 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 8056BC 80244E3C 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 8056C0 80244E40 44050000 */  mfc1      $a1, $f0
-/* 8056C4 80244E44 C6000088 */  lwc1      $f0, 0x88($s0)
-/* 8056C8 80244E48 46800020 */  cvt.s.w   $f0, $f0
-/* 8056CC 80244E4C 8C630140 */  lw        $v1, 0x140($v1)
-/* 8056D0 80244E50 44060000 */  mfc1      $a2, $f0
-/* 8056D4 80244E54 00431021 */  addu      $v0, $v0, $v1
-/* 8056D8 80244E58 8E03008C */  lw        $v1, 0x8c($s0)
-/* 8056DC 80244E5C 8C440000 */  lw        $a0, ($v0)
-/* 8056E0 80244E60 24630006 */  addiu     $v1, $v1, 6
-/* 8056E4 80244E64 44830000 */  mtc1      $v1, $f0
-/* 8056E8 80244E68 00000000 */  nop
-/* 8056EC 80244E6C 46800020 */  cvt.s.w   $f0, $f0
-/* 8056F0 80244E70 44070000 */  mfc1      $a3, $f0
-/* 8056F4 80244E74 0C04D083 */  jal       set_item_entity_position
-/* 8056F8 80244E78 00000000 */   nop
-/* 8056FC 80244E7C 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 805700 80244E80 8FB00010 */  lw        $s0, 0x10($sp)
-/* 805704 80244E84 24020002 */  addiu     $v0, $zero, 2
-/* 805708 80244E88 03E00008 */  jr        $ra
-/* 80570C 80244E8C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E90_805710.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E90_805710.s
deleted file mode 100644
index c91a841a67..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E90_805710.s
+++ /dev/null
@@ -1,58 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80244E90_805710
-/* 805710 80244E90 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 805714 80244E94 AFB60028 */  sw        $s6, 0x28($sp)
-/* 805718 80244E98 0080B02D */  daddu     $s6, $a0, $zero
-/* 80571C 80244E9C AFB50024 */  sw        $s5, 0x24($sp)
-/* 805720 80244EA0 3C158011 */  lui       $s5, %hi(gPlayerData)
-/* 805724 80244EA4 26B5F290 */  addiu     $s5, $s5, %lo(gPlayerData)
-/* 805728 80244EA8 AFB20018 */  sw        $s2, 0x18($sp)
-/* 80572C 80244EAC 2412FFFF */  addiu     $s2, $zero, -1
-/* 805730 80244EB0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 805734 80244EB4 0000802D */  daddu     $s0, $zero, $zero
-/* 805738 80244EB8 AFB40020 */  sw        $s4, 0x20($sp)
-/* 80573C 80244EBC 3C14F840 */  lui       $s4, 0xf840
-/* 805740 80244EC0 36945C19 */  ori       $s4, $s4, 0x5c19
-/* 805744 80244EC4 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 805748 80244EC8 3C13F840 */  lui       $s3, 0xf840
-/* 80574C 80244ECC 36735C2C */  ori       $s3, $s3, 0x5c2c
-/* 805750 80244ED0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 805754 80244ED4 3C118025 */  lui       $s1, %hi(D_80256ADC_81735C)
-/* 805758 80244ED8 26316ADC */  addiu     $s1, $s1, %lo(D_80256ADC_81735C)
-/* 80575C 80244EDC AFBF002C */  sw        $ra, 0x2c($sp)
-.L80244EE0:
-/* 805760 80244EE0 8E220000 */  lw        $v0, ($s1)
-/* 805764 80244EE4 000210C0 */  sll       $v0, $v0, 3
-/* 805768 80244EE8 02A21021 */  addu      $v0, $s5, $v0
-/* 80576C 80244EEC 90420014 */  lbu       $v0, 0x14($v0)
-/* 805770 80244EF0 1040000A */  beqz      $v0, .L80244F1C
-/* 805774 80244EF4 0000202D */   daddu    $a0, $zero, $zero
-/* 805778 80244EF8 0C0B1EAF */  jal       evt_get_variable
-/* 80577C 80244EFC 02142821 */   addu     $a1, $s0, $s4
-/* 805780 80244F00 10400006 */  beqz      $v0, .L80244F1C
-/* 805784 80244F04 0000202D */   daddu    $a0, $zero, $zero
-/* 805788 80244F08 0C0B1EAF */  jal       evt_get_variable
-/* 80578C 80244F0C 02132821 */   addu     $a1, $s0, $s3
-/* 805790 80244F10 10400006 */  beqz      $v0, .L80244F2C
-/* 805794 80244F14 24120001 */   addiu    $s2, $zero, 1
-/* 805798 80244F18 0000902D */  daddu     $s2, $zero, $zero
-.L80244F1C:
-/* 80579C 80244F1C 26100001 */  addiu     $s0, $s0, 1
-/* 8057A0 80244F20 2E020013 */  sltiu     $v0, $s0, 0x13
-/* 8057A4 80244F24 1440FFEE */  bnez      $v0, .L80244EE0
-/* 8057A8 80244F28 26310014 */   addiu    $s1, $s1, 0x14
-.L80244F2C:
-/* 8057AC 80244F2C AED20084 */  sw        $s2, 0x84($s6)
-/* 8057B0 80244F30 8FBF002C */  lw        $ra, 0x2c($sp)
-/* 8057B4 80244F34 8FB60028 */  lw        $s6, 0x28($sp)
-/* 8057B8 80244F38 8FB50024 */  lw        $s5, 0x24($sp)
-/* 8057BC 80244F3C 8FB40020 */  lw        $s4, 0x20($sp)
-/* 8057C0 80244F40 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 8057C4 80244F44 8FB20018 */  lw        $s2, 0x18($sp)
-/* 8057C8 80244F48 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8057CC 80244F4C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8057D0 80244F50 24020002 */  addiu     $v0, $zero, 2
-/* 8057D4 80244F54 03E00008 */  jr        $ra
-/* 8057D8 80244F58 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244F5C_8057DC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244F5C_8057DC.s
deleted file mode 100644
index 62aa7d84ca..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244F5C_8057DC.s
+++ /dev/null
@@ -1,55 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80244F5C_8057DC
-/* 8057DC 80244F5C 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 8057E0 80244F60 AFB50024 */  sw        $s5, 0x24($sp)
-/* 8057E4 80244F64 0080A82D */  daddu     $s5, $a0, $zero
-/* 8057E8 80244F68 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8057EC 80244F6C 0000882D */  daddu     $s1, $zero, $zero
-/* 8057F0 80244F70 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8057F4 80244F74 0220802D */  daddu     $s0, $s1, $zero
-/* 8057F8 80244F78 AFB40020 */  sw        $s4, 0x20($sp)
-/* 8057FC 80244F7C 3C14F840 */  lui       $s4, 0xf840
-/* 805800 80244F80 36945C19 */  ori       $s4, $s4, 0x5c19
-/* 805804 80244F84 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 805808 80244F88 3C13F840 */  lui       $s3, 0xf840
-/* 80580C 80244F8C 36735C2C */  ori       $s3, $s3, 0x5c2c
-/* 805810 80244F90 AFB20018 */  sw        $s2, 0x18($sp)
-/* 805814 80244F94 3C128025 */  lui       $s2, %hi(D_80256ADC_81735C)
-/* 805818 80244F98 26526ADC */  addiu     $s2, $s2, %lo(D_80256ADC_81735C)
-/* 80581C 80244F9C AFBF0028 */  sw        $ra, 0x28($sp)
-.L80244FA0:
-/* 805820 80244FA0 8E420000 */  lw        $v0, ($s2)
-/* 805824 80244FA4 5455000F */  bnel      $v0, $s5, .L80244FE4
-/* 805828 80244FA8 26100001 */   addiu    $s0, $s0, 1
-/* 80582C 80244FAC 0000202D */  daddu     $a0, $zero, $zero
-/* 805830 80244FB0 0C0B1EAF */  jal       evt_get_variable
-/* 805834 80244FB4 02142821 */   addu     $a1, $s0, $s4
-/* 805838 80244FB8 5040000A */  beql      $v0, $zero, .L80244FE4
-/* 80583C 80244FBC 26100001 */   addiu    $s0, $s0, 1
-/* 805840 80244FC0 52200001 */  beql      $s1, $zero, .L80244FC8
-/* 805844 80244FC4 24110001 */   addiu    $s1, $zero, 1
-.L80244FC8:
-/* 805848 80244FC8 0000202D */  daddu     $a0, $zero, $zero
-/* 80584C 80244FCC 0C0B1EAF */  jal       evt_get_variable
-/* 805850 80244FD0 02132821 */   addu     $a1, $s0, $s3
-/* 805854 80244FD4 14400003 */  bnez      $v0, .L80244FE4
-/* 805858 80244FD8 26100001 */   addiu    $s0, $s0, 1
-/* 80585C 80244FDC 080913FC */  j         .L80244FF0
-/* 805860 80244FE0 24110002 */   addiu    $s1, $zero, 2
-.L80244FE4:
-/* 805864 80244FE4 2E020013 */  sltiu     $v0, $s0, 0x13
-/* 805868 80244FE8 1440FFED */  bnez      $v0, .L80244FA0
-/* 80586C 80244FEC 26520014 */   addiu    $s2, $s2, 0x14
-.L80244FF0:
-/* 805870 80244FF0 0220102D */  daddu     $v0, $s1, $zero
-/* 805874 80244FF4 8FBF0028 */  lw        $ra, 0x28($sp)
-/* 805878 80244FF8 8FB50024 */  lw        $s5, 0x24($sp)
-/* 80587C 80244FFC 8FB40020 */  lw        $s4, 0x20($sp)
-/* 805880 80245000 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 805884 80245004 8FB20018 */  lw        $s2, 0x18($sp)
-/* 805888 80245008 8FB10014 */  lw        $s1, 0x14($sp)
-/* 80588C 8024500C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 805890 80245010 03E00008 */  jr        $ra
-/* 805894 80245014 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s
deleted file mode 100644
index 76c7abb609..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s
+++ /dev/null
@@ -1,142 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80245028_8058A8
-/* 8058A8 80245028 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* 8058AC 8024502C AFB70034 */  sw        $s7, 0x34($sp)
-/* 8058B0 80245030 0080B82D */  daddu     $s7, $a0, $zero
-/* 8058B4 80245034 AFBE0038 */  sw        $fp, 0x38($sp)
-/* 8058B8 80245038 3C1E8026 */  lui       $fp, %hi(D_80262C38)
-/* 8058BC 8024503C 27DE2C38 */  addiu     $fp, $fp, %lo(D_80262C38)
-/* 8058C0 80245040 AFBF003C */  sw        $ra, 0x3c($sp)
-/* 8058C4 80245044 AFB60030 */  sw        $s6, 0x30($sp)
-/* 8058C8 80245048 AFB5002C */  sw        $s5, 0x2c($sp)
-/* 8058CC 8024504C AFB40028 */  sw        $s4, 0x28($sp)
-/* 8058D0 80245050 AFB30024 */  sw        $s3, 0x24($sp)
-/* 8058D4 80245054 AFB20020 */  sw        $s2, 0x20($sp)
-/* 8058D8 80245058 AFB1001C */  sw        $s1, 0x1c($sp)
-/* 8058DC 8024505C 10A00045 */  beqz      $a1, .L80245174
-/* 8058E0 80245060 AFB00018 */   sw       $s0, 0x18($sp)
-/* 8058E4 80245064 0000B02D */  daddu     $s6, $zero, $zero
-/* 8058E8 80245068 24150001 */  addiu     $s5, $zero, 1
-/* 8058EC 8024506C 02A0282D */  daddu     $a1, $s5, $zero
-/* 8058F0 80245070 3C148009 */  lui       $s4, %hi(D_8008EEC0 + 4)
-/* 8058F4 80245074 2694EEC4 */  addiu     $s4, $s4, %lo(D_8008EEC0 + 4)
-/* 8058F8 80245078 03C0882D */  daddu     $s1, $fp, $zero
-.L8024507C:
-/* 8058FC 8024507C 8E900000 */  lw        $s0, ($s4)
-/* 805900 80245080 3C068011 */  lui       $a2, %hi(gPlayerData)
-/* 805904 80245084 24C6F290 */  addiu     $a2, $a2, %lo(gPlayerData)
-/* 805908 80245088 001010C0 */  sll       $v0, $s0, 3
-/* 80590C 8024508C 00C29821 */  addu      $s3, $a2, $v0
-/* 805910 80245090 92620014 */  lbu       $v0, 0x14($s3)
-/* 805914 80245094 50400027 */  beql      $v0, $zero, .L80245134
-/* 805918 80245098 26B50001 */   addiu    $s5, $s5, 1
-/* 80591C 8024509C 24060005 */  addiu     $a2, $zero, 5
-/* 805920 802450A0 52060024 */  beql      $s0, $a2, .L80245134
-/* 805924 802450A4 26B50001 */   addiu    $s5, $s5, 1
-/* 805928 802450A8 0200202D */  daddu     $a0, $s0, $zero
-/* 80592C 802450AC 00101100 */  sll       $v0, $s0, 4
-/* 805930 802450B0 3C068009 */  lui       $a2, %hi(gPartnerPopupProperties)
-/* 805934 802450B4 24C6EF20 */  addiu     $a2, $a2, %lo(gPartnerPopupProperties)
-/* 805938 802450B8 00469021 */  addu      $s2, $v0, $a2
-/* 80593C 802450BC 0C0913D7 */  jal       func_80244F5C_8057DC
-/* 805940 802450C0 AFA50010 */   sw       $a1, 0x10($sp)
-/* 805944 802450C4 0040182D */  daddu     $v1, $v0, $zero
-/* 805948 802450C8 8FA50010 */  lw        $a1, 0x10($sp)
-/* 80594C 802450CC 50600019 */  beql      $v1, $zero, .L80245134
-/* 805950 802450D0 26B50001 */   addiu    $s5, $s5, 1
-/* 805954 802450D4 00102080 */  sll       $a0, $s0, 2
-/* 805958 802450D8 3C06800F */  lui       $a2, %hi(wPartnerHudScripts)
-/* 80595C 802450DC 24C67F00 */  addiu     $a2, $a2, %lo(wPartnerHudScripts)
-/* 805960 802450E0 00861021 */  addu      $v0, $a0, $a2
-/* 805964 802450E4 8C420000 */  lw        $v0, ($v0)
-/* 805968 802450E8 AE300108 */  sw        $s0, 0x108($s1)
-/* 80596C 802450EC AE25018C */  sw        $a1, 0x18c($s1)
-/* 805970 802450F0 AE220000 */  sw        $v0, ($s1)
-/* 805974 802450F4 8E420000 */  lw        $v0, ($s2)
-/* 805978 802450F8 AE220084 */  sw        $v0, 0x84($s1)
-/* 80597C 802450FC 8E420008 */  lw        $v0, 8($s2)
-/* 805980 80245100 AE220294 */  sw        $v0, 0x294($s1)
-/* 805984 80245104 82620015 */  lb        $v0, 0x15($s3)
-/* 805988 80245108 14650007 */  bne       $v1, $a1, .L80245128
-/* 80598C 8024510C AE220210 */   sw       $v0, 0x210($s1)
-/* 805990 80245110 3C06800F */  lui       $a2, %hi(wDisabledPartnerHudScripts)
-/* 805994 80245114 24C67F40 */  addiu     $a2, $a2, %lo(wDisabledPartnerHudScripts)
-/* 805998 80245118 00861021 */  addu      $v0, $a0, $a2
-/* 80599C 8024511C AE20018C */  sw        $zero, 0x18c($s1)
-/* 8059A0 80245120 8C420000 */  lw        $v0, ($v0)
-/* 8059A4 80245124 AE220000 */  sw        $v0, ($s1)
-.L80245128:
-/* 8059A8 80245128 26310004 */  addiu     $s1, $s1, 4
-/* 8059AC 8024512C 26D60001 */  addiu     $s6, $s6, 1
-/* 8059B0 80245130 26B50001 */  addiu     $s5, $s5, 1
-.L80245134:
-/* 8059B4 80245134 2AA2000C */  slti      $v0, $s5, 0xc
-/* 8059B8 80245138 1440FFD0 */  bnez      $v0, .L8024507C
-/* 8059BC 8024513C 26940004 */   addiu    $s4, $s4, 4
-/* 8059C0 80245140 03C0202D */  daddu     $a0, $fp, $zero
-/* 8059C4 80245144 3C038026 */  lui       $v1, %hi(D_80262F68)
-/* 8059C8 80245148 8C632F68 */  lw        $v1, %lo(D_80262F68)($v1)
-/* 8059CC 8024514C 2402000D */  addiu     $v0, $zero, 0xd
-/* 8059D0 80245150 AFC20318 */  sw        $v0, 0x318($fp)
-/* 8059D4 80245154 AFD60324 */  sw        $s6, 0x324($fp)
-/* 8059D8 80245158 0C03D390 */  jal       create_popup_menu
-/* 8059DC 8024515C AFC30328 */   sw       $v1, 0x328($fp)
-/* 8059E0 80245160 0C03A631 */  jal       func_800E98C4
-/* 8059E4 80245164 00000000 */   nop
-/* 8059E8 80245168 0C03A5EE */  jal       close_status_menu
-/* 8059EC 8024516C 00000000 */   nop
-/* 8059F0 80245170 AEE00070 */  sw        $zero, 0x70($s7)
-.L80245174:
-/* 8059F4 80245174 8EE20070 */  lw        $v0, 0x70($s7)
-/* 8059F8 80245178 14400008 */  bnez      $v0, .L8024519C
-/* 8059FC 8024517C 24420001 */   addiu    $v0, $v0, 1
-/* 805A00 80245180 87C2032C */  lh        $v0, 0x32c($fp)
-/* 805A04 80245184 10400009 */  beqz      $v0, .L802451AC
-/* 805A08 80245188 AEE20074 */   sw       $v0, 0x74($s7)
-/* 805A0C 8024518C 0C03C4EC */  jal       hide_popup_menu
-/* 805A10 80245190 00000000 */   nop
-/* 805A14 80245194 8EE20070 */  lw        $v0, 0x70($s7)
-/* 805A18 80245198 24420001 */  addiu     $v0, $v0, 1
-.L8024519C:
-/* 805A1C 8024519C AEE20070 */  sw        $v0, 0x70($s7)
-/* 805A20 802451A0 28420014 */  slti      $v0, $v0, 0x14
-/* 805A24 802451A4 10400003 */  beqz      $v0, .L802451B4
-/* 805A28 802451A8 00000000 */   nop
-.L802451AC:
-/* 805A2C 802451AC 0809147F */  j         .L802451FC
-/* 805A30 802451B0 0000102D */   daddu    $v0, $zero, $zero
-.L802451B4:
-/* 805A34 802451B4 0C03C54E */  jal       destroy_popup_menu
-/* 805A38 802451B8 00000000 */   nop
-/* 805A3C 802451BC 8EE30074 */  lw        $v1, 0x74($s7)
-/* 805A40 802451C0 240200FF */  addiu     $v0, $zero, 0xff
-/* 805A44 802451C4 1062000A */  beq       $v1, $v0, .L802451F0
-/* 805A48 802451C8 2462FFFF */   addiu    $v0, $v1, -1
-/* 805A4C 802451CC 00021080 */  sll       $v0, $v0, 2
-/* 805A50 802451D0 03C21021 */  addu      $v0, $fp, $v0
-/* 805A54 802451D4 8C500108 */  lw        $s0, 0x108($v0)
-/* 805A58 802451D8 24020002 */  addiu     $v0, $zero, 2
-/* 805A5C 802451DC 2463FFFF */  addiu     $v1, $v1, -1
-/* 805A60 802451E0 3C018026 */  lui       $at, %hi(D_80262F68)
-/* 805A64 802451E4 AC232F68 */  sw        $v1, %lo(D_80262F68)($at)
-/* 805A68 802451E8 0809147F */  j         .L802451FC
-/* 805A6C 802451EC AEF00088 */   sw       $s0, 0x88($s7)
-.L802451F0:
-/* 805A70 802451F0 2402FFFF */  addiu     $v0, $zero, -1
-/* 805A74 802451F4 AEE20088 */  sw        $v0, 0x88($s7)
-/* 805A78 802451F8 24020002 */  addiu     $v0, $zero, 2
-.L802451FC:
-/* 805A7C 802451FC 8FBF003C */  lw        $ra, 0x3c($sp)
-/* 805A80 80245200 8FBE0038 */  lw        $fp, 0x38($sp)
-/* 805A84 80245204 8FB70034 */  lw        $s7, 0x34($sp)
-/* 805A88 80245208 8FB60030 */  lw        $s6, 0x30($sp)
-/* 805A8C 8024520C 8FB5002C */  lw        $s5, 0x2c($sp)
-/* 805A90 80245210 8FB40028 */  lw        $s4, 0x28($sp)
-/* 805A94 80245214 8FB30024 */  lw        $s3, 0x24($sp)
-/* 805A98 80245218 8FB20020 */  lw        $s2, 0x20($sp)
-/* 805A9C 8024521C 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 805AA0 80245220 8FB00018 */  lw        $s0, 0x18($sp)
-/* 805AA4 80245224 03E00008 */  jr        $ra
-/* 805AA8 80245228 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s
deleted file mode 100644
index 672ae3cc91..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s
+++ /dev/null
@@ -1,148 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024522C_805AAC
-/* 805AAC 8024522C 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* 805AB0 80245230 AFB5002C */  sw        $s5, 0x2c($sp)
-/* 805AB4 80245234 0080A82D */  daddu     $s5, $a0, $zero
-/* 805AB8 80245238 AFBF003C */  sw        $ra, 0x3c($sp)
-/* 805ABC 8024523C AFBE0038 */  sw        $fp, 0x38($sp)
-/* 805AC0 80245240 AFB70034 */  sw        $s7, 0x34($sp)
-/* 805AC4 80245244 AFB60030 */  sw        $s6, 0x30($sp)
-/* 805AC8 80245248 AFB40028 */  sw        $s4, 0x28($sp)
-/* 805ACC 8024524C AFB30024 */  sw        $s3, 0x24($sp)
-/* 805AD0 80245250 AFB20020 */  sw        $s2, 0x20($sp)
-/* 805AD4 80245254 AFB1001C */  sw        $s1, 0x1c($sp)
-/* 805AD8 80245258 AFB00018 */  sw        $s0, 0x18($sp)
-/* 805ADC 8024525C 8EA700AC */  lw        $a3, 0xac($s5)
-/* 805AE0 80245260 3C168026 */  lui       $s6, %hi(D_80262C38)
-/* 805AE4 80245264 26D62C38 */  addiu     $s6, $s6, %lo(D_80262C38)
-/* 805AE8 80245268 10A0003D */  beqz      $a1, .L80245360
-/* 805AEC 8024526C AFA70010 */   sw       $a3, 0x10($sp)
-/* 805AF0 80245270 0000A02D */  daddu     $s4, $zero, $zero
-/* 805AF4 80245274 0280982D */  daddu     $s3, $s4, $zero
-/* 805AF8 80245278 3C1EF840 */  lui       $fp, 0xf840
-/* 805AFC 8024527C 37DE5C19 */  ori       $fp, $fp, 0x5c19
-/* 805B00 80245280 3C17F840 */  lui       $s7, 0xf840
-/* 805B04 80245284 36F75C2C */  ori       $s7, $s7, 0x5c2c
-/* 805B08 80245288 3C128025 */  lui       $s2, %hi(D_80256ADC_81735C)
-/* 805B0C 8024528C 26526ADC */  addiu     $s2, $s2, %lo(D_80256ADC_81735C)
-/* 805B10 80245290 02C0882D */  daddu     $s1, $s6, $zero
-.L80245294:
-/* 805B14 80245294 0000202D */  daddu     $a0, $zero, $zero
-/* 805B18 80245298 0C0B1EAF */  jal       evt_get_variable
-/* 805B1C 8024529C 027E2821 */   addu     $a1, $s3, $fp
-/* 805B20 802452A0 0000202D */  daddu     $a0, $zero, $zero
-/* 805B24 802452A4 02772821 */  addu      $a1, $s3, $s7
-/* 805B28 802452A8 0C0B1EAF */  jal       evt_get_variable
-/* 805B2C 802452AC 0040802D */   daddu    $s0, $v0, $zero
-/* 805B30 802452B0 1200001C */  beqz      $s0, .L80245324
-/* 805B34 802452B4 0040202D */   daddu    $a0, $v0, $zero
-/* 805B38 802452B8 8E420000 */  lw        $v0, ($s2)
-/* 805B3C 802452BC 8FA70010 */  lw        $a3, 0x10($sp)
-/* 805B40 802452C0 54E20019 */  bnel      $a3, $v0, .L80245328
-/* 805B44 802452C4 26730001 */   addiu    $s3, $s3, 1
-/* 805B48 802452C8 3C028009 */  lui       $v0, %hi(gItemTable+0xA84)
-/* 805B4C 802452CC 84428364 */  lh        $v0, %lo(gItemTable+0xA84)($v0)
-/* 805B50 802452D0 3C078009 */  lui       $a3, %hi(gItemHudScripts)
-/* 805B54 802452D4 24E7A680 */  addiu     $a3, $a3, %lo(gItemHudScripts)
-/* 805B58 802452D8 AE330108 */  sw        $s3, 0x108($s1)
-/* 805B5C 802452DC 8E430008 */  lw        $v1, 8($s2)
-/* 805B60 802452E0 000210C0 */  sll       $v0, $v0, 3
-/* 805B64 802452E4 AE230084 */  sw        $v1, 0x84($s1)
-/* 805B68 802452E8 8E43000C */  lw        $v1, 0xc($s2)
-/* 805B6C 802452EC 00471021 */  addu      $v0, $v0, $a3
-/* 805B70 802452F0 AE200210 */  sw        $zero, 0x210($s1)
-/* 805B74 802452F4 10800005 */  beqz      $a0, .L8024530C
-/* 805B78 802452F8 AE230294 */   sw       $v1, 0x294($s1)
-/* 805B7C 802452FC 8C420004 */  lw        $v0, 4($v0)
-/* 805B80 80245300 AE20018C */  sw        $zero, 0x18c($s1)
-/* 805B84 80245304 080914C7 */  j         .L8024531C
-/* 805B88 80245308 AE220000 */   sw       $v0, ($s1)
-.L8024530C:
-/* 805B8C 8024530C 8C430000 */  lw        $v1, ($v0)
-/* 805B90 80245310 24020001 */  addiu     $v0, $zero, 1
-/* 805B94 80245314 AE22018C */  sw        $v0, 0x18c($s1)
-/* 805B98 80245318 AE230000 */  sw        $v1, ($s1)
-.L8024531C:
-/* 805B9C 8024531C 26310004 */  addiu     $s1, $s1, 4
-/* 805BA0 80245320 26940001 */  addiu     $s4, $s4, 1
-.L80245324:
-/* 805BA4 80245324 26730001 */  addiu     $s3, $s3, 1
-.L80245328:
-/* 805BA8 80245328 2E620013 */  sltiu     $v0, $s3, 0x13
-/* 805BAC 8024532C 1440FFD9 */  bnez      $v0, .L80245294
-/* 805BB0 80245330 26520014 */   addiu    $s2, $s2, 0x14
-/* 805BB4 80245334 02C0202D */  daddu     $a0, $s6, $zero
-/* 805BB8 80245338 24020008 */  addiu     $v0, $zero, 8
-/* 805BBC 8024533C AEC20318 */  sw        $v0, 0x318($s6)
-/* 805BC0 80245340 AED40324 */  sw        $s4, 0x324($s6)
-/* 805BC4 80245344 0C03D390 */  jal       create_popup_menu
-/* 805BC8 80245348 AEC00328 */   sw       $zero, 0x328($s6)
-/* 805BCC 8024534C 0C03A631 */  jal       func_800E98C4
-/* 805BD0 80245350 00000000 */   nop
-/* 805BD4 80245354 0C03A5EE */  jal       close_status_menu
-/* 805BD8 80245358 00000000 */   nop
-/* 805BDC 8024535C AEA00070 */  sw        $zero, 0x70($s5)
-.L80245360:
-/* 805BE0 80245360 8EA20070 */  lw        $v0, 0x70($s5)
-/* 805BE4 80245364 14400008 */  bnez      $v0, .L80245388
-/* 805BE8 80245368 24420001 */   addiu    $v0, $v0, 1
-/* 805BEC 8024536C 86C2032C */  lh        $v0, 0x32c($s6)
-/* 805BF0 80245370 10400009 */  beqz      $v0, .L80245398
-/* 805BF4 80245374 AEA20074 */   sw       $v0, 0x74($s5)
-/* 805BF8 80245378 0C03C4EC */  jal       hide_popup_menu
-/* 805BFC 8024537C 00000000 */   nop
-/* 805C00 80245380 8EA20070 */  lw        $v0, 0x70($s5)
-/* 805C04 80245384 24420001 */  addiu     $v0, $v0, 1
-.L80245388:
-/* 805C08 80245388 AEA20070 */  sw        $v0, 0x70($s5)
-/* 805C0C 8024538C 28420014 */  slti      $v0, $v0, 0x14
-/* 805C10 80245390 10400003 */  beqz      $v0, .L802453A0
-/* 805C14 80245394 00000000 */   nop
-.L80245398:
-/* 805C18 80245398 08091504 */  j         .L80245410
-/* 805C1C 8024539C 0000102D */   daddu    $v0, $zero, $zero
-.L802453A0:
-/* 805C20 802453A0 0C03C54E */  jal       destroy_popup_menu
-/* 805C24 802453A4 00000000 */   nop
-/* 805C28 802453A8 8EA40074 */  lw        $a0, 0x74($s5)
-/* 805C2C 802453AC 240200FF */  addiu     $v0, $zero, 0xff
-/* 805C30 802453B0 10820014 */  beq       $a0, $v0, .L80245404
-/* 805C34 802453B4 3C03F840 */   lui      $v1, 0xf840
-/* 805C38 802453B8 34635C2C */  ori       $v1, $v1, 0x5c2c
-/* 805C3C 802453BC 2482FFFF */  addiu     $v0, $a0, -1
-/* 805C40 802453C0 00021080 */  sll       $v0, $v0, 2
-/* 805C44 802453C4 02C21021 */  addu      $v0, $s6, $v0
-/* 805C48 802453C8 0000202D */  daddu     $a0, $zero, $zero
-/* 805C4C 802453CC 8C450108 */  lw        $a1, 0x108($v0)
-/* 805C50 802453D0 24060001 */  addiu     $a2, $zero, 1
-/* 805C54 802453D4 00051080 */  sll       $v0, $a1, 2
-/* 805C58 802453D8 00451021 */  addu      $v0, $v0, $a1
-/* 805C5C 802453DC 00021080 */  sll       $v0, $v0, 2
-/* 805C60 802453E0 AEA50088 */  sw        $a1, 0x88($s5)
-/* 805C64 802453E4 3C018025 */  lui       $at, %hi(D_80256AEC_81736C)
-/* 805C68 802453E8 00220821 */  addu      $at, $at, $v0
-/* 805C6C 802453EC 8C226AEC */  lw        $v0, %lo(D_80256AEC_81736C)($at)
-/* 805C70 802453F0 00A32821 */  addu      $a1, $a1, $v1
-/* 805C74 802453F4 0C0B2026 */  jal       evt_set_variable
-/* 805C78 802453F8 AEA20084 */   sw       $v0, 0x84($s5)
-/* 805C7C 802453FC 08091504 */  j         .L80245410
-/* 805C80 80245400 24020002 */   addiu    $v0, $zero, 2
-.L80245404:
-/* 805C84 80245404 2402FFFF */  addiu     $v0, $zero, -1
-/* 805C88 80245408 AEA20088 */  sw        $v0, 0x88($s5)
-/* 805C8C 8024540C 24020002 */  addiu     $v0, $zero, 2
-.L80245410:
-/* 805C90 80245410 8FBF003C */  lw        $ra, 0x3c($sp)
-/* 805C94 80245414 8FBE0038 */  lw        $fp, 0x38($sp)
-/* 805C98 80245418 8FB70034 */  lw        $s7, 0x34($sp)
-/* 805C9C 8024541C 8FB60030 */  lw        $s6, 0x30($sp)
-/* 805CA0 80245420 8FB5002C */  lw        $s5, 0x2c($sp)
-/* 805CA4 80245424 8FB40028 */  lw        $s4, 0x28($sp)
-/* 805CA8 80245428 8FB30024 */  lw        $s3, 0x24($sp)
-/* 805CAC 8024542C 8FB20020 */  lw        $s2, 0x20($sp)
-/* 805CB0 80245430 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 805CB4 80245434 8FB00018 */  lw        $s0, 0x18($sp)
-/* 805CB8 80245438 03E00008 */  jr        $ra
-/* 805CBC 8024543C 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tabs_draw_badges_805540.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tabs_draw_badges_805540.s
deleted file mode 100644
index 6299bca81d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tabs_draw_badges_805540.s
+++ /dev/null
@@ -1,49 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel pause_tabs_draw_badges_805540
-/* 805540 80244CC0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 805544 80244CC4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 805548 80244CC8 0000202D */  daddu     $a0, $zero, $zero
-/* 80554C 80244CCC 3C05F840 */  lui       $a1, 0xf840
-/* 805550 80244CD0 0C0B1EAF */  jal       evt_get_variable
-/* 805554 80244CD4 34A55C84 */   ori      $a1, $a1, 0x5c84
-/* 805558 80244CD8 14400008 */  bnez      $v0, .L80244CFC
-/* 80555C 80244CDC 0000202D */   daddu    $a0, $zero, $zero
-/* 805560 80244CE0 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 805564 80244CE4 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 805568 80244CE8 8C420140 */  lw        $v0, 0x140($v0)
-/* 80556C 80244CEC 8C440000 */  lw        $a0, ($v0)
-/* 805570 80244CF0 0C04D062 */  jal       clear_item_entity_flags
-/* 805574 80244CF4 24050040 */   addiu    $a1, $zero, 0x40
-/* 805578 80244CF8 0000202D */  daddu     $a0, $zero, $zero
-.L80244CFC:
-/* 80557C 80244CFC 3C05F840 */  lui       $a1, 0xf840
-/* 805580 80244D00 0C0B1EAF */  jal       evt_get_variable
-/* 805584 80244D04 34A55C85 */   ori      $a1, $a1, 0x5c85
-/* 805588 80244D08 14400008 */  bnez      $v0, .L80244D2C
-/* 80558C 80244D0C 0000202D */   daddu    $a0, $zero, $zero
-/* 805590 80244D10 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 805594 80244D14 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 805598 80244D18 8C420140 */  lw        $v0, 0x140($v0)
-/* 80559C 80244D1C 8C440010 */  lw        $a0, 0x10($v0)
-/* 8055A0 80244D20 0C04D062 */  jal       clear_item_entity_flags
-/* 8055A4 80244D24 24050040 */   addiu    $a1, $zero, 0x40
-/* 8055A8 80244D28 0000202D */  daddu     $a0, $zero, $zero
-.L80244D2C:
-/* 8055AC 80244D2C 3C05F840 */  lui       $a1, 0xf840
-/* 8055B0 80244D30 0C0B1EAF */  jal       evt_get_variable
-/* 8055B4 80244D34 34A55C86 */   ori      $a1, $a1, 0x5c86
-/* 8055B8 80244D38 14400007 */  bnez      $v0, .L80244D58
-/* 8055BC 80244D3C 00000000 */   nop
-/* 8055C0 80244D40 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 8055C4 80244D44 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 8055C8 80244D48 8C420140 */  lw        $v0, 0x140($v0)
-/* 8055CC 80244D4C 8C440020 */  lw        $a0, 0x20($v0)
-/* 8055D0 80244D50 0C04D062 */  jal       clear_item_entity_flags
-/* 8055D4 80244D54 24050040 */   addiu    $a1, $zero, 0x40
-.L80244D58:
-/* 8055D8 80244D58 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8055DC 80244D5C 24020002 */  addiu     $v0, $zero, 2
-/* 8055E0 80244D60 03E00008 */  jr        $ra
-/* 8055E4 80244D64 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tabs_draw_stats_805418.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tabs_draw_stats_805418.s
deleted file mode 100644
index f17f11d690..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tabs_draw_stats_805418.s
+++ /dev/null
@@ -1,88 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel pause_tabs_draw_stats_805418
-/* 805418 80244B98 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 80541C 80244B9C 0000202D */  daddu     $a0, $zero, $zero
-/* 805420 80244BA0 3C05FD05 */  lui       $a1, 0xfd05
-/* 805424 80244BA4 34A50F80 */  ori       $a1, $a1, 0xf80
-/* 805428 80244BA8 AFBF0024 */  sw        $ra, 0x24($sp)
-/* 80542C 80244BAC 0C0B1EAF */  jal       evt_get_variable
-/* 805430 80244BB0 AFB00020 */   sw       $s0, 0x20($sp)
-/* 805434 80244BB4 0000202D */  daddu     $a0, $zero, $zero
-/* 805438 80244BB8 27A50010 */  addiu     $a1, $sp, 0x10
-/* 80543C 80244BBC 0040802D */  daddu     $s0, $v0, $zero
-/* 805440 80244BC0 27A60014 */  addiu     $a2, $sp, 0x14
-/* 805444 80244BC4 0C0470AC */  jal       mdl_get_copied_vertices
-/* 805448 80244BC8 27A70018 */   addiu    $a3, $sp, 0x18
-/* 80544C 80244BCC 8FA20018 */  lw        $v0, 0x18($sp)
-/* 805450 80244BD0 1840002C */  blez      $v0, .L80244C84
-/* 805454 80244BD4 0000302D */   daddu    $a2, $zero, $zero
-/* 805458 80244BD8 240AFFB2 */  addiu     $t2, $zero, -0x4e
-/* 80545C 80244BDC 2409FFF0 */  addiu     $t1, $zero, -0x10
-/* 805460 80244BE0 0040402D */  daddu     $t0, $v0, $zero
-/* 805464 80244BE4 8FA70014 */  lw        $a3, 0x14($sp)
-/* 805468 80244BE8 8FA50010 */  lw        $a1, 0x10($sp)
-.L80244BEC:
-/* 80546C 80244BEC 84A20000 */  lh        $v0, ($a1)
-/* 805470 80244BF0 144A000F */  bne       $v0, $t2, .L80244C30
-/* 805474 80244BF4 00061900 */   sll      $v1, $a2, 4
-/* 805478 80244BF8 00E32021 */  addu      $a0, $a3, $v1
-/* 80547C 80244BFC 84A20002 */  lh        $v0, 2($a1)
-/* 805480 80244C00 14400007 */  bnez      $v0, .L80244C20
-/* 805484 80244C04 94A30002 */   lhu      $v1, 2($a1)
-/* 805488 80244C08 06010002 */  bgez      $s0, .L80244C14
-/* 80548C 80244C0C 0200102D */   daddu    $v0, $s0, $zero
-/* 805490 80244C10 26020003 */  addiu     $v0, $s0, 3
-.L80244C14:
-/* 805494 80244C14 00021083 */  sra       $v0, $v0, 2
-/* 805498 80244C18 0809131C */  j         .L80244C70
-/* 80549C 80244C1C 00621023 */   subu     $v0, $v1, $v0
-.L80244C20:
-/* 8054A0 80244C20 06010011 */  bgez      $s0, .L80244C68
-/* 8054A4 80244C24 0200102D */   daddu    $v0, $s0, $zero
-/* 8054A8 80244C28 0809131A */  j         .L80244C68
-/* 8054AC 80244C2C 26020003 */   addiu    $v0, $s0, 3
-.L80244C30:
-/* 8054B0 80244C30 54490011 */  bnel      $v0, $t1, .L80244C78
-/* 8054B4 80244C34 24C60001 */   addiu    $a2, $a2, 1
-/* 8054B8 80244C38 00E32021 */  addu      $a0, $a3, $v1
-/* 8054BC 80244C3C 84A20002 */  lh        $v0, 2($a1)
-/* 8054C0 80244C40 94A30002 */  lhu       $v1, 2($a1)
-/* 8054C4 80244C44 14400006 */  bnez      $v0, .L80244C60
-/* 8054C8 80244C48 0200102D */   daddu    $v0, $s0, $zero
-/* 8054CC 80244C4C 06020001 */  bltzl     $s0, .L80244C54
-/* 8054D0 80244C50 26020003 */   addiu    $v0, $s0, 3
-.L80244C54:
-/* 8054D4 80244C54 00021083 */  sra       $v0, $v0, 2
-/* 8054D8 80244C58 0809131C */  j         .L80244C70
-/* 8054DC 80244C5C 00621023 */   subu     $v0, $v1, $v0
-.L80244C60:
-/* 8054E0 80244C60 04420001 */  bltzl     $v0, .L80244C68
-/* 8054E4 80244C64 24420003 */   addiu    $v0, $v0, 3
-.L80244C68:
-/* 8054E8 80244C68 00021083 */  sra       $v0, $v0, 2
-/* 8054EC 80244C6C 00621021 */  addu      $v0, $v1, $v0
-.L80244C70:
-/* 8054F0 80244C70 A4820002 */  sh        $v0, 2($a0)
-/* 8054F4 80244C74 24C60001 */  addiu     $a2, $a2, 1
-.L80244C78:
-/* 8054F8 80244C78 00C8102A */  slt       $v0, $a2, $t0
-/* 8054FC 80244C7C 1440FFDB */  bnez      $v0, .L80244BEC
-/* 805500 80244C80 24A50010 */   addiu    $a1, $a1, 0x10
-.L80244C84:
-/* 805504 80244C84 3C03800A */  lui       $v1, %hi(gMasterGfxPos)
-/* 805508 80244C88 2463A66C */  addiu     $v1, $v1, %lo(gMasterGfxPos)
-/* 80550C 80244C8C 8C620000 */  lw        $v0, ($v1)
-/* 805510 80244C90 0000202D */  daddu     $a0, $zero, $zero
-/* 805514 80244C94 0040802D */  daddu     $s0, $v0, $zero
-/* 805518 80244C98 24420008 */  addiu     $v0, $v0, 8
-/* 80551C 80244C9C AC620000 */  sw        $v0, ($v1)
-/* 805520 80244CA0 3C02DE00 */  lui       $v0, 0xde00
-/* 805524 80244CA4 0C0470BB */  jal       mdl_get_copied_gfx
-/* 805528 80244CA8 AE020000 */   sw       $v0, ($s0)
-/* 80552C 80244CAC AE020004 */  sw        $v0, 4($s0)
-/* 805530 80244CB0 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 805534 80244CB4 8FB00020 */  lw        $s0, 0x20($sp)
-/* 805538 80244CB8 03E00008 */  jr        $ra
-/* 80553C 80244CBC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/842D90/func_802401C0_842D90.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/842D90/func_802401C0_842D90.s
deleted file mode 100644
index 3359e2084c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/842D90/func_802401C0_842D90.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802401C0_842D90
-/* 842D90 802401C0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 842D94 802401C4 2404009E */  addiu     $a0, $zero, 0x9e
-/* 842D98 802401C8 2405FFFF */  addiu     $a1, $zero, -1
-/* 842D9C 802401CC 24060001 */  addiu     $a2, $zero, 1
-/* 842DA0 802401D0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 842DA4 802401D4 0C046E54 */  jal       func_8011B950
-/* 842DA8 802401D8 00C0382D */   daddu    $a3, $a2, $zero
-/* 842DAC 802401DC 0000202D */  daddu     $a0, $zero, $zero
-/* 842DB0 802401E0 0080282D */  daddu     $a1, $a0, $zero
-/* 842DB4 802401E4 0080302D */  daddu     $a2, $a0, $zero
-/* 842DB8 802401E8 0C046F97 */  jal       set_background_color_blend
-/* 842DBC 802401EC 240700FF */   addiu    $a3, $zero, 0xff
-/* 842DC0 802401F0 3C03800B */  lui       $v1, %hi(gCameras)
-/* 842DC4 802401F4 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* 842DC8 802401F8 A460002C */  sh        $zero, 0x2c($v1)
-/* 842DCC 802401FC A460002E */  sh        $zero, 0x2e($v1)
-/* 842DD0 80240200 A4600030 */  sh        $zero, 0x30($v1)
-/* 842DD4 80240204 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 842DD8 80240208 24020002 */  addiu     $v0, $zero, 2
-/* 842DDC 8024020C 03E00008 */  jr        $ra
-/* 842DE0 80240210 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 842DE4 80240214 00000000 */  nop
-/* 842DE8 80240218 00000000 */  nop
-/* 842DEC 8024021C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242C78_854DE8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242C78_854DE8.s
deleted file mode 100644
index 80b71c6aaa..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242C78_854DE8.s
+++ /dev/null
@@ -1,146 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242C78_854DE8
-/* 854DE8 80242C78 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* 854DEC 80242C7C AFB3001C */  sw        $s3, 0x1c($sp)
-/* 854DF0 80242C80 0080982D */  daddu     $s3, $a0, $zero
-/* 854DF4 80242C84 AFB00010 */  sw        $s0, 0x10($sp)
-/* 854DF8 80242C88 00A0802D */  daddu     $s0, $a1, $zero
-/* 854DFC 80242C8C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 854E00 80242C90 AFB20018 */  sw        $s2, 0x18($sp)
-/* 854E04 80242C94 AFB10014 */  sw        $s1, 0x14($sp)
-/* 854E08 80242C98 F7B80038 */  sdc1      $f24, 0x38($sp)
-/* 854E0C 80242C9C F7B60030 */  sdc1      $f22, 0x30($sp)
-/* 854E10 80242CA0 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* 854E14 80242CA4 8E72000C */  lw        $s2, 0xc($s3)
-/* 854E18 80242CA8 0C00EAD2 */  jal       get_npc_safe
-/* 854E1C 80242CAC 0000202D */   daddu    $a0, $zero, $zero
-/* 854E20 80242CB0 12000010 */  beqz      $s0, .L80242CF4
-/* 854E24 80242CB4 0040882D */   daddu    $s1, $v0, $zero
-/* 854E28 80242CB8 8E450000 */  lw        $a1, ($s2)
-/* 854E2C 80242CBC 0C0B1EAF */  jal       evt_get_variable
-/* 854E30 80242CC0 0260202D */   daddu    $a0, $s3, $zero
-/* 854E34 80242CC4 0040182D */  daddu     $v1, $v0, $zero
-/* 854E38 80242CC8 10600006 */  beqz      $v1, .L80242CE4
-/* 854E3C 80242CCC AE630070 */   sw       $v1, 0x70($s3)
-/* 854E40 80242CD0 24020001 */  addiu     $v0, $zero, 1
-/* 854E44 80242CD4 10620005 */  beq       $v1, $v0, .L80242CEC
-/* 854E48 80242CD8 24020019 */   addiu    $v0, $zero, 0x19
-/* 854E4C 80242CDC 08090B3D */  j         .L80242CF4
-/* 854E50 80242CE0 AE620074 */   sw       $v0, 0x74($s3)
-.L80242CE4:
-/* 854E54 80242CE4 08090B3C */  j         .L80242CF0
-/* 854E58 80242CE8 24020037 */   addiu    $v0, $zero, 0x37
-.L80242CEC:
-/* 854E5C 80242CEC 24020055 */  addiu     $v0, $zero, 0x55
-.L80242CF0:
-/* 854E60 80242CF0 AE620074 */  sw        $v0, 0x74($s3)
-.L80242CF4:
-/* 854E64 80242CF4 C634000C */  lwc1      $f20, 0xc($s1)
-/* 854E68 80242CF8 C6760074 */  lwc1      $f22, 0x74($s3)
-/* 854E6C 80242CFC 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 854E70 80242D00 4600A507 */  neg.s     $f20, $f20
-/* 854E74 80242D04 0C00A8BB */  jal       sin_deg
-/* 854E78 80242D08 4600A306 */   mov.s    $f12, $f20
-/* 854E7C 80242D0C 46160002 */  mul.s     $f0, $f0, $f22
-/* 854E80 80242D10 00000000 */  nop
-/* 854E84 80242D14 C6220038 */  lwc1      $f2, 0x38($s1)
-/* 854E88 80242D18 3C0141F0 */  lui       $at, 0x41f0
-/* 854E8C 80242D1C 44812000 */  mtc1      $at, $f4
-/* 854E90 80242D20 00000000 */  nop
-/* 854E94 80242D24 46041080 */  add.s     $f2, $f2, $f4
-/* 854E98 80242D28 46001600 */  add.s     $f24, $f2, $f0
-/* 854E9C 80242D2C 0C00A8D4 */  jal       cos_deg
-/* 854EA0 80242D30 4600A306 */   mov.s    $f12, $f20
-/* 854EA4 80242D34 46160002 */  mul.s     $f0, $f0, $f22
-/* 854EA8 80242D38 00000000 */  nop
-/* 854EAC 80242D3C 24020001 */  addiu     $v0, $zero, 1
-/* 854EB0 80242D40 C6220040 */  lwc1      $f2, 0x40($s1)
-/* 854EB4 80242D44 C624003C */  lwc1      $f4, 0x3c($s1)
-/* 854EB8 80242D48 46001580 */  add.s     $f22, $f2, $f0
-/* 854EBC 80242D4C 3C014248 */  lui       $at, 0x4248
-/* 854EC0 80242D50 44810000 */  mtc1      $at, $f0
-/* 854EC4 80242D54 8E640070 */  lw        $a0, 0x70($s3)
-/* 854EC8 80242D58 1082001C */  beq       $a0, $v0, .L80242DCC
-/* 854ECC 80242D5C 46002500 */   add.s    $f20, $f4, $f0
-/* 854ED0 80242D60 28820002 */  slti      $v0, $a0, 2
-/* 854ED4 80242D64 10400005 */  beqz      $v0, .L80242D7C
-/* 854ED8 80242D68 24020002 */   addiu    $v0, $zero, 2
-/* 854EDC 80242D6C 10800007 */  beqz      $a0, .L80242D8C
-/* 854EE0 80242D70 0000102D */   daddu    $v0, $zero, $zero
-/* 854EE4 80242D74 08090B97 */  j         .L80242E5C
-/* 854EE8 80242D78 00000000 */   nop
-.L80242D7C:
-/* 854EEC 80242D7C 10820027 */  beq       $a0, $v0, .L80242E1C
-/* 854EF0 80242D80 0000102D */   daddu    $v0, $zero, $zero
-/* 854EF4 80242D84 08090B97 */  j         .L80242E5C
-/* 854EF8 80242D88 00000000 */   nop
-.L80242D8C:
-/* 854EFC 80242D8C 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* 854F00 80242D90 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* 854F04 80242D94 3C030001 */  lui       $v1, 1
-/* 854F08 80242D98 E4580028 */  swc1      $f24, 0x28($v0)
-/* 854F0C 80242D9C E454002C */  swc1      $f20, 0x2c($v0)
-/* 854F10 80242DA0 E4560030 */  swc1      $f22, 0x30($v0)
-/* 854F14 80242DA4 C6200038 */  lwc1      $f0, 0x38($s1)
-/* 854F18 80242DA8 C622003C */  lwc1      $f2, 0x3c($s1)
-/* 854F1C 80242DAC 8E220000 */  lw        $v0, ($s1)
-/* 854F20 80242DB0 C6240040 */  lwc1      $f4, 0x40($s1)
-/* 854F24 80242DB4 00431025 */  or        $v0, $v0, $v1
-/* 854F28 80242DB8 E620006C */  swc1      $f0, 0x6c($s1)
-/* 854F2C 80242DBC E6220070 */  swc1      $f2, 0x70($s1)
-/* 854F30 80242DC0 E6240074 */  swc1      $f4, 0x74($s1)
-/* 854F34 80242DC4 08090B96 */  j         .L80242E58
-/* 854F38 80242DC8 AE220000 */   sw       $v0, ($s1)
-.L80242DCC:
-/* 854F3C 80242DCC 0C00EAD2 */  jal       get_npc_safe
-/* 854F40 80242DD0 2404FFFC */   addiu    $a0, $zero, -4
-/* 854F44 80242DD4 0040202D */  daddu     $a0, $v0, $zero
-/* 854F48 80242DD8 54800003 */  bnel      $a0, $zero, .L80242DE8
-/* 854F4C 80242DDC E4980038 */   swc1     $f24, 0x38($a0)
-/* 854F50 80242DE0 08090B97 */  j         .L80242E5C
-/* 854F54 80242DE4 24020002 */   addiu    $v0, $zero, 2
-.L80242DE8:
-/* 854F58 80242DE8 4600C006 */  mov.s     $f0, $f24
-/* 854F5C 80242DEC E494003C */  swc1      $f20, 0x3c($a0)
-/* 854F60 80242DF0 4600A086 */  mov.s     $f2, $f20
-/* 854F64 80242DF4 E4960040 */  swc1      $f22, 0x40($a0)
-/* 854F68 80242DF8 4600B106 */  mov.s     $f4, $f22
-/* 854F6C 80242DFC 8C820000 */  lw        $v0, ($a0)
-/* 854F70 80242E00 3C030001 */  lui       $v1, 1
-/* 854F74 80242E04 E480006C */  swc1      $f0, 0x6c($a0)
-/* 854F78 80242E08 E4820070 */  swc1      $f2, 0x70($a0)
-/* 854F7C 80242E0C E4840074 */  swc1      $f4, 0x74($a0)
-/* 854F80 80242E10 00431025 */  or        $v0, $v0, $v1
-/* 854F84 80242E14 08090B96 */  j         .L80242E58
-/* 854F88 80242E18 AC820000 */   sw       $v0, ($a0)
-.L80242E1C:
-/* 854F8C 80242E1C 0C00EAD2 */  jal       get_npc_safe
-/* 854F90 80242E20 24040001 */   addiu    $a0, $zero, 1
-/* 854F94 80242E24 E4580038 */  swc1      $f24, 0x38($v0)
-/* 854F98 80242E28 4600C006 */  mov.s     $f0, $f24
-/* 854F9C 80242E2C E454003C */  swc1      $f20, 0x3c($v0)
-/* 854FA0 80242E30 4600A086 */  mov.s     $f2, $f20
-/* 854FA4 80242E34 E4560040 */  swc1      $f22, 0x40($v0)
-/* 854FA8 80242E38 4600B106 */  mov.s     $f4, $f22
-/* 854FAC 80242E3C 8C430000 */  lw        $v1, ($v0)
-/* 854FB0 80242E40 3C040001 */  lui       $a0, 1
-/* 854FB4 80242E44 E440006C */  swc1      $f0, 0x6c($v0)
-/* 854FB8 80242E48 E4420070 */  swc1      $f2, 0x70($v0)
-/* 854FBC 80242E4C E4440074 */  swc1      $f4, 0x74($v0)
-/* 854FC0 80242E50 00641825 */  or        $v1, $v1, $a0
-/* 854FC4 80242E54 AC430000 */  sw        $v1, ($v0)
-.L80242E58:
-/* 854FC8 80242E58 0000102D */  daddu     $v0, $zero, $zero
-.L80242E5C:
-/* 854FCC 80242E5C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 854FD0 80242E60 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 854FD4 80242E64 8FB20018 */  lw        $s2, 0x18($sp)
-/* 854FD8 80242E68 8FB10014 */  lw        $s1, 0x14($sp)
-/* 854FDC 80242E6C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 854FE0 80242E70 D7B80038 */  ldc1      $f24, 0x38($sp)
-/* 854FE4 80242E74 D7B60030 */  ldc1      $f22, 0x30($sp)
-/* 854FE8 80242E78 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* 854FEC 80242E7C 03E00008 */  jr        $ra
-/* 854FF0 80242E80 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242804_9C7BE4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242804_9C7BE4.s
deleted file mode 100644
index 324b54c6d9..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242804_9C7BE4.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242804_9C7BE4
-/* 9C7BE4 80242804 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9C7BE8 80242808 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 9C7BEC 8024280C AFB00010 */  sw        $s0, 0x10($sp)
-/* 9C7BF0 80242810 8C82000C */  lw        $v0, 0xc($a0)
-/* 9C7BF4 80242814 0C0B1EAF */  jal       evt_get_variable
-/* 9C7BF8 80242818 8C450000 */   lw       $a1, ($v0)
-/* 9C7BFC 8024281C 3C038025 */  lui       $v1, %hi(D_80250810_9D5BF0)
-/* 9C7C00 80242820 24630810 */  addiu     $v1, $v1, %lo(D_80250810_9D5BF0)
-/* 9C7C04 80242824 00028040 */  sll       $s0, $v0, 1
-/* 9C7C08 80242828 02038021 */  addu      $s0, $s0, $v1
-/* 9C7C0C 8024282C 0C015612 */  jal       snd_ambient_80055848
-/* 9C7C10 80242830 86040000 */   lh       $a0, ($s0)
-/* 9C7C14 80242834 240505DC */  addiu     $a1, $zero, 0x5dc
-/* 9C7C18 80242838 86040000 */  lh        $a0, ($s0)
-/* 9C7C1C 8024283C 0C01559B */  jal       au_ambience_set_volume
-/* 9C7C20 80242840 2406007F */   addiu    $a2, $zero, 0x7f
-/* 9C7C24 80242844 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 9C7C28 80242848 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9C7C2C 8024284C 24020002 */  addiu     $v0, $zero, 2
-/* 9C7C30 80242850 03E00008 */  jr        $ra
-/* 9C7C34 80242854 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242858_9C7C38.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242858_9C7C38.s
deleted file mode 100644
index d05ea55c13..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242858_9C7C38.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242858_9C7C38
-/* 9C7C38 80242858 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9C7C3C 8024285C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 9C7C40 80242860 8C82000C */  lw        $v0, 0xc($a0)
-/* 9C7C44 80242864 0C0B1EAF */  jal       evt_get_variable
-/* 9C7C48 80242868 8C450000 */   lw       $a1, ($v0)
-/* 9C7C4C 8024286C 240505DC */  addiu     $a1, $zero, 0x5dc
-/* 9C7C50 80242870 00021040 */  sll       $v0, $v0, 1
-/* 9C7C54 80242874 3C048025 */  lui       $a0, %hi(D_80250810_9D5BF0)
-/* 9C7C58 80242878 00822021 */  addu      $a0, $a0, $v0
-/* 9C7C5C 8024287C 84840810 */  lh        $a0, %lo(D_80250810_9D5BF0)($a0)
-/* 9C7C60 80242880 0C01559B */  jal       au_ambience_set_volume
-/* 9C7C64 80242884 24060001 */   addiu    $a2, $zero, 1
-/* 9C7C68 80242888 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9C7C6C 8024288C 24020002 */  addiu     $v0, $zero, 2
-/* 9C7C70 80242890 03E00008 */  jr        $ra
-/* 9C7C74 80242894 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_802406AC_BBD84C.s b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_802406AC_BBD84C.s
deleted file mode 100644
index 2c8ccc2c07..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_802406AC_BBD84C.s
+++ /dev/null
@@ -1,41 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802406AC_BBD84C
-/* BBD84C 802406AC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* BBD850 802406B0 AFB00010 */  sw        $s0, 0x10($sp)
-/* BBD854 802406B4 0080802D */  daddu     $s0, $a0, $zero
-/* BBD858 802406B8 AFBF0014 */  sw        $ra, 0x14($sp)
-/* BBD85C 802406BC 10A00005 */  beqz      $a1, .L802406D4
-/* BBD860 802406C0 8E02000C */   lw       $v0, 0xc($s0)
-/* BBD864 802406C4 0C0B1EAF */  jal       evt_get_variable
-/* BBD868 802406C8 8C450000 */   lw       $a1, ($v0)
-/* BBD86C 802406CC 8C420000 */  lw        $v0, ($v0)
-/* BBD870 802406D0 AE020074 */  sw        $v0, 0x74($s0)
-.L802406D4:
-/* BBD874 802406D4 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* BBD878 802406D8 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* BBD87C 802406DC 8C420010 */  lw        $v0, 0x10($v0)
-/* BBD880 802406E0 8E050074 */  lw        $a1, 0x74($s0)
-/* BBD884 802406E4 30428000 */  andi      $v0, $v0, 0x8000
-/* BBD888 802406E8 1040000D */  beqz      $v0, .L80240720
-/* BBD88C 802406EC 0000102D */   daddu    $v0, $zero, $zero
-/* BBD890 802406F0 8CA20000 */  lw        $v0, ($a1)
-/* BBD894 802406F4 30420004 */  andi      $v0, $v0, 4
-/* BBD898 802406F8 10400003 */  beqz      $v0, .L80240708
-/* BBD89C 802406FC 24020001 */   addiu    $v0, $zero, 1
-/* BBD8A0 80240700 080901C3 */  j         .L8024070C
-/* BBD8A4 80240704 AE020084 */   sw       $v0, 0x84($s0)
-.L80240708:
-/* BBD8A8 80240708 AE000084 */  sw        $zero, 0x84($s0)
-.L8024070C:
-/* BBD8AC 8024070C 24020002 */  addiu     $v0, $zero, 2
-/* BBD8B0 80240710 8CA30000 */  lw        $v1, ($a1)
-/* BBD8B4 80240714 2404FFFD */  addiu     $a0, $zero, -3
-/* BBD8B8 80240718 00641824 */  and       $v1, $v1, $a0
-/* BBD8BC 8024071C ACA30000 */  sw        $v1, ($a1)
-.L80240720:
-/* BBD8C0 80240720 8FBF0014 */  lw        $ra, 0x14($sp)
-/* BBD8C4 80240724 8FB00010 */  lw        $s0, 0x10($sp)
-/* BBD8C8 80240728 03E00008 */  jr        $ra
-/* BBD8CC 8024072C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240730_BBD8D0.s b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240730_BBD8D0.s
deleted file mode 100644
index c7cd079e91..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240730_BBD8D0.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240730_BBD8D0
-/* BBD8D0 80240730 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* BBD8D4 80240734 AFB00010 */  sw        $s0, 0x10($sp)
-/* BBD8D8 80240738 0080802D */  daddu     $s0, $a0, $zero
-/* BBD8DC 8024073C AFBF0014 */  sw        $ra, 0x14($sp)
-/* BBD8E0 80240740 10A00005 */  beqz      $a1, .L80240758
-/* BBD8E4 80240744 8E02000C */   lw       $v0, 0xc($s0)
-/* BBD8E8 80240748 0C0B1EAF */  jal       evt_get_variable
-/* BBD8EC 8024074C 8C450000 */   lw       $a1, ($v0)
-/* BBD8F0 80240750 8C420000 */  lw        $v0, ($v0)
-/* BBD8F4 80240754 AE020074 */  sw        $v0, 0x74($s0)
-.L80240758:
-/* BBD8F8 80240758 8E040074 */  lw        $a0, 0x74($s0)
-/* BBD8FC 8024075C 8C830000 */  lw        $v1, ($a0)
-/* BBD900 80240760 30620004 */  andi      $v0, $v1, 4
-/* BBD904 80240764 14400003 */  bnez      $v0, .L80240774
-/* BBD908 80240768 2402FFFD */   addiu    $v0, $zero, -3
-/* BBD90C 8024076C 080901E0 */  j         .L80240780
-/* BBD910 80240770 0000102D */   daddu    $v0, $zero, $zero
-.L80240774:
-/* BBD914 80240774 00621024 */  and       $v0, $v1, $v0
-/* BBD918 80240778 AC820000 */  sw        $v0, ($a0)
-/* BBD91C 8024077C 24020002 */  addiu     $v0, $zero, 2
-.L80240780:
-/* BBD920 80240780 8FBF0014 */  lw        $ra, 0x14($sp)
-/* BBD924 80240784 8FB00010 */  lw        $s0, 0x10($sp)
-/* BBD928 80240788 03E00008 */  jr        $ra
-/* BBD92C 8024078C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240BB0_BBDD50.s b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240BB0_BBDD50.s
deleted file mode 100644
index a2b904bdb9..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240BB0_BBDD50.s
+++ /dev/null
@@ -1,48 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240BB0_BBDD50
-/* BBDD50 80240BB0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* BBDD54 80240BB4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* BBDD58 80240BB8 8C82000C */  lw        $v0, 0xc($a0)
-/* BBDD5C 80240BBC 0C0B1EAF */  jal       evt_get_variable
-/* BBDD60 80240BC0 8C450000 */   lw       $a1, ($v0)
-/* BBDD64 80240BC4 0040182D */  daddu     $v1, $v0, $zero
-/* BBDD68 80240BC8 10600012 */  beqz      $v1, .L80240C14
-/* BBDD6C 80240BCC 0000202D */   daddu    $a0, $zero, $zero
-/* BBDD70 80240BD0 8C620000 */  lw        $v0, ($v1)
-/* BBDD74 80240BD4 5040000A */  beql      $v0, $zero, .L80240C00
-/* BBDD78 80240BD8 00041080 */   sll      $v0, $a0, 2
-/* BBDD7C 80240BDC 3C058024 */  lui       $a1, %hi(obk_01_802458F0)
-/* BBDD80 80240BE0 24A558F0 */  addiu     $a1, $a1, %lo(obk_01_802458F0)
-.L80240BE4:
-/* BBDD84 80240BE4 24630004 */  addiu     $v1, $v1, 4
-/* BBDD88 80240BE8 24840001 */  addiu     $a0, $a0, 1
-/* BBDD8C 80240BEC ACA20000 */  sw        $v0, ($a1)
-/* BBDD90 80240BF0 8C620000 */  lw        $v0, ($v1)
-/* BBDD94 80240BF4 1440FFFB */  bnez      $v0, .L80240BE4
-/* BBDD98 80240BF8 24A50004 */   addiu    $a1, $a1, 4
-/* BBDD9C 80240BFC 00041080 */  sll       $v0, $a0, 2
-.L80240C00:
-/* BBDDA0 80240C00 3C018024 */  lui       $at, %hi(obk_01_802458F0)
-/* BBDDA4 80240C04 00220821 */  addu      $at, $at, $v0
-/* BBDDA8 80240C08 AC2058F0 */  sw        $zero, %lo(obk_01_802458F0)($at)
-/* BBDDAC 80240C0C 0809030F */  j         .L80240C3C
-/* BBDDB0 80240C10 00000000 */   nop
-.L80240C14:
-/* BBDDB4 80240C14 3C038024 */  lui       $v1, %hi(obk_01_802458F0)
-/* BBDDB8 80240C18 246358F0 */  addiu     $v1, $v1, %lo(obk_01_802458F0)
-/* BBDDBC 80240C1C 0060282D */  daddu     $a1, $v1, $zero
-.L80240C20:
-/* BBDDC0 80240C20 24820010 */  addiu     $v0, $a0, 0x10
-/* BBDDC4 80240C24 AC620000 */  sw        $v0, ($v1)
-/* BBDDC8 80240C28 24630004 */  addiu     $v1, $v1, 4
-/* BBDDCC 80240C2C 24840001 */  addiu     $a0, $a0, 1
-/* BBDDD0 80240C30 28820070 */  slti      $v0, $a0, 0x70
-/* BBDDD4 80240C34 1440FFFA */  bnez      $v0, .L80240C20
-/* BBDDD8 80240C38 ACA001C0 */   sw       $zero, 0x1c0($a1)
-.L80240C3C:
-/* BBDDDC 80240C3C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* BBDDE0 80240C40 24020002 */  addiu     $v0, $zero, 2
-/* BBDDE4 80240C44 03E00008 */  jr        $ra
-/* BBDDE8 80240C48 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402A0_BC8100.s b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402A0_BC8100.s
deleted file mode 100644
index 0b446cc6c1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402A0_BC8100.s
+++ /dev/null
@@ -1,30 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402A0_BC8100
-/* BC8100 802402A0 24020001 */  addiu     $v0, $zero, 1
-/* BC8104 802402A4 1082000B */  beq       $a0, $v0, .L802402D4
-/* BC8108 802402A8 2403000C */   addiu    $v1, $zero, 0xc
-/* BC810C 802402AC 28820002 */  slti      $v0, $a0, 2
-/* BC8110 802402B0 1440000E */  bnez      $v0, .L802402EC
-/* BC8114 802402B4 0060102D */   daddu    $v0, $v1, $zero
-/* BC8118 802402B8 24020002 */  addiu     $v0, $zero, 2
-/* BC811C 802402BC 10820007 */  beq       $a0, $v0, .L802402DC
-/* BC8120 802402C0 24020003 */   addiu    $v0, $zero, 3
-/* BC8124 802402C4 10820007 */  beq       $a0, $v0, .L802402E4
-/* BC8128 802402C8 0060102D */   daddu    $v0, $v1, $zero
-/* BC812C 802402CC 080900BB */  j         .L802402EC
-/* BC8130 802402D0 00000000 */   nop
-.L802402D4:
-/* BC8134 802402D4 080900BA */  j         .L802402E8
-/* BC8138 802402D8 24030064 */   addiu    $v1, $zero, 0x64
-.L802402DC:
-/* BC813C 802402DC 080900BA */  j         .L802402E8
-/* BC8140 802402E0 2403000D */   addiu    $v1, $zero, 0xd
-.L802402E4:
-/* BC8144 802402E4 2403000E */  addiu     $v1, $zero, 0xe
-.L802402E8:
-/* BC8148 802402E8 0060102D */  daddu     $v0, $v1, $zero
-.L802402EC:
-/* BC814C 802402EC 03E00008 */  jr        $ra
-/* BC8150 802402F0 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240730_AB0720.s b/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240730_AB0720.s
deleted file mode 100644
index 52ef6866cf..0000000000
--- a/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240730_AB0720.s
+++ /dev/null
@@ -1,48 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240730_AB0720
-/* AB0720 80240730 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* AB0724 80240734 AFBF0010 */  sw        $ra, 0x10($sp)
-/* AB0728 80240738 8C82000C */  lw        $v0, 0xc($a0)
-/* AB072C 8024073C 0C0B1EAF */  jal       evt_get_variable
-/* AB0730 80240740 8C450000 */   lw       $a1, ($v0)
-/* AB0734 80240744 0040182D */  daddu     $v1, $v0, $zero
-/* AB0738 80240748 10600012 */  beqz      $v1, .L80240794
-/* AB073C 8024074C 0000202D */   daddu    $a0, $zero, $zero
-/* AB0740 80240750 8C620000 */  lw        $v0, ($v1)
-/* AB0744 80240754 5040000A */  beql      $v0, $zero, .L80240780
-/* AB0748 80240758 00041080 */   sll      $v0, $a0, 2
-/* AB074C 8024075C 3C058024 */  lui       $a1, %hi(D_80242180)
-/* AB0750 80240760 24A52180 */  addiu     $a1, $a1, %lo(D_80242180)
-.L80240764:
-/* AB0754 80240764 24630004 */  addiu     $v1, $v1, 4
-/* AB0758 80240768 24840001 */  addiu     $a0, $a0, 1
-/* AB075C 8024076C ACA20000 */  sw        $v0, ($a1)
-/* AB0760 80240770 8C620000 */  lw        $v0, ($v1)
-/* AB0764 80240774 1440FFFB */  bnez      $v0, .L80240764
-/* AB0768 80240778 24A50004 */   addiu    $a1, $a1, 4
-/* AB076C 8024077C 00041080 */  sll       $v0, $a0, 2
-.L80240780:
-/* AB0770 80240780 3C018024 */  lui       $at, %hi(D_80242180)
-/* AB0774 80240784 00220821 */  addu      $at, $at, $v0
-/* AB0778 80240788 AC202180 */  sw        $zero, %lo(D_80242180)($at)
-/* AB077C 8024078C 080901EF */  j         .L802407BC
-/* AB0780 80240790 00000000 */   nop
-.L80240794:
-/* AB0784 80240794 3C038024 */  lui       $v1, %hi(D_80242180)
-/* AB0788 80240798 24632180 */  addiu     $v1, $v1, %lo(D_80242180)
-/* AB078C 8024079C 0060282D */  daddu     $a1, $v1, $zero
-.L802407A0:
-/* AB0790 802407A0 24820010 */  addiu     $v0, $a0, 0x10
-/* AB0794 802407A4 AC620000 */  sw        $v0, ($v1)
-/* AB0798 802407A8 24630004 */  addiu     $v1, $v1, 4
-/* AB079C 802407AC 24840001 */  addiu     $a0, $a0, 1
-/* AB07A0 802407B0 28820070 */  slti      $v0, $a0, 0x70
-/* AB07A4 802407B4 1440FFFA */  bnez      $v0, .L802407A0
-/* AB07A8 802407B8 ACA001C0 */   sw       $zero, 0x1c0($a1)
-.L802407BC:
-/* AB07AC 802407BC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* AB07B0 802407C0 24020002 */  addiu     $v0, $zero, 2
-/* AB07B4 802407C4 03E00008 */  jr        $ra
-/* AB07B8 802407C8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411D8_D511C8.s b/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411D8_D511C8.s
deleted file mode 100644
index 2f24832d6b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411D8_D511C8.s
+++ /dev/null
@@ -1,48 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802411D8_D511C8
-/* D511C8 802411D8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D511CC 802411DC AFBF0010 */  sw        $ra, 0x10($sp)
-/* D511D0 802411E0 8C82000C */  lw        $v0, 0xc($a0)
-/* D511D4 802411E4 0C0B1EAF */  jal       evt_get_variable
-/* D511D8 802411E8 8C450000 */   lw       $a1, ($v0)
-/* D511DC 802411EC 0040182D */  daddu     $v1, $v0, $zero
-/* D511E0 802411F0 10600012 */  beqz      $v1, .L8024123C
-/* D511E4 802411F4 0000202D */   daddu    $a0, $zero, $zero
-/* D511E8 802411F8 8C620000 */  lw        $v0, ($v1)
-/* D511EC 802411FC 5040000A */  beql      $v0, $zero, .L80241228
-/* D511F0 80241200 00041080 */   sll      $v0, $a0, 2
-/* D511F4 80241204 3C058024 */  lui       $a1, %hi(func_80243CC0_A2DF00)
-/* D511F8 80241208 24A53CC0 */  addiu     $a1, $a1, %lo(func_80243CC0_A2DF00)
-.L8024120C:
-/* D511FC 8024120C 24630004 */  addiu     $v1, $v1, 4
-/* D51200 80241210 24840001 */  addiu     $a0, $a0, 1
-/* D51204 80241214 ACA20000 */  sw        $v0, ($a1)
-/* D51208 80241218 8C620000 */  lw        $v0, ($v1)
-/* D5120C 8024121C 1440FFFB */  bnez      $v0, .L8024120C
-/* D51210 80241220 24A50004 */   addiu    $a1, $a1, 4
-/* D51214 80241224 00041080 */  sll       $v0, $a0, 2
-.L80241228:
-/* D51218 80241228 3C018024 */  lui       $at, %hi(func_80243CC0_A2DF00)
-/* D5121C 8024122C 00220821 */  addu      $at, $at, $v0
-/* D51220 80241230 AC203CC0 */  sw        $zero, %lo(func_80243CC0_A2DF00)($at)
-/* D51224 80241234 08090499 */  j         .L80241264
-/* D51228 80241238 00000000 */   nop
-.L8024123C:
-/* D5122C 8024123C 3C038024 */  lui       $v1, %hi(func_80243CC0_A2DF00)
-/* D51230 80241240 24633CC0 */  addiu     $v1, $v1, %lo(func_80243CC0_A2DF00)
-/* D51234 80241244 0060282D */  daddu     $a1, $v1, $zero
-.L80241248:
-/* D51238 80241248 24820010 */  addiu     $v0, $a0, 0x10
-/* D5123C 8024124C AC620000 */  sw        $v0, ($v1)
-/* D51240 80241250 24630004 */  addiu     $v1, $v1, 4
-/* D51244 80241254 24840001 */  addiu     $a0, $a0, 1
-/* D51248 80241258 28820070 */  slti      $v0, $a0, 0x70
-/* D5124C 8024125C 1440FFFA */  bnez      $v0, .L80241248
-/* D51250 80241260 ACA001C0 */   sw       $zero, 0x1c0($a1)
-.L80241264:
-/* D51254 80241264 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D51258 80241268 24020002 */  addiu     $v0, $zero, 2
-/* D5125C 8024126C 03E00008 */  jr        $ra
-/* D51260 80241270 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
index 9849236df8..478e119bb8 100644
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@@ -15265,8 +15265,8 @@ func_80244848_8050C8 = 0x80244848; // type:func rom:0x8050C8
 func_802448A0_805120 = 0x802448A0; // type:func rom:0x805120
 func_80244984_805204 = 0x80244984; // type:func rom:0x805204
 func_802449F8_805278 = 0x802449F8; // type:func rom:0x805278
-pause_tabs_draw_stats_805418 = 0x80244B98; // type:func rom:0x805418
-pause_tabs_draw_badges_805540 = 0x80244CC0; // type:func rom:0x805540
+func_80244B98_805418 = 0x80244B98; // type:func rom:0x805418
+func_80244CC0_805540 = 0x80244CC0; // type:func rom:0x805540
 func_80244D68_8055E8 = 0x80244D68; // type:func rom:0x8055E8
 func_80244E10_805690 = 0x80244E10; // type:func rom:0x805690
 func_80244E90_805710 = 0x80244E90; // type:func rom:0x805710
diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt
index 89c57a3227..58fde23c1e 100644
--- a/ver/us/undefined_syms.txt
+++ b/ver/us/undefined_syms.txt
@@ -480,6 +480,9 @@ mac_01_D_80262A70 = 0x80262A70;
 mac_01_LetterDelivery_SavedNpcAnim = 0x80262C34;
 D_80262C38 = 0x80262C38;
 D_80262F68 = 0x80262F68;
+kpa_81_D_80242040 = 0x80242040;
+osr_01_D_80242180 = 0x80242180;
+pra_02_D_80243CC0 = 0x80243CC0;
 
 // Unsolved BSS Mysteries
 gActionCommandStatus = 0x8029FBE0; // more bss for 16c8e0's segment