diff --git a/include/common_structs.h b/include/common_structs.h
index 66b48eb7c9..a1d0816415 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -1753,13 +1753,17 @@ typedef struct ActorMovement {
     /* 0x00 */ Vec3f currentPos;
     /* 0x0C */ Vec3f goalPos;
     /* 0x18 */ Vec3f unk_18;
-    /* 0x24 */ char unk_24[24];
+    /* 0x24 */ char unk_24[0x18];
     /* 0x3C */ f32 acceleration;
     /* 0x40 */ f32 speed;
     /* 0x44 */ f32 velocity;
     /* 0x48 */ f32 angle;
     /* 0x4C */ f32 distance;
-} ActorMovement; // size = 0x50;
+    /* 0x50 */ f32 flyElapsed;
+    /* 0x54 */ char unk_11C[4];
+    /* 0x58 */ s16 flyTime;
+    /* 0x5A */ s16 flyArcAmplitude;
+} ActorMovement; // size = 0x5C;
 
 typedef struct ChompChainAnimationState {
     /* 0x00 */ Vec3f currentPos;
@@ -1812,10 +1816,6 @@ typedef struct Actor {
     /* 0x008 */ struct ActorBlueprint* actorBlueprint;
     /* 0x00C */ ActorState state;
     /* 0x0C8 */ ActorMovement fly;
-    /* 0x118 */ f32 flyElapsed;
-    /* 0x11C */ char unk_11C[4];
-    /* 0x120 */ s16 flyTime;
-    /* 0x122 */ s16 flyArcAmplitude;
     /* 0x124 */ char unk_124[16];
     /* 0x134 */ u8 unk_134;
     /* 0x135 */ u8 footStepCounter;
diff --git a/include/dead.h b/include/dead.h
index fdabaf04b9..a884be3b0f 100644
--- a/include/dead.h
+++ b/include/dead.h
@@ -118,6 +118,6 @@
 #define mdl_get_copied_gfx dead_mdl_get_copied_gfx
 #define gMatrixListPos dead_gMatrixListPos
 #define gDisplayContext dead_gDisplayContext
-#define fx_sun_undeclared fx_sun
+#define fx_sun_undeclared dead_fx_sun_undeclared
 
 #endif
diff --git a/include/effects.h b/include/effects.h
index 2b4d07f0d4..1f9f551ad6 100644
--- a/include/effects.h
+++ b/include/effects.h
@@ -2674,4 +2674,6 @@ EffectInstance* fx_pink_sparkles(s32, f32, f32, f32, f32, f32);
 EffectInstance* fx_star_outline(s32, f32, f32, f32, f32, s32);
 EffectInstance* fx_86(s32, f32, f32, f32, f32, s32);
 
+void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
+
 #endif
diff --git a/include/enums.h b/include/enums.h
index c85468b5a0..b471a9ad7f 100644
--- a/include/enums.h
+++ b/include/enums.h
@@ -534,6 +534,7 @@ enum SoundIDs {
     SOUND_JR_TROOPA_SWIM            = 0x00000046,
     SOUND_BOO_SPOOK                 = 0x00000047,
     SOUND_48                        = 0x00000048,
+    SOUND_4E                        = 0x0000004E,
     SOUND_51                        = 0x00000051,
     SOUND_52                        = 0x00000052,
     SOUND_53                        = 0x00000053,
diff --git a/include/functions.h b/include/functions.h
index 5be3857dc7..05dd0d4088 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -528,6 +528,7 @@ void add_vec2D_polar(f32* x, f32* y, f32 r, f32 theta);
 //TODO -- remove these and use audio/public.h instead
 
 enum AuResult bgm_set_track_volumes(s32 playerIndex, s16 trackVolSet);
+enum AuResult bgm_clear_track_volumes(s32 playerIndex, s16 trackVolSet);
 enum AuResult bgm_set_variation(s32 playerIndex, s16 arg1);
 void bgm_quiet_max_volume(void);
 void bgm_reset_max_volume(void);
@@ -592,6 +593,7 @@ void step_current_game_mode(void);
 void update_entities(void);
 void func_80138198(void);
 void bgm_update_music_settings(void);
+s32 func_8014AD40(void);
 void update_ambient_sounds(void);
 void update_windows(void);
 void player_render_interact_prompts(void);
diff --git a/include/model.h b/include/model.h
index 32c5203ab2..ea04e57513 100644
--- a/include/model.h
+++ b/include/model.h
@@ -157,6 +157,10 @@ typedef ModelTreeInfo ModelTreeInfoList[0x200];
 extern ModelTreeInfoList* mdl_currentModelTreeNodeInfo;
 extern ModelList* gCurrentModels;
 
+void set_model_fog_color_parameters(u8 primR, u8 primG, u8 primB, u8 primA, u8 fogR, u8 fogG, u8 fogB, s32 fogStart, s32 fogEnd);
+void set_model_env_color_parameters(u8 primR, u8 primG, u8 primB, u8 envR, u8 envG, u8 envB);
+void get_model_env_color_parameters(u8* primR, u8* primG, u8* primB, u8* envR, u8* envG, u8* envB);
+
 void init_model_data(void);
 void update_model_animator(s32);
 void update_model_animator_with_transform(s32 animatorID, Mtx* mtx);
diff --git a/src/19FAF0.c b/src/19FAF0.c
index e2f43a8b87..a736c139f2 100644
--- a/src/19FAF0.c
+++ b/src/19FAF0.c
@@ -1057,23 +1057,16 @@ ApiStatus GetMenuSelection(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-// float regz
-#ifdef NON_MATCHING
 ApiStatus func_80273444(Evt* script, s32 isInitialCall) {
     BattleStatus* battleStatus = &gBattleStatus;
     Bytecode* args = script->ptrReadPos;
     Actor* player = battleStatus->playerActor;
     ActorState* playerState = &player->state;
     f32 playerVel;
-    f32 currentX;
-    f32 currentY;
-    f32 currentZ;
-    f32 goalX;
-    f32 goalY;
-    f32 goalZ;
+    f32 x, y, z;
+    f32 goalX, goalY, goalZ;
     f32 var_f8;
-    f64 temp_f20_2;
-    f32 sub;
+    f64 playerSpeed;
 
     if (isInitialCall) {
         script->functionTemp[0] = FALSE;
@@ -1084,20 +1077,21 @@ ApiStatus func_80273444(Evt* script, s32 isInitialCall) {
         player->state.moveArcAmplitude = evt_get_variable(script, *args++);
         script->functionTemp[1] = evt_get_variable(script, *args++);
 
-        goalX = player->state.goalPos.x;
-        goalY = player->state.goalPos.y;
-        goalZ = player->state.goalPos.z;
         player->state.currentPos.x = player->currentPos.x;
         player->state.currentPos.y = player->currentPos.y;
         player->state.currentPos.z = player->currentPos.z;
-        currentX = player->currentPos.x;
-        currentY = player->currentPos.y;
-        currentZ = player->currentPos.z;
 
-        player->state.angle = atan2(currentX, currentZ, goalX, goalZ);
-        player->state.distance = dist2D(currentX, currentZ, goalX, goalZ);
+        x = player->state.currentPos.x;
+        y = player->state.currentPos.y;
+        z = player->state.currentPos.z;
+        goalX = player->state.goalPos.x;
+        goalY = player->state.goalPos.y;
+        goalZ = player->state.goalPos.z;
 
-        sub = goalY - currentY;
+        player->state.angle = atan2(x, z, goalX, goalZ);
+        player->state.distance = dist2D(x, z, goalX, goalZ);
+
+        y = goalY - y;
 
         if (player->state.moveTime == 0) {
             player->state.moveTime = player->state.distance / player->state.speed;
@@ -1108,7 +1102,7 @@ ApiStatus func_80273444(Evt* script, s32 isInitialCall) {
         }
 
         playerState->speed += var_f8 / playerState->moveTime;
-        playerState->velocity = (playerState->acceleration * playerState->moveTime * 0.5f) + (sub / playerState->moveTime);
+        playerState->velocity = (playerState->acceleration * playerState->moveTime * 0.5f) + (y / playerState->moveTime);
         set_animation(0, 0, playerState->animJumpRise);
         playerState->unk_24 = 90.0f;
         playerState->unk_28 = 180 / playerState->moveTime;
@@ -1141,8 +1135,8 @@ ApiStatus func_80273444(Evt* script, s32 isInitialCall) {
 
     playerState->currentPos.y += playerVel;
     playerState->velocity -= playerState->acceleration;
-    temp_f20_2 = playerState->speed;
-    add_xz_vec3f(&playerState->currentPos, temp_f20_2 + sin_rad(DEG_TO_RAD(playerState->unk_24)), playerState->angle);
+    playerSpeed = playerState->speed;
+    add_xz_vec3f(&playerState->currentPos, playerSpeed + sin_rad(DEG_TO_RAD(playerState->unk_24)), playerState->angle);
     playerState->unk_24 += playerState->unk_28;
     playerState->unk_24 = clamp_angle(playerState->unk_24);
     player->currentPos.x = playerState->currentPos.x;
@@ -1164,26 +1158,13 @@ ApiStatus func_80273444(Evt* script, s32 isInitialCall) {
 
     return ApiStatus_DONE1;
 }
-#else
-INCLUDE_ASM(s32, "19FAF0", func_80273444);
-#endif
 
-//float bs
-#ifdef NON_MATCHING
-s32 PlayerFallToGoal(Evt* script, s32 isInitialCall) {
+ApiStatus PlayerFallToGoal(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     Actor* player = gBattleStatus.playerActor;
     ActorState* state = &player->state;
-    f32 temp_f0_2;
-    f32 temp_f20;
-    f32 goalX;
-    f32 goalY;
-    f32 goalZ;
-    f32 currentX, currentY, currentZ;
-    f32 new_var2;
-    f32 temp;
-    f32 xTemp, yTemp, zTemp;
-    f32 goalPosX, goalPosZ;
+    f32 x, y, z;
+    f32 goalX, goalY, goalZ;
 
     if (isInitialCall) {
         script->functionTemp[0] = FALSE;
@@ -1192,23 +1173,23 @@ s32 PlayerFallToGoal(Evt* script, s32 isInitialCall) {
     if (!script->functionTemp[0]) {
         s32 moveTime = evt_get_variable(script, *args++);
 
-        state->currentPos.x = player->currentPos.x;
-        state->currentPos.z = player->currentPos.z;
-        currentX = state->currentPos.x;
-        state->currentPos.y = player->currentPos.y;
-        currentY = state->currentPos.y;
-        temp = state->currentPos.z;
+        player->state.currentPos.x = player->currentPos.x;
+        player->state.currentPos.y = player->currentPos.y;
+        player->state.currentPos.z = player->currentPos.z;
 
-        goalX = state->goalPos.x;
-        goalY = state->goalPos.y;
-        goalZ = state->goalPos.z;
+        x = player->state.currentPos.x;
+        y = player->state.currentPos.y;
+        z = player->state.currentPos.z;
+        goalX = player->state.goalPos.x;
+        goalY = player->state.goalPos.y;
+        goalZ = player->state.goalPos.z;
 
         state->moveTime = moveTime;
 
-        state->angle = atan2(currentX, temp, goalX, goalZ);
-        state->distance = dist2D(currentX, temp, goalX, goalZ);
+        player->state.angle = atan2(x, z, goalX, goalZ);
+        player->state.distance = dist2D(x, z, goalX, goalZ);
 
-        temp = goalY - currentY;
+        y = goalY - y;
 
         if (state->moveTime == 0) {
             state->moveTime = state->distance / state->speed;
@@ -1217,13 +1198,13 @@ s32 PlayerFallToGoal(Evt* script, s32 isInitialCall) {
         }
 
         state->velocity = 0.0f;
-        state->acceleration = (((temp / state->moveTime) - state->velocity) / (-state->moveTime * 0.5));
+        state->acceleration = ((y / state->moveTime) - state->velocity) / (-state->moveTime * 0.5);
         set_animation(ACTOR_PLAYER, 0, state->animJumpRise);
         script->functionTemp[0] = TRUE;
     }
 
     if (state->velocity < 0.0f) {
-        set_animation(0, 0, state->animJumpFall);
+        set_animation(ACTOR_PLAYER, 0, state->animJumpFall);
     }
 
     state->currentPos.y += state->velocity;
@@ -1245,9 +1226,6 @@ s32 PlayerFallToGoal(Evt* script, s32 isInitialCall) {
     }
     return ApiStatus_BLOCK;
 }
-#else
-INCLUDE_ASM(s32, "19FAF0", PlayerFallToGoal, Evt* script, s32 isInitialCall);
-#endif
 
 ApiStatus PlayerLandJump(Evt *script, s32 isInitialCall) {
     Actor* player = gBattleStatus.playerActor;
diff --git a/src/1A5830.c b/src/1A5830.c
index 384d5bb79c..1851b4b0e5 100644
--- a/src/1A5830.c
+++ b/src/1A5830.c
@@ -1003,9 +1003,171 @@ ApiStatus BindNextTurn(Evt* script, s32 isInitialCall) {
 
 INCLUDE_ASM(s32, "1A5830", JumpToGoal);
 
-INCLUDE_ASM(s32, "1A5830", IdleJumpToGoal);
+ApiStatus IdleJumpToGoal(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    ActorMovement* fly;
+    f32 x, y, z;
+    f32 goalX, goalY, goalZ;
+    f32 var_f8;
+    Actor* actor;
 
-INCLUDE_ASM(s32, "1A5830", JumpToGoalSimple2);
+    if (isInitialCall) {
+        script->functionTemp[0] = FALSE;
+    }
+
+    if (!script->functionTemp[0]) {
+        s32 actorID = evt_get_variable(script, *args++);
+
+        if (actorID == ACTOR_SELF) {
+            actorID = script->owner1.actorID;
+        }
+
+        script->functionTempPtr[1] = actor = get_actor(actorID);
+        fly = &actor->fly;
+
+        actor->fly.flyTime = evt_get_variable(script, *args++);
+        script->functionTemp[2] = evt_get_variable(script, *args++);
+        script->functionTemp[3] = evt_get_variable(script, *args++);
+
+        fly->currentPos.x = actor->currentPos.x;
+        fly->currentPos.y = actor->currentPos.y;
+        fly->currentPos.z = actor->currentPos.z;
+
+        x = fly->currentPos.x;
+        y = fly->currentPos.y;
+        z = fly->currentPos.z;
+        goalX = fly->goalPos.x;
+        goalY = fly->goalPos.y;
+        goalZ = fly->goalPos.z;
+        fly->angle = atan2(x, z, goalX, goalZ);
+        fly->distance = dist2D(x, z, goalX, goalZ);
+        y = goalY - y;
+
+        if (fly->flyTime == 0) {
+            fly->flyTime = fly->distance / fly->speed;
+            var_f8 = fly->distance - (fly->flyTime * fly->speed);
+        } else {
+            fly->speed = fly->distance / fly->flyTime;
+            var_f8 = fly->distance - (fly->flyTime * fly->speed);
+        }
+
+        if (fly->flyTime == 0) {
+            return ApiStatus_DONE2;
+        }
+
+        fly->velocity = ((fly->acceleration * fly->flyTime) * 0.5f) + (y / fly->flyTime);
+        fly->speed += var_f8 / fly->flyTime;
+        script->functionTemp[0] = TRUE;
+    }
+
+    actor = script->functionTempPtr[1];
+    fly = &actor->fly;
+
+    fly->currentPos.y += fly->velocity;
+    fly->velocity -= fly->acceleration;
+    if (fly->velocity < 0.0f && fly->goalPos.y > fly->currentPos.y) {
+        fly->currentPos.y = fly->goalPos.y;
+    }
+    add_xz_vec3f_copy2(&fly->currentPos, fly->speed, fly->angle);
+    actor->currentPos.x = fly->currentPos.x;
+    actor->currentPos.y = fly->currentPos.y;
+    actor->currentPos.z = fly->currentPos.z;
+
+    fly->flyTime--;
+    if (fly->flyTime <= 0) {
+        if (script->functionTemp[3] != 0) {
+            play_movement_dust_effects(2, fly->goalPos.x, fly->goalPos.y, fly->goalPos.z, fly->angle);
+        }
+        actor->currentPos.x = fly->goalPos.x;
+        actor->currentPos.y = fly->goalPos.y;
+        actor->currentPos.z = fly->goalPos.z;
+        return ApiStatus_DONE1;
+    }
+
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus JumpToGoalSimple2(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    ActorState* state;
+    f32 x, y, z;
+    f32 goalX, goalY, goalZ;
+    f32 var_f8;
+    Actor* actor;
+
+    if (isInitialCall) {
+        script->functionTemp[0] = FALSE;
+    }
+
+    if (!script->functionTemp[0]) {
+        s32 actorID = evt_get_variable(script, *args++);
+
+        if (actorID == ACTOR_SELF) {
+            actorID = script->owner1.actorID;
+        }
+
+        script->functionTempPtr[1] = actor = get_actor(actorID);
+        state = &actor->state;
+
+        state->moveTime = evt_get_variable(script, *args++);
+        state->currentPos.x = actor->currentPos.x;
+        state->currentPos.y = actor->currentPos.y;
+        state->currentPos.z = actor->currentPos.z;
+
+        x = state->currentPos.x;
+        y = state->currentPos.y;
+        z = state->currentPos.z;
+        goalX = state->goalPos.x;
+        goalY = state->goalPos.y;
+        goalZ = state->goalPos.z;
+        state->angle = atan2(x, z, goalX, goalZ);
+        state->distance = dist2D(x, z, goalX, goalZ);
+        y -= goalY;
+
+        if (state->moveTime == 0) {
+            state->moveTime = state->distance / state->speed;
+            var_f8 = state->distance - (state->moveTime * state->speed);
+        } else {
+            state->speed = state->distance / state->moveTime;
+            var_f8 = state->distance - (state->moveTime * state->speed);
+        }
+
+        if (state->moveTime == 0) {
+            return ApiStatus_DONE2;
+        }
+
+        state->velocity = ((state->acceleration * state->moveTime) * 0.5f) + (y / state->moveTime);
+        state->speed += var_f8 / state->moveTime;
+        if (actor->actorTypeData1[4] != 0) {
+            sfx_play_sound_at_position(actor->actorTypeData1[4], 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z);
+        }
+        script->functionTemp[0] = TRUE;
+    }
+
+    actor = script->functionTempPtr[1];
+    state = &actor->state;
+
+    state->currentPos.y -= state->velocity;
+    state->velocity -= state->acceleration;
+    if (state->velocity > 0.0f && state->goalPos.y < state->currentPos.y) {
+        state->currentPos.y = state->goalPos.y;
+    }
+    add_xz_vec3f(&state->currentPos, state->speed, state->angle);
+    actor->currentPos.x = state->currentPos.x;
+    actor->currentPos.y = state->currentPos.y;
+    actor->currentPos.z = state->currentPos.z;
+
+    state->moveTime--;
+    if (state->moveTime <= 0) {
+        play_movement_dust_effects(2, state->goalPos.x, state->goalPos.y, state->goalPos.z, state->angle);
+        actor->currentPos.x = state->goalPos.x;
+        actor->currentPos.y = state->goalPos.y;
+        actor->currentPos.z = state->goalPos.z;
+        return ApiStatus_DONE1;
+    }
+
+    return ApiStatus_BLOCK;
+}
 
 INCLUDE_ASM(s32, "1A5830", JumpWithBounce);
 
@@ -1572,10 +1734,17 @@ s32 FlyPartTo(Evt* script, s32 isInitialCall) {
     Actor* actor;
     ActorPart* part;
     ActorPartMovement* partMovement;
-    s32 actorID, partIndex;
+    s32 actorID;
+    s32 partIndex;
     f32 f2, f4;
-    f32 d1, d2, d3, delta;
-    f32 d1_, d2_, d3_, delta_;
+
+    f32 temp_f0;
+    f32 xComp;
+    f32 temp_f0_2;
+    f32 temp_f0_3;
+    f32 yComp;
+    f32 zComp;
+    f32 temp_f2_4;
 
     if (isInitialCall) {
         actorID = evt_get_variable(script, *args++);
@@ -1597,14 +1766,21 @@ s32 FlyPartTo(Evt* script, s32 isInitialCall) {
         partMovement->unk_3A = evt_get_variable(script, *args++);
         script->functionTemp[3] = evt_get_variable(script, *args++);
 
-        partMovement->unk_18.x = partMovement->unk_00.x = part->absolutePosition.x;
-        d1_ = SQ((partMovement->unk_00.x - partMovement->goalPos.x));
-        partMovement->unk_18.y = partMovement->unk_00.y = part->absolutePosition.y;
-        d2_ = SQ((partMovement->unk_00.y - partMovement->goalPos.z));
-        partMovement->unk_18.z = partMovement->unk_00.z = part->absolutePosition.z;
-        d3_ = SQ((partMovement->unk_00.z - partMovement->goalPos.z));
-
-        partMovement->distance = sqrtf(d1_ + d2_ + d3_);
+        temp_f0 = part->absolutePosition.x;
+        partMovement->unk_00.x = temp_f0;
+        partMovement->unk_18.x = temp_f0;
+        temp_f0_2 = part->absolutePosition.y;
+        partMovement->unk_00.y = temp_f0_2;
+        partMovement->unk_18.y = temp_f0_2;
+        temp_f0_3 = part->absolutePosition.z;
+        partMovement->unk_00.z = temp_f0_3;
+        partMovement->unk_18.z = temp_f0_3;
+        //xComp = temp_f0 - partMovement->goalPos.x;
+        f2 = partMovement->goalPos.x;
+        xComp = temp_f0 - f2;
+        yComp = temp_f0_2 - partMovement->goalPos.y;
+        zComp = temp_f0_3 - partMovement->goalPos.z;
+        partMovement->distance = sqrtf(SQ(xComp) + SQ(yComp) + SQ(zComp));
 
         if (partMovement->moveTime == 0) {
             partMovement->moveTime = partMovement->distance / partMovement->moveSpeed;
@@ -1630,8 +1806,8 @@ s32 FlyPartTo(Evt* script, s32 isInitialCall) {
     }
 
     part = script->functionTempPtr[2];
-    partMovement = part->movement;
     actor = script->functionTempPtr[1];
+    partMovement = part->movement;
     partMovement->unk_00.x = update_lerp_battle(script->functionTemp[3], partMovement->unk_18.x, partMovement->goalPos.x, partMovement->unk_3C, partMovement->moveTime);
     partMovement->unk_00.y = update_lerp_battle(script->functionTemp[3], partMovement->unk_18.y, partMovement->goalPos.y, partMovement->unk_3C, partMovement->moveTime);
     partMovement->unk_00.z = update_lerp_battle(script->functionTemp[3], partMovement->unk_18.z, partMovement->goalPos.z, partMovement->unk_3C, partMovement->moveTime);
@@ -1681,16 +1857,12 @@ s32 FlyPartTo(Evt* script, s32 isInitialCall) {
         }
     }
 
-    delta = partMovement->goalPos.x;
-    delta -= partMovement->unk_00.x;
-    d1 = SQ(delta);
-    delta = partMovement->goalPos.y - partMovement->unk_00.y;
-    d2 = SQ(delta);
-    delta = partMovement->goalPos.z - partMovement->unk_00.z;
-    d3 = SQ(delta);
-    f2 = sqrtf(d1 + d2 + d3);
+    f2 = sqrtf(
+        SQ(partMovement->goalPos.x - partMovement->unk_00.x) +
+        SQ(partMovement->goalPos.y - partMovement->unk_00.y) +
+        SQ(partMovement->goalPos.z - partMovement->unk_00.z)
+    );
 
-    //f2 = sqrtf(SQ((partMovement->unk_00.x - partMovement->goalPos.x)) + SQ((partMovement->unk_00.y - partMovement->goalPos.y)) + SQ((partMovement->unk_00.z - partMovement->goalPos.z)));
     if (f2 == 0.0f) {
         f2 = 1.0f;
     }
diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c
index 363378897e..44f2266cb7 100644
--- a/src/a5dd0_len_114e0.c
+++ b/src/a5dd0_len_114e0.c
@@ -6,6 +6,15 @@
 #include "hud_element.h"
 #include "effects.h"
 
+#ifdef SHIFT
+#define AREA_SPECIFIC_ENTITY_VRAM entity_default_VRAM
+#else
+#define MODEL_TEXTURE_BASE_ADDRESS 0x8028E000 // TODO shift
+#define BATTLE_ENTITY_HEAP_BASE 0x80267FF0 // TODO shift
+#define AREA_SPECIFIC_ENTITY_VRAM 0x802BAE00
+#define BATTLE_ENTITY_HEAP_BOTTOM 0x80250000 // TODO shift
+#endif
+
 typedef struct Fog {
     /* 0x00 */ s32 enabled;
     /* 0x04 */ s32 r;
@@ -385,7 +394,7 @@ Gfx D_8014B400[21][5] = {
     },
 };
 
-void* mdl_textureBaseAddress = 0x8028E000;
+void* mdl_textureBaseAddress = (void*) MODEL_TEXTURE_BASE_ADDRESS;
 
 u8 mdl_bgMultiplyColorA = 0;
 u8 mdl_bgMultiplyColorR = 0;
@@ -1085,9 +1094,9 @@ void entity_free_static_data(EntityBlueprint* data);
 s32 create_entity_shadow(Entity* entity, f32 x, f32 y, f32 z);
 void update_entity_shadow_position(Entity* entity);
 void func_80117D00(Model* model);
-void appendGfx_model_group(Model* model);
+void appendGfx_model_group(void* model);
 void render_transform_group_node(ModelNode* node);
-void render_transform_group(ModelTransformGroup* group);
+void render_transform_group(void* group);
 void func_801180E8(TextureHeader*, void**, u8* raster, u16* palette, u8* auxRaster, u16* auxPalette, s32, s32, s32, s32);
 void load_model_transforms(ModelNode* model, ModelNode* parent, Matrix4f mdlTxMtx, s32 treeDepth);
 s32 is_identity_fixed_mtx(Mtx* mtx);
@@ -1772,12 +1781,6 @@ void entity_reset_collision(Entity* entity) {
     entity->flags &= ~ENTITY_FLAGS_DETECTED_COLLISION;
 }
 
-#ifdef SHIFT
-#define AREA_SPECIFIC_ENTITY_VRAM entity_default_VRAM
-#else
-#define AREA_SPECIFIC_ENTITY_VRAM 0x802BAE00
-#endif
-
 void load_area_specific_entity_data(void) {
     if (!entity_area_specific_data_is_loaded) {
         if (gGameStatusPtr->areaID == AREA_JAN || gGameStatusPtr->areaID == AREA_IWA) {
@@ -1826,8 +1829,8 @@ void clear_entity_data(s32 arg0) {
     }
 
     if (!gGameStatusPtr->isBattle) {
-        gEntityHeapBottom = 0x80250000;
-        gEntityHeapBase = 0x80267FF0;
+        gEntityHeapBottom = BATTLE_ENTITY_HEAP_BOTTOM;
+        gEntityHeapBase = BATTLE_ENTITY_HEAP_BASE;
     } else {
         gEntityHeapBottom = (s32)&D_801A7000;
         gEntityHeapBase = gEntityHeapBottom + 0x3000;
@@ -1847,8 +1850,8 @@ void clear_entity_data(s32 arg0) {
 
 void init_entity_data(void) {
     if (!gGameStatusPtr->isBattle) {
-        gEntityHeapBottom = 0x80250000;
-        gEntityHeapBase = 0x80267FF0;
+        gEntityHeapBottom = BATTLE_ENTITY_HEAP_BOTTOM;
+        gEntityHeapBase = BATTLE_ENTITY_HEAP_BASE;
         reload_world_entity_data();
     } else {
         s32 i;
@@ -2053,19 +2056,15 @@ void load_simple_entity_data(Entity* entity, EntityBlueprint* bp, s32 listIndex)
 
 void load_split_entity_data(Entity* entity, EntityBlueprint* entityData, s32 listIndex) {
     s32 swizzlePointers = FALSE;
-    s32 s2;
     s32 loadedStart, loadedEnd;
     void* animBaseAddr;
-    s32 v0, v00;
     s16* animationScript;
     StaticAnimatorNode** animationNodes;
-    s32 s00;
     s32 specialSize;
     s32 dma1size;
     s32 dma2size_1;
     s32 dma2size_2;
     s32 totalLoaded;
-    s32 totalLoadedBytes;
 
     if (entityData->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) {
         DmaEntry* dmaList = entityData->dmaList;
@@ -2959,7 +2958,7 @@ void state_render_frontUI(void) {
     }
 }
 
-void appendGfx_model(Model* model);
+void appendGfx_model(void* data);
 INCLUDE_ASM(void, "a5dd0_len_114e0", appendGfx_model, Model*);
 
 void func_80114B58(u32 romOffset, TextureHandle* handle, TextureHeader* header, s32 mainSize, s32 mainPalSize, s32 auxSize, s32 auxPalSize) {
@@ -3307,280 +3306,216 @@ INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80116674);
 
 INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80116698);
 
-// this function has weird control flow and suqqz
-#ifdef NON_EQUIVALENT
+
 void render_models(void) {
+    RenderTask rt;
+    RenderTask* rtPtr = &rt;
+    f32 outX, outY, outZ, outS;
+    f32 m00, m01, m02, m03;
+    f32 m10, m11, m12, m13;
+    f32 m20, m21, m22, m23;
+    f32 m30, m31, m32, m33;
+    f32 x, y, z;
+    f32 bbx, bby, bbz;
+
     Camera* camera = &gCameras[gCurrentCameraID];
+    Model* model;
+    ModelBoundingBox* boundingBox;
+    ModelTransformGroup* transformGroup;
+    f32 xComp, yComp, zComp;
+
     s32 distance;
     s32 cond;
     s32 i;
 
-    RenderTask rt;
-    RenderTask* rtPtr = &rt;
-    f32 sp38;
-    f32 sp3C;
-    f32 sp40;
-    f32 sp44;
-    f32 sp48;
-    f32 sp4C;
-    f32 sp50;
-    f32 sp54;
-    f32 sp58;
-    f32 sp5C;
-    f32 sp60;
-    f32 sp64;
-    f32 sp68;
-    f32 sp6C;
-    f32 sp70;
-    f32 sp74;
-    f32 sp78;
-    f32 sp7C;
-    f32 sp80;
-    f32 sp84;
-    f32 centerX, centerY, centerZ;
-    f32 sp98;
-    f32 spA0;
+#define COMMON_RENDER_MODELS \
+    outX = (m00 * xComp) + (m10 * yComp) + (m20 * zComp) + m30; \
+    outY = (m01 * xComp) + (m11 * yComp) + (m21 * zComp) + m31; \
+    outZ = (m02 * xComp) + (m12 * yComp) + (m22 * zComp) + m32; \
+    outS = (m03 * xComp) + (m13 * yComp) + (m23 * zComp) + m33; \
+    if (outS == 0.0f) { \
+        break; \
+    } \
+    outS = 1.0f / outS; \
+    xComp = outX * outS; \
+    yComp = outY * outS; \
+    zComp = outZ * outS; \
+    if (zComp > -1.0f && xComp >= -1.0f && xComp <= 1.0f && yComp >= -1.0f && yComp <= 1.0f) { \
+        break; \
+    }
 
-    f32 temp_f0;
-    f32 temp_f0_2;
-    f32 temp_f0_3;
-    f32 temp_f0_4;
-    f32 temp_f0_5;
-    f32 temp_f0_6;
-    f32 temp_f0_7;
-    f32 temp_f0_8;
-    f32 temp_f12;
-    f32 temp_f12_10;
-    f32 temp_f12_11;
-    f32 temp_f12_12;
-    f32 temp_f12_13;
-    f32 temp_f12_14;
-    f32 temp_f12_15;
-    f32 temp_f12_16;
-    f32 temp_f12_2;
-    f32 temp_f12_3;
-    f32 temp_f12_4;
-    f32 temp_f12_5;
-    f32 temp_f12_6;
-    f32 temp_f12_7;
-    f32 temp_f12_8;
-    f32 temp_f12_9;
-    f32 temp_f20;
-    f32 temp_f20_2;
-    f32 temp_f20_3;
-    f32 temp_f20_4;
-    f32 temp_f20_5;
-    f32 temp_f20_6;
-    f32 temp_f20_7;
-    f32 temp_f20_8;
-    f32 temp_f26;
-    f32 temp_f28;
-    f32 temp_f2;
-    f32 temp_f2_2;
-    f32 temp_f2_3;
-    f32 temp_f2_4;
-    f32 temp_f2_5;
-    f32 temp_f2_6;
-    f32 temp_f2_7;
-    f32 temp_f2_8;
-    f32 temp_f4;
-    f32 temp_f4_10;
-    f32 temp_f4_11;
-    f32 temp_f4_12;
-    f32 temp_f4_13;
-    f32 temp_f4_14;
-    f32 temp_f4_15;
-    f32 temp_f4_16;
-    f32 temp_f4_17;
-    f32 temp_f4_18;
-    f32 temp_f4_19;
-    f32 temp_f4_20;
-    f32 temp_f4_21;
-    f32 temp_f4_22;
-    f32 temp_f4_23;
-    f32 temp_f4_24;
-    f32 temp_f4_2;
-    f32 temp_f4_3;
-    f32 temp_f4_4;
-    f32 temp_f4_5;
-    f32 temp_f4_6;
-    f32 temp_f4_7;
-    f32 temp_f4_8;
-    f32 temp_f4_9;
-    f32 temp_f6;
-    f32 temp_f6_2;
-    f32 temp_f6_3;
-    f32 temp_f6_4;
-    f32 temp_f6_5;
-    f32 temp_f6_6;
-    f32 temp_f6_7;
-    f32 temp_f6_8;
-    f32 temp_f8;
-    f32 temp_f8_2;
-    f32 temp_f8_3;
-    f32 temp_f8_4;
-    f32 temp_f8_5;
-    f32 temp_f8_6;
-    f32 temp_f8_7;
-    f32 temp_f8_8;
-
-    sp48 = camera->perspectiveMatrix[0][0];
-    sp4C = camera->perspectiveMatrix[0][1];
-    sp50 = camera->perspectiveMatrix[0][2];
-    sp54 = camera->perspectiveMatrix[0][3];
-    sp58 = camera->perspectiveMatrix[1][0];
-    sp5C = camera->perspectiveMatrix[1][1];
-    sp60 = camera->perspectiveMatrix[1][2];
-    sp64 = camera->perspectiveMatrix[1][3];
-    sp68 = camera->perspectiveMatrix[2][0];
-    sp6C = camera->perspectiveMatrix[2][1];
-    sp70 = camera->perspectiveMatrix[2][2];
-    sp74 = camera->perspectiveMatrix[2][3];
-    sp78 = camera->perspectiveMatrix[3][0];
-    sp7C = camera->perspectiveMatrix[3][1];
-    sp80 = camera->perspectiveMatrix[3][2];
-    sp84 = camera->perspectiveMatrix[3][3];
+    m00 = camera->perspectiveMatrix[0][0];
+    m01 = camera->perspectiveMatrix[0][1];
+    m02 = camera->perspectiveMatrix[0][2];
+    m03 = camera->perspectiveMatrix[0][3];
+    m10 = camera->perspectiveMatrix[1][0];
+    m11 = camera->perspectiveMatrix[1][1];
+    m12 = camera->perspectiveMatrix[1][2];
+    m13 = camera->perspectiveMatrix[1][3];
+    m20 = camera->perspectiveMatrix[2][0];
+    m21 = camera->perspectiveMatrix[2][1];
+    m22 = camera->perspectiveMatrix[2][2];
+    m23 = camera->perspectiveMatrix[2][3];
+    m30 = camera->perspectiveMatrix[3][0];
+    m31 = camera->perspectiveMatrix[3][1];
+    m32 = camera->perspectiveMatrix[3][2];
+    m33 = camera->perspectiveMatrix[3][3];
 
     for (i = 0; i < ARRAY_COUNT(*gCurrentModels); i++) {
-        Model* model = (*gCurrentModels)[i];
-
-        if (model != NULL) {
-            if (model->flags == 0) {
-                continue;
-            }
-
-            if (model->flags & 4) {
-                continue;
-            }
-
-            if (model->flags & 2) {
-                continue;
-            }
-
-            if (model->flags & 0x20) {
-                continue;
-            }
-
-            if (model->flags & 0x8) {
-                continue;
-            }
-
-            centerX = model->center.x;
-            centerY = model->center.y;
-            centerZ = model->center.z;
-
-            if (model->flags & 0x200) {
-                ModelNodeProperty* propertyList = model->modelNode->propertyList;
-
-                temp_f26 = (f32) propertyList->dataType;
-                sp98 = temp_f26;
-                spA0 = (f32) propertyList[1].dataType;
-                temp_f28 = (f32) propertyList[1].key;
-                temp_f4 = centerX - temp_f26;
-                temp_f12 = centerY - spA0;
-                temp_f20 = centerZ - temp_f28;
-                temp_f6 = (sp48 * temp_f4) + (sp58 * temp_f12) + (sp68 * temp_f20) + sp78;
-                temp_f8 = (sp4C * temp_f4) + (sp5C * temp_f12) + (sp6C * temp_f20) + sp7C;
-                temp_f2 = (sp50 * temp_f4) + (sp60 * temp_f12) + (sp70 * temp_f20) + sp80;
-                temp_f4_2 = (sp54 * temp_f4) + (sp64 * temp_f12) + (sp74 * temp_f20) + sp84;
-                cond = FALSE;
-
-                if ((temp_f4_2 != 0.0f) &&
-                ((temp_f0 = 1.0f / temp_f4_2, temp_f4_3 = temp_f6 * temp_f0, temp_f12_2 = temp_f8 * temp_f0, !((temp_f2 * temp_f0) > -1.0f)) || !(temp_f4_3 >= -1.0f) || !(temp_f4_3 <= 1.0f) || !(temp_f12_2 >= -1.0f) || !(temp_f12_2 <= 1.0f)) && ((sp98 == 0.0f) || ((temp_f4_4 = centerX + sp98, temp_f12_3 = centerY - spA0, temp_f20_2 = centerZ - temp_f28, temp_f6_2 = (sp48 * temp_f4_4) + (sp58 * temp_f12_3) + (sp68 * temp_f20_2) + sp78, temp_f8_2 = (sp4C * temp_f4_4) + (sp5C * temp_f12_3) + (sp6C * temp_f20_2) + sp7C, temp_f2_2 = (sp50 * temp_f4_4) + (sp60 * temp_f12_3) + (sp70 * temp_f20_2) + sp80, temp_f4_5 = (sp54 * temp_f4_4) + (sp64 * temp_f12_3) + (sp74 * temp_f20_2) + sp84, (temp_f4_5 != 0.0f)) && ((temp_f0_2 = 1.0f / temp_f4_5, temp_f4_6 = temp_f6_2 * temp_f0_2, temp_f12_4 = temp_f8_2 * temp_f0_2, !((temp_f2_2 * temp_f0_2) > -1.0f)) || !(temp_f4_6 >= -1.0f) || !(temp_f4_6 <= 1.0f) || !(temp_f12_4 >= -1.0f) || !(temp_f12_4 <= 1.0f)))) && ((spA0 == 0.0f) || ((temp_f4_7 = centerX - sp98, temp_f12_5 = centerY + spA0, temp_f20_3 = centerZ - temp_f28, temp_f6_3 = (sp48 * temp_f4_7) + (sp58 * temp_f12_5) + (sp68 * temp_f20_3) + sp78, temp_f8_3 = (sp4C * temp_f4_7) + (sp5C * temp_f12_5) + (sp6C * temp_f20_3) + sp7C, temp_f2_3 = (sp50 * temp_f4_7) + (sp60 * temp_f12_5) + (sp70 * temp_f20_3) + sp80, temp_f4_8 = (sp54 * temp_f4_7) + (sp64 * temp_f12_5) + (sp74 * temp_f20_3) + sp84, (temp_f4_8 != 0.0f)) && ((temp_f0_3 = 1.0f / temp_f4_8, temp_f4_9 = temp_f6_3 * temp_f0_3, temp_f12_6 = temp_f8_3 * temp_f0_3, !((temp_f2_3 * temp_f0_3) > -1.0f)) || !(temp_f4_9 >= -1.0f) || !(temp_f4_9 <= 1.0f) || !(temp_f12_6 >= -1.0f) || !(temp_f12_6 <= 1.0f))))) {
-                    if ((sp98 != 0.0f) && (spA0 != 0.0f)) {
-                        temp_f4_10 = centerX + sp98;
-                        temp_f12_7 = centerY + spA0;
-                        temp_f20_4 = centerZ - temp_f28;
-                        temp_f6_4 = (sp48 * temp_f4_10) + (sp58 * temp_f12_7) + (sp68 * temp_f20_4) + sp78;
-                        temp_f8_4 = (sp4C * temp_f4_10) + (sp5C * temp_f12_7) + (sp6C * temp_f20_4) + sp7C;
-                        temp_f2_4 = (sp50 * temp_f4_10) + (sp60 * temp_f12_7) + (sp70 * temp_f20_4) + sp80;
-                        temp_f4_11 = (sp54 * temp_f4_10) + (sp64 * temp_f12_7) + (sp74 * temp_f20_4) + sp84;
-
-                        if (temp_f4_11 != 0.0f) {
-                            temp_f0_4 = 1.0f / temp_f4_11;
-                            temp_f4_12 = temp_f6_4 * temp_f0_4;
-                            temp_f12_8 = temp_f8_4 * temp_f0_4;
-                            if (((temp_f2_4 * temp_f0_4) > -1.0f) && (temp_f4_12 >= -1.0f) && (temp_f4_12 <= 1.0f) && (temp_f12_8 >= -1.0f)) {
-                                if (!(temp_f12_8 <= 1.0f)) {
-                                    goto block_36;
-                                }
-                            } else {
-                                goto block_37;
-                            }
-                        }
-                    } else {
-block_36:
-block_37:
-                        if (((temp_f28 == 0.0f) || ((temp_f4_13 = centerX - sp98, temp_f12_9 = centerY - spA0, temp_f20_5 = centerZ + temp_f28, temp_f6_5 = (sp48 * temp_f4_13) + (sp58 * temp_f12_9) + (sp68 * temp_f20_5) + sp78, temp_f8_5 = (sp4C * temp_f4_13) + (sp5C * temp_f12_9) + (sp6C * temp_f20_5) + sp7C, temp_f2_5 = (sp50 * temp_f4_13) + (sp60 * temp_f12_9) + (sp70 * temp_f20_5) + sp80, temp_f4_14 = (sp54 * temp_f4_13) + (sp64 * temp_f12_9) + (sp74 * temp_f20_5) + sp84, (temp_f4_14 != 0.0f)) && ((temp_f0_5 = 1.0f / temp_f4_14, temp_f4_15 = temp_f6_5 * temp_f0_5, temp_f12_10 = temp_f8_5 * temp_f0_5, !((temp_f2_5 * temp_f0_5) > -1.0f)) || !(temp_f4_15 >= -1.0f) || !(temp_f4_15 <= 1.0f) || !(temp_f12_10 >= -1.0f) || !(temp_f12_10 <= 1.0f)))) && ((sp98 == 0.0f) || (temp_f28 == 0.0f) || ((temp_f4_16 = centerX + sp98, temp_f12_11 = centerY - spA0, temp_f20_6 = centerZ + temp_f28, temp_f6_6 = (sp48 * temp_f4_16) + (sp58 * temp_f12_11) + (sp68 * temp_f20_6) + sp78, temp_f8_6 = (sp4C * temp_f4_16) + (sp5C * temp_f12_11) + (sp6C * temp_f20_6) + sp7C, temp_f2_6 = (sp50 * temp_f4_16) + (sp60 * temp_f12_11) + (sp70 * temp_f20_6) + sp80, temp_f4_17 = (sp54 * temp_f4_16) + (sp64 * temp_f12_11) + (sp74 * temp_f20_6) + sp84, (temp_f4_17 != 0.0f)) && ((temp_f0_6 = 1.0f / temp_f4_17, temp_f4_18 = temp_f6_6 * temp_f0_6, temp_f12_12 = temp_f8_6 * temp_f0_6, !((temp_f2_6 * temp_f0_6) > -1.0f)) || !(temp_f4_18 >= -1.0f) || !(temp_f4_18 <= 1.0f) || !(temp_f12_12 >= -1.0f) || !(temp_f12_12 <= 1.0f)))) && ((spA0 == 0.0f) || (temp_f28 == 0.0f) || ((temp_f4_19 = centerX - sp98, temp_f12_13 = centerY + spA0, temp_f20_7 = centerZ + temp_f28, temp_f6_7 = (sp48 * temp_f4_19) + (sp58 * temp_f12_13) + (sp68 * temp_f20_7) + sp78, temp_f8_7 = (sp4C * temp_f4_19) + (sp5C * temp_f12_13) + (sp6C * temp_f20_7) + sp7C, temp_f2_7 = (sp50 * temp_f4_19) + (sp60 * temp_f12_13) + (sp70 * temp_f20_7) + sp80, temp_f4_20 = (sp54 * temp_f4_19) + (sp64 * temp_f12_13) + (sp74 * temp_f20_7) + sp84, (temp_f4_20 != 0.0f)) && ((temp_f0_7 = 1.0f / temp_f4_20, temp_f4_21 = temp_f6_7 * temp_f0_7, temp_f12_14 = temp_f8_7 * temp_f0_7, !((temp_f2_7 * temp_f0_7) > -1.0f)) || !(temp_f4_21 >= -1.0f) || !(temp_f4_21 <= 1.0f) || !(temp_f12_14 >= -1.0f) || !(temp_f12_14 <= 1.0f)))) && ((sp98 == 0.0f) || (spA0 == 0.0f) || (temp_f28 == 0.0f) || ((temp_f4_22 = centerX + sp98, temp_f12_15 = centerY + spA0, temp_f20_8 = centerZ + temp_f28, temp_f6_8 = (sp48 * temp_f4_22) + (sp58 * temp_f12_15) + (sp68 * temp_f20_8) + sp78, temp_f8_8 = (sp4C * temp_f4_22) + (sp5C * temp_f12_15) + (sp6C * temp_f20_8) + sp7C, temp_f2_8 = (sp50 * temp_f4_22) + (sp60 * temp_f12_15) + (sp70 * temp_f20_8) + sp80, temp_f4_23 = (sp54 * temp_f4_22) + (sp64 * temp_f12_15) + (sp74 * temp_f20_8) + sp84, (temp_f4_23 != 0.0f)) && ((temp_f0_8 = 1.0f / temp_f4_23, temp_f4_24 = temp_f6_8 * temp_f0_8, temp_f12_16 = temp_f8_8 * temp_f0_8, !((temp_f2_8 * temp_f0_8) > -1.0f)) || !(temp_f4_24 >= -1.0f) || !(temp_f4_24 <= 1.0f) || !(temp_f12_16 >= -1.0f) || !(temp_f12_16 <= 1.0f))))) {
-                            cond = TRUE;
-                        }
-                    }
-                }
-
-                if (cond) {
-                    continue;
-                }
-            }
-
-            transform_point(camera->perspectiveMatrix[0], centerX, centerY, centerZ, 1.0f, &sp38, &sp3C, &sp40, &sp44);
-            distance = sp40 + 5000.0f;
-            if (distance < 0) {
-                distance = 0;
-            } else if (distance > 10000) {
-                distance = 10000;
-            }
-            rtPtr->appendGfxArg = model;
-            if (model->modelNode->type == SHAPE_TYPE_GROUP) {
-                rtPtr->appendGfx = appendGfx_model_group;
-            } else {
-                rtPtr->appendGfx = appendGfx_model;
-            }
-            rtPtr->distance = -distance;
-            rtPtr->renderMode = model->renderMode;
-            queue_render_task(rtPtr);
+        model = (*gCurrentModels)[i];
+        if (model == NULL) {
+            continue;
         }
+        if (model->flags == 0) {
+            continue;
+        }
+        if (model->flags & 4) {
+            continue;
+        }
+        if (model->flags & 2) {
+            continue;
+        }
+        if (model->flags & 0x20) {
+            continue;
+        }
+        if (model->flags & 8) {
+            continue;
+        }
+
+        x = model->center.x;
+        y = model->center.y;
+        z = model->center.z;
+
+        if (model->flags & 0x200) {
+            cond = FALSE;
+            boundingBox = (ModelBoundingBox*) model->modelNode->propertyList;
+            bbx = boundingBox->halfSizeX;
+            bby = boundingBox->halfSizeY;
+            bbz = boundingBox->halfSizeZ;
+
+            while (TRUE) {
+                if (TRUE) {
+                    xComp = x - bbx;
+                    yComp = y - bby;
+                    zComp = z - bbz;
+                    COMMON_RENDER_MODELS;
+                }
+
+                if (bbx != 0.0f) {
+                    xComp = x + bbx;
+                    yComp = y - bby;
+                    zComp = z - bbz;
+                    COMMON_RENDER_MODELS;
+                }
+
+                if (bby != 0.0f) {
+                    xComp = x - bbx;
+                    yComp = y + bby;
+                    zComp = z - bbz;
+                    COMMON_RENDER_MODELS;
+                }
+
+                if (bbx != 0.0f && bby != 0.0f) {
+                    xComp = x + bbx;
+                    yComp = y + bby;
+                    zComp = z - bbz;
+                    COMMON_RENDER_MODELS;
+                }
+
+                if (bbz != 0.0f) {
+                    xComp = x - bbx;
+                    yComp = y - bby;
+                    zComp = z + bbz;
+                    COMMON_RENDER_MODELS;
+                }
+
+                if (bbx != 0.0f && bbz != 0.0f) {
+                    xComp = x + bbx;
+                    yComp = y - bby;
+                    zComp = z + bbz;
+                    COMMON_RENDER_MODELS;
+                }
+
+                if (bby != 0.0f && bbz != 0.0f) {
+                    xComp = x - bbx;
+                    yComp = y + bby;
+                    zComp = z + bbz;
+                    COMMON_RENDER_MODELS;
+                }
+
+                if (bbx != 0.0f && bby != 0.0f && bbz != 0.0f) {
+                    xComp = x + bbx;
+                    yComp = y + bby;
+                    zComp = z + bbz;
+                    COMMON_RENDER_MODELS;
+                }
+                cond = TRUE;
+                break;
+            }
+            if (cond) {
+                continue;
+            }
+        }
+
+        transform_point(camera->perspectiveMatrix, x, y, z, 1.0f, &outX, &outY, &outZ, &outS);
+        distance = outZ + 5000.0f;
+        if (distance < 0) {
+            distance = 0;
+        } else if (distance > 10000) {
+            distance = 10000;
+        }
+        rtPtr->appendGfxArg = model;
+        if (model->modelNode->type == SHAPE_TYPE_GROUP) {
+            rtPtr->appendGfx = appendGfx_model_group;
+        } else {
+            rtPtr->appendGfx = appendGfx_model;
+        }
+        rtPtr->distance = -distance;
+        rtPtr->renderMode = model->renderMode;
+        queue_render_task(rtPtr);
     }
 
     for (i = 0; i < ARRAY_COUNT(*gCurrentTransformGroups); i++) {
-        ModelTransformGroup* group = (*gCurrentTransformGroups)[i];
-        f32 centerX, centerY, centerZ;
-        s32 distance;
-
-        if (group == NULL) {
-            continue;
-        }
-        if (group->flags == 0) {
-            continue;
-        }
-        if (group->flags & MODEL_TRANSFORM_GROUP_FLAGS_4) {
+        transformGroup = (*gCurrentTransformGroups)[i];
+        if (transformGroup == NULL) {
             continue;
         }
 
-        centerX = group->center.x;
-        centerY = group->center.y;
-        centerZ = group->center.z;
-
-        transform_point(camera->perspectiveMatrix, centerX, centerY, centerZ, 1.0f, &sp38, &sp3C, &sp40, &sp44);
-        if (sp44 == 0.0f) {
-            sp44 = 1.0f;
+        if (transformGroup->flags == 0) {
+            continue;
         }
 
-        distance = (sp40 / sp44) * 10000.0f;
+        if (transformGroup->flags & 4) {
+            continue;
+        }
 
-        if (!(group->flags & MODEL_TRANSFORM_GROUP_FLAGS_2)) {
+        xComp = transformGroup->center.x;
+        yComp = transformGroup->center.y;
+        zComp = transformGroup->center.z;
+
+        transform_point(
+            camera->perspectiveMatrix,
+            xComp, yComp, zComp, 1.0f,
+            &outX, &outY, &outZ, &outS
+        );
+        if (outS == 0.0f) {
+            outS = 1.0f;
+        }
+
+        distance = ((outZ / outS) * 10000.0f);
+
+        if (!(transformGroup->flags & 2)) {
             rtPtr->appendGfx = render_transform_group;
-            rtPtr->appendGfxArg = group;
+            rtPtr->appendGfxArg = transformGroup;
             rtPtr->distance = -distance;
-            rtPtr->renderMode = group->renderMode;
+            rtPtr->renderMode = transformGroup->renderMode;
             queue_render_task(rtPtr);
         }
     }
 }
-#else
-INCLUDE_ASM(s32, "a5dd0_len_114e0", render_models);
-#endif
 
-void appendGfx_model_group(Model* model) {
+void appendGfx_model_group(void* data) {
+    Model* model = data;
     s32 modelTreeDepth = (*mdl_currentModelTreeNodeInfo)[model->modelID].treeDepth;
     s32 i;
 
@@ -3689,19 +3624,19 @@ void render_transform_group_node(ModelNode* node) {
 }
 
 
-// arg0 and gfx temps needed
-void render_transform_group(ModelTransformGroup* group) {
-    ModelTransformGroup* mtg = group;
+// gfx temps needed
+void render_transform_group(void* data) {
+    ModelTransformGroup* group = data;
     Gfx** gfx = &gMasterGfxPos;
 
-    if (!(mtg->flags & MODEL_TRANSFORM_GROUP_FLAGS_4)) {
-        mdl_currentTransformGroupChildIndex = mtg->minChildModelIndex;
-        if (!(mtg->flags & MODEL_TRANSFORM_GROUP_FLAGS_2000)) {
-            gSPMatrix((*gfx)++, mtg->transformMtx, (G_MTX_PUSH | G_MTX_LOAD) | G_MTX_MODELVIEW);
+    if (!(group->flags & MODEL_TRANSFORM_GROUP_FLAGS_4)) {
+        mdl_currentTransformGroupChildIndex = group->minChildModelIndex;
+        if (!(group->flags & MODEL_TRANSFORM_GROUP_FLAGS_2000)) {
+            gSPMatrix((*gfx)++, group->transformMtx, (G_MTX_PUSH | G_MTX_LOAD) | G_MTX_MODELVIEW);
         }
 
-        render_transform_group_node(mtg->modelNode);
-        if (!(mtg->flags & MODEL_TRANSFORM_GROUP_FLAGS_2000)) {
+        render_transform_group_node(group->modelNode);
+        if (!(group->flags & MODEL_TRANSFORM_GROUP_FLAGS_2000)) {
             gSPPopMatrix((*gfx)++, G_MTX_MODELVIEW);
         }
         gDPPipeSync((*gfx)++);
diff --git a/src/d0a70_len_4fe0.c b/src/d0a70_len_4fe0.c
index 6109b4b4d7..e31487ddaa 100644
--- a/src/d0a70_len_4fe0.c
+++ b/src/d0a70_len_4fe0.c
@@ -1119,7 +1119,7 @@ void func_8013CFA8(FoldState* state, Matrix4f mtx) {
 
     i = state->firstVtxIdx;
 
-    while (1) {
+    while (TRUE) {
         Camera* cam;
         s32 uls = (fold_vtxBuf[i + 0].v.tc[0] >> 0x5) - 0x100;
         s32 ult = (fold_vtxBuf[i + 0].v.tc[1] >> 0x5) - 0x100;
diff --git a/src/dc470_len_14c0.c b/src/dc470_len_14c0.c
index 988a00577f..d7a8035319 100644
--- a/src/dc470_len_14c0.c
+++ b/src/dc470_len_14c0.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "model.h"
 
 char gCloudyFlowerFieldsBg[] = "fla_bg";
 char gSunnyFlowerFieldsBg[] = "flb_bg";
@@ -10,8 +11,6 @@ f32 gBackroundWavePhase = 0.0f;
 extern PAL_BIN gBackgroundPalette[256];
 extern f32 gBackroundLastScrollValue;
 
-void get_model_env_color_parameters(u8* primR, u8* primG, u8* primB, u8* envR, u8* envG, u8* envB);
-
 void load_map_bg(char* optAssetName) {
     if (optAssetName != NULL) {
         UNK_PTR compressedData;
diff --git a/src/effects/blast.c b/src/effects/blast.c
index 7b89e5916b..f7e946de28 100644
--- a/src/effects/blast.c
+++ b/src/effects/blast.c
@@ -95,23 +95,18 @@ void blast_render(EffectInstance* effect) {
 #ifdef NON_MATCHING
 void blast_appendGfx(void* effect) {
     Matrix4f sp18, sp58, sp98;
-    Gfx* dlist;
-    Gfx* dlist2;
-    BlastFXData* data = ((EffectInstance*)effect)->data;
-    f32 temp_f2;
+    Gfx* dlist = D_090017B0_37F190;
+    BlastFXData* data = ((EffectInstance*)effect)->data.blast;
     s32 temp_f4;
     s32 alpha;
+    f32 new_var;
 
-    dlist = D_090017B0_37F190;
-    dlist2 = D_09001300_37ECD0;
-
-    temp_f2 = data->unk_20;
-    temp_f4 = temp_f2;
-    alpha = (temp_f2 - temp_f4) * 256.0f;
+    new_var = (temp_f4 = data->unk_20);
+    alpha = (new_var - ((s32) data->unk_20)) * 256.0f;
 
     gDPPipeSync(gMasterGfxPos++);
     gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data));
-    gSPDisplayList(gMasterGfxPos++, dlist2);
+    gSPDisplayList(gMasterGfxPos++, D_09001300_37ECD0);
     gSPDisplayList(gMasterGfxPos++, D_E007C510[temp_f4]);
 
     shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z);
diff --git a/src/npc.c b/src/npc.c
index 0060a0352b..4587ac5f6d 100644
--- a/src/npc.c
+++ b/src/npc.c
@@ -2107,12 +2107,10 @@ void func_8003DA38(Npc* npc, s32 arg1) {
     }
 }
 
-// floats suqqz
-#ifdef NON_EQUIVALENT
 void func_8003DC38(Npc* npc, s32 arg1) {
-    f32 xTemp;
-    f32 zTemp;
-    f32 yTemp;
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    f32 xTemp, yTemp, zTemp;
+    f32 xTemp2, yTemp2, zTemp2;
     f32 theta;
     f32 sinTheta;
     f32 cosTheta;
@@ -2127,15 +2125,14 @@ void func_8003DC38(Npc* npc, s32 arg1) {
 
         for (i = 0; i < 4; i++) {
             xTemp = rand_int(10) - 5;
-            yTemp = -2.0f;
             zTemp = rand_int(10) - 5;
-
-            yTemp -= (SQ(xTemp) + SQ(zTemp)) / 5.0f;
+            yTemp = -2.0f - ((SQ(xTemp) + SQ(zTemp)) / 5.0f);
             D_80077C28 = 0;
 
-            theta = DEG_TO_RAD(clamp_angle(-npc->yaw + i * 90));
+            theta = DEG_TO_RAD(clamp_angle(-npc->yaw + (i * 90)));
             sinTheta = sin_rad(theta);
             cosTheta = cos_rad(theta);
+
             fx_cloud_trail(
                 1,
                 npc->pos.x + (npc->collisionRadius * sinTheta * -0.3f) + xTemp,
@@ -2144,11 +2141,10 @@ void func_8003DC38(Npc* npc, s32 arg1) {
             );
         }
     } else {
-        xTemp = rand_int(10) - 5;
-        yTemp = -2.0f;
-        zTemp = rand_int(10) - 5;
+        xTemp2 = rand_int(10) - 5;
+        zTemp2 = rand_int(10) - 5;
+        yTemp2 = -2.0f - ((SQ(xTemp2) + SQ(zTemp2)) / 5.0f);
 
-        yTemp -= (SQ(xTemp) + SQ(zTemp)) / 5.0f;
         D_80077C28 = 0;
 
         theta = DEG_TO_RAD(clamp_angle(-npc->yaw));
@@ -2156,15 +2152,12 @@ void func_8003DC38(Npc* npc, s32 arg1) {
         cosTheta = cos_rad(theta);
         fx_cloud_trail(
             1,
-            npc->pos.x + (npc->collisionRadius * sinTheta * -0.3f) + xTemp,
-            npc->pos.y + 15.5f + yTemp,
-            npc->pos.z + (npc->collisionRadius * cosTheta * -0.3f) + zTemp
+            npc->pos.x + (npc->collisionRadius * sinTheta * -0.3f) + xTemp2,
+            npc->pos.y + 15.5f + yTemp2,
+            npc->pos.z + (npc->collisionRadius * cosTheta * -0.3f) + zTemp2
         );
     }
 }
-#else
-INCLUDE_ASM(s32, "npc", func_8003DC38);
-#endif
 
 void func_8003DFA0(Npc* npc, s32 arg1) {
     if (D_80077C30++ >= 4) {
diff --git a/src/sprite.c b/src/sprite.c
index a9d2a9498b..45b80e6511 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -817,7 +817,9 @@ s32 spr_draw_player_sprite(s32 spriteInstanceID, s32 yaw, s32 alphaIn, u16** pal
     s32 camRelativeYaw;
     s32 alpha;
     f32 zscale;
+    u32 animIdx;
     PAL_PTR* drawPalettes;
+    SpriteAnimData* animData;
 
     camRelativeYaw = yaw;
     spriteAnimIndex = spriteInstanceID & 0xFF;
@@ -830,12 +832,17 @@ s32 spr_draw_player_sprite(s32 spriteInstanceID, s32 yaw, s32 alphaIn, u16** pal
 
     spriteIndex = ((animID >> 0x10) & 0xFF) - 1;
     D_802DF57C = spriteIndex;
-    if (spr_playerSprites[spriteIndex] == NULL) {
+    animData = spr_playerSprites[spriteIndex];
+    if (animData == NULL) {
         return 0;
     }
-    rasterList = spr_playerSprites[spriteIndex]->rastersOffset;
-    animList = &spr_playerSprites[spriteIndex]->animListStart[animID & 0xFF];
-    drawPalettes = spr_playerSprites[spriteIndex]->palettesOffset;
+
+    animIdx = animID & 0xFF;
+    animIdx++;
+
+    rasterList = animData->rastersOffset;
+    animList = animData->animListStart[animIdx];
+    drawPalettes = animData->palettesOffset;
     if (animID & SPRITE_ID_BACK_FACING) {
         switch (spriteIndex) {
             case 0:
@@ -843,7 +850,7 @@ s32 spr_draw_player_sprite(s32 spriteInstanceID, s32 yaw, s32 alphaIn, u16** pal
             case 9:
                 spriteIndex++;
                 D_802DF57C = spriteIndex;
-                rasterList = spr_playerSprites[spriteIndex]->rastersOffset;
+                rasterList = spr_playerSprites[D_802DF57C]->rastersOffset;
                 break;
         }
     }
diff --git a/src/world/area_flo/flo_00/C9DF20.c b/src/world/area_flo/flo_00/C9DF20.c
index 2ec4c73287..8091ec2e4a 100644
--- a/src/world/area_flo/flo_00/C9DF20.c
+++ b/src/world/area_flo/flo_00/C9DF20.c
@@ -1,8 +1,7 @@
 #include "flo_00.h"
+#include "effects.h"
 
 // Same as SpawnSunEffect, but doesn't touch float regs like SpawnSunEffect does
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
-
 ApiStatus N(func_80240000_C9DF20)(Evt* script, s32 isInitialCall) {
     fx_sun_undeclared(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
diff --git a/src/world/area_flo/flo_03/CA72A0.c b/src/world/area_flo/flo_03/CA72A0.c
index 382199734b..f84696b470 100644
--- a/src/world/area_flo/flo_03/CA72A0.c
+++ b/src/world/area_flo/flo_03/CA72A0.c
@@ -1,6 +1,5 @@
 #include "flo_03.h"
-
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
+#include "effects.h"
 
 ApiStatus N(func_80240000_CA72A0)(Evt* script, s32 isInitialCall) {
     fx_sun_undeclared(1, 0, 0, 0, 0, 0);
diff --git a/src/world/area_flo/flo_09/CB5000.c b/src/world/area_flo/flo_09/CB5000.c
index f991805964..42110ba223 100644
--- a/src/world/area_flo/flo_09/CB5000.c
+++ b/src/world/area_flo/flo_09/CB5000.c
@@ -1,6 +1,5 @@
 #include "flo_09.h"
-
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
+#include "effects.h"
 
 ApiStatus N(func_80240000_CB5000)(Evt* script, s32 isInitialCall) {
     fx_sun_undeclared(1, 0, 0, 0, 0, 0);
diff --git a/src/world/area_flo/flo_10/CB9240.c b/src/world/area_flo/flo_10/CB9240.c
index a18e8bacb9..51d25ea75e 100644
--- a/src/world/area_flo/flo_10/CB9240.c
+++ b/src/world/area_flo/flo_10/CB9240.c
@@ -1,6 +1,5 @@
 #include "flo_10.h"
-
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
+#include "effects.h"
 
 ApiStatus N(func_80240040_CB9240)(Evt* script, s32 isInitialCall) {
     fx_sun_undeclared(1, 0, 0, 0, 0, 0);
diff --git a/src/world/area_flo/flo_11/CBDCD0.c b/src/world/area_flo/flo_11/CBDCD0.c
index 5e1222d322..e4bb3af3b4 100644
--- a/src/world/area_flo/flo_11/CBDCD0.c
+++ b/src/world/area_flo/flo_11/CBDCD0.c
@@ -2,6 +2,7 @@
 #include "message_ids.h"
 #include "sprite/npc/Lakitu.h"
 #include "entity.h"
+#include "effects.h"
 
 enum {
     NPC_LAKITU0,
@@ -657,8 +658,6 @@ EvtScript N(makeEntities) = {
 
 #include "world/common/entity/Pipe.inc.c"
 
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
-
 ApiStatus N(func_802402E0_CBDFB0)(Evt* script, s32 isInitialCall) {
     fx_sun_undeclared(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
diff --git a/src/world/area_flo/flo_12/CC0E30.c b/src/world/area_flo/flo_12/CC0E30.c
index 68433e7e36..602e4457f0 100644
--- a/src/world/area_flo/flo_12/CC0E30.c
+++ b/src/world/area_flo/flo_12/CC0E30.c
@@ -1,6 +1,5 @@
 #include "flo_12.h"
-
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
+#include "effects.h"
 
 ApiStatus N(func_80240000_CC0E30)(Evt* script, s32 isInitialCall) {
     fx_sun_undeclared(0, 0, 0, 0, 0, 0);
diff --git a/src/world/area_flo/flo_13/CC3810.c b/src/world/area_flo/flo_13/CC3810.c
index fa9b63ab4f..b410872f6d 100644
--- a/src/world/area_flo/flo_13/CC3810.c
+++ b/src/world/area_flo/flo_13/CC3810.c
@@ -1,6 +1,5 @@
 #include "flo_13.h"
-
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
+#include "effects.h"
 
 ApiStatus N(func_80240000_CC3810)(Evt* script, s32 isInitialCall) {
     fx_sun_undeclared(0, 0, 0, 0, 0, 0);
diff --git a/src/world/area_flo/flo_14/CCB310.c b/src/world/area_flo/flo_14/CCB310.c
index 5b7cd4ffb9..fdcc24b5bd 100644
--- a/src/world/area_flo/flo_14/CCB310.c
+++ b/src/world/area_flo/flo_14/CCB310.c
@@ -1,5 +1,6 @@
 #include "flo_14.h"
 #include "message_ids.h"
+#include "effects.h"
 
 EntryList N(entryList) = {
     {  720.0f, 0.0f, 0.0f, 270.0f },
@@ -570,8 +571,6 @@ EvtScript N(80243E78) = {
 
 #include "world/common/atomic/TexturePan.inc.c"
 
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
-
 ApiStatus N(func_8024030C_CCB61C)(Evt* script, s32 isInitialCall) {
     fx_sun_undeclared(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
diff --git a/src/world/area_flo/flo_16/CD1E30.c b/src/world/area_flo/flo_16/CD1E30.c
index 152a6ada2a..9e340d7c48 100644
--- a/src/world/area_flo/flo_16/CD1E30.c
+++ b/src/world/area_flo/flo_16/CD1E30.c
@@ -1,6 +1,5 @@
 #include "flo_16.h"
-
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
+#include "effects.h"
 
 ApiStatus N(func_80240000_CD1E30)(Evt* script, s32 isInitialCall) {
     fx_sun_undeclared(1, 0, 0, 0, 0, 0);
diff --git a/src/world/area_flo/flo_17/CD72E0.c b/src/world/area_flo/flo_17/CD72E0.c
index 4524ad9e1d..34a7f8667b 100644
--- a/src/world/area_flo/flo_17/CD72E0.c
+++ b/src/world/area_flo/flo_17/CD72E0.c
@@ -1,6 +1,5 @@
 #include "flo_17.h"
-
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
+#include "effects.h"
 
 ApiStatus N(func_80240000_CD72E0)(Evt* script, s32 isInitialCall) {
     fx_sun_undeclared(1, 0, 0, 0, 0, 0);
diff --git a/src/world/area_flo/flo_18/CDC6A0.c b/src/world/area_flo/flo_18/CDC6A0.c
index 4702aa6d6e..a744cd39f7 100644
--- a/src/world/area_flo/flo_18/CDC6A0.c
+++ b/src/world/area_flo/flo_18/CDC6A0.c
@@ -1745,15 +1745,6 @@ static s32 N(pad_66B4)[] = {
 
 #include "world/common/atomic/TexturePan.inc.c"
 
-// It seems like fx_sun was not properly defined for this file. Having a proper
-// declaration makes it not match.
-
-#ifdef AVOID_UB
-void fx_sun_undeclared(s32, f32, f32, f32, f32, s32);
-#else
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
-#endif
-
 ApiStatus N(func_8024030C_CDC9AC)(Evt* script, s32 isInitialCall) {
     fx_sun_undeclared(1, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c
index b3a9343eb4..54e0334f29 100644
--- a/src/world/area_flo/flo_21/CE6700.c
+++ b/src/world/area_flo/flo_21/CE6700.c
@@ -1421,8 +1421,6 @@ NpcGroupList N(npcGroupList_80245AEC) = {
 
 #include "world/common/atomic/TexturePan.inc.c"
 
-EffectInstance* fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
-
 ApiStatus N(func_80240B00_CE7200)(Evt* script, s32 isInitialCall) {
     fx_sun_undeclared(1, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
diff --git a/src/world/area_flo/flo_22/CEC240.c b/src/world/area_flo/flo_22/CEC240.c
index 4b80b6165b..92574b631e 100644
--- a/src/world/area_flo/flo_22/CEC240.c
+++ b/src/world/area_flo/flo_22/CEC240.c
@@ -2,6 +2,7 @@
 #include "message_ids.h"
 #include "sprite/npc/Bzzap.h"
 #include "sprite/npc/Dayzee.h"
+#include "effects.h"
 
 enum {
     NPC_BZZAP,
@@ -385,8 +386,6 @@ static s32 N(pad_1594)[] = {
     0x00000000, 0x00000000, 0x00000000,
 };
 
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
-
 ApiStatus N(func_80240000_CEC240)(Evt* script, s32 isInitialCall) {
     fx_sun_undeclared(1, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
diff --git a/src/world/area_flo/flo_23/CEE260.c b/src/world/area_flo/flo_23/CEE260.c
index 3619f547ab..20603283c1 100644
--- a/src/world/area_flo/flo_23/CEE260.c
+++ b/src/world/area_flo/flo_23/CEE260.c
@@ -1,6 +1,5 @@
 #include "flo_23.h"
-
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
+#include "effects.h"
 
 ApiStatus N(func_80240000_CEE260)(Evt* script, s32 isInitialCall) {
     fx_sun_undeclared(0, 0, 0, 0, 0, 0);
diff --git a/src/world/area_flo/flo_24/CF0940.c b/src/world/area_flo/flo_24/CF0940.c
index b9731acd5d..09c71d7349 100644
--- a/src/world/area_flo/flo_24/CF0940.c
+++ b/src/world/area_flo/flo_24/CF0940.c
@@ -1,6 +1,5 @@
 #include "flo_24.h"
-
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
+#include "effects.h"
 
 ApiStatus N(func_80240000_CF0940)(Evt* script, s32 isInitialCall) {
     fx_sun_undeclared(1, 0, 0, 0, 0, 0);
diff --git a/src/world/area_flo/flo_25/CF2BD0.c b/src/world/area_flo/flo_25/CF2BD0.c
index 095404d24c..7c2d333709 100644
--- a/src/world/area_flo/flo_25/CF2BD0.c
+++ b/src/world/area_flo/flo_25/CF2BD0.c
@@ -1,6 +1,5 @@
 #include "flo_25.h"
-
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
+#include "effects.h"
 
 ApiStatus N(func_80240000_CF2BD0)(Evt* script, s32 isInitialCall) {
     fx_sun_undeclared(0, 0, 0, 0, 0, 0);
diff --git a/src/world/area_hos/hos_05/A2AAC0.c b/src/world/area_hos/hos_05/A2AAC0.c
index 7ea5a4c6bd..97ceec3872 100644
--- a/src/world/area_hos/hos_05/A2AAC0.c
+++ b/src/world/area_hos/hos_05/A2AAC0.c
@@ -1,11 +1,8 @@
 #include "hos_05.h"
+#include "model.h"
 
 extern Gfx D_8024AA28_A34C68[];
 
-void set_model_fog_color_parameters(u8 var2, u8 var3, u8 var4, u8 var5, u8 var6, u8 var7, u8 var8, s32 var9, s32 var10);
-void set_model_env_color_parameters(u8 primR, u8 primG, u8 primB, u8 envR, u8 envG, u8 envB);
-void get_model_env_color_parameters(u8* primR, u8* primG, u8* primB, u8* envR, u8* envG, u8* envB);
-
 ApiStatus func_80240880_A2AAC0(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     s32 primR = evt_get_variable(script, *args++);
diff --git a/src/world/area_hos/hos_05/A2EF00.c b/src/world/area_hos/hos_05/A2EF00.c
index 8795a58aab..e6711170ef 100644
--- a/src/world/area_hos/hos_05/A2EF00.c
+++ b/src/world/area_hos/hos_05/A2EF00.c
@@ -1,4 +1,5 @@
 #include "hos_05.h"
+#include "model.h"
 
 extern u8 D_8024DCCF_A37F0F;
 extern u8 D_8024DCD3_A37F13;
@@ -13,9 +14,6 @@ extern u8 D_802D9D73;
 
 // should match when preceding bss is worked out
 #ifdef NON_MATCHING
-void set_model_env_color_parameters(u8 primR, u8 primG, u8 primB, u8 envR, u8 envG, u8 envB);
-void get_model_env_color_parameters(u8* primR, u8* primG, u8* primB, u8* envR, u8* envG, u8* envB);
-
 ApiStatus func_802452C4_A2F504(Evt* script, s32 isInitialCall) {
     Bytecode* args;
     static u8 oldPrimR, oldPrimG, oldPrimB;
@@ -36,7 +34,7 @@ ApiStatus func_802452C4_A2F504(Evt* script, s32 isInitialCall) {
         duration = evt_get_variable(script, *args++);
         time = 0;
     }
-    
+
     if (duration > 0) {
         time++;
         set_model_env_color_parameters(
@@ -83,4 +81,25 @@ void func_80245744_A2F984(void) {
 
 INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_80245794_A2F9D4);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_802457C0_A2FA00);
+ApiStatus func_802457C0_A2FA00(Evt* script, s32 isInitialCall) {
+    Camera* camera = &gCameras[CAM_DEFAULT];
+
+    if (isInitialCall) {
+        script->functionTemp[0] = 40;
+    }
+    script->functionTemp[0]--;
+    if (camera->currentController != NULL) {
+        camera->currentController->viewPitch -= 1.0 - ((f32) (40 - script->functionTemp[0]) * 0.01);
+    } else if (camera->prevController != NULL) {
+        camera->prevController->viewPitch -= 1.0 - ((f32) (40 - script->functionTemp[0]) * 0.01);
+    }
+
+    if (script->functionTemp[0] == 0) {
+        return ApiStatus_DONE2;
+    } else {
+        return ApiStatus_BLOCK;
+    }
+}
+
+const char* N(exit_str_0) = "hos_20";
+const char* N(exit_str_1) = "hos_04";
diff --git a/src/world/area_hos/hos_10/A3FEB0.c b/src/world/area_hos/hos_10/A3FEB0.c
index 32c40adb4c..38c474e88a 100644
--- a/src/world/area_hos/hos_10/A3FEB0.c
+++ b/src/world/area_hos/hos_10/A3FEB0.c
@@ -8,6 +8,27 @@ INCLUDE_ASM(s32, "world/area_hos/hos_10/A3FEB0", func_80240B44_A40284);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_10/A3FEB0", func_80240B98_A402D8);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_10/A3FEB0", func_80240BEC_A4032C);
+ApiStatus func_80240BEC_A4032C(Evt* script, s32 isInitialCall) {
+    gPlayerData.currentPartner = PARTNER_NONE;
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_hos/hos_10/A3FEB0", func_80240BFC_A4033C);
+ApiStatus func_80240BFC_A4033C(Evt* script, s32 isInitialCall) {
+    if (isInitialCall) {
+        script->functionTemp[1] = 0;
+    }
+
+    set_screen_overlay_color(0, 208, 208, 208);
+    set_screen_overlay_params_front(1, script->functionTemp[1]);
+
+    if (script->functionTemp[1] == 255) {
+        return ApiStatus_DONE2;
+    }
+
+    script->functionTemp[1] += 7;
+    if (script->functionTemp[1] > 255) {
+        script->functionTemp[1] = 255;
+    }
+
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/area_jan/jan_00/jan_00_1_main.c b/src/world/area_jan/jan_00/jan_00_1_main.c
index f66132e89d..cad115314f 100644
--- a/src/world/area_jan/jan_00/jan_00_1_main.c
+++ b/src/world/area_jan/jan_00/jan_00_1_main.c
@@ -9,13 +9,14 @@ extern EvtScript N(EVS_MakeEntities);
 
 extern EvtScript N(EVS_802467AC);
 extern EvtScript N(EVS_80247A2C);
-API_CALLABLE(func_8024030C_B2084C);
 
 #include "world/common/atomic/TexturePan.inc.c"
 #include "world/common/atomic/TexturePan.data.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_8024030C_B2084C);
-MAP_DATA_SECTION_START
+API_CALLABLE(func_8024030C_B2084C) {
+    fx_sun_undeclared(0, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
 
 EvtScript N(EVS_ExitWalk_jan_01_0) = EVT_EXIT_WALK(60, jan_00_ENTRY_1, "jan_01", jan_01_ENTRY_0);
 EvtScript N(EVS_ExitWalk_jan_08_0) = EVT_EXIT_WALK(60, jan_00_ENTRY_2, "jan_08", jan_08_ENTRY_0);
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 37890b330e..d3e99e87ae 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
@@ -98,8 +98,52 @@ EvtScript N(EVS_Kolorado_LetterReward) = {
     EVT_END
 };
 
+// float regalloc
 API_CALLABLE(func_80240B4C_B2108C);
+#ifdef NON_EQUIVALENT
+API_CALLABLE(func_80240B4C_B2108C) {
+    Bytecode* args = script->ptrReadPos;
+    Npc* npc;
+    f32 temp_f20;
+    f32 var_f22;
+    f32 x, y, z;
+    s32 temp_s1;
+    s32 outX, outY, outZ;
+
+    temp_s1 = evt_get_variable(script, *args++);
+    x = y = z = 0.0f;
+    outX = *args++;
+    outY = *args++;
+    outZ = *args++;
+    npc = get_npc_safe(0);
+    switch (temp_s1) {
+        case 0:
+            var_f22 = 130.0f;
+            break;
+        case 1:
+            var_f22 = 160.0f;
+            break;
+        case 2:
+            var_f22 = 100.0f;
+            break;
+        default:
+            var_f22 = 80.0f;
+            break;
+    }
+    if (temp_s1 < 4) {
+        temp_f20 = -npc->yaw;
+        x = npc->pos.x + 30.0f + sin_deg(temp_f20) * var_f22;
+        z = npc->pos.z + cos_deg(temp_f20) * var_f22;
+        y = npc->pos.y + 50.0f;
+    }
+    evt_set_float_variable(script, outX, x);
+    evt_set_float_variable(script, outY, y);
+    evt_set_float_variable(script, outZ, z);
+    return ApiStatus_DONE2;
+}
+#else
 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);
@@ -107,8 +151,17 @@ INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240CF8_B21238);
 API_CALLABLE(func_80240F14_B21454);
 INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240F14_B21454);
 
-API_CALLABLE(func_80241134_B21674);
-INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80241134_B21674);
+API_CALLABLE(func_80241134_B21674) {
+    Npc* npc = get_npc_safe(2);
+    f32 x = npc->pos.x;
+    f32 y = npc->pos.y;
+    f32 z = npc->pos.z - 20.0f;
+
+    if (y < 0.0f) {
+        fx_rising_bubble(0, x, y, z, 0.0f);
+    }
+    return ApiStatus_BLOCK;
+}
 
 MAP_DATA_SECTION_START
 
diff --git a/src/world/area_jan/jan_01/B28030.c b/src/world/area_jan/jan_01/B28030.c
index 160c27f24d..a3e4778f38 100644
--- a/src/world/area_jan/jan_01/B28030.c
+++ b/src/world/area_jan/jan_01/B28030.c
@@ -1,13 +1,11 @@
 #include "jan_01.h"
+#include "effects.h"
 
 static char* N(exit_str_0) = "jan_00";
 static char* N(exit_str_1) = "jan_02";
 
 #include "world/common/atomic/TexturePan.inc.c"
 
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
-
-// will not match with correct function definition
 ApiStatus func_8024030C_B2833C(Evt* script, s32 isInitialCall) {
     fx_sun_undeclared(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
diff --git a/src/world/area_jan/jan_02/B2C4A0.c b/src/world/area_jan/jan_02/B2C4A0.c
index 2556d15e8f..3f1e76e954 100644
--- a/src/world/area_jan/jan_02/B2C4A0.c
+++ b/src/world/area_jan/jan_02/B2C4A0.c
@@ -1,9 +1,34 @@
 #include "jan_02.h"
+#include "effects.h"
+#include "mapfs/jan_02_hit.h"
 
 #include "world/common/atomic/TexturePan.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C4A0", func_8024033C_B2C7AC);
+extern s32 D_80242BD8_B2F048;
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C4A0", func_80240360_B2C7D0);
+ApiStatus func_8024033C_B2C7AC(Evt* script, s32 isInitialCall) {
+    bgm_clear_track_volumes(0, 0);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C4A0", func_802403F8_B2C868);
+ApiStatus func_80240360_B2C7D0(Evt* script, s32 isInitialCall) {
+    u16 currentFloor = gCollisionStatus.currentFloor;
+
+    if (D_80242BD8_B2F048 != 0) {
+        if (currentFloor == COLLIDER_o327 || currentFloor == COLLIDER_o330) {
+            func_8011B7C0(9, 2, 0);
+            D_80242BD8_B2F048 = 0;
+        }
+    } else {
+        if (currentFloor == COLLIDER_o319 || currentFloor == COLLIDER_o316) {
+            func_8011B7C0(9, 2, 1);
+            D_80242BD8_B2F048 = 1;
+        }
+    }
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus func_802403F8_B2C868(Evt* script, s32 isInitialCall) {
+    fx_sun_undeclared(0, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index 8d0ac1a777..022982297a 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -1,4 +1,5 @@
 #include "jan_03.h"
+#include "effects.h"
 
 static char* N(exit_str_0) = "jan_02";
 static char* N(exit_str_1) = "jan_05";
@@ -11,7 +12,10 @@ static char* N(exit_str_3) = "";
 
 #include "world/common/atomic/TexturePan.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802405EC_B351BC);
+ApiStatus func_802405EC_B351BC(Evt* script, s32 isInitialCall) {
+    fx_sun_undeclared(0, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/enemy/ai/PatrolNoAttackAI.inc.c"
 
diff --git a/src/world/area_jan/jan_03/B37B70.c b/src/world/area_jan/jan_03/B37B70.c
index 9b475c77f7..f9da8da0f3 100644
--- a/src/world/area_jan/jan_03/B37B70.c
+++ b/src/world/area_jan/jan_03/B37B70.c
@@ -1,3 +1,10 @@
 #include "jan_03.h"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B37B70", func_80242FA0_B37B70);
+ApiStatus func_80242FA0_B37B70(Evt* script, s32 isInitialCall) {
+    f32 x = gPlayerStatus.currentSpeed * 5.0f * sin_deg(gPlayerStatus.targetYaw);
+    f32 z = gPlayerStatus.currentSpeed * 5.0f * -cos_deg(gPlayerStatus.targetYaw);
+
+    script->varTable[0] = gPlayerStatus.position.x + x;
+    script->varTable[1] = gPlayerStatus.position.z + z;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_jan/jan_04/B451F0.c b/src/world/area_jan/jan_04/B451F0.c
index a6ff6adc37..55247b626c 100644
--- a/src/world/area_jan/jan_04/B451F0.c
+++ b/src/world/area_jan/jan_04/B451F0.c
@@ -1,13 +1,9 @@
 #include "jan_04.h"
 
-//static f64 D_802462E0_B4AA50[4] = {990.0, 2.732579860045591e+204, 2.732579860045591e+204, 0.0}; /* const */
-
 #include "world/common/todo/SetEntityPositionF.inc.c"
 
 #include "world/common/todo/GetEntityPosition.inc.c"
 
-// Can't get this to match because the const array above is in "discarded section .data"
-#ifdef NON_EQUIVALENT
 ApiStatus func_80240BE8_B45358(Evt* script, s32 isInitialCall) {
     Entity* entity = get_entity_by_index(script->varTable[10]);
 
@@ -19,7 +15,7 @@ ApiStatus func_80240BE8_B45358(Evt* script, s32 isInitialCall) {
     entity->scale.x = (60 - script->functionTemp[1]) / 60.0f;
     entity->scale.y = (60 - script->functionTemp[1]) / 60.0f;
     entity->scale.z = (60 - script->functionTemp[1]) / 60.0f;
-    entity->rotation.y = (1.0f - cos_rad(entity->scale.y * PI)) * D_802462E0_B4AA50[0] * 0.25f;
+    entity->rotation.y = (1.0f - cos_rad(entity->scale.y * PI)) * 990.0 * 0.25f;
     script->functionTemp[1]--;
 
     if (script->functionTemp[1] == -1) {
@@ -27,11 +23,25 @@ ApiStatus func_80240BE8_B45358(Evt* script, s32 isInitialCall) {
     }
     return ApiStatus_BLOCK;
 }
-#else
-INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240BE8_B45358);
-#endif
 
-INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240D0C_B4547C);
+const char* N(exit_str_0) = "jan_04\0"; // remove \0 when this is part of a script and not an isolated symbol
+const char* N(exit_str_1) = "jan_04";
+
+ApiStatus func_80240D0C_B4547C(Evt* script, s32 isInitialCall) {
+    Entity* entity = get_entity_by_index(script->varTable[10]);
+
+    if (isInitialCall) {
+        script->functionTemp[0] = -30;
+    }
+    entity->rotation.x = script->functionTemp[0];
+    entity->rotation.z = script->functionTemp[0];
+    script->functionTemp[0]++;
+
+    if (script->functionTemp[0] == 1) {
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}
 
 #define NAMESPACE dup_jan_04
 #include "common/foliage.inc.c"
diff --git a/src/world/area_jan/jan_04/B45730.c b/src/world/area_jan/jan_04/B45730.c
index 238dde3ed6..e7f439de19 100644
--- a/src/world/area_jan/jan_04/B45730.c
+++ b/src/world/area_jan/jan_04/B45730.c
@@ -1,3 +1,39 @@
 #include "jan_04.h"
+#include "world/partners.h"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_04/B45730", func_80240FC0_B45730);
+extern s32 D_8024625C_B4A9CC;
+extern Evt* D_8024A290;
+
+ApiStatus func_80240FC0_B45730(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    EvtScript* rideScript;
+
+    switch (D_8024625C_B4A9CC) {
+        case 0:
+            rideScript = partner_get_ride_script();
+            if (rideScript != NULL) {
+                Evt* newScript;
+
+                D_8024625C_B4A9CC++;
+                newScript = start_script(rideScript, 0, 0x20);
+                newScript->varTable[1] = playerStatus->position.x - 10.0f;
+                newScript->varTable[2] = playerStatus->position.y;
+                newScript->varTable[3] = playerStatus->position.z;
+                D_8024A290 = newScript;
+                newScript->varTable[12] = 1;
+            }
+            break;
+        case 1:
+        case 2:
+            D_8024625C_B4A9CC++;
+            break;
+        case 3:
+            wPartnerNpc->yaw = 270.0f;
+            playerStatus->targetYaw = 270.0f;
+            playerStatus->currentYaw = 270.0f;
+            playerStatus->spriteFacingAngle = 180.0f;
+            D_8024A290->functionTemp[1] = 1;
+            return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/area_jan/jan_05/B4AF10.c b/src/world/area_jan/jan_05/B4AF10.c
index 0fea0d1129..18e2281518 100644
--- a/src/world/area_jan/jan_05/B4AF10.c
+++ b/src/world/area_jan/jan_05/B4AF10.c
@@ -1,7 +1,6 @@
 #include "jan_05.h"
+#include "model.h"
 
 #include "common/foliage.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_05/B4AF10", func_802406DC_B4B14C);
-
-INCLUDE_ASM(s32, "world/area_jan/jan_05/B4AF10", func_80240738_B4B1A8);
+#include "world/common/todo/PullVineSub.inc.c"
diff --git a/src/world/area_jan/jan_08/B5E5C0.c b/src/world/area_jan/jan_08/B5E5C0.c
index 8c63b510e1..9ae722e059 100644
--- a/src/world/area_jan/jan_08/B5E5C0.c
+++ b/src/world/area_jan/jan_08/B5E5C0.c
@@ -2,7 +2,4 @@
 
 #include "common/foliage.inc.c"
 
-
-INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E5C0", func_8024054C_B5E7FC);
-
-INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E5C0", func_802405A8_B5E858);
+#include "world/common/todo/PullVineSub.inc.c"
diff --git a/src/world/area_jan/jan_09/B660A0.c b/src/world/area_jan/jan_09/B660A0.c
index 1aa8bf0cb0..ad1c10947d 100644
--- a/src/world/area_jan/jan_09/B660A0.c
+++ b/src/world/area_jan/jan_09/B660A0.c
@@ -2,6 +2,4 @@
 
 #include "common/foliage.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_09/B660A0", func_8024082C_B662DC);
-
-INCLUDE_ASM(s32, "world/area_jan/jan_09/B660A0", func_80240888_B66338);
+#include "world/common/todo/PullVineSub.inc.c"
diff --git a/src/world/area_jan/jan_13/B767B0.c b/src/world/area_jan/jan_13/B767B0.c
index 244ae291b1..c5f113f211 100644
--- a/src/world/area_jan/jan_13/B767B0.c
+++ b/src/world/area_jan/jan_13/B767B0.c
@@ -3,13 +3,53 @@
 static char* N(exit_str_0) = "jan_14";
 static char* N(exit_str_1) = "jan_12";
 
-INCLUDE_ASM(s32, "world/area_jan/jan_13/B767B0", func_80240000_B767B0);
+extern u16 D_80240850_B77000;
 
-INCLUDE_ASM(s32, "world/area_jan/jan_13/B767B0", func_802401AC_B7695C);
+void func_80240000_B767B0(void) {
+    f64 temp_f20 = ((sin_rad((f32) D_80240850_B77000 * 0.02) + 1.0f) * 0.3) + 0.6;
+    f64 temp_f21 = (sin_rad((f32) D_80240850_B77000 * 0.1) + 1.0f) * 0.1;
+    f32 scale = temp_f20 + temp_f21;
 
-INCLUDE_ASM(s32, "world/area_jan/jan_13/B767B0", func_80240214_B769C4);
+    guScale(&gDisplayContext->matrixStack[gMatrixListPos], (scale * 0.3) + 0.5, scale, (scale * 0.3) + 0.5);
+    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+    D_80240850_B77000++;
+}
 
-INCLUDE_ASM(s32, "world/area_jan/jan_13/B767B0", func_802402B8_B76A68);
+ApiStatus func_802401AC_B7695C(Evt* script, s32 isInitialCall) {
+    script->varTable[2] = EVT_FLOAT_TO_FIXED(script->varTable[1] / 100.0f);
+    script->varTable[3] = EVT_FLOAT_TO_FIXED(script->varTable[1] / 100.0f);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80240214_B769C4(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    if (*args++ != 0) {
+        script->functionTemp[0] = evt_get_variable(script, *args++);
+        script->functionTemp[1] = evt_get_variable(script, *args++);
+        script->functionTemp[2] = evt_get_variable(script, *args++);
+        sfx_adjust_env_sound_pos(SOUND_4E, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]);
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_802402B8_B76A68(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    s32 vt0 = script->varTable[0];
+    s32 vt2 = script->varTable[2];
+
+    if (script->varTable[1] >= -99) {
+        f32 theta = (playerStatus->targetYaw / 180.0f) * 3.141592f;
+
+        vt0 -= (s32) (sin_rad(theta) * 25.0f);
+        vt2 -= (s32) (-cos_rad(theta) * 25.0f);
+    } else {
+        vt2 += 25;
+    }
+    script->varTable[0] = vt0;
+    script->varTable[2] = vt2;
+    return ApiStatus_DONE2;
+}
 
 #include "common/foliage.inc.c"
 
diff --git a/src/world/area_jan/jan_22/B851A0.c b/src/world/area_jan/jan_22/B851A0.c
index ad1a2b311a..9c581d36df 100644
--- a/src/world/area_jan/jan_22/B851A0.c
+++ b/src/world/area_jan/jan_22/B851A0.c
@@ -32,11 +32,11 @@ ApiStatus func_80241168_B852E8(Evt* script, s32 isInitialCall) {
     f32 dx = array[3] - array[0];
     f32 dy = array[4] - array[1];
     f32 dz = array[5] - array[2];
-    
+
     script->varTable[5] = (dx / 1000.0f) * script->varTable[0];
     script->varTable[6] = (dy / 1000.0f) * script->varTable[0];
     script->varTable[7] = (dz / 1000.0f) * script->varTable[0];
-    
+
     if (mode == 0) {
         Npc* partner = get_npc_safe(-4);
         gPlayerStatus.position.x = (script->varTable[2] + script->varTable[5]);
@@ -69,32 +69,4 @@ ApiStatus func_802412E0_B85460(Evt* script, s32 isInitialCall) {
 
 #include "common/foliage.inc.c"
 
-void func_8024160C_B8578C(Matrix4f mtx, f32 shearAmt) {
-    guMtxIdentF(mtx);
-    mtx[1][2] = 0;
-    mtx[1][1] = 1.0f;
-    mtx[1][0] = shearAmt * 0.2;
-}
-
-ApiStatus func_80241668_B857E8(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    Matrix4f mtx;
-    s32 treeIndex;
-    s32 listIndex;
-    Model* model;
-    f32 shearAmt;
-
-    treeIndex = evt_get_variable(script, *args++);
-    listIndex = get_model_list_index_from_tree_index(treeIndex);
-    shearAmt = evt_get_float_variable(script, *args++);
-    model = get_model_from_list_index(listIndex);
-    if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) {
-        func_8024160C_B8578C(model->transformMatrix, shearAmt);
-        model->flags |= (MODEL_FLAGS_HAS_TRANSFORM_APPLIED | MODEL_FLAGS_USES_TRANSFORM_MATRIX);
-    } else {
-        func_8024160C_B8578C(mtx, shearAmt);
-        guMtxCatF(mtx, model->transformMatrix, model->transformMatrix);
-    }
-    
-    return ApiStatus_DONE2;
-}
+#include "world/common/todo/PullVineSub.inc.c"
diff --git a/src/world/area_kkj/kkj_25/B06D10.c b/src/world/area_kkj/kkj_25/B06D10.c
index 03ad2d22d7..4562f04b17 100644
--- a/src/world/area_kkj/kkj_25/B06D10.c
+++ b/src/world/area_kkj/kkj_25/B06D10.c
@@ -150,7 +150,44 @@ ApiStatus func_80240CE8_B076E8(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240D30_B07730);
+ApiStatus func_80240D30_B07730(Evt* script, s32 isInitialCall) {
+    if (isInitialCall) {
+        script->functionTemp[1] = 0;
+        script->functionTemp[2] = 0;
+    }
+
+    switch (script->functionTemp[2]) {
+        case 0:
+            set_screen_overlay_color(0, 208, 0, 0);
+            set_screen_overlay_params_front(1, script->functionTemp[1]);
+            if (script->functionTemp[1] == 255) {
+                script->functionTemp[1] = 0;
+                script->functionTemp[2] = 1;
+            } else {
+                script->functionTemp[1] += 7;
+                if (script->functionTemp[1] > 255) {
+                    script->functionTemp[1] = 255;
+                }
+            }
+            break;
+        case 1:
+            set_screen_overlay_color(
+                0,
+                208,
+                (script->functionTemp[1] * 208) / 255,
+                (script->functionTemp[1] * 208) / 255
+            );
+            set_screen_overlay_params_front(1, 255.0f);
+            if (script->functionTemp[1] == 255) {
+                script->functionTemp[2] = 2;
+            }
+            script->functionTemp[1] += 14;
+            if (script->functionTemp[1] > 255) {
+                script->functionTemp[1] = 255;
+            }
+    }
+    return (script->functionTemp[2] == 2) * 2;
+}
 
 ApiStatus func_80240E54_B07854(Evt* script, s32 isInitialCall) {
     if (isInitialCall) {
diff --git a/src/world/area_kmr/kmr_00/kmr_00_3_revival.c b/src/world/area_kmr/kmr_00/kmr_00_3_revival.c
index 3e0c1843b5..aead791293 100644
--- a/src/world/area_kmr/kmr_00/kmr_00_3_revival.c
+++ b/src/world/area_kmr/kmr_00/kmr_00_3_revival.c
@@ -1,8 +1,6 @@
 #include "kmr_00.h"
 #include "effects.h"
-
-void set_model_env_color_parameters(u8 primR, u8 primG, u8 primB, u8 envR, u8 envG, u8 envB);
-void get_model_env_color_parameters(u8* primR, u8* primG, u8* primB, u8* envR, u8* envG, u8* envB);
+#include "model.h"
 
 API_CALLABLE(N(func_80240000_8ABF90)) {
     Bytecode* args;
diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c
index 6e59a019cd..acab4c1906 100644
--- a/src/world/area_kmr/kmr_02/8B0070.c
+++ b/src/world/area_kmr/kmr_02/8B0070.c
@@ -12,7 +12,10 @@ static char* N(exit_str_3) = "";
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802402E0_8B0350);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240370_8B03E0);
+ApiStatus func_80240370_8B03E0(Evt* script, s32 isInitialCall) {
+    set_map_change_fade_rate(1);
+    return ApiStatus_DONE2;
+}
 
 extern s32 N(Quizmo_Worker);
 extern s32 N(Quizmo_AnswerResult);
@@ -30,7 +33,13 @@ static char* N(exit_str_6) = "\0\0\0\0";
 
 #include "world/common/util/ChangeNpcToPartner.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242014_8B2084);
+ApiStatus func_80242014_8B2084(Evt* script, s32 isInitialCall) {
+    if (get_npc_unsafe(NPC_PARTNER)->flags & NPC_FLAG_1000) {
+        return ApiStatus_DONE2;
+    } else {
+        return ApiStatus_BLOCK;
+    }
+}
 
 #include "world/common/todo/GetNpcCollisionHeight.inc.c"
 
@@ -66,28 +75,108 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242394_8B2404);
 extern s32 N(LetterDelivery_SavedNpcAnim);
 #include "world/common/todo/LetterDelivery.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242710_8B2780);
+ApiStatus func_80242710_8B2780(Evt* script, s32 isInitialCall) {
+    script->varTable[0] = gPlayerData.curHP == gPlayerData.curMaxHP;
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242734_8B27A4);
+extern u8 D_80257B00_8C7B70;
+extern u16 D_80257D00_8C7D70;
+extern MessageImageData D_80258120;
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242788_8B27F8);
+ApiStatus func_80242734_8B27A4(void) {
+    D_80258120.raster = &D_80257B00_8C7B70; // TODO extract image
+    D_80258120.palette = &D_80257D00_8C7D70; // TODO extract pal
+    D_80258120.width = 32; // TOOD image header define
+    D_80258120.height = 32; // TOOD image header define
+    D_80258120.format = G_IM_FMT_CI;
+    D_80258120.bitDepth = 0;
+    set_message_images(&D_80258120);
+    return ApiStatus_DONE1;
+}
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802427B0_8B2820);
+ApiStatus func_80242788_8B27F8(Evt* script, s32 isInitialCall) {
+    gPlayerData.partners[PARTNER_GOOMPA].enabled = FALSE;
+    func_800EB2A4(0);
+    return ApiStatus_DONE1;
+}
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802427CC_8B283C);
+ApiStatus func_802427B0_8B2820(Evt* script, s32 isInitialCall) {
+    if (gGameStatusPtr->pressedButtons[0] & BUTTON_START) {
+        return ApiStatus_DONE2;
+    } else {
+        return ApiStatus_BLOCK;
+    }
+}
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802427EC_8B285C);
+ApiStatus func_802427CC_8B283C(Evt* script, s32 isInitialCall) {
+    set_game_mode(GAME_MODE_PAUSE);
+    return ApiStatus_DONE1;
+}
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024280C_8B287C);
+ApiStatus func_802427EC_8B285C(Evt* script, s32 isInitialCall) {
+    close_status_menu();
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_8024280C_8B287C(Evt* script) {
+    Bytecode* args = script->ptrReadPos;
+    Npc* npc = resolve_npc(script, 0);
+
+    npc->renderYaw += evt_get_float_variable(script, *args++);
+    return ApiStatus_DONE2;
+}
 
 #define UNK_NPC_POS_FUNC_NUM 7
 #include "world/common/todo/UnkNpcPosFunc.inc.c"
 
 #include "world/common/todo/SyncStatusMenu.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024295C_8B29CC);
+#ifdef NON_EQUIVALENT
+extern u8 D_80257F20;
+extern u8 D_80257F21;
+extern u8 D_80257F22;
+extern u8 D_80257F23;
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242BA8_8B2C18);
+// control flow + data migration
+ApiStatus func_8024295C_8B29CC(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 r = evt_get_variable(script, *args++);
+    s32 g = evt_get_variable(script, *args++);
+    s32 b = evt_get_variable(script, *args++);
+    s32 a = evt_get_variable(script, *args++);
+    s32 temp_s0_5 = evt_get_variable(script, *args++);
+
+    if (isInitialCall) {
+        get_background_color_blend(&D_80257F20, &D_80257F21, &D_80257F22, &D_80257F23);
+        script->functionTemp[0] = 0;
+    }
+
+    if (temp_s0_5 > 0) {
+        set_background_color_blend(
+            D_80257F20 + (((r - D_80257F20) * script->functionTemp[0]) / temp_s0_5),
+            D_80257F21 + (((g - D_80257F21) * script->functionTemp[0]) / temp_s0_5),
+            D_80257F22 + (((b - D_80257F22) * script->functionTemp[0]) / temp_s0_5),
+            D_80257F23 + (((a - D_80257F23) * script->functionTemp[0]) / temp_s0_5)
+        );
+
+        script->functionTemp[0]++;
+        if (temp_s0_5 < script->functionTemp[0]) {
+            return ApiStatus_BLOCK;
+        }
+    } else {
+        set_background_color_blend(r, g, b, a);
+    }
+    return ApiStatus_DONE2;
+}
+#else
+INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024295C_8B29CC);
+#endif
+
+ApiStatus func_80242BA8_8B2C18(Evt* script, s32 isInitialCall) {
+    *gBgRenderTypePtr = 1;
+    return ApiStatus_DONE2;
+}
 
 // will match when preceding bss is worked out
 #ifdef NON_MATCHING
@@ -135,10 +224,23 @@ s32 func_80242BC0_8B2C30(Evt* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242BC0_8B2C30);
 #endif
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242F08_8B2F78);
+ApiStatus func_80242F08_8B2F78(Evt* script, s32 isInitialCall) {
+    mdl_set_all_fog_mode(3);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242F28_8B2F98);
+ApiStatus func_80242F28_8B2F98(Evt* script, s32 isInitialCall) {
+    func_8011B950(0x9C, -1, 1, 1);
+    set_background_color_blend(0, 0, 0, 255);
+    gCameras[CAM_DEFAULT].bgColor[0] = 0;
+    gCameras[CAM_DEFAULT].bgColor[1] = 0;
+    gCameras[CAM_DEFAULT].bgColor[2] = 0;
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242F7C_8B2FEC);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80243034_8B30A4);
+ApiStatus func_80243034_8B30A4(Evt* script, s32 isInitialCall) {
+    get_item_entity(script->varTable[0])->scale = 0.6f;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_kmr/kmr_02/8B33E0.c b/src/world/area_kmr/kmr_02/8B33E0.c
index 7a2138c06f..c31d60f7ef 100644
--- a/src/world/area_kmr/kmr_02/8B33E0.c
+++ b/src/world/area_kmr/kmr_02/8B33E0.c
@@ -1,6 +1,20 @@
 #include "kmr_02.h"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B33E0", func_80243370_8B33E0);
+ApiStatus func_80243370_8B33E0(Evt* script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    s32 cond = FALSE;
+    s32 i;
+
+    for (i = 0; i < ARRAY_COUNT(playerData->equippedBadges); i++) {
+        if (playerData->equippedBadges[i] != 0) {
+            cond = TRUE;
+            break;
+        }
+    }
+
+    script->varTable[0] = cond;
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/todo/SetEntityPositionF.inc.c"
 
diff --git a/src/world/area_kmr/kmr_11/8DA100.c b/src/world/area_kmr/kmr_11/8DA100.c
index 96e4675736..da4b9a160b 100644
--- a/src/world/area_kmr/kmr_11/8DA100.c
+++ b/src/world/area_kmr/kmr_11/8DA100.c
@@ -9,4 +9,7 @@ static char* N(exit_str_3) = "";
 
 #include "common/UnkFogFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA100", func_8024027C_8DA37C);
+ApiStatus func_8024027C_8DA37C(Evt* script, s32 isInitialCall) {
+    set_map_change_fade_rate(10);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_kmr/kmr_11/8DA3A0.c b/src/world/area_kmr/kmr_11/8DA3A0.c
index a863eaa931..bf8e8e1b53 100644
--- a/src/world/area_kmr/kmr_11/8DA3A0.c
+++ b/src/world/area_kmr/kmr_11/8DA3A0.c
@@ -1,8 +1,22 @@
 #include "kmr_11.h"
+#include "effects.h"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_802402A0_8DA3A0);
+ApiStatus func_802402A0_8DA3A0(Evt* script) {
+    Bytecode* args = script->ptrReadPos;
+    f32 temp_f24 = evt_get_float_variable(script, *args++);
+    f32 temp_f22 = evt_get_float_variable(script, *args++);
+    f32 temp_f20 = evt_get_float_variable(script, *args++);
+    s32 t4 = evt_get_variable(script, *args++);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240344_8DA444);
+    fx_lens_flare(0, temp_f24, temp_f22, temp_f20, t4);
+    return ApiStatus_DONE2;
+}
+ApiStatus func_80240344_8DA444(Evt* script) {
+    Bytecode* args = script->ptrReadPos;
+
+    gCameras[CAM_DEFAULT].vfov = evt_get_float_variable(script, *args++);
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/enemy/ai/StationaryAI.inc.c"
 
diff --git a/src/world/area_kmr/kmr_20/8EBE50.c b/src/world/area_kmr/kmr_20/8EBE50.c
index 8e6199384a..7344f679d3 100644
--- a/src/world/area_kmr/kmr_20/8EBE50.c
+++ b/src/world/area_kmr/kmr_20/8EBE50.c
@@ -23,7 +23,10 @@ ApiStatus func_80240358_8EC178(Evt* script, s32 isInitialCall) {
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_802405BC_8EC3DC);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_802406BC_8EC4DC);
+ApiStatus func_802406BC_8EC4DC(Evt* script, s32 isInitialCall) {
+    script->functionTemp[3] = 0;
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_802406C8_8EC4E8);
 
@@ -32,7 +35,10 @@ ApiStatus func_80240B20_8EC940(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240B48_8EC968);
+ApiStatus func_80240B48_8EC968(Evt* script, s32 isInitialCall) {
+    script->functionTemp[3] = 0;
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240B54_8EC974);
 
diff --git a/src/world/area_kmr/kmr_20/8ED440.c b/src/world/area_kmr/kmr_20/8ED440.c
index 2eac51d86c..182787c77e 100644
--- a/src/world/area_kmr/kmr_20/8ED440.c
+++ b/src/world/area_kmr/kmr_20/8ED440.c
@@ -4,4 +4,15 @@
 
 #include "world/common/todo/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED440", func_80241738_8ED558);
+extern Addr EntityModel_Spring_ReboundAnim;
+
+ApiStatus func_80241738_8ED558(Evt* script, s32 isInitialCall) {
+    Entity* entity = get_entity_by_index(0);
+
+    if (entity == NULL) {
+        return ApiStatus_BLOCK;
+    }
+
+    play_model_animation(entity->virtualModelIndex, (s16*)EntityModel_Spring_ReboundAnim);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_kmr/kmr_20/8EDFC0.c b/src/world/area_kmr/kmr_20/8EDFC0.c
index e114bb2ad8..a1c6c34a5f 100644
--- a/src/world/area_kmr/kmr_20/8EDFC0.c
+++ b/src/world/area_kmr/kmr_20/8EDFC0.c
@@ -2,9 +2,18 @@
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDFC0", func_802421A0_8EDFC0);
 
+void func_80242870_8EE690(void*);
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDFC0", func_80242870_8EE690);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDFC0", func_80242A04_8EE824);
+void func_80242A04_8EE824(void) {
+    RenderTask rt;
+
+    rt.renderMode = RENDER_MODE_2D;
+    rt.appendGfxArg = NULL;
+    rt.appendGfx = func_80242870_8EE690;
+    rt.distance = 0;
+    queue_render_task(&rt);
+}
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDFC0", func_80242A3C_8EE85C);
 
diff --git a/src/world/area_kmr/kmr_22/8FF670.c b/src/world/area_kmr/kmr_22/8FF670.c
index aa344b6888..0ec508e2aa 100644
--- a/src/world/area_kmr/kmr_22/8FF670.c
+++ b/src/world/area_kmr/kmr_22/8FF670.c
@@ -11,4 +11,6 @@ static char* N(exit_str_7) = "nok_11";
 static char* N(exit_str_8) = "kmr_00";
 static char* N(exit_str_9) = "";
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF670", func_80240000_8FF670);
+ApiStatus func_80240000_8FF670(Evt* script, s32 isInitialCall) {
+    return ApiStatus_DONE1;
+}
diff --git a/src/world/area_kmr/kmr_22/8FF680.c b/src/world/area_kmr/kmr_22/8FF680.c
index ce6a36d64c..0e1a081227 100644
--- a/src/world/area_kmr/kmr_22/8FF680.c
+++ b/src/world/area_kmr/kmr_22/8FF680.c
@@ -2,6 +2,23 @@
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF680", func_80240010_8FF680);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF680", func_802401E0_8FF850);
+ApiStatus func_802401E0_8FF850(Evt* script, s32 isInitialCall) {
+    set_curtain_scale_goal(2.0f);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF680", func_80240208_8FF878);
+ApiStatus func_80240208_8FF878(Evt* script, s32 isInitialCall) {
+    ApiStatus ret;
+
+    if (gGameStatusPtr->pressedButtons[0] & BUTTON_START) {
+        ret = ApiStatus_DONE2;
+    } else {
+        ret = ApiStatus_BLOCK;
+    }
+
+    if (gGameStatusPtr->pressedButtons[0] & BUTTON_A) {
+        ret = ApiStatus_DONE2;
+        script->varTable[0] = -1;
+    }
+    return ret;
+}
diff --git a/src/world/area_kmr/kmr_22/8FF8B0.c b/src/world/area_kmr/kmr_22/8FF8B0.c
index f35ec47865..cb8151c0e4 100644
--- a/src/world/area_kmr/kmr_22/8FF8B0.c
+++ b/src/world/area_kmr/kmr_22/8FF8B0.c
@@ -6,13 +6,37 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_80240314_8FF984);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_80240418_8FFA88);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_802404E4_8FFB54);
+ApiStatus func_802404E4_8FFB54(Evt* script) {
+    Bytecode* args = script->ptrReadPos;
 
+    evt_get_variable(script, *args++);
+    evt_get_variable(script, *args++);
+    evt_get_variable(script, *args++);
+    evt_get_variable(script, *args++);
+    evt_get_variable(script, *args++);
+    evt_get_variable(NULL, MapVar(0));
+    return ApiStatus_DONE2;
+}
+
+void func_8024056C_8FFBDC(void*);
 INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_8024056C_8FFBDC);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_80240B00_900170);
+void func_80240B00_900170(void) {
+    RenderTask rt;
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_80240B3C_9001AC);
+    rt.appendGfx = &func_8024056C_8FFBDC;
+    rt.distance = 10;
+    rt.appendGfxArg = NULL;
+    rt.renderMode = RENDER_MODE_SURFACE_OPA;
+    queue_render_task(&rt);
+}
+
+extern s32 D_802483D0;
+
+ApiStatus func_80240B3C_9001AC(Evt* script, s32 isInitialCall) {
+    D_802483D0 = 0;
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_80240B4C_9001BC);
 
diff --git a/src/world/area_kpa/kpa_134/AA92B0.c b/src/world/area_kpa/kpa_134/AA92B0.c
index cb6739cc09..541d9ea017 100644
--- a/src/world/area_kpa/kpa_134/AA92B0.c
+++ b/src/world/area_kpa/kpa_134/AA92B0.c
@@ -5,11 +5,59 @@ ApiStatus func_80240310_AA92B0(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA92B0", func_8024033C_AA92DC);
+ApiStatus func_8024033C_AA92DC(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->actionState != ACTION_STATE_FALLING) {
+        return ApiStatus_BLOCK;
+    }
+
+    if (fabs(playerStatus->position.x - 50.0f) > 14.0) {
+        return ApiStatus_BLOCK;
+    }
+
+    if (fabs(playerStatus->position.y - 150.0f) > 14.0) {
+        return ApiStatus_BLOCK;
+    }
+
+    if (fabs(playerStatus->position.z - -34.0f) > 14.0) {
+        return ApiStatus_BLOCK;
+    }
+
+    playerStatus->position.x = 50.0f;
+    playerStatus->position.y = 150.0f;
+    playerStatus->position.z = -34.0f;
+    playerStatus->currentSpeed = 0.0f;
+    return ApiStatus_DONE2;
+}
 
 ApiStatus func_80240408_AA93A8(Evt* script, s32 isInitialCall) {
     create_shadow_type(0, 680.0f, 240.0f, -35.0f);
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA92B0", func_80240434_AA93D4);
+ApiStatus func_80240434_AA93D4(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->actionState != ACTION_STATE_FALLING) {
+        return ApiStatus_BLOCK;
+    }
+
+    if (fabs(playerStatus->position.x - 680.0f) > 14.0) {
+        return ApiStatus_BLOCK;
+    }
+
+    if (fabs(playerStatus->position.y - 275.0f) > 14.0) {
+        return ApiStatus_BLOCK;
+    }
+
+    if (fabs(playerStatus->position.z - -35.0f) > 14.0) {
+        return ApiStatus_BLOCK;
+    }
+
+    playerStatus->position.x = 680.0f;
+    playerStatus->position.y = 275.0f;
+    playerStatus->position.z = -35.0f;
+    playerStatus->currentSpeed = 0.0f;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c
index b536c8c843..5933f872d1 100644
--- a/src/world/area_mac/mac_00/7EB340.c
+++ b/src/world/area_mac/mac_00/7EB340.c
@@ -81,7 +81,14 @@ ApiStatus N(SetDojoBattle)(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802421D0_7ECEE0);
+ApiStatus func_802421D0_7ECEE0(Evt* script, s32 isInitialCall) {
+    func_8011B950(0x8A, -1, 1, 1);
+    set_background_color_blend(0, 0, 0, 255);
+    gCameras[CAM_DEFAULT].bgColor[0] = 0;
+    gCameras[CAM_DEFAULT].bgColor[1] = 0;
+    gCameras[CAM_DEFAULT].bgColor[2] = 0;
+    return ApiStatus_DONE2;
+}
 
 ApiStatus func_80242224_7ECF34(Evt* script, s32 isInitialCall) {
     gPlayerData.curHP = 1;
@@ -89,7 +96,10 @@ ApiStatus func_80242224_7ECF34(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242250_7ECF60);
+ApiStatus func_80242250_7ECF60(Evt* script, s32 isInitialCall) {
+    script->varTable[0] = (s32) ((gPlayerData.frameCounter - gPlayerData.tradeEventStartTime) / 3600) < script->varTable[0];
+    return ApiStatus_DONE2;
+}
 
 ApiStatus func_8024228C_7ECF9C(Evt* script, s32 isInitialCall) {
     script->varTable[0] = get_item_count();
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index 7d0c3e901d..5980571aa1 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -147,7 +147,40 @@ ApiStatus func_80244848_8050C8(Evt* script, s32 isInitialCall) {
     return ApiStatus_BLOCK;
 }
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802448A0_805120);
+ApiStatus func_802448A0_805120(Evt* script, s32 isInitialCall) {
+    s32 alpha;
+
+    if (isInitialCall) {
+        if (script->varTable[0] == 0) {
+            func_8011B950(script->varTable[15], -1, 1, 1);
+        }
+        script->functionTemp[0] = 0;
+    }
+
+    script->functionTemp[0] += 32;
+    if (script->functionTemp[0] > 255) {
+        script->functionTemp[0] = 255;
+    }
+
+    if (script->varTable[0] == 0) {
+        alpha = script->functionTemp[0];
+    } else {
+        alpha = 255 - script->functionTemp[0];
+    }
+
+    set_background_color_blend(0, 0, 0, alpha);
+    gCameras[CAM_DEFAULT].bgColor[0] = 0;
+    gCameras[CAM_DEFAULT].bgColor[1] = 0;
+    gCameras[CAM_DEFAULT].bgColor[2] = 0;
+
+    if (script->functionTemp[0] >= 255) {
+        if (script->varTable[0] == 3) {
+            func_8011B950(script->varTable[15], -1, 0, 1);
+        }
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244984_805204);
 
diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c
index 2cd171ee35..623bcde0d9 100644
--- a/src/world/area_mac/mac_03/831B20.c
+++ b/src/world/area_mac/mac_03/831B20.c
@@ -45,6 +45,15 @@ ApiStatus func_802417FC_832FFC(Evt* script, s32 isInitialCall) {
 extern s32 N(LetterDelivery_SavedNpcAnim);
 #include "world/common/todo/LetterDelivery.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241B84_833384);
+ApiStatus func_80241B84_833384(Evt* script, s32 isInitialCall) {
+    s32 gb29 = evt_get_variable(script, GameByte(29));
+
+    if (gb29 == 0) {
+        script->varTable[0] = -1;
+    } else {
+        script->varTable[0] = evt_get_variable(script, gb29 + GameByte(29));
+    }
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241BD8_8333D8);
diff --git a/src/world/area_mac/mac_04/842BD0.c b/src/world/area_mac/mac_04/842BD0.c
index 09039ae705..5b0c81aa9b 100644
--- a/src/world/area_mac/mac_04/842BD0.c
+++ b/src/world/area_mac/mac_04/842BD0.c
@@ -1,3 +1,15 @@
 #include "mac_04.h"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/842BD0", func_80240000_842BD0);
+extern char wMapBgName[];
+
+ApiStatus func_80240000_842BD0(Evt* script, s32 isInitialCall) {
+    if (gGameStatusPtr->entryID == 4) {
+        sprintf(wMapBgName, "hos_bg");
+    }
+    return ApiStatus_BLOCK;
+}
+
+const char N(exit_str_0)[] = "mac_05";
+const char N(exit_str_1)[] = "mac_02";
+const char N(exit_str_2)[] = "omo_03";
+const char N(exit_str_3)[] = "hos_20\0\0"; // todo remove padding after these are moved
diff --git a/src/world/area_mac/mac_04/842C20.c b/src/world/area_mac/mac_04/842C20.c
index d0af34cf98..417c386a5a 100644
--- a/src/world/area_mac/mac_04/842C20.c
+++ b/src/world/area_mac/mac_04/842C20.c
@@ -1,5 +1,23 @@
 #include "mac_04.h"
+#include "model.h"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/842C20", func_80240050_842C20);
+ApiStatus func_80240050_842C20(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 primR = evt_get_variable(script, *args++);
+    s32 primG = evt_get_variable(script, *args++);
+    s32 primB = evt_get_variable(script, *args++);
+    s32 primA = evt_get_variable(script, *args++);
+    s32 fogR = evt_get_variable(script, *args++);
+    s32 fogG = evt_get_variable(script, *args++);
+    s32 fogB = evt_get_variable(script, *args++);
+    s32 fogStart = evt_get_variable(script, *args++);
+    s32 fogEnd = evt_get_variable(script, *args++);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/842C20", func_80240194_842D64);
+    set_model_fog_color_parameters(primR, primG, primB, primA, fogR, fogG, fogB, fogStart, fogEnd);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80240194_842D64(Evt* script, s32 isInitialCall) {
+    mdl_set_all_fog_mode(3);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_mac/mac_04/842D90.c b/src/world/area_mac/mac_04/842D90.c
index 0b98476672..da503e705e 100644
--- a/src/world/area_mac/mac_04/842D90.c
+++ b/src/world/area_mac/mac_04/842D90.c
@@ -1,3 +1,15 @@
 #include "mac_04.h"
 
+// matches if func_8011B950 is declared to return s32, but that breaks other funcs
+#ifdef NON_MATCHING
+ApiStatus func_802401C0_842D90(Evt* script, s32 isInitialCall) {
+    func_8011B950(0x9E, -1, 1, 1);
+    set_background_color_blend(0, 0, 0, 255);
+    gCameras[CAM_DEFAULT].bgColor[0] = 0;
+    gCameras[CAM_DEFAULT].bgColor[1] = 0;
+    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_04/843030.c b/src/world/area_mac/mac_04/843030.c
index 317c607839..2e28a7ecb6 100644
--- a/src/world/area_mac/mac_04/843030.c
+++ b/src/world/area_mac/mac_04/843030.c
@@ -40,9 +40,42 @@ ApiStatus func_802417AC_84437C(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241848_844418);
+s32 func_80241848_844418(void) {
+    s32 bpCost = 0;
+    s32 i = 0;
+    ItemData* itemTable = gItemTable;
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802418AC_84447C);
+    for (; i < ARRAY_COUNT(gPlayerData.equippedBadges); i++) {
+        s16 badge = gPlayerData.equippedBadges[i];
+
+        if (badge != 0) {
+            bpCost += gMoveTable[itemTable[badge].moveID].costBP;
+        }
+    }
+    return bpCost;
+}
+
+ApiStatus func_802418AC_84447C(Evt* script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    Bytecode* args = script->ptrReadPos;
+    s32 outVar = *args++;
+    s32 bpCost = func_80241848_844418();
+    s32 i;
+
+    if (gPlayerData.maxBP >= bpCost) {
+        evt_set_variable(script, outVar, FALSE);
+        return ApiStatus_DONE2;
+    } else {
+        s16* badges = gPlayerData.equippedBadges;
+
+        for (i = 0; i < ARRAY_COUNT(gPlayerData.equippedBadges); i++) {
+            badges[i] = 0;
+        }
+        enforce_hpfp_limits();
+        evt_set_variable(script, outVar, TRUE);
+        return ApiStatus_DONE2;
+    }
+}
 
 ApiStatus PostChapter4StatUpdate(Evt* script, s32 isInitialCall) {
     PlayerData* playerData = &gPlayerData;
@@ -67,11 +100,73 @@ ApiStatus N(IsPartnerBow)(Evt* script, s32 isInitialCall) {
 
 #include "world/common/todo/GetPlayerCoins.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802419E4_8445B4);
+ApiStatus func_802419E4_8445B4(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 out1 = *args++;
+    s32 out2 = *args++;
+    s32 out3 = *args++;
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241A64_844634);
+    evt_set_variable(script, out1, gPlayerData.hardMaxHP);
+    evt_set_variable(script, out2, gPlayerData.hardMaxFP);
+    evt_set_variable(script, out3, gPlayerData.maxBP);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241B90_844760);
+ApiStatus func_80241A64_844634(Evt* script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    s32 bp = 0;
+    s32 fp = 0;
+    s32 hp = 0;
+
+    switch (script->varTable[10]) {
+        case 0:
+            hp = 10;
+            fp = -5;
+            bp = -3;
+            break;
+        case 1:
+            hp = -5;
+            fp = 10;
+            bp = -3;
+            break;
+        case 2:
+            hp = -5;
+            fp = -5;
+            bp = 6;
+            break;
+    }
+
+    playerData->hardMaxHP += hp;
+    playerData->curMaxHP += hp;
+    if (playerData->curMaxHP > 75) {
+        playerData->curMaxHP = 75;
+    }
+    if (playerData->curHP > playerData->curMaxHP) {
+        playerData->curHP = playerData->curMaxHP;
+    }
+    playerData->hardMaxFP += fp;
+    playerData->curMaxFP += fp;
+    if (playerData->curMaxFP > 75) {
+        playerData->curMaxFP = 75;
+    }
+    if (playerData->curFP > playerData->curMaxFP) {
+        playerData->curFP = playerData->curMaxFP;
+    }
+    playerData->maxBP += bp;
+    if (playerData->maxBP > 30) {
+        playerData->maxBP = 30;
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80241B90_844760(Evt* script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+
+    script->varTable[0] = playerData->curMaxHP;
+    script->varTable[1] = playerData->curMaxFP;
+    script->varTable[2] = playerData->maxBP;
+    return ApiStatus_DONE2;
+}
 
 ApiStatus N(SetNpcShadowScale)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
@@ -87,6 +182,13 @@ ApiStatus N(80241C20_8447F0)(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241C40_844810);
+ApiStatus func_80241C40_844810(Evt* script, s32 isInitialCall) {
+    func_800E98C4();
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241C60_844830);
+ApiStatus func_80241C60_844830(Evt* script, s32 isInitialCall) {
+    func_800E98C4();
+    open_status_menu_long();
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_mac/mac_04/844860.c b/src/world/area_mac/mac_04/844860.c
index dd1b4e2601..0e6068860c 100644
--- a/src/world/area_mac/mac_04/844860.c
+++ b/src/world/area_mac/mac_04/844860.c
@@ -1,4 +1,5 @@
 #include "mac_04.h"
+#include "sprite.h"
 
 void func_80241D30_844900(void);
 void func_80241DAC_84497C(void*);
@@ -32,25 +33,22 @@ void func_80241D30_844900(void) {
     queue_render_task(&renderTask);
 }
 
-// problem with asm file improperly including strings "omo_03" and "kmr_22"
-#ifdef NON_MATCHING
-void func_80241DAC_84497C(PlayerStatus* playerStatus) {
+void func_80241DAC_84497C(void* data) {
+    PlayerStatus* playerStatus = data;
     f32 scale = evt_get_float_variable(NULL, MapVar(10));
-    f32 scale_2;
     Matrix4f transformMtx;
     Matrix4f tempMtx;
-    
+
     guRotateF(transformMtx, playerStatus->spriteFacingAngle, 0.0f, 1.0f, 0.0f);
-    scale_2 = (f32) ((f64) scale * SPRITE_WORLD_SCALE_D);
-    guScaleF(tempMtx, scale_2, scale_2, scale_2);
+    guScaleF(tempMtx, scale * SPRITE_WORLD_SCALE_D, scale * SPRITE_WORLD_SCALE_D, scale * SPRITE_WORLD_SCALE_D);
     guMtxCatF(transformMtx, tempMtx, transformMtx);
     guTranslateF(tempMtx, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z);
     guMtxCatF(transformMtx, tempMtx, transformMtx);
-    playerStatus->unk_BC = spr_update_player_sprite(0, playerStatus->trueAnimation, 1.0f);
+    playerStatus->animNotifyValue = spr_update_player_sprite(0, playerStatus->trueAnimation, 1.0f);
     spr_draw_player_sprite(0, 0, 0, NULL, transformMtx);
 }
-#else
-INCLUDE_ASM(s32, "world/area_mac/mac_04/844860", func_80241DAC_84497C);
-#endif
+
+const char* N(exit_str_4) = "omo_03";
+const char* N(exit_str_5) = "kmr_22";
 
 #include "world/common/todo/RemovePadlock.inc.c"
diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c
index bc3661d020..0ca0f0bcd4 100644
--- a/src/world/area_mac/mac_05/852170.c
+++ b/src/world/area_mac/mac_05/852170.c
@@ -1,4 +1,5 @@
 #include "mac_05.h"
+#include "effects.h"
 
 static char* N(exit_str_0) = "mac_04";
 static char* N(exit_str_1) = "kgr_01";
@@ -11,7 +12,10 @@ static char* N(exit_str_1) = "kgr_01";
 #include "world/common/todo/UnkFloatFunc001.inc.c"
 #define NAMESPACE mac_05
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024047C_8525EC);
+ApiStatus func_8024047C_8525EC(Evt* script, s32 isInitialCall) {
+    gGameStatusPtr->exitTangent = 0.0f;
+    return ApiStatus_BLOCK;
+}
 
 #include "world/common/enemy/ai/PatrolNoAttackAI.inc.c"
 
@@ -76,24 +80,198 @@ ApiStatus func_80242708_854878(Evt* script, s32 isInitialCall) {
 extern s32 N(LetterDelivery_SavedNpcAnim);
 #include "world/common/todo/LetterDelivery.inc.c"
 
+// float stuff
+#ifdef NON_MATCHING
+ApiStatus func_80242A90_854C00(Evt* script) {
+    Bytecode* args = script->ptrReadPos;
+    s32 temp_s1 = evt_get_variable(script, *args++);
+    s32 temp_s3 = *args++;
+    s32 temp_s4 = *args++;
+    s32 temp_s5 = *args++;
+    Npc* npc = get_npc_safe(0);
+    f32 temp_f20;
+    f32 var_f20;
+    f32 var_f22;
+    f32 var_f24;
+    f32 var_f26;
+
+    switch (temp_s1) {
+        case 0:
+            var_f26 = 55.0f;
+            break;
+        case 1:
+            var_f26 = 85.0f;
+            break;
+        case 2:
+            var_f26 = 25.0f;
+            break;
+        case 3:
+            var_f24 = -295.0f;
+            var_f22 = -10.0f;
+            var_f20 = 400.0f;
+            break;
+        case 4:
+            var_f24 = -285.0f;
+            var_f22 = -10.0f;
+            var_f20 = 380.0f;
+            break;
+        default:
+            var_f24 = -295.0f;
+            var_f22 = -10.0f;
+            var_f20 = 420.0f;
+            break;
+    }
+    if (temp_s1 < 3) {
+        temp_f20 = -npc->yaw;
+        var_f24 = npc->pos.x + 30.0f + (sin_deg(temp_f20) * var_f26);
+        var_f22 = npc->pos.y + 50.0f;
+        var_f20 = npc->pos.z + (cos_deg(temp_f20) * var_f26);
+    }
+    evt_set_float_variable(script, temp_s3, var_f24);
+    evt_set_float_variable(script, temp_s4, var_f22);
+    evt_set_float_variable(script, temp_s5, var_f20);
+    return ApiStatus_DONE2;
+}
+#else
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A90_854C00);
+#endif
 
 static char* N(exit_str_2) = "mac_06";
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242C78_854DE8);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242E84_854FF4);
+ApiStatus func_80242E84_854FF4(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    Npc* npc = get_npc_safe(0);
+
+    if (isInitialCall) {
+        script->functionTemp[0] = evt_get_variable(script, *args++);
+        if (script->functionTemp[0] == 0) {
+            script->functionTemp[2] = 0;
+            script->functionTemp[1] = 90;
+        } else {
+            script->functionTemp[2] = 10;
+            script->functionTemp[1] = 290;
+            npc->pos.x = 650.0f;
+            npc->pos.y = -30.0f;
+            npc->pos.z = 372.0f;
+        }
+    }
+
+    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] = 200;
+            }
+            break;
+        case 1:
+            if (evt_get_variable(NULL, MapFlag(1)) != 0) {
+                npc->pos.x += 3.0f;
+                script->functionTemp[1]--;
+                if (script->functionTemp[1] <= 0) {
+                    return ApiStatus_DONE1;
+                }
+            }
+            break;
+        case 10:
+            npc->yaw = 270.0f;
+            npc->pos.x -= 3.0f;
+            script->functionTemp[1]--;
+            if (script->functionTemp[1] <= 0) {
+                script->functionTemp[2] = 11;
+                script->functionTemp[1] = 90;
+            }
+            break;
+        case 11:
+            npc->yaw -= 1.0f;
+            script->functionTemp[1]--;
+            if (script->functionTemp[1] <= 0) {
+                return ApiStatus_DONE1;
+            }
+            break;
+    }
+    return ApiStatus_BLOCK;
+}
 
 #include "world/common/todo/GetFloorCollider.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802430B4_855224);
+ApiStatus func_802430B4_855224(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    Npc* npc = get_npc_safe(-4);
+    s32 outVal = -1;
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802431B0_855320);
+    if (gCollisionStatus.bombetteExploded >= 0) {
+        f32 temp = 11.0f;
+        f32 x = npc->pos.x;
+        f32 y = npc->pos.y + temp;
+        f32 z = npc->pos.z;
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80243254_8553C4);
+        temp = 12.0f;
+        if (npc_raycast_down_around(npc->collisionChannel, &x, &y, &z, &temp, npc->yaw, npc->collisionRadius) &&
+            temp <= 12.0f)
+        {
+            outVal = D_8010C978;
+        }
+    }
+    evt_set_variable(script, *args++, outVal);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024335C_8554CC);
+ApiStatus func_802431B0_855320(Evt* script, s32 isInitialCall) {
+    Npc* npc = get_npc_safe(4);
+    f32 x = npc->pos.x + 20.0f;
+    f32 y = npc->pos.y;
+    f32 z = npc->pos.z - 15.0f;
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80243380_8554F0);
+    if (y < 0.0f) {
+        fx_rising_bubble(0, x, y, z, 0.0f);
+        sfx_adjust_env_sound_pos(SOUND_JR_TROOPA_SWIM, 0, x, y, z);
+    }
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802433BC_85552C);
+ApiStatus func_80243254_8553C4(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    Bytecode* args = script->ptrReadPos;
+    s32 npcID = evt_get_variable(script, *args++);
+    s32 outVar0 = *args++;
+    s32 outVar1 = *args++;
+    Npc* npc = resolve_npc(script, npcID);
+    f32 theta;
+    f32 x;
+    f32 z;
+
+    if (npc == NULL) {
+        return ApiStatus_DONE2;
+    }
+
+    theta = clamp_angle(atan2(playerStatus->position.x, playerStatus->position.z, npc->pos.x, npc->pos.z));
+    x = playerStatus->position.x + (sin_deg(theta) * 40.0f);
+    z = playerStatus->position.z - (cos_deg(theta) * 40.0f);
+    evt_set_variable(script, outVar0, x);
+    evt_set_variable(script, outVar1, z);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_8024335C_8554CC(Evt* script, s32 isInitialCall) {
+    if (func_8014AD40() == 0) {
+        return ApiStatus_DONE2;
+    } else {
+        return ApiStatus_BLOCK;
+    }
+}
+
+ApiStatus func_80243380_8554F0(Evt* script, s32 isInitialCall) {
+    script->varTable[0] = (s32) ((gPlayerData.frameCounter - gPlayerData.tradeEventStartTime) / 3600) < script->varTable[0];
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_802433BC_85552C(Evt* script, s32 isInitialCall) {
+    script->varTable[0] = get_item_count();
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_mac/machi/7E7850.c b/src/world/area_mac/machi/7E7850.c
index 2ba0fc6e03..237e7c35f2 100644
--- a/src/world/area_mac/machi/7E7850.c
+++ b/src/world/area_mac/machi/7E7850.c
@@ -1,3 +1,40 @@
 #include "machi.h"
 
-INCLUDE_ASM(s32, "world/area_mac/machi/7E7850", func_802404B0_7E7850);
+ApiStatus func_802404B0_7E7850(Evt* script, s32 isInitialCall) {
+    Npc* npc = get_npc_unsafe(0x37);
+
+    if (isInitialCall) {
+        script->functionTemp[0] = 0;
+    }
+
+    switch (script->functionTemp[0]) {
+        case 0:
+            npc->moveToPos.x = npc->pos.x + 500.0f;
+            npc->moveToPos.y = npc->pos.y + 120.0f;
+            npc->moveToPos.z = npc->pos.z - 500.0f;
+            npc->duration = 20;
+            npc->moveToPos.x = (npc->moveToPos.x - npc->pos.x) / npc->duration;
+            npc->moveToPos.y = (npc->moveToPos.y - npc->pos.y) / npc->duration;
+            npc->moveToPos.z = (npc->moveToPos.z - npc->pos.z) / npc->duration;
+            npc->duration = 100;
+            npc->moveToPos.x /= 10.0f;
+            npc->moveToPos.y /= 10.0f;
+            npc->moveToPos.z /= 10.0f;
+            enable_npc_blur(npc);
+            script->functionTemp[0] = 1;
+            break;
+        case 1:
+            npc->pos.x += npc->moveToPos.x;
+            npc->pos.y += npc->moveToPos.y;
+            npc->pos.z += npc->moveToPos.z;
+            npc->moveToPos.x = npc->moveToPos.x * 1.05;
+            npc->moveToPos.y = npc->moveToPos.y * 1.05;
+            npc->moveToPos.z = npc->moveToPos.z * 1.05;
+            npc->duration--;
+            if (npc->duration == 0) {
+                return ApiStatus_DONE1;
+            }
+            break;
+    }
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/area_nok/nok_02/9DA8F0.c b/src/world/area_nok/nok_02/9DA8F0.c
index d645dc0fbb..548d15f9af 100644
--- a/src/world/area_nok/nok_02/9DA8F0.c
+++ b/src/world/area_nok/nok_02/9DA8F0.c
@@ -1,6 +1,33 @@
 #include "nok_02.h"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_802438D0_9DA8F0);
+extern s32 D_802523B4_9E93D4;
+extern Npc* wPartnerNpc;
+
+// SetupDemoScene
+ApiStatus func_802438D0_9DA8F0(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    switch (D_802523B4_9E93D4) {
+        case 0:
+            D_802523B4_9E93D4 = 1;
+            break;
+        case 1:
+        case 2:
+            D_802523B4_9E93D4++;
+            break;
+        case 3:
+            partner_clear_player_tracking(wPartnerNpc);
+            partner_set_goal_pos(playerStatus->position.x, playerStatus->position.z);
+            func_800EF3D4(0);
+            set_npc_yaw(wPartnerNpc, 90.0f);
+            playerStatus->targetYaw = 90.0f;
+            playerStatus->currentYaw = 90.0f;
+            playerStatus->spriteFacingAngle = 0.0f;
+            return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
 
 #define NAMESPACE dup2_nok_02
 #include "world/common/todo/GetNpcCollisionHeight.inc.c"
@@ -64,7 +91,16 @@ ApiStatus func_80243D14_9DAD34(Evt* script, s32 isInitialCall) {
 #include "world/common/todo/GetItemName.inc.c"
 #define NAMESPACE nok_02
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243EC8_9DAEE8);
+ApiStatus func_80243EC8_9DAEE8(Evt* script) {
+    Bytecode* args = script->ptrReadPos;
+
+    if ((evt_get_variable(script, *args++) % 4) != 0) {
+        script->varTable[0] = 0;
+    } else {
+        script->varTable[0] = 1;
+    }
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243F10_9DAF30);
 
diff --git a/src/world/area_nok/nok_12/9FC6D0.c b/src/world/area_nok/nok_12/9FC6D0.c
index 7907e4cffc..e9702d1df7 100644
--- a/src/world/area_nok/nok_12/9FC6D0.c
+++ b/src/world/area_nok/nok_12/9FC6D0.c
@@ -1,5 +1,57 @@
 #include "nok_12.h"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_12/9FC6D0", func_80241EE0_9FC6D0);
+extern s32 D_802459CC_A001BC;
+extern s32 D_80245A14_A00204;
+extern Npc* wPartnerNpc;
 
-INCLUDE_ASM(s32, "world/area_nok/nok_12/9FC6D0", func_80241FD0_9FC7C0);
+// SetupDemoScene
+ApiStatus func_80241EE0_9FC6D0(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    switch (D_802459CC_A001BC) {
+        case 0:
+            D_802459CC_A001BC = 1;
+            break;
+        case 1:
+        case 2:
+            D_802459CC_A001BC++;
+            break;
+        case 3:
+            partner_clear_player_tracking(wPartnerNpc);
+            partner_set_goal_pos(playerStatus->position.x, playerStatus->position.z);
+            func_800EF3D4(0);
+            set_npc_yaw(wPartnerNpc, 90.0f);
+            playerStatus->targetYaw = 90.0f;
+            playerStatus->currentYaw = 90.0f;
+            playerStatus->spriteFacingAngle = 0.0f;
+            return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+
+// SetupDemoScene
+ApiStatus func_80241FD0_9FC7C0(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    switch (D_80245A14_A00204) {
+        case 0:
+            D_80245A14_A00204 = 1;
+            break;
+        case 1:
+        case 2:
+            D_80245A14_A00204++;
+            break;
+        case 3:
+            partner_clear_player_tracking(wPartnerNpc);
+            partner_set_goal_pos(playerStatus->position.x, playerStatus->position.z);
+            func_800EF3D4(0);
+            set_npc_yaw(wPartnerNpc, 90.0f);
+            playerStatus->targetYaw = 90.0f;
+            playerStatus->currentYaw = 90.0f;
+            playerStatus->spriteFacingAngle = 0.0f;
+            return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/area_obk/obk_01/BBD1A0.c b/src/world/area_obk/obk_01/BBD1A0.c
index 9c02f3b660..6073b42801 100644
--- a/src/world/area_obk/obk_01/BBD1A0.c
+++ b/src/world/area_obk/obk_01/BBD1A0.c
@@ -11,7 +11,12 @@ static char* N(exit_str_5) = "obk_09";
 
 #include "world/common/todo/SetCamera0MoveFlag1.inc.c"
 
-INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_80240038_BBD1D8);
+ApiStatus func_80240038_BBD1D8(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    gCameras[CAM_DEFAULT].vfov = (s32) evt_get_float_variable(script, *args++);
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_8024007C_BBD21C);
 
diff --git a/src/world/area_obk/obk_01/BBD980.c b/src/world/area_obk/obk_01/BBD980.c
index 770fe4e408..4086023674 100644
--- a/src/world/area_obk/obk_01/BBD980.c
+++ b/src/world/area_obk/obk_01/BBD980.c
@@ -17,6 +17,65 @@ INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240BB0_BBDD50);
 extern s32 N(LetterDelivery_SavedNpcAnim);
 #include "world/common/todo/LetterDelivery.inc.c"
 
-INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240F38_BBE0D8);
+ApiStatus func_80240F38_BBE0D8(Evt* script, s32 isInitialCall) {
+    Npc* npc = get_npc_safe(script->owner2.npcID);
 
-INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80241094_BBE234);
+    if (isInitialCall) {
+        script->functionTemp[1] = 0;
+    }
+
+    switch (script->functionTemp[1]) {
+        case 0:
+            npc->pos.z = rand_int(100) + 180;
+            npc->pos.y = rand_int(100) - 200;
+            npc->moveSpeed = (2.0f * rand_float()) + 2.0f;
+            if (rand_int(100) < 50) {
+                npc->pos.x = 920.0f;
+                npc->yaw = 270.0f;
+            } else {
+                npc->pos.x = -20.0f;
+                npc->yaw = 90.0f;
+            }
+            script->functionTemp[1] = 1;
+            break;
+        case 1:
+            npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+            if (npc->pos.x < -30.0f || npc->pos.x > 930.0f) {
+                script->functionTemp[1] = 0;
+            }
+            break;
+    }
+    return ApiStatus_BLOCK;
+}
+
+extern s16 D_80244A54_BC1BF4[];
+
+ApiStatus func_80241094_BBE234(Evt* script, s32 isInitialCall) {
+    s32 var0 = script->varTable[0];
+    s32 var1 = script->varTable[1];
+    s32 temp;
+
+    if (var1 == 0) {
+        script->functionTemp[2] = D_80244A54_BC1BF4[rand_int(3)];
+        var1 = rand_int(50) + 30;
+    }
+    var1--;
+
+    temp = script->functionTemp[2];
+    if (var0 < temp) {
+        var0 += 10;
+        if (temp < var0) {
+            var0 = temp;
+        }
+    }
+    if (temp < var0) {
+        var0 -= 10;
+        if (var0 < temp) {
+            var0 = temp;
+        }
+    }
+
+    script->varTable[0] = var0;
+    script->varTable[1] = var1;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_obk/obk_02/BC2A90.c b/src/world/area_obk/obk_02/BC2A90.c
index 09a4990050..7d7ca3cc7a 100644
--- a/src/world/area_obk/obk_02/BC2A90.c
+++ b/src/world/area_obk/obk_02/BC2A90.c
@@ -5,8 +5,41 @@ static char* N(exit_str_1) = "obk_03";
 static char* N(exit_str_2) = "obk_06";
 static char* N(exit_str_3) = "";
 
-INCLUDE_ASM(s32, "world/area_obk/obk_02/BC2A90", func_80240000_BC2A90);
+ApiStatus func_80240000_BC2A90(Evt* script, s32 isInitialCall) {
+    script->functionTemp[1] = 0;
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/todo/UnkAngleFunc004.inc.c"
 
-INCLUDE_ASM(s32, "world/area_obk/obk_02/BC2A90", func_80240194_BC2C24);
+extern s16 D_80240CBC_BC374C[];
+
+ApiStatus func_80240194_BC2C24(Evt* script, s32 isInitialCall) {
+    s32 var0 = script->varTable[0];
+    s32 var1 = script->varTable[1];
+    s32 temp;
+
+    if (var1 == 0) {
+        script->functionTemp[2] = D_80240CBC_BC374C[rand_int(3)];
+        var1 = rand_int(50) + 30;
+    }
+    var1--;
+
+    temp = script->functionTemp[2];
+    if (var0 < temp) {
+        var0 += 10;
+        if (temp < var0) {
+            var0 = temp;
+        }
+    }
+    if (temp < var0) {
+        var0 -= 10;
+        if (var0 < temp) {
+            var0 = temp;
+        }
+    }
+
+    script->varTable[0] = var0;
+    script->varTable[1] = var1;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_obk/obk_02/BC2CD0.c b/src/world/area_obk/obk_02/BC2CD0.c
index 1479a6aa40..57cfa9db26 100644
--- a/src/world/area_obk/obk_02/BC2CD0.c
+++ b/src/world/area_obk/obk_02/BC2CD0.c
@@ -1,3 +1,7 @@
 #include "obk_02.h"
 
-INCLUDE_ASM(s32, "world/area_obk/obk_02/BC2CD0", func_80240240_BC2CD0);
+ApiStatus func_80240240_BC2CD0(Evt* script, s32 isInitialCall) {
+    script->varTable[0] = sin_deg(script->varTable[1]) * 10.0f;
+    script->varTable[1] = clamp_angle(script->varTable[1] + 6);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_obk/obk_04/BC7E60.c b/src/world/area_obk/obk_04/BC7E60.c
index 689ac57898..d1dbffc931 100644
--- a/src/world/area_obk/obk_04/BC7E60.c
+++ b/src/world/area_obk/obk_04/BC7E60.c
@@ -1,3 +1,9 @@
 #include "obk_04.h"
 
-INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7E60", func_80240000_BC7E60);
+ApiStatus func_80240000_BC7E60(Evt* script, s32 isInitialCall) {
+    ItemEntity* item = get_item_entity(script->varTable[0]);
+
+    set_item_entity_flags(script->varTable[0], ITEM_ENTITY_FLAGS_TRANSPARENT);
+    item->alpha = 255;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_obk/obk_04/BC7EB0.c b/src/world/area_obk/obk_04/BC7EB0.c
index 7ecf2b2f55..8cf11b7958 100644
--- a/src/world/area_obk/obk_04/BC7EB0.c
+++ b/src/world/area_obk/obk_04/BC7EB0.c
@@ -2,39 +2,267 @@
 
 static char* N(exit_str_0) = "obk_03";
 
-INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240050_BC7EB0);
+ApiStatus func_80240050_BC7EB0(Evt* script, s32 isInitialCall) {
+    Npc* npc = get_npc_unsafe(script->owner2.npcID);
+    s32* ptr = heap_malloc(4); // todo what is this
 
-INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_802400D0_BC7F30);
+    npc->blur.any = ptr;
+    *ptr = NULL;
+    npc->planarFlyDist = 125.0f;
+    npc->yaw = 0.0f;
+    npc->pos.x = 0.0f;
+    npc->pos.y = -875.0f;
+    npc->pos.z = 0.0f;
+    npc->duration = 60;
+    script->functionTemp[1] = 0;
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240198_BC7FF8);
+void func_802400D0_BC7F30(Npc* npc) {
+    if (npc->yaw > 340.0f || npc->yaw < 20.0f) {
+        npc->renderMode = RENDER_MODE_ALPHATEST;
+        npc->unk_A2 = 0;
+        func_8003D624(npc, 0, 0, 0, 0, 0, npc->unk_A2);
+    } else {
+        npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2;
+        func_8003D624(npc, 7, gPlayerStatusPtr->alpha1, 255, 0, 0, npc->unk_A2);
+        npc->unk_9A = 255;
+    }
+}
 
-INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_8024022C_BC808C);
+void func_80240198_BC7FF8(void) {
+    func_802400D0_BC7F30(get_npc_unsafe(1));
+    func_802400D0_BC7F30(get_npc_unsafe(2));
+    func_802400D0_BC7F30(get_npc_unsafe(3));
+    func_802400D0_BC7F30(get_npc_unsafe(4));
+    func_802400D0_BC7F30(get_npc_unsafe(5));
+    func_802400D0_BC7F30(get_npc_unsafe(6));
+    func_802400D0_BC7F30(get_npc_unsafe(7));
+    func_802400D0_BC7F30(get_npc_unsafe(8));
+}
 
+void func_8024022C_BC808C(void) {
+    get_npc_unsafe(1)->unk_A2 = 0;
+    get_npc_unsafe(2)->unk_A2 = 0;
+    get_npc_unsafe(3)->unk_A2 = 0;
+    get_npc_unsafe(4)->unk_A2 = 0;
+    get_npc_unsafe(5)->unk_A2 = 0;
+    get_npc_unsafe(6)->unk_A2 = 0;
+    get_npc_unsafe(7)->unk_A2 = 0;
+    get_npc_unsafe(8)->unk_A2 = 0;
+}
+
+s32 func_802402A0_BC8100(s32);
 INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_802402A0_BC8100);
 
-INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_802402F4_BC8154);
+ApiStatus func_802402F4_BC8154(Evt* script, s32 isInitialCall) {
+    Npc* npc = get_npc_unsafe(script->owner2.npcID);
+    s32* temp_s3 = npc->blur.any;
+    s32 temp_v0;
 
-INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_802405B4_BC8414);
+    switch (script->functionTemp[1]) {
+        case 0:
+            temp_v0 = evt_get_variable(script, MapVar(1));
+            if (temp_v0 == 1) {
+                *temp_s3 = temp_v0;
+                script->functionTemp[1] = 10;
+            }
+            break;
+        case 1:
+            break;
+        case 10:
+            npc->yaw = clamp_angle(npc->yaw + 2.0f);
+            npc->duration--;
+            if (npc->duration == 0) {
+                script->functionTemp[1] = 11;
+            }
+            break;
+        case 11:
+            if (npc->pos.y <= -920.0f) {
+                func_80240198_BC7FF8();
+            }
+            npc->yaw = clamp_angle(npc->yaw + 2.0f);
+            npc->pos.y -= 0.5f;
+            if (npc->pos.y <= -988.0f) {
+                evt_set_variable(script, MapVar(2), 1);
+                func_8024022C_BC808C();
+                script->functionTemp[1] = 12;
+            }
+            break;
+        case 12:
+            script->functionTemp[1] = func_802402A0_BC8100(evt_get_variable(script, MapVar(3)));
+            npc->yaw = clamp_angle(npc->yaw + 2.0f);
+            break;
+        case 13:
+            script->functionTemp[1] = func_802402A0_BC8100(evt_get_variable(script, MapVar(3)));
+            npc->yaw = clamp_angle(npc->yaw - 2.0f);
+            break;
+        case 14:
+            evt_set_variable(script, MapVar(3), 0);
+            npc->duration++;
+            if (npc->duration == 50) {
+                script->functionTemp[1] = 15;
+            }
+            npc->planarFlyDist -= 2.0f;
+            npc->yaw = clamp_angle(npc->yaw + 2.0f);
+            break;
+        case 15:
+            npc->duration--;
+            if (npc->duration == 0) {
+                script->functionTemp[1] = 12;
+            }
+            npc->planarFlyDist += 2.0f;
+            npc->yaw = clamp_angle(npc->yaw + 2.0f);
+            break;
+        case 100:
+            script->functionTemp[1] = func_802402A0_BC8100(evt_get_variable(script, MapVar(3)));
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_802405B4_BC8414(Evt* script, s32 isInitialCall) {
+    Npc* npc = get_npc_unsafe(script->owner2.npcID);
+
+    npc->blur.any = get_npc_unsafe(0); // TODO what is this?
+    script->functionTemp[2] = script->owner2.npcID * 45;
+    npc->flags |= NPC_FLAG_40000;
+    script->functionTemp[1] = 0;
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240624_BC8484);
 
-INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240910_BC8770);
+ApiStatus func_80240910_BC8770(Evt* script, s32 isInitialCall) {
+    if (gPlayerStatus.position.y < -50.0f) {
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}
 
 #include "world/common/todo/StashVars.inc.c"
 
 #include "world/common/todo/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240A58_BC88B8);
+ApiStatus func_80240A58_BC88B8(Evt* script, s32 isInitialCall) {
+    Npc* npc1 = get_npc_unsafe(1);
+    Npc* npc2 = get_npc_unsafe(2);
+    Npc* npc3 = get_npc_unsafe(3);
+    Npc* npc4 = get_npc_unsafe(4);
+    Npc* npc5 = get_npc_unsafe(5);
+    Npc* npc6 = get_npc_unsafe(6);
+    Npc* npc7 = get_npc_unsafe(7);
+    Npc* npc8 = get_npc_unsafe(8);
 
-INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240C10_BC8A70);
+    switch (script->varTable[0]) {
+        case 0:
+            script->varTable[0] = npc1->yaw;
+            evt_set_variable(NULL, MapVar(5), 1);
+            break;
+        case 1:
+            script->varTable[0] = npc2->yaw;
+            evt_set_variable(NULL, MapVar(5), 2);
+            break;
+        case 2:
+            script->varTable[0] = npc3->yaw;
+            evt_set_variable(NULL, MapVar(5), 3);
+            break;
+        case 3:
+            script->varTable[0] = npc4->yaw;
+            evt_set_variable(NULL, MapVar(5), 4);
+            break;
+        case 4:
+            script->varTable[0] = npc5->yaw;
+            evt_set_variable(NULL, MapVar(5), 5);
+            break;
+        case 5:
+            script->varTable[0] = npc6->yaw;
+            evt_set_variable(NULL, MapVar(5), 6);
+            break;
+        case 6:
+            script->varTable[0] = npc7->yaw;
+            evt_set_variable(NULL, MapVar(5), 7);
+            break;
+        case 7:
+            script->varTable[0] = npc8->yaw;
+            evt_set_variable(NULL, MapVar(5), 8);
+            break;
+    }
+    script->varTable[0] += script->varTable[1];
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240CA0_BC8B00);
+ApiStatus func_80240C10_BC8A70(Evt* script) {
+    Npc npc;
+
+    npc.pos.x = 0;
+    npc.pos.y = 0.0f;
+    npc.pos.z = 0.0f;
+    npc.planarFlyDist = 125.0f;
+    npc_move_heading(&npc, 125.0f, script->varTable[0]);
+    script->varTable[0] = npc.pos.x;
+    script->varTable[1] = npc.pos.y + 10.0f;
+    script->varTable[2] = npc.pos.z + 20.0f;
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80240CA0_BC8B00(Evt* script, s32 isInitialCall) {
+    Npc* npc = get_npc_unsafe(evt_get_variable(NULL, MapVar(5)));
+
+    script->varTable[0] = npc->pos.x;
+    script->varTable[1] = npc->pos.y;
+    script->varTable[2] = npc->pos.z;
+    return ApiStatus_DONE2;
+}
 
 ApiStatus func_80240D00_BC8B60(Evt* script, s32 isInitialCall) {
     gPlayerData.bootsLevel = 1;
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240D14_BC8B74);
+ApiStatus func_80240D14_BC8B74(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    Npc npc;
+    f32 dist = dist2D(playerStatus->position.x, playerStatus->position.z, 0.0f, 0.0f);
+    f32 yaw;
+    s32 gt, lt;
 
-INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240E58_BC8CB8);
+    if (!(dist > 90.0f)) {
+        gt = FALSE;
+    } else {
+        gt = TRUE;
+    }
+
+    if (!(dist < 150.0f)) {
+        lt = FALSE;
+    } else {
+        lt = TRUE;
+    }
+
+    if ((gt | lt) != 0) {
+        yaw = atan2(playerStatus->position.x, playerStatus->position.z, 0.0f, 0.0f) + 180.0f;
+        npc.pos.x = 0.0f;
+        npc.pos.y = 0.0f;
+        npc.pos.z = 0.0f;
+        npc_move_heading(&npc, 80.0f, yaw);
+        script->varTable[0] = npc.pos.x;
+        script->varTable[1] = npc.pos.y;
+        script->varTable[2] = npc.pos.z;
+        script->varTable[3] = 1;
+    } else {
+        script->varTable[0] = playerStatus->position.x;
+        script->varTable[1] = playerStatus->position.y;
+        script->varTable[2] = playerStatus->position.z;
+        script->varTable[3] = 0;
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80240E58_BC8CB8(Evt* script, s32 isInitialCall) {
+    if (get_npc_unsafe(1)->duration == 0) {
+        return ApiStatus_DONE2;
+    } else {
+        return ApiStatus_BLOCK;
+    }
+}
diff --git a/src/world/area_obk/obk_07/BCEEB0.c b/src/world/area_obk/obk_07/BCEEB0.c
index 27f3272b2e..db31663930 100644
--- a/src/world/area_obk/obk_07/BCEEB0.c
+++ b/src/world/area_obk/obk_07/BCEEB0.c
@@ -1,7 +1,40 @@
 #include "obk_07.h"
 
-INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEEB0", func_802402C0_BCEEB0);
+ApiStatus func_802402C0_BCEEB0(Evt* script, s32 isInitialCall) {
+    script->functionTemp[1] = 0;
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/todo/UnkAngleFunc004.inc.c"
 
-INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEEB0", func_80240454_BCF044);
+extern s16 D_8024292C_BD151C[];
+
+ApiStatus func_80240454_BCF044(Evt* script, s32 isInitialCall) {
+    s32 var0 = script->varTable[0];
+    s32 var1 = script->varTable[1];
+    s32 temp;
+
+    if (var1 == 0) {
+        script->functionTemp[2] = D_8024292C_BD151C[rand_int(3)];
+        var1 = rand_int(50) + 30;
+    }
+    var1--;
+
+    temp = script->functionTemp[2];
+    if (var0 < temp) {
+        var0 += 10;
+        if (temp < var0) {
+            var0 = temp;
+        }
+    }
+    if (temp < var0) {
+        var0 -= 10;
+        if (var0 < temp) {
+            var0 = temp;
+        }
+    }
+
+    script->varTable[0] = var0;
+    script->varTable[1] = var1;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_obk/obk_08/BD3870.c b/src/world/area_obk/obk_08/BD3870.c
index 98ec01c165..88ce8b144d 100644
--- a/src/world/area_obk/obk_08/BD3870.c
+++ b/src/world/area_obk/obk_08/BD3870.c
@@ -14,4 +14,10 @@ INCLUDE_ASM(s32, "world/area_obk/obk_08/BD3870", func_802406DC_BD3F4C);
 
 INCLUDE_ASM(s32, "world/area_obk/obk_08/BD3870", func_8024079C_BD400C);
 
-INCLUDE_ASM(s32, "world/area_obk/obk_08/BD3870", func_80240808_BD4078);
+ApiStatus func_80240808_BD4078(Evt* script, s32 isInitialCall) {
+    if (gPlayerData.curHP < 2) {
+        return ApiStatus_DONE2;
+    }
+    gPlayerData.curHP--;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_obk/obk_08/BD4110.c b/src/world/area_obk/obk_08/BD4110.c
index 29f46d3658..44f0a215c0 100644
--- a/src/world/area_obk/obk_08/BD4110.c
+++ b/src/world/area_obk/obk_08/BD4110.c
@@ -2,21 +2,119 @@
 
 static char* N(exit_str_0) = "obk_01";
 
-INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_802408A0_BD4110);
+ApiStatus func_802408A0_BD4110(Evt* script, s32 isInitialCall) {
+    Npc* npc = get_npc_unsafe(script->owner2.npcID);
+    s32* ptr = heap_malloc(4); // todo what is this
 
-INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_80240920_BD4190);
+    npc->blur.any = ptr;
+    *ptr = NULL;
+    npc->planarFlyDist = 125.0f;
+    npc->yaw = 0.0f;
+    npc->pos.x = 0.0f;
+    npc->pos.y = -875.0f;
+    npc->pos.z = 0.0f;
+    npc->duration = 60;
+    script->functionTemp[1] = 0;
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_802409E8_BD4258);
+void func_80240920_BD4190(Npc* npc) {
+    if (npc->yaw > 340.0f || npc->yaw < 20.0f) {
+        npc->renderMode = RENDER_MODE_ALPHATEST;
+        npc->unk_A2 = 0;
+        func_8003D624(npc, 0, 0, 0, 0, 0, npc->unk_A2);
+    } else {
+        npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2;
+        func_8003D624(npc, 7, gPlayerStatusPtr->alpha1, 0, 0, 0, npc->unk_A2);
+        npc->unk_9A = 255;
+    }
+}
 
-INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_80240A7C_BD42EC);
+void func_802409E8_BD4258(void) {
+    func_80240920_BD4190(get_npc_unsafe(1));
+    func_80240920_BD4190(get_npc_unsafe(2));
+    func_80240920_BD4190(get_npc_unsafe(3));
+    func_80240920_BD4190(get_npc_unsafe(4));
+    func_80240920_BD4190(get_npc_unsafe(5));
+    func_80240920_BD4190(get_npc_unsafe(6));
+    func_80240920_BD4190(get_npc_unsafe(7));
+    func_80240920_BD4190(get_npc_unsafe(8));
+}
 
-INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_80240AF0_BD4360);
+void func_80240A7C_BD42EC(void) {
+    get_npc_unsafe(1)->unk_A2 = 0;
+    get_npc_unsafe(2)->unk_A2 = 0;
+    get_npc_unsafe(3)->unk_A2 = 0;
+    get_npc_unsafe(4)->unk_A2 = 0;
+    get_npc_unsafe(5)->unk_A2 = 0;
+    get_npc_unsafe(6)->unk_A2 = 0;
+    get_npc_unsafe(7)->unk_A2 = 0;
+    get_npc_unsafe(8)->unk_A2 = 0;
+}
 
-INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_80240CA0_BD4510);
+ApiStatus func_80240AF0_BD4360(Evt* script, s32 isInitialCall) {
+    Npc* npc = get_npc_unsafe(script->owner2.npcID);
+    s32* temp_s2 = npc->blur.any;
+    s32 temp_v0;
+
+    switch (script->functionTemp[1]) {
+        case 0:
+            temp_v0 = evt_get_variable(script, AreaFlag(8));
+            if (temp_v0 == 1) {
+                *temp_s2 = temp_v0;
+                script->functionTemp[1] = 10;
+            }
+            break;
+        case 10:
+            npc->yaw = clamp_angle(npc->yaw + 2.0f);
+            npc->duration--;
+            if (npc->duration == 0) {
+                script->functionTemp[1] = 11;
+            }
+            break;
+        case 11:
+            if (npc->pos.y <= -920.0f) {
+                func_802409E8_BD4258();
+            }
+            npc->yaw = clamp_angle(npc->yaw + 2.0f);
+            npc->pos.y -= 0.5f;
+            if (npc->pos.y <= -988.0f) {
+                evt_set_variable(script, MapVar(1), 1);
+                func_80240A7C_BD42EC();
+                script->functionTemp[1] = 12;
+            }
+            break;
+        case 12:
+            if (evt_get_variable(script, MapVar(2)) == 1) {
+                script->functionTemp[1] = 13;
+            }
+            npc->yaw = clamp_angle(npc->yaw + 2.0f);
+            break;
+        case 13:
+            if (evt_get_variable(script, MapVar(2)) == 0) {
+                script->functionTemp[1] = 12;
+            }
+            break;
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80240CA0_BD4510(Evt* script, s32 isInitialCall) {
+    Npc* npc = get_npc_unsafe(script->owner2.npcID);
+
+    npc->blur.any = get_npc_unsafe(0);
+    script->functionTemp[2] = script->owner2.npcID * 45;
+    npc->flags |= NPC_FLAG_40000;
+    script->functionTemp[1] = 0;
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_80240D10_BD4580);
 
-INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_80240FD8_BD4848);
+ApiStatus func_80240FD8_BD4848(Evt* script, s32 isInitialCall) {
+    script->functionTemp[1] = 0;
+    return ApiStatus_DONE2;
+}
 
 ApiStatus func_80240FE4_BD4854(Evt* script, s32 isInitialCall) {
     Npc* npc = get_npc_safe(script->owner2.npcID);
@@ -52,4 +150,34 @@ ApiStatus func_80240FE4_BD4854(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_8024116C_BD49DC);
+extern s16 D_80244FEC_BD885C[];
+
+ApiStatus func_8024116C_BD49DC(Evt* script, s32 isInitialCall) {
+    s32 var0 = script->varTable[0];
+    s32 var1 = script->varTable[1];
+    s32 temp;
+
+    if (var1 == 0) {
+        script->functionTemp[2] = D_80244FEC_BD885C[rand_int(3)];
+        var1 = rand_int(50) + 30;
+    }
+    var1--;
+
+    temp = script->functionTemp[2];
+    if (var0 < temp) {
+        var0 += 10;
+        if (temp < var0) {
+            var0 = temp;
+        }
+    }
+    if (temp < var0) {
+        var0 -= 10;
+        if (var0 < temp) {
+            var0 = temp;
+        }
+    }
+
+    script->varTable[0] = var0;
+    script->varTable[1] = var1;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_obk/obk_08/BD4A90.c b/src/world/area_obk/obk_08/BD4A90.c
index c6f1183455..7061c04d6b 100644
--- a/src/world/area_obk/obk_08/BD4A90.c
+++ b/src/world/area_obk/obk_08/BD4A90.c
@@ -1,9 +1,106 @@
 #include "obk_08.h"
 
-INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4A90", func_80241220_BD4A90);
+ApiStatus func_80241220_BD4A90(Evt* script, s32 isInitialCall) {
+    Npc* npc1 = get_npc_unsafe(0xB);
+    Npc* npc2 = get_npc_unsafe(0);
 
-INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4A90", func_802412BC_BD4B2C);
+    npc1->pos.x = npc2->pos.x;
+    npc1->pos.z = npc2->pos.z;
+    npc_move_heading(npc1, npc2->planarFlyDist, script->varTable[0]);
+    npc1->pos.y = npc2->pos.y + 1000.0f + 25.0f;
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4A90", func_80241300_BD4B70);
+ApiStatus func_802412BC_BD4B2C(Evt* script, s32 isInitialCall) {
+    script->varTable[0] = clamp_angle(script->varTable[0] - 2);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4A90", func_80241658_BD4EC8);
+ApiStatus func_80241300_BD4B70(Evt* script, s32 isInitialCall) {
+    Npc* npc1 = get_npc_unsafe(1);
+    Npc* npc2 = get_npc_unsafe(2);
+    Npc* npc3 = get_npc_unsafe(3);
+    Npc* npc4 = get_npc_unsafe(4);
+    Npc* npc5 = get_npc_unsafe(5);
+    Npc* npc6 = get_npc_unsafe(6);
+    Npc* npc7 = get_npc_unsafe(7);
+    Npc* npc8 = get_npc_unsafe(8);
+    s32 outVal = 0;
+
+    script->varTable[1] = FALSE;
+
+    evt_set_variable(script, MapVar(3), 0);
+    if (npc1->yaw <= script->varTable[0] - 23 && script->varTable[0] - 27 <= npc1->yaw) {
+        script->varTable[1] = TRUE;
+        outVal = 1;
+    }
+    if (npc2->yaw <= script->varTable[0] - 23 && script->varTable[0] - 27 <= npc2->yaw) {
+        script->varTable[1] = TRUE;
+        outVal = 2;
+    }
+    if (npc3->yaw <= script->varTable[0] - 23 && script->varTable[0] - 27 <= npc3->yaw) {
+        script->varTable[1] = TRUE;
+        outVal = 3;
+    }
+    if (npc4->yaw <= script->varTable[0] - 23 && script->varTable[0] - 27 <= npc4->yaw) {
+        script->varTable[1] = TRUE;
+        outVal = 4;
+    }
+    if (npc5->yaw <= script->varTable[0] - 23 && script->varTable[0] - 27 <= npc5->yaw) {
+        script->varTable[1] = TRUE;
+        outVal = 5;
+    }
+    if (npc6->yaw <= script->varTable[0] - 23 && script->varTable[0] - 27 <= npc6->yaw) {
+        script->varTable[1] = TRUE;
+        outVal = 6;
+    }
+    if (npc7->yaw <= script->varTable[0] - 23 && script->varTable[0] - 27 <= npc7->yaw) {
+        script->varTable[1] = TRUE;
+        outVal = 7;
+    }
+    if (npc8->yaw <= script->varTable[0] - 23 && script->varTable[0] - 27 <= npc8->yaw) {
+        script->varTable[1] = TRUE;
+        outVal = 8;
+    }
+    evt_set_variable(script, MapVar(3), outVal);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80241658_BD4EC8(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    f32 dist = dist2D(playerStatus->position.x, playerStatus->position.z, 0.0f, 0.0f);
+    Npc npc;
+    f32 temp_a2;
+    s32 gt;
+    s32 lt;
+
+    if (!(dist > 90.0f)) {
+        gt = FALSE;
+    } else {
+        gt = TRUE;
+    }
+
+    if (!(dist < 150.0f)) {
+        lt = FALSE;
+    } else {
+        lt = TRUE;
+    }
+
+    if ((gt | lt) != 0) {
+        temp_a2 = atan2(playerStatus->position.x, playerStatus->position.z, 0.0f, 0.0f) + 180.0f;
+        npc.pos.x = 0.0f;
+        npc.pos.y = 0.0f;
+        npc.pos.z = 0.0f;
+        npc_move_heading(&npc, 80.0f, temp_a2);
+        script->varTable[0] = npc.pos.x;
+        script->varTable[1] = npc.pos.y;
+        script->varTable[2] = npc.pos.z;
+        script->varTable[3] = 1;
+    } else {
+        script->varTable[0] = playerStatus->position.x;
+        script->varTable[1] = playerStatus->position.y;
+        script->varTable[2] = playerStatus->position.z;
+        script->varTable[3] = 0;
+    }
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_obk/obk_09/BDABA0.c b/src/world/area_obk/obk_09/BDABA0.c
index cdd14dc483..986132563a 100644
--- a/src/world/area_obk/obk_09/BDABA0.c
+++ b/src/world/area_obk/obk_09/BDABA0.c
@@ -1,3 +1,6 @@
 #include "obk_09.h"
 
-INCLUDE_ASM(s32, "world/area_obk/obk_09/BDABA0", func_802403F0_BDABA0);
+ApiStatus func_802403F0_BDABA0(Evt* script) {
+    get_item_entity(script->varTable[0])->scale = 0.6f;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_omo/omo_01/D9AEF0.c b/src/world/area_omo/omo_01/D9AEF0.c
index c6ba7699c0..21c35f20fe 100644
--- a/src/world/area_omo/omo_01/D9AEF0.c
+++ b/src/world/area_omo/omo_01/D9AEF0.c
@@ -1,3 +1,61 @@
 #include "omo_01.h"
+#include "model.h"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_01/D9AEF0", func_80240000_D9AEF0);
+typedef struct UnkOmo {
+    /* 0x00 */ f32 unk_00;
+    /* 0x04 */ f32 unk_04;
+    /* 0x08 */ f32 unk_08;
+    /* 0x0C */ f32 unk_0C;
+    /* 0x10 */ f32 unk_10;
+    /* 0x14 */ s32 treeIndex;
+} UnkOmo; // size = 0x18
+
+extern s32 D_802412A0_D9C190[];
+
+ApiStatus func_80240000_D9AEF0(Evt* script, s32 isInitialCall) {
+    Matrix4f sp18, sp58;
+    UnkOmo* it;
+    Model* model;
+    f32 temp_f20;
+    f32 temp_f24;
+    u32 i;
+
+    if (isInitialCall) {
+        it = heap_malloc(sizeof(*it) * 2);
+        script->functionTempPtr[0] = it;
+
+        for (i = 0; i < 2; i++, it++) {
+            s32 treeIndex = D_802412A0_D9C190[i];
+
+            it->treeIndex = treeIndex;
+            model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex));
+            it->unk_00 = model->center.x;
+            it->unk_04 = model->center.z;
+            it->unk_0C = 3.5f;
+            it->unk_10 = 0;
+            it->unk_08 = 0;
+        }
+    }
+
+    it = script->functionTempPtr[0];
+    for (i = 0; i < 2; i++, it++) {
+        it->unk_10 += it->unk_0C;
+        it->unk_10 = clamp_angle(it->unk_10);
+        temp_f20 = sin_deg(it->unk_10) * 20.0f;
+        temp_f24 = SQ(temp_f20) / 90.0f;
+        if (i == 0) {
+            if ((it->unk_08 >= 0.0f && temp_f20 < 0.0f) || (it->unk_08 < 0.0f && temp_f20 >= 0.0f)) {
+                sfx_play_sound_at_position(0x1D6, 0, -185.0f, 0.0f, 160.0f);
+            }
+            it->unk_08 = temp_f20;
+        }
+        model = get_model_from_list_index(get_model_list_index_from_tree_index(it->treeIndex));
+        model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED;
+        guTranslateF(sp18, -it->unk_00, 0.0f, -it->unk_04);
+        guRotateF(sp58, temp_f20, 0.0f, 0.0f, 1.0f);
+        guMtxCatF(sp18, sp58, model->transformMatrix);
+        guTranslateF(sp18, it->unk_00, temp_f24, it->unk_04);
+        guMtxCatF(model->transformMatrix, sp18, model->transformMatrix);
+    }
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/area_omo/omo_01/D9B150.c b/src/world/area_omo/omo_01/D9B150.c
index 72691e2955..af27794ba0 100644
--- a/src/world/area_omo/omo_01/D9B150.c
+++ b/src/world/area_omo/omo_01/D9B150.c
@@ -1,11 +1,8 @@
 #include "omo_01.h"
+#include "common.h"
+#include "npc.h"
 
 static char* N(exit_str_0) = "omo_13";
 
-INCLUDE_ASM(s32, "world/area_omo/omo_01/D9B150", func_80240260_D9B150);
-
-INCLUDE_ASM(s32, "world/area_omo/omo_01/D9B150", func_80240844_D9B734);
-
-INCLUDE_ASM(s32, "world/area_omo/omo_01/D9B150", func_802409A8_D9B898);
-
-INCLUDE_ASM(s32, "world/area_omo/omo_01/D9B150", func_802409EC_D9B8DC);
+// TODO rename UnkFloAI since it's not exclusive to flo
+#include "world/common/enemy/ai/UnkFloAI.inc.c"
diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c
index 7cfdfd627b..3e97583a1f 100644
--- a/src/world/area_omo/omo_05/DB22C0.c
+++ b/src/world/area_omo/omo_05/DB22C0.c
@@ -38,8 +38,35 @@ ApiStatus func_80242204_DB44C4(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802422A0_DB4560);
+ApiStatus func_802422A0_DB4560(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 itemID = evt_get_variable(script, *args++);
+    ItemData* item = &gItemTable[itemID];
 
-INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80242328_DB45E8);
+    if (itemID == ITEM_CAKE || itemID == ITEM_STRANGE_CAKE || itemID == ITEM_SHROOM_CAKE) {
+        script->varTable[9] = 2;
+    } else if (item->typeFlags & ITEM_TYPE_FLAG_FOOD_OR_DRINK) {
+        script->varTable[9] = 1;
+    } else {
+        script->varTable[9] = 0;
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80242328_DB45E8(Evt* script, s32 isInitialCall) {
+    Camera* camera = &gCameras[CAM_DEFAULT];
+
+    if (isInitialCall) {
+        camera->flags |= CAMERA_FLAGS_SHAKING;
+        script->functionTempF[0] = 0.0f;
+    }
+    script->functionTempF[0] += 10.0f;
+    guRotateF(camera->viewMtxShaking, script->functionTempF[0], 0.0f, 0.0f, -1.0f);
+
+    if (script->functionTempF[0] >= 360.0) {
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}
 
 INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802423C8_DB4688);
diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c
index 55e8d1d766..bc5a0a373a 100644
--- a/src/world/area_omo/omo_07/DBD2B0.c
+++ b/src/world/area_omo/omo_07/DBD2B0.c
@@ -13,4 +13,19 @@ static char* N(exit_str_1) = "";
 
 #include "world/common/todo/UnsetCamera0Flag1000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242EA8_DC0158);
+ApiStatus func_80242EA8_DC0158(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 temp_s1;
+    s32 t0;
+    s32 t1;
+
+    temp_s1 = AreaFlag(7);
+    do {
+        t0 = evt_get_variable(script, *(args++));
+    } while (0); // TODO required to match
+    t0 += temp_s1;
+    t1 = evt_get_variable(script, *args++);
+
+    evt_set_variable(script, t0, t1);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_omo/omo_09/DCCCD0.c b/src/world/area_omo/omo_09/DCCCD0.c
index 9df553acae..26f4acaa7b 100644
--- a/src/world/area_omo/omo_09/DCCCD0.c
+++ b/src/world/area_omo/omo_09/DCCCD0.c
@@ -3,8 +3,14 @@
 static char* N(exit_str_0) = "omo_08";
 static char* N(exit_str_1) = "";
 
+ApiStatus func_80240000_DCCCD0(Evt* script, s32 isInitialCall);
 INCLUDE_ASM(s32, "world/area_omo/omo_09/DCCCD0", func_80240000_DCCCD0);
 
-INCLUDE_ASM(s32, "world/area_omo/omo_09/DCCCD0", func_80240054_DCCD24);
+ApiStatus func_80240054_DCCD24(Evt* script, s32 isInitialCall) {
+    if (func_80240000_DCCCD0(script, isInitialCall) == ApiStatus_BLOCK) {
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}
 
 INCLUDE_ASM(s32, "world/area_omo/omo_09/DCCCD0", func_80240078_DCCD48);
diff --git a/src/world/area_omo/omo_09/DCD3B0.c b/src/world/area_omo/omo_09/DCD3B0.c
index 1b12ae0f94..2b44fd2d2c 100644
--- a/src/world/area_omo/omo_09/DCD3B0.c
+++ b/src/world/area_omo/omo_09/DCD3B0.c
@@ -1,3 +1,8 @@
 #include "omo_09.h"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3B0", func_802406E0_DCD3B0);
+ApiStatus func_802406E0_DCD3B0(Evt* script, s32 isInitialCall) {
+    if (gPlayerStatus.position.x < 850.0f) {
+        return ApiStatus_BLOCK;
+    }
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_omo/omo_12/DDF310.c b/src/world/area_omo/omo_12/DDF310.c
index ae09a1b292..59bf62b3b6 100644
--- a/src/world/area_omo/omo_12/DDF310.c
+++ b/src/world/area_omo/omo_12/DDF310.c
@@ -8,6 +8,21 @@
 
 #include "world/common/todo/UnsetCamera0Flag1000.inc.c"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_12/DDF310", func_80240314_DDF624);
+ApiStatus func_80240314_DDF624(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 x = evt_get_variable(script, *args++);
+    s32 y = evt_get_variable(script, *args++);
+    s32 z = evt_get_variable(script, *args++);
+    s32 temp_s0_5 = evt_get_variable(script, *args++);
 
-INCLUDE_ASM(s32, "world/area_omo/omo_12/DDF310", func_802403D8_DDF6E8);
+    set_screen_overlay_center_worldpos(1, 1, x, y, z);
+    set_screen_overlay_alpha(1, temp_s0_5);
+    set_screen_overlay_params_back(0xB, 255.0f);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_802403D8_DDF6E8(Evt* script, s32 isInitialCall) {
+    set_screen_overlay_alpha(1, 0.0f);
+    set_screen_overlay_params_back(0xB, 0.0f);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_omo/omo_13/DE2710.c b/src/world/area_omo/omo_13/DE2710.c
index e6bac56750..870ad31565 100644
--- a/src/world/area_omo/omo_13/DE2710.c
+++ b/src/world/area_omo/omo_13/DE2710.c
@@ -12,17 +12,17 @@
 #ifdef NON_MATCHING
 ApiStatus func_80240F00_DE3390(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    
+
     if (isInitialCall) {
         D_80241C04_DE4094 = FALSE;
     }
-    
+
     if (D_80241C04_DE4094) {
         D_80241C04_DE4094 = FALSE;
         evt_set_variable(script, *args++, D_80241C08_DE4098);
         return ApiStatus_DONE2;
     }
-    
+
     return ApiStatus_BLOCK;
 }
 #else
@@ -52,4 +52,54 @@ ApiStatus func_80240F8C_DE341C(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
+// control flow
+#ifdef NON_MATCHING
+ApiStatus func_80241028_DE34B8(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    Npc* npc = get_npc_safe(0);
+    f32 theta;
+    f32 x, y, z;
+
+    dist2D(110.0f, -45.0f, playerStatus->position.x, playerStatus->position.z);
+    theta = clamp_angle(atan2(110.0f, -45.0f, playerStatus->position.x, playerStatus->position.z));
+
+    x = (sin_deg(theta) * 30.0f) + 110.0f;
+    if (script->varTable[11] != 0) {
+        y = playerStatus->position.y * 0.7f;
+    } else {
+        y = npc->pos.y;
+    }
+    z = -45.0f - (cos_deg(theta) * 30.0f);
+
+    if (script->varTable[11] != 0 && npc->pos.y == 0.0f) {
+        script->varTable[11] = 0;
+    }
+    if (npc->pos.x == x && npc->pos.y == y) {
+        if (npc->pos.z == z) {
+            if (npc->currentAnim != 0x3B0501) {
+                npc->currentAnim = 0x3B0501;
+            }
+        } else {
+            goto block_10;
+        }
+    } else {
+block_10:
+        if (npc->currentAnim != 0x3B0502) {
+            if (script->varTable[10]++ >= 6) {
+                npc->currentAnim = 0x3B0502;
+                script->varTable[10] = 0;
+            }
+        }
+        npc->pos.x = x;
+        npc->pos.z = z;
+        npc->colliderPos.x = npc->pos.x;
+        npc->colliderPos.y = npc->pos.y;
+        npc->colliderPos.z = npc->pos.z;
+        npc->flags |= 0x10000;
+    }
+    npc->yaw = atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z);
+    return ApiStatus_DONE2;
+}
+#else
 INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80241028_DE34B8);
+#endif
diff --git a/src/world/area_omo/omo_14/DE5810.c b/src/world/area_omo/omo_14/DE5810.c
index 1c47970f4e..ab2a00d03d 100644
--- a/src/world/area_omo/omo_14/DE5810.c
+++ b/src/world/area_omo/omo_14/DE5810.c
@@ -1,10 +1,71 @@
 #include "omo_14.h"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_14/DE5810", func_80240160_DE5810);
+ApiStatus func_80240160_DE5810(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID);
+    f32 x = playerStatus->position.x +
+        ((playerStatus->colliderDiameter + npc->collisionRadius) * 0.5f * sin_deg((npc->npcID * 360.0f) / 10.0f));
+    f32 z = playerStatus->position.z -
+        ((playerStatus->colliderDiameter + npc->collisionRadius) * 0.5f * cos_deg((npc->npcID * 360.0f) / 10.0f));
+    f32 dist = dist2D(npc->pos.x, npc->pos.z, x, z);
 
-INCLUDE_ASM(s32, "world/area_omo/omo_14/DE5810", func_802403FC_DE5AAC);
+    if (npc->moveSpeed < dist) {
+        if (npc->flags & 0x2000) {
+            if (npc->yaw < 180.0f) {
+                npc->yaw = npc->pos.z > 0.0f ? 45.0f : 135.0f;
+            } else {
+                npc->yaw = npc->pos.z > 0.0f ? 315.0f : 225.0f;
+            }
+        } else {
+            npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z);
+        }
+        npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+    } else {
+        npc->yaw = atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z);
+    }
 
-INCLUDE_ASM(s32, "world/area_omo/omo_14/DE5810", func_80240564_DE5C14);
+    if (script->varTableF[11] == playerStatus->position.x && script->varTableF[13] == playerStatus->position.z) {
+        if (dist < 20.0f) {
+            script->varTable[14]++;
+        } else {
+            script->varTable[14] = 0;
+        }
+    }
+    script->varTableF[11] = playerStatus->position.x;
+    script->varTableF[12] = playerStatus->position.y;
+    script->varTableF[13] = playerStatus->position.z;
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_802403FC_DE5AAC(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID);
+    f32 x = evt_get_float_variable(script, *args++);
+    f32 z = evt_get_float_variable(script, *args++);
+
+    if (npc->moveSpeed < dist2D(npc->pos.x, npc->pos.z, x, z)) {
+        if (npc->flags & NPC_FLAG_NO_PROJECT_SHADOW) {
+            if (npc->yaw < 180.0f) {
+                npc->yaw = npc->pos.z > 0.0f ? 45.0f : 135.0f;
+            } else {
+                npc->yaw = npc->pos.z > 0.0f ? 315.0f : 225.0f;
+            }
+        } else {
+            npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z);
+        }
+        npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80240564_DE5C14(Evt* script, s32 isInitialCall) {
+    if (gPartnerActionStatus.partnerActionState != 0) {
+        script->varTable[9] = gPartnerActionStatus.actingPartner;
+    } else {
+        script->varTable[9] = -1;
+    }
+    return ApiStatus_DONE2;
+}
 
 ApiStatus N(IsPartnerWatt)(Evt* script, s32 isInitialCall) {
     if (gPartnerActionStatus.actingPartner == PARTNER_WATT) {
diff --git a/src/world/area_omo/omo_16/DEBED0.c b/src/world/area_omo/omo_16/DEBED0.c
index c3e0f67ae1..b509bf980d 100644
--- a/src/world/area_omo/omo_16/DEBED0.c
+++ b/src/world/area_omo/omo_16/DEBED0.c
@@ -21,4 +21,16 @@ static char* N(exit_str_3) = "omo_03";
 
 #include "common/IsAOrBPressed.inc.c"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_8024055C_DEC42C);
+ApiStatus func_8024055C_DEC42C(Evt* script, s32 isInitialCall) {
+    f32 temp_f0 = evt_get_float_variable(script, MapVar(11));
+
+    script->varTable[0] = 0;
+    if (fabsf(temp_f0) < 2000.0f && (gGameStatusPtr->pressedButtons[0] & BUTTON_A)) {
+        script->varTable[0] = 1;
+    }
+
+    if (fabsf(temp_f0) < 2000.0f && (gGameStatusPtr->pressedButtons[0] & BUTTON_B)) {
+        script->varTable[0] = 1;
+    }
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_osr/osr_00/AACBB0.c b/src/world/area_osr/osr_00/AACBB0.c
index 8f9c7eea34..47aab49365 100644
--- a/src/world/area_osr/osr_00/AACBB0.c
+++ b/src/world/area_osr/osr_00/AACBB0.c
@@ -1,4 +1,5 @@
 #include "osr_00.h"
+#include "ld_addrs.h"
 
 #include "world/common/atomic/UnkFunc27.inc.c"
 
diff --git a/src/world/area_osr/osr_02/AB21D0.c b/src/world/area_osr/osr_02/AB21D0.c
index 59d53d104f..63f16092c0 100644
--- a/src/world/area_osr/osr_02/AB21D0.c
+++ b/src/world/area_osr/osr_02/AB21D0.c
@@ -1,3 +1,23 @@
 #include "osr_02.h"
 
-INCLUDE_ASM(s32, "world/area_osr/osr_02/AB21D0", func_80240060_AB21D0);
+extern s16 D_8024253C_AB46AC[];
+
+ApiStatus func_80240060_AB21D0(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_8024253C_AB46AC[script->owner2.npcID - 2];
+    }
+
+    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;
+}
diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c
index fec9af77c8..62b6b221d0 100644
--- a/src/world/area_pra/pra_02/D50010.c
+++ b/src/world/area_pra/pra_02/D50010.c
@@ -39,7 +39,25 @@ ApiStatus func_80241274_D51264(Evt* script, s32 isInitialCall) {
 
 #include "world/common/todo/UnkFunc44.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802414A8_D51498);
+ApiStatus func_802414A8_D51498(Evt* script) {
+    Bytecode* args = script->ptrReadPos;
+    s32 entityIdx = evt_get_variable(script, *args++);
+    f32 x = evt_get_float_variable(script, *args++);
+    f32 y = evt_get_float_variable(script, *args++);
+    f32 z = evt_get_float_variable(script, *args++);
+    f32 temp = evt_get_float_variable(script, MapVar(0));
+    Entity* entity;
+
+    if (entityIdx == -1) {
+        return ApiStatus_DONE2;
+    }
+
+    entity = get_entity_by_index(entityIdx);
+    entity->position.x = x;
+    entity->position.y = y + temp;
+    entity->position.z = z;
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/todo/RemovePadlock.inc.c"
 
diff --git a/src/world/area_pra/pra_03/D53CD0.c b/src/world/area_pra/pra_03/D53CD0.c
index f2f4affa6e..f4350868d8 100644
--- a/src/world/area_pra/pra_03/D53CD0.c
+++ b/src/world/area_pra/pra_03/D53CD0.c
@@ -1,7 +1,37 @@
 #include "pra_03.h"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_03/D53CD0", func_80240020_D53CD0);
+ApiStatus func_80240020_D53CD0(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
 
-INCLUDE_ASM(s32, "world/area_pra/pra_03/D53CD0", func_802400AC_D53D5C);
+    if (playerStatus->targetYaw >= 0.0f && playerStatus->targetYaw < 180.0f) {
+        script->varTable[0] = 150;
+    }
+    if (playerStatus->targetYaw >= 180.0f && playerStatus->targetYaw < 360.0f) {
+        script->varTable[0] = 95;
+    }
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_pra/pra_03/D53CD0", func_80240138_D53DE8);
+ApiStatus func_802400AC_D53D5C(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->targetYaw >= 0.0f && playerStatus->targetYaw < 180.0f) {
+        script->varTable[0] = 165;
+    }
+    if (playerStatus->targetYaw >= 180.0f && playerStatus->targetYaw < 360.0f) {
+        script->varTable[0] = 70;
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80240138_D53DE8(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->lastGoodPosition.y == 0) {
+        evt_set_variable(script, MapVar(0), 0);
+    }
+    if (playerStatus->lastGoodPosition.y == -200) {
+        evt_set_variable(script, MapVar(0), 1);
+    }
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/area_pra/pra_04/D546B0.c b/src/world/area_pra/pra_04/D546B0.c
index f32d10780c..fde15fd5c7 100644
--- a/src/world/area_pra/pra_04/D546B0.c
+++ b/src/world/area_pra/pra_04/D546B0.c
@@ -1,7 +1,37 @@
 #include "pra_04.h"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_04/D546B0", func_80240020_D546B0);
+ApiStatus func_80240020_D546B0(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
 
-INCLUDE_ASM(s32, "world/area_pra/pra_04/D546B0", func_802400AC_D5473C);
+    if (playerStatus->targetYaw >= 0.0f && playerStatus->targetYaw < 180.0f) {
+        script->varTable[0] = 150;
+    }
+    if (playerStatus->targetYaw >= 180.0f && playerStatus->targetYaw < 360.0f) {
+        script->varTable[0] = 95;
+    }
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_pra/pra_04/D546B0", func_80240138_D547C8);
+ApiStatus func_802400AC_D5473C(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->targetYaw >= 0.0f && playerStatus->targetYaw < 180.0f) {
+        script->varTable[0] = 165;
+    }
+    if (playerStatus->targetYaw >= 180.0f && playerStatus->targetYaw < 360.0f) {
+        script->varTable[0] = 70;
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80240138_D547C8(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->lastGoodPosition.y == 0) {
+        evt_set_variable(script, MapVar(0), 0);
+    }
+    if (playerStatus->lastGoodPosition.y == -200) {
+        evt_set_variable(script, MapVar(0), 1);
+    }
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/area_pra/pra_06/D57430.c b/src/world/area_pra/pra_06/D57430.c
index cdedabf880..1c288671ee 100644
--- a/src/world/area_pra/pra_06/D57430.c
+++ b/src/world/area_pra/pra_06/D57430.c
@@ -1,5 +1,12 @@
 #include "pra_06.h"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240000_D57430);
+ApiStatus func_80240000_D57430(void) {
+    gGameStatusPtr->playerSpriteSet = 1;
+    sprintf(wMapShapeName, "pra_05_shape");
+    sprintf(wMapHitName, "pra_05_hit");
+    return ApiStatus_BLOCK;
+}
+
+const char N(exit_str_0)[] = "pra_39";
 
 #include "world/common/atomic/Reflection.inc.c"
diff --git a/src/world/area_pra/pra_09/D588B0.c b/src/world/area_pra/pra_09/D588B0.c
index 9485ff4018..150cb93345 100644
--- a/src/world/area_pra/pra_09/D588B0.c
+++ b/src/world/area_pra/pra_09/D588B0.c
@@ -1,4 +1,5 @@
 #include "pra_09.h"
+#include "effects.h"
 
 #include "world/common/atomic/Reflection.inc.c"
 
@@ -52,10 +53,78 @@ ApiStatus func_80241274_D59B04(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80241310_D59BA0);
+#include "world/common/todo/PlayBigSmokePuff.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_802413A4_D59C34);
+ApiStatus func_802413A4_D59C34(Evt* script, s32 isInitialCall) {
+    EncounterStatus* currentEncounter = &gCurrentEncounter;
+    Bytecode* args = script->ptrReadPos;
+    Enemy* enemy = script->owner1.enemy;
+    s32 var_s1 = evt_get_variable(script, *args++) == 0;
+    Encounter* encounter;
 
-INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_802414F4_D59D84);
+    if (evt_get_variable(script, *args++) == 0) {
+        var_s1 += 1;
+    }
+    if (evt_get_variable(script, *args++) == 0) {
+        var_s1 += 1;
+    }
+    if (evt_get_variable(script, *args++) == 0) {
+        var_s1 += 1;
+    }
 
-INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_802415F8_D59E88);
+    switch (var_s1) {
+        case 1:
+            encounter = currentEncounter->encounterList[enemy->encounterIndex];
+            encounter->battle = 0x2101;
+            break;
+        case 2:
+            encounter = currentEncounter->encounterList[enemy->encounterIndex];
+            encounter->battle = 0x2102;
+            break;
+        case 3:
+            encounter = currentEncounter->encounterList[enemy->encounterIndex];
+            encounter->battle = 0x2103;
+            break;
+        case 4:
+            encounter = currentEncounter->encounterList[enemy->encounterIndex];
+            encounter->battle = 0x2104;
+            break;
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_802414F4_D59D84(Evt* script, s32 isInitialCall) {
+    Npc* npc = resolve_npc(script, script->varTable[0]);
+
+    if (isInitialCall) {
+        npc->pos.x = script->varTable[1];
+        npc->pos.y = script->varTable[2];
+        npc->pos.z = script->varTable[3];
+        npc->jumpVelocity = 0.0f;
+        npc->currentAnim = 0x30011;
+        npc->jumpScale = 0.8f;
+    }
+    npc->rotation.z -= 39.0f;
+    npc->rotation.x -= 33.0f;
+    npc->pos.y -= npc->jumpVelocity;
+    npc->jumpVelocity += npc->jumpScale;
+    if (npc->pos.y <= 0.0f) {
+        npc->pos.y = 0.0f;
+        npc->rotation.z = 0.0f;
+        npc->rotation.x = 0.0f;
+        npc->jumpVelocity = 0.0f;
+        npc->jumpScale = 0.0f;
+        npc->currentAnim = 0x30003;
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus func_802415F8_D59E88(Evt* script, s32 isInitialCall) {
+    Npc* npc1 = resolve_npc(script, script->varTable[3]);
+    Npc* npc2 = resolve_npc(script, script->varTable[4]);
+
+    npc1->collisionRadius = npc2->collisionRadius;
+    npc1->collisionHeight = npc2->collisionHeight;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c
index 435043d9e8..5694549df3 100644
--- a/src/world/area_pra/pra_12/D62D10.c
+++ b/src/world/area_pra/pra_12/D62D10.c
@@ -1,6 +1,13 @@
 #include "pra_12.h"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240000_D62D10);
+ApiStatus func_80240000_D62D10(Evt* script, s32 isInitialCall) {
+    gGameStatusPtr->playerSpriteSet = 1;
+    sprintf(wMapShapeName, "pra_05_shape");
+    sprintf(wMapHitName, "pra_05_hit");
+    return ApiStatus_BLOCK;
+}
+
+const char N(exit_str_0)[] = "pra_10";
 
 #include "world/common/atomic/Reflection.inc.c"
 
diff --git a/src/world/area_pra/pra_13/D64600.c b/src/world/area_pra/pra_13/D64600.c
index 00dad68897..c86e57edf0 100644
--- a/src/world/area_pra/pra_13/D64600.c
+++ b/src/world/area_pra/pra_13/D64600.c
@@ -52,12 +52,50 @@ ApiStatus func_80241274_D65854(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80241310_D658F0);
+#include "world/common/todo/PlayBigSmokePuff.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_802413A4_D65984);
+ApiStatus func_802413A4_D65984(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
 
-INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_802413D0_D659B0);
+    get_npc_safe(evt_get_variable(script, *args++));
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_8024140C_D659EC);
+void func_8024140C_D659EC(void);
+void func_802414BC_D65A9C(void* npc);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_802414BC_D65A9C);
+ApiStatus func_802413D0_D659B0(Evt* script, s32 isInitialCall) {
+    script->array[0] = create_generic_entity_world(0, func_8024140C_D659EC);
+    return ApiStatus_DONE2;
+}
+
+void func_8024140C_D659EC(void) {
+    RenderTask rt;
+    RenderTask* rtPtr = &rt;
+    Npc* npc = get_npc_safe(0);
+
+    if (gPlayerStatusPtr->flags & PS_FLAGS_HAS_REFLECTION) {
+        s32 x, y, z;
+
+        get_screen_coords(gCurrentCamID, npc->pos.x, npc->pos.y, -npc->pos.z, &x, &y, &z);
+        rtPtr->renderMode = npc->renderMode;
+        rtPtr->distance = -z;
+        rtPtr->appendGfxArg = npc;
+        rtPtr->appendGfx = func_802414BC_D65A9C;
+        queue_render_task(rtPtr);
+    }
+}
+
+void func_802414BC_D65A9C(void* data) {
+    Npc* npc = data;
+    Matrix4f sp18, sp58, sp98, spD8;
+
+    npc_get_render_yaw(npc);
+    guRotateF(sp18, npc->renderYaw + gCameras[gCurrentCamID].currentYaw, 0.0f, 1.0f, 0.0f);
+    guScaleF(spD8, SPRITE_WORLD_SCALE_F, SPRITE_WORLD_SCALE_F, SPRITE_WORLD_SCALE_F);
+    guMtxCatF(sp18, spD8, sp18);
+    guTranslateF(sp58, npc->pos.x, npc->pos.y, npc->pos.z);
+    guMtxCatF(sp18, sp58, sp18);
+    spr_update_player_sprite(2, npc->currentAnim, 1.0f);
+    spr_draw_player_sprite(2, 0, 0, 0, sp18);
+}
diff --git a/src/world/area_pra/pra_15/D69830.c b/src/world/area_pra/pra_15/D69830.c
index 79cd77cb8d..db3f4e1a4f 100644
--- a/src/world/area_pra/pra_15/D69830.c
+++ b/src/world/area_pra/pra_15/D69830.c
@@ -1,3 +1,6 @@
 #include "pra_15.h"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_15/D69830", func_80240020_D69830);
+ApiStatus func_80240020_D69830(Evt* script, s32 isInitialCall) {
+    gOverrideFlags &= ~GLOBAL_OVERRIDES_80;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c
index bf57561040..e606e829ec 100644
--- a/src/world/area_pra/pra_19/D6E9D0.c
+++ b/src/world/area_pra/pra_19/D6E9D0.c
@@ -52,20 +52,165 @@ ApiStatus func_80241274_D6FC24(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80241310_D6FCC0);
+#include "world/common/todo/PlayBigSmokePuff.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_802413A4_D6FD54);
+ApiStatus func_802413A4_D6FD54(Evt* script, s32 isInitialCall) {
+    EncounterStatus* currentEncounter = &gCurrentEncounter;
+    Bytecode* args = script->ptrReadPos;
+    Enemy* enemy = script->owner1.enemy;
+    s32 var_s1 = evt_get_variable(script, *args++) == 0;
+    Encounter* encounter;
 
-INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_802414F4_D6FEA4);
+    if (evt_get_variable(script, *args++) == 0) {
+        var_s1 += 1;
+    }
+    if (evt_get_variable(script, *args++) == 0) {
+        var_s1 += 1;
+    }
+    if (evt_get_variable(script, *args++) == 0) {
+        var_s1 += 1;
+    }
 
-INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80241530_D6FEE0);
+    switch (var_s1) {
+        case 1:
+            encounter = currentEncounter->encounterList[enemy->encounterIndex];
+            encounter->battle = 0x2101;
+            break;
+        case 2:
+            encounter = currentEncounter->encounterList[enemy->encounterIndex];
+            encounter->battle = 0x2102;
+            break;
+        case 3:
+            encounter = currentEncounter->encounterList[enemy->encounterIndex];
+            encounter->battle = 0x2103;
+            break;
+        case 4:
+            encounter = currentEncounter->encounterList[enemy->encounterIndex];
+            encounter->battle = 0x2104;
+            break;
+    }
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_802415E0_D6FF90);
+void func_802415E0_D6FF90(void* data);
+void func_80241530_D6FEE0(void);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_802416F8_D700A8);
+ApiStatus func_802414F4_D6FEA4(Evt* script, s32 isInitialCall) {
+    script->array[0] = create_generic_entity_world(0, func_80241530_D6FEE0);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80241710_D700C0);
+void func_80241530_D6FEE0(void) {
+    RenderTask rt;
+    RenderTask* rtPtr = &rt;
+    Npc* npc = get_npc_safe(5);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_8024175C_D7010C);
+    if (gPlayerStatusPtr->flags & PS_FLAGS_HAS_REFLECTION) {
+        s32 x, y, z;
 
-INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80241838_D701E8);
+        get_screen_coords(gCurrentCamID, npc->pos.x, npc->pos.y, -npc->pos.z, &x, &y, &z);
+        rtPtr->renderMode = npc->renderMode;
+        rtPtr->distance = -z;
+        rtPtr->appendGfxArg = npc;
+        rtPtr->appendGfx = func_802415E0_D6FF90;
+        queue_render_task(rtPtr);
+    }
+}
+
+void func_802415E0_D6FF90(void* data) {
+    Npc* npc = data;
+    Matrix4f sp18, sp58, sp98;
+
+    npc_get_render_yaw(npc);
+    guRotateF(sp18, npc->renderYaw + gCameras[gCurrentCamID].currentYaw, 0.0f, 1.0f, 0.0f);
+    guScaleF(sp98, SPRITE_WORLD_SCALE_F, SPRITE_WORLD_SCALE_F, SPRITE_WORLD_SCALE_F);
+    guMtxCatF(sp18, sp98, sp18);
+    guTranslateF(sp58, npc->pos.x, npc->pos.y, npc->pos.z);
+    guMtxCatF(sp18, sp58, sp18);
+    spr_update_player_sprite(2, npc->currentAnim, 1.0f);
+    spr_draw_player_sprite(2, 0, 0, 0, sp18);
+}
+
+ApiStatus func_802416F8_D700A8(Evt* script) {
+    gPlayerStatus.spriteFacingAngle = script->varTable[0];
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80241710_D700C0(Evt* script, s32 isInitialCall) {
+    Npc* npc1 = resolve_npc(script, script->varTable[3]);
+    Npc* npc2 = resolve_npc(script, script->varTable[4]);
+
+    npc1->collisionRadius = npc2->collisionRadius;
+    npc1->collisionHeight = npc2->collisionHeight;
+    return ApiStatus_DONE2;
+}
+
+
+ApiStatus func_8024175C_D7010C(Evt* script, s32 isInitialCall) {
+    Npc* npc0 = get_npc_unsafe(0);
+    Npc* npc1 = get_npc_unsafe(1);
+    Npc* npc2 = get_npc_unsafe(2);
+    Npc* npc3 = get_npc_unsafe(3);
+    Npc* npc4 = get_npc_unsafe(4);
+    f32 playerX = gPlayerStatus.position.x;
+
+    if (npc0->pos.x < playerX) {
+        return ApiStatus_DONE2;
+    }
+    if (npc1->pos.x < playerX) {
+        return ApiStatus_DONE2;
+    }
+    if (npc2->pos.x < playerX) {
+        return ApiStatus_DONE2;
+    }
+    if (npc3->pos.x < playerX) {
+        return ApiStatus_DONE2;
+    }
+    if (npc4->pos.x < playerX) {
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;;
+}
+
+ApiStatus func_80241838_D701E8(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    Npc* npc = get_npc_unsafe(evt_get_variable(script, *args++));
+
+    if (isInitialCall) {
+        script->varTable[10] = evt_get_variable(script, *args++);
+        script->varTable[11] = 8;
+        script->varTable[12] = evt_get_variable(script, *args++);
+        if (npc->pos.x < script->varTable[10]) {
+            script->varTable[13] = 0;
+        } else {
+            script->varTable[13] = 1;
+        }
+    }
+
+    if (script->varTable[13] == 0) {
+        if (npc->pos.x >= script->varTable[10]) {
+            npc->pos.x = script->varTable[10];
+            return ApiStatus_DONE2;
+        }
+        npc->pos.x += script->varTable[11];
+    } else {
+        if (npc->pos.x <= script->varTable[10]) {
+            npc->pos.x = script->varTable[10];
+            return ApiStatus_DONE2;
+        }
+        npc->pos.x -= script->varTable[11];
+    }
+
+    if (script->varTable[12] == 0) {
+        script->varTable[11] += 2;
+        if (script->varTable[11] >= 14) {
+            script->varTable[11] = 14;
+        }
+    } else {
+        script->varTable[11] -= 2;
+        if (script->varTable[11] <= 8) {
+            script->varTable[11] = 8;
+        }
+    }
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/area_pra/pra_21/D77F40.c b/src/world/area_pra/pra_21/D77F40.c
index 1a4bda76b2..3a2417cace 100644
--- a/src/world/area_pra/pra_21/D77F40.c
+++ b/src/world/area_pra/pra_21/D77F40.c
@@ -1,5 +1,25 @@
 #include "pra_21.h"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_21/D77F40", func_80240020_D77F40);
+ApiStatus func_80240020_D77F40(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
 
-INCLUDE_ASM(s32, "world/area_pra/pra_21/D77F40", func_802400AC_D77FCC);
+    if (playerStatus->targetYaw >= 0.0f && playerStatus->targetYaw < 180.0f) {
+        script->varTable[0] = 425;
+    }
+    if (playerStatus->targetYaw >= 180.0f && playerStatus->targetYaw < 360.0f) {
+        script->varTable[0] = 325;
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_802400AC_D77FCC(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->lastGoodPosition.y == 0) {
+        evt_set_variable(script, MapVar(0), 0);
+    }
+    if (playerStatus->lastGoodPosition.y == -200) {
+        evt_set_variable(script, MapVar(0), 1);
+    }
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/area_pra/pra_22/D788A0.c b/src/world/area_pra/pra_22/D788A0.c
index 812a5f6d7e..f4759e9225 100644
--- a/src/world/area_pra/pra_22/D788A0.c
+++ b/src/world/area_pra/pra_22/D788A0.c
@@ -2,8 +2,49 @@
 
 #include "world/common/todo/UnkFunc11.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_22/D788A0", func_802400DC_D7895C);
+ApiStatus func_802400DC_D7895C(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    f32 x, y, z, hitDepth;
 
-INCLUDE_ASM(s32, "world/area_pra/pra_22/D788A0", func_802401D0_D78A50);
+    playerStatus->position.x = script->varTable[0];
+    x = playerStatus->position.x;
+    y = playerStatus->position.y + 10.0f;
+    z = playerStatus->position.z;
+    hitDepth = 300.0f;
+    npc_raycast_down_around(0, &x, &y, &z, &hitDepth, 270.0f, playerStatus->colliderDiameter);
+    playerStatus->position.x = x;
+    playerStatus->position.z = z;
+    script->varTable[10] = 0;
+    if (playerStatus->position.y != y) {
+        playerStatus->position.y = 0.0f;
+        script->varTable[3]++;
+        if (script->varTable[3] >= 30) {
+            script->varTable[10] = 1;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_pra/pra_22/D788A0", func_8024025C_D78ADC);
+ApiStatus func_802401D0_D78A50(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->targetYaw >= 0.0f && playerStatus->targetYaw < 180.0f) {
+        script->varTable[0] = 425;
+    }
+    if (playerStatus->targetYaw >= 180.0f && playerStatus->targetYaw < 360.0f) {
+        script->varTable[0] = 325;
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_8024025C_D78ADC(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->lastGoodPosition.y == 0) {
+        evt_set_variable(script, MapVar(0), 0);
+    }
+    if (playerStatus->lastGoodPosition.y == -200) {
+        evt_set_variable(script, MapVar(0), 1);
+    }
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c
index 79668bd4e1..8535d8f2f6 100644
--- a/src/world/area_pra/pra_27/D799F0.c
+++ b/src/world/area_pra/pra_27/D799F0.c
@@ -1,6 +1,13 @@
 #include "pra_27.h"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240000_D799F0);
+ApiStatus func_80240000_D799F0(Evt* script, s32 isInitialCall) {
+    gGameStatusPtr->playerSpriteSet = 1;
+    sprintf(wMapShapeName, "pra_05_shape");
+    sprintf(wMapHitName, "pra_05_hit");
+    return ApiStatus_BLOCK;
+}
+
+const char N(exit_str_0)[] = "pra_36";
 
 #include "world/common/atomic/Reflection.inc.c"
 
diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c
index 9793dd05a6..1e4b4fd191 100644
--- a/src/world/area_pra/pra_28/D7B2A0.c
+++ b/src/world/area_pra/pra_28/D7B2A0.c
@@ -1,6 +1,13 @@
 #include "pra_28.h"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240000_D7B2A0);
+ApiStatus func_80240000_D7B2A0(Evt* script, s32 isInitialCall) {
+    gGameStatusPtr->playerSpriteSet = 1;
+    sprintf(wMapShapeName, "pra_05_shape");
+    sprintf(wMapHitName, "pra_05_hit");
+    return ApiStatus_BLOCK;
+}
+
+const char N(exit_str_0)[] = "pra_37";
 
 #include "world/common/atomic/Reflection.inc.c"
 
diff --git a/src/world/area_pra/pra_29/D7CB70.c b/src/world/area_pra/pra_29/D7CB70.c
index d0e9d047d3..29e38a7041 100644
--- a/src/world/area_pra/pra_29/D7CB70.c
+++ b/src/world/area_pra/pra_29/D7CB70.c
@@ -29,4 +29,4 @@ void func_802410B0_D7DC00(s32 index) {
 
 }
 
-INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_802411D4_D7DD24);
+#include "world/common/todo/PlayRisingBubble.inc.c"
diff --git a/src/world/area_pra/pra_31/D7ED60.c b/src/world/area_pra/pra_31/D7ED60.c
index 18a8f97139..7404e58d98 100644
--- a/src/world/area_pra/pra_31/D7ED60.c
+++ b/src/world/area_pra/pra_31/D7ED60.c
@@ -3,4 +3,7 @@
 static char* N(exit_str_0) = "pra_34";
 static char* N(exit_str_1) = "pra_40";
 
-INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED60", func_80240000_D7ED60);
+ApiStatus func_80240000_D7ED60(Evt* script, s32 isInitialCall) {
+    gGameStatusPtr->playerSpriteSet = 1;
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/area_pra/pra_31/D7ED80.c b/src/world/area_pra/pra_31/D7ED80.c
index d3f112d101..09fd5da1c4 100644
--- a/src/world/area_pra/pra_31/D7ED80.c
+++ b/src/world/area_pra/pra_31/D7ED80.c
@@ -50,6 +50,26 @@ ApiStatus func_80240374_D7F0D4(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_80240410_D7F170);
+ApiStatus func_80240410_D7F170(Evt* script, s32 isInitialCall) {
+    Npc* npc = get_npc_safe(script->owner2.npcID);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_80240468_D7F1C8);
+    script->varTable[0] = clamp_angle(atan2(npc->pos.x, npc->pos.z, gPlayerStatus.position.x, gPlayerStatus.position.z));
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80240468_D7F1C8(Evt* script, s32 isInitialCall) {
+    script->varTable[6] = script->varTable[0] + 90;
+    script->varTable[7] = script->varTable[5] + 90;
+    script->varTable[8] = abs(script->varTable[6] - script->varTable[7]);
+
+    if (script->varTable[8] == 270) {
+        script->varTable[8] = 90;
+        if (script->varTable[6] > script->varTable[7]) {
+            script->varTable[6] -= 360;
+        } else {
+            script->varTable[7] -= 360;
+        }
+    }
+    script->varTable[8] = (script->varTable[8] / 90) * 20;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_pra/pra_31/D7F270.c b/src/world/area_pra/pra_31/D7F270.c
index 296737e367..957df70cdf 100644
--- a/src/world/area_pra/pra_31/D7F270.c
+++ b/src/world/area_pra/pra_31/D7F270.c
@@ -18,6 +18,11 @@ INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240E70_D7FBD0);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240F2C_D7FC8C);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240FD0_D7FD30);
+ApiStatus func_80240FD0_D7FD30(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
 
-INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240FF0_D7FD50);
+    playerStatus->animFlags |= PA_FLAGS_800000;
+    return ApiStatus_DONE2;
+}
+
+#include "world/common/todo/UnkFunc11.inc.c"
diff --git a/src/world/area_pra/pra_32/D86A20.c b/src/world/area_pra/pra_32/D86A20.c
index 02581cd4b7..fd31f2b0b5 100644
--- a/src/world/area_pra/pra_32/D86A20.c
+++ b/src/world/area_pra/pra_32/D86A20.c
@@ -5,4 +5,7 @@
 static char* N(exit_str_0) = "kmr_23";
 static char* N(exit_str_1) = "pra_40";
 
-INCLUDE_ASM(s32, "world/area_pra/pra_32/D86A20", func_80240814_D87214);
+ApiStatus func_80240814_D87214(Evt* script, s32 isInitialCall) {
+    gOverrideFlags &= ~GLOBAL_OVERRIDES_80;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_pra/pra_33/D89700.c b/src/world/area_pra/pra_33/D89700.c
index 954411df47..b3a6dd4001 100644
--- a/src/world/area_pra/pra_33/D89700.c
+++ b/src/world/area_pra/pra_33/D89700.c
@@ -1,17 +1,32 @@
 #include "pra_33.h"
+#include "mapfs/pra_33_hit.h"
 
 #include "world/common/atomic/Reflection.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240F20_D8A600);
-
-ApiStatus func_80240F58_D8A638(Evt* script, s32 isInitialCall) {
-    s32 temp_f2;
-
-    script->varTable[6] = dist2D(200.0f, 0.0f, gPlayerStatus.position.x, gPlayerStatus.position.z);
-    temp_f2 = atan2(200.0f, 0.0f, gPlayerStatus.position.x, gPlayerStatus.position.z);
-    script->varTable[7] = temp_f2;
-    script->varTable[7] = clamp_angle(temp_f2);
+ApiStatus func_80240F20_D8A600(Evt* script, s32 isInitialCall) {
+    script->varTable[10] = 0;
+    if (gCollisionStatus.currentFloor == COLLIDER_o1045) {
+        script->varTable[10] = 1;
+    }
+    if (gCollisionStatus.lastTouchedFloor == COLLIDER_o1045) {
+        script->varTable[10] = 1;
+    }
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80241000_D8A6E0);
+
+ApiStatus func_80240F58_D8A638(Evt* script, s32 isInitialCall) {
+    script->varTable[6] = dist2D(200.0f, 0.0f, gPlayerStatus.position.x, gPlayerStatus.position.z);
+    script->varTable[7] = atan2(200.0f, 0.0f, gPlayerStatus.position.x, gPlayerStatus.position.z);
+    script->varTable[7] = clamp_angle(script->varTable[7]);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80241000_D8A6E0(Evt* script, s32 isInitialCall) {
+    f32 sinTheta, cosTheta;
+
+    sin_cos_deg(script->varTable[7], &sinTheta, &cosTheta);
+    gPlayerStatus.position.x = (script->varTable[6] * sinTheta) + 200.0f;
+    gPlayerStatus.position.z = (script->varTable[6] * -cosTheta) + 0.0f;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c
index a63aa8d4fb..13652b00ad 100644
--- a/src/world/area_pra/pra_35/D8D270.c
+++ b/src/world/area_pra/pra_35/D8D270.c
@@ -4,108 +4,6 @@
 
 #include "world/common/enemy/ai/PatrolNoAttackAI.inc.c"
 
-#include "world/common/enemy/ai/MeleeHitbox.inc.c"
-
-// Requires data migration
-#ifdef NON_MATCHING
-ApiStatus func_802423CC_D8F61C(Evt *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc *npc = get_npc_unsafe(enemy->npcID);
-    Bytecode* args = script->ptrReadPos;
-    EnemyDetectVolume territory;
-    EnemyDetectVolume* territoryPtr = &territory;
-    MobileAISettings* npcAISettings = (MobileAISettings*)evt_get_variable(script, *args++);
-
-    territory.skipPlayerDetectChance = 0;
-    territory.shape = enemy->territory->patrol.detectShape;
-    territory.pointX = enemy->territory->patrol.detectPos.x;
-    territory.pointZ = enemy->territory->patrol.detectPos.z;
-    territory.sizeX = enemy->territory->patrol.detectSize.x;
-    territory.sizeZ = enemy->territory->patrol.detectSize.z;
-    territory.halfHeight = 65.0f;
-    territory.detectFlags = 0;
-
-    if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) {
-        script->functionTemp[0] = 0;
-        npc->duration = 0;
-        npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE];
-        npc->flags &= ~NPC_FLAG_JUMPING;
-        if (!enemy->territory->patrol.isFlying) {
-            npc->flags |= NPC_FLAG_GRAVITY;
-            npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT;
-        } else {
-            npc->flags &= ~NPC_FLAG_GRAVITY;
-            npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT;
-        }
-        if (enemy->aiFlags & ENEMY_AI_FLAGS_4) {
-            script->functionTemp[0] = 99;
-            script->functionTemp[1] = 0;
-            enemy->aiFlags &= ~ENEMY_AI_FLAGS_4;
-        }
-        enemy->varTable[0] = 0;
-    }
-
-    if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(MeleeHitbox_CanSeePlayer)(script)) {
-        script->functionTemp[0] = 30;
-    }
-
-    switch (script->functionTemp[0]) {
-        case 0:
-            pra_35_PatrolAI_MoveInit(script, npcAISettings, territoryPtr);
-            // fallthrough
-        case 1:
-            pra_35_PatrolAI_Move(script, npcAISettings, territoryPtr);
-            break;
-        case 2:
-            pra_35_PatrolAI_LoiterInit(script, npcAISettings, territoryPtr);
-            // fallthrough
-        case 3:
-            pra_35_PatrolAI_Loiter(script, npcAISettings, territoryPtr);
-            break;
-        case 7:
-            pra_35_PatrolAI_PostLoiter(script, npcAISettings, territoryPtr);
-            break;
-        case 5:
-            pra_35_PatrolAI_JumpInit(script, npcAISettings, territoryPtr);
-            // fallthrough
-        case 11:
-            pra_35_PatrolAI_Jump(script, npcAISettings, territoryPtr);
-            break;
-        case 12:
-            pra_35_PatrolAI_ChaseInit(script, npcAISettings, territoryPtr);
-            // fallthrough
-        case 13:
-            pra_35_PatrolAI_Chase(script, npcAISettings, territoryPtr);
-            break;
-        case 14:
-            pra_35_PatrolAI_LosePlayer(script, npcAISettings, territoryPtr);
-            break;
-        case 30:
-            pra_35_MeleeHitbox_30(script);
-            // fallthrough
-        case 31:
-            pra_35_MeleeHitbox_31(script);
-            if (script->functionTemp[0] != 32) {
-                break;
-            }
-            // fallthrough
-        case 32:
-            pra_35_MeleeHitbox_32(script);
-            if (script->functionTemp[0] != 33) {
-                break;
-            }
-            // fallthrough
-        case 33:
-            pra_35_MeleeHitbox_33(script);
-            break;
-        case 99:
-            basic_ai_suspend(script);
-            break;
-    }
-    return ApiStatus_BLOCK;
-}
-#else
-INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_802423CC_D8F61C);
-#endif
+#include "world/common/enemy/ai/ClubbaPatrolAI.inc.c"
 
 #include "world/common/enemy/ai/WanderMeleeAI.inc.c"
diff --git a/src/world/area_sam/sam_05/D187E0.c b/src/world/area_sam/sam_05/D187E0.c
index d71fc17751..b4d926b1c4 100644
--- a/src/world/area_sam/sam_05/D187E0.c
+++ b/src/world/area_sam/sam_05/D187E0.c
@@ -7,4 +7,10 @@ static char* N(exit_str_1) = "sam_06";
 
 INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_802419A4_D1A184);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80241D20_D1A500);
+ApiStatus func_80241D20_D1A500(Evt* script, s32 isInitialCall) {
+    if (gGameStatusPtr->pressedButtons[0] & BUTTON_A) {
+        return ApiStatus_DONE2;
+    } else {
+        return ApiStatus_BLOCK;
+    }
+}
diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c
index 7cb4b8ced8..a480ea5b03 100644
--- a/src/world/area_sam/sam_06/D203E0.c
+++ b/src/world/area_sam/sam_06/D203E0.c
@@ -61,4 +61,37 @@ ApiStatus func_80241EB4_D21D44(Evt* script, s32 isInitialCall) {
 extern s32 N(LetterDelivery_SavedNpcAnim);
 #include "world/common/todo/LetterDelivery.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242538_D223C8);
+ApiStatus func_80242538_D223C8(Evt* script, s32 isInitialCall) {
+    s32 alpha;
+
+    if (isInitialCall) {
+        if (script->varTable[0] == 0) {
+            func_8011B950(script->varTable[15], -1, 1, 1);
+        }
+        script->functionTemp[0] = 0;
+    }
+
+    script->functionTemp[0] += 32;
+    if (script->functionTemp[0] > 255) {
+        script->functionTemp[0] = 255;
+    }
+
+    if (script->varTable[0] == 0) {
+        alpha = script->functionTemp[0];
+    } else {
+        alpha = 255 - script->functionTemp[0];
+    }
+
+    set_background_color_blend(0, 0, 0, alpha);
+    gCameras[CAM_DEFAULT].bgColor[0] = 0;
+    gCameras[CAM_DEFAULT].bgColor[1] = 0;
+    gCameras[CAM_DEFAULT].bgColor[2] = 0;
+
+    if (script->functionTemp[0] >= 255) {
+        if (script->varTable[0] == 3) {
+            func_8011B950(script->varTable[15], -1, 0, 1);
+        }
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c
index 2be74f8390..34a2398522 100644
--- a/src/world/area_sam/sam_07/D2BD30.c
+++ b/src/world/area_sam/sam_07/D2BD30.c
@@ -9,7 +9,21 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240000_D2BD30);
 
 #include "world/common/todo/GetEntityPosition.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802405B0_D2C2E0);
+ApiStatus func_802405B0_D2C2E0(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    Bytecode* args = script->ptrReadPos;
+    s32 floor = evt_get_variable(script, *args++);
+    s32 floor2 = evt_get_variable(script, *args++);
+
+    if (gCollisionStatus.currentFloor == floor || gCollisionStatus.currentFloor == floor2) {
+        if (playerStatus->actionState == ACTION_STATE_SPIN_POUND ||
+            playerStatus->actionState == ACTION_STATE_TORNADO_POUND)
+        {
+            return ApiStatus_BLOCK;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/todo/UnsetCamera0MoveFlag1.inc.c"
 
diff --git a/src/world/area_sam/sam_08/D309C0.c b/src/world/area_sam/sam_08/D309C0.c
index d08e1eb8e8..362c042e47 100644
--- a/src/world/area_sam/sam_08/D309C0.c
+++ b/src/world/area_sam/sam_08/D309C0.c
@@ -2,16 +2,7 @@
 
 #include "world/common/enemy/ai/WanderMeleeAI.inc.c"
 
-ApiStatus func_80241610_D31290(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32 x = evt_get_variable(script, *args++);
-    s32 y = evt_get_variable(script, *args++);
-    s32 z = evt_get_variable(script, *args++);
-
-    fx_big_smoke_puff(x, y, z);
-    
-    return ApiStatus_DONE2;
-}
+#include "world/common/todo/PlayBigSmokePuff.inc.c"
 
 ApiStatus func_802416A4_D31324(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
@@ -20,7 +11,7 @@ ApiStatus func_802416A4_D31324(Evt* script, s32 isInitialCall) {
     s32 z = evt_get_variable(script, *args++);
 
     sfx_adjust_env_sound_pos(0x8000006C, 0, x, y, z);
-    
+
     return ApiStatus_DONE2;
 }
 
@@ -30,6 +21,6 @@ ApiStatus func_8024174C_D313CC(Evt* script, s32 isInitialCall) {
     s32 rumbleTime = evt_get_variable(script, *args++);
 
     start_rumble(rumbleFreq & 0xFF, rumbleTime & 0xFFFF);
-    
+
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_sam/sam_10/D37800.c b/src/world/area_sam/sam_10/D37800.c
index abcdf4e16b..fb1b25a4a4 100644
--- a/src/world/area_sam/sam_10/D37800.c
+++ b/src/world/area_sam/sam_10/D37800.c
@@ -13,6 +13,15 @@ static char* N(exit_str_3) = "";
 
 #include "world/common/todo/IsItemBadge.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_802402BC_D37ABC);
+ApiStatus func_802402BC_D37ABC(Evt* script, s32 isInitialCall) {
+    get_item_entity(script->varTable[0])->scale = 0.8f;
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_802402F0_D37AF0);
+ApiStatus func_802402F0_D37AF0(Evt* script, s32 isInitialCall) {
+    script->varTable[0] = gPlayerStatus.position.x + (sin_deg(310.0f) * 100.0f);
+    script->varTable[1] = gPlayerStatus.position.z - (cos_deg(310.0f) * 100.0f);
+    script->varTable[2] = gPlayerStatus.position.x + (sin_deg(130.0f) * 100.0f);
+    script->varTable[3] = gPlayerStatus.position.z - (cos_deg(130.0f) * 100.0f);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_sam/sam_11/D3A930.c b/src/world/area_sam/sam_11/D3A930.c
index aec4116a72..93cf3c47d9 100644
--- a/src/world/area_sam/sam_11/D3A930.c
+++ b/src/world/area_sam/sam_11/D3A930.c
@@ -1,8 +1,64 @@
 #include "sam_11.h"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240360_D3A930);
+extern s32 D_80243CC0_D3E290;
+extern s32 D_80243CC4_D3E294;
+extern s32 D_80243CC8_D3E298;
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_8024052C_D3AAFC);
+// needs data migration + some issues with the return values
+#ifdef NON_EQUIVALENT
+ApiStatus func_80240360_D3A930(Evt* script, s32 isInitialCall) {
+    u8 r, g, b, a;
+    u8 alpha;
+    s32 temp_a2;
+
+    if (isInitialCall) {
+        func_8011B950(script->varTable[1], -1, 1, 1);
+        script->functionTemp[0] = 0;
+        get_background_color_blend(&r, &g, &b, &a);
+        if ((script->varTable[0] != 0) || (a != 255)) {
+            if (script->varTable[0] == 1 && a == 0) {
+                return ApiStatus_DONE2;
+            }
+        } else {
+            return ApiStatus_DONE2;
+        }
+    }
+
+    script->functionTemp[0] += script->varTable[2];
+    if (script->functionTemp[0] > 255) {
+        script->functionTemp[0] = 255;
+    }
+    if (script->varTable[0] == 0) {
+        alpha = script->functionTemp[0];
+    } else {
+        alpha = ~script->functionTemp[0];
+    }
+    a = alpha;
+    set_background_color_blend(0, 0, 0, a);
+    temp_a2 = 255 - a;
+    r = (D_80243CC0_D3E290 * temp_a2) / 255;
+    g = (D_80243CC4_D3E294 * temp_a2) / 255;
+    b = (D_80243CC8_D3E298 * temp_a2) / 255;
+    gCameras[CAM_DEFAULT].bgColor[0] = r;
+    gCameras[CAM_DEFAULT].bgColor[1] = g;
+    gCameras[CAM_DEFAULT].bgColor[2] = b;
+    if (script->functionTemp[0] >= 255) {
+        if (script->varTable[0] == 1) {
+            func_8011B950(script->varTable[1], -1, 0, 1);
+        }
+
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}
+#else
+INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240360_D3A930);
+#endif
+
+ApiStatus func_8024052C_D3AAFC(Evt* script, s32 isInitialCall) {
+    gEntityHideMode = 1;
+    return ApiStatus_DONE2;
+}
 
 #define NAMESPACE dup_sam_11
 ApiStatus N(Set80151310_2)(Evt* script, s32 isInitialCall) {
@@ -20,8 +76,54 @@ ApiStatus N(Set80151310_0)(Evt* script, s32 isInitialCall) {
 
 #include "world/common/todo/SetCamera0MoveFlag1.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_8024059C_D3AB6C);
+ApiStatus func_8024059C_D3AB6C(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    f32 xComp, zComp;
+    f32 x, y, z;
+    f32 hitDepth;
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_8024072C_D3ACFC);
+    if (isInitialCall) {
+        script->functionTemp[1] = 10;
+    }
+    playerStatus->targetYaw = 270.0f;
+    script->functionTemp[1] += 4;
+    xComp = (script->functionTemp[1] / 10) * sin_deg(playerStatus->targetYaw);
+    zComp = (script->functionTemp[1] / 10) * -cos_deg(playerStatus->targetYaw);
+    x = playerStatus->position.x + xComp;
+    y = playerStatus->position.y + playerStatus->colliderHeight * 0.5f;
+    z = playerStatus->position.z + zComp;
+    hitDepth = 500.0f;
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240754_D3AD24);
+    if (npc_raycast_down_sides(0, &x, &y, &z, &hitDepth)) {
+        if (hitDepth < 100.0f) {
+            playerStatus->position.x = x;
+            playerStatus->position.y = y;
+            playerStatus->position.z = z;
+            return ApiStatus_BLOCK;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_8024072C_D3ACFC(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->flags & (PS_FLAGS_INPUT_DISABLED | PS_FLAGS_1000)) {
+        script->varTable[0] = 1;
+    } else {
+        script->varTable[0] = 0;
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80240754_D3AD24(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->lastGoodPosition.y == 385) {
+        evt_set_variable(script, MapVar(7), 0);
+    }
+    if (playerStatus->lastGoodPosition.y == 150) {
+        evt_set_variable(script, MapVar(7), 1);
+    }
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c
index 3f77103fcb..2e2b3e32f4 100644
--- a/src/world/area_sam/sam_11/D3ADA0.c
+++ b/src/world/area_sam/sam_11/D3ADA0.c
@@ -1,5 +1,6 @@
 #include "sam_11.h"
 #include "effects.h"
+#include "mapfs/sam_11_hit.h"
 
 #define CHUCK_QUIZMO_NPC_ID 17
 
@@ -11,18 +12,114 @@ extern EffectInstance* N(Quizmo_VannaTEffect);
 
 #include "world/common/atomic/Quizmo.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241864_D3BE34);
+ApiStatus func_80241864_D3BE34(Evt* script, s32 isInitialCall) {
+    Npc* npc = get_npc_safe(1);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802418B4_D3BE84);
+    npc->pos.y = 0.0f;
+    npc->pos.x = 470.0f;
+    npc->pos.z = 5.0f;
+    script->varTableF[10] = npc->pos.z;
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241A6C_D3C03C);
+ApiStatus func_802418B4_D3BE84(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    Npc* npc = get_npc_safe(1);
+    f32* vt10 = &script->varTableF[10];
+    f32 playerX;
+    f32 var_f2;
+
+    if (*vt10 == npc->pos.z && npc->currentAnim != 0x9A0001) {
+        npc->currentAnim = 0x9A0001;
+    }
+
+    if (*vt10 != npc->pos.z) {
+        if (npc->currentAnim != 0x9A0002) {
+            npc->currentAnim = 0x9A0002;
+        }
+    }
+
+    *vt10 = npc->pos.z;
+
+    if (!(dist2D(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z) < 30.0f) &&
+        !(dist2D(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z) > 130.0f))
+    {
+        playerX = var_f2 = playerStatus->position.z;
+        if (playerX > 50.0f) {
+            var_f2 = 50.0f;
+        }
+        if (playerX < -40.0f) {
+            var_f2 = -40.0f;
+        }
+        if (npc->pos.z <= var_f2) {
+            npc->pos.z += 4.0f;
+            if (npc->pos.z > var_f2) {
+                npc->pos.z = var_f2;
+            }
+        }
+        if (npc->pos.z > var_f2) {
+            npc->pos.z -= 4.0f;
+            if (npc->pos.z <= var_f2) {
+                npc->pos.z = var_f2;
+            }
+        }
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80241A6C_D3C03C(Evt* script, s32 isInitialCall) {
+    get_item_entity(script->varTable[0])->scale = 0.6f;
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241DAC_D3C37C);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241FB0_D3C580);
+ApiStatus func_80241FB0_D3C580(Evt* script, s32 isInitialCall) {
+    script->varTable[10] = 0;
+    if (gCollisionStatus.currentFloor == COLLIDER_suimen) {
+        script->varTable[10] = 1;
+    }
+    if (gCollisionStatus.lastTouchedFloor == COLLIDER_suimen) {
+        script->varTable[10] = 1;
+    }
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241FE8_D3C5B8);
+ApiStatus func_80241FE8_D3C5B8(Evt* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    f32 x = playerStatus->position.x;
+    f32 y = playerStatus->position.y + 10.0f;
+    f32 z = playerStatus->position.z;
+    f32 hitDepth = 40.0f;
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80242074_D3C644);
+    npc_raycast_down_sides(0, &x, &y, &z, &hitDepth);
+    playerStatus->position.x = x;
+    playerStatus->position.y = y;
+    playerStatus->position.z = z;
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80242074_D3C644(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    Npc* partner = get_npc_safe(NPC_PARTNER);
+    s32 var_s0 = -1;
+
+    if (gCollisionStatus.bombetteExploded >= 0) {
+        f32 temp = 11.0f;
+        f32 x = partner->pos.x;
+        f32 y = partner->pos.y + temp;
+        f32 z = partner->pos.z;
+
+        temp = 12.0f;
+        if (npc_raycast_down_around(partner->collisionChannel, &x, &y, &z, &temp, partner->yaw,
+                                    partner->collisionRadius) && temp <= 12.0f)
+        {
+            var_s0 = D_8010C978;
+        }
+    }
+    evt_set_variable(script, *args++, var_s0);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_sam/sam_12/D4BA20.c b/src/world/area_sam/sam_12/D4BA20.c
index 3fec596b40..6116a60344 100644
--- a/src/world/area_sam/sam_12/D4BA20.c
+++ b/src/world/area_sam/sam_12/D4BA20.c
@@ -3,4 +3,15 @@
 static char* N(exit_str_0) = "sam_10";
 static char* N(exit_str_1) = "";
 
-INCLUDE_ASM(s32, "world/area_sam/sam_12/D4BA20", func_80240000_D4BA20);
+ApiStatus func_80240000_D4BA20(Evt* script, s32 isInitialCall) {
+    Npc* npc;
+
+    if (isInitialCall) {
+        script->functionTempF[1] = 0.0f;
+        script->functionTempPtr[2] = get_npc_safe(script->owner2.npcID);
+    }
+    npc = script->functionTempPtr[2];
+    npc->verticalRenderOffset = sin_deg(script->functionTempF[1]) * 5.0f;
+    script->functionTempF[1] = clamp_angle(script->functionTempF[1] + 4.5f);
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/area_sam/sam_12/D4BAB0.c b/src/world/area_sam/sam_12/D4BAB0.c
index a153308b5f..ca884ae57b 100644
--- a/src/world/area_sam/sam_12/D4BAB0.c
+++ b/src/world/area_sam/sam_12/D4BAB0.c
@@ -1,9 +1,48 @@
 #include "sam_12.h"
+#include "effects.h"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_12/D4BAB0", func_80240090_D4BAB0);
+ApiStatus func_80240090_D4BAB0(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
 
-INCLUDE_ASM(s32, "world/area_sam/sam_12/D4BAB0", func_802400C0_D4BAE0);
+    set_screen_overlay_params_front(0, evt_get_float_variable(script, *args++));
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_sam/sam_12/D4BAB0", func_80240194_D4BBB4);
+ApiStatus func_802400C0_D4BAE0(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 idx = evt_get_variable(script, *args++);
+    s32 x = evt_get_float_variable(script, *args++);
+    s32 y = evt_get_float_variable(script, *args++);
+    s32 z = evt_get_float_variable(script, *args++);
+    ItemEntity* item = get_item_entity(idx);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_12/D4BAB0", func_80240238_D4BC58);
+    item->position.x = x;
+    item->position.y = y;
+    item->position.z = z;
+    return ApiStatus_DONE2;
+}
+
+#include "world/common/todo/PlayRisingBubble.inc.c"
+
+ApiStatus func_80240238_D4BC58(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    f32 temp_f26 = evt_get_float_variable(script, *args++);
+    f32 x = evt_get_float_variable(script, *args++);
+    f32 y = evt_get_float_variable(script, *args++);
+    f32 z = evt_get_float_variable(script, *args++);
+    f32 t = evt_get_float_variable(script, *args++);
+    s32 outVar = *args++;
+    EffectInstance* effect;
+
+    fx_sleep_bubble(
+        0,
+        gPlayerStatus.position.x + x,
+        gPlayerStatus.position.y + ((gPlayerStatus.colliderHeight * 2) / 3) + y,
+        gPlayerStatus.position.z + z,
+        (gPlayerStatus.colliderHeight / 3) + t,
+        temp_f26,
+        &effect
+    );
+    evt_set_variable(script, outVar, (s32) effect);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_sbk/sbk_02/sbk_02_3_ruins.c b/src/world/area_sbk/sbk_02/sbk_02_3_ruins.c
index 6a1bfc73cf..b14a940bb8 100644
--- a/src/world/area_sbk/sbk_02/sbk_02_3_ruins.c
+++ b/src/world/area_sbk/sbk_02/sbk_02_3_ruins.c
@@ -1,13 +1,12 @@
 #include "sbk_02.h"
 #include "effects.h"
-
-void get_model_env_color_parameters(u8* primR, u8* primG, u8* primB, u8* envR, u8* envG, u8* envB);
+#include "model.h"
 
 #include "world/common/atomic/UnkFunc27.inc.c"
 
 API_CALLABLE(N(HideSun)) {
     EffectInstance* effect = (EffectInstance*)evt_get_variable(script, MapVar(0));
-    
+
     effect->data.sun->targetAlpha = 0;
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_tik/tik_04/872020.c b/src/world/area_tik/tik_04/872020.c
index c9905b1643..d17b2b6cd8 100644
--- a/src/world/area_tik/tik_04/872020.c
+++ b/src/world/area_tik/tik_04/872020.c
@@ -1,4 +1,5 @@
 #include "tik_04.h"
+#include "mapfs/tik_04_hit.h"
 
 #include "world/common/todo/UnkPosFunc2.inc.c"
 
@@ -62,8 +63,8 @@ ApiStatus func_80240A00_872430(Evt* script, s32 isInitialCall) {
 ApiStatus func_80240C20_872650(Evt* script, s32 isInitialCall) {
     PlayerStatus* player = &gPlayerStatus;
 
-    if ((gCollisionStatus.currentFloor == 9) || (gCollisionStatus.currentFloor == 0xB)) {
-        if ((player->actionState == ACTION_STATE_SPIN_POUND) || (player->actionState == ACTION_STATE_TORNADO_POUND)) {
+    if (gCollisionStatus.currentFloor == COLLIDER_erb1 || gCollisionStatus.currentFloor == COLLIDER_erb2) {
+        if (player->actionState == ACTION_STATE_SPIN_POUND || player->actionState == ACTION_STATE_TORNADO_POUND) {
             return ApiStatus_BLOCK;
         }
     }
diff --git a/src/world/area_tik/tik_22/89FEF0.c b/src/world/area_tik/tik_22/89FEF0.c
index de129fc754..9986122129 100644
--- a/src/world/area_tik/tik_22/89FEF0.c
+++ b/src/world/area_tik/tik_22/89FEF0.c
@@ -4,8 +4,6 @@
 
 #include "world/common/entity/Pipe.inc.c"
 
-s32 bgm_clear_track_volumes(s32, s16);
-
 ApiStatus func_8024061C_8A04DC(Evt* script, s32 isInitialCall) {
     bgm_clear_track_volumes(0, 2);
     return ApiStatus_DONE2;
diff --git a/src/world/common/atomic/LavaGlowLighting.inc.c b/src/world/common/atomic/LavaGlowLighting.inc.c
index a577cacb4a..311ec4450b 100644
--- a/src/world/common/atomic/LavaGlowLighting.inc.c
+++ b/src/world/common/atomic/LavaGlowLighting.inc.c
@@ -11,8 +11,6 @@ enum {
     LAVA_GLOW_MODE_END   = 10
 };
 
-void set_model_fog_color_parameters(u8, u8, u8, u8, u8, u8, u8, s32, s32);
-
 f32 N(LavaGlowLightTime) = 0.0f;
 
 ApiStatus N(ApplyLavaGlowLighting)(Evt* script, s32 isInitialCall) {
@@ -23,11 +21,11 @@ ApiStatus N(ApplyLavaGlowLighting)(Evt* script, s32 isInitialCall) {
     f32 deltaX;
     f32 scale;
     s32 fogStart;
-    f32 baseAlpha; 
+    f32 baseAlpha;
     f32 slowOsc, fastOsc;
     f64 primA;
     s32 i;
-    
+
     if (isInitialCall) {
         if (modelIDs != NULL) {
             // apply effect to models in the list
@@ -47,7 +45,7 @@ ApiStatus N(ApplyLavaGlowLighting)(Evt* script, s32 isInitialCall) {
             }
         }
     }
-    
+
     N(LavaGlowLightTime) += 1.0f;
     if (N(LavaGlowLightTime) > 360.0f) {
         N(LavaGlowLightTime) -= 360.0f;
@@ -72,7 +70,7 @@ ApiStatus N(ApplyLavaGlowLighting)(Evt* script, s32 isInitialCall) {
         case LAVA_GLOW_MODE_2:
             baseAlpha = 100.0f;
             fogStart = 995 - evt_get_variable(NULL, MV_GlowIntensity);
-            break;   
+            break;
         case LAVA_GLOW_MODE_END:
             return 0;
         default:
@@ -93,7 +91,7 @@ ApiStatus N(ClearLavaGlowLighting)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     ModelIDList* modelIDs = (ModelIDList*) evt_get_variable(script, *args++);
     s32 i;
-        
+
     if (modelIDs != NULL) {
         // clear effect from models in the list
         u16* idList = modelIDs->list;
diff --git a/src/world/common/atomic/UnkFunc27.inc.c b/src/world/common/atomic/UnkFunc27.inc.c
index da2f03514f..9dc3635ad4 100644
--- a/src/world/common/atomic/UnkFunc27.inc.c
+++ b/src/world/common/atomic/UnkFunc27.inc.c
@@ -47,9 +47,6 @@ ApiStatus N(UnkFunc27)(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-void set_model_fog_color_parameters(u8 var2, u8 var3, u8 var4, u8 var5, u8 var6, u8 var7, u8 var8, s32 var9, s32 var10);
-void set_model_env_color_parameters(u8 var2, u8 var3, u8 var4, u8 var5, u8 var6, u8 var7);
-
 ApiStatus N(UnkFunc26)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     s32 var1 = evt_get_variable(script, *args++);
diff --git a/src/world/common/enemy/ai/UnkFloAI.inc.c b/src/world/common/enemy/ai/UnkFloAI.inc.c
index 902a1c216a..0d982fc7cc 100644
--- a/src/world/common/enemy/ai/UnkFloAI.inc.c
+++ b/src/world/common/enemy/ai/UnkFloAI.inc.c
@@ -1,5 +1,6 @@
 #include "common.h"
 #include "npc.h"
+#include "effects.h"
 #ifdef _DEAD_H_
 #include "dead_structs.h"
 #endif
@@ -25,7 +26,7 @@ void N(UnkFloAI_ChaseInit)(Evt* script, MobileAISettings* npcAISettings, EnemyDe
     f32 posXCCW;
     f32 posYCCW;
     f32 posZCCW;
-    
+
     npc->duration = npcAISettings->chaseUpdateInterval / 2 + rand_int(npcAISettings->chaseUpdateInterval / 2 + 1);
     npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_CHASE];
     npc->moveSpeed = npcAISettings->chaseSpeed;
diff --git a/src/world/common/todo/DeadUnkFunc1.inc.c b/src/world/common/todo/DeadUnkFunc1.inc.c
index 52b1defeae..171c974857 100644
--- a/src/world/common/todo/DeadUnkFunc1.inc.c
+++ b/src/world/common/todo/DeadUnkFunc1.inc.c
@@ -1,6 +1,5 @@
 #include "common.h"
-
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
+#include "effects.h"
 
 ApiStatus N(DeadUnkFunc1)(Evt* script, s32 isInitialCall) {
     fx_sun_undeclared(1, 0, 0, 0, 0, 0);
diff --git a/src/world/common/todo/PlayBigSmokePuff.inc.c b/src/world/common/todo/PlayBigSmokePuff.inc.c
new file mode 100644
index 0000000000..89c05d6ae4
--- /dev/null
+++ b/src/world/common/todo/PlayBigSmokePuff.inc.c
@@ -0,0 +1,14 @@
+#include "common_structs.h"
+#include "effects.h"
+#include "evt.h"
+
+ApiStatus N(PlayBigSmokePuff)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 x = evt_get_variable(script, *args++);
+    s32 y = evt_get_variable(script, *args++);
+    s32 z = evt_get_variable(script, *args++);
+
+    fx_big_smoke_puff(x, y, z);
+
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/todo/PlayRisingBubble.inc.c b/src/world/common/todo/PlayRisingBubble.inc.c
new file mode 100644
index 0000000000..b75d077ef6
--- /dev/null
+++ b/src/world/common/todo/PlayRisingBubble.inc.c
@@ -0,0 +1,14 @@
+#include "common_structs.h"
+#include "effects.h"
+#include "evt.h"
+
+ApiStatus N(PlayRisingBubble)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 x = evt_get_variable(script, *args++);
+    s32 y = evt_get_variable(script, *args++);
+    s32 z = evt_get_variable(script, *args++);
+
+    fx_rising_bubble(0, x, y, z, 0);
+
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/todo/PullVine.inc.c b/src/world/common/todo/PullVine.inc.c
index 882ff0a915..ec165f500d 100644
--- a/src/world/common/todo/PullVine.inc.c
+++ b/src/world/common/todo/PullVine.inc.c
@@ -7,7 +7,7 @@ ApiStatus N(PullVine_WaitForPlayerGrab)(Evt* script, s32 isInitialCall) {
     f32 dx, dy, dz;
     f32 dist;
     s32 result;
-    
+
     modelX = evt_get_float_variable(script, *args++);
     modelY = evt_get_float_variable(script, *args++) + 15.0f;
     modelZ = evt_get_float_variable(script, *args++);
@@ -27,32 +27,9 @@ ApiStatus N(PullVine_UpdatePosition)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     f32 x1 = evt_get_float_variable(script, *args++);
     f32 x2 = evt_get_float_variable(script, *args++);
-    
+
     evt_set_float_variable(script, *args++, (x2 - x1) / 10.0f);
     return ApiStatus_DONE2;
 }
 
-void N(PullVine_apply_shear_mtx)(Matrix4f mtx, f32 f) {
-    guMtxIdentF(mtx);
-    mtx[1][0] = f * 0.2;
-    mtx[1][1] = 1.0f;
-    mtx[1][2] = 0.0f;
-}
-
-ApiStatus N(PullVine_ShearBushModel)(Evt* script) {
-    Bytecode* args = script->ptrReadPos;
-    s32 modelID = evt_get_variable(script, *args++);
-    s32 modelIndex = get_model_list_index_from_tree_index(modelID);
-    f32 f = evt_get_float_variable(script, *args++);
-    Model* mdl = get_model_from_list_index(modelIndex);
-    Matrix4f mtx;
-    
-    if (!(mdl->flags & 0x400)) {
-        N(PullVine_apply_shear_mtx)(mdl->transformMatrix, f);
-        mdl->flags |= 0x1400;
-    } else {
-        N(PullVine_apply_shear_mtx)(mtx, f);
-        guMtxCatF(mtx, mdl->transformMatrix, mdl->transformMatrix);
-    }
-    return ApiStatus_DONE2;
-}
+#include "world/common/todo/PullVineSub.inc.c"
diff --git a/src/world/common/todo/PullVineSub.inc.c b/src/world/common/todo/PullVineSub.inc.c
new file mode 100644
index 0000000000..35b152e6a1
--- /dev/null
+++ b/src/world/common/todo/PullVineSub.inc.c
@@ -0,0 +1,27 @@
+#include "common.h"
+#include "model.h"
+
+void N(PullVine_apply_shear_mtx)(Matrix4f mtx, f32 f) {
+    guMtxIdentF(mtx);
+    mtx[1][0] = f * 0.2;
+    mtx[1][1] = 1.0f;
+    mtx[1][2] = 0.0f;
+}
+
+ApiStatus N(PullVine_ShearBushModel)(Evt* script) {
+    Bytecode* args = script->ptrReadPos;
+    s32 modelID = evt_get_variable(script, *args++);
+    s32 modelIndex = get_model_list_index_from_tree_index(modelID);
+    f32 f = evt_get_float_variable(script, *args++);
+    Model* mdl = get_model_from_list_index(modelIndex);
+    Matrix4f mtx;
+
+    if (!(mdl->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) {
+        N(PullVine_apply_shear_mtx)(mdl->transformMatrix, f);
+        mdl->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED;
+    } else {
+        N(PullVine_apply_shear_mtx)(mtx, f);
+        guMtxCatF(mtx, mdl->transformMatrix, mdl->transformMatrix);
+    }
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/todo/UnkFunc11.inc.c b/src/world/common/todo/UnkFunc11.inc.c
index e8c4fa0ee8..3c6254b3f5 100644
--- a/src/world/common/todo/UnkFunc11.inc.c
+++ b/src/world/common/todo/UnkFunc11.inc.c
@@ -6,7 +6,7 @@ ApiStatus N(UnkFunc11)(Evt* script, s32 isInitialCall) {
     PlayerStatus* playerStatus = &gPlayerStatus;
     CollisionStatus* collisionStatus = &gCollisionStatus;
 
-    if (((collisionStatus->pushingAgainstWall != pushableColliderID) && (playerStatus->actionState == ACTION_STATE_PUSHING_BLOCK)) ||
+    if ((collisionStatus->pushingAgainstWall != pushableColliderID && playerStatus->actionState == ACTION_STATE_PUSHING_BLOCK) ||
         playerStatus->enableCollisionOverlapsCheck || playerStatus->inputEnabledCounter) {
         set_action_state(ACTION_STATE_IDLE);
         script->varTable[0] = 0;
@@ -15,8 +15,11 @@ ApiStatus N(UnkFunc11)(Evt* script, s32 isInitialCall) {
 
     if (collisionStatus->pushingAgainstWall != pushableColliderID) {
         script->varTable[0] = 0;
-    } else if ((playerStatus->actionState != ACTION_STATE_PUSHING_BLOCK) && (playerStatus->actionState != ACTION_STATE_WALK) &&
-               (playerStatus->actionState != ACTION_STATE_RUN)) {
+    } else if (
+        (playerStatus->actionState != ACTION_STATE_PUSHING_BLOCK) &&
+        (playerStatus->actionState != ACTION_STATE_WALK) &&
+        (playerStatus->actionState != ACTION_STATE_RUN))
+    {
         script->varTable[0] = 0;
     } else if (playerStatus->animFlags & PA_FLAGS_HOLDING_WATT) {
         script->varTable[0] = 0;
diff --git a/src/world/dead/flo_00/EB8E50.c b/src/world/dead/flo_00/EB8E50.c
index d19ce9db17..618f6ef1d2 100644
--- a/src/world/dead/flo_00/EB8E50.c
+++ b/src/world/dead/flo_00/EB8E50.c
@@ -1,4 +1,5 @@
 #include "flo_00.h"
+#include "effects.h"
 
 const char ascii_EC2000[] = "mac_01";
 const char ascii_EC2008[] = "flo_14";
@@ -9,8 +10,6 @@ const char ascii_EC2028[] = "flo_09";
 const char ascii_EC2030[] = "flo_08";
 static const f64 rodata_alignment = 0.0;
 
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
-
 ApiStatus func_80240000_EB8E50(void) {
     fx_sun_undeclared(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
diff --git a/src/world/dead/flo_12/EDBFE0.c b/src/world/dead/flo_12/EDBFE0.c
index c21ec117e9..e931b6f936 100644
--- a/src/world/dead/flo_12/EDBFE0.c
+++ b/src/world/dead/flo_12/EDBFE0.c
@@ -1,6 +1,5 @@
 #include "flo_12.h"
-
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
+#include "effects.h"
 
 ApiStatus N(func_80240000_EDBFE0)(Evt *script, s32 isInitialCall) {
     fx_sun_undeclared(0, 0, 0, 0, 0, 0);
diff --git a/src/world/dead/flo_13/EDE9C0.c b/src/world/dead/flo_13/EDE9C0.c
index b10106aaad..5ff91433d9 100644
--- a/src/world/dead/flo_13/EDE9C0.c
+++ b/src/world/dead/flo_13/EDE9C0.c
@@ -1,6 +1,5 @@
 #include "flo_13.h"
-
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
+#include "effects.h"
 
 ApiStatus N(func_80240000_EDE9C0)(Evt *script, s32 isInitialCall) {
     fx_sun_undeclared(0, 0, 0, 0, 0, 0);
diff --git a/src/world/dead/flo_14/EE65B0.c b/src/world/dead/flo_14/EE65B0.c
index 97db97ab30..065ff405aa 100644
--- a/src/world/dead/flo_14/EE65B0.c
+++ b/src/world/dead/flo_14/EE65B0.c
@@ -1,11 +1,10 @@
 #include "flo_14.h"
+#include "effects.h"
 
 extern f32 D_80243B44_EEA0F4;
 
 #include "world/common/atomic/TexturePan.inc.c"
 
-void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
-
 ApiStatus func_8024030C_EE68BC(Evt *script, s32 isInitialCall) {
     fx_sun_undeclared(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
diff --git a/tools/find_similar_areas.py b/tools/find_similar_areas.py
index da91f98d4f..2a6cade258 100755
--- a/tools/find_similar_areas.py
+++ b/tools/find_similar_areas.py
@@ -16,6 +16,7 @@ script_dir = Path(os.path.dirname(os.path.realpath(__file__)))
 root_dir = script_dir / ".."
 asm_dir = root_dir / "ver/current/asm/nonmatchings/"
 build_dir = root_dir / "ver/current/build/"
+elf_path = build_dir / "papermario.elf"
 map_file_path = build_dir / "papermario.map"
 rom_path = root_dir / "ver/current/baserom.z64"
 
@@ -57,6 +58,25 @@ def get_all_unmatched_functions():
     return ret
 
 
+def get_func_sizes() -> Dict[str, int]:
+    try:
+        result = subprocess.run(['mips-linux-gnu-objdump', '-x', elf_path], stdout=subprocess.PIPE)
+        nm_lines = result.stdout.decode().split("\n")
+    except:
+        print(f"Error: Could not run objdump on {elf_path} - make sure that the project is built")
+        sys.exit(1)
+
+    sizes: Dict[str, int] = {}
+
+    for line in nm_lines:
+        if " F " in line:
+            components = line.split()
+            size = int(components[4], 16)
+            name = components[5]
+            sizes[name] = size
+
+    return sizes
+
 def get_symbol_bytes(func: str) -> Optional[Bytes]:
     if func not in syms or syms[func].rom_end is None:
         return None
@@ -118,7 +138,7 @@ def parse_map() -> OrderedDict[str, Symbol]:
             else:
                 if cur_sect != "(.text)":
                     continue
-                syms[fn] = Symbol(
+                new_sym = Symbol(
                     name=fn,
                     rom_start=rom,
                     ram=ram,
@@ -126,12 +146,15 @@ def parse_map() -> OrderedDict[str, Symbol]:
                     prev_sym=prev_sym,
                     is_decompiled=not fn in unmatched_functions,
                 )
+                if fn in func_sizes:
+                    new_sym.rom_end = rom + func_sizes[fn]
+                syms[fn] = new_sym
                 prev_sym = fn
 
     # Calc end offsets
     for sym in syms:
         prev_sym = syms[sym].prev_sym
-        if prev_sym:
+        if prev_sym and not syms[prev_sym].rom_end:
             syms[prev_sym].rom_end = syms[sym].rom_start
 
     return syms
@@ -254,13 +277,59 @@ def get_tu_offset(obj_file: Path, symbol: str) -> Optional[int]:
             return int(pieces[0], 16)
     return None
 
+@dataclass
+class CRange():
+    start: Optional[int] = None
+    end: Optional[int] = None
+    start_exact = False
+    end_exact = False
 
-def get_c_range(
-    insn_start: int, insn_end: int, line_numbers: Dict[int, int]
-) -> Tuple[Optional[int], Optional[int]]:
-    start = line_numbers.get(insn_start)
-    end = line_numbers.get(insn_end)
-    return start, end
+    def has_info(self):
+        return self.start is not None or self.end is not None
+
+    def __str__(self):
+        start_str = "?"
+        end_str = "?"
+
+        if self.start is not None:
+            if self.start_exact:
+                start_str = f"{self.start}"
+            else:
+                start_str = f"~{self.start}"
+
+        if self.end is not None:
+            if self.end_exact:
+                end_str = f"{self.end}"
+            else:
+                end_str = f"~{self.end}"
+
+        return f"{start_str} - {end_str}"
+
+
+def get_c_range(insn_start: int, insn_end: int, line_numbers: Dict[int, int]) -> CRange:
+    range = CRange()
+
+    if insn_start in line_numbers:
+        range.start = line_numbers[insn_start]
+        range.start_exact = True
+    else:
+        keys = list(line_numbers.keys())
+        for i, key in enumerate(keys[:-1]):
+            if keys[i + 1] > insn_start:
+                range.start = line_numbers[keys[i]]
+                break
+
+    if insn_end in line_numbers:
+        range.end = line_numbers[insn_end]
+        range.end_exact = True
+    else:
+        keys = list(line_numbers.keys())
+        for i, key in enumerate(keys):
+            if key > insn_end:
+                range.end = line_numbers[key]
+                break
+
+    return range
 
 
 def get_matches(query: str, window_size: int):
@@ -305,29 +374,25 @@ def get_matches(query: str, window_size: int):
                 query_end = result.query_start + total_len
                 target_end = result.target_start + total_len
 
-                c_start: Optional[int] = None
-                c_end: Optional[int] = None
+                c_range = None
                 if tu_offset is not None and len(line_numbers) > 0:
-                    c_start, c_end = get_c_range(
+                    c_range = get_c_range(
                         tu_offset + (result.target_start * 4),
                         tu_offset + (target_end * 4),
                         line_numbers,
                     )
 
                 target_range_str = ""
-                if c_start is not None or c_end is not None:
-                    start_str = c_start if c_start is not None else "?"
-                    end_str = c_end if c_end is not None else "?"
-
+                if c_range:
                     target_range_str = (
-                        fg.li_cyan + f" (line {start_str}-{end_str} in {obj_file.stem})" + fg.rs
+                        fg.li_cyan + f" (line {c_range} in {obj_file.stem})" + fg.rs
                     )
 
-                query_str = f"{query} [{result.query_start}-{query_end}]"
+                query_str = f"query [{result.query_start}-{query_end}]"
                 target_str = (
-                    f"{symbol} [{result.target_start}-{target_end}]{target_range_str}"
+                    f"{symbol} [insn {result.target_start}-{target_end}] ({total_len} total){target_range_str}"
                 )
-                print(f"\t{query_str} matches {target_str} ({total_len} total insns)")
+                print(f"\t{query_str} matches {target_str}")
 
     return OrderedDict(sorted(ret.items(), key=lambda kv: kv[1], reverse=True))
 
@@ -354,6 +419,7 @@ args = parser.parse_args()
 if __name__ == "__main__":
     rom_bytes = read_rom()
     unmatched_functions = get_all_unmatched_functions()
+    func_sizes = get_func_sizes()
     syms = parse_map()
 
     do_query(args.query, args.window_size)
diff --git a/ver/us/asm/data/world/area_jan/jan_05/B4E050.data.s b/ver/us/asm/data/world/area_jan/jan_05/B4E050.data.s
index 0501a28d39..24193294d5 100644
--- a/ver/us/asm/data/world/area_jan/jan_05/B4E050.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_05/B4E050.data.s
@@ -6,7 +6,7 @@ dlabel D_802435E0_B4E050
 .word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_05_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_05_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_05_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_05_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, jan_05_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, jan_05_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80243F44_B4E9B4
-.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000003D, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x00000065, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000067, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_80240738_B4B1A8, 0x00000065, 0xFE363C86, 0x00000043, 0x00000003, func_80240738_B4B1A8, 0x00000067, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000003D, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x00000065, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000067, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, jan_05_PullVine_ShearBushModel, 0x00000065, 0xFE363C86, 0x00000043, 0x00000003, jan_05_PullVine_ShearBushModel, 0x00000067, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024410C_B4EB7C
 .word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003D, 0x7FFFFE00, 0x00000044, 0x00000001, D_80243F44_B4E9B4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F80, 0xFD050F81, 0x0000002E, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_jan/jan_08/B60790.data.s b/ver/us/asm/data/world/area_jan/jan_08/B60790.data.s
index a770702ec7..0d5c7a7466 100644
--- a/ver/us/asm/data/world/area_jan/jan_08/B60790.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_08/B60790.data.s
@@ -21,13 +21,13 @@ dlabel D_802429D0_B60C80
 .word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_08_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_08_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_08_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_08_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, jan_08_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, jan_08_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80243334_B615E4
-.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000054, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x00000066, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000068, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_802405A8_B5E858, 0x00000066, 0xFE363C86, 0x00000043, 0x00000003, func_802405A8_B5E858, 0x00000068, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000054, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x00000066, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000068, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, jan_08_PullVine_ShearBushModel, 0x00000066, 0xFE363C86, 0x00000043, 0x00000003, jan_08_PullVine_ShearBushModel, 0x00000068, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802434FC_B617AC
 .word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000054, 0x7FFFFE00, 0x00000044, 0x00000001, D_80243334_B615E4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F80, 0xFD050F81, 0x0000002E, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802435E8_B61898
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000053, 0x00000153, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000003, func_802405A8_B5E858, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_802405A8_B5E858, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_802405A8_B5E858, 0xFE363C81, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF8406050, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008140, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFEC5, 0xFE363C85, 0x00000014, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000007, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008140, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEAC, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000007, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000053, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000009, 0x00000043, 0x00000006, RotateModel, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x0000010E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0xFE363C84, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFFFFFE79, 0x00000000, 0xFFFFFF70, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000007, 0x00000102, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000009, 0x00000043, 0x00000006, RotateModel, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0x00000009, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0xFE363C84, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000007, 0x00000001, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000007, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetNpcVar, 0x00000007, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000053, 0x00000153, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000003, jan_08_PullVine_ShearBushModel, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, jan_08_PullVine_ShearBushModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, jan_08_PullVine_ShearBushModel, 0xFE363C81, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF8406050, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008140, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFEC5, 0xFE363C85, 0x00000014, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000007, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008140, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEAC, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000007, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000053, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000009, 0x00000043, 0x00000006, RotateModel, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x0000010E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0xFE363C84, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFFFFFE79, 0x00000000, 0xFFFFFF70, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000007, 0x00000102, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000009, 0x00000043, 0x00000006, RotateModel, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0x00000009, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0xFE363C84, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000007, 0x00000001, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000007, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetNpcVar, 0x00000007, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80243970_B61C20
 .word 0x00000001, 0x00000062
diff --git a/ver/us/asm/data/world/area_jan/jan_09/B687D0.data.s b/ver/us/asm/data/world/area_jan/jan_09/B687D0.data.s
index af1ed8505c..edc421cbe4 100644
--- a/ver/us/asm/data/world/area_jan/jan_09/B687D0.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_09/B687D0.data.s
@@ -6,13 +6,13 @@ dlabel D_80242D20_B687D0
 .word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_09_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_09_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_09_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_09_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, jan_09_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, jan_09_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80243684_B69134
-.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000046, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x0000005F, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000061, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_80240888_B66338, 0x0000005F, 0xFE363C86, 0x00000043, 0x00000003, func_80240888_B66338, 0x00000061, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000046, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x0000005F, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000061, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, jan_09_PullVine_ShearBushModel, 0x0000005F, 0xFE363C86, 0x00000043, 0x00000003, jan_09_PullVine_ShearBushModel, 0x00000061, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024384C_B692FC
-.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000047, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F82, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F82, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, TranslateModel, 0x00000063, 0xFD050F82, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_80240888_B66338, 0x00000063, 0xFE363C86, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000047, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F82, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F82, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, TranslateModel, 0x00000063, 0xFD050F82, 0x00000000, 0x00000000, 0x00000043, 0x00000003, jan_09_PullVine_ShearBushModel, 0x00000063, 0xFE363C86, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80243954_B69404
-.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000048, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F83, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F84, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F83, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F84, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x00000065, 0xFD050F83, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000067, 0xFD050F84, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_80240888_B66338, 0x00000065, 0xFE363C86, 0x00000043, 0x00000003, func_80240888_B66338, 0x00000067, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000048, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F83, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F84, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F83, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F84, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x00000065, 0xFD050F83, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000067, 0xFD050F84, 0x00000000, 0x00000000, 0x00000043, 0x00000003, jan_09_PullVine_ShearBushModel, 0x00000065, 0xFE363C86, 0x00000043, 0x00000003, jan_09_PullVine_ShearBushModel, 0x00000067, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80243B1C_B695CC
 .word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000046, 0x7FFFFE00, 0x00000044, 0x00000001, D_80243684_B69134, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F80, 0xFD050F81, 0x0000002E, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -24,7 +24,7 @@ dlabel D_80243CD4_B69784
 .word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000048, 0x7FFFFE00, 0x00000044, 0x00000001, D_80243954_B69404, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F84, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F83, 0xFD050F84, 0x0000002E, 0x00000002, 0xFD050F83, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80243DC0_B69870
-.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000047, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000048, 0x7FFFFE00, 0x00000044, 0x00000001, D_8024384C_B692FC, 0x00000044, 0x00000001, D_80243954_B69404, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F84, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F83, 0xFD050F84, 0x0000002E, 0x00000002, 0xFD050F83, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000003, func_80240888_B66338, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80240888_B66338, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80240888_B66338, 0xFE363C81, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C81, 0x00000043, 0x00000007, DropItemEntity, 0x00000157, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000007, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000047, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000048, 0x7FFFFE00, 0x00000044, 0x00000001, D_8024384C_B692FC, 0x00000044, 0x00000001, D_80243954_B69404, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F84, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F83, 0xFD050F84, 0x0000002E, 0x00000002, 0xFD050F83, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000003, jan_09_PullVine_ShearBushModel, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, jan_09_PullVine_ShearBushModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, jan_09_PullVine_ShearBushModel, 0xFE363C81, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C81, 0x00000043, 0x00000007, DropItemEntity, 0x00000157, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000007, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80243FC4_B69A74
 .word 0x00000003, 0x00000001, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F85, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFD050F85, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFD050F85, 0x00000078, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F85, 0xFE363C83, 0x00000028, 0x00000002, 0xFD050F85, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000024, 0x00000002, 0xFD050F85, 0x00000E10, 0x00000005, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFD050F85, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A9280, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A8680, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24A0680, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A7EE0, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A7EE0, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24A7EE0, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7BB0, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x0000003C, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_jan/jan_22/B8E200.data.s b/ver/us/asm/data/world/area_jan/jan_22/B8E200.data.s
index 495cb6d6dc..b4f0108de1 100644
--- a/ver/us/asm/data/world/area_jan/jan_22/B8E200.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_22/B8E200.data.s
@@ -6,7 +6,7 @@ dlabel D_8024A080_B8E200
 .word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_22_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_22_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_22_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_22_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, jan_22_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, jan_22_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024A9E4_B8EB64
-.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000C, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x0000001D, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_80241668_B857E8, 0x0000001D, 0xFE363C86, 0x00000043, 0x00000003, func_80241668_B857E8, 0x0000001F, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001D, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0x0000002D, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_80241668_B857E8, 0x0000001D, 0x00000000, 0x00000043, 0x00000003, func_80241668_B857E8, 0x0000001F, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_8024A9E4_B8EB64, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F80, 0xFD050F81, 0x0000002E, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000C, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x0000001D, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, jan_22_PullVine_ShearBushModel, 0x0000001D, 0xFE363C86, 0x00000043, 0x00000003, jan_22_PullVine_ShearBushModel, 0x0000001F, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001D, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0x0000002D, 0x00000000, 0x00000000, 0x00000043, 0x00000003, jan_22_PullVine_ShearBushModel, 0x0000001D, 0x00000000, 0x00000043, 0x00000003, jan_22_PullVine_ShearBushModel, 0x0000001F, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_8024A9E4_B8EB64, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F80, 0xFD050F81, 0x0000002E, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024ACE8_B8EE68
 .word 0x00000001, 0x00000021
diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s
index a65ae8cc36..579b6bf94b 100644
--- a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s
+++ b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s
@@ -276,7 +276,7 @@ dlabel D_8024D3F0_8BD460
 .word 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B0012, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024D420_8BD490
-.word 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00800000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00800000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00800000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00800000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00800000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00800000, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2449E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, btl_state_draw_switch_to_player_8B2C18, 0x00000043, 0x00000006, func_8024295C_8B29CC, 0x00000000, 0x00000000, 0x00000000, 0x000000FF, 0x00000000, 0x00000043, 0x00000001, func_80242F08_8B2F78, 0x00000043, 0x00000008, func_80242BC0_8B2C30, 0x0000001E, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x000000C3, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000009C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000008C, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, kmr_02_SyncStatusMenu, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000008F, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080009, 0x00000043, 0x00000004, GetPlayerPos, 0xFFFFFF24, 0x00000021, 0xFFFFFEAA, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000C, 0x00002041, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFF3A, 0x00000073, 0xFFFFFEF0, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0xFFFFFF3A, 0x0000008C, 0xFFFFFEF0, 0x00000024, 0x00000002, 0xFD050F81, 0x00000078, 0x00000026, 0x00000002, 0xFD050F80, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0x0000000C, mac_02_Quizmo_AnswerResult_8BE5C8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000078, 0x00000050, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x0000000C, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000B40, 0x00000050, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x0000000C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000008C, 0x0000003C, 0x00000050, 0x00000004, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0xFFFFFF3A, 0xFE363C80, 0xFFFFFEF0, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2469280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AF280, 0xF24A2280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF247FA80, 0xF245A280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000C, 0x00120002, 0x00120001, 0x00000000, 0x000B0009, 0x00000043, 0x00000005, MakeLerp, 0x00000078, 0x0000003C, 0x00000014, 0x00000000, 0x00000003, 0x00000001, 0x00000005, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFD050F80, 0x00000032, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2449E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2478280, 0xF245A280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000003C, 0x00000000, 0x00000028, 0x00000000, 0x00000003, 0x00000001, 0x00000006, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x0000000C, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000006, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0x0000000C, D_8024E548_8BE5B8, 0x00000043, 0x00000005, GetNpcPos, 0x0000000C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000C, 0x00002041, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000044, 0x00000001, 0x80243B30, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80242F08_8B2F78, 0x00000043, 0x00000008, func_80242BC0_8B2C30, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000032, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080024, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetGroupEnabled, 0x000000C3, 0x00000001, 0x00000043, 0x00000001, func_80242F28_8B2F98, 0x00000043, 0x00000003, EnableModel, 0x0000008C, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000B8, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000C1, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFF4C, 0x00000013, 0xFFFFFEB1, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000008F, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000008F, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000143, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000008F, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000143, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000008F, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000143, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFFFFFF3B, 0x00000027, 0xFFFFFF44, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00830002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000200, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000011, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000099, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000000A, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000099, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000011, 0x000001C2, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0xFFFFFF40, 0xFFFFFF1A, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B000A, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0xFFFFFF60, 0xFFFFFECA, 0x00000021, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00830001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B000B, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B000C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001E, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B000D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0x00000000, 0xF245CA80, 0xF24ACA80, 0xF24A5280, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080016, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B000E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B000F, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000037, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B0010, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B0011, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2449E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, BindNpcInteract, 0x00000006, D_8024D3F0_8BD460, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00800000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00800000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00800000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00800000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00800000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00800000, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2449E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_80242BA8_8B2C18, 0x00000043, 0x00000006, func_8024295C_8B29CC, 0x00000000, 0x00000000, 0x00000000, 0x000000FF, 0x00000000, 0x00000043, 0x00000001, func_80242F08_8B2F78, 0x00000043, 0x00000008, func_80242BC0_8B2C30, 0x0000001E, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x000000C3, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000009C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000008C, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, kmr_02_SyncStatusMenu, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000008F, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080009, 0x00000043, 0x00000004, GetPlayerPos, 0xFFFFFF24, 0x00000021, 0xFFFFFEAA, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000C, 0x00002041, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFF3A, 0x00000073, 0xFFFFFEF0, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0xFFFFFF3A, 0x0000008C, 0xFFFFFEF0, 0x00000024, 0x00000002, 0xFD050F81, 0x00000078, 0x00000026, 0x00000002, 0xFD050F80, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0x0000000C, mac_02_Quizmo_AnswerResult_8BE5C8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000078, 0x00000050, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x0000000C, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000B40, 0x00000050, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x0000000C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000008C, 0x0000003C, 0x00000050, 0x00000004, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0xFFFFFF3A, 0xFE363C80, 0xFFFFFEF0, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2469280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AF280, 0xF24A2280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF247FA80, 0xF245A280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000C, 0x00120002, 0x00120001, 0x00000000, 0x000B0009, 0x00000043, 0x00000005, MakeLerp, 0x00000078, 0x0000003C, 0x00000014, 0x00000000, 0x00000003, 0x00000001, 0x00000005, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFD050F80, 0x00000032, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2449E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2478280, 0xF245A280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000003C, 0x00000000, 0x00000028, 0x00000000, 0x00000003, 0x00000001, 0x00000006, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x0000000C, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000006, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0x0000000C, D_8024E548_8BE5B8, 0x00000043, 0x00000005, GetNpcPos, 0x0000000C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000C, 0x00002041, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000044, 0x00000001, 0x80243B30, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80242F08_8B2F78, 0x00000043, 0x00000008, func_80242BC0_8B2C30, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000032, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080024, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetGroupEnabled, 0x000000C3, 0x00000001, 0x00000043, 0x00000001, func_80242F28_8B2F98, 0x00000043, 0x00000003, EnableModel, 0x0000008C, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000B8, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000C1, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFF4C, 0x00000013, 0xFFFFFEB1, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000008F, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000008F, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000143, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000008F, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000143, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000008F, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000143, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFFFFFF3B, 0x00000027, 0xFFFFFF44, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00830002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000200, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000011, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000099, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000000A, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000099, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000011, 0x000001C2, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0xFFFFFF40, 0xFFFFFF1A, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B000A, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0xFFFFFF60, 0xFFFFFECA, 0x00000021, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00830001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B000B, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B000C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001E, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B000D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0x00000000, 0xF245CA80, 0xF24ACA80, 0xF24A5280, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080016, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B000E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B000F, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000037, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B0010, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B0011, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2449E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, BindNpcInteract, 0x00000006, D_8024D3F0_8BD460, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024E538_8BE5A8
 .short 0x0001, 0x0003, 0x0005, 0x0007, 0x0007, 0x0005, 0x0003, 0x0000
diff --git a/ver/us/asm/data/world/area_mac/mac_05/857070.data.s b/ver/us/asm/data/world/area_mac/mac_05/857070.data.s
index 927da37663..7df1a1e249 100644
--- a/ver/us/asm/data/world/area_mac/mac_05/857070.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_05/857070.data.s
@@ -276,7 +276,7 @@ dlabel D_8024E5DC_86074C
 .word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024E3A0_860510, 0x0000000A, 0x00000002, 0xF8405CA6, 0x00000001, 0x00000043, 0x00000003, SetTattleMessage, 0x00000009, 0x001A0058, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024E62C_86079C
-.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000043, 0x00000001, filemenu_update_show_name_input_8554F0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700BF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802433BC_85552C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C0, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000002CD, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF840627D, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C1, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000B, 0x00000046, 0x00000001, D_802479A8_859B18, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C5, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x000000AC, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C2, 0x00000024, 0x00000002, 0xFE363C80, 0x000000BB, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000003, AddItem, 0xFE363C80, 0xFE363C81, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C3, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000002CD, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF840627D, 0x00000000, 0x00000027, 0x00000002, 0xF5DE02E2, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C4, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000043, 0x00000001, func_80243380_8554F0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700BF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802433BC_85552C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C0, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000002CD, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF840627D, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C1, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000B, 0x00000046, 0x00000001, D_802479A8_859B18, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C5, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x000000AC, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C2, 0x00000024, 0x00000002, 0xFE363C80, 0x000000BB, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000003, AddItem, 0xFE363C80, 0xFE363C81, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C3, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000002CD, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF840627D, 0x00000000, 0x00000027, 0x00000002, 0xF5DE02E2, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C4, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024E9A8_860B18
 .word 0x0000000B, 0x00000002, 0xF840627D, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024E62C_86079C, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_omo/omo_01/D9C200.data.s b/ver/us/asm/data/world/area_omo/omo_01/D9C200.data.s
index 8542e489c1..de754735c9 100644
--- a/ver/us/asm/data/world/area_omo/omo_01/D9C200.data.s
+++ b/ver/us/asm/data/world/area_omo/omo_01/D9C200.data.s
@@ -6,7 +6,7 @@ dlabel D_80241310_D9C200
 .word 0x40200000, 0x00000032, 0x0000000F, 0x42C80000, 0x00000000, 0x00000003, 0x4079999A, 0x00000014, 0x00000001, 0x43340000, 0x00000000, 0x00000001
 
 dlabel D_80241340_D9C230
-.word 0x00000043, 0x00000002, func_802409EC_D9B8DC, D_80241310_D9C200, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, omo_01_UnkFloAI_Main, D_80241310_D9C200, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241360_D9C250
 .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80241340_D9C230, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001
diff --git a/ver/us/asm/data/world/area_pra/pra_09/D59F80.data.s b/ver/us/asm/data/world/area_pra/pra_09/D59F80.data.s
index d48a8667b2..7449450c8a 100644
--- a/ver/us/asm/data/world/area_pra/pra_09/D59F80.data.s
+++ b/ver/us/asm/data/world/area_pra/pra_09/D59F80.data.s
@@ -54,13 +54,13 @@ dlabel D_80242268_D5AAF8
 .word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000182, 0x00000024, 0x00000002, 0xFE363C80, 0x00000182, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A9280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24ACA80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242374_D5AC04
-.word 0x00000043, 0x00000001, func_802415F8_D59E88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C83, 0x00000100, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C83, 0x0003000E, 0x00030003, 0x00000000, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80241310_D59BA0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C83, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C83, 0x00000100, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C84, 0x000002CD, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000B40, 0x00000028, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C84, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFE363C84, 0x004E0005, 0x004E0002, 0x00000000, 0x00000046, 0x00000001, D_80242268_D5AAF8, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C84, 0x004E0004, 0x00000043, 0x00000004, InterpNpcYaw, 0xFE363C84, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFE363C84, 0xF24A9480, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C84, 0x000002CB, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFE363C84, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C84, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, func_802415F8_D59E88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C83, 0x00000100, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C83, 0x0003000E, 0x00030003, 0x00000000, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, pra_09_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C83, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C83, 0x00000100, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C84, 0x000002CD, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000B40, 0x00000028, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C84, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFE363C84, 0x004E0005, 0x004E0002, 0x00000000, 0x00000046, 0x00000001, D_80242268_D5AAF8, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C84, 0x004E0004, 0x00000043, 0x00000004, InterpNpcYaw, 0xFE363C84, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFE363C84, 0xF24A9480, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C84, 0x000002CB, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFE363C84, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C84, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802425D0_D5AE60
 .word 0x00000043, 0x00000003, SetNpcJumpscale, 0xFE363C83, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024266C_D5AEFC
-.word 0x0000000A, 0x00000002, 0xFD050F82, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, func_80241310_D59BA0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0x000002CD, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x004E0004, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F83, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, func_80241310_D59BA0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000006, 0x000002CD, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x004E0004, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F84, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, func_80241310_D59BA0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000007, 0x000002CD, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x004E0004, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F85, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, func_80241310_D59BA0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000008, 0x000002CD, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x004E0004, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000008, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xFD050F82, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, pra_09_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0x000002CD, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x004E0004, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F83, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, pra_09_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000006, 0x000002CD, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x004E0004, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F84, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, pra_09_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000007, 0x000002CD, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x004E0004, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F85, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, pra_09_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000008, 0x000002CD, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x004E0004, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000008, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242A58_D5B2E8
 .word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C83, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C83, 0x00030007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0xFE363C83, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_13/D66880.data.s b/ver/us/asm/data/world/area_pra/pra_13/D66880.data.s
index e2656f983f..903e5a8e83 100644
--- a/ver/us/asm/data/world/area_pra/pra_13/D66880.data.s
+++ b/ver/us/asm/data/world/area_pra/pra_13/D66880.data.s
@@ -21,7 +21,7 @@ dlabel D_802425EC_D66BCC
 .word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000B40, 0x00000028, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C84, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024267C_D66C5C
-.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000005A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8280, 0x00000043, 0x00000004, PlayerMoveTo, 0x000001B8, 0xFFFFFFBA, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8E80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24FF280, 0xF24AAA80, 0xF24A5E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0001002B, 0x0001002B, 0x00000000, 0x00120139, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0003000E, 0x00030003, 0x00000000, 0x0012013A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A9280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, func_80241310_D658F0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000002CD, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0x00000002, 0x00000043, 0x00000003, SetNpcYaw, 0x00000002, 0x0000005A, 0x00000046, 0x00000001, D_802425EC_D66BCC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x004E0004, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x000001AE, 0xFFFFFFBA, 0x0000000F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80241310_D658F0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000185, 0x00000000, 0xFFFFFFC3, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x000002CD, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x01000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0x00000003, 0x00000043, 0x00000003, SetNpcYaw, 0x00000003, 0x0000005A, 0x00000046, 0x00000001, D_802425EC_D66BCC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x004E0004, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x000001A4, 0xFFFFFFBA, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000005A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8280, 0x00000043, 0x00000004, PlayerMoveTo, 0x000001B8, 0xFFFFFFBA, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8E80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24FF280, 0xF24AAA80, 0xF24A5E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0001002B, 0x0001002B, 0x00000000, 0x00120139, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0003000E, 0x00030003, 0x00000000, 0x0012013A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A9280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, pra_13_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000002CD, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0x00000002, 0x00000043, 0x00000003, SetNpcYaw, 0x00000002, 0x0000005A, 0x00000046, 0x00000001, D_802425EC_D66BCC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x004E0004, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x000001AE, 0xFFFFFFBA, 0x0000000F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, pra_13_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000185, 0x00000000, 0xFFFFFFC3, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x000002CD, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x01000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0x00000003, 0x00000043, 0x00000003, SetNpcYaw, 0x00000003, 0x0000005A, 0x00000046, 0x00000001, D_802425EC_D66BCC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x004E0004, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x000001A4, 0xFFFFFFBA, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242A70_D67050
 .word 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000190, 0x00000000, 0xFFFFFFBA, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000172, 0x00000000, 0xFFFFFFBA, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x004E0002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x004E0002, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x004E0005, 0x004E0002, 0x00000000, 0x0012013B, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000002CB, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x004E0004, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x00000000, 0xFFFFFFBA, 0x0000002D, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x000002CB, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x004E0004, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFFE2, 0xFFFFFFBA, 0x0000002D, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFFE2, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000004F, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_19/D70A70.data.s b/ver/us/asm/data/world/area_pra/pra_19/D70A70.data.s
index 9d520849d2..883558aeea 100644
--- a/ver/us/asm/data/world/area_pra/pra_19/D70A70.data.s
+++ b/ver/us/asm/data/world/area_pra/pra_19/D70A70.data.s
@@ -39,13 +39,13 @@ dlabel D_8024266C_D7101C
 .word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000182, 0x00000024, 0x00000002, 0xFE363C80, 0x00000182, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A9280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24ACA80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242778_D71128
-.word 0x00000043, 0x00000001, func_80241710_D700C0, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C83, 0x00000100, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C83, 0xFE363C86, 0xFE363C87, 0x00000000, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80241310_D6FCC0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C83, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C83, 0x00000100, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C84, 0x000002CD, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000B40, 0x00000028, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C84, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFE363C84, 0x004E0005, 0x004E0002, 0x00000000, 0x00000046, 0x00000001, D_8024266C_D7101C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C84, 0x004E0004, 0x00000043, 0x00000004, InterpNpcYaw, 0xFE363C84, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFE363C84, 0xF24A9480, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C84, 0x000002CB, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFE363C84, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C84, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, func_80241710_D700C0, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C83, 0x00000100, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C83, 0xFE363C86, 0xFE363C87, 0x00000000, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, pra_19_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C83, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C83, 0x00000100, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C84, 0x000002CD, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000B40, 0x00000028, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C84, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFE363C84, 0x004E0005, 0x004E0002, 0x00000000, 0x00000046, 0x00000001, D_8024266C_D7101C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C84, 0x004E0004, 0x00000043, 0x00000004, InterpNpcYaw, 0xFE363C84, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFE363C84, 0xF24A9480, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C84, 0x000002CB, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFE363C84, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C84, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802429D4_D71384
 .word 0x00000043, 0x00000003, SetNpcJumpscale, 0xFE363C83, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242A70_D71420
-.word 0x0000000A, 0x00000002, 0xFD050F82, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, func_80241310_D6FCC0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000007, 0x000002CD, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F83, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, func_80241310_D6FCC0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000008, 0x000002CD, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000008, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F84, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, func_80241310_D6FCC0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000009, 0x000002CD, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000009, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F85, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, func_80241310_D6FCC0, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000A, 0x000002CD, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xFD050F82, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, pra_19_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000007, 0x000002CD, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F83, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, pra_19_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000008, 0x000002CD, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000008, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F84, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, pra_19_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000009, 0x000002CD, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000009, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F85, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, pra_19_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000A, 0x000002CD, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242E0C_D717BC
 .word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C83, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0xFE363C83, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_22/D78BF0.data.s b/ver/us/asm/data/world/area_pra/pra_22/D78BF0.data.s
index d57e8744fb..d321ff8c42 100644
--- a/ver/us/asm/data/world/area_pra/pra_22/D78BF0.data.s
+++ b/ver/us/asm/data/world/area_pra/pra_22/D78BF0.data.s
@@ -21,7 +21,7 @@ dlabel D_80240510_D78D90
 .word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_802404C8_D78D48, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, D_80240370_D78BF0, 0x00000024, 0x00000002, 0xFE363C83, D_80240378_D78BF8, 0x00000046, 0x00000001, D_802861B0_7E7030, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_802404C8_D78D48, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80240608_D78E88
-.word 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_22_UnkFunc11, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, pra_22_UnkFunc12, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080002, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000008, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001C, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_22_UnkFunc11, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, func_802400DC_D7895C, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080002, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000008, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001C, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80240AB0_D79330
 .word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000151, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C80, 0x0000019D, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000012, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001C, 0x00000046, 0x00000001, D_80240608_D78E88, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000054, 0x00000024, 0x00000002, 0xF5DE029E, 0xFE363C88, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000048, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80241088, 0x00000044, 0x00000001, 0x80240330, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000054, 0x00000047, 0x00000005, D_80240AB0_D79330, 0x00000040, 0x0000001C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE029E, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFCE, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFCE, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000032, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x00000021, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000044, 0x00000001, D_80240510_D78D90, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_29/D7E9B0.data.s b/ver/us/asm/data/world/area_pra/pra_29/D7E9B0.data.s
index 30e36e45a0..487dca4072 100644
--- a/ver/us/asm/data/world/area_pra/pra_29/D7E9B0.data.s
+++ b/ver/us/asm/data/world/area_pra/pra_29/D7E9B0.data.s
@@ -3,4 +3,4 @@
 .section .data
 
 dlabel D_80241E60_D7E9B0
-.word 0x00000008, 0x00000001, 0x00000028, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, func_802411D4_D7DD24, 0x00000104, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000002F, 0x00000000, 0x000000FA, 0x00000000, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000001FF, 0x00000050, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000053, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000053, 0x00000043, 0x00000003, EnableModel, 0x00000033, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000038, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x000000FF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000035, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000003A, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelFlags, 0x00000035, 0x00000010, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x0000003A, 0x00000010, 0x00000000, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000000, func_802410B0_D7DC00, 0x00000000, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, func_802410B0_D7DC00, 0x00000000, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000000, 0x00000035, 0x00000001, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000001, 0x00000034, 0x00000000, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000002, 0x00000036, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x00000035, 0x00000090, 0x00000001, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000003, 0x0000003A, 0x00000001, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000004, 0x00000039, 0x00000000, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000005, 0x0000003B, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x0000003A, 0x00000090, 0x00000001, 0x00000047, 0x00000005, D_80241E60_D7E9B0, 0x00020000, 0xF9718882, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000033, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000034, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000035, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000038, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000039, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003A, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000008, 0x00000001, 0x00000028, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, pra_29_PlayRisingBubble, 0x00000104, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000002F, 0x00000000, 0x000000FA, 0x00000000, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000001FF, 0x00000050, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000053, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000053, 0x00000043, 0x00000003, EnableModel, 0x00000033, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000038, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x000000FF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000035, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000003A, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelFlags, 0x00000035, 0x00000010, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x0000003A, 0x00000010, 0x00000000, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000000, func_802410B0_D7DC00, 0x00000000, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, func_802410B0_D7DC00, 0x00000000, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000000, 0x00000035, 0x00000001, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000001, 0x00000034, 0x00000000, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000002, 0x00000036, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x00000035, 0x00000090, 0x00000001, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000003, 0x0000003A, 0x00000001, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000004, 0x00000039, 0x00000000, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000005, 0x0000003B, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x0000003A, 0x00000090, 0x00000001, 0x00000047, 0x00000005, D_80241E60_D7E9B0, 0x00020000, 0xF9718882, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000033, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000034, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000035, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000038, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000039, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003A, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_31/D81250.data.s b/ver/us/asm/data/world/area_pra/pra_31/D81250.data.s
index f24bb50ce2..65532b0c32 100644
--- a/ver/us/asm/data/world/area_pra/pra_31/D81250.data.s
+++ b/ver/us/asm/data/world/area_pra/pra_31/D81250.data.s
@@ -18,7 +18,7 @@ dlabel D_80242B40_D818A0
 .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240E70_D7FBD0, 0x00000000, 0x00000024, 0x00000002, 0xFD050F86, 0xFE363C82, 0x00000043, 0x00000002, func_80240E70_D7FBD0, 0x00000001, 0x00000024, 0x00000002, 0xFD050F87, 0xFE363C82, 0x00000043, 0x00000002, func_80240E70_D7FBD0, 0x00000002, 0x00000024, 0x00000002, 0xFD050F88, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240E70_D7FBD0, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000003B, 0xFE363C80, 0x00000000, 0xFE363C81, 0x00000043, 0x00000006, RotateGroup, 0x00000038, 0xFD050F86, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240E70_D7FBD0, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000043, 0xFE363C80, 0x00000000, 0xFE363C81, 0x00000043, 0x00000006, RotateGroup, 0x00000040, 0xFD050F87, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240E70_D7FBD0, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x0000004B, 0xFE363C80, 0x00000000, 0xFE363C81, 0x00000043, 0x00000006, RotateGroup, 0x00000048, 0xFD050F88, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240F2C_D7FC8C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C80, 0xFFFFFFF6, 0xFE363C81, 0x00000043, 0x00000002, func_80240F2C_D7FC8C, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFFFFFFF6, 0xFE363C81, 0x00000043, 0x00000002, func_80240F2C_D7FC8C, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C80, 0xFFFFFFF6, 0xFE363C81, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001F, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000022, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000024, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000025, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000026, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000027, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242E04_D81B64
-.word 0x00000043, 0x00000002, btl_delete_actor_D7F91C, 0xFE363C8A, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000002, func_80240FF0_D7FD50, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240C70_D7F9D0, 0xFE363C8A, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFE363C84, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, pra_31_UnkFunc12, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000028, 0xF24A7BB4, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x0000002D, 0x00000000, 0x00000043, 0x00000002, func_80240A3C_D7F79C, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000043, 0x00000001, func_80240FD0_D7FD30, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80240FF0_D7FD50, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80240FF0_D7FD50, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, btl_delete_actor_D7F91C, 0xFE363C8A, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000002, pra_31_UnkFunc11, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240C70_D7F9D0, 0xFE363C8A, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFE363C84, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, pra_31_UnkFunc12, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000028, 0xF24A7BB4, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x0000002D, 0x00000000, 0x00000043, 0x00000002, func_80240A3C_D7F79C, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000043, 0x00000001, func_80240FD0_D7FD30, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, pra_31_UnkFunc11, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, pra_31_UnkFunc11, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80243078_D81DD8
 .word 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000055, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240894_D7F5F4, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001B, 0x00000046, 0x00000001, D_80242E04_D81B64, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_35/D90700.data.s b/ver/us/asm/data/world/area_pra/pra_35/D90700.data.s
index 036e46f678..f5cf30e24b 100644
--- a/ver/us/asm/data/world/area_pra/pra_35/D90700.data.s
+++ b/ver/us/asm/data/world/area_pra/pra_35/D90700.data.s
@@ -12,7 +12,7 @@ dlabel D_8024359C_D907EC
 .word 0x40000000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000007, 0x40733333, 0x0000003C, 0x0000000A, 0x42DC0000, 0x42480000, 0x00000001
 
 dlabel D_802435CC_D9081C
-.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, func_802423CC_D8F61C, D_8024359C_D907EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, pra_35_ClubbaPatrolAI_Main, D_8024359C_D907EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024363C_D9088C
 .word 0x00000000, 0x00240022, 0x00000000, 0x00000000, D_802435CC_D9081C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000
diff --git a/ver/us/asm/data/world/area_sam/sam_08/D335E0.data.s b/ver/us/asm/data/world/area_sam/sam_08/D335E0.data.s
index e46302510d..a9731f427c 100644
--- a/ver/us/asm/data/world/area_sam/sam_08/D335E0.data.s
+++ b/ver/us/asm/data/world/area_sam/sam_08/D335E0.data.s
@@ -3,7 +3,7 @@
 .section .data
 
 dlabel D_80243960_D335E0
-.word 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x8000006C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_8024174C_D313CC, 0x00000050, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000004, func_80241610_D31290, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802416A4_D31324, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x8000006C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_8024174C_D313CC, 0x00000050, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000004, sam_08_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802416A4_D31324, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80243A18_D33698
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000001B, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001B, 0x00008000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000016, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000019, 0x0000039B, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF88, 0x00000000, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000017, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C85, 0x00000014, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C85, 0x0000003C, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C85, 0x00000014, 0x00000004, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00020003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00020003, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000002, 0x0000002D, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0xFFFFFFD3, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000002, 0x0000002D, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00020003, 0x00020003, 0x00000005, 0x0012011F, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00020006, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump1, 0x00000000, 0xFFFFFBDA, 0xFFFFFF88, 0xFFFFFFDB, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00020003, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00020006, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump1, 0x00000001, 0xFFFFFB6C, 0xFFFFFF88, 0xFFFFFFDB, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00020003, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00120120, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C86, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24A8280, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000E, 0x00020003, 0x00000000, 0x00120121, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C89, 0xFE363C86, 0x0000002F, 0x00000002, 0xFE363C87, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C88, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C89, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000E, 0x00020003, 0x00000000, 0x00120122, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000E, 0x00020003, 0x00000000, 0x00120123, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000E, 0x00020003, 0x00000000, 0x00120124, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000E, 0x00020003, 0x00000000, 0x00120125, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000E, 0x00020003, 0x00000000, 0x00120126, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000E, 0x00020003, 0x00000000, 0x00120127, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000E, 0x00020003, 0x00000000, 0x00120128, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000E, 0x00020003, 0x00000000, 0x00120129, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x000000C0, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0002000C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00020003, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002F, 0x00000002, 0xFE363C80, 0x00000002, 0x0000002F, 0x00000002, 0xFE363C81, 0x00000002, 0x0000002F, 0x00000002, 0xFE363C82, 0x00000002, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C87, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24A8280, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000F, 0x00020002, 0x00000000, 0x0012012C, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C87, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C88, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002C, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C84, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C85, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00020011, 0x00020003, 0x00000000, 0x0012012D, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C87, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C88, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002C, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C84, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C85, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000F, 0x00020002, 0x00000000, 0x0012012E, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C87, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C88, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002C, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C84, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C85, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000E, 0x00020003, 0x00000000, 0x0012012F, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000000, 0x00000001, 0xFE363C89, 0x00000043, 0x00000006, GetDist2D, 0xFE363C8A, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C85, 0x0000002E, 0x00000002, 0xFE363C8A, 0xF24A7CE7, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C82, 0xFE363C8A, 0xFE363C89, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00020006, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000A, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000045, 0x00000002, D_80243960_D335E0, 0xFD050F80, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C86, 0xFE363C88, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00020005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00020005, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, GetNpcYaw, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000004, func_80241610_D31290, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFE2, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump1, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump1, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, GetNpcYaw, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000004, func_80241610_D31290, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000037, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, GetNpcYaw, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000004, func_80241610_D31290, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump1, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump1, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, GetNpcYaw, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000004, func_80241610_D31290, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x8000006C, 0x00000049, 0x00000001, 0xFD050F80, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000032, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000006, NpcJump1, 0x00000000, 0xFFFFFBDA, 0xFFFFFF88, 0xFFFFFFDB, 0x0000000F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A8280, 0x00000043, 0x00000006, NpcJump1, 0x00000001, 0xFFFFFB6C, 0xFFFFFF88, 0xFFFFFFDB, 0x0000000F, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000006, NpcJump1, 0x00000000, 0xFFFFFB6C, 0xFFFFFF88, 0xFFFFFFDB, 0x0000000F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A8280, 0x00000043, 0x00000006, NpcJump1, 0x00000001, 0xFFFFFBDA, 0xFFFFFF88, 0xFFFFFFDB, 0x0000000F, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00020003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00020003, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002C, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C84, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C85, 0xF24A8280, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C81, 0x0000002C, 0x00000002, 0xFE363C88, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C87, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C88, 0xF24A8280, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DAE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000D, 0x00020003, 0x00000000, 0x00120125, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000D, 0x00020003, 0x00000000, 0x00120124, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000D, 0x00020003, 0x00000000, 0x00120127, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000D, 0x00020003, 0x00000000, 0x00120126, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000D, 0x00020003, 0x00000000, 0x00120129, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000D, 0x00020003, 0x00000000, 0x00120128, 0x00000012, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DAE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000D, 0x00020003, 0x00000000, 0x00120124, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000D, 0x00020003, 0x00000000, 0x00120125, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000D, 0x00020003, 0x00000000, 0x00120126, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000D, 0x00020003, 0x00000000, 0x00120127, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000D, 0x00020003, 0x00000000, 0x00120128, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000D, 0x00020003, 0x00000000, 0x00120129, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x000000C0, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0002000C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B8, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000004, func_80241610_D31290, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000002CD, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000B40, 0x00000028, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000002, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000003, GetAngleToNPC, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C83, 0xF24B1A80, 0xFE363C80, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00020005, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00020003, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x004E0005, 0x004E0002, 0x00000000, 0x00120130, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000D, 0x00020003, 0x00000005, 0x00120131, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x004E0005, 0x004E0002, 0x00000000, 0x00120132, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x004E0006, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, SetNpcVar, 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000019, 0x00000016, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000005, TranslateGroup, 0x00000017, 0x00000000, 0xFFFFFF88, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000043, 0x00000003, EnableModel, 0x00000016, 0x00000000, 0x00000047, 0x00000005, D_80243A18_D33698, 0x00020000, 0xF9718886, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000001B, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001B, 0x00008000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000016, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000019, 0x0000039B, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF88, 0x00000000, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000017, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C85, 0x00000014, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C85, 0x0000003C, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C85, 0x00000014, 0x00000004, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00020003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00020003, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000002, 0x0000002D, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0xFFFFFFD3, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000002, 0x0000002D, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00020003, 0x00020003, 0x00000005, 0x0012011F, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00020006, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump1, 0x00000000, 0xFFFFFBDA, 0xFFFFFF88, 0xFFFFFFDB, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00020003, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00020006, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump1, 0x00000001, 0xFFFFFB6C, 0xFFFFFF88, 0xFFFFFFDB, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00020003, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00120120, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C86, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24A8280, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000E, 0x00020003, 0x00000000, 0x00120121, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C89, 0xFE363C86, 0x0000002F, 0x00000002, 0xFE363C87, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C88, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C89, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000E, 0x00020003, 0x00000000, 0x00120122, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000E, 0x00020003, 0x00000000, 0x00120123, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000E, 0x00020003, 0x00000000, 0x00120124, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000E, 0x00020003, 0x00000000, 0x00120125, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000E, 0x00020003, 0x00000000, 0x00120126, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000E, 0x00020003, 0x00000000, 0x00120127, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000E, 0x00020003, 0x00000000, 0x00120128, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000E, 0x00020003, 0x00000000, 0x00120129, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x000000C0, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0002000C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00020003, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002F, 0x00000002, 0xFE363C80, 0x00000002, 0x0000002F, 0x00000002, 0xFE363C81, 0x00000002, 0x0000002F, 0x00000002, 0xFE363C82, 0x00000002, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C87, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24A8280, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000F, 0x00020002, 0x00000000, 0x0012012C, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C87, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C88, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002C, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C84, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C85, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00020011, 0x00020003, 0x00000000, 0x0012012D, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C87, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C88, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002C, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C84, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C85, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000F, 0x00020002, 0x00000000, 0x0012012E, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C87, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C88, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002C, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C84, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C85, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000E, 0x00020003, 0x00000000, 0x0012012F, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000000, 0x00000001, 0xFE363C89, 0x00000043, 0x00000006, GetDist2D, 0xFE363C8A, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C85, 0x0000002E, 0x00000002, 0xFE363C8A, 0xF24A7CE7, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C82, 0xFE363C8A, 0xFE363C89, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00020006, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000A, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000045, 0x00000002, D_80243960_D335E0, 0xFD050F80, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C86, 0xFE363C88, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00020005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00020005, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, GetNpcYaw, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000004, sam_08_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFE2, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump1, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump1, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, GetNpcYaw, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000004, sam_08_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000037, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, GetNpcYaw, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000004, sam_08_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump1, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump1, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, GetNpcYaw, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000004, sam_08_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x8000006C, 0x00000049, 0x00000001, 0xFD050F80, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000032, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000006, NpcJump1, 0x00000000, 0xFFFFFBDA, 0xFFFFFF88, 0xFFFFFFDB, 0x0000000F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A8280, 0x00000043, 0x00000006, NpcJump1, 0x00000001, 0xFFFFFB6C, 0xFFFFFF88, 0xFFFFFFDB, 0x0000000F, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000006, NpcJump1, 0x00000000, 0xFFFFFB6C, 0xFFFFFF88, 0xFFFFFFDB, 0x0000000F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A8280, 0x00000043, 0x00000006, NpcJump1, 0x00000001, 0xFFFFFBDA, 0xFFFFFF88, 0xFFFFFFDB, 0x0000000F, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00020003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00020003, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002C, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C84, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C85, 0xF24A8280, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C81, 0x0000002C, 0x00000002, 0xFE363C88, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C87, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C88, 0xF24A8280, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DAE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000D, 0x00020003, 0x00000000, 0x00120125, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000D, 0x00020003, 0x00000000, 0x00120124, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000D, 0x00020003, 0x00000000, 0x00120127, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000D, 0x00020003, 0x00000000, 0x00120126, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000D, 0x00020003, 0x00000000, 0x00120129, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000D, 0x00020003, 0x00000000, 0x00120128, 0x00000012, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DAE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000D, 0x00020003, 0x00000000, 0x00120124, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000D, 0x00020003, 0x00000000, 0x00120125, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000D, 0x00020003, 0x00000000, 0x00120126, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000D, 0x00020003, 0x00000000, 0x00120127, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0002000D, 0x00020003, 0x00000000, 0x00120128, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000D, 0x00020003, 0x00000000, 0x00120129, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x000000C0, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0002000C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B8, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000004, sam_08_PlayBigSmokePuff, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000002CD, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000B40, 0x00000028, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000002, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000003, GetAngleToNPC, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C83, 0xF24B1A80, 0xFE363C80, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00020005, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00020003, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x004E0005, 0x004E0002, 0x00000000, 0x00120130, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0002000D, 0x00020003, 0x00000005, 0x00120131, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x004E0005, 0x004E0002, 0x00000000, 0x00120132, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x004E0006, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, SetNpcVar, 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000019, 0x00000016, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000005, TranslateGroup, 0x00000017, 0x00000000, 0xFFFFFF88, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000043, 0x00000003, EnableModel, 0x00000016, 0x00000000, 0x00000047, 0x00000005, D_80243A18_D33698, 0x00020000, 0xF9718886, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_sam/sam_12/D4C2A0.data.s b/ver/us/asm/data/world/area_sam/sam_12/D4C2A0.data.s
index 74ccb39ab3..a6235b248a 100644
--- a/ver/us/asm/data/world/area_sam/sam_12/D4C2A0.data.s
+++ b/ver/us/asm/data/world/area_sam/sam_12/D4C2A0.data.s
@@ -15,4 +15,4 @@ dlabel D_80240A78_D4C498
 .word 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000B1, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80240B30_D4C550
-.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x0000032F, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000A0, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A0, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000005A, 0x00000000, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802409E0_D4C400, 0xFE363C89, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000000C8, 0x00000032, 0x00000000, 0x00000044, 0x00000001, D_80240A78_D4C498, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000139, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000064, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000045, 0x00000002, D_80240894_D4C2B4, 0xFE363C88, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120133, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DFE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5C80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24B6A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120134, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A0, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120135, 0x00000045, 0x00000002, D_80240B30_D4C550, 0xFE363C8A, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000032, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A8EE7, 0x00000043, 0x00000002, func_80240090_D4BAB0, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000007, func_80240238_D4BC58, 0xFFFFFFA6, 0x00000006, 0xFFFFFFFB, 0x00000002, 0x00000000, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24E7680, 0x00000005, 0x00000001, 0x00000064, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A704D, 0x00000043, 0x00000002, func_80240090_D4BAB0, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120136, 0x00000003, 0x00000001, 0x00000006, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000006, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, RemoveEffect, 0xFE363C87, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x000002F1, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001E, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DFE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5C80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24B6A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120137, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000E6, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24E1280, 0xF24B6A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, func_80240194_D4BBB4, 0x000000E8, 0x0000001F, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000032, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7CFB, 0x00000043, 0x00000005, func_802400C0_D4BAE0, 0xFD050F80, 0xF24E1280, 0xFE363C80, 0xF24A7A80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A0, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120138, 0x00000049, 0x00000001, 0xFE363C88, 0x00000049, 0x00000001, 0xFE363C89, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000005, 0x00000001, 0x00000005, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000002, 0x000000E6, 0x0000001E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000005, 0x00000001, 0x00000064, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000004C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
+.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x0000032F, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000A0, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A0, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000005A, 0x00000000, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802409E0_D4C400, 0xFE363C89, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000000C8, 0x00000032, 0x00000000, 0x00000044, 0x00000001, D_80240A78_D4C498, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000139, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000064, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000045, 0x00000002, D_80240894_D4C2B4, 0xFE363C88, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120133, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DFE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5C80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24B6A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120134, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A0, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120135, 0x00000045, 0x00000002, D_80240B30_D4C550, 0xFE363C8A, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000032, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A8EE7, 0x00000043, 0x00000002, func_80240090_D4BAB0, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000007, func_80240238_D4BC58, 0xFFFFFFA6, 0x00000006, 0xFFFFFFFB, 0x00000002, 0x00000000, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24E7680, 0x00000005, 0x00000001, 0x00000064, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A704D, 0x00000043, 0x00000002, func_80240090_D4BAB0, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120136, 0x00000003, 0x00000001, 0x00000006, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000006, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, RemoveEffect, 0xFE363C87, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x000002F1, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001E, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DFE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5C80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24B6A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120137, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000E6, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24E1280, 0xF24B6A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, sam_12_PlayRisingBubble, 0x000000E8, 0x0000001F, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000032, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7CFB, 0x00000043, 0x00000005, func_802400C0_D4BAE0, 0xFD050F80, 0xF24E1280, 0xFE363C80, 0xF24A7A80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A0, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B10002, 0x00B10001, 0x00000000, 0x00120138, 0x00000049, 0x00000001, 0xFE363C88, 0x00000049, 0x00000001, 0xFE363C89, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000005, 0x00000001, 0x00000005, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000002, 0x000000E6, 0x0000001E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000005, 0x00000001, 0x00000064, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000004C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/nonmatchings/19FAF0/PlayerFallToGoal.s b/ver/us/asm/nonmatchings/19FAF0/PlayerFallToGoal.s
deleted file mode 100644
index 66ad61eba8..0000000000
--- a/ver/us/asm/nonmatchings/19FAF0/PlayerFallToGoal.s
+++ /dev/null
@@ -1,166 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel PlayerFallToGoal
-/* 1A2174 80273894 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* 1A2178 80273898 AFB00018 */  sw        $s0, 0x18($sp)
-/* 1A217C 8027389C 3C10800E */  lui       $s0, %hi(gBattleStatus+0xD8)
-/* 1A2180 802738A0 8E10C148 */  lw        $s0, %lo(gBattleStatus+0xD8)($s0)
-/* 1A2184 802738A4 AFB20020 */  sw        $s2, 0x20($sp)
-/* 1A2188 802738A8 0080902D */  daddu     $s2, $a0, $zero
-/* 1A218C 802738AC AFBF0024 */  sw        $ra, 0x24($sp)
-/* 1A2190 802738B0 AFB1001C */  sw        $s1, 0x1c($sp)
-/* 1A2194 802738B4 F7BE0050 */  sdc1      $f30, 0x50($sp)
-/* 1A2198 802738B8 F7BC0048 */  sdc1      $f28, 0x48($sp)
-/* 1A219C 802738BC F7BA0040 */  sdc1      $f26, 0x40($sp)
-/* 1A21A0 802738C0 F7B80038 */  sdc1      $f24, 0x38($sp)
-/* 1A21A4 802738C4 F7B60030 */  sdc1      $f22, 0x30($sp)
-/* 1A21A8 802738C8 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* 1A21AC 802738CC 8E43000C */  lw        $v1, 0xc($s2)
-/* 1A21B0 802738D0 10A00002 */  beqz      $a1, .L802738DC
-/* 1A21B4 802738D4 2611000C */   addiu    $s1, $s0, 0xc
-/* 1A21B8 802738D8 AE400070 */  sw        $zero, 0x70($s2)
-.L802738DC:
-/* 1A21BC 802738DC 8E420070 */  lw        $v0, 0x70($s2)
-/* 1A21C0 802738E0 14400046 */  bnez      $v0, .L802739FC
-/* 1A21C4 802738E4 00000000 */   nop
-/* 1A21C8 802738E8 8C650000 */  lw        $a1, ($v1)
-/* 1A21CC 802738EC 0C0B1EAF */  jal       evt_get_variable
-/* 1A21D0 802738F0 0240202D */   daddu    $a0, $s2, $zero
-/* 1A21D4 802738F4 C6000148 */  lwc1      $f0, 0x148($s0)
-/* 1A21D8 802738F8 C61A0018 */  lwc1      $f26, 0x18($s0)
-/* 1A21DC 802738FC C61C0020 */  lwc1      $f28, 0x20($s0)
-/* 1A21E0 80273900 C614014C */  lwc1      $f20, 0x14c($s0)
-/* 1A21E4 80273904 C618001C */  lwc1      $f24, 0x1c($s0)
-/* 1A21E8 80273908 A6020070 */  sh        $v0, 0x70($s0)
-/* 1A21EC 8027390C E6000010 */  swc1      $f0, 0x10($s0)
-/* 1A21F0 80273910 46000786 */  mov.s     $f30, $f0
-/* 1A21F4 80273914 4406D000 */  mfc1      $a2, $f26
-/* 1A21F8 80273918 4407E000 */  mfc1      $a3, $f28
-/* 1A21FC 8027391C C6000144 */  lwc1      $f0, 0x144($s0)
-/* 1A2200 80273920 4600A386 */  mov.s     $f14, $f20
-/* 1A2204 80273924 E6140014 */  swc1      $f20, 0x14($s0)
-/* 1A2208 80273928 E600000C */  swc1      $f0, 0xc($s0)
-/* 1A220C 8027392C 46000586 */  mov.s     $f22, $f0
-/* 1A2210 80273930 0C00A720 */  jal       atan2
-/* 1A2214 80273934 4600B306 */   mov.s    $f12, $f22
-/* 1A2218 80273938 4600B306 */  mov.s     $f12, $f22
-/* 1A221C 8027393C 4600A386 */  mov.s     $f14, $f20
-/* 1A2220 80273940 4406D000 */  mfc1      $a2, $f26
-/* 1A2224 80273944 4407E000 */  mfc1      $a3, $f28
-/* 1A2228 80273948 461EC781 */  sub.s     $f30, $f24, $f30
-/* 1A222C 8027394C 0C00A7B5 */  jal       dist2D
-/* 1A2230 80273950 E6000054 */   swc1     $f0, 0x54($s0)
-/* 1A2234 80273954 86020070 */  lh        $v0, 0x70($s0)
-/* 1A2238 80273958 46000086 */  mov.s     $f2, $f0
-/* 1A223C 8027395C 14400007 */  bnez      $v0, .L8027397C
-/* 1A2240 80273960 E6020058 */   swc1     $f2, 0x58($s0)
-/* 1A2244 80273964 C600004C */  lwc1      $f0, 0x4c($s0)
-/* 1A2248 80273968 46001003 */  div.s     $f0, $f2, $f0
-/* 1A224C 8027396C 4600018D */  trunc.w.s $f6, $f0
-/* 1A2250 80273970 44023000 */  mfc1      $v0, $f6
-/* 1A2254 80273974 0809CE64 */  j         .L80273990
-/* 1A2258 80273978 A6020070 */   sh       $v0, 0x70($s0)
-.L8027397C:
-/* 1A225C 8027397C 44820000 */  mtc1      $v0, $f0
-/* 1A2260 80273980 00000000 */  nop
-/* 1A2264 80273984 46800020 */  cvt.s.w   $f0, $f0
-/* 1A2268 80273988 46001003 */  div.s     $f0, $f2, $f0
-/* 1A226C 8027398C E600004C */  swc1      $f0, 0x4c($s0)
-.L80273990:
-/* 1A2270 80273990 86230064 */  lh        $v1, 0x64($s1)
-/* 1A2274 80273994 3C013FE0 */  lui       $at, 0x3fe0
-/* 1A2278 80273998 44810800 */  mtc1      $at, $f1
-/* 1A227C 8027399C 44800000 */  mtc1      $zero, $f0
-/* 1A2280 802739A0 00031023 */  negu      $v0, $v1
-/* 1A2284 802739A4 44821000 */  mtc1      $v0, $f2
-/* 1A2288 802739A8 00000000 */  nop
-/* 1A228C 802739AC 468010A1 */  cvt.d.w   $f2, $f2
-/* 1A2290 802739B0 46201082 */  mul.d     $f2, $f2, $f0
-/* 1A2294 802739B4 00000000 */  nop
-/* 1A2298 802739B8 0000202D */  daddu     $a0, $zero, $zero
-/* 1A229C 802739BC AE200044 */  sw        $zero, 0x44($s1)
-/* 1A22A0 802739C0 C6240044 */  lwc1      $f4, 0x44($s1)
-/* 1A22A4 802739C4 44830000 */  mtc1      $v1, $f0
-/* 1A22A8 802739C8 00000000 */  nop
-/* 1A22AC 802739CC 46800020 */  cvt.s.w   $f0, $f0
-/* 1A22B0 802739D0 4600F003 */  div.s     $f0, $f30, $f0
-/* 1A22B4 802739D4 46040001 */  sub.s     $f0, $f0, $f4
-/* 1A22B8 802739D8 0080282D */  daddu     $a1, $a0, $zero
-/* 1A22BC 802739DC 8E260058 */  lw        $a2, 0x58($s1)
-/* 1A22C0 802739E0 46000021 */  cvt.d.s   $f0, $f0
-/* 1A22C4 802739E4 46220003 */  div.d     $f0, $f0, $f2
-/* 1A22C8 802739E8 46200020 */  cvt.s.d   $f0, $f0
-/* 1A22CC 802739EC 0C098F3F */  jal       set_animation
-/* 1A22D0 802739F0 E620003C */   swc1     $f0, 0x3c($s1)
-/* 1A22D4 802739F4 24020001 */  addiu     $v0, $zero, 1
-/* 1A22D8 802739F8 AE420070 */  sw        $v0, 0x70($s2)
-.L802739FC:
-/* 1A22DC 802739FC C6220044 */  lwc1      $f2, 0x44($s1)
-/* 1A22E0 80273A00 44800000 */  mtc1      $zero, $f0
-/* 1A22E4 80273A04 00000000 */  nop
-/* 1A22E8 80273A08 4600103C */  c.lt.s    $f2, $f0
-/* 1A22EC 80273A0C 00000000 */  nop
-/* 1A22F0 80273A10 45000004 */  bc1f      .L80273A24
-/* 1A22F4 80273A14 0000202D */   daddu    $a0, $zero, $zero
-/* 1A22F8 80273A18 8E26005C */  lw        $a2, 0x5c($s1)
-/* 1A22FC 80273A1C 0C098F3F */  jal       set_animation
-/* 1A2300 80273A20 0080282D */   daddu    $a1, $a0, $zero
-.L80273A24:
-/* 1A2304 80273A24 C6240004 */  lwc1      $f4, 4($s1)
-/* 1A2308 80273A28 C6200044 */  lwc1      $f0, 0x44($s1)
-/* 1A230C 80273A2C 8E250040 */  lw        $a1, 0x40($s1)
-/* 1A2310 80273A30 46002100 */  add.s     $f4, $f4, $f0
-/* 1A2314 80273A34 C622003C */  lwc1      $f2, 0x3c($s1)
-/* 1A2318 80273A38 8E260048 */  lw        $a2, 0x48($s1)
-/* 1A231C 80273A3C 46020001 */  sub.s     $f0, $f0, $f2
-/* 1A2320 80273A40 0220202D */  daddu     $a0, $s1, $zero
-/* 1A2324 80273A44 E6240004 */  swc1      $f4, 4($s1)
-/* 1A2328 80273A48 0C09904A */  jal       add_xz_vec3f
-/* 1A232C 80273A4C E6200044 */   swc1     $f0, 0x44($s1)
-/* 1A2330 80273A50 C6200000 */  lwc1      $f0, ($s1)
-/* 1A2334 80273A54 E6000144 */  swc1      $f0, 0x144($s0)
-/* 1A2338 80273A58 C6200004 */  lwc1      $f0, 4($s1)
-/* 1A233C 80273A5C E6000148 */  swc1      $f0, 0x148($s0)
-/* 1A2340 80273A60 C6200008 */  lwc1      $f0, 8($s1)
-/* 1A2344 80273A64 E600014C */  swc1      $f0, 0x14c($s0)
-/* 1A2348 80273A68 96220064 */  lhu       $v0, 0x64($s1)
-/* 1A234C 80273A6C 2442FFFF */  addiu     $v0, $v0, -1
-/* 1A2350 80273A70 A6220064 */  sh        $v0, 0x64($s1)
-/* 1A2354 80273A74 00021400 */  sll       $v0, $v0, 0x10
-/* 1A2358 80273A78 04410016 */  bgez      $v0, .L80273AD4
-/* 1A235C 80273A7C 0000102D */   daddu    $v0, $zero, $zero
-/* 1A2360 80273A80 C620000C */  lwc1      $f0, 0xc($s1)
-/* 1A2364 80273A84 C602018C */  lwc1      $f2, 0x18c($s0)
-/* 1A2368 80273A88 E6000144 */  swc1      $f0, 0x144($s0)
-/* 1A236C 80273A8C C6200010 */  lwc1      $f0, 0x10($s1)
-/* 1A2370 80273A90 E6000148 */  swc1      $f0, 0x148($s0)
-/* 1A2374 80273A94 C6200014 */  lwc1      $f0, 0x14($s1)
-/* 1A2378 80273A98 E600014C */  swc1      $f0, 0x14c($s0)
-/* 1A237C 80273A9C E7A20010 */  swc1      $f2, 0x10($sp)
-/* 1A2380 80273AA0 8E050144 */  lw        $a1, 0x144($s0)
-/* 1A2384 80273AA4 8E060148 */  lw        $a2, 0x148($s0)
-/* 1A2388 80273AA8 8E07014C */  lw        $a3, 0x14c($s0)
-/* 1A238C 80273AAC 0C0990BC */  jal       play_movement_dust_effects
-/* 1A2390 80273AB0 24040002 */   addiu    $a0, $zero, 2
-/* 1A2394 80273AB4 C600014C */  lwc1      $f0, 0x14c($s0)
-/* 1A2398 80273AB8 24040148 */  addiu     $a0, $zero, 0x148
-/* 1A239C 80273ABC E7A00010 */  swc1      $f0, 0x10($sp)
-/* 1A23A0 80273AC0 8E060144 */  lw        $a2, 0x144($s0)
-/* 1A23A4 80273AC4 8E070148 */  lw        $a3, 0x148($s0)
-/* 1A23A8 80273AC8 0C052757 */  jal       sfx_play_sound_at_position
-/* 1A23AC 80273ACC 0000282D */   daddu    $a1, $zero, $zero
-/* 1A23B0 80273AD0 24020001 */  addiu     $v0, $zero, 1
-.L80273AD4:
-/* 1A23B4 80273AD4 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 1A23B8 80273AD8 8FB20020 */  lw        $s2, 0x20($sp)
-/* 1A23BC 80273ADC 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 1A23C0 80273AE0 8FB00018 */  lw        $s0, 0x18($sp)
-/* 1A23C4 80273AE4 D7BE0050 */  ldc1      $f30, 0x50($sp)
-/* 1A23C8 80273AE8 D7BC0048 */  ldc1      $f28, 0x48($sp)
-/* 1A23CC 80273AEC D7BA0040 */  ldc1      $f26, 0x40($sp)
-/* 1A23D0 80273AF0 D7B80038 */  ldc1      $f24, 0x38($sp)
-/* 1A23D4 80273AF4 D7B60030 */  ldc1      $f22, 0x30($sp)
-/* 1A23D8 80273AF8 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* 1A23DC 80273AFC 03E00008 */  jr        $ra
-/* 1A23E0 80273B00 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/asm/nonmatchings/19FAF0/func_80273444.s b/ver/us/asm/nonmatchings/19FAF0/func_80273444.s
deleted file mode 100644
index d231a0e8eb..0000000000
--- a/ver/us/asm/nonmatchings/19FAF0/func_80273444.s
+++ /dev/null
@@ -1,302 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_8029D898
-.double 54.9
-
-.section .text
-
-glabel func_80273444
-/* 1A1D24 80273444 27BDFFA0 */  addiu     $sp, $sp, -0x60
-/* 1A1D28 80273448 AFB20020 */  sw        $s2, 0x20($sp)
-/* 1A1D2C 8027344C 3C12800E */  lui       $s2, %hi(gBattleStatus+0xD8)
-/* 1A1D30 80273450 8E52C148 */  lw        $s2, %lo(gBattleStatus+0xD8)($s2)
-/* 1A1D34 80273454 AFB30024 */  sw        $s3, 0x24($sp)
-/* 1A1D38 80273458 0080982D */  daddu     $s3, $a0, $zero
-/* 1A1D3C 8027345C AFBF0028 */  sw        $ra, 0x28($sp)
-/* 1A1D40 80273460 AFB1001C */  sw        $s1, 0x1c($sp)
-/* 1A1D44 80273464 AFB00018 */  sw        $s0, 0x18($sp)
-/* 1A1D48 80273468 F7BE0058 */  sdc1      $f30, 0x58($sp)
-/* 1A1D4C 8027346C F7BC0050 */  sdc1      $f28, 0x50($sp)
-/* 1A1D50 80273470 F7BA0048 */  sdc1      $f26, 0x48($sp)
-/* 1A1D54 80273474 F7B80040 */  sdc1      $f24, 0x40($sp)
-/* 1A1D58 80273478 F7B60038 */  sdc1      $f22, 0x38($sp)
-/* 1A1D5C 8027347C F7B40030 */  sdc1      $f20, 0x30($sp)
-/* 1A1D60 80273480 8E70000C */  lw        $s0, 0xc($s3)
-/* 1A1D64 80273484 10A00002 */  beqz      $a1, .L80273490
-/* 1A1D68 80273488 2651000C */   addiu    $s1, $s2, 0xc
-/* 1A1D6C 8027348C AE600070 */  sw        $zero, 0x70($s3)
-.L80273490:
-/* 1A1D70 80273490 8E620070 */  lw        $v0, 0x70($s3)
-/* 1A1D74 80273494 14400081 */  bnez      $v0, .L8027369C
-/* 1A1D78 80273498 00000000 */   nop
-/* 1A1D7C 8027349C 8E050000 */  lw        $a1, ($s0)
-/* 1A1D80 802734A0 26100004 */  addiu     $s0, $s0, 4
-/* 1A1D84 802734A4 0C0B1EAF */  jal       evt_get_variable
-/* 1A1D88 802734A8 0260202D */   daddu    $a0, $s3, $zero
-/* 1A1D8C 802734AC A6420070 */  sh        $v0, 0x70($s2)
-/* 1A1D90 802734B0 8E050000 */  lw        $a1, ($s0)
-/* 1A1D94 802734B4 26100004 */  addiu     $s0, $s0, 4
-/* 1A1D98 802734B8 0C0B1EAF */  jal       evt_get_variable
-/* 1A1D9C 802734BC 0260202D */   daddu    $a0, $s3, $zero
-/* 1A1DA0 802734C0 A6420072 */  sh        $v0, 0x72($s2)
-/* 1A1DA4 802734C4 8E050000 */  lw        $a1, ($s0)
-/* 1A1DA8 802734C8 0C0B1EAF */  jal       evt_get_variable
-/* 1A1DAC 802734CC 0260202D */   daddu    $a0, $s3, $zero
-/* 1A1DB0 802734D0 AE620074 */  sw        $v0, 0x74($s3)
-/* 1A1DB4 802734D4 C6400148 */  lwc1      $f0, 0x148($s2)
-/* 1A1DB8 802734D8 C65A0018 */  lwc1      $f26, 0x18($s2)
-/* 1A1DBC 802734DC C65C0020 */  lwc1      $f28, 0x20($s2)
-/* 1A1DC0 802734E0 C654014C */  lwc1      $f20, 0x14c($s2)
-/* 1A1DC4 802734E4 C658001C */  lwc1      $f24, 0x1c($s2)
-/* 1A1DC8 802734E8 E6400010 */  swc1      $f0, 0x10($s2)
-/* 1A1DCC 802734EC 46000786 */  mov.s     $f30, $f0
-/* 1A1DD0 802734F0 4406D000 */  mfc1      $a2, $f26
-/* 1A1DD4 802734F4 4407E000 */  mfc1      $a3, $f28
-/* 1A1DD8 802734F8 C6400144 */  lwc1      $f0, 0x144($s2)
-/* 1A1DDC 802734FC 4600A386 */  mov.s     $f14, $f20
-/* 1A1DE0 80273500 E6540014 */  swc1      $f20, 0x14($s2)
-/* 1A1DE4 80273504 E640000C */  swc1      $f0, 0xc($s2)
-/* 1A1DE8 80273508 46000586 */  mov.s     $f22, $f0
-/* 1A1DEC 8027350C 0C00A720 */  jal       atan2
-/* 1A1DF0 80273510 4600B306 */   mov.s    $f12, $f22
-/* 1A1DF4 80273514 4600B306 */  mov.s     $f12, $f22
-/* 1A1DF8 80273518 4600A386 */  mov.s     $f14, $f20
-/* 1A1DFC 8027351C 4406D000 */  mfc1      $a2, $f26
-/* 1A1E00 80273520 4407E000 */  mfc1      $a3, $f28
-/* 1A1E04 80273524 461EC781 */  sub.s     $f30, $f24, $f30
-/* 1A1E08 80273528 0C00A7B5 */  jal       dist2D
-/* 1A1E0C 8027352C E6400054 */   swc1     $f0, 0x54($s2)
-/* 1A1E10 80273530 86420070 */  lh        $v0, 0x70($s2)
-/* 1A1E14 80273534 46000106 */  mov.s     $f4, $f0
-/* 1A1E18 80273538 14400012 */  bnez      $v0, .L80273584
-/* 1A1E1C 8027353C E6440058 */   swc1     $f4, 0x58($s2)
-/* 1A1E20 80273540 C640004C */  lwc1      $f0, 0x4c($s2)
-/* 1A1E24 80273544 C642004C */  lwc1      $f2, 0x4c($s2)
-/* 1A1E28 80273548 46002003 */  div.s     $f0, $f4, $f0
-/* 1A1E2C 8027354C 4600028D */  trunc.w.s $f10, $f0
-/* 1A1E30 80273550 44035000 */  mfc1      $v1, $f10
-/* 1A1E34 80273554 00000000 */  nop
-/* 1A1E38 80273558 00031400 */  sll       $v0, $v1, 0x10
-/* 1A1E3C 8027355C 00021403 */  sra       $v0, $v0, 0x10
-/* 1A1E40 80273560 44820000 */  mtc1      $v0, $f0
-/* 1A1E44 80273564 00000000 */  nop
-/* 1A1E48 80273568 46800020 */  cvt.s.w   $f0, $f0
-/* 1A1E4C 8027356C 46020002 */  mul.s     $f0, $f0, $f2
-/* 1A1E50 80273570 00000000 */  nop
-/* 1A1E54 80273574 46002086 */  mov.s     $f2, $f4
-/* 1A1E58 80273578 A6430070 */  sh        $v1, 0x70($s2)
-/* 1A1E5C 8027357C 0809CD6E */  j         .L802735B8
-/* 1A1E60 80273580 46001201 */   sub.s    $f8, $f2, $f0
-.L80273584:
-/* 1A1E64 80273584 44821000 */  mtc1      $v0, $f2
-/* 1A1E68 80273588 00000000 */  nop
-/* 1A1E6C 8027358C 468010A0 */  cvt.s.w   $f2, $f2
-/* 1A1E70 80273590 86420070 */  lh        $v0, 0x70($s2)
-/* 1A1E74 80273594 46022083 */  div.s     $f2, $f4, $f2
-/* 1A1E78 80273598 44820000 */  mtc1      $v0, $f0
-/* 1A1E7C 8027359C 00000000 */  nop
-/* 1A1E80 802735A0 46800020 */  cvt.s.w   $f0, $f0
-/* 1A1E84 802735A4 46020002 */  mul.s     $f0, $f0, $f2
-/* 1A1E88 802735A8 00000000 */  nop
-/* 1A1E8C 802735AC C6440058 */  lwc1      $f4, 0x58($s2)
-/* 1A1E90 802735B0 E642004C */  swc1      $f2, 0x4c($s2)
-/* 1A1E94 802735B4 46002201 */  sub.s     $f8, $f4, $f0
-.L802735B8:
-/* 1A1E98 802735B8 86220064 */  lh        $v0, 0x64($s1)
-/* 1A1E9C 802735BC C622003C */  lwc1      $f2, 0x3c($s1)
-/* 1A1EA0 802735C0 44823000 */  mtc1      $v0, $f6
-/* 1A1EA4 802735C4 00000000 */  nop
-/* 1A1EA8 802735C8 468031A0 */  cvt.s.w   $f6, $f6
-/* 1A1EAC 802735CC 46061082 */  mul.s     $f2, $f2, $f6
-/* 1A1EB0 802735D0 00000000 */  nop
-/* 1A1EB4 802735D4 3C013F00 */  lui       $at, 0x3f00
-/* 1A1EB8 802735D8 44810000 */  mtc1      $at, $f0
-/* 1A1EBC 802735DC 00000000 */  nop
-/* 1A1EC0 802735E0 46001082 */  mul.s     $f2, $f2, $f0
-/* 1A1EC4 802735E4 00000000 */  nop
-/* 1A1EC8 802735E8 0000202D */  daddu     $a0, $zero, $zero
-/* 1A1ECC 802735EC C6240040 */  lwc1      $f4, 0x40($s1)
-/* 1A1ED0 802735F0 46003006 */  mov.s     $f0, $f6
-/* 1A1ED4 802735F4 46004003 */  div.s     $f0, $f8, $f0
-/* 1A1ED8 802735F8 46002100 */  add.s     $f4, $f4, $f0
-/* 1A1EDC 802735FC 8E260058 */  lw        $a2, 0x58($s1)
-/* 1A1EE0 80273600 4606F183 */  div.s     $f6, $f30, $f6
-/* 1A1EE4 80273604 46061080 */  add.s     $f2, $f2, $f6
-/* 1A1EE8 80273608 0080282D */  daddu     $a1, $a0, $zero
-/* 1A1EEC 8027360C E6240040 */  swc1      $f4, 0x40($s1)
-/* 1A1EF0 80273610 0C098F3F */  jal       set_animation
-/* 1A1EF4 80273614 E6220044 */   swc1     $f2, 0x44($s1)
-/* 1A1EF8 80273618 86230064 */  lh        $v1, 0x64($s1)
-/* 1A1EFC 8027361C 240200B4 */  addiu     $v0, $zero, 0xb4
-/* 1A1F00 80273620 14600002 */  bnez      $v1, .L8027362C
-/* 1A1F04 80273624 0043001A */   div      $zero, $v0, $v1
-/* 1A1F08 80273628 0007000D */  break     7
-.L8027362C:
-/* 1A1F0C 8027362C 2401FFFF */   addiu    $at, $zero, -1
-/* 1A1F10 80273630 14610004 */  bne       $v1, $at, .L80273644
-/* 1A1F14 80273634 3C018000 */   lui      $at, 0x8000
-/* 1A1F18 80273638 14410002 */  bne       $v0, $at, .L80273644
-/* 1A1F1C 8027363C 00000000 */   nop
-/* 1A1F20 80273640 0006000D */  break     6
-.L80273644:
-/* 1A1F24 80273644 00001012 */   mflo     $v0
-/* 1A1F28 80273648 3C0142B4 */  lui       $at, 0x42b4
-/* 1A1F2C 8027364C 44810000 */  mtc1      $at, $f0
-/* 1A1F30 80273650 C6220010 */  lwc1      $f2, 0x10($s1)
-/* 1A1F34 80273654 E6200024 */  swc1      $f0, 0x24($s1)
-/* 1A1F38 80273658 E622002C */  swc1      $f2, 0x2c($s1)
-/* 1A1F3C 8027365C 44820000 */  mtc1      $v0, $f0
-/* 1A1F40 80273660 00000000 */  nop
-/* 1A1F44 80273664 46800020 */  cvt.s.w   $f0, $f0
-/* 1A1F48 80273668 E6200028 */  swc1      $f0, 0x28($s1)
-/* 1A1F4C 8027366C 8E630074 */  lw        $v1, 0x74($s3)
-/* 1A1F50 80273670 24020002 */  addiu     $v0, $zero, 2
-/* 1A1F54 80273674 10620007 */  beq       $v1, $v0, .L80273694
-/* 1A1F58 80273678 24040160 */   addiu    $a0, $zero, 0x160
-/* 1A1F5C 8027367C C640014C */  lwc1      $f0, 0x14c($s2)
-/* 1A1F60 80273680 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 1A1F64 80273684 8E460144 */  lw        $a2, 0x144($s2)
-/* 1A1F68 80273688 8E470148 */  lw        $a3, 0x148($s2)
-/* 1A1F6C 8027368C 0C052757 */  jal       sfx_play_sound_at_position
-/* 1A1F70 80273690 0000282D */   daddu    $a1, $zero, $zero
-.L80273694:
-/* 1A1F74 80273694 24020001 */  addiu     $v0, $zero, 1
-/* 1A1F78 80273698 AE620070 */  sw        $v0, 0x70($s3)
-.L8027369C:
-/* 1A1F7C 8027369C C6220044 */  lwc1      $f2, 0x44($s1)
-/* 1A1F80 802736A0 44800000 */  mtc1      $zero, $f0
-/* 1A1F84 802736A4 00000000 */  nop
-/* 1A1F88 802736A8 4600103C */  c.lt.s    $f2, $f0
-/* 1A1F8C 802736AC 00000000 */  nop
-/* 1A1F90 802736B0 45000004 */  bc1f      .L802736C4
-/* 1A1F94 802736B4 0000202D */   daddu    $a0, $zero, $zero
-/* 1A1F98 802736B8 8E26005C */  lw        $a2, 0x5c($s1)
-/* 1A1F9C 802736BC 0C098F3F */  jal       set_animation
-/* 1A1FA0 802736C0 0080282D */   daddu    $a1, $a0, $zero
-.L802736C4:
-/* 1A1FA4 802736C4 24020001 */  addiu     $v0, $zero, 1
-/* 1A1FA8 802736C8 86230066 */  lh        $v1, 0x66($s1)
-/* 1A1FAC 802736CC C6260044 */  lwc1      $f6, 0x44($s1)
-/* 1A1FB0 802736D0 10620007 */  beq       $v1, $v0, .L802736F0
-/* 1A1FB4 802736D4 28620002 */   slti     $v0, $v1, 2
-/* 1A1FB8 802736D8 1440001D */  bnez      $v0, .L80273750
-/* 1A1FBC 802736DC 24020002 */   addiu    $v0, $zero, 2
-/* 1A1FC0 802736E0 1062000C */  beq       $v1, $v0, .L80273714
-/* 1A1FC4 802736E4 00000000 */   nop
-/* 1A1FC8 802736E8 0809CDD4 */  j         .L80273750
-/* 1A1FCC 802736EC 00000000 */   nop
-.L802736F0:
-/* 1A1FD0 802736F0 C6200004 */  lwc1      $f0, 4($s1)
-/* 1A1FD4 802736F4 C622002C */  lwc1      $f2, 0x2c($s1)
-/* 1A1FD8 802736F8 46020001 */  sub.s     $f0, $f0, $f2
-/* 1A1FDC 802736FC 3C014234 */  lui       $at, 0x4234
-/* 1A1FE0 80273700 44811000 */  mtc1      $at, $f2
-/* 1A1FE4 80273704 00000000 */  nop
-/* 1A1FE8 80273708 4600103C */  c.lt.s    $f2, $f0
-/* 1A1FEC 8027370C 0809CDCD */  j         .L80273734
-/* 1A1FF0 80273710 00000000 */   nop
-.L80273714:
-/* 1A1FF4 80273714 C6200004 */  lwc1      $f0, 4($s1)
-/* 1A1FF8 80273718 C622002C */  lwc1      $f2, 0x2c($s1)
-/* 1A1FFC 8027371C 46020001 */  sub.s     $f0, $f0, $f2
-/* 1A2000 80273720 3C01802A */  lui       $at, %hi(D_8029D898)
-/* 1A2004 80273724 D422D898 */  ldc1      $f2, %lo(D_8029D898)($at)
-/* 1A2008 80273728 46000021 */  cvt.d.s   $f0, $f0
-/* 1A200C 8027372C 4620103C */  c.lt.d    $f2, $f0
-/* 1A2010 80273730 00000000 */  nop
-.L80273734:
-/* 1A2014 80273734 45000006 */  bc1f      .L80273750
-/* 1A2018 80273738 00000000 */   nop
-/* 1A201C 8027373C 3C013E80 */  lui       $at, 0x3e80
-/* 1A2020 80273740 44810000 */  mtc1      $at, $f0
-/* 1A2024 80273744 00000000 */  nop
-/* 1A2028 80273748 46003182 */  mul.s     $f6, $f6, $f0
-/* 1A202C 8027374C 00000000 */  nop
-.L80273750:
-/* 1A2030 80273750 C6240004 */  lwc1      $f4, 4($s1)
-/* 1A2034 80273754 C6220044 */  lwc1      $f2, 0x44($s1)
-/* 1A2038 80273758 46062100 */  add.s     $f4, $f4, $f6
-/* 1A203C 8027375C C620003C */  lwc1      $f0, 0x3c($s1)
-/* 1A2040 80273760 C62C0024 */  lwc1      $f12, 0x24($s1)
-/* 1A2044 80273764 46001081 */  sub.s     $f2, $f2, $f0
-/* 1A2048 80273768 3C0140C9 */  lui       $at, 0x40c9
-/* 1A204C 8027376C 34210FD0 */  ori       $at, $at, 0xfd0
-/* 1A2050 80273770 44810000 */  mtc1      $at, $f0
-/* 1A2054 80273774 C6340040 */  lwc1      $f20, 0x40($s1)
-/* 1A2058 80273778 46006302 */  mul.s     $f12, $f12, $f0
-/* 1A205C 8027377C 00000000 */  nop
-/* 1A2060 80273780 3C0143B4 */  lui       $at, 0x43b4
-/* 1A2064 80273784 44810000 */  mtc1      $at, $f0
-/* 1A2068 80273788 4600A521 */  cvt.d.s   $f20, $f20
-/* 1A206C 8027378C E6240004 */  swc1      $f4, 4($s1)
-/* 1A2070 80273790 E6220044 */  swc1      $f2, 0x44($s1)
-/* 1A2074 80273794 0C00A85B */  jal       sin_rad
-/* 1A2078 80273798 46006303 */   div.s    $f12, $f12, $f0
-/* 1A207C 8027379C 46000021 */  cvt.d.s   $f0, $f0
-/* 1A2080 802737A0 4620A500 */  add.d     $f20, $f20, $f0
-/* 1A2084 802737A4 8E260048 */  lw        $a2, 0x48($s1)
-/* 1A2088 802737A8 4620A520 */  cvt.s.d   $f20, $f20
-/* 1A208C 802737AC 4405A000 */  mfc1      $a1, $f20
-/* 1A2090 802737B0 0C09904A */  jal       add_xz_vec3f
-/* 1A2094 802737B4 0220202D */   daddu    $a0, $s1, $zero
-/* 1A2098 802737B8 C62C0024 */  lwc1      $f12, 0x24($s1)
-/* 1A209C 802737BC C6200028 */  lwc1      $f0, 0x28($s1)
-/* 1A20A0 802737C0 46006300 */  add.s     $f12, $f12, $f0
-/* 1A20A4 802737C4 0C00A6C9 */  jal       clamp_angle
-/* 1A20A8 802737C8 E62C0024 */   swc1     $f12, 0x24($s1)
-/* 1A20AC 802737CC C6220000 */  lwc1      $f2, ($s1)
-/* 1A20B0 802737D0 E6200024 */  swc1      $f0, 0x24($s1)
-/* 1A20B4 802737D4 E6420144 */  swc1      $f2, 0x144($s2)
-/* 1A20B8 802737D8 C6200004 */  lwc1      $f0, 4($s1)
-/* 1A20BC 802737DC E6400148 */  swc1      $f0, 0x148($s2)
-/* 1A20C0 802737E0 C6200008 */  lwc1      $f0, 8($s1)
-/* 1A20C4 802737E4 E640014C */  swc1      $f0, 0x14c($s2)
-/* 1A20C8 802737E8 96220064 */  lhu       $v0, 0x64($s1)
-/* 1A20CC 802737EC 2442FFFF */  addiu     $v0, $v0, -1
-/* 1A20D0 802737F0 A6220064 */  sh        $v0, 0x64($s1)
-/* 1A20D4 802737F4 00021400 */  sll       $v0, $v0, 0x10
-/* 1A20D8 802737F8 04410019 */  bgez      $v0, .L80273860
-/* 1A20DC 802737FC 0000102D */   daddu    $v0, $zero, $zero
-/* 1A20E0 80273800 C6200010 */  lwc1      $f0, 0x10($s1)
-/* 1A20E4 80273804 E6400148 */  swc1      $f0, 0x148($s2)
-/* 1A20E8 80273808 8E630074 */  lw        $v1, 0x74($s3)
-/* 1A20EC 8027380C 24020001 */  addiu     $v0, $zero, 1
-/* 1A20F0 80273810 1062000A */  beq       $v1, $v0, .L8027383C
-/* 1A20F4 80273814 24020002 */   addiu    $v0, $zero, 2
-/* 1A20F8 80273818 C640018C */  lwc1      $f0, 0x18c($s2)
-/* 1A20FC 8027381C E7A00010 */  swc1      $f0, 0x10($sp)
-/* 1A2100 80273820 8E450144 */  lw        $a1, 0x144($s2)
-/* 1A2104 80273824 8E460148 */  lw        $a2, 0x148($s2)
-/* 1A2108 80273828 8E47014C */  lw        $a3, 0x14c($s2)
-/* 1A210C 8027382C 0C0990BC */  jal       play_movement_dust_effects
-/* 1A2110 80273830 24040002 */   addiu    $a0, $zero, 2
-/* 1A2114 80273834 8E630074 */  lw        $v1, 0x74($s3)
-/* 1A2118 80273838 24020002 */  addiu     $v0, $zero, 2
-.L8027383C:
-/* 1A211C 8027383C 10620007 */  beq       $v1, $v0, .L8027385C
-/* 1A2120 80273840 24040148 */   addiu    $a0, $zero, 0x148
-/* 1A2124 80273844 C640014C */  lwc1      $f0, 0x14c($s2)
-/* 1A2128 80273848 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 1A212C 8027384C 8E460144 */  lw        $a2, 0x144($s2)
-/* 1A2130 80273850 8E470148 */  lw        $a3, 0x148($s2)
-/* 1A2134 80273854 0C052757 */  jal       sfx_play_sound_at_position
-/* 1A2138 80273858 0000282D */   daddu    $a1, $zero, $zero
-.L8027385C:
-/* 1A213C 8027385C 24020001 */  addiu     $v0, $zero, 1
-.L80273860:
-/* 1A2140 80273860 8FBF0028 */  lw        $ra, 0x28($sp)
-/* 1A2144 80273864 8FB30024 */  lw        $s3, 0x24($sp)
-/* 1A2148 80273868 8FB20020 */  lw        $s2, 0x20($sp)
-/* 1A214C 8027386C 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 1A2150 80273870 8FB00018 */  lw        $s0, 0x18($sp)
-/* 1A2154 80273874 D7BE0058 */  ldc1      $f30, 0x58($sp)
-/* 1A2158 80273878 D7BC0050 */  ldc1      $f28, 0x50($sp)
-/* 1A215C 8027387C D7BA0048 */  ldc1      $f26, 0x48($sp)
-/* 1A2160 80273880 D7B80040 */  ldc1      $f24, 0x40($sp)
-/* 1A2164 80273884 D7B60038 */  ldc1      $f22, 0x38($sp)
-/* 1A2168 80273888 D7B40030 */  ldc1      $f20, 0x30($sp)
-/* 1A216C 8027388C 03E00008 */  jr        $ra
-/* 1A2170 80273890 27BD0060 */   addiu    $sp, $sp, 0x60
diff --git a/ver/us/asm/nonmatchings/1A5830/IdleJumpToGoal.s b/ver/us/asm/nonmatchings/1A5830/IdleJumpToGoal.s
deleted file mode 100644
index 02e57fa7ec..0000000000
--- a/ver/us/asm/nonmatchings/1A5830/IdleJumpToGoal.s
+++ /dev/null
@@ -1,210 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel IdleJumpToGoal
-/* 1A79EC 8027910C 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* 1A79F0 80279110 AFB20020 */  sw        $s2, 0x20($sp)
-/* 1A79F4 80279114 0080902D */  daddu     $s2, $a0, $zero
-/* 1A79F8 80279118 AFBF0024 */  sw        $ra, 0x24($sp)
-/* 1A79FC 8027911C AFB1001C */  sw        $s1, 0x1c($sp)
-/* 1A7A00 80279120 AFB00018 */  sw        $s0, 0x18($sp)
-/* 1A7A04 80279124 F7BE0050 */  sdc1      $f30, 0x50($sp)
-/* 1A7A08 80279128 F7BC0048 */  sdc1      $f28, 0x48($sp)
-/* 1A7A0C 8027912C F7BA0040 */  sdc1      $f26, 0x40($sp)
-/* 1A7A10 80279130 F7B80038 */  sdc1      $f24, 0x38($sp)
-/* 1A7A14 80279134 F7B60030 */  sdc1      $f22, 0x30($sp)
-/* 1A7A18 80279138 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* 1A7A1C 8027913C 8E51000C */  lw        $s1, 0xc($s2)
-/* 1A7A20 80279140 54A00001 */  bnel      $a1, $zero, .L80279148
-/* 1A7A24 80279144 AE400070 */   sw       $zero, 0x70($s2)
-.L80279148:
-/* 1A7A28 80279148 8E420070 */  lw        $v0, 0x70($s2)
-/* 1A7A2C 8027914C 14400073 */  bnez      $v0, .L8027931C
-/* 1A7A30 80279150 00000000 */   nop
-/* 1A7A34 80279154 8E250000 */  lw        $a1, ($s1)
-/* 1A7A38 80279158 26310004 */  addiu     $s1, $s1, 4
-/* 1A7A3C 8027915C 0C0B1EAF */  jal       evt_get_variable
-/* 1A7A40 80279160 0240202D */   daddu    $a0, $s2, $zero
-/* 1A7A44 80279164 0040202D */  daddu     $a0, $v0, $zero
-/* 1A7A48 80279168 2402FF81 */  addiu     $v0, $zero, -0x7f
-/* 1A7A4C 8027916C 14820002 */  bne       $a0, $v0, .L80279178
-/* 1A7A50 80279170 00000000 */   nop
-/* 1A7A54 80279174 8E440148 */  lw        $a0, 0x148($s2)
-.L80279178:
-/* 1A7A58 80279178 0C09A75B */  jal       get_actor
-/* 1A7A5C 8027917C 00000000 */   nop
-/* 1A7A60 80279180 0040802D */  daddu     $s0, $v0, $zero
-/* 1A7A64 80279184 AE500074 */  sw        $s0, 0x74($s2)
-/* 1A7A68 80279188 8E250000 */  lw        $a1, ($s1)
-/* 1A7A6C 8027918C 26310004 */  addiu     $s1, $s1, 4
-/* 1A7A70 80279190 0C0B1EAF */  jal       evt_get_variable
-/* 1A7A74 80279194 0240202D */   daddu    $a0, $s2, $zero
-/* 1A7A78 80279198 A6020120 */  sh        $v0, 0x120($s0)
-/* 1A7A7C 8027919C 8E250000 */  lw        $a1, ($s1)
-/* 1A7A80 802791A0 26310004 */  addiu     $s1, $s1, 4
-/* 1A7A84 802791A4 0C0B1EAF */  jal       evt_get_variable
-/* 1A7A88 802791A8 0240202D */   daddu    $a0, $s2, $zero
-/* 1A7A8C 802791AC AE420078 */  sw        $v0, 0x78($s2)
-/* 1A7A90 802791B0 8E250000 */  lw        $a1, ($s1)
-/* 1A7A94 802791B4 0C0B1EAF */  jal       evt_get_variable
-/* 1A7A98 802791B8 0240202D */   daddu    $a0, $s2, $zero
-/* 1A7A9C 802791BC AE42007C */  sw        $v0, 0x7c($s2)
-/* 1A7AA0 802791C0 C6000148 */  lwc1      $f0, 0x148($s0)
-/* 1A7AA4 802791C4 C61A00D4 */  lwc1      $f26, 0xd4($s0)
-/* 1A7AA8 802791C8 C61C00DC */  lwc1      $f28, 0xdc($s0)
-/* 1A7AAC 802791CC C614014C */  lwc1      $f20, 0x14c($s0)
-/* 1A7AB0 802791D0 C61800D8 */  lwc1      $f24, 0xd8($s0)
-/* 1A7AB4 802791D4 261100C8 */  addiu     $s1, $s0, 0xc8
-/* 1A7AB8 802791D8 E60000CC */  swc1      $f0, 0xcc($s0)
-/* 1A7ABC 802791DC 46000786 */  mov.s     $f30, $f0
-/* 1A7AC0 802791E0 4406D000 */  mfc1      $a2, $f26
-/* 1A7AC4 802791E4 4407E000 */  mfc1      $a3, $f28
-/* 1A7AC8 802791E8 C6000144 */  lwc1      $f0, 0x144($s0)
-/* 1A7ACC 802791EC 4600A386 */  mov.s     $f14, $f20
-/* 1A7AD0 802791F0 E61400D0 */  swc1      $f20, 0xd0($s0)
-/* 1A7AD4 802791F4 E60000C8 */  swc1      $f0, 0xc8($s0)
-/* 1A7AD8 802791F8 46000586 */  mov.s     $f22, $f0
-/* 1A7ADC 802791FC 0C00A720 */  jal       atan2
-/* 1A7AE0 80279200 4600B306 */   mov.s    $f12, $f22
-/* 1A7AE4 80279204 4600B306 */  mov.s     $f12, $f22
-/* 1A7AE8 80279208 4600A386 */  mov.s     $f14, $f20
-/* 1A7AEC 8027920C 4406D000 */  mfc1      $a2, $f26
-/* 1A7AF0 80279210 4407E000 */  mfc1      $a3, $f28
-/* 1A7AF4 80279214 461EC781 */  sub.s     $f30, $f24, $f30
-/* 1A7AF8 80279218 0C00A7B5 */  jal       dist2D
-/* 1A7AFC 8027921C E6000110 */   swc1     $f0, 0x110($s0)
-/* 1A7B00 80279220 86020120 */  lh        $v0, 0x120($s0)
-/* 1A7B04 80279224 46000106 */  mov.s     $f4, $f0
-/* 1A7B08 80279228 14400012 */  bnez      $v0, .L80279274
-/* 1A7B0C 8027922C E6040114 */   swc1     $f4, 0x114($s0)
-/* 1A7B10 80279230 C6000108 */  lwc1      $f0, 0x108($s0)
-/* 1A7B14 80279234 C6020108 */  lwc1      $f2, 0x108($s0)
-/* 1A7B18 80279238 46002003 */  div.s     $f0, $f4, $f0
-/* 1A7B1C 8027923C 4600028D */  trunc.w.s $f10, $f0
-/* 1A7B20 80279240 44035000 */  mfc1      $v1, $f10
-/* 1A7B24 80279244 00000000 */  nop
-/* 1A7B28 80279248 00031400 */  sll       $v0, $v1, 0x10
-/* 1A7B2C 8027924C 00021403 */  sra       $v0, $v0, 0x10
-/* 1A7B30 80279250 44820000 */  mtc1      $v0, $f0
-/* 1A7B34 80279254 00000000 */  nop
-/* 1A7B38 80279258 46800020 */  cvt.s.w   $f0, $f0
-/* 1A7B3C 8027925C 46020002 */  mul.s     $f0, $f0, $f2
-/* 1A7B40 80279260 00000000 */  nop
-/* 1A7B44 80279264 46002086 */  mov.s     $f2, $f4
-/* 1A7B48 80279268 A6030120 */  sh        $v1, 0x120($s0)
-/* 1A7B4C 8027926C 0809E4AA */  j         .L802792A8
-/* 1A7B50 80279270 46001201 */   sub.s    $f8, $f2, $f0
-.L80279274:
-/* 1A7B54 80279274 44821000 */  mtc1      $v0, $f2
-/* 1A7B58 80279278 00000000 */  nop
-/* 1A7B5C 8027927C 468010A0 */  cvt.s.w   $f2, $f2
-/* 1A7B60 80279280 86020120 */  lh        $v0, 0x120($s0)
-/* 1A7B64 80279284 46022083 */  div.s     $f2, $f4, $f2
-/* 1A7B68 80279288 44820000 */  mtc1      $v0, $f0
-/* 1A7B6C 8027928C 00000000 */  nop
-/* 1A7B70 80279290 46800020 */  cvt.s.w   $f0, $f0
-/* 1A7B74 80279294 46020002 */  mul.s     $f0, $f0, $f2
-/* 1A7B78 80279298 00000000 */  nop
-/* 1A7B7C 8027929C C6040114 */  lwc1      $f4, 0x114($s0)
-/* 1A7B80 802792A0 E6020108 */  swc1      $f2, 0x108($s0)
-/* 1A7B84 802792A4 46002201 */  sub.s     $f8, $f4, $f0
-.L802792A8:
-/* 1A7B88 802792A8 86220058 */  lh        $v0, 0x58($s1)
-/* 1A7B8C 802792AC 14400003 */  bnez      $v0, .L802792BC
-/* 1A7B90 802792B0 00000000 */   nop
-/* 1A7B94 802792B4 0809E4FC */  j         .L802793F0
-/* 1A7B98 802792B8 24020002 */   addiu    $v0, $zero, 2
-.L802792BC:
-/* 1A7B9C 802792BC C622003C */  lwc1      $f2, 0x3c($s1)
-/* 1A7BA0 802792C0 44823000 */  mtc1      $v0, $f6
-/* 1A7BA4 802792C4 00000000 */  nop
-/* 1A7BA8 802792C8 468031A0 */  cvt.s.w   $f6, $f6
-/* 1A7BAC 802792CC 46061082 */  mul.s     $f2, $f2, $f6
-/* 1A7BB0 802792D0 00000000 */  nop
-/* 1A7BB4 802792D4 3C013F00 */  lui       $at, 0x3f00
-/* 1A7BB8 802792D8 44810000 */  mtc1      $at, $f0
-/* 1A7BBC 802792DC 00000000 */  nop
-/* 1A7BC0 802792E0 46001082 */  mul.s     $f2, $f2, $f0
-/* 1A7BC4 802792E4 00000000 */  nop
-/* 1A7BC8 802792E8 86220058 */  lh        $v0, 0x58($s1)
-/* 1A7BCC 802792EC C6240040 */  lwc1      $f4, 0x40($s1)
-/* 1A7BD0 802792F0 44820000 */  mtc1      $v0, $f0
-/* 1A7BD4 802792F4 00000000 */  nop
-/* 1A7BD8 802792F8 46800020 */  cvt.s.w   $f0, $f0
-/* 1A7BDC 802792FC 46004003 */  div.s     $f0, $f8, $f0
-/* 1A7BE0 80279300 46002100 */  add.s     $f4, $f4, $f0
-/* 1A7BE4 80279304 4606F183 */  div.s     $f6, $f30, $f6
-/* 1A7BE8 80279308 46061080 */  add.s     $f2, $f2, $f6
-/* 1A7BEC 8027930C 24020001 */  addiu     $v0, $zero, 1
-/* 1A7BF0 80279310 E6240040 */  swc1      $f4, 0x40($s1)
-/* 1A7BF4 80279314 E6220044 */  swc1      $f2, 0x44($s1)
-/* 1A7BF8 80279318 AE420070 */  sw        $v0, 0x70($s2)
-.L8027931C:
-/* 1A7BFC 8027931C 8E500074 */  lw        $s0, 0x74($s2)
-/* 1A7C00 80279320 C600010C */  lwc1      $f0, 0x10c($s0)
-/* 1A7C04 80279324 C60400CC */  lwc1      $f4, 0xcc($s0)
-/* 1A7C08 80279328 46000086 */  mov.s     $f2, $f0
-/* 1A7C0C 8027932C 46002100 */  add.s     $f4, $f4, $f0
-/* 1A7C10 80279330 C6000104 */  lwc1      $f0, 0x104($s0)
-/* 1A7C14 80279334 46001081 */  sub.s     $f2, $f2, $f0
-/* 1A7C18 80279338 44800000 */  mtc1      $zero, $f0
-/* 1A7C1C 8027933C 261100C8 */  addiu     $s1, $s0, 0xc8
-/* 1A7C20 80279340 E60400CC */  swc1      $f4, 0xcc($s0)
-/* 1A7C24 80279344 4600103C */  c.lt.s    $f2, $f0
-/* 1A7C28 80279348 00000000 */  nop
-/* 1A7C2C 8027934C 45000007 */  bc1f      .L8027936C
-/* 1A7C30 80279350 E602010C */   swc1     $f2, 0x10c($s0)
-/* 1A7C34 80279354 C60200D8 */  lwc1      $f2, 0xd8($s0)
-/* 1A7C38 80279358 46002006 */  mov.s     $f0, $f4
-/* 1A7C3C 8027935C 4602003C */  c.lt.s    $f0, $f2
-/* 1A7C40 80279360 00000000 */  nop
-/* 1A7C44 80279364 45030001 */  bc1tl     .L8027936C
-/* 1A7C48 80279368 E60200CC */   swc1     $f2, 0xcc($s0)
-.L8027936C:
-/* 1A7C4C 8027936C 8E250040 */  lw        $a1, 0x40($s1)
-/* 1A7C50 80279370 8E260048 */  lw        $a2, 0x48($s1)
-/* 1A7C54 80279374 0C099096 */  jal       add_xz_vec3f_copy2
-/* 1A7C58 80279378 0220202D */   daddu    $a0, $s1, $zero
-/* 1A7C5C 8027937C C6200000 */  lwc1      $f0, ($s1)
-/* 1A7C60 80279380 E6000144 */  swc1      $f0, 0x144($s0)
-/* 1A7C64 80279384 C6200004 */  lwc1      $f0, 4($s1)
-/* 1A7C68 80279388 E6000148 */  swc1      $f0, 0x148($s0)
-/* 1A7C6C 8027938C C6200008 */  lwc1      $f0, 8($s1)
-/* 1A7C70 80279390 E600014C */  swc1      $f0, 0x14c($s0)
-/* 1A7C74 80279394 96220058 */  lhu       $v0, 0x58($s1)
-/* 1A7C78 80279398 2442FFFF */  addiu     $v0, $v0, -1
-/* 1A7C7C 8027939C A6220058 */  sh        $v0, 0x58($s1)
-/* 1A7C80 802793A0 00021400 */  sll       $v0, $v0, 0x10
-/* 1A7C84 802793A4 1C400012 */  bgtz      $v0, .L802793F0
-/* 1A7C88 802793A8 0000102D */   daddu    $v0, $zero, $zero
-/* 1A7C8C 802793AC 8E42007C */  lw        $v0, 0x7c($s2)
-/* 1A7C90 802793B0 10400008 */  beqz      $v0, .L802793D4
-/* 1A7C94 802793B4 00000000 */   nop
-/* 1A7C98 802793B8 C6200048 */  lwc1      $f0, 0x48($s1)
-/* 1A7C9C 802793BC E7A00010 */  swc1      $f0, 0x10($sp)
-/* 1A7CA0 802793C0 8E25000C */  lw        $a1, 0xc($s1)
-/* 1A7CA4 802793C4 8E260010 */  lw        $a2, 0x10($s1)
-/* 1A7CA8 802793C8 8E270014 */  lw        $a3, 0x14($s1)
-/* 1A7CAC 802793CC 0C0990BC */  jal       play_movement_dust_effects
-/* 1A7CB0 802793D0 24040002 */   addiu    $a0, $zero, 2
-.L802793D4:
-/* 1A7CB4 802793D4 C620000C */  lwc1      $f0, 0xc($s1)
-/* 1A7CB8 802793D8 E6000144 */  swc1      $f0, 0x144($s0)
-/* 1A7CBC 802793DC C6200010 */  lwc1      $f0, 0x10($s1)
-/* 1A7CC0 802793E0 E6000148 */  swc1      $f0, 0x148($s0)
-/* 1A7CC4 802793E4 C6200014 */  lwc1      $f0, 0x14($s1)
-/* 1A7CC8 802793E8 24020001 */  addiu     $v0, $zero, 1
-/* 1A7CCC 802793EC E600014C */  swc1      $f0, 0x14c($s0)
-.L802793F0:
-/* 1A7CD0 802793F0 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 1A7CD4 802793F4 8FB20020 */  lw        $s2, 0x20($sp)
-/* 1A7CD8 802793F8 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 1A7CDC 802793FC 8FB00018 */  lw        $s0, 0x18($sp)
-/* 1A7CE0 80279400 D7BE0050 */  ldc1      $f30, 0x50($sp)
-/* 1A7CE4 80279404 D7BC0048 */  ldc1      $f28, 0x48($sp)
-/* 1A7CE8 80279408 D7BA0040 */  ldc1      $f26, 0x40($sp)
-/* 1A7CEC 8027940C D7B80038 */  ldc1      $f24, 0x38($sp)
-/* 1A7CF0 80279410 D7B60030 */  ldc1      $f22, 0x30($sp)
-/* 1A7CF4 80279414 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* 1A7CF8 80279418 03E00008 */  jr        $ra
-/* 1A7CFC 8027941C 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/asm/nonmatchings/1A5830/JumpToGoalSimple2.s b/ver/us/asm/nonmatchings/1A5830/JumpToGoalSimple2.s
deleted file mode 100644
index fd6d9e4078..0000000000
--- a/ver/us/asm/nonmatchings/1A5830/JumpToGoalSimple2.s
+++ /dev/null
@@ -1,207 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel JumpToGoalSimple2
-/* 1A7D00 80279420 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* 1A7D04 80279424 AFB20020 */  sw        $s2, 0x20($sp)
-/* 1A7D08 80279428 0080902D */  daddu     $s2, $a0, $zero
-/* 1A7D0C 8027942C AFBF0024 */  sw        $ra, 0x24($sp)
-/* 1A7D10 80279430 AFB1001C */  sw        $s1, 0x1c($sp)
-/* 1A7D14 80279434 AFB00018 */  sw        $s0, 0x18($sp)
-/* 1A7D18 80279438 F7BE0050 */  sdc1      $f30, 0x50($sp)
-/* 1A7D1C 8027943C F7BC0048 */  sdc1      $f28, 0x48($sp)
-/* 1A7D20 80279440 F7BA0040 */  sdc1      $f26, 0x40($sp)
-/* 1A7D24 80279444 F7B80038 */  sdc1      $f24, 0x38($sp)
-/* 1A7D28 80279448 F7B60030 */  sdc1      $f22, 0x30($sp)
-/* 1A7D2C 8027944C F7B40028 */  sdc1      $f20, 0x28($sp)
-/* 1A7D30 80279450 8E51000C */  lw        $s1, 0xc($s2)
-/* 1A7D34 80279454 54A00001 */  bnel      $a1, $zero, .L8027945C
-/* 1A7D38 80279458 AE400070 */   sw       $zero, 0x70($s2)
-.L8027945C:
-/* 1A7D3C 8027945C 8E420070 */  lw        $v0, 0x70($s2)
-/* 1A7D40 80279460 14400073 */  bnez      $v0, .L80279630
-/* 1A7D44 80279464 00000000 */   nop
-/* 1A7D48 80279468 8E250000 */  lw        $a1, ($s1)
-/* 1A7D4C 8027946C 26310004 */  addiu     $s1, $s1, 4
-/* 1A7D50 80279470 0C0B1EAF */  jal       evt_get_variable
-/* 1A7D54 80279474 0240202D */   daddu    $a0, $s2, $zero
-/* 1A7D58 80279478 0040202D */  daddu     $a0, $v0, $zero
-/* 1A7D5C 8027947C 2402FF81 */  addiu     $v0, $zero, -0x7f
-/* 1A7D60 80279480 14820002 */  bne       $a0, $v0, .L8027948C
-/* 1A7D64 80279484 00000000 */   nop
-/* 1A7D68 80279488 8E440148 */  lw        $a0, 0x148($s2)
-.L8027948C:
-/* 1A7D6C 8027948C 0C09A75B */  jal       get_actor
-/* 1A7D70 80279490 00000000 */   nop
-/* 1A7D74 80279494 0040802D */  daddu     $s0, $v0, $zero
-/* 1A7D78 80279498 AE500074 */  sw        $s0, 0x74($s2)
-/* 1A7D7C 8027949C 8E250000 */  lw        $a1, ($s1)
-/* 1A7D80 802794A0 0C0B1EAF */  jal       evt_get_variable
-/* 1A7D84 802794A4 0240202D */   daddu    $a0, $s2, $zero
-/* 1A7D88 802794A8 C6000148 */  lwc1      $f0, 0x148($s0)
-/* 1A7D8C 802794AC C61A0018 */  lwc1      $f26, 0x18($s0)
-/* 1A7D90 802794B0 C61C0020 */  lwc1      $f28, 0x20($s0)
-/* 1A7D94 802794B4 C614014C */  lwc1      $f20, 0x14c($s0)
-/* 1A7D98 802794B8 C618001C */  lwc1      $f24, 0x1c($s0)
-/* 1A7D9C 802794BC 2611000C */  addiu     $s1, $s0, 0xc
-/* 1A7DA0 802794C0 A6020070 */  sh        $v0, 0x70($s0)
-/* 1A7DA4 802794C4 E6000010 */  swc1      $f0, 0x10($s0)
-/* 1A7DA8 802794C8 46000786 */  mov.s     $f30, $f0
-/* 1A7DAC 802794CC 4406D000 */  mfc1      $a2, $f26
-/* 1A7DB0 802794D0 4407E000 */  mfc1      $a3, $f28
-/* 1A7DB4 802794D4 C6000144 */  lwc1      $f0, 0x144($s0)
-/* 1A7DB8 802794D8 4600A386 */  mov.s     $f14, $f20
-/* 1A7DBC 802794DC E6140014 */  swc1      $f20, 0x14($s0)
-/* 1A7DC0 802794E0 E600000C */  swc1      $f0, 0xc($s0)
-/* 1A7DC4 802794E4 46000586 */  mov.s     $f22, $f0
-/* 1A7DC8 802794E8 0C00A720 */  jal       atan2
-/* 1A7DCC 802794EC 4600B306 */   mov.s    $f12, $f22
-/* 1A7DD0 802794F0 4600B306 */  mov.s     $f12, $f22
-/* 1A7DD4 802794F4 4600A386 */  mov.s     $f14, $f20
-/* 1A7DD8 802794F8 4406D000 */  mfc1      $a2, $f26
-/* 1A7DDC 802794FC 4407E000 */  mfc1      $a3, $f28
-/* 1A7DE0 80279500 4618F781 */  sub.s     $f30, $f30, $f24
-/* 1A7DE4 80279504 0C00A7B5 */  jal       dist2D
-/* 1A7DE8 80279508 E6000054 */   swc1     $f0, 0x54($s0)
-/* 1A7DEC 8027950C 86020070 */  lh        $v0, 0x70($s0)
-/* 1A7DF0 80279510 46000106 */  mov.s     $f4, $f0
-/* 1A7DF4 80279514 14400012 */  bnez      $v0, .L80279560
-/* 1A7DF8 80279518 E6040058 */   swc1     $f4, 0x58($s0)
-/* 1A7DFC 8027951C C600004C */  lwc1      $f0, 0x4c($s0)
-/* 1A7E00 80279520 C602004C */  lwc1      $f2, 0x4c($s0)
-/* 1A7E04 80279524 46002003 */  div.s     $f0, $f4, $f0
-/* 1A7E08 80279528 4600028D */  trunc.w.s $f10, $f0
-/* 1A7E0C 8027952C 44035000 */  mfc1      $v1, $f10
-/* 1A7E10 80279530 00000000 */  nop
-/* 1A7E14 80279534 00031400 */  sll       $v0, $v1, 0x10
-/* 1A7E18 80279538 00021403 */  sra       $v0, $v0, 0x10
-/* 1A7E1C 8027953C 44820000 */  mtc1      $v0, $f0
-/* 1A7E20 80279540 00000000 */  nop
-/* 1A7E24 80279544 46800020 */  cvt.s.w   $f0, $f0
-/* 1A7E28 80279548 46020002 */  mul.s     $f0, $f0, $f2
-/* 1A7E2C 8027954C 00000000 */  nop
-/* 1A7E30 80279550 46002086 */  mov.s     $f2, $f4
-/* 1A7E34 80279554 A6030070 */  sh        $v1, 0x70($s0)
-/* 1A7E38 80279558 0809E565 */  j         .L80279594
-/* 1A7E3C 8027955C 46001201 */   sub.s    $f8, $f2, $f0
-.L80279560:
-/* 1A7E40 80279560 44821000 */  mtc1      $v0, $f2
-/* 1A7E44 80279564 00000000 */  nop
-/* 1A7E48 80279568 468010A0 */  cvt.s.w   $f2, $f2
-/* 1A7E4C 8027956C 86020070 */  lh        $v0, 0x70($s0)
-/* 1A7E50 80279570 46022083 */  div.s     $f2, $f4, $f2
-/* 1A7E54 80279574 44820000 */  mtc1      $v0, $f0
-/* 1A7E58 80279578 00000000 */  nop
-/* 1A7E5C 8027957C 46800020 */  cvt.s.w   $f0, $f0
-/* 1A7E60 80279580 46020002 */  mul.s     $f0, $f0, $f2
-/* 1A7E64 80279584 00000000 */  nop
-/* 1A7E68 80279588 C6040058 */  lwc1      $f4, 0x58($s0)
-/* 1A7E6C 8027958C E602004C */  swc1      $f2, 0x4c($s0)
-/* 1A7E70 80279590 46002201 */  sub.s     $f8, $f4, $f0
-.L80279594:
-/* 1A7E74 80279594 86220064 */  lh        $v0, 0x64($s1)
-/* 1A7E78 80279598 14400003 */  bnez      $v0, .L802795A8
-/* 1A7E7C 8027959C 00000000 */   nop
-/* 1A7E80 802795A0 0809E5BE */  j         .L802796F8
-/* 1A7E84 802795A4 24020002 */   addiu    $v0, $zero, 2
-.L802795A8:
-/* 1A7E88 802795A8 C622003C */  lwc1      $f2, 0x3c($s1)
-/* 1A7E8C 802795AC 44823000 */  mtc1      $v0, $f6
-/* 1A7E90 802795B0 00000000 */  nop
-/* 1A7E94 802795B4 468031A0 */  cvt.s.w   $f6, $f6
-/* 1A7E98 802795B8 46061082 */  mul.s     $f2, $f2, $f6
-/* 1A7E9C 802795BC 00000000 */  nop
-/* 1A7EA0 802795C0 3C013F00 */  lui       $at, 0x3f00
-/* 1A7EA4 802795C4 44810000 */  mtc1      $at, $f0
-/* 1A7EA8 802795C8 00000000 */  nop
-/* 1A7EAC 802795CC 46001082 */  mul.s     $f2, $f2, $f0
-/* 1A7EB0 802795D0 00000000 */  nop
-/* 1A7EB4 802795D4 86220064 */  lh        $v0, 0x64($s1)
-/* 1A7EB8 802795D8 C6240040 */  lwc1      $f4, 0x40($s1)
-/* 1A7EBC 802795DC 44820000 */  mtc1      $v0, $f0
-/* 1A7EC0 802795E0 00000000 */  nop
-/* 1A7EC4 802795E4 46800020 */  cvt.s.w   $f0, $f0
-/* 1A7EC8 802795E8 46004003 */  div.s     $f0, $f8, $f0
-/* 1A7ECC 802795EC 46002100 */  add.s     $f4, $f4, $f0
-/* 1A7ED0 802795F0 4606F183 */  div.s     $f6, $f30, $f6
-/* 1A7ED4 802795F4 46061080 */  add.s     $f2, $f2, $f6
-/* 1A7ED8 802795F8 E6240040 */  swc1      $f4, 0x40($s1)
-/* 1A7EDC 802795FC E6220044 */  swc1      $f2, 0x44($s1)
-/* 1A7EE0 80279600 8E0201AC */  lw        $v0, 0x1ac($s0)
-/* 1A7EE4 80279604 10400009 */  beqz      $v0, .L8027962C
-/* 1A7EE8 80279608 24020001 */   addiu    $v0, $zero, 1
-/* 1A7EEC 8027960C C600014C */  lwc1      $f0, 0x14c($s0)
-/* 1A7EF0 80279610 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 1A7EF4 80279614 8E0401AC */  lw        $a0, 0x1ac($s0)
-/* 1A7EF8 80279618 8E060144 */  lw        $a2, 0x144($s0)
-/* 1A7EFC 8027961C 8E070148 */  lw        $a3, 0x148($s0)
-/* 1A7F00 80279620 0C052757 */  jal       sfx_play_sound_at_position
-/* 1A7F04 80279624 0000282D */   daddu    $a1, $zero, $zero
-/* 1A7F08 80279628 24020001 */  addiu     $v0, $zero, 1
-.L8027962C:
-/* 1A7F0C 8027962C AE420070 */  sw        $v0, 0x70($s2)
-.L80279630:
-/* 1A7F10 80279630 8E500074 */  lw        $s0, 0x74($s2)
-/* 1A7F14 80279634 C6000050 */  lwc1      $f0, 0x50($s0)
-/* 1A7F18 80279638 C6040010 */  lwc1      $f4, 0x10($s0)
-/* 1A7F1C 8027963C 46000086 */  mov.s     $f2, $f0
-/* 1A7F20 80279640 46002101 */  sub.s     $f4, $f4, $f0
-/* 1A7F24 80279644 C6000048 */  lwc1      $f0, 0x48($s0)
-/* 1A7F28 80279648 46001081 */  sub.s     $f2, $f2, $f0
-/* 1A7F2C 8027964C 44800000 */  mtc1      $zero, $f0
-/* 1A7F30 80279650 2611000C */  addiu     $s1, $s0, 0xc
-/* 1A7F34 80279654 E6040010 */  swc1      $f4, 0x10($s0)
-/* 1A7F38 80279658 4602003C */  c.lt.s    $f0, $f2
-/* 1A7F3C 8027965C 00000000 */  nop
-/* 1A7F40 80279660 45000007 */  bc1f      .L80279680
-/* 1A7F44 80279664 E6020050 */   swc1     $f2, 0x50($s0)
-/* 1A7F48 80279668 C602001C */  lwc1      $f2, 0x1c($s0)
-/* 1A7F4C 8027966C 46002006 */  mov.s     $f0, $f4
-/* 1A7F50 80279670 4600103C */  c.lt.s    $f2, $f0
-/* 1A7F54 80279674 00000000 */  nop
-/* 1A7F58 80279678 45030001 */  bc1tl     .L80279680
-/* 1A7F5C 8027967C E6020010 */   swc1     $f2, 0x10($s0)
-.L80279680:
-/* 1A7F60 80279680 8E250040 */  lw        $a1, 0x40($s1)
-/* 1A7F64 80279684 8E260048 */  lw        $a2, 0x48($s1)
-/* 1A7F68 80279688 0C09904A */  jal       add_xz_vec3f
-/* 1A7F6C 8027968C 0220202D */   daddu    $a0, $s1, $zero
-/* 1A7F70 80279690 C6200000 */  lwc1      $f0, ($s1)
-/* 1A7F74 80279694 E6000144 */  swc1      $f0, 0x144($s0)
-/* 1A7F78 80279698 C6200004 */  lwc1      $f0, 4($s1)
-/* 1A7F7C 8027969C E6000148 */  swc1      $f0, 0x148($s0)
-/* 1A7F80 802796A0 C6200008 */  lwc1      $f0, 8($s1)
-/* 1A7F84 802796A4 E600014C */  swc1      $f0, 0x14c($s0)
-/* 1A7F88 802796A8 96220064 */  lhu       $v0, 0x64($s1)
-/* 1A7F8C 802796AC 2442FFFF */  addiu     $v0, $v0, -1
-/* 1A7F90 802796B0 A6220064 */  sh        $v0, 0x64($s1)
-/* 1A7F94 802796B4 00021400 */  sll       $v0, $v0, 0x10
-/* 1A7F98 802796B8 1C40000F */  bgtz      $v0, .L802796F8
-/* 1A7F9C 802796BC 0000102D */   daddu    $v0, $zero, $zero
-/* 1A7FA0 802796C0 C6200048 */  lwc1      $f0, 0x48($s1)
-/* 1A7FA4 802796C4 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 1A7FA8 802796C8 8E25000C */  lw        $a1, 0xc($s1)
-/* 1A7FAC 802796CC 8E260010 */  lw        $a2, 0x10($s1)
-/* 1A7FB0 802796D0 8E270014 */  lw        $a3, 0x14($s1)
-/* 1A7FB4 802796D4 0C0990BC */  jal       play_movement_dust_effects
-/* 1A7FB8 802796D8 24040002 */   addiu    $a0, $zero, 2
-/* 1A7FBC 802796DC C620000C */  lwc1      $f0, 0xc($s1)
-/* 1A7FC0 802796E0 E6000144 */  swc1      $f0, 0x144($s0)
-/* 1A7FC4 802796E4 C6200010 */  lwc1      $f0, 0x10($s1)
-/* 1A7FC8 802796E8 E6000148 */  swc1      $f0, 0x148($s0)
-/* 1A7FCC 802796EC C6200014 */  lwc1      $f0, 0x14($s1)
-/* 1A7FD0 802796F0 24020001 */  addiu     $v0, $zero, 1
-/* 1A7FD4 802796F4 E600014C */  swc1      $f0, 0x14c($s0)
-.L802796F8:
-/* 1A7FD8 802796F8 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 1A7FDC 802796FC 8FB20020 */  lw        $s2, 0x20($sp)
-/* 1A7FE0 80279700 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 1A7FE4 80279704 8FB00018 */  lw        $s0, 0x18($sp)
-/* 1A7FE8 80279708 D7BE0050 */  ldc1      $f30, 0x50($sp)
-/* 1A7FEC 8027970C D7BC0048 */  ldc1      $f28, 0x48($sp)
-/* 1A7FF0 80279710 D7BA0040 */  ldc1      $f26, 0x40($sp)
-/* 1A7FF4 80279714 D7B80038 */  ldc1      $f24, 0x38($sp)
-/* 1A7FF8 80279718 D7B60030 */  ldc1      $f22, 0x30($sp)
-/* 1A7FFC 8027971C D7B40028 */  ldc1      $f20, 0x28($sp)
-/* 1A8000 80279720 03E00008 */  jr        $ra
-/* 1A8004 80279724 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/render_models.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/render_models.s
deleted file mode 100644
index c71a67af78..0000000000
--- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/render_models.s
+++ /dev/null
@@ -1,1113 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel render_models
-/* AD290 80116B90 27BDFF10 */  addiu     $sp, $sp, -0xf0
-/* AD294 80116B94 F7BE00E8 */  sdc1      $f30, 0xe8($sp)
-/* AD298 80116B98 3C013F80 */  lui       $at, 0x3f80
-/* AD29C 80116B9C 4481F000 */  mtc1      $at, $f30
-/* AD2A0 80116BA0 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* AD2A4 80116BA4 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* AD2A8 80116BA8 3C04800B */  lui       $a0, %hi(gCameras)
-/* AD2AC 80116BAC 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
-/* AD2B0 80116BB0 AFBF00BC */  sw        $ra, 0xbc($sp)
-/* AD2B4 80116BB4 AFB400B8 */  sw        $s4, 0xb8($sp)
-/* AD2B8 80116BB8 AFB300B4 */  sw        $s3, 0xb4($sp)
-/* AD2BC 80116BBC AFB200B0 */  sw        $s2, 0xb0($sp)
-/* AD2C0 80116BC0 AFB100AC */  sw        $s1, 0xac($sp)
-/* AD2C4 80116BC4 AFB000A8 */  sw        $s0, 0xa8($sp)
-/* AD2C8 80116BC8 F7BC00E0 */  sdc1      $f28, 0xe0($sp)
-/* AD2CC 80116BCC F7BA00D8 */  sdc1      $f26, 0xd8($sp)
-/* AD2D0 80116BD0 F7B800D0 */  sdc1      $f24, 0xd0($sp)
-/* AD2D4 80116BD4 F7B600C8 */  sdc1      $f22, 0xc8($sp)
-/* AD2D8 80116BD8 F7B400C0 */  sdc1      $f20, 0xc0($sp)
-/* AD2DC 80116BDC 00031080 */  sll       $v0, $v1, 2
-/* AD2E0 80116BE0 00431021 */  addu      $v0, $v0, $v1
-/* AD2E4 80116BE4 00021080 */  sll       $v0, $v0, 2
-/* AD2E8 80116BE8 00431023 */  subu      $v0, $v0, $v1
-/* AD2EC 80116BEC 000218C0 */  sll       $v1, $v0, 3
-/* AD2F0 80116BF0 00431021 */  addu      $v0, $v0, $v1
-/* AD2F4 80116BF4 000210C0 */  sll       $v0, $v0, 3
-/* AD2F8 80116BF8 00449021 */  addu      $s2, $v0, $a0
-/* AD2FC 80116BFC C65800D4 */  lwc1      $f24, 0xd4($s2)
-/* AD300 80116C00 E7B80048 */  swc1      $f24, 0x48($sp)
-/* AD304 80116C04 C65A00D8 */  lwc1      $f26, 0xd8($s2)
-/* AD308 80116C08 E7BA004C */  swc1      $f26, 0x4c($sp)
-/* AD30C 80116C0C C65800DC */  lwc1      $f24, 0xdc($s2)
-/* AD310 80116C10 E7B80050 */  swc1      $f24, 0x50($sp)
-/* AD314 80116C14 C65A00E0 */  lwc1      $f26, 0xe0($s2)
-/* AD318 80116C18 E7BA0054 */  swc1      $f26, 0x54($sp)
-/* AD31C 80116C1C C65800E4 */  lwc1      $f24, 0xe4($s2)
-/* AD320 80116C20 E7B80058 */  swc1      $f24, 0x58($sp)
-/* AD324 80116C24 C65A00E8 */  lwc1      $f26, 0xe8($s2)
-/* AD328 80116C28 E7BA005C */  swc1      $f26, 0x5c($sp)
-/* AD32C 80116C2C C65800EC */  lwc1      $f24, 0xec($s2)
-/* AD330 80116C30 E7B80060 */  swc1      $f24, 0x60($sp)
-/* AD334 80116C34 C65A00F0 */  lwc1      $f26, 0xf0($s2)
-/* AD338 80116C38 E7BA0064 */  swc1      $f26, 0x64($sp)
-/* AD33C 80116C3C C65800F4 */  lwc1      $f24, 0xf4($s2)
-/* AD340 80116C40 E7B80068 */  swc1      $f24, 0x68($sp)
-/* AD344 80116C44 C65A00F8 */  lwc1      $f26, 0xf8($s2)
-/* AD348 80116C48 E7BA006C */  swc1      $f26, 0x6c($sp)
-/* AD34C 80116C4C C65800FC */  lwc1      $f24, 0xfc($s2)
-/* AD350 80116C50 E7B80070 */  swc1      $f24, 0x70($sp)
-/* AD354 80116C54 C65A0100 */  lwc1      $f26, 0x100($s2)
-/* AD358 80116C58 E7BA0074 */  swc1      $f26, 0x74($sp)
-/* AD35C 80116C5C C6580104 */  lwc1      $f24, 0x104($s2)
-/* AD360 80116C60 E7B80078 */  swc1      $f24, 0x78($sp)
-/* AD364 80116C64 C65A0108 */  lwc1      $f26, 0x108($s2)
-/* AD368 80116C68 27B10028 */  addiu     $s1, $sp, 0x28
-/* AD36C 80116C6C E7BA007C */  swc1      $f26, 0x7c($sp)
-/* AD370 80116C70 C658010C */  lwc1      $f24, 0x10c($s2)
-/* AD374 80116C74 0000982D */  daddu     $s3, $zero, $zero
-/* AD378 80116C78 E7B80080 */  swc1      $f24, 0x80($sp)
-/* AD37C 80116C7C C65A0110 */  lwc1      $f26, 0x110($s2)
-/* AD380 80116C80 E7BA0084 */  swc1      $f26, 0x84($sp)
-.L80116C84:
-/* AD384 80116C84 3C038015 */  lui       $v1, %hi(gCurrentModels)
-/* AD388 80116C88 8C6312CC */  lw        $v1, %lo(gCurrentModels)($v1)
-/* AD38C 80116C8C 00131080 */  sll       $v0, $s3, 2
-/* AD390 80116C90 00431021 */  addu      $v0, $v0, $v1
-/* AD394 80116C94 8C500000 */  lw        $s0, ($v0)
-/* AD398 80116C98 520003AA */  beql      $s0, $zero, .L80117B44
-/* AD39C 80116C9C 26730001 */   addiu    $s3, $s3, 1
-/* AD3A0 80116CA0 96030000 */  lhu       $v1, ($s0)
-/* AD3A4 80116CA4 506003A7 */  beql      $v1, $zero, .L80117B44
-/* AD3A8 80116CA8 26730001 */   addiu    $s3, $s3, 1
-/* AD3AC 80116CAC 30620004 */  andi      $v0, $v1, 4
-/* AD3B0 80116CB0 544003A4 */  bnel      $v0, $zero, .L80117B44
-/* AD3B4 80116CB4 26730001 */   addiu    $s3, $s3, 1
-/* AD3B8 80116CB8 30620002 */  andi      $v0, $v1, 2
-/* AD3BC 80116CBC 544003A1 */  bnel      $v0, $zero, .L80117B44
-/* AD3C0 80116CC0 26730001 */   addiu    $s3, $s3, 1
-/* AD3C4 80116CC4 30620020 */  andi      $v0, $v1, 0x20
-/* AD3C8 80116CC8 5440039E */  bnel      $v0, $zero, .L80117B44
-/* AD3CC 80116CCC 26730001 */   addiu    $s3, $s3, 1
-/* AD3D0 80116CD0 30620008 */  andi      $v0, $v1, 8
-/* AD3D4 80116CD4 5440039B */  bnel      $v0, $zero, .L80117B44
-/* AD3D8 80116CD8 26730001 */   addiu    $s3, $s3, 1
-/* AD3DC 80116CDC C6180098 */  lwc1      $f24, 0x98($s0)
-/* AD3E0 80116CE0 E7B80088 */  swc1      $f24, 0x88($sp)
-/* AD3E4 80116CE4 C61A009C */  lwc1      $f26, 0x9c($s0)
-/* AD3E8 80116CE8 E7BA008C */  swc1      $f26, 0x8c($sp)
-/* AD3EC 80116CEC C61800A0 */  lwc1      $f24, 0xa0($s0)
-/* AD3F0 80116CF0 30620200 */  andi      $v0, $v1, 0x200
-/* AD3F4 80116CF4 10400362 */  beqz      $v0, .L80117A80
-/* AD3F8 80116CF8 E7B80090 */   swc1     $f24, 0x90($sp)
-/* AD3FC 80116CFC 8E020008 */  lw        $v0, 8($s0)
-/* AD400 80116D00 8C42000C */  lw        $v0, 0xc($v0)
-/* AD404 80116D04 0000182D */  daddu     $v1, $zero, $zero
-/* AD408 80116D08 C45A0004 */  lwc1      $f26, 4($v0)
-/* AD40C 80116D0C 4680D6A0 */  cvt.s.w   $f26, $f26
-/* AD410 80116D10 E7BA0098 */  swc1      $f26, 0x98($sp)
-/* AD414 80116D14 C4580010 */  lwc1      $f24, 0x10($v0)
-/* AD418 80116D18 4680C620 */  cvt.s.w   $f24, $f24
-/* AD41C 80116D1C E7B800A0 */  swc1      $f24, 0xa0($sp)
-/* AD420 80116D20 C45C001C */  lwc1      $f28, 0x1c($v0)
-/* AD424 80116D24 4680E720 */  cvt.s.w   $f28, $f28
-/* AD428 80116D28 C7B80088 */  lwc1      $f24, 0x88($sp)
-/* AD42C 80116D2C 461AC101 */  sub.s     $f4, $f24, $f26
-/* AD430 80116D30 C7BA0048 */  lwc1      $f26, 0x48($sp)
-/* AD434 80116D34 4604D182 */  mul.s     $f6, $f26, $f4
-/* AD438 80116D38 00000000 */  nop
-/* AD43C 80116D3C C7B8008C */  lwc1      $f24, 0x8c($sp)
-/* AD440 80116D40 C7BA00A0 */  lwc1      $f26, 0xa0($sp)
-/* AD444 80116D44 461AC301 */  sub.s     $f12, $f24, $f26
-/* AD448 80116D48 C7B80058 */  lwc1      $f24, 0x58($sp)
-/* AD44C 80116D4C 460CC582 */  mul.s     $f22, $f24, $f12
-/* AD450 80116D50 00000000 */  nop
-/* AD454 80116D54 C7BA0090 */  lwc1      $f26, 0x90($sp)
-/* AD458 80116D58 461CD501 */  sub.s     $f20, $f26, $f28
-/* AD45C 80116D5C C7BA004C */  lwc1      $f26, 0x4c($sp)
-/* AD460 80116D60 4604D002 */  mul.s     $f0, $f26, $f4
-/* AD464 80116D64 00000000 */  nop
-/* AD468 80116D68 C7B80068 */  lwc1      $f24, 0x68($sp)
-/* AD46C 80116D6C 4614C382 */  mul.s     $f14, $f24, $f20
-/* AD470 80116D70 00000000 */  nop
-/* AD474 80116D74 C7BA006C */  lwc1      $f26, 0x6c($sp)
-/* AD478 80116D78 4614D402 */  mul.s     $f16, $f26, $f20
-/* AD47C 80116D7C 00000000 */  nop
-/* AD480 80116D80 C7B8005C */  lwc1      $f24, 0x5c($sp)
-/* AD484 80116D84 460CC202 */  mul.s     $f8, $f24, $f12
-/* AD488 80116D88 00000000 */  nop
-/* AD48C 80116D8C C7BA0060 */  lwc1      $f26, 0x60($sp)
-/* AD490 80116D90 460CD282 */  mul.s     $f10, $f26, $f12
-/* AD494 80116D94 00000000 */  nop
-/* AD498 80116D98 C7B80050 */  lwc1      $f24, 0x50($sp)
-/* AD49C 80116D9C 4604C082 */  mul.s     $f2, $f24, $f4
-/* AD4A0 80116DA0 00000000 */  nop
-/* AD4A4 80116DA4 C7BA0054 */  lwc1      $f26, 0x54($sp)
-/* AD4A8 80116DA8 4604D102 */  mul.s     $f4, $f26, $f4
-/* AD4AC 80116DAC 00000000 */  nop
-/* AD4B0 80116DB0 C7B80070 */  lwc1      $f24, 0x70($sp)
-/* AD4B4 80116DB4 4614C482 */  mul.s     $f18, $f24, $f20
-/* AD4B8 80116DB8 00000000 */  nop
-/* AD4BC 80116DBC C7BA0074 */  lwc1      $f26, 0x74($sp)
-/* AD4C0 80116DC0 4614D502 */  mul.s     $f20, $f26, $f20
-/* AD4C4 80116DC4 00000000 */  nop
-/* AD4C8 80116DC8 C7B80064 */  lwc1      $f24, 0x64($sp)
-/* AD4CC 80116DCC 460CC302 */  mul.s     $f12, $f24, $f12
-/* AD4D0 80116DD0 00000000 */  nop
-/* AD4D4 80116DD4 46163180 */  add.s     $f6, $f6, $f22
-/* AD4D8 80116DD8 460E3180 */  add.s     $f6, $f6, $f14
-/* AD4DC 80116DDC 46080000 */  add.s     $f0, $f0, $f8
-/* AD4E0 80116DE0 460A1080 */  add.s     $f2, $f2, $f10
-/* AD4E4 80116DE4 C7B80078 */  lwc1      $f24, 0x78($sp)
-/* AD4E8 80116DE8 46183180 */  add.s     $f6, $f6, $f24
-/* AD4EC 80116DEC 46100000 */  add.s     $f0, $f0, $f16
-/* AD4F0 80116DF0 46121080 */  add.s     $f2, $f2, $f18
-/* AD4F4 80116DF4 460C2100 */  add.s     $f4, $f4, $f12
-/* AD4F8 80116DF8 C7BA007C */  lwc1      $f26, 0x7c($sp)
-/* AD4FC 80116DFC 461A0200 */  add.s     $f8, $f0, $f26
-/* AD500 80116E00 C7B80080 */  lwc1      $f24, 0x80($sp)
-/* AD504 80116E04 46181080 */  add.s     $f2, $f2, $f24
-/* AD508 80116E08 C7BA0084 */  lwc1      $f26, 0x84($sp)
-/* AD50C 80116E0C 46142100 */  add.s     $f4, $f4, $f20
-/* AD510 80116E10 E7A60038 */  swc1      $f6, 0x38($sp)
-/* AD514 80116E14 4480C000 */  mtc1      $zero, $f24
-/* AD518 80116E18 461A2100 */  add.s     $f4, $f4, $f26
-/* AD51C 80116E1C E7A8003C */  swc1      $f8, 0x3c($sp)
-/* AD520 80116E20 E7A20040 */  swc1      $f2, 0x40($sp)
-/* AD524 80116E24 46182032 */  c.eq.s    $f4, $f24
-/* AD528 80116E28 00000000 */  nop
-/* AD52C 80116E2C 45010312 */  bc1t      .L80117A78
-/* AD530 80116E30 E7A40044 */   swc1     $f4, 0x44($sp)
-/* AD534 80116E34 4604F003 */  div.s     $f0, $f30, $f4
-/* AD538 80116E38 46003102 */  mul.s     $f4, $f6, $f0
-/* AD53C 80116E3C 00000000 */  nop
-/* AD540 80116E40 46004302 */  mul.s     $f12, $f8, $f0
-/* AD544 80116E44 00000000 */  nop
-/* AD548 80116E48 46001502 */  mul.s     $f20, $f2, $f0
-/* AD54C 80116E4C 00000000 */  nop
-/* AD550 80116E50 3C01BF80 */  lui       $at, 0xbf80
-/* AD554 80116E54 4481D000 */  mtc1      $at, $f26
-/* AD558 80116E58 00000000 */  nop
-/* AD55C 80116E5C 4614D03C */  c.lt.s    $f26, $f20
-/* AD560 80116E60 00000000 */  nop
-/* AD564 80116E64 45000011 */  bc1f      .L80116EAC
-/* AD568 80116E68 E7A00044 */   swc1     $f0, 0x44($sp)
-/* AD56C 80116E6C 4604D03E */  c.le.s    $f26, $f4
-/* AD570 80116E70 00000000 */  nop
-/* AD574 80116E74 4500000D */  bc1f      .L80116EAC
-/* AD578 80116E78 00000000 */   nop
-/* AD57C 80116E7C 461E203E */  c.le.s    $f4, $f30
-/* AD580 80116E80 00000000 */  nop
-/* AD584 80116E84 45000009 */  bc1f      .L80116EAC
-/* AD588 80116E88 00000000 */   nop
-/* AD58C 80116E8C 460CD03E */  c.le.s    $f26, $f12
-/* AD590 80116E90 00000000 */  nop
-/* AD594 80116E94 45000005 */  bc1f      .L80116EAC
-/* AD598 80116E98 00000000 */   nop
-/* AD59C 80116E9C 461E603E */  c.le.s    $f12, $f30
-/* AD5A0 80116EA0 00000000 */  nop
-/* AD5A4 80116EA4 450102F4 */  bc1t      .L80117A78
-/* AD5A8 80116EA8 00000000 */   nop
-.L80116EAC:
-/* AD5AC 80116EAC C7B80098 */  lwc1      $f24, 0x98($sp)
-/* AD5B0 80116EB0 4480D000 */  mtc1      $zero, $f26
-/* AD5B4 80116EB4 00000000 */  nop
-/* AD5B8 80116EB8 461AC032 */  c.eq.s    $f24, $f26
-/* AD5BC 80116EBC 00000000 */  nop
-/* AD5C0 80116EC0 45010062 */  bc1t      .L8011704C
-/* AD5C4 80116EC4 00000000 */   nop
-/* AD5C8 80116EC8 C7BA0088 */  lwc1      $f26, 0x88($sp)
-/* AD5CC 80116ECC 4618D100 */  add.s     $f4, $f26, $f24
-/* AD5D0 80116ED0 C7B80048 */  lwc1      $f24, 0x48($sp)
-/* AD5D4 80116ED4 4604C182 */  mul.s     $f6, $f24, $f4
-/* AD5D8 80116ED8 00000000 */  nop
-/* AD5DC 80116EDC C7BA008C */  lwc1      $f26, 0x8c($sp)
-/* AD5E0 80116EE0 C7B800A0 */  lwc1      $f24, 0xa0($sp)
-/* AD5E4 80116EE4 4618D301 */  sub.s     $f12, $f26, $f24
-/* AD5E8 80116EE8 C7BA0058 */  lwc1      $f26, 0x58($sp)
-/* AD5EC 80116EEC 460CD582 */  mul.s     $f22, $f26, $f12
-/* AD5F0 80116EF0 00000000 */  nop
-/* AD5F4 80116EF4 C7B80090 */  lwc1      $f24, 0x90($sp)
-/* AD5F8 80116EF8 461CC501 */  sub.s     $f20, $f24, $f28
-/* AD5FC 80116EFC C7B8004C */  lwc1      $f24, 0x4c($sp)
-/* AD600 80116F00 4604C002 */  mul.s     $f0, $f24, $f4
-/* AD604 80116F04 00000000 */  nop
-/* AD608 80116F08 C7BA0068 */  lwc1      $f26, 0x68($sp)
-/* AD60C 80116F0C 4614D382 */  mul.s     $f14, $f26, $f20
-/* AD610 80116F10 00000000 */  nop
-/* AD614 80116F14 C7B8006C */  lwc1      $f24, 0x6c($sp)
-/* AD618 80116F18 4614C402 */  mul.s     $f16, $f24, $f20
-/* AD61C 80116F1C 00000000 */  nop
-/* AD620 80116F20 C7BA005C */  lwc1      $f26, 0x5c($sp)
-/* AD624 80116F24 460CD202 */  mul.s     $f8, $f26, $f12
-/* AD628 80116F28 00000000 */  nop
-/* AD62C 80116F2C C7B80060 */  lwc1      $f24, 0x60($sp)
-/* AD630 80116F30 460CC282 */  mul.s     $f10, $f24, $f12
-/* AD634 80116F34 00000000 */  nop
-/* AD638 80116F38 C7BA0050 */  lwc1      $f26, 0x50($sp)
-/* AD63C 80116F3C 4604D082 */  mul.s     $f2, $f26, $f4
-/* AD640 80116F40 00000000 */  nop
-/* AD644 80116F44 C7B80054 */  lwc1      $f24, 0x54($sp)
-/* AD648 80116F48 4604C102 */  mul.s     $f4, $f24, $f4
-/* AD64C 80116F4C 00000000 */  nop
-/* AD650 80116F50 C7BA0070 */  lwc1      $f26, 0x70($sp)
-/* AD654 80116F54 4614D482 */  mul.s     $f18, $f26, $f20
-/* AD658 80116F58 00000000 */  nop
-/* AD65C 80116F5C C7B80074 */  lwc1      $f24, 0x74($sp)
-/* AD660 80116F60 4614C502 */  mul.s     $f20, $f24, $f20
-/* AD664 80116F64 00000000 */  nop
-/* AD668 80116F68 C7BA0064 */  lwc1      $f26, 0x64($sp)
-/* AD66C 80116F6C 460CD302 */  mul.s     $f12, $f26, $f12
-/* AD670 80116F70 00000000 */  nop
-/* AD674 80116F74 46163180 */  add.s     $f6, $f6, $f22
-/* AD678 80116F78 460E3180 */  add.s     $f6, $f6, $f14
-/* AD67C 80116F7C 46080000 */  add.s     $f0, $f0, $f8
-/* AD680 80116F80 460A1080 */  add.s     $f2, $f2, $f10
-/* AD684 80116F84 C7BA0078 */  lwc1      $f26, 0x78($sp)
-/* AD688 80116F88 461A3180 */  add.s     $f6, $f6, $f26
-/* AD68C 80116F8C 46100000 */  add.s     $f0, $f0, $f16
-/* AD690 80116F90 46121080 */  add.s     $f2, $f2, $f18
-/* AD694 80116F94 460C2100 */  add.s     $f4, $f4, $f12
-/* AD698 80116F98 C7B8007C */  lwc1      $f24, 0x7c($sp)
-/* AD69C 80116F9C 46180200 */  add.s     $f8, $f0, $f24
-/* AD6A0 80116FA0 C7BA0080 */  lwc1      $f26, 0x80($sp)
-/* AD6A4 80116FA4 461A1080 */  add.s     $f2, $f2, $f26
-/* AD6A8 80116FA8 C7B80084 */  lwc1      $f24, 0x84($sp)
-/* AD6AC 80116FAC 46142100 */  add.s     $f4, $f4, $f20
-/* AD6B0 80116FB0 E7A60038 */  swc1      $f6, 0x38($sp)
-/* AD6B4 80116FB4 4480D000 */  mtc1      $zero, $f26
-/* AD6B8 80116FB8 46182100 */  add.s     $f4, $f4, $f24
-/* AD6BC 80116FBC E7A8003C */  swc1      $f8, 0x3c($sp)
-/* AD6C0 80116FC0 E7A20040 */  swc1      $f2, 0x40($sp)
-/* AD6C4 80116FC4 461A2032 */  c.eq.s    $f4, $f26
-/* AD6C8 80116FC8 00000000 */  nop
-/* AD6CC 80116FCC 450102AA */  bc1t      .L80117A78
-/* AD6D0 80116FD0 E7A40044 */   swc1     $f4, 0x44($sp)
-/* AD6D4 80116FD4 4604F003 */  div.s     $f0, $f30, $f4
-/* AD6D8 80116FD8 46003102 */  mul.s     $f4, $f6, $f0
-/* AD6DC 80116FDC 00000000 */  nop
-/* AD6E0 80116FE0 46004302 */  mul.s     $f12, $f8, $f0
-/* AD6E4 80116FE4 00000000 */  nop
-/* AD6E8 80116FE8 46001502 */  mul.s     $f20, $f2, $f0
-/* AD6EC 80116FEC 00000000 */  nop
-/* AD6F0 80116FF0 3C01BF80 */  lui       $at, 0xbf80
-/* AD6F4 80116FF4 4481C000 */  mtc1      $at, $f24
-/* AD6F8 80116FF8 00000000 */  nop
-/* AD6FC 80116FFC 4614C03C */  c.lt.s    $f24, $f20
-/* AD700 80117000 00000000 */  nop
-/* AD704 80117004 45000011 */  bc1f      .L8011704C
-/* AD708 80117008 E7A00044 */   swc1     $f0, 0x44($sp)
-/* AD70C 8011700C 4604C03E */  c.le.s    $f24, $f4
-/* AD710 80117010 00000000 */  nop
-/* AD714 80117014 4500000D */  bc1f      .L8011704C
-/* AD718 80117018 00000000 */   nop
-/* AD71C 8011701C 461E203E */  c.le.s    $f4, $f30
-/* AD720 80117020 00000000 */  nop
-/* AD724 80117024 45000009 */  bc1f      .L8011704C
-/* AD728 80117028 00000000 */   nop
-/* AD72C 8011702C 460CC03E */  c.le.s    $f24, $f12
-/* AD730 80117030 00000000 */  nop
-/* AD734 80117034 45000005 */  bc1f      .L8011704C
-/* AD738 80117038 00000000 */   nop
-/* AD73C 8011703C 461E603E */  c.le.s    $f12, $f30
-/* AD740 80117040 00000000 */  nop
-/* AD744 80117044 4501028C */  bc1t      .L80117A78
-/* AD748 80117048 00000000 */   nop
-.L8011704C:
-/* AD74C 8011704C C7BA00A0 */  lwc1      $f26, 0xa0($sp)
-/* AD750 80117050 4480C000 */  mtc1      $zero, $f24
-/* AD754 80117054 00000000 */  nop
-/* AD758 80117058 4618D032 */  c.eq.s    $f26, $f24
-/* AD75C 8011705C 00000000 */  nop
-/* AD760 80117060 45010063 */  bc1t      .L801171F0
-/* AD764 80117064 00000000 */   nop
-/* AD768 80117068 C7BA0088 */  lwc1      $f26, 0x88($sp)
-/* AD76C 8011706C C7B80098 */  lwc1      $f24, 0x98($sp)
-/* AD770 80117070 4618D101 */  sub.s     $f4, $f26, $f24
-/* AD774 80117074 C7BA0048 */  lwc1      $f26, 0x48($sp)
-/* AD778 80117078 4604D182 */  mul.s     $f6, $f26, $f4
-/* AD77C 8011707C 00000000 */  nop
-/* AD780 80117080 C7B8008C */  lwc1      $f24, 0x8c($sp)
-/* AD784 80117084 C7BA00A0 */  lwc1      $f26, 0xa0($sp)
-/* AD788 80117088 461AC300 */  add.s     $f12, $f24, $f26
-/* AD78C 8011708C C7B80058 */  lwc1      $f24, 0x58($sp)
-/* AD790 80117090 460CC582 */  mul.s     $f22, $f24, $f12
-/* AD794 80117094 00000000 */  nop
-/* AD798 80117098 C7BA0090 */  lwc1      $f26, 0x90($sp)
-/* AD79C 8011709C 461CD501 */  sub.s     $f20, $f26, $f28
-/* AD7A0 801170A0 C7BA004C */  lwc1      $f26, 0x4c($sp)
-/* AD7A4 801170A4 4604D002 */  mul.s     $f0, $f26, $f4
-/* AD7A8 801170A8 00000000 */  nop
-/* AD7AC 801170AC C7B80068 */  lwc1      $f24, 0x68($sp)
-/* AD7B0 801170B0 4614C382 */  mul.s     $f14, $f24, $f20
-/* AD7B4 801170B4 00000000 */  nop
-/* AD7B8 801170B8 C7BA006C */  lwc1      $f26, 0x6c($sp)
-/* AD7BC 801170BC 4614D402 */  mul.s     $f16, $f26, $f20
-/* AD7C0 801170C0 00000000 */  nop
-/* AD7C4 801170C4 C7B8005C */  lwc1      $f24, 0x5c($sp)
-/* AD7C8 801170C8 460CC202 */  mul.s     $f8, $f24, $f12
-/* AD7CC 801170CC 00000000 */  nop
-/* AD7D0 801170D0 C7BA0060 */  lwc1      $f26, 0x60($sp)
-/* AD7D4 801170D4 460CD282 */  mul.s     $f10, $f26, $f12
-/* AD7D8 801170D8 00000000 */  nop
-/* AD7DC 801170DC C7B80050 */  lwc1      $f24, 0x50($sp)
-/* AD7E0 801170E0 4604C082 */  mul.s     $f2, $f24, $f4
-/* AD7E4 801170E4 00000000 */  nop
-/* AD7E8 801170E8 C7BA0054 */  lwc1      $f26, 0x54($sp)
-/* AD7EC 801170EC 4604D102 */  mul.s     $f4, $f26, $f4
-/* AD7F0 801170F0 00000000 */  nop
-/* AD7F4 801170F4 C7B80070 */  lwc1      $f24, 0x70($sp)
-/* AD7F8 801170F8 4614C482 */  mul.s     $f18, $f24, $f20
-/* AD7FC 801170FC 00000000 */  nop
-/* AD800 80117100 C7BA0074 */  lwc1      $f26, 0x74($sp)
-/* AD804 80117104 4614D502 */  mul.s     $f20, $f26, $f20
-/* AD808 80117108 00000000 */  nop
-/* AD80C 8011710C C7B80064 */  lwc1      $f24, 0x64($sp)
-/* AD810 80117110 460CC302 */  mul.s     $f12, $f24, $f12
-/* AD814 80117114 00000000 */  nop
-/* AD818 80117118 46163180 */  add.s     $f6, $f6, $f22
-/* AD81C 8011711C 460E3180 */  add.s     $f6, $f6, $f14
-/* AD820 80117120 46080000 */  add.s     $f0, $f0, $f8
-/* AD824 80117124 460A1080 */  add.s     $f2, $f2, $f10
-/* AD828 80117128 C7B80078 */  lwc1      $f24, 0x78($sp)
-/* AD82C 8011712C 46183180 */  add.s     $f6, $f6, $f24
-/* AD830 80117130 46100000 */  add.s     $f0, $f0, $f16
-/* AD834 80117134 46121080 */  add.s     $f2, $f2, $f18
-/* AD838 80117138 460C2100 */  add.s     $f4, $f4, $f12
-/* AD83C 8011713C C7BA007C */  lwc1      $f26, 0x7c($sp)
-/* AD840 80117140 461A0200 */  add.s     $f8, $f0, $f26
-/* AD844 80117144 C7B80080 */  lwc1      $f24, 0x80($sp)
-/* AD848 80117148 46181080 */  add.s     $f2, $f2, $f24
-/* AD84C 8011714C C7BA0084 */  lwc1      $f26, 0x84($sp)
-/* AD850 80117150 46142100 */  add.s     $f4, $f4, $f20
-/* AD854 80117154 E7A60038 */  swc1      $f6, 0x38($sp)
-/* AD858 80117158 4480C000 */  mtc1      $zero, $f24
-/* AD85C 8011715C 461A2100 */  add.s     $f4, $f4, $f26
-/* AD860 80117160 E7A8003C */  swc1      $f8, 0x3c($sp)
-/* AD864 80117164 E7A20040 */  swc1      $f2, 0x40($sp)
-/* AD868 80117168 46182032 */  c.eq.s    $f4, $f24
-/* AD86C 8011716C 00000000 */  nop
-/* AD870 80117170 45010241 */  bc1t      .L80117A78
-/* AD874 80117174 E7A40044 */   swc1     $f4, 0x44($sp)
-/* AD878 80117178 4604F003 */  div.s     $f0, $f30, $f4
-/* AD87C 8011717C 46003102 */  mul.s     $f4, $f6, $f0
-/* AD880 80117180 00000000 */  nop
-/* AD884 80117184 46004302 */  mul.s     $f12, $f8, $f0
-/* AD888 80117188 00000000 */  nop
-/* AD88C 8011718C 46001502 */  mul.s     $f20, $f2, $f0
-/* AD890 80117190 00000000 */  nop
-/* AD894 80117194 3C01BF80 */  lui       $at, 0xbf80
-/* AD898 80117198 4481D000 */  mtc1      $at, $f26
-/* AD89C 8011719C 00000000 */  nop
-/* AD8A0 801171A0 4614D03C */  c.lt.s    $f26, $f20
-/* AD8A4 801171A4 00000000 */  nop
-/* AD8A8 801171A8 45000011 */  bc1f      .L801171F0
-/* AD8AC 801171AC E7A00044 */   swc1     $f0, 0x44($sp)
-/* AD8B0 801171B0 4604D03E */  c.le.s    $f26, $f4
-/* AD8B4 801171B4 00000000 */  nop
-/* AD8B8 801171B8 4500000D */  bc1f      .L801171F0
-/* AD8BC 801171BC 00000000 */   nop
-/* AD8C0 801171C0 461E203E */  c.le.s    $f4, $f30
-/* AD8C4 801171C4 00000000 */  nop
-/* AD8C8 801171C8 45000009 */  bc1f      .L801171F0
-/* AD8CC 801171CC 00000000 */   nop
-/* AD8D0 801171D0 460CD03E */  c.le.s    $f26, $f12
-/* AD8D4 801171D4 00000000 */  nop
-/* AD8D8 801171D8 45000005 */  bc1f      .L801171F0
-/* AD8DC 801171DC 00000000 */   nop
-/* AD8E0 801171E0 461E603E */  c.le.s    $f12, $f30
-/* AD8E4 801171E4 00000000 */  nop
-/* AD8E8 801171E8 45010223 */  bc1t      .L80117A78
-/* AD8EC 801171EC 00000000 */   nop
-.L801171F0:
-/* AD8F0 801171F0 C7B80098 */  lwc1      $f24, 0x98($sp)
-/* AD8F4 801171F4 4480D000 */  mtc1      $zero, $f26
-/* AD8F8 801171F8 00000000 */  nop
-/* AD8FC 801171FC 461AC032 */  c.eq.s    $f24, $f26
-/* AD900 80117200 00000000 */  nop
-/* AD904 80117204 45010068 */  bc1t      .L801173A8
-/* AD908 80117208 00000000 */   nop
-/* AD90C 8011720C C7B800A0 */  lwc1      $f24, 0xa0($sp)
-/* AD910 80117210 461AC032 */  c.eq.s    $f24, $f26
-/* AD914 80117214 00000000 */  nop
-/* AD918 80117218 45010063 */  bc1t      .L801173A8
-/* AD91C 8011721C 00000000 */   nop
-/* AD920 80117220 C7BA0088 */  lwc1      $f26, 0x88($sp)
-/* AD924 80117224 C7B80098 */  lwc1      $f24, 0x98($sp)
-/* AD928 80117228 4618D100 */  add.s     $f4, $f26, $f24
-/* AD92C 8011722C C7BA0048 */  lwc1      $f26, 0x48($sp)
-/* AD930 80117230 4604D182 */  mul.s     $f6, $f26, $f4
-/* AD934 80117234 00000000 */  nop
-/* AD938 80117238 C7B8008C */  lwc1      $f24, 0x8c($sp)
-/* AD93C 8011723C C7BA00A0 */  lwc1      $f26, 0xa0($sp)
-/* AD940 80117240 461AC300 */  add.s     $f12, $f24, $f26
-/* AD944 80117244 C7B80058 */  lwc1      $f24, 0x58($sp)
-/* AD948 80117248 460CC582 */  mul.s     $f22, $f24, $f12
-/* AD94C 8011724C 00000000 */  nop
-/* AD950 80117250 C7BA0090 */  lwc1      $f26, 0x90($sp)
-/* AD954 80117254 461CD501 */  sub.s     $f20, $f26, $f28
-/* AD958 80117258 C7BA004C */  lwc1      $f26, 0x4c($sp)
-/* AD95C 8011725C 4604D002 */  mul.s     $f0, $f26, $f4
-/* AD960 80117260 00000000 */  nop
-/* AD964 80117264 C7B80068 */  lwc1      $f24, 0x68($sp)
-/* AD968 80117268 4614C382 */  mul.s     $f14, $f24, $f20
-/* AD96C 8011726C 00000000 */  nop
-/* AD970 80117270 C7BA006C */  lwc1      $f26, 0x6c($sp)
-/* AD974 80117274 4614D402 */  mul.s     $f16, $f26, $f20
-/* AD978 80117278 00000000 */  nop
-/* AD97C 8011727C C7B8005C */  lwc1      $f24, 0x5c($sp)
-/* AD980 80117280 460CC202 */  mul.s     $f8, $f24, $f12
-/* AD984 80117284 00000000 */  nop
-/* AD988 80117288 C7BA0060 */  lwc1      $f26, 0x60($sp)
-/* AD98C 8011728C 460CD282 */  mul.s     $f10, $f26, $f12
-/* AD990 80117290 00000000 */  nop
-/* AD994 80117294 C7B80050 */  lwc1      $f24, 0x50($sp)
-/* AD998 80117298 4604C082 */  mul.s     $f2, $f24, $f4
-/* AD99C 8011729C 00000000 */  nop
-/* AD9A0 801172A0 C7BA0054 */  lwc1      $f26, 0x54($sp)
-/* AD9A4 801172A4 4604D102 */  mul.s     $f4, $f26, $f4
-/* AD9A8 801172A8 00000000 */  nop
-/* AD9AC 801172AC C7B80070 */  lwc1      $f24, 0x70($sp)
-/* AD9B0 801172B0 4614C482 */  mul.s     $f18, $f24, $f20
-/* AD9B4 801172B4 00000000 */  nop
-/* AD9B8 801172B8 C7BA0074 */  lwc1      $f26, 0x74($sp)
-/* AD9BC 801172BC 4614D502 */  mul.s     $f20, $f26, $f20
-/* AD9C0 801172C0 00000000 */  nop
-/* AD9C4 801172C4 C7B80064 */  lwc1      $f24, 0x64($sp)
-/* AD9C8 801172C8 460CC302 */  mul.s     $f12, $f24, $f12
-/* AD9CC 801172CC 00000000 */  nop
-/* AD9D0 801172D0 46163180 */  add.s     $f6, $f6, $f22
-/* AD9D4 801172D4 460E3180 */  add.s     $f6, $f6, $f14
-/* AD9D8 801172D8 46080000 */  add.s     $f0, $f0, $f8
-/* AD9DC 801172DC 460A1080 */  add.s     $f2, $f2, $f10
-/* AD9E0 801172E0 C7B80078 */  lwc1      $f24, 0x78($sp)
-/* AD9E4 801172E4 46183180 */  add.s     $f6, $f6, $f24
-/* AD9E8 801172E8 46100000 */  add.s     $f0, $f0, $f16
-/* AD9EC 801172EC 46121080 */  add.s     $f2, $f2, $f18
-/* AD9F0 801172F0 460C2100 */  add.s     $f4, $f4, $f12
-/* AD9F4 801172F4 C7BA007C */  lwc1      $f26, 0x7c($sp)
-/* AD9F8 801172F8 461A0200 */  add.s     $f8, $f0, $f26
-/* AD9FC 801172FC C7B80080 */  lwc1      $f24, 0x80($sp)
-/* ADA00 80117300 46181080 */  add.s     $f2, $f2, $f24
-/* ADA04 80117304 C7BA0084 */  lwc1      $f26, 0x84($sp)
-/* ADA08 80117308 46142100 */  add.s     $f4, $f4, $f20
-/* ADA0C 8011730C E7A60038 */  swc1      $f6, 0x38($sp)
-/* ADA10 80117310 4480C000 */  mtc1      $zero, $f24
-/* ADA14 80117314 461A2100 */  add.s     $f4, $f4, $f26
-/* ADA18 80117318 E7A8003C */  swc1      $f8, 0x3c($sp)
-/* ADA1C 8011731C E7A20040 */  swc1      $f2, 0x40($sp)
-/* ADA20 80117320 46182032 */  c.eq.s    $f4, $f24
-/* ADA24 80117324 00000000 */  nop
-/* ADA28 80117328 450101D3 */  bc1t      .L80117A78
-/* ADA2C 8011732C E7A40044 */   swc1     $f4, 0x44($sp)
-/* ADA30 80117330 4604F003 */  div.s     $f0, $f30, $f4
-/* ADA34 80117334 46003102 */  mul.s     $f4, $f6, $f0
-/* ADA38 80117338 00000000 */  nop
-/* ADA3C 8011733C 46004302 */  mul.s     $f12, $f8, $f0
-/* ADA40 80117340 00000000 */  nop
-/* ADA44 80117344 46001502 */  mul.s     $f20, $f2, $f0
-/* ADA48 80117348 00000000 */  nop
-/* ADA4C 8011734C 3C01BF80 */  lui       $at, 0xbf80
-/* ADA50 80117350 4481D000 */  mtc1      $at, $f26
-/* ADA54 80117354 00000000 */  nop
-/* ADA58 80117358 4614D03C */  c.lt.s    $f26, $f20
-/* ADA5C 8011735C 00000000 */  nop
-/* ADA60 80117360 45000013 */  bc1f      .L801173B0
-/* ADA64 80117364 E7A00044 */   swc1     $f0, 0x44($sp)
-/* ADA68 80117368 4604D03E */  c.le.s    $f26, $f4
-/* ADA6C 8011736C 00000000 */  nop
-/* ADA70 80117370 4500000F */  bc1f      .L801173B0
-/* ADA74 80117374 00000000 */   nop
-/* ADA78 80117378 461E203E */  c.le.s    $f4, $f30
-/* ADA7C 8011737C 00000000 */  nop
-/* ADA80 80117380 4500000B */  bc1f      .L801173B0
-/* ADA84 80117384 00000000 */   nop
-/* ADA88 80117388 460CD03E */  c.le.s    $f26, $f12
-/* ADA8C 8011738C 00000000 */  nop
-/* ADA90 80117390 45000007 */  bc1f      .L801173B0
-/* ADA94 80117394 00000000 */   nop
-/* ADA98 80117398 461E603E */  c.le.s    $f12, $f30
-/* ADA9C 8011739C 00000000 */  nop
-/* ADAA0 801173A0 450101B5 */  bc1t      .L80117A78
-/* ADAA4 801173A4 00000000 */   nop
-.L801173A8:
-/* ADAA8 801173A8 4480C000 */  mtc1      $zero, $f24
-/* ADAAC 801173AC 00000000 */  nop
-.L801173B0:
-/* ADAB0 801173B0 4618E032 */  c.eq.s    $f28, $f24
-/* ADAB4 801173B4 00000000 */  nop
-/* ADAB8 801173B8 45010063 */  bc1t      .L80117548
-/* ADABC 801173BC 00000000 */   nop
-/* ADAC0 801173C0 C7BA0088 */  lwc1      $f26, 0x88($sp)
-/* ADAC4 801173C4 C7B80098 */  lwc1      $f24, 0x98($sp)
-/* ADAC8 801173C8 4618D101 */  sub.s     $f4, $f26, $f24
-/* ADACC 801173CC C7BA0048 */  lwc1      $f26, 0x48($sp)
-/* ADAD0 801173D0 4604D182 */  mul.s     $f6, $f26, $f4
-/* ADAD4 801173D4 00000000 */  nop
-/* ADAD8 801173D8 C7B8008C */  lwc1      $f24, 0x8c($sp)
-/* ADADC 801173DC C7BA00A0 */  lwc1      $f26, 0xa0($sp)
-/* ADAE0 801173E0 461AC301 */  sub.s     $f12, $f24, $f26
-/* ADAE4 801173E4 C7B80058 */  lwc1      $f24, 0x58($sp)
-/* ADAE8 801173E8 460CC582 */  mul.s     $f22, $f24, $f12
-/* ADAEC 801173EC 00000000 */  nop
-/* ADAF0 801173F0 C7BA0090 */  lwc1      $f26, 0x90($sp)
-/* ADAF4 801173F4 461CD500 */  add.s     $f20, $f26, $f28
-/* ADAF8 801173F8 C7BA004C */  lwc1      $f26, 0x4c($sp)
-/* ADAFC 801173FC 4604D002 */  mul.s     $f0, $f26, $f4
-/* ADB00 80117400 00000000 */  nop
-/* ADB04 80117404 C7B80068 */  lwc1      $f24, 0x68($sp)
-/* ADB08 80117408 4614C382 */  mul.s     $f14, $f24, $f20
-/* ADB0C 8011740C 00000000 */  nop
-/* ADB10 80117410 C7BA006C */  lwc1      $f26, 0x6c($sp)
-/* ADB14 80117414 4614D402 */  mul.s     $f16, $f26, $f20
-/* ADB18 80117418 00000000 */  nop
-/* ADB1C 8011741C C7B8005C */  lwc1      $f24, 0x5c($sp)
-/* ADB20 80117420 460CC202 */  mul.s     $f8, $f24, $f12
-/* ADB24 80117424 00000000 */  nop
-/* ADB28 80117428 C7BA0060 */  lwc1      $f26, 0x60($sp)
-/* ADB2C 8011742C 460CD282 */  mul.s     $f10, $f26, $f12
-/* ADB30 80117430 00000000 */  nop
-/* ADB34 80117434 C7B80050 */  lwc1      $f24, 0x50($sp)
-/* ADB38 80117438 4604C082 */  mul.s     $f2, $f24, $f4
-/* ADB3C 8011743C 00000000 */  nop
-/* ADB40 80117440 C7BA0054 */  lwc1      $f26, 0x54($sp)
-/* ADB44 80117444 4604D102 */  mul.s     $f4, $f26, $f4
-/* ADB48 80117448 00000000 */  nop
-/* ADB4C 8011744C C7B80070 */  lwc1      $f24, 0x70($sp)
-/* ADB50 80117450 4614C482 */  mul.s     $f18, $f24, $f20
-/* ADB54 80117454 00000000 */  nop
-/* ADB58 80117458 C7BA0074 */  lwc1      $f26, 0x74($sp)
-/* ADB5C 8011745C 4614D502 */  mul.s     $f20, $f26, $f20
-/* ADB60 80117460 00000000 */  nop
-/* ADB64 80117464 C7B80064 */  lwc1      $f24, 0x64($sp)
-/* ADB68 80117468 460CC302 */  mul.s     $f12, $f24, $f12
-/* ADB6C 8011746C 00000000 */  nop
-/* ADB70 80117470 46163180 */  add.s     $f6, $f6, $f22
-/* ADB74 80117474 460E3180 */  add.s     $f6, $f6, $f14
-/* ADB78 80117478 46080000 */  add.s     $f0, $f0, $f8
-/* ADB7C 8011747C 460A1080 */  add.s     $f2, $f2, $f10
-/* ADB80 80117480 C7B80078 */  lwc1      $f24, 0x78($sp)
-/* ADB84 80117484 46183180 */  add.s     $f6, $f6, $f24
-/* ADB88 80117488 46100000 */  add.s     $f0, $f0, $f16
-/* ADB8C 8011748C 46121080 */  add.s     $f2, $f2, $f18
-/* ADB90 80117490 460C2100 */  add.s     $f4, $f4, $f12
-/* ADB94 80117494 C7BA007C */  lwc1      $f26, 0x7c($sp)
-/* ADB98 80117498 461A0200 */  add.s     $f8, $f0, $f26
-/* ADB9C 8011749C C7B80080 */  lwc1      $f24, 0x80($sp)
-/* ADBA0 801174A0 46181080 */  add.s     $f2, $f2, $f24
-/* ADBA4 801174A4 C7BA0084 */  lwc1      $f26, 0x84($sp)
-/* ADBA8 801174A8 46142100 */  add.s     $f4, $f4, $f20
-/* ADBAC 801174AC E7A60038 */  swc1      $f6, 0x38($sp)
-/* ADBB0 801174B0 4480C000 */  mtc1      $zero, $f24
-/* ADBB4 801174B4 461A2100 */  add.s     $f4, $f4, $f26
-/* ADBB8 801174B8 E7A8003C */  swc1      $f8, 0x3c($sp)
-/* ADBBC 801174BC E7A20040 */  swc1      $f2, 0x40($sp)
-/* ADBC0 801174C0 46182032 */  c.eq.s    $f4, $f24
-/* ADBC4 801174C4 00000000 */  nop
-/* ADBC8 801174C8 4501016B */  bc1t      .L80117A78
-/* ADBCC 801174CC E7A40044 */   swc1     $f4, 0x44($sp)
-/* ADBD0 801174D0 4604F003 */  div.s     $f0, $f30, $f4
-/* ADBD4 801174D4 46003102 */  mul.s     $f4, $f6, $f0
-/* ADBD8 801174D8 00000000 */  nop
-/* ADBDC 801174DC 46004302 */  mul.s     $f12, $f8, $f0
-/* ADBE0 801174E0 00000000 */  nop
-/* ADBE4 801174E4 46001502 */  mul.s     $f20, $f2, $f0
-/* ADBE8 801174E8 00000000 */  nop
-/* ADBEC 801174EC 3C01BF80 */  lui       $at, 0xbf80
-/* ADBF0 801174F0 4481D000 */  mtc1      $at, $f26
-/* ADBF4 801174F4 00000000 */  nop
-/* ADBF8 801174F8 4614D03C */  c.lt.s    $f26, $f20
-/* ADBFC 801174FC 00000000 */  nop
-/* ADC00 80117500 45000011 */  bc1f      .L80117548
-/* ADC04 80117504 E7A00044 */   swc1     $f0, 0x44($sp)
-/* ADC08 80117508 4604D03E */  c.le.s    $f26, $f4
-/* ADC0C 8011750C 00000000 */  nop
-/* ADC10 80117510 4500000D */  bc1f      .L80117548
-/* ADC14 80117514 00000000 */   nop
-/* ADC18 80117518 461E203E */  c.le.s    $f4, $f30
-/* ADC1C 8011751C 00000000 */  nop
-/* ADC20 80117520 45000009 */  bc1f      .L80117548
-/* ADC24 80117524 00000000 */   nop
-/* ADC28 80117528 460CD03E */  c.le.s    $f26, $f12
-/* ADC2C 8011752C 00000000 */  nop
-/* ADC30 80117530 45000005 */  bc1f      .L80117548
-/* ADC34 80117534 00000000 */   nop
-/* ADC38 80117538 461E603E */  c.le.s    $f12, $f30
-/* ADC3C 8011753C 00000000 */  nop
-/* ADC40 80117540 4501014D */  bc1t      .L80117A78
-/* ADC44 80117544 00000000 */   nop
-.L80117548:
-/* ADC48 80117548 C7B80098 */  lwc1      $f24, 0x98($sp)
-/* ADC4C 8011754C 4480D000 */  mtc1      $zero, $f26
-/* ADC50 80117550 00000000 */  nop
-/* ADC54 80117554 461AC032 */  c.eq.s    $f24, $f26
-/* ADC58 80117558 00000000 */  nop
-/* ADC5C 8011755C 45010066 */  bc1t      .L801176F8
-/* ADC60 80117560 00000000 */   nop
-/* ADC64 80117564 461AE032 */  c.eq.s    $f28, $f26
-/* ADC68 80117568 00000000 */  nop
-/* ADC6C 8011756C 45010062 */  bc1t      .L801176F8
-/* ADC70 80117570 00000000 */   nop
-/* ADC74 80117574 C7BA0088 */  lwc1      $f26, 0x88($sp)
-/* ADC78 80117578 4618D100 */  add.s     $f4, $f26, $f24
-/* ADC7C 8011757C C7B80048 */  lwc1      $f24, 0x48($sp)
-/* ADC80 80117580 4604C182 */  mul.s     $f6, $f24, $f4
-/* ADC84 80117584 00000000 */  nop
-/* ADC88 80117588 C7BA008C */  lwc1      $f26, 0x8c($sp)
-/* ADC8C 8011758C C7B800A0 */  lwc1      $f24, 0xa0($sp)
-/* ADC90 80117590 4618D301 */  sub.s     $f12, $f26, $f24
-/* ADC94 80117594 C7BA0058 */  lwc1      $f26, 0x58($sp)
-/* ADC98 80117598 460CD582 */  mul.s     $f22, $f26, $f12
-/* ADC9C 8011759C 00000000 */  nop
-/* ADCA0 801175A0 C7B80090 */  lwc1      $f24, 0x90($sp)
-/* ADCA4 801175A4 461CC500 */  add.s     $f20, $f24, $f28
-/* ADCA8 801175A8 C7B8004C */  lwc1      $f24, 0x4c($sp)
-/* ADCAC 801175AC 4604C002 */  mul.s     $f0, $f24, $f4
-/* ADCB0 801175B0 00000000 */  nop
-/* ADCB4 801175B4 C7BA0068 */  lwc1      $f26, 0x68($sp)
-/* ADCB8 801175B8 4614D382 */  mul.s     $f14, $f26, $f20
-/* ADCBC 801175BC 00000000 */  nop
-/* ADCC0 801175C0 C7B8006C */  lwc1      $f24, 0x6c($sp)
-/* ADCC4 801175C4 4614C402 */  mul.s     $f16, $f24, $f20
-/* ADCC8 801175C8 00000000 */  nop
-/* ADCCC 801175CC C7BA005C */  lwc1      $f26, 0x5c($sp)
-/* ADCD0 801175D0 460CD202 */  mul.s     $f8, $f26, $f12
-/* ADCD4 801175D4 00000000 */  nop
-/* ADCD8 801175D8 C7B80060 */  lwc1      $f24, 0x60($sp)
-/* ADCDC 801175DC 460CC282 */  mul.s     $f10, $f24, $f12
-/* ADCE0 801175E0 00000000 */  nop
-/* ADCE4 801175E4 C7BA0050 */  lwc1      $f26, 0x50($sp)
-/* ADCE8 801175E8 4604D082 */  mul.s     $f2, $f26, $f4
-/* ADCEC 801175EC 00000000 */  nop
-/* ADCF0 801175F0 C7B80054 */  lwc1      $f24, 0x54($sp)
-/* ADCF4 801175F4 4604C102 */  mul.s     $f4, $f24, $f4
-/* ADCF8 801175F8 00000000 */  nop
-/* ADCFC 801175FC C7BA0070 */  lwc1      $f26, 0x70($sp)
-/* ADD00 80117600 4614D482 */  mul.s     $f18, $f26, $f20
-/* ADD04 80117604 00000000 */  nop
-/* ADD08 80117608 C7B80074 */  lwc1      $f24, 0x74($sp)
-/* ADD0C 8011760C 4614C502 */  mul.s     $f20, $f24, $f20
-/* ADD10 80117610 00000000 */  nop
-/* ADD14 80117614 C7BA0064 */  lwc1      $f26, 0x64($sp)
-/* ADD18 80117618 460CD302 */  mul.s     $f12, $f26, $f12
-/* ADD1C 8011761C 00000000 */  nop
-/* ADD20 80117620 46163180 */  add.s     $f6, $f6, $f22
-/* ADD24 80117624 460E3180 */  add.s     $f6, $f6, $f14
-/* ADD28 80117628 46080000 */  add.s     $f0, $f0, $f8
-/* ADD2C 8011762C 460A1080 */  add.s     $f2, $f2, $f10
-/* ADD30 80117630 C7BA0078 */  lwc1      $f26, 0x78($sp)
-/* ADD34 80117634 461A3180 */  add.s     $f6, $f6, $f26
-/* ADD38 80117638 46100000 */  add.s     $f0, $f0, $f16
-/* ADD3C 8011763C 46121080 */  add.s     $f2, $f2, $f18
-/* ADD40 80117640 460C2100 */  add.s     $f4, $f4, $f12
-/* ADD44 80117644 C7B8007C */  lwc1      $f24, 0x7c($sp)
-/* ADD48 80117648 46180200 */  add.s     $f8, $f0, $f24
-/* ADD4C 8011764C C7BA0080 */  lwc1      $f26, 0x80($sp)
-/* ADD50 80117650 461A1080 */  add.s     $f2, $f2, $f26
-/* ADD54 80117654 C7B80084 */  lwc1      $f24, 0x84($sp)
-/* ADD58 80117658 46142100 */  add.s     $f4, $f4, $f20
-/* ADD5C 8011765C E7A60038 */  swc1      $f6, 0x38($sp)
-/* ADD60 80117660 4480D000 */  mtc1      $zero, $f26
-/* ADD64 80117664 46182100 */  add.s     $f4, $f4, $f24
-/* ADD68 80117668 E7A8003C */  swc1      $f8, 0x3c($sp)
-/* ADD6C 8011766C E7A20040 */  swc1      $f2, 0x40($sp)
-/* ADD70 80117670 461A2032 */  c.eq.s    $f4, $f26
-/* ADD74 80117674 00000000 */  nop
-/* ADD78 80117678 450100FF */  bc1t      .L80117A78
-/* ADD7C 8011767C E7A40044 */   swc1     $f4, 0x44($sp)
-/* ADD80 80117680 4604F003 */  div.s     $f0, $f30, $f4
-/* ADD84 80117684 46003102 */  mul.s     $f4, $f6, $f0
-/* ADD88 80117688 00000000 */  nop
-/* ADD8C 8011768C 46004302 */  mul.s     $f12, $f8, $f0
-/* ADD90 80117690 00000000 */  nop
-/* ADD94 80117694 46001502 */  mul.s     $f20, $f2, $f0
-/* ADD98 80117698 00000000 */  nop
-/* ADD9C 8011769C 3C01BF80 */  lui       $at, 0xbf80
-/* ADDA0 801176A0 4481C000 */  mtc1      $at, $f24
-/* ADDA4 801176A4 00000000 */  nop
-/* ADDA8 801176A8 4614C03C */  c.lt.s    $f24, $f20
-/* ADDAC 801176AC 00000000 */  nop
-/* ADDB0 801176B0 45000011 */  bc1f      .L801176F8
-/* ADDB4 801176B4 E7A00044 */   swc1     $f0, 0x44($sp)
-/* ADDB8 801176B8 4604C03E */  c.le.s    $f24, $f4
-/* ADDBC 801176BC 00000000 */  nop
-/* ADDC0 801176C0 4500000D */  bc1f      .L801176F8
-/* ADDC4 801176C4 00000000 */   nop
-/* ADDC8 801176C8 461E203E */  c.le.s    $f4, $f30
-/* ADDCC 801176CC 00000000 */  nop
-/* ADDD0 801176D0 45000009 */  bc1f      .L801176F8
-/* ADDD4 801176D4 00000000 */   nop
-/* ADDD8 801176D8 460CC03E */  c.le.s    $f24, $f12
-/* ADDDC 801176DC 00000000 */  nop
-/* ADDE0 801176E0 45000005 */  bc1f      .L801176F8
-/* ADDE4 801176E4 00000000 */   nop
-/* ADDE8 801176E8 461E603E */  c.le.s    $f12, $f30
-/* ADDEC 801176EC 00000000 */  nop
-/* ADDF0 801176F0 450100E1 */  bc1t      .L80117A78
-/* ADDF4 801176F4 00000000 */   nop
-.L801176F8:
-/* ADDF8 801176F8 C7BA00A0 */  lwc1      $f26, 0xa0($sp)
-/* ADDFC 801176FC 4480C000 */  mtc1      $zero, $f24
-/* ADE00 80117700 00000000 */  nop
-/* ADE04 80117704 4618D032 */  c.eq.s    $f26, $f24
-/* ADE08 80117708 00000000 */  nop
-/* ADE0C 8011770C 45010067 */  bc1t      .L801178AC
-/* ADE10 80117710 00000000 */   nop
-/* ADE14 80117714 4618E032 */  c.eq.s    $f28, $f24
-/* ADE18 80117718 00000000 */  nop
-/* ADE1C 8011771C 45010063 */  bc1t      .L801178AC
-/* ADE20 80117720 00000000 */   nop
-/* ADE24 80117724 C7BA0088 */  lwc1      $f26, 0x88($sp)
-/* ADE28 80117728 C7B80098 */  lwc1      $f24, 0x98($sp)
-/* ADE2C 8011772C 4618D101 */  sub.s     $f4, $f26, $f24
-/* ADE30 80117730 C7BA0048 */  lwc1      $f26, 0x48($sp)
-/* ADE34 80117734 4604D182 */  mul.s     $f6, $f26, $f4
-/* ADE38 80117738 00000000 */  nop
-/* ADE3C 8011773C C7B8008C */  lwc1      $f24, 0x8c($sp)
-/* ADE40 80117740 C7BA00A0 */  lwc1      $f26, 0xa0($sp)
-/* ADE44 80117744 461AC300 */  add.s     $f12, $f24, $f26
-/* ADE48 80117748 C7B80058 */  lwc1      $f24, 0x58($sp)
-/* ADE4C 8011774C 460CC582 */  mul.s     $f22, $f24, $f12
-/* ADE50 80117750 00000000 */  nop
-/* ADE54 80117754 C7BA0090 */  lwc1      $f26, 0x90($sp)
-/* ADE58 80117758 461CD500 */  add.s     $f20, $f26, $f28
-/* ADE5C 8011775C C7BA004C */  lwc1      $f26, 0x4c($sp)
-/* ADE60 80117760 4604D002 */  mul.s     $f0, $f26, $f4
-/* ADE64 80117764 00000000 */  nop
-/* ADE68 80117768 C7B80068 */  lwc1      $f24, 0x68($sp)
-/* ADE6C 8011776C 4614C382 */  mul.s     $f14, $f24, $f20
-/* ADE70 80117770 00000000 */  nop
-/* ADE74 80117774 C7BA006C */  lwc1      $f26, 0x6c($sp)
-/* ADE78 80117778 4614D402 */  mul.s     $f16, $f26, $f20
-/* ADE7C 8011777C 00000000 */  nop
-/* ADE80 80117780 C7B8005C */  lwc1      $f24, 0x5c($sp)
-/* ADE84 80117784 460CC202 */  mul.s     $f8, $f24, $f12
-/* ADE88 80117788 00000000 */  nop
-/* ADE8C 8011778C C7BA0060 */  lwc1      $f26, 0x60($sp)
-/* ADE90 80117790 460CD282 */  mul.s     $f10, $f26, $f12
-/* ADE94 80117794 00000000 */  nop
-/* ADE98 80117798 C7B80050 */  lwc1      $f24, 0x50($sp)
-/* ADE9C 8011779C 4604C082 */  mul.s     $f2, $f24, $f4
-/* ADEA0 801177A0 00000000 */  nop
-/* ADEA4 801177A4 C7BA0054 */  lwc1      $f26, 0x54($sp)
-/* ADEA8 801177A8 4604D102 */  mul.s     $f4, $f26, $f4
-/* ADEAC 801177AC 00000000 */  nop
-/* ADEB0 801177B0 C7B80070 */  lwc1      $f24, 0x70($sp)
-/* ADEB4 801177B4 4614C482 */  mul.s     $f18, $f24, $f20
-/* ADEB8 801177B8 00000000 */  nop
-/* ADEBC 801177BC C7BA0074 */  lwc1      $f26, 0x74($sp)
-/* ADEC0 801177C0 4614D502 */  mul.s     $f20, $f26, $f20
-/* ADEC4 801177C4 00000000 */  nop
-/* ADEC8 801177C8 C7B80064 */  lwc1      $f24, 0x64($sp)
-/* ADECC 801177CC 460CC302 */  mul.s     $f12, $f24, $f12
-/* ADED0 801177D0 00000000 */  nop
-/* ADED4 801177D4 46163180 */  add.s     $f6, $f6, $f22
-/* ADED8 801177D8 460E3180 */  add.s     $f6, $f6, $f14
-/* ADEDC 801177DC 46080000 */  add.s     $f0, $f0, $f8
-/* ADEE0 801177E0 460A1080 */  add.s     $f2, $f2, $f10
-/* ADEE4 801177E4 C7B80078 */  lwc1      $f24, 0x78($sp)
-/* ADEE8 801177E8 46183180 */  add.s     $f6, $f6, $f24
-/* ADEEC 801177EC 46100000 */  add.s     $f0, $f0, $f16
-/* ADEF0 801177F0 46121080 */  add.s     $f2, $f2, $f18
-/* ADEF4 801177F4 460C2100 */  add.s     $f4, $f4, $f12
-/* ADEF8 801177F8 C7BA007C */  lwc1      $f26, 0x7c($sp)
-/* ADEFC 801177FC 461A0200 */  add.s     $f8, $f0, $f26
-/* ADF00 80117800 C7B80080 */  lwc1      $f24, 0x80($sp)
-/* ADF04 80117804 46181080 */  add.s     $f2, $f2, $f24
-/* ADF08 80117808 C7BA0084 */  lwc1      $f26, 0x84($sp)
-/* ADF0C 8011780C 46142100 */  add.s     $f4, $f4, $f20
-/* ADF10 80117810 E7A60038 */  swc1      $f6, 0x38($sp)
-/* ADF14 80117814 4480C000 */  mtc1      $zero, $f24
-/* ADF18 80117818 461A2100 */  add.s     $f4, $f4, $f26
-/* ADF1C 8011781C E7A8003C */  swc1      $f8, 0x3c($sp)
-/* ADF20 80117820 E7A20040 */  swc1      $f2, 0x40($sp)
-/* ADF24 80117824 46182032 */  c.eq.s    $f4, $f24
-/* ADF28 80117828 00000000 */  nop
-/* ADF2C 8011782C 45010092 */  bc1t      .L80117A78
-/* ADF30 80117830 E7A40044 */   swc1     $f4, 0x44($sp)
-/* ADF34 80117834 4604F003 */  div.s     $f0, $f30, $f4
-/* ADF38 80117838 46003102 */  mul.s     $f4, $f6, $f0
-/* ADF3C 8011783C 00000000 */  nop
-/* ADF40 80117840 46004302 */  mul.s     $f12, $f8, $f0
-/* ADF44 80117844 00000000 */  nop
-/* ADF48 80117848 46001502 */  mul.s     $f20, $f2, $f0
-/* ADF4C 8011784C 00000000 */  nop
-/* ADF50 80117850 3C01BF80 */  lui       $at, 0xbf80
-/* ADF54 80117854 4481D000 */  mtc1      $at, $f26
-/* ADF58 80117858 00000000 */  nop
-/* ADF5C 8011785C 4614D03C */  c.lt.s    $f26, $f20
-/* ADF60 80117860 00000000 */  nop
-/* ADF64 80117864 45000011 */  bc1f      .L801178AC
-/* ADF68 80117868 E7A00044 */   swc1     $f0, 0x44($sp)
-/* ADF6C 8011786C 4604D03E */  c.le.s    $f26, $f4
-/* ADF70 80117870 00000000 */  nop
-/* ADF74 80117874 4500000D */  bc1f      .L801178AC
-/* ADF78 80117878 00000000 */   nop
-/* ADF7C 8011787C 461E203E */  c.le.s    $f4, $f30
-/* ADF80 80117880 00000000 */  nop
-/* ADF84 80117884 45000009 */  bc1f      .L801178AC
-/* ADF88 80117888 00000000 */   nop
-/* ADF8C 8011788C 460CD03E */  c.le.s    $f26, $f12
-/* ADF90 80117890 00000000 */  nop
-/* ADF94 80117894 45000005 */  bc1f      .L801178AC
-/* ADF98 80117898 00000000 */   nop
-/* ADF9C 8011789C 461E603E */  c.le.s    $f12, $f30
-/* ADFA0 801178A0 00000000 */  nop
-/* ADFA4 801178A4 45010074 */  bc1t      .L80117A78
-/* ADFA8 801178A8 00000000 */   nop
-.L801178AC:
-/* ADFAC 801178AC C7B80098 */  lwc1      $f24, 0x98($sp)
-/* ADFB0 801178B0 4480D000 */  mtc1      $zero, $f26
-/* ADFB4 801178B4 00000000 */  nop
-/* ADFB8 801178B8 461AC032 */  c.eq.s    $f24, $f26
-/* ADFBC 801178BC 00000000 */  nop
-/* ADFC0 801178C0 4503006D */  bc1tl     .L80117A78
-/* ADFC4 801178C4 24030001 */   addiu    $v1, $zero, 1
-/* ADFC8 801178C8 C7B800A0 */  lwc1      $f24, 0xa0($sp)
-/* ADFCC 801178CC 461AC032 */  c.eq.s    $f24, $f26
-/* ADFD0 801178D0 00000000 */  nop
-/* ADFD4 801178D4 45030068 */  bc1tl     .L80117A78
-/* ADFD8 801178D8 24030001 */   addiu    $v1, $zero, 1
-/* ADFDC 801178DC 461AE032 */  c.eq.s    $f28, $f26
-/* ADFE0 801178E0 00000000 */  nop
-/* ADFE4 801178E4 45030064 */  bc1tl     .L80117A78
-/* ADFE8 801178E8 24030001 */   addiu    $v1, $zero, 1
-/* ADFEC 801178EC C7BA0088 */  lwc1      $f26, 0x88($sp)
-/* ADFF0 801178F0 C7B80098 */  lwc1      $f24, 0x98($sp)
-/* ADFF4 801178F4 4618D100 */  add.s     $f4, $f26, $f24
-/* ADFF8 801178F8 C7BA0048 */  lwc1      $f26, 0x48($sp)
-/* ADFFC 801178FC 4604D182 */  mul.s     $f6, $f26, $f4
-/* AE000 80117900 00000000 */  nop
-/* AE004 80117904 C7B8008C */  lwc1      $f24, 0x8c($sp)
-/* AE008 80117908 C7BA00A0 */  lwc1      $f26, 0xa0($sp)
-/* AE00C 8011790C 461AC300 */  add.s     $f12, $f24, $f26
-/* AE010 80117910 C7B80058 */  lwc1      $f24, 0x58($sp)
-/* AE014 80117914 460CC582 */  mul.s     $f22, $f24, $f12
-/* AE018 80117918 00000000 */  nop
-/* AE01C 8011791C C7BA0090 */  lwc1      $f26, 0x90($sp)
-/* AE020 80117920 461CD500 */  add.s     $f20, $f26, $f28
-/* AE024 80117924 C7BA004C */  lwc1      $f26, 0x4c($sp)
-/* AE028 80117928 4604D002 */  mul.s     $f0, $f26, $f4
-/* AE02C 8011792C 00000000 */  nop
-/* AE030 80117930 C7B80068 */  lwc1      $f24, 0x68($sp)
-/* AE034 80117934 4614C382 */  mul.s     $f14, $f24, $f20
-/* AE038 80117938 00000000 */  nop
-/* AE03C 8011793C C7BA006C */  lwc1      $f26, 0x6c($sp)
-/* AE040 80117940 4614D402 */  mul.s     $f16, $f26, $f20
-/* AE044 80117944 00000000 */  nop
-/* AE048 80117948 C7B8005C */  lwc1      $f24, 0x5c($sp)
-/* AE04C 8011794C 460CC202 */  mul.s     $f8, $f24, $f12
-/* AE050 80117950 00000000 */  nop
-/* AE054 80117954 C7BA0060 */  lwc1      $f26, 0x60($sp)
-/* AE058 80117958 460CD282 */  mul.s     $f10, $f26, $f12
-/* AE05C 8011795C 00000000 */  nop
-/* AE060 80117960 C7B80050 */  lwc1      $f24, 0x50($sp)
-/* AE064 80117964 4604C082 */  mul.s     $f2, $f24, $f4
-/* AE068 80117968 00000000 */  nop
-/* AE06C 8011796C C7BA0054 */  lwc1      $f26, 0x54($sp)
-/* AE070 80117970 4604D102 */  mul.s     $f4, $f26, $f4
-/* AE074 80117974 00000000 */  nop
-/* AE078 80117978 C7B80070 */  lwc1      $f24, 0x70($sp)
-/* AE07C 8011797C 4614C482 */  mul.s     $f18, $f24, $f20
-/* AE080 80117980 00000000 */  nop
-/* AE084 80117984 C7BA0074 */  lwc1      $f26, 0x74($sp)
-/* AE088 80117988 4614D502 */  mul.s     $f20, $f26, $f20
-/* AE08C 8011798C 00000000 */  nop
-/* AE090 80117990 C7B80064 */  lwc1      $f24, 0x64($sp)
-/* AE094 80117994 460CC302 */  mul.s     $f12, $f24, $f12
-/* AE098 80117998 00000000 */  nop
-/* AE09C 8011799C 46163180 */  add.s     $f6, $f6, $f22
-/* AE0A0 801179A0 460E3180 */  add.s     $f6, $f6, $f14
-/* AE0A4 801179A4 46080000 */  add.s     $f0, $f0, $f8
-/* AE0A8 801179A8 460A1080 */  add.s     $f2, $f2, $f10
-/* AE0AC 801179AC C7B80078 */  lwc1      $f24, 0x78($sp)
-/* AE0B0 801179B0 46183180 */  add.s     $f6, $f6, $f24
-/* AE0B4 801179B4 46100000 */  add.s     $f0, $f0, $f16
-/* AE0B8 801179B8 46121080 */  add.s     $f2, $f2, $f18
-/* AE0BC 801179BC 460C2100 */  add.s     $f4, $f4, $f12
-/* AE0C0 801179C0 C7BA007C */  lwc1      $f26, 0x7c($sp)
-/* AE0C4 801179C4 461A0200 */  add.s     $f8, $f0, $f26
-/* AE0C8 801179C8 C7B80080 */  lwc1      $f24, 0x80($sp)
-/* AE0CC 801179CC 46181080 */  add.s     $f2, $f2, $f24
-/* AE0D0 801179D0 C7BA0084 */  lwc1      $f26, 0x84($sp)
-/* AE0D4 801179D4 46142100 */  add.s     $f4, $f4, $f20
-/* AE0D8 801179D8 E7A60038 */  swc1      $f6, 0x38($sp)
-/* AE0DC 801179DC 4480C000 */  mtc1      $zero, $f24
-/* AE0E0 801179E0 461A2100 */  add.s     $f4, $f4, $f26
-/* AE0E4 801179E4 E7A8003C */  swc1      $f8, 0x3c($sp)
-/* AE0E8 801179E8 E7A20040 */  swc1      $f2, 0x40($sp)
-/* AE0EC 801179EC 46182032 */  c.eq.s    $f4, $f24
-/* AE0F0 801179F0 00000000 */  nop
-/* AE0F4 801179F4 45010020 */  bc1t      .L80117A78
-/* AE0F8 801179F8 E7A40044 */   swc1     $f4, 0x44($sp)
-/* AE0FC 801179FC 4604F003 */  div.s     $f0, $f30, $f4
-/* AE100 80117A00 46003102 */  mul.s     $f4, $f6, $f0
-/* AE104 80117A04 00000000 */  nop
-/* AE108 80117A08 46004302 */  mul.s     $f12, $f8, $f0
-/* AE10C 80117A0C 00000000 */  nop
-/* AE110 80117A10 46001502 */  mul.s     $f20, $f2, $f0
-/* AE114 80117A14 00000000 */  nop
-/* AE118 80117A18 3C01BF80 */  lui       $at, 0xbf80
-/* AE11C 80117A1C 4481D000 */  mtc1      $at, $f26
-/* AE120 80117A20 00000000 */  nop
-/* AE124 80117A24 4614D03C */  c.lt.s    $f26, $f20
-/* AE128 80117A28 00000000 */  nop
-/* AE12C 80117A2C 45000011 */  bc1f      .L80117A74
-/* AE130 80117A30 E7A00044 */   swc1     $f0, 0x44($sp)
-/* AE134 80117A34 4604D03E */  c.le.s    $f26, $f4
-/* AE138 80117A38 00000000 */  nop
-/* AE13C 80117A3C 4502000E */  bc1fl     .L80117A78
-/* AE140 80117A40 24030001 */   addiu    $v1, $zero, 1
-/* AE144 80117A44 461E203E */  c.le.s    $f4, $f30
-/* AE148 80117A48 00000000 */  nop
-/* AE14C 80117A4C 4502000A */  bc1fl     .L80117A78
-/* AE150 80117A50 24030001 */   addiu    $v1, $zero, 1
-/* AE154 80117A54 460CD03E */  c.le.s    $f26, $f12
-/* AE158 80117A58 00000000 */  nop
-/* AE15C 80117A5C 45020006 */  bc1fl     .L80117A78
-/* AE160 80117A60 24030001 */   addiu    $v1, $zero, 1
-/* AE164 80117A64 461E603E */  c.le.s    $f12, $f30
-/* AE168 80117A68 00000000 */  nop
-/* AE16C 80117A6C 45010002 */  bc1t      .L80117A78
-/* AE170 80117A70 00000000 */   nop
-.L80117A74:
-/* AE174 80117A74 24030001 */  addiu     $v1, $zero, 1
-.L80117A78:
-/* AE178 80117A78 54600032 */  bnel      $v1, $zero, .L80117B44
-/* AE17C 80117A7C 26730001 */   addiu    $s3, $s3, 1
-.L80117A80:
-/* AE180 80117A80 264400D4 */  addiu     $a0, $s2, 0xd4
-/* AE184 80117A84 8FA50088 */  lw        $a1, 0x88($sp)
-/* AE188 80117A88 8FA6008C */  lw        $a2, 0x8c($sp)
-/* AE18C 80117A8C 8FA70090 */  lw        $a3, 0x90($sp)
-/* AE190 80117A90 27A20038 */  addiu     $v0, $sp, 0x38
-/* AE194 80117A94 AFA20014 */  sw        $v0, 0x14($sp)
-/* AE198 80117A98 27A2003C */  addiu     $v0, $sp, 0x3c
-/* AE19C 80117A9C AFA20018 */  sw        $v0, 0x18($sp)
-/* AE1A0 80117AA0 27A20040 */  addiu     $v0, $sp, 0x40
-/* AE1A4 80117AA4 AFA2001C */  sw        $v0, 0x1c($sp)
-/* AE1A8 80117AA8 27A20044 */  addiu     $v0, $sp, 0x44
-/* AE1AC 80117AAC E7BE0010 */  swc1      $f30, 0x10($sp)
-/* AE1B0 80117AB0 0C00A588 */  jal       transform_point
-/* AE1B4 80117AB4 AFA20020 */   sw       $v0, 0x20($sp)
-/* AE1B8 80117AB8 C7A00040 */  lwc1      $f0, 0x40($sp)
-/* AE1BC 80117ABC 3C01459C */  lui       $at, 0x459c
-/* AE1C0 80117AC0 34214000 */  ori       $at, $at, 0x4000
-/* AE1C4 80117AC4 44811000 */  mtc1      $at, $f2
-/* AE1C8 80117AC8 00000000 */  nop
-/* AE1CC 80117ACC 46020000 */  add.s     $f0, $f0, $f2
-/* AE1D0 80117AD0 4600060D */  trunc.w.s $f24, $f0
-/* AE1D4 80117AD4 4404C000 */  mfc1      $a0, $f24
-/* AE1D8 80117AD8 00000000 */  nop
-/* AE1DC 80117ADC 04810003 */  bgez      $a0, .L80117AEC
-/* AE1E0 80117AE0 28822711 */   slti     $v0, $a0, 0x2711
-/* AE1E4 80117AE4 08045EBD */  j         .L80117AF4
-/* AE1E8 80117AE8 0000202D */   daddu    $a0, $zero, $zero
-.L80117AEC:
-/* AE1EC 80117AEC 50400001 */  beql      $v0, $zero, .L80117AF4
-/* AE1F0 80117AF0 24042710 */   addiu    $a0, $zero, 0x2710
-.L80117AF4:
-/* AE1F4 80117AF4 AE300008 */  sw        $s0, 8($s1)
-/* AE1F8 80117AF8 8E020008 */  lw        $v0, 8($s0)
-/* AE1FC 80117AFC 8C430000 */  lw        $v1, ($v0)
-/* AE200 80117B00 24020005 */  addiu     $v0, $zero, 5
-/* AE204 80117B04 14620005 */  bne       $v1, $v0, .L80117B1C
-/* AE208 80117B08 00000000 */   nop
-/* AE20C 80117B0C 3C028011 */  lui       $v0, %hi(appendGfx_model_group)
-/* AE210 80117B10 24427C94 */  addiu     $v0, $v0, %lo(appendGfx_model_group)
-/* AE214 80117B14 08045ECA */  j         .L80117B28
-/* AE218 80117B18 AE22000C */   sw       $v0, 0xc($s1)
-.L80117B1C:
-/* AE21C 80117B1C 3C028011 */  lui       $v0, %hi(appendGfx_model)
-/* AE220 80117B20 24423090 */  addiu     $v0, $v0, %lo(appendGfx_model)
-/* AE224 80117B24 AE22000C */  sw        $v0, 0xc($s1)
-.L80117B28:
-/* AE228 80117B28 00041023 */  negu      $v0, $a0
-/* AE22C 80117B2C AE220004 */  sw        $v0, 4($s1)
-/* AE230 80117B30 820200A6 */  lb        $v0, 0xa6($s0)
-/* AE234 80117B34 0220202D */  daddu     $a0, $s1, $zero
-/* AE238 80117B38 0C047644 */  jal       queue_render_task
-/* AE23C 80117B3C AE220000 */   sw       $v0, ($s1)
-/* AE240 80117B40 26730001 */  addiu     $s3, $s3, 1
-.L80117B44:
-/* AE244 80117B44 2A620100 */  slti      $v0, $s3, 0x100
-/* AE248 80117B48 1440FC4E */  bnez      $v0, .L80116C84
-/* AE24C 80117B4C 27B40038 */   addiu    $s4, $sp, 0x38
-/* AE250 80117B50 0000982D */  daddu     $s3, $zero, $zero
-/* AE254 80117B54 3C013F80 */  lui       $at, 0x3f80
-/* AE258 80117B58 4481B000 */  mtc1      $at, $f22
-.L80117B5C:
-/* AE25C 80117B5C 3C038015 */  lui       $v1, %hi(gCurrentTransformGroups)
-/* AE260 80117B60 8C6312E0 */  lw        $v1, %lo(gCurrentTransformGroups)($v1)
-/* AE264 80117B64 00131080 */  sll       $v0, $s3, 2
-/* AE268 80117B68 00431021 */  addu      $v0, $v0, $v1
-/* AE26C 80117B6C 8C500000 */  lw        $s0, ($v0)
-/* AE270 80117B70 52000037 */  beql      $s0, $zero, .L80117C50
-/* AE274 80117B74 26730001 */   addiu    $s3, $s3, 1
-/* AE278 80117B78 96020000 */  lhu       $v0, ($s0)
-/* AE27C 80117B7C 50400034 */  beql      $v0, $zero, .L80117C50
-/* AE280 80117B80 26730001 */   addiu    $s3, $s3, 1
-/* AE284 80117B84 30420004 */  andi      $v0, $v0, 4
-/* AE288 80117B88 54400031 */  bnel      $v0, $zero, .L80117C50
-/* AE28C 80117B8C 26730001 */   addiu    $s3, $s3, 1
-/* AE290 80117B90 264400D4 */  addiu     $a0, $s2, 0xd4
-/* AE294 80117B94 C6040090 */  lwc1      $f4, 0x90($s0)
-/* AE298 80117B98 C60C0094 */  lwc1      $f12, 0x94($s0)
-/* AE29C 80117B9C C6140098 */  lwc1      $f20, 0x98($s0)
-/* AE2A0 80117BA0 27A2003C */  addiu     $v0, $sp, 0x3c
-/* AE2A4 80117BA4 AFA20018 */  sw        $v0, 0x18($sp)
-/* AE2A8 80117BA8 27A20040 */  addiu     $v0, $sp, 0x40
-/* AE2AC 80117BAC AFA2001C */  sw        $v0, 0x1c($sp)
-/* AE2B0 80117BB0 44052000 */  mfc1      $a1, $f4
-/* AE2B4 80117BB4 44066000 */  mfc1      $a2, $f12
-/* AE2B8 80117BB8 4407A000 */  mfc1      $a3, $f20
-/* AE2BC 80117BBC 27A20044 */  addiu     $v0, $sp, 0x44
-/* AE2C0 80117BC0 E7B60010 */  swc1      $f22, 0x10($sp)
-/* AE2C4 80117BC4 AFB40014 */  sw        $s4, 0x14($sp)
-/* AE2C8 80117BC8 0C00A588 */  jal       transform_point
-/* AE2CC 80117BCC AFA20020 */   sw       $v0, 0x20($sp)
-/* AE2D0 80117BD0 C7A20044 */  lwc1      $f2, 0x44($sp)
-/* AE2D4 80117BD4 44800000 */  mtc1      $zero, $f0
-/* AE2D8 80117BD8 00000000 */  nop
-/* AE2DC 80117BDC 46001032 */  c.eq.s    $f2, $f0
-/* AE2E0 80117BE0 00000000 */  nop
-/* AE2E4 80117BE4 45030001 */  bc1tl     .L80117BEC
-/* AE2E8 80117BE8 E7B60044 */   swc1     $f22, 0x44($sp)
-.L80117BEC:
-/* AE2EC 80117BEC C7A00040 */  lwc1      $f0, 0x40($sp)
-/* AE2F0 80117BF0 C7A20044 */  lwc1      $f2, 0x44($sp)
-/* AE2F4 80117BF4 3C01461C */  lui       $at, 0x461c
-/* AE2F8 80117BF8 34214000 */  ori       $at, $at, 0x4000
-/* AE2FC 80117BFC 44812000 */  mtc1      $at, $f4
-/* AE300 80117C00 46020003 */  div.s     $f0, $f0, $f2
-/* AE304 80117C04 46040002 */  mul.s     $f0, $f0, $f4
-/* AE308 80117C08 00000000 */  nop
-/* AE30C 80117C0C 96020000 */  lhu       $v0, ($s0)
-/* AE310 80117C10 30420002 */  andi      $v0, $v0, 2
-/* AE314 80117C14 4600060D */  trunc.w.s $f24, $f0
-/* AE318 80117C18 4404C000 */  mfc1      $a0, $f24
-/* AE31C 80117C1C 5440000C */  bnel      $v0, $zero, .L80117C50
-/* AE320 80117C20 26730001 */   addiu    $s3, $s3, 1
-/* AE324 80117C24 3C028012 */  lui       $v0, %hi(render_transform_group)
-/* AE328 80117C28 2442800C */  addiu     $v0, $v0, %lo(render_transform_group)
-/* AE32C 80117C2C AE22000C */  sw        $v0, 0xc($s1)
-/* AE330 80117C30 00041023 */  negu      $v0, $a0
-/* AE334 80117C34 AE300008 */  sw        $s0, 8($s1)
-/* AE338 80117C38 AE220004 */  sw        $v0, 4($s1)
-/* AE33C 80117C3C 9202009E */  lbu       $v0, 0x9e($s0)
-/* AE340 80117C40 0220202D */  daddu     $a0, $s1, $zero
-/* AE344 80117C44 0C047644 */  jal       queue_render_task
-/* AE348 80117C48 AE220000 */   sw       $v0, ($s1)
-/* AE34C 80117C4C 26730001 */  addiu     $s3, $s3, 1
-.L80117C50:
-/* AE350 80117C50 2A620004 */  slti      $v0, $s3, 4
-/* AE354 80117C54 1440FFC1 */  bnez      $v0, .L80117B5C
-/* AE358 80117C58 00000000 */   nop
-/* AE35C 80117C5C 8FBF00BC */  lw        $ra, 0xbc($sp)
-/* AE360 80117C60 8FB400B8 */  lw        $s4, 0xb8($sp)
-/* AE364 80117C64 8FB300B4 */  lw        $s3, 0xb4($sp)
-/* AE368 80117C68 8FB200B0 */  lw        $s2, 0xb0($sp)
-/* AE36C 80117C6C 8FB100AC */  lw        $s1, 0xac($sp)
-/* AE370 80117C70 8FB000A8 */  lw        $s0, 0xa8($sp)
-/* AE374 80117C74 D7BE00E8 */  ldc1      $f30, 0xe8($sp)
-/* AE378 80117C78 D7BC00E0 */  ldc1      $f28, 0xe0($sp)
-/* AE37C 80117C7C D7BA00D8 */  ldc1      $f26, 0xd8($sp)
-/* AE380 80117C80 D7B800D0 */  ldc1      $f24, 0xd0($sp)
-/* AE384 80117C84 D7B600C8 */  ldc1      $f22, 0xc8($sp)
-/* AE388 80117C88 D7B400C0 */  ldc1      $f20, 0xc0($sp)
-/* AE38C 80117C8C 03E00008 */  jr        $ra
-/* AE390 80117C90 27BD00F0 */   addiu    $sp, $sp, 0xf0
diff --git a/ver/us/asm/nonmatchings/npc/func_8003DC38.s b/ver/us/asm/nonmatchings/npc/func_8003DC38.s
deleted file mode 100644
index b4960a9890..0000000000
--- a/ver/us/asm/nonmatchings/npc/func_8003DC38.s
+++ /dev/null
@@ -1,225 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8003DC38
-/* 19038 8003DC38 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* 1903C 8003DC3C 3C028007 */  lui       $v0, %hi(D_80077C2C)
-/* 19040 8003DC40 24427C2C */  addiu     $v0, $v0, %lo(D_80077C2C)
-/* 19044 8003DC44 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 19048 8003DC48 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 1904C 8003DC4C AFB20018 */  sw        $s2, 0x18($sp)
-/* 19050 8003DC50 AFB10014 */  sw        $s1, 0x14($sp)
-/* 19054 8003DC54 AFB00010 */  sw        $s0, 0x10($sp)
-/* 19058 8003DC58 F7BE0050 */  sdc1      $f30, 0x50($sp)
-/* 1905C 8003DC5C F7BC0048 */  sdc1      $f28, 0x48($sp)
-/* 19060 8003DC60 F7BA0040 */  sdc1      $f26, 0x40($sp)
-/* 19064 8003DC64 F7B80038 */  sdc1      $f24, 0x38($sp)
-/* 19068 8003DC68 F7B60030 */  sdc1      $f22, 0x30($sp)
-/* 1906C 8003DC6C F7B40028 */  sdc1      $f20, 0x28($sp)
-/* 19070 8003DC70 C4400000 */  lwc1      $f0, ($v0)
-/* 19074 8003DC74 3C013DCC */  lui       $at, 0x3dcc
-/* 19078 8003DC78 3421CCCD */  ori       $at, $at, 0xcccd
-/* 1907C 8003DC7C 44811000 */  mtc1      $at, $f2
-/* 19080 8003DC80 00000000 */  nop
-/* 19084 8003DC84 46020000 */  add.s     $f0, $f0, $f2
-/* 19088 8003DC88 E4400000 */  swc1      $f0, ($v0)
-/* 1908C 8003DC8C 24020002 */  addiu     $v0, $zero, 2
-/* 19090 8003DC90 14A2006B */  bne       $a1, $v0, .L8003DE40
-/* 19094 8003DC94 0080882D */   daddu    $s1, $a0, $zero
-/* 19098 8003DC98 3C108007 */  lui       $s0, %hi(D_80077C24)
-/* 1909C 8003DC9C 26107C24 */  addiu     $s0, $s0, %lo(D_80077C24)
-/* 190A0 8003DCA0 C62E003C */  lwc1      $f14, 0x3c($s1)
-/* 190A4 8003DCA4 3C014160 */  lui       $at, 0x4160
-/* 190A8 8003DCA8 44810000 */  mtc1      $at, $f0
-/* 190AC 8003DCAC C62C0038 */  lwc1      $f12, 0x38($s1)
-/* 190B0 8003DCB0 46007380 */  add.s     $f14, $f14, $f0
-/* 190B4 8003DCB4 3C0140A0 */  lui       $at, 0x40a0
-/* 190B8 8003DCB8 44810000 */  mtc1      $at, $f0
-/* 190BC 8003DCBC 8E260040 */  lw        $a2, 0x40($s1)
-/* 190C0 8003DCC0 8E070000 */  lw        $a3, ($s0)
-/* 190C4 8003DCC4 0C01BF14 */  jal       fx_cloud_puff
-/* 190C8 8003DCC8 46007381 */   sub.s    $f14, $f14, $f0
-/* 190CC 8003DCCC C6000000 */  lwc1      $f0, ($s0)
-/* 190D0 8003DCD0 3C01420C */  lui       $at, 0x420c
-/* 190D4 8003DCD4 44816000 */  mtc1      $at, $f12
-/* 190D8 8003DCD8 0000982D */  daddu     $s3, $zero, $zero
-/* 190DC 8003DCDC 460C0300 */  add.s     $f12, $f0, $f12
-/* 190E0 8003DCE0 3C01BE99 */  lui       $at, 0xbe99
-/* 190E4 8003DCE4 3421999A */  ori       $at, $at, 0x999a
-/* 190E8 8003DCE8 4481F000 */  mtc1      $at, $f30
-/* 190EC 8003DCEC 0C00A6C9 */  jal       clamp_angle
-/* 190F0 8003DCF0 0260902D */   daddu    $s2, $s3, $zero
-/* 190F4 8003DCF4 E6000000 */  swc1      $f0, ($s0)
-.L8003DCF8:
-/* 190F8 8003DCF8 0C00A67F */  jal       rand_int
-/* 190FC 8003DCFC 2404000A */   addiu    $a0, $zero, 0xa
-/* 19100 8003DD00 2442FFFB */  addiu     $v0, $v0, -5
-/* 19104 8003DD04 4482B000 */  mtc1      $v0, $f22
-/* 19108 8003DD08 00000000 */  nop
-/* 1910C 8003DD0C 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 19110 8003DD10 0C00A67F */  jal       rand_int
-/* 19114 8003DD14 2404000A */   addiu    $a0, $zero, 0xa
-/* 19118 8003DD18 4616B082 */  mul.s     $f2, $f22, $f22
-/* 1911C 8003DD1C 00000000 */  nop
-/* 19120 8003DD20 2442FFFB */  addiu     $v0, $v0, -5
-/* 19124 8003DD24 4482C000 */  mtc1      $v0, $f24
-/* 19128 8003DD28 00000000 */  nop
-/* 1912C 8003DD2C 4680C620 */  cvt.s.w   $f24, $f24
-/* 19130 8003DD30 4618C102 */  mul.s     $f4, $f24, $f24
-/* 19134 8003DD34 00000000 */  nop
-/* 19138 8003DD38 C62C000C */  lwc1      $f12, 0xc($s1)
-/* 1913C 8003DD3C 44920000 */  mtc1      $s2, $f0
-/* 19140 8003DD40 00000000 */  nop
-/* 19144 8003DD44 46800020 */  cvt.s.w   $f0, $f0
-/* 19148 8003DD48 46006307 */  neg.s     $f12, $f12
-/* 1914C 8003DD4C 46006300 */  add.s     $f12, $f12, $f0
-/* 19150 8003DD50 3C01C000 */  lui       $at, 0xc000
-/* 19154 8003DD54 4481A000 */  mtc1      $at, $f20
-/* 19158 8003DD58 3C0140A0 */  lui       $at, 0x40a0
-/* 1915C 8003DD5C 44810000 */  mtc1      $at, $f0
-/* 19160 8003DD60 46041080 */  add.s     $f2, $f2, $f4
-/* 19164 8003DD64 3C018007 */  lui       $at, %hi(D_80077C28)
-/* 19168 8003DD68 A4207C28 */  sh        $zero, %lo(D_80077C28)($at)
-/* 1916C 8003DD6C 46001083 */  div.s     $f2, $f2, $f0
-/* 19170 8003DD70 0C00A6C9 */  jal       clamp_angle
-/* 19174 8003DD74 4602A501 */   sub.s    $f20, $f20, $f2
-/* 19178 8003DD78 3C0140C9 */  lui       $at, 0x40c9
-/* 1917C 8003DD7C 34210FD0 */  ori       $at, $at, 0xfd0
-/* 19180 8003DD80 44811000 */  mtc1      $at, $f2
-/* 19184 8003DD84 00000000 */  nop
-/* 19188 8003DD88 46020002 */  mul.s     $f0, $f0, $f2
-/* 1918C 8003DD8C 00000000 */  nop
-/* 19190 8003DD90 3C0143B4 */  lui       $at, 0x43b4
-/* 19194 8003DD94 44811000 */  mtc1      $at, $f2
-/* 19198 8003DD98 00000000 */  nop
-/* 1919C 8003DD9C 46020683 */  div.s     $f26, $f0, $f2
-/* 191A0 8003DDA0 0C00A85B */  jal       sin_rad
-/* 191A4 8003DDA4 4600D306 */   mov.s    $f12, $f26
-/* 191A8 8003DDA8 46000706 */  mov.s     $f28, $f0
-/* 191AC 8003DDAC 0C00A874 */  jal       cos_rad
-/* 191B0 8003DDB0 4600D306 */   mov.s    $f12, $f26
-/* 191B4 8003DDB4 862200A6 */  lh        $v0, 0xa6($s1)
-/* 191B8 8003DDB8 44822000 */  mtc1      $v0, $f4
-/* 191BC 8003DDBC 00000000 */  nop
-/* 191C0 8003DDC0 46802120 */  cvt.s.w   $f4, $f4
-/* 191C4 8003DDC4 461C2182 */  mul.s     $f6, $f4, $f28
-/* 191C8 8003DDC8 00000000 */  nop
-/* 191CC 8003DDCC 46002102 */  mul.s     $f4, $f4, $f0
-/* 191D0 8003DDD0 00000000 */  nop
-/* 191D4 8003DDD4 3C014178 */  lui       $at, 0x4178
-/* 191D8 8003DDD8 44811000 */  mtc1      $at, $f2
-/* 191DC 8003DDDC C620003C */  lwc1      $f0, 0x3c($s1)
-/* 191E0 8003DDE0 46020000 */  add.s     $f0, $f0, $f2
-/* 191E4 8003DDE4 46140000 */  add.s     $f0, $f0, $f20
-/* 191E8 8003DDE8 461E3182 */  mul.s     $f6, $f6, $f30
-/* 191EC 8003DDEC 00000000 */  nop
-/* 191F0 8003DDF0 44060000 */  mfc1      $a2, $f0
-/* 191F4 8003DDF4 C6200038 */  lwc1      $f0, 0x38($s1)
-/* 191F8 8003DDF8 46060000 */  add.s     $f0, $f0, $f6
-/* 191FC 8003DDFC 46160000 */  add.s     $f0, $f0, $f22
-/* 19200 8003DE00 461E2102 */  mul.s     $f4, $f4, $f30
-/* 19204 8003DE04 00000000 */  nop
-/* 19208 8003DE08 44050000 */  mfc1      $a1, $f0
-/* 1920C 8003DE0C C6200040 */  lwc1      $f0, 0x40($s1)
-/* 19210 8003DE10 46040000 */  add.s     $f0, $f0, $f4
-/* 19214 8003DE14 46180000 */  add.s     $f0, $f0, $f24
-/* 19218 8003DE18 2652005A */  addiu     $s2, $s2, 0x5a
-/* 1921C 8003DE1C 26730001 */  addiu     $s3, $s3, 1
-/* 19220 8003DE20 44070000 */  mfc1      $a3, $f0
-/* 19224 8003DE24 0C01BF2C */  jal       fx_cloud_trail
-/* 19228 8003DE28 24040001 */   addiu    $a0, $zero, 1
-/* 1922C 8003DE2C 2A620004 */  slti      $v0, $s3, 4
-/* 19230 8003DE30 1040004E */  beqz      $v0, .L8003DF6C
-/* 19234 8003DE34 00000000 */   nop
-/* 19238 8003DE38 0800F73E */  j         .L8003DCF8
-/* 1923C 8003DE3C 00000000 */   nop
-.L8003DE40:
-/* 19240 8003DE40 0C00A67F */  jal       rand_int
-/* 19244 8003DE44 2404000A */   addiu    $a0, $zero, 0xa
-/* 19248 8003DE48 2442FFFB */  addiu     $v0, $v0, -5
-/* 1924C 8003DE4C 4482C000 */  mtc1      $v0, $f24
-/* 19250 8003DE50 00000000 */  nop
-/* 19254 8003DE54 4680C620 */  cvt.s.w   $f24, $f24
-/* 19258 8003DE58 0C00A67F */  jal       rand_int
-/* 1925C 8003DE5C 2404000A */   addiu    $a0, $zero, 0xa
-/* 19260 8003DE60 4618C002 */  mul.s     $f0, $f24, $f24
-/* 19264 8003DE64 00000000 */  nop
-/* 19268 8003DE68 2442FFFB */  addiu     $v0, $v0, -5
-/* 1926C 8003DE6C 4482B000 */  mtc1      $v0, $f22
-/* 19270 8003DE70 00000000 */  nop
-/* 19274 8003DE74 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 19278 8003DE78 4616B082 */  mul.s     $f2, $f22, $f22
-/* 1927C 8003DE7C 00000000 */  nop
-/* 19280 8003DE80 C62C000C */  lwc1      $f12, 0xc($s1)
-/* 19284 8003DE84 3C01C000 */  lui       $at, 0xc000
-/* 19288 8003DE88 4481A000 */  mtc1      $at, $f20
-/* 1928C 8003DE8C 46020000 */  add.s     $f0, $f0, $f2
-/* 19290 8003DE90 3C018007 */  lui       $at, %hi(D_80077C28)
-/* 19294 8003DE94 A4207C28 */  sh        $zero, %lo(D_80077C28)($at)
-/* 19298 8003DE98 3C0140A0 */  lui       $at, 0x40a0
-/* 1929C 8003DE9C 44811000 */  mtc1      $at, $f2
-/* 192A0 8003DEA0 46006307 */  neg.s     $f12, $f12
-/* 192A4 8003DEA4 46020003 */  div.s     $f0, $f0, $f2
-/* 192A8 8003DEA8 0C00A6C9 */  jal       clamp_angle
-/* 192AC 8003DEAC 4600A501 */   sub.s    $f20, $f20, $f0
-/* 192B0 8003DEB0 3C0140C9 */  lui       $at, 0x40c9
-/* 192B4 8003DEB4 34210FD0 */  ori       $at, $at, 0xfd0
-/* 192B8 8003DEB8 44811000 */  mtc1      $at, $f2
-/* 192BC 8003DEBC 00000000 */  nop
-/* 192C0 8003DEC0 46020002 */  mul.s     $f0, $f0, $f2
-/* 192C4 8003DEC4 00000000 */  nop
-/* 192C8 8003DEC8 3C0143B4 */  lui       $at, 0x43b4
-/* 192CC 8003DECC 44811000 */  mtc1      $at, $f2
-/* 192D0 8003DED0 00000000 */  nop
-/* 192D4 8003DED4 46020683 */  div.s     $f26, $f0, $f2
-/* 192D8 8003DED8 0C00A85B */  jal       sin_rad
-/* 192DC 8003DEDC 4600D306 */   mov.s    $f12, $f26
-/* 192E0 8003DEE0 46000706 */  mov.s     $f28, $f0
-/* 192E4 8003DEE4 0C00A874 */  jal       cos_rad
-/* 192E8 8003DEE8 4600D306 */   mov.s    $f12, $f26
-/* 192EC 8003DEEC 862200A6 */  lh        $v0, 0xa6($s1)
-/* 192F0 8003DEF0 44822000 */  mtc1      $v0, $f4
-/* 192F4 8003DEF4 00000000 */  nop
-/* 192F8 8003DEF8 46802120 */  cvt.s.w   $f4, $f4
-/* 192FC 8003DEFC 461C2182 */  mul.s     $f6, $f4, $f28
-/* 19300 8003DF00 00000000 */  nop
-/* 19304 8003DF04 46002102 */  mul.s     $f4, $f4, $f0
-/* 19308 8003DF08 00000000 */  nop
-/* 1930C 8003DF0C 3C01BE99 */  lui       $at, 0xbe99
-/* 19310 8003DF10 3421999A */  ori       $at, $at, 0x999a
-/* 19314 8003DF14 44810000 */  mtc1      $at, $f0
-/* 19318 8003DF18 00000000 */  nop
-/* 1931C 8003DF1C 46003182 */  mul.s     $f6, $f6, $f0
-/* 19320 8003DF20 00000000 */  nop
-/* 19324 8003DF24 46002102 */  mul.s     $f4, $f4, $f0
-/* 19328 8003DF28 00000000 */  nop
-/* 1932C 8003DF2C 3C014178 */  lui       $at, 0x4178
-/* 19330 8003DF30 44811000 */  mtc1      $at, $f2
-/* 19334 8003DF34 C620003C */  lwc1      $f0, 0x3c($s1)
-/* 19338 8003DF38 46020000 */  add.s     $f0, $f0, $f2
-/* 1933C 8003DF3C 46140000 */  add.s     $f0, $f0, $f20
-/* 19340 8003DF40 44060000 */  mfc1      $a2, $f0
-/* 19344 8003DF44 C6200038 */  lwc1      $f0, 0x38($s1)
-/* 19348 8003DF48 46060000 */  add.s     $f0, $f0, $f6
-/* 1934C 8003DF4C 46180000 */  add.s     $f0, $f0, $f24
-/* 19350 8003DF50 44050000 */  mfc1      $a1, $f0
-/* 19354 8003DF54 C6200040 */  lwc1      $f0, 0x40($s1)
-/* 19358 8003DF58 46040000 */  add.s     $f0, $f0, $f4
-/* 1935C 8003DF5C 46160000 */  add.s     $f0, $f0, $f22
-/* 19360 8003DF60 44070000 */  mfc1      $a3, $f0
-/* 19364 8003DF64 0C01BF2C */  jal       fx_cloud_trail
-/* 19368 8003DF68 24040001 */   addiu    $a0, $zero, 1
-.L8003DF6C:
-/* 1936C 8003DF6C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 19370 8003DF70 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 19374 8003DF74 8FB20018 */  lw        $s2, 0x18($sp)
-/* 19378 8003DF78 8FB10014 */  lw        $s1, 0x14($sp)
-/* 1937C 8003DF7C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 19380 8003DF80 D7BE0050 */  ldc1      $f30, 0x50($sp)
-/* 19384 8003DF84 D7BC0048 */  ldc1      $f28, 0x48($sp)
-/* 19388 8003DF88 D7BA0040 */  ldc1      $f26, 0x40($sp)
-/* 1938C 8003DF8C D7B80038 */  ldc1      $f24, 0x38($sp)
-/* 19390 8003DF90 D7B60030 */  ldc1      $f22, 0x30($sp)
-/* 19394 8003DF94 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* 19398 8003DF98 03E00008 */  jr        $ra
-/* 1939C 8003DF9C 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802457C0_A2FA00.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802457C0_A2FA00.s
deleted file mode 100644
index 1820a1cc1e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802457C0_A2FA00.s
+++ /dev/null
@@ -1,54 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_8024F280_A394C0
-.double 0.01, 1.1479345624872949e+195, 1.1479345581702053e+195, 0.0
-
-.section .text
-
-glabel func_802457C0_A2FA00
-/* A2FA00 802457C0 3C06800B */  lui       $a2, %hi(gCameras)
-/* A2FA04 802457C4 24C61D80 */  addiu     $a2, $a2, %lo(gCameras)
-/* A2FA08 802457C8 10A00003 */  beqz      $a1, .L802457D8
-/* A2FA0C 802457CC 00C0382D */   daddu    $a3, $a2, $zero
-/* A2FA10 802457D0 24020028 */  addiu     $v0, $zero, 0x28
-/* A2FA14 802457D4 AC820070 */  sw        $v0, 0x70($a0)
-.L802457D8:
-/* A2FA18 802457D8 8C820070 */  lw        $v0, 0x70($a0)
-/* A2FA1C 802457DC 2443FFFF */  addiu     $v1, $v0, -1
-/* A2FA20 802457E0 AC830070 */  sw        $v1, 0x70($a0)
-/* A2FA24 802457E4 8CC50448 */  lw        $a1, 0x448($a2)
-/* A2FA28 802457E8 54A00005 */  bnel      $a1, $zero, .L80245800
-/* A2FA2C 802457EC 24020028 */   addiu    $v0, $zero, 0x28
-/* A2FA30 802457F0 8CE50444 */  lw        $a1, 0x444($a3)
-/* A2FA34 802457F4 10A00014 */  beqz      $a1, .L80245848
-/* A2FA38 802457F8 00000000 */   nop
-/* A2FA3C 802457FC 24020028 */  addiu     $v0, $zero, 0x28
-.L80245800:
-/* A2FA40 80245800 00431023 */  subu      $v0, $v0, $v1
-/* A2FA44 80245804 44821000 */  mtc1      $v0, $f2
-/* A2FA48 80245808 00000000 */  nop
-/* A2FA4C 8024580C 468010A0 */  cvt.s.w   $f2, $f2
-/* A2FA50 80245810 3C018025 */  lui       $at, %hi(D_8024F280_A394C0)
-/* A2FA54 80245814 D420F280 */  ldc1      $f0, %lo(D_8024F280_A394C0)($at)
-/* A2FA58 80245818 460010A1 */  cvt.d.s   $f2, $f2
-/* A2FA5C 8024581C 46201082 */  mul.d     $f2, $f2, $f0
-/* A2FA60 80245820 00000000 */  nop
-/* A2FA64 80245824 3C013FF0 */  lui       $at, 0x3ff0
-/* A2FA68 80245828 44812800 */  mtc1      $at, $f5
-/* A2FA6C 8024582C 44802000 */  mtc1      $zero, $f4
-/* A2FA70 80245830 C4A00024 */  lwc1      $f0, 0x24($a1)
-/* A2FA74 80245834 46222101 */  sub.d     $f4, $f4, $f2
-/* A2FA78 80245838 46000021 */  cvt.d.s   $f0, $f0
-/* A2FA7C 8024583C 46240001 */  sub.d     $f0, $f0, $f4
-/* A2FA80 80245840 46200020 */  cvt.s.d   $f0, $f0
-/* A2FA84 80245844 E4A00024 */  swc1      $f0, 0x24($a1)
-.L80245848:
-/* A2FA88 80245848 8C820070 */  lw        $v0, 0x70($a0)
-/* A2FA8C 8024584C 2C420001 */  sltiu     $v0, $v0, 1
-/* A2FA90 80245850 03E00008 */  jr        $ra
-/* A2FA94 80245854 00021040 */   sll      $v0, $v0, 1
-/* A2FA98 80245858 00000000 */  nop
-/* A2FA9C 8024585C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s
deleted file mode 100644
index 3405093595..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240BEC_A4032C
-/* A4032C 80240BEC 3C018011 */  lui       $at, %hi(gPlayerData+0x12)
-/* A40330 80240BF0 A020F2A2 */  sb        $zero, %lo(gPlayerData+0x12)($at)
-/* A40334 80240BF4 03E00008 */  jr        $ra
-/* A40338 80240BF8 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BFC_A4033C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BFC_A4033C.s
deleted file mode 100644
index 30f68e1630..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BFC_A4033C.s
+++ /dev/null
@@ -1,41 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240BFC_A4033C
-/* A4033C 80240BFC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A40340 80240C00 AFB00010 */  sw        $s0, 0x10($sp)
-/* A40344 80240C04 0080802D */  daddu     $s0, $a0, $zero
-/* A40348 80240C08 10A00002 */  beqz      $a1, .L80240C14
-/* A4034C 80240C0C AFBF0014 */   sw       $ra, 0x14($sp)
-/* A40350 80240C10 AE000074 */  sw        $zero, 0x74($s0)
-.L80240C14:
-/* A40354 80240C14 0000202D */  daddu     $a0, $zero, $zero
-/* A40358 80240C18 240500D0 */  addiu     $a1, $zero, 0xd0
-/* A4035C 80240C1C 00A0302D */  daddu     $a2, $a1, $zero
-/* A40360 80240C20 0C04DF84 */  jal       set_screen_overlay_color
-/* A40364 80240C24 00A0382D */   daddu    $a3, $a1, $zero
-/* A40368 80240C28 C6000074 */  lwc1      $f0, 0x74($s0)
-/* A4036C 80240C2C 46800020 */  cvt.s.w   $f0, $f0
-/* A40370 80240C30 44050000 */  mfc1      $a1, $f0
-/* A40374 80240C34 0C04DF62 */  jal       set_screen_overlay_params_front
-/* A40378 80240C38 24040001 */   addiu    $a0, $zero, 1
-/* A4037C 80240C3C 8E020074 */  lw        $v0, 0x74($s0)
-/* A40380 80240C40 240300FF */  addiu     $v1, $zero, 0xff
-/* A40384 80240C44 14430003 */  bne       $v0, $v1, .L80240C54
-/* A40388 80240C48 24420007 */   addiu    $v0, $v0, 7
-/* A4038C 80240C4C 0809031A */  j         .L80240C68
-/* A40390 80240C50 24020002 */   addiu    $v0, $zero, 2
-.L80240C54:
-/* A40394 80240C54 AE020074 */  sw        $v0, 0x74($s0)
-/* A40398 80240C58 28420100 */  slti      $v0, $v0, 0x100
-/* A4039C 80240C5C 50400001 */  beql      $v0, $zero, .L80240C64
-/* A403A0 80240C60 AE030074 */   sw       $v1, 0x74($s0)
-.L80240C64:
-/* A403A4 80240C64 0000102D */  daddu     $v0, $zero, $zero
-.L80240C68:
-/* A403A8 80240C68 8FBF0014 */  lw        $ra, 0x14($sp)
-/* A403AC 80240C6C 8FB00010 */  lw        $s0, 0x10($sp)
-/* A403B0 80240C70 03E00008 */  jr        $ra
-/* A403B4 80240C74 27BD0018 */   addiu    $sp, $sp, 0x18
-/* A403B8 80240C78 00000000 */  nop
-/* A403BC 80240C7C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024030C_B2084C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024030C_B2084C.s
deleted file mode 100644
index a66a962a4a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024030C_B2084C.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024030C_B2084C
-/* B2084C 8024030C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B20850 80240310 0000202D */  daddu     $a0, $zero, $zero
-/* B20854 80240314 0080282D */  daddu     $a1, $a0, $zero
-/* B20858 80240318 0080302D */  daddu     $a2, $a0, $zero
-/* B2085C 8024031C 0080382D */  daddu     $a3, $a0, $zero
-/* B20860 80240320 AFBF0018 */  sw        $ra, 0x18($sp)
-/* B20864 80240324 AFA00010 */  sw        $zero, 0x10($sp)
-/* B20868 80240328 0C01CA54 */  jal       fx_sun
-/* B2086C 8024032C AFA00014 */   sw       $zero, 0x14($sp)
-/* B20870 80240330 8FBF0018 */  lw        $ra, 0x18($sp)
-/* B20874 80240334 24020002 */  addiu     $v0, $zero, 2
-/* B20878 80240338 03E00008 */  jr        $ra
-/* B2087C 8024033C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80241134_B21674.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80241134_B21674.s
deleted file mode 100644
index 25949593c0..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80241134_B21674.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241134_B21674
-/* B21674 80241134 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B21678 80241138 AFBF0018 */  sw        $ra, 0x18($sp)
-/* B2167C 8024113C 0C00EAD2 */  jal       get_npc_safe
-/* B21680 80241140 24040002 */   addiu    $a0, $zero, 2
-/* B21684 80241144 C4420040 */  lwc1      $f2, 0x40($v0)
-/* B21688 80241148 3C0141A0 */  lui       $at, 0x41a0
-/* B2168C 8024114C 44810000 */  mtc1      $at, $f0
-/* B21690 80241150 C444003C */  lwc1      $f4, 0x3c($v0)
-/* B21694 80241154 46001081 */  sub.s     $f2, $f2, $f0
-/* B21698 80241158 44803000 */  mtc1      $zero, $f6
-/* B2169C 8024115C 00000000 */  nop
-/* B216A0 80241160 4606203C */  c.lt.s    $f4, $f6
-/* B216A4 80241164 C4400038 */  lwc1      $f0, 0x38($v0)
-/* B216A8 80241168 45000006 */  bc1f      .L80241184
-/* B216AC 8024116C 0000202D */   daddu    $a0, $zero, $zero
-/* B216B0 80241170 44050000 */  mfc1      $a1, $f0
-/* B216B4 80241174 44062000 */  mfc1      $a2, $f4
-/* B216B8 80241178 44071000 */  mfc1      $a3, $f2
-/* B216BC 8024117C 0C01C16C */  jal       fx_rising_bubble
-/* B216C0 80241180 E7A60010 */   swc1     $f6, 0x10($sp)
-.L80241184:
-/* B216C4 80241184 8FBF0018 */  lw        $ra, 0x18($sp)
-/* B216C8 80241188 0000102D */  daddu     $v0, $zero, $zero
-/* B216CC 8024118C 03E00008 */  jr        $ra
-/* B216D0 80241190 27BD0020 */   addiu    $sp, $sp, 0x20
-/* B216D4 80241194 00000000 */  nop
-/* B216D8 80241198 00000000 */  nop
-/* B216DC 8024119C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_8024033C_B2C7AC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_8024033C_B2C7AC.s
deleted file mode 100644
index cd21b64bd3..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_8024033C_B2C7AC.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024033C_B2C7AC
-/* B2C7AC 8024033C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B2C7B0 80240340 0000202D */  daddu     $a0, $zero, $zero
-/* B2C7B4 80240344 AFBF0010 */  sw        $ra, 0x10($sp)
-/* B2C7B8 80240348 0C052AD8 */  jal       bgm_clear_track_volumes
-/* B2C7BC 8024034C 0080282D */   daddu    $a1, $a0, $zero
-/* B2C7C0 80240350 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B2C7C4 80240354 24020002 */  addiu     $v0, $zero, 2
-/* B2C7C8 80240358 03E00008 */  jr        $ra
-/* B2C7CC 8024035C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_80240360_B2C7D0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_80240360_B2C7D0.s
deleted file mode 100644
index 643ef73045..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_80240360_B2C7D0.s
+++ /dev/null
@@ -1,46 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240360_B2C7D0
-/* B2C7D0 80240360 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B2C7D4 80240364 AFB00010 */  sw        $s0, 0x10($sp)
-/* B2C7D8 80240368 3C108024 */  lui       $s0, %hi(D_80242BD8_B2F048)
-/* B2C7DC 8024036C 26102BD8 */  addiu     $s0, $s0, %lo(D_80242BD8_B2F048)
-/* B2C7E0 80240370 AFBF0014 */  sw        $ra, 0x14($sp)
-/* B2C7E4 80240374 8E020000 */  lw        $v0, ($s0)
-/* B2C7E8 80240378 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* B2C7EC 8024037C 9463A552 */  lhu       $v1, %lo(gCollisionStatus+0x2)($v1)
-/* B2C7F0 80240380 1040000C */  beqz      $v0, .L802403B4
-/* B2C7F4 80240384 2402000A */   addiu    $v0, $zero, 0xa
-/* B2C7F8 80240388 3063FFFF */  andi      $v1, $v1, 0xffff
-/* B2C7FC 8024038C 10620003 */  beq       $v1, $v0, .L8024039C
-/* B2C800 80240390 2402000D */   addiu    $v0, $zero, 0xd
-/* B2C804 80240394 14620013 */  bne       $v1, $v0, .L802403E4
-/* B2C808 80240398 00000000 */   nop
-.L8024039C:
-/* B2C80C 8024039C 24040009 */  addiu     $a0, $zero, 9
-/* B2C810 802403A0 24050002 */  addiu     $a1, $zero, 2
-/* B2C814 802403A4 0C046DF0 */  jal       func_8011B7C0
-/* B2C818 802403A8 0000302D */   daddu    $a2, $zero, $zero
-/* B2C81C 802403AC 080900F9 */  j         .L802403E4
-/* B2C820 802403B0 AE000000 */   sw       $zero, ($s0)
-.L802403B4:
-/* B2C824 802403B4 3063FFFF */  andi      $v1, $v1, 0xffff
-/* B2C828 802403B8 2402002E */  addiu     $v0, $zero, 0x2e
-/* B2C82C 802403BC 10620003 */  beq       $v1, $v0, .L802403CC
-/* B2C830 802403C0 2402002B */   addiu    $v0, $zero, 0x2b
-/* B2C834 802403C4 14620007 */  bne       $v1, $v0, .L802403E4
-/* B2C838 802403C8 00000000 */   nop
-.L802403CC:
-/* B2C83C 802403CC 24040009 */  addiu     $a0, $zero, 9
-/* B2C840 802403D0 24050002 */  addiu     $a1, $zero, 2
-/* B2C844 802403D4 0C046DF0 */  jal       func_8011B7C0
-/* B2C848 802403D8 24060001 */   addiu    $a2, $zero, 1
-/* B2C84C 802403DC 24020001 */  addiu     $v0, $zero, 1
-/* B2C850 802403E0 AE020000 */  sw        $v0, ($s0)
-.L802403E4:
-/* B2C854 802403E4 8FBF0014 */  lw        $ra, 0x14($sp)
-/* B2C858 802403E8 8FB00010 */  lw        $s0, 0x10($sp)
-/* B2C85C 802403EC 0000102D */  daddu     $v0, $zero, $zero
-/* B2C860 802403F0 03E00008 */  jr        $ra
-/* B2C864 802403F4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_802403F8_B2C868.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_802403F8_B2C868.s
deleted file mode 100644
index 6f642b810b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_802403F8_B2C868.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802403F8_B2C868
-/* B2C868 802403F8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B2C86C 802403FC 0000202D */  daddu     $a0, $zero, $zero
-/* B2C870 80240400 0080282D */  daddu     $a1, $a0, $zero
-/* B2C874 80240404 0080302D */  daddu     $a2, $a0, $zero
-/* B2C878 80240408 0080382D */  daddu     $a3, $a0, $zero
-/* B2C87C 8024040C AFBF0018 */  sw        $ra, 0x18($sp)
-/* B2C880 80240410 AFA00010 */  sw        $zero, 0x10($sp)
-/* B2C884 80240414 0C01CA54 */  jal       fx_sun
-/* B2C888 80240418 AFA00014 */   sw       $zero, 0x14($sp)
-/* B2C88C 8024041C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* B2C890 80240420 24020002 */  addiu     $v0, $zero, 2
-/* B2C894 80240424 03E00008 */  jr        $ra
-/* B2C898 80240428 27BD0020 */   addiu    $sp, $sp, 0x20
-/* B2C89C 8024042C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802405EC_B351BC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802405EC_B351BC.s
deleted file mode 100644
index 8d3e3df6d1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802405EC_B351BC.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802405EC_B351BC
-/* B351BC 802405EC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B351C0 802405F0 0000202D */  daddu     $a0, $zero, $zero
-/* B351C4 802405F4 0080282D */  daddu     $a1, $a0, $zero
-/* B351C8 802405F8 0080302D */  daddu     $a2, $a0, $zero
-/* B351CC 802405FC 0080382D */  daddu     $a3, $a0, $zero
-/* B351D0 80240600 AFBF0018 */  sw        $ra, 0x18($sp)
-/* B351D4 80240604 AFA00010 */  sw        $zero, 0x10($sp)
-/* B351D8 80240608 0C01CA54 */  jal       fx_sun
-/* B351DC 8024060C AFA00014 */   sw       $zero, 0x14($sp)
-/* B351E0 80240610 8FBF0018 */  lw        $ra, 0x18($sp)
-/* B351E4 80240614 24020002 */  addiu     $v0, $zero, 2
-/* B351E8 80240618 03E00008 */  jr        $ra
-/* B351EC 8024061C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B37B70/func_80242FA0_B37B70.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B37B70/func_80242FA0_B37B70.s
deleted file mode 100644
index 880e3b9536..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B37B70/func_80242FA0_B37B70.s
+++ /dev/null
@@ -1,48 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242FA0_B37B70
-/* B37B70 80242FA0 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* B37B74 80242FA4 AFB00010 */  sw        $s0, 0x10($sp)
-/* B37B78 80242FA8 3C108011 */  lui       $s0, %hi(gPlayerStatus)
-/* B37B7C 80242FAC 2610EFC8 */  addiu     $s0, $s0, %lo(gPlayerStatus)
-/* B37B80 80242FB0 AFBF0018 */  sw        $ra, 0x18($sp)
-/* B37B84 80242FB4 AFB10014 */  sw        $s1, 0x14($sp)
-/* B37B88 80242FB8 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* B37B8C 80242FBC F7B40020 */  sdc1      $f20, 0x20($sp)
-/* B37B90 80242FC0 C60C0080 */  lwc1      $f12, 0x80($s0)
-/* B37B94 80242FC4 0C00A8BB */  jal       sin_deg
-/* B37B98 80242FC8 0080882D */   daddu    $s1, $a0, $zero
-/* B37B9C 80242FCC C6140054 */  lwc1      $f20, 0x54($s0)
-/* B37BA0 80242FD0 3C0140A0 */  lui       $at, 0x40a0
-/* B37BA4 80242FD4 4481B000 */  mtc1      $at, $f22
-/* B37BA8 80242FD8 00000000 */  nop
-/* B37BAC 80242FDC 4616A502 */  mul.s     $f20, $f20, $f22
-/* B37BB0 80242FE0 00000000 */  nop
-/* B37BB4 80242FE4 C60C0080 */  lwc1      $f12, 0x80($s0)
-/* B37BB8 80242FE8 4600A502 */  mul.s     $f20, $f20, $f0
-/* B37BBC 80242FEC 0C00A8D4 */  jal       cos_deg
-/* B37BC0 80242FF0 00000000 */   nop
-/* B37BC4 80242FF4 C6040054 */  lwc1      $f4, 0x54($s0)
-/* B37BC8 80242FF8 46162102 */  mul.s     $f4, $f4, $f22
-/* B37BCC 80242FFC 00000000 */  nop
-/* B37BD0 80243000 C6020028 */  lwc1      $f2, 0x28($s0)
-/* B37BD4 80243004 46141080 */  add.s     $f2, $f2, $f20
-/* B37BD8 80243008 46000007 */  neg.s     $f0, $f0
-/* B37BDC 8024300C 46002102 */  mul.s     $f4, $f4, $f0
-/* B37BE0 80243010 00000000 */  nop
-/* B37BE4 80243014 4600118D */  trunc.w.s $f6, $f2
-/* B37BE8 80243018 E6260084 */  swc1      $f6, 0x84($s1)
-/* B37BEC 8024301C C6000030 */  lwc1      $f0, 0x30($s0)
-/* B37BF0 80243020 46040000 */  add.s     $f0, $f0, $f4
-/* B37BF4 80243024 4600018D */  trunc.w.s $f6, $f0
-/* B37BF8 80243028 E6260088 */  swc1      $f6, 0x88($s1)
-/* B37BFC 8024302C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* B37C00 80243030 8FB10014 */  lw        $s1, 0x14($sp)
-/* B37C04 80243034 8FB00010 */  lw        $s0, 0x10($sp)
-/* B37C08 80243038 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* B37C0C 8024303C D7B40020 */  ldc1      $f20, 0x20($sp)
-/* B37C10 80243040 24020002 */  addiu     $v0, $zero, 2
-/* B37C14 80243044 03E00008 */  jr        $ra
-/* B37C18 80243048 27BD0030 */   addiu    $sp, $sp, 0x30
-/* B37C1C 8024304C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240BE8_B45358.s b/ver/us/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240BE8_B45358.s
deleted file mode 100644
index 7fdaeebe97..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240BE8_B45358.s
+++ /dev/null
@@ -1,85 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_802462E0_B4AA50
-.double 990.0, 2.732579860045591e+204, 2.732579860045591e+204, 0.0
-
-.section .text
-
-glabel func_80240BE8_B45358
-/* B45358 80240BE8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B4535C 80240BEC AFB20018 */  sw        $s2, 0x18($sp)
-/* B45360 80240BF0 0080902D */  daddu     $s2, $a0, $zero
-/* B45364 80240BF4 AFBF001C */  sw        $ra, 0x1c($sp)
-/* B45368 80240BF8 AFB10014 */  sw        $s1, 0x14($sp)
-/* B4536C 80240BFC AFB00010 */  sw        $s0, 0x10($sp)
-/* B45370 80240C00 8E4400AC */  lw        $a0, 0xac($s2)
-/* B45374 80240C04 0C04417A */  jal       get_entity_by_index
-/* B45378 80240C08 00A0802D */   daddu    $s0, $a1, $zero
-/* B4537C 80240C0C 12000004 */  beqz      $s0, .L80240C20
-/* B45380 80240C10 0040882D */   daddu    $s1, $v0, $zero
-/* B45384 80240C14 2402003C */  addiu     $v0, $zero, 0x3c
-/* B45388 80240C18 AE400070 */  sw        $zero, 0x70($s2)
-/* B4538C 80240C1C AE420074 */  sw        $v0, 0x74($s2)
-.L80240C20:
-/* B45390 80240C20 2403003C */  addiu     $v1, $zero, 0x3c
-/* B45394 80240C24 8E420074 */  lw        $v0, 0x74($s2)
-/* B45398 80240C28 3C014270 */  lui       $at, 0x4270
-/* B4539C 80240C2C 44811000 */  mtc1      $at, $f2
-/* B453A0 80240C30 00621023 */  subu      $v0, $v1, $v0
-/* B453A4 80240C34 44820000 */  mtc1      $v0, $f0
-/* B453A8 80240C38 00000000 */  nop
-/* B453AC 80240C3C 46800020 */  cvt.s.w   $f0, $f0
-/* B453B0 80240C40 46020003 */  div.s     $f0, $f0, $f2
-/* B453B4 80240C44 E6200054 */  swc1      $f0, 0x54($s1)
-/* B453B8 80240C48 8E420074 */  lw        $v0, 0x74($s2)
-/* B453BC 80240C4C 3C014049 */  lui       $at, 0x4049
-/* B453C0 80240C50 34210FD8 */  ori       $at, $at, 0xfd8
-/* B453C4 80240C54 44816000 */  mtc1      $at, $f12
-/* B453C8 80240C58 00621023 */  subu      $v0, $v1, $v0
-/* B453CC 80240C5C 44820000 */  mtc1      $v0, $f0
-/* B453D0 80240C60 00000000 */  nop
-/* B453D4 80240C64 46800020 */  cvt.s.w   $f0, $f0
-/* B453D8 80240C68 46020003 */  div.s     $f0, $f0, $f2
-/* B453DC 80240C6C E6200058 */  swc1      $f0, 0x58($s1)
-/* B453E0 80240C70 8E420074 */  lw        $v0, 0x74($s2)
-/* B453E4 80240C74 460C0302 */  mul.s     $f12, $f0, $f12
-/* B453E8 80240C78 00000000 */  nop
-/* B453EC 80240C7C 00621823 */  subu      $v1, $v1, $v0
-/* B453F0 80240C80 44830000 */  mtc1      $v1, $f0
-/* B453F4 80240C84 00000000 */  nop
-/* B453F8 80240C88 46800020 */  cvt.s.w   $f0, $f0
-/* B453FC 80240C8C 46020003 */  div.s     $f0, $f0, $f2
-/* B45400 80240C90 0C00A874 */  jal       cos_rad
-/* B45404 80240C94 E620005C */   swc1     $f0, 0x5c($s1)
-/* B45408 80240C98 3C013F80 */  lui       $at, 0x3f80
-/* B4540C 80240C9C 44811000 */  mtc1      $at, $f2
-/* B45410 80240CA0 00000000 */  nop
-/* B45414 80240CA4 46001081 */  sub.s     $f2, $f2, $f0
-/* B45418 80240CA8 3C018024 */  lui       $at, %hi(D_802462E0_B4AA50)
-/* B4541C 80240CAC D42062E0 */  ldc1      $f0, %lo(D_802462E0_B4AA50)($at)
-/* B45420 80240CB0 460010A1 */  cvt.d.s   $f2, $f2
-/* B45424 80240CB4 46201082 */  mul.d     $f2, $f2, $f0
-/* B45428 80240CB8 00000000 */  nop
-/* B4542C 80240CBC 3C013FD0 */  lui       $at, 0x3fd0
-/* B45430 80240CC0 44810800 */  mtc1      $at, $f1
-/* B45434 80240CC4 44800000 */  mtc1      $zero, $f0
-/* B45438 80240CC8 00000000 */  nop
-/* B4543C 80240CCC 46201082 */  mul.d     $f2, $f2, $f0
-/* B45440 80240CD0 00000000 */  nop
-/* B45444 80240CD4 462010A0 */  cvt.s.d   $f2, $f2
-/* B45448 80240CD8 E6220064 */  swc1      $f2, 0x64($s1)
-/* B4544C 80240CDC 8E430074 */  lw        $v1, 0x74($s2)
-/* B45450 80240CE0 2463FFFF */  addiu     $v1, $v1, -1
-/* B45454 80240CE4 00031027 */  nor       $v0, $zero, $v1
-/* B45458 80240CE8 2C420001 */  sltiu     $v0, $v0, 1
-/* B4545C 80240CEC AE430074 */  sw        $v1, 0x74($s2)
-/* B45460 80240CF0 8FBF001C */  lw        $ra, 0x1c($sp)
-/* B45464 80240CF4 8FB20018 */  lw        $s2, 0x18($sp)
-/* B45468 80240CF8 8FB10014 */  lw        $s1, 0x14($sp)
-/* B4546C 80240CFC 8FB00010 */  lw        $s0, 0x10($sp)
-/* B45470 80240D00 00021040 */  sll       $v0, $v0, 1
-/* B45474 80240D04 03E00008 */  jr        $ra
-/* B45478 80240D08 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240D0C_B4547C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240D0C_B4547C.s
deleted file mode 100644
index b2125d9ab1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240D0C_B4547C.s
+++ /dev/null
@@ -1,34 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240D0C_B4547C
-/* B4547C 80240D0C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B45480 80240D10 AFB10014 */  sw        $s1, 0x14($sp)
-/* B45484 80240D14 0080882D */  daddu     $s1, $a0, $zero
-/* B45488 80240D18 AFBF0018 */  sw        $ra, 0x18($sp)
-/* B4548C 80240D1C AFB00010 */  sw        $s0, 0x10($sp)
-/* B45490 80240D20 8E2400AC */  lw        $a0, 0xac($s1)
-/* B45494 80240D24 0C04417A */  jal       get_entity_by_index
-/* B45498 80240D28 00A0802D */   daddu    $s0, $a1, $zero
-/* B4549C 80240D2C 12000003 */  beqz      $s0, .L80240D3C
-/* B454A0 80240D30 0040182D */   daddu    $v1, $v0, $zero
-/* B454A4 80240D34 2402FFE2 */  addiu     $v0, $zero, -0x1e
-/* B454A8 80240D38 AE220070 */  sw        $v0, 0x70($s1)
-.L80240D3C:
-/* B454AC 80240D3C C6200070 */  lwc1      $f0, 0x70($s1)
-/* B454B0 80240D40 46800020 */  cvt.s.w   $f0, $f0
-/* B454B4 80240D44 E4600060 */  swc1      $f0, 0x60($v1)
-/* B454B8 80240D48 C6200070 */  lwc1      $f0, 0x70($s1)
-/* B454BC 80240D4C 46800020 */  cvt.s.w   $f0, $f0
-/* B454C0 80240D50 E4600068 */  swc1      $f0, 0x68($v1)
-/* B454C4 80240D54 8E230070 */  lw        $v1, 0x70($s1)
-/* B454C8 80240D58 24630001 */  addiu     $v1, $v1, 1
-/* B454CC 80240D5C 38620001 */  xori      $v0, $v1, 1
-/* B454D0 80240D60 2C420001 */  sltiu     $v0, $v0, 1
-/* B454D4 80240D64 AE230070 */  sw        $v1, 0x70($s1)
-/* B454D8 80240D68 8FBF0018 */  lw        $ra, 0x18($sp)
-/* B454DC 80240D6C 8FB10014 */  lw        $s1, 0x14($sp)
-/* B454E0 80240D70 8FB00010 */  lw        $s0, 0x10($sp)
-/* B454E4 80240D74 00021040 */  sll       $v0, $v0, 1
-/* B454E8 80240D78 03E00008 */  jr        $ra
-/* B454EC 80240D7C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0_B45730.s b/ver/us/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0_B45730.s
deleted file mode 100644
index 9353130c55..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0_B45730.s
+++ /dev/null
@@ -1,86 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240FC0_B45730
-/* B45730 80240FC0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B45734 80240FC4 AFB10014 */  sw        $s1, 0x14($sp)
-/* B45738 80240FC8 3C118011 */  lui       $s1, %hi(gPlayerStatus)
-/* B4573C 80240FCC 2631EFC8 */  addiu     $s1, $s1, %lo(gPlayerStatus)
-/* B45740 80240FD0 AFB00010 */  sw        $s0, 0x10($sp)
-/* B45744 80240FD4 3C108024 */  lui       $s0, %hi(D_8024625C_B4A9CC)
-/* B45748 80240FD8 2610625C */  addiu     $s0, $s0, %lo(D_8024625C_B4A9CC)
-/* B4574C 80240FDC AFBF0018 */  sw        $ra, 0x18($sp)
-/* B45750 80240FE0 8E030000 */  lw        $v1, ($s0)
-/* B45754 80240FE4 28620003 */  slti      $v0, $v1, 3
-/* B45758 80240FE8 10400007 */  beqz      $v0, .L80241008
-/* B4575C 80240FEC 0220202D */   daddu    $a0, $s1, $zero
-/* B45760 80240FF0 1C600027 */  bgtz      $v1, .L80241090
-/* B45764 80240FF4 24620001 */   addiu    $v0, $v1, 1
-/* B45768 80240FF8 10600008 */  beqz      $v1, .L8024101C
-/* B4576C 80240FFC 0000102D */   daddu    $v0, $zero, $zero
-/* B45770 80241000 08090437 */  j         .L802410DC
-/* B45774 80241004 00000000 */   nop
-.L80241008:
-/* B45778 80241008 24020003 */  addiu     $v0, $zero, 3
-/* B4577C 8024100C 10620022 */  beq       $v1, $v0, .L80241098
-/* B45780 80241010 0000102D */   daddu    $v0, $zero, $zero
-/* B45784 80241014 08090437 */  j         .L802410DC
-/* B45788 80241018 00000000 */   nop
-.L8024101C:
-/* B4578C 8024101C 0C03AD8E */  jal       partner_get_ride_script
-/* B45790 80241020 00000000 */   nop
-/* B45794 80241024 0040202D */  daddu     $a0, $v0, $zero
-/* B45798 80241028 1080002B */  beqz      $a0, .L802410D8
-/* B4579C 8024102C 0000282D */   daddu    $a1, $zero, $zero
-/* B457A0 80241030 8E020000 */  lw        $v0, ($s0)
-/* B457A4 80241034 24060020 */  addiu     $a2, $zero, 0x20
-/* B457A8 80241038 24420001 */  addiu     $v0, $v0, 1
-/* B457AC 8024103C 0C0B0CF8 */  jal       start_script
-/* B457B0 80241040 AE020000 */   sw       $v0, ($s0)
-/* B457B4 80241044 C6200028 */  lwc1      $f0, 0x28($s1)
-/* B457B8 80241048 3C014120 */  lui       $at, 0x4120
-/* B457BC 8024104C 44811000 */  mtc1      $at, $f2
-/* B457C0 80241050 00000000 */  nop
-/* B457C4 80241054 46020001 */  sub.s     $f0, $f0, $f2
-/* B457C8 80241058 4600010D */  trunc.w.s $f4, $f0
-/* B457CC 8024105C E4440088 */  swc1      $f4, 0x88($v0)
-/* B457D0 80241060 C620002C */  lwc1      $f0, 0x2c($s1)
-/* B457D4 80241064 4600010D */  trunc.w.s $f4, $f0
-/* B457D8 80241068 E444008C */  swc1      $f4, 0x8c($v0)
-/* B457DC 8024106C C6200030 */  lwc1      $f0, 0x30($s1)
-/* B457E0 80241070 24030001 */  addiu     $v1, $zero, 1
-/* B457E4 80241074 3C018025 */  lui       $at, %hi(D_8024A290)
-/* B457E8 80241078 AC22A290 */  sw        $v0, %lo(D_8024A290)($at)
-/* B457EC 8024107C AC4300B4 */  sw        $v1, 0xb4($v0)
-/* B457F0 80241080 4600010D */  trunc.w.s $f4, $f0
-/* B457F4 80241084 E4440090 */  swc1      $f4, 0x90($v0)
-/* B457F8 80241088 08090437 */  j         .L802410DC
-/* B457FC 8024108C 0000102D */   daddu    $v0, $zero, $zero
-.L80241090:
-/* B45800 80241090 08090436 */  j         .L802410D8
-/* B45804 80241094 AE020000 */   sw       $v0, ($s0)
-.L80241098:
-/* B45808 80241098 3C038011 */  lui       $v1, %hi(wPartnerNpc)
-/* B4580C 8024109C 8C63C930 */  lw        $v1, %lo(wPartnerNpc)($v1)
-/* B45810 802410A0 3C014387 */  lui       $at, 0x4387
-/* B45814 802410A4 44810000 */  mtc1      $at, $f0
-/* B45818 802410A8 3C014334 */  lui       $at, 0x4334
-/* B4581C 802410AC 44811000 */  mtc1      $at, $f2
-/* B45820 802410B0 24020002 */  addiu     $v0, $zero, 2
-/* B45824 802410B4 E460000C */  swc1      $f0, 0xc($v1)
-/* B45828 802410B8 E4800080 */  swc1      $f0, 0x80($a0)
-/* B4582C 802410BC E4800084 */  swc1      $f0, 0x84($a0)
-/* B45830 802410C0 E48200A8 */  swc1      $f2, 0xa8($a0)
-/* B45834 802410C4 3C048025 */  lui       $a0, %hi(D_8024A290)
-/* B45838 802410C8 8C84A290 */  lw        $a0, %lo(D_8024A290)($a0)
-/* B4583C 802410CC 24030001 */  addiu     $v1, $zero, 1
-/* B45840 802410D0 08090437 */  j         .L802410DC
-/* B45844 802410D4 AC830074 */   sw       $v1, 0x74($a0)
-.L802410D8:
-/* B45848 802410D8 0000102D */  daddu     $v0, $zero, $zero
-.L802410DC:
-/* B4584C 802410DC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* B45850 802410E0 8FB10014 */  lw        $s1, 0x14($sp)
-/* B45854 802410E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* B45858 802410E8 03E00008 */  jr        $ra
-/* B4585C 802410EC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_802406DC_B4B14C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_802406DC_B4B14C.s
deleted file mode 100644
index bd184afd77..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_802406DC_B4B14C.s
+++ /dev/null
@@ -1,34 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_80247A20_B52490
-.double 0.2, 0.0
-
-.section .text
-
-glabel func_802406DC_B4B14C
-/* B4B14C 802406DC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B4B150 802406E0 AFB00010 */  sw        $s0, 0x10($sp)
-/* B4B154 802406E4 F7B40018 */  sdc1      $f20, 0x18($sp)
-/* B4B158 802406E8 4485A000 */  mtc1      $a1, $f20
-/* B4B15C 802406EC AFBF0014 */  sw        $ra, 0x14($sp)
-/* B4B160 802406F0 0C019D28 */  jal       guMtxIdentF
-/* B4B164 802406F4 0080802D */   daddu    $s0, $a0, $zero
-/* B4B168 802406F8 3C018024 */  lui       $at, %hi(D_80247A20_B52490)
-/* B4B16C 802406FC D4207A20 */  ldc1      $f0, %lo(D_80247A20_B52490)($at)
-/* B4B170 80240700 4600A521 */  cvt.d.s   $f20, $f20
-/* B4B174 80240704 4620A502 */  mul.d     $f20, $f20, $f0
-/* B4B178 80240708 00000000 */  nop
-/* B4B17C 8024070C 3C013F80 */  lui       $at, 0x3f80
-/* B4B180 80240710 44810000 */  mtc1      $at, $f0
-/* B4B184 80240714 AE000018 */  sw        $zero, 0x18($s0)
-/* B4B188 80240718 E6000014 */  swc1      $f0, 0x14($s0)
-/* B4B18C 8024071C 4620A520 */  cvt.s.d   $f20, $f20
-/* B4B190 80240720 E6140010 */  swc1      $f20, 0x10($s0)
-/* B4B194 80240724 8FBF0014 */  lw        $ra, 0x14($sp)
-/* B4B198 80240728 8FB00010 */  lw        $s0, 0x10($sp)
-/* B4B19C 8024072C D7B40018 */  ldc1      $f20, 0x18($sp)
-/* B4B1A0 80240730 03E00008 */  jr        $ra
-/* B4B1A4 80240734 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_80240738_B4B1A8.s b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_80240738_B4B1A8.s
deleted file mode 100644
index d4263d8e60..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_80240738_B4B1A8.s
+++ /dev/null
@@ -1,52 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240738_B4B1A8
-/* B4B1A8 80240738 27BDFF98 */  addiu     $sp, $sp, -0x68
-/* B4B1AC 8024073C AFB10054 */  sw        $s1, 0x54($sp)
-/* B4B1B0 80240740 0080882D */  daddu     $s1, $a0, $zero
-/* B4B1B4 80240744 AFBF0058 */  sw        $ra, 0x58($sp)
-/* B4B1B8 80240748 AFB00050 */  sw        $s0, 0x50($sp)
-/* B4B1BC 8024074C F7B40060 */  sdc1      $f20, 0x60($sp)
-/* B4B1C0 80240750 8E30000C */  lw        $s0, 0xc($s1)
-/* B4B1C4 80240754 8E050000 */  lw        $a1, ($s0)
-/* B4B1C8 80240758 0C0B1EAF */  jal       evt_get_variable
-/* B4B1CC 8024075C 26100004 */   addiu    $s0, $s0, 4
-/* B4B1D0 80240760 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* B4B1D4 80240764 0040202D */   daddu    $a0, $v0, $zero
-/* B4B1D8 80240768 0220202D */  daddu     $a0, $s1, $zero
-/* B4B1DC 8024076C 8E050000 */  lw        $a1, ($s0)
-/* B4B1E0 80240770 0C0B210B */  jal       evt_get_float_variable
-/* B4B1E4 80240774 0040802D */   daddu    $s0, $v0, $zero
-/* B4B1E8 80240778 0200202D */  daddu     $a0, $s0, $zero
-/* B4B1EC 8024077C 0C046B4C */  jal       get_model_from_list_index
-/* B4B1F0 80240780 46000506 */   mov.s    $f20, $f0
-/* B4B1F4 80240784 0040802D */  daddu     $s0, $v0, $zero
-/* B4B1F8 80240788 96020000 */  lhu       $v0, ($s0)
-/* B4B1FC 8024078C 30420400 */  andi      $v0, $v0, 0x400
-/* B4B200 80240790 14400008 */  bnez      $v0, .L802407B4
-/* B4B204 80240794 00000000 */   nop
-/* B4B208 80240798 4405A000 */  mfc1      $a1, $f20
-/* B4B20C 8024079C 0C0901B7 */  jal       func_802406DC_B4B14C
-/* B4B210 802407A0 26040058 */   addiu    $a0, $s0, 0x58
-/* B4B214 802407A4 96020000 */  lhu       $v0, ($s0)
-/* B4B218 802407A8 34421400 */  ori       $v0, $v0, 0x1400
-/* B4B21C 802407AC 080901F4 */  j         .L802407D0
-/* B4B220 802407B0 A6020000 */   sh       $v0, ($s0)
-.L802407B4:
-/* B4B224 802407B4 4405A000 */  mfc1      $a1, $f20
-/* B4B228 802407B8 0C0901B7 */  jal       func_802406DC_B4B14C
-/* B4B22C 802407BC 27A40010 */   addiu    $a0, $sp, 0x10
-/* B4B230 802407C0 27A40010 */  addiu     $a0, $sp, 0x10
-/* B4B234 802407C4 26050058 */  addiu     $a1, $s0, 0x58
-/* B4B238 802407C8 0C019D80 */  jal       guMtxCatF
-/* B4B23C 802407CC 00A0302D */   daddu    $a2, $a1, $zero
-.L802407D0:
-/* B4B240 802407D0 8FBF0058 */  lw        $ra, 0x58($sp)
-/* B4B244 802407D4 8FB10054 */  lw        $s1, 0x54($sp)
-/* B4B248 802407D8 8FB00050 */  lw        $s0, 0x50($sp)
-/* B4B24C 802407DC D7B40060 */  ldc1      $f20, 0x60($sp)
-/* B4B250 802407E0 24020002 */  addiu     $v0, $zero, 2
-/* B4B254 802407E4 03E00008 */  jr        $ra
-/* B4B258 802407E8 27BD0068 */   addiu    $sp, $sp, 0x68
-/* B4B25C 802407EC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_8024054C_B5E7FC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_8024054C_B5E7FC.s
deleted file mode 100644
index e097d83d2c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_8024054C_B5E7FC.s
+++ /dev/null
@@ -1,34 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_802474B0_B65760
-.double 0.2, 0.0
-
-.section .text
-
-glabel func_8024054C_B5E7FC
-/* B5E7FC 8024054C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B5E800 80240550 AFB00010 */  sw        $s0, 0x10($sp)
-/* B5E804 80240554 F7B40018 */  sdc1      $f20, 0x18($sp)
-/* B5E808 80240558 4485A000 */  mtc1      $a1, $f20
-/* B5E80C 8024055C AFBF0014 */  sw        $ra, 0x14($sp)
-/* B5E810 80240560 0C019D28 */  jal       guMtxIdentF
-/* B5E814 80240564 0080802D */   daddu    $s0, $a0, $zero
-/* B5E818 80240568 3C018024 */  lui       $at, %hi(D_802474B0_B65760)
-/* B5E81C 8024056C D42074B0 */  ldc1      $f0, %lo(D_802474B0_B65760)($at)
-/* B5E820 80240570 4600A521 */  cvt.d.s   $f20, $f20
-/* B5E824 80240574 4620A502 */  mul.d     $f20, $f20, $f0
-/* B5E828 80240578 00000000 */  nop
-/* B5E82C 8024057C 3C013F80 */  lui       $at, 0x3f80
-/* B5E830 80240580 44810000 */  mtc1      $at, $f0
-/* B5E834 80240584 AE000018 */  sw        $zero, 0x18($s0)
-/* B5E838 80240588 E6000014 */  swc1      $f0, 0x14($s0)
-/* B5E83C 8024058C 4620A520 */  cvt.s.d   $f20, $f20
-/* B5E840 80240590 E6140010 */  swc1      $f20, 0x10($s0)
-/* B5E844 80240594 8FBF0014 */  lw        $ra, 0x14($sp)
-/* B5E848 80240598 8FB00010 */  lw        $s0, 0x10($sp)
-/* B5E84C 8024059C D7B40018 */  ldc1      $f20, 0x18($sp)
-/* B5E850 802405A0 03E00008 */  jr        $ra
-/* B5E854 802405A4 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_802405A8_B5E858.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_802405A8_B5E858.s
deleted file mode 100644
index 56552735c8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_802405A8_B5E858.s
+++ /dev/null
@@ -1,52 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802405A8_B5E858
-/* B5E858 802405A8 27BDFF98 */  addiu     $sp, $sp, -0x68
-/* B5E85C 802405AC AFB10054 */  sw        $s1, 0x54($sp)
-/* B5E860 802405B0 0080882D */  daddu     $s1, $a0, $zero
-/* B5E864 802405B4 AFBF0058 */  sw        $ra, 0x58($sp)
-/* B5E868 802405B8 AFB00050 */  sw        $s0, 0x50($sp)
-/* B5E86C 802405BC F7B40060 */  sdc1      $f20, 0x60($sp)
-/* B5E870 802405C0 8E30000C */  lw        $s0, 0xc($s1)
-/* B5E874 802405C4 8E050000 */  lw        $a1, ($s0)
-/* B5E878 802405C8 0C0B1EAF */  jal       evt_get_variable
-/* B5E87C 802405CC 26100004 */   addiu    $s0, $s0, 4
-/* B5E880 802405D0 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* B5E884 802405D4 0040202D */   daddu    $a0, $v0, $zero
-/* B5E888 802405D8 0220202D */  daddu     $a0, $s1, $zero
-/* B5E88C 802405DC 8E050000 */  lw        $a1, ($s0)
-/* B5E890 802405E0 0C0B210B */  jal       evt_get_float_variable
-/* B5E894 802405E4 0040802D */   daddu    $s0, $v0, $zero
-/* B5E898 802405E8 0200202D */  daddu     $a0, $s0, $zero
-/* B5E89C 802405EC 0C046B4C */  jal       get_model_from_list_index
-/* B5E8A0 802405F0 46000506 */   mov.s    $f20, $f0
-/* B5E8A4 802405F4 0040802D */  daddu     $s0, $v0, $zero
-/* B5E8A8 802405F8 96020000 */  lhu       $v0, ($s0)
-/* B5E8AC 802405FC 30420400 */  andi      $v0, $v0, 0x400
-/* B5E8B0 80240600 14400008 */  bnez      $v0, .L80240624
-/* B5E8B4 80240604 00000000 */   nop
-/* B5E8B8 80240608 4405A000 */  mfc1      $a1, $f20
-/* B5E8BC 8024060C 0C090153 */  jal       func_8024054C_B5E7FC
-/* B5E8C0 80240610 26040058 */   addiu    $a0, $s0, 0x58
-/* B5E8C4 80240614 96020000 */  lhu       $v0, ($s0)
-/* B5E8C8 80240618 34421400 */  ori       $v0, $v0, 0x1400
-/* B5E8CC 8024061C 08090190 */  j         .L80240640
-/* B5E8D0 80240620 A6020000 */   sh       $v0, ($s0)
-.L80240624:
-/* B5E8D4 80240624 4405A000 */  mfc1      $a1, $f20
-/* B5E8D8 80240628 0C090153 */  jal       func_8024054C_B5E7FC
-/* B5E8DC 8024062C 27A40010 */   addiu    $a0, $sp, 0x10
-/* B5E8E0 80240630 27A40010 */  addiu     $a0, $sp, 0x10
-/* B5E8E4 80240634 26050058 */  addiu     $a1, $s0, 0x58
-/* B5E8E8 80240638 0C019D80 */  jal       guMtxCatF
-/* B5E8EC 8024063C 00A0302D */   daddu    $a2, $a1, $zero
-.L80240640:
-/* B5E8F0 80240640 8FBF0058 */  lw        $ra, 0x58($sp)
-/* B5E8F4 80240644 8FB10054 */  lw        $s1, 0x54($sp)
-/* B5E8F8 80240648 8FB00050 */  lw        $s0, 0x50($sp)
-/* B5E8FC 8024064C D7B40060 */  ldc1      $f20, 0x60($sp)
-/* B5E900 80240650 24020002 */  addiu     $v0, $zero, 2
-/* B5E904 80240654 03E00008 */  jr        $ra
-/* B5E908 80240658 27BD0068 */   addiu    $sp, $sp, 0x68
-/* B5E90C 8024065C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_8024082C_B662DC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_8024082C_B662DC.s
deleted file mode 100644
index dedff81dd3..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_8024082C_B662DC.s
+++ /dev/null
@@ -1,34 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_80246590_B6C040
-.double 0.2, 0.0
-
-.section .text
-
-glabel func_8024082C_B662DC
-/* B662DC 8024082C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B662E0 80240830 AFB00010 */  sw        $s0, 0x10($sp)
-/* B662E4 80240834 F7B40018 */  sdc1      $f20, 0x18($sp)
-/* B662E8 80240838 4485A000 */  mtc1      $a1, $f20
-/* B662EC 8024083C AFBF0014 */  sw        $ra, 0x14($sp)
-/* B662F0 80240840 0C019D28 */  jal       guMtxIdentF
-/* B662F4 80240844 0080802D */   daddu    $s0, $a0, $zero
-/* B662F8 80240848 3C018024 */  lui       $at, %hi(D_80246590_B6C040)
-/* B662FC 8024084C D4206590 */  ldc1      $f0, %lo(D_80246590_B6C040)($at)
-/* B66300 80240850 4600A521 */  cvt.d.s   $f20, $f20
-/* B66304 80240854 4620A502 */  mul.d     $f20, $f20, $f0
-/* B66308 80240858 00000000 */  nop
-/* B6630C 8024085C 3C013F80 */  lui       $at, 0x3f80
-/* B66310 80240860 44810000 */  mtc1      $at, $f0
-/* B66314 80240864 AE000018 */  sw        $zero, 0x18($s0)
-/* B66318 80240868 E6000014 */  swc1      $f0, 0x14($s0)
-/* B6631C 8024086C 4620A520 */  cvt.s.d   $f20, $f20
-/* B66320 80240870 E6140010 */  swc1      $f20, 0x10($s0)
-/* B66324 80240874 8FBF0014 */  lw        $ra, 0x14($sp)
-/* B66328 80240878 8FB00010 */  lw        $s0, 0x10($sp)
-/* B6632C 8024087C D7B40018 */  ldc1      $f20, 0x18($sp)
-/* B66330 80240880 03E00008 */  jr        $ra
-/* B66334 80240884 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_80240888_B66338.s b/ver/us/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_80240888_B66338.s
deleted file mode 100644
index ed20bce40d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_80240888_B66338.s
+++ /dev/null
@@ -1,52 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240888_B66338
-/* B66338 80240888 27BDFF98 */  addiu     $sp, $sp, -0x68
-/* B6633C 8024088C AFB10054 */  sw        $s1, 0x54($sp)
-/* B66340 80240890 0080882D */  daddu     $s1, $a0, $zero
-/* B66344 80240894 AFBF0058 */  sw        $ra, 0x58($sp)
-/* B66348 80240898 AFB00050 */  sw        $s0, 0x50($sp)
-/* B6634C 8024089C F7B40060 */  sdc1      $f20, 0x60($sp)
-/* B66350 802408A0 8E30000C */  lw        $s0, 0xc($s1)
-/* B66354 802408A4 8E050000 */  lw        $a1, ($s0)
-/* B66358 802408A8 0C0B1EAF */  jal       evt_get_variable
-/* B6635C 802408AC 26100004 */   addiu    $s0, $s0, 4
-/* B66360 802408B0 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* B66364 802408B4 0040202D */   daddu    $a0, $v0, $zero
-/* B66368 802408B8 0220202D */  daddu     $a0, $s1, $zero
-/* B6636C 802408BC 8E050000 */  lw        $a1, ($s0)
-/* B66370 802408C0 0C0B210B */  jal       evt_get_float_variable
-/* B66374 802408C4 0040802D */   daddu    $s0, $v0, $zero
-/* B66378 802408C8 0200202D */  daddu     $a0, $s0, $zero
-/* B6637C 802408CC 0C046B4C */  jal       get_model_from_list_index
-/* B66380 802408D0 46000506 */   mov.s    $f20, $f0
-/* B66384 802408D4 0040802D */  daddu     $s0, $v0, $zero
-/* B66388 802408D8 96020000 */  lhu       $v0, ($s0)
-/* B6638C 802408DC 30420400 */  andi      $v0, $v0, 0x400
-/* B66390 802408E0 14400008 */  bnez      $v0, .L80240904
-/* B66394 802408E4 00000000 */   nop
-/* B66398 802408E8 4405A000 */  mfc1      $a1, $f20
-/* B6639C 802408EC 0C09020B */  jal       func_8024082C_B662DC
-/* B663A0 802408F0 26040058 */   addiu    $a0, $s0, 0x58
-/* B663A4 802408F4 96020000 */  lhu       $v0, ($s0)
-/* B663A8 802408F8 34421400 */  ori       $v0, $v0, 0x1400
-/* B663AC 802408FC 08090248 */  j         .L80240920
-/* B663B0 80240900 A6020000 */   sh       $v0, ($s0)
-.L80240904:
-/* B663B4 80240904 4405A000 */  mfc1      $a1, $f20
-/* B663B8 80240908 0C09020B */  jal       func_8024082C_B662DC
-/* B663BC 8024090C 27A40010 */   addiu    $a0, $sp, 0x10
-/* B663C0 80240910 27A40010 */  addiu     $a0, $sp, 0x10
-/* B663C4 80240914 26050058 */  addiu     $a1, $s0, 0x58
-/* B663C8 80240918 0C019D80 */  jal       guMtxCatF
-/* B663CC 8024091C 00A0302D */   daddu    $a2, $a1, $zero
-.L80240920:
-/* B663D0 80240920 8FBF0058 */  lw        $ra, 0x58($sp)
-/* B663D4 80240924 8FB10054 */  lw        $s1, 0x54($sp)
-/* B663D8 80240928 8FB00050 */  lw        $s0, 0x50($sp)
-/* B663DC 8024092C D7B40060 */  ldc1      $f20, 0x60($sp)
-/* B663E0 80240930 24020002 */  addiu     $v0, $zero, 2
-/* B663E4 80240934 03E00008 */  jr        $ra
-/* B663E8 80240938 27BD0068 */   addiu    $sp, $sp, 0x68
-/* B663EC 8024093C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240000_B767B0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240000_B767B0.s
deleted file mode 100644
index 73dafbc533..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240000_B767B0.s
+++ /dev/null
@@ -1,127 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_80243880_B7A030
-.double 0.02
-
-dlabel D_80243888_B7A038
-.double 0.1
-
-dlabel D_80243890_B7A040
-.double 0.3
-
-dlabel D_80243898_B7A048
-.double 0.6
-
-.section .text
-
-glabel func_80240000_B767B0
-/* B767B0 80240000 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* B767B4 80240004 AFB10014 */  sw        $s1, 0x14($sp)
-/* B767B8 80240008 3C118024 */  lui       $s1, %hi(D_80240850_B77000)
-/* B767BC 8024000C 26310850 */  addiu     $s1, $s1, %lo(D_80240850_B77000)
-/* B767C0 80240010 AFBF0020 */  sw        $ra, 0x20($sp)
-/* B767C4 80240014 AFB3001C */  sw        $s3, 0x1c($sp)
-/* B767C8 80240018 AFB20018 */  sw        $s2, 0x18($sp)
-/* B767CC 8024001C AFB00010 */  sw        $s0, 0x10($sp)
-/* B767D0 80240020 F7BA0040 */  sdc1      $f26, 0x40($sp)
-/* B767D4 80240024 F7B80038 */  sdc1      $f24, 0x38($sp)
-/* B767D8 80240028 F7B60030 */  sdc1      $f22, 0x30($sp)
-/* B767DC 8024002C F7B40028 */  sdc1      $f20, 0x28($sp)
-/* B767E0 80240030 96220000 */  lhu       $v0, ($s1)
-/* B767E4 80240034 3C018024 */  lui       $at, %hi(D_80243880_B7A030)
-/* B767E8 80240038 D4203880 */  ldc1      $f0, %lo(D_80243880_B7A030)($at)
-/* B767EC 8024003C 44826000 */  mtc1      $v0, $f12
-/* B767F0 80240040 00000000 */  nop
-/* B767F4 80240044 46806320 */  cvt.s.w   $f12, $f12
-/* B767F8 80240048 46006321 */  cvt.d.s   $f12, $f12
-/* B767FC 8024004C 46206302 */  mul.d     $f12, $f12, $f0
-/* B76800 80240050 00000000 */  nop
-/* B76804 80240054 0C00A85B */  jal       sin_rad
-/* B76808 80240058 46206320 */   cvt.s.d  $f12, $f12
-/* B7680C 8024005C 96220000 */  lhu       $v0, ($s1)
-/* B76810 80240060 3C018024 */  lui       $at, %hi(D_80243888_B7A038)
-/* B76814 80240064 D4363888 */  ldc1      $f22, %lo(D_80243888_B7A038)($at)
-/* B76818 80240068 44826000 */  mtc1      $v0, $f12
-/* B7681C 8024006C 00000000 */  nop
-/* B76820 80240070 46806320 */  cvt.s.w   $f12, $f12
-/* B76824 80240074 46006321 */  cvt.d.s   $f12, $f12
-/* B76828 80240078 46366302 */  mul.d     $f12, $f12, $f22
-/* B7682C 8024007C 00000000 */  nop
-/* B76830 80240080 3C013F80 */  lui       $at, 0x3f80
-/* B76834 80240084 4481D000 */  mtc1      $at, $f26
-/* B76838 80240088 00000000 */  nop
-/* B7683C 8024008C 461A0500 */  add.s     $f20, $f0, $f26
-/* B76840 80240090 3C018024 */  lui       $at, %hi(D_80243890_B7A040)
-/* B76844 80240094 D4383890 */  ldc1      $f24, %lo(D_80243890_B7A040)($at)
-/* B76848 80240098 4600A521 */  cvt.d.s   $f20, $f20
-/* B7684C 8024009C 4638A502 */  mul.d     $f20, $f20, $f24
-/* B76850 802400A0 00000000 */  nop
-/* B76854 802400A4 3C018024 */  lui       $at, %hi(D_80243898_B7A048)
-/* B76858 802400A8 D4203898 */  ldc1      $f0, %lo(D_80243898_B7A048)($at)
-/* B7685C 802400AC 4620A500 */  add.d     $f20, $f20, $f0
-/* B76860 802400B0 0C00A85B */  jal       sin_rad
-/* B76864 802400B4 46206320 */   cvt.s.d  $f12, $f12
-/* B76868 802400B8 461A0000 */  add.s     $f0, $f0, $f26
-/* B7686C 802400BC 46000021 */  cvt.d.s   $f0, $f0
-/* B76870 802400C0 46360002 */  mul.d     $f0, $f0, $f22
-/* B76874 802400C4 00000000 */  nop
-/* B76878 802400C8 4620A500 */  add.d     $f20, $f20, $f0
-/* B7687C 802400CC 3C130001 */  lui       $s3, 1
-/* B76880 802400D0 4620A520 */  cvt.s.d   $f20, $f20
-/* B76884 802400D4 4600A021 */  cvt.d.s   $f0, $f20
-/* B76888 802400D8 46380002 */  mul.d     $f0, $f0, $f24
-/* B7688C 802400DC 00000000 */  nop
-/* B76890 802400E0 36731630 */  ori       $s3, $s3, 0x1630
-/* B76894 802400E4 3C12800A */  lui       $s2, %hi(gDisplayContext)
-/* B76898 802400E8 2652A674 */  addiu     $s2, $s2, %lo(gDisplayContext)
-/* B7689C 802400EC 3C108007 */  lui       $s0, %hi(gMatrixListPos)
-/* B768A0 802400F0 261041F0 */  addiu     $s0, $s0, %lo(gMatrixListPos)
-/* B768A4 802400F4 3C013FE0 */  lui       $at, 0x3fe0
-/* B768A8 802400F8 44811800 */  mtc1      $at, $f3
-/* B768AC 802400FC 44801000 */  mtc1      $zero, $f2
-/* B768B0 80240100 96040000 */  lhu       $a0, ($s0)
-/* B768B4 80240104 8E420000 */  lw        $v0, ($s2)
-/* B768B8 80240108 00042180 */  sll       $a0, $a0, 6
-/* B768BC 8024010C 46220000 */  add.d     $f0, $f0, $f2
-/* B768C0 80240110 00932021 */  addu      $a0, $a0, $s3
-/* B768C4 80240114 00442021 */  addu      $a0, $v0, $a0
-/* B768C8 80240118 46200020 */  cvt.s.d   $f0, $f0
-/* B768CC 8024011C 44050000 */  mfc1      $a1, $f0
-/* B768D0 80240120 4406A000 */  mfc1      $a2, $f20
-/* B768D4 80240124 0C019DC0 */  jal       guScale
-/* B768D8 80240128 00A0382D */   daddu    $a3, $a1, $zero
-/* B768DC 8024012C 3C05DA38 */  lui       $a1, 0xda38
-/* B768E0 80240130 3C04800A */  lui       $a0, %hi(gMasterGfxPos)
-/* B768E4 80240134 2484A66C */  addiu     $a0, $a0, %lo(gMasterGfxPos)
-/* B768E8 80240138 34A50001 */  ori       $a1, $a1, 1
-/* B768EC 8024013C 8C820000 */  lw        $v0, ($a0)
-/* B768F0 80240140 96030000 */  lhu       $v1, ($s0)
-/* B768F4 80240144 0040302D */  daddu     $a2, $v0, $zero
-/* B768F8 80240148 24420008 */  addiu     $v0, $v0, 8
-/* B768FC 8024014C AC820000 */  sw        $v0, ($a0)
-/* B76900 80240150 24620001 */  addiu     $v0, $v1, 1
-/* B76904 80240154 3063FFFF */  andi      $v1, $v1, 0xffff
-/* B76908 80240158 00031980 */  sll       $v1, $v1, 6
-/* B7690C 8024015C 00731821 */  addu      $v1, $v1, $s3
-/* B76910 80240160 ACC50000 */  sw        $a1, ($a2)
-/* B76914 80240164 A6020000 */  sh        $v0, ($s0)
-/* B76918 80240168 8E420000 */  lw        $v0, ($s2)
-/* B7691C 8024016C 96240000 */  lhu       $a0, ($s1)
-/* B76920 80240170 00431021 */  addu      $v0, $v0, $v1
-/* B76924 80240174 24840001 */  addiu     $a0, $a0, 1
-/* B76928 80240178 ACC20004 */  sw        $v0, 4($a2)
-/* B7692C 8024017C A6240000 */  sh        $a0, ($s1)
-/* B76930 80240180 8FBF0020 */  lw        $ra, 0x20($sp)
-/* B76934 80240184 8FB3001C */  lw        $s3, 0x1c($sp)
-/* B76938 80240188 8FB20018 */  lw        $s2, 0x18($sp)
-/* B7693C 8024018C 8FB10014 */  lw        $s1, 0x14($sp)
-/* B76940 80240190 8FB00010 */  lw        $s0, 0x10($sp)
-/* B76944 80240194 D7BA0040 */  ldc1      $f26, 0x40($sp)
-/* B76948 80240198 D7B80038 */  ldc1      $f24, 0x38($sp)
-/* B7694C 8024019C D7B60030 */  ldc1      $f22, 0x30($sp)
-/* B76950 802401A0 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* B76954 802401A4 03E00008 */  jr        $ra
-/* B76958 802401A8 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_802401AC_B7695C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_802401AC_B7695C.s
deleted file mode 100644
index 58d40323f9..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_802401AC_B7695C.s
+++ /dev/null
@@ -1,30 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802401AC_B7695C
-/* B7695C 802401AC C4820088 */  lwc1      $f2, 0x88($a0)
-/* B76960 802401B0 468010A0 */  cvt.s.w   $f2, $f2
-/* B76964 802401B4 3C0142C8 */  lui       $at, 0x42c8
-/* B76968 802401B8 44812000 */  mtc1      $at, $f4
-/* B7696C 802401BC 3C014480 */  lui       $at, 0x4480
-/* B76970 802401C0 44813000 */  mtc1      $at, $f6
-/* B76974 802401C4 46041083 */  div.s     $f2, $f2, $f4
-/* B76978 802401C8 46061082 */  mul.s     $f2, $f2, $f6
-/* B7697C 802401CC 00000000 */  nop
-/* B76980 802401D0 C4800088 */  lwc1      $f0, 0x88($a0)
-/* B76984 802401D4 46800020 */  cvt.s.w   $f0, $f0
-/* B76988 802401D8 46040003 */  div.s     $f0, $f0, $f4
-/* B7698C 802401DC 46060002 */  mul.s     $f0, $f0, $f6
-/* B76990 802401E0 00000000 */  nop
-/* B76994 802401E4 3C01CD5B */  lui       $at, 0xcd5b
-/* B76998 802401E8 34215858 */  ori       $at, $at, 0x5858
-/* B7699C 802401EC 44812000 */  mtc1      $at, $f4
-/* B769A0 802401F0 00000000 */  nop
-/* B769A4 802401F4 46041080 */  add.s     $f2, $f2, $f4
-/* B769A8 802401F8 46040000 */  add.s     $f0, $f0, $f4
-/* B769AC 802401FC 4600120D */  trunc.w.s $f8, $f2
-/* B769B0 80240200 E488008C */  swc1      $f8, 0x8c($a0)
-/* B769B4 80240204 4600020D */  trunc.w.s $f8, $f0
-/* B769B8 80240208 E4880090 */  swc1      $f8, 0x90($a0)
-/* B769BC 8024020C 03E00008 */  jr        $ra
-/* B769C0 80240210 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240214_B769C4.s b/ver/us/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240214_B769C4.s
deleted file mode 100644
index c59b060fa1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240214_B769C4.s
+++ /dev/null
@@ -1,46 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240214_B769C4
-/* B769C4 80240214 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* B769C8 80240218 AFB1001C */  sw        $s1, 0x1c($sp)
-/* B769CC 8024021C 0080882D */  daddu     $s1, $a0, $zero
-/* B769D0 80240220 AFBF0020 */  sw        $ra, 0x20($sp)
-/* B769D4 80240224 AFB00018 */  sw        $s0, 0x18($sp)
-/* B769D8 80240228 8E30000C */  lw        $s0, 0xc($s1)
-/* B769DC 8024022C 8E020000 */  lw        $v0, ($s0)
-/* B769E0 80240230 1040001B */  beqz      $v0, .L802402A0
-/* B769E4 80240234 26100004 */   addiu    $s0, $s0, 4
-/* B769E8 80240238 8E050000 */  lw        $a1, ($s0)
-/* B769EC 8024023C 0C0B1EAF */  jal       evt_get_variable
-/* B769F0 80240240 26100004 */   addiu    $s0, $s0, 4
-/* B769F4 80240244 AE220070 */  sw        $v0, 0x70($s1)
-/* B769F8 80240248 8E050000 */  lw        $a1, ($s0)
-/* B769FC 8024024C 26100004 */  addiu     $s0, $s0, 4
-/* B76A00 80240250 0C0B1EAF */  jal       evt_get_variable
-/* B76A04 80240254 0220202D */   daddu    $a0, $s1, $zero
-/* B76A08 80240258 AE220074 */  sw        $v0, 0x74($s1)
-/* B76A0C 8024025C 8E050000 */  lw        $a1, ($s0)
-/* B76A10 80240260 0C0B1EAF */  jal       evt_get_variable
-/* B76A14 80240264 0220202D */   daddu    $a0, $s1, $zero
-/* B76A18 80240268 2404004E */  addiu     $a0, $zero, 0x4e
-/* B76A1C 8024026C 0000282D */  daddu     $a1, $zero, $zero
-/* B76A20 80240270 C6200070 */  lwc1      $f0, 0x70($s1)
-/* B76A24 80240274 46800020 */  cvt.s.w   $f0, $f0
-/* B76A28 80240278 C6220074 */  lwc1      $f2, 0x74($s1)
-/* B76A2C 8024027C 468010A0 */  cvt.s.w   $f2, $f2
-/* B76A30 80240280 44060000 */  mfc1      $a2, $f0
-/* B76A34 80240284 44071000 */  mfc1      $a3, $f2
-/* B76A38 80240288 44820000 */  mtc1      $v0, $f0
-/* B76A3C 8024028C 00000000 */  nop
-/* B76A40 80240290 46800020 */  cvt.s.w   $f0, $f0
-/* B76A44 80240294 AE220078 */  sw        $v0, 0x78($s1)
-/* B76A48 80240298 0C05267B */  jal       sfx_adjust_env_sound_pos
-/* B76A4C 8024029C E7A00010 */   swc1     $f0, 0x10($sp)
-.L802402A0:
-/* B76A50 802402A0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* B76A54 802402A4 8FB1001C */  lw        $s1, 0x1c($sp)
-/* B76A58 802402A8 8FB00018 */  lw        $s0, 0x18($sp)
-/* B76A5C 802402AC 24020002 */  addiu     $v0, $zero, 2
-/* B76A60 802402B0 03E00008 */  jr        $ra
-/* B76A64 802402B4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_802402B8_B76A68.s b/ver/us/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_802402B8_B76A68.s
deleted file mode 100644
index fd402d96b5..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_802402B8_B76A68.s
+++ /dev/null
@@ -1,59 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402B8_B76A68
-/* B76A68 802402B8 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* B76A6C 802402BC AFB20018 */  sw        $s2, 0x18($sp)
-/* B76A70 802402C0 0080902D */  daddu     $s2, $a0, $zero
-/* B76A74 802402C4 AFBF001C */  sw        $ra, 0x1c($sp)
-/* B76A78 802402C8 AFB10014 */  sw        $s1, 0x14($sp)
-/* B76A7C 802402CC AFB00010 */  sw        $s0, 0x10($sp)
-/* B76A80 802402D0 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* B76A84 802402D4 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* B76A88 802402D8 8E510084 */  lw        $s1, 0x84($s2)
-/* B76A8C 802402DC 8E420088 */  lw        $v0, 0x88($s2)
-/* B76A90 802402E0 8E50008C */  lw        $s0, 0x8c($s2)
-/* B76A94 802402E4 2842FF9D */  slti      $v0, $v0, -0x63
-/* B76A98 802402E8 5440001E */  bnel      $v0, $zero, .L80240364
-/* B76A9C 802402EC 26100019 */   addiu    $s0, $s0, 0x19
-/* B76AA0 802402F0 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* B76AA4 802402F4 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* B76AA8 802402F8 C4540080 */  lwc1      $f20, 0x80($v0)
-/* B76AAC 802402FC 3C014334 */  lui       $at, 0x4334
-/* B76AB0 80240300 44810000 */  mtc1      $at, $f0
-/* B76AB4 80240304 3C014049 */  lui       $at, 0x4049
-/* B76AB8 80240308 34210FD8 */  ori       $at, $at, 0xfd8
-/* B76ABC 8024030C 44811000 */  mtc1      $at, $f2
-/* B76AC0 80240310 4600A503 */  div.s     $f20, $f20, $f0
-/* B76AC4 80240314 4602A502 */  mul.s     $f20, $f20, $f2
-/* B76AC8 80240318 00000000 */  nop
-/* B76ACC 8024031C 3C0141C8 */  lui       $at, 0x41c8
-/* B76AD0 80240320 4481B000 */  mtc1      $at, $f22
-/* B76AD4 80240324 0C00A85B */  jal       sin_rad
-/* B76AD8 80240328 4600A306 */   mov.s    $f12, $f20
-/* B76ADC 8024032C 46160002 */  mul.s     $f0, $f0, $f22
-/* B76AE0 80240330 00000000 */  nop
-/* B76AE4 80240334 4600A306 */  mov.s     $f12, $f20
-/* B76AE8 80240338 4600010D */  trunc.w.s $f4, $f0
-/* B76AEC 8024033C 44022000 */  mfc1      $v0, $f4
-/* B76AF0 80240340 0C00A874 */  jal       cos_rad
-/* B76AF4 80240344 02228823 */   subu     $s1, $s1, $v0
-/* B76AF8 80240348 46000007 */  neg.s     $f0, $f0
-/* B76AFC 8024034C 46160002 */  mul.s     $f0, $f0, $f22
-/* B76B00 80240350 00000000 */  nop
-/* B76B04 80240354 4600010D */  trunc.w.s $f4, $f0
-/* B76B08 80240358 44022000 */  mfc1      $v0, $f4
-/* B76B0C 8024035C 00000000 */  nop
-/* B76B10 80240360 02028023 */  subu      $s0, $s0, $v0
-.L80240364:
-/* B76B14 80240364 AE510084 */  sw        $s1, 0x84($s2)
-/* B76B18 80240368 AE50008C */  sw        $s0, 0x8c($s2)
-/* B76B1C 8024036C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* B76B20 80240370 8FB20018 */  lw        $s2, 0x18($sp)
-/* B76B24 80240374 8FB10014 */  lw        $s1, 0x14($sp)
-/* B76B28 80240378 8FB00010 */  lw        $s0, 0x10($sp)
-/* B76B2C 8024037C D7B60028 */  ldc1      $f22, 0x28($sp)
-/* B76B30 80240380 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* B76B34 80240384 24020002 */  addiu     $v0, $zero, 2
-/* B76B38 80240388 03E00008 */  jr        $ra
-/* B76B3C 8024038C 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240D30_B07730.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240D30_B07730.s
deleted file mode 100644
index e3f4d56add..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240D30_B07730.s
+++ /dev/null
@@ -1,82 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240D30_B07730
-/* B07730 80240D30 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B07734 80240D34 AFB00010 */  sw        $s0, 0x10($sp)
-/* B07738 80240D38 0080802D */  daddu     $s0, $a0, $zero
-/* B0773C 80240D3C 10A00003 */  beqz      $a1, .L80240D4C
-/* B07740 80240D40 AFBF0014 */   sw       $ra, 0x14($sp)
-/* B07744 80240D44 AE000074 */  sw        $zero, 0x74($s0)
-/* B07748 80240D48 AE000078 */  sw        $zero, 0x78($s0)
-.L80240D4C:
-/* B0774C 80240D4C 8E030078 */  lw        $v1, 0x78($s0)
-/* B07750 80240D50 10600005 */  beqz      $v1, .L80240D68
-/* B07754 80240D54 24020001 */   addiu    $v0, $zero, 1
-/* B07758 80240D58 10620015 */  beq       $v1, $v0, .L80240DB0
-/* B0775C 80240D5C 3C048080 */   lui      $a0, 0x8080
-/* B07760 80240D60 0809038D */  j         .L80240E34
-/* B07764 80240D64 00000000 */   nop
-.L80240D68:
-/* B07768 80240D68 0000202D */  daddu     $a0, $zero, $zero
-/* B0776C 80240D6C 240500D0 */  addiu     $a1, $zero, 0xd0
-/* B07770 80240D70 0080302D */  daddu     $a2, $a0, $zero
-/* B07774 80240D74 0C04DF84 */  jal       set_screen_overlay_color
-/* B07778 80240D78 0080382D */   daddu    $a3, $a0, $zero
-/* B0777C 80240D7C C6000074 */  lwc1      $f0, 0x74($s0)
-/* B07780 80240D80 46800020 */  cvt.s.w   $f0, $f0
-/* B07784 80240D84 44050000 */  mfc1      $a1, $f0
-/* B07788 80240D88 0C04DF62 */  jal       set_screen_overlay_params_front
-/* B0778C 80240D8C 24040001 */   addiu    $a0, $zero, 1
-/* B07790 80240D90 8E020074 */  lw        $v0, 0x74($s0)
-/* B07794 80240D94 240300FF */  addiu     $v1, $zero, 0xff
-/* B07798 80240D98 14430022 */  bne       $v0, $v1, .L80240E24
-/* B0779C 80240D9C 24420007 */   addiu    $v0, $v0, 7
-/* B077A0 80240DA0 24020001 */  addiu     $v0, $zero, 1
-/* B077A4 80240DA4 AE000074 */  sw        $zero, 0x74($s0)
-/* B077A8 80240DA8 0809038D */  j         .L80240E34
-/* B077AC 80240DAC AE020078 */   sw       $v0, 0x78($s0)
-.L80240DB0:
-/* B077B0 80240DB0 8E030074 */  lw        $v1, 0x74($s0)
-/* B077B4 80240DB4 34848081 */  ori       $a0, $a0, 0x8081
-/* B077B8 80240DB8 00031040 */  sll       $v0, $v1, 1
-/* B077BC 80240DBC 00431021 */  addu      $v0, $v0, $v1
-/* B077C0 80240DC0 00021080 */  sll       $v0, $v0, 2
-/* B077C4 80240DC4 00431021 */  addu      $v0, $v0, $v1
-/* B077C8 80240DC8 00021100 */  sll       $v0, $v0, 4
-/* B077CC 80240DCC 00440018 */  mult      $v0, $a0
-/* B077D0 80240DD0 240500D0 */  addiu     $a1, $zero, 0xd0
-/* B077D4 80240DD4 0000202D */  daddu     $a0, $zero, $zero
-/* B077D8 80240DD8 00004010 */  mfhi      $t0
-/* B077DC 80240DDC 01023021 */  addu      $a2, $t0, $v0
-/* B077E0 80240DE0 000631C3 */  sra       $a2, $a2, 7
-/* B077E4 80240DE4 000217C3 */  sra       $v0, $v0, 0x1f
-/* B077E8 80240DE8 00C23023 */  subu      $a2, $a2, $v0
-/* B077EC 80240DEC 30C600FF */  andi      $a2, $a2, 0xff
-/* B077F0 80240DF0 0C04DF84 */  jal       set_screen_overlay_color
-/* B077F4 80240DF4 00C0382D */   daddu    $a3, $a2, $zero
-/* B077F8 80240DF8 3C05437F */  lui       $a1, 0x437f
-/* B077FC 80240DFC 0C04DF62 */  jal       set_screen_overlay_params_front
-/* B07800 80240E00 24040001 */   addiu    $a0, $zero, 1
-/* B07804 80240E04 8E020074 */  lw        $v0, 0x74($s0)
-/* B07808 80240E08 240300FF */  addiu     $v1, $zero, 0xff
-/* B0780C 80240E0C 14430005 */  bne       $v0, $v1, .L80240E24
-/* B07810 80240E10 2442000E */   addiu    $v0, $v0, 0xe
-/* B07814 80240E14 24020002 */  addiu     $v0, $zero, 2
-/* B07818 80240E18 AE020078 */  sw        $v0, 0x78($s0)
-/* B0781C 80240E1C 8E020074 */  lw        $v0, 0x74($s0)
-/* B07820 80240E20 2442000E */  addiu     $v0, $v0, 0xe
-.L80240E24:
-/* B07824 80240E24 AE020074 */  sw        $v0, 0x74($s0)
-/* B07828 80240E28 28420100 */  slti      $v0, $v0, 0x100
-/* B0782C 80240E2C 50400001 */  beql      $v0, $zero, .L80240E34
-/* B07830 80240E30 AE030074 */   sw       $v1, 0x74($s0)
-.L80240E34:
-/* B07834 80240E34 8E020078 */  lw        $v0, 0x78($s0)
-/* B07838 80240E38 8FBF0014 */  lw        $ra, 0x14($sp)
-/* B0783C 80240E3C 8FB00010 */  lw        $s0, 0x10($sp)
-/* B07840 80240E40 38420002 */  xori      $v0, $v0, 2
-/* B07844 80240E44 2C420001 */  sltiu     $v0, $v0, 1
-/* B07848 80240E48 00021040 */  sll       $v0, $v0, 1
-/* B0784C 80240E4C 03E00008 */  jr        $ra
-/* B07850 80240E50 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240370_8B03E0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240370_8B03E0.s
deleted file mode 100644
index 79590ad752..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240370_8B03E0.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240370_8B03E0
-/* 8B03E0 80240370 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B03E4 80240374 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B03E8 80240378 0C00D77C */  jal       set_map_change_fade_rate
-/* 8B03EC 8024037C 24040001 */   addiu    $a0, $zero, 1
-/* 8B03F0 80240380 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B03F4 80240384 24020002 */  addiu     $v0, $zero, 2
-/* 8B03F8 80240388 03E00008 */  jr        $ra
-/* 8B03FC 8024038C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242014_8B2084.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242014_8B2084.s
deleted file mode 100644
index 8c496e3365..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242014_8B2084.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242014_8B2084
-/* 8B2084 80242014 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B2088 80242018 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B208C 8024201C 0C00EABB */  jal       get_npc_unsafe
-/* 8B2090 80242020 2404FFFC */   addiu    $a0, $zero, -4
-/* 8B2094 80242024 8C420000 */  lw        $v0, ($v0)
-/* 8B2098 80242028 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B209C 8024202C 30421000 */  andi      $v0, $v0, 0x1000
-/* 8B20A0 80242030 0002102B */  sltu      $v0, $zero, $v0
-/* 8B20A4 80242034 00021040 */  sll       $v0, $v0, 1
-/* 8B20A8 80242038 03E00008 */  jr        $ra
-/* 8B20AC 8024203C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242710_8B2780.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242710_8B2780.s
deleted file mode 100644
index c2df682adb..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242710_8B2780.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242710_8B2780
-/* 8B2780 80242710 3C028011 */  lui       $v0, %hi(gPlayerData)
-/* 8B2784 80242714 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
-/* 8B2788 80242718 80430002 */  lb        $v1, 2($v0)
-/* 8B278C 8024271C 80420003 */  lb        $v0, 3($v0)
-/* 8B2790 80242720 00621826 */  xor       $v1, $v1, $v0
-/* 8B2794 80242724 2C630001 */  sltiu     $v1, $v1, 1
-/* 8B2798 80242728 24020002 */  addiu     $v0, $zero, 2
-/* 8B279C 8024272C 03E00008 */  jr        $ra
-/* 8B27A0 80242730 AC830084 */   sw       $v1, 0x84($a0)
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242734_8B27A4.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242734_8B27A4.s
deleted file mode 100644
index 286c7adc0b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242734_8B27A4.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242734_8B27A4
-/* 8B27A4 80242734 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B27A8 80242738 3C048026 */  lui       $a0, %hi(D_80258120)
-/* 8B27AC 8024273C 24848120 */  addiu     $a0, $a0, %lo(D_80258120)
-/* 8B27B0 80242740 3C028025 */  lui       $v0, %hi(D_80257B00_8C7B70)
-/* 8B27B4 80242744 24427B00 */  addiu     $v0, $v0, %lo(D_80257B00_8C7B70)
-/* 8B27B8 80242748 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B27BC 8024274C AC820000 */  sw        $v0, ($a0)
-/* 8B27C0 80242750 3C028025 */  lui       $v0, %hi(D_80257D00_8C7D70)
-/* 8B27C4 80242754 24427D00 */  addiu     $v0, $v0, %lo(D_80257D00_8C7D70)
-/* 8B27C8 80242758 AC820004 */  sw        $v0, 4($a0)
-/* 8B27CC 8024275C 24020020 */  addiu     $v0, $zero, 0x20
-/* 8B27D0 80242760 A4820008 */  sh        $v0, 8($a0)
-/* 8B27D4 80242764 A482000A */  sh        $v0, 0xa($a0)
-/* 8B27D8 80242768 24020002 */  addiu     $v0, $zero, 2
-/* 8B27DC 8024276C AC82000C */  sw        $v0, 0xc($a0)
-/* 8B27E0 80242770 0C0496CB */  jal       set_message_images
-/* 8B27E4 80242774 AC800010 */   sw       $zero, 0x10($a0)
-/* 8B27E8 80242778 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B27EC 8024277C 24020001 */  addiu     $v0, $zero, 1
-/* 8B27F0 80242780 03E00008 */  jr        $ra
-/* 8B27F4 80242784 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s
deleted file mode 100644
index 421fff4889..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242788_8B27F8
-/* 8B27F8 80242788 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B27FC 8024278C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B2800 80242790 3C018011 */  lui       $at, %hi(gPlayerData+0x3C)
-/* 8B2804 80242794 A020F2CC */  sb        $zero, %lo(gPlayerData+0x3C)($at)
-/* 8B2808 80242798 0C03ACA9 */  jal       func_800EB2A4
-/* 8B280C 8024279C 0000202D */   daddu    $a0, $zero, $zero
-/* 8B2810 802427A0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B2814 802427A4 24020001 */  addiu     $v0, $zero, 1
-/* 8B2818 802427A8 03E00008 */  jr        $ra
-/* 8B281C 802427AC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427B0_8B2820.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427B0_8B2820.s
deleted file mode 100644
index 68957ea675..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427B0_8B2820.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802427B0_8B2820
-/* 8B2820 802427B0 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 8B2824 802427B4 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 8B2828 802427B8 8C420010 */  lw        $v0, 0x10($v0)
-/* 8B282C 802427BC 30421000 */  andi      $v0, $v0, 0x1000
-/* 8B2830 802427C0 0002102B */  sltu      $v0, $zero, $v0
-/* 8B2834 802427C4 03E00008 */  jr        $ra
-/* 8B2838 802427C8 00021040 */   sll      $v0, $v0, 1
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427CC_8B283C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427CC_8B283C.s
deleted file mode 100644
index 960a993c98..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427CC_8B283C.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802427CC_8B283C
-/* 8B283C 802427CC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B2840 802427D0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B2844 802427D4 0C00CD3C */  jal       set_game_mode
-/* 8B2848 802427D8 2404000A */   addiu    $a0, $zero, 0xa
-/* 8B284C 802427DC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B2850 802427E0 24020001 */  addiu     $v0, $zero, 1
-/* 8B2854 802427E4 03E00008 */  jr        $ra
-/* 8B2858 802427E8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427EC_8B285C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427EC_8B285C.s
deleted file mode 100644
index f038424dee..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427EC_8B285C.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802427EC_8B285C
-/* 8B285C 802427EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B2860 802427F0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B2864 802427F4 0C03A5EE */  jal       close_status_menu
-/* 8B2868 802427F8 00000000 */   nop
-/* 8B286C 802427FC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B2870 80242800 24020002 */  addiu     $v0, $zero, 2
-/* 8B2874 80242804 03E00008 */  jr        $ra
-/* 8B2878 80242808 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024280C_8B287C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024280C_8B287C.s
deleted file mode 100644
index 23ec4069ff..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024280C_8B287C.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024280C_8B287C
-/* 8B287C 8024280C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 8B2880 80242810 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8B2884 80242814 0080802D */  daddu     $s0, $a0, $zero
-/* 8B2888 80242818 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 8B288C 8024281C AFB10014 */  sw        $s1, 0x14($sp)
-/* 8B2890 80242820 8E11000C */  lw        $s1, 0xc($s0)
-/* 8B2894 80242824 0C0B36B0 */  jal       resolve_npc
-/* 8B2898 80242828 0000282D */   daddu    $a1, $zero, $zero
-/* 8B289C 8024282C 0200202D */  daddu     $a0, $s0, $zero
-/* 8B28A0 80242830 8E250000 */  lw        $a1, ($s1)
-/* 8B28A4 80242834 0C0B210B */  jal       evt_get_float_variable
-/* 8B28A8 80242838 0040802D */   daddu    $s0, $v0, $zero
-/* 8B28AC 8024283C C6020034 */  lwc1      $f2, 0x34($s0)
-/* 8B28B0 80242840 46001080 */  add.s     $f2, $f2, $f0
-/* 8B28B4 80242844 E6020034 */  swc1      $f2, 0x34($s0)
-/* 8B28B8 80242848 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8B28BC 8024284C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8B28C0 80242850 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8B28C4 80242854 24020002 */  addiu     $v0, $zero, 2
-/* 8B28C8 80242858 03E00008 */  jr        $ra
-/* 8B28CC 8024285C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BA8_8B2C18.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BA8_8B2C18.s
deleted file mode 100644
index c5f2ed19be..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BA8_8B2C18.s
+++ /dev/null
@@ -1,10 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel btl_state_draw_switch_to_player_8B2C18
-/* 8B2C18 80242BA8 3C038015 */  lui       $v1, %hi(gBgRenderTypePtr)
-/* 8B2C1C 80242BAC 8C6312F0 */  lw        $v1, %lo(gBgRenderTypePtr)($v1)
-/* 8B2C20 80242BB0 24020001 */  addiu     $v0, $zero, 1
-/* 8B2C24 80242BB4 A0620000 */  sb        $v0, ($v1)
-/* 8B2C28 80242BB8 03E00008 */  jr        $ra
-/* 8B2C2C 80242BBC 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F08_8B2F78.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F08_8B2F78.s
deleted file mode 100644
index 79ce28b4ee..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F08_8B2F78.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242F08_8B2F78
-/* 8B2F78 80242F08 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B2F7C 80242F0C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B2F80 80242F10 0C04760B */  jal       mdl_set_all_fog_mode
-/* 8B2F84 80242F14 24040003 */   addiu    $a0, $zero, 3
-/* 8B2F88 80242F18 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B2F8C 80242F1C 24020002 */  addiu     $v0, $zero, 2
-/* 8B2F90 80242F20 03E00008 */  jr        $ra
-/* 8B2F94 80242F24 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F28_8B2F98.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F28_8B2F98.s
deleted file mode 100644
index 981e4b35cc..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F28_8B2F98.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242F28_8B2F98
-/* 8B2F98 80242F28 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B2F9C 80242F2C 2404009C */  addiu     $a0, $zero, 0x9c
-/* 8B2FA0 80242F30 2405FFFF */  addiu     $a1, $zero, -1
-/* 8B2FA4 80242F34 24060001 */  addiu     $a2, $zero, 1
-/* 8B2FA8 80242F38 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B2FAC 80242F3C 0C046E54 */  jal       func_8011B950
-/* 8B2FB0 80242F40 00C0382D */   daddu    $a3, $a2, $zero
-/* 8B2FB4 80242F44 0000202D */  daddu     $a0, $zero, $zero
-/* 8B2FB8 80242F48 0080282D */  daddu     $a1, $a0, $zero
-/* 8B2FBC 80242F4C 0080302D */  daddu     $a2, $a0, $zero
-/* 8B2FC0 80242F50 0C046F97 */  jal       set_background_color_blend
-/* 8B2FC4 80242F54 240700FF */   addiu    $a3, $zero, 0xff
-/* 8B2FC8 80242F58 3C02800B */  lui       $v0, %hi(gCameras)
-/* 8B2FCC 80242F5C 24421D80 */  addiu     $v0, $v0, %lo(gCameras)
-/* 8B2FD0 80242F60 A440002C */  sh        $zero, 0x2c($v0)
-/* 8B2FD4 80242F64 A440002E */  sh        $zero, 0x2e($v0)
-/* 8B2FD8 80242F68 A4400030 */  sh        $zero, 0x30($v0)
-/* 8B2FDC 80242F6C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B2FE0 80242F70 24020002 */  addiu     $v0, $zero, 2
-/* 8B2FE4 80242F74 03E00008 */  jr        $ra
-/* 8B2FE8 80242F78 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80243034_8B30A4.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80243034_8B30A4.s
deleted file mode 100644
index 9d414f4d3d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80243034_8B30A4.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243034_8B30A4
-/* 8B30A4 80243034 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B30A8 80243038 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B30AC 8024303C 0C04C3D6 */  jal       get_item_entity
-/* 8B30B0 80243040 8C840084 */   lw       $a0, 0x84($a0)
-/* 8B30B4 80243044 3C013F19 */  lui       $at, 0x3f19
-/* 8B30B8 80243048 3421999A */  ori       $at, $at, 0x999a
-/* 8B30BC 8024304C 44810000 */  mtc1      $at, $f0
-/* 8B30C0 80243050 00000000 */  nop
-/* 8B30C4 80243054 E4400030 */  swc1      $f0, 0x30($v0)
-/* 8B30C8 80243058 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B30CC 8024305C 24020002 */  addiu     $v0, $zero, 2
-/* 8B30D0 80243060 03E00008 */  jr        $ra
-/* 8B30D4 80243064 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 8B30D8 80243068 00000000 */  nop
-/* 8B30DC 8024306C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B33E0/func_80243370_8B33E0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B33E0/func_80243370_8B33E0.s
deleted file mode 100644
index b8f4d31493..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B33E0/func_80243370_8B33E0.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243370_8B33E0
-/* 8B33E0 80243370 0000302D */  daddu     $a2, $zero, $zero
-/* 8B33E4 80243374 00C0282D */  daddu     $a1, $a2, $zero
-/* 8B33E8 80243378 3C038011 */  lui       $v1, %hi(gPlayerData)
-/* 8B33EC 8024337C 2463F290 */  addiu     $v1, $v1, %lo(gPlayerData)
-.L80243380:
-/* 8B33F0 80243380 84620208 */  lh        $v0, 0x208($v1)
-/* 8B33F4 80243384 10400003 */  beqz      $v0, .L80243394
-/* 8B33F8 80243388 24A50001 */   addiu    $a1, $a1, 1
-/* 8B33FC 8024338C 08090CE8 */  j         .L802433A0
-/* 8B3400 80243390 24060001 */   addiu    $a2, $zero, 1
-.L80243394:
-/* 8B3404 80243394 28A20040 */  slti      $v0, $a1, 0x40
-/* 8B3408 80243398 1440FFF9 */  bnez      $v0, .L80243380
-/* 8B340C 8024339C 24630002 */   addiu    $v1, $v1, 2
-.L802433A0:
-/* 8B3410 802433A0 AC860084 */  sw        $a2, 0x84($a0)
-/* 8B3414 802433A4 03E00008 */  jr        $ra
-/* 8B3418 802433A8 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024027C_8DA37C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024027C_8DA37C.s
deleted file mode 100644
index d16686296e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024027C_8DA37C.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024027C_8DA37C
-/* 8DA37C 8024027C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8DA380 80240280 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8DA384 80240284 0C00D77C */  jal       set_map_change_fade_rate
-/* 8DA388 80240288 2404000A */   addiu    $a0, $zero, 0xa
-/* 8DA38C 8024028C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8DA390 80240290 24020002 */  addiu     $v0, $zero, 2
-/* 8DA394 80240294 03E00008 */  jr        $ra
-/* 8DA398 80240298 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 8DA39C 8024029C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802402A0_8DA3A0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802402A0_8DA3A0.s
deleted file mode 100644
index 70f88b8010..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802402A0_8DA3A0.s
+++ /dev/null
@@ -1,45 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402A0_8DA3A0
-/* 8DA3A0 802402A0 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* 8DA3A4 802402A4 AFB1001C */  sw        $s1, 0x1c($sp)
-/* 8DA3A8 802402A8 0080882D */  daddu     $s1, $a0, $zero
-/* 8DA3AC 802402AC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 8DA3B0 802402B0 AFB00018 */  sw        $s0, 0x18($sp)
-/* 8DA3B4 802402B4 F7B80038 */  sdc1      $f24, 0x38($sp)
-/* 8DA3B8 802402B8 F7B60030 */  sdc1      $f22, 0x30($sp)
-/* 8DA3BC 802402BC F7B40028 */  sdc1      $f20, 0x28($sp)
-/* 8DA3C0 802402C0 8E30000C */  lw        $s0, 0xc($s1)
-/* 8DA3C4 802402C4 8E050000 */  lw        $a1, ($s0)
-/* 8DA3C8 802402C8 0C0B210B */  jal       evt_get_float_variable
-/* 8DA3CC 802402CC 26100004 */   addiu    $s0, $s0, 4
-/* 8DA3D0 802402D0 8E050000 */  lw        $a1, ($s0)
-/* 8DA3D4 802402D4 26100004 */  addiu     $s0, $s0, 4
-/* 8DA3D8 802402D8 0220202D */  daddu     $a0, $s1, $zero
-/* 8DA3DC 802402DC 0C0B210B */  jal       evt_get_float_variable
-/* 8DA3E0 802402E0 46000606 */   mov.s    $f24, $f0
-/* 8DA3E4 802402E4 8E050000 */  lw        $a1, ($s0)
-/* 8DA3E8 802402E8 26100004 */  addiu     $s0, $s0, 4
-/* 8DA3EC 802402EC 0220202D */  daddu     $a0, $s1, $zero
-/* 8DA3F0 802402F0 0C0B210B */  jal       evt_get_float_variable
-/* 8DA3F4 802402F4 46000586 */   mov.s    $f22, $f0
-/* 8DA3F8 802402F8 0220202D */  daddu     $a0, $s1, $zero
-/* 8DA3FC 802402FC 8E050000 */  lw        $a1, ($s0)
-/* 8DA400 80240300 0C0B1EAF */  jal       evt_get_variable
-/* 8DA404 80240304 46000506 */   mov.s    $f20, $f0
-/* 8DA408 80240308 4405C000 */  mfc1      $a1, $f24
-/* 8DA40C 8024030C 4406B000 */  mfc1      $a2, $f22
-/* 8DA410 80240310 4407A000 */  mfc1      $a3, $f20
-/* 8DA414 80240314 0000202D */  daddu     $a0, $zero, $zero
-/* 8DA418 80240318 0C01C094 */  jal       fx_lens_flare
-/* 8DA41C 8024031C AFA20010 */   sw       $v0, 0x10($sp)
-/* 8DA420 80240320 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 8DA424 80240324 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 8DA428 80240328 8FB00018 */  lw        $s0, 0x18($sp)
-/* 8DA42C 8024032C D7B80038 */  ldc1      $f24, 0x38($sp)
-/* 8DA430 80240330 D7B60030 */  ldc1      $f22, 0x30($sp)
-/* 8DA434 80240334 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* 8DA438 80240338 24020002 */  addiu     $v0, $zero, 2
-/* 8DA43C 8024033C 03E00008 */  jr        $ra
-/* 8DA440 80240340 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240344_8DA444.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240344_8DA444.s
deleted file mode 100644
index b872e401f8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240344_8DA444.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240344_8DA444
-/* 8DA444 80240344 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8DA448 80240348 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8DA44C 8024034C 8C82000C */  lw        $v0, 0xc($a0)
-/* 8DA450 80240350 0C0B210B */  jal       evt_get_float_variable
-/* 8DA454 80240354 8C450000 */   lw       $a1, ($v0)
-/* 8DA458 80240358 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8DA45C 8024035C 24020002 */  addiu     $v0, $zero, 2
-/* 8DA460 80240360 3C01800B */  lui       $at, %hi(gCameras+0x18)
-/* 8DA464 80240364 E4201D98 */  swc1      $f0, %lo(gCameras+0x18)($at)
-/* 8DA468 80240368 03E00008 */  jr        $ra
-/* 8DA46C 8024036C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406BC_8EC4DC.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406BC_8EC4DC.s
deleted file mode 100644
index 9be1273077..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406BC_8EC4DC.s
+++ /dev/null
@@ -1,7 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802406BC_8EC4DC
-/* 8EC4DC 802406BC AC80007C */  sw        $zero, 0x7c($a0)
-/* 8EC4E0 802406C0 03E00008 */  jr        $ra
-/* 8EC4E4 802406C4 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B48_8EC968.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B48_8EC968.s
deleted file mode 100644
index e660bcd938..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B48_8EC968.s
+++ /dev/null
@@ -1,7 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240B48_8EC968
-/* 8EC968 80240B48 AC80007C */  sw        $zero, 0x7c($a0)
-/* 8EC96C 80240B4C 03E00008 */  jr        $ra
-/* 8EC970 80240B50 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241738_8ED558.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241738_8ED558.s
deleted file mode 100644
index 0ee83e6b82..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241738_8ED558.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241738_8ED558
-/* 8ED558 80241738 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8ED55C 8024173C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8ED560 80241740 0C04417A */  jal       get_entity_by_index
-/* 8ED564 80241744 0000202D */   daddu    $a0, $zero, $zero
-/* 8ED568 80241748 50400007 */  beql      $v0, $zero, .L80241768
-/* 8ED56C 8024174C 0000102D */   daddu    $v0, $zero, $zero
-/* 8ED570 80241750 84440014 */  lh        $a0, 0x14($v0)
-/* 8ED574 80241754 3C050000 */  lui       $a1, 0
-/* 8ED578 80241758 24A501E4 */  addiu     $a1, $a1, 0x1e4
-/* 8ED57C 8024175C 0C048052 */  jal       play_model_animation
-/* 8ED580 80241760 00000000 */   nop
-/* 8ED584 80241764 24020002 */  addiu     $v0, $zero, 2
-.L80241768:
-/* 8ED588 80241768 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8ED58C 8024176C 03E00008 */  jr        $ra
-/* 8ED590 80241770 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 8ED594 80241774 00000000 */  nop
-/* 8ED598 80241778 00000000 */  nop
-/* 8ED59C 8024177C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A04_8EE824.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A04_8EE824.s
deleted file mode 100644
index aa6625c1d1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A04_8EE824.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242A04_8EE824
-/* 8EE824 80242A04 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 8EE828 80242A08 2402002D */  addiu     $v0, $zero, 0x2d
-/* 8EE82C 80242A0C AFA20010 */  sw        $v0, 0x10($sp)
-/* 8EE830 80242A10 3C028024 */  lui       $v0, %hi(func_80242870_8EE690)
-/* 8EE834 80242A14 24422870 */  addiu     $v0, $v0, %lo(func_80242870_8EE690)
-/* 8EE838 80242A18 27A40010 */  addiu     $a0, $sp, 0x10
-/* 8EE83C 80242A1C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 8EE840 80242A20 AFA00018 */  sw        $zero, 0x18($sp)
-/* 8EE844 80242A24 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 8EE848 80242A28 0C047644 */  jal       queue_render_task
-/* 8EE84C 80242A2C AFA00014 */   sw       $zero, 0x14($sp)
-/* 8EE850 80242A30 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 8EE854 80242A34 03E00008 */  jr        $ra
-/* 8EE858 80242A38 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF670/func_80240000_8FF670.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF670/func_80240000_8FF670.s
deleted file mode 100644
index cda3d5c1df..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF670/func_80240000_8FF670.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_8FF670
-/* 8FF670 80240000 03E00008 */  jr        $ra
-/* 8FF674 80240004 24020001 */   addiu    $v0, $zero, 1
-/* 8FF678 80240008 00000000 */  nop
-/* 8FF67C 8024000C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_802401E0_8FF850.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_802401E0_8FF850.s
deleted file mode 100644
index a21c508025..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_802401E0_8FF850.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802401E0_8FF850
-/* 8FF850 802401E0 3C014000 */  lui       $at, 0x4000
-/* 8FF854 802401E4 44816000 */  mtc1      $at, $f12
-/* 8FF858 802401E8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8FF85C 802401EC AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8FF860 802401F0 0C00AFB7 */  jal       set_curtain_scale_goal
-/* 8FF864 802401F4 00000000 */   nop
-/* 8FF868 802401F8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8FF86C 802401FC 24020002 */  addiu     $v0, $zero, 2
-/* 8FF870 80240200 03E00008 */  jr        $ra
-/* 8FF874 80240204 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240208_8FF878.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240208_8FF878.s
deleted file mode 100644
index f55d68f4fb..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240208_8FF878.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240208_8FF878
-/* 8FF878 80240208 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 8FF87C 8024020C 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 8FF880 80240210 8C430010 */  lw        $v1, 0x10($v0)
-/* 8FF884 80240214 30621000 */  andi      $v0, $v1, 0x1000
-/* 8FF888 80240218 0002102B */  sltu      $v0, $zero, $v0
-/* 8FF88C 8024021C 30638000 */  andi      $v1, $v1, 0x8000
-/* 8FF890 80240220 10600004 */  beqz      $v1, .L80240234
-/* 8FF894 80240224 00022840 */   sll      $a1, $v0, 1
-/* 8FF898 80240228 24050002 */  addiu     $a1, $zero, 2
-/* 8FF89C 8024022C 2402FFFF */  addiu     $v0, $zero, -1
-/* 8FF8A0 80240230 AC820084 */  sw        $v0, 0x84($a0)
-.L80240234:
-/* 8FF8A4 80240234 03E00008 */  jr        $ra
-/* 8FF8A8 80240238 00A0102D */   daddu    $v0, $a1, $zero
-/* 8FF8AC 8024023C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_802404E4_8FFB54.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_802404E4_8FFB54.s
deleted file mode 100644
index 5dfe1f9bfe..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_802404E4_8FFB54.s
+++ /dev/null
@@ -1,38 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802404E4_8FFB54
-/* 8FFB54 802404E4 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 8FFB58 802404E8 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8FFB5C 802404EC 0080882D */  daddu     $s1, $a0, $zero
-/* 8FFB60 802404F0 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 8FFB64 802404F4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8FFB68 802404F8 8E30000C */  lw        $s0, 0xc($s1)
-/* 8FFB6C 802404FC 8E050000 */  lw        $a1, ($s0)
-/* 8FFB70 80240500 0C0B1EAF */  jal       evt_get_variable
-/* 8FFB74 80240504 26100004 */   addiu    $s0, $s0, 4
-/* 8FFB78 80240508 8E050000 */  lw        $a1, ($s0)
-/* 8FFB7C 8024050C 26100004 */  addiu     $s0, $s0, 4
-/* 8FFB80 80240510 0C0B1EAF */  jal       evt_get_variable
-/* 8FFB84 80240514 0220202D */   daddu    $a0, $s1, $zero
-/* 8FFB88 80240518 8E050000 */  lw        $a1, ($s0)
-/* 8FFB8C 8024051C 26100004 */  addiu     $s0, $s0, 4
-/* 8FFB90 80240520 0C0B1EAF */  jal       evt_get_variable
-/* 8FFB94 80240524 0220202D */   daddu    $a0, $s1, $zero
-/* 8FFB98 80240528 8E050000 */  lw        $a1, ($s0)
-/* 8FFB9C 8024052C 26100004 */  addiu     $s0, $s0, 4
-/* 8FFBA0 80240530 0C0B1EAF */  jal       evt_get_variable
-/* 8FFBA4 80240534 0220202D */   daddu    $a0, $s1, $zero
-/* 8FFBA8 80240538 8E050000 */  lw        $a1, ($s0)
-/* 8FFBAC 8024053C 0C0B1EAF */  jal       evt_get_variable
-/* 8FFBB0 80240540 0220202D */   daddu    $a0, $s1, $zero
-/* 8FFBB4 80240544 0000202D */  daddu     $a0, $zero, $zero
-/* 8FFBB8 80240548 3C05FD05 */  lui       $a1, 0xfd05
-/* 8FFBBC 8024054C 0C0B1EAF */  jal       evt_get_variable
-/* 8FFBC0 80240550 34A50F80 */   ori      $a1, $a1, 0xf80
-/* 8FFBC4 80240554 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8FFBC8 80240558 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8FFBCC 8024055C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8FFBD0 80240560 24020002 */  addiu     $v0, $zero, 2
-/* 8FFBD4 80240564 03E00008 */  jr        $ra
-/* 8FFBD8 80240568 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B00_900170.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B00_900170.s
deleted file mode 100644
index 50d8d001a3..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B00_900170.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240B00_900170
-/* 900170 80240B00 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 900174 80240B04 3C028024 */  lui       $v0, %hi(func_8024056C_8FFBDC)
-/* 900178 80240B08 2442056C */  addiu     $v0, $v0, %lo(func_8024056C_8FFBDC)
-/* 90017C 80240B0C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 900180 80240B10 2402000A */  addiu     $v0, $zero, 0xa
-/* 900184 80240B14 AFA20014 */  sw        $v0, 0x14($sp)
-/* 900188 80240B18 24020001 */  addiu     $v0, $zero, 1
-/* 90018C 80240B1C 27A40010 */  addiu     $a0, $sp, 0x10
-/* 900190 80240B20 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 900194 80240B24 AFA00018 */  sw        $zero, 0x18($sp)
-/* 900198 80240B28 0C047644 */  jal       queue_render_task
-/* 90019C 80240B2C AFA20010 */   sw       $v0, 0x10($sp)
-/* 9001A0 80240B30 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 9001A4 80240B34 03E00008 */  jr        $ra
-/* 9001A8 80240B38 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B3C_9001AC.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B3C_9001AC.s
deleted file mode 100644
index b33d396594..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B3C_9001AC.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240B3C_9001AC
-/* 9001AC 80240B3C 3C018025 */  lui       $at, %hi(D_802483D0)
-/* 9001B0 80240B40 AC2083D0 */  sw        $zero, %lo(D_802483D0)($at)
-/* 9001B4 80240B44 03E00008 */  jr        $ra
-/* 9001B8 80240B48 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_8024033C_AA92DC.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_8024033C_AA92DC.s
deleted file mode 100644
index 67068f8d98..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_8024033C_AA92DC.s
+++ /dev/null
@@ -1,58 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024033C_AA92DC
-/* AA92DC 8024033C 3C048011 */  lui       $a0, %hi(gPlayerStatus)
-/* AA92E0 80240340 2484EFC8 */  addiu     $a0, $a0, %lo(gPlayerStatus)
-/* AA92E4 80240344 808300B4 */  lb        $v1, 0xb4($a0)
-/* AA92E8 80240348 24020008 */  addiu     $v0, $zero, 8
-/* AA92EC 8024034C 10620003 */  beq       $v1, $v0, .L8024035C
-/* AA92F0 80240350 0080282D */   daddu    $a1, $a0, $zero
-.L80240354:
-/* AA92F4 80240354 03E00008 */  jr        $ra
-/* AA92F8 80240358 0000102D */   daddu    $v0, $zero, $zero
-.L8024035C:
-/* AA92FC 8024035C C4800028 */  lwc1      $f0, 0x28($a0)
-/* AA9300 80240360 3C014248 */  lui       $at, 0x4248
-/* AA9304 80240364 44814000 */  mtc1      $at, $f8
-/* AA9308 80240368 00000000 */  nop
-/* AA930C 8024036C 46080001 */  sub.s     $f0, $f0, $f8
-/* AA9310 80240370 3C01402C */  lui       $at, 0x402c
-/* AA9314 80240374 44811800 */  mtc1      $at, $f3
-/* AA9318 80240378 44801000 */  mtc1      $zero, $f2
-/* AA931C 8024037C 46000021 */  cvt.d.s   $f0, $f0
-/* AA9320 80240380 46200005 */  abs.d     $f0, $f0
-/* AA9324 80240384 4620103C */  c.lt.d    $f2, $f0
-/* AA9328 80240388 00000000 */  nop
-/* AA932C 8024038C 4501FFF1 */  bc1t      .L80240354
-/* AA9330 80240390 00000000 */   nop
-/* AA9334 80240394 C480002C */  lwc1      $f0, 0x2c($a0)
-/* AA9338 80240398 3C014316 */  lui       $at, 0x4316
-/* AA933C 8024039C 44813000 */  mtc1      $at, $f6
-/* AA9340 802403A0 00000000 */  nop
-/* AA9344 802403A4 46060001 */  sub.s     $f0, $f0, $f6
-/* AA9348 802403A8 46000021 */  cvt.d.s   $f0, $f0
-/* AA934C 802403AC 46200005 */  abs.d     $f0, $f0
-/* AA9350 802403B0 4620103C */  c.lt.d    $f2, $f0
-/* AA9354 802403B4 00000000 */  nop
-/* AA9358 802403B8 4501FFE6 */  bc1t      .L80240354
-/* AA935C 802403BC 00000000 */   nop
-/* AA9360 802403C0 C4A00030 */  lwc1      $f0, 0x30($a1)
-/* AA9364 802403C4 3C01C208 */  lui       $at, 0xc208
-/* AA9368 802403C8 44812000 */  mtc1      $at, $f4
-/* AA936C 802403CC 00000000 */  nop
-/* AA9370 802403D0 46040001 */  sub.s     $f0, $f0, $f4
-/* AA9374 802403D4 46000021 */  cvt.d.s   $f0, $f0
-/* AA9378 802403D8 46200005 */  abs.d     $f0, $f0
-/* AA937C 802403DC 4620103C */  c.lt.d    $f2, $f0
-/* AA9380 802403E0 00000000 */  nop
-/* AA9384 802403E4 45010006 */  bc1t      .L80240400
-/* AA9388 802403E8 24020002 */   addiu    $v0, $zero, 2
-/* AA938C 802403EC E4A80028 */  swc1      $f8, 0x28($a1)
-/* AA9390 802403F0 E4A6002C */  swc1      $f6, 0x2c($a1)
-/* AA9394 802403F4 E4A40030 */  swc1      $f4, 0x30($a1)
-/* AA9398 802403F8 03E00008 */  jr        $ra
-/* AA939C 802403FC ACA00054 */   sw       $zero, 0x54($a1)
-.L80240400:
-/* AA93A0 80240400 03E00008 */  jr        $ra
-/* AA93A4 80240404 0000102D */   daddu    $v0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_80240434_AA93D4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_80240434_AA93D4.s
deleted file mode 100644
index 348053efa5..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_134/AA92B0/func_80240434_AA93D4.s
+++ /dev/null
@@ -1,62 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240434_AA93D4
-/* AA93D4 80240434 3C048011 */  lui       $a0, %hi(gPlayerStatus)
-/* AA93D8 80240438 2484EFC8 */  addiu     $a0, $a0, %lo(gPlayerStatus)
-/* AA93DC 8024043C 808300B4 */  lb        $v1, 0xb4($a0)
-/* AA93E0 80240440 24020008 */  addiu     $v0, $zero, 8
-/* AA93E4 80240444 10620003 */  beq       $v1, $v0, .L80240454
-/* AA93E8 80240448 0080282D */   daddu    $a1, $a0, $zero
-.L8024044C:
-/* AA93EC 8024044C 03E00008 */  jr        $ra
-/* AA93F0 80240450 0000102D */   daddu    $v0, $zero, $zero
-.L80240454:
-/* AA93F4 80240454 C4800028 */  lwc1      $f0, 0x28($a0)
-/* AA93F8 80240458 3C01442A */  lui       $at, 0x442a
-/* AA93FC 8024045C 44814000 */  mtc1      $at, $f8
-/* AA9400 80240460 00000000 */  nop
-/* AA9404 80240464 46080001 */  sub.s     $f0, $f0, $f8
-/* AA9408 80240468 3C01402C */  lui       $at, 0x402c
-/* AA940C 8024046C 44811800 */  mtc1      $at, $f3
-/* AA9410 80240470 44801000 */  mtc1      $zero, $f2
-/* AA9414 80240474 46000021 */  cvt.d.s   $f0, $f0
-/* AA9418 80240478 46200005 */  abs.d     $f0, $f0
-/* AA941C 8024047C 4620103C */  c.lt.d    $f2, $f0
-/* AA9420 80240480 00000000 */  nop
-/* AA9424 80240484 4501FFF1 */  bc1t      .L8024044C
-/* AA9428 80240488 00000000 */   nop
-/* AA942C 8024048C C480002C */  lwc1      $f0, 0x2c($a0)
-/* AA9430 80240490 3C014389 */  lui       $at, 0x4389
-/* AA9434 80240494 34218000 */  ori       $at, $at, 0x8000
-/* AA9438 80240498 44813000 */  mtc1      $at, $f6
-/* AA943C 8024049C 00000000 */  nop
-/* AA9440 802404A0 46060001 */  sub.s     $f0, $f0, $f6
-/* AA9444 802404A4 46000021 */  cvt.d.s   $f0, $f0
-/* AA9448 802404A8 46200005 */  abs.d     $f0, $f0
-/* AA944C 802404AC 4620103C */  c.lt.d    $f2, $f0
-/* AA9450 802404B0 00000000 */  nop
-/* AA9454 802404B4 4501FFE5 */  bc1t      .L8024044C
-/* AA9458 802404B8 00000000 */   nop
-/* AA945C 802404BC C4A00030 */  lwc1      $f0, 0x30($a1)
-/* AA9460 802404C0 3C01C20C */  lui       $at, 0xc20c
-/* AA9464 802404C4 44812000 */  mtc1      $at, $f4
-/* AA9468 802404C8 00000000 */  nop
-/* AA946C 802404CC 46040001 */  sub.s     $f0, $f0, $f4
-/* AA9470 802404D0 46000021 */  cvt.d.s   $f0, $f0
-/* AA9474 802404D4 46200005 */  abs.d     $f0, $f0
-/* AA9478 802404D8 4620103C */  c.lt.d    $f2, $f0
-/* AA947C 802404DC 00000000 */  nop
-/* AA9480 802404E0 45010006 */  bc1t      .L802404FC
-/* AA9484 802404E4 24020002 */   addiu    $v0, $zero, 2
-/* AA9488 802404E8 E4A80028 */  swc1      $f8, 0x28($a1)
-/* AA948C 802404EC E4A6002C */  swc1      $f6, 0x2c($a1)
-/* AA9490 802404F0 E4A40030 */  swc1      $f4, 0x30($a1)
-/* AA9494 802404F4 03E00008 */  jr        $ra
-/* AA9498 802404F8 ACA00054 */   sw       $zero, 0x54($a1)
-.L802404FC:
-/* AA949C 802404FC 03E00008 */  jr        $ra
-/* AA94A0 80240500 0000102D */   daddu    $v0, $zero, $zero
-/* AA94A4 80240504 00000000 */  nop
-/* AA94A8 80240508 00000000 */  nop
-/* AA94AC 8024050C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802421D0_7ECEE0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802421D0_7ECEE0.s
deleted file mode 100644
index 783ed8a82c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802421D0_7ECEE0.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802421D0_7ECEE0
-/* 7ECEE0 802421D0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 7ECEE4 802421D4 2404008A */  addiu     $a0, $zero, 0x8a
-/* 7ECEE8 802421D8 2405FFFF */  addiu     $a1, $zero, -1
-/* 7ECEEC 802421DC 24060001 */  addiu     $a2, $zero, 1
-/* 7ECEF0 802421E0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 7ECEF4 802421E4 0C046E54 */  jal       func_8011B950
-/* 7ECEF8 802421E8 00C0382D */   daddu    $a3, $a2, $zero
-/* 7ECEFC 802421EC 0000202D */  daddu     $a0, $zero, $zero
-/* 7ECF00 802421F0 0080282D */  daddu     $a1, $a0, $zero
-/* 7ECF04 802421F4 0080302D */  daddu     $a2, $a0, $zero
-/* 7ECF08 802421F8 0C046F97 */  jal       set_background_color_blend
-/* 7ECF0C 802421FC 240700FF */   addiu    $a3, $zero, 0xff
-/* 7ECF10 80242200 3C02800B */  lui       $v0, %hi(gCameras)
-/* 7ECF14 80242204 24421D80 */  addiu     $v0, $v0, %lo(gCameras)
-/* 7ECF18 80242208 A440002C */  sh        $zero, 0x2c($v0)
-/* 7ECF1C 8024220C A440002E */  sh        $zero, 0x2e($v0)
-/* 7ECF20 80242210 A4400030 */  sh        $zero, 0x30($v0)
-/* 7ECF24 80242214 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 7ECF28 80242218 24020002 */  addiu     $v0, $zero, 2
-/* 7ECF2C 8024221C 03E00008 */  jr        $ra
-/* 7ECF30 80242220 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242250_7ECF60.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242250_7ECF60.s
deleted file mode 100644
index c66c61d16b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242250_7ECF60.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242250_7ECF60
-/* 7ECF60 80242250 3C038011 */  lui       $v1, %hi(gPlayerData)
-/* 7ECF64 80242254 2463F290 */  addiu     $v1, $v1, %lo(gPlayerData)
-/* 7ECF68 80242258 8C6202BC */  lw        $v0, 0x2bc($v1)
-/* 7ECF6C 8024225C 8C630324 */  lw        $v1, 0x324($v1)
-/* 7ECF70 80242260 00431023 */  subu      $v0, $v0, $v1
-/* 7ECF74 80242264 3C0391A2 */  lui       $v1, 0x91a2
-/* 7ECF78 80242268 3463B3C5 */  ori       $v1, $v1, 0xb3c5
-/* 7ECF7C 8024226C 00430019 */  multu     $v0, $v1
-/* 7ECF80 80242270 8C830084 */  lw        $v1, 0x84($a0)
-/* 7ECF84 80242274 00002810 */  mfhi      $a1
-/* 7ECF88 80242278 000512C2 */  srl       $v0, $a1, 0xb
-/* 7ECF8C 8024227C 0043102A */  slt       $v0, $v0, $v1
-/* 7ECF90 80242280 AC820084 */  sw        $v0, 0x84($a0)
-/* 7ECF94 80242284 03E00008 */  jr        $ra
-/* 7ECF98 80242288 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802448A0_805120.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802448A0_805120.s
deleted file mode 100644
index b9558bbb69..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802448A0_805120.s
+++ /dev/null
@@ -1,66 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802448A0_805120
-/* 805120 802448A0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 805124 802448A4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 805128 802448A8 0080802D */  daddu     $s0, $a0, $zero
-/* 80512C 802448AC 10A0000A */  beqz      $a1, .L802448D8
-/* 805130 802448B0 AFBF0014 */   sw       $ra, 0x14($sp)
-/* 805134 802448B4 8E020084 */  lw        $v0, 0x84($s0)
-/* 805138 802448B8 54400007 */  bnel      $v0, $zero, .L802448D8
-/* 80513C 802448BC AE000070 */   sw       $zero, 0x70($s0)
-/* 805140 802448C0 960400C2 */  lhu       $a0, 0xc2($s0)
-/* 805144 802448C4 2405FFFF */  addiu     $a1, $zero, -1
-/* 805148 802448C8 24060001 */  addiu     $a2, $zero, 1
-/* 80514C 802448CC 0C046E54 */  jal       func_8011B950
-/* 805150 802448D0 00C0382D */   daddu    $a3, $a2, $zero
-/* 805154 802448D4 AE000070 */  sw        $zero, 0x70($s0)
-.L802448D8:
-/* 805158 802448D8 8E020070 */  lw        $v0, 0x70($s0)
-/* 80515C 802448DC 24420020 */  addiu     $v0, $v0, 0x20
-/* 805160 802448E0 AE020070 */  sw        $v0, 0x70($s0)
-/* 805164 802448E4 28420100 */  slti      $v0, $v0, 0x100
-/* 805168 802448E8 14400002 */  bnez      $v0, .L802448F4
-/* 80516C 802448EC 240200FF */   addiu    $v0, $zero, 0xff
-/* 805170 802448F0 AE020070 */  sw        $v0, 0x70($s0)
-.L802448F4:
-/* 805174 802448F4 8E020084 */  lw        $v0, 0x84($s0)
-/* 805178 802448F8 14400004 */  bnez      $v0, .L8024490C
-/* 80517C 802448FC 240200FF */   addiu    $v0, $zero, 0xff
-/* 805180 80244900 8E020070 */  lw        $v0, 0x70($s0)
-/* 805184 80244904 08091246 */  j         .L80244918
-/* 805188 80244908 0000202D */   daddu    $a0, $zero, $zero
-.L8024490C:
-/* 80518C 8024490C 8E030070 */  lw        $v1, 0x70($s0)
-/* 805190 80244910 00431023 */  subu      $v0, $v0, $v1
-/* 805194 80244914 0000202D */  daddu     $a0, $zero, $zero
-.L80244918:
-/* 805198 80244918 0080282D */  daddu     $a1, $a0, $zero
-/* 80519C 8024491C 0080302D */  daddu     $a2, $a0, $zero
-/* 8051A0 80244920 0C046F97 */  jal       set_background_color_blend
-/* 8051A4 80244924 304700FF */   andi     $a3, $v0, 0xff
-/* 8051A8 80244928 3C02800B */  lui       $v0, %hi(gCameras)
-/* 8051AC 8024492C 24421D80 */  addiu     $v0, $v0, %lo(gCameras)
-/* 8051B0 80244930 A440002C */  sh        $zero, 0x2c($v0)
-/* 8051B4 80244934 A440002E */  sh        $zero, 0x2e($v0)
-/* 8051B8 80244938 A4400030 */  sh        $zero, 0x30($v0)
-/* 8051BC 8024493C 8E020070 */  lw        $v0, 0x70($s0)
-/* 8051C0 80244940 284200FF */  slti      $v0, $v0, 0xff
-/* 8051C4 80244944 1440000B */  bnez      $v0, .L80244974
-/* 8051C8 80244948 0000102D */   daddu    $v0, $zero, $zero
-/* 8051CC 8024494C 8E030084 */  lw        $v1, 0x84($s0)
-/* 8051D0 80244950 24020003 */  addiu     $v0, $zero, 3
-/* 8051D4 80244954 14620007 */  bne       $v1, $v0, .L80244974
-/* 8051D8 80244958 24020002 */   addiu    $v0, $zero, 2
-/* 8051DC 8024495C 960400C2 */  lhu       $a0, 0xc2($s0)
-/* 8051E0 80244960 2405FFFF */  addiu     $a1, $zero, -1
-/* 8051E4 80244964 0000302D */  daddu     $a2, $zero, $zero
-/* 8051E8 80244968 0C046E54 */  jal       func_8011B950
-/* 8051EC 8024496C 24070001 */   addiu    $a3, $zero, 1
-/* 8051F0 80244970 24020002 */  addiu     $v0, $zero, 2
-.L80244974:
-/* 8051F4 80244974 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8051F8 80244978 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8051FC 8024497C 03E00008 */  jr        $ra
-/* 805200 80244980 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B84_833384.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B84_833384.s
deleted file mode 100644
index 1b667fc033..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B84_833384.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241B84_833384
-/* 833384 80241B84 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 833388 80241B88 AFB00010 */  sw        $s0, 0x10($sp)
-/* 83338C 80241B8C 0080802D */  daddu     $s0, $a0, $zero
-/* 833390 80241B90 3C05F5DE */  lui       $a1, 0xf5de
-/* 833394 80241B94 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 833398 80241B98 0C0B1EAF */  jal       evt_get_variable
-/* 83339C 80241B9C 34A5019D */   ori      $a1, $a1, 0x19d
-/* 8333A0 80241BA0 54400003 */  bnel      $v0, $zero, .L80241BB0
-/* 8333A4 80241BA4 3C05F5DE */   lui      $a1, 0xf5de
-/* 8333A8 80241BA8 080906F0 */  j         .L80241BC0
-/* 8333AC 80241BAC 2402FFFF */   addiu    $v0, $zero, -1
-.L80241BB0:
-/* 8333B0 80241BB0 34A5019D */  ori       $a1, $a1, 0x19d
-/* 8333B4 80241BB4 0200202D */  daddu     $a0, $s0, $zero
-/* 8333B8 80241BB8 0C0B1EAF */  jal       evt_get_variable
-/* 8333BC 80241BBC 00452821 */   addu     $a1, $v0, $a1
-.L80241BC0:
-/* 8333C0 80241BC0 AE020084 */  sw        $v0, 0x84($s0)
-/* 8333C4 80241BC4 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8333C8 80241BC8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8333CC 80241BCC 24020002 */  addiu     $v0, $zero, 2
-/* 8333D0 80241BD0 03E00008 */  jr        $ra
-/* 8333D4 80241BD4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/842BD0/func_80240000_842BD0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/842BD0/func_80240000_842BD0.s
deleted file mode 100644
index 28f1738f47..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/842BD0/func_80240000_842BD0.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_8024F550_852120
-.ascii "hos_bg\0\0mac_05\0\0mac_02\0\0omo_03\0\0hos_20\0\0\0\0\0\0\0\0\0\0"
-
-.section .text
-
-glabel func_80240000_842BD0
-/* 842BD0 80240000 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 842BD4 80240004 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 842BD8 80240008 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 842BDC 8024000C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 842BE0 80240010 8443008E */  lh        $v1, 0x8e($v0)
-/* 842BE4 80240014 24020004 */  addiu     $v0, $zero, 4
-/* 842BE8 80240018 14620006 */  bne       $v1, $v0, .L80240034
-/* 842BEC 8024001C 00000000 */   nop
-/* 842BF0 80240020 3C04800E */  lui       $a0, %hi(wMapBgName)
-/* 842BF4 80240024 24849668 */  addiu     $a0, $a0, %lo(wMapBgName)
-/* 842BF8 80240028 3C058025 */  lui       $a1, %hi(D_8024F550_852120)
-/* 842BFC 8024002C 0C01953C */  jal       sprintf
-/* 842C00 80240030 24A5F550 */   addiu    $a1, $a1, %lo(D_8024F550_852120)
-.L80240034:
-/* 842C04 80240034 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 842C08 80240038 0000102D */  daddu     $v0, $zero, $zero
-/* 842C0C 8024003C 03E00008 */  jr        $ra
-/* 842C10 80240040 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 842C14 80240044 00000000 */  nop
-/* 842C18 80240048 00000000 */  nop
-/* 842C1C 8024004C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240050_842C20.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240050_842C20.s
deleted file mode 100644
index d8e3f0c553..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240050_842C20.s
+++ /dev/null
@@ -1,85 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240050_842C20
-/* 842C20 80240050 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* 842C24 80240054 AFB1002C */  sw        $s1, 0x2c($sp)
-/* 842C28 80240058 0080882D */  daddu     $s1, $a0, $zero
-/* 842C2C 8024005C AFBF004C */  sw        $ra, 0x4c($sp)
-/* 842C30 80240060 AFBE0048 */  sw        $fp, 0x48($sp)
-/* 842C34 80240064 AFB70044 */  sw        $s7, 0x44($sp)
-/* 842C38 80240068 AFB60040 */  sw        $s6, 0x40($sp)
-/* 842C3C 8024006C AFB5003C */  sw        $s5, 0x3c($sp)
-/* 842C40 80240070 AFB40038 */  sw        $s4, 0x38($sp)
-/* 842C44 80240074 AFB30034 */  sw        $s3, 0x34($sp)
-/* 842C48 80240078 AFB20030 */  sw        $s2, 0x30($sp)
-/* 842C4C 8024007C AFB00028 */  sw        $s0, 0x28($sp)
-/* 842C50 80240080 8E30000C */  lw        $s0, 0xc($s1)
-/* 842C54 80240084 8E050000 */  lw        $a1, ($s0)
-/* 842C58 80240088 0C0B1EAF */  jal       evt_get_variable
-/* 842C5C 8024008C 26100004 */   addiu    $s0, $s0, 4
-/* 842C60 80240090 8E050000 */  lw        $a1, ($s0)
-/* 842C64 80240094 26100004 */  addiu     $s0, $s0, 4
-/* 842C68 80240098 0220202D */  daddu     $a0, $s1, $zero
-/* 842C6C 8024009C 0C0B1EAF */  jal       evt_get_variable
-/* 842C70 802400A0 0040F02D */   daddu    $fp, $v0, $zero
-/* 842C74 802400A4 8E050000 */  lw        $a1, ($s0)
-/* 842C78 802400A8 26100004 */  addiu     $s0, $s0, 4
-/* 842C7C 802400AC 0220202D */  daddu     $a0, $s1, $zero
-/* 842C80 802400B0 0C0B1EAF */  jal       evt_get_variable
-/* 842C84 802400B4 0040B02D */   daddu    $s6, $v0, $zero
-/* 842C88 802400B8 8E050000 */  lw        $a1, ($s0)
-/* 842C8C 802400BC 26100004 */  addiu     $s0, $s0, 4
-/* 842C90 802400C0 0220202D */  daddu     $a0, $s1, $zero
-/* 842C94 802400C4 0C0B1EAF */  jal       evt_get_variable
-/* 842C98 802400C8 0040B82D */   daddu    $s7, $v0, $zero
-/* 842C9C 802400CC 8E050000 */  lw        $a1, ($s0)
-/* 842CA0 802400D0 26100004 */  addiu     $s0, $s0, 4
-/* 842CA4 802400D4 0220202D */  daddu     $a0, $s1, $zero
-/* 842CA8 802400D8 0C0B1EAF */  jal       evt_get_variable
-/* 842CAC 802400DC 0040A82D */   daddu    $s5, $v0, $zero
-/* 842CB0 802400E0 8E050000 */  lw        $a1, ($s0)
-/* 842CB4 802400E4 26100004 */  addiu     $s0, $s0, 4
-/* 842CB8 802400E8 0220202D */  daddu     $a0, $s1, $zero
-/* 842CBC 802400EC 0C0B1EAF */  jal       evt_get_variable
-/* 842CC0 802400F0 0040A02D */   daddu    $s4, $v0, $zero
-/* 842CC4 802400F4 8E050000 */  lw        $a1, ($s0)
-/* 842CC8 802400F8 26100004 */  addiu     $s0, $s0, 4
-/* 842CCC 802400FC 0220202D */  daddu     $a0, $s1, $zero
-/* 842CD0 80240100 0C0B1EAF */  jal       evt_get_variable
-/* 842CD4 80240104 0040982D */   daddu    $s3, $v0, $zero
-/* 842CD8 80240108 8E050000 */  lw        $a1, ($s0)
-/* 842CDC 8024010C 26100004 */  addiu     $s0, $s0, 4
-/* 842CE0 80240110 0220202D */  daddu     $a0, $s1, $zero
-/* 842CE4 80240114 0C0B1EAF */  jal       evt_get_variable
-/* 842CE8 80240118 0040902D */   daddu    $s2, $v0, $zero
-/* 842CEC 8024011C 0220202D */  daddu     $a0, $s1, $zero
-/* 842CF0 80240120 8E050000 */  lw        $a1, ($s0)
-/* 842CF4 80240124 0C0B1EAF */  jal       evt_get_variable
-/* 842CF8 80240128 0040802D */   daddu    $s0, $v0, $zero
-/* 842CFC 8024012C 33C400FF */  andi      $a0, $fp, 0xff
-/* 842D00 80240130 32C500FF */  andi      $a1, $s6, 0xff
-/* 842D04 80240134 329400FF */  andi      $s4, $s4, 0xff
-/* 842D08 80240138 327300FF */  andi      $s3, $s3, 0xff
-/* 842D0C 8024013C 325200FF */  andi      $s2, $s2, 0xff
-/* 842D10 80240140 32E600FF */  andi      $a2, $s7, 0xff
-/* 842D14 80240144 32A700FF */  andi      $a3, $s5, 0xff
-/* 842D18 80240148 AFB40010 */  sw        $s4, 0x10($sp)
-/* 842D1C 8024014C AFB30014 */  sw        $s3, 0x14($sp)
-/* 842D20 80240150 AFB20018 */  sw        $s2, 0x18($sp)
-/* 842D24 80240154 AFB0001C */  sw        $s0, 0x1c($sp)
-/* 842D28 80240158 0C046FAD */  jal       set_model_fog_color_parameters
-/* 842D2C 8024015C AFA20020 */   sw       $v0, 0x20($sp)
-/* 842D30 80240160 8FBF004C */  lw        $ra, 0x4c($sp)
-/* 842D34 80240164 8FBE0048 */  lw        $fp, 0x48($sp)
-/* 842D38 80240168 8FB70044 */  lw        $s7, 0x44($sp)
-/* 842D3C 8024016C 8FB60040 */  lw        $s6, 0x40($sp)
-/* 842D40 80240170 8FB5003C */  lw        $s5, 0x3c($sp)
-/* 842D44 80240174 8FB40038 */  lw        $s4, 0x38($sp)
-/* 842D48 80240178 8FB30034 */  lw        $s3, 0x34($sp)
-/* 842D4C 8024017C 8FB20030 */  lw        $s2, 0x30($sp)
-/* 842D50 80240180 8FB1002C */  lw        $s1, 0x2c($sp)
-/* 842D54 80240184 8FB00028 */  lw        $s0, 0x28($sp)
-/* 842D58 80240188 24020002 */  addiu     $v0, $zero, 2
-/* 842D5C 8024018C 03E00008 */  jr        $ra
-/* 842D60 80240190 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240194_842D64.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240194_842D64.s
deleted file mode 100644
index dd99884b92..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240194_842D64.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240194_842D64
-/* 842D64 80240194 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 842D68 80240198 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 842D6C 8024019C 0C04760B */  jal       mdl_set_all_fog_mode
-/* 842D70 802401A0 24040003 */   addiu    $a0, $zero, 3
-/* 842D74 802401A4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 842D78 802401A8 24020002 */  addiu     $v0, $zero, 2
-/* 842D7C 802401AC 03E00008 */  jr        $ra
-/* 842D80 802401B0 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 842D84 802401B4 00000000 */  nop
-/* 842D88 802401B8 00000000 */  nop
-/* 842D8C 802401BC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241848_844418.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241848_844418.s
deleted file mode 100644
index 825bbc7135..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241848_844418.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241848_844418
-/* 844418 80241848 0000302D */  daddu     $a2, $zero, $zero
-/* 84441C 8024184C 00C0282D */  daddu     $a1, $a2, $zero
-/* 844420 80241850 3C088008 */  lui       $t0, %hi(gItemTable)
-/* 844424 80241854 250878E0 */  addiu     $t0, $t0, %lo(gItemTable)
-/* 844428 80241858 3C078009 */  lui       $a3, %hi(gMoveTable)
-/* 84442C 8024185C 24E7F060 */  addiu     $a3, $a3, %lo(gMoveTable)
-/* 844430 80241860 3C048011 */  lui       $a0, %hi(gPlayerData)
-/* 844434 80241864 2484F290 */  addiu     $a0, $a0, %lo(gPlayerData)
-.L80241868:
-/* 844438 80241868 84820208 */  lh        $v0, 0x208($a0)
-/* 84443C 8024186C 1040000A */  beqz      $v0, .L80241898
-/* 844440 80241870 24A50001 */   addiu    $a1, $a1, 1
-/* 844444 80241874 00021140 */  sll       $v0, $v0, 5
-/* 844448 80241878 00481021 */  addu      $v0, $v0, $t0
-/* 84444C 8024187C 9043001A */  lbu       $v1, 0x1a($v0)
-/* 844450 80241880 00031080 */  sll       $v0, $v1, 2
-/* 844454 80241884 00431021 */  addu      $v0, $v0, $v1
-/* 844458 80241888 00021080 */  sll       $v0, $v0, 2
-/* 84445C 8024188C 00471021 */  addu      $v0, $v0, $a3
-/* 844460 80241890 80420012 */  lb        $v0, 0x12($v0)
-/* 844464 80241894 00C23021 */  addu      $a2, $a2, $v0
-.L80241898:
-/* 844468 80241898 28A20040 */  slti      $v0, $a1, 0x40
-/* 84446C 8024189C 1440FFF2 */  bnez      $v0, .L80241868
-/* 844470 802418A0 24840002 */   addiu    $a0, $a0, 2
-/* 844474 802418A4 03E00008 */  jr        $ra
-/* 844478 802418A8 00C0102D */   daddu    $v0, $a2, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802418AC_84447C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802418AC_84447C.s
deleted file mode 100644
index a6a387e5f6..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802418AC_84447C.s
+++ /dev/null
@@ -1,45 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802418AC_84447C
-/* 84447C 802418AC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 844480 802418B0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 844484 802418B4 0080802D */  daddu     $s0, $a0, $zero
-/* 844488 802418B8 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 84448C 802418BC AFB20018 */  sw        $s2, 0x18($sp)
-/* 844490 802418C0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 844494 802418C4 8E02000C */  lw        $v0, 0xc($s0)
-/* 844498 802418C8 0C090612 */  jal       func_80241848_844418
-/* 84449C 802418CC 8C520000 */   lw       $s2, ($v0)
-/* 8444A0 802418D0 3C118011 */  lui       $s1, %hi(gPlayerData)
-/* 8444A4 802418D4 2631F290 */  addiu     $s1, $s1, %lo(gPlayerData)
-/* 8444A8 802418D8 82230008 */  lb        $v1, 8($s1)
-/* 8444AC 802418DC 0062182A */  slt       $v1, $v1, $v0
-/* 8444B0 802418E0 14600005 */  bnez      $v1, .L802418F8
-/* 8444B4 802418E4 2403003F */   addiu    $v1, $zero, 0x3f
-/* 8444B8 802418E8 0200202D */  daddu     $a0, $s0, $zero
-/* 8444BC 802418EC 0240282D */  daddu     $a1, $s2, $zero
-/* 8444C0 802418F0 08090648 */  j         .L80241920
-/* 8444C4 802418F4 0000302D */   daddu    $a2, $zero, $zero
-.L802418F8:
-/* 8444C8 802418F8 26220286 */  addiu     $v0, $s1, 0x286
-.L802418FC:
-/* 8444CC 802418FC A4400000 */  sh        $zero, ($v0)
-/* 8444D0 80241900 2463FFFF */  addiu     $v1, $v1, -1
-/* 8444D4 80241904 0461FFFD */  bgez      $v1, .L802418FC
-/* 8444D8 80241908 2442FFFE */   addiu    $v0, $v0, -2
-/* 8444DC 8024190C 0C039E1B */  jal       enforce_hpfp_limits
-/* 8444E0 80241910 00000000 */   nop
-/* 8444E4 80241914 0200202D */  daddu     $a0, $s0, $zero
-/* 8444E8 80241918 0240282D */  daddu     $a1, $s2, $zero
-/* 8444EC 8024191C 24060001 */  addiu     $a2, $zero, 1
-.L80241920:
-/* 8444F0 80241920 0C0B2026 */  jal       evt_set_variable
-/* 8444F4 80241924 00000000 */   nop
-/* 8444F8 80241928 24020002 */  addiu     $v0, $zero, 2
-/* 8444FC 8024192C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 844500 80241930 8FB20018 */  lw        $s2, 0x18($sp)
-/* 844504 80241934 8FB10014 */  lw        $s1, 0x14($sp)
-/* 844508 80241938 8FB00010 */  lw        $s0, 0x10($sp)
-/* 84450C 8024193C 03E00008 */  jr        $ra
-/* 844510 80241940 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419E4_8445B4.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419E4_8445B4.s
deleted file mode 100644
index d3ce47ac14..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419E4_8445B4.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802419E4_8445B4
-/* 8445B4 802419E4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 8445B8 802419E8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8445BC 802419EC 0080802D */  daddu     $s0, $a0, $zero
-/* 8445C0 802419F0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8445C4 802419F4 3C118011 */  lui       $s1, %hi(gPlayerData)
-/* 8445C8 802419F8 2631F290 */  addiu     $s1, $s1, %lo(gPlayerData)
-/* 8445CC 802419FC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 8445D0 80241A00 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 8445D4 80241A04 AFB20018 */  sw        $s2, 0x18($sp)
-/* 8445D8 80241A08 8E02000C */  lw        $v0, 0xc($s0)
-/* 8445DC 80241A0C 82260004 */  lb        $a2, 4($s1)
-/* 8445E0 80241A10 8C450000 */  lw        $a1, ($v0)
-/* 8445E4 80241A14 24420004 */  addiu     $v0, $v0, 4
-/* 8445E8 80241A18 8C520000 */  lw        $s2, ($v0)
-/* 8445EC 80241A1C 0C0B2026 */  jal       evt_set_variable
-/* 8445F0 80241A20 8C530004 */   lw       $s3, 4($v0)
-/* 8445F4 80241A24 0200202D */  daddu     $a0, $s0, $zero
-/* 8445F8 80241A28 82260007 */  lb        $a2, 7($s1)
-/* 8445FC 80241A2C 0C0B2026 */  jal       evt_set_variable
-/* 844600 80241A30 0240282D */   daddu    $a1, $s2, $zero
-/* 844604 80241A34 0200202D */  daddu     $a0, $s0, $zero
-/* 844608 80241A38 82260008 */  lb        $a2, 8($s1)
-/* 84460C 80241A3C 0C0B2026 */  jal       evt_set_variable
-/* 844610 80241A40 0260282D */   daddu    $a1, $s3, $zero
-/* 844614 80241A44 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 844618 80241A48 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 84461C 80241A4C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 844620 80241A50 8FB10014 */  lw        $s1, 0x14($sp)
-/* 844624 80241A54 8FB00010 */  lw        $s0, 0x10($sp)
-/* 844628 80241A58 24020002 */  addiu     $v0, $zero, 2
-/* 84462C 80241A5C 03E00008 */  jr        $ra
-/* 844630 80241A60 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241A64_844634.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241A64_844634.s
deleted file mode 100644
index d60fda1fb0..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241A64_844634.s
+++ /dev/null
@@ -1,89 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241A64_844634
-/* 844634 80241A64 0000402D */  daddu     $t0, $zero, $zero
-/* 844638 80241A68 0100382D */  daddu     $a3, $t0, $zero
-/* 84463C 80241A6C 3C058011 */  lui       $a1, %hi(gPlayerData)
-/* 844640 80241A70 24A5F290 */  addiu     $a1, $a1, %lo(gPlayerData)
-/* 844644 80241A74 8C8300AC */  lw        $v1, 0xac($a0)
-/* 844648 80241A78 24020001 */  addiu     $v0, $zero, 1
-/* 84464C 80241A7C 1062000F */  beq       $v1, $v0, .L80241ABC
-/* 844650 80241A80 0100302D */   daddu    $a2, $t0, $zero
-/* 844654 80241A84 28620002 */  slti      $v0, $v1, 2
-/* 844658 80241A88 10400005 */  beqz      $v0, .L80241AA0
-/* 84465C 80241A8C 24020002 */   addiu    $v0, $zero, 2
-/* 844660 80241A90 50600007 */  beql      $v1, $zero, .L80241AB0
-/* 844664 80241A94 2406000A */   addiu    $a2, $zero, 0xa
-/* 844668 80241A98 080906B5 */  j         .L80241AD4
-/* 84466C 80241A9C 00000000 */   nop
-.L80241AA0:
-/* 844670 80241AA0 5062000A */  beql      $v1, $v0, .L80241ACC
-/* 844674 80241AA4 2406FFFB */   addiu    $a2, $zero, -5
-/* 844678 80241AA8 080906B5 */  j         .L80241AD4
-/* 84467C 80241AAC 00000000 */   nop
-.L80241AB0:
-/* 844680 80241AB0 2407FFFB */  addiu     $a3, $zero, -5
-/* 844684 80241AB4 080906B5 */  j         .L80241AD4
-/* 844688 80241AB8 2408FFFD */   addiu    $t0, $zero, -3
-.L80241ABC:
-/* 84468C 80241ABC 2406FFFB */  addiu     $a2, $zero, -5
-/* 844690 80241AC0 2407000A */  addiu     $a3, $zero, 0xa
-/* 844694 80241AC4 080906B5 */  j         .L80241AD4
-/* 844698 80241AC8 2408FFFD */   addiu    $t0, $zero, -3
-.L80241ACC:
-/* 84469C 80241ACC 00C0382D */  daddu     $a3, $a2, $zero
-/* 8446A0 80241AD0 24080006 */  addiu     $t0, $zero, 6
-.L80241AD4:
-/* 8446A4 80241AD4 90A30004 */  lbu       $v1, 4($a1)
-/* 8446A8 80241AD8 90A20003 */  lbu       $v0, 3($a1)
-/* 8446AC 80241ADC 00661821 */  addu      $v1, $v1, $a2
-/* 8446B0 80241AE0 00461021 */  addu      $v0, $v0, $a2
-/* 8446B4 80241AE4 A0A20003 */  sb        $v0, 3($a1)
-/* 8446B8 80241AE8 00021600 */  sll       $v0, $v0, 0x18
-/* 8446BC 80241AEC 00021603 */  sra       $v0, $v0, 0x18
-/* 8446C0 80241AF0 2842004C */  slti      $v0, $v0, 0x4c
-/* 8446C4 80241AF4 14400003 */  bnez      $v0, .L80241B04
-/* 8446C8 80241AF8 A0A30004 */   sb       $v1, 4($a1)
-/* 8446CC 80241AFC 2402004B */  addiu     $v0, $zero, 0x4b
-/* 8446D0 80241B00 A0A20003 */  sb        $v0, 3($a1)
-.L80241B04:
-/* 8446D4 80241B04 80A30002 */  lb        $v1, 2($a1)
-/* 8446D8 80241B08 80A20003 */  lb        $v0, 3($a1)
-/* 8446DC 80241B0C 0043102A */  slt       $v0, $v0, $v1
-/* 8446E0 80241B10 90A30003 */  lbu       $v1, 3($a1)
-/* 8446E4 80241B14 54400001 */  bnel      $v0, $zero, .L80241B1C
-/* 8446E8 80241B18 A0A30002 */   sb       $v1, 2($a1)
-.L80241B1C:
-/* 8446EC 80241B1C 90A30007 */  lbu       $v1, 7($a1)
-/* 8446F0 80241B20 90A20006 */  lbu       $v0, 6($a1)
-/* 8446F4 80241B24 00671821 */  addu      $v1, $v1, $a3
-/* 8446F8 80241B28 00471021 */  addu      $v0, $v0, $a3
-/* 8446FC 80241B2C A0A20006 */  sb        $v0, 6($a1)
-/* 844700 80241B30 00021600 */  sll       $v0, $v0, 0x18
-/* 844704 80241B34 00021603 */  sra       $v0, $v0, 0x18
-/* 844708 80241B38 2842004C */  slti      $v0, $v0, 0x4c
-/* 84470C 80241B3C 14400003 */  bnez      $v0, .L80241B4C
-/* 844710 80241B40 A0A30007 */   sb       $v1, 7($a1)
-/* 844714 80241B44 2402004B */  addiu     $v0, $zero, 0x4b
-/* 844718 80241B48 A0A20006 */  sb        $v0, 6($a1)
-.L80241B4C:
-/* 84471C 80241B4C 80A30005 */  lb        $v1, 5($a1)
-/* 844720 80241B50 80A20006 */  lb        $v0, 6($a1)
-/* 844724 80241B54 0043102A */  slt       $v0, $v0, $v1
-/* 844728 80241B58 90A30006 */  lbu       $v1, 6($a1)
-/* 84472C 80241B5C 54400001 */  bnel      $v0, $zero, .L80241B64
-/* 844730 80241B60 A0A30005 */   sb       $v1, 5($a1)
-.L80241B64:
-/* 844734 80241B64 90A20008 */  lbu       $v0, 8($a1)
-/* 844738 80241B68 00481021 */  addu      $v0, $v0, $t0
-/* 84473C 80241B6C A0A20008 */  sb        $v0, 8($a1)
-/* 844740 80241B70 00021600 */  sll       $v0, $v0, 0x18
-/* 844744 80241B74 00021603 */  sra       $v0, $v0, 0x18
-/* 844748 80241B78 2842001F */  slti      $v0, $v0, 0x1f
-/* 84474C 80241B7C 14400002 */  bnez      $v0, .L80241B88
-/* 844750 80241B80 2402001E */   addiu    $v0, $zero, 0x1e
-/* 844754 80241B84 A0A20008 */  sb        $v0, 8($a1)
-.L80241B88:
-/* 844758 80241B88 03E00008 */  jr        $ra
-/* 84475C 80241B8C 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241B90_844760.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241B90_844760.s
deleted file mode 100644
index 9597a02910..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241B90_844760.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241B90_844760
-/* 844760 80241B90 3C038011 */  lui       $v1, %hi(gPlayerData)
-/* 844764 80241B94 2463F290 */  addiu     $v1, $v1, %lo(gPlayerData)
-/* 844768 80241B98 80620003 */  lb        $v0, 3($v1)
-/* 84476C 80241B9C AC820084 */  sw        $v0, 0x84($a0)
-/* 844770 80241BA0 80620006 */  lb        $v0, 6($v1)
-/* 844774 80241BA4 AC820088 */  sw        $v0, 0x88($a0)
-/* 844778 80241BA8 80620008 */  lb        $v0, 8($v1)
-/* 84477C 80241BAC AC82008C */  sw        $v0, 0x8c($a0)
-/* 844780 80241BB0 03E00008 */  jr        $ra
-/* 844784 80241BB4 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C40_844810.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C40_844810.s
deleted file mode 100644
index f565f9efe8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C40_844810.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241C40_844810
-/* 844810 80241C40 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 844814 80241C44 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 844818 80241C48 0C03A631 */  jal       func_800E98C4
-/* 84481C 80241C4C 00000000 */   nop
-/* 844820 80241C50 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 844824 80241C54 24020002 */  addiu     $v0, $zero, 2
-/* 844828 80241C58 03E00008 */  jr        $ra
-/* 84482C 80241C5C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C60_844830.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C60_844830.s
deleted file mode 100644
index b418889706..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C60_844830.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241C60_844830
-/* 844830 80241C60 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 844834 80241C64 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 844838 80241C68 0C03A631 */  jal       func_800E98C4
-/* 84483C 80241C6C 00000000 */   nop
-/* 844840 80241C70 0C03A5D8 */  jal       open_status_menu_long
-/* 844844 80241C74 00000000 */   nop
-/* 844848 80241C78 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 84484C 80241C7C 24020002 */  addiu     $v0, $zero, 2
-/* 844850 80241C80 03E00008 */  jr        $ra
-/* 844854 80241C84 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 844858 80241C88 00000000 */  nop
-/* 84485C 80241C8C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC_84497C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC_84497C.s
deleted file mode 100644
index 8aea153fce..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC_84497C.s
+++ /dev/null
@@ -1,76 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_8024F580_852150
-.double 0.7142857142857143, 5.578423069507728e+228, 3.0252731672874824e+209, 0.0
-
-.section .text
-
-glabel func_80241DAC_84497C
-/* 84497C 80241DAC 27BDFF48 */  addiu     $sp, $sp, -0xb8
-/* 844980 80241DB0 AFB1009C */  sw        $s1, 0x9c($sp)
-/* 844984 80241DB4 0080882D */  daddu     $s1, $a0, $zero
-/* 844988 80241DB8 0000202D */  daddu     $a0, $zero, $zero
-/* 84498C 80241DBC 3C05FD05 */  lui       $a1, 0xfd05
-/* 844990 80241DC0 AFBF00A0 */  sw        $ra, 0xa0($sp)
-/* 844994 80241DC4 AFB00098 */  sw        $s0, 0x98($sp)
-/* 844998 80241DC8 F7B600B0 */  sdc1      $f22, 0xb0($sp)
-/* 84499C 80241DCC F7B400A8 */  sdc1      $f20, 0xa8($sp)
-/* 8449A0 80241DD0 0C0B210B */  jal       evt_get_float_variable
-/* 8449A4 80241DD4 34A50F8A */   ori      $a1, $a1, 0xf8a
-/* 8449A8 80241DD8 44801000 */  mtc1      $zero, $f2
-/* 8449AC 80241DDC 3C013F80 */  lui       $at, 0x3f80
-/* 8449B0 80241DE0 4481B000 */  mtc1      $at, $f22
-/* 8449B4 80241DE4 27A40018 */  addiu     $a0, $sp, 0x18
-/* 8449B8 80241DE8 E7A20010 */  swc1      $f2, 0x10($sp)
-/* 8449BC 80241DEC 8E2500A8 */  lw        $a1, 0xa8($s1)
-/* 8449C0 80241DF0 44061000 */  mfc1      $a2, $f2
-/* 8449C4 80241DF4 4407B000 */  mfc1      $a3, $f22
-/* 8449C8 80241DF8 0C019EC8 */  jal       guRotateF
-/* 8449CC 80241DFC 46000506 */   mov.s    $f20, $f0
-/* 8449D0 80241E00 3C018025 */  lui       $at, %hi(D_8024F580_852150)
-/* 8449D4 80241E04 D420F580 */  ldc1      $f0, %lo(D_8024F580_852150)($at)
-/* 8449D8 80241E08 4600A521 */  cvt.d.s   $f20, $f20
-/* 8449DC 80241E0C 4620A502 */  mul.d     $f20, $f20, $f0
-/* 8449E0 80241E10 00000000 */  nop
-/* 8449E4 80241E14 27B00058 */  addiu     $s0, $sp, 0x58
-/* 8449E8 80241E18 4620A520 */  cvt.s.d   $f20, $f20
-/* 8449EC 80241E1C 4405A000 */  mfc1      $a1, $f20
-/* 8449F0 80241E20 0200202D */  daddu     $a0, $s0, $zero
-/* 8449F4 80241E24 00A0302D */  daddu     $a2, $a1, $zero
-/* 8449F8 80241E28 0C019DF0 */  jal       guScaleF
-/* 8449FC 80241E2C 00A0382D */   daddu    $a3, $a1, $zero
-/* 844A00 80241E30 27A40018 */  addiu     $a0, $sp, 0x18
-/* 844A04 80241E34 0200282D */  daddu     $a1, $s0, $zero
-/* 844A08 80241E38 0C019D80 */  jal       guMtxCatF
-/* 844A0C 80241E3C 0080302D */   daddu    $a2, $a0, $zero
-/* 844A10 80241E40 8E250028 */  lw        $a1, 0x28($s1)
-/* 844A14 80241E44 8E26002C */  lw        $a2, 0x2c($s1)
-/* 844A18 80241E48 8E270030 */  lw        $a3, 0x30($s1)
-/* 844A1C 80241E4C 0C019E40 */  jal       guTranslateF
-/* 844A20 80241E50 0200202D */   daddu    $a0, $s0, $zero
-/* 844A24 80241E54 27A40018 */  addiu     $a0, $sp, 0x18
-/* 844A28 80241E58 0200282D */  daddu     $a1, $s0, $zero
-/* 844A2C 80241E5C 0C019D80 */  jal       guMtxCatF
-/* 844A30 80241E60 0080302D */   daddu    $a2, $a0, $zero
-/* 844A34 80241E64 8E2500A4 */  lw        $a1, 0xa4($s1)
-/* 844A38 80241E68 4406B000 */  mfc1      $a2, $f22
-/* 844A3C 80241E6C 0C0B76A3 */  jal       spr_update_player_sprite
-/* 844A40 80241E70 0000202D */   daddu    $a0, $zero, $zero
-/* 844A44 80241E74 0000202D */  daddu     $a0, $zero, $zero
-/* 844A48 80241E78 0080282D */  daddu     $a1, $a0, $zero
-/* 844A4C 80241E7C 0080302D */  daddu     $a2, $a0, $zero
-/* 844A50 80241E80 0080382D */  daddu     $a3, $a0, $zero
-/* 844A54 80241E84 A62200BC */  sh        $v0, 0xbc($s1)
-/* 844A58 80241E88 27A20018 */  addiu     $v0, $sp, 0x18
-/* 844A5C 80241E8C 0C0B7710 */  jal       spr_draw_player_sprite
-/* 844A60 80241E90 AFA20010 */   sw       $v0, 0x10($sp)
-/* 844A64 80241E94 8FBF00A0 */  lw        $ra, 0xa0($sp)
-/* 844A68 80241E98 8FB1009C */  lw        $s1, 0x9c($sp)
-/* 844A6C 80241E9C 8FB00098 */  lw        $s0, 0x98($sp)
-/* 844A70 80241EA0 D7B600B0 */  ldc1      $f22, 0xb0($sp)
-/* 844A74 80241EA4 D7B400A8 */  ldc1      $f20, 0xa8($sp)
-/* 844A78 80241EA8 03E00008 */  jr        $ra
-/* 844A7C 80241EAC 27BD00B8 */   addiu    $sp, $sp, 0xb8
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024047C_8525EC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024047C_8525EC.s
deleted file mode 100644
index 3c217916c1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024047C_8525EC.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024047C_8525EC
-/* 8525EC 8024047C 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 8525F0 80240480 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 8525F4 80240484 AC400094 */  sw        $zero, 0x94($v0)
-/* 8525F8 80240488 03E00008 */  jr        $ra
-/* 8525FC 8024048C 0000102D */   daddu    $v0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242E84_854FF4.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242E84_854FF4.s
deleted file mode 100644
index 7bbb386dda..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242E84_854FF4.s
+++ /dev/null
@@ -1,142 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242E84_854FF4
-/* 854FF4 80242E84 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 854FF8 80242E88 AFB20018 */  sw        $s2, 0x18($sp)
-/* 854FFC 80242E8C 0080902D */  daddu     $s2, $a0, $zero
-/* 855000 80242E90 AFB00010 */  sw        $s0, 0x10($sp)
-/* 855004 80242E94 00A0802D */  daddu     $s0, $a1, $zero
-/* 855008 80242E98 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 85500C 80242E9C AFB3001C */  sw        $s3, 0x1c($sp)
-/* 855010 80242EA0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 855014 80242EA4 8E53000C */  lw        $s3, 0xc($s2)
-/* 855018 80242EA8 0C00EAD2 */  jal       get_npc_safe
-/* 85501C 80242EAC 0000202D */   daddu    $a0, $zero, $zero
-/* 855020 80242EB0 12000018 */  beqz      $s0, .L80242F14
-/* 855024 80242EB4 0040882D */   daddu    $s1, $v0, $zero
-/* 855028 80242EB8 8E650000 */  lw        $a1, ($s3)
-/* 85502C 80242EBC 0C0B1EAF */  jal       evt_get_variable
-/* 855030 80242EC0 0240202D */   daddu    $a0, $s2, $zero
-/* 855034 80242EC4 14400005 */  bnez      $v0, .L80242EDC
-/* 855038 80242EC8 AE420070 */   sw       $v0, 0x70($s2)
-/* 85503C 80242ECC 2402005A */  addiu     $v0, $zero, 0x5a
-/* 855040 80242ED0 AE400078 */  sw        $zero, 0x78($s2)
-/* 855044 80242ED4 08090BC5 */  j         .L80242F14
-/* 855048 80242ED8 AE420074 */   sw       $v0, 0x74($s2)
-.L80242EDC:
-/* 85504C 80242EDC 3C014422 */  lui       $at, 0x4422
-/* 855050 80242EE0 34218000 */  ori       $at, $at, 0x8000
-/* 855054 80242EE4 44810000 */  mtc1      $at, $f0
-/* 855058 80242EE8 3C01C1F0 */  lui       $at, 0xc1f0
-/* 85505C 80242EEC 44811000 */  mtc1      $at, $f2
-/* 855060 80242EF0 3C0143BA */  lui       $at, 0x43ba
-/* 855064 80242EF4 44812000 */  mtc1      $at, $f4
-/* 855068 80242EF8 2402000A */  addiu     $v0, $zero, 0xa
-/* 85506C 80242EFC AE420078 */  sw        $v0, 0x78($s2)
-/* 855070 80242F00 24020122 */  addiu     $v0, $zero, 0x122
-/* 855074 80242F04 AE420074 */  sw        $v0, 0x74($s2)
-/* 855078 80242F08 E6200038 */  swc1      $f0, 0x38($s1)
-/* 85507C 80242F0C E622003C */  swc1      $f2, 0x3c($s1)
-/* 855080 80242F10 E6240040 */  swc1      $f4, 0x40($s1)
-.L80242F14:
-/* 855084 80242F14 8E430078 */  lw        $v1, 0x78($s2)
-/* 855088 80242F18 24040001 */  addiu     $a0, $zero, 1
-/* 85508C 80242F1C 10640022 */  beq       $v1, $a0, .L80242FA8
-/* 855090 80242F20 28620002 */   slti     $v0, $v1, 2
-/* 855094 80242F24 10400005 */  beqz      $v0, .L80242F3C
-/* 855098 80242F28 2402000A */   addiu    $v0, $zero, 0xa
-/* 85509C 80242F2C 10600009 */  beqz      $v1, .L80242F54
-/* 8550A0 80242F30 0000102D */   daddu    $v0, $zero, $zero
-/* 8550A4 80242F34 08090C1B */  j         .L8024306C
-/* 8550A8 80242F38 00000000 */   nop
-.L80242F3C:
-/* 8550AC 80242F3C 1062002C */  beq       $v1, $v0, .L80242FF0
-/* 8550B0 80242F40 2402000B */   addiu    $v0, $zero, 0xb
-/* 8550B4 80242F44 1062003D */  beq       $v1, $v0, .L8024303C
-/* 8550B8 80242F48 0000102D */   daddu    $v0, $zero, $zero
-/* 8550BC 80242F4C 08090C1B */  j         .L8024306C
-/* 8550C0 80242F50 00000000 */   nop
-.L80242F54:
-/* 8550C4 80242F54 3C0200B6 */  lui       $v0, 0xb6
-/* 8550C8 80242F58 C624000C */  lwc1      $f4, 0xc($s1)
-/* 8550CC 80242F5C 3C013F80 */  lui       $at, 0x3f80
-/* 8550D0 80242F60 44810000 */  mtc1      $at, $f0
-/* 8550D4 80242F64 3C014040 */  lui       $at, 0x4040
-/* 8550D8 80242F68 44811000 */  mtc1      $at, $f2
-/* 8550DC 80242F6C 46002101 */  sub.s     $f4, $f4, $f0
-/* 8550E0 80242F70 C6200038 */  lwc1      $f0, 0x38($s1)
-/* 8550E4 80242F74 34420001 */  ori       $v0, $v0, 1
-/* 8550E8 80242F78 46020000 */  add.s     $f0, $f0, $f2
-/* 8550EC 80242F7C AE220028 */  sw        $v0, 0x28($s1)
-/* 8550F0 80242F80 E624000C */  swc1      $f4, 0xc($s1)
-/* 8550F4 80242F84 E6200038 */  swc1      $f0, 0x38($s1)
-/* 8550F8 80242F88 8E420074 */  lw        $v0, 0x74($s2)
-/* 8550FC 80242F8C 2442FFFF */  addiu     $v0, $v0, -1
-/* 855100 80242F90 1C400035 */  bgtz      $v0, .L80243068
-/* 855104 80242F94 AE420074 */   sw       $v0, 0x74($s2)
-/* 855108 80242F98 240200C8 */  addiu     $v0, $zero, 0xc8
-/* 85510C 80242F9C AE440078 */  sw        $a0, 0x78($s2)
-/* 855110 80242FA0 08090C1A */  j         .L80243068
-/* 855114 80242FA4 AE420074 */   sw       $v0, 0x74($s2)
-.L80242FA8:
-/* 855118 80242FA8 0000202D */  daddu     $a0, $zero, $zero
-/* 85511C 80242FAC 3C05FAA2 */  lui       $a1, 0xfaa2
-/* 855120 80242FB0 0C0B1EAF */  jal       evt_get_variable
-/* 855124 80242FB4 34A5B581 */   ori      $a1, $a1, 0xb581
-/* 855128 80242FB8 1040002C */  beqz      $v0, .L8024306C
-/* 85512C 80242FBC 0000102D */   daddu    $v0, $zero, $zero
-/* 855130 80242FC0 C6200038 */  lwc1      $f0, 0x38($s1)
-/* 855134 80242FC4 3C014040 */  lui       $at, 0x4040
-/* 855138 80242FC8 44811000 */  mtc1      $at, $f2
-/* 85513C 80242FCC 00000000 */  nop
-/* 855140 80242FD0 46020000 */  add.s     $f0, $f0, $f2
-/* 855144 80242FD4 E6200038 */  swc1      $f0, 0x38($s1)
-/* 855148 80242FD8 8E420074 */  lw        $v0, 0x74($s2)
-/* 85514C 80242FDC 2442FFFF */  addiu     $v0, $v0, -1
-/* 855150 80242FE0 1C400021 */  bgtz      $v0, .L80243068
-/* 855154 80242FE4 AE420074 */   sw       $v0, 0x74($s2)
-/* 855158 80242FE8 08090C1B */  j         .L8024306C
-/* 85515C 80242FEC 24020001 */   addiu    $v0, $zero, 1
-.L80242FF0:
-/* 855160 80242FF0 C6220038 */  lwc1      $f2, 0x38($s1)
-/* 855164 80242FF4 3C014040 */  lui       $at, 0x4040
-/* 855168 80242FF8 44810000 */  mtc1      $at, $f0
-/* 85516C 80242FFC 00000000 */  nop
-/* 855170 80243000 46001081 */  sub.s     $f2, $f2, $f0
-/* 855174 80243004 3C014387 */  lui       $at, 0x4387
-/* 855178 80243008 44810000 */  mtc1      $at, $f0
-/* 85517C 8024300C 00000000 */  nop
-/* 855180 80243010 E620000C */  swc1      $f0, 0xc($s1)
-/* 855184 80243014 E6220038 */  swc1      $f2, 0x38($s1)
-/* 855188 80243018 8E420074 */  lw        $v0, 0x74($s2)
-/* 85518C 8024301C 2442FFFF */  addiu     $v0, $v0, -1
-/* 855190 80243020 1C400011 */  bgtz      $v0, .L80243068
-/* 855194 80243024 AE420074 */   sw       $v0, 0x74($s2)
-/* 855198 80243028 2402000B */  addiu     $v0, $zero, 0xb
-/* 85519C 8024302C AE420078 */  sw        $v0, 0x78($s2)
-/* 8551A0 80243030 2402005A */  addiu     $v0, $zero, 0x5a
-/* 8551A4 80243034 08090C1A */  j         .L80243068
-/* 8551A8 80243038 AE420074 */   sw       $v0, 0x74($s2)
-.L8024303C:
-/* 8551AC 8024303C C620000C */  lwc1      $f0, 0xc($s1)
-/* 8551B0 80243040 3C013F80 */  lui       $at, 0x3f80
-/* 8551B4 80243044 44811000 */  mtc1      $at, $f2
-/* 8551B8 80243048 00000000 */  nop
-/* 8551BC 8024304C 46020001 */  sub.s     $f0, $f0, $f2
-/* 8551C0 80243050 E620000C */  swc1      $f0, 0xc($s1)
-/* 8551C4 80243054 8E430074 */  lw        $v1, 0x74($s2)
-/* 8551C8 80243058 24020001 */  addiu     $v0, $zero, 1
-/* 8551CC 8024305C 2463FFFF */  addiu     $v1, $v1, -1
-/* 8551D0 80243060 18600002 */  blez      $v1, .L8024306C
-/* 8551D4 80243064 AE430074 */   sw       $v1, 0x74($s2)
-.L80243068:
-/* 8551D8 80243068 0000102D */  daddu     $v0, $zero, $zero
-.L8024306C:
-/* 8551DC 8024306C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 8551E0 80243070 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 8551E4 80243074 8FB20018 */  lw        $s2, 0x18($sp)
-/* 8551E8 80243078 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8551EC 8024307C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8551F0 80243080 03E00008 */  jr        $ra
-/* 8551F4 80243084 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4_855224.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4_855224.s
deleted file mode 100644
index 67affd1e69..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4_855224.s
+++ /dev/null
@@ -1,69 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802430B4_855224
-/* 855224 802430B4 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 855228 802430B8 AFB20038 */  sw        $s2, 0x38($sp)
-/* 85522C 802430BC 0080902D */  daddu     $s2, $a0, $zero
-/* 855230 802430C0 AFBF003C */  sw        $ra, 0x3c($sp)
-/* 855234 802430C4 AFB10034 */  sw        $s1, 0x34($sp)
-/* 855238 802430C8 AFB00030 */  sw        $s0, 0x30($sp)
-/* 85523C 802430CC F7B40040 */  sdc1      $f20, 0x40($sp)
-/* 855240 802430D0 8E51000C */  lw        $s1, 0xc($s2)
-/* 855244 802430D4 0C00EAD2 */  jal       get_npc_safe
-/* 855248 802430D8 2404FFFC */   addiu    $a0, $zero, -4
-/* 85524C 802430DC 2410FFFF */  addiu     $s0, $zero, -1
-/* 855250 802430E0 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x18)
-/* 855254 802430E4 8463A568 */  lh        $v1, %lo(gCollisionStatus+0x18)($v1)
-/* 855258 802430E8 04600025 */  bltz      $v1, .L80243180
-/* 85525C 802430EC 0040202D */   daddu    $a0, $v0, $zero
-/* 855260 802430F0 3C014130 */  lui       $at, 0x4130
-/* 855264 802430F4 44812000 */  mtc1      $at, $f4
-/* 855268 802430F8 C4800038 */  lwc1      $f0, 0x38($a0)
-/* 85526C 802430FC 3C014140 */  lui       $at, 0x4140
-/* 855270 80243100 4481A000 */  mtc1      $at, $f20
-/* 855274 80243104 27A2002C */  addiu     $v0, $sp, 0x2c
-/* 855278 80243108 E7A4002C */  swc1      $f4, 0x2c($sp)
-/* 85527C 8024310C E7A00020 */  swc1      $f0, 0x20($sp)
-/* 855280 80243110 C480003C */  lwc1      $f0, 0x3c($a0)
-/* 855284 80243114 C4820040 */  lwc1      $f2, 0x40($a0)
-/* 855288 80243118 46040000 */  add.s     $f0, $f0, $f4
-/* 85528C 8024311C E7B4002C */  swc1      $f20, 0x2c($sp)
-/* 855290 80243120 E7A20028 */  swc1      $f2, 0x28($sp)
-/* 855294 80243124 E7A00024 */  swc1      $f0, 0x24($sp)
-/* 855298 80243128 AFA20010 */  sw        $v0, 0x10($sp)
-/* 85529C 8024312C C480000C */  lwc1      $f0, 0xc($a0)
-/* 8552A0 80243130 27A50020 */  addiu     $a1, $sp, 0x20
-/* 8552A4 80243134 E7A00014 */  swc1      $f0, 0x14($sp)
-/* 8552A8 80243138 848200A6 */  lh        $v0, 0xa6($a0)
-/* 8552AC 8024313C 27A60024 */  addiu     $a2, $sp, 0x24
-/* 8552B0 80243140 44820000 */  mtc1      $v0, $f0
-/* 8552B4 80243144 00000000 */  nop
-/* 8552B8 80243148 46800020 */  cvt.s.w   $f0, $f0
-/* 8552BC 8024314C E7A00018 */  swc1      $f0, 0x18($sp)
-/* 8552C0 80243150 8C840080 */  lw        $a0, 0x80($a0)
-/* 8552C4 80243154 0C0371DE */  jal       npc_raycast_down_around
-/* 8552C8 80243158 27A70028 */   addiu    $a3, $sp, 0x28
-/* 8552CC 8024315C 10400009 */  beqz      $v0, .L80243184
-/* 8552D0 80243160 0240202D */   daddu    $a0, $s2, $zero
-/* 8552D4 80243164 C7A0002C */  lwc1      $f0, 0x2c($sp)
-/* 8552D8 80243168 4614003E */  c.le.s    $f0, $f20
-/* 8552DC 8024316C 00000000 */  nop
-/* 8552E0 80243170 45000004 */  bc1f      .L80243184
-/* 8552E4 80243174 00000000 */   nop
-/* 8552E8 80243178 3C108011 */  lui       $s0, %hi(D_8010C978)
-/* 8552EC 8024317C 8E10C978 */  lw        $s0, %lo(D_8010C978)($s0)
-.L80243180:
-/* 8552F0 80243180 0240202D */  daddu     $a0, $s2, $zero
-.L80243184:
-/* 8552F4 80243184 8E250000 */  lw        $a1, ($s1)
-/* 8552F8 80243188 0C0B2026 */  jal       evt_set_variable
-/* 8552FC 8024318C 0200302D */   daddu    $a2, $s0, $zero
-/* 855300 80243190 8FBF003C */  lw        $ra, 0x3c($sp)
-/* 855304 80243194 8FB20038 */  lw        $s2, 0x38($sp)
-/* 855308 80243198 8FB10034 */  lw        $s1, 0x34($sp)
-/* 85530C 8024319C 8FB00030 */  lw        $s0, 0x30($sp)
-/* 855310 802431A0 D7B40040 */  ldc1      $f20, 0x40($sp)
-/* 855314 802431A4 24020002 */  addiu     $v0, $zero, 2
-/* 855318 802431A8 03E00008 */  jr        $ra
-/* 85531C 802431AC 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0_855320.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0_855320.s
deleted file mode 100644
index 805810dac5..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0_855320.s
+++ /dev/null
@@ -1,46 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802431B0_855320
-/* 855320 802431B0 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* 855324 802431B4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 855328 802431B8 F7B80030 */  sdc1      $f24, 0x30($sp)
-/* 85532C 802431BC F7B60028 */  sdc1      $f22, 0x28($sp)
-/* 855330 802431C0 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 855334 802431C4 0C00EAD2 */  jal       get_npc_safe
-/* 855338 802431C8 24040004 */   addiu    $a0, $zero, 4
-/* 85533C 802431CC C4420038 */  lwc1      $f2, 0x38($v0)
-/* 855340 802431D0 3C0141A0 */  lui       $at, 0x41a0
-/* 855344 802431D4 44810000 */  mtc1      $at, $f0
-/* 855348 802431D8 00000000 */  nop
-/* 85534C 802431DC 46001580 */  add.s     $f22, $f2, $f0
-/* 855350 802431E0 C4420040 */  lwc1      $f2, 0x40($v0)
-/* 855354 802431E4 3C014170 */  lui       $at, 0x4170
-/* 855358 802431E8 44810000 */  mtc1      $at, $f0
-/* 85535C 802431EC C454003C */  lwc1      $f20, 0x3c($v0)
-/* 855360 802431F0 46001601 */  sub.s     $f24, $f2, $f0
-/* 855364 802431F4 44800000 */  mtc1      $zero, $f0
-/* 855368 802431F8 00000000 */  nop
-/* 85536C 802431FC 4600A03C */  c.lt.s    $f20, $f0
-/* 855370 80243200 00000000 */  nop
-/* 855374 80243204 4500000C */  bc1f      .L80243238
-/* 855378 80243208 0000202D */   daddu    $a0, $zero, $zero
-/* 85537C 8024320C 4405B000 */  mfc1      $a1, $f22
-/* 855380 80243210 4406A000 */  mfc1      $a2, $f20
-/* 855384 80243214 4407C000 */  mfc1      $a3, $f24
-/* 855388 80243218 0C01C16C */  jal       fx_rising_bubble
-/* 85538C 8024321C E7A00010 */   swc1     $f0, 0x10($sp)
-/* 855390 80243220 24040046 */  addiu     $a0, $zero, 0x46
-/* 855394 80243224 4406B000 */  mfc1      $a2, $f22
-/* 855398 80243228 4407A000 */  mfc1      $a3, $f20
-/* 85539C 8024322C 0000282D */  daddu     $a1, $zero, $zero
-/* 8553A0 80243230 0C05267B */  jal       sfx_adjust_env_sound_pos
-/* 8553A4 80243234 E7B80010 */   swc1     $f24, 0x10($sp)
-.L80243238:
-/* 8553A8 80243238 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8553AC 8024323C D7B80030 */  ldc1      $f24, 0x30($sp)
-/* 8553B0 80243240 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* 8553B4 80243244 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 8553B8 80243248 24020002 */  addiu     $v0, $zero, 2
-/* 8553BC 8024324C 03E00008 */  jr        $ra
-/* 8553C0 80243250 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243254_8553C4.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243254_8553C4.s
deleted file mode 100644
index 083d86b08b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243254_8553C4.s
+++ /dev/null
@@ -1,71 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243254_8553C4
-/* 8553C4 80243254 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* 8553C8 80243258 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8553CC 8024325C 0080882D */  daddu     $s1, $a0, $zero
-/* 8553D0 80243260 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 8553D4 80243264 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 8553D8 80243268 AFB20018 */  sw        $s2, 0x18($sp)
-/* 8553DC 8024326C AFB00010 */  sw        $s0, 0x10($sp)
-/* 8553E0 80243270 F7B80038 */  sdc1      $f24, 0x38($sp)
-/* 8553E4 80243274 F7B60030 */  sdc1      $f22, 0x30($sp)
-/* 8553E8 80243278 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* 8553EC 8024327C 8E30000C */  lw        $s0, 0xc($s1)
-/* 8553F0 80243280 8E050000 */  lw        $a1, ($s0)
-/* 8553F4 80243284 0C0B1EAF */  jal       evt_get_variable
-/* 8553F8 80243288 26100004 */   addiu    $s0, $s0, 4
-/* 8553FC 8024328C 0220202D */  daddu     $a0, $s1, $zero
-/* 855400 80243290 8E120000 */  lw        $s2, ($s0)
-/* 855404 80243294 8E130004 */  lw        $s3, 4($s0)
-/* 855408 80243298 0C0B36B0 */  jal       resolve_npc
-/* 85540C 8024329C 0040282D */   daddu    $a1, $v0, $zero
-/* 855410 802432A0 3C108011 */  lui       $s0, %hi(gPlayerStatus)
-/* 855414 802432A4 2610EFC8 */  addiu     $s0, $s0, %lo(gPlayerStatus)
-/* 855418 802432A8 50400022 */  beql      $v0, $zero, .L80243334
-/* 85541C 802432AC 24020002 */   addiu    $v0, $zero, 2
-/* 855420 802432B0 C60C0028 */  lwc1      $f12, 0x28($s0)
-/* 855424 802432B4 8C460038 */  lw        $a2, 0x38($v0)
-/* 855428 802432B8 C60E0030 */  lwc1      $f14, 0x30($s0)
-/* 85542C 802432BC 0C00A720 */  jal       atan2
-/* 855430 802432C0 8C470040 */   lw       $a3, 0x40($v0)
-/* 855434 802432C4 0C00A6C9 */  jal       clamp_angle
-/* 855438 802432C8 46000306 */   mov.s    $f12, $f0
-/* 85543C 802432CC 46000506 */  mov.s     $f20, $f0
-/* 855440 802432D0 3C014220 */  lui       $at, 0x4220
-/* 855444 802432D4 4481C000 */  mtc1      $at, $f24
-/* 855448 802432D8 0C00A8BB */  jal       sin_deg
-/* 85544C 802432DC 4600A306 */   mov.s    $f12, $f20
-/* 855450 802432E0 46180002 */  mul.s     $f0, $f0, $f24
-/* 855454 802432E4 00000000 */  nop
-/* 855458 802432E8 C6160028 */  lwc1      $f22, 0x28($s0)
-/* 85545C 802432EC 4600B580 */  add.s     $f22, $f22, $f0
-/* 855460 802432F0 0C00A8D4 */  jal       cos_deg
-/* 855464 802432F4 4600A306 */   mov.s    $f12, $f20
-/* 855468 802432F8 46180002 */  mul.s     $f0, $f0, $f24
-/* 85546C 802432FC 00000000 */  nop
-/* 855470 80243300 0220202D */  daddu     $a0, $s1, $zero
-/* 855474 80243304 0240282D */  daddu     $a1, $s2, $zero
-/* 855478 80243308 C6140030 */  lwc1      $f20, 0x30($s0)
-/* 85547C 8024330C 4600B08D */  trunc.w.s $f2, $f22
-/* 855480 80243310 44061000 */  mfc1      $a2, $f2
-/* 855484 80243314 0C0B2026 */  jal       evt_set_variable
-/* 855488 80243318 4600A501 */   sub.s    $f20, $f20, $f0
-/* 85548C 8024331C 0220202D */  daddu     $a0, $s1, $zero
-/* 855490 80243320 4600A08D */  trunc.w.s $f2, $f20
-/* 855494 80243324 44061000 */  mfc1      $a2, $f2
-/* 855498 80243328 0C0B2026 */  jal       evt_set_variable
-/* 85549C 8024332C 0260282D */   daddu    $a1, $s3, $zero
-/* 8554A0 80243330 24020002 */  addiu     $v0, $zero, 2
-.L80243334:
-/* 8554A4 80243334 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 8554A8 80243338 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 8554AC 8024333C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 8554B0 80243340 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8554B4 80243344 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8554B8 80243348 D7B80038 */  ldc1      $f24, 0x38($sp)
-/* 8554BC 8024334C D7B60030 */  ldc1      $f22, 0x30($sp)
-/* 8554C0 80243350 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* 8554C4 80243354 03E00008 */  jr        $ra
-/* 8554C8 80243358 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024335C_8554CC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024335C_8554CC.s
deleted file mode 100644
index 519cfb73a8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024335C_8554CC.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024335C_8554CC
-/* 8554CC 8024335C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8554D0 80243360 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8554D4 80243364 0C052B50 */  jal       func_8014AD40
-/* 8554D8 80243368 00000000 */   nop
-/* 8554DC 8024336C 2C420001 */  sltiu     $v0, $v0, 1
-/* 8554E0 80243370 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8554E4 80243374 00021040 */  sll       $v0, $v0, 1
-/* 8554E8 80243378 03E00008 */  jr        $ra
-/* 8554EC 8024337C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243380_8554F0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243380_8554F0.s
deleted file mode 100644
index 9485ec9805..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243380_8554F0.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel filemenu_update_show_name_input_8554F0
-/* 8554F0 80243380 3C038011 */  lui       $v1, %hi(gPlayerData)
-/* 8554F4 80243384 2463F290 */  addiu     $v1, $v1, %lo(gPlayerData)
-/* 8554F8 80243388 8C6202BC */  lw        $v0, 0x2bc($v1)
-/* 8554FC 8024338C 8C630324 */  lw        $v1, 0x324($v1)
-/* 855500 80243390 00431023 */  subu      $v0, $v0, $v1
-/* 855504 80243394 3C0391A2 */  lui       $v1, 0x91a2
-/* 855508 80243398 3463B3C5 */  ori       $v1, $v1, 0xb3c5
-/* 85550C 8024339C 00430019 */  multu     $v0, $v1
-/* 855510 802433A0 8C830084 */  lw        $v1, 0x84($a0)
-/* 855514 802433A4 00002810 */  mfhi      $a1
-/* 855518 802433A8 000512C2 */  srl       $v0, $a1, 0xb
-/* 85551C 802433AC 0043102A */  slt       $v0, $v0, $v1
-/* 855520 802433B0 AC820084 */  sw        $v0, 0x84($a0)
-/* 855524 802433B4 03E00008 */  jr        $ra
-/* 855528 802433B8 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802433BC_85552C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802433BC_85552C.s
deleted file mode 100644
index 9dbd83b674..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802433BC_85552C.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802433BC_85552C
-/* 85552C 802433BC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 855530 802433C0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 855534 802433C4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 855538 802433C8 0C039D7B */  jal       get_item_count
-/* 85553C 802433CC 0080802D */   daddu    $s0, $a0, $zero
-/* 855540 802433D0 AE020084 */  sw        $v0, 0x84($s0)
-/* 855544 802433D4 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 855548 802433D8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 85554C 802433DC 24020002 */  addiu     $v0, $zero, 2
-/* 855550 802433E0 03E00008 */  jr        $ra
-/* 855554 802433E4 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 855558 802433E8 00000000 */  nop
-/* 85555C 802433EC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_mac/machi/7E7850/func_802404B0_7E7850.s b/ver/us/asm/nonmatchings/world/area_mac/machi/7E7850/func_802404B0_7E7850.s
deleted file mode 100644
index 070543dcd3..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/machi/7E7850/func_802404B0_7E7850.s
+++ /dev/null
@@ -1,136 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_80243960_7EAD00
-.double 1.05, 0.0
-
-.section .text
-
-glabel func_802404B0_7E7850
-/* 7E7850 802404B0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7E7854 802404B4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E7858 802404B8 0080882D */  daddu     $s1, $a0, $zero
-/* 7E785C 802404BC AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E7860 802404C0 00A0802D */  daddu     $s0, $a1, $zero
-/* 7E7864 802404C4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 7E7868 802404C8 0C00EABB */  jal       get_npc_unsafe
-/* 7E786C 802404CC 24040037 */   addiu    $a0, $zero, 0x37
-/* 7E7870 802404D0 12000002 */  beqz      $s0, .L802404DC
-/* 7E7874 802404D4 0040202D */   daddu    $a0, $v0, $zero
-/* 7E7878 802404D8 AE200070 */  sw        $zero, 0x70($s1)
-.L802404DC:
-/* 7E787C 802404DC 8E230070 */  lw        $v1, 0x70($s1)
-/* 7E7880 802404E0 10600005 */  beqz      $v1, .L802404F8
-/* 7E7884 802404E4 24020001 */   addiu    $v0, $zero, 1
-/* 7E7888 802404E8 1062003C */  beq       $v1, $v0, .L802405DC
-/* 7E788C 802404EC 0000102D */   daddu    $v0, $zero, $zero
-/* 7E7890 802404F0 0809019E */  j         .L80240678
-/* 7E7894 802404F4 00000000 */   nop
-.L802404F8:
-/* 7E7898 802404F8 C4800038 */  lwc1      $f0, 0x38($a0)
-/* 7E789C 802404FC 3C0143FA */  lui       $at, 0x43fa
-/* 7E78A0 80240500 44814000 */  mtc1      $at, $f8
-/* 7E78A4 80240504 00000000 */  nop
-/* 7E78A8 80240508 46080000 */  add.s     $f0, $f0, $f8
-/* 7E78AC 8024050C C482003C */  lwc1      $f2, 0x3c($a0)
-/* 7E78B0 80240510 E4800060 */  swc1      $f0, 0x60($a0)
-/* 7E78B4 80240514 3C0142F0 */  lui       $at, 0x42f0
-/* 7E78B8 80240518 44810000 */  mtc1      $at, $f0
-/* 7E78BC 8024051C C4860038 */  lwc1      $f6, 0x38($a0)
-/* 7E78C0 80240520 46001080 */  add.s     $f2, $f2, $f0
-/* 7E78C4 80240524 C4800040 */  lwc1      $f0, 0x40($a0)
-/* 7E78C8 80240528 24020014 */  addiu     $v0, $zero, 0x14
-/* 7E78CC 8024052C A482008E */  sh        $v0, 0x8e($a0)
-/* 7E78D0 80240530 46080001 */  sub.s     $f0, $f0, $f8
-/* 7E78D4 80240534 C4840060 */  lwc1      $f4, 0x60($a0)
-/* 7E78D8 80240538 8483008E */  lh        $v1, 0x8e($a0)
-/* 7E78DC 8024053C 46062101 */  sub.s     $f4, $f4, $f6
-/* 7E78E0 80240540 E4800068 */  swc1      $f0, 0x68($a0)
-/* 7E78E4 80240544 C480003C */  lwc1      $f0, 0x3c($a0)
-/* 7E78E8 80240548 24020064 */  addiu     $v0, $zero, 0x64
-/* 7E78EC 8024054C E4820064 */  swc1      $f2, 0x64($a0)
-/* 7E78F0 80240550 46001081 */  sub.s     $f2, $f2, $f0
-/* 7E78F4 80240554 3C0141A0 */  lui       $at, 0x41a0
-/* 7E78F8 80240558 44813000 */  mtc1      $at, $f6
-/* 7E78FC 8024055C 44830000 */  mtc1      $v1, $f0
-/* 7E7900 80240560 00000000 */  nop
-/* 7E7904 80240564 46800020 */  cvt.s.w   $f0, $f0
-/* 7E7908 80240568 46001083 */  div.s     $f2, $f2, $f0
-/* 7E790C 8024056C C4800068 */  lwc1      $f0, 0x68($a0)
-/* 7E7910 80240570 0060282D */  daddu     $a1, $v1, $zero
-/* 7E7914 80240574 A482008E */  sh        $v0, 0x8e($a0)
-/* 7E7918 80240578 E4820064 */  swc1      $f2, 0x64($a0)
-/* 7E791C 8024057C C4820040 */  lwc1      $f2, 0x40($a0)
-/* 7E7920 80240580 46062103 */  div.s     $f4, $f4, $f6
-/* 7E7924 80240584 E4840060 */  swc1      $f4, 0x60($a0)
-/* 7E7928 80240588 46020001 */  sub.s     $f0, $f0, $f2
-/* 7E792C 8024058C 46002086 */  mov.s     $f2, $f4
-/* 7E7930 80240590 3C014120 */  lui       $at, 0x4120
-/* 7E7934 80240594 44812000 */  mtc1      $at, $f4
-/* 7E7938 80240598 44853000 */  mtc1      $a1, $f6
-/* 7E793C 8024059C 00000000 */  nop
-/* 7E7940 802405A0 468031A0 */  cvt.s.w   $f6, $f6
-/* 7E7944 802405A4 46041083 */  div.s     $f2, $f2, $f4
-/* 7E7948 802405A8 E4820060 */  swc1      $f2, 0x60($a0)
-/* 7E794C 802405AC 46060003 */  div.s     $f0, $f0, $f6
-/* 7E7950 802405B0 E4800068 */  swc1      $f0, 0x68($a0)
-/* 7E7954 802405B4 C4800064 */  lwc1      $f0, 0x64($a0)
-/* 7E7958 802405B8 C4820068 */  lwc1      $f2, 0x68($a0)
-/* 7E795C 802405BC 46040003 */  div.s     $f0, $f0, $f4
-/* 7E7960 802405C0 46041083 */  div.s     $f2, $f2, $f4
-/* 7E7964 802405C4 E4800064 */  swc1      $f0, 0x64($a0)
-/* 7E7968 802405C8 0C00EB49 */  jal       enable_npc_blur
-/* 7E796C 802405CC E4820068 */   swc1     $f2, 0x68($a0)
-/* 7E7970 802405D0 24020001 */  addiu     $v0, $zero, 1
-/* 7E7974 802405D4 0809019D */  j         .L80240674
-/* 7E7978 802405D8 AE220070 */   sw       $v0, 0x70($s1)
-.L802405DC:
-/* 7E797C 802405DC C4840060 */  lwc1      $f4, 0x60($a0)
-/* 7E7980 802405E0 3C018024 */  lui       $at, %hi(D_80243960_7EAD00)
-/* 7E7984 802405E4 D42A3960 */  ldc1      $f10, %lo(D_80243960_7EAD00)($at)
-/* 7E7988 802405E8 46002121 */  cvt.d.s   $f4, $f4
-/* 7E798C 802405EC 462A2102 */  mul.d     $f4, $f4, $f10
-/* 7E7990 802405F0 00000000 */  nop
-/* 7E7994 802405F4 C4820064 */  lwc1      $f2, 0x64($a0)
-/* 7E7998 802405F8 460010A1 */  cvt.d.s   $f2, $f2
-/* 7E799C 802405FC 462A1082 */  mul.d     $f2, $f2, $f10
-/* 7E79A0 80240600 00000000 */  nop
-/* 7E79A4 80240604 24020001 */  addiu     $v0, $zero, 1
-/* 7E79A8 80240608 C48E0038 */  lwc1      $f14, 0x38($a0)
-/* 7E79AC 8024060C C4800060 */  lwc1      $f0, 0x60($a0)
-/* 7E79B0 80240610 C48C003C */  lwc1      $f12, 0x3c($a0)
-/* 7E79B4 80240614 9483008E */  lhu       $v1, 0x8e($a0)
-/* 7E79B8 80240618 C4880040 */  lwc1      $f8, 0x40($a0)
-/* 7E79BC 8024061C C4860068 */  lwc1      $f6, 0x68($a0)
-/* 7E79C0 80240620 46007380 */  add.s     $f14, $f14, $f0
-/* 7E79C4 80240624 2463FFFF */  addiu     $v1, $v1, -1
-/* 7E79C8 80240628 C4800064 */  lwc1      $f0, 0x64($a0)
-/* 7E79CC 8024062C 46064200 */  add.s     $f8, $f8, $f6
-/* 7E79D0 80240630 A483008E */  sh        $v1, 0x8e($a0)
-/* 7E79D4 80240634 00031C00 */  sll       $v1, $v1, 0x10
-/* 7E79D8 80240638 46006300 */  add.s     $f12, $f12, $f0
-/* 7E79DC 8024063C 46003006 */  mov.s     $f0, $f6
-/* 7E79E0 80240640 46000021 */  cvt.d.s   $f0, $f0
-/* 7E79E4 80240644 462A0002 */  mul.d     $f0, $f0, $f10
-/* 7E79E8 80240648 00000000 */  nop
-/* 7E79EC 8024064C E48E0038 */  swc1      $f14, 0x38($a0)
-/* 7E79F0 80240650 E4880040 */  swc1      $f8, 0x40($a0)
-/* 7E79F4 80240654 E48C003C */  swc1      $f12, 0x3c($a0)
-/* 7E79F8 80240658 46202120 */  cvt.s.d   $f4, $f4
-/* 7E79FC 8024065C 462010A0 */  cvt.s.d   $f2, $f2
-/* 7E7A00 80240660 E4840060 */  swc1      $f4, 0x60($a0)
-/* 7E7A04 80240664 E4820064 */  swc1      $f2, 0x64($a0)
-/* 7E7A08 80240668 46200020 */  cvt.s.d   $f0, $f0
-/* 7E7A0C 8024066C 10600002 */  beqz      $v1, .L80240678
-/* 7E7A10 80240670 E4800068 */   swc1     $f0, 0x68($a0)
-.L80240674:
-/* 7E7A14 80240674 0000102D */  daddu     $v0, $zero, $zero
-.L80240678:
-/* 7E7A18 80240678 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 7E7A1C 8024067C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E7A20 80240680 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E7A24 80240684 03E00008 */  jr        $ra
-/* 7E7A28 80240688 27BD0020 */   addiu    $sp, $sp, 0x20
-/* 7E7A2C 8024068C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0_9DA8F0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0_9DA8F0.s
deleted file mode 100644
index 0ede7ddf23..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0_9DA8F0.s
+++ /dev/null
@@ -1,70 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802438D0_9DA8F0
-/* 9DA8F0 802438D0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 9DA8F4 802438D4 3C048025 */  lui       $a0, %hi(D_802523B4_9E93D4)
-/* 9DA8F8 802438D8 248423B4 */  addiu     $a0, $a0, %lo(D_802523B4_9E93D4)
-/* 9DA8FC 802438DC AFBF0018 */  sw        $ra, 0x18($sp)
-/* 9DA900 802438E0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 9DA904 802438E4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9DA908 802438E8 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 9DA90C 802438EC 8C830000 */  lw        $v1, ($a0)
-/* 9DA910 802438F0 3C118011 */  lui       $s1, %hi(gPlayerStatus)
-/* 9DA914 802438F4 2631EFC8 */  addiu     $s1, $s1, %lo(gPlayerStatus)
-/* 9DA918 802438F8 28620003 */  slti      $v0, $v1, 3
-/* 9DA91C 802438FC 50400007 */  beql      $v0, $zero, .L8024391C
-/* 9DA920 80243900 24020003 */   addiu    $v0, $zero, 3
-/* 9DA924 80243904 1C60000C */  bgtz      $v1, .L80243938
-/* 9DA928 80243908 24620001 */   addiu    $v0, $v1, 1
-/* 9DA92C 8024390C 10600007 */  beqz      $v1, .L8024392C
-/* 9DA930 80243910 0000102D */   daddu    $v0, $zero, $zero
-/* 9DA934 80243914 08090E6A */  j         .L802439A8
-/* 9DA938 80243918 00000000 */   nop
-.L8024391C:
-/* 9DA93C 8024391C 10620008 */  beq       $v1, $v0, .L80243940
-/* 9DA940 80243920 0000102D */   daddu    $v0, $zero, $zero
-/* 9DA944 80243924 08090E6A */  j         .L802439A8
-/* 9DA948 80243928 00000000 */   nop
-.L8024392C:
-/* 9DA94C 8024392C 24020001 */  addiu     $v0, $zero, 1
-/* 9DA950 80243930 08090E69 */  j         .L802439A4
-/* 9DA954 80243934 AC820000 */   sw       $v0, ($a0)
-.L80243938:
-/* 9DA958 80243938 08090E69 */  j         .L802439A4
-/* 9DA95C 8024393C AC820000 */   sw       $v0, ($a0)
-.L80243940:
-/* 9DA960 80243940 3C108011 */  lui       $s0, %hi(wPartnerNpc)
-/* 9DA964 80243944 2610C930 */  addiu     $s0, $s0, %lo(wPartnerNpc)
-/* 9DA968 80243948 0C03BD17 */  jal       partner_clear_player_tracking
-/* 9DA96C 8024394C 8E040000 */   lw       $a0, ($s0)
-/* 9DA970 80243950 C6200028 */  lwc1      $f0, 0x28($s1)
-/* 9DA974 80243954 C6220030 */  lwc1      $f2, 0x30($s1)
-/* 9DA978 80243958 4600010D */  trunc.w.s $f4, $f0
-/* 9DA97C 8024395C 44042000 */  mfc1      $a0, $f4
-/* 9DA980 80243960 4600110D */  trunc.w.s $f4, $f2
-/* 9DA984 80243964 44052000 */  mfc1      $a1, $f4
-/* 9DA988 80243968 0C03BCF0 */  jal       partner_set_goal_pos
-/* 9DA98C 8024396C 00000000 */   nop
-/* 9DA990 80243970 0C03BCF5 */  jal       func_800EF3D4
-/* 9DA994 80243974 0000202D */   daddu    $a0, $zero, $zero
-/* 9DA998 80243978 3C0142B4 */  lui       $at, 0x42b4
-/* 9DA99C 8024397C 4481A000 */  mtc1      $at, $f20
-/* 9DA9A0 80243980 8E040000 */  lw        $a0, ($s0)
-/* 9DA9A4 80243984 4405A000 */  mfc1      $a1, $f20
-/* 9DA9A8 80243988 0C00ECD0 */  jal       set_npc_yaw
-/* 9DA9AC 8024398C 00000000 */   nop
-/* 9DA9B0 80243990 24020002 */  addiu     $v0, $zero, 2
-/* 9DA9B4 80243994 E6340080 */  swc1      $f20, 0x80($s1)
-/* 9DA9B8 80243998 E6340084 */  swc1      $f20, 0x84($s1)
-/* 9DA9BC 8024399C 08090E6A */  j         .L802439A8
-/* 9DA9C0 802439A0 AE2000A8 */   sw       $zero, 0xa8($s1)
-.L802439A4:
-/* 9DA9C4 802439A4 0000102D */  daddu     $v0, $zero, $zero
-.L802439A8:
-/* 9DA9C8 802439A8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 9DA9CC 802439AC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9DA9D0 802439B0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9DA9D4 802439B4 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 9DA9D8 802439B8 03E00008 */  jr        $ra
-/* 9DA9DC 802439BC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243EC8_9DAEE8.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243EC8_9DAEE8.s
deleted file mode 100644
index 916809daa4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243EC8_9DAEE8.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243EC8_9DAEE8
-/* 9DAEE8 80243EC8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9DAEEC 80243ECC AFB00010 */  sw        $s0, 0x10($sp)
-/* 9DAEF0 80243ED0 0080802D */  daddu     $s0, $a0, $zero
-/* 9DAEF4 80243ED4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 9DAEF8 80243ED8 8E02000C */  lw        $v0, 0xc($s0)
-/* 9DAEFC 80243EDC 0C0B1EAF */  jal       evt_get_variable
-/* 9DAF00 80243EE0 8C450000 */   lw       $a1, ($v0)
-/* 9DAF04 80243EE4 30420003 */  andi      $v0, $v0, 3
-/* 9DAF08 80243EE8 10400003 */  beqz      $v0, .L80243EF8
-/* 9DAF0C 80243EEC 24020001 */   addiu    $v0, $zero, 1
-/* 9DAF10 80243EF0 08090FBF */  j         .L80243EFC
-/* 9DAF14 80243EF4 AE000084 */   sw       $zero, 0x84($s0)
-.L80243EF8:
-/* 9DAF18 80243EF8 AE020084 */  sw        $v0, 0x84($s0)
-.L80243EFC:
-/* 9DAF1C 80243EFC 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 9DAF20 80243F00 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9DAF24 80243F04 24020002 */  addiu     $v0, $zero, 2
-/* 9DAF28 80243F08 03E00008 */  jr        $ra
-/* 9DAF2C 80243F0C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241EE0_9FC6D0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241EE0_9FC6D0.s
deleted file mode 100644
index 7530129954..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241EE0_9FC6D0.s
+++ /dev/null
@@ -1,70 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241EE0_9FC6D0
-/* 9FC6D0 80241EE0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 9FC6D4 80241EE4 3C048024 */  lui       $a0, %hi(D_802459CC_A001BC)
-/* 9FC6D8 80241EE8 248459CC */  addiu     $a0, $a0, %lo(D_802459CC_A001BC)
-/* 9FC6DC 80241EEC AFBF0018 */  sw        $ra, 0x18($sp)
-/* 9FC6E0 80241EF0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 9FC6E4 80241EF4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9FC6E8 80241EF8 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 9FC6EC 80241EFC 8C830000 */  lw        $v1, ($a0)
-/* 9FC6F0 80241F00 3C118011 */  lui       $s1, %hi(gPlayerStatus)
-/* 9FC6F4 80241F04 2631EFC8 */  addiu     $s1, $s1, %lo(gPlayerStatus)
-/* 9FC6F8 80241F08 28620003 */  slti      $v0, $v1, 3
-/* 9FC6FC 80241F0C 50400007 */  beql      $v0, $zero, .L80241F2C
-/* 9FC700 80241F10 24020003 */   addiu    $v0, $zero, 3
-/* 9FC704 80241F14 1C60000C */  bgtz      $v1, .L80241F48
-/* 9FC708 80241F18 24620001 */   addiu    $v0, $v1, 1
-/* 9FC70C 80241F1C 10600007 */  beqz      $v1, .L80241F3C
-/* 9FC710 80241F20 0000102D */   daddu    $v0, $zero, $zero
-/* 9FC714 80241F24 080907EE */  j         .L80241FB8
-/* 9FC718 80241F28 00000000 */   nop
-.L80241F2C:
-/* 9FC71C 80241F2C 10620008 */  beq       $v1, $v0, .L80241F50
-/* 9FC720 80241F30 0000102D */   daddu    $v0, $zero, $zero
-/* 9FC724 80241F34 080907EE */  j         .L80241FB8
-/* 9FC728 80241F38 00000000 */   nop
-.L80241F3C:
-/* 9FC72C 80241F3C 24020001 */  addiu     $v0, $zero, 1
-/* 9FC730 80241F40 080907ED */  j         .L80241FB4
-/* 9FC734 80241F44 AC820000 */   sw       $v0, ($a0)
-.L80241F48:
-/* 9FC738 80241F48 080907ED */  j         .L80241FB4
-/* 9FC73C 80241F4C AC820000 */   sw       $v0, ($a0)
-.L80241F50:
-/* 9FC740 80241F50 3C108011 */  lui       $s0, %hi(wPartnerNpc)
-/* 9FC744 80241F54 2610C930 */  addiu     $s0, $s0, %lo(wPartnerNpc)
-/* 9FC748 80241F58 0C03BD17 */  jal       partner_clear_player_tracking
-/* 9FC74C 80241F5C 8E040000 */   lw       $a0, ($s0)
-/* 9FC750 80241F60 C6200028 */  lwc1      $f0, 0x28($s1)
-/* 9FC754 80241F64 C6220030 */  lwc1      $f2, 0x30($s1)
-/* 9FC758 80241F68 4600010D */  trunc.w.s $f4, $f0
-/* 9FC75C 80241F6C 44042000 */  mfc1      $a0, $f4
-/* 9FC760 80241F70 4600110D */  trunc.w.s $f4, $f2
-/* 9FC764 80241F74 44052000 */  mfc1      $a1, $f4
-/* 9FC768 80241F78 0C03BCF0 */  jal       partner_set_goal_pos
-/* 9FC76C 80241F7C 00000000 */   nop
-/* 9FC770 80241F80 0C03BCF5 */  jal       func_800EF3D4
-/* 9FC774 80241F84 0000202D */   daddu    $a0, $zero, $zero
-/* 9FC778 80241F88 3C0142B4 */  lui       $at, 0x42b4
-/* 9FC77C 80241F8C 4481A000 */  mtc1      $at, $f20
-/* 9FC780 80241F90 8E040000 */  lw        $a0, ($s0)
-/* 9FC784 80241F94 4405A000 */  mfc1      $a1, $f20
-/* 9FC788 80241F98 0C00ECD0 */  jal       set_npc_yaw
-/* 9FC78C 80241F9C 00000000 */   nop
-/* 9FC790 80241FA0 24020002 */  addiu     $v0, $zero, 2
-/* 9FC794 80241FA4 E6340080 */  swc1      $f20, 0x80($s1)
-/* 9FC798 80241FA8 E6340084 */  swc1      $f20, 0x84($s1)
-/* 9FC79C 80241FAC 080907EE */  j         .L80241FB8
-/* 9FC7A0 80241FB0 AE2000A8 */   sw       $zero, 0xa8($s1)
-.L80241FB4:
-/* 9FC7A4 80241FB4 0000102D */  daddu     $v0, $zero, $zero
-.L80241FB8:
-/* 9FC7A8 80241FB8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 9FC7AC 80241FBC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9FC7B0 80241FC0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9FC7B4 80241FC4 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 9FC7B8 80241FC8 03E00008 */  jr        $ra
-/* 9FC7BC 80241FCC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0_9FC7C0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0_9FC7C0.s
deleted file mode 100644
index aa6a081f95..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0_9FC7C0.s
+++ /dev/null
@@ -1,70 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241FD0_9FC7C0
-/* 9FC7C0 80241FD0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 9FC7C4 80241FD4 3C048024 */  lui       $a0, %hi(D_80245A14_A00204)
-/* 9FC7C8 80241FD8 24845A14 */  addiu     $a0, $a0, %lo(D_80245A14_A00204)
-/* 9FC7CC 80241FDC AFBF0018 */  sw        $ra, 0x18($sp)
-/* 9FC7D0 80241FE0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 9FC7D4 80241FE4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9FC7D8 80241FE8 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 9FC7DC 80241FEC 8C830000 */  lw        $v1, ($a0)
-/* 9FC7E0 80241FF0 3C118011 */  lui       $s1, %hi(gPlayerStatus)
-/* 9FC7E4 80241FF4 2631EFC8 */  addiu     $s1, $s1, %lo(gPlayerStatus)
-/* 9FC7E8 80241FF8 28620003 */  slti      $v0, $v1, 3
-/* 9FC7EC 80241FFC 50400007 */  beql      $v0, $zero, .L8024201C
-/* 9FC7F0 80242000 24020003 */   addiu    $v0, $zero, 3
-/* 9FC7F4 80242004 1C60000C */  bgtz      $v1, .L80242038
-/* 9FC7F8 80242008 24620001 */   addiu    $v0, $v1, 1
-/* 9FC7FC 8024200C 10600007 */  beqz      $v1, .L8024202C
-/* 9FC800 80242010 0000102D */   daddu    $v0, $zero, $zero
-/* 9FC804 80242014 0809082A */  j         .L802420A8
-/* 9FC808 80242018 00000000 */   nop
-.L8024201C:
-/* 9FC80C 8024201C 10620008 */  beq       $v1, $v0, .L80242040
-/* 9FC810 80242020 0000102D */   daddu    $v0, $zero, $zero
-/* 9FC814 80242024 0809082A */  j         .L802420A8
-/* 9FC818 80242028 00000000 */   nop
-.L8024202C:
-/* 9FC81C 8024202C 24020001 */  addiu     $v0, $zero, 1
-/* 9FC820 80242030 08090829 */  j         .L802420A4
-/* 9FC824 80242034 AC820000 */   sw       $v0, ($a0)
-.L80242038:
-/* 9FC828 80242038 08090829 */  j         .L802420A4
-/* 9FC82C 8024203C AC820000 */   sw       $v0, ($a0)
-.L80242040:
-/* 9FC830 80242040 3C108011 */  lui       $s0, %hi(wPartnerNpc)
-/* 9FC834 80242044 2610C930 */  addiu     $s0, $s0, %lo(wPartnerNpc)
-/* 9FC838 80242048 0C03BD17 */  jal       partner_clear_player_tracking
-/* 9FC83C 8024204C 8E040000 */   lw       $a0, ($s0)
-/* 9FC840 80242050 C6200028 */  lwc1      $f0, 0x28($s1)
-/* 9FC844 80242054 C6220030 */  lwc1      $f2, 0x30($s1)
-/* 9FC848 80242058 4600010D */  trunc.w.s $f4, $f0
-/* 9FC84C 8024205C 44042000 */  mfc1      $a0, $f4
-/* 9FC850 80242060 4600110D */  trunc.w.s $f4, $f2
-/* 9FC854 80242064 44052000 */  mfc1      $a1, $f4
-/* 9FC858 80242068 0C03BCF0 */  jal       partner_set_goal_pos
-/* 9FC85C 8024206C 00000000 */   nop
-/* 9FC860 80242070 0C03BCF5 */  jal       func_800EF3D4
-/* 9FC864 80242074 0000202D */   daddu    $a0, $zero, $zero
-/* 9FC868 80242078 3C0142B4 */  lui       $at, 0x42b4
-/* 9FC86C 8024207C 4481A000 */  mtc1      $at, $f20
-/* 9FC870 80242080 8E040000 */  lw        $a0, ($s0)
-/* 9FC874 80242084 4405A000 */  mfc1      $a1, $f20
-/* 9FC878 80242088 0C00ECD0 */  jal       set_npc_yaw
-/* 9FC87C 8024208C 00000000 */   nop
-/* 9FC880 80242090 24020002 */  addiu     $v0, $zero, 2
-/* 9FC884 80242094 E6340080 */  swc1      $f20, 0x80($s1)
-/* 9FC888 80242098 E6340084 */  swc1      $f20, 0x84($s1)
-/* 9FC88C 8024209C 0809082A */  j         .L802420A8
-/* 9FC890 802420A0 AE2000A8 */   sw       $zero, 0xa8($s1)
-.L802420A4:
-/* 9FC894 802420A4 0000102D */  daddu     $v0, $zero, $zero
-.L802420A8:
-/* 9FC898 802420A8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 9FC89C 802420AC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9FC8A0 802420B0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9FC8A4 802420B4 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 9FC8A8 802420B8 03E00008 */  jr        $ra
-/* 9FC8AC 802420BC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240038_BBD1D8.s b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240038_BBD1D8.s
deleted file mode 100644
index 3429a35aca..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240038_BBD1D8.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240038_BBD1D8
-/* BBD1D8 80240038 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* BBD1DC 8024003C AFBF0010 */  sw        $ra, 0x10($sp)
-/* BBD1E0 80240040 8C82000C */  lw        $v0, 0xc($a0)
-/* BBD1E4 80240044 0C0B210B */  jal       evt_get_float_variable
-/* BBD1E8 80240048 8C450000 */   lw       $a1, ($v0)
-/* BBD1EC 8024004C 4600008D */  trunc.w.s $f2, $f0
-/* BBD1F0 80240050 44021000 */  mfc1      $v0, $f2
-/* BBD1F4 80240054 00000000 */  nop
-/* BBD1F8 80240058 44820000 */  mtc1      $v0, $f0
-/* BBD1FC 8024005C 00000000 */  nop
-/* BBD200 80240060 46800020 */  cvt.s.w   $f0, $f0
-/* BBD204 80240064 8FBF0010 */  lw        $ra, 0x10($sp)
-/* BBD208 80240068 24020002 */  addiu     $v0, $zero, 2
-/* BBD20C 8024006C 3C01800B */  lui       $at, %hi(gCameras+0x18)
-/* BBD210 80240070 E4201D98 */  swc1      $f0, %lo(gCameras+0x18)($at)
-/* BBD214 80240074 03E00008 */  jr        $ra
-/* BBD218 80240078 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240F38_BBE0D8.s b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240F38_BBE0D8.s
deleted file mode 100644
index 0002d8762d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240F38_BBE0D8.s
+++ /dev/null
@@ -1,97 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240F38_BBE0D8
-/* BBE0D8 80240F38 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* BBE0DC 80240F3C AFB20018 */  sw        $s2, 0x18($sp)
-/* BBE0E0 80240F40 0080902D */  daddu     $s2, $a0, $zero
-/* BBE0E4 80240F44 AFBF001C */  sw        $ra, 0x1c($sp)
-/* BBE0E8 80240F48 AFB10014 */  sw        $s1, 0x14($sp)
-/* BBE0EC 80240F4C AFB00010 */  sw        $s0, 0x10($sp)
-/* BBE0F0 80240F50 8E44014C */  lw        $a0, 0x14c($s2)
-/* BBE0F4 80240F54 0C00EAD2 */  jal       get_npc_safe
-/* BBE0F8 80240F58 00A0802D */   daddu    $s0, $a1, $zero
-/* BBE0FC 80240F5C 12000002 */  beqz      $s0, .L80240F68
-/* BBE100 80240F60 0040882D */   daddu    $s1, $v0, $zero
-/* BBE104 80240F64 AE400074 */  sw        $zero, 0x74($s2)
-.L80240F68:
-/* BBE108 80240F68 8E430074 */  lw        $v1, 0x74($s2)
-/* BBE10C 80240F6C 10600005 */  beqz      $v1, .L80240F84
-/* BBE110 80240F70 24020001 */   addiu    $v0, $zero, 1
-/* BBE114 80240F74 1062002C */  beq       $v1, $v0, .L80241028
-/* BBE118 80240F78 00000000 */   nop
-/* BBE11C 80240F7C 0809041E */  j         .L80241078
-/* BBE120 80240F80 00000000 */   nop
-.L80240F84:
-/* BBE124 80240F84 0C00A67F */  jal       rand_int
-/* BBE128 80240F88 24040064 */   addiu    $a0, $zero, 0x64
-/* BBE12C 80240F8C 24040064 */  addiu     $a0, $zero, 0x64
-/* BBE130 80240F90 244200B4 */  addiu     $v0, $v0, 0xb4
-/* BBE134 80240F94 44820000 */  mtc1      $v0, $f0
-/* BBE138 80240F98 00000000 */  nop
-/* BBE13C 80240F9C 46800020 */  cvt.s.w   $f0, $f0
-/* BBE140 80240FA0 0C00A67F */  jal       rand_int
-/* BBE144 80240FA4 E6200040 */   swc1     $f0, 0x40($s1)
-/* BBE148 80240FA8 2442FF38 */  addiu     $v0, $v0, -0xc8
-/* BBE14C 80240FAC 44820000 */  mtc1      $v0, $f0
-/* BBE150 80240FB0 00000000 */  nop
-/* BBE154 80240FB4 46800020 */  cvt.s.w   $f0, $f0
-/* BBE158 80240FB8 0C00A64D */  jal       rand_float
-/* BBE15C 80240FBC E620003C */   swc1     $f0, 0x3c($s1)
-/* BBE160 80240FC0 46000000 */  add.s     $f0, $f0, $f0
-/* BBE164 80240FC4 3C014000 */  lui       $at, 0x4000
-/* BBE168 80240FC8 44811000 */  mtc1      $at, $f2
-/* BBE16C 80240FCC 00000000 */  nop
-/* BBE170 80240FD0 46020000 */  add.s     $f0, $f0, $f2
-/* BBE174 80240FD4 24040064 */  addiu     $a0, $zero, 0x64
-/* BBE178 80240FD8 0C00A67F */  jal       rand_int
-/* BBE17C 80240FDC E6200018 */   swc1     $f0, 0x18($s1)
-/* BBE180 80240FE0 28420032 */  slti      $v0, $v0, 0x32
-/* BBE184 80240FE4 10400007 */  beqz      $v0, .L80241004
-/* BBE188 80240FE8 00000000 */   nop
-/* BBE18C 80240FEC 3C014466 */  lui       $at, 0x4466
-/* BBE190 80240FF0 44810000 */  mtc1      $at, $f0
-/* BBE194 80240FF4 3C014387 */  lui       $at, 0x4387
-/* BBE198 80240FF8 44811000 */  mtc1      $at, $f2
-/* BBE19C 80240FFC 08090406 */  j         .L80241018
-/* BBE1A0 80241000 E6200038 */   swc1     $f0, 0x38($s1)
-.L80241004:
-/* BBE1A4 80241004 3C01C1A0 */  lui       $at, 0xc1a0
-/* BBE1A8 80241008 44810000 */  mtc1      $at, $f0
-/* BBE1AC 8024100C 3C0142B4 */  lui       $at, 0x42b4
-/* BBE1B0 80241010 44811000 */  mtc1      $at, $f2
-/* BBE1B4 80241014 E6200038 */  swc1      $f0, 0x38($s1)
-.L80241018:
-/* BBE1B8 80241018 E622000C */  swc1      $f2, 0xc($s1)
-/* BBE1BC 8024101C 24020001 */  addiu     $v0, $zero, 1
-/* BBE1C0 80241020 0809041E */  j         .L80241078
-/* BBE1C4 80241024 AE420074 */   sw       $v0, 0x74($s2)
-.L80241028:
-/* BBE1C8 80241028 8E250018 */  lw        $a1, 0x18($s1)
-/* BBE1CC 8024102C 8E26000C */  lw        $a2, 0xc($s1)
-/* BBE1D0 80241030 0C00EA95 */  jal       npc_move_heading
-/* BBE1D4 80241034 0220202D */   daddu    $a0, $s1, $zero
-/* BBE1D8 80241038 C6220038 */  lwc1      $f2, 0x38($s1)
-/* BBE1DC 8024103C 3C01C1F0 */  lui       $at, 0xc1f0
-/* BBE1E0 80241040 44810000 */  mtc1      $at, $f0
-/* BBE1E4 80241044 00000000 */  nop
-/* BBE1E8 80241048 4600103C */  c.lt.s    $f2, $f0
-/* BBE1EC 8024104C 00000000 */  nop
-/* BBE1F0 80241050 45030009 */  bc1tl     .L80241078
-/* BBE1F4 80241054 AE400074 */   sw       $zero, 0x74($s2)
-/* BBE1F8 80241058 3C014468 */  lui       $at, 0x4468
-/* BBE1FC 8024105C 34218000 */  ori       $at, $at, 0x8000
-/* BBE200 80241060 44810000 */  mtc1      $at, $f0
-/* BBE204 80241064 00000000 */  nop
-/* BBE208 80241068 4602003C */  c.lt.s    $f0, $f2
-/* BBE20C 8024106C 00000000 */  nop
-/* BBE210 80241070 45030001 */  bc1tl     .L80241078
-/* BBE214 80241074 AE400074 */   sw       $zero, 0x74($s2)
-.L80241078:
-/* BBE218 80241078 8FBF001C */  lw        $ra, 0x1c($sp)
-/* BBE21C 8024107C 8FB20018 */  lw        $s2, 0x18($sp)
-/* BBE220 80241080 8FB10014 */  lw        $s1, 0x14($sp)
-/* BBE224 80241084 8FB00010 */  lw        $s0, 0x10($sp)
-/* BBE228 80241088 0000102D */  daddu     $v0, $zero, $zero
-/* BBE22C 8024108C 03E00008 */  jr        $ra
-/* BBE230 80241090 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80241094_BBE234.s b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80241094_BBE234.s
deleted file mode 100644
index b68736e2e6..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80241094_BBE234.s
+++ /dev/null
@@ -1,51 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241094_BBE234
-/* BBE234 80241094 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* BBE238 80241098 AFB10014 */  sw        $s1, 0x14($sp)
-/* BBE23C 8024109C 0080882D */  daddu     $s1, $a0, $zero
-/* BBE240 802410A0 AFBF0018 */  sw        $ra, 0x18($sp)
-/* BBE244 802410A4 AFB00010 */  sw        $s0, 0x10($sp)
-/* BBE248 802410A8 8E240088 */  lw        $a0, 0x88($s1)
-/* BBE24C 802410AC 1480000B */  bnez      $a0, .L802410DC
-/* BBE250 802410B0 8E300084 */   lw       $s0, 0x84($s1)
-/* BBE254 802410B4 0C00A67F */  jal       rand_int
-/* BBE258 802410B8 24040003 */   addiu    $a0, $zero, 3
-/* BBE25C 802410BC 00021040 */  sll       $v0, $v0, 1
-/* BBE260 802410C0 3C018024 */  lui       $at, %hi(D_80244A54_BC1BF4)
-/* BBE264 802410C4 00220821 */  addu      $at, $at, $v0
-/* BBE268 802410C8 84224A54 */  lh        $v0, %lo(D_80244A54_BC1BF4)($at)
-/* BBE26C 802410CC 24040032 */  addiu     $a0, $zero, 0x32
-/* BBE270 802410D0 0C00A67F */  jal       rand_int
-/* BBE274 802410D4 AE220078 */   sw       $v0, 0x78($s1)
-/* BBE278 802410D8 2444001E */  addiu     $a0, $v0, 0x1e
-.L802410DC:
-/* BBE27C 802410DC 8E230078 */  lw        $v1, 0x78($s1)
-/* BBE280 802410E0 0203102A */  slt       $v0, $s0, $v1
-/* BBE284 802410E4 10400006 */  beqz      $v0, .L80241100
-/* BBE288 802410E8 2484FFFF */   addiu    $a0, $a0, -1
-/* BBE28C 802410EC 2610000A */  addiu     $s0, $s0, 0xa
-/* BBE290 802410F0 0070102A */  slt       $v0, $v1, $s0
-/* BBE294 802410F4 5040000A */  beql      $v0, $zero, .L80241120
-/* BBE298 802410F8 AE300084 */   sw       $s0, 0x84($s1)
-/* BBE29C 802410FC 0060802D */  daddu     $s0, $v1, $zero
-.L80241100:
-/* BBE2A0 80241100 0070102A */  slt       $v0, $v1, $s0
-/* BBE2A4 80241104 50400006 */  beql      $v0, $zero, .L80241120
-/* BBE2A8 80241108 AE300084 */   sw       $s0, 0x84($s1)
-/* BBE2AC 8024110C 2610FFF6 */  addiu     $s0, $s0, -0xa
-/* BBE2B0 80241110 0203102A */  slt       $v0, $s0, $v1
-/* BBE2B4 80241114 54400001 */  bnel      $v0, $zero, .L8024111C
-/* BBE2B8 80241118 0060802D */   daddu    $s0, $v1, $zero
-.L8024111C:
-/* BBE2BC 8024111C AE300084 */  sw        $s0, 0x84($s1)
-.L80241120:
-/* BBE2C0 80241120 AE240088 */  sw        $a0, 0x88($s1)
-/* BBE2C4 80241124 8FBF0018 */  lw        $ra, 0x18($sp)
-/* BBE2C8 80241128 8FB10014 */  lw        $s1, 0x14($sp)
-/* BBE2CC 8024112C 8FB00010 */  lw        $s0, 0x10($sp)
-/* BBE2D0 80241130 24020002 */  addiu     $v0, $zero, 2
-/* BBE2D4 80241134 03E00008 */  jr        $ra
-/* BBE2D8 80241138 27BD0020 */   addiu    $sp, $sp, 0x20
-/* BBE2DC 8024113C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_80240000_BC2A90.s b/ver/us/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_80240000_BC2A90.s
deleted file mode 100644
index 5b8c1883c4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_80240000_BC2A90.s
+++ /dev/null
@@ -1,7 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_BC2A90
-/* BC2A90 80240000 AC800074 */  sw        $zero, 0x74($a0)
-/* BC2A94 80240004 03E00008 */  jr        $ra
-/* BC2A98 80240008 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_80240194_BC2C24.s b/ver/us/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_80240194_BC2C24.s
deleted file mode 100644
index 2958dc61ba..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_80240194_BC2C24.s
+++ /dev/null
@@ -1,51 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240194_BC2C24
-/* BC2C24 80240194 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* BC2C28 80240198 AFB10014 */  sw        $s1, 0x14($sp)
-/* BC2C2C 8024019C 0080882D */  daddu     $s1, $a0, $zero
-/* BC2C30 802401A0 AFBF0018 */  sw        $ra, 0x18($sp)
-/* BC2C34 802401A4 AFB00010 */  sw        $s0, 0x10($sp)
-/* BC2C38 802401A8 8E240088 */  lw        $a0, 0x88($s1)
-/* BC2C3C 802401AC 1480000B */  bnez      $a0, .L802401DC
-/* BC2C40 802401B0 8E300084 */   lw       $s0, 0x84($s1)
-/* BC2C44 802401B4 0C00A67F */  jal       rand_int
-/* BC2C48 802401B8 24040003 */   addiu    $a0, $zero, 3
-/* BC2C4C 802401BC 00021040 */  sll       $v0, $v0, 1
-/* BC2C50 802401C0 3C018024 */  lui       $at, %hi(D_80240CBC_BC374C)
-/* BC2C54 802401C4 00220821 */  addu      $at, $at, $v0
-/* BC2C58 802401C8 84220CBC */  lh        $v0, %lo(D_80240CBC_BC374C)($at)
-/* BC2C5C 802401CC 24040032 */  addiu     $a0, $zero, 0x32
-/* BC2C60 802401D0 0C00A67F */  jal       rand_int
-/* BC2C64 802401D4 AE220078 */   sw       $v0, 0x78($s1)
-/* BC2C68 802401D8 2444001E */  addiu     $a0, $v0, 0x1e
-.L802401DC:
-/* BC2C6C 802401DC 8E230078 */  lw        $v1, 0x78($s1)
-/* BC2C70 802401E0 0203102A */  slt       $v0, $s0, $v1
-/* BC2C74 802401E4 10400006 */  beqz      $v0, .L80240200
-/* BC2C78 802401E8 2484FFFF */   addiu    $a0, $a0, -1
-/* BC2C7C 802401EC 2610000A */  addiu     $s0, $s0, 0xa
-/* BC2C80 802401F0 0070102A */  slt       $v0, $v1, $s0
-/* BC2C84 802401F4 5040000A */  beql      $v0, $zero, .L80240220
-/* BC2C88 802401F8 AE300084 */   sw       $s0, 0x84($s1)
-/* BC2C8C 802401FC 0060802D */  daddu     $s0, $v1, $zero
-.L80240200:
-/* BC2C90 80240200 0070102A */  slt       $v0, $v1, $s0
-/* BC2C94 80240204 50400006 */  beql      $v0, $zero, .L80240220
-/* BC2C98 80240208 AE300084 */   sw       $s0, 0x84($s1)
-/* BC2C9C 8024020C 2610FFF6 */  addiu     $s0, $s0, -0xa
-/* BC2CA0 80240210 0203102A */  slt       $v0, $s0, $v1
-/* BC2CA4 80240214 54400001 */  bnel      $v0, $zero, .L8024021C
-/* BC2CA8 80240218 0060802D */   daddu    $s0, $v1, $zero
-.L8024021C:
-/* BC2CAC 8024021C AE300084 */  sw        $s0, 0x84($s1)
-.L80240220:
-/* BC2CB0 80240220 AE240088 */  sw        $a0, 0x88($s1)
-/* BC2CB4 80240224 8FBF0018 */  lw        $ra, 0x18($sp)
-/* BC2CB8 80240228 8FB10014 */  lw        $s1, 0x14($sp)
-/* BC2CBC 8024022C 8FB00010 */  lw        $s0, 0x10($sp)
-/* BC2CC0 80240230 24020002 */  addiu     $v0, $zero, 2
-/* BC2CC4 80240234 03E00008 */  jr        $ra
-/* BC2CC8 80240238 27BD0020 */   addiu    $sp, $sp, 0x20
-/* BC2CCC 8024023C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_02/BC2CD0/func_80240240_BC2CD0.s b/ver/us/asm/nonmatchings/world/area_obk/obk_02/BC2CD0/func_80240240_BC2CD0.s
deleted file mode 100644
index 76ce2c9781..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_02/BC2CD0/func_80240240_BC2CD0.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240240_BC2CD0
-/* BC2CD0 80240240 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* BC2CD4 80240244 AFB00010 */  sw        $s0, 0x10($sp)
-/* BC2CD8 80240248 0080802D */  daddu     $s0, $a0, $zero
-/* BC2CDC 8024024C AFBF0014 */  sw        $ra, 0x14($sp)
-/* BC2CE0 80240250 C60C0088 */  lwc1      $f12, 0x88($s0)
-/* BC2CE4 80240254 0C00A8BB */  jal       sin_deg
-/* BC2CE8 80240258 46806320 */   cvt.s.w  $f12, $f12
-/* BC2CEC 8024025C 3C014120 */  lui       $at, 0x4120
-/* BC2CF0 80240260 44811000 */  mtc1      $at, $f2
-/* BC2CF4 80240264 00000000 */  nop
-/* BC2CF8 80240268 46020002 */  mul.s     $f0, $f0, $f2
-/* BC2CFC 8024026C 00000000 */  nop
-/* BC2D00 80240270 8E020088 */  lw        $v0, 0x88($s0)
-/* BC2D04 80240274 24420006 */  addiu     $v0, $v0, 6
-/* BC2D08 80240278 44826000 */  mtc1      $v0, $f12
-/* BC2D0C 8024027C 00000000 */  nop
-/* BC2D10 80240280 46806320 */  cvt.s.w   $f12, $f12
-/* BC2D14 80240284 4600010D */  trunc.w.s $f4, $f0
-/* BC2D18 80240288 0C00A6C9 */  jal       clamp_angle
-/* BC2D1C 8024028C E6040084 */   swc1     $f4, 0x84($s0)
-/* BC2D20 80240290 4600010D */  trunc.w.s $f4, $f0
-/* BC2D24 80240294 E6040088 */  swc1      $f4, 0x88($s0)
-/* BC2D28 80240298 8FBF0014 */  lw        $ra, 0x14($sp)
-/* BC2D2C 8024029C 8FB00010 */  lw        $s0, 0x10($sp)
-/* BC2D30 802402A0 24020002 */  addiu     $v0, $zero, 2
-/* BC2D34 802402A4 03E00008 */  jr        $ra
-/* BC2D38 802402A8 27BD0018 */   addiu    $sp, $sp, 0x18
-/* BC2D3C 802402AC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7E60/func_80240000_BC7E60.s b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7E60/func_80240000_BC7E60.s
deleted file mode 100644
index 71ce31a4e5..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7E60/func_80240000_BC7E60.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_BC7E60
-/* BC7E60 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* BC7E64 80240004 AFB00010 */  sw        $s0, 0x10($sp)
-/* BC7E68 80240008 0080802D */  daddu     $s0, $a0, $zero
-/* BC7E6C 8024000C AFBF0014 */  sw        $ra, 0x14($sp)
-/* BC7E70 80240010 0C04C3D6 */  jal       get_item_entity
-/* BC7E74 80240014 8E040084 */   lw       $a0, 0x84($s0)
-/* BC7E78 80240018 8E040084 */  lw        $a0, 0x84($s0)
-/* BC7E7C 8024001C 0040802D */  daddu     $s0, $v0, $zero
-/* BC7E80 80240020 0C04D052 */  jal       set_item_entity_flags
-/* BC7E84 80240024 3C050008 */   lui      $a1, 8
-/* BC7E88 80240028 240300FF */  addiu     $v1, $zero, 0xff
-/* BC7E8C 8024002C A203002F */  sb        $v1, 0x2f($s0)
-/* BC7E90 80240030 8FBF0014 */  lw        $ra, 0x14($sp)
-/* BC7E94 80240034 8FB00010 */  lw        $s0, 0x10($sp)
-/* BC7E98 80240038 24020002 */  addiu     $v0, $zero, 2
-/* BC7E9C 8024003C 03E00008 */  jr        $ra
-/* BC7EA0 80240040 27BD0018 */   addiu    $sp, $sp, 0x18
-/* BC7EA4 80240044 00000000 */  nop
-/* BC7EA8 80240048 00000000 */  nop
-/* BC7EAC 8024004C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240050_BC7EB0.s b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240050_BC7EB0.s
deleted file mode 100644
index ad9224c146..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240050_BC7EB0.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240050_BC7EB0
-/* BC7EB0 80240050 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* BC7EB4 80240054 AFB10014 */  sw        $s1, 0x14($sp)
-/* BC7EB8 80240058 0080882D */  daddu     $s1, $a0, $zero
-/* BC7EBC 8024005C AFBF0018 */  sw        $ra, 0x18($sp)
-/* BC7EC0 80240060 AFB00010 */  sw        $s0, 0x10($sp)
-/* BC7EC4 80240064 0C00EABB */  jal       get_npc_unsafe
-/* BC7EC8 80240068 8E24014C */   lw       $a0, 0x14c($s1)
-/* BC7ECC 8024006C 24040004 */  addiu     $a0, $zero, 4
-/* BC7ED0 80240070 0C00AB39 */  jal       heap_malloc
-/* BC7ED4 80240074 0040802D */   daddu    $s0, $v0, $zero
-/* BC7ED8 80240078 3C0142FA */  lui       $at, 0x42fa
-/* BC7EDC 8024007C 44810000 */  mtc1      $at, $f0
-/* BC7EE0 80240080 3C01C45A */  lui       $at, 0xc45a
-/* BC7EE4 80240084 3421C000 */  ori       $at, $at, 0xc000
-/* BC7EE8 80240088 44811000 */  mtc1      $at, $f2
-/* BC7EEC 8024008C 0040182D */  daddu     $v1, $v0, $zero
-/* BC7EF0 80240090 AE030020 */  sw        $v1, 0x20($s0)
-/* BC7EF4 80240094 AC600000 */  sw        $zero, ($v1)
-/* BC7EF8 80240098 2403003C */  addiu     $v1, $zero, 0x3c
-/* BC7EFC 8024009C AE00000C */  sw        $zero, 0xc($s0)
-/* BC7F00 802400A0 AE000038 */  sw        $zero, 0x38($s0)
-/* BC7F04 802400A4 AE000040 */  sw        $zero, 0x40($s0)
-/* BC7F08 802400A8 A603008E */  sh        $v1, 0x8e($s0)
-/* BC7F0C 802400AC E6000010 */  swc1      $f0, 0x10($s0)
-/* BC7F10 802400B0 E602003C */  swc1      $f2, 0x3c($s0)
-/* BC7F14 802400B4 AE200074 */  sw        $zero, 0x74($s1)
-/* BC7F18 802400B8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* BC7F1C 802400BC 8FB10014 */  lw        $s1, 0x14($sp)
-/* BC7F20 802400C0 8FB00010 */  lw        $s0, 0x10($sp)
-/* BC7F24 802400C4 24020002 */  addiu     $v0, $zero, 2
-/* BC7F28 802400C8 03E00008 */  jr        $ra
-/* BC7F2C 802400CC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802400D0_BC7F30.s b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802400D0_BC7F30.s
deleted file mode 100644
index a16bedd9ad..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802400D0_BC7F30.s
+++ /dev/null
@@ -1,57 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802400D0_BC7F30
-/* BC7F30 802400D0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* BC7F34 802400D4 AFB00020 */  sw        $s0, 0x20($sp)
-/* BC7F38 802400D8 0080802D */  daddu     $s0, $a0, $zero
-/* BC7F3C 802400DC AFBF0024 */  sw        $ra, 0x24($sp)
-/* BC7F40 802400E0 C602000C */  lwc1      $f2, 0xc($s0)
-/* BC7F44 802400E4 3C0143AA */  lui       $at, 0x43aa
-/* BC7F48 802400E8 44810000 */  mtc1      $at, $f0
-/* BC7F4C 802400EC 00000000 */  nop
-/* BC7F50 802400F0 4602003C */  c.lt.s    $f0, $f2
-/* BC7F54 802400F4 00000000 */  nop
-/* BC7F58 802400F8 45010008 */  bc1t      .L8024011C
-/* BC7F5C 802400FC 0200202D */   daddu    $a0, $s0, $zero
-/* BC7F60 80240100 3C0141A0 */  lui       $at, 0x41a0
-/* BC7F64 80240104 44810000 */  mtc1      $at, $f0
-/* BC7F68 80240108 00000000 */  nop
-/* BC7F6C 8024010C 4600103C */  c.lt.s    $f2, $f0
-/* BC7F70 80240110 00000000 */  nop
-/* BC7F74 80240114 4500000E */  bc1f      .L80240150
-/* BC7F78 80240118 24020016 */   addiu    $v0, $zero, 0x16
-.L8024011C:
-/* BC7F7C 8024011C 0000282D */  daddu     $a1, $zero, $zero
-/* BC7F80 80240120 00A0302D */  daddu     $a2, $a1, $zero
-/* BC7F84 80240124 2402000D */  addiu     $v0, $zero, 0xd
-/* BC7F88 80240128 A08200AA */  sb        $v0, 0xaa($a0)
-/* BC7F8C 8024012C A48000A2 */  sh        $zero, 0xa2($a0)
-/* BC7F90 80240130 AFA00010 */  sw        $zero, 0x10($sp)
-/* BC7F94 80240134 AFA00014 */  sw        $zero, 0x14($sp)
-/* BC7F98 80240138 948200A2 */  lhu       $v0, 0xa2($a0)
-/* BC7F9C 8024013C 00A0382D */  daddu     $a3, $a1, $zero
-/* BC7FA0 80240140 0C00F589 */  jal       func_8003D624
-/* BC7FA4 80240144 AFA20018 */   sw       $v0, 0x18($sp)
-/* BC7FA8 80240148 08090062 */  j         .L80240188
-/* BC7FAC 8024014C 00000000 */   nop
-.L80240150:
-/* BC7FB0 80240150 A20200AA */  sb        $v0, 0xaa($s0)
-/* BC7FB4 80240154 3C02800F */  lui       $v0, %hi(gPlayerStatusPtr)
-/* BC7FB8 80240158 8C427B30 */  lw        $v0, %lo(gPlayerStatusPtr)($v0)
-/* BC7FBC 8024015C 0200202D */  daddu     $a0, $s0, $zero
-/* BC7FC0 80240160 9046000E */  lbu       $a2, 0xe($v0)
-/* BC7FC4 80240164 24050007 */  addiu     $a1, $zero, 7
-/* BC7FC8 80240168 AFA00010 */  sw        $zero, 0x10($sp)
-/* BC7FCC 8024016C AFA00014 */  sw        $zero, 0x14($sp)
-/* BC7FD0 80240170 960200A2 */  lhu       $v0, 0xa2($s0)
-/* BC7FD4 80240174 240700FF */  addiu     $a3, $zero, 0xff
-/* BC7FD8 80240178 0C00F589 */  jal       func_8003D624
-/* BC7FDC 8024017C AFA20018 */   sw       $v0, 0x18($sp)
-/* BC7FE0 80240180 240200FF */  addiu     $v0, $zero, 0xff
-/* BC7FE4 80240184 A602009A */  sh        $v0, 0x9a($s0)
-.L80240188:
-/* BC7FE8 80240188 8FBF0024 */  lw        $ra, 0x24($sp)
-/* BC7FEC 8024018C 8FB00020 */  lw        $s0, 0x20($sp)
-/* BC7FF0 80240190 03E00008 */  jr        $ra
-/* BC7FF4 80240194 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240198_BC7FF8.s b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240198_BC7FF8.s
deleted file mode 100644
index c710b30ca2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240198_BC7FF8.s
+++ /dev/null
@@ -1,41 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240198_BC7FF8
-/* BC7FF8 80240198 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* BC7FFC 8024019C AFBF0010 */  sw        $ra, 0x10($sp)
-/* BC8000 802401A0 0C00EABB */  jal       get_npc_unsafe
-/* BC8004 802401A4 24040001 */   addiu    $a0, $zero, 1
-/* BC8008 802401A8 0C090034 */  jal       func_802400D0_BC7F30
-/* BC800C 802401AC 0040202D */   daddu    $a0, $v0, $zero
-/* BC8010 802401B0 0C00EABB */  jal       get_npc_unsafe
-/* BC8014 802401B4 24040002 */   addiu    $a0, $zero, 2
-/* BC8018 802401B8 0C090034 */  jal       func_802400D0_BC7F30
-/* BC801C 802401BC 0040202D */   daddu    $a0, $v0, $zero
-/* BC8020 802401C0 0C00EABB */  jal       get_npc_unsafe
-/* BC8024 802401C4 24040003 */   addiu    $a0, $zero, 3
-/* BC8028 802401C8 0C090034 */  jal       func_802400D0_BC7F30
-/* BC802C 802401CC 0040202D */   daddu    $a0, $v0, $zero
-/* BC8030 802401D0 0C00EABB */  jal       get_npc_unsafe
-/* BC8034 802401D4 24040004 */   addiu    $a0, $zero, 4
-/* BC8038 802401D8 0C090034 */  jal       func_802400D0_BC7F30
-/* BC803C 802401DC 0040202D */   daddu    $a0, $v0, $zero
-/* BC8040 802401E0 0C00EABB */  jal       get_npc_unsafe
-/* BC8044 802401E4 24040005 */   addiu    $a0, $zero, 5
-/* BC8048 802401E8 0C090034 */  jal       func_802400D0_BC7F30
-/* BC804C 802401EC 0040202D */   daddu    $a0, $v0, $zero
-/* BC8050 802401F0 0C00EABB */  jal       get_npc_unsafe
-/* BC8054 802401F4 24040006 */   addiu    $a0, $zero, 6
-/* BC8058 802401F8 0C090034 */  jal       func_802400D0_BC7F30
-/* BC805C 802401FC 0040202D */   daddu    $a0, $v0, $zero
-/* BC8060 80240200 0C00EABB */  jal       get_npc_unsafe
-/* BC8064 80240204 24040007 */   addiu    $a0, $zero, 7
-/* BC8068 80240208 0C090034 */  jal       func_802400D0_BC7F30
-/* BC806C 8024020C 0040202D */   daddu    $a0, $v0, $zero
-/* BC8070 80240210 0C00EABB */  jal       get_npc_unsafe
-/* BC8074 80240214 24040008 */   addiu    $a0, $zero, 8
-/* BC8078 80240218 0C090034 */  jal       func_802400D0_BC7F30
-/* BC807C 8024021C 0040202D */   daddu    $a0, $v0, $zero
-/* BC8080 80240220 8FBF0010 */  lw        $ra, 0x10($sp)
-/* BC8084 80240224 03E00008 */  jr        $ra
-/* BC8088 80240228 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_8024022C_BC808C.s b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_8024022C_BC808C.s
deleted file mode 100644
index 21ddb4294c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_8024022C_BC808C.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024022C_BC808C
-/* BC808C 8024022C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* BC8090 80240230 AFBF0010 */  sw        $ra, 0x10($sp)
-/* BC8094 80240234 0C00EABB */  jal       get_npc_unsafe
-/* BC8098 80240238 24040001 */   addiu    $a0, $zero, 1
-/* BC809C 8024023C 24040002 */  addiu     $a0, $zero, 2
-/* BC80A0 80240240 0C00EABB */  jal       get_npc_unsafe
-/* BC80A4 80240244 A44000A2 */   sh       $zero, 0xa2($v0)
-/* BC80A8 80240248 24040003 */  addiu     $a0, $zero, 3
-/* BC80AC 8024024C 0C00EABB */  jal       get_npc_unsafe
-/* BC80B0 80240250 A44000A2 */   sh       $zero, 0xa2($v0)
-/* BC80B4 80240254 24040004 */  addiu     $a0, $zero, 4
-/* BC80B8 80240258 0C00EABB */  jal       get_npc_unsafe
-/* BC80BC 8024025C A44000A2 */   sh       $zero, 0xa2($v0)
-/* BC80C0 80240260 24040005 */  addiu     $a0, $zero, 5
-/* BC80C4 80240264 0C00EABB */  jal       get_npc_unsafe
-/* BC80C8 80240268 A44000A2 */   sh       $zero, 0xa2($v0)
-/* BC80CC 8024026C 24040006 */  addiu     $a0, $zero, 6
-/* BC80D0 80240270 0C00EABB */  jal       get_npc_unsafe
-/* BC80D4 80240274 A44000A2 */   sh       $zero, 0xa2($v0)
-/* BC80D8 80240278 24040007 */  addiu     $a0, $zero, 7
-/* BC80DC 8024027C 0C00EABB */  jal       get_npc_unsafe
-/* BC80E0 80240280 A44000A2 */   sh       $zero, 0xa2($v0)
-/* BC80E4 80240284 24040008 */  addiu     $a0, $zero, 8
-/* BC80E8 80240288 0C00EABB */  jal       get_npc_unsafe
-/* BC80EC 8024028C A44000A2 */   sh       $zero, 0xa2($v0)
-/* BC80F0 80240290 A44000A2 */  sh        $zero, 0xa2($v0)
-/* BC80F4 80240294 8FBF0010 */  lw        $ra, 0x10($sp)
-/* BC80F8 80240298 03E00008 */  jr        $ra
-/* BC80FC 8024029C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402F4_BC8154.s b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402F4_BC8154.s
deleted file mode 100644
index 73bb0ddae3..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402F4_BC8154.s
+++ /dev/null
@@ -1,197 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402F4_BC8154
-/* BC8154 802402F4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* BC8158 802402F8 AFB10014 */  sw        $s1, 0x14($sp)
-/* BC815C 802402FC 0080882D */  daddu     $s1, $a0, $zero
-/* BC8160 80240300 AFBF0024 */  sw        $ra, 0x24($sp)
-/* BC8164 80240304 AFB40020 */  sw        $s4, 0x20($sp)
-/* BC8168 80240308 AFB3001C */  sw        $s3, 0x1c($sp)
-/* BC816C 8024030C AFB20018 */  sw        $s2, 0x18($sp)
-/* BC8170 80240310 AFB00010 */  sw        $s0, 0x10($sp)
-/* BC8174 80240314 8E24014C */  lw        $a0, 0x14c($s1)
-/* BC8178 80240318 0C00EABB */  jal       get_npc_unsafe
-/* BC817C 8024031C 2414000C */   addiu    $s4, $zero, 0xc
-/* BC8180 80240320 0040802D */  daddu     $s0, $v0, $zero
-/* BC8184 80240324 8E230074 */  lw        $v1, 0x74($s1)
-/* BC8188 80240328 8E130020 */  lw        $s3, 0x20($s0)
-/* BC818C 8024032C 10740057 */  beq       $v1, $s4, .L8024048C
-/* BC8190 80240330 2862000D */   slti     $v0, $v1, 0xd
-/* BC8194 80240334 1040000F */  beqz      $v0, .L80240374
-/* BC8198 80240338 24120001 */   addiu    $s2, $zero, 1
-/* BC819C 8024033C 10720094 */  beq       $v1, $s2, .L80240590
-/* BC81A0 80240340 28620002 */   slti     $v0, $v1, 2
-/* BC81A4 80240344 10400005 */  beqz      $v0, .L8024035C
-/* BC81A8 80240348 2402000A */   addiu    $v0, $zero, 0xa
-/* BC81AC 8024034C 10600015 */  beqz      $v1, .L802403A4
-/* BC81B0 80240350 0220202D */   daddu    $a0, $s1, $zero
-/* BC81B4 80240354 08090164 */  j         .L80240590
-/* BC81B8 80240358 00000000 */   nop
-.L8024035C:
-/* BC81BC 8024035C 10620019 */  beq       $v1, $v0, .L802403C4
-/* BC81C0 80240360 2402000B */   addiu    $v0, $zero, 0xb
-/* BC81C4 80240364 10620025 */  beq       $v1, $v0, .L802403FC
-/* BC81C8 80240368 00000000 */   nop
-/* BC81CC 8024036C 08090164 */  j         .L80240590
-/* BC81D0 80240370 00000000 */   nop
-.L80240374:
-/* BC81D4 80240374 2402000E */  addiu     $v0, $zero, 0xe
-/* BC81D8 80240378 1062005B */  beq       $v1, $v0, .L802404E8
-/* BC81DC 8024037C 0062102A */   slt      $v0, $v1, $v0
-/* BC81E0 80240380 1440004E */  bnez      $v0, .L802404BC
-/* BC81E4 80240384 0220202D */   daddu    $a0, $s1, $zero
-/* BC81E8 80240388 2402000F */  addiu     $v0, $zero, 0xf
-/* BC81EC 8024038C 10620069 */  beq       $v1, $v0, .L80240534
-/* BC81F0 80240390 24020064 */   addiu    $v0, $zero, 0x64
-/* BC81F4 80240394 10620079 */  beq       $v1, $v0, .L8024057C
-/* BC81F8 80240398 3C05FD05 */   lui      $a1, 0xfd05
-/* BC81FC 8024039C 08090164 */  j         .L80240590
-/* BC8200 802403A0 00000000 */   nop
-.L802403A4:
-/* BC8204 802403A4 3C05FD05 */  lui       $a1, 0xfd05
-/* BC8208 802403A8 0C0B1EAF */  jal       evt_get_variable
-/* BC820C 802403AC 34A50F81 */   ori      $a1, $a1, 0xf81
-/* BC8210 802403B0 14520077 */  bne       $v0, $s2, .L80240590
-/* BC8214 802403B4 00000000 */   nop
-/* BC8218 802403B8 AE620000 */  sw        $v0, ($s3)
-/* BC821C 802403BC 08090163 */  j         .L8024058C
-/* BC8220 802403C0 2402000A */   addiu    $v0, $zero, 0xa
-.L802403C4:
-/* BC8224 802403C4 C600000C */  lwc1      $f0, 0xc($s0)
-/* BC8228 802403C8 3C014000 */  lui       $at, 0x4000
-/* BC822C 802403CC 44816000 */  mtc1      $at, $f12
-/* BC8230 802403D0 0C00A6C9 */  jal       clamp_angle
-/* BC8234 802403D4 460C0300 */   add.s    $f12, $f0, $f12
-/* BC8238 802403D8 9602008E */  lhu       $v0, 0x8e($s0)
-/* BC823C 802403DC E600000C */  swc1      $f0, 0xc($s0)
-/* BC8240 802403E0 2442FFFF */  addiu     $v0, $v0, -1
-/* BC8244 802403E4 A602008E */  sh        $v0, 0x8e($s0)
-/* BC8248 802403E8 00021400 */  sll       $v0, $v0, 0x10
-/* BC824C 802403EC 14400068 */  bnez      $v0, .L80240590
-/* BC8250 802403F0 2402000B */   addiu    $v0, $zero, 0xb
-/* BC8254 802403F4 08090164 */  j         .L80240590
-/* BC8258 802403F8 AE220074 */   sw       $v0, 0x74($s1)
-.L802403FC:
-/* BC825C 802403FC C602003C */  lwc1      $f2, 0x3c($s0)
-/* BC8260 80240400 3C01C466 */  lui       $at, 0xc466
-/* BC8264 80240404 44810000 */  mtc1      $at, $f0
-/* BC8268 80240408 00000000 */  nop
-/* BC826C 8024040C 4600103E */  c.le.s    $f2, $f0
-/* BC8270 80240410 00000000 */  nop
-/* BC8274 80240414 45000003 */  bc1f      .L80240424
-/* BC8278 80240418 00000000 */   nop
-/* BC827C 8024041C 0C090066 */  jal       func_80240198_BC7FF8
-/* BC8280 80240420 00000000 */   nop
-.L80240424:
-/* BC8284 80240424 C600000C */  lwc1      $f0, 0xc($s0)
-/* BC8288 80240428 3C014000 */  lui       $at, 0x4000
-/* BC828C 8024042C 44816000 */  mtc1      $at, $f12
-/* BC8290 80240430 0C00A6C9 */  jal       clamp_angle
-/* BC8294 80240434 460C0300 */   add.s    $f12, $f0, $f12
-/* BC8298 80240438 C604003C */  lwc1      $f4, 0x3c($s0)
-/* BC829C 8024043C 3C013F00 */  lui       $at, 0x3f00
-/* BC82A0 80240440 44811000 */  mtc1      $at, $f2
-/* BC82A4 80240444 00000000 */  nop
-/* BC82A8 80240448 46022101 */  sub.s     $f4, $f4, $f2
-/* BC82AC 8024044C 3C01C477 */  lui       $at, 0xc477
-/* BC82B0 80240450 44811000 */  mtc1      $at, $f2
-/* BC82B4 80240454 E600000C */  swc1      $f0, 0xc($s0)
-/* BC82B8 80240458 4602203E */  c.le.s    $f4, $f2
-/* BC82BC 8024045C 00000000 */  nop
-/* BC82C0 80240460 4500004B */  bc1f      .L80240590
-/* BC82C4 80240464 E604003C */   swc1     $f4, 0x3c($s0)
-/* BC82C8 80240468 0220202D */  daddu     $a0, $s1, $zero
-/* BC82CC 8024046C 3C05FD05 */  lui       $a1, 0xfd05
-/* BC82D0 80240470 34A50F82 */  ori       $a1, $a1, 0xf82
-/* BC82D4 80240474 0C0B2026 */  jal       evt_set_variable
-/* BC82D8 80240478 24060001 */   addiu    $a2, $zero, 1
-/* BC82DC 8024047C 0C09008B */  jal       func_8024022C_BC808C
-/* BC82E0 80240480 00000000 */   nop
-/* BC82E4 80240484 08090164 */  j         .L80240590
-/* BC82E8 80240488 AE340074 */   sw       $s4, 0x74($s1)
-.L8024048C:
-/* BC82EC 8024048C 0220202D */  daddu     $a0, $s1, $zero
-/* BC82F0 80240490 3C05FD05 */  lui       $a1, 0xfd05
-/* BC82F4 80240494 0C0B1EAF */  jal       evt_get_variable
-/* BC82F8 80240498 34A50F83 */   ori      $a1, $a1, 0xf83
-/* BC82FC 8024049C 0C0900A8 */  jal       func_802402A0_BC8100
-/* BC8300 802404A0 0040202D */   daddu    $a0, $v0, $zero
-/* BC8304 802404A4 AE220074 */  sw        $v0, 0x74($s1)
-/* BC8308 802404A8 C600000C */  lwc1      $f0, 0xc($s0)
-/* BC830C 802404AC 3C014000 */  lui       $at, 0x4000
-/* BC8310 802404B0 44816000 */  mtc1      $at, $f12
-/* BC8314 802404B4 0809015B */  j         .L8024056C
-/* BC8318 802404B8 460C0300 */   add.s    $f12, $f0, $f12
-.L802404BC:
-/* BC831C 802404BC 3C05FD05 */  lui       $a1, 0xfd05
-/* BC8320 802404C0 0C0B1EAF */  jal       evt_get_variable
-/* BC8324 802404C4 34A50F83 */   ori      $a1, $a1, 0xf83
-/* BC8328 802404C8 0C0900A8 */  jal       func_802402A0_BC8100
-/* BC832C 802404CC 0040202D */   daddu    $a0, $v0, $zero
-/* BC8330 802404D0 AE220074 */  sw        $v0, 0x74($s1)
-/* BC8334 802404D4 C600000C */  lwc1      $f0, 0xc($s0)
-/* BC8338 802404D8 3C014000 */  lui       $at, 0x4000
-/* BC833C 802404DC 44816000 */  mtc1      $at, $f12
-/* BC8340 802404E0 0809015B */  j         .L8024056C
-/* BC8344 802404E4 460C0301 */   sub.s    $f12, $f0, $f12
-.L802404E8:
-/* BC8348 802404E8 0220202D */  daddu     $a0, $s1, $zero
-/* BC834C 802404EC 3C05FD05 */  lui       $a1, 0xfd05
-/* BC8350 802404F0 34A50F83 */  ori       $a1, $a1, 0xf83
-/* BC8354 802404F4 0C0B2026 */  jal       evt_set_variable
-/* BC8358 802404F8 0000302D */   daddu    $a2, $zero, $zero
-/* BC835C 802404FC 9602008E */  lhu       $v0, 0x8e($s0)
-/* BC8360 80240500 24030032 */  addiu     $v1, $zero, 0x32
-/* BC8364 80240504 24420001 */  addiu     $v0, $v0, 1
-/* BC8368 80240508 A602008E */  sh        $v0, 0x8e($s0)
-/* BC836C 8024050C 00021400 */  sll       $v0, $v0, 0x10
-/* BC8370 80240510 00021403 */  sra       $v0, $v0, 0x10
-/* BC8374 80240514 14430002 */  bne       $v0, $v1, .L80240520
-/* BC8378 80240518 2402000F */   addiu    $v0, $zero, 0xf
-/* BC837C 8024051C AE220074 */  sw        $v0, 0x74($s1)
-.L80240520:
-/* BC8380 80240520 C6000010 */  lwc1      $f0, 0x10($s0)
-/* BC8384 80240524 3C014000 */  lui       $at, 0x4000
-/* BC8388 80240528 44811000 */  mtc1      $at, $f2
-/* BC838C 8024052C 08090158 */  j         .L80240560
-/* BC8390 80240530 46020001 */   sub.s    $f0, $f0, $f2
-.L80240534:
-/* BC8394 80240534 9602008E */  lhu       $v0, 0x8e($s0)
-/* BC8398 80240538 2442FFFF */  addiu     $v0, $v0, -1
-/* BC839C 8024053C A602008E */  sh        $v0, 0x8e($s0)
-/* BC83A0 80240540 00021400 */  sll       $v0, $v0, 0x10
-/* BC83A4 80240544 50400001 */  beql      $v0, $zero, .L8024054C
-/* BC83A8 80240548 AE340074 */   sw       $s4, 0x74($s1)
-.L8024054C:
-/* BC83AC 8024054C C6000010 */  lwc1      $f0, 0x10($s0)
-/* BC83B0 80240550 3C014000 */  lui       $at, 0x4000
-/* BC83B4 80240554 44811000 */  mtc1      $at, $f2
-/* BC83B8 80240558 00000000 */  nop
-/* BC83BC 8024055C 46020000 */  add.s     $f0, $f0, $f2
-.L80240560:
-/* BC83C0 80240560 C60C000C */  lwc1      $f12, 0xc($s0)
-/* BC83C4 80240564 46026300 */  add.s     $f12, $f12, $f2
-/* BC83C8 80240568 E6000010 */  swc1      $f0, 0x10($s0)
-.L8024056C:
-/* BC83CC 8024056C 0C00A6C9 */  jal       clamp_angle
-/* BC83D0 80240570 00000000 */   nop
-/* BC83D4 80240574 08090164 */  j         .L80240590
-/* BC83D8 80240578 E600000C */   swc1     $f0, 0xc($s0)
-.L8024057C:
-/* BC83DC 8024057C 0C0B1EAF */  jal       evt_get_variable
-/* BC83E0 80240580 34A50F83 */   ori      $a1, $a1, 0xf83
-/* BC83E4 80240584 0C0900A8 */  jal       func_802402A0_BC8100
-/* BC83E8 80240588 0040202D */   daddu    $a0, $v0, $zero
-.L8024058C:
-/* BC83EC 8024058C AE220074 */  sw        $v0, 0x74($s1)
-.L80240590:
-/* BC83F0 80240590 8FBF0024 */  lw        $ra, 0x24($sp)
-/* BC83F4 80240594 8FB40020 */  lw        $s4, 0x20($sp)
-/* BC83F8 80240598 8FB3001C */  lw        $s3, 0x1c($sp)
-/* BC83FC 8024059C 8FB20018 */  lw        $s2, 0x18($sp)
-/* BC8400 802405A0 8FB10014 */  lw        $s1, 0x14($sp)
-/* BC8404 802405A4 8FB00010 */  lw        $s0, 0x10($sp)
-/* BC8408 802405A8 24020002 */  addiu     $v0, $zero, 2
-/* BC840C 802405AC 03E00008 */  jr        $ra
-/* BC8410 802405B0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802405B4_BC8414.s b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802405B4_BC8414.s
deleted file mode 100644
index 6611b4015f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802405B4_BC8414.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802405B4_BC8414
-/* BC8414 802405B4 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* BC8418 802405B8 AFB10014 */  sw        $s1, 0x14($sp)
-/* BC841C 802405BC 0080882D */  daddu     $s1, $a0, $zero
-/* BC8420 802405C0 AFBF0018 */  sw        $ra, 0x18($sp)
-/* BC8424 802405C4 AFB00010 */  sw        $s0, 0x10($sp)
-/* BC8428 802405C8 0C00EABB */  jal       get_npc_unsafe
-/* BC842C 802405CC 8E24014C */   lw       $a0, 0x14c($s1)
-/* BC8430 802405D0 0000202D */  daddu     $a0, $zero, $zero
-/* BC8434 802405D4 0C00EABB */  jal       get_npc_unsafe
-/* BC8438 802405D8 0040802D */   daddu    $s0, $v0, $zero
-/* BC843C 802405DC AE020020 */  sw        $v0, 0x20($s0)
-/* BC8440 802405E0 8E23014C */  lw        $v1, 0x14c($s1)
-/* BC8444 802405E4 00032040 */  sll       $a0, $v1, 1
-/* BC8448 802405E8 00832021 */  addu      $a0, $a0, $v1
-/* BC844C 802405EC 00041900 */  sll       $v1, $a0, 4
-/* BC8450 802405F0 00641823 */  subu      $v1, $v1, $a0
-/* BC8454 802405F4 AE230078 */  sw        $v1, 0x78($s1)
-/* BC8458 802405F8 8E030000 */  lw        $v1, ($s0)
-/* BC845C 802405FC 3C040004 */  lui       $a0, 4
-/* BC8460 80240600 00641825 */  or        $v1, $v1, $a0
-/* BC8464 80240604 AE030000 */  sw        $v1, ($s0)
-/* BC8468 80240608 AE200074 */  sw        $zero, 0x74($s1)
-/* BC846C 8024060C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* BC8470 80240610 8FB10014 */  lw        $s1, 0x14($sp)
-/* BC8474 80240614 8FB00010 */  lw        $s0, 0x10($sp)
-/* BC8478 80240618 24020002 */  addiu     $v0, $zero, 2
-/* BC847C 8024061C 03E00008 */  jr        $ra
-/* BC8480 80240620 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240910_BC8770.s b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240910_BC8770.s
deleted file mode 100644
index 90b57af81f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240910_BC8770.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240910_BC8770
-/* BC8770 80240910 3C018011 */  lui       $at, %hi(gPlayerStatus+0x2C)
-/* BC8774 80240914 C422EFF4 */  lwc1      $f2, %lo(gPlayerStatus+0x2C)($at)
-/* BC8778 80240918 3C01C248 */  lui       $at, 0xc248
-/* BC877C 8024091C 44810000 */  mtc1      $at, $f0
-/* BC8780 80240920 00000000 */  nop
-/* BC8784 80240924 4600103C */  c.lt.s    $f2, $f0
-/* BC8788 80240928 00000000 */  nop
-/* BC878C 8024092C 45010002 */  bc1t      .L80240938
-/* BC8790 80240930 24020002 */   addiu    $v0, $zero, 2
-/* BC8794 80240934 0000102D */  daddu     $v0, $zero, $zero
-.L80240938:
-/* BC8798 80240938 03E00008 */  jr        $ra
-/* BC879C 8024093C 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58_BC88B8.s b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58_BC88B8.s
deleted file mode 100644
index 6b5e7e6355..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58_BC88B8.s
+++ /dev/null
@@ -1,131 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel jtbl_802451D8_BCD038
-.word .L80240B08_BC8968, .L80240B20_BC8980, .L80240B38_BC8998, .L80240B50_BC89B0, .L80240B68_BC89C8, .L80240B80_BC89E0, .L80240B98_BC89F8, .L80240BB0_BC8A10, 0, 0
-
-.section .text
-
-glabel func_80240A58_BC88B8
-/* BC88B8 80240A58 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* BC88BC 80240A5C AFB00010 */  sw        $s0, 0x10($sp)
-/* BC88C0 80240A60 0080802D */  daddu     $s0, $a0, $zero
-/* BC88C4 80240A64 24040001 */  addiu     $a0, $zero, 1
-/* BC88C8 80240A68 AFBF0030 */  sw        $ra, 0x30($sp)
-/* BC88CC 80240A6C AFB7002C */  sw        $s7, 0x2c($sp)
-/* BC88D0 80240A70 AFB60028 */  sw        $s6, 0x28($sp)
-/* BC88D4 80240A74 AFB50024 */  sw        $s5, 0x24($sp)
-/* BC88D8 80240A78 AFB40020 */  sw        $s4, 0x20($sp)
-/* BC88DC 80240A7C AFB3001C */  sw        $s3, 0x1c($sp)
-/* BC88E0 80240A80 AFB20018 */  sw        $s2, 0x18($sp)
-/* BC88E4 80240A84 0C00EABB */  jal       get_npc_unsafe
-/* BC88E8 80240A88 AFB10014 */   sw       $s1, 0x14($sp)
-/* BC88EC 80240A8C 24040002 */  addiu     $a0, $zero, 2
-/* BC88F0 80240A90 0C00EABB */  jal       get_npc_unsafe
-/* BC88F4 80240A94 0040B82D */   daddu    $s7, $v0, $zero
-/* BC88F8 80240A98 24040003 */  addiu     $a0, $zero, 3
-/* BC88FC 80240A9C 0C00EABB */  jal       get_npc_unsafe
-/* BC8900 80240AA0 0040B02D */   daddu    $s6, $v0, $zero
-/* BC8904 80240AA4 24040004 */  addiu     $a0, $zero, 4
-/* BC8908 80240AA8 0C00EABB */  jal       get_npc_unsafe
-/* BC890C 80240AAC 0040A82D */   daddu    $s5, $v0, $zero
-/* BC8910 80240AB0 24040005 */  addiu     $a0, $zero, 5
-/* BC8914 80240AB4 0C00EABB */  jal       get_npc_unsafe
-/* BC8918 80240AB8 0040A02D */   daddu    $s4, $v0, $zero
-/* BC891C 80240ABC 24040006 */  addiu     $a0, $zero, 6
-/* BC8920 80240AC0 0C00EABB */  jal       get_npc_unsafe
-/* BC8924 80240AC4 0040982D */   daddu    $s3, $v0, $zero
-/* BC8928 80240AC8 24040007 */  addiu     $a0, $zero, 7
-/* BC892C 80240ACC 0C00EABB */  jal       get_npc_unsafe
-/* BC8930 80240AD0 0040902D */   daddu    $s2, $v0, $zero
-/* BC8934 80240AD4 24040008 */  addiu     $a0, $zero, 8
-/* BC8938 80240AD8 0C00EABB */  jal       get_npc_unsafe
-/* BC893C 80240ADC 0040882D */   daddu    $s1, $v0, $zero
-/* BC8940 80240AE0 8E030084 */  lw        $v1, 0x84($s0)
-/* BC8944 80240AE4 0040302D */  daddu     $a2, $v0, $zero
-/* BC8948 80240AE8 2C620008 */  sltiu     $v0, $v1, 8
-/* BC894C 80240AEC 10400039 */  beqz      $v0, .L80240BD4
-/* BC8950 80240AF0 00031080 */   sll      $v0, $v1, 2
-/* BC8954 80240AF4 3C018024 */  lui       $at, %hi(jtbl_802451D8_BCD038)
-/* BC8958 80240AF8 00220821 */  addu      $at, $at, $v0
-/* BC895C 80240AFC 8C2251D8 */  lw        $v0, %lo(jtbl_802451D8_BCD038)($at)
-/* BC8960 80240B00 00400008 */  jr        $v0
-/* BC8964 80240B04 00000000 */   nop
-.L80240B08_BC8968:
-/* BC8968 80240B08 0000202D */  daddu     $a0, $zero, $zero
-/* BC896C 80240B0C 3C05FD05 */  lui       $a1, 0xfd05
-/* BC8970 80240B10 34A50F85 */  ori       $a1, $a1, 0xf85
-/* BC8974 80240B14 C6E0000C */  lwc1      $f0, 0xc($s7)
-/* BC8978 80240B18 080902F1 */  j         .L80240BC4
-/* BC897C 80240B1C 24060001 */   addiu    $a2, $zero, 1
-.L80240B20_BC8980:
-/* BC8980 80240B20 0000202D */  daddu     $a0, $zero, $zero
-/* BC8984 80240B24 3C05FD05 */  lui       $a1, 0xfd05
-/* BC8988 80240B28 34A50F85 */  ori       $a1, $a1, 0xf85
-/* BC898C 80240B2C C6C0000C */  lwc1      $f0, 0xc($s6)
-/* BC8990 80240B30 080902F1 */  j         .L80240BC4
-/* BC8994 80240B34 24060002 */   addiu    $a2, $zero, 2
-.L80240B38_BC8998:
-/* BC8998 80240B38 0000202D */  daddu     $a0, $zero, $zero
-/* BC899C 80240B3C 3C05FD05 */  lui       $a1, 0xfd05
-/* BC89A0 80240B40 34A50F85 */  ori       $a1, $a1, 0xf85
-/* BC89A4 80240B44 C6A0000C */  lwc1      $f0, 0xc($s5)
-/* BC89A8 80240B48 080902F1 */  j         .L80240BC4
-/* BC89AC 80240B4C 24060003 */   addiu    $a2, $zero, 3
-.L80240B50_BC89B0:
-/* BC89B0 80240B50 0000202D */  daddu     $a0, $zero, $zero
-/* BC89B4 80240B54 3C05FD05 */  lui       $a1, 0xfd05
-/* BC89B8 80240B58 34A50F85 */  ori       $a1, $a1, 0xf85
-/* BC89BC 80240B5C C680000C */  lwc1      $f0, 0xc($s4)
-/* BC89C0 80240B60 080902F1 */  j         .L80240BC4
-/* BC89C4 80240B64 24060004 */   addiu    $a2, $zero, 4
-.L80240B68_BC89C8:
-/* BC89C8 80240B68 0000202D */  daddu     $a0, $zero, $zero
-/* BC89CC 80240B6C 3C05FD05 */  lui       $a1, 0xfd05
-/* BC89D0 80240B70 34A50F85 */  ori       $a1, $a1, 0xf85
-/* BC89D4 80240B74 C660000C */  lwc1      $f0, 0xc($s3)
-/* BC89D8 80240B78 080902F1 */  j         .L80240BC4
-/* BC89DC 80240B7C 24060005 */   addiu    $a2, $zero, 5
-.L80240B80_BC89E0:
-/* BC89E0 80240B80 0000202D */  daddu     $a0, $zero, $zero
-/* BC89E4 80240B84 3C05FD05 */  lui       $a1, 0xfd05
-/* BC89E8 80240B88 34A50F85 */  ori       $a1, $a1, 0xf85
-/* BC89EC 80240B8C C640000C */  lwc1      $f0, 0xc($s2)
-/* BC89F0 80240B90 080902F1 */  j         .L80240BC4
-/* BC89F4 80240B94 24060006 */   addiu    $a2, $zero, 6
-.L80240B98_BC89F8:
-/* BC89F8 80240B98 0000202D */  daddu     $a0, $zero, $zero
-/* BC89FC 80240B9C 3C05FD05 */  lui       $a1, 0xfd05
-/* BC8A00 80240BA0 34A50F85 */  ori       $a1, $a1, 0xf85
-/* BC8A04 80240BA4 C620000C */  lwc1      $f0, 0xc($s1)
-/* BC8A08 80240BA8 080902F1 */  j         .L80240BC4
-/* BC8A0C 80240BAC 24060007 */   addiu    $a2, $zero, 7
-.L80240BB0_BC8A10:
-/* BC8A10 80240BB0 0000202D */  daddu     $a0, $zero, $zero
-/* BC8A14 80240BB4 3C05FD05 */  lui       $a1, 0xfd05
-/* BC8A18 80240BB8 34A50F85 */  ori       $a1, $a1, 0xf85
-/* BC8A1C 80240BBC C4C0000C */  lwc1      $f0, 0xc($a2)
-/* BC8A20 80240BC0 24060008 */  addiu     $a2, $zero, 8
-.L80240BC4:
-/* BC8A24 80240BC4 4600008D */  trunc.w.s $f2, $f0
-/* BC8A28 80240BC8 0C0B2026 */  jal       evt_set_variable
-/* BC8A2C 80240BCC E6020084 */   swc1     $f2, 0x84($s0)
-/* BC8A30 80240BD0 8E030084 */  lw        $v1, 0x84($s0)
-.L80240BD4:
-/* BC8A34 80240BD4 8E040088 */  lw        $a0, 0x88($s0)
-/* BC8A38 80240BD8 00641821 */  addu      $v1, $v1, $a0
-/* BC8A3C 80240BDC AE030084 */  sw        $v1, 0x84($s0)
-/* BC8A40 80240BE0 8FBF0030 */  lw        $ra, 0x30($sp)
-/* BC8A44 80240BE4 8FB7002C */  lw        $s7, 0x2c($sp)
-/* BC8A48 80240BE8 8FB60028 */  lw        $s6, 0x28($sp)
-/* BC8A4C 80240BEC 8FB50024 */  lw        $s5, 0x24($sp)
-/* BC8A50 80240BF0 8FB40020 */  lw        $s4, 0x20($sp)
-/* BC8A54 80240BF4 8FB3001C */  lw        $s3, 0x1c($sp)
-/* BC8A58 80240BF8 8FB20018 */  lw        $s2, 0x18($sp)
-/* BC8A5C 80240BFC 8FB10014 */  lw        $s1, 0x14($sp)
-/* BC8A60 80240C00 8FB00010 */  lw        $s0, 0x10($sp)
-/* BC8A64 80240C04 24020002 */  addiu     $v0, $zero, 2
-/* BC8A68 80240C08 03E00008 */  jr        $ra
-/* BC8A6C 80240C0C 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240C10_BC8A70.s b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240C10_BC8A70.s
deleted file mode 100644
index 467432281d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240C10_BC8A70.s
+++ /dev/null
@@ -1,40 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240C10_BC8A70
-/* BC8A70 80240C10 3C0142FA */  lui       $at, 0x42fa
-/* BC8A74 80240C14 44810000 */  mtc1      $at, $f0
-/* BC8A78 80240C18 27BDFCA8 */  addiu     $sp, $sp, -0x358
-/* BC8A7C 80240C1C AFB00350 */  sw        $s0, 0x350($sp)
-/* BC8A80 80240C20 0080802D */  daddu     $s0, $a0, $zero
-/* BC8A84 80240C24 AFBF0354 */  sw        $ra, 0x354($sp)
-/* BC8A88 80240C28 AFA00048 */  sw        $zero, 0x48($sp)
-/* BC8A8C 80240C2C AFA0004C */  sw        $zero, 0x4c($sp)
-/* BC8A90 80240C30 AFA00050 */  sw        $zero, 0x50($sp)
-/* BC8A94 80240C34 E7A00020 */  swc1      $f0, 0x20($sp)
-/* BC8A98 80240C38 C6040084 */  lwc1      $f4, 0x84($s0)
-/* BC8A9C 80240C3C 46802120 */  cvt.s.w   $f4, $f4
-/* BC8AA0 80240C40 44050000 */  mfc1      $a1, $f0
-/* BC8AA4 80240C44 44062000 */  mfc1      $a2, $f4
-/* BC8AA8 80240C48 0C00EA95 */  jal       npc_move_heading
-/* BC8AAC 80240C4C 27A40010 */   addiu    $a0, $sp, 0x10
-/* BC8AB0 80240C50 C7A00048 */  lwc1      $f0, 0x48($sp)
-/* BC8AB4 80240C54 3C014120 */  lui       $at, 0x4120
-/* BC8AB8 80240C58 44811000 */  mtc1      $at, $f2
-/* BC8ABC 80240C5C 4600010D */  trunc.w.s $f4, $f0
-/* BC8AC0 80240C60 E6040084 */  swc1      $f4, 0x84($s0)
-/* BC8AC4 80240C64 C7A0004C */  lwc1      $f0, 0x4c($sp)
-/* BC8AC8 80240C68 46020000 */  add.s     $f0, $f0, $f2
-/* BC8ACC 80240C6C 3C0141A0 */  lui       $at, 0x41a0
-/* BC8AD0 80240C70 44811000 */  mtc1      $at, $f2
-/* BC8AD4 80240C74 4600010D */  trunc.w.s $f4, $f0
-/* BC8AD8 80240C78 E6040088 */  swc1      $f4, 0x88($s0)
-/* BC8ADC 80240C7C C7A00050 */  lwc1      $f0, 0x50($sp)
-/* BC8AE0 80240C80 46020000 */  add.s     $f0, $f0, $f2
-/* BC8AE4 80240C84 4600010D */  trunc.w.s $f4, $f0
-/* BC8AE8 80240C88 E604008C */  swc1      $f4, 0x8c($s0)
-/* BC8AEC 80240C8C 8FBF0354 */  lw        $ra, 0x354($sp)
-/* BC8AF0 80240C90 8FB00350 */  lw        $s0, 0x350($sp)
-/* BC8AF4 80240C94 24020002 */  addiu     $v0, $zero, 2
-/* BC8AF8 80240C98 03E00008 */  jr        $ra
-/* BC8AFC 80240C9C 27BD0358 */   addiu    $sp, $sp, 0x358
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240CA0_BC8B00.s b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240CA0_BC8B00.s
deleted file mode 100644
index 98af697911..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240CA0_BC8B00.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240CA0_BC8B00
-/* BC8B00 80240CA0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* BC8B04 80240CA4 AFB00010 */  sw        $s0, 0x10($sp)
-/* BC8B08 80240CA8 0080802D */  daddu     $s0, $a0, $zero
-/* BC8B0C 80240CAC 0000202D */  daddu     $a0, $zero, $zero
-/* BC8B10 80240CB0 3C05FD05 */  lui       $a1, 0xfd05
-/* BC8B14 80240CB4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* BC8B18 80240CB8 0C0B1EAF */  jal       evt_get_variable
-/* BC8B1C 80240CBC 34A50F85 */   ori      $a1, $a1, 0xf85
-/* BC8B20 80240CC0 0C00EABB */  jal       get_npc_unsafe
-/* BC8B24 80240CC4 0040202D */   daddu    $a0, $v0, $zero
-/* BC8B28 80240CC8 C4400038 */  lwc1      $f0, 0x38($v0)
-/* BC8B2C 80240CCC 4600008D */  trunc.w.s $f2, $f0
-/* BC8B30 80240CD0 E6020084 */  swc1      $f2, 0x84($s0)
-/* BC8B34 80240CD4 C440003C */  lwc1      $f0, 0x3c($v0)
-/* BC8B38 80240CD8 4600008D */  trunc.w.s $f2, $f0
-/* BC8B3C 80240CDC E6020088 */  swc1      $f2, 0x88($s0)
-/* BC8B40 80240CE0 C4400040 */  lwc1      $f0, 0x40($v0)
-/* BC8B44 80240CE4 4600008D */  trunc.w.s $f2, $f0
-/* BC8B48 80240CE8 E602008C */  swc1      $f2, 0x8c($s0)
-/* BC8B4C 80240CEC 8FBF0014 */  lw        $ra, 0x14($sp)
-/* BC8B50 80240CF0 8FB00010 */  lw        $s0, 0x10($sp)
-/* BC8B54 80240CF4 24020002 */  addiu     $v0, $zero, 2
-/* BC8B58 80240CF8 03E00008 */  jr        $ra
-/* BC8B5C 80240CFC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240D14_BC8B74.s b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240D14_BC8B74.s
deleted file mode 100644
index 8c7f41cece..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240D14_BC8B74.s
+++ /dev/null
@@ -1,89 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240D14_BC8B74
-/* BC8B74 80240D14 27BDFC98 */  addiu     $sp, $sp, -0x368
-/* BC8B78 80240D18 AFB20358 */  sw        $s2, 0x358($sp)
-/* BC8B7C 80240D1C 3C128011 */  lui       $s2, %hi(gPlayerStatus)
-/* BC8B80 80240D20 2652EFC8 */  addiu     $s2, $s2, %lo(gPlayerStatus)
-/* BC8B84 80240D24 AFBF035C */  sw        $ra, 0x35c($sp)
-/* BC8B88 80240D28 AFB10354 */  sw        $s1, 0x354($sp)
-/* BC8B8C 80240D2C AFB00350 */  sw        $s0, 0x350($sp)
-/* BC8B90 80240D30 F7B40360 */  sdc1      $f20, 0x360($sp)
-/* BC8B94 80240D34 C64C0028 */  lwc1      $f12, 0x28($s2)
-/* BC8B98 80240D38 4480A000 */  mtc1      $zero, $f20
-/* BC8B9C 80240D3C C64E0030 */  lwc1      $f14, 0x30($s2)
-/* BC8BA0 80240D40 4406A000 */  mfc1      $a2, $f20
-/* BC8BA4 80240D44 4407A000 */  mfc1      $a3, $f20
-/* BC8BA8 80240D48 0C00A7B5 */  jal       dist2D
-/* BC8BAC 80240D4C 0080802D */   daddu    $s0, $a0, $zero
-/* BC8BB0 80240D50 24020001 */  addiu     $v0, $zero, 1
-/* BC8BB4 80240D54 46000106 */  mov.s     $f4, $f0
-/* BC8BB8 80240D58 3C0142B4 */  lui       $at, 0x42b4
-/* BC8BBC 80240D5C 44811000 */  mtc1      $at, $f2
-/* BC8BC0 80240D60 00000000 */  nop
-/* BC8BC4 80240D64 4604103C */  c.lt.s    $f2, $f4
-/* BC8BC8 80240D68 00000000 */  nop
-/* BC8BCC 80240D6C 45010002 */  bc1t      .L80240D78
-/* BC8BD0 80240D70 0240882D */   daddu    $s1, $s2, $zero
-/* BC8BD4 80240D74 0000102D */  daddu     $v0, $zero, $zero
-.L80240D78:
-/* BC8BD8 80240D78 3C014316 */  lui       $at, 0x4316
-/* BC8BDC 80240D7C 44810000 */  mtc1      $at, $f0
-/* BC8BE0 80240D80 00000000 */  nop
-/* BC8BE4 80240D84 4600203C */  c.lt.s    $f4, $f0
-/* BC8BE8 80240D88 00000000 */  nop
-/* BC8BEC 80240D8C 45010002 */  bc1t      .L80240D98
-/* BC8BF0 80240D90 24030001 */   addiu    $v1, $zero, 1
-/* BC8BF4 80240D94 0000182D */  daddu     $v1, $zero, $zero
-.L80240D98:
-/* BC8BF8 80240D98 00431025 */  or        $v0, $v0, $v1
-/* BC8BFC 80240D9C 1040001C */  beqz      $v0, .L80240E10
-/* BC8C00 80240DA0 00000000 */   nop
-/* BC8C04 80240DA4 C64C0028 */  lwc1      $f12, 0x28($s2)
-/* BC8C08 80240DA8 C64E0030 */  lwc1      $f14, 0x30($s2)
-/* BC8C0C 80240DAC 4406A000 */  mfc1      $a2, $f20
-/* BC8C10 80240DB0 4407A000 */  mfc1      $a3, $f20
-/* BC8C14 80240DB4 0C00A720 */  jal       atan2
-/* BC8C18 80240DB8 00000000 */   nop
-/* BC8C1C 80240DBC 3C014334 */  lui       $at, 0x4334
-/* BC8C20 80240DC0 44811000 */  mtc1      $at, $f2
-/* BC8C24 80240DC4 00000000 */  nop
-/* BC8C28 80240DC8 46020000 */  add.s     $f0, $f0, $f2
-/* BC8C2C 80240DCC 3C0542A0 */  lui       $a1, 0x42a0
-/* BC8C30 80240DD0 44060000 */  mfc1      $a2, $f0
-/* BC8C34 80240DD4 27A40010 */  addiu     $a0, $sp, 0x10
-/* BC8C38 80240DD8 E7B40048 */  swc1      $f20, 0x48($sp)
-/* BC8C3C 80240DDC E7B4004C */  swc1      $f20, 0x4c($sp)
-/* BC8C40 80240DE0 0C00EA95 */  jal       npc_move_heading
-/* BC8C44 80240DE4 E7B40050 */   swc1     $f20, 0x50($sp)
-/* BC8C48 80240DE8 C7A00048 */  lwc1      $f0, 0x48($sp)
-/* BC8C4C 80240DEC 4600018D */  trunc.w.s $f6, $f0
-/* BC8C50 80240DF0 E6060084 */  swc1      $f6, 0x84($s0)
-/* BC8C54 80240DF4 C7A0004C */  lwc1      $f0, 0x4c($sp)
-/* BC8C58 80240DF8 4600018D */  trunc.w.s $f6, $f0
-/* BC8C5C 80240DFC E6060088 */  swc1      $f6, 0x88($s0)
-/* BC8C60 80240E00 C7A00050 */  lwc1      $f0, 0x50($sp)
-/* BC8C64 80240E04 24020001 */  addiu     $v0, $zero, 1
-/* BC8C68 80240E08 0809038C */  j         .L80240E30
-/* BC8C6C 80240E0C AE020090 */   sw       $v0, 0x90($s0)
-.L80240E10:
-/* BC8C70 80240E10 C6200028 */  lwc1      $f0, 0x28($s1)
-/* BC8C74 80240E14 4600018D */  trunc.w.s $f6, $f0
-/* BC8C78 80240E18 E6060084 */  swc1      $f6, 0x84($s0)
-/* BC8C7C 80240E1C C620002C */  lwc1      $f0, 0x2c($s1)
-/* BC8C80 80240E20 4600018D */  trunc.w.s $f6, $f0
-/* BC8C84 80240E24 E6060088 */  swc1      $f6, 0x88($s0)
-/* BC8C88 80240E28 C6200030 */  lwc1      $f0, 0x30($s1)
-/* BC8C8C 80240E2C AE000090 */  sw        $zero, 0x90($s0)
-.L80240E30:
-/* BC8C90 80240E30 4600018D */  trunc.w.s $f6, $f0
-/* BC8C94 80240E34 E606008C */  swc1      $f6, 0x8c($s0)
-/* BC8C98 80240E38 8FBF035C */  lw        $ra, 0x35c($sp)
-/* BC8C9C 80240E3C 8FB20358 */  lw        $s2, 0x358($sp)
-/* BC8CA0 80240E40 8FB10354 */  lw        $s1, 0x354($sp)
-/* BC8CA4 80240E44 8FB00350 */  lw        $s0, 0x350($sp)
-/* BC8CA8 80240E48 D7B40360 */  ldc1      $f20, 0x360($sp)
-/* BC8CAC 80240E4C 24020002 */  addiu     $v0, $zero, 2
-/* BC8CB0 80240E50 03E00008 */  jr        $ra
-/* BC8CB4 80240E54 27BD0368 */   addiu    $sp, $sp, 0x368
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240E58_BC8CB8.s b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240E58_BC8CB8.s
deleted file mode 100644
index ca88a558e1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240E58_BC8CB8.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E58_BC8CB8
-/* BC8CB8 80240E58 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* BC8CBC 80240E5C AFBF0010 */  sw        $ra, 0x10($sp)
-/* BC8CC0 80240E60 0C00EABB */  jal       get_npc_unsafe
-/* BC8CC4 80240E64 24040001 */   addiu    $a0, $zero, 1
-/* BC8CC8 80240E68 8442008E */  lh        $v0, 0x8e($v0)
-/* BC8CCC 80240E6C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* BC8CD0 80240E70 2C420001 */  sltiu     $v0, $v0, 1
-/* BC8CD4 80240E74 00021040 */  sll       $v0, $v0, 1
-/* BC8CD8 80240E78 03E00008 */  jr        $ra
-/* BC8CDC 80240E7C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_802402C0_BCEEB0.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_802402C0_BCEEB0.s
deleted file mode 100644
index 50b9b85050..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_802402C0_BCEEB0.s
+++ /dev/null
@@ -1,7 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402C0_BCEEB0
-/* BCEEB0 802402C0 AC800074 */  sw        $zero, 0x74($a0)
-/* BCEEB4 802402C4 03E00008 */  jr        $ra
-/* BCEEB8 802402C8 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_80240454_BCF044.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_80240454_BCF044.s
deleted file mode 100644
index a8534733ae..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_80240454_BCF044.s
+++ /dev/null
@@ -1,51 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240454_BCF044
-/* BCF044 80240454 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* BCF048 80240458 AFB10014 */  sw        $s1, 0x14($sp)
-/* BCF04C 8024045C 0080882D */  daddu     $s1, $a0, $zero
-/* BCF050 80240460 AFBF0018 */  sw        $ra, 0x18($sp)
-/* BCF054 80240464 AFB00010 */  sw        $s0, 0x10($sp)
-/* BCF058 80240468 8E240088 */  lw        $a0, 0x88($s1)
-/* BCF05C 8024046C 1480000B */  bnez      $a0, .L8024049C
-/* BCF060 80240470 8E300084 */   lw       $s0, 0x84($s1)
-/* BCF064 80240474 0C00A67F */  jal       rand_int
-/* BCF068 80240478 24040003 */   addiu    $a0, $zero, 3
-/* BCF06C 8024047C 00021040 */  sll       $v0, $v0, 1
-/* BCF070 80240480 3C018024 */  lui       $at, %hi(D_8024292C_BD151C)
-/* BCF074 80240484 00220821 */  addu      $at, $at, $v0
-/* BCF078 80240488 8422292C */  lh        $v0, %lo(D_8024292C_BD151C)($at)
-/* BCF07C 8024048C 24040032 */  addiu     $a0, $zero, 0x32
-/* BCF080 80240490 0C00A67F */  jal       rand_int
-/* BCF084 80240494 AE220078 */   sw       $v0, 0x78($s1)
-/* BCF088 80240498 2444001E */  addiu     $a0, $v0, 0x1e
-.L8024049C:
-/* BCF08C 8024049C 8E230078 */  lw        $v1, 0x78($s1)
-/* BCF090 802404A0 0203102A */  slt       $v0, $s0, $v1
-/* BCF094 802404A4 10400006 */  beqz      $v0, .L802404C0
-/* BCF098 802404A8 2484FFFF */   addiu    $a0, $a0, -1
-/* BCF09C 802404AC 2610000A */  addiu     $s0, $s0, 0xa
-/* BCF0A0 802404B0 0070102A */  slt       $v0, $v1, $s0
-/* BCF0A4 802404B4 5040000A */  beql      $v0, $zero, .L802404E0
-/* BCF0A8 802404B8 AE300084 */   sw       $s0, 0x84($s1)
-/* BCF0AC 802404BC 0060802D */  daddu     $s0, $v1, $zero
-.L802404C0:
-/* BCF0B0 802404C0 0070102A */  slt       $v0, $v1, $s0
-/* BCF0B4 802404C4 50400006 */  beql      $v0, $zero, .L802404E0
-/* BCF0B8 802404C8 AE300084 */   sw       $s0, 0x84($s1)
-/* BCF0BC 802404CC 2610FFF6 */  addiu     $s0, $s0, -0xa
-/* BCF0C0 802404D0 0203102A */  slt       $v0, $s0, $v1
-/* BCF0C4 802404D4 54400001 */  bnel      $v0, $zero, .L802404DC
-/* BCF0C8 802404D8 0060802D */   daddu    $s0, $v1, $zero
-.L802404DC:
-/* BCF0CC 802404DC AE300084 */  sw        $s0, 0x84($s1)
-.L802404E0:
-/* BCF0D0 802404E0 AE240088 */  sw        $a0, 0x88($s1)
-/* BCF0D4 802404E4 8FBF0018 */  lw        $ra, 0x18($sp)
-/* BCF0D8 802404E8 8FB10014 */  lw        $s1, 0x14($sp)
-/* BCF0DC 802404EC 8FB00010 */  lw        $s0, 0x10($sp)
-/* BCF0E0 802404F0 24020002 */  addiu     $v0, $zero, 2
-/* BCF0E4 802404F4 03E00008 */  jr        $ra
-/* BCF0E8 802404F8 27BD0020 */   addiu    $sp, $sp, 0x20
-/* BCF0EC 802404FC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240808_BD4078.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240808_BD4078.s
deleted file mode 100644
index 8459f31968..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240808_BD4078.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240808_BD4078
-/* BD4078 80240808 3C048011 */  lui       $a0, %hi(gPlayerData)
-/* BD407C 8024080C 2484F290 */  addiu     $a0, $a0, %lo(gPlayerData)
-/* BD4080 80240810 80820002 */  lb        $v0, 2($a0)
-/* BD4084 80240814 90830002 */  lbu       $v1, 2($a0)
-/* BD4088 80240818 28420002 */  slti      $v0, $v0, 2
-/* BD408C 8024081C 14400004 */  bnez      $v0, .L80240830
-/* BD4090 80240820 2462FFFF */   addiu    $v0, $v1, -1
-/* BD4094 80240824 A0820002 */  sb        $v0, 2($a0)
-/* BD4098 80240828 03E00008 */  jr        $ra
-/* BD409C 8024082C 24020002 */   addiu    $v0, $zero, 2
-.L80240830:
-/* BD40A0 80240830 03E00008 */  jr        $ra
-/* BD40A4 80240834 24020002 */   addiu    $v0, $zero, 2
-/* BD40A8 80240838 00000000 */  nop
-/* BD40AC 8024083C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_802408A0_BD4110.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_802408A0_BD4110.s
deleted file mode 100644
index ca7a2abd1e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_802408A0_BD4110.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802408A0_BD4110
-/* BD4110 802408A0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* BD4114 802408A4 AFB10014 */  sw        $s1, 0x14($sp)
-/* BD4118 802408A8 0080882D */  daddu     $s1, $a0, $zero
-/* BD411C 802408AC AFBF0018 */  sw        $ra, 0x18($sp)
-/* BD4120 802408B0 AFB00010 */  sw        $s0, 0x10($sp)
-/* BD4124 802408B4 0C00EABB */  jal       get_npc_unsafe
-/* BD4128 802408B8 8E24014C */   lw       $a0, 0x14c($s1)
-/* BD412C 802408BC 24040004 */  addiu     $a0, $zero, 4
-/* BD4130 802408C0 0C00AB39 */  jal       heap_malloc
-/* BD4134 802408C4 0040802D */   daddu    $s0, $v0, $zero
-/* BD4138 802408C8 3C0142FA */  lui       $at, 0x42fa
-/* BD413C 802408CC 44810000 */  mtc1      $at, $f0
-/* BD4140 802408D0 3C01C45A */  lui       $at, 0xc45a
-/* BD4144 802408D4 3421C000 */  ori       $at, $at, 0xc000
-/* BD4148 802408D8 44811000 */  mtc1      $at, $f2
-/* BD414C 802408DC 0040182D */  daddu     $v1, $v0, $zero
-/* BD4150 802408E0 AE030020 */  sw        $v1, 0x20($s0)
-/* BD4154 802408E4 AC600000 */  sw        $zero, ($v1)
-/* BD4158 802408E8 2403003C */  addiu     $v1, $zero, 0x3c
-/* BD415C 802408EC AE00000C */  sw        $zero, 0xc($s0)
-/* BD4160 802408F0 AE000038 */  sw        $zero, 0x38($s0)
-/* BD4164 802408F4 AE000040 */  sw        $zero, 0x40($s0)
-/* BD4168 802408F8 A603008E */  sh        $v1, 0x8e($s0)
-/* BD416C 802408FC E6000010 */  swc1      $f0, 0x10($s0)
-/* BD4170 80240900 E602003C */  swc1      $f2, 0x3c($s0)
-/* BD4174 80240904 AE200074 */  sw        $zero, 0x74($s1)
-/* BD4178 80240908 8FBF0018 */  lw        $ra, 0x18($sp)
-/* BD417C 8024090C 8FB10014 */  lw        $s1, 0x14($sp)
-/* BD4180 80240910 8FB00010 */  lw        $s0, 0x10($sp)
-/* BD4184 80240914 24020002 */  addiu     $v0, $zero, 2
-/* BD4188 80240918 03E00008 */  jr        $ra
-/* BD418C 8024091C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240920_BD4190.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240920_BD4190.s
deleted file mode 100644
index 815939a653..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240920_BD4190.s
+++ /dev/null
@@ -1,57 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240920_BD4190
-/* BD4190 80240920 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* BD4194 80240924 AFB00020 */  sw        $s0, 0x20($sp)
-/* BD4198 80240928 0080802D */  daddu     $s0, $a0, $zero
-/* BD419C 8024092C AFBF0024 */  sw        $ra, 0x24($sp)
-/* BD41A0 80240930 C602000C */  lwc1      $f2, 0xc($s0)
-/* BD41A4 80240934 3C0143AA */  lui       $at, 0x43aa
-/* BD41A8 80240938 44810000 */  mtc1      $at, $f0
-/* BD41AC 8024093C 00000000 */  nop
-/* BD41B0 80240940 4602003C */  c.lt.s    $f0, $f2
-/* BD41B4 80240944 00000000 */  nop
-/* BD41B8 80240948 45010008 */  bc1t      .L8024096C
-/* BD41BC 8024094C 0200202D */   daddu    $a0, $s0, $zero
-/* BD41C0 80240950 3C0141A0 */  lui       $at, 0x41a0
-/* BD41C4 80240954 44810000 */  mtc1      $at, $f0
-/* BD41C8 80240958 00000000 */  nop
-/* BD41CC 8024095C 4600103C */  c.lt.s    $f2, $f0
-/* BD41D0 80240960 00000000 */  nop
-/* BD41D4 80240964 4500000E */  bc1f      .L802409A0
-/* BD41D8 80240968 24020016 */   addiu    $v0, $zero, 0x16
-.L8024096C:
-/* BD41DC 8024096C 0000282D */  daddu     $a1, $zero, $zero
-/* BD41E0 80240970 00A0302D */  daddu     $a2, $a1, $zero
-/* BD41E4 80240974 2402000D */  addiu     $v0, $zero, 0xd
-/* BD41E8 80240978 A08200AA */  sb        $v0, 0xaa($a0)
-/* BD41EC 8024097C A48000A2 */  sh        $zero, 0xa2($a0)
-/* BD41F0 80240980 AFA00010 */  sw        $zero, 0x10($sp)
-/* BD41F4 80240984 AFA00014 */  sw        $zero, 0x14($sp)
-/* BD41F8 80240988 948200A2 */  lhu       $v0, 0xa2($a0)
-/* BD41FC 8024098C 00A0382D */  daddu     $a3, $a1, $zero
-/* BD4200 80240990 0C00F589 */  jal       func_8003D624
-/* BD4204 80240994 AFA20018 */   sw       $v0, 0x18($sp)
-/* BD4208 80240998 08090276 */  j         .L802409D8
-/* BD420C 8024099C 00000000 */   nop
-.L802409A0:
-/* BD4210 802409A0 A20200AA */  sb        $v0, 0xaa($s0)
-/* BD4214 802409A4 3C02800F */  lui       $v0, %hi(gPlayerStatusPtr)
-/* BD4218 802409A8 8C427B30 */  lw        $v0, %lo(gPlayerStatusPtr)($v0)
-/* BD421C 802409AC 0200202D */  daddu     $a0, $s0, $zero
-/* BD4220 802409B0 9046000E */  lbu       $a2, 0xe($v0)
-/* BD4224 802409B4 24050007 */  addiu     $a1, $zero, 7
-/* BD4228 802409B8 AFA00010 */  sw        $zero, 0x10($sp)
-/* BD422C 802409BC AFA00014 */  sw        $zero, 0x14($sp)
-/* BD4230 802409C0 960200A2 */  lhu       $v0, 0xa2($s0)
-/* BD4234 802409C4 0000382D */  daddu     $a3, $zero, $zero
-/* BD4238 802409C8 0C00F589 */  jal       func_8003D624
-/* BD423C 802409CC AFA20018 */   sw       $v0, 0x18($sp)
-/* BD4240 802409D0 240200FF */  addiu     $v0, $zero, 0xff
-/* BD4244 802409D4 A602009A */  sh        $v0, 0x9a($s0)
-.L802409D8:
-/* BD4248 802409D8 8FBF0024 */  lw        $ra, 0x24($sp)
-/* BD424C 802409DC 8FB00020 */  lw        $s0, 0x20($sp)
-/* BD4250 802409E0 03E00008 */  jr        $ra
-/* BD4254 802409E4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_802409E8_BD4258.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_802409E8_BD4258.s
deleted file mode 100644
index 1206524f3a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_802409E8_BD4258.s
+++ /dev/null
@@ -1,41 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802409E8_BD4258
-/* BD4258 802409E8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* BD425C 802409EC AFBF0010 */  sw        $ra, 0x10($sp)
-/* BD4260 802409F0 0C00EABB */  jal       get_npc_unsafe
-/* BD4264 802409F4 24040001 */   addiu    $a0, $zero, 1
-/* BD4268 802409F8 0C090248 */  jal       func_80240920_BD4190
-/* BD426C 802409FC 0040202D */   daddu    $a0, $v0, $zero
-/* BD4270 80240A00 0C00EABB */  jal       get_npc_unsafe
-/* BD4274 80240A04 24040002 */   addiu    $a0, $zero, 2
-/* BD4278 80240A08 0C090248 */  jal       func_80240920_BD4190
-/* BD427C 80240A0C 0040202D */   daddu    $a0, $v0, $zero
-/* BD4280 80240A10 0C00EABB */  jal       get_npc_unsafe
-/* BD4284 80240A14 24040003 */   addiu    $a0, $zero, 3
-/* BD4288 80240A18 0C090248 */  jal       func_80240920_BD4190
-/* BD428C 80240A1C 0040202D */   daddu    $a0, $v0, $zero
-/* BD4290 80240A20 0C00EABB */  jal       get_npc_unsafe
-/* BD4294 80240A24 24040004 */   addiu    $a0, $zero, 4
-/* BD4298 80240A28 0C090248 */  jal       func_80240920_BD4190
-/* BD429C 80240A2C 0040202D */   daddu    $a0, $v0, $zero
-/* BD42A0 80240A30 0C00EABB */  jal       get_npc_unsafe
-/* BD42A4 80240A34 24040005 */   addiu    $a0, $zero, 5
-/* BD42A8 80240A38 0C090248 */  jal       func_80240920_BD4190
-/* BD42AC 80240A3C 0040202D */   daddu    $a0, $v0, $zero
-/* BD42B0 80240A40 0C00EABB */  jal       get_npc_unsafe
-/* BD42B4 80240A44 24040006 */   addiu    $a0, $zero, 6
-/* BD42B8 80240A48 0C090248 */  jal       func_80240920_BD4190
-/* BD42BC 80240A4C 0040202D */   daddu    $a0, $v0, $zero
-/* BD42C0 80240A50 0C00EABB */  jal       get_npc_unsafe
-/* BD42C4 80240A54 24040007 */   addiu    $a0, $zero, 7
-/* BD42C8 80240A58 0C090248 */  jal       func_80240920_BD4190
-/* BD42CC 80240A5C 0040202D */   daddu    $a0, $v0, $zero
-/* BD42D0 80240A60 0C00EABB */  jal       get_npc_unsafe
-/* BD42D4 80240A64 24040008 */   addiu    $a0, $zero, 8
-/* BD42D8 80240A68 0C090248 */  jal       func_80240920_BD4190
-/* BD42DC 80240A6C 0040202D */   daddu    $a0, $v0, $zero
-/* BD42E0 80240A70 8FBF0010 */  lw        $ra, 0x10($sp)
-/* BD42E4 80240A74 03E00008 */  jr        $ra
-/* BD42E8 80240A78 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240A7C_BD42EC.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240A7C_BD42EC.s
deleted file mode 100644
index c8ac712707..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240A7C_BD42EC.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240A7C_BD42EC
-/* BD42EC 80240A7C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* BD42F0 80240A80 AFBF0010 */  sw        $ra, 0x10($sp)
-/* BD42F4 80240A84 0C00EABB */  jal       get_npc_unsafe
-/* BD42F8 80240A88 24040001 */   addiu    $a0, $zero, 1
-/* BD42FC 80240A8C 24040002 */  addiu     $a0, $zero, 2
-/* BD4300 80240A90 0C00EABB */  jal       get_npc_unsafe
-/* BD4304 80240A94 A44000A2 */   sh       $zero, 0xa2($v0)
-/* BD4308 80240A98 24040003 */  addiu     $a0, $zero, 3
-/* BD430C 80240A9C 0C00EABB */  jal       get_npc_unsafe
-/* BD4310 80240AA0 A44000A2 */   sh       $zero, 0xa2($v0)
-/* BD4314 80240AA4 24040004 */  addiu     $a0, $zero, 4
-/* BD4318 80240AA8 0C00EABB */  jal       get_npc_unsafe
-/* BD431C 80240AAC A44000A2 */   sh       $zero, 0xa2($v0)
-/* BD4320 80240AB0 24040005 */  addiu     $a0, $zero, 5
-/* BD4324 80240AB4 0C00EABB */  jal       get_npc_unsafe
-/* BD4328 80240AB8 A44000A2 */   sh       $zero, 0xa2($v0)
-/* BD432C 80240ABC 24040006 */  addiu     $a0, $zero, 6
-/* BD4330 80240AC0 0C00EABB */  jal       get_npc_unsafe
-/* BD4334 80240AC4 A44000A2 */   sh       $zero, 0xa2($v0)
-/* BD4338 80240AC8 24040007 */  addiu     $a0, $zero, 7
-/* BD433C 80240ACC 0C00EABB */  jal       get_npc_unsafe
-/* BD4340 80240AD0 A44000A2 */   sh       $zero, 0xa2($v0)
-/* BD4344 80240AD4 24040008 */  addiu     $a0, $zero, 8
-/* BD4348 80240AD8 0C00EABB */  jal       get_npc_unsafe
-/* BD434C 80240ADC A44000A2 */   sh       $zero, 0xa2($v0)
-/* BD4350 80240AE0 A44000A2 */  sh        $zero, 0xa2($v0)
-/* BD4354 80240AE4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* BD4358 80240AE8 03E00008 */  jr        $ra
-/* BD435C 80240AEC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s
deleted file mode 100644
index bf8a515467..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s
+++ /dev/null
@@ -1,128 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel jtbl_80246EC8_BDA738
-.word .L80240B3C_BD43AC, .L80240C84_BD44F4, .L80240C84_BD44F4, .L80240C84_BD44F4, .L80240C84_BD44F4, .L80240C84_BD44F4, .L80240C84_BD44F4, .L80240C84_BD44F4, .L80240C84_BD44F4, .L80240C84_BD44F4, .L80240B64_BD43D4, .L80240B9C_BD440C, .L80240C2C_BD449C, .L80240C68_BD44D8
-
-.section .text
-
-glabel func_80240AF0_BD4360
-/* BD4360 80240AF0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* BD4364 80240AF4 AFB10014 */  sw        $s1, 0x14($sp)
-/* BD4368 80240AF8 0080882D */  daddu     $s1, $a0, $zero
-/* BD436C 80240AFC AFBF001C */  sw        $ra, 0x1c($sp)
-/* BD4370 80240B00 AFB20018 */  sw        $s2, 0x18($sp)
-/* BD4374 80240B04 AFB00010 */  sw        $s0, 0x10($sp)
-/* BD4378 80240B08 0C00EABB */  jal       get_npc_unsafe
-/* BD437C 80240B0C 8E24014C */   lw       $a0, 0x14c($s1)
-/* BD4380 80240B10 0040802D */  daddu     $s0, $v0, $zero
-/* BD4384 80240B14 8E230074 */  lw        $v1, 0x74($s1)
-/* BD4388 80240B18 8E120020 */  lw        $s2, 0x20($s0)
-/* BD438C 80240B1C 2C62000E */  sltiu     $v0, $v1, 0xe
-/* BD4390 80240B20 10400058 */  beqz      $v0, .L80240C84_BD44F4
-/* BD4394 80240B24 00031080 */   sll      $v0, $v1, 2
-/* BD4398 80240B28 3C018024 */  lui       $at, %hi(jtbl_80246EC8_BDA738)
-/* BD439C 80240B2C 00220821 */  addu      $at, $at, $v0
-/* BD43A0 80240B30 8C226EC8 */  lw        $v0, %lo(jtbl_80246EC8_BDA738)($at)
-/* BD43A4 80240B34 00400008 */  jr        $v0
-/* BD43A8 80240B38 00000000 */   nop
-.L80240B3C_BD43AC:
-/* BD43AC 80240B3C 0220202D */  daddu     $a0, $s1, $zero
-/* BD43B0 80240B40 3C05F971 */  lui       $a1, 0xf971
-/* BD43B4 80240B44 0C0B1EAF */  jal       evt_get_variable
-/* BD43B8 80240B48 34A58888 */   ori      $a1, $a1, 0x8888
-/* BD43BC 80240B4C 0040182D */  daddu     $v1, $v0, $zero
-/* BD43C0 80240B50 24020001 */  addiu     $v0, $zero, 1
-/* BD43C4 80240B54 1462004B */  bne       $v1, $v0, .L80240C84_BD44F4
-/* BD43C8 80240B58 2402000A */   addiu    $v0, $zero, 0xa
-/* BD43CC 80240B5C 08090320 */  j         .L80240C80
-/* BD43D0 80240B60 AE430000 */   sw       $v1, ($s2)
-.L80240B64_BD43D4:
-/* BD43D4 80240B64 C600000C */  lwc1      $f0, 0xc($s0)
-/* BD43D8 80240B68 3C014000 */  lui       $at, 0x4000
-/* BD43DC 80240B6C 44816000 */  mtc1      $at, $f12
-/* BD43E0 80240B70 0C00A6C9 */  jal       clamp_angle
-/* BD43E4 80240B74 460C0300 */   add.s    $f12, $f0, $f12
-/* BD43E8 80240B78 9602008E */  lhu       $v0, 0x8e($s0)
-/* BD43EC 80240B7C E600000C */  swc1      $f0, 0xc($s0)
-/* BD43F0 80240B80 2442FFFF */  addiu     $v0, $v0, -1
-/* BD43F4 80240B84 A602008E */  sh        $v0, 0x8e($s0)
-/* BD43F8 80240B88 00021400 */  sll       $v0, $v0, 0x10
-/* BD43FC 80240B8C 1440003D */  bnez      $v0, .L80240C84_BD44F4
-/* BD4400 80240B90 2402000B */   addiu    $v0, $zero, 0xb
-/* BD4404 80240B94 08090321 */  j         .L80240C84_BD44F4
-/* BD4408 80240B98 AE220074 */   sw       $v0, 0x74($s1)
-.L80240B9C_BD440C:
-/* BD440C 80240B9C C602003C */  lwc1      $f2, 0x3c($s0)
-/* BD4410 80240BA0 3C01C466 */  lui       $at, 0xc466
-/* BD4414 80240BA4 44810000 */  mtc1      $at, $f0
-/* BD4418 80240BA8 00000000 */  nop
-/* BD441C 80240BAC 4600103E */  c.le.s    $f2, $f0
-/* BD4420 80240BB0 00000000 */  nop
-/* BD4424 80240BB4 45000003 */  bc1f      .L80240BC4
-/* BD4428 80240BB8 00000000 */   nop
-/* BD442C 80240BBC 0C09027A */  jal       func_802409E8_BD4258
-/* BD4430 80240BC0 00000000 */   nop
-.L80240BC4:
-/* BD4434 80240BC4 C600000C */  lwc1      $f0, 0xc($s0)
-/* BD4438 80240BC8 3C014000 */  lui       $at, 0x4000
-/* BD443C 80240BCC 44816000 */  mtc1      $at, $f12
-/* BD4440 80240BD0 0C00A6C9 */  jal       clamp_angle
-/* BD4444 80240BD4 460C0300 */   add.s    $f12, $f0, $f12
-/* BD4448 80240BD8 C604003C */  lwc1      $f4, 0x3c($s0)
-/* BD444C 80240BDC 3C013F00 */  lui       $at, 0x3f00
-/* BD4450 80240BE0 44811000 */  mtc1      $at, $f2
-/* BD4454 80240BE4 00000000 */  nop
-/* BD4458 80240BE8 46022101 */  sub.s     $f4, $f4, $f2
-/* BD445C 80240BEC 3C01C477 */  lui       $at, 0xc477
-/* BD4460 80240BF0 44811000 */  mtc1      $at, $f2
-/* BD4464 80240BF4 E600000C */  swc1      $f0, 0xc($s0)
-/* BD4468 80240BF8 4602203E */  c.le.s    $f4, $f2
-/* BD446C 80240BFC 00000000 */  nop
-/* BD4470 80240C00 45000020 */  bc1f      .L80240C84_BD44F4
-/* BD4474 80240C04 E604003C */   swc1     $f4, 0x3c($s0)
-/* BD4478 80240C08 0220202D */  daddu     $a0, $s1, $zero
-/* BD447C 80240C0C 3C05FD05 */  lui       $a1, 0xfd05
-/* BD4480 80240C10 34A50F81 */  ori       $a1, $a1, 0xf81
-/* BD4484 80240C14 0C0B2026 */  jal       evt_set_variable
-/* BD4488 80240C18 24060001 */   addiu    $a2, $zero, 1
-/* BD448C 80240C1C 0C09029F */  jal       func_80240A7C_BD42EC
-/* BD4490 80240C20 00000000 */   nop
-/* BD4494 80240C24 08090320 */  j         .L80240C80
-/* BD4498 80240C28 2402000C */   addiu    $v0, $zero, 0xc
-.L80240C2C_BD449C:
-/* BD449C 80240C2C 0220202D */  daddu     $a0, $s1, $zero
-/* BD44A0 80240C30 3C05FD05 */  lui       $a1, 0xfd05
-/* BD44A4 80240C34 0C0B1EAF */  jal       evt_get_variable
-/* BD44A8 80240C38 34A50F82 */   ori      $a1, $a1, 0xf82
-/* BD44AC 80240C3C 24030001 */  addiu     $v1, $zero, 1
-/* BD44B0 80240C40 14430002 */  bne       $v0, $v1, .L80240C4C
-/* BD44B4 80240C44 2402000D */   addiu    $v0, $zero, 0xd
-/* BD44B8 80240C48 AE220074 */  sw        $v0, 0x74($s1)
-.L80240C4C:
-/* BD44BC 80240C4C C600000C */  lwc1      $f0, 0xc($s0)
-/* BD44C0 80240C50 3C014000 */  lui       $at, 0x4000
-/* BD44C4 80240C54 44816000 */  mtc1      $at, $f12
-/* BD44C8 80240C58 0C00A6C9 */  jal       clamp_angle
-/* BD44CC 80240C5C 460C0300 */   add.s    $f12, $f0, $f12
-/* BD44D0 80240C60 08090321 */  j         .L80240C84_BD44F4
-/* BD44D4 80240C64 E600000C */   swc1     $f0, 0xc($s0)
-.L80240C68_BD44D8:
-/* BD44D8 80240C68 0220202D */  daddu     $a0, $s1, $zero
-/* BD44DC 80240C6C 3C05FD05 */  lui       $a1, 0xfd05
-/* BD44E0 80240C70 0C0B1EAF */  jal       evt_get_variable
-/* BD44E4 80240C74 34A50F82 */   ori      $a1, $a1, 0xf82
-/* BD44E8 80240C78 14400002 */  bnez      $v0, .L80240C84_BD44F4
-/* BD44EC 80240C7C 2402000C */   addiu    $v0, $zero, 0xc
-.L80240C80:
-/* BD44F0 80240C80 AE220074 */  sw        $v0, 0x74($s1)
-.L80240C84_BD44F4:
-/* BD44F4 80240C84 8FBF001C */  lw        $ra, 0x1c($sp)
-/* BD44F8 80240C88 8FB20018 */  lw        $s2, 0x18($sp)
-/* BD44FC 80240C8C 8FB10014 */  lw        $s1, 0x14($sp)
-/* BD4500 80240C90 8FB00010 */  lw        $s0, 0x10($sp)
-/* BD4504 80240C94 24020002 */  addiu     $v0, $zero, 2
-/* BD4508 80240C98 03E00008 */  jr        $ra
-/* BD450C 80240C9C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240CA0_BD4510.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240CA0_BD4510.s
deleted file mode 100644
index e1d25b3672..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240CA0_BD4510.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240CA0_BD4510
-/* BD4510 80240CA0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* BD4514 80240CA4 AFB10014 */  sw        $s1, 0x14($sp)
-/* BD4518 80240CA8 0080882D */  daddu     $s1, $a0, $zero
-/* BD451C 80240CAC AFBF0018 */  sw        $ra, 0x18($sp)
-/* BD4520 80240CB0 AFB00010 */  sw        $s0, 0x10($sp)
-/* BD4524 80240CB4 0C00EABB */  jal       get_npc_unsafe
-/* BD4528 80240CB8 8E24014C */   lw       $a0, 0x14c($s1)
-/* BD452C 80240CBC 0000202D */  daddu     $a0, $zero, $zero
-/* BD4530 80240CC0 0C00EABB */  jal       get_npc_unsafe
-/* BD4534 80240CC4 0040802D */   daddu    $s0, $v0, $zero
-/* BD4538 80240CC8 AE020020 */  sw        $v0, 0x20($s0)
-/* BD453C 80240CCC 8E23014C */  lw        $v1, 0x14c($s1)
-/* BD4540 80240CD0 00032040 */  sll       $a0, $v1, 1
-/* BD4544 80240CD4 00832021 */  addu      $a0, $a0, $v1
-/* BD4548 80240CD8 00041900 */  sll       $v1, $a0, 4
-/* BD454C 80240CDC 00641823 */  subu      $v1, $v1, $a0
-/* BD4550 80240CE0 AE230078 */  sw        $v1, 0x78($s1)
-/* BD4554 80240CE4 8E030000 */  lw        $v1, ($s0)
-/* BD4558 80240CE8 3C040004 */  lui       $a0, 4
-/* BD455C 80240CEC 00641825 */  or        $v1, $v1, $a0
-/* BD4560 80240CF0 AE030000 */  sw        $v1, ($s0)
-/* BD4564 80240CF4 AE200074 */  sw        $zero, 0x74($s1)
-/* BD4568 80240CF8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* BD456C 80240CFC 8FB10014 */  lw        $s1, 0x14($sp)
-/* BD4570 80240D00 8FB00010 */  lw        $s0, 0x10($sp)
-/* BD4574 80240D04 24020002 */  addiu     $v0, $zero, 2
-/* BD4578 80240D08 03E00008 */  jr        $ra
-/* BD457C 80240D0C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240FD8_BD4848.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240FD8_BD4848.s
deleted file mode 100644
index fc2463b7df..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240FD8_BD4848.s
+++ /dev/null
@@ -1,7 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240FD8_BD4848
-/* BD4848 80240FD8 AC800074 */  sw        $zero, 0x74($a0)
-/* BD484C 80240FDC 03E00008 */  jr        $ra
-/* BD4850 80240FE0 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_8024116C_BD49DC.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_8024116C_BD49DC.s
deleted file mode 100644
index 1a9d822536..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_8024116C_BD49DC.s
+++ /dev/null
@@ -1,53 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024116C_BD49DC
-/* BD49DC 8024116C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* BD49E0 80241170 AFB10014 */  sw        $s1, 0x14($sp)
-/* BD49E4 80241174 0080882D */  daddu     $s1, $a0, $zero
-/* BD49E8 80241178 AFBF0018 */  sw        $ra, 0x18($sp)
-/* BD49EC 8024117C AFB00010 */  sw        $s0, 0x10($sp)
-/* BD49F0 80241180 8E240088 */  lw        $a0, 0x88($s1)
-/* BD49F4 80241184 1480000B */  bnez      $a0, .L802411B4
-/* BD49F8 80241188 8E300084 */   lw       $s0, 0x84($s1)
-/* BD49FC 8024118C 0C00A67F */  jal       rand_int
-/* BD4A00 80241190 24040003 */   addiu    $a0, $zero, 3
-/* BD4A04 80241194 00021040 */  sll       $v0, $v0, 1
-/* BD4A08 80241198 3C018024 */  lui       $at, %hi(D_80244FEC_BD885C)
-/* BD4A0C 8024119C 00220821 */  addu      $at, $at, $v0
-/* BD4A10 802411A0 84224FEC */  lh        $v0, %lo(D_80244FEC_BD885C)($at)
-/* BD4A14 802411A4 24040032 */  addiu     $a0, $zero, 0x32
-/* BD4A18 802411A8 0C00A67F */  jal       rand_int
-/* BD4A1C 802411AC AE220078 */   sw       $v0, 0x78($s1)
-/* BD4A20 802411B0 2444001E */  addiu     $a0, $v0, 0x1e
-.L802411B4:
-/* BD4A24 802411B4 8E230078 */  lw        $v1, 0x78($s1)
-/* BD4A28 802411B8 0203102A */  slt       $v0, $s0, $v1
-/* BD4A2C 802411BC 10400006 */  beqz      $v0, .L802411D8
-/* BD4A30 802411C0 2484FFFF */   addiu    $a0, $a0, -1
-/* BD4A34 802411C4 2610000A */  addiu     $s0, $s0, 0xa
-/* BD4A38 802411C8 0070102A */  slt       $v0, $v1, $s0
-/* BD4A3C 802411CC 5040000A */  beql      $v0, $zero, .L802411F8
-/* BD4A40 802411D0 AE300084 */   sw       $s0, 0x84($s1)
-/* BD4A44 802411D4 0060802D */  daddu     $s0, $v1, $zero
-.L802411D8:
-/* BD4A48 802411D8 0070102A */  slt       $v0, $v1, $s0
-/* BD4A4C 802411DC 50400006 */  beql      $v0, $zero, .L802411F8
-/* BD4A50 802411E0 AE300084 */   sw       $s0, 0x84($s1)
-/* BD4A54 802411E4 2610FFF6 */  addiu     $s0, $s0, -0xa
-/* BD4A58 802411E8 0203102A */  slt       $v0, $s0, $v1
-/* BD4A5C 802411EC 54400001 */  bnel      $v0, $zero, .L802411F4
-/* BD4A60 802411F0 0060802D */   daddu    $s0, $v1, $zero
-.L802411F4:
-/* BD4A64 802411F4 AE300084 */  sw        $s0, 0x84($s1)
-.L802411F8:
-/* BD4A68 802411F8 AE240088 */  sw        $a0, 0x88($s1)
-/* BD4A6C 802411FC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* BD4A70 80241200 8FB10014 */  lw        $s1, 0x14($sp)
-/* BD4A74 80241204 8FB00010 */  lw        $s0, 0x10($sp)
-/* BD4A78 80241208 24020002 */  addiu     $v0, $zero, 2
-/* BD4A7C 8024120C 03E00008 */  jr        $ra
-/* BD4A80 80241210 27BD0020 */   addiu    $sp, $sp, 0x20
-/* BD4A84 80241214 00000000 */  nop
-/* BD4A88 80241218 00000000 */  nop
-/* BD4A8C 8024121C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241220_BD4A90.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241220_BD4A90.s
deleted file mode 100644
index dc3d5b6655..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241220_BD4A90.s
+++ /dev/null
@@ -1,43 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241220_BD4A90
-/* BD4A90 80241220 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* BD4A94 80241224 AFB20018 */  sw        $s2, 0x18($sp)
-/* BD4A98 80241228 0080902D */  daddu     $s2, $a0, $zero
-/* BD4A9C 8024122C 2404000B */  addiu     $a0, $zero, 0xb
-/* BD4AA0 80241230 AFBF001C */  sw        $ra, 0x1c($sp)
-/* BD4AA4 80241234 AFB10014 */  sw        $s1, 0x14($sp)
-/* BD4AA8 80241238 0C00EABB */  jal       get_npc_unsafe
-/* BD4AAC 8024123C AFB00010 */   sw       $s0, 0x10($sp)
-/* BD4AB0 80241240 0000202D */  daddu     $a0, $zero, $zero
-/* BD4AB4 80241244 0C00EABB */  jal       get_npc_unsafe
-/* BD4AB8 80241248 0040882D */   daddu    $s1, $v0, $zero
-/* BD4ABC 8024124C 0040802D */  daddu     $s0, $v0, $zero
-/* BD4AC0 80241250 C6000038 */  lwc1      $f0, 0x38($s0)
-/* BD4AC4 80241254 E6200038 */  swc1      $f0, 0x38($s1)
-/* BD4AC8 80241258 C6000040 */  lwc1      $f0, 0x40($s0)
-/* BD4ACC 8024125C E6200040 */  swc1      $f0, 0x40($s1)
-/* BD4AD0 80241260 C6440084 */  lwc1      $f4, 0x84($s2)
-/* BD4AD4 80241264 46802120 */  cvt.s.w   $f4, $f4
-/* BD4AD8 80241268 8E050010 */  lw        $a1, 0x10($s0)
-/* BD4ADC 8024126C 44062000 */  mfc1      $a2, $f4
-/* BD4AE0 80241270 0C00EA95 */  jal       npc_move_heading
-/* BD4AE4 80241274 0220202D */   daddu    $a0, $s1, $zero
-/* BD4AE8 80241278 C600003C */  lwc1      $f0, 0x3c($s0)
-/* BD4AEC 8024127C 3C01447A */  lui       $at, 0x447a
-/* BD4AF0 80241280 44811000 */  mtc1      $at, $f2
-/* BD4AF4 80241284 00000000 */  nop
-/* BD4AF8 80241288 46020000 */  add.s     $f0, $f0, $f2
-/* BD4AFC 8024128C 3C0141C8 */  lui       $at, 0x41c8
-/* BD4B00 80241290 44811000 */  mtc1      $at, $f2
-/* BD4B04 80241294 00000000 */  nop
-/* BD4B08 80241298 46020000 */  add.s     $f0, $f0, $f2
-/* BD4B0C 8024129C E620003C */  swc1      $f0, 0x3c($s1)
-/* BD4B10 802412A0 8FBF001C */  lw        $ra, 0x1c($sp)
-/* BD4B14 802412A4 8FB20018 */  lw        $s2, 0x18($sp)
-/* BD4B18 802412A8 8FB10014 */  lw        $s1, 0x14($sp)
-/* BD4B1C 802412AC 8FB00010 */  lw        $s0, 0x10($sp)
-/* BD4B20 802412B0 24020002 */  addiu     $v0, $zero, 2
-/* BD4B24 802412B4 03E00008 */  jr        $ra
-/* BD4B28 802412B8 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_802412BC_BD4B2C.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_802412BC_BD4B2C.s
deleted file mode 100644
index 64ee80e84f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_802412BC_BD4B2C.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802412BC_BD4B2C
-/* BD4B2C 802412BC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* BD4B30 802412C0 AFB00010 */  sw        $s0, 0x10($sp)
-/* BD4B34 802412C4 0080802D */  daddu     $s0, $a0, $zero
-/* BD4B38 802412C8 AFBF0014 */  sw        $ra, 0x14($sp)
-/* BD4B3C 802412CC 8E020084 */  lw        $v0, 0x84($s0)
-/* BD4B40 802412D0 2442FFFE */  addiu     $v0, $v0, -2
-/* BD4B44 802412D4 44826000 */  mtc1      $v0, $f12
-/* BD4B48 802412D8 00000000 */  nop
-/* BD4B4C 802412DC 0C00A6C9 */  jal       clamp_angle
-/* BD4B50 802412E0 46806320 */   cvt.s.w  $f12, $f12
-/* BD4B54 802412E4 4600008D */  trunc.w.s $f2, $f0
-/* BD4B58 802412E8 E6020084 */  swc1      $f2, 0x84($s0)
-/* BD4B5C 802412EC 8FBF0014 */  lw        $ra, 0x14($sp)
-/* BD4B60 802412F0 8FB00010 */  lw        $s0, 0x10($sp)
-/* BD4B64 802412F4 24020002 */  addiu     $v0, $zero, 2
-/* BD4B68 802412F8 03E00008 */  jr        $ra
-/* BD4B6C 802412FC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241300_BD4B70.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241300_BD4B70.s
deleted file mode 100644
index a2e2a94b61..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241300_BD4B70.s
+++ /dev/null
@@ -1,226 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241300_BD4B70
-/* BD4B70 80241300 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* BD4B74 80241304 AFB20020 */  sw        $s2, 0x20($sp)
-/* BD4B78 80241308 0080902D */  daddu     $s2, $a0, $zero
-/* BD4B7C 8024130C 24040001 */  addiu     $a0, $zero, 1
-/* BD4B80 80241310 AFBF003C */  sw        $ra, 0x3c($sp)
-/* BD4B84 80241314 AFBE0038 */  sw        $fp, 0x38($sp)
-/* BD4B88 80241318 AFB70034 */  sw        $s7, 0x34($sp)
-/* BD4B8C 8024131C AFB60030 */  sw        $s6, 0x30($sp)
-/* BD4B90 80241320 AFB5002C */  sw        $s5, 0x2c($sp)
-/* BD4B94 80241324 AFB40028 */  sw        $s4, 0x28($sp)
-/* BD4B98 80241328 AFB30024 */  sw        $s3, 0x24($sp)
-/* BD4B9C 8024132C AFB1001C */  sw        $s1, 0x1c($sp)
-/* BD4BA0 80241330 0C00EABB */  jal       get_npc_unsafe
-/* BD4BA4 80241334 AFB00018 */   sw       $s0, 0x18($sp)
-/* BD4BA8 80241338 24040002 */  addiu     $a0, $zero, 2
-/* BD4BAC 8024133C 0C00EABB */  jal       get_npc_unsafe
-/* BD4BB0 80241340 0040802D */   daddu    $s0, $v0, $zero
-/* BD4BB4 80241344 24040003 */  addiu     $a0, $zero, 3
-/* BD4BB8 80241348 0C00EABB */  jal       get_npc_unsafe
-/* BD4BBC 8024134C 0040982D */   daddu    $s3, $v0, $zero
-/* BD4BC0 80241350 24040004 */  addiu     $a0, $zero, 4
-/* BD4BC4 80241354 0C00EABB */  jal       get_npc_unsafe
-/* BD4BC8 80241358 0040A02D */   daddu    $s4, $v0, $zero
-/* BD4BCC 8024135C 24040005 */  addiu     $a0, $zero, 5
-/* BD4BD0 80241360 0C00EABB */  jal       get_npc_unsafe
-/* BD4BD4 80241364 0040A82D */   daddu    $s5, $v0, $zero
-/* BD4BD8 80241368 24040006 */  addiu     $a0, $zero, 6
-/* BD4BDC 8024136C 0C00EABB */  jal       get_npc_unsafe
-/* BD4BE0 80241370 0040B02D */   daddu    $s6, $v0, $zero
-/* BD4BE4 80241374 24040007 */  addiu     $a0, $zero, 7
-/* BD4BE8 80241378 0C00EABB */  jal       get_npc_unsafe
-/* BD4BEC 8024137C 0040B82D */   daddu    $s7, $v0, $zero
-/* BD4BF0 80241380 24040008 */  addiu     $a0, $zero, 8
-/* BD4BF4 80241384 0C00EABB */  jal       get_npc_unsafe
-/* BD4BF8 80241388 0040F02D */   daddu    $fp, $v0, $zero
-/* BD4BFC 8024138C 0240202D */  daddu     $a0, $s2, $zero
-/* BD4C00 80241390 3C05FD05 */  lui       $a1, 0xfd05
-/* BD4C04 80241394 34A50F83 */  ori       $a1, $a1, 0xf83
-/* BD4C08 80241398 0000302D */  daddu     $a2, $zero, $zero
-/* BD4C0C 8024139C AE400088 */  sw        $zero, 0x88($s2)
-/* BD4C10 802413A0 0C0B2026 */  jal       evt_set_variable
-/* BD4C14 802413A4 AFA20010 */   sw       $v0, 0x10($sp)
-/* BD4C18 802413A8 8E430084 */  lw        $v1, 0x84($s2)
-/* BD4C1C 802413AC C602000C */  lwc1      $f2, 0xc($s0)
-/* BD4C20 802413B0 2462FFE9 */  addiu     $v0, $v1, -0x17
-/* BD4C24 802413B4 44820000 */  mtc1      $v0, $f0
-/* BD4C28 802413B8 00000000 */  nop
-/* BD4C2C 802413BC 46800020 */  cvt.s.w   $f0, $f0
-/* BD4C30 802413C0 4600103E */  c.le.s    $f2, $f0
-/* BD4C34 802413C4 00000000 */  nop
-/* BD4C38 802413C8 4500000C */  bc1f      .L802413FC
-/* BD4C3C 802413CC 0000882D */   daddu    $s1, $zero, $zero
-/* BD4C40 802413D0 2462FFE5 */  addiu     $v0, $v1, -0x1b
-/* BD4C44 802413D4 44820000 */  mtc1      $v0, $f0
-/* BD4C48 802413D8 00000000 */  nop
-/* BD4C4C 802413DC 46800020 */  cvt.s.w   $f0, $f0
-/* BD4C50 802413E0 4602003E */  c.le.s    $f0, $f2
-/* BD4C54 802413E4 00000000 */  nop
-/* BD4C58 802413E8 45000004 */  bc1f      .L802413FC
-/* BD4C5C 802413EC 24020001 */   addiu    $v0, $zero, 1
-/* BD4C60 802413F0 AE420088 */  sw        $v0, 0x88($s2)
-/* BD4C64 802413F4 0040882D */  daddu     $s1, $v0, $zero
-/* BD4C68 802413F8 8E430084 */  lw        $v1, 0x84($s2)
-.L802413FC:
-/* BD4C6C 802413FC C662000C */  lwc1      $f2, 0xc($s3)
-/* BD4C70 80241400 2462FFE9 */  addiu     $v0, $v1, -0x17
-/* BD4C74 80241404 44820000 */  mtc1      $v0, $f0
-/* BD4C78 80241408 00000000 */  nop
-/* BD4C7C 8024140C 46800020 */  cvt.s.w   $f0, $f0
-/* BD4C80 80241410 4600103E */  c.le.s    $f2, $f0
-/* BD4C84 80241414 00000000 */  nop
-/* BD4C88 80241418 4500000A */  bc1f      .L80241444
-/* BD4C8C 8024141C 2462FFE5 */   addiu    $v0, $v1, -0x1b
-/* BD4C90 80241420 44820000 */  mtc1      $v0, $f0
-/* BD4C94 80241424 00000000 */  nop
-/* BD4C98 80241428 46800020 */  cvt.s.w   $f0, $f0
-/* BD4C9C 8024142C 4602003E */  c.le.s    $f0, $f2
-/* BD4CA0 80241430 00000000 */  nop
-/* BD4CA4 80241434 45000003 */  bc1f      .L80241444
-/* BD4CA8 80241438 24020001 */   addiu    $v0, $zero, 1
-/* BD4CAC 8024143C AE420088 */  sw        $v0, 0x88($s2)
-/* BD4CB0 80241440 24110002 */  addiu     $s1, $zero, 2
-.L80241444:
-/* BD4CB4 80241444 8E430084 */  lw        $v1, 0x84($s2)
-/* BD4CB8 80241448 C682000C */  lwc1      $f2, 0xc($s4)
-/* BD4CBC 8024144C 2462FFE9 */  addiu     $v0, $v1, -0x17
-/* BD4CC0 80241450 44820000 */  mtc1      $v0, $f0
-/* BD4CC4 80241454 00000000 */  nop
-/* BD4CC8 80241458 46800020 */  cvt.s.w   $f0, $f0
-/* BD4CCC 8024145C 4600103E */  c.le.s    $f2, $f0
-/* BD4CD0 80241460 00000000 */  nop
-/* BD4CD4 80241464 4500000B */  bc1f      .L80241494
-/* BD4CD8 80241468 2462FFE5 */   addiu    $v0, $v1, -0x1b
-/* BD4CDC 8024146C 44820000 */  mtc1      $v0, $f0
-/* BD4CE0 80241470 00000000 */  nop
-/* BD4CE4 80241474 46800020 */  cvt.s.w   $f0, $f0
-/* BD4CE8 80241478 4602003E */  c.le.s    $f0, $f2
-/* BD4CEC 8024147C 00000000 */  nop
-/* BD4CF0 80241480 45000004 */  bc1f      .L80241494
-/* BD4CF4 80241484 24020001 */   addiu    $v0, $zero, 1
-/* BD4CF8 80241488 AE420088 */  sw        $v0, 0x88($s2)
-/* BD4CFC 8024148C 24110003 */  addiu     $s1, $zero, 3
-/* BD4D00 80241490 8E430084 */  lw        $v1, 0x84($s2)
-.L80241494:
-/* BD4D04 80241494 C6A2000C */  lwc1      $f2, 0xc($s5)
-/* BD4D08 80241498 2462FFE9 */  addiu     $v0, $v1, -0x17
-/* BD4D0C 8024149C 44820000 */  mtc1      $v0, $f0
-/* BD4D10 802414A0 00000000 */  nop
-/* BD4D14 802414A4 46800020 */  cvt.s.w   $f0, $f0
-/* BD4D18 802414A8 4600103E */  c.le.s    $f2, $f0
-/* BD4D1C 802414AC 00000000 */  nop
-/* BD4D20 802414B0 4500000A */  bc1f      .L802414DC
-/* BD4D24 802414B4 2462FFE5 */   addiu    $v0, $v1, -0x1b
-/* BD4D28 802414B8 44820000 */  mtc1      $v0, $f0
-/* BD4D2C 802414BC 00000000 */  nop
-/* BD4D30 802414C0 46800020 */  cvt.s.w   $f0, $f0
-/* BD4D34 802414C4 4602003E */  c.le.s    $f0, $f2
-/* BD4D38 802414C8 00000000 */  nop
-/* BD4D3C 802414CC 45000003 */  bc1f      .L802414DC
-/* BD4D40 802414D0 24020001 */   addiu    $v0, $zero, 1
-/* BD4D44 802414D4 AE420088 */  sw        $v0, 0x88($s2)
-/* BD4D48 802414D8 24110004 */  addiu     $s1, $zero, 4
-.L802414DC:
-/* BD4D4C 802414DC 8E430084 */  lw        $v1, 0x84($s2)
-/* BD4D50 802414E0 C6C2000C */  lwc1      $f2, 0xc($s6)
-/* BD4D54 802414E4 2462FFE9 */  addiu     $v0, $v1, -0x17
-/* BD4D58 802414E8 44820000 */  mtc1      $v0, $f0
-/* BD4D5C 802414EC 00000000 */  nop
-/* BD4D60 802414F0 46800020 */  cvt.s.w   $f0, $f0
-/* BD4D64 802414F4 4600103E */  c.le.s    $f2, $f0
-/* BD4D68 802414F8 00000000 */  nop
-/* BD4D6C 802414FC 4500000B */  bc1f      .L8024152C
-/* BD4D70 80241500 2462FFE5 */   addiu    $v0, $v1, -0x1b
-/* BD4D74 80241504 44820000 */  mtc1      $v0, $f0
-/* BD4D78 80241508 00000000 */  nop
-/* BD4D7C 8024150C 46800020 */  cvt.s.w   $f0, $f0
-/* BD4D80 80241510 4602003E */  c.le.s    $f0, $f2
-/* BD4D84 80241514 00000000 */  nop
-/* BD4D88 80241518 45000004 */  bc1f      .L8024152C
-/* BD4D8C 8024151C 24020001 */   addiu    $v0, $zero, 1
-/* BD4D90 80241520 AE420088 */  sw        $v0, 0x88($s2)
-/* BD4D94 80241524 24110005 */  addiu     $s1, $zero, 5
-/* BD4D98 80241528 8E430084 */  lw        $v1, 0x84($s2)
-.L8024152C:
-/* BD4D9C 8024152C C6E2000C */  lwc1      $f2, 0xc($s7)
-/* BD4DA0 80241530 2462FFE9 */  addiu     $v0, $v1, -0x17
-/* BD4DA4 80241534 44820000 */  mtc1      $v0, $f0
-/* BD4DA8 80241538 00000000 */  nop
-/* BD4DAC 8024153C 46800020 */  cvt.s.w   $f0, $f0
-/* BD4DB0 80241540 4600103E */  c.le.s    $f2, $f0
-/* BD4DB4 80241544 00000000 */  nop
-/* BD4DB8 80241548 4500000A */  bc1f      .L80241574
-/* BD4DBC 8024154C 2462FFE5 */   addiu    $v0, $v1, -0x1b
-/* BD4DC0 80241550 44820000 */  mtc1      $v0, $f0
-/* BD4DC4 80241554 00000000 */  nop
-/* BD4DC8 80241558 46800020 */  cvt.s.w   $f0, $f0
-/* BD4DCC 8024155C 4602003E */  c.le.s    $f0, $f2
-/* BD4DD0 80241560 00000000 */  nop
-/* BD4DD4 80241564 45000003 */  bc1f      .L80241574
-/* BD4DD8 80241568 24020001 */   addiu    $v0, $zero, 1
-/* BD4DDC 8024156C AE420088 */  sw        $v0, 0x88($s2)
-/* BD4DE0 80241570 24110006 */  addiu     $s1, $zero, 6
-.L80241574:
-/* BD4DE4 80241574 8E430084 */  lw        $v1, 0x84($s2)
-/* BD4DE8 80241578 C7C2000C */  lwc1      $f2, 0xc($fp)
-/* BD4DEC 8024157C 2462FFE9 */  addiu     $v0, $v1, -0x17
-/* BD4DF0 80241580 44820000 */  mtc1      $v0, $f0
-/* BD4DF4 80241584 00000000 */  nop
-/* BD4DF8 80241588 46800020 */  cvt.s.w   $f0, $f0
-/* BD4DFC 8024158C 4600103E */  c.le.s    $f2, $f0
-/* BD4E00 80241590 00000000 */  nop
-/* BD4E04 80241594 4500000B */  bc1f      .L802415C4
-/* BD4E08 80241598 2462FFE5 */   addiu    $v0, $v1, -0x1b
-/* BD4E0C 8024159C 44820000 */  mtc1      $v0, $f0
-/* BD4E10 802415A0 00000000 */  nop
-/* BD4E14 802415A4 46800020 */  cvt.s.w   $f0, $f0
-/* BD4E18 802415A8 4602003E */  c.le.s    $f0, $f2
-/* BD4E1C 802415AC 00000000 */  nop
-/* BD4E20 802415B0 45000004 */  bc1f      .L802415C4
-/* BD4E24 802415B4 24020001 */   addiu    $v0, $zero, 1
-/* BD4E28 802415B8 AE420088 */  sw        $v0, 0x88($s2)
-/* BD4E2C 802415BC 24110007 */  addiu     $s1, $zero, 7
-/* BD4E30 802415C0 8E430084 */  lw        $v1, 0x84($s2)
-.L802415C4:
-/* BD4E34 802415C4 8FA70010 */  lw        $a3, 0x10($sp)
-/* BD4E38 802415C8 2462FFE9 */  addiu     $v0, $v1, -0x17
-/* BD4E3C 802415CC C4E2000C */  lwc1      $f2, 0xc($a3)
-/* BD4E40 802415D0 44820000 */  mtc1      $v0, $f0
-/* BD4E44 802415D4 00000000 */  nop
-/* BD4E48 802415D8 46800020 */  cvt.s.w   $f0, $f0
-/* BD4E4C 802415DC 4600103E */  c.le.s    $f2, $f0
-/* BD4E50 802415E0 00000000 */  nop
-/* BD4E54 802415E4 4500000A */  bc1f      .L80241610
-/* BD4E58 802415E8 2462FFE5 */   addiu    $v0, $v1, -0x1b
-/* BD4E5C 802415EC 44820000 */  mtc1      $v0, $f0
-/* BD4E60 802415F0 00000000 */  nop
-/* BD4E64 802415F4 46800020 */  cvt.s.w   $f0, $f0
-/* BD4E68 802415F8 4602003E */  c.le.s    $f0, $f2
-/* BD4E6C 802415FC 00000000 */  nop
-/* BD4E70 80241600 45000003 */  bc1f      .L80241610
-/* BD4E74 80241604 24020001 */   addiu    $v0, $zero, 1
-/* BD4E78 80241608 AE420088 */  sw        $v0, 0x88($s2)
-/* BD4E7C 8024160C 24110008 */  addiu     $s1, $zero, 8
-.L80241610:
-/* BD4E80 80241610 0240202D */  daddu     $a0, $s2, $zero
-/* BD4E84 80241614 3C05FD05 */  lui       $a1, 0xfd05
-/* BD4E88 80241618 34A50F83 */  ori       $a1, $a1, 0xf83
-/* BD4E8C 8024161C 0C0B2026 */  jal       evt_set_variable
-/* BD4E90 80241620 0220302D */   daddu    $a2, $s1, $zero
-/* BD4E94 80241624 8FBF003C */  lw        $ra, 0x3c($sp)
-/* BD4E98 80241628 8FBE0038 */  lw        $fp, 0x38($sp)
-/* BD4E9C 8024162C 8FB70034 */  lw        $s7, 0x34($sp)
-/* BD4EA0 80241630 8FB60030 */  lw        $s6, 0x30($sp)
-/* BD4EA4 80241634 8FB5002C */  lw        $s5, 0x2c($sp)
-/* BD4EA8 80241638 8FB40028 */  lw        $s4, 0x28($sp)
-/* BD4EAC 8024163C 8FB30024 */  lw        $s3, 0x24($sp)
-/* BD4EB0 80241640 8FB20020 */  lw        $s2, 0x20($sp)
-/* BD4EB4 80241644 8FB1001C */  lw        $s1, 0x1c($sp)
-/* BD4EB8 80241648 8FB00018 */  lw        $s0, 0x18($sp)
-/* BD4EBC 8024164C 24020002 */  addiu     $v0, $zero, 2
-/* BD4EC0 80241650 03E00008 */  jr        $ra
-/* BD4EC4 80241654 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241658_BD4EC8.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241658_BD4EC8.s
deleted file mode 100644
index 80b1a796ed..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241658_BD4EC8.s
+++ /dev/null
@@ -1,90 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241658_BD4EC8
-/* BD4EC8 80241658 27BDFC98 */  addiu     $sp, $sp, -0x368
-/* BD4ECC 8024165C AFB20358 */  sw        $s2, 0x358($sp)
-/* BD4ED0 80241660 3C128011 */  lui       $s2, %hi(gPlayerStatus)
-/* BD4ED4 80241664 2652EFC8 */  addiu     $s2, $s2, %lo(gPlayerStatus)
-/* BD4ED8 80241668 AFBF035C */  sw        $ra, 0x35c($sp)
-/* BD4EDC 8024166C AFB10354 */  sw        $s1, 0x354($sp)
-/* BD4EE0 80241670 AFB00350 */  sw        $s0, 0x350($sp)
-/* BD4EE4 80241674 F7B40360 */  sdc1      $f20, 0x360($sp)
-/* BD4EE8 80241678 C64C0028 */  lwc1      $f12, 0x28($s2)
-/* BD4EEC 8024167C 4480A000 */  mtc1      $zero, $f20
-/* BD4EF0 80241680 C64E0030 */  lwc1      $f14, 0x30($s2)
-/* BD4EF4 80241684 4406A000 */  mfc1      $a2, $f20
-/* BD4EF8 80241688 4407A000 */  mfc1      $a3, $f20
-/* BD4EFC 8024168C 0C00A7B5 */  jal       dist2D
-/* BD4F00 80241690 0080802D */   daddu    $s0, $a0, $zero
-/* BD4F04 80241694 24020001 */  addiu     $v0, $zero, 1
-/* BD4F08 80241698 46000106 */  mov.s     $f4, $f0
-/* BD4F0C 8024169C 3C0142B4 */  lui       $at, 0x42b4
-/* BD4F10 802416A0 44811000 */  mtc1      $at, $f2
-/* BD4F14 802416A4 00000000 */  nop
-/* BD4F18 802416A8 4604103C */  c.lt.s    $f2, $f4
-/* BD4F1C 802416AC 00000000 */  nop
-/* BD4F20 802416B0 45010002 */  bc1t      .L802416BC
-/* BD4F24 802416B4 0240882D */   daddu    $s1, $s2, $zero
-/* BD4F28 802416B8 0000102D */  daddu     $v0, $zero, $zero
-.L802416BC:
-/* BD4F2C 802416BC 3C014316 */  lui       $at, 0x4316
-/* BD4F30 802416C0 44810000 */  mtc1      $at, $f0
-/* BD4F34 802416C4 00000000 */  nop
-/* BD4F38 802416C8 4600203C */  c.lt.s    $f4, $f0
-/* BD4F3C 802416CC 00000000 */  nop
-/* BD4F40 802416D0 45010002 */  bc1t      .L802416DC
-/* BD4F44 802416D4 24030001 */   addiu    $v1, $zero, 1
-/* BD4F48 802416D8 0000182D */  daddu     $v1, $zero, $zero
-.L802416DC:
-/* BD4F4C 802416DC 00431025 */  or        $v0, $v0, $v1
-/* BD4F50 802416E0 1040001C */  beqz      $v0, .L80241754
-/* BD4F54 802416E4 00000000 */   nop
-/* BD4F58 802416E8 C64C0028 */  lwc1      $f12, 0x28($s2)
-/* BD4F5C 802416EC C64E0030 */  lwc1      $f14, 0x30($s2)
-/* BD4F60 802416F0 4406A000 */  mfc1      $a2, $f20
-/* BD4F64 802416F4 4407A000 */  mfc1      $a3, $f20
-/* BD4F68 802416F8 0C00A720 */  jal       atan2
-/* BD4F6C 802416FC 00000000 */   nop
-/* BD4F70 80241700 3C014334 */  lui       $at, 0x4334
-/* BD4F74 80241704 44811000 */  mtc1      $at, $f2
-/* BD4F78 80241708 00000000 */  nop
-/* BD4F7C 8024170C 46020000 */  add.s     $f0, $f0, $f2
-/* BD4F80 80241710 3C0542A0 */  lui       $a1, 0x42a0
-/* BD4F84 80241714 44060000 */  mfc1      $a2, $f0
-/* BD4F88 80241718 27A40010 */  addiu     $a0, $sp, 0x10
-/* BD4F8C 8024171C E7B40048 */  swc1      $f20, 0x48($sp)
-/* BD4F90 80241720 E7B4004C */  swc1      $f20, 0x4c($sp)
-/* BD4F94 80241724 0C00EA95 */  jal       npc_move_heading
-/* BD4F98 80241728 E7B40050 */   swc1     $f20, 0x50($sp)
-/* BD4F9C 8024172C C7A00048 */  lwc1      $f0, 0x48($sp)
-/* BD4FA0 80241730 4600018D */  trunc.w.s $f6, $f0
-/* BD4FA4 80241734 E6060084 */  swc1      $f6, 0x84($s0)
-/* BD4FA8 80241738 C7A0004C */  lwc1      $f0, 0x4c($sp)
-/* BD4FAC 8024173C 4600018D */  trunc.w.s $f6, $f0
-/* BD4FB0 80241740 E6060088 */  swc1      $f6, 0x88($s0)
-/* BD4FB4 80241744 C7A00050 */  lwc1      $f0, 0x50($sp)
-/* BD4FB8 80241748 24020001 */  addiu     $v0, $zero, 1
-/* BD4FBC 8024174C 080905DD */  j         .L80241774
-/* BD4FC0 80241750 AE020090 */   sw       $v0, 0x90($s0)
-.L80241754:
-/* BD4FC4 80241754 C6200028 */  lwc1      $f0, 0x28($s1)
-/* BD4FC8 80241758 4600018D */  trunc.w.s $f6, $f0
-/* BD4FCC 8024175C E6060084 */  swc1      $f6, 0x84($s0)
-/* BD4FD0 80241760 C620002C */  lwc1      $f0, 0x2c($s1)
-/* BD4FD4 80241764 4600018D */  trunc.w.s $f6, $f0
-/* BD4FD8 80241768 E6060088 */  swc1      $f6, 0x88($s0)
-/* BD4FDC 8024176C C6200030 */  lwc1      $f0, 0x30($s1)
-/* BD4FE0 80241770 AE000090 */  sw        $zero, 0x90($s0)
-.L80241774:
-/* BD4FE4 80241774 4600018D */  trunc.w.s $f6, $f0
-/* BD4FE8 80241778 E606008C */  swc1      $f6, 0x8c($s0)
-/* BD4FEC 8024177C 8FBF035C */  lw        $ra, 0x35c($sp)
-/* BD4FF0 80241780 8FB20358 */  lw        $s2, 0x358($sp)
-/* BD4FF4 80241784 8FB10354 */  lw        $s1, 0x354($sp)
-/* BD4FF8 80241788 8FB00350 */  lw        $s0, 0x350($sp)
-/* BD4FFC 8024178C D7B40360 */  ldc1      $f20, 0x360($sp)
-/* BD5000 80241790 24020002 */  addiu     $v0, $zero, 2
-/* BD5004 80241794 03E00008 */  jr        $ra
-/* BD5008 80241798 27BD0368 */   addiu    $sp, $sp, 0x368
-/* BD500C 8024179C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_09/BDABA0/func_802403F0_BDABA0.s b/ver/us/asm/nonmatchings/world/area_obk/obk_09/BDABA0/func_802403F0_BDABA0.s
deleted file mode 100644
index e1374058e2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_09/BDABA0/func_802403F0_BDABA0.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802403F0_BDABA0
-/* BDABA0 802403F0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* BDABA4 802403F4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* BDABA8 802403F8 0C04C3D6 */  jal       get_item_entity
-/* BDABAC 802403FC 8C840084 */   lw       $a0, 0x84($a0)
-/* BDABB0 80240400 3C013F19 */  lui       $at, 0x3f19
-/* BDABB4 80240404 3421999A */  ori       $at, $at, 0x999a
-/* BDABB8 80240408 44810000 */  mtc1      $at, $f0
-/* BDABBC 8024040C 00000000 */  nop
-/* BDABC0 80240410 E4400030 */  swc1      $f0, 0x30($v0)
-/* BDABC4 80240414 8FBF0010 */  lw        $ra, 0x10($sp)
-/* BDABC8 80240418 24020002 */  addiu     $v0, $zero, 2
-/* BDABCC 8024041C 03E00008 */  jr        $ra
-/* BDABD0 80240420 27BD0018 */   addiu    $sp, $sp, 0x18
-/* BDABD4 80240424 00000000 */  nop
-/* BDABD8 80240428 00000000 */  nop
-/* BDABDC 8024042C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9AEF0/func_80240000_D9AEF0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9AEF0/func_80240000_D9AEF0.s
deleted file mode 100644
index cd073ef448..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9AEF0/func_80240000_D9AEF0.s
+++ /dev/null
@@ -1,162 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_D9AEF0
-/* D9AEF0 80240000 27BDFF30 */  addiu     $sp, $sp, -0xd0
-/* D9AEF4 80240004 AFB600B0 */  sw        $s6, 0xb0($sp)
-/* D9AEF8 80240008 AFBF00B4 */  sw        $ra, 0xb4($sp)
-/* D9AEFC 8024000C AFB500AC */  sw        $s5, 0xac($sp)
-/* D9AF00 80240010 AFB400A8 */  sw        $s4, 0xa8($sp)
-/* D9AF04 80240014 AFB300A4 */  sw        $s3, 0xa4($sp)
-/* D9AF08 80240018 AFB200A0 */  sw        $s2, 0xa0($sp)
-/* D9AF0C 8024001C AFB1009C */  sw        $s1, 0x9c($sp)
-/* D9AF10 80240020 AFB00098 */  sw        $s0, 0x98($sp)
-/* D9AF14 80240024 F7B800C8 */  sdc1      $f24, 0xc8($sp)
-/* D9AF18 80240028 F7B600C0 */  sdc1      $f22, 0xc0($sp)
-/* D9AF1C 8024002C F7B400B8 */  sdc1      $f20, 0xb8($sp)
-/* D9AF20 80240030 10A0001E */  beqz      $a1, .L802400AC
-/* D9AF24 80240034 0080B02D */   daddu    $s6, $a0, $zero
-/* D9AF28 80240038 0C00AB39 */  jal       heap_malloc
-/* D9AF2C 8024003C 24040030 */   addiu    $a0, $zero, 0x30
-/* D9AF30 80240040 0040982D */  daddu     $s3, $v0, $zero
-/* D9AF34 80240044 0000A02D */  daddu     $s4, $zero, $zero
-/* D9AF38 80240048 26700008 */  addiu     $s0, $s3, 8
-/* D9AF3C 8024004C 3C014060 */  lui       $at, 0x4060
-/* D9AF40 80240050 4481A000 */  mtc1      $at, $f20
-/* D9AF44 80240054 3C128024 */  lui       $s2, %hi(D_802412A0_D9C190)
-/* D9AF48 80240058 265212A0 */  addiu     $s2, $s2, %lo(D_802412A0_D9C190)
-/* D9AF4C 8024005C AED30070 */  sw        $s3, 0x70($s6)
-.L80240060:
-/* D9AF50 80240060 8E440000 */  lw        $a0, ($s2)
-/* D9AF54 80240064 26520004 */  addiu     $s2, $s2, 4
-/* D9AF58 80240068 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* D9AF5C 8024006C AE04000C */   sw       $a0, 0xc($s0)
-/* D9AF60 80240070 0C046B4C */  jal       get_model_from_list_index
-/* D9AF64 80240074 0040202D */   daddu    $a0, $v0, $zero
-/* D9AF68 80240078 0040882D */  daddu     $s1, $v0, $zero
-/* D9AF6C 8024007C 26940001 */  addiu     $s4, $s4, 1
-/* D9AF70 80240080 C6200098 */  lwc1      $f0, 0x98($s1)
-/* D9AF74 80240084 2E820002 */  sltiu     $v0, $s4, 2
-/* D9AF78 80240088 E6600000 */  swc1      $f0, ($s3)
-/* D9AF7C 8024008C C62000A0 */  lwc1      $f0, 0xa0($s1)
-/* D9AF80 80240090 26730018 */  addiu     $s3, $s3, 0x18
-/* D9AF84 80240094 E6140004 */  swc1      $f20, 4($s0)
-/* D9AF88 80240098 AE000008 */  sw        $zero, 8($s0)
-/* D9AF8C 8024009C AE000000 */  sw        $zero, ($s0)
-/* D9AF90 802400A0 E600FFFC */  swc1      $f0, -4($s0)
-/* D9AF94 802400A4 1440FFEE */  bnez      $v0, .L80240060
-/* D9AF98 802400A8 26100018 */   addiu    $s0, $s0, 0x18
-.L802400AC:
-/* D9AF9C 802400AC 0000A02D */  daddu     $s4, $zero, $zero
-/* D9AFA0 802400B0 27B50058 */  addiu     $s5, $sp, 0x58
-/* D9AFA4 802400B4 8ED30070 */  lw        $s3, 0x70($s6)
-/* D9AFA8 802400B8 4480B000 */  mtc1      $zero, $f22
-/* D9AFAC 802400BC 26720004 */  addiu     $s2, $s3, 4
-.L802400C0:
-/* D9AFB0 802400C0 C64C000C */  lwc1      $f12, 0xc($s2)
-/* D9AFB4 802400C4 C6400008 */  lwc1      $f0, 8($s2)
-/* D9AFB8 802400C8 46006300 */  add.s     $f12, $f12, $f0
-/* D9AFBC 802400CC 0C00A6C9 */  jal       clamp_angle
-/* D9AFC0 802400D0 E64C000C */   swc1     $f12, 0xc($s2)
-/* D9AFC4 802400D4 46000306 */  mov.s     $f12, $f0
-/* D9AFC8 802400D8 0C00A8BB */  jal       sin_deg
-/* D9AFCC 802400DC E64C000C */   swc1     $f12, 0xc($s2)
-/* D9AFD0 802400E0 3C0141A0 */  lui       $at, 0x41a0
-/* D9AFD4 802400E4 44811000 */  mtc1      $at, $f2
-/* D9AFD8 802400E8 00000000 */  nop
-/* D9AFDC 802400EC 46020502 */  mul.s     $f20, $f0, $f2
-/* D9AFE0 802400F0 00000000 */  nop
-/* D9AFE4 802400F4 4614A082 */  mul.s     $f2, $f20, $f20
-/* D9AFE8 802400F8 00000000 */  nop
-/* D9AFEC 802400FC 3C0142B4 */  lui       $at, 0x42b4
-/* D9AFF0 80240100 44810000 */  mtc1      $at, $f0
-/* D9AFF4 80240104 1680001B */  bnez      $s4, .L80240174
-/* D9AFF8 80240108 46001603 */   div.s    $f24, $f2, $f0
-/* D9AFFC 8024010C C6400004 */  lwc1      $f0, 4($s2)
-/* D9B000 80240110 4600B03E */  c.le.s    $f22, $f0
-/* D9B004 80240114 00000000 */  nop
-/* D9B008 80240118 45000005 */  bc1f      .L80240130
-/* D9B00C 8024011C 00000000 */   nop
-/* D9B010 80240120 4616A03C */  c.lt.s    $f20, $f22
-/* D9B014 80240124 00000000 */  nop
-/* D9B018 80240128 4501000A */  bc1t      .L80240154
-/* D9B01C 8024012C 240401D6 */   addiu    $a0, $zero, 0x1d6
-.L80240130:
-/* D9B020 80240130 4616003C */  c.lt.s    $f0, $f22
-/* D9B024 80240134 00000000 */  nop
-/* D9B028 80240138 4502000E */  bc1fl     .L80240174
-/* D9B02C 8024013C E6540004 */   swc1     $f20, 4($s2)
-/* D9B030 80240140 4614B03E */  c.le.s    $f22, $f20
-/* D9B034 80240144 00000000 */  nop
-/* D9B038 80240148 4502000A */  bc1fl     .L80240174
-/* D9B03C 8024014C E6540004 */   swc1     $f20, 4($s2)
-/* D9B040 80240150 240401D6 */  addiu     $a0, $zero, 0x1d6
-.L80240154:
-/* D9B044 80240154 0000282D */  daddu     $a1, $zero, $zero
-/* D9B048 80240158 3C06C339 */  lui       $a2, 0xc339
-/* D9B04C 8024015C 3C014320 */  lui       $at, 0x4320
-/* D9B050 80240160 44810000 */  mtc1      $at, $f0
-/* D9B054 80240164 0000382D */  daddu     $a3, $zero, $zero
-/* D9B058 80240168 0C052757 */  jal       sfx_play_sound_at_position
-/* D9B05C 8024016C E7A00010 */   swc1     $f0, 0x10($sp)
-/* D9B060 80240170 E6540004 */  swc1      $f20, 4($s2)
-.L80240174:
-/* D9B064 80240174 8E440010 */  lw        $a0, 0x10($s2)
-/* D9B068 80240178 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* D9B06C 8024017C 26940001 */   addiu    $s4, $s4, 1
-/* D9B070 80240180 0C046B4C */  jal       get_model_from_list_index
-/* D9B074 80240184 0040202D */   daddu    $a0, $v0, $zero
-/* D9B078 80240188 0040882D */  daddu     $s1, $v0, $zero
-/* D9B07C 8024018C 96220000 */  lhu       $v0, ($s1)
-/* D9B080 80240190 4406B000 */  mfc1      $a2, $f22
-/* D9B084 80240194 34421400 */  ori       $v0, $v0, 0x1400
-/* D9B088 80240198 A6220000 */  sh        $v0, ($s1)
-/* D9B08C 8024019C C6600000 */  lwc1      $f0, ($s3)
-/* D9B090 802401A0 C6420000 */  lwc1      $f2, ($s2)
-/* D9B094 802401A4 46000007 */  neg.s     $f0, $f0
-/* D9B098 802401A8 46001087 */  neg.s     $f2, $f2
-/* D9B09C 802401AC 44050000 */  mfc1      $a1, $f0
-/* D9B0A0 802401B0 44071000 */  mfc1      $a3, $f2
-/* D9B0A4 802401B4 0C019E40 */  jal       guTranslateF
-/* D9B0A8 802401B8 27A40018 */   addiu    $a0, $sp, 0x18
-/* D9B0AC 802401BC 4405A000 */  mfc1      $a1, $f20
-/* D9B0B0 802401C0 4406B000 */  mfc1      $a2, $f22
-/* D9B0B4 802401C4 4407B000 */  mfc1      $a3, $f22
-/* D9B0B8 802401C8 3C013F80 */  lui       $at, 0x3f80
-/* D9B0BC 802401CC 44810000 */  mtc1      $at, $f0
-/* D9B0C0 802401D0 02A0202D */  daddu     $a0, $s5, $zero
-/* D9B0C4 802401D4 0C019EC8 */  jal       guRotateF
-/* D9B0C8 802401D8 E7A00010 */   swc1     $f0, 0x10($sp)
-/* D9B0CC 802401DC 27A40018 */  addiu     $a0, $sp, 0x18
-/* D9B0D0 802401E0 02A0282D */  daddu     $a1, $s5, $zero
-/* D9B0D4 802401E4 26300058 */  addiu     $s0, $s1, 0x58
-/* D9B0D8 802401E8 0C019D80 */  jal       guMtxCatF
-/* D9B0DC 802401EC 0200302D */   daddu    $a2, $s0, $zero
-/* D9B0E0 802401F0 27A40018 */  addiu     $a0, $sp, 0x18
-/* D9B0E4 802401F4 8E470000 */  lw        $a3, ($s2)
-/* D9B0E8 802401F8 26520018 */  addiu     $s2, $s2, 0x18
-/* D9B0EC 802401FC 8E650000 */  lw        $a1, ($s3)
-/* D9B0F0 80240200 4406C000 */  mfc1      $a2, $f24
-/* D9B0F4 80240204 0C019E40 */  jal       guTranslateF
-/* D9B0F8 80240208 26730018 */   addiu    $s3, $s3, 0x18
-/* D9B0FC 8024020C 0200202D */  daddu     $a0, $s0, $zero
-/* D9B100 80240210 27A50018 */  addiu     $a1, $sp, 0x18
-/* D9B104 80240214 0C019D80 */  jal       guMtxCatF
-/* D9B108 80240218 0080302D */   daddu    $a2, $a0, $zero
-/* D9B10C 8024021C 2E820002 */  sltiu     $v0, $s4, 2
-/* D9B110 80240220 1440FFA7 */  bnez      $v0, .L802400C0
-/* D9B114 80240224 0000102D */   daddu    $v0, $zero, $zero
-/* D9B118 80240228 8FBF00B4 */  lw        $ra, 0xb4($sp)
-/* D9B11C 8024022C 8FB600B0 */  lw        $s6, 0xb0($sp)
-/* D9B120 80240230 8FB500AC */  lw        $s5, 0xac($sp)
-/* D9B124 80240234 8FB400A8 */  lw        $s4, 0xa8($sp)
-/* D9B128 80240238 8FB300A4 */  lw        $s3, 0xa4($sp)
-/* D9B12C 8024023C 8FB200A0 */  lw        $s2, 0xa0($sp)
-/* D9B130 80240240 8FB1009C */  lw        $s1, 0x9c($sp)
-/* D9B134 80240244 8FB00098 */  lw        $s0, 0x98($sp)
-/* D9B138 80240248 D7B800C8 */  ldc1      $f24, 0xc8($sp)
-/* D9B13C 8024024C D7B600C0 */  ldc1      $f22, 0xc0($sp)
-/* D9B140 80240250 D7B400B8 */  ldc1      $f20, 0xb8($sp)
-/* D9B144 80240254 03E00008 */  jr        $ra
-/* D9B148 80240258 27BD00D0 */   addiu    $sp, $sp, 0xd0
-/* D9B14C 8024025C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240260_D9B150.s b/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240260_D9B150.s
deleted file mode 100644
index 9ab3c8a377..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240260_D9B150.s
+++ /dev/null
@@ -1,401 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240260_D9B150
-/* D9B150 80240260 27BDFF68 */  addiu     $sp, $sp, -0x98
-/* D9B154 80240264 AFB60060 */  sw        $s6, 0x60($sp)
-/* D9B158 80240268 0080B02D */  daddu     $s6, $a0, $zero
-/* D9B15C 8024026C AFBF0064 */  sw        $ra, 0x64($sp)
-/* D9B160 80240270 AFB5005C */  sw        $s5, 0x5c($sp)
-/* D9B164 80240274 AFB40058 */  sw        $s4, 0x58($sp)
-/* D9B168 80240278 AFB30054 */  sw        $s3, 0x54($sp)
-/* D9B16C 8024027C AFB20050 */  sw        $s2, 0x50($sp)
-/* D9B170 80240280 AFB1004C */  sw        $s1, 0x4c($sp)
-/* D9B174 80240284 AFB00048 */  sw        $s0, 0x48($sp)
-/* D9B178 80240288 F7BE0090 */  sdc1      $f30, 0x90($sp)
-/* D9B17C 8024028C F7BC0088 */  sdc1      $f28, 0x88($sp)
-/* D9B180 80240290 F7BA0080 */  sdc1      $f26, 0x80($sp)
-/* D9B184 80240294 F7B80078 */  sdc1      $f24, 0x78($sp)
-/* D9B188 80240298 F7B60070 */  sdc1      $f22, 0x70($sp)
-/* D9B18C 8024029C F7B40068 */  sdc1      $f20, 0x68($sp)
-/* D9B190 802402A0 8ED20148 */  lw        $s2, 0x148($s6)
-/* D9B194 802402A4 00A0882D */  daddu     $s1, $a1, $zero
-/* D9B198 802402A8 86440008 */  lh        $a0, 8($s2)
-/* D9B19C 802402AC 0C00EABB */  jal       get_npc_unsafe
-/* D9B1A0 802402B0 00C0A82D */   daddu    $s5, $a2, $zero
-/* D9B1A4 802402B4 8E240020 */  lw        $a0, 0x20($s1)
-/* D9B1A8 802402B8 0040802D */  daddu     $s0, $v0, $zero
-/* D9B1AC 802402BC 00041FC2 */  srl       $v1, $a0, 0x1f
-/* D9B1B0 802402C0 00832021 */  addu      $a0, $a0, $v1
-/* D9B1B4 802402C4 00042043 */  sra       $a0, $a0, 1
-/* D9B1B8 802402C8 0C00A67F */  jal       rand_int
-/* D9B1BC 802402CC 24840001 */   addiu    $a0, $a0, 1
-/* D9B1C0 802402D0 8E230020 */  lw        $v1, 0x20($s1)
-/* D9B1C4 802402D4 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* D9B1C8 802402D8 000327C2 */  srl       $a0, $v1, 0x1f
-/* D9B1CC 802402DC 00641821 */  addu      $v1, $v1, $a0
-/* D9B1D0 802402E0 00031843 */  sra       $v1, $v1, 1
-/* D9B1D4 802402E4 00621821 */  addu      $v1, $v1, $v0
-/* D9B1D8 802402E8 A603008E */  sh        $v1, 0x8e($s0)
-/* D9B1DC 802402EC 8E4200CC */  lw        $v0, 0xcc($s2)
-/* D9B1E0 802402F0 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* D9B1E4 802402F4 8C42000C */  lw        $v0, 0xc($v0)
-/* D9B1E8 802402F8 AE020028 */  sw        $v0, 0x28($s0)
-/* D9B1EC 802402FC C6200018 */  lwc1      $f0, 0x18($s1)
-/* D9B1F0 80240300 3C02800F */  lui       $v0, %hi(gPlayerStatusPtr)
-/* D9B1F4 80240304 8C427B30 */  lw        $v0, %lo(gPlayerStatusPtr)($v0)
-/* D9B1F8 80240308 E6000018 */  swc1      $f0, 0x18($s0)
-/* D9B1FC 8024030C 8C460028 */  lw        $a2, 0x28($v0)
-/* D9B200 80240310 8C470030 */  lw        $a3, 0x30($v0)
-/* D9B204 80240314 0C00A720 */  jal       atan2
-/* D9B208 80240318 0000982D */   daddu    $s3, $zero, $zero
-/* D9B20C 8024031C 3C014334 */  lui       $at, 0x4334
-/* D9B210 80240320 44816000 */  mtc1      $at, $f12
-/* D9B214 80240324 0C00A6C9 */  jal       clamp_angle
-/* D9B218 80240328 460C0300 */   add.s    $f12, $f0, $f12
-/* D9B21C 8024032C 46000506 */  mov.s     $f20, $f0
-/* D9B220 80240330 C60C000C */  lwc1      $f12, 0xc($s0)
-/* D9B224 80240334 0C00A70A */  jal       get_clamped_angle_diff
-/* D9B228 80240338 4600A386 */   mov.s    $f14, $f20
-/* D9B22C 8024033C 46000086 */  mov.s     $f2, $f0
-/* D9B230 80240340 8E22001C */  lw        $v0, 0x1c($s1)
-/* D9B234 80240344 46001005 */  abs.s     $f0, $f2
-/* D9B238 80240348 44822000 */  mtc1      $v0, $f4
-/* D9B23C 8024034C 00000000 */  nop
-/* D9B240 80240350 46802120 */  cvt.s.w   $f4, $f4
-/* D9B244 80240354 4600203C */  c.lt.s    $f4, $f0
-/* D9B248 80240358 00000000 */  nop
-/* D9B24C 8024035C 4500000D */  bc1f      .L80240394
-/* D9B250 80240360 00000000 */   nop
-/* D9B254 80240364 44800000 */  mtc1      $zero, $f0
-/* D9B258 80240368 C614000C */  lwc1      $f20, 0xc($s0)
-/* D9B25C 8024036C 4600103C */  c.lt.s    $f2, $f0
-/* D9B260 80240370 00000000 */  nop
-/* D9B264 80240374 45000006 */  bc1f      .L80240390
-/* D9B268 80240378 00021023 */   negu     $v0, $v0
-/* D9B26C 8024037C 44820000 */  mtc1      $v0, $f0
-/* D9B270 80240380 00000000 */  nop
-/* D9B274 80240384 46800020 */  cvt.s.w   $f0, $f0
-/* D9B278 80240388 080900E5 */  j         .L80240394
-/* D9B27C 8024038C 4600A500 */   add.s    $f20, $f20, $f0
-.L80240390:
-/* D9B280 80240390 4604A500 */  add.s     $f20, $f20, $f4
-.L80240394:
-/* D9B284 80240394 0C00A6C9 */  jal       clamp_angle
-/* D9B288 80240398 4600A306 */   mov.s    $f12, $f20
-/* D9B28C 8024039C 3C14800F */  lui       $s4, %hi(gPlayerStatusPtr)
-/* D9B290 802403A0 26947B30 */  addiu     $s4, $s4, %lo(gPlayerStatusPtr)
-/* D9B294 802403A4 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* D9B298 802403A8 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* D9B29C 802403AC 8E820000 */  lw        $v0, ($s4)
-/* D9B2A0 802403B0 C602003C */  lwc1      $f2, 0x3c($s0)
-/* D9B2A4 802403B4 E600000C */  swc1      $f0, 0xc($s0)
-/* D9B2A8 802403B8 46006006 */  mov.s     $f0, $f12
-/* D9B2AC 802403BC 8C460028 */  lw        $a2, 0x28($v0)
-/* D9B2B0 802403C0 8C470030 */  lw        $a3, 0x30($v0)
-/* D9B2B4 802403C4 46007106 */  mov.s     $f4, $f14
-/* D9B2B8 802403C8 E7A00020 */  swc1      $f0, 0x20($sp)
-/* D9B2BC 802403CC E7A20024 */  swc1      $f2, 0x24($sp)
-/* D9B2C0 802403D0 0C00A720 */  jal       atan2
-/* D9B2C4 802403D4 E7A40028 */   swc1     $f4, 0x28($sp)
-/* D9B2C8 802403D8 3C014334 */  lui       $at, 0x4334
-/* D9B2CC 802403DC 44816000 */  mtc1      $at, $f12
-/* D9B2D0 802403E0 0C00A6C9 */  jal       clamp_angle
-/* D9B2D4 802403E4 460C0300 */   add.s    $f12, $f0, $f12
-/* D9B2D8 802403E8 C6020018 */  lwc1      $f2, 0x18($s0)
-/* D9B2DC 802403EC 3C014012 */  lui       $at, 0x4012
-/* D9B2E0 802403F0 4481E800 */  mtc1      $at, $f29
-/* D9B2E4 802403F4 4480E000 */  mtc1      $zero, $f28
-/* D9B2E8 802403F8 460010A1 */  cvt.d.s   $f2, $f2
-/* D9B2EC 802403FC 463C1082 */  mul.d     $f2, $f2, $f28
-/* D9B2F0 80240400 00000000 */  nop
-/* D9B2F4 80240404 46000506 */  mov.s     $f20, $f0
-/* D9B2F8 80240408 27A50020 */  addiu     $a1, $sp, 0x20
-/* D9B2FC 8024040C 27A60024 */  addiu     $a2, $sp, 0x24
-/* D9B300 80240410 27A70028 */  addiu     $a3, $sp, 0x28
-/* D9B304 80240414 E7B40014 */  swc1      $f20, 0x14($sp)
-/* D9B308 80240418 462010A0 */  cvt.s.d   $f2, $f2
-/* D9B30C 8024041C E7A20010 */  swc1      $f2, 0x10($sp)
-/* D9B310 80240420 860200A8 */  lh        $v0, 0xa8($s0)
-/* D9B314 80240424 4480B000 */  mtc1      $zero, $f22
-/* D9B318 80240428 44820000 */  mtc1      $v0, $f0
-/* D9B31C 8024042C 00000000 */  nop
-/* D9B320 80240430 46800020 */  cvt.s.w   $f0, $f0
-/* D9B324 80240434 E7A00018 */  swc1      $f0, 0x18($sp)
-/* D9B328 80240438 860200A6 */  lh        $v0, 0xa6($s0)
-/* D9B32C 8024043C 4600B606 */  mov.s     $f24, $f22
-/* D9B330 80240440 44820000 */  mtc1      $v0, $f0
-/* D9B334 80240444 00000000 */  nop
-/* D9B338 80240448 46800020 */  cvt.s.w   $f0, $f0
-/* D9B33C 8024044C E7A0001C */  swc1      $f0, 0x1c($sp)
-/* D9B340 80240450 8E040080 */  lw        $a0, 0x80($s0)
-/* D9B344 80240454 0C03773B */  jal       npc_test_move_simple_without_slipping
-/* D9B348 80240458 4600C686 */   mov.s    $f26, $f24
-/* D9B34C 8024045C 104000E1 */  beqz      $v0, .L802407E4
-/* D9B350 80240460 00000000 */   nop
-/* D9B354 80240464 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* D9B358 80240468 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* D9B35C 8024046C 8FA60020 */  lw        $a2, 0x20($sp)
-/* D9B360 80240470 0C00A7B5 */  jal       dist2D
-/* D9B364 80240474 8FA70028 */   lw       $a3, 0x28($sp)
-/* D9B368 80240478 46000586 */  mov.s     $f22, $f0
-/* D9B36C 8024047C C6020038 */  lwc1      $f2, 0x38($s0)
-/* D9B370 80240480 C604003C */  lwc1      $f4, 0x3c($s0)
-/* D9B374 80240484 3C01420C */  lui       $at, 0x420c
-/* D9B378 80240488 4481F000 */  mtc1      $at, $f30
-/* D9B37C 8024048C C6000040 */  lwc1      $f0, 0x40($s0)
-/* D9B380 80240490 461EA300 */  add.s     $f12, $f20, $f30
-/* D9B384 80240494 E7A2002C */  swc1      $f2, 0x2c($sp)
-/* D9B388 80240498 E7A40030 */  swc1      $f4, 0x30($sp)
-/* D9B38C 8024049C 0C00A6C9 */  jal       clamp_angle
-/* D9B390 802404A0 E7A00034 */   swc1     $f0, 0x34($sp)
-/* D9B394 802404A4 C6020018 */  lwc1      $f2, 0x18($s0)
-/* D9B398 802404A8 460010A1 */  cvt.d.s   $f2, $f2
-/* D9B39C 802404AC 463C1082 */  mul.d     $f2, $f2, $f28
-/* D9B3A0 802404B0 00000000 */  nop
-/* D9B3A4 802404B4 E7A00014 */  swc1      $f0, 0x14($sp)
-/* D9B3A8 802404B8 462010A0 */  cvt.s.d   $f2, $f2
-/* D9B3AC 802404BC E7A20010 */  swc1      $f2, 0x10($sp)
-/* D9B3B0 802404C0 860200A8 */  lh        $v0, 0xa8($s0)
-/* D9B3B4 802404C4 27A5002C */  addiu     $a1, $sp, 0x2c
-/* D9B3B8 802404C8 44820000 */  mtc1      $v0, $f0
-/* D9B3BC 802404CC 00000000 */  nop
-/* D9B3C0 802404D0 46800020 */  cvt.s.w   $f0, $f0
-/* D9B3C4 802404D4 E7A00018 */  swc1      $f0, 0x18($sp)
-/* D9B3C8 802404D8 860200A6 */  lh        $v0, 0xa6($s0)
-/* D9B3CC 802404DC 27A60030 */  addiu     $a2, $sp, 0x30
-/* D9B3D0 802404E0 44820000 */  mtc1      $v0, $f0
-/* D9B3D4 802404E4 00000000 */  nop
-/* D9B3D8 802404E8 46800020 */  cvt.s.w   $f0, $f0
-/* D9B3DC 802404EC E7A0001C */  swc1      $f0, 0x1c($sp)
-/* D9B3E0 802404F0 8E040080 */  lw        $a0, 0x80($s0)
-/* D9B3E4 802404F4 0C03773B */  jal       npc_test_move_simple_without_slipping
-/* D9B3E8 802404F8 27A70034 */   addiu    $a3, $sp, 0x34
-/* D9B3EC 802404FC 10400007 */  beqz      $v0, .L8024051C
-/* D9B3F0 80240500 00000000 */   nop
-/* D9B3F4 80240504 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* D9B3F8 80240508 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* D9B3FC 8024050C 8FA6002C */  lw        $a2, 0x2c($sp)
-/* D9B400 80240510 0C00A7B5 */  jal       dist2D
-/* D9B404 80240514 8FA70034 */   lw       $a3, 0x34($sp)
-/* D9B408 80240518 46000606 */  mov.s     $f24, $f0
-.L8024051C:
-/* D9B40C 8024051C C6000038 */  lwc1      $f0, 0x38($s0)
-/* D9B410 80240520 C602003C */  lwc1      $f2, 0x3c($s0)
-/* D9B414 80240524 C6040040 */  lwc1      $f4, 0x40($s0)
-/* D9B418 80240528 461EA301 */  sub.s     $f12, $f20, $f30
-/* D9B41C 8024052C E7A00038 */  swc1      $f0, 0x38($sp)
-/* D9B420 80240530 E7A2003C */  swc1      $f2, 0x3c($sp)
-/* D9B424 80240534 0C00A6C9 */  jal       clamp_angle
-/* D9B428 80240538 E7A40040 */   swc1     $f4, 0x40($sp)
-/* D9B42C 8024053C C6020018 */  lwc1      $f2, 0x18($s0)
-/* D9B430 80240540 460010A1 */  cvt.d.s   $f2, $f2
-/* D9B434 80240544 463C1082 */  mul.d     $f2, $f2, $f28
-/* D9B438 80240548 00000000 */  nop
-/* D9B43C 8024054C E7A00014 */  swc1      $f0, 0x14($sp)
-/* D9B440 80240550 462010A0 */  cvt.s.d   $f2, $f2
-/* D9B444 80240554 E7A20010 */  swc1      $f2, 0x10($sp)
-/* D9B448 80240558 860200A8 */  lh        $v0, 0xa8($s0)
-/* D9B44C 8024055C 27A50038 */  addiu     $a1, $sp, 0x38
-/* D9B450 80240560 44820000 */  mtc1      $v0, $f0
-/* D9B454 80240564 00000000 */  nop
-/* D9B458 80240568 46800020 */  cvt.s.w   $f0, $f0
-/* D9B45C 8024056C E7A00018 */  swc1      $f0, 0x18($sp)
-/* D9B460 80240570 860200A6 */  lh        $v0, 0xa6($s0)
-/* D9B464 80240574 27A6003C */  addiu     $a2, $sp, 0x3c
-/* D9B468 80240578 44820000 */  mtc1      $v0, $f0
-/* D9B46C 8024057C 00000000 */  nop
-/* D9B470 80240580 46800020 */  cvt.s.w   $f0, $f0
-/* D9B474 80240584 E7A0001C */  swc1      $f0, 0x1c($sp)
-/* D9B478 80240588 8E040080 */  lw        $a0, 0x80($s0)
-/* D9B47C 8024058C 0C03773B */  jal       npc_test_move_simple_without_slipping
-/* D9B480 80240590 27A70040 */   addiu    $a3, $sp, 0x40
-/* D9B484 80240594 10400007 */  beqz      $v0, .L802405B4
-/* D9B488 80240598 00000000 */   nop
-/* D9B48C 8024059C C60C0038 */  lwc1      $f12, 0x38($s0)
-/* D9B490 802405A0 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* D9B494 802405A4 8FA60038 */  lw        $a2, 0x38($sp)
-/* D9B498 802405A8 0C00A7B5 */  jal       dist2D
-/* D9B49C 802405AC 8FA70040 */   lw       $a3, 0x40($sp)
-/* D9B4A0 802405B0 46000686 */  mov.s     $f26, $f0
-.L802405B4:
-/* D9B4A4 802405B4 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* D9B4A8 802405B8 8E820000 */  lw        $v0, ($s4)
-/* D9B4AC 802405BC C60E0040 */  lwc1      $f14, 0x40($s0)
-/* D9B4B0 802405C0 8C460028 */  lw        $a2, 0x28($v0)
-/* D9B4B4 802405C4 0C00A7B5 */  jal       dist2D
-/* D9B4B8 802405C8 8C470030 */   lw       $a3, 0x30($v0)
-/* D9B4BC 802405CC C6000018 */  lwc1      $f0, 0x18($s0)
-/* D9B4C0 802405D0 3C013FF8 */  lui       $at, 0x3ff8
-/* D9B4C4 802405D4 44811800 */  mtc1      $at, $f3
-/* D9B4C8 802405D8 44801000 */  mtc1      $zero, $f2
-/* D9B4CC 802405DC 46000021 */  cvt.d.s   $f0, $f0
-/* D9B4D0 802405E0 46220082 */  mul.d     $f2, $f0, $f2
-/* D9B4D4 802405E4 00000000 */  nop
-/* D9B4D8 802405E8 4600B021 */  cvt.d.s   $f0, $f22
-/* D9B4DC 802405EC 4622003C */  c.lt.d    $f0, $f2
-/* D9B4E0 802405F0 00000000 */  nop
-/* D9B4E4 802405F4 45000012 */  bc1f      .L80240640
-/* D9B4E8 802405F8 00000000 */   nop
-/* D9B4EC 802405FC 4600C021 */  cvt.d.s   $f0, $f24
-/* D9B4F0 80240600 4622003C */  c.lt.d    $f0, $f2
-/* D9B4F4 80240604 00000000 */  nop
-/* D9B4F8 80240608 4500000D */  bc1f      .L80240640
-/* D9B4FC 8024060C 00000000 */   nop
-/* D9B500 80240610 4600D021 */  cvt.d.s   $f0, $f26
-/* D9B504 80240614 4622003C */  c.lt.d    $f0, $f2
-/* D9B508 80240618 00000000 */  nop
-/* D9B50C 8024061C 45000008 */  bc1f      .L80240640
-/* D9B510 80240620 02A0202D */   daddu    $a0, $s5, $zero
-/* D9B514 80240624 AFA00010 */  sw        $zero, 0x10($sp)
-/* D9B518 80240628 8E26000C */  lw        $a2, 0xc($s1)
-/* D9B51C 8024062C 8E270010 */  lw        $a3, 0x10($s1)
-/* D9B520 80240630 0C01242D */  jal       basic_ai_check_player_dist
-/* D9B524 80240634 0240282D */   daddu    $a1, $s2, $zero
-/* D9B528 80240638 54400001 */  bnel      $v0, $zero, .L80240640
-/* D9B52C 8024063C 24130001 */   addiu    $s3, $zero, 1
-.L80240640:
-/* D9B530 80240640 1660006A */  bnez      $s3, .L802407EC
-/* D9B534 80240644 2402000A */   addiu    $v0, $zero, 0xa
-/* D9B538 80240648 4616C03C */  c.lt.s    $f24, $f22
-/* D9B53C 8024064C 00000000 */  nop
-/* D9B540 80240650 4500000C */  bc1f      .L80240684
-/* D9B544 80240654 00000000 */   nop
-/* D9B548 80240658 4618D03C */  c.lt.s    $f26, $f24
-/* D9B54C 8024065C 00000000 */  nop
-/* D9B550 80240660 45000006 */  bc1f      .L8024067C
-/* D9B554 80240664 00000000 */   nop
-/* D9B558 80240668 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* D9B55C 8024066C C60E0040 */  lwc1      $f14, 0x40($s0)
-/* D9B560 80240670 8FA60020 */  lw        $a2, 0x20($sp)
-/* D9B564 80240674 080901DA */  j         .L80240768
-/* D9B568 80240678 8FA70028 */   lw       $a3, 0x28($sp)
-.L8024067C:
-/* D9B56C 8024067C 4616C03C */  c.lt.s    $f24, $f22
-/* D9B570 80240680 00000000 */  nop
-.L80240684:
-/* D9B574 80240684 4500000A */  bc1f      .L802406B0
-/* D9B578 80240688 00000000 */   nop
-/* D9B57C 8024068C 461AC03C */  c.lt.s    $f24, $f26
-/* D9B580 80240690 00000000 */  nop
-/* D9B584 80240694 45000006 */  bc1f      .L802406B0
-/* D9B588 80240698 00000000 */   nop
-/* D9B58C 8024069C C60C0038 */  lwc1      $f12, 0x38($s0)
-/* D9B590 802406A0 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* D9B594 802406A4 8FA60020 */  lw        $a2, 0x20($sp)
-/* D9B598 802406A8 080901DA */  j         .L80240768
-/* D9B59C 802406AC 8FA70028 */   lw       $a3, 0x28($sp)
-.L802406B0:
-/* D9B5A0 802406B0 4618B03C */  c.lt.s    $f22, $f24
-/* D9B5A4 802406B4 00000000 */  nop
-/* D9B5A8 802406B8 4500000A */  bc1f      .L802406E4
-/* D9B5AC 802406BC 00000000 */   nop
-/* D9B5B0 802406C0 4616D03C */  c.lt.s    $f26, $f22
-/* D9B5B4 802406C4 00000000 */  nop
-/* D9B5B8 802406C8 45000006 */  bc1f      .L802406E4
-/* D9B5BC 802406CC 00000000 */   nop
-/* D9B5C0 802406D0 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* D9B5C4 802406D4 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* D9B5C8 802406D8 8FA6002C */  lw        $a2, 0x2c($sp)
-/* D9B5CC 802406DC 080901DA */  j         .L80240768
-/* D9B5D0 802406E0 8FA70034 */   lw       $a3, 0x34($sp)
-.L802406E4:
-/* D9B5D4 802406E4 4618D03C */  c.lt.s    $f26, $f24
-/* D9B5D8 802406E8 00000000 */  nop
-/* D9B5DC 802406EC 4500000A */  bc1f      .L80240718
-/* D9B5E0 802406F0 00000000 */   nop
-/* D9B5E4 802406F4 461AB03C */  c.lt.s    $f22, $f26
-/* D9B5E8 802406F8 00000000 */  nop
-/* D9B5EC 802406FC 45000008 */  bc1f      .L80240720
-/* D9B5F0 80240700 00000000 */   nop
-/* D9B5F4 80240704 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* D9B5F8 80240708 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* D9B5FC 8024070C 8FA6002C */  lw        $a2, 0x2c($sp)
-/* D9B600 80240710 080901DA */  j         .L80240768
-/* D9B604 80240714 8FA70034 */   lw       $a3, 0x34($sp)
-.L80240718:
-/* D9B608 80240718 461AB03C */  c.lt.s    $f22, $f26
-/* D9B60C 8024071C 00000000 */  nop
-.L80240720:
-/* D9B610 80240720 45000005 */  bc1f      .L80240738
-/* D9B614 80240724 00000000 */   nop
-/* D9B618 80240728 4616C03C */  c.lt.s    $f24, $f22
-/* D9B61C 8024072C 00000000 */  nop
-/* D9B620 80240730 45010009 */  bc1t      .L80240758
-/* D9B624 80240734 00000000 */   nop
-.L80240738:
-/* D9B628 80240738 461AC03C */  c.lt.s    $f24, $f26
-/* D9B62C 8024073C 00000000 */  nop
-/* D9B630 80240740 4500000C */  bc1f      .L80240774
-/* D9B634 80240744 00000000 */   nop
-/* D9B638 80240748 4618B03C */  c.lt.s    $f22, $f24
-/* D9B63C 8024074C 00000000 */  nop
-/* D9B640 80240750 45000008 */  bc1f      .L80240774
-/* D9B644 80240754 00000000 */   nop
-.L80240758:
-/* D9B648 80240758 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* D9B64C 8024075C C60E0040 */  lwc1      $f14, 0x40($s0)
-/* D9B650 80240760 8FA60038 */  lw        $a2, 0x38($sp)
-/* D9B654 80240764 8FA70040 */  lw        $a3, 0x40($sp)
-.L80240768:
-/* D9B658 80240768 0C00A720 */  jal       atan2
-/* D9B65C 8024076C 00000000 */   nop
-/* D9B660 80240770 46000506 */  mov.s     $f20, $f0
-.L80240774:
-/* D9B664 80240774 C60C000C */  lwc1      $f12, 0xc($s0)
-/* D9B668 80240778 0C00A70A */  jal       get_clamped_angle_diff
-/* D9B66C 8024077C 4600A386 */   mov.s    $f14, $f20
-/* D9B670 80240780 46000086 */  mov.s     $f2, $f0
-/* D9B674 80240784 8E22001C */  lw        $v0, 0x1c($s1)
-/* D9B678 80240788 46001005 */  abs.s     $f0, $f2
-/* D9B67C 8024078C 44822000 */  mtc1      $v0, $f4
-/* D9B680 80240790 00000000 */  nop
-/* D9B684 80240794 46802120 */  cvt.s.w   $f4, $f4
-/* D9B688 80240798 4600203C */  c.lt.s    $f4, $f0
-/* D9B68C 8024079C 00000000 */  nop
-/* D9B690 802407A0 4500000D */  bc1f      .L802407D8
-/* D9B694 802407A4 00000000 */   nop
-/* D9B698 802407A8 44800000 */  mtc1      $zero, $f0
-/* D9B69C 802407AC C614000C */  lwc1      $f20, 0xc($s0)
-/* D9B6A0 802407B0 4600103C */  c.lt.s    $f2, $f0
-/* D9B6A4 802407B4 00000000 */  nop
-/* D9B6A8 802407B8 45000006 */  bc1f      .L802407D4
-/* D9B6AC 802407BC 00021023 */   negu     $v0, $v0
-/* D9B6B0 802407C0 44820000 */  mtc1      $v0, $f0
-/* D9B6B4 802407C4 00000000 */  nop
-/* D9B6B8 802407C8 46800020 */  cvt.s.w   $f0, $f0
-/* D9B6BC 802407CC 080901F6 */  j         .L802407D8
-/* D9B6C0 802407D0 4600A500 */   add.s    $f20, $f20, $f0
-.L802407D4:
-/* D9B6C4 802407D4 4604A500 */  add.s     $f20, $f20, $f4
-.L802407D8:
-/* D9B6C8 802407D8 0C00A6C9 */  jal       clamp_angle
-/* D9B6CC 802407DC 4600A306 */   mov.s    $f12, $f20
-/* D9B6D0 802407E0 E600000C */  swc1      $f0, 0xc($s0)
-.L802407E4:
-/* D9B6D4 802407E4 12600005 */  beqz      $s3, .L802407FC
-/* D9B6D8 802407E8 2402000A */   addiu    $v0, $zero, 0xa
-.L802407EC:
-/* D9B6DC 802407EC A602008E */  sh        $v0, 0x8e($s0)
-/* D9B6E0 802407F0 8E4200CC */  lw        $v0, 0xcc($s2)
-/* D9B6E4 802407F4 8C420020 */  lw        $v0, 0x20($v0)
-/* D9B6E8 802407F8 AE020028 */  sw        $v0, 0x28($s0)
-.L802407FC:
-/* D9B6EC 802407FC 2402000D */  addiu     $v0, $zero, 0xd
-/* D9B6F0 80240800 AEC20070 */  sw        $v0, 0x70($s6)
-/* D9B6F4 80240804 8FBF0064 */  lw        $ra, 0x64($sp)
-/* D9B6F8 80240808 8FB60060 */  lw        $s6, 0x60($sp)
-/* D9B6FC 8024080C 8FB5005C */  lw        $s5, 0x5c($sp)
-/* D9B700 80240810 8FB40058 */  lw        $s4, 0x58($sp)
-/* D9B704 80240814 8FB30054 */  lw        $s3, 0x54($sp)
-/* D9B708 80240818 8FB20050 */  lw        $s2, 0x50($sp)
-/* D9B70C 8024081C 8FB1004C */  lw        $s1, 0x4c($sp)
-/* D9B710 80240820 8FB00048 */  lw        $s0, 0x48($sp)
-/* D9B714 80240824 D7BE0090 */  ldc1      $f30, 0x90($sp)
-/* D9B718 80240828 D7BC0088 */  ldc1      $f28, 0x88($sp)
-/* D9B71C 8024082C D7BA0080 */  ldc1      $f26, 0x80($sp)
-/* D9B720 80240830 D7B80078 */  ldc1      $f24, 0x78($sp)
-/* D9B724 80240834 D7B60070 */  ldc1      $f22, 0x70($sp)
-/* D9B728 80240838 D7B40068 */  ldc1      $f20, 0x68($sp)
-/* D9B72C 8024083C 03E00008 */  jr        $ra
-/* D9B730 80240840 27BD0098 */   addiu    $sp, $sp, 0x98
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240844_D9B734.s b/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240844_D9B734.s
deleted file mode 100644
index 67257b8520..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240844_D9B734.s
+++ /dev/null
@@ -1,100 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240844_D9B734
-/* D9B734 80240844 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* D9B738 80240848 AFB3003C */  sw        $s3, 0x3c($sp)
-/* D9B73C 8024084C 0080982D */  daddu     $s3, $a0, $zero
-/* D9B740 80240850 AFBF0040 */  sw        $ra, 0x40($sp)
-/* D9B744 80240854 AFB20038 */  sw        $s2, 0x38($sp)
-/* D9B748 80240858 AFB10034 */  sw        $s1, 0x34($sp)
-/* D9B74C 8024085C AFB00030 */  sw        $s0, 0x30($sp)
-/* D9B750 80240860 8E720148 */  lw        $s2, 0x148($s3)
-/* D9B754 80240864 00A0882D */  daddu     $s1, $a1, $zero
-/* D9B758 80240868 86440008 */  lh        $a0, 8($s2)
-/* D9B75C 8024086C 0C00EABB */  jal       get_npc_unsafe
-/* D9B760 80240870 00C0802D */   daddu    $s0, $a2, $zero
-/* D9B764 80240874 0200202D */  daddu     $a0, $s0, $zero
-/* D9B768 80240878 0240282D */  daddu     $a1, $s2, $zero
-/* D9B76C 8024087C 24030001 */  addiu     $v1, $zero, 1
-/* D9B770 80240880 AFA30010 */  sw        $v1, 0x10($sp)
-/* D9B774 80240884 8E260024 */  lw        $a2, 0x24($s1)
-/* D9B778 80240888 8E270028 */  lw        $a3, 0x28($s1)
-/* D9B77C 8024088C 0C01242D */  jal       basic_ai_check_player_dist
-/* D9B780 80240890 0040802D */   daddu    $s0, $v0, $zero
-/* D9B784 80240894 1440001D */  bnez      $v0, .L8024090C
-/* D9B788 80240898 24040002 */   addiu    $a0, $zero, 2
-/* D9B78C 8024089C 0200282D */  daddu     $a1, $s0, $zero
-/* D9B790 802408A0 0000302D */  daddu     $a2, $zero, $zero
-/* D9B794 802408A4 860300A8 */  lh        $v1, 0xa8($s0)
-/* D9B798 802408A8 3C013F80 */  lui       $at, 0x3f80
-/* D9B79C 802408AC 44810000 */  mtc1      $at, $f0
-/* D9B7A0 802408B0 3C014000 */  lui       $at, 0x4000
-/* D9B7A4 802408B4 44811000 */  mtc1      $at, $f2
-/* D9B7A8 802408B8 3C01C1A0 */  lui       $at, 0xc1a0
-/* D9B7AC 802408BC 44812000 */  mtc1      $at, $f4
-/* D9B7B0 802408C0 2402000F */  addiu     $v0, $zero, 0xf
-/* D9B7B4 802408C4 AFA2001C */  sw        $v0, 0x1c($sp)
-/* D9B7B8 802408C8 44833000 */  mtc1      $v1, $f6
-/* D9B7BC 802408CC 00000000 */  nop
-/* D9B7C0 802408D0 468031A0 */  cvt.s.w   $f6, $f6
-/* D9B7C4 802408D4 44073000 */  mfc1      $a3, $f6
-/* D9B7C8 802408D8 27A20028 */  addiu     $v0, $sp, 0x28
-/* D9B7CC 802408DC AFA20020 */  sw        $v0, 0x20($sp)
-/* D9B7D0 802408E0 E7A00010 */  swc1      $f0, 0x10($sp)
-/* D9B7D4 802408E4 E7A20014 */  swc1      $f2, 0x14($sp)
-/* D9B7D8 802408E8 0C01BFA4 */  jal       fx_emote
-/* D9B7DC 802408EC E7A40018 */   swc1     $f4, 0x18($sp)
-/* D9B7E0 802408F0 8E4200CC */  lw        $v0, 0xcc($s2)
-/* D9B7E4 802408F4 8C430000 */  lw        $v1, ($v0)
-/* D9B7E8 802408F8 24020019 */  addiu     $v0, $zero, 0x19
-/* D9B7EC 802408FC A602008E */  sh        $v0, 0x8e($s0)
-/* D9B7F0 80240900 2402000E */  addiu     $v0, $zero, 0xe
-/* D9B7F4 80240904 08090262 */  j         .L80240988
-/* D9B7F8 80240908 AE030028 */   sw       $v1, 0x28($s0)
-.L8024090C:
-/* D9B7FC 8024090C 8E4200CC */  lw        $v0, 0xcc($s2)
-/* D9B800 80240910 8E030028 */  lw        $v1, 0x28($s0)
-/* D9B804 80240914 8C420020 */  lw        $v0, 0x20($v0)
-/* D9B808 80240918 10620014 */  beq       $v1, $v0, .L8024096C
-/* D9B80C 8024091C 00000000 */   nop
-/* D9B810 80240920 C6000018 */  lwc1      $f0, 0x18($s0)
-/* D9B814 80240924 3C014010 */  lui       $at, 0x4010
-/* D9B818 80240928 44811800 */  mtc1      $at, $f3
-/* D9B81C 8024092C 44801000 */  mtc1      $zero, $f2
-/* D9B820 80240930 46000021 */  cvt.d.s   $f0, $f0
-/* D9B824 80240934 4622003C */  c.lt.d    $f0, $f2
-/* D9B828 80240938 00000000 */  nop
-/* D9B82C 8024093C 45000003 */  bc1f      .L8024094C
-/* D9B830 80240940 0000282D */   daddu    $a1, $zero, $zero
-/* D9B834 80240944 08090255 */  j         .L80240954
-/* D9B838 80240948 0200202D */   daddu    $a0, $s0, $zero
-.L8024094C:
-/* D9B83C 8024094C 0200202D */  daddu     $a0, $s0, $zero
-/* D9B840 80240950 24050001 */  addiu     $a1, $zero, 1
-.L80240954:
-/* D9B844 80240954 0C00F598 */  jal       func_8003D660
-/* D9B848 80240958 00000000 */   nop
-/* D9B84C 8024095C 8E050018 */  lw        $a1, 0x18($s0)
-/* D9B850 80240960 8E06000C */  lw        $a2, 0xc($s0)
-/* D9B854 80240964 0C00EA95 */  jal       npc_move_heading
-/* D9B858 80240968 0200202D */   daddu    $a0, $s0, $zero
-.L8024096C:
-/* D9B85C 8024096C 8602008E */  lh        $v0, 0x8e($s0)
-/* D9B860 80240970 9603008E */  lhu       $v1, 0x8e($s0)
-/* D9B864 80240974 18400003 */  blez      $v0, .L80240984
-/* D9B868 80240978 2462FFFF */   addiu    $v0, $v1, -1
-/* D9B86C 8024097C 08090263 */  j         .L8024098C
-/* D9B870 80240980 A602008E */   sh       $v0, 0x8e($s0)
-.L80240984:
-/* D9B874 80240984 2402000C */  addiu     $v0, $zero, 0xc
-.L80240988:
-/* D9B878 80240988 AE620070 */  sw        $v0, 0x70($s3)
-.L8024098C:
-/* D9B87C 8024098C 8FBF0040 */  lw        $ra, 0x40($sp)
-/* D9B880 80240990 8FB3003C */  lw        $s3, 0x3c($sp)
-/* D9B884 80240994 8FB20038 */  lw        $s2, 0x38($sp)
-/* D9B888 80240998 8FB10034 */  lw        $s1, 0x34($sp)
-/* D9B88C 8024099C 8FB00030 */  lw        $s0, 0x30($sp)
-/* D9B890 802409A0 03E00008 */  jr        $ra
-/* D9B894 802409A4 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409A8_D9B898.s b/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409A8_D9B898.s
deleted file mode 100644
index 595552c349..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409A8_D9B898.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802409A8_D9B898
-/* D9B898 802409A8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D9B89C 802409AC AFB00010 */  sw        $s0, 0x10($sp)
-/* D9B8A0 802409B0 0080802D */  daddu     $s0, $a0, $zero
-/* D9B8A4 802409B4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* D9B8A8 802409B8 8E020148 */  lw        $v0, 0x148($s0)
-/* D9B8AC 802409BC 0C00EABB */  jal       get_npc_unsafe
-/* D9B8B0 802409C0 84440008 */   lh       $a0, 8($v0)
-/* D9B8B4 802409C4 9443008E */  lhu       $v1, 0x8e($v0)
-/* D9B8B8 802409C8 2463FFFF */  addiu     $v1, $v1, -1
-/* D9B8BC 802409CC A443008E */  sh        $v1, 0x8e($v0)
-/* D9B8C0 802409D0 00031C00 */  sll       $v1, $v1, 0x10
-/* D9B8C4 802409D4 50600001 */  beql      $v1, $zero, .L802409DC
-/* D9B8C8 802409D8 AE000070 */   sw       $zero, 0x70($s0)
-.L802409DC:
-/* D9B8CC 802409DC 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D9B8D0 802409E0 8FB00010 */  lw        $s0, 0x10($sp)
-/* D9B8D4 802409E4 03E00008 */  jr        $ra
-/* D9B8D8 802409E8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s
deleted file mode 100644
index 66befd87cf..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s
+++ /dev/null
@@ -1,171 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel jtbl_80242448_D9D338
-.word .L80240B3C_D9BA2C, .L80240B4C_D9BA3C, .L80240B64_D9BA54, .L80240B74_D9BA64, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240B8C_D9BA7C, .L80240B9C_D9BA8C, .L80240BB4_D9BAA4, .L80240BC4_D9BAB4, .L80240BDC_D9BACC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BFC_D9BAEC, .L80240BF4_D9BAE4, 0, 0
-
-.section .text
-
-glabel func_802409EC_D9B8DC
-/* D9B8DC 802409EC 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* D9B8E0 802409F0 AFB40040 */  sw        $s4, 0x40($sp)
-/* D9B8E4 802409F4 0080A02D */  daddu     $s4, $a0, $zero
-/* D9B8E8 802409F8 AFBF0048 */  sw        $ra, 0x48($sp)
-/* D9B8EC 802409FC AFB50044 */  sw        $s5, 0x44($sp)
-/* D9B8F0 80240A00 AFB3003C */  sw        $s3, 0x3c($sp)
-/* D9B8F4 80240A04 AFB20038 */  sw        $s2, 0x38($sp)
-/* D9B8F8 80240A08 AFB10034 */  sw        $s1, 0x34($sp)
-/* D9B8FC 80240A0C AFB00030 */  sw        $s0, 0x30($sp)
-/* D9B900 80240A10 8E910148 */  lw        $s1, 0x148($s4)
-/* D9B904 80240A14 86240008 */  lh        $a0, 8($s1)
-/* D9B908 80240A18 0C00EABB */  jal       get_npc_unsafe
-/* D9B90C 80240A1C 00A0802D */   daddu    $s0, $a1, $zero
-/* D9B910 80240A20 8E83000C */  lw        $v1, 0xc($s4)
-/* D9B914 80240A24 0280202D */  daddu     $a0, $s4, $zero
-/* D9B918 80240A28 8C650000 */  lw        $a1, ($v1)
-/* D9B91C 80240A2C 0C0B1EAF */  jal       evt_get_variable
-/* D9B920 80240A30 0040A82D */   daddu    $s5, $v0, $zero
-/* D9B924 80240A34 AFA00010 */  sw        $zero, 0x10($sp)
-/* D9B928 80240A38 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* D9B92C 80240A3C 8C630030 */  lw        $v1, 0x30($v1)
-/* D9B930 80240A40 AFA30014 */  sw        $v1, 0x14($sp)
-/* D9B934 80240A44 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* D9B938 80240A48 8C63001C */  lw        $v1, 0x1c($v1)
-/* D9B93C 80240A4C AFA30018 */  sw        $v1, 0x18($sp)
-/* D9B940 80240A50 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* D9B944 80240A54 8C630024 */  lw        $v1, 0x24($v1)
-/* D9B948 80240A58 AFA3001C */  sw        $v1, 0x1c($sp)
-/* D9B94C 80240A5C 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* D9B950 80240A60 8C630028 */  lw        $v1, 0x28($v1)
-/* D9B954 80240A64 27B30010 */  addiu     $s3, $sp, 0x10
-/* D9B958 80240A68 AFA30020 */  sw        $v1, 0x20($sp)
-/* D9B95C 80240A6C 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* D9B960 80240A70 3C0142C8 */  lui       $at, 0x42c8
-/* D9B964 80240A74 44810000 */  mtc1      $at, $f0
-/* D9B968 80240A78 8C63002C */  lw        $v1, 0x2c($v1)
-/* D9B96C 80240A7C 0040902D */  daddu     $s2, $v0, $zero
-/* D9B970 80240A80 E7A00028 */  swc1      $f0, 0x28($sp)
-/* D9B974 80240A84 A7A0002C */  sh        $zero, 0x2c($sp)
-/* D9B978 80240A88 16000005 */  bnez      $s0, .L80240AA0
-/* D9B97C 80240A8C AFA30024 */   sw       $v1, 0x24($sp)
-/* D9B980 80240A90 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* D9B984 80240A94 30420004 */  andi      $v0, $v0, 4
-/* D9B988 80240A98 1040001F */  beqz      $v0, .L80240B18
-/* D9B98C 80240A9C 00000000 */   nop
-.L80240AA0:
-/* D9B990 80240AA0 2404F7FF */  addiu     $a0, $zero, -0x801
-/* D9B994 80240AA4 AE800070 */  sw        $zero, 0x70($s4)
-/* D9B998 80240AA8 A6A0008E */  sh        $zero, 0x8e($s5)
-/* D9B99C 80240AAC 8E2200CC */  lw        $v0, 0xcc($s1)
-/* D9B9A0 80240AB0 8EA30000 */  lw        $v1, ($s5)
-/* D9B9A4 80240AB4 8C420000 */  lw        $v0, ($v0)
-/* D9B9A8 80240AB8 00641824 */  and       $v1, $v1, $a0
-/* D9B9AC 80240ABC AEA30000 */  sw        $v1, ($s5)
-/* D9B9B0 80240AC0 AEA20028 */  sw        $v0, 0x28($s5)
-/* D9B9B4 80240AC4 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* D9B9B8 80240AC8 8C420034 */  lw        $v0, 0x34($v0)
-/* D9B9BC 80240ACC 54400005 */  bnel      $v0, $zero, .L80240AE4
-/* D9B9C0 80240AD0 2402FDFF */   addiu    $v0, $zero, -0x201
-/* D9B9C4 80240AD4 34620200 */  ori       $v0, $v1, 0x200
-/* D9B9C8 80240AD8 2403FFF7 */  addiu     $v1, $zero, -9
-/* D9B9CC 80240ADC 080902BB */  j         .L80240AEC
-/* D9B9D0 80240AE0 00431024 */   and      $v0, $v0, $v1
-.L80240AE4:
-/* D9B9D4 80240AE4 00621024 */  and       $v0, $v1, $v0
-/* D9B9D8 80240AE8 34420008 */  ori       $v0, $v0, 8
-.L80240AEC:
-/* D9B9DC 80240AEC AEA20000 */  sw        $v0, ($s5)
-/* D9B9E0 80240AF0 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* D9B9E4 80240AF4 30420004 */  andi      $v0, $v0, 4
-/* D9B9E8 80240AF8 10400007 */  beqz      $v0, .L80240B18
-/* D9B9EC 80240AFC 24020063 */   addiu    $v0, $zero, 0x63
-/* D9B9F0 80240B00 AE820070 */  sw        $v0, 0x70($s4)
-/* D9B9F4 80240B04 AE800074 */  sw        $zero, 0x74($s4)
-/* D9B9F8 80240B08 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* D9B9FC 80240B0C 2403FFFB */  addiu     $v1, $zero, -5
-/* D9BA00 80240B10 00431024 */  and       $v0, $v0, $v1
-/* D9BA04 80240B14 AE2200B0 */  sw        $v0, 0xb0($s1)
-.L80240B18:
-/* D9BA08 80240B18 8E830070 */  lw        $v1, 0x70($s4)
-/* D9BA0C 80240B1C 2C620064 */  sltiu     $v0, $v1, 0x64
-/* D9BA10 80240B20 10400036 */  beqz      $v0, .L80240BFC_D9BAEC
-/* D9BA14 80240B24 00031080 */   sll      $v0, $v1, 2
-/* D9BA18 80240B28 3C018024 */  lui       $at, %hi(jtbl_80242448_D9D338)
-/* D9BA1C 80240B2C 00220821 */  addu      $at, $at, $v0
-/* D9BA20 80240B30 8C222448 */  lw        $v0, %lo(jtbl_80242448_D9D338)($at)
-/* D9BA24 80240B34 00400008 */  jr        $v0
-/* D9BA28 80240B38 00000000 */   nop
-.L80240B3C_D9BA2C:
-/* D9BA2C 80240B3C 0280202D */  daddu     $a0, $s4, $zero
-/* D9BA30 80240B40 0240282D */  daddu     $a1, $s2, $zero
-/* D9BA34 80240B44 0C012568 */  jal       basic_ai_wander_init
-/* D9BA38 80240B48 0260302D */   daddu    $a2, $s3, $zero
-.L80240B4C_D9BA3C:
-/* D9BA3C 80240B4C 0280202D */  daddu     $a0, $s4, $zero
-/* D9BA40 80240B50 0240282D */  daddu     $a1, $s2, $zero
-/* D9BA44 80240B54 0C0125AE */  jal       basic_ai_wander
-/* D9BA48 80240B58 0260302D */   daddu    $a2, $s3, $zero
-/* D9BA4C 80240B5C 080902FF */  j         .L80240BFC_D9BAEC
-/* D9BA50 80240B60 00000000 */   nop
-.L80240B64_D9BA54:
-/* D9BA54 80240B64 0280202D */  daddu     $a0, $s4, $zero
-/* D9BA58 80240B68 0240282D */  daddu     $a1, $s2, $zero
-/* D9BA5C 80240B6C 0C0126D1 */  jal       basic_ai_loiter_init
-/* D9BA60 80240B70 0260302D */   daddu    $a2, $s3, $zero
-.L80240B74_D9BA64:
-/* D9BA64 80240B74 0280202D */  daddu     $a0, $s4, $zero
-/* D9BA68 80240B78 0240282D */  daddu     $a1, $s2, $zero
-/* D9BA6C 80240B7C 0C012701 */  jal       basic_ai_loiter
-/* D9BA70 80240B80 0260302D */   daddu    $a2, $s3, $zero
-/* D9BA74 80240B84 080902FF */  j         .L80240BFC_D9BAEC
-/* D9BA78 80240B88 00000000 */   nop
-.L80240B8C_D9BA7C:
-/* D9BA7C 80240B8C 0280202D */  daddu     $a0, $s4, $zero
-/* D9BA80 80240B90 0240282D */  daddu     $a1, $s2, $zero
-/* D9BA84 80240B94 0C01278F */  jal       basic_ai_found_player_jump_init
-/* D9BA88 80240B98 0260302D */   daddu    $a2, $s3, $zero
-.L80240B9C_D9BA8C:
-/* D9BA8C 80240B9C 0280202D */  daddu     $a0, $s4, $zero
-/* D9BA90 80240BA0 0240282D */  daddu     $a1, $s2, $zero
-/* D9BA94 80240BA4 0C0127B3 */  jal       basic_ai_found_player_jump
-/* D9BA98 80240BA8 0260302D */   daddu    $a2, $s3, $zero
-/* D9BA9C 80240BAC 080902FF */  j         .L80240BFC_D9BAEC
-/* D9BAA0 80240BB0 00000000 */   nop
-.L80240BB4_D9BAA4:
-/* D9BAA4 80240BB4 0280202D */  daddu     $a0, $s4, $zero
-/* D9BAA8 80240BB8 0240282D */  daddu     $a1, $s2, $zero
-/* D9BAAC 80240BBC 0C090098 */  jal       func_80240260_D9B150
-/* D9BAB0 80240BC0 0260302D */   daddu    $a2, $s3, $zero
-.L80240BC4_D9BAB4:
-/* D9BAB4 80240BC4 0280202D */  daddu     $a0, $s4, $zero
-/* D9BAB8 80240BC8 0240282D */  daddu     $a1, $s2, $zero
-/* D9BABC 80240BCC 0C090211 */  jal       func_80240844_D9B734
-/* D9BAC0 80240BD0 0260302D */   daddu    $a2, $s3, $zero
-/* D9BAC4 80240BD4 080902FF */  j         .L80240BFC_D9BAEC
-/* D9BAC8 80240BD8 00000000 */   nop
-.L80240BDC_D9BACC:
-/* D9BACC 80240BDC 0280202D */  daddu     $a0, $s4, $zero
-/* D9BAD0 80240BE0 0240282D */  daddu     $a1, $s2, $zero
-/* D9BAD4 80240BE4 0C09026A */  jal       func_802409A8_D9B898
-/* D9BAD8 80240BE8 0260302D */   daddu    $a2, $s3, $zero
-/* D9BADC 80240BEC 080902FF */  j         .L80240BFC_D9BAEC
-/* D9BAE0 80240BF0 00000000 */   nop
-.L80240BF4_D9BAE4:
-/* D9BAE4 80240BF4 0C0129CF */  jal       basic_ai_suspend
-/* D9BAE8 80240BF8 0280202D */   daddu    $a0, $s4, $zero
-.L80240BFC_D9BAEC:
-/* D9BAEC 80240BFC 8FBF0048 */  lw        $ra, 0x48($sp)
-/* D9BAF0 80240C00 8FB50044 */  lw        $s5, 0x44($sp)
-/* D9BAF4 80240C04 8FB40040 */  lw        $s4, 0x40($sp)
-/* D9BAF8 80240C08 8FB3003C */  lw        $s3, 0x3c($sp)
-/* D9BAFC 80240C0C 8FB20038 */  lw        $s2, 0x38($sp)
-/* D9BB00 80240C10 8FB10034 */  lw        $s1, 0x34($sp)
-/* D9BB04 80240C14 8FB00030 */  lw        $s0, 0x30($sp)
-/* D9BB08 80240C18 0000102D */  daddu     $v0, $zero, $zero
-/* D9BB0C 80240C1C 03E00008 */  jr        $ra
-/* D9BB10 80240C20 27BD0050 */   addiu    $sp, $sp, 0x50
-/* D9BB14 80240C24 00000000 */  nop
-/* D9BB18 80240C28 00000000 */  nop
-/* D9BB1C 80240C2C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802422A0_DB4560.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802422A0_DB4560.s
deleted file mode 100644
index dfbc8c577d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802422A0_DB4560.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802422A0_DB4560
-/* DB4560 802422A0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* DB4564 802422A4 AFB00010 */  sw        $s0, 0x10($sp)
-/* DB4568 802422A8 0080802D */  daddu     $s0, $a0, $zero
-/* DB456C 802422AC AFBF0014 */  sw        $ra, 0x14($sp)
-/* DB4570 802422B0 8E02000C */  lw        $v0, 0xc($s0)
-/* DB4574 802422B4 0C0B1EAF */  jal       evt_get_variable
-/* DB4578 802422B8 8C450000 */   lw       $a1, ($v0)
-/* DB457C 802422BC 0040202D */  daddu     $a0, $v0, $zero
-/* DB4580 802422C0 3C038008 */  lui       $v1, %hi(gItemTable)
-/* DB4584 802422C4 246378E0 */  addiu     $v1, $v1, %lo(gItemTable)
-/* DB4588 802422C8 00041140 */  sll       $v0, $a0, 5
-/* DB458C 802422CC 00431821 */  addu      $v1, $v0, $v1
-/* DB4590 802422D0 240200C1 */  addiu     $v0, $zero, 0xc1
-/* DB4594 802422D4 10820005 */  beq       $a0, $v0, .L802422EC
-/* DB4598 802422D8 240200D2 */   addiu    $v0, $zero, 0xd2
-/* DB459C 802422DC 10820003 */  beq       $a0, $v0, .L802422EC
-/* DB45A0 802422E0 240200B7 */   addiu    $v0, $zero, 0xb7
-/* DB45A4 802422E4 14820004 */  bne       $a0, $v0, .L802422F8
-/* DB45A8 802422E8 00000000 */   nop
-.L802422EC:
-/* DB45AC 802422EC 24020002 */  addiu     $v0, $zero, 2
-/* DB45B0 802422F0 080908C5 */  j         .L80242314
-/* DB45B4 802422F4 AE0200A8 */   sw       $v0, 0xa8($s0)
-.L802422F8:
-/* DB45B8 802422F8 94620018 */  lhu       $v0, 0x18($v1)
-/* DB45BC 802422FC 30420080 */  andi      $v0, $v0, 0x80
-/* DB45C0 80242300 10400003 */  beqz      $v0, .L80242310
-/* DB45C4 80242304 24020001 */   addiu    $v0, $zero, 1
-/* DB45C8 80242308 080908C5 */  j         .L80242314
-/* DB45CC 8024230C AE0200A8 */   sw       $v0, 0xa8($s0)
-.L80242310:
-/* DB45D0 80242310 AE0000A8 */  sw        $zero, 0xa8($s0)
-.L80242314:
-/* DB45D4 80242314 8FBF0014 */  lw        $ra, 0x14($sp)
-/* DB45D8 80242318 8FB00010 */  lw        $s0, 0x10($sp)
-/* DB45DC 8024231C 24020002 */  addiu     $v0, $zero, 2
-/* DB45E0 80242320 03E00008 */  jr        $ra
-/* DB45E4 80242324 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242328_DB45E8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242328_DB45E8.s
deleted file mode 100644
index fa34d14cd8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242328_DB45E8.s
+++ /dev/null
@@ -1,53 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_80245648_DB7908
-.double 360.0
-
-.section .text
-
-glabel func_80242328_DB45E8
-/* DB45E8 80242328 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* DB45EC 8024232C AFB00018 */  sw        $s0, 0x18($sp)
-/* DB45F0 80242330 0080802D */  daddu     $s0, $a0, $zero
-/* DB45F4 80242334 3C03800B */  lui       $v1, %hi(gCameras)
-/* DB45F8 80242338 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* DB45FC 8024233C 0060202D */  daddu     $a0, $v1, $zero
-/* DB4600 80242340 10A00005 */  beqz      $a1, .L80242358
-/* DB4604 80242344 AFBF001C */   sw       $ra, 0x1c($sp)
-/* DB4608 80242348 94620000 */  lhu       $v0, ($v1)
-/* DB460C 8024234C 34420008 */  ori       $v0, $v0, 8
-/* DB4610 80242350 A4620000 */  sh        $v0, ($v1)
-/* DB4614 80242354 AE000070 */  sw        $zero, 0x70($s0)
-.L80242358:
-/* DB4618 80242358 C6000070 */  lwc1      $f0, 0x70($s0)
-/* DB461C 8024235C 3C014120 */  lui       $at, 0x4120
-/* DB4620 80242360 44811000 */  mtc1      $at, $f2
-/* DB4624 80242364 00000000 */  nop
-/* DB4628 80242368 46020000 */  add.s     $f0, $f0, $f2
-/* DB462C 8024236C 3C01BF80 */  lui       $at, 0xbf80
-/* DB4630 80242370 44811000 */  mtc1      $at, $f2
-/* DB4634 80242374 E6000070 */  swc1      $f0, 0x70($s0)
-/* DB4638 80242378 44800000 */  mtc1      $zero, $f0
-/* DB463C 8024237C 24840194 */  addiu     $a0, $a0, 0x194
-/* DB4640 80242380 E7A20010 */  swc1      $f2, 0x10($sp)
-/* DB4644 80242384 44060000 */  mfc1      $a2, $f0
-/* DB4648 80242388 8E050070 */  lw        $a1, 0x70($s0)
-/* DB464C 8024238C 0C019EC8 */  jal       guRotateF
-/* DB4650 80242390 00C0382D */   daddu    $a3, $a2, $zero
-/* DB4654 80242394 C6000070 */  lwc1      $f0, 0x70($s0)
-/* DB4658 80242398 3C018024 */  lui       $at, %hi(D_80245648_DB7908)
-/* DB465C 8024239C D4225648 */  ldc1      $f2, %lo(D_80245648_DB7908)($at)
-/* DB4660 802423A0 46000021 */  cvt.d.s   $f0, $f0
-/* DB4664 802423A4 4620103E */  c.le.d    $f2, $f0
-/* DB4668 802423A8 00000000 */  nop
-/* DB466C 802423AC 45010002 */  bc1t      .L802423B8
-/* DB4670 802423B0 24020002 */   addiu    $v0, $zero, 2
-/* DB4674 802423B4 0000102D */  daddu     $v0, $zero, $zero
-.L802423B8:
-/* DB4678 802423B8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* DB467C 802423BC 8FB00018 */  lw        $s0, 0x18($sp)
-/* DB4680 802423C0 03E00008 */  jr        $ra
-/* DB4684 802423C4 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242EA8_DC0158.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242EA8_DC0158.s
deleted file mode 100644
index 38ba56caf8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242EA8_DC0158.s
+++ /dev/null
@@ -1,34 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242EA8_DC0158
-/* DC0158 80242EA8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* DC015C 80242EAC AFB20018 */  sw        $s2, 0x18($sp)
-/* DC0160 80242EB0 0080902D */  daddu     $s2, $a0, $zero
-/* DC0164 80242EB4 AFB10014 */  sw        $s1, 0x14($sp)
-/* DC0168 80242EB8 3C11F971 */  lui       $s1, 0xf971
-/* DC016C 80242EBC AFBF001C */  sw        $ra, 0x1c($sp)
-/* DC0170 80242EC0 AFB00010 */  sw        $s0, 0x10($sp)
-/* DC0174 80242EC4 8E50000C */  lw        $s0, 0xc($s2)
-/* DC0178 80242EC8 36318887 */  ori       $s1, $s1, 0x8887
-/* DC017C 80242ECC 8E050000 */  lw        $a1, ($s0)
-/* DC0180 80242ED0 0C0B1EAF */  jal       evt_get_variable
-/* DC0184 80242ED4 26100004 */   addiu    $s0, $s0, 4
-/* DC0188 80242ED8 00518821 */  addu      $s1, $v0, $s1
-/* DC018C 80242EDC 8E050000 */  lw        $a1, ($s0)
-/* DC0190 80242EE0 0C0B1EAF */  jal       evt_get_variable
-/* DC0194 80242EE4 0240202D */   daddu    $a0, $s2, $zero
-/* DC0198 80242EE8 0240202D */  daddu     $a0, $s2, $zero
-/* DC019C 80242EEC 0220282D */  daddu     $a1, $s1, $zero
-/* DC01A0 80242EF0 0C0B2026 */  jal       evt_set_variable
-/* DC01A4 80242EF4 0040302D */   daddu    $a2, $v0, $zero
-/* DC01A8 80242EF8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* DC01AC 80242EFC 8FB20018 */  lw        $s2, 0x18($sp)
-/* DC01B0 80242F00 8FB10014 */  lw        $s1, 0x14($sp)
-/* DC01B4 80242F04 8FB00010 */  lw        $s0, 0x10($sp)
-/* DC01B8 80242F08 24020002 */  addiu     $v0, $zero, 2
-/* DC01BC 80242F0C 03E00008 */  jr        $ra
-/* DC01C0 80242F10 27BD0020 */   addiu    $sp, $sp, 0x20
-/* DC01C4 80242F14 00000000 */  nop
-/* DC01C8 80242F18 00000000 */  nop
-/* DC01CC 80242F1C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240054_DCCD24.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240054_DCCD24.s
deleted file mode 100644
index 12ac51eba4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240054_DCCD24.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240054_DCCD24
-/* DCCD24 80240054 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* DCCD28 80240058 AFBF0010 */  sw        $ra, 0x10($sp)
-/* DCCD2C 8024005C 0C090000 */  jal       func_80240000_DCCCD0
-/* DCCD30 80240060 00000000 */   nop
-/* DCCD34 80240064 2C420001 */  sltiu     $v0, $v0, 1
-/* DCCD38 80240068 8FBF0010 */  lw        $ra, 0x10($sp)
-/* DCCD3C 8024006C 00021040 */  sll       $v0, $v0, 1
-/* DCCD40 80240070 03E00008 */  jr        $ra
-/* DCCD44 80240074 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD3B0/func_802406E0_DCD3B0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD3B0/func_802406E0_DCD3B0.s
deleted file mode 100644
index 8da0bd033f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD3B0/func_802406E0_DCD3B0.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802406E0_DCD3B0
-/* DCD3B0 802406E0 3C018011 */  lui       $at, %hi(gPlayerStatus+0x28)
-/* DCD3B4 802406E4 C422EFF0 */  lwc1      $f2, %lo(gPlayerStatus+0x28)($at)
-/* DCD3B8 802406E8 3C014454 */  lui       $at, 0x4454
-/* DCD3BC 802406EC 34218000 */  ori       $at, $at, 0x8000
-/* DCD3C0 802406F0 44810000 */  mtc1      $at, $f0
-/* DCD3C4 802406F4 00000000 */  nop
-/* DCD3C8 802406F8 4600103C */  c.lt.s    $f2, $f0
-/* DCD3CC 802406FC 00000000 */  nop
-/* DCD3D0 80240700 45010002 */  bc1t      .L8024070C
-/* DCD3D4 80240704 0000102D */   daddu    $v0, $zero, $zero
-/* DCD3D8 80240708 24020002 */  addiu     $v0, $zero, 2
-.L8024070C:
-/* DCD3DC 8024070C 03E00008 */  jr        $ra
-/* DCD3E0 80240710 00000000 */   nop
-/* DCD3E4 80240714 00000000 */  nop
-/* DCD3E8 80240718 00000000 */  nop
-/* DCD3EC 8024071C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240314_DDF624.s b/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240314_DDF624.s
deleted file mode 100644
index 6b976a5540..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240314_DDF624.s
+++ /dev/null
@@ -1,53 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240314_DDF624
-/* DDF624 80240314 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* DDF628 80240318 AFB1001C */  sw        $s1, 0x1c($sp)
-/* DDF62C 8024031C 0080882D */  daddu     $s1, $a0, $zero
-/* DDF630 80240320 AFBF0028 */  sw        $ra, 0x28($sp)
-/* DDF634 80240324 AFB30024 */  sw        $s3, 0x24($sp)
-/* DDF638 80240328 AFB20020 */  sw        $s2, 0x20($sp)
-/* DDF63C 8024032C AFB00018 */  sw        $s0, 0x18($sp)
-/* DDF640 80240330 8E30000C */  lw        $s0, 0xc($s1)
-/* DDF644 80240334 8E050000 */  lw        $a1, ($s0)
-/* DDF648 80240338 0C0B1EAF */  jal       evt_get_variable
-/* DDF64C 8024033C 26100004 */   addiu    $s0, $s0, 4
-/* DDF650 80240340 8E050000 */  lw        $a1, ($s0)
-/* DDF654 80240344 26100004 */  addiu     $s0, $s0, 4
-/* DDF658 80240348 0220202D */  daddu     $a0, $s1, $zero
-/* DDF65C 8024034C 0C0B1EAF */  jal       evt_get_variable
-/* DDF660 80240350 0040982D */   daddu    $s3, $v0, $zero
-/* DDF664 80240354 8E050000 */  lw        $a1, ($s0)
-/* DDF668 80240358 26100004 */  addiu     $s0, $s0, 4
-/* DDF66C 8024035C 0220202D */  daddu     $a0, $s1, $zero
-/* DDF670 80240360 0C0B1EAF */  jal       evt_get_variable
-/* DDF674 80240364 0040902D */   daddu    $s2, $v0, $zero
-/* DDF678 80240368 0220202D */  daddu     $a0, $s1, $zero
-/* DDF67C 8024036C 8E050000 */  lw        $a1, ($s0)
-/* DDF680 80240370 0C0B1EAF */  jal       evt_get_variable
-/* DDF684 80240374 0040802D */   daddu    $s0, $v0, $zero
-/* DDF688 80240378 24040001 */  addiu     $a0, $zero, 1
-/* DDF68C 8024037C 0080282D */  daddu     $a1, $a0, $zero
-/* DDF690 80240380 AFB00010 */  sw        $s0, 0x10($sp)
-/* DDF694 80240384 0040802D */  daddu     $s0, $v0, $zero
-/* DDF698 80240388 0260302D */  daddu     $a2, $s3, $zero
-/* DDF69C 8024038C 0C04DFB0 */  jal       set_screen_overlay_center_worldpos
-/* DDF6A0 80240390 0240382D */   daddu    $a3, $s2, $zero
-/* DDF6A4 80240394 44900000 */  mtc1      $s0, $f0
-/* DDF6A8 80240398 00000000 */  nop
-/* DDF6AC 8024039C 46800020 */  cvt.s.w   $f0, $f0
-/* DDF6B0 802403A0 44050000 */  mfc1      $a1, $f0
-/* DDF6B4 802403A4 0C04E035 */  jal       set_screen_overlay_alpha
-/* DDF6B8 802403A8 24040001 */   addiu    $a0, $zero, 1
-/* DDF6BC 802403AC 3C05437F */  lui       $a1, 0x437f
-/* DDF6C0 802403B0 0C04DF69 */  jal       set_screen_overlay_params_back
-/* DDF6C4 802403B4 2404000B */   addiu    $a0, $zero, 0xb
-/* DDF6C8 802403B8 8FBF0028 */  lw        $ra, 0x28($sp)
-/* DDF6CC 802403BC 8FB30024 */  lw        $s3, 0x24($sp)
-/* DDF6D0 802403C0 8FB20020 */  lw        $s2, 0x20($sp)
-/* DDF6D4 802403C4 8FB1001C */  lw        $s1, 0x1c($sp)
-/* DDF6D8 802403C8 8FB00018 */  lw        $s0, 0x18($sp)
-/* DDF6DC 802403CC 24020002 */  addiu     $v0, $zero, 2
-/* DDF6E0 802403D0 03E00008 */  jr        $ra
-/* DDF6E4 802403D4 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802403D8_DDF6E8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802403D8_DDF6E8.s
deleted file mode 100644
index a041a6621b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802403D8_DDF6E8.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802403D8_DDF6E8
-/* DDF6E8 802403D8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* DDF6EC 802403DC F7B40018 */  sdc1      $f20, 0x18($sp)
-/* DDF6F0 802403E0 4480A000 */  mtc1      $zero, $f20
-/* DDF6F4 802403E4 00000000 */  nop
-/* DDF6F8 802403E8 4405A000 */  mfc1      $a1, $f20
-/* DDF6FC 802403EC AFBF0010 */  sw        $ra, 0x10($sp)
-/* DDF700 802403F0 0C04E035 */  jal       set_screen_overlay_alpha
-/* DDF704 802403F4 24040001 */   addiu    $a0, $zero, 1
-/* DDF708 802403F8 4405A000 */  mfc1      $a1, $f20
-/* DDF70C 802403FC 0C04DF69 */  jal       set_screen_overlay_params_back
-/* DDF710 80240400 2404000B */   addiu    $a0, $zero, 0xb
-/* DDF714 80240404 8FBF0010 */  lw        $ra, 0x10($sp)
-/* DDF718 80240408 D7B40018 */  ldc1      $f20, 0x18($sp)
-/* DDF71C 8024040C 24020002 */  addiu     $v0, $zero, 2
-/* DDF720 80240410 03E00008 */  jr        $ra
-/* DDF724 80240414 27BD0020 */   addiu    $sp, $sp, 0x20
-/* DDF728 80240418 00000000 */  nop
-/* DDF72C 8024041C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240160_DE5810.s b/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240160_DE5810.s
deleted file mode 100644
index 69475708eb..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240160_DE5810.s
+++ /dev/null
@@ -1,178 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240160_DE5810
-/* DE5810 80240160 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* DE5814 80240164 AFB20018 */  sw        $s2, 0x18($sp)
-/* DE5818 80240168 0080902D */  daddu     $s2, $a0, $zero
-/* DE581C 8024016C AFBF001C */  sw        $ra, 0x1c($sp)
-/* DE5820 80240170 AFB10014 */  sw        $s1, 0x14($sp)
-/* DE5824 80240174 AFB00010 */  sw        $s0, 0x10($sp)
-/* DE5828 80240178 F7B80030 */  sdc1      $f24, 0x30($sp)
-/* DE582C 8024017C F7B60028 */  sdc1      $f22, 0x28($sp)
-/* DE5830 80240180 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* DE5834 80240184 8E420148 */  lw        $v0, 0x148($s2)
-/* DE5838 80240188 0C00EABB */  jal       get_npc_unsafe
-/* DE583C 8024018C 84440008 */   lh       $a0, 8($v0)
-/* DE5840 80240190 0040802D */  daddu     $s0, $v0, $zero
-/* DE5844 80240194 820200A4 */  lb        $v0, 0xa4($s0)
-/* DE5848 80240198 3C0143B4 */  lui       $at, 0x43b4
-/* DE584C 8024019C 4481A000 */  mtc1      $at, $f20
-/* DE5850 802401A0 44826000 */  mtc1      $v0, $f12
-/* DE5854 802401A4 00000000 */  nop
-/* DE5858 802401A8 46806320 */  cvt.s.w   $f12, $f12
-/* DE585C 802401AC 46146302 */  mul.s     $f12, $f12, $f20
-/* DE5860 802401B0 00000000 */  nop
-/* DE5864 802401B4 3C014120 */  lui       $at, 0x4120
-/* DE5868 802401B8 4481B000 */  mtc1      $at, $f22
-/* DE586C 802401BC 0C00A8BB */  jal       sin_deg
-/* DE5870 802401C0 46166303 */   div.s    $f12, $f12, $f22
-/* DE5874 802401C4 3C118011 */  lui       $s1, %hi(gPlayerStatus)
-/* DE5878 802401C8 2631EFC8 */  addiu     $s1, $s1, %lo(gPlayerStatus)
-/* DE587C 802401CC 862200B2 */  lh        $v0, 0xb2($s1)
-/* DE5880 802401D0 860300A6 */  lh        $v1, 0xa6($s0)
-/* DE5884 802401D4 3C013F00 */  lui       $at, 0x3f00
-/* DE5888 802401D8 4481C000 */  mtc1      $at, $f24
-/* DE588C 802401DC 00431021 */  addu      $v0, $v0, $v1
-/* DE5890 802401E0 44821000 */  mtc1      $v0, $f2
-/* DE5894 802401E4 00000000 */  nop
-/* DE5898 802401E8 468010A0 */  cvt.s.w   $f2, $f2
-/* DE589C 802401EC 46181082 */  mul.s     $f2, $f2, $f24
-/* DE58A0 802401F0 00000000 */  nop
-/* DE58A4 802401F4 820200A4 */  lb        $v0, 0xa4($s0)
-/* DE58A8 802401F8 44826000 */  mtc1      $v0, $f12
-/* DE58AC 802401FC 00000000 */  nop
-/* DE58B0 80240200 46806320 */  cvt.s.w   $f12, $f12
-/* DE58B4 80240204 46146302 */  mul.s     $f12, $f12, $f20
-/* DE58B8 80240208 00000000 */  nop
-/* DE58BC 8024020C 46001082 */  mul.s     $f2, $f2, $f0
-/* DE58C0 80240210 00000000 */  nop
-/* DE58C4 80240214 C6200028 */  lwc1      $f0, 0x28($s1)
-/* DE58C8 80240218 46166303 */  div.s     $f12, $f12, $f22
-/* DE58CC 8024021C 0C00A8D4 */  jal       cos_deg
-/* DE58D0 80240220 46020580 */   add.s    $f22, $f0, $f2
-/* DE58D4 80240224 862200B2 */  lh        $v0, 0xb2($s1)
-/* DE58D8 80240228 860300A6 */  lh        $v1, 0xa6($s0)
-/* DE58DC 8024022C 00431021 */  addu      $v0, $v0, $v1
-/* DE58E0 80240230 44821000 */  mtc1      $v0, $f2
-/* DE58E4 80240234 00000000 */  nop
-/* DE58E8 80240238 468010A0 */  cvt.s.w   $f2, $f2
-/* DE58EC 8024023C 46181082 */  mul.s     $f2, $f2, $f24
-/* DE58F0 80240240 00000000 */  nop
-/* DE58F4 80240244 46001082 */  mul.s     $f2, $f2, $f0
-/* DE58F8 80240248 00000000 */  nop
-/* DE58FC 8024024C C6200030 */  lwc1      $f0, 0x30($s1)
-/* DE5900 80240250 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* DE5904 80240254 46020501 */  sub.s     $f20, $f0, $f2
-/* DE5908 80240258 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* DE590C 8024025C 4406B000 */  mfc1      $a2, $f22
-/* DE5910 80240260 4407A000 */  mfc1      $a3, $f20
-/* DE5914 80240264 0C00A7B5 */  jal       dist2D
-/* DE5918 80240268 00000000 */   nop
-/* DE591C 8024026C C6020018 */  lwc1      $f2, 0x18($s0)
-/* DE5920 80240270 46000606 */  mov.s     $f24, $f0
-/* DE5924 80240274 4618103C */  c.lt.s    $f2, $f24
-/* DE5928 80240278 00000000 */  nop
-/* DE592C 8024027C 45000033 */  bc1f      .L8024034C
-/* DE5930 80240280 00000000 */   nop
-/* DE5934 80240284 8E020000 */  lw        $v0, ($s0)
-/* DE5938 80240288 30422000 */  andi      $v0, $v0, 0x2000
-/* DE593C 8024028C 10400022 */  beqz      $v0, .L80240318
-/* DE5940 80240290 00000000 */   nop
-/* DE5944 80240294 C602000C */  lwc1      $f2, 0xc($s0)
-/* DE5948 80240298 3C014334 */  lui       $at, 0x4334
-/* DE594C 8024029C 44810000 */  mtc1      $at, $f0
-/* DE5950 802402A0 00000000 */  nop
-/* DE5954 802402A4 4600103C */  c.lt.s    $f2, $f0
-/* DE5958 802402A8 00000000 */  nop
-/* DE595C 802402AC 4500000D */  bc1f      .L802402E4
-/* DE5960 802402B0 00000000 */   nop
-/* DE5964 802402B4 C6020040 */  lwc1      $f2, 0x40($s0)
-/* DE5968 802402B8 44800000 */  mtc1      $zero, $f0
-/* DE596C 802402BC 3C014307 */  lui       $at, 0x4307
-/* DE5970 802402C0 44812000 */  mtc1      $at, $f4
-/* DE5974 802402C4 4602003C */  c.lt.s    $f0, $f2
-/* DE5978 802402C8 00000000 */  nop
-/* DE597C 802402CC 45020019 */  bc1fl     .L80240334
-/* DE5980 802402D0 E604000C */   swc1     $f4, 0xc($s0)
-/* DE5984 802402D4 3C014234 */  lui       $at, 0x4234
-/* DE5988 802402D8 44812000 */  mtc1      $at, $f4
-/* DE598C 802402DC 080900CD */  j         .L80240334
-/* DE5990 802402E0 E604000C */   swc1     $f4, 0xc($s0)
-.L802402E4:
-/* DE5994 802402E4 C6020040 */  lwc1      $f2, 0x40($s0)
-/* DE5998 802402E8 44800000 */  mtc1      $zero, $f0
-/* DE599C 802402EC 3C014361 */  lui       $at, 0x4361
-/* DE59A0 802402F0 44812000 */  mtc1      $at, $f4
-/* DE59A4 802402F4 4602003C */  c.lt.s    $f0, $f2
-/* DE59A8 802402F8 00000000 */  nop
-/* DE59AC 802402FC 4502000D */  bc1fl     .L80240334
-/* DE59B0 80240300 E604000C */   swc1     $f4, 0xc($s0)
-/* DE59B4 80240304 3C01439D */  lui       $at, 0x439d
-/* DE59B8 80240308 34218000 */  ori       $at, $at, 0x8000
-/* DE59BC 8024030C 44812000 */  mtc1      $at, $f4
-/* DE59C0 80240310 080900CD */  j         .L80240334
-/* DE59C4 80240314 E604000C */   swc1     $f4, 0xc($s0)
-.L80240318:
-/* DE59C8 80240318 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* DE59CC 8024031C C60E0040 */  lwc1      $f14, 0x40($s0)
-/* DE59D0 80240320 4406B000 */  mfc1      $a2, $f22
-/* DE59D4 80240324 4407A000 */  mfc1      $a3, $f20
-/* DE59D8 80240328 0C00A720 */  jal       atan2
-/* DE59DC 8024032C 00000000 */   nop
-/* DE59E0 80240330 E600000C */  swc1      $f0, 0xc($s0)
-.L80240334:
-/* DE59E4 80240334 8E06000C */  lw        $a2, 0xc($s0)
-/* DE59E8 80240338 8E050018 */  lw        $a1, 0x18($s0)
-/* DE59EC 8024033C 0C00EA95 */  jal       npc_move_heading
-/* DE59F0 80240340 0200202D */   daddu    $a0, $s0, $zero
-/* DE59F4 80240344 080900D9 */  j         .L80240364
-/* DE59F8 80240348 00000000 */   nop
-.L8024034C:
-/* DE59FC 8024034C C60C0038 */  lwc1      $f12, 0x38($s0)
-/* DE5A00 80240350 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* DE5A04 80240354 8E260028 */  lw        $a2, 0x28($s1)
-/* DE5A08 80240358 0C00A720 */  jal       atan2
-/* DE5A0C 8024035C 8E270030 */   lw       $a3, 0x30($s1)
-/* DE5A10 80240360 E600000C */  swc1      $f0, 0xc($s0)
-.L80240364:
-/* DE5A14 80240364 C64200B0 */  lwc1      $f2, 0xb0($s2)
-/* DE5A18 80240368 C6200028 */  lwc1      $f0, 0x28($s1)
-/* DE5A1C 8024036C 46001032 */  c.eq.s    $f2, $f0
-/* DE5A20 80240370 00000000 */  nop
-/* DE5A24 80240374 45020013 */  bc1fl     .L802403C4
-/* DE5A28 80240378 E64000B0 */   swc1     $f0, 0xb0($s2)
-/* DE5A2C 8024037C C64200B8 */  lwc1      $f2, 0xb8($s2)
-/* DE5A30 80240380 C6200030 */  lwc1      $f0, 0x30($s1)
-/* DE5A34 80240384 46001032 */  c.eq.s    $f2, $f0
-/* DE5A38 80240388 00000000 */  nop
-/* DE5A3C 8024038C 4500000B */  bc1f      .L802403BC
-/* DE5A40 80240390 00000000 */   nop
-/* DE5A44 80240394 3C0141A0 */  lui       $at, 0x41a0
-/* DE5A48 80240398 44810000 */  mtc1      $at, $f0
-/* DE5A4C 8024039C 00000000 */  nop
-/* DE5A50 802403A0 4600C03C */  c.lt.s    $f24, $f0
-/* DE5A54 802403A4 00000000 */  nop
-/* DE5A58 802403A8 45020004 */  bc1fl     .L802403BC
-/* DE5A5C 802403AC AE4000BC */   sw       $zero, 0xbc($s2)
-/* DE5A60 802403B0 8E4200BC */  lw        $v0, 0xbc($s2)
-/* DE5A64 802403B4 24420001 */  addiu     $v0, $v0, 1
-/* DE5A68 802403B8 AE4200BC */  sw        $v0, 0xbc($s2)
-.L802403BC:
-/* DE5A6C 802403BC C6200028 */  lwc1      $f0, 0x28($s1)
-/* DE5A70 802403C0 E64000B0 */  swc1      $f0, 0xb0($s2)
-.L802403C4:
-/* DE5A74 802403C4 C620002C */  lwc1      $f0, 0x2c($s1)
-/* DE5A78 802403C8 E64000B4 */  swc1      $f0, 0xb4($s2)
-/* DE5A7C 802403CC C6200030 */  lwc1      $f0, 0x30($s1)
-/* DE5A80 802403D0 E64000B8 */  swc1      $f0, 0xb8($s2)
-/* DE5A84 802403D4 8FBF001C */  lw        $ra, 0x1c($sp)
-/* DE5A88 802403D8 8FB20018 */  lw        $s2, 0x18($sp)
-/* DE5A8C 802403DC 8FB10014 */  lw        $s1, 0x14($sp)
-/* DE5A90 802403E0 8FB00010 */  lw        $s0, 0x10($sp)
-/* DE5A94 802403E4 D7B80030 */  ldc1      $f24, 0x30($sp)
-/* DE5A98 802403E8 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* DE5A9C 802403EC D7B40020 */  ldc1      $f20, 0x20($sp)
-/* DE5AA0 802403F0 24020002 */  addiu     $v0, $zero, 2
-/* DE5AA4 802403F4 03E00008 */  jr        $ra
-/* DE5AA8 802403F8 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_802403FC_DE5AAC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_802403FC_DE5AAC.s
deleted file mode 100644
index e4782f40bc..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_802403FC_DE5AAC.s
+++ /dev/null
@@ -1,98 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802403FC_DE5AAC
-/* DE5AAC 802403FC 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* DE5AB0 80240400 AFB10014 */  sw        $s1, 0x14($sp)
-/* DE5AB4 80240404 0080882D */  daddu     $s1, $a0, $zero
-/* DE5AB8 80240408 AFBF001C */  sw        $ra, 0x1c($sp)
-/* DE5ABC 8024040C AFB20018 */  sw        $s2, 0x18($sp)
-/* DE5AC0 80240410 AFB00010 */  sw        $s0, 0x10($sp)
-/* DE5AC4 80240414 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* DE5AC8 80240418 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* DE5ACC 8024041C 8E220148 */  lw        $v0, 0x148($s1)
-/* DE5AD0 80240420 84440008 */  lh        $a0, 8($v0)
-/* DE5AD4 80240424 0C00EABB */  jal       get_npc_unsafe
-/* DE5AD8 80240428 8E30000C */   lw       $s0, 0xc($s1)
-/* DE5ADC 8024042C 8E050000 */  lw        $a1, ($s0)
-/* DE5AE0 80240430 26100004 */  addiu     $s0, $s0, 4
-/* DE5AE4 80240434 0220202D */  daddu     $a0, $s1, $zero
-/* DE5AE8 80240438 0C0B210B */  jal       evt_get_float_variable
-/* DE5AEC 8024043C 0040902D */   daddu    $s2, $v0, $zero
-/* DE5AF0 80240440 0220202D */  daddu     $a0, $s1, $zero
-/* DE5AF4 80240444 8E050000 */  lw        $a1, ($s0)
-/* DE5AF8 80240448 0C0B210B */  jal       evt_get_float_variable
-/* DE5AFC 8024044C 46000586 */   mov.s    $f22, $f0
-/* DE5B00 80240450 46000506 */  mov.s     $f20, $f0
-/* DE5B04 80240454 C64C0038 */  lwc1      $f12, 0x38($s2)
-/* DE5B08 80240458 C64E0040 */  lwc1      $f14, 0x40($s2)
-/* DE5B0C 8024045C 4406B000 */  mfc1      $a2, $f22
-/* DE5B10 80240460 4407A000 */  mfc1      $a3, $f20
-/* DE5B14 80240464 0C00A7B5 */  jal       dist2D
-/* DE5B18 80240468 00000000 */   nop
-/* DE5B1C 8024046C C6420018 */  lwc1      $f2, 0x18($s2)
-/* DE5B20 80240470 4600103C */  c.lt.s    $f2, $f0
-/* DE5B24 80240474 00000000 */  nop
-/* DE5B28 80240478 45000031 */  bc1f      .L80240540
-/* DE5B2C 8024047C 00000000 */   nop
-/* DE5B30 80240480 8E420000 */  lw        $v0, ($s2)
-/* DE5B34 80240484 30422000 */  andi      $v0, $v0, 0x2000
-/* DE5B38 80240488 10400022 */  beqz      $v0, .L80240514
-/* DE5B3C 8024048C 00000000 */   nop
-/* DE5B40 80240490 C642000C */  lwc1      $f2, 0xc($s2)
-/* DE5B44 80240494 3C014334 */  lui       $at, 0x4334
-/* DE5B48 80240498 44810000 */  mtc1      $at, $f0
-/* DE5B4C 8024049C 00000000 */  nop
-/* DE5B50 802404A0 4600103C */  c.lt.s    $f2, $f0
-/* DE5B54 802404A4 00000000 */  nop
-/* DE5B58 802404A8 4500000D */  bc1f      .L802404E0
-/* DE5B5C 802404AC 00000000 */   nop
-/* DE5B60 802404B0 C6420040 */  lwc1      $f2, 0x40($s2)
-/* DE5B64 802404B4 44800000 */  mtc1      $zero, $f0
-/* DE5B68 802404B8 3C014307 */  lui       $at, 0x4307
-/* DE5B6C 802404BC 44812000 */  mtc1      $at, $f4
-/* DE5B70 802404C0 4602003C */  c.lt.s    $f0, $f2
-/* DE5B74 802404C4 00000000 */  nop
-/* DE5B78 802404C8 45020019 */  bc1fl     .L80240530
-/* DE5B7C 802404CC E644000C */   swc1     $f4, 0xc($s2)
-/* DE5B80 802404D0 3C014234 */  lui       $at, 0x4234
-/* DE5B84 802404D4 44812000 */  mtc1      $at, $f4
-/* DE5B88 802404D8 0809014C */  j         .L80240530
-/* DE5B8C 802404DC E644000C */   swc1     $f4, 0xc($s2)
-.L802404E0:
-/* DE5B90 802404E0 C6420040 */  lwc1      $f2, 0x40($s2)
-/* DE5B94 802404E4 44800000 */  mtc1      $zero, $f0
-/* DE5B98 802404E8 3C014361 */  lui       $at, 0x4361
-/* DE5B9C 802404EC 44812000 */  mtc1      $at, $f4
-/* DE5BA0 802404F0 4602003C */  c.lt.s    $f0, $f2
-/* DE5BA4 802404F4 00000000 */  nop
-/* DE5BA8 802404F8 4502000D */  bc1fl     .L80240530
-/* DE5BAC 802404FC E644000C */   swc1     $f4, 0xc($s2)
-/* DE5BB0 80240500 3C01439D */  lui       $at, 0x439d
-/* DE5BB4 80240504 34218000 */  ori       $at, $at, 0x8000
-/* DE5BB8 80240508 44812000 */  mtc1      $at, $f4
-/* DE5BBC 8024050C 0809014C */  j         .L80240530
-/* DE5BC0 80240510 E644000C */   swc1     $f4, 0xc($s2)
-.L80240514:
-/* DE5BC4 80240514 C64C0038 */  lwc1      $f12, 0x38($s2)
-/* DE5BC8 80240518 C64E0040 */  lwc1      $f14, 0x40($s2)
-/* DE5BCC 8024051C 4406B000 */  mfc1      $a2, $f22
-/* DE5BD0 80240520 4407A000 */  mfc1      $a3, $f20
-/* DE5BD4 80240524 0C00A720 */  jal       atan2
-/* DE5BD8 80240528 00000000 */   nop
-/* DE5BDC 8024052C E640000C */  swc1      $f0, 0xc($s2)
-.L80240530:
-/* DE5BE0 80240530 8E450018 */  lw        $a1, 0x18($s2)
-/* DE5BE4 80240534 8E46000C */  lw        $a2, 0xc($s2)
-/* DE5BE8 80240538 0C00EA95 */  jal       npc_move_heading
-/* DE5BEC 8024053C 0240202D */   daddu    $a0, $s2, $zero
-.L80240540:
-/* DE5BF0 80240540 8FBF001C */  lw        $ra, 0x1c($sp)
-/* DE5BF4 80240544 8FB20018 */  lw        $s2, 0x18($sp)
-/* DE5BF8 80240548 8FB10014 */  lw        $s1, 0x14($sp)
-/* DE5BFC 8024054C 8FB00010 */  lw        $s0, 0x10($sp)
-/* DE5C00 80240550 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* DE5C04 80240554 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* DE5C08 80240558 24020002 */  addiu     $v0, $zero, 2
-/* DE5C0C 8024055C 03E00008 */  jr        $ra
-/* DE5C10 80240560 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240564_DE5C14.s b/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240564_DE5C14.s
deleted file mode 100644
index 72ee6808ed..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240564_DE5C14.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240564_DE5C14
-/* DE5C14 80240564 3C038011 */  lui       $v1, %hi(gPartnerActionStatus)
-/* DE5C18 80240568 2463EBB0 */  addiu     $v1, $v1, %lo(gPartnerActionStatus)
-/* DE5C1C 8024056C 80620000 */  lb        $v0, ($v1)
-/* DE5C20 80240570 10400004 */  beqz      $v0, .L80240584
-/* DE5C24 80240574 2402FFFF */   addiu    $v0, $zero, -1
-/* DE5C28 80240578 80620003 */  lb        $v0, 3($v1)
-/* DE5C2C 8024057C 08090162 */  j         .L80240588
-/* DE5C30 80240580 AC8200A8 */   sw       $v0, 0xa8($a0)
-.L80240584:
-/* DE5C34 80240584 AC8200A8 */  sw        $v0, 0xa8($a0)
-.L80240588:
-/* DE5C38 80240588 03E00008 */  jr        $ra
-/* DE5C3C 8024058C 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_8024055C_DEC42C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_8024055C_DEC42C.s
deleted file mode 100644
index 7aeff3b327..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_8024055C_DEC42C.s
+++ /dev/null
@@ -1,47 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024055C_DEC42C
-/* DEC42C 8024055C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* DEC430 80240560 AFB00010 */  sw        $s0, 0x10($sp)
-/* DEC434 80240564 0080802D */  daddu     $s0, $a0, $zero
-/* DEC438 80240568 3C05FD05 */  lui       $a1, 0xfd05
-/* DEC43C 8024056C AFBF0014 */  sw        $ra, 0x14($sp)
-/* DEC440 80240570 0C0B210B */  jal       evt_get_float_variable
-/* DEC444 80240574 34A50F8B */   ori      $a1, $a1, 0xf8b
-/* DEC448 80240578 46000106 */  mov.s     $f4, $f0
-/* DEC44C 8024057C 3C0144FA */  lui       $at, 0x44fa
-/* DEC450 80240580 44811000 */  mtc1      $at, $f2
-/* DEC454 80240584 46002005 */  abs.s     $f0, $f4
-/* DEC458 80240588 4602003C */  c.lt.s    $f0, $f2
-/* DEC45C 8024058C 00000000 */  nop
-/* DEC460 80240590 4500000D */  bc1f      .L802405C8
-/* DEC464 80240594 AE000084 */   sw       $zero, 0x84($s0)
-/* DEC468 80240598 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* DEC46C 8024059C 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* DEC470 802405A0 8C420010 */  lw        $v0, 0x10($v0)
-/* DEC474 802405A4 30428000 */  andi      $v0, $v0, 0x8000
-/* DEC478 802405A8 10400007 */  beqz      $v0, .L802405C8
-/* DEC47C 802405AC 24020001 */   addiu    $v0, $zero, 1
-/* DEC480 802405B0 AE020084 */  sw        $v0, 0x84($s0)
-/* DEC484 802405B4 3C0144FA */  lui       $at, 0x44fa
-/* DEC488 802405B8 44811000 */  mtc1      $at, $f2
-/* DEC48C 802405BC 46002005 */  abs.s     $f0, $f4
-/* DEC490 802405C0 4602003C */  c.lt.s    $f0, $f2
-/* DEC494 802405C4 00000000 */  nop
-.L802405C8:
-/* DEC498 802405C8 45000008 */  bc1f      .L802405EC
-/* DEC49C 802405CC 00000000 */   nop
-/* DEC4A0 802405D0 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* DEC4A4 802405D4 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* DEC4A8 802405D8 8C420010 */  lw        $v0, 0x10($v0)
-/* DEC4AC 802405DC 30424000 */  andi      $v0, $v0, 0x4000
-/* DEC4B0 802405E0 10400002 */  beqz      $v0, .L802405EC
-/* DEC4B4 802405E4 24020001 */   addiu    $v0, $zero, 1
-/* DEC4B8 802405E8 AE020084 */  sw        $v0, 0x84($s0)
-.L802405EC:
-/* DEC4BC 802405EC 8FBF0014 */  lw        $ra, 0x14($sp)
-/* DEC4C0 802405F0 8FB00010 */  lw        $s0, 0x10($sp)
-/* DEC4C4 802405F4 24020002 */  addiu     $v0, $zero, 2
-/* DEC4C8 802405F8 03E00008 */  jr        $ra
-/* DEC4CC 802405FC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_02/AB21D0/func_80240060_AB21D0.s b/ver/us/asm/nonmatchings/world/area_osr/osr_02/AB21D0/func_80240060_AB21D0.s
deleted file mode 100644
index 865115c185..0000000000
--- a/ver/us/asm/nonmatchings/world/area_osr/osr_02/AB21D0/func_80240060_AB21D0.s
+++ /dev/null
@@ -1,55 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240060_AB21D0
-/* AB21D0 80240060 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* AB21D4 80240064 AFB10014 */  sw        $s1, 0x14($sp)
-/* AB21D8 80240068 0080882D */  daddu     $s1, $a0, $zero
-/* AB21DC 8024006C AFBF0018 */  sw        $ra, 0x18($sp)
-/* AB21E0 80240070 10A0000C */  beqz      $a1, .L802400A4
-/* AB21E4 80240074 AFB00010 */   sw       $s0, 0x10($sp)
-/* AB21E8 80240078 8E24014C */  lw        $a0, 0x14c($s1)
-/* AB21EC 8024007C 0C00EAD2 */  jal       get_npc_safe
-/* AB21F0 80240080 AE200074 */   sw       $zero, 0x74($s1)
-/* AB21F4 80240084 8E23014C */  lw        $v1, 0x14c($s1)
-/* AB21F8 80240088 AE220078 */  sw        $v0, 0x78($s1)
-/* AB21FC 8024008C 2463FFFE */  addiu     $v1, $v1, -2
-/* AB2200 80240090 00031840 */  sll       $v1, $v1, 1
-/* AB2204 80240094 3C028024 */  lui       $v0, %hi(D_8024253C_AB46AC)
-/* AB2208 80240098 00431021 */  addu      $v0, $v0, $v1
-/* AB220C 8024009C 8442253C */  lh        $v0, %lo(D_8024253C_AB46AC)($v0)
-/* AB2210 802400A0 AE22007C */  sw        $v0, 0x7c($s1)
-.L802400A4:
-/* AB2214 802400A4 8E22007C */  lw        $v0, 0x7c($s1)
-/* AB2218 802400A8 14400015 */  bnez      $v0, .L80240100
-/* AB221C 802400AC 2442FFFF */   addiu    $v0, $v0, -1
-/* AB2220 802400B0 C62C0074 */  lwc1      $f12, 0x74($s1)
-/* AB2224 802400B4 0C00A8BB */  jal       sin_deg
-/* AB2228 802400B8 8E300078 */   lw       $s0, 0x78($s1)
-/* AB222C 802400BC 3C013FC0 */  lui       $at, 0x3fc0
-/* AB2230 802400C0 44811000 */  mtc1      $at, $f2
-/* AB2234 802400C4 00000000 */  nop
-/* AB2238 802400C8 46020002 */  mul.s     $f0, $f0, $f2
-/* AB223C 802400CC 00000000 */  nop
-/* AB2240 802400D0 3C014190 */  lui       $at, 0x4190
-/* AB2244 802400D4 44816000 */  mtc1      $at, $f12
-/* AB2248 802400D8 4600010D */  trunc.w.s $f4, $f0
-/* AB224C 802400DC 44022000 */  mfc1      $v0, $f4
-/* AB2250 802400E0 00000000 */  nop
-/* AB2254 802400E4 A20200AB */  sb        $v0, 0xab($s0)
-/* AB2258 802400E8 C6200074 */  lwc1      $f0, 0x74($s1)
-/* AB225C 802400EC 0C00A6C9 */  jal       clamp_angle
-/* AB2260 802400F0 460C0300 */   add.s    $f12, $f0, $f12
-/* AB2264 802400F4 0000102D */  daddu     $v0, $zero, $zero
-/* AB2268 802400F8 08090042 */  j         .L80240108
-/* AB226C 802400FC E6200074 */   swc1     $f0, 0x74($s1)
-.L80240100:
-/* AB2270 80240100 AE22007C */  sw        $v0, 0x7c($s1)
-/* AB2274 80240104 0000102D */  daddu     $v0, $zero, $zero
-.L80240108:
-/* AB2278 80240108 8FBF0018 */  lw        $ra, 0x18($sp)
-/* AB227C 8024010C 8FB10014 */  lw        $s1, 0x14($sp)
-/* AB2280 80240110 8FB00010 */  lw        $s0, 0x10($sp)
-/* AB2284 80240114 03E00008 */  jr        $ra
-/* AB2288 80240118 27BD0020 */   addiu    $sp, $sp, 0x20
-/* AB228C 8024011C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802414A8_D51498.s b/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802414A8_D51498.s
deleted file mode 100644
index 26f87d17ac..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802414A8_D51498.s
+++ /dev/null
@@ -1,62 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802414A8_D51498
-/* D51498 802414A8 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* D5149C 802414AC AFB10014 */  sw        $s1, 0x14($sp)
-/* D514A0 802414B0 0080882D */  daddu     $s1, $a0, $zero
-/* D514A4 802414B4 AFBF001C */  sw        $ra, 0x1c($sp)
-/* D514A8 802414B8 AFB20018 */  sw        $s2, 0x18($sp)
-/* D514AC 802414BC AFB00010 */  sw        $s0, 0x10($sp)
-/* D514B0 802414C0 F7BA0038 */  sdc1      $f26, 0x38($sp)
-/* D514B4 802414C4 F7B80030 */  sdc1      $f24, 0x30($sp)
-/* D514B8 802414C8 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* D514BC 802414CC F7B40020 */  sdc1      $f20, 0x20($sp)
-/* D514C0 802414D0 8E30000C */  lw        $s0, 0xc($s1)
-/* D514C4 802414D4 8E050000 */  lw        $a1, ($s0)
-/* D514C8 802414D8 0C0B1EAF */  jal       evt_get_variable
-/* D514CC 802414DC 26100004 */   addiu    $s0, $s0, 4
-/* D514D0 802414E0 8E050000 */  lw        $a1, ($s0)
-/* D514D4 802414E4 26100004 */  addiu     $s0, $s0, 4
-/* D514D8 802414E8 0220202D */  daddu     $a0, $s1, $zero
-/* D514DC 802414EC 0C0B210B */  jal       evt_get_float_variable
-/* D514E0 802414F0 0040902D */   daddu    $s2, $v0, $zero
-/* D514E4 802414F4 8E050000 */  lw        $a1, ($s0)
-/* D514E8 802414F8 26100004 */  addiu     $s0, $s0, 4
-/* D514EC 802414FC 0220202D */  daddu     $a0, $s1, $zero
-/* D514F0 80241500 0C0B210B */  jal       evt_get_float_variable
-/* D514F4 80241504 46000686 */   mov.s    $f26, $f0
-/* D514F8 80241508 0220202D */  daddu     $a0, $s1, $zero
-/* D514FC 8024150C 8E050000 */  lw        $a1, ($s0)
-/* D51500 80241510 0C0B210B */  jal       evt_get_float_variable
-/* D51504 80241514 46000606 */   mov.s    $f24, $f0
-/* D51508 80241518 0220202D */  daddu     $a0, $s1, $zero
-/* D5150C 8024151C 3C05FD05 */  lui       $a1, 0xfd05
-/* D51510 80241520 34A50F80 */  ori       $a1, $a1, 0xf80
-/* D51514 80241524 0C0B210B */  jal       evt_get_float_variable
-/* D51518 80241528 46000586 */   mov.s    $f22, $f0
-/* D5151C 8024152C 2402FFFF */  addiu     $v0, $zero, -1
-/* D51520 80241530 1242000A */  beq       $s2, $v0, .L8024155C
-/* D51524 80241534 46000506 */   mov.s    $f20, $f0
-/* D51528 80241538 0C04417A */  jal       get_entity_by_index
-/* D5152C 8024153C 0240202D */   daddu    $a0, $s2, $zero
-/* D51530 80241540 0040182D */  daddu     $v1, $v0, $zero
-/* D51534 80241544 24020002 */  addiu     $v0, $zero, 2
-/* D51538 80241548 4614C000 */  add.s     $f0, $f24, $f20
-/* D5153C 8024154C E47A0048 */  swc1      $f26, 0x48($v1)
-/* D51540 80241550 E4760050 */  swc1      $f22, 0x50($v1)
-/* D51544 80241554 08090558 */  j         .L80241560
-/* D51548 80241558 E460004C */   swc1     $f0, 0x4c($v1)
-.L8024155C:
-/* D5154C 8024155C 24020002 */  addiu     $v0, $zero, 2
-.L80241560:
-/* D51550 80241560 8FBF001C */  lw        $ra, 0x1c($sp)
-/* D51554 80241564 8FB20018 */  lw        $s2, 0x18($sp)
-/* D51558 80241568 8FB10014 */  lw        $s1, 0x14($sp)
-/* D5155C 8024156C 8FB00010 */  lw        $s0, 0x10($sp)
-/* D51560 80241570 D7BA0038 */  ldc1      $f26, 0x38($sp)
-/* D51564 80241574 D7B80030 */  ldc1      $f24, 0x30($sp)
-/* D51568 80241578 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* D5156C 8024157C D7B40020 */  ldc1      $f20, 0x20($sp)
-/* D51570 80241580 03E00008 */  jr        $ra
-/* D51574 80241584 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240020_D53CD0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240020_D53CD0.s
deleted file mode 100644
index d3f4dbf340..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240020_D53CD0.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240020_D53CD0
-/* D53CD0 80240020 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* D53CD4 80240024 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* D53CD8 80240028 C4620080 */  lwc1      $f2, 0x80($v1)
-/* D53CDC 8024002C 44800000 */  mtc1      $zero, $f0
-/* D53CE0 80240030 00000000 */  nop
-/* D53CE4 80240034 4602003E */  c.le.s    $f0, $f2
-/* D53CE8 80240038 00000000 */  nop
-/* D53CEC 8024003C 4500000A */  bc1f      .L80240068
-/* D53CF0 80240040 00000000 */   nop
-/* D53CF4 80240044 3C014334 */  lui       $at, 0x4334
-/* D53CF8 80240048 44810000 */  mtc1      $at, $f0
-/* D53CFC 8024004C 00000000 */  nop
-/* D53D00 80240050 4600103C */  c.lt.s    $f2, $f0
-/* D53D04 80240054 00000000 */  nop
-/* D53D08 80240058 45000006 */  bc1f      .L80240074
-/* D53D0C 8024005C 24020096 */   addiu    $v0, $zero, 0x96
-/* D53D10 80240060 AC820084 */  sw        $v0, 0x84($a0)
-/* D53D14 80240064 C4620080 */  lwc1      $f2, 0x80($v1)
-.L80240068:
-/* D53D18 80240068 3C014334 */  lui       $at, 0x4334
-/* D53D1C 8024006C 44810000 */  mtc1      $at, $f0
-/* D53D20 80240070 00000000 */  nop
-.L80240074:
-/* D53D24 80240074 4602003E */  c.le.s    $f0, $f2
-/* D53D28 80240078 00000000 */  nop
-/* D53D2C 8024007C 45000009 */  bc1f      .L802400A4
-/* D53D30 80240080 00000000 */   nop
-/* D53D34 80240084 3C0143B4 */  lui       $at, 0x43b4
-/* D53D38 80240088 44810000 */  mtc1      $at, $f0
-/* D53D3C 8024008C 00000000 */  nop
-/* D53D40 80240090 4600103C */  c.lt.s    $f2, $f0
-/* D53D44 80240094 00000000 */  nop
-/* D53D48 80240098 45000002 */  bc1f      .L802400A4
-/* D53D4C 8024009C 2402005F */   addiu    $v0, $zero, 0x5f
-/* D53D50 802400A0 AC820084 */  sw        $v0, 0x84($a0)
-.L802400A4:
-/* D53D54 802400A4 03E00008 */  jr        $ra
-/* D53D58 802400A8 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_802400AC_D53D5C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_802400AC_D53D5C.s
deleted file mode 100644
index f6b6e1383a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_802400AC_D53D5C.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802400AC_D53D5C
-/* D53D5C 802400AC 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* D53D60 802400B0 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* D53D64 802400B4 C4620080 */  lwc1      $f2, 0x80($v1)
-/* D53D68 802400B8 44800000 */  mtc1      $zero, $f0
-/* D53D6C 802400BC 00000000 */  nop
-/* D53D70 802400C0 4602003E */  c.le.s    $f0, $f2
-/* D53D74 802400C4 00000000 */  nop
-/* D53D78 802400C8 4500000A */  bc1f      .L802400F4
-/* D53D7C 802400CC 00000000 */   nop
-/* D53D80 802400D0 3C014334 */  lui       $at, 0x4334
-/* D53D84 802400D4 44810000 */  mtc1      $at, $f0
-/* D53D88 802400D8 00000000 */  nop
-/* D53D8C 802400DC 4600103C */  c.lt.s    $f2, $f0
-/* D53D90 802400E0 00000000 */  nop
-/* D53D94 802400E4 45000006 */  bc1f      .L80240100
-/* D53D98 802400E8 240200A5 */   addiu    $v0, $zero, 0xa5
-/* D53D9C 802400EC AC820084 */  sw        $v0, 0x84($a0)
-/* D53DA0 802400F0 C4620080 */  lwc1      $f2, 0x80($v1)
-.L802400F4:
-/* D53DA4 802400F4 3C014334 */  lui       $at, 0x4334
-/* D53DA8 802400F8 44810000 */  mtc1      $at, $f0
-/* D53DAC 802400FC 00000000 */  nop
-.L80240100:
-/* D53DB0 80240100 4602003E */  c.le.s    $f0, $f2
-/* D53DB4 80240104 00000000 */  nop
-/* D53DB8 80240108 45000009 */  bc1f      .L80240130
-/* D53DBC 8024010C 00000000 */   nop
-/* D53DC0 80240110 3C0143B4 */  lui       $at, 0x43b4
-/* D53DC4 80240114 44810000 */  mtc1      $at, $f0
-/* D53DC8 80240118 00000000 */  nop
-/* D53DCC 8024011C 4600103C */  c.lt.s    $f2, $f0
-/* D53DD0 80240120 00000000 */  nop
-/* D53DD4 80240124 45000002 */  bc1f      .L80240130
-/* D53DD8 80240128 24020046 */   addiu    $v0, $zero, 0x46
-/* D53DDC 8024012C AC820084 */  sw        $v0, 0x84($a0)
-.L80240130:
-/* D53DE0 80240130 03E00008 */  jr        $ra
-/* D53DE4 80240134 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240138_D53DE8.s b/ver/us/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240138_D53DE8.s
deleted file mode 100644
index 47449b9c5b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240138_D53DE8.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240138_D53DE8
-/* D53DE8 80240138 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D53DEC 8024013C AFB10014 */  sw        $s1, 0x14($sp)
-/* D53DF0 80240140 0080882D */  daddu     $s1, $a0, $zero
-/* D53DF4 80240144 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* D53DF8 80240148 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* D53DFC 8024014C AFBF0018 */  sw        $ra, 0x18($sp)
-/* D53E00 80240150 AFB00010 */  sw        $s0, 0x10($sp)
-/* D53E04 80240154 84430018 */  lh        $v1, 0x18($v0)
-/* D53E08 80240158 14600005 */  bnez      $v1, .L80240170
-/* D53E0C 8024015C 0040802D */   daddu    $s0, $v0, $zero
-/* D53E10 80240160 3C05FD05 */  lui       $a1, 0xfd05
-/* D53E14 80240164 34A50F80 */  ori       $a1, $a1, 0xf80
-/* D53E18 80240168 0C0B2026 */  jal       evt_set_variable
-/* D53E1C 8024016C 0000302D */   daddu    $a2, $zero, $zero
-.L80240170:
-/* D53E20 80240170 86030018 */  lh        $v1, 0x18($s0)
-/* D53E24 80240174 2402FF38 */  addiu     $v0, $zero, -0xc8
-/* D53E28 80240178 14620005 */  bne       $v1, $v0, .L80240190
-/* D53E2C 8024017C 0220202D */   daddu    $a0, $s1, $zero
-/* D53E30 80240180 3C05FD05 */  lui       $a1, 0xfd05
-/* D53E34 80240184 34A50F80 */  ori       $a1, $a1, 0xf80
-/* D53E38 80240188 0C0B2026 */  jal       evt_set_variable
-/* D53E3C 8024018C 24060001 */   addiu    $a2, $zero, 1
-.L80240190:
-/* D53E40 80240190 8FBF0018 */  lw        $ra, 0x18($sp)
-/* D53E44 80240194 8FB10014 */  lw        $s1, 0x14($sp)
-/* D53E48 80240198 8FB00010 */  lw        $s0, 0x10($sp)
-/* D53E4C 8024019C 0000102D */  daddu     $v0, $zero, $zero
-/* D53E50 802401A0 03E00008 */  jr        $ra
-/* D53E54 802401A4 27BD0020 */   addiu    $sp, $sp, 0x20
-/* D53E58 802401A8 00000000 */  nop
-/* D53E5C 802401AC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_80240020_D546B0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_80240020_D546B0.s
deleted file mode 100644
index 893f611938..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_80240020_D546B0.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240020_D546B0
-/* D546B0 80240020 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* D546B4 80240024 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* D546B8 80240028 C4620080 */  lwc1      $f2, 0x80($v1)
-/* D546BC 8024002C 44800000 */  mtc1      $zero, $f0
-/* D546C0 80240030 00000000 */  nop
-/* D546C4 80240034 4602003E */  c.le.s    $f0, $f2
-/* D546C8 80240038 00000000 */  nop
-/* D546CC 8024003C 4500000A */  bc1f      .L80240068
-/* D546D0 80240040 00000000 */   nop
-/* D546D4 80240044 3C014334 */  lui       $at, 0x4334
-/* D546D8 80240048 44810000 */  mtc1      $at, $f0
-/* D546DC 8024004C 00000000 */  nop
-/* D546E0 80240050 4600103C */  c.lt.s    $f2, $f0
-/* D546E4 80240054 00000000 */  nop
-/* D546E8 80240058 45000006 */  bc1f      .L80240074
-/* D546EC 8024005C 24020096 */   addiu    $v0, $zero, 0x96
-/* D546F0 80240060 AC820084 */  sw        $v0, 0x84($a0)
-/* D546F4 80240064 C4620080 */  lwc1      $f2, 0x80($v1)
-.L80240068:
-/* D546F8 80240068 3C014334 */  lui       $at, 0x4334
-/* D546FC 8024006C 44810000 */  mtc1      $at, $f0
-/* D54700 80240070 00000000 */  nop
-.L80240074:
-/* D54704 80240074 4602003E */  c.le.s    $f0, $f2
-/* D54708 80240078 00000000 */  nop
-/* D5470C 8024007C 45000009 */  bc1f      .L802400A4
-/* D54710 80240080 00000000 */   nop
-/* D54714 80240084 3C0143B4 */  lui       $at, 0x43b4
-/* D54718 80240088 44810000 */  mtc1      $at, $f0
-/* D5471C 8024008C 00000000 */  nop
-/* D54720 80240090 4600103C */  c.lt.s    $f2, $f0
-/* D54724 80240094 00000000 */  nop
-/* D54728 80240098 45000002 */  bc1f      .L802400A4
-/* D5472C 8024009C 2402005F */   addiu    $v0, $zero, 0x5f
-/* D54730 802400A0 AC820084 */  sw        $v0, 0x84($a0)
-.L802400A4:
-/* D54734 802400A4 03E00008 */  jr        $ra
-/* D54738 802400A8 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_802400AC_D5473C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_802400AC_D5473C.s
deleted file mode 100644
index e3c98787c2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_802400AC_D5473C.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802400AC_D5473C
-/* D5473C 802400AC 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* D54740 802400B0 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* D54744 802400B4 C4620080 */  lwc1      $f2, 0x80($v1)
-/* D54748 802400B8 44800000 */  mtc1      $zero, $f0
-/* D5474C 802400BC 00000000 */  nop
-/* D54750 802400C0 4602003E */  c.le.s    $f0, $f2
-/* D54754 802400C4 00000000 */  nop
-/* D54758 802400C8 4500000A */  bc1f      .L802400F4
-/* D5475C 802400CC 00000000 */   nop
-/* D54760 802400D0 3C014334 */  lui       $at, 0x4334
-/* D54764 802400D4 44810000 */  mtc1      $at, $f0
-/* D54768 802400D8 00000000 */  nop
-/* D5476C 802400DC 4600103C */  c.lt.s    $f2, $f0
-/* D54770 802400E0 00000000 */  nop
-/* D54774 802400E4 45000006 */  bc1f      .L80240100
-/* D54778 802400E8 240200A5 */   addiu    $v0, $zero, 0xa5
-/* D5477C 802400EC AC820084 */  sw        $v0, 0x84($a0)
-/* D54780 802400F0 C4620080 */  lwc1      $f2, 0x80($v1)
-.L802400F4:
-/* D54784 802400F4 3C014334 */  lui       $at, 0x4334
-/* D54788 802400F8 44810000 */  mtc1      $at, $f0
-/* D5478C 802400FC 00000000 */  nop
-.L80240100:
-/* D54790 80240100 4602003E */  c.le.s    $f0, $f2
-/* D54794 80240104 00000000 */  nop
-/* D54798 80240108 45000009 */  bc1f      .L80240130
-/* D5479C 8024010C 00000000 */   nop
-/* D547A0 80240110 3C0143B4 */  lui       $at, 0x43b4
-/* D547A4 80240114 44810000 */  mtc1      $at, $f0
-/* D547A8 80240118 00000000 */  nop
-/* D547AC 8024011C 4600103C */  c.lt.s    $f2, $f0
-/* D547B0 80240120 00000000 */  nop
-/* D547B4 80240124 45000002 */  bc1f      .L80240130
-/* D547B8 80240128 24020046 */   addiu    $v0, $zero, 0x46
-/* D547BC 8024012C AC820084 */  sw        $v0, 0x84($a0)
-.L80240130:
-/* D547C0 80240130 03E00008 */  jr        $ra
-/* D547C4 80240134 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_80240138_D547C8.s b/ver/us/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_80240138_D547C8.s
deleted file mode 100644
index a91064dd3b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_80240138_D547C8.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240138_D547C8
-/* D547C8 80240138 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D547CC 8024013C AFB10014 */  sw        $s1, 0x14($sp)
-/* D547D0 80240140 0080882D */  daddu     $s1, $a0, $zero
-/* D547D4 80240144 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* D547D8 80240148 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* D547DC 8024014C AFBF0018 */  sw        $ra, 0x18($sp)
-/* D547E0 80240150 AFB00010 */  sw        $s0, 0x10($sp)
-/* D547E4 80240154 84430018 */  lh        $v1, 0x18($v0)
-/* D547E8 80240158 14600005 */  bnez      $v1, .L80240170
-/* D547EC 8024015C 0040802D */   daddu    $s0, $v0, $zero
-/* D547F0 80240160 3C05FD05 */  lui       $a1, 0xfd05
-/* D547F4 80240164 34A50F80 */  ori       $a1, $a1, 0xf80
-/* D547F8 80240168 0C0B2026 */  jal       evt_set_variable
-/* D547FC 8024016C 0000302D */   daddu    $a2, $zero, $zero
-.L80240170:
-/* D54800 80240170 86030018 */  lh        $v1, 0x18($s0)
-/* D54804 80240174 2402FF38 */  addiu     $v0, $zero, -0xc8
-/* D54808 80240178 14620005 */  bne       $v1, $v0, .L80240190
-/* D5480C 8024017C 0220202D */   daddu    $a0, $s1, $zero
-/* D54810 80240180 3C05FD05 */  lui       $a1, 0xfd05
-/* D54814 80240184 34A50F80 */  ori       $a1, $a1, 0xf80
-/* D54818 80240188 0C0B2026 */  jal       evt_set_variable
-/* D5481C 8024018C 24060001 */   addiu    $a2, $zero, 1
-.L80240190:
-/* D54820 80240190 8FBF0018 */  lw        $ra, 0x18($sp)
-/* D54824 80240194 8FB10014 */  lw        $s1, 0x14($sp)
-/* D54828 80240198 8FB00010 */  lw        $s0, 0x10($sp)
-/* D5482C 8024019C 0000102D */  daddu     $v0, $zero, $zero
-/* D54830 802401A0 03E00008 */  jr        $ra
-/* D54834 802401A4 27BD0020 */   addiu    $sp, $sp, 0x20
-/* D54838 802401A8 00000000 */  nop
-/* D5483C 802401AC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240000_D57430.s b/ver/us/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240000_D57430.s
deleted file mode 100644
index b90962d077..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240000_D57430.s
+++ /dev/null
@@ -1,34 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_80241430_D58860
-.ascii "pra_05_shape\0\0\0\0"
-
-dlabel D_80241440_D58870
-.ascii "pra_05_hit\0\0pra_39\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-
-.section .text
-
-glabel func_80240000_D57430
-/* D57430 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D57434 80240004 3C04800E */  lui       $a0, %hi(wMapShapeName)
-/* D57438 80240008 24849230 */  addiu     $a0, $a0, %lo(wMapShapeName)
-/* D5743C 8024000C 3C058024 */  lui       $a1, %hi(D_80241430_D58860)
-/* D57440 80240010 24A51430 */  addiu     $a1, $a1, %lo(D_80241430_D58860)
-/* D57444 80240014 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* D57448 80240018 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* D5744C 8024001C 24020001 */  addiu     $v0, $zero, 1
-/* D57450 80240020 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D57454 80240024 0C01953C */  jal       sprintf
-/* D57458 80240028 A0620084 */   sb       $v0, 0x84($v1)
-/* D5745C 8024002C 3C04800E */  lui       $a0, %hi(wMapHitName)
-/* D57460 80240030 248491E0 */  addiu     $a0, $a0, %lo(wMapHitName)
-/* D57464 80240034 3C058024 */  lui       $a1, %hi(D_80241440_D58870)
-/* D57468 80240038 0C01953C */  jal       sprintf
-/* D5746C 8024003C 24A51440 */   addiu    $a1, $a1, %lo(D_80241440_D58870)
-/* D57470 80240040 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D57474 80240044 0000102D */  daddu     $v0, $zero, $zero
-/* D57478 80240048 03E00008 */  jr        $ra
-/* D5747C 8024004C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241310_D59BA0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241310_D59BA0.s
deleted file mode 100644
index 2da45c7f2e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241310_D59BA0.s
+++ /dev/null
@@ -1,41 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241310_D59BA0
-/* D59BA0 80241310 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D59BA4 80241314 AFB10014 */  sw        $s1, 0x14($sp)
-/* D59BA8 80241318 0080882D */  daddu     $s1, $a0, $zero
-/* D59BAC 8024131C AFBF001C */  sw        $ra, 0x1c($sp)
-/* D59BB0 80241320 AFB20018 */  sw        $s2, 0x18($sp)
-/* D59BB4 80241324 AFB00010 */  sw        $s0, 0x10($sp)
-/* D59BB8 80241328 8E30000C */  lw        $s0, 0xc($s1)
-/* D59BBC 8024132C 8E050000 */  lw        $a1, ($s0)
-/* D59BC0 80241330 0C0B1EAF */  jal       evt_get_variable
-/* D59BC4 80241334 26100004 */   addiu    $s0, $s0, 4
-/* D59BC8 80241338 8E050000 */  lw        $a1, ($s0)
-/* D59BCC 8024133C 26100004 */  addiu     $s0, $s0, 4
-/* D59BD0 80241340 0220202D */  daddu     $a0, $s1, $zero
-/* D59BD4 80241344 0C0B1EAF */  jal       evt_get_variable
-/* D59BD8 80241348 0040902D */   daddu    $s2, $v0, $zero
-/* D59BDC 8024134C 0220202D */  daddu     $a0, $s1, $zero
-/* D59BE0 80241350 8E050000 */  lw        $a1, ($s0)
-/* D59BE4 80241354 0C0B1EAF */  jal       evt_get_variable
-/* D59BE8 80241358 0040802D */   daddu    $s0, $v0, $zero
-/* D59BEC 8024135C 44926000 */  mtc1      $s2, $f12
-/* D59BF0 80241360 00000000 */  nop
-/* D59BF4 80241364 46806320 */  cvt.s.w   $f12, $f12
-/* D59BF8 80241368 44820000 */  mtc1      $v0, $f0
-/* D59BFC 8024136C 00000000 */  nop
-/* D59C00 80241370 46800020 */  cvt.s.w   $f0, $f0
-/* D59C04 80241374 44060000 */  mfc1      $a2, $f0
-/* D59C08 80241378 44907000 */  mtc1      $s0, $f14
-/* D59C0C 8024137C 00000000 */  nop
-/* D59C10 80241380 0C01BE3C */  jal       fx_big_smoke_puff
-/* D59C14 80241384 468073A0 */   cvt.s.w  $f14, $f14
-/* D59C18 80241388 8FBF001C */  lw        $ra, 0x1c($sp)
-/* D59C1C 8024138C 8FB20018 */  lw        $s2, 0x18($sp)
-/* D59C20 80241390 8FB10014 */  lw        $s1, 0x14($sp)
-/* D59C24 80241394 8FB00010 */  lw        $s0, 0x10($sp)
-/* D59C28 80241398 24020002 */  addiu     $v0, $zero, 2
-/* D59C2C 8024139C 03E00008 */  jr        $ra
-/* D59C30 802413A0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802413A4_D59C34.s b/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802413A4_D59C34.s
deleted file mode 100644
index 628d16ede3..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802413A4_D59C34.s
+++ /dev/null
@@ -1,98 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802413A4_D59C34
-/* D59C34 802413A4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* D59C38 802413A8 AFB20018 */  sw        $s2, 0x18($sp)
-/* D59C3C 802413AC 0080902D */  daddu     $s2, $a0, $zero
-/* D59C40 802413B0 AFBF0024 */  sw        $ra, 0x24($sp)
-/* D59C44 802413B4 AFB40020 */  sw        $s4, 0x20($sp)
-/* D59C48 802413B8 AFB3001C */  sw        $s3, 0x1c($sp)
-/* D59C4C 802413BC AFB10014 */  sw        $s1, 0x14($sp)
-/* D59C50 802413C0 AFB00010 */  sw        $s0, 0x10($sp)
-/* D59C54 802413C4 8E50000C */  lw        $s0, 0xc($s2)
-/* D59C58 802413C8 8E530148 */  lw        $s3, 0x148($s2)
-/* D59C5C 802413CC 8E050000 */  lw        $a1, ($s0)
-/* D59C60 802413D0 0C0B1EAF */  jal       evt_get_variable
-/* D59C64 802413D4 26100004 */   addiu    $s0, $s0, 4
-/* D59C68 802413D8 2C510001 */  sltiu     $s1, $v0, 1
-/* D59C6C 802413DC 8E050000 */  lw        $a1, ($s0)
-/* D59C70 802413E0 26100004 */  addiu     $s0, $s0, 4
-/* D59C74 802413E4 3C14800B */  lui       $s4, %hi(gCurrentEncounter)
-/* D59C78 802413E8 26940F10 */  addiu     $s4, $s4, %lo(gCurrentEncounter)
-/* D59C7C 802413EC 0C0B1EAF */  jal       evt_get_variable
-/* D59C80 802413F0 0240202D */   daddu    $a0, $s2, $zero
-/* D59C84 802413F4 50400001 */  beql      $v0, $zero, .L802413FC
-/* D59C88 802413F8 26310001 */   addiu    $s1, $s1, 1
-.L802413FC:
-/* D59C8C 802413FC 8E050000 */  lw        $a1, ($s0)
-/* D59C90 80241400 26100004 */  addiu     $s0, $s0, 4
-/* D59C94 80241404 0C0B1EAF */  jal       evt_get_variable
-/* D59C98 80241408 0240202D */   daddu    $a0, $s2, $zero
-/* D59C9C 8024140C 50400001 */  beql      $v0, $zero, .L80241414
-/* D59CA0 80241410 26310001 */   addiu    $s1, $s1, 1
-.L80241414:
-/* D59CA4 80241414 8E050000 */  lw        $a1, ($s0)
-/* D59CA8 80241418 0C0B1EAF */  jal       evt_get_variable
-/* D59CAC 8024141C 0240202D */   daddu    $a0, $s2, $zero
-/* D59CB0 80241420 50400001 */  beql      $v0, $zero, .L80241428
-/* D59CB4 80241424 26310001 */   addiu    $s1, $s1, 1
-.L80241428:
-/* D59CB8 80241428 24020002 */  addiu     $v0, $zero, 2
-/* D59CBC 8024142C 12220016 */  beq       $s1, $v0, .L80241488
-/* D59CC0 80241430 00000000 */   nop
-/* D59CC4 80241434 2A220003 */  slti      $v0, $s1, 3
-/* D59CC8 80241438 10400005 */  beqz      $v0, .L80241450
-/* D59CCC 8024143C 24020001 */   addiu    $v0, $zero, 1
-/* D59CD0 80241440 1222000B */  beq       $s1, $v0, .L80241470
-/* D59CD4 80241444 00000000 */   nop
-/* D59CD8 80241448 08090534 */  j         .L802414D0
-/* D59CDC 8024144C 00000000 */   nop
-.L80241450:
-/* D59CE0 80241450 24020003 */  addiu     $v0, $zero, 3
-/* D59CE4 80241454 12220012 */  beq       $s1, $v0, .L802414A0
-/* D59CE8 80241458 00000000 */   nop
-/* D59CEC 8024145C 24020004 */  addiu     $v0, $zero, 4
-/* D59CF0 80241460 12220015 */  beq       $s1, $v0, .L802414B8
-/* D59CF4 80241464 00000000 */   nop
-/* D59CF8 80241468 08090534 */  j         .L802414D0
-/* D59CFC 8024146C 00000000 */   nop
-.L80241470:
-/* D59D00 80241470 82620004 */  lb        $v0, 4($s3)
-/* D59D04 80241474 00021080 */  sll       $v0, $v0, 2
-/* D59D08 80241478 00541021 */  addu      $v0, $v0, $s4
-/* D59D0C 8024147C 8C430028 */  lw        $v1, 0x28($v0)
-/* D59D10 80241480 08090533 */  j         .L802414CC
-/* D59D14 80241484 24022101 */   addiu    $v0, $zero, 0x2101
-.L80241488:
-/* D59D18 80241488 82620004 */  lb        $v0, 4($s3)
-/* D59D1C 8024148C 00021080 */  sll       $v0, $v0, 2
-/* D59D20 80241490 00541021 */  addu      $v0, $v0, $s4
-/* D59D24 80241494 8C430028 */  lw        $v1, 0x28($v0)
-/* D59D28 80241498 08090533 */  j         .L802414CC
-/* D59D2C 8024149C 24022102 */   addiu    $v0, $zero, 0x2102
-.L802414A0:
-/* D59D30 802414A0 82620004 */  lb        $v0, 4($s3)
-/* D59D34 802414A4 00021080 */  sll       $v0, $v0, 2
-/* D59D38 802414A8 00541021 */  addu      $v0, $v0, $s4
-/* D59D3C 802414AC 8C430028 */  lw        $v1, 0x28($v0)
-/* D59D40 802414B0 08090533 */  j         .L802414CC
-/* D59D44 802414B4 24022103 */   addiu    $v0, $zero, 0x2103
-.L802414B8:
-/* D59D48 802414B8 82620004 */  lb        $v0, 4($s3)
-/* D59D4C 802414BC 00021080 */  sll       $v0, $v0, 2
-/* D59D50 802414C0 00541021 */  addu      $v0, $v0, $s4
-/* D59D54 802414C4 8C430028 */  lw        $v1, 0x28($v0)
-/* D59D58 802414C8 24022104 */  addiu     $v0, $zero, 0x2104
-.L802414CC:
-/* D59D5C 802414CC A4620044 */  sh        $v0, 0x44($v1)
-.L802414D0:
-/* D59D60 802414D0 8FBF0024 */  lw        $ra, 0x24($sp)
-/* D59D64 802414D4 8FB40020 */  lw        $s4, 0x20($sp)
-/* D59D68 802414D8 8FB3001C */  lw        $s3, 0x1c($sp)
-/* D59D6C 802414DC 8FB20018 */  lw        $s2, 0x18($sp)
-/* D59D70 802414E0 8FB10014 */  lw        $s1, 0x14($sp)
-/* D59D74 802414E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* D59D78 802414E8 24020002 */  addiu     $v0, $zero, 2
-/* D59D7C 802414EC 03E00008 */  jr        $ra
-/* D59D80 802414F0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802414F4_D59D84.s b/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802414F4_D59D84.s
deleted file mode 100644
index b1cfcce43c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802414F4_D59D84.s
+++ /dev/null
@@ -1,72 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802414F4_D59D84
-/* D59D84 802414F4 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D59D88 802414F8 AFB10014 */  sw        $s1, 0x14($sp)
-/* D59D8C 802414FC 0080882D */  daddu     $s1, $a0, $zero
-/* D59D90 80241500 AFB00010 */  sw        $s0, 0x10($sp)
-/* D59D94 80241504 00A0802D */  daddu     $s0, $a1, $zero
-/* D59D98 80241508 AFBF0018 */  sw        $ra, 0x18($sp)
-/* D59D9C 8024150C 0C0B36B0 */  jal       resolve_npc
-/* D59DA0 80241510 8E250084 */   lw       $a1, 0x84($s1)
-/* D59DA4 80241514 12000012 */  beqz      $s0, .L80241560
-/* D59DA8 80241518 0040202D */   daddu    $a0, $v0, $zero
-/* D59DAC 8024151C 3C020003 */  lui       $v0, 3
-/* D59DB0 80241520 34420011 */  ori       $v0, $v0, 0x11
-/* D59DB4 80241524 3C013F4C */  lui       $at, 0x3f4c
-/* D59DB8 80241528 3421CCCD */  ori       $at, $at, 0xcccd
-/* D59DBC 8024152C 44811000 */  mtc1      $at, $f2
-/* D59DC0 80241530 C6200088 */  lwc1      $f0, 0x88($s1)
-/* D59DC4 80241534 46800020 */  cvt.s.w   $f0, $f0
-/* D59DC8 80241538 E4800038 */  swc1      $f0, 0x38($a0)
-/* D59DCC 8024153C C620008C */  lwc1      $f0, 0x8c($s1)
-/* D59DD0 80241540 46800020 */  cvt.s.w   $f0, $f0
-/* D59DD4 80241544 E480003C */  swc1      $f0, 0x3c($a0)
-/* D59DD8 80241548 C6200090 */  lwc1      $f0, 0x90($s1)
-/* D59DDC 8024154C 46800020 */  cvt.s.w   $f0, $f0
-/* D59DE0 80241550 E4800040 */  swc1      $f0, 0x40($a0)
-/* D59DE4 80241554 AC80001C */  sw        $zero, 0x1c($a0)
-/* D59DE8 80241558 AC820028 */  sw        $v0, 0x28($a0)
-/* D59DEC 8024155C E4820014 */  swc1      $f2, 0x14($a0)
-.L80241560:
-/* D59DF0 80241560 C486004C */  lwc1      $f6, 0x4c($a0)
-/* D59DF4 80241564 3C01421C */  lui       $at, 0x421c
-/* D59DF8 80241568 44810000 */  mtc1      $at, $f0
-/* D59DFC 8024156C C482003C */  lwc1      $f2, 0x3c($a0)
-/* D59E00 80241570 46003181 */  sub.s     $f6, $f6, $f0
-/* D59E04 80241574 C480001C */  lwc1      $f0, 0x1c($a0)
-/* D59E08 80241578 C4840044 */  lwc1      $f4, 0x44($a0)
-/* D59E0C 8024157C 46001081 */  sub.s     $f2, $f2, $f0
-/* D59E10 80241580 3C014204 */  lui       $at, 0x4204
-/* D59E14 80241584 44810000 */  mtc1      $at, $f0
-/* D59E18 80241588 44805000 */  mtc1      $zero, $f10
-/* D59E1C 8024158C 46002101 */  sub.s     $f4, $f4, $f0
-/* D59E20 80241590 C480001C */  lwc1      $f0, 0x1c($a0)
-/* D59E24 80241594 E482003C */  swc1      $f2, 0x3c($a0)
-/* D59E28 80241598 C4820014 */  lwc1      $f2, 0x14($a0)
-/* D59E2C 8024159C C488003C */  lwc1      $f8, 0x3c($a0)
-/* D59E30 802415A0 46020000 */  add.s     $f0, $f0, $f2
-/* D59E34 802415A4 E486004C */  swc1      $f6, 0x4c($a0)
-/* D59E38 802415A8 460A403E */  c.le.s    $f8, $f10
-/* D59E3C 802415AC E4840044 */  swc1      $f4, 0x44($a0)
-/* D59E40 802415B0 45010003 */  bc1t      .L802415C0
-/* D59E44 802415B4 E480001C */   swc1     $f0, 0x1c($a0)
-/* D59E48 802415B8 08090579 */  j         .L802415E4
-/* D59E4C 802415BC 0000102D */   daddu    $v0, $zero, $zero
-.L802415C0:
-/* D59E50 802415C0 3C030003 */  lui       $v1, 3
-/* D59E54 802415C4 34630003 */  ori       $v1, $v1, 3
-/* D59E58 802415C8 24020002 */  addiu     $v0, $zero, 2
-/* D59E5C 802415CC E48A003C */  swc1      $f10, 0x3c($a0)
-/* D59E60 802415D0 E48A004C */  swc1      $f10, 0x4c($a0)
-/* D59E64 802415D4 E48A0044 */  swc1      $f10, 0x44($a0)
-/* D59E68 802415D8 E48A001C */  swc1      $f10, 0x1c($a0)
-/* D59E6C 802415DC E48A0014 */  swc1      $f10, 0x14($a0)
-/* D59E70 802415E0 AC830028 */  sw        $v1, 0x28($a0)
-.L802415E4:
-/* D59E74 802415E4 8FBF0018 */  lw        $ra, 0x18($sp)
-/* D59E78 802415E8 8FB10014 */  lw        $s1, 0x14($sp)
-/* D59E7C 802415EC 8FB00010 */  lw        $s0, 0x10($sp)
-/* D59E80 802415F0 03E00008 */  jr        $ra
-/* D59E84 802415F4 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802415F8_D59E88.s b/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802415F8_D59E88.s
deleted file mode 100644
index 7f75593d2d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802415F8_D59E88.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802415F8_D59E88
-/* D59E88 802415F8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D59E8C 802415FC AFB00010 */  sw        $s0, 0x10($sp)
-/* D59E90 80241600 0080802D */  daddu     $s0, $a0, $zero
-/* D59E94 80241604 AFBF0014 */  sw        $ra, 0x14($sp)
-/* D59E98 80241608 0C0B36B0 */  jal       resolve_npc
-/* D59E9C 8024160C 8E050090 */   lw       $a1, 0x90($s0)
-/* D59EA0 80241610 0200202D */  daddu     $a0, $s0, $zero
-/* D59EA4 80241614 8C850094 */  lw        $a1, 0x94($a0)
-/* D59EA8 80241618 0C0B36B0 */  jal       resolve_npc
-/* D59EAC 8024161C 0040802D */   daddu    $s0, $v0, $zero
-/* D59EB0 80241620 944300A6 */  lhu       $v1, 0xa6($v0)
-/* D59EB4 80241624 A60300A6 */  sh        $v1, 0xa6($s0)
-/* D59EB8 80241628 944300A8 */  lhu       $v1, 0xa8($v0)
-/* D59EBC 8024162C A60300A8 */  sh        $v1, 0xa8($s0)
-/* D59EC0 80241630 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D59EC4 80241634 8FB00010 */  lw        $s0, 0x10($sp)
-/* D59EC8 80241638 24020002 */  addiu     $v0, $zero, 2
-/* D59ECC 8024163C 03E00008 */  jr        $ra
-/* D59ED0 80241640 27BD0018 */   addiu    $sp, $sp, 0x18
-/* D59ED4 80241644 00000000 */  nop
-/* D59ED8 80241648 00000000 */  nop
-/* D59EDC 8024164C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240000_D62D10.s b/ver/us/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240000_D62D10.s
deleted file mode 100644
index 9d9810e50f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240000_D62D10.s
+++ /dev/null
@@ -1,34 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_802418A0_D645B0
-.ascii "pra_05_shape\0\0\0\0"
-
-dlabel D_802418B0_D645C0
-.ascii "pra_05_hit\0\0pra_10\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-
-.section .text
-
-glabel func_80240000_D62D10
-/* D62D10 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D62D14 80240004 3C04800E */  lui       $a0, %hi(wMapShapeName)
-/* D62D18 80240008 24849230 */  addiu     $a0, $a0, %lo(wMapShapeName)
-/* D62D1C 8024000C 3C058024 */  lui       $a1, %hi(D_802418A0_D645B0)
-/* D62D20 80240010 24A518A0 */  addiu     $a1, $a1, %lo(D_802418A0_D645B0)
-/* D62D24 80240014 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* D62D28 80240018 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* D62D2C 8024001C 24020001 */  addiu     $v0, $zero, 1
-/* D62D30 80240020 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D62D34 80240024 0C01953C */  jal       sprintf
-/* D62D38 80240028 A0620084 */   sb       $v0, 0x84($v1)
-/* D62D3C 8024002C 3C04800E */  lui       $a0, %hi(wMapHitName)
-/* D62D40 80240030 248491E0 */  addiu     $a0, $a0, %lo(wMapHitName)
-/* D62D44 80240034 3C058024 */  lui       $a1, %hi(D_802418B0_D645C0)
-/* D62D48 80240038 0C01953C */  jal       sprintf
-/* D62D4C 8024003C 24A518B0 */   addiu    $a1, $a1, %lo(D_802418B0_D645C0)
-/* D62D50 80240040 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D62D54 80240044 0000102D */  daddu     $v0, $zero, $zero
-/* D62D58 80240048 03E00008 */  jr        $ra
-/* D62D5C 8024004C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241310_D658F0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241310_D658F0.s
deleted file mode 100644
index 60c7cd17d4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241310_D658F0.s
+++ /dev/null
@@ -1,41 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241310_D658F0
-/* D658F0 80241310 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D658F4 80241314 AFB10014 */  sw        $s1, 0x14($sp)
-/* D658F8 80241318 0080882D */  daddu     $s1, $a0, $zero
-/* D658FC 8024131C AFBF001C */  sw        $ra, 0x1c($sp)
-/* D65900 80241320 AFB20018 */  sw        $s2, 0x18($sp)
-/* D65904 80241324 AFB00010 */  sw        $s0, 0x10($sp)
-/* D65908 80241328 8E30000C */  lw        $s0, 0xc($s1)
-/* D6590C 8024132C 8E050000 */  lw        $a1, ($s0)
-/* D65910 80241330 0C0B1EAF */  jal       evt_get_variable
-/* D65914 80241334 26100004 */   addiu    $s0, $s0, 4
-/* D65918 80241338 8E050000 */  lw        $a1, ($s0)
-/* D6591C 8024133C 26100004 */  addiu     $s0, $s0, 4
-/* D65920 80241340 0220202D */  daddu     $a0, $s1, $zero
-/* D65924 80241344 0C0B1EAF */  jal       evt_get_variable
-/* D65928 80241348 0040902D */   daddu    $s2, $v0, $zero
-/* D6592C 8024134C 0220202D */  daddu     $a0, $s1, $zero
-/* D65930 80241350 8E050000 */  lw        $a1, ($s0)
-/* D65934 80241354 0C0B1EAF */  jal       evt_get_variable
-/* D65938 80241358 0040802D */   daddu    $s0, $v0, $zero
-/* D6593C 8024135C 44926000 */  mtc1      $s2, $f12
-/* D65940 80241360 00000000 */  nop
-/* D65944 80241364 46806320 */  cvt.s.w   $f12, $f12
-/* D65948 80241368 44820000 */  mtc1      $v0, $f0
-/* D6594C 8024136C 00000000 */  nop
-/* D65950 80241370 46800020 */  cvt.s.w   $f0, $f0
-/* D65954 80241374 44060000 */  mfc1      $a2, $f0
-/* D65958 80241378 44907000 */  mtc1      $s0, $f14
-/* D6595C 8024137C 00000000 */  nop
-/* D65960 80241380 0C01BE3C */  jal       fx_big_smoke_puff
-/* D65964 80241384 468073A0 */   cvt.s.w  $f14, $f14
-/* D65968 80241388 8FBF001C */  lw        $ra, 0x1c($sp)
-/* D6596C 8024138C 8FB20018 */  lw        $s2, 0x18($sp)
-/* D65970 80241390 8FB10014 */  lw        $s1, 0x14($sp)
-/* D65974 80241394 8FB00010 */  lw        $s0, 0x10($sp)
-/* D65978 80241398 24020002 */  addiu     $v0, $zero, 2
-/* D6597C 8024139C 03E00008 */  jr        $ra
-/* D65980 802413A0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802413A4_D65984.s b/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802413A4_D65984.s
deleted file mode 100644
index fb41df03b3..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802413A4_D65984.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802413A4_D65984
-/* D65984 802413A4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D65988 802413A8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D6598C 802413AC 8C82000C */  lw        $v0, 0xc($a0)
-/* D65990 802413B0 0C0B1EAF */  jal       evt_get_variable
-/* D65994 802413B4 8C450000 */   lw       $a1, ($v0)
-/* D65998 802413B8 0C00EAD2 */  jal       get_npc_safe
-/* D6599C 802413BC 0040202D */   daddu    $a0, $v0, $zero
-/* D659A0 802413C0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D659A4 802413C4 24020002 */  addiu     $v0, $zero, 2
-/* D659A8 802413C8 03E00008 */  jr        $ra
-/* D659AC 802413CC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802413D0_D659B0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802413D0_D659B0.s
deleted file mode 100644
index 7aeebfadb8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802413D0_D659B0.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802413D0_D659B0
-/* D659B0 802413D0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D659B4 802413D4 AFB00010 */  sw        $s0, 0x10($sp)
-/* D659B8 802413D8 0080802D */  daddu     $s0, $a0, $zero
-/* D659BC 802413DC 3C058024 */  lui       $a1, %hi(func_8024140C_D659EC)
-/* D659C0 802413E0 24A5140C */  addiu     $a1, $a1, %lo(func_8024140C_D659EC)
-/* D659C4 802413E4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* D659C8 802413E8 0C048C56 */  jal       create_generic_entity_world
-/* D659CC 802413EC 0000202D */   daddu    $a0, $zero, $zero
-/* D659D0 802413F0 8E03013C */  lw        $v1, 0x13c($s0)
-/* D659D4 802413F4 AC620000 */  sw        $v0, ($v1)
-/* D659D8 802413F8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D659DC 802413FC 8FB00010 */  lw        $s0, 0x10($sp)
-/* D659E0 80241400 24020002 */  addiu     $v0, $zero, 2
-/* D659E4 80241404 03E00008 */  jr        $ra
-/* D659E8 80241408 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024140C_D659EC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024140C_D659EC.s
deleted file mode 100644
index ccd410343b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024140C_D659EC.s
+++ /dev/null
@@ -1,49 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024140C_D659EC
-/* D659EC 8024140C 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* D659F0 80241410 0000202D */  daddu     $a0, $zero, $zero
-/* D659F4 80241414 AFBF0048 */  sw        $ra, 0x48($sp)
-/* D659F8 80241418 AFB10044 */  sw        $s1, 0x44($sp)
-/* D659FC 8024141C 0C00EAD2 */  jal       get_npc_safe
-/* D65A00 80241420 AFB00040 */   sw       $s0, 0x40($sp)
-/* D65A04 80241424 3C03800F */  lui       $v1, %hi(gPlayerStatusPtr)
-/* D65A08 80241428 8C637B30 */  lw        $v1, %lo(gPlayerStatusPtr)($v1)
-/* D65A0C 8024142C 27B10020 */  addiu     $s1, $sp, 0x20
-/* D65A10 80241430 8C630000 */  lw        $v1, ($v1)
-/* D65A14 80241434 30630001 */  andi      $v1, $v1, 1
-/* D65A18 80241438 1060001B */  beqz      $v1, .L802414A8
-/* D65A1C 8024143C 0040802D */   daddu    $s0, $v0, $zero
-/* D65A20 80241440 C6000040 */  lwc1      $f0, 0x40($s0)
-/* D65A24 80241444 3C04800A */  lui       $a0, %hi(gCurrentCamID)
-/* D65A28 80241448 8484A634 */  lh        $a0, %lo(gCurrentCamID)($a0)
-/* D65A2C 8024144C 27A20030 */  addiu     $v0, $sp, 0x30
-/* D65A30 80241450 AFA20010 */  sw        $v0, 0x10($sp)
-/* D65A34 80241454 27A20034 */  addiu     $v0, $sp, 0x34
-/* D65A38 80241458 AFA20014 */  sw        $v0, 0x14($sp)
-/* D65A3C 8024145C 27A20038 */  addiu     $v0, $sp, 0x38
-/* D65A40 80241460 AFA20018 */  sw        $v0, 0x18($sp)
-/* D65A44 80241464 8E050038 */  lw        $a1, 0x38($s0)
-/* D65A48 80241468 8E06003C */  lw        $a2, 0x3c($s0)
-/* D65A4C 8024146C 46000007 */  neg.s     $f0, $f0
-/* D65A50 80241470 44070000 */  mfc1      $a3, $f0
-/* D65A54 80241474 0C00B94E */  jal       get_screen_coords
-/* D65A58 80241478 00000000 */   nop
-/* D65A5C 8024147C 0220202D */  daddu     $a0, $s1, $zero
-/* D65A60 80241480 820500AA */  lb        $a1, 0xaa($s0)
-/* D65A64 80241484 8FA30038 */  lw        $v1, 0x38($sp)
-/* D65A68 80241488 3C028024 */  lui       $v0, %hi(func_802414BC_D65A9C)
-/* D65A6C 8024148C 244214BC */  addiu     $v0, $v0, %lo(func_802414BC_D65A9C)
-/* D65A70 80241490 AFB00028 */  sw        $s0, 0x28($sp)
-/* D65A74 80241494 AFA2002C */  sw        $v0, 0x2c($sp)
-/* D65A78 80241498 00031823 */  negu      $v1, $v1
-/* D65A7C 8024149C AFA50020 */  sw        $a1, 0x20($sp)
-/* D65A80 802414A0 0C047644 */  jal       queue_render_task
-/* D65A84 802414A4 AFA30024 */   sw       $v1, 0x24($sp)
-.L802414A8:
-/* D65A88 802414A8 8FBF0048 */  lw        $ra, 0x48($sp)
-/* D65A8C 802414AC 8FB10044 */  lw        $s1, 0x44($sp)
-/* D65A90 802414B0 8FB00040 */  lw        $s0, 0x40($sp)
-/* D65A94 802414B4 03E00008 */  jr        $ra
-/* D65A98 802414B8 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802414BC_D65A9C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802414BC_D65A9C.s
deleted file mode 100644
index e66bd4e12a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802414BC_D65A9C.s
+++ /dev/null
@@ -1,77 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802414BC_D65A9C
-/* D65A9C 802414BC 27BDFED0 */  addiu     $sp, $sp, -0x130
-/* D65AA0 802414C0 AFB1011C */  sw        $s1, 0x11c($sp)
-/* D65AA4 802414C4 AFBF0120 */  sw        $ra, 0x120($sp)
-/* D65AA8 802414C8 AFB00118 */  sw        $s0, 0x118($sp)
-/* D65AAC 802414CC F7B40128 */  sdc1      $f20, 0x128($sp)
-/* D65AB0 802414D0 0C00E769 */  jal       npc_get_render_yaw
-/* D65AB4 802414D4 0080882D */   daddu    $s1, $a0, $zero
-/* D65AB8 802414D8 44800000 */  mtc1      $zero, $f0
-/* D65ABC 802414DC 3C03800A */  lui       $v1, %hi(gCurrentCamID)
-/* D65AC0 802414E0 8463A634 */  lh        $v1, %lo(gCurrentCamID)($v1)
-/* D65AC4 802414E4 C6220034 */  lwc1      $f2, 0x34($s1)
-/* D65AC8 802414E8 00031080 */  sll       $v0, $v1, 2
-/* D65ACC 802414EC 00431021 */  addu      $v0, $v0, $v1
-/* D65AD0 802414F0 00021080 */  sll       $v0, $v0, 2
-/* D65AD4 802414F4 00431023 */  subu      $v0, $v0, $v1
-/* D65AD8 802414F8 000218C0 */  sll       $v1, $v0, 3
-/* D65ADC 802414FC 00431021 */  addu      $v0, $v0, $v1
-/* D65AE0 80241500 000210C0 */  sll       $v0, $v0, 3
-/* D65AE4 80241504 44060000 */  mfc1      $a2, $f0
-/* D65AE8 80241508 3C01800B */  lui       $at, %hi(gCameras+0x6C)
-/* D65AEC 8024150C 00220821 */  addu      $at, $at, $v0
-/* D65AF0 80241510 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
-/* D65AF4 80241514 3C013F80 */  lui       $at, 0x3f80
-/* D65AF8 80241518 4481A000 */  mtc1      $at, $f20
-/* D65AFC 8024151C 46001080 */  add.s     $f2, $f2, $f0
-/* D65B00 80241520 4407A000 */  mfc1      $a3, $f20
-/* D65B04 80241524 44051000 */  mfc1      $a1, $f2
-/* D65B08 80241528 27A40018 */  addiu     $a0, $sp, 0x18
-/* D65B0C 8024152C 0C019EC8 */  jal       guRotateF
-/* D65B10 80241530 AFA60010 */   sw       $a2, 0x10($sp)
-/* D65B14 80241534 3C013F36 */  lui       $at, 0x3f36
-/* D65B18 80241538 3421DB6E */  ori       $at, $at, 0xdb6e
-/* D65B1C 8024153C 44810000 */  mtc1      $at, $f0
-/* D65B20 80241540 27B000D8 */  addiu     $s0, $sp, 0xd8
-/* D65B24 80241544 44050000 */  mfc1      $a1, $f0
-/* D65B28 80241548 0200202D */  daddu     $a0, $s0, $zero
-/* D65B2C 8024154C 00A0302D */  daddu     $a2, $a1, $zero
-/* D65B30 80241550 0C019DF0 */  jal       guScaleF
-/* D65B34 80241554 00A0382D */   daddu    $a3, $a1, $zero
-/* D65B38 80241558 27A40018 */  addiu     $a0, $sp, 0x18
-/* D65B3C 8024155C 0200282D */  daddu     $a1, $s0, $zero
-/* D65B40 80241560 0C019D80 */  jal       guMtxCatF
-/* D65B44 80241564 0080302D */   daddu    $a2, $a0, $zero
-/* D65B48 80241568 27B00058 */  addiu     $s0, $sp, 0x58
-/* D65B4C 8024156C 8E250038 */  lw        $a1, 0x38($s1)
-/* D65B50 80241570 8E26003C */  lw        $a2, 0x3c($s1)
-/* D65B54 80241574 8E270040 */  lw        $a3, 0x40($s1)
-/* D65B58 80241578 0C019E40 */  jal       guTranslateF
-/* D65B5C 8024157C 0200202D */   daddu    $a0, $s0, $zero
-/* D65B60 80241580 27A40018 */  addiu     $a0, $sp, 0x18
-/* D65B64 80241584 0200282D */  daddu     $a1, $s0, $zero
-/* D65B68 80241588 0C019D80 */  jal       guMtxCatF
-/* D65B6C 8024158C 0080302D */   daddu    $a2, $a0, $zero
-/* D65B70 80241590 8E250028 */  lw        $a1, 0x28($s1)
-/* D65B74 80241594 4406A000 */  mfc1      $a2, $f20
-/* D65B78 80241598 0C0B76A3 */  jal       spr_update_player_sprite
-/* D65B7C 8024159C 24040002 */   addiu    $a0, $zero, 2
-/* D65B80 802415A0 24040002 */  addiu     $a0, $zero, 2
-/* D65B84 802415A4 0000282D */  daddu     $a1, $zero, $zero
-/* D65B88 802415A8 00A0302D */  daddu     $a2, $a1, $zero
-/* D65B8C 802415AC 00A0382D */  daddu     $a3, $a1, $zero
-/* D65B90 802415B0 27A20018 */  addiu     $v0, $sp, 0x18
-/* D65B94 802415B4 0C0B7710 */  jal       spr_draw_player_sprite
-/* D65B98 802415B8 AFA20010 */   sw       $v0, 0x10($sp)
-/* D65B9C 802415BC 8FBF0120 */  lw        $ra, 0x120($sp)
-/* D65BA0 802415C0 8FB1011C */  lw        $s1, 0x11c($sp)
-/* D65BA4 802415C4 8FB00118 */  lw        $s0, 0x118($sp)
-/* D65BA8 802415C8 D7B40128 */  ldc1      $f20, 0x128($sp)
-/* D65BAC 802415CC 03E00008 */  jr        $ra
-/* D65BB0 802415D0 27BD0130 */   addiu    $sp, $sp, 0x130
-/* D65BB4 802415D4 00000000 */  nop
-/* D65BB8 802415D8 00000000 */  nop
-/* D65BBC 802415DC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_15/D69830/func_80240020_D69830.s b/ver/us/asm/nonmatchings/world/area_pra/pra_15/D69830/func_80240020_D69830.s
deleted file mode 100644
index b4e26e8928..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_15/D69830/func_80240020_D69830.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240020_D69830
-/* D69830 80240020 3C02800A */  lui       $v0, %hi(gOverrideFlags)
-/* D69834 80240024 2442A650 */  addiu     $v0, $v0, %lo(gOverrideFlags)
-/* D69838 80240028 8C430000 */  lw        $v1, ($v0)
-/* D6983C 8024002C 2404FF7F */  addiu     $a0, $zero, -0x81
-/* D69840 80240030 00641824 */  and       $v1, $v1, $a0
-/* D69844 80240034 AC430000 */  sw        $v1, ($v0)
-/* D69848 80240038 03E00008 */  jr        $ra
-/* D6984C 8024003C 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241310_D6FCC0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241310_D6FCC0.s
deleted file mode 100644
index 61b80cea76..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241310_D6FCC0.s
+++ /dev/null
@@ -1,41 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241310_D6FCC0
-/* D6FCC0 80241310 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D6FCC4 80241314 AFB10014 */  sw        $s1, 0x14($sp)
-/* D6FCC8 80241318 0080882D */  daddu     $s1, $a0, $zero
-/* D6FCCC 8024131C AFBF001C */  sw        $ra, 0x1c($sp)
-/* D6FCD0 80241320 AFB20018 */  sw        $s2, 0x18($sp)
-/* D6FCD4 80241324 AFB00010 */  sw        $s0, 0x10($sp)
-/* D6FCD8 80241328 8E30000C */  lw        $s0, 0xc($s1)
-/* D6FCDC 8024132C 8E050000 */  lw        $a1, ($s0)
-/* D6FCE0 80241330 0C0B1EAF */  jal       evt_get_variable
-/* D6FCE4 80241334 26100004 */   addiu    $s0, $s0, 4
-/* D6FCE8 80241338 8E050000 */  lw        $a1, ($s0)
-/* D6FCEC 8024133C 26100004 */  addiu     $s0, $s0, 4
-/* D6FCF0 80241340 0220202D */  daddu     $a0, $s1, $zero
-/* D6FCF4 80241344 0C0B1EAF */  jal       evt_get_variable
-/* D6FCF8 80241348 0040902D */   daddu    $s2, $v0, $zero
-/* D6FCFC 8024134C 0220202D */  daddu     $a0, $s1, $zero
-/* D6FD00 80241350 8E050000 */  lw        $a1, ($s0)
-/* D6FD04 80241354 0C0B1EAF */  jal       evt_get_variable
-/* D6FD08 80241358 0040802D */   daddu    $s0, $v0, $zero
-/* D6FD0C 8024135C 44926000 */  mtc1      $s2, $f12
-/* D6FD10 80241360 00000000 */  nop
-/* D6FD14 80241364 46806320 */  cvt.s.w   $f12, $f12
-/* D6FD18 80241368 44820000 */  mtc1      $v0, $f0
-/* D6FD1C 8024136C 00000000 */  nop
-/* D6FD20 80241370 46800020 */  cvt.s.w   $f0, $f0
-/* D6FD24 80241374 44060000 */  mfc1      $a2, $f0
-/* D6FD28 80241378 44907000 */  mtc1      $s0, $f14
-/* D6FD2C 8024137C 00000000 */  nop
-/* D6FD30 80241380 0C01BE3C */  jal       fx_big_smoke_puff
-/* D6FD34 80241384 468073A0 */   cvt.s.w  $f14, $f14
-/* D6FD38 80241388 8FBF001C */  lw        $ra, 0x1c($sp)
-/* D6FD3C 8024138C 8FB20018 */  lw        $s2, 0x18($sp)
-/* D6FD40 80241390 8FB10014 */  lw        $s1, 0x14($sp)
-/* D6FD44 80241394 8FB00010 */  lw        $s0, 0x10($sp)
-/* D6FD48 80241398 24020002 */  addiu     $v0, $zero, 2
-/* D6FD4C 8024139C 03E00008 */  jr        $ra
-/* D6FD50 802413A0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802413A4_D6FD54.s b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802413A4_D6FD54.s
deleted file mode 100644
index 58e77a4139..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802413A4_D6FD54.s
+++ /dev/null
@@ -1,98 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802413A4_D6FD54
-/* D6FD54 802413A4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* D6FD58 802413A8 AFB20018 */  sw        $s2, 0x18($sp)
-/* D6FD5C 802413AC 0080902D */  daddu     $s2, $a0, $zero
-/* D6FD60 802413B0 AFBF0024 */  sw        $ra, 0x24($sp)
-/* D6FD64 802413B4 AFB40020 */  sw        $s4, 0x20($sp)
-/* D6FD68 802413B8 AFB3001C */  sw        $s3, 0x1c($sp)
-/* D6FD6C 802413BC AFB10014 */  sw        $s1, 0x14($sp)
-/* D6FD70 802413C0 AFB00010 */  sw        $s0, 0x10($sp)
-/* D6FD74 802413C4 8E50000C */  lw        $s0, 0xc($s2)
-/* D6FD78 802413C8 8E530148 */  lw        $s3, 0x148($s2)
-/* D6FD7C 802413CC 8E050000 */  lw        $a1, ($s0)
-/* D6FD80 802413D0 0C0B1EAF */  jal       evt_get_variable
-/* D6FD84 802413D4 26100004 */   addiu    $s0, $s0, 4
-/* D6FD88 802413D8 2C510001 */  sltiu     $s1, $v0, 1
-/* D6FD8C 802413DC 8E050000 */  lw        $a1, ($s0)
-/* D6FD90 802413E0 26100004 */  addiu     $s0, $s0, 4
-/* D6FD94 802413E4 3C14800B */  lui       $s4, %hi(gCurrentEncounter)
-/* D6FD98 802413E8 26940F10 */  addiu     $s4, $s4, %lo(gCurrentEncounter)
-/* D6FD9C 802413EC 0C0B1EAF */  jal       evt_get_variable
-/* D6FDA0 802413F0 0240202D */   daddu    $a0, $s2, $zero
-/* D6FDA4 802413F4 50400001 */  beql      $v0, $zero, .L802413FC
-/* D6FDA8 802413F8 26310001 */   addiu    $s1, $s1, 1
-.L802413FC:
-/* D6FDAC 802413FC 8E050000 */  lw        $a1, ($s0)
-/* D6FDB0 80241400 26100004 */  addiu     $s0, $s0, 4
-/* D6FDB4 80241404 0C0B1EAF */  jal       evt_get_variable
-/* D6FDB8 80241408 0240202D */   daddu    $a0, $s2, $zero
-/* D6FDBC 8024140C 50400001 */  beql      $v0, $zero, .L80241414
-/* D6FDC0 80241410 26310001 */   addiu    $s1, $s1, 1
-.L80241414:
-/* D6FDC4 80241414 8E050000 */  lw        $a1, ($s0)
-/* D6FDC8 80241418 0C0B1EAF */  jal       evt_get_variable
-/* D6FDCC 8024141C 0240202D */   daddu    $a0, $s2, $zero
-/* D6FDD0 80241420 50400001 */  beql      $v0, $zero, .L80241428
-/* D6FDD4 80241424 26310001 */   addiu    $s1, $s1, 1
-.L80241428:
-/* D6FDD8 80241428 24020002 */  addiu     $v0, $zero, 2
-/* D6FDDC 8024142C 12220016 */  beq       $s1, $v0, .L80241488
-/* D6FDE0 80241430 00000000 */   nop
-/* D6FDE4 80241434 2A220003 */  slti      $v0, $s1, 3
-/* D6FDE8 80241438 10400005 */  beqz      $v0, .L80241450
-/* D6FDEC 8024143C 24020001 */   addiu    $v0, $zero, 1
-/* D6FDF0 80241440 1222000B */  beq       $s1, $v0, .L80241470
-/* D6FDF4 80241444 00000000 */   nop
-/* D6FDF8 80241448 08090534 */  j         .L802414D0
-/* D6FDFC 8024144C 00000000 */   nop
-.L80241450:
-/* D6FE00 80241450 24020003 */  addiu     $v0, $zero, 3
-/* D6FE04 80241454 12220012 */  beq       $s1, $v0, .L802414A0
-/* D6FE08 80241458 00000000 */   nop
-/* D6FE0C 8024145C 24020004 */  addiu     $v0, $zero, 4
-/* D6FE10 80241460 12220015 */  beq       $s1, $v0, .L802414B8
-/* D6FE14 80241464 00000000 */   nop
-/* D6FE18 80241468 08090534 */  j         .L802414D0
-/* D6FE1C 8024146C 00000000 */   nop
-.L80241470:
-/* D6FE20 80241470 82620004 */  lb        $v0, 4($s3)
-/* D6FE24 80241474 00021080 */  sll       $v0, $v0, 2
-/* D6FE28 80241478 00541021 */  addu      $v0, $v0, $s4
-/* D6FE2C 8024147C 8C430028 */  lw        $v1, 0x28($v0)
-/* D6FE30 80241480 08090533 */  j         .L802414CC
-/* D6FE34 80241484 24022101 */   addiu    $v0, $zero, 0x2101
-.L80241488:
-/* D6FE38 80241488 82620004 */  lb        $v0, 4($s3)
-/* D6FE3C 8024148C 00021080 */  sll       $v0, $v0, 2
-/* D6FE40 80241490 00541021 */  addu      $v0, $v0, $s4
-/* D6FE44 80241494 8C430028 */  lw        $v1, 0x28($v0)
-/* D6FE48 80241498 08090533 */  j         .L802414CC
-/* D6FE4C 8024149C 24022102 */   addiu    $v0, $zero, 0x2102
-.L802414A0:
-/* D6FE50 802414A0 82620004 */  lb        $v0, 4($s3)
-/* D6FE54 802414A4 00021080 */  sll       $v0, $v0, 2
-/* D6FE58 802414A8 00541021 */  addu      $v0, $v0, $s4
-/* D6FE5C 802414AC 8C430028 */  lw        $v1, 0x28($v0)
-/* D6FE60 802414B0 08090533 */  j         .L802414CC
-/* D6FE64 802414B4 24022103 */   addiu    $v0, $zero, 0x2103
-.L802414B8:
-/* D6FE68 802414B8 82620004 */  lb        $v0, 4($s3)
-/* D6FE6C 802414BC 00021080 */  sll       $v0, $v0, 2
-/* D6FE70 802414C0 00541021 */  addu      $v0, $v0, $s4
-/* D6FE74 802414C4 8C430028 */  lw        $v1, 0x28($v0)
-/* D6FE78 802414C8 24022104 */  addiu     $v0, $zero, 0x2104
-.L802414CC:
-/* D6FE7C 802414CC A4620044 */  sh        $v0, 0x44($v1)
-.L802414D0:
-/* D6FE80 802414D0 8FBF0024 */  lw        $ra, 0x24($sp)
-/* D6FE84 802414D4 8FB40020 */  lw        $s4, 0x20($sp)
-/* D6FE88 802414D8 8FB3001C */  lw        $s3, 0x1c($sp)
-/* D6FE8C 802414DC 8FB20018 */  lw        $s2, 0x18($sp)
-/* D6FE90 802414E0 8FB10014 */  lw        $s1, 0x14($sp)
-/* D6FE94 802414E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* D6FE98 802414E8 24020002 */  addiu     $v0, $zero, 2
-/* D6FE9C 802414EC 03E00008 */  jr        $ra
-/* D6FEA0 802414F0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802414F4_D6FEA4.s b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802414F4_D6FEA4.s
deleted file mode 100644
index d6658456f5..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802414F4_D6FEA4.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802414F4_D6FEA4
-/* D6FEA4 802414F4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D6FEA8 802414F8 AFB00010 */  sw        $s0, 0x10($sp)
-/* D6FEAC 802414FC 0080802D */  daddu     $s0, $a0, $zero
-/* D6FEB0 80241500 3C058024 */  lui       $a1, %hi(func_80241530_D6FEE0)
-/* D6FEB4 80241504 24A51530 */  addiu     $a1, $a1, %lo(func_80241530_D6FEE0)
-/* D6FEB8 80241508 AFBF0014 */  sw        $ra, 0x14($sp)
-/* D6FEBC 8024150C 0C048C56 */  jal       create_generic_entity_world
-/* D6FEC0 80241510 0000202D */   daddu    $a0, $zero, $zero
-/* D6FEC4 80241514 8E03013C */  lw        $v1, 0x13c($s0)
-/* D6FEC8 80241518 AC620000 */  sw        $v0, ($v1)
-/* D6FECC 8024151C 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D6FED0 80241520 8FB00010 */  lw        $s0, 0x10($sp)
-/* D6FED4 80241524 24020002 */  addiu     $v0, $zero, 2
-/* D6FED8 80241528 03E00008 */  jr        $ra
-/* D6FEDC 8024152C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241530_D6FEE0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241530_D6FEE0.s
deleted file mode 100644
index e2fb4d2b4e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241530_D6FEE0.s
+++ /dev/null
@@ -1,49 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241530_D6FEE0
-/* D6FEE0 80241530 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* D6FEE4 80241534 24040005 */  addiu     $a0, $zero, 5
-/* D6FEE8 80241538 AFBF0048 */  sw        $ra, 0x48($sp)
-/* D6FEEC 8024153C AFB10044 */  sw        $s1, 0x44($sp)
-/* D6FEF0 80241540 0C00EAD2 */  jal       get_npc_safe
-/* D6FEF4 80241544 AFB00040 */   sw       $s0, 0x40($sp)
-/* D6FEF8 80241548 3C03800F */  lui       $v1, %hi(gPlayerStatusPtr)
-/* D6FEFC 8024154C 8C637B30 */  lw        $v1, %lo(gPlayerStatusPtr)($v1)
-/* D6FF00 80241550 27B10020 */  addiu     $s1, $sp, 0x20
-/* D6FF04 80241554 8C630000 */  lw        $v1, ($v1)
-/* D6FF08 80241558 30630001 */  andi      $v1, $v1, 1
-/* D6FF0C 8024155C 1060001B */  beqz      $v1, .L802415CC
-/* D6FF10 80241560 0040802D */   daddu    $s0, $v0, $zero
-/* D6FF14 80241564 C6000040 */  lwc1      $f0, 0x40($s0)
-/* D6FF18 80241568 3C04800A */  lui       $a0, %hi(gCurrentCamID)
-/* D6FF1C 8024156C 8484A634 */  lh        $a0, %lo(gCurrentCamID)($a0)
-/* D6FF20 80241570 27A20030 */  addiu     $v0, $sp, 0x30
-/* D6FF24 80241574 AFA20010 */  sw        $v0, 0x10($sp)
-/* D6FF28 80241578 27A20034 */  addiu     $v0, $sp, 0x34
-/* D6FF2C 8024157C AFA20014 */  sw        $v0, 0x14($sp)
-/* D6FF30 80241580 27A20038 */  addiu     $v0, $sp, 0x38
-/* D6FF34 80241584 AFA20018 */  sw        $v0, 0x18($sp)
-/* D6FF38 80241588 8E050038 */  lw        $a1, 0x38($s0)
-/* D6FF3C 8024158C 8E06003C */  lw        $a2, 0x3c($s0)
-/* D6FF40 80241590 46000007 */  neg.s     $f0, $f0
-/* D6FF44 80241594 44070000 */  mfc1      $a3, $f0
-/* D6FF48 80241598 0C00B94E */  jal       get_screen_coords
-/* D6FF4C 8024159C 00000000 */   nop
-/* D6FF50 802415A0 0220202D */  daddu     $a0, $s1, $zero
-/* D6FF54 802415A4 820500AA */  lb        $a1, 0xaa($s0)
-/* D6FF58 802415A8 8FA30038 */  lw        $v1, 0x38($sp)
-/* D6FF5C 802415AC 3C028024 */  lui       $v0, %hi(func_802415E0_D6FF90)
-/* D6FF60 802415B0 244215E0 */  addiu     $v0, $v0, %lo(func_802415E0_D6FF90)
-/* D6FF64 802415B4 AFB00028 */  sw        $s0, 0x28($sp)
-/* D6FF68 802415B8 AFA2002C */  sw        $v0, 0x2c($sp)
-/* D6FF6C 802415BC 00031823 */  negu      $v1, $v1
-/* D6FF70 802415C0 AFA50020 */  sw        $a1, 0x20($sp)
-/* D6FF74 802415C4 0C047644 */  jal       queue_render_task
-/* D6FF78 802415C8 AFA30024 */   sw       $v1, 0x24($sp)
-.L802415CC:
-/* D6FF7C 802415CC 8FBF0048 */  lw        $ra, 0x48($sp)
-/* D6FF80 802415D0 8FB10044 */  lw        $s1, 0x44($sp)
-/* D6FF84 802415D4 8FB00040 */  lw        $s0, 0x40($sp)
-/* D6FF88 802415D8 03E00008 */  jr        $ra
-/* D6FF8C 802415DC 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802415E0_D6FF90.s b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802415E0_D6FF90.s
deleted file mode 100644
index 535a33dc7b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802415E0_D6FF90.s
+++ /dev/null
@@ -1,74 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802415E0_D6FF90
-/* D6FF90 802415E0 27BDFF10 */  addiu     $sp, $sp, -0xf0
-/* D6FF94 802415E4 AFB100DC */  sw        $s1, 0xdc($sp)
-/* D6FF98 802415E8 AFBF00E0 */  sw        $ra, 0xe0($sp)
-/* D6FF9C 802415EC AFB000D8 */  sw        $s0, 0xd8($sp)
-/* D6FFA0 802415F0 F7B400E8 */  sdc1      $f20, 0xe8($sp)
-/* D6FFA4 802415F4 0C00E769 */  jal       npc_get_render_yaw
-/* D6FFA8 802415F8 0080882D */   daddu    $s1, $a0, $zero
-/* D6FFAC 802415FC 44800000 */  mtc1      $zero, $f0
-/* D6FFB0 80241600 3C03800A */  lui       $v1, %hi(gCurrentCamID)
-/* D6FFB4 80241604 8463A634 */  lh        $v1, %lo(gCurrentCamID)($v1)
-/* D6FFB8 80241608 C6220034 */  lwc1      $f2, 0x34($s1)
-/* D6FFBC 8024160C 00031080 */  sll       $v0, $v1, 2
-/* D6FFC0 80241610 00431021 */  addu      $v0, $v0, $v1
-/* D6FFC4 80241614 00021080 */  sll       $v0, $v0, 2
-/* D6FFC8 80241618 00431023 */  subu      $v0, $v0, $v1
-/* D6FFCC 8024161C 000218C0 */  sll       $v1, $v0, 3
-/* D6FFD0 80241620 00431021 */  addu      $v0, $v0, $v1
-/* D6FFD4 80241624 000210C0 */  sll       $v0, $v0, 3
-/* D6FFD8 80241628 44060000 */  mfc1      $a2, $f0
-/* D6FFDC 8024162C 3C01800B */  lui       $at, %hi(gCameras+0x6C)
-/* D6FFE0 80241630 00220821 */  addu      $at, $at, $v0
-/* D6FFE4 80241634 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
-/* D6FFE8 80241638 3C013F80 */  lui       $at, 0x3f80
-/* D6FFEC 8024163C 4481A000 */  mtc1      $at, $f20
-/* D6FFF0 80241640 46001080 */  add.s     $f2, $f2, $f0
-/* D6FFF4 80241644 4407A000 */  mfc1      $a3, $f20
-/* D6FFF8 80241648 44051000 */  mfc1      $a1, $f2
-/* D6FFFC 8024164C 27A40018 */  addiu     $a0, $sp, 0x18
-/* D70000 80241650 0C019EC8 */  jal       guRotateF
-/* D70004 80241654 AFA60010 */   sw       $a2, 0x10($sp)
-/* D70008 80241658 3C013F36 */  lui       $at, 0x3f36
-/* D7000C 8024165C 3421DB6E */  ori       $at, $at, 0xdb6e
-/* D70010 80241660 44810000 */  mtc1      $at, $f0
-/* D70014 80241664 27B00098 */  addiu     $s0, $sp, 0x98
-/* D70018 80241668 44050000 */  mfc1      $a1, $f0
-/* D7001C 8024166C 0200202D */  daddu     $a0, $s0, $zero
-/* D70020 80241670 00A0302D */  daddu     $a2, $a1, $zero
-/* D70024 80241674 0C019DF0 */  jal       guScaleF
-/* D70028 80241678 00A0382D */   daddu    $a3, $a1, $zero
-/* D7002C 8024167C 27A40018 */  addiu     $a0, $sp, 0x18
-/* D70030 80241680 0200282D */  daddu     $a1, $s0, $zero
-/* D70034 80241684 0C019D80 */  jal       guMtxCatF
-/* D70038 80241688 0080302D */   daddu    $a2, $a0, $zero
-/* D7003C 8024168C 27B00058 */  addiu     $s0, $sp, 0x58
-/* D70040 80241690 8E250038 */  lw        $a1, 0x38($s1)
-/* D70044 80241694 8E26003C */  lw        $a2, 0x3c($s1)
-/* D70048 80241698 8E270040 */  lw        $a3, 0x40($s1)
-/* D7004C 8024169C 0C019E40 */  jal       guTranslateF
-/* D70050 802416A0 0200202D */   daddu    $a0, $s0, $zero
-/* D70054 802416A4 27A40018 */  addiu     $a0, $sp, 0x18
-/* D70058 802416A8 0200282D */  daddu     $a1, $s0, $zero
-/* D7005C 802416AC 0C019D80 */  jal       guMtxCatF
-/* D70060 802416B0 0080302D */   daddu    $a2, $a0, $zero
-/* D70064 802416B4 8E250028 */  lw        $a1, 0x28($s1)
-/* D70068 802416B8 4406A000 */  mfc1      $a2, $f20
-/* D7006C 802416BC 0C0B76A3 */  jal       spr_update_player_sprite
-/* D70070 802416C0 24040002 */   addiu    $a0, $zero, 2
-/* D70074 802416C4 24040002 */  addiu     $a0, $zero, 2
-/* D70078 802416C8 0000282D */  daddu     $a1, $zero, $zero
-/* D7007C 802416CC 00A0302D */  daddu     $a2, $a1, $zero
-/* D70080 802416D0 00A0382D */  daddu     $a3, $a1, $zero
-/* D70084 802416D4 27A20018 */  addiu     $v0, $sp, 0x18
-/* D70088 802416D8 0C0B7710 */  jal       spr_draw_player_sprite
-/* D7008C 802416DC AFA20010 */   sw       $v0, 0x10($sp)
-/* D70090 802416E0 8FBF00E0 */  lw        $ra, 0xe0($sp)
-/* D70094 802416E4 8FB100DC */  lw        $s1, 0xdc($sp)
-/* D70098 802416E8 8FB000D8 */  lw        $s0, 0xd8($sp)
-/* D7009C 802416EC D7B400E8 */  ldc1      $f20, 0xe8($sp)
-/* D700A0 802416F0 03E00008 */  jr        $ra
-/* D700A4 802416F4 27BD00F0 */   addiu    $sp, $sp, 0xf0
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802416F8_D700A8.s b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802416F8_D700A8.s
deleted file mode 100644
index 17761256a5..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802416F8_D700A8.s
+++ /dev/null
@@ -1,10 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802416F8_D700A8
-/* D700A8 802416F8 C4800084 */  lwc1      $f0, 0x84($a0)
-/* D700AC 802416FC 46800020 */  cvt.s.w   $f0, $f0
-/* D700B0 80241700 3C018011 */  lui       $at, %hi(gPlayerStatus+0xA8)
-/* D700B4 80241704 E420F070 */  swc1      $f0, %lo(gPlayerStatus+0xA8)($at)
-/* D700B8 80241708 03E00008 */  jr        $ra
-/* D700BC 8024170C 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241710_D700C0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241710_D700C0.s
deleted file mode 100644
index e249e9e329..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241710_D700C0.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241710_D700C0
-/* D700C0 80241710 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D700C4 80241714 AFB00010 */  sw        $s0, 0x10($sp)
-/* D700C8 80241718 0080802D */  daddu     $s0, $a0, $zero
-/* D700CC 8024171C AFBF0014 */  sw        $ra, 0x14($sp)
-/* D700D0 80241720 0C0B36B0 */  jal       resolve_npc
-/* D700D4 80241724 8E050090 */   lw       $a1, 0x90($s0)
-/* D700D8 80241728 0200202D */  daddu     $a0, $s0, $zero
-/* D700DC 8024172C 8C850094 */  lw        $a1, 0x94($a0)
-/* D700E0 80241730 0C0B36B0 */  jal       resolve_npc
-/* D700E4 80241734 0040802D */   daddu    $s0, $v0, $zero
-/* D700E8 80241738 944300A6 */  lhu       $v1, 0xa6($v0)
-/* D700EC 8024173C A60300A6 */  sh        $v1, 0xa6($s0)
-/* D700F0 80241740 944300A8 */  lhu       $v1, 0xa8($v0)
-/* D700F4 80241744 A60300A8 */  sh        $v1, 0xa8($s0)
-/* D700F8 80241748 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D700FC 8024174C 8FB00010 */  lw        $s0, 0x10($sp)
-/* D70100 80241750 24020002 */  addiu     $v0, $zero, 2
-/* D70104 80241754 03E00008 */  jr        $ra
-/* D70108 80241758 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024175C_D7010C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024175C_D7010C.s
deleted file mode 100644
index 639d78019d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024175C_D7010C.s
+++ /dev/null
@@ -1,60 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024175C_D7010C
-/* D7010C 8024175C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* D70110 80241760 0000202D */  daddu     $a0, $zero, $zero
-/* D70114 80241764 AFBF0020 */  sw        $ra, 0x20($sp)
-/* D70118 80241768 AFB3001C */  sw        $s3, 0x1c($sp)
-/* D7011C 8024176C AFB20018 */  sw        $s2, 0x18($sp)
-/* D70120 80241770 AFB10014 */  sw        $s1, 0x14($sp)
-/* D70124 80241774 0C00EABB */  jal       get_npc_unsafe
-/* D70128 80241778 AFB00010 */   sw       $s0, 0x10($sp)
-/* D7012C 8024177C 24040001 */  addiu     $a0, $zero, 1
-/* D70130 80241780 0C00EABB */  jal       get_npc_unsafe
-/* D70134 80241784 0040802D */   daddu    $s0, $v0, $zero
-/* D70138 80241788 24040002 */  addiu     $a0, $zero, 2
-/* D7013C 8024178C 0C00EABB */  jal       get_npc_unsafe
-/* D70140 80241790 0040882D */   daddu    $s1, $v0, $zero
-/* D70144 80241794 24040003 */  addiu     $a0, $zero, 3
-/* D70148 80241798 0C00EABB */  jal       get_npc_unsafe
-/* D7014C 8024179C 0040902D */   daddu    $s2, $v0, $zero
-/* D70150 802417A0 24040004 */  addiu     $a0, $zero, 4
-/* D70154 802417A4 0C00EABB */  jal       get_npc_unsafe
-/* D70158 802417A8 0040982D */   daddu    $s3, $v0, $zero
-/* D7015C 802417AC 3C018011 */  lui       $at, %hi(gPlayerStatus+0x28)
-/* D70160 802417B0 C422EFF0 */  lwc1      $f2, %lo(gPlayerStatus+0x28)($at)
-/* D70164 802417B4 C6000038 */  lwc1      $f0, 0x38($s0)
-/* D70168 802417B8 4602003C */  c.lt.s    $f0, $f2
-/* D7016C 802417BC 00000000 */  nop
-/* D70170 802417C0 45030016 */  bc1tl     .L8024181C
-/* D70174 802417C4 24020002 */   addiu    $v0, $zero, 2
-/* D70178 802417C8 C6200038 */  lwc1      $f0, 0x38($s1)
-/* D7017C 802417CC 4602003C */  c.lt.s    $f0, $f2
-/* D70180 802417D0 00000000 */  nop
-/* D70184 802417D4 45030011 */  bc1tl     .L8024181C
-/* D70188 802417D8 24020002 */   addiu    $v0, $zero, 2
-/* D7018C 802417DC C6400038 */  lwc1      $f0, 0x38($s2)
-/* D70190 802417E0 4602003C */  c.lt.s    $f0, $f2
-/* D70194 802417E4 00000000 */  nop
-/* D70198 802417E8 4503000C */  bc1tl     .L8024181C
-/* D7019C 802417EC 24020002 */   addiu    $v0, $zero, 2
-/* D701A0 802417F0 C6600038 */  lwc1      $f0, 0x38($s3)
-/* D701A4 802417F4 4602003C */  c.lt.s    $f0, $f2
-/* D701A8 802417F8 00000000 */  nop
-/* D701AC 802417FC 45030007 */  bc1tl     .L8024181C
-/* D701B0 80241800 24020002 */   addiu    $v0, $zero, 2
-/* D701B4 80241804 C4400038 */  lwc1      $f0, 0x38($v0)
-/* D701B8 80241808 4602003C */  c.lt.s    $f0, $f2
-/* D701BC 8024180C 00000000 */  nop
-/* D701C0 80241810 45010002 */  bc1t      .L8024181C
-/* D701C4 80241814 24020002 */   addiu    $v0, $zero, 2
-/* D701C8 80241818 0000102D */  daddu     $v0, $zero, $zero
-.L8024181C:
-/* D701CC 8024181C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* D701D0 80241820 8FB3001C */  lw        $s3, 0x1c($sp)
-/* D701D4 80241824 8FB20018 */  lw        $s2, 0x18($sp)
-/* D701D8 80241828 8FB10014 */  lw        $s1, 0x14($sp)
-/* D701DC 8024182C 8FB00010 */  lw        $s0, 0x10($sp)
-/* D701E0 80241830 03E00008 */  jr        $ra
-/* D701E4 80241834 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241838_D701E8.s b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241838_D701E8.s
deleted file mode 100644
index 4cf564bbcf..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241838_D701E8.s
+++ /dev/null
@@ -1,108 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241838_D701E8
-/* D701E8 80241838 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* D701EC 8024183C AFB20018 */  sw        $s2, 0x18($sp)
-/* D701F0 80241840 0080902D */  daddu     $s2, $a0, $zero
-/* D701F4 80241844 AFB00010 */  sw        $s0, 0x10($sp)
-/* D701F8 80241848 00A0802D */  daddu     $s0, $a1, $zero
-/* D701FC 8024184C AFBF0020 */  sw        $ra, 0x20($sp)
-/* D70200 80241850 AFB3001C */  sw        $s3, 0x1c($sp)
-/* D70204 80241854 AFB10014 */  sw        $s1, 0x14($sp)
-/* D70208 80241858 8E51000C */  lw        $s1, 0xc($s2)
-/* D7020C 8024185C 8E250000 */  lw        $a1, ($s1)
-/* D70210 80241860 0C0B1EAF */  jal       evt_get_variable
-/* D70214 80241864 26310004 */   addiu    $s1, $s1, 4
-/* D70218 80241868 0C00EABB */  jal       get_npc_unsafe
-/* D7021C 8024186C 0040202D */   daddu    $a0, $v0, $zero
-/* D70220 80241870 12000016 */  beqz      $s0, .L802418CC
-/* D70224 80241874 0040982D */   daddu    $s3, $v0, $zero
-/* D70228 80241878 8E250000 */  lw        $a1, ($s1)
-/* D7022C 8024187C 26310004 */  addiu     $s1, $s1, 4
-/* D70230 80241880 0C0B1EAF */  jal       evt_get_variable
-/* D70234 80241884 0240202D */   daddu    $a0, $s2, $zero
-/* D70238 80241888 AE4200AC */  sw        $v0, 0xac($s2)
-/* D7023C 8024188C 24020008 */  addiu     $v0, $zero, 8
-/* D70240 80241890 AE4200B0 */  sw        $v0, 0xb0($s2)
-/* D70244 80241894 8E250000 */  lw        $a1, ($s1)
-/* D70248 80241898 0C0B1EAF */  jal       evt_get_variable
-/* D7024C 8024189C 0240202D */   daddu    $a0, $s2, $zero
-/* D70250 802418A0 AE4200B4 */  sw        $v0, 0xb4($s2)
-/* D70254 802418A4 C6620038 */  lwc1      $f2, 0x38($s3)
-/* D70258 802418A8 C64000AC */  lwc1      $f0, 0xac($s2)
-/* D7025C 802418AC 46800020 */  cvt.s.w   $f0, $f0
-/* D70260 802418B0 4600103C */  c.lt.s    $f2, $f0
-/* D70264 802418B4 00000000 */  nop
-/* D70268 802418B8 45000003 */  bc1f      .L802418C8
-/* D7026C 802418BC 24020001 */   addiu    $v0, $zero, 1
-/* D70270 802418C0 08090633 */  j         .L802418CC
-/* D70274 802418C4 AE4000B8 */   sw       $zero, 0xb8($s2)
-.L802418C8:
-/* D70278 802418C8 AE4200B8 */  sw        $v0, 0xb8($s2)
-.L802418CC:
-/* D7027C 802418CC 8E4200B8 */  lw        $v0, 0xb8($s2)
-/* D70280 802418D0 1440000C */  bnez      $v0, .L80241904
-/* D70284 802418D4 00000000 */   nop
-/* D70288 802418D8 C6620038 */  lwc1      $f2, 0x38($s3)
-/* D7028C 802418DC C64000AC */  lwc1      $f0, 0xac($s2)
-/* D70290 802418E0 46800020 */  cvt.s.w   $f0, $f0
-/* D70294 802418E4 4602003E */  c.le.s    $f0, $f2
-/* D70298 802418E8 00000000 */  nop
-/* D7029C 802418EC 4503000D */  bc1tl     .L80241924
-/* D702A0 802418F0 E6600038 */   swc1     $f0, 0x38($s3)
-/* D702A4 802418F4 C64000B0 */  lwc1      $f0, 0xb0($s2)
-/* D702A8 802418F8 46800020 */  cvt.s.w   $f0, $f0
-/* D702AC 802418FC 0809064E */  j         .L80241938
-/* D702B0 80241900 46001000 */   add.s    $f0, $f2, $f0
-.L80241904:
-/* D702B4 80241904 C6620038 */  lwc1      $f2, 0x38($s3)
-/* D702B8 80241908 C64000AC */  lwc1      $f0, 0xac($s2)
-/* D702BC 8024190C 46800020 */  cvt.s.w   $f0, $f0
-/* D702C0 80241910 4600103E */  c.le.s    $f2, $f0
-/* D702C4 80241914 00000000 */  nop
-/* D702C8 80241918 45000004 */  bc1f      .L8024192C
-/* D702CC 8024191C 00000000 */   nop
-/* D702D0 80241920 E6600038 */  swc1      $f0, 0x38($s3)
-.L80241924:
-/* D702D4 80241924 08090662 */  j         .L80241988
-/* D702D8 80241928 24020002 */   addiu    $v0, $zero, 2
-.L8024192C:
-/* D702DC 8024192C C64000B0 */  lwc1      $f0, 0xb0($s2)
-/* D702E0 80241930 46800020 */  cvt.s.w   $f0, $f0
-/* D702E4 80241934 46001001 */  sub.s     $f0, $f2, $f0
-.L80241938:
-/* D702E8 80241938 E6600038 */  swc1      $f0, 0x38($s3)
-/* D702EC 8024193C 8E4200B4 */  lw        $v0, 0xb4($s2)
-/* D702F0 80241940 14400009 */  bnez      $v0, .L80241968
-/* D702F4 80241944 00000000 */   nop
-/* D702F8 80241948 8E4200B0 */  lw        $v0, 0xb0($s2)
-/* D702FC 8024194C 24420002 */  addiu     $v0, $v0, 2
-/* D70300 80241950 AE4200B0 */  sw        $v0, 0xb0($s2)
-/* D70304 80241954 2842000E */  slti      $v0, $v0, 0xe
-/* D70308 80241958 1440000B */  bnez      $v0, .L80241988
-/* D7030C 8024195C 0000102D */   daddu    $v0, $zero, $zero
-/* D70310 80241960 08090660 */  j         .L80241980
-/* D70314 80241964 2402000E */   addiu    $v0, $zero, 0xe
-.L80241968:
-/* D70318 80241968 8E4200B0 */  lw        $v0, 0xb0($s2)
-/* D7031C 8024196C 2442FFFE */  addiu     $v0, $v0, -2
-/* D70320 80241970 AE4200B0 */  sw        $v0, 0xb0($s2)
-/* D70324 80241974 28420009 */  slti      $v0, $v0, 9
-/* D70328 80241978 10400002 */  beqz      $v0, .L80241984
-/* D7032C 8024197C 24020008 */   addiu    $v0, $zero, 8
-.L80241980:
-/* D70330 80241980 AE4200B0 */  sw        $v0, 0xb0($s2)
-.L80241984:
-/* D70334 80241984 0000102D */  daddu     $v0, $zero, $zero
-.L80241988:
-/* D70338 80241988 8FBF0020 */  lw        $ra, 0x20($sp)
-/* D7033C 8024198C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* D70340 80241990 8FB20018 */  lw        $s2, 0x18($sp)
-/* D70344 80241994 8FB10014 */  lw        $s1, 0x14($sp)
-/* D70348 80241998 8FB00010 */  lw        $s0, 0x10($sp)
-/* D7034C 8024199C 03E00008 */  jr        $ra
-/* D70350 802419A0 27BD0028 */   addiu    $sp, $sp, 0x28
-/* D70354 802419A4 00000000 */  nop
-/* D70358 802419A8 00000000 */  nop
-/* D7035C 802419AC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_21/D77F40/func_80240020_D77F40.s b/ver/us/asm/nonmatchings/world/area_pra/pra_21/D77F40/func_80240020_D77F40.s
deleted file mode 100644
index 626071cd4a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_21/D77F40/func_80240020_D77F40.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240020_D77F40
-/* D77F40 80240020 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* D77F44 80240024 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* D77F48 80240028 C4620080 */  lwc1      $f2, 0x80($v1)
-/* D77F4C 8024002C 44800000 */  mtc1      $zero, $f0
-/* D77F50 80240030 00000000 */  nop
-/* D77F54 80240034 4602003E */  c.le.s    $f0, $f2
-/* D77F58 80240038 00000000 */  nop
-/* D77F5C 8024003C 4500000A */  bc1f      .L80240068
-/* D77F60 80240040 00000000 */   nop
-/* D77F64 80240044 3C014334 */  lui       $at, 0x4334
-/* D77F68 80240048 44810000 */  mtc1      $at, $f0
-/* D77F6C 8024004C 00000000 */  nop
-/* D77F70 80240050 4600103C */  c.lt.s    $f2, $f0
-/* D77F74 80240054 00000000 */  nop
-/* D77F78 80240058 45000006 */  bc1f      .L80240074
-/* D77F7C 8024005C 240201A9 */   addiu    $v0, $zero, 0x1a9
-/* D77F80 80240060 AC820084 */  sw        $v0, 0x84($a0)
-/* D77F84 80240064 C4620080 */  lwc1      $f2, 0x80($v1)
-.L80240068:
-/* D77F88 80240068 3C014334 */  lui       $at, 0x4334
-/* D77F8C 8024006C 44810000 */  mtc1      $at, $f0
-/* D77F90 80240070 00000000 */  nop
-.L80240074:
-/* D77F94 80240074 4602003E */  c.le.s    $f0, $f2
-/* D77F98 80240078 00000000 */  nop
-/* D77F9C 8024007C 45000009 */  bc1f      .L802400A4
-/* D77FA0 80240080 00000000 */   nop
-/* D77FA4 80240084 3C0143B4 */  lui       $at, 0x43b4
-/* D77FA8 80240088 44810000 */  mtc1      $at, $f0
-/* D77FAC 8024008C 00000000 */  nop
-/* D77FB0 80240090 4600103C */  c.lt.s    $f2, $f0
-/* D77FB4 80240094 00000000 */  nop
-/* D77FB8 80240098 45000002 */  bc1f      .L802400A4
-/* D77FBC 8024009C 24020145 */   addiu    $v0, $zero, 0x145
-/* D77FC0 802400A0 AC820084 */  sw        $v0, 0x84($a0)
-.L802400A4:
-/* D77FC4 802400A4 03E00008 */  jr        $ra
-/* D77FC8 802400A8 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_21/D77F40/func_802400AC_D77FCC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_21/D77F40/func_802400AC_D77FCC.s
deleted file mode 100644
index fa8be91a0e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_21/D77F40/func_802400AC_D77FCC.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802400AC_D77FCC
-/* D77FCC 802400AC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D77FD0 802400B0 AFB10014 */  sw        $s1, 0x14($sp)
-/* D77FD4 802400B4 0080882D */  daddu     $s1, $a0, $zero
-/* D77FD8 802400B8 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* D77FDC 802400BC 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* D77FE0 802400C0 AFBF0018 */  sw        $ra, 0x18($sp)
-/* D77FE4 802400C4 AFB00010 */  sw        $s0, 0x10($sp)
-/* D77FE8 802400C8 84430018 */  lh        $v1, 0x18($v0)
-/* D77FEC 802400CC 14600005 */  bnez      $v1, .L802400E4
-/* D77FF0 802400D0 0040802D */   daddu    $s0, $v0, $zero
-/* D77FF4 802400D4 3C05FD05 */  lui       $a1, 0xfd05
-/* D77FF8 802400D8 34A50F80 */  ori       $a1, $a1, 0xf80
-/* D77FFC 802400DC 0C0B2026 */  jal       evt_set_variable
-/* D78000 802400E0 0000302D */   daddu    $a2, $zero, $zero
-.L802400E4:
-/* D78004 802400E4 86030018 */  lh        $v1, 0x18($s0)
-/* D78008 802400E8 2402FF38 */  addiu     $v0, $zero, -0xc8
-/* D7800C 802400EC 14620005 */  bne       $v1, $v0, .L80240104
-/* D78010 802400F0 0220202D */   daddu    $a0, $s1, $zero
-/* D78014 802400F4 3C05FD05 */  lui       $a1, 0xfd05
-/* D78018 802400F8 34A50F80 */  ori       $a1, $a1, 0xf80
-/* D7801C 802400FC 0C0B2026 */  jal       evt_set_variable
-/* D78020 80240100 24060001 */   addiu    $a2, $zero, 1
-.L80240104:
-/* D78024 80240104 8FBF0018 */  lw        $ra, 0x18($sp)
-/* D78028 80240108 8FB10014 */  lw        $s1, 0x14($sp)
-/* D7802C 8024010C 8FB00010 */  lw        $s0, 0x10($sp)
-/* D78030 80240110 0000102D */  daddu     $v0, $zero, $zero
-/* D78034 80240114 03E00008 */  jr        $ra
-/* D78038 80240118 27BD0020 */   addiu    $sp, $sp, 0x20
-/* D7803C 8024011C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_802400DC_D7895C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_802400DC_D7895C.s
deleted file mode 100644
index c409d4dac2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_802400DC_D7895C.s
+++ /dev/null
@@ -1,66 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel pra_22_UnkFunc12
-/* D7895C 802400DC 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* D78960 802400E0 AFB10034 */  sw        $s1, 0x34($sp)
-/* D78964 802400E4 0080882D */  daddu     $s1, $a0, $zero
-/* D78968 802400E8 AFB00030 */  sw        $s0, 0x30($sp)
-/* D7896C 802400EC 3C108011 */  lui       $s0, %hi(gPlayerStatus)
-/* D78970 802400F0 2610EFC8 */  addiu     $s0, $s0, %lo(gPlayerStatus)
-/* D78974 802400F4 AFBF0038 */  sw        $ra, 0x38($sp)
-/* D78978 802400F8 C6200084 */  lwc1      $f0, 0x84($s1)
-/* D7897C 802400FC 46800020 */  cvt.s.w   $f0, $f0
-/* D78980 80240100 27A2002C */  addiu     $v0, $sp, 0x2c
-/* D78984 80240104 0000202D */  daddu     $a0, $zero, $zero
-/* D78988 80240108 27A50020 */  addiu     $a1, $sp, 0x20
-/* D7898C 8024010C 27A60024 */  addiu     $a2, $sp, 0x24
-/* D78990 80240110 E6000028 */  swc1      $f0, 0x28($s0)
-/* D78994 80240114 E7A00020 */  swc1      $f0, 0x20($sp)
-/* D78998 80240118 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D7899C 8024011C 3C014120 */  lui       $at, 0x4120
-/* D789A0 80240120 44811000 */  mtc1      $at, $f2
-/* D789A4 80240124 C6040030 */  lwc1      $f4, 0x30($s0)
-/* D789A8 80240128 3C014396 */  lui       $at, 0x4396
-/* D789AC 8024012C 44813000 */  mtc1      $at, $f6
-/* D789B0 80240130 46020000 */  add.s     $f0, $f0, $f2
-/* D789B4 80240134 E7A40028 */  swc1      $f4, 0x28($sp)
-/* D789B8 80240138 E7A6002C */  swc1      $f6, 0x2c($sp)
-/* D789BC 8024013C E7A00024 */  swc1      $f0, 0x24($sp)
-/* D789C0 80240140 3C014387 */  lui       $at, 0x4387
-/* D789C4 80240144 44810000 */  mtc1      $at, $f0
-/* D789C8 80240148 860300B2 */  lh        $v1, 0xb2($s0)
-/* D789CC 8024014C 27A70028 */  addiu     $a3, $sp, 0x28
-/* D789D0 80240150 AFA20010 */  sw        $v0, 0x10($sp)
-/* D789D4 80240154 E7A00014 */  swc1      $f0, 0x14($sp)
-/* D789D8 80240158 44830000 */  mtc1      $v1, $f0
-/* D789DC 8024015C 00000000 */  nop
-/* D789E0 80240160 46800020 */  cvt.s.w   $f0, $f0
-/* D789E4 80240164 0C0371DE */  jal       npc_raycast_down_around
-/* D789E8 80240168 E7A00018 */   swc1     $f0, 0x18($sp)
-/* D789EC 8024016C C7A00020 */  lwc1      $f0, 0x20($sp)
-/* D789F0 80240170 C7A20028 */  lwc1      $f2, 0x28($sp)
-/* D789F4 80240174 E6000028 */  swc1      $f0, 0x28($s0)
-/* D789F8 80240178 E6020030 */  swc1      $f2, 0x30($s0)
-/* D789FC 8024017C AE2000AC */  sw        $zero, 0xac($s1)
-/* D78A00 80240180 C602002C */  lwc1      $f2, 0x2c($s0)
-/* D78A04 80240184 C7A00024 */  lwc1      $f0, 0x24($sp)
-/* D78A08 80240188 46001032 */  c.eq.s    $f2, $f0
-/* D78A0C 8024018C 00000000 */  nop
-/* D78A10 80240190 45010009 */  bc1t      .L802401B8
-/* D78A14 80240194 00000000 */   nop
-/* D78A18 80240198 AE00002C */  sw        $zero, 0x2c($s0)
-/* D78A1C 8024019C 8E220090 */  lw        $v0, 0x90($s1)
-/* D78A20 802401A0 24420001 */  addiu     $v0, $v0, 1
-/* D78A24 802401A4 AE220090 */  sw        $v0, 0x90($s1)
-/* D78A28 802401A8 2842001E */  slti      $v0, $v0, 0x1e
-/* D78A2C 802401AC 14400002 */  bnez      $v0, .L802401B8
-/* D78A30 802401B0 24020001 */   addiu    $v0, $zero, 1
-/* D78A34 802401B4 AE2200AC */  sw        $v0, 0xac($s1)
-.L802401B8:
-/* D78A38 802401B8 8FBF0038 */  lw        $ra, 0x38($sp)
-/* D78A3C 802401BC 8FB10034 */  lw        $s1, 0x34($sp)
-/* D78A40 802401C0 8FB00030 */  lw        $s0, 0x30($sp)
-/* D78A44 802401C4 24020002 */  addiu     $v0, $zero, 2
-/* D78A48 802401C8 03E00008 */  jr        $ra
-/* D78A4C 802401CC 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_802401D0_D78A50.s b/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_802401D0_D78A50.s
deleted file mode 100644
index befa6a4e49..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_802401D0_D78A50.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802401D0_D78A50
-/* D78A50 802401D0 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* D78A54 802401D4 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* D78A58 802401D8 C4620080 */  lwc1      $f2, 0x80($v1)
-/* D78A5C 802401DC 44800000 */  mtc1      $zero, $f0
-/* D78A60 802401E0 00000000 */  nop
-/* D78A64 802401E4 4602003E */  c.le.s    $f0, $f2
-/* D78A68 802401E8 00000000 */  nop
-/* D78A6C 802401EC 4500000A */  bc1f      .L80240218
-/* D78A70 802401F0 00000000 */   nop
-/* D78A74 802401F4 3C014334 */  lui       $at, 0x4334
-/* D78A78 802401F8 44810000 */  mtc1      $at, $f0
-/* D78A7C 802401FC 00000000 */  nop
-/* D78A80 80240200 4600103C */  c.lt.s    $f2, $f0
-/* D78A84 80240204 00000000 */  nop
-/* D78A88 80240208 45000006 */  bc1f      .L80240224
-/* D78A8C 8024020C 240201A9 */   addiu    $v0, $zero, 0x1a9
-/* D78A90 80240210 AC820084 */  sw        $v0, 0x84($a0)
-/* D78A94 80240214 C4620080 */  lwc1      $f2, 0x80($v1)
-.L80240218:
-/* D78A98 80240218 3C014334 */  lui       $at, 0x4334
-/* D78A9C 8024021C 44810000 */  mtc1      $at, $f0
-/* D78AA0 80240220 00000000 */  nop
-.L80240224:
-/* D78AA4 80240224 4602003E */  c.le.s    $f0, $f2
-/* D78AA8 80240228 00000000 */  nop
-/* D78AAC 8024022C 45000009 */  bc1f      .L80240254
-/* D78AB0 80240230 00000000 */   nop
-/* D78AB4 80240234 3C0143B4 */  lui       $at, 0x43b4
-/* D78AB8 80240238 44810000 */  mtc1      $at, $f0
-/* D78ABC 8024023C 00000000 */  nop
-/* D78AC0 80240240 4600103C */  c.lt.s    $f2, $f0
-/* D78AC4 80240244 00000000 */  nop
-/* D78AC8 80240248 45000002 */  bc1f      .L80240254
-/* D78ACC 8024024C 24020145 */   addiu    $v0, $zero, 0x145
-/* D78AD0 80240250 AC820084 */  sw        $v0, 0x84($a0)
-.L80240254:
-/* D78AD4 80240254 03E00008 */  jr        $ra
-/* D78AD8 80240258 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_8024025C_D78ADC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_8024025C_D78ADC.s
deleted file mode 100644
index 68dbfdddaa..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_8024025C_D78ADC.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024025C_D78ADC
-/* D78ADC 8024025C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D78AE0 80240260 AFB10014 */  sw        $s1, 0x14($sp)
-/* D78AE4 80240264 0080882D */  daddu     $s1, $a0, $zero
-/* D78AE8 80240268 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* D78AEC 8024026C 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* D78AF0 80240270 AFBF0018 */  sw        $ra, 0x18($sp)
-/* D78AF4 80240274 AFB00010 */  sw        $s0, 0x10($sp)
-/* D78AF8 80240278 84430018 */  lh        $v1, 0x18($v0)
-/* D78AFC 8024027C 14600005 */  bnez      $v1, .L80240294
-/* D78B00 80240280 0040802D */   daddu    $s0, $v0, $zero
-/* D78B04 80240284 3C05FD05 */  lui       $a1, 0xfd05
-/* D78B08 80240288 34A50F80 */  ori       $a1, $a1, 0xf80
-/* D78B0C 8024028C 0C0B2026 */  jal       evt_set_variable
-/* D78B10 80240290 0000302D */   daddu    $a2, $zero, $zero
-.L80240294:
-/* D78B14 80240294 86030018 */  lh        $v1, 0x18($s0)
-/* D78B18 80240298 2402FF38 */  addiu     $v0, $zero, -0xc8
-/* D78B1C 8024029C 14620005 */  bne       $v1, $v0, .L802402B4
-/* D78B20 802402A0 0220202D */   daddu    $a0, $s1, $zero
-/* D78B24 802402A4 3C05FD05 */  lui       $a1, 0xfd05
-/* D78B28 802402A8 34A50F80 */  ori       $a1, $a1, 0xf80
-/* D78B2C 802402AC 0C0B2026 */  jal       evt_set_variable
-/* D78B30 802402B0 24060001 */   addiu    $a2, $zero, 1
-.L802402B4:
-/* D78B34 802402B4 8FBF0018 */  lw        $ra, 0x18($sp)
-/* D78B38 802402B8 8FB10014 */  lw        $s1, 0x14($sp)
-/* D78B3C 802402BC 8FB00010 */  lw        $s0, 0x10($sp)
-/* D78B40 802402C0 0000102D */  daddu     $v0, $zero, $zero
-/* D78B44 802402C4 03E00008 */  jr        $ra
-/* D78B48 802402C8 27BD0020 */   addiu    $sp, $sp, 0x20
-/* D78B4C 802402CC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240000_D799F0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240000_D799F0.s
deleted file mode 100644
index d23920e3e4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240000_D799F0.s
+++ /dev/null
@@ -1,34 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_80241880_D7B270
-.ascii "pra_05_shape\0\0\0\0"
-
-dlabel D_80241890_D7B280
-.ascii "pra_05_hit\0\0pra_36\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-
-.section .text
-
-glabel func_80240000_D799F0
-/* D799F0 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D799F4 80240004 3C04800E */  lui       $a0, %hi(wMapShapeName)
-/* D799F8 80240008 24849230 */  addiu     $a0, $a0, %lo(wMapShapeName)
-/* D799FC 8024000C 3C058024 */  lui       $a1, %hi(D_80241880_D7B270)
-/* D79A00 80240010 24A51880 */  addiu     $a1, $a1, %lo(D_80241880_D7B270)
-/* D79A04 80240014 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* D79A08 80240018 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* D79A0C 8024001C 24020001 */  addiu     $v0, $zero, 1
-/* D79A10 80240020 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D79A14 80240024 0C01953C */  jal       sprintf
-/* D79A18 80240028 A0620084 */   sb       $v0, 0x84($v1)
-/* D79A1C 8024002C 3C04800E */  lui       $a0, %hi(wMapHitName)
-/* D79A20 80240030 248491E0 */  addiu     $a0, $a0, %lo(wMapHitName)
-/* D79A24 80240034 3C058024 */  lui       $a1, %hi(D_80241890_D7B280)
-/* D79A28 80240038 0C01953C */  jal       sprintf
-/* D79A2C 8024003C 24A51890 */   addiu    $a1, $a1, %lo(D_80241890_D7B280)
-/* D79A30 80240040 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D79A34 80240044 0000102D */  daddu     $v0, $zero, $zero
-/* D79A38 80240048 03E00008 */  jr        $ra
-/* D79A3C 8024004C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240000_D7B2A0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240000_D7B2A0.s
deleted file mode 100644
index 5400adcfdc..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240000_D7B2A0.s
+++ /dev/null
@@ -1,34 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_80241880_D7CB20
-.ascii "pra_05_shape\0\0\0\0"
-
-dlabel D_80241890_D7CB30
-.ascii "pra_05_hit\0\0pra_37\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-
-.section .text
-
-glabel func_80240000_D7B2A0
-/* D7B2A0 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D7B2A4 80240004 3C04800E */  lui       $a0, %hi(wMapShapeName)
-/* D7B2A8 80240008 24849230 */  addiu     $a0, $a0, %lo(wMapShapeName)
-/* D7B2AC 8024000C 3C058024 */  lui       $a1, %hi(D_80241880_D7CB20)
-/* D7B2B0 80240010 24A51880 */  addiu     $a1, $a1, %lo(D_80241880_D7CB20)
-/* D7B2B4 80240014 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* D7B2B8 80240018 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* D7B2BC 8024001C 24020001 */  addiu     $v0, $zero, 1
-/* D7B2C0 80240020 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D7B2C4 80240024 0C01953C */  jal       sprintf
-/* D7B2C8 80240028 A0620084 */   sb       $v0, 0x84($v1)
-/* D7B2CC 8024002C 3C04800E */  lui       $a0, %hi(wMapHitName)
-/* D7B2D0 80240030 248491E0 */  addiu     $a0, $a0, %lo(wMapHitName)
-/* D7B2D4 80240034 3C058024 */  lui       $a1, %hi(D_80241890_D7CB30)
-/* D7B2D8 80240038 0C01953C */  jal       sprintf
-/* D7B2DC 8024003C 24A51890 */   addiu    $a1, $a1, %lo(D_80241890_D7CB30)
-/* D7B2E0 80240040 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D7B2E4 80240044 0000102D */  daddu     $v0, $zero, $zero
-/* D7B2E8 80240048 03E00008 */  jr        $ra
-/* D7B2EC 8024004C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802411D4_D7DD24.s b/ver/us/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802411D4_D7DD24.s
deleted file mode 100644
index bfb2f23e3b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802411D4_D7DD24.s
+++ /dev/null
@@ -1,47 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802411D4_D7DD24
-/* D7DD24 802411D4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* D7DD28 802411D8 AFB1001C */  sw        $s1, 0x1c($sp)
-/* D7DD2C 802411DC 0080882D */  daddu     $s1, $a0, $zero
-/* D7DD30 802411E0 AFBF0024 */  sw        $ra, 0x24($sp)
-/* D7DD34 802411E4 AFB20020 */  sw        $s2, 0x20($sp)
-/* D7DD38 802411E8 AFB00018 */  sw        $s0, 0x18($sp)
-/* D7DD3C 802411EC 8E30000C */  lw        $s0, 0xc($s1)
-/* D7DD40 802411F0 8E050000 */  lw        $a1, ($s0)
-/* D7DD44 802411F4 0C0B1EAF */  jal       evt_get_variable
-/* D7DD48 802411F8 26100004 */   addiu    $s0, $s0, 4
-/* D7DD4C 802411FC 8E050000 */  lw        $a1, ($s0)
-/* D7DD50 80241200 26100004 */  addiu     $s0, $s0, 4
-/* D7DD54 80241204 0220202D */  daddu     $a0, $s1, $zero
-/* D7DD58 80241208 0C0B1EAF */  jal       evt_get_variable
-/* D7DD5C 8024120C 0040902D */   daddu    $s2, $v0, $zero
-/* D7DD60 80241210 0220202D */  daddu     $a0, $s1, $zero
-/* D7DD64 80241214 8E050000 */  lw        $a1, ($s0)
-/* D7DD68 80241218 0C0B1EAF */  jal       evt_get_variable
-/* D7DD6C 8024121C 0040802D */   daddu    $s0, $v0, $zero
-/* D7DD70 80241220 44920000 */  mtc1      $s2, $f0
-/* D7DD74 80241224 00000000 */  nop
-/* D7DD78 80241228 46800020 */  cvt.s.w   $f0, $f0
-/* D7DD7C 8024122C 44050000 */  mfc1      $a1, $f0
-/* D7DD80 80241230 44900000 */  mtc1      $s0, $f0
-/* D7DD84 80241234 00000000 */  nop
-/* D7DD88 80241238 46800020 */  cvt.s.w   $f0, $f0
-/* D7DD8C 8024123C 44060000 */  mfc1      $a2, $f0
-/* D7DD90 80241240 44820000 */  mtc1      $v0, $f0
-/* D7DD94 80241244 00000000 */  nop
-/* D7DD98 80241248 46800020 */  cvt.s.w   $f0, $f0
-/* D7DD9C 8024124C 44070000 */  mfc1      $a3, $f0
-/* D7DDA0 80241250 0000202D */  daddu     $a0, $zero, $zero
-/* D7DDA4 80241254 0C01C16C */  jal       fx_rising_bubble
-/* D7DDA8 80241258 AFA00010 */   sw       $zero, 0x10($sp)
-/* D7DDAC 8024125C 8FBF0024 */  lw        $ra, 0x24($sp)
-/* D7DDB0 80241260 8FB20020 */  lw        $s2, 0x20($sp)
-/* D7DDB4 80241264 8FB1001C */  lw        $s1, 0x1c($sp)
-/* D7DDB8 80241268 8FB00018 */  lw        $s0, 0x18($sp)
-/* D7DDBC 8024126C 24020002 */  addiu     $v0, $zero, 2
-/* D7DDC0 80241270 03E00008 */  jr        $ra
-/* D7DDC4 80241274 27BD0028 */   addiu    $sp, $sp, 0x28
-/* D7DDC8 80241278 00000000 */  nop
-/* D7DDCC 8024127C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED60/func_80240000_D7ED60.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED60/func_80240000_D7ED60.s
deleted file mode 100644
index a386944593..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED60/func_80240000_D7ED60.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_D7ED60
-/* D7ED60 80240000 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* D7ED64 80240004 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* D7ED68 80240008 24020001 */  addiu     $v0, $zero, 1
-/* D7ED6C 8024000C A0620084 */  sb        $v0, 0x84($v1)
-/* D7ED70 80240010 03E00008 */  jr        $ra
-/* D7ED74 80240014 0000102D */   daddu    $v0, $zero, $zero
-/* D7ED78 80240018 00000000 */  nop
-/* D7ED7C 8024001C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240410_D7F170.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240410_D7F170.s
deleted file mode 100644
index aa7afec0dd..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240410_D7F170.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240410_D7F170
-/* D7F170 80240410 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D7F174 80240414 AFB00010 */  sw        $s0, 0x10($sp)
-/* D7F178 80240418 0080802D */  daddu     $s0, $a0, $zero
-/* D7F17C 8024041C AFBF0014 */  sw        $ra, 0x14($sp)
-/* D7F180 80240420 0C00EAD2 */  jal       get_npc_safe
-/* D7F184 80240424 8E04014C */   lw       $a0, 0x14c($s0)
-/* D7F188 80240428 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* D7F18C 8024042C 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* D7F190 80240430 C44C0038 */  lwc1      $f12, 0x38($v0)
-/* D7F194 80240434 C44E0040 */  lwc1      $f14, 0x40($v0)
-/* D7F198 80240438 8C660028 */  lw        $a2, 0x28($v1)
-/* D7F19C 8024043C 0C00A720 */  jal       atan2
-/* D7F1A0 80240440 8C670030 */   lw       $a3, 0x30($v1)
-/* D7F1A4 80240444 0C00A6C9 */  jal       clamp_angle
-/* D7F1A8 80240448 46000306 */   mov.s    $f12, $f0
-/* D7F1AC 8024044C 4600008D */  trunc.w.s $f2, $f0
-/* D7F1B0 80240450 E6020084 */  swc1      $f2, 0x84($s0)
-/* D7F1B4 80240454 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D7F1B8 80240458 8FB00010 */  lw        $s0, 0x10($sp)
-/* D7F1BC 8024045C 24020002 */  addiu     $v0, $zero, 2
-/* D7F1C0 80240460 03E00008 */  jr        $ra
-/* D7F1C4 80240464 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240468_D7F1C8.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240468_D7F1C8.s
deleted file mode 100644
index e0b40ab569..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240468_D7F1C8.s
+++ /dev/null
@@ -1,49 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240468_D7F1C8
-/* D7F1C8 80240468 8C820084 */  lw        $v0, 0x84($a0)
-/* D7F1CC 8024046C 2442005A */  addiu     $v0, $v0, 0x5a
-/* D7F1D0 80240470 AC82009C */  sw        $v0, 0x9c($a0)
-/* D7F1D4 80240474 8C820098 */  lw        $v0, 0x98($a0)
-/* D7F1D8 80240478 8C83009C */  lw        $v1, 0x9c($a0)
-/* D7F1DC 8024047C 2442005A */  addiu     $v0, $v0, 0x5a
-/* D7F1E0 80240480 00621823 */  subu      $v1, $v1, $v0
-/* D7F1E4 80240484 04620001 */  bltzl     $v1, .L8024048C
-/* D7F1E8 80240488 00031823 */   negu     $v1, $v1
-.L8024048C:
-/* D7F1EC 8024048C AC8200A0 */  sw        $v0, 0xa0($a0)
-/* D7F1F0 80240490 2402010E */  addiu     $v0, $zero, 0x10e
-/* D7F1F4 80240494 1462000C */  bne       $v1, $v0, .L802404C8
-/* D7F1F8 80240498 AC8300A4 */   sw       $v1, 0xa4($a0)
-/* D7F1FC 8024049C 8C85009C */  lw        $a1, 0x9c($a0)
-/* D7F200 802404A0 8C8300A0 */  lw        $v1, 0xa0($a0)
-/* D7F204 802404A4 2402005A */  addiu     $v0, $zero, 0x5a
-/* D7F208 802404A8 AC8200A4 */  sw        $v0, 0xa4($a0)
-/* D7F20C 802404AC 0065102A */  slt       $v0, $v1, $a1
-/* D7F210 802404B0 50400004 */  beql      $v0, $zero, .L802404C4
-/* D7F214 802404B4 2462FE98 */   addiu    $v0, $v1, -0x168
-/* D7F218 802404B8 24A2FE98 */  addiu     $v0, $a1, -0x168
-/* D7F21C 802404BC 08090132 */  j         .L802404C8
-/* D7F220 802404C0 AC82009C */   sw       $v0, 0x9c($a0)
-.L802404C4:
-/* D7F224 802404C4 AC8200A0 */  sw        $v0, 0xa0($a0)
-.L802404C8:
-/* D7F228 802404C8 3C03B60B */  lui       $v1, 0xb60b
-/* D7F22C 802404CC 8C8200A4 */  lw        $v0, 0xa4($a0)
-/* D7F230 802404D0 346360B7 */  ori       $v1, $v1, 0x60b7
-/* D7F234 802404D4 00430018 */  mult      $v0, $v1
-/* D7F238 802404D8 00003010 */  mfhi      $a2
-/* D7F23C 802404DC 00C21821 */  addu      $v1, $a2, $v0
-/* D7F240 802404E0 00031983 */  sra       $v1, $v1, 6
-/* D7F244 802404E4 000217C3 */  sra       $v0, $v0, 0x1f
-/* D7F248 802404E8 00621823 */  subu      $v1, $v1, $v0
-/* D7F24C 802404EC 00031080 */  sll       $v0, $v1, 2
-/* D7F250 802404F0 00431021 */  addu      $v0, $v0, $v1
-/* D7F254 802404F4 00021080 */  sll       $v0, $v0, 2
-/* D7F258 802404F8 AC8200A4 */  sw        $v0, 0xa4($a0)
-/* D7F25C 802404FC 03E00008 */  jr        $ra
-/* D7F260 80240500 24020002 */   addiu    $v0, $zero, 2
-/* D7F264 80240504 00000000 */  nop
-/* D7F268 80240508 00000000 */  nop
-/* D7F26C 8024050C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240FD0_D7FD30.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240FD0_D7FD30.s
deleted file mode 100644
index c7adcdd038..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240FD0_D7FD30.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240FD0_D7FD30
-/* D7FD30 80240FD0 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* D7FD34 80240FD4 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* D7FD38 80240FD8 8C430004 */  lw        $v1, 4($v0)
-/* D7FD3C 80240FDC 3C040080 */  lui       $a0, 0x80
-/* D7FD40 80240FE0 00641825 */  or        $v1, $v1, $a0
-/* D7FD44 80240FE4 AC430004 */  sw        $v1, 4($v0)
-/* D7FD48 80240FE8 03E00008 */  jr        $ra
-/* D7FD4C 80240FEC 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240FF0_D7FD50.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240FF0_D7FD50.s
deleted file mode 100644
index 85bd0acade..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240FF0_D7FD50.s
+++ /dev/null
@@ -1,58 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240FF0_D7FD50
-/* D7FD50 80240FF0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D7FD54 80240FF4 AFB00010 */  sw        $s0, 0x10($sp)
-/* D7FD58 80240FF8 0080802D */  daddu     $s0, $a0, $zero
-/* D7FD5C 80240FFC AFBF0014 */  sw        $ra, 0x14($sp)
-/* D7FD60 80241000 8E02000C */  lw        $v0, 0xc($s0)
-/* D7FD64 80241004 0C0B1EAF */  jal       evt_get_variable
-/* D7FD68 80241008 8C450000 */   lw       $a1, ($v0)
-/* D7FD6C 8024100C 0040302D */  daddu     $a2, $v0, $zero
-/* D7FD70 80241010 3C058016 */  lui       $a1, %hi(gCollisionStatus)
-/* D7FD74 80241014 84A5A550 */  lh        $a1, %lo(gCollisionStatus)($a1)
-/* D7FD78 80241018 3C048011 */  lui       $a0, %hi(gPlayerStatus)
-/* D7FD7C 8024101C 2484EFC8 */  addiu     $a0, $a0, %lo(gPlayerStatus)
-/* D7FD80 80241020 10A60004 */  beq       $a1, $a2, .L80241034
-/* D7FD84 80241024 24020014 */   addiu    $v0, $zero, 0x14
-/* D7FD88 80241028 808300B4 */  lb        $v1, 0xb4($a0)
-/* D7FD8C 8024102C 10620006 */  beq       $v1, $v0, .L80241048
-/* D7FD90 80241030 00000000 */   nop
-.L80241034:
-/* D7FD94 80241034 8C820014 */  lw        $v0, 0x14($a0)
-/* D7FD98 80241038 3C03FFFF */  lui       $v1, 0xffff
-/* D7FD9C 8024103C 00431024 */  and       $v0, $v0, $v1
-/* D7FDA0 80241040 10400005 */  beqz      $v0, .L80241058
-/* D7FDA4 80241044 00000000 */   nop
-.L80241048:
-/* D7FDA8 80241048 0C039769 */  jal       set_action_state
-/* D7FDAC 8024104C 0000202D */   daddu    $a0, $zero, $zero
-/* D7FDB0 80241050 08090426 */  j         .L80241098
-/* D7FDB4 80241054 AE000084 */   sw       $zero, 0x84($s0)
-.L80241058:
-/* D7FDB8 80241058 54A6000F */  bnel      $a1, $a2, .L80241098
-/* D7FDBC 8024105C AE000084 */   sw       $zero, 0x84($s0)
-/* D7FDC0 80241060 808300B4 */  lb        $v1, 0xb4($a0)
-/* D7FDC4 80241064 24020014 */  addiu     $v0, $zero, 0x14
-/* D7FDC8 80241068 10620005 */  beq       $v1, $v0, .L80241080
-/* D7FDCC 8024106C 24020001 */   addiu    $v0, $zero, 1
-/* D7FDD0 80241070 10620003 */  beq       $v1, $v0, .L80241080
-/* D7FDD4 80241074 24020002 */   addiu    $v0, $zero, 2
-/* D7FDD8 80241078 54620008 */  bnel      $v1, $v0, .L8024109C
-/* D7FDDC 8024107C AE000084 */   sw       $zero, 0x84($s0)
-.L80241080:
-/* D7FDE0 80241080 8C820004 */  lw        $v0, 4($a0)
-/* D7FDE4 80241084 30420001 */  andi      $v0, $v0, 1
-/* D7FDE8 80241088 54400003 */  bnel      $v0, $zero, .L80241098
-/* D7FDEC 8024108C AE000084 */   sw       $zero, 0x84($s0)
-/* D7FDF0 80241090 24020001 */  addiu     $v0, $zero, 1
-/* D7FDF4 80241094 AE020084 */  sw        $v0, 0x84($s0)
-.L80241098:
-/* D7FDF8 80241098 24020002 */  addiu     $v0, $zero, 2
-.L8024109C:
-/* D7FDFC 8024109C 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D7FE00 802410A0 8FB00010 */  lw        $s0, 0x10($sp)
-/* D7FE04 802410A4 03E00008 */  jr        $ra
-/* D7FE08 802410A8 27BD0018 */   addiu    $sp, $sp, 0x18
-/* D7FE0C 802410AC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240814_D87214.s b/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240814_D87214.s
deleted file mode 100644
index e632bc9d86..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_80240814_D87214.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240814_D87214
-/* D87214 80240814 3C02800A */  lui       $v0, %hi(gOverrideFlags)
-/* D87218 80240818 2442A650 */  addiu     $v0, $v0, %lo(gOverrideFlags)
-/* D8721C 8024081C 8C430000 */  lw        $v1, ($v0)
-/* D87220 80240820 2404FF7F */  addiu     $a0, $zero, -0x81
-/* D87224 80240824 00641824 */  and       $v1, $v1, $a0
-/* D87228 80240828 AC430000 */  sw        $v1, ($v0)
-/* D8722C 8024082C 03E00008 */  jr        $ra
-/* D87230 80240830 24020002 */   addiu    $v0, $zero, 2
-/* D87234 80240834 00000000 */  nop
-/* D87238 80240838 00000000 */  nop
-/* D8723C 8024083C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240F20_D8A600.s b/ver/us/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240F20_D8A600.s
deleted file mode 100644
index 0b74983b59..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240F20_D8A600.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240F20_D8A600
-/* D8A600 80240F20 3C058016 */  lui       $a1, %hi(gCollisionStatus)
-/* D8A604 80240F24 24A5A550 */  addiu     $a1, $a1, %lo(gCollisionStatus)
-/* D8A608 80240F28 AC8000AC */  sw        $zero, 0xac($a0)
-/* D8A60C 80240F2C 84A20002 */  lh        $v0, 2($a1)
-/* D8A610 80240F30 2403001C */  addiu     $v1, $zero, 0x1c
-/* D8A614 80240F34 14430002 */  bne       $v0, $v1, .L80240F40
-/* D8A618 80240F38 24020001 */   addiu    $v0, $zero, 1
-/* D8A61C 80240F3C AC8200AC */  sw        $v0, 0xac($a0)
-.L80240F40:
-/* D8A620 80240F40 84A20004 */  lh        $v0, 4($a1)
-/* D8A624 80240F44 14430002 */  bne       $v0, $v1, .L80240F50
-/* D8A628 80240F48 24020001 */   addiu    $v0, $zero, 1
-/* D8A62C 80240F4C AC8200AC */  sw        $v0, 0xac($a0)
-.L80240F50:
-/* D8A630 80240F50 03E00008 */  jr        $ra
-/* D8A634 80240F54 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80241000_D8A6E0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80241000_D8A6E0.s
deleted file mode 100644
index f491bd96ac..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80241000_D8A6E0.s
+++ /dev/null
@@ -1,40 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241000_D8A6E0
-/* D8A6E0 80241000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D8A6E4 80241004 AFB00018 */  sw        $s0, 0x18($sp)
-/* D8A6E8 80241008 0080802D */  daddu     $s0, $a0, $zero
-/* D8A6EC 8024100C AFBF001C */  sw        $ra, 0x1c($sp)
-/* D8A6F0 80241010 C60C00A0 */  lwc1      $f12, 0xa0($s0)
-/* D8A6F4 80241014 46806320 */  cvt.s.w   $f12, $f12
-/* D8A6F8 80241018 27A50010 */  addiu     $a1, $sp, 0x10
-/* D8A6FC 8024101C 0C00A88D */  jal       sin_cos_deg
-/* D8A700 80241020 27A60014 */   addiu    $a2, $sp, 0x14
-/* D8A704 80241024 C7A20010 */  lwc1      $f2, 0x10($sp)
-/* D8A708 80241028 C600009C */  lwc1      $f0, 0x9c($s0)
-/* D8A70C 8024102C 46800020 */  cvt.s.w   $f0, $f0
-/* D8A710 80241030 46020002 */  mul.s     $f0, $f0, $f2
-/* D8A714 80241034 00000000 */  nop
-/* D8A718 80241038 3C014348 */  lui       $at, 0x4348
-/* D8A71C 8024103C 44811000 */  mtc1      $at, $f2
-/* D8A720 80241040 00000000 */  nop
-/* D8A724 80241044 46020000 */  add.s     $f0, $f0, $f2
-/* D8A728 80241048 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* D8A72C 8024104C 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* D8A730 80241050 E4400028 */  swc1      $f0, 0x28($v0)
-/* D8A734 80241054 C7A00014 */  lwc1      $f0, 0x14($sp)
-/* D8A738 80241058 C602009C */  lwc1      $f2, 0x9c($s0)
-/* D8A73C 8024105C 468010A0 */  cvt.s.w   $f2, $f2
-/* D8A740 80241060 46000007 */  neg.s     $f0, $f0
-/* D8A744 80241064 46001082 */  mul.s     $f2, $f2, $f0
-/* D8A748 80241068 00000000 */  nop
-/* D8A74C 8024106C 44800000 */  mtc1      $zero, $f0
-/* D8A750 80241070 00000000 */  nop
-/* D8A754 80241074 46001080 */  add.s     $f2, $f2, $f0
-/* D8A758 80241078 E4420030 */  swc1      $f2, 0x30($v0)
-/* D8A75C 8024107C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* D8A760 80241080 8FB00018 */  lw        $s0, 0x18($sp)
-/* D8A764 80241084 24020002 */  addiu     $v0, $zero, 2
-/* D8A768 80241088 03E00008 */  jr        $ra
-/* D8A76C 8024108C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s
deleted file mode 100644
index 09497bee53..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s
+++ /dev/null
@@ -1,212 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel jtbl_80244188_D913D8
-.word .L80242550_D8F7A0, .L80242560_D8F7B0, .L80242578_D8F7C8, .L80242588_D8F7D8, .L802425A0_D8F7F0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L802425B8_D8F808, .L802425C8_D8F818, .L802425E0_D8F830, .L802425F0_D8F840, .L80242608_D8F858, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242620_D8F870, .L80242628_D8F878, .L80242640_D8F890, .L80242658_D8F8A8, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242670_D8F8C0, .L80242668_D8F8B8
-
-.section .text
-
-glabel func_802423CC_D8F61C
-/* D8F61C 802423CC 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* D8F620 802423D0 AFB20038 */  sw        $s2, 0x38($sp)
-/* D8F624 802423D4 0080902D */  daddu     $s2, $a0, $zero
-/* D8F628 802423D8 AFBF0048 */  sw        $ra, 0x48($sp)
-/* D8F62C 802423DC AFB50044 */  sw        $s5, 0x44($sp)
-/* D8F630 802423E0 AFB40040 */  sw        $s4, 0x40($sp)
-/* D8F634 802423E4 AFB3003C */  sw        $s3, 0x3c($sp)
-/* D8F638 802423E8 AFB10034 */  sw        $s1, 0x34($sp)
-/* D8F63C 802423EC AFB00030 */  sw        $s0, 0x30($sp)
-/* D8F640 802423F0 8E510148 */  lw        $s1, 0x148($s2)
-/* D8F644 802423F4 86240008 */  lh        $a0, 8($s1)
-/* D8F648 802423F8 0C00EABB */  jal       get_npc_unsafe
-/* D8F64C 802423FC 00A0802D */   daddu    $s0, $a1, $zero
-/* D8F650 80242400 8E43000C */  lw        $v1, 0xc($s2)
-/* D8F654 80242404 0240202D */  daddu     $a0, $s2, $zero
-/* D8F658 80242408 8C650000 */  lw        $a1, ($v1)
-/* D8F65C 8024240C 0C0B1EAF */  jal       evt_get_variable
-/* D8F660 80242410 0040A82D */   daddu    $s5, $v0, $zero
-/* D8F664 80242414 AFA00010 */  sw        $zero, 0x10($sp)
-/* D8F668 80242418 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* D8F66C 8024241C 8C630094 */  lw        $v1, 0x94($v1)
-/* D8F670 80242420 AFA30014 */  sw        $v1, 0x14($sp)
-/* D8F674 80242424 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* D8F678 80242428 8C630080 */  lw        $v1, 0x80($v1)
-/* D8F67C 8024242C AFA30018 */  sw        $v1, 0x18($sp)
-/* D8F680 80242430 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* D8F684 80242434 8C630088 */  lw        $v1, 0x88($v1)
-/* D8F688 80242438 AFA3001C */  sw        $v1, 0x1c($sp)
-/* D8F68C 8024243C 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* D8F690 80242440 8C63008C */  lw        $v1, 0x8c($v1)
-/* D8F694 80242444 27B40010 */  addiu     $s4, $sp, 0x10
-/* D8F698 80242448 AFA30020 */  sw        $v1, 0x20($sp)
-/* D8F69C 8024244C 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* D8F6A0 80242450 3C014282 */  lui       $at, 0x4282
-/* D8F6A4 80242454 44810000 */  mtc1      $at, $f0
-/* D8F6A8 80242458 8C630090 */  lw        $v1, 0x90($v1)
-/* D8F6AC 8024245C 0040982D */  daddu     $s3, $v0, $zero
-/* D8F6B0 80242460 E7A00028 */  swc1      $f0, 0x28($sp)
-/* D8F6B4 80242464 A7A0002C */  sh        $zero, 0x2c($sp)
-/* D8F6B8 80242468 16000005 */  bnez      $s0, .L80242480
-/* D8F6BC 8024246C AFA30024 */   sw       $v1, 0x24($sp)
-/* D8F6C0 80242470 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* D8F6C4 80242474 30420004 */  andi      $v0, $v0, 4
-/* D8F6C8 80242478 10400020 */  beqz      $v0, .L802424FC
-/* D8F6CC 8024247C 00000000 */   nop
-.L80242480:
-/* D8F6D0 80242480 2404F7FF */  addiu     $a0, $zero, -0x801
-/* D8F6D4 80242484 AE400070 */  sw        $zero, 0x70($s2)
-/* D8F6D8 80242488 A6A0008E */  sh        $zero, 0x8e($s5)
-/* D8F6DC 8024248C 8E2200CC */  lw        $v0, 0xcc($s1)
-/* D8F6E0 80242490 8EA30000 */  lw        $v1, ($s5)
-/* D8F6E4 80242494 8C420000 */  lw        $v0, ($v0)
-/* D8F6E8 80242498 00641824 */  and       $v1, $v1, $a0
-/* D8F6EC 8024249C AEA30000 */  sw        $v1, ($s5)
-/* D8F6F0 802424A0 AEA20028 */  sw        $v0, 0x28($s5)
-/* D8F6F4 802424A4 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* D8F6F8 802424A8 8C420098 */  lw        $v0, 0x98($v0)
-/* D8F6FC 802424AC 54400005 */  bnel      $v0, $zero, .L802424C4
-/* D8F700 802424B0 2402FDFF */   addiu    $v0, $zero, -0x201
-/* D8F704 802424B4 34620200 */  ori       $v0, $v1, 0x200
-/* D8F708 802424B8 2403FFF7 */  addiu     $v1, $zero, -9
-/* D8F70C 802424BC 08090933 */  j         .L802424CC
-/* D8F710 802424C0 00431024 */   and      $v0, $v0, $v1
-.L802424C4:
-/* D8F714 802424C4 00621024 */  and       $v0, $v1, $v0
-/* D8F718 802424C8 34420008 */  ori       $v0, $v0, 8
-.L802424CC:
-/* D8F71C 802424CC AEA20000 */  sw        $v0, ($s5)
-/* D8F720 802424D0 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* D8F724 802424D4 30420004 */  andi      $v0, $v0, 4
-/* D8F728 802424D8 10400007 */  beqz      $v0, .L802424F8
-/* D8F72C 802424DC 24020063 */   addiu    $v0, $zero, 0x63
-/* D8F730 802424E0 AE420070 */  sw        $v0, 0x70($s2)
-/* D8F734 802424E4 AE400074 */  sw        $zero, 0x74($s2)
-/* D8F738 802424E8 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* D8F73C 802424EC 2403FFFB */  addiu     $v1, $zero, -5
-/* D8F740 802424F0 00431024 */  and       $v0, $v0, $v1
-/* D8F744 802424F4 AE2200B0 */  sw        $v0, 0xb0($s1)
-.L802424F8:
-/* D8F748 802424F8 AE20006C */  sw        $zero, 0x6c($s1)
-.L802424FC:
-/* D8F74C 802424FC 8E420070 */  lw        $v0, 0x70($s2)
-/* D8F750 80242500 2842001E */  slti      $v0, $v0, 0x1e
-/* D8F754 80242504 10400009 */  beqz      $v0, .L8024252C
-/* D8F758 80242508 00000000 */   nop
-/* D8F75C 8024250C 8E22006C */  lw        $v0, 0x6c($s1)
-/* D8F760 80242510 14400006 */  bnez      $v0, .L8024252C
-/* D8F764 80242514 00000000 */   nop
-/* D8F768 80242518 0C0907EE */  jal       pra_35_MeleeHitbox_CanSeePlayer
-/* D8F76C 8024251C 0240202D */   daddu    $a0, $s2, $zero
-/* D8F770 80242520 10400002 */  beqz      $v0, .L8024252C
-/* D8F774 80242524 2402001E */   addiu    $v0, $zero, 0x1e
-/* D8F778 80242528 AE420070 */  sw        $v0, 0x70($s2)
-.L8024252C:
-/* D8F77C 8024252C 8E430070 */  lw        $v1, 0x70($s2)
-/* D8F780 80242530 2C620064 */  sltiu     $v0, $v1, 0x64
-/* D8F784 80242534 1040004E */  beqz      $v0, .L80242670_D8F8C0
-/* D8F788 80242538 00031080 */   sll      $v0, $v1, 2
-/* D8F78C 8024253C 3C018024 */  lui       $at, %hi(jtbl_80244188_D913D8)
-/* D8F790 80242540 00220821 */  addu      $at, $at, $v0
-/* D8F794 80242544 8C224188 */  lw        $v0, %lo(jtbl_80244188_D913D8)($at)
-/* D8F798 80242548 00400008 */  jr        $v0
-/* D8F79C 8024254C 00000000 */   nop
-.L80242550_D8F7A0:
-/* D8F7A0 80242550 0240202D */  daddu     $a0, $s2, $zero
-/* D8F7A4 80242554 0260282D */  daddu     $a1, $s3, $zero
-/* D8F7A8 80242558 0C0903C8 */  jal       pra_35_PatrolAI_MoveInit
-/* D8F7AC 8024255C 0280302D */   daddu    $a2, $s4, $zero
-.L80242560_D8F7B0:
-/* D8F7B0 80242560 0240202D */  daddu     $a0, $s2, $zero
-/* D8F7B4 80242564 0260282D */  daddu     $a1, $s3, $zero
-/* D8F7B8 80242568 0C09041E */  jal       pra_35_PatrolAI_Move
-/* D8F7BC 8024256C 0280302D */   daddu    $a2, $s4, $zero
-/* D8F7C0 80242570 0809099C */  j         .L80242670_D8F8C0
-/* D8F7C4 80242574 00000000 */   nop
-.L80242578_D8F7C8:
-/* D8F7C8 80242578 0240202D */  daddu     $a0, $s2, $zero
-/* D8F7CC 8024257C 0260282D */  daddu     $a1, $s3, $zero
-/* D8F7D0 80242580 0C0904C8 */  jal       pra_35_PatrolAI_LoiterInit
-/* D8F7D4 80242584 0280302D */   daddu    $a2, $s4, $zero
-.L80242588_D8F7D8:
-/* D8F7D8 80242588 0240202D */  daddu     $a0, $s2, $zero
-/* D8F7DC 8024258C 0260282D */  daddu     $a1, $s3, $zero
-/* D8F7E0 80242590 0C0904F8 */  jal       pra_35_PatrolAI_Loiter
-/* D8F7E4 80242594 0280302D */   daddu    $a2, $s4, $zero
-/* D8F7E8 80242598 0809099C */  j         .L80242670_D8F8C0
-/* D8F7EC 8024259C 00000000 */   nop
-.L802425A0_D8F7F0:
-/* D8F7F0 802425A0 0240202D */  daddu     $a0, $s2, $zero
-/* D8F7F4 802425A4 0260282D */  daddu     $a1, $s3, $zero
-/* D8F7F8 802425A8 0C090567 */  jal       pra_35_PatrolAI_PostLoiter
-/* D8F7FC 802425AC 0280302D */   daddu    $a2, $s4, $zero
-/* D8F800 802425B0 0809099C */  j         .L80242670_D8F8C0
-/* D8F804 802425B4 00000000 */   nop
-.L802425B8_D8F808:
-/* D8F808 802425B8 0240202D */  daddu     $a0, $s2, $zero
-/* D8F80C 802425BC 0260282D */  daddu     $a1, $s3, $zero
-/* D8F810 802425C0 0C090594 */  jal       pra_35_PatrolAI_JumpInit
-/* D8F814 802425C4 0280302D */   daddu    $a2, $s4, $zero
-.L802425C8_D8F818:
-/* D8F818 802425C8 0240202D */  daddu     $a0, $s2, $zero
-/* D8F81C 802425CC 0260282D */  daddu     $a1, $s3, $zero
-/* D8F820 802425D0 0C0905B1 */  jal       pra_35_PatrolAI_Jump
-/* D8F824 802425D4 0280302D */   daddu    $a2, $s4, $zero
-/* D8F828 802425D8 0809099C */  j         .L80242670_D8F8C0
-/* D8F82C 802425DC 00000000 */   nop
-.L802425E0_D8F830:
-/* D8F830 802425E0 0240202D */  daddu     $a0, $s2, $zero
-/* D8F834 802425E4 0260282D */  daddu     $a1, $s3, $zero
-/* D8F838 802425E8 0C0905CF */  jal       pra_35_PatrolAI_ChaseInit
-/* D8F83C 802425EC 0280302D */   daddu    $a2, $s4, $zero
-.L802425F0_D8F840:
-/* D8F840 802425F0 0240202D */  daddu     $a0, $s2, $zero
-/* D8F844 802425F4 0260282D */  daddu     $a1, $s3, $zero
-/* D8F848 802425F8 0C09061B */  jal       pra_35_PatrolAI_Chase
-/* D8F84C 802425FC 0280302D */   daddu    $a2, $s4, $zero
-/* D8F850 80242600 0809099C */  j         .L80242670_D8F8C0
-/* D8F854 80242604 00000000 */   nop
-.L80242608_D8F858:
-/* D8F858 80242608 0240202D */  daddu     $a0, $s2, $zero
-/* D8F85C 8024260C 0260282D */  daddu     $a1, $s3, $zero
-/* D8F860 80242610 0C090663 */  jal       pra_35_PatrolAI_LosePlayer
-/* D8F864 80242614 0280302D */   daddu    $a2, $s4, $zero
-/* D8F868 80242618 0809099C */  j         .L80242670_D8F8C0
-/* D8F86C 8024261C 00000000 */   nop
-.L80242620_D8F870:
-/* D8F870 80242620 0C09076C */  jal       pra_35_MeleeHitbox_30
-/* D8F874 80242624 0240202D */   daddu    $a0, $s2, $zero
-.L80242628_D8F878:
-/* D8F878 80242628 0C090787 */  jal       pra_35_MeleeHitbox_31
-/* D8F87C 8024262C 0240202D */   daddu    $a0, $s2, $zero
-/* D8F880 80242630 8E430070 */  lw        $v1, 0x70($s2)
-/* D8F884 80242634 24020020 */  addiu     $v0, $zero, 0x20
-/* D8F888 80242638 1462000D */  bne       $v1, $v0, .L80242670_D8F8C0
-/* D8F88C 8024263C 00000000 */   nop
-.L80242640_D8F890:
-/* D8F890 80242640 0C0907A3 */  jal       pra_35_MeleeHitbox_32
-/* D8F894 80242644 0240202D */   daddu    $a0, $s2, $zero
-/* D8F898 80242648 8E430070 */  lw        $v1, 0x70($s2)
-/* D8F89C 8024264C 24020021 */  addiu     $v0, $zero, 0x21
-/* D8F8A0 80242650 14620007 */  bne       $v1, $v0, .L80242670_D8F8C0
-/* D8F8A4 80242654 00000000 */   nop
-.L80242658_D8F8A8:
-/* D8F8A8 80242658 0C0907D9 */  jal       pra_35_MeleeHitbox_33
-/* D8F8AC 8024265C 0240202D */   daddu    $a0, $s2, $zero
-/* D8F8B0 80242660 0809099C */  j         .L80242670_D8F8C0
-/* D8F8B4 80242664 00000000 */   nop
-.L80242668_D8F8B8:
-/* D8F8B8 80242668 0C0129CF */  jal       basic_ai_suspend
-/* D8F8BC 8024266C 0240202D */   daddu    $a0, $s2, $zero
-.L80242670_D8F8C0:
-/* D8F8C0 80242670 8FBF0048 */  lw        $ra, 0x48($sp)
-/* D8F8C4 80242674 8FB50044 */  lw        $s5, 0x44($sp)
-/* D8F8C8 80242678 8FB40040 */  lw        $s4, 0x40($sp)
-/* D8F8CC 8024267C 8FB3003C */  lw        $s3, 0x3c($sp)
-/* D8F8D0 80242680 8FB20038 */  lw        $s2, 0x38($sp)
-/* D8F8D4 80242684 8FB10034 */  lw        $s1, 0x34($sp)
-/* D8F8D8 80242688 8FB00030 */  lw        $s0, 0x30($sp)
-/* D8F8DC 8024268C 0000102D */  daddu     $v0, $zero, $zero
-/* D8F8E0 80242690 03E00008 */  jr        $ra
-/* D8F8E4 80242694 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241D20_D1A500.s b/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241D20_D1A500.s
deleted file mode 100644
index 61cb90d78e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241D20_D1A500.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241D20_D1A500
-/* D1A500 80241D20 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* D1A504 80241D24 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* D1A508 80241D28 90420012 */  lbu       $v0, 0x12($v0)
-/* D1A50C 80241D2C 000211C2 */  srl       $v0, $v0, 7
-/* D1A510 80241D30 03E00008 */  jr        $ra
-/* D1A514 80241D34 00021040 */   sll      $v0, $v0, 1
-/* D1A518 80241D38 00000000 */  nop
-/* D1A51C 80241D3C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242538_D223C8.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242538_D223C8.s
deleted file mode 100644
index 15fcbeb13d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242538_D223C8.s
+++ /dev/null
@@ -1,67 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242538_D223C8
-/* D223C8 80242538 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D223CC 8024253C AFB00010 */  sw        $s0, 0x10($sp)
-/* D223D0 80242540 0080802D */  daddu     $s0, $a0, $zero
-/* D223D4 80242544 10A0000A */  beqz      $a1, .L80242570
-/* D223D8 80242548 AFBF0014 */   sw       $ra, 0x14($sp)
-/* D223DC 8024254C 8E020084 */  lw        $v0, 0x84($s0)
-/* D223E0 80242550 54400007 */  bnel      $v0, $zero, .L80242570
-/* D223E4 80242554 AE000070 */   sw       $zero, 0x70($s0)
-/* D223E8 80242558 960400C2 */  lhu       $a0, 0xc2($s0)
-/* D223EC 8024255C 2405FFFF */  addiu     $a1, $zero, -1
-/* D223F0 80242560 24060001 */  addiu     $a2, $zero, 1
-/* D223F4 80242564 0C046E54 */  jal       func_8011B950
-/* D223F8 80242568 00C0382D */   daddu    $a3, $a2, $zero
-/* D223FC 8024256C AE000070 */  sw        $zero, 0x70($s0)
-.L80242570:
-/* D22400 80242570 8E020070 */  lw        $v0, 0x70($s0)
-/* D22404 80242574 24420020 */  addiu     $v0, $v0, 0x20
-/* D22408 80242578 AE020070 */  sw        $v0, 0x70($s0)
-/* D2240C 8024257C 28420100 */  slti      $v0, $v0, 0x100
-/* D22410 80242580 14400002 */  bnez      $v0, .L8024258C
-/* D22414 80242584 240200FF */   addiu    $v0, $zero, 0xff
-/* D22418 80242588 AE020070 */  sw        $v0, 0x70($s0)
-.L8024258C:
-/* D2241C 8024258C 8E020084 */  lw        $v0, 0x84($s0)
-/* D22420 80242590 14400004 */  bnez      $v0, .L802425A4
-/* D22424 80242594 240200FF */   addiu    $v0, $zero, 0xff
-/* D22428 80242598 8E020070 */  lw        $v0, 0x70($s0)
-/* D2242C 8024259C 0809096C */  j         .L802425B0
-/* D22430 802425A0 0000202D */   daddu    $a0, $zero, $zero
-.L802425A4:
-/* D22434 802425A4 8E030070 */  lw        $v1, 0x70($s0)
-/* D22438 802425A8 00431023 */  subu      $v0, $v0, $v1
-/* D2243C 802425AC 0000202D */  daddu     $a0, $zero, $zero
-.L802425B0:
-/* D22440 802425B0 0080282D */  daddu     $a1, $a0, $zero
-/* D22444 802425B4 0080302D */  daddu     $a2, $a0, $zero
-/* D22448 802425B8 0C046F97 */  jal       set_background_color_blend
-/* D2244C 802425BC 304700FF */   andi     $a3, $v0, 0xff
-/* D22450 802425C0 3C02800B */  lui       $v0, %hi(gCameras)
-/* D22454 802425C4 24421D80 */  addiu     $v0, $v0, %lo(gCameras)
-/* D22458 802425C8 A440002C */  sh        $zero, 0x2c($v0)
-/* D2245C 802425CC A440002E */  sh        $zero, 0x2e($v0)
-/* D22460 802425D0 A4400030 */  sh        $zero, 0x30($v0)
-/* D22464 802425D4 8E020070 */  lw        $v0, 0x70($s0)
-/* D22468 802425D8 284200FF */  slti      $v0, $v0, 0xff
-/* D2246C 802425DC 1440000B */  bnez      $v0, .L8024260C
-/* D22470 802425E0 0000102D */   daddu    $v0, $zero, $zero
-/* D22474 802425E4 8E030084 */  lw        $v1, 0x84($s0)
-/* D22478 802425E8 24020003 */  addiu     $v0, $zero, 3
-/* D2247C 802425EC 14620007 */  bne       $v1, $v0, .L8024260C
-/* D22480 802425F0 24020002 */   addiu    $v0, $zero, 2
-/* D22484 802425F4 960400C2 */  lhu       $a0, 0xc2($s0)
-/* D22488 802425F8 2405FFFF */  addiu     $a1, $zero, -1
-/* D2248C 802425FC 0000302D */  daddu     $a2, $zero, $zero
-/* D22490 80242600 0C046E54 */  jal       func_8011B950
-/* D22494 80242604 24070001 */   addiu    $a3, $zero, 1
-/* D22498 80242608 24020002 */  addiu     $v0, $zero, 2
-.L8024260C:
-/* D2249C 8024260C 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D224A0 80242610 8FB00010 */  lw        $s0, 0x10($sp)
-/* D224A4 80242614 03E00008 */  jr        $ra
-/* D224A8 80242618 27BD0018 */   addiu    $sp, $sp, 0x18
-/* D224AC 8024261C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_802405B0_D2C2E0.s b/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_802405B0_D2C2E0.s
deleted file mode 100644
index c4f0007b2c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_802405B0_D2C2E0.s
+++ /dev/null
@@ -1,40 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802405B0_D2C2E0
-/* D2C2E0 802405B0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D2C2E4 802405B4 AFB10014 */  sw        $s1, 0x14($sp)
-/* D2C2E8 802405B8 0080882D */  daddu     $s1, $a0, $zero
-/* D2C2EC 802405BC AFBF0018 */  sw        $ra, 0x18($sp)
-/* D2C2F0 802405C0 AFB00010 */  sw        $s0, 0x10($sp)
-/* D2C2F4 802405C4 8E30000C */  lw        $s0, 0xc($s1)
-/* D2C2F8 802405C8 8E050000 */  lw        $a1, ($s0)
-/* D2C2FC 802405CC 0C0B1EAF */  jal       evt_get_variable
-/* D2C300 802405D0 26100004 */   addiu    $s0, $s0, 4
-/* D2C304 802405D4 0220202D */  daddu     $a0, $s1, $zero
-/* D2C308 802405D8 8E050000 */  lw        $a1, ($s0)
-/* D2C30C 802405DC 0C0B1EAF */  jal       evt_get_variable
-/* D2C310 802405E0 0040802D */   daddu    $s0, $v0, $zero
-/* D2C314 802405E4 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* D2C318 802405E8 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* D2C31C 802405EC 10700003 */  beq       $v1, $s0, .L802405FC
-/* D2C320 802405F0 00000000 */   nop
-/* D2C324 802405F4 1462000A */  bne       $v1, $v0, .L80240620
-/* D2C328 802405F8 24020002 */   addiu    $v0, $zero, 2
-.L802405FC:
-/* D2C32C 802405FC 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* D2C330 80240600 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* D2C334 80240604 804300B4 */  lb        $v1, 0xb4($v0)
-/* D2C338 80240608 2402000E */  addiu     $v0, $zero, 0xe
-/* D2C33C 8024060C 10620003 */  beq       $v1, $v0, .L8024061C
-/* D2C340 80240610 24020010 */   addiu    $v0, $zero, 0x10
-/* D2C344 80240614 14620002 */  bne       $v1, $v0, .L80240620
-/* D2C348 80240618 24020002 */   addiu    $v0, $zero, 2
-.L8024061C:
-/* D2C34C 8024061C 0000102D */  daddu     $v0, $zero, $zero
-.L80240620:
-/* D2C350 80240620 8FBF0018 */  lw        $ra, 0x18($sp)
-/* D2C354 80240624 8FB10014 */  lw        $s1, 0x14($sp)
-/* D2C358 80240628 8FB00010 */  lw        $s0, 0x10($sp)
-/* D2C35C 8024062C 03E00008 */  jr        $ra
-/* D2C360 80240630 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37800/func_802402BC_D37ABC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37800/func_802402BC_D37ABC.s
deleted file mode 100644
index 0361e1c583..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37800/func_802402BC_D37ABC.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402BC_D37ABC
-/* D37ABC 802402BC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D37AC0 802402C0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D37AC4 802402C4 0C04C3D6 */  jal       get_item_entity
-/* D37AC8 802402C8 8C840084 */   lw       $a0, 0x84($a0)
-/* D37ACC 802402CC 3C013F4C */  lui       $at, 0x3f4c
-/* D37AD0 802402D0 3421CCCD */  ori       $at, $at, 0xcccd
-/* D37AD4 802402D4 44810000 */  mtc1      $at, $f0
-/* D37AD8 802402D8 00000000 */  nop
-/* D37ADC 802402DC E4400030 */  swc1      $f0, 0x30($v0)
-/* D37AE0 802402E0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D37AE4 802402E4 24020002 */  addiu     $v0, $zero, 2
-/* D37AE8 802402E8 03E00008 */  jr        $ra
-/* D37AEC 802402EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37800/func_802402F0_D37AF0.s b/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37800/func_802402F0_D37AF0.s
deleted file mode 100644
index 805ae72c19..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37800/func_802402F0_D37AF0.s
+++ /dev/null
@@ -1,60 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402F0_D37AF0
-/* D37AF0 802402F0 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* D37AF4 802402F4 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* D37AF8 802402F8 3C01439B */  lui       $at, 0x439b
-/* D37AFC 802402FC 4481B000 */  mtc1      $at, $f22
-/* D37B00 80240300 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* D37B04 80240304 3C0142C8 */  lui       $at, 0x42c8
-/* D37B08 80240308 4481A000 */  mtc1      $at, $f20
-/* D37B0C 8024030C AFB10014 */  sw        $s1, 0x14($sp)
-/* D37B10 80240310 0080882D */  daddu     $s1, $a0, $zero
-/* D37B14 80240314 AFBF0018 */  sw        $ra, 0x18($sp)
-/* D37B18 80240318 AFB00010 */  sw        $s0, 0x10($sp)
-/* D37B1C 8024031C 0C00A8BB */  jal       sin_deg
-/* D37B20 80240320 4600B306 */   mov.s    $f12, $f22
-/* D37B24 80240324 46140002 */  mul.s     $f0, $f0, $f20
-/* D37B28 80240328 00000000 */  nop
-/* D37B2C 8024032C 3C108011 */  lui       $s0, %hi(gPlayerStatus)
-/* D37B30 80240330 2610EFC8 */  addiu     $s0, $s0, %lo(gPlayerStatus)
-/* D37B34 80240334 C6020028 */  lwc1      $f2, 0x28($s0)
-/* D37B38 80240338 46001080 */  add.s     $f2, $f2, $f0
-/* D37B3C 8024033C 4600110D */  trunc.w.s $f4, $f2
-/* D37B40 80240340 E6240084 */  swc1      $f4, 0x84($s1)
-/* D37B44 80240344 0C00A8D4 */  jal       cos_deg
-/* D37B48 80240348 4600B306 */   mov.s    $f12, $f22
-/* D37B4C 8024034C 46140002 */  mul.s     $f0, $f0, $f20
-/* D37B50 80240350 00000000 */  nop
-/* D37B54 80240354 C6020030 */  lwc1      $f2, 0x30($s0)
-/* D37B58 80240358 3C014302 */  lui       $at, 0x4302
-/* D37B5C 8024035C 4481B000 */  mtc1      $at, $f22
-/* D37B60 80240360 46001081 */  sub.s     $f2, $f2, $f0
-/* D37B64 80240364 4600110D */  trunc.w.s $f4, $f2
-/* D37B68 80240368 E6240088 */  swc1      $f4, 0x88($s1)
-/* D37B6C 8024036C 0C00A8BB */  jal       sin_deg
-/* D37B70 80240370 4600B306 */   mov.s    $f12, $f22
-/* D37B74 80240374 46140002 */  mul.s     $f0, $f0, $f20
-/* D37B78 80240378 00000000 */  nop
-/* D37B7C 8024037C C6020028 */  lwc1      $f2, 0x28($s0)
-/* D37B80 80240380 46001080 */  add.s     $f2, $f2, $f0
-/* D37B84 80240384 4600110D */  trunc.w.s $f4, $f2
-/* D37B88 80240388 E624008C */  swc1      $f4, 0x8c($s1)
-/* D37B8C 8024038C 0C00A8D4 */  jal       cos_deg
-/* D37B90 80240390 4600B306 */   mov.s    $f12, $f22
-/* D37B94 80240394 46140002 */  mul.s     $f0, $f0, $f20
-/* D37B98 80240398 00000000 */  nop
-/* D37B9C 8024039C C6020030 */  lwc1      $f2, 0x30($s0)
-/* D37BA0 802403A0 46001081 */  sub.s     $f2, $f2, $f0
-/* D37BA4 802403A4 4600110D */  trunc.w.s $f4, $f2
-/* D37BA8 802403A8 E6240090 */  swc1      $f4, 0x90($s1)
-/* D37BAC 802403AC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* D37BB0 802403B0 8FB10014 */  lw        $s1, 0x14($sp)
-/* D37BB4 802403B4 8FB00010 */  lw        $s0, 0x10($sp)
-/* D37BB8 802403B8 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* D37BBC 802403BC D7B40020 */  ldc1      $f20, 0x20($sp)
-/* D37BC0 802403C0 24020002 */  addiu     $v0, $zero, 2
-/* D37BC4 802403C4 03E00008 */  jr        $ra
-/* D37BC8 802403C8 27BD0030 */   addiu    $sp, $sp, 0x30
-/* D37BCC 802403CC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_8024052C_D3AAFC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_8024052C_D3AAFC.s
deleted file mode 100644
index 11ef0281d0..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_8024052C_D3AAFC.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024052C_D3AAFC
-/* D3AAFC 8024052C 24020001 */  addiu     $v0, $zero, 1
-/* D3AB00 80240530 3C018015 */  lui       $at, %hi(gEntityHideMode)
-/* D3AB04 80240534 AC221310 */  sw        $v0, %lo(gEntityHideMode)($at)
-/* D3AB08 80240538 03E00008 */  jr        $ra
-/* D3AB0C 8024053C 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_8024059C_D3AB6C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_8024059C_D3AB6C.s
deleted file mode 100644
index de520b7422..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_8024059C_D3AB6C.s
+++ /dev/null
@@ -1,107 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024059C_D3AB6C
-/* D3AB6C 8024059C 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* D3AB70 802405A0 AFB1002C */  sw        $s1, 0x2c($sp)
-/* D3AB74 802405A4 AFB20030 */  sw        $s2, 0x30($sp)
-/* D3AB78 802405A8 3C128011 */  lui       $s2, %hi(gPlayerStatus)
-/* D3AB7C 802405AC 2652EFC8 */  addiu     $s2, $s2, %lo(gPlayerStatus)
-/* D3AB80 802405B0 AFBF0034 */  sw        $ra, 0x34($sp)
-/* D3AB84 802405B4 AFB00028 */  sw        $s0, 0x28($sp)
-/* D3AB88 802405B8 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* D3AB8C 802405BC 10A00003 */  beqz      $a1, .L802405CC
-/* D3AB90 802405C0 0080882D */   daddu    $s1, $a0, $zero
-/* D3AB94 802405C4 2402000A */  addiu     $v0, $zero, 0xa
-/* D3AB98 802405C8 AE220074 */  sw        $v0, 0x74($s1)
-.L802405CC:
-/* D3AB9C 802405CC 3C014387 */  lui       $at, 0x4387
-/* D3ABA0 802405D0 44810000 */  mtc1      $at, $f0
-/* D3ABA4 802405D4 00000000 */  nop
-/* D3ABA8 802405D8 E6400080 */  swc1      $f0, 0x80($s2)
-/* D3ABAC 802405DC 8E220074 */  lw        $v0, 0x74($s1)
-/* D3ABB0 802405E0 24420004 */  addiu     $v0, $v0, 4
-/* D3ABB4 802405E4 AE220074 */  sw        $v0, 0x74($s1)
-/* D3ABB8 802405E8 C64C0080 */  lwc1      $f12, 0x80($s2)
-/* D3ABBC 802405EC 0C00A8BB */  jal       sin_deg
-/* D3ABC0 802405F0 3C106666 */   lui      $s0, 0x6666
-/* D3ABC4 802405F4 8E230074 */  lw        $v1, 0x74($s1)
-/* D3ABC8 802405F8 36106667 */  ori       $s0, $s0, 0x6667
-/* D3ABCC 802405FC 00700018 */  mult      $v1, $s0
-/* D3ABD0 80240600 C64C0080 */  lwc1      $f12, 0x80($s2)
-/* D3ABD4 80240604 00031FC3 */  sra       $v1, $v1, 0x1f
-/* D3ABD8 80240608 00004010 */  mfhi      $t0
-/* D3ABDC 8024060C 00081083 */  sra       $v0, $t0, 2
-/* D3ABE0 80240610 00431023 */  subu      $v0, $v0, $v1
-/* D3ABE4 80240614 4482A000 */  mtc1      $v0, $f20
-/* D3ABE8 80240618 00000000 */  nop
-/* D3ABEC 8024061C 4680A520 */  cvt.s.w   $f20, $f20
-/* D3ABF0 80240620 4600A502 */  mul.s     $f20, $f20, $f0
-/* D3ABF4 80240624 0C00A8D4 */  jal       cos_deg
-/* D3ABF8 80240628 00000000 */   nop
-/* D3ABFC 8024062C 8E230074 */  lw        $v1, 0x74($s1)
-/* D3AC00 80240630 00700018 */  mult      $v1, $s0
-/* D3AC04 80240634 46000007 */  neg.s     $f0, $f0
-/* D3AC08 80240638 00031FC3 */  sra       $v1, $v1, 0x1f
-/* D3AC0C 8024063C 00004010 */  mfhi      $t0
-/* D3AC10 80240640 00081083 */  sra       $v0, $t0, 2
-/* D3AC14 80240644 00431023 */  subu      $v0, $v0, $v1
-/* D3AC18 80240648 44824000 */  mtc1      $v0, $f8
-/* D3AC1C 8024064C 00000000 */  nop
-/* D3AC20 80240650 46804220 */  cvt.s.w   $f8, $f8
-/* D3AC24 80240654 46004202 */  mul.s     $f8, $f8, $f0
-/* D3AC28 80240658 00000000 */  nop
-/* D3AC2C 8024065C 0000202D */  daddu     $a0, $zero, $zero
-/* D3AC30 80240660 864200B0 */  lh        $v0, 0xb0($s2)
-/* D3AC34 80240664 3C013F00 */  lui       $at, 0x3f00
-/* D3AC38 80240668 44811000 */  mtc1      $at, $f2
-/* D3AC3C 8024066C 44820000 */  mtc1      $v0, $f0
-/* D3AC40 80240670 00000000 */  nop
-/* D3AC44 80240674 46800020 */  cvt.s.w   $f0, $f0
-/* D3AC48 80240678 46020002 */  mul.s     $f0, $f0, $f2
-/* D3AC4C 8024067C 00000000 */  nop
-/* D3AC50 80240680 27A50018 */  addiu     $a1, $sp, 0x18
-/* D3AC54 80240684 27A6001C */  addiu     $a2, $sp, 0x1c
-/* D3AC58 80240688 C6440028 */  lwc1      $f4, 0x28($s2)
-/* D3AC5C 8024068C 27A70020 */  addiu     $a3, $sp, 0x20
-/* D3AC60 80240690 46142100 */  add.s     $f4, $f4, $f20
-/* D3AC64 80240694 C642002C */  lwc1      $f2, 0x2c($s2)
-/* D3AC68 80240698 3C0143FA */  lui       $at, 0x43fa
-/* D3AC6C 8024069C 44813000 */  mtc1      $at, $f6
-/* D3AC70 802406A0 46001080 */  add.s     $f2, $f2, $f0
-/* D3AC74 802406A4 C6400030 */  lwc1      $f0, 0x30($s2)
-/* D3AC78 802406A8 27A20024 */  addiu     $v0, $sp, 0x24
-/* D3AC7C 802406AC E7A60024 */  swc1      $f6, 0x24($sp)
-/* D3AC80 802406B0 46080000 */  add.s     $f0, $f0, $f8
-/* D3AC84 802406B4 E7A40018 */  swc1      $f4, 0x18($sp)
-/* D3AC88 802406B8 E7A2001C */  swc1      $f2, 0x1c($sp)
-/* D3AC8C 802406BC E7A00020 */  swc1      $f0, 0x20($sp)
-/* D3AC90 802406C0 0C0372DF */  jal       npc_raycast_down_sides
-/* D3AC94 802406C4 AFA20010 */   sw       $v0, 0x10($sp)
-/* D3AC98 802406C8 10400011 */  beqz      $v0, .L80240710
-/* D3AC9C 802406CC 24020002 */   addiu    $v0, $zero, 2
-/* D3ACA0 802406D0 C7A20024 */  lwc1      $f2, 0x24($sp)
-/* D3ACA4 802406D4 3C0142C8 */  lui       $at, 0x42c8
-/* D3ACA8 802406D8 44810000 */  mtc1      $at, $f0
-/* D3ACAC 802406DC 00000000 */  nop
-/* D3ACB0 802406E0 4600103C */  c.lt.s    $f2, $f0
-/* D3ACB4 802406E4 00000000 */  nop
-/* D3ACB8 802406E8 45000008 */  bc1f      .L8024070C
-/* D3ACBC 802406EC 0000102D */   daddu    $v0, $zero, $zero
-/* D3ACC0 802406F0 C7A00018 */  lwc1      $f0, 0x18($sp)
-/* D3ACC4 802406F4 C7A2001C */  lwc1      $f2, 0x1c($sp)
-/* D3ACC8 802406F8 C7A40020 */  lwc1      $f4, 0x20($sp)
-/* D3ACCC 802406FC E6400028 */  swc1      $f0, 0x28($s2)
-/* D3ACD0 80240700 E642002C */  swc1      $f2, 0x2c($s2)
-/* D3ACD4 80240704 080901C4 */  j         .L80240710
-/* D3ACD8 80240708 E6440030 */   swc1     $f4, 0x30($s2)
-.L8024070C:
-/* D3ACDC 8024070C 24020002 */  addiu     $v0, $zero, 2
-.L80240710:
-/* D3ACE0 80240710 8FBF0034 */  lw        $ra, 0x34($sp)
-/* D3ACE4 80240714 8FB20030 */  lw        $s2, 0x30($sp)
-/* D3ACE8 80240718 8FB1002C */  lw        $s1, 0x2c($sp)
-/* D3ACEC 8024071C 8FB00028 */  lw        $s0, 0x28($sp)
-/* D3ACF0 80240720 D7B40038 */  ldc1      $f20, 0x38($sp)
-/* D3ACF4 80240724 03E00008 */  jr        $ra
-/* D3ACF8 80240728 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_8024072C_D3ACFC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_8024072C_D3ACFC.s
deleted file mode 100644
index 29f4cec1f9..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_8024072C_D3ACFC.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024072C_D3ACFC
-/* D3ACFC 8024072C 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* D3AD00 80240730 8C42EFC8 */  lw        $v0, %lo(gPlayerStatus)($v0)
-/* D3AD04 80240734 30423000 */  andi      $v0, $v0, 0x3000
-/* D3AD08 80240738 10400003 */  beqz      $v0, .L80240748
-/* D3AD0C 8024073C 24020001 */   addiu    $v0, $zero, 1
-/* D3AD10 80240740 080901D3 */  j         .L8024074C
-/* D3AD14 80240744 AC820084 */   sw       $v0, 0x84($a0)
-.L80240748:
-/* D3AD18 80240748 AC800084 */  sw        $zero, 0x84($a0)
-.L8024074C:
-/* D3AD1C 8024074C 03E00008 */  jr        $ra
-/* D3AD20 80240750 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240754_D3AD24.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240754_D3AD24.s
deleted file mode 100644
index f50329f54a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240754_D3AD24.s
+++ /dev/null
@@ -1,37 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240754_D3AD24
-/* D3AD24 80240754 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D3AD28 80240758 AFB10014 */  sw        $s1, 0x14($sp)
-/* D3AD2C 8024075C 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* D3AD30 80240760 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* D3AD34 80240764 AFB00010 */  sw        $s0, 0x10($sp)
-/* D3AD38 80240768 0040802D */  daddu     $s0, $v0, $zero
-/* D3AD3C 8024076C AFBF0018 */  sw        $ra, 0x18($sp)
-/* D3AD40 80240770 86030018 */  lh        $v1, 0x18($s0)
-/* D3AD44 80240774 24020181 */  addiu     $v0, $zero, 0x181
-/* D3AD48 80240778 14620006 */  bne       $v1, $v0, .L80240794
-/* D3AD4C 8024077C 0080882D */   daddu    $s1, $a0, $zero
-/* D3AD50 80240780 3C05FD05 */  lui       $a1, 0xfd05
-/* D3AD54 80240784 34A50F87 */  ori       $a1, $a1, 0xf87
-/* D3AD58 80240788 0C0B2026 */  jal       evt_set_variable
-/* D3AD5C 8024078C 0000302D */   daddu    $a2, $zero, $zero
-/* D3AD60 80240790 86030018 */  lh        $v1, 0x18($s0)
-.L80240794:
-/* D3AD64 80240794 24020096 */  addiu     $v0, $zero, 0x96
-/* D3AD68 80240798 14620005 */  bne       $v1, $v0, .L802407B0
-/* D3AD6C 8024079C 0220202D */   daddu    $a0, $s1, $zero
-/* D3AD70 802407A0 3C05FD05 */  lui       $a1, 0xfd05
-/* D3AD74 802407A4 34A50F87 */  ori       $a1, $a1, 0xf87
-/* D3AD78 802407A8 0C0B2026 */  jal       evt_set_variable
-/* D3AD7C 802407AC 24060001 */   addiu    $a2, $zero, 1
-.L802407B0:
-/* D3AD80 802407B0 8FBF0018 */  lw        $ra, 0x18($sp)
-/* D3AD84 802407B4 8FB10014 */  lw        $s1, 0x14($sp)
-/* D3AD88 802407B8 8FB00010 */  lw        $s0, 0x10($sp)
-/* D3AD8C 802407BC 0000102D */  daddu     $v0, $zero, $zero
-/* D3AD90 802407C0 03E00008 */  jr        $ra
-/* D3AD94 802407C4 27BD0020 */   addiu    $sp, $sp, 0x20
-/* D3AD98 802407C8 00000000 */  nop
-/* D3AD9C 802407CC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241864_D3BE34.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241864_D3BE34.s
deleted file mode 100644
index 0fa6de7810..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241864_D3BE34.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241864_D3BE34
-/* D3BE34 80241864 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D3BE38 80241868 AFB00010 */  sw        $s0, 0x10($sp)
-/* D3BE3C 8024186C 0080802D */  daddu     $s0, $a0, $zero
-/* D3BE40 80241870 AFBF0014 */  sw        $ra, 0x14($sp)
-/* D3BE44 80241874 0C00EAD2 */  jal       get_npc_safe
-/* D3BE48 80241878 24040001 */   addiu    $a0, $zero, 1
-/* D3BE4C 8024187C 3C0143EB */  lui       $at, 0x43eb
-/* D3BE50 80241880 44811000 */  mtc1      $at, $f2
-/* D3BE54 80241884 3C0140A0 */  lui       $at, 0x40a0
-/* D3BE58 80241888 44810000 */  mtc1      $at, $f0
-/* D3BE5C 8024188C 0040182D */  daddu     $v1, $v0, $zero
-/* D3BE60 80241890 AC60003C */  sw        $zero, 0x3c($v1)
-/* D3BE64 80241894 E4620038 */  swc1      $f2, 0x38($v1)
-/* D3BE68 80241898 E4600040 */  swc1      $f0, 0x40($v1)
-/* D3BE6C 8024189C E60000AC */  swc1      $f0, 0xac($s0)
-/* D3BE70 802418A0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D3BE74 802418A4 8FB00010 */  lw        $s0, 0x10($sp)
-/* D3BE78 802418A8 24020002 */  addiu     $v0, $zero, 2
-/* D3BE7C 802418AC 03E00008 */  jr        $ra
-/* D3BE80 802418B0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802418B4_D3BE84.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802418B4_D3BE84.s
deleted file mode 100644
index edae544207..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802418B4_D3BE84.s
+++ /dev/null
@@ -1,122 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802418B4_D3BE84
-/* D3BE84 802418B4 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D3BE88 802418B8 AFB00010 */  sw        $s0, 0x10($sp)
-/* D3BE8C 802418BC 0080802D */  daddu     $s0, $a0, $zero
-/* D3BE90 802418C0 24040001 */  addiu     $a0, $zero, 1
-/* D3BE94 802418C4 AFBF001C */  sw        $ra, 0x1c($sp)
-/* D3BE98 802418C8 AFB20018 */  sw        $s2, 0x18($sp)
-/* D3BE9C 802418CC 0C00EAD2 */  jal       get_npc_safe
-/* D3BEA0 802418D0 AFB10014 */   sw       $s1, 0x14($sp)
-/* D3BEA4 802418D4 0040882D */  daddu     $s1, $v0, $zero
-/* D3BEA8 802418D8 3C128011 */  lui       $s2, %hi(gPlayerStatus)
-/* D3BEAC 802418DC 2652EFC8 */  addiu     $s2, $s2, %lo(gPlayerStatus)
-/* D3BEB0 802418E0 C60200AC */  lwc1      $f2, 0xac($s0)
-/* D3BEB4 802418E4 C6200040 */  lwc1      $f0, 0x40($s1)
-/* D3BEB8 802418E8 46001032 */  c.eq.s    $f2, $f0
-/* D3BEBC 802418EC 00000000 */  nop
-/* D3BEC0 802418F0 45000006 */  bc1f      .L8024190C
-/* D3BEC4 802418F4 261000AC */   addiu    $s0, $s0, 0xac
-/* D3BEC8 802418F8 3C03009A */  lui       $v1, 0x9a
-/* D3BECC 802418FC 8E220028 */  lw        $v0, 0x28($s1)
-/* D3BED0 80241900 34630001 */  ori       $v1, $v1, 1
-/* D3BED4 80241904 54430001 */  bnel      $v0, $v1, .L8024190C
-/* D3BED8 80241908 AE230028 */   sw       $v1, 0x28($s1)
-.L8024190C:
-/* D3BEDC 8024190C C6020000 */  lwc1      $f2, ($s0)
-/* D3BEE0 80241910 C6200040 */  lwc1      $f0, 0x40($s1)
-/* D3BEE4 80241914 46001032 */  c.eq.s    $f2, $f0
-/* D3BEE8 80241918 00000000 */  nop
-/* D3BEEC 8024191C 45030008 */  bc1tl     .L80241940
-/* D3BEF0 80241920 E6000000 */   swc1     $f0, ($s0)
-/* D3BEF4 80241924 3C03009A */  lui       $v1, 0x9a
-/* D3BEF8 80241928 8E220028 */  lw        $v0, 0x28($s1)
-/* D3BEFC 8024192C 34630002 */  ori       $v1, $v1, 2
-/* D3BF00 80241930 54430001 */  bnel      $v0, $v1, .L80241938
-/* D3BF04 80241934 AE230028 */   sw       $v1, 0x28($s1)
-.L80241938:
-/* D3BF08 80241938 C6200040 */  lwc1      $f0, 0x40($s1)
-/* D3BF0C 8024193C E6000000 */  swc1      $f0, ($s0)
-.L80241940:
-/* D3BF10 80241940 C62C0038 */  lwc1      $f12, 0x38($s1)
-/* D3BF14 80241944 C62E0040 */  lwc1      $f14, 0x40($s1)
-/* D3BF18 80241948 8E460028 */  lw        $a2, 0x28($s2)
-/* D3BF1C 8024194C 0C00A7B5 */  jal       dist2D
-/* D3BF20 80241950 8E470030 */   lw       $a3, 0x30($s2)
-/* D3BF24 80241954 3C0141F0 */  lui       $at, 0x41f0
-/* D3BF28 80241958 44811000 */  mtc1      $at, $f2
-/* D3BF2C 8024195C 00000000 */  nop
-/* D3BF30 80241960 4602003C */  c.lt.s    $f0, $f2
-/* D3BF34 80241964 00000000 */  nop
-/* D3BF38 80241968 4501003A */  bc1t      .L80241A54
-/* D3BF3C 8024196C 24020002 */   addiu    $v0, $zero, 2
-/* D3BF40 80241970 C62C0038 */  lwc1      $f12, 0x38($s1)
-/* D3BF44 80241974 C62E0040 */  lwc1      $f14, 0x40($s1)
-/* D3BF48 80241978 8E460028 */  lw        $a2, 0x28($s2)
-/* D3BF4C 8024197C 0C00A7B5 */  jal       dist2D
-/* D3BF50 80241980 8E470030 */   lw       $a3, 0x30($s2)
-/* D3BF54 80241984 3C014302 */  lui       $at, 0x4302
-/* D3BF58 80241988 44811000 */  mtc1      $at, $f2
-/* D3BF5C 8024198C 00000000 */  nop
-/* D3BF60 80241990 4600103C */  c.lt.s    $f2, $f0
-/* D3BF64 80241994 00000000 */  nop
-/* D3BF68 80241998 4501002E */  bc1t      .L80241A54
-/* D3BF6C 8024199C 24020002 */   addiu    $v0, $zero, 2
-/* D3BF70 802419A0 C6420030 */  lwc1      $f2, 0x30($s2)
-/* D3BF74 802419A4 3C014248 */  lui       $at, 0x4248
-/* D3BF78 802419A8 44812000 */  mtc1      $at, $f4
-/* D3BF7C 802419AC 00000000 */  nop
-/* D3BF80 802419B0 4602203C */  c.lt.s    $f4, $f2
-/* D3BF84 802419B4 00000000 */  nop
-/* D3BF88 802419B8 45000002 */  bc1f      .L802419C4
-/* D3BF8C 802419BC 46001006 */   mov.s    $f0, $f2
-/* D3BF90 802419C0 46002086 */  mov.s     $f2, $f4
-.L802419C4:
-/* D3BF94 802419C4 3C01C220 */  lui       $at, 0xc220
-/* D3BF98 802419C8 44812000 */  mtc1      $at, $f4
-/* D3BF9C 802419CC 00000000 */  nop
-/* D3BFA0 802419D0 4604003C */  c.lt.s    $f0, $f4
-/* D3BFA4 802419D4 00000000 */  nop
-/* D3BFA8 802419D8 45030001 */  bc1tl     .L802419E0
-/* D3BFAC 802419DC 46002086 */   mov.s    $f2, $f4
-.L802419E0:
-/* D3BFB0 802419E0 C6240040 */  lwc1      $f4, 0x40($s1)
-/* D3BFB4 802419E4 4602203E */  c.le.s    $f4, $f2
-/* D3BFB8 802419E8 00000000 */  nop
-/* D3BFBC 802419EC 4500000B */  bc1f      .L80241A1C
-/* D3BFC0 802419F0 00000000 */   nop
-/* D3BFC4 802419F4 3C014080 */  lui       $at, 0x4080
-/* D3BFC8 802419F8 44810000 */  mtc1      $at, $f0
-/* D3BFCC 802419FC 00000000 */  nop
-/* D3BFD0 80241A00 46002000 */  add.s     $f0, $f4, $f0
-/* D3BFD4 80241A04 4600103C */  c.lt.s    $f2, $f0
-/* D3BFD8 80241A08 00000000 */  nop
-/* D3BFDC 80241A0C 45000002 */  bc1f      .L80241A18
-/* D3BFE0 80241A10 E6200040 */   swc1     $f0, 0x40($s1)
-/* D3BFE4 80241A14 E6220040 */  swc1      $f2, 0x40($s1)
-.L80241A18:
-/* D3BFE8 80241A18 C6240040 */  lwc1      $f4, 0x40($s1)
-.L80241A1C:
-/* D3BFEC 80241A1C 4604103C */  c.lt.s    $f2, $f4
-/* D3BFF0 80241A20 00000000 */  nop
-/* D3BFF4 80241A24 4500000B */  bc1f      .L80241A54
-/* D3BFF8 80241A28 24020002 */   addiu    $v0, $zero, 2
-/* D3BFFC 80241A2C 3C014080 */  lui       $at, 0x4080
-/* D3C000 80241A30 44810000 */  mtc1      $at, $f0
-/* D3C004 80241A34 00000000 */  nop
-/* D3C008 80241A38 46002001 */  sub.s     $f0, $f4, $f0
-/* D3C00C 80241A3C 4602003E */  c.le.s    $f0, $f2
-/* D3C010 80241A40 00000000 */  nop
-/* D3C014 80241A44 45000003 */  bc1f      .L80241A54
-/* D3C018 80241A48 E6200040 */   swc1     $f0, 0x40($s1)
-/* D3C01C 80241A4C E6220040 */  swc1      $f2, 0x40($s1)
-/* D3C020 80241A50 24020002 */  addiu     $v0, $zero, 2
-.L80241A54:
-/* D3C024 80241A54 8FBF001C */  lw        $ra, 0x1c($sp)
-/* D3C028 80241A58 8FB20018 */  lw        $s2, 0x18($sp)
-/* D3C02C 80241A5C 8FB10014 */  lw        $s1, 0x14($sp)
-/* D3C030 80241A60 8FB00010 */  lw        $s0, 0x10($sp)
-/* D3C034 80241A64 03E00008 */  jr        $ra
-/* D3C038 80241A68 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241A6C_D3C03C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241A6C_D3C03C.s
deleted file mode 100644
index ea1d0fb61b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241A6C_D3C03C.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241A6C_D3C03C
-/* D3C03C 80241A6C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D3C040 80241A70 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D3C044 80241A74 0C04C3D6 */  jal       get_item_entity
-/* D3C048 80241A78 8C840084 */   lw       $a0, 0x84($a0)
-/* D3C04C 80241A7C 3C013F19 */  lui       $at, 0x3f19
-/* D3C050 80241A80 3421999A */  ori       $at, $at, 0x999a
-/* D3C054 80241A84 44810000 */  mtc1      $at, $f0
-/* D3C058 80241A88 00000000 */  nop
-/* D3C05C 80241A8C E4400030 */  swc1      $f0, 0x30($v0)
-/* D3C060 80241A90 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D3C064 80241A94 24020002 */  addiu     $v0, $zero, 2
-/* D3C068 80241A98 03E00008 */  jr        $ra
-/* D3C06C 80241A9C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FB0_D3C580.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FB0_D3C580.s
deleted file mode 100644
index 9a8b632b15..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FB0_D3C580.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241FB0_D3C580
-/* D3C580 80241FB0 3C058016 */  lui       $a1, %hi(gCollisionStatus)
-/* D3C584 80241FB4 24A5A550 */  addiu     $a1, $a1, %lo(gCollisionStatus)
-/* D3C588 80241FB8 AC8000AC */  sw        $zero, 0xac($a0)
-/* D3C58C 80241FBC 84A20002 */  lh        $v0, 2($a1)
-/* D3C590 80241FC0 24030040 */  addiu     $v1, $zero, 0x40
-/* D3C594 80241FC4 14430002 */  bne       $v0, $v1, .L80241FD0
-/* D3C598 80241FC8 24020001 */   addiu    $v0, $zero, 1
-/* D3C59C 80241FCC AC8200AC */  sw        $v0, 0xac($a0)
-.L80241FD0:
-/* D3C5A0 80241FD0 84A20004 */  lh        $v0, 4($a1)
-/* D3C5A4 80241FD4 14430002 */  bne       $v0, $v1, .L80241FE0
-/* D3C5A8 80241FD8 24020001 */   addiu    $v0, $zero, 1
-/* D3C5AC 80241FDC AC8200AC */  sw        $v0, 0xac($a0)
-.L80241FE0:
-/* D3C5B0 80241FE0 03E00008 */  jr        $ra
-/* D3C5B4 80241FE4 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FE8_D3C5B8.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FE8_D3C5B8.s
deleted file mode 100644
index 7e5abd543b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FE8_D3C5B8.s
+++ /dev/null
@@ -1,39 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241FE8_D3C5B8
-/* D3C5B8 80241FE8 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* D3C5BC 80241FEC AFB00028 */  sw        $s0, 0x28($sp)
-/* D3C5C0 80241FF0 3C108011 */  lui       $s0, %hi(gPlayerStatus)
-/* D3C5C4 80241FF4 2610EFC8 */  addiu     $s0, $s0, %lo(gPlayerStatus)
-/* D3C5C8 80241FF8 27A20024 */  addiu     $v0, $sp, 0x24
-/* D3C5CC 80241FFC 0000202D */  daddu     $a0, $zero, $zero
-/* D3C5D0 80242000 27A50018 */  addiu     $a1, $sp, 0x18
-/* D3C5D4 80242004 27A6001C */  addiu     $a2, $sp, 0x1c
-/* D3C5D8 80242008 AFBF002C */  sw        $ra, 0x2c($sp)
-/* D3C5DC 8024200C C6000028 */  lwc1      $f0, 0x28($s0)
-/* D3C5E0 80242010 3C014120 */  lui       $at, 0x4120
-/* D3C5E4 80242014 44811000 */  mtc1      $at, $f2
-/* D3C5E8 80242018 3C014220 */  lui       $at, 0x4220
-/* D3C5EC 8024201C 44813000 */  mtc1      $at, $f6
-/* D3C5F0 80242020 27A70020 */  addiu     $a3, $sp, 0x20
-/* D3C5F4 80242024 E7A00018 */  swc1      $f0, 0x18($sp)
-/* D3C5F8 80242028 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D3C5FC 8024202C C6040030 */  lwc1      $f4, 0x30($s0)
-/* D3C600 80242030 46020000 */  add.s     $f0, $f0, $f2
-/* D3C604 80242034 E7A60024 */  swc1      $f6, 0x24($sp)
-/* D3C608 80242038 E7A40020 */  swc1      $f4, 0x20($sp)
-/* D3C60C 8024203C E7A0001C */  swc1      $f0, 0x1c($sp)
-/* D3C610 80242040 0C0372DF */  jal       npc_raycast_down_sides
-/* D3C614 80242044 AFA20010 */   sw       $v0, 0x10($sp)
-/* D3C618 80242048 C7A00018 */  lwc1      $f0, 0x18($sp)
-/* D3C61C 8024204C C7A2001C */  lwc1      $f2, 0x1c($sp)
-/* D3C620 80242050 C7A40020 */  lwc1      $f4, 0x20($sp)
-/* D3C624 80242054 E6000028 */  swc1      $f0, 0x28($s0)
-/* D3C628 80242058 E602002C */  swc1      $f2, 0x2c($s0)
-/* D3C62C 8024205C E6040030 */  swc1      $f4, 0x30($s0)
-/* D3C630 80242060 8FBF002C */  lw        $ra, 0x2c($sp)
-/* D3C634 80242064 8FB00028 */  lw        $s0, 0x28($sp)
-/* D3C638 80242068 24020002 */  addiu     $v0, $zero, 2
-/* D3C63C 8024206C 03E00008 */  jr        $ra
-/* D3C640 80242070 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074_D3C644.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074_D3C644.s
deleted file mode 100644
index 97c7fb1cf6..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074_D3C644.s
+++ /dev/null
@@ -1,69 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242074_D3C644
-/* D3C644 80242074 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* D3C648 80242078 AFB20038 */  sw        $s2, 0x38($sp)
-/* D3C64C 8024207C 0080902D */  daddu     $s2, $a0, $zero
-/* D3C650 80242080 AFBF003C */  sw        $ra, 0x3c($sp)
-/* D3C654 80242084 AFB10034 */  sw        $s1, 0x34($sp)
-/* D3C658 80242088 AFB00030 */  sw        $s0, 0x30($sp)
-/* D3C65C 8024208C F7B40040 */  sdc1      $f20, 0x40($sp)
-/* D3C660 80242090 8E51000C */  lw        $s1, 0xc($s2)
-/* D3C664 80242094 0C00EAD2 */  jal       get_npc_safe
-/* D3C668 80242098 2404FFFC */   addiu    $a0, $zero, -4
-/* D3C66C 8024209C 2410FFFF */  addiu     $s0, $zero, -1
-/* D3C670 802420A0 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x18)
-/* D3C674 802420A4 8463A568 */  lh        $v1, %lo(gCollisionStatus+0x18)($v1)
-/* D3C678 802420A8 04600025 */  bltz      $v1, .L80242140
-/* D3C67C 802420AC 0040202D */   daddu    $a0, $v0, $zero
-/* D3C680 802420B0 3C014130 */  lui       $at, 0x4130
-/* D3C684 802420B4 44812000 */  mtc1      $at, $f4
-/* D3C688 802420B8 C4800038 */  lwc1      $f0, 0x38($a0)
-/* D3C68C 802420BC 3C014140 */  lui       $at, 0x4140
-/* D3C690 802420C0 4481A000 */  mtc1      $at, $f20
-/* D3C694 802420C4 27A2002C */  addiu     $v0, $sp, 0x2c
-/* D3C698 802420C8 E7A4002C */  swc1      $f4, 0x2c($sp)
-/* D3C69C 802420CC E7A00020 */  swc1      $f0, 0x20($sp)
-/* D3C6A0 802420D0 C480003C */  lwc1      $f0, 0x3c($a0)
-/* D3C6A4 802420D4 C4820040 */  lwc1      $f2, 0x40($a0)
-/* D3C6A8 802420D8 46040000 */  add.s     $f0, $f0, $f4
-/* D3C6AC 802420DC E7B4002C */  swc1      $f20, 0x2c($sp)
-/* D3C6B0 802420E0 E7A20028 */  swc1      $f2, 0x28($sp)
-/* D3C6B4 802420E4 E7A00024 */  swc1      $f0, 0x24($sp)
-/* D3C6B8 802420E8 AFA20010 */  sw        $v0, 0x10($sp)
-/* D3C6BC 802420EC C480000C */  lwc1      $f0, 0xc($a0)
-/* D3C6C0 802420F0 27A50020 */  addiu     $a1, $sp, 0x20
-/* D3C6C4 802420F4 E7A00014 */  swc1      $f0, 0x14($sp)
-/* D3C6C8 802420F8 848200A6 */  lh        $v0, 0xa6($a0)
-/* D3C6CC 802420FC 27A60024 */  addiu     $a2, $sp, 0x24
-/* D3C6D0 80242100 44820000 */  mtc1      $v0, $f0
-/* D3C6D4 80242104 00000000 */  nop
-/* D3C6D8 80242108 46800020 */  cvt.s.w   $f0, $f0
-/* D3C6DC 8024210C E7A00018 */  swc1      $f0, 0x18($sp)
-/* D3C6E0 80242110 8C840080 */  lw        $a0, 0x80($a0)
-/* D3C6E4 80242114 0C0371DE */  jal       npc_raycast_down_around
-/* D3C6E8 80242118 27A70028 */   addiu    $a3, $sp, 0x28
-/* D3C6EC 8024211C 10400009 */  beqz      $v0, .L80242144
-/* D3C6F0 80242120 0240202D */   daddu    $a0, $s2, $zero
-/* D3C6F4 80242124 C7A0002C */  lwc1      $f0, 0x2c($sp)
-/* D3C6F8 80242128 4614003E */  c.le.s    $f0, $f20
-/* D3C6FC 8024212C 00000000 */  nop
-/* D3C700 80242130 45000004 */  bc1f      .L80242144
-/* D3C704 80242134 00000000 */   nop
-/* D3C708 80242138 3C108011 */  lui       $s0, %hi(D_8010C978)
-/* D3C70C 8024213C 8E10C978 */  lw        $s0, %lo(D_8010C978)($s0)
-.L80242140:
-/* D3C710 80242140 0240202D */  daddu     $a0, $s2, $zero
-.L80242144:
-/* D3C714 80242144 8E250000 */  lw        $a1, ($s1)
-/* D3C718 80242148 0C0B2026 */  jal       evt_set_variable
-/* D3C71C 8024214C 0200302D */   daddu    $a2, $s0, $zero
-/* D3C720 80242150 8FBF003C */  lw        $ra, 0x3c($sp)
-/* D3C724 80242154 8FB20038 */  lw        $s2, 0x38($sp)
-/* D3C728 80242158 8FB10034 */  lw        $s1, 0x34($sp)
-/* D3C72C 8024215C 8FB00030 */  lw        $s0, 0x30($sp)
-/* D3C730 80242160 D7B40040 */  ldc1      $f20, 0x40($sp)
-/* D3C734 80242164 24020002 */  addiu     $v0, $zero, 2
-/* D3C738 80242168 03E00008 */  jr        $ra
-/* D3C73C 8024216C 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BA20/func_80240000_D4BA20.s b/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BA20/func_80240000_D4BA20.s
deleted file mode 100644
index e1f3987fc9..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BA20/func_80240000_D4BA20.s
+++ /dev/null
@@ -1,41 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_D4BA20
-/* D4BA20 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D4BA24 80240004 AFB10014 */  sw        $s1, 0x14($sp)
-/* D4BA28 80240008 0080882D */  daddu     $s1, $a0, $zero
-/* D4BA2C 8024000C AFBF0018 */  sw        $ra, 0x18($sp)
-/* D4BA30 80240010 10A00005 */  beqz      $a1, .L80240028
-/* D4BA34 80240014 AFB00010 */   sw       $s0, 0x10($sp)
-/* D4BA38 80240018 8E24014C */  lw        $a0, 0x14c($s1)
-/* D4BA3C 8024001C 0C00EAD2 */  jal       get_npc_safe
-/* D4BA40 80240020 AE200074 */   sw       $zero, 0x74($s1)
-/* D4BA44 80240024 AE220078 */  sw        $v0, 0x78($s1)
-.L80240028:
-/* D4BA48 80240028 C62C0074 */  lwc1      $f12, 0x74($s1)
-/* D4BA4C 8024002C 0C00A8BB */  jal       sin_deg
-/* D4BA50 80240030 8E300078 */   lw       $s0, 0x78($s1)
-/* D4BA54 80240034 3C0140A0 */  lui       $at, 0x40a0
-/* D4BA58 80240038 44811000 */  mtc1      $at, $f2
-/* D4BA5C 8024003C 00000000 */  nop
-/* D4BA60 80240040 46020002 */  mul.s     $f0, $f0, $f2
-/* D4BA64 80240044 00000000 */  nop
-/* D4BA68 80240048 3C014090 */  lui       $at, 0x4090
-/* D4BA6C 8024004C 44816000 */  mtc1      $at, $f12
-/* D4BA70 80240050 4600010D */  trunc.w.s $f4, $f0
-/* D4BA74 80240054 44022000 */  mfc1      $v0, $f4
-/* D4BA78 80240058 00000000 */  nop
-/* D4BA7C 8024005C A20200AB */  sb        $v0, 0xab($s0)
-/* D4BA80 80240060 C6200074 */  lwc1      $f0, 0x74($s1)
-/* D4BA84 80240064 0C00A6C9 */  jal       clamp_angle
-/* D4BA88 80240068 460C0300 */   add.s    $f12, $f0, $f12
-/* D4BA8C 8024006C E6200074 */  swc1      $f0, 0x74($s1)
-/* D4BA90 80240070 8FBF0018 */  lw        $ra, 0x18($sp)
-/* D4BA94 80240074 8FB10014 */  lw        $s1, 0x14($sp)
-/* D4BA98 80240078 8FB00010 */  lw        $s0, 0x10($sp)
-/* D4BA9C 8024007C 0000102D */  daddu     $v0, $zero, $zero
-/* D4BAA0 80240080 03E00008 */  jr        $ra
-/* D4BAA4 80240084 27BD0020 */   addiu    $sp, $sp, 0x20
-/* D4BAA8 80240088 00000000 */  nop
-/* D4BAAC 8024008C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240090_D4BAB0.s b/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240090_D4BAB0.s
deleted file mode 100644
index bd5942a46d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240090_D4BAB0.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240090_D4BAB0
-/* D4BAB0 80240090 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D4BAB4 80240094 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D4BAB8 80240098 8C82000C */  lw        $v0, 0xc($a0)
-/* D4BABC 8024009C 0C0B210B */  jal       evt_get_float_variable
-/* D4BAC0 802400A0 8C450000 */   lw       $a1, ($v0)
-/* D4BAC4 802400A4 44050000 */  mfc1      $a1, $f0
-/* D4BAC8 802400A8 0C04DF62 */  jal       set_screen_overlay_params_front
-/* D4BACC 802400AC 0000202D */   daddu    $a0, $zero, $zero
-/* D4BAD0 802400B0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D4BAD4 802400B4 24020002 */  addiu     $v0, $zero, 2
-/* D4BAD8 802400B8 03E00008 */  jr        $ra
-/* D4BADC 802400BC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_802400C0_D4BAE0.s b/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_802400C0_D4BAE0.s
deleted file mode 100644
index 667e008b6d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_802400C0_D4BAE0.s
+++ /dev/null
@@ -1,57 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802400C0_D4BAE0
-/* D4BAE0 802400C0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* D4BAE4 802400C4 AFB10014 */  sw        $s1, 0x14($sp)
-/* D4BAE8 802400C8 0080882D */  daddu     $s1, $a0, $zero
-/* D4BAEC 802400CC AFBF0020 */  sw        $ra, 0x20($sp)
-/* D4BAF0 802400D0 AFB3001C */  sw        $s3, 0x1c($sp)
-/* D4BAF4 802400D4 AFB20018 */  sw        $s2, 0x18($sp)
-/* D4BAF8 802400D8 AFB00010 */  sw        $s0, 0x10($sp)
-/* D4BAFC 802400DC 8E30000C */  lw        $s0, 0xc($s1)
-/* D4BB00 802400E0 8E050000 */  lw        $a1, ($s0)
-/* D4BB04 802400E4 0C0B1EAF */  jal       evt_get_variable
-/* D4BB08 802400E8 26100004 */   addiu    $s0, $s0, 4
-/* D4BB0C 802400EC 8E050000 */  lw        $a1, ($s0)
-/* D4BB10 802400F0 26100004 */  addiu     $s0, $s0, 4
-/* D4BB14 802400F4 0220202D */  daddu     $a0, $s1, $zero
-/* D4BB18 802400F8 0C0B210B */  jal       evt_get_float_variable
-/* D4BB1C 802400FC 0040982D */   daddu    $s3, $v0, $zero
-/* D4BB20 80240100 8E050000 */  lw        $a1, ($s0)
-/* D4BB24 80240104 26100004 */  addiu     $s0, $s0, 4
-/* D4BB28 80240108 4600008D */  trunc.w.s $f2, $f0
-/* D4BB2C 8024010C 44121000 */  mfc1      $s2, $f2
-/* D4BB30 80240110 0C0B210B */  jal       evt_get_float_variable
-/* D4BB34 80240114 0220202D */   daddu    $a0, $s1, $zero
-/* D4BB38 80240118 0220202D */  daddu     $a0, $s1, $zero
-/* D4BB3C 8024011C 8E050000 */  lw        $a1, ($s0)
-/* D4BB40 80240120 4600008D */  trunc.w.s $f2, $f0
-/* D4BB44 80240124 44111000 */  mfc1      $s1, $f2
-/* D4BB48 80240128 0C0B210B */  jal       evt_get_float_variable
-/* D4BB4C 8024012C 00000000 */   nop
-/* D4BB50 80240130 4600008D */  trunc.w.s $f2, $f0
-/* D4BB54 80240134 44101000 */  mfc1      $s0, $f2
-/* D4BB58 80240138 0C04C3D6 */  jal       get_item_entity
-/* D4BB5C 8024013C 0260202D */   daddu    $a0, $s3, $zero
-/* D4BB60 80240140 0040182D */  daddu     $v1, $v0, $zero
-/* D4BB64 80240144 44920000 */  mtc1      $s2, $f0
-/* D4BB68 80240148 00000000 */  nop
-/* D4BB6C 8024014C 46800020 */  cvt.s.w   $f0, $f0
-/* D4BB70 80240150 E4600008 */  swc1      $f0, 8($v1)
-/* D4BB74 80240154 44910000 */  mtc1      $s1, $f0
-/* D4BB78 80240158 00000000 */  nop
-/* D4BB7C 8024015C 46800020 */  cvt.s.w   $f0, $f0
-/* D4BB80 80240160 E460000C */  swc1      $f0, 0xc($v1)
-/* D4BB84 80240164 44900000 */  mtc1      $s0, $f0
-/* D4BB88 80240168 00000000 */  nop
-/* D4BB8C 8024016C 46800020 */  cvt.s.w   $f0, $f0
-/* D4BB90 80240170 E4600010 */  swc1      $f0, 0x10($v1)
-/* D4BB94 80240174 8FBF0020 */  lw        $ra, 0x20($sp)
-/* D4BB98 80240178 8FB3001C */  lw        $s3, 0x1c($sp)
-/* D4BB9C 8024017C 8FB20018 */  lw        $s2, 0x18($sp)
-/* D4BBA0 80240180 8FB10014 */  lw        $s1, 0x14($sp)
-/* D4BBA4 80240184 8FB00010 */  lw        $s0, 0x10($sp)
-/* D4BBA8 80240188 24020002 */  addiu     $v0, $zero, 2
-/* D4BBAC 8024018C 03E00008 */  jr        $ra
-/* D4BBB0 80240190 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240194_D4BBB4.s b/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240194_D4BBB4.s
deleted file mode 100644
index c767cd109f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240194_D4BBB4.s
+++ /dev/null
@@ -1,45 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240194_D4BBB4
-/* D4BBB4 80240194 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* D4BBB8 80240198 AFB1001C */  sw        $s1, 0x1c($sp)
-/* D4BBBC 8024019C 0080882D */  daddu     $s1, $a0, $zero
-/* D4BBC0 802401A0 AFBF0024 */  sw        $ra, 0x24($sp)
-/* D4BBC4 802401A4 AFB20020 */  sw        $s2, 0x20($sp)
-/* D4BBC8 802401A8 AFB00018 */  sw        $s0, 0x18($sp)
-/* D4BBCC 802401AC 8E30000C */  lw        $s0, 0xc($s1)
-/* D4BBD0 802401B0 8E050000 */  lw        $a1, ($s0)
-/* D4BBD4 802401B4 0C0B1EAF */  jal       evt_get_variable
-/* D4BBD8 802401B8 26100004 */   addiu    $s0, $s0, 4
-/* D4BBDC 802401BC 8E050000 */  lw        $a1, ($s0)
-/* D4BBE0 802401C0 26100004 */  addiu     $s0, $s0, 4
-/* D4BBE4 802401C4 0220202D */  daddu     $a0, $s1, $zero
-/* D4BBE8 802401C8 0C0B1EAF */  jal       evt_get_variable
-/* D4BBEC 802401CC 0040902D */   daddu    $s2, $v0, $zero
-/* D4BBF0 802401D0 0220202D */  daddu     $a0, $s1, $zero
-/* D4BBF4 802401D4 8E050000 */  lw        $a1, ($s0)
-/* D4BBF8 802401D8 0C0B1EAF */  jal       evt_get_variable
-/* D4BBFC 802401DC 0040802D */   daddu    $s0, $v0, $zero
-/* D4BC00 802401E0 44920000 */  mtc1      $s2, $f0
-/* D4BC04 802401E4 00000000 */  nop
-/* D4BC08 802401E8 46800020 */  cvt.s.w   $f0, $f0
-/* D4BC0C 802401EC 44050000 */  mfc1      $a1, $f0
-/* D4BC10 802401F0 44900000 */  mtc1      $s0, $f0
-/* D4BC14 802401F4 00000000 */  nop
-/* D4BC18 802401F8 46800020 */  cvt.s.w   $f0, $f0
-/* D4BC1C 802401FC 44060000 */  mfc1      $a2, $f0
-/* D4BC20 80240200 44820000 */  mtc1      $v0, $f0
-/* D4BC24 80240204 00000000 */  nop
-/* D4BC28 80240208 46800020 */  cvt.s.w   $f0, $f0
-/* D4BC2C 8024020C 44070000 */  mfc1      $a3, $f0
-/* D4BC30 80240210 0000202D */  daddu     $a0, $zero, $zero
-/* D4BC34 80240214 0C01C16C */  jal       fx_rising_bubble
-/* D4BC38 80240218 AFA00010 */   sw       $zero, 0x10($sp)
-/* D4BC3C 8024021C 8FBF0024 */  lw        $ra, 0x24($sp)
-/* D4BC40 80240220 8FB20020 */  lw        $s2, 0x20($sp)
-/* D4BC44 80240224 8FB1001C */  lw        $s1, 0x1c($sp)
-/* D4BC48 80240228 8FB00018 */  lw        $s0, 0x18($sp)
-/* D4BC4C 8024022C 24020002 */  addiu     $v0, $zero, 2
-/* D4BC50 80240230 03E00008 */  jr        $ra
-/* D4BC54 80240234 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240238_D4BC58.s b/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240238_D4BC58.s
deleted file mode 100644
index a2de0cf085..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240238_D4BC58.s
+++ /dev/null
@@ -1,94 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240238_D4BC58
-/* D4BC58 80240238 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* D4BC5C 8024023C AFB1002C */  sw        $s1, 0x2c($sp)
-/* D4BC60 80240240 0080882D */  daddu     $s1, $a0, $zero
-/* D4BC64 80240244 AFBF0030 */  sw        $ra, 0x30($sp)
-/* D4BC68 80240248 AFB00028 */  sw        $s0, 0x28($sp)
-/* D4BC6C 8024024C F7BA0050 */  sdc1      $f26, 0x50($sp)
-/* D4BC70 80240250 F7B80048 */  sdc1      $f24, 0x48($sp)
-/* D4BC74 80240254 F7B60040 */  sdc1      $f22, 0x40($sp)
-/* D4BC78 80240258 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* D4BC7C 8024025C 8E30000C */  lw        $s0, 0xc($s1)
-/* D4BC80 80240260 8E050000 */  lw        $a1, ($s0)
-/* D4BC84 80240264 0C0B210B */  jal       evt_get_float_variable
-/* D4BC88 80240268 26100004 */   addiu    $s0, $s0, 4
-/* D4BC8C 8024026C 8E050000 */  lw        $a1, ($s0)
-/* D4BC90 80240270 26100004 */  addiu     $s0, $s0, 4
-/* D4BC94 80240274 0220202D */  daddu     $a0, $s1, $zero
-/* D4BC98 80240278 0C0B210B */  jal       evt_get_float_variable
-/* D4BC9C 8024027C 46000686 */   mov.s    $f26, $f0
-/* D4BCA0 80240280 8E050000 */  lw        $a1, ($s0)
-/* D4BCA4 80240284 26100004 */  addiu     $s0, $s0, 4
-/* D4BCA8 80240288 0220202D */  daddu     $a0, $s1, $zero
-/* D4BCAC 8024028C 0C0B210B */  jal       evt_get_float_variable
-/* D4BCB0 80240290 46000506 */   mov.s    $f20, $f0
-/* D4BCB4 80240294 8E050000 */  lw        $a1, ($s0)
-/* D4BCB8 80240298 26100004 */  addiu     $s0, $s0, 4
-/* D4BCBC 8024029C 0220202D */  daddu     $a0, $s1, $zero
-/* D4BCC0 802402A0 0C0B210B */  jal       evt_get_float_variable
-/* D4BCC4 802402A4 46000586 */   mov.s    $f22, $f0
-/* D4BCC8 802402A8 0220202D */  daddu     $a0, $s1, $zero
-/* D4BCCC 802402AC 8E050000 */  lw        $a1, ($s0)
-/* D4BCD0 802402B0 0C0B210B */  jal       evt_get_float_variable
-/* D4BCD4 802402B4 46000606 */   mov.s    $f24, $f0
-/* D4BCD8 802402B8 3C065555 */  lui       $a2, 0x5555
-/* D4BCDC 802402BC 3C078011 */  lui       $a3, %hi(gPlayerStatus)
-/* D4BCE0 802402C0 24E7EFC8 */  addiu     $a3, $a3, %lo(gPlayerStatus)
-/* D4BCE4 802402C4 94E200B0 */  lhu       $v0, 0xb0($a3)
-/* D4BCE8 802402C8 34C65556 */  ori       $a2, $a2, 0x5556
-/* D4BCEC 802402CC 00021400 */  sll       $v0, $v0, 0x10
-/* D4BCF0 802402D0 00022403 */  sra       $a0, $v0, 0x10
-/* D4BCF4 802402D4 00041840 */  sll       $v1, $a0, 1
-/* D4BCF8 802402D8 00660018 */  mult      $v1, $a2
-/* D4BCFC 802402DC C4E20028 */  lwc1      $f2, 0x28($a3)
-/* D4BD00 802402E0 46141080 */  add.s     $f2, $f2, $f20
-/* D4BD04 802402E4 00005010 */  mfhi      $t2
-/* D4BD08 802402E8 C4E4002C */  lwc1      $f4, 0x2c($a3)
-/* D4BD0C 802402EC 00000000 */  nop
-/* D4BD10 802402F0 00860018 */  mult      $a0, $a2
-/* D4BD14 802402F4 00031FC3 */  sra       $v1, $v1, 0x1f
-/* D4BD18 802402F8 44051000 */  mfc1      $a1, $f2
-/* D4BD1C 802402FC 01431823 */  subu      $v1, $t2, $v1
-/* D4BD20 80240300 44831000 */  mtc1      $v1, $f2
-/* D4BD24 80240304 00000000 */  nop
-/* D4BD28 80240308 468010A0 */  cvt.s.w   $f2, $f2
-/* D4BD2C 8024030C 46022100 */  add.s     $f4, $f4, $f2
-/* D4BD30 80240310 26100004 */  addiu     $s0, $s0, 4
-/* D4BD34 80240314 8E100000 */  lw        $s0, ($s0)
-/* D4BD38 80240318 46162100 */  add.s     $f4, $f4, $f22
-/* D4BD3C 8024031C E7BA0014 */  swc1      $f26, 0x14($sp)
-/* D4BD40 80240320 000217C3 */  sra       $v0, $v0, 0x1f
-/* D4BD44 80240324 00004010 */  mfhi      $t0
-/* D4BD48 80240328 01021023 */  subu      $v0, $t0, $v0
-/* D4BD4C 8024032C 00021400 */  sll       $v0, $v0, 0x10
-/* D4BD50 80240330 00021403 */  sra       $v0, $v0, 0x10
-/* D4BD54 80240334 44821000 */  mtc1      $v0, $f2
-/* D4BD58 80240338 00000000 */  nop
-/* D4BD5C 8024033C 468010A0 */  cvt.s.w   $f2, $f2
-/* D4BD60 80240340 46001080 */  add.s     $f2, $f2, $f0
-/* D4BD64 80240344 C4E00030 */  lwc1      $f0, 0x30($a3)
-/* D4BD68 80240348 46180000 */  add.s     $f0, $f0, $f24
-/* D4BD6C 8024034C 0000202D */  daddu     $a0, $zero, $zero
-/* D4BD70 80240350 44062000 */  mfc1      $a2, $f4
-/* D4BD74 80240354 44070000 */  mfc1      $a3, $f0
-/* D4BD78 80240358 27A20020 */  addiu     $v0, $sp, 0x20
-/* D4BD7C 8024035C AFA20018 */  sw        $v0, 0x18($sp)
-/* D4BD80 80240360 0C01C1FC */  jal       fx_sleep_bubble
-/* D4BD84 80240364 E7A20010 */   swc1     $f2, 0x10($sp)
-/* D4BD88 80240368 0220202D */  daddu     $a0, $s1, $zero
-/* D4BD8C 8024036C 8FA60020 */  lw        $a2, 0x20($sp)
-/* D4BD90 80240370 0C0B2026 */  jal       evt_set_variable
-/* D4BD94 80240374 0200282D */   daddu    $a1, $s0, $zero
-/* D4BD98 80240378 8FBF0030 */  lw        $ra, 0x30($sp)
-/* D4BD9C 8024037C 8FB1002C */  lw        $s1, 0x2c($sp)
-/* D4BDA0 80240380 8FB00028 */  lw        $s0, 0x28($sp)
-/* D4BDA4 80240384 D7BA0050 */  ldc1      $f26, 0x50($sp)
-/* D4BDA8 80240388 D7B80048 */  ldc1      $f24, 0x48($sp)
-/* D4BDAC 8024038C D7B60040 */  ldc1      $f22, 0x40($sp)
-/* D4BDB0 80240390 D7B40038 */  ldc1      $f20, 0x38($sp)
-/* D4BDB4 80240394 24020002 */  addiu     $v0, $zero, 2
-/* D4BDB8 80240398 03E00008 */  jr        $ra
-/* D4BDBC 8024039C 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
index 548f75afad..9156082f77 100644
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@@ -15438,7 +15438,7 @@ func_802430B4_855224 = 0x802430B4; // type:func rom:0x855224
 func_802431B0_855320 = 0x802431B0; // type:func rom:0x855320
 func_80243254_8553C4 = 0x80243254; // type:func rom:0x8553C4
 func_8024335C_8554CC = 0x8024335C; // type:func rom:0x8554CC
-filemenu_update_show_name_input_8554F0 = 0x80243380; // type:func rom:0x8554F0
+func_80243380_8554F0 = 0x80243380; // type:func rom:0x8554F0
 func_802433BC_85552C = 0x802433BC; // type:func rom:0x85552C
 mac_05_resolve_npc = 0x802433F0; // type:func rom:0x855560
 mac_05_UnkAngleFunc001 = 0x8024343C; // type:func rom:0x8555AC
@@ -15958,7 +15958,7 @@ func_8024280C_8B287C = 0x8024280C; // type:func rom:0x8B287C
 kmr_02_UnkNpcPosFunc = 0x80242860; // type:func rom:0x8B28D0
 kmr_02_SyncStatusMenu = 0x8024293C; // type:func rom:0x8B29AC
 func_8024295C_8B29CC = 0x8024295C; // type:func rom:0x8B29CC
-btl_state_draw_switch_to_player_8B2C18 = 0x80242BA8; // type:func rom:0x8B2C18
+func_80242BA8_8B2C18 = 0x80242BA8; // type:func rom:0x8B2C18
 func_80242BC0_8B2C30 = 0x80242BC0; // type:func rom:0x8B2C30
 func_80242F08_8B2F78 = 0x80242F08; // type:func rom:0x8B2F78
 func_80242F28_8B2F98 = 0x80242F28; // type:func rom:0x8B2F98
@@ -19302,7 +19302,7 @@ func_80240350_B4ADC0 = 0x80240350; // type:func rom:0xB4ADC0
 jan_05_foliage_setup_shear_mtx = 0x802404A0; // type:func rom:0xB4AF10
 jan_05_TransformFoliage = 0x80240510; // type:func rom:0xB4AF80
 func_802406DC_B4B14C = 0x802406DC; // type:func rom:0xB4B14C
-func_80240738_B4B1A8 = 0x80240738; // type:func rom:0xB4B1A8
+jan_05_PullVine_ShearBushModel = 0x80240738; // type:func rom:0xB4B1A8
 jan_05_HeartPlant_SpawnHeart = 0x802407F0; // type:func rom:0xB4B260
 jan_05_HoppingAI_HopInit = 0x802408A4; // type:func rom:0xB4B314
 jan_05_HoppingAI_Hop = 0x80240AD4; // type:func rom:0xB4B544
@@ -19377,7 +19377,7 @@ jan_08_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xB5E3D4
 jan_08_foliage_setup_shear_mtx = 0x80240310; // type:func rom:0xB5E5C0
 jan_08_TransformFoliage = 0x80240380; // type:func rom:0xB5E630
 func_8024054C_B5E7FC = 0x8024054C; // type:func rom:0xB5E7FC
-func_802405A8_B5E858 = 0x802405A8; // type:func rom:0xB5E858
+jan_08_PullVine_ShearBushModel = 0x802405A8; // type:func rom:0xB5E858
 jan_08_SuperBlock_SetOverride40 = 0x80240660; // type:func rom:0xB5E910
 jan_08_SuperBlock_ClearOverride40 = 0x8024067C; // type:func rom:0xB5E92C
 jan_08_SuperBlock_HideBlockContent = 0x8024069C; // type:func rom:0xB5E94C
@@ -19426,7 +19426,7 @@ jan_09_UpdateTexturePanStepped = 0x80240404; // type:func rom:0xB65EB4
 jan_09_foliage_setup_shear_mtx = 0x802405F0; // type:func rom:0xB660A0
 jan_09_TransformFoliage = 0x80240660; // type:func rom:0xB66110
 func_8024082C_B662DC = 0x8024082C; // type:func rom:0xB662DC
-func_80240888_B66338 = 0x80240888; // type:func rom:0xB66338
+jan_09_PullVine_ShearBushModel = 0x80240888; // type:func rom:0xB66338
 jan_09_SpearGuyAI_LoiterInit = 0x80240940; // type:func rom:0xB663F0
 jan_09_SpearGuyAI_Loiter = 0x80240990; // type:func rom:0xB66440
 jan_09_MeleeHitbox_30 = 0x80240B54; // type:func rom:0xB66604
@@ -19546,7 +19546,7 @@ func_802412E0_B85460 = 0x802412E0; // type:func rom:0xB85460
 jan_22_foliage_setup_shear_mtx = 0x802413D0; // type:func rom:0xB85550
 jan_22_TransformFoliage = 0x80241440; // type:func rom:0xB855C0
 func_8024160C_B8578C = 0x8024160C; // type:func rom:0xB8578C
-func_80241668_B857E8 = 0x80241668; // type:func rom:0xB857E8
+jan_22_PullVine_ShearBushModel = 0x80241668; // type:func rom:0xB857E8
 dup_jan_22_foliage_setup_shear_mtx = 0x80241720; // type:func rom:0xB858A0
 dup_jan_22_TransformFoliage = 0x80241790; // type:func rom:0xB85910
 jan_22_varStash = 0x802425BC; // type:data rom:0xB8673C
@@ -23715,7 +23715,7 @@ sam_08_MeleeHitbox_33 = 0x80240EF4; // type:func rom:0xD30B74
 sam_08_MeleeHitbox_CanSeePlayer = 0x80240F48; // type:func rom:0xD30BC8
 sam_08_MeleeHitbox_Main = 0x802410FC; // type:func rom:0xD30D7C
 sam_08_WanderMeleeAI_Main = 0x8024135C; // type:func rom:0xD30FDC
-func_80241610_D31290 = 0x80241610; // type:func rom:0xD31290
+sam_08_PlayBigSmokePuff = 0x80241610; // type:func rom:0xD31290
 func_802416A4_D31324 = 0x802416A4; // type:func rom:0xD31324
 func_8024174C_D313CC = 0x8024174C; // type:func rom:0xD313CC
 sam_08_SuperBlock_CantUpgradeMessages = 0x80241AE0; // type:data rom:0xD31760
@@ -23806,7 +23806,7 @@ D_80251438_D4BA08 = 0x80251438; // type:data rom:0xD4BA08
 func_80240000_D4BA20 = 0x80240000; // type:func rom:0xD4BA20
 func_80240090_D4BAB0 = 0x80240090; // type:func rom:0xD4BAB0
 func_802400C0_D4BAE0 = 0x802400C0; // type:func rom:0xD4BAE0
-func_80240194_D4BBB4 = 0x80240194; // type:func rom:0xD4BBB4
+sam_12_PlayRisingBubble = 0x80240194; // type:func rom:0xD4BBB4
 func_80240238_D4BC58 = 0x80240238; // type:func rom:0xD4BC58
 pra_01_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD4D040
 pra_01_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD4D060
@@ -23927,7 +23927,7 @@ func_8024114C_D599DC = 0x8024114C; // type:func rom:0xD599DC
 func_802411A0_D59A30 = 0x802411A0; // type:func rom:0xD59A30
 func_802411D8_D59A68 = 0x802411D8; // type:func rom:0xD59A68
 func_80241274_D59B04 = 0x80241274; // type:func rom:0xD59B04
-func_80241310_D59BA0 = 0x80241310; // type:func rom:0xD59BA0
+pra_09_PlayBigSmokePuff = 0x80241310; // type:func rom:0xD59BA0
 func_802413A4_D59C34 = 0x802413A4; // type:func rom:0xD59C34
 func_802414F4_D59D84 = 0x802414F4; // type:func rom:0xD59D84
 func_802415F8_D59E88 = 0x802415F8; // type:func rom:0xD59E88
@@ -24010,7 +24010,7 @@ func_8024114C_D6572C = 0x8024114C; // type:func rom:0xD6572C
 func_802411A0_D65780 = 0x802411A0; // type:func rom:0xD65780
 func_802411D8_D657B8 = 0x802411D8; // type:func rom:0xD657B8
 func_80241274_D65854 = 0x80241274; // type:func rom:0xD65854
-func_80241310_D658F0 = 0x80241310; // type:func rom:0xD658F0
+pra_13_PlayBigSmokePuff = 0x80241310; // type:func rom:0xD658F0
 func_802413A4_D65984 = 0x802413A4; // type:func rom:0xD65984
 func_802413D0_D659B0 = 0x802413D0; // type:func rom:0xD659B0
 func_8024140C_D659EC = 0x8024140C; // type:func rom:0xD659EC
@@ -24086,7 +24086,7 @@ func_8024114C_D6FAFC = 0x8024114C; // type:func rom:0xD6FAFC
 func_802411A0_D6FB50 = 0x802411A0; // type:func rom:0xD6FB50
 func_802411D8_D6FB88 = 0x802411D8; // type:func rom:0xD6FB88
 func_80241274_D6FC24 = 0x80241274; // type:func rom:0xD6FC24
-func_80241310_D6FCC0 = 0x80241310; // type:func rom:0xD6FCC0
+pra_19_PlayBigSmokePuff = 0x80241310; // type:func rom:0xD6FCC0
 func_802413A4_D6FD54 = 0x802413A4; // type:func rom:0xD6FD54
 func_802414F4_D6FEA4 = 0x802414F4; // type:func rom:0xD6FEA4
 func_80241530_D6FEE0 = 0x80241530; // type:func rom:0xD6FEE0
@@ -24177,7 +24177,7 @@ pra_29_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD7DA08
 pra_29_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD7DA3C
 func_80240F20_D7DA70 = 0x80240F20; // type:func rom:0xD7DA70
 func_802410B0_D7DC00 = 0x802410B0; // type:func rom:0xD7DC00
-func_802411D4_D7DD24 = 0x802411D4; // type:func rom:0xD7DD24
+pra_29_PlayRisingBubble = 0x802411D4; // type:func rom:0xD7DD24
 func_80240000_D7ED60 = 0x80240000; // type:func rom:0xD7ED60
 pra_31_GetNpcCollisionHeight = 0x80240020; // type:func rom:0xD7ED80
 pra_31_AddPlayerHandsOffset = 0x8024007C; // type:func rom:0xD7EDDC
@@ -24197,7 +24197,7 @@ pra_31_UnkFunc12 = 0x80240DBC; // type:func rom:0xD7FB1C
 func_80240E70_D7FBD0 = 0x80240E70; // type:func rom:0xD7FBD0
 func_80240F2C_D7FC8C = 0x80240F2C; // type:func rom:0xD7FC8C
 func_80240FD0_D7FD30 = 0x80240FD0; // type:func rom:0xD7FD30
-func_80240FF0_D7FD50 = 0x80240FF0; // type:func rom:0xD7FD50
+pra_31_UnkFunc11 = 0x80240FF0; // type:func rom:0xD7FD50
 D_8024119C_D7FEFC = 0x8024119C; // type:data rom:0xD7FEFC
 D_802411A0_D7FF00 = 0x802411A0; // type:data rom:0xD7FF00
 D_802424F0_D81250 = 0x802424F0; // type:data rom:0xD81250
@@ -24277,7 +24277,7 @@ pra_35_MeleeHitbox_32 = 0x80241E8C; // type:func rom:0xD8F0DC
 pra_35_MeleeHitbox_33 = 0x80241F64; // type:func rom:0xD8F1B4
 pra_35_MeleeHitbox_CanSeePlayer = 0x80241FB8; // type:func rom:0xD8F208
 pra_35_MeleeHitbox_Main = 0x8024216C; // type:func rom:0xD8F3BC
-func_802423CC_D8F61C = 0x802423CC; // type:func rom:0xD8F61C
+pra_35_ClubbaPatrolAI_Main = 0x802423CC; // type:func rom:0xD8F61C
 pra_35_WanderMeleeAI_Main = 0x80242698; // type:func rom:0xD8F8E8
 pra_35_StashVars = 0x80242950; // type:func rom:0xD8FBA0
 pra_35_GetItemName = 0x80242A04; // type:func rom:0xD8FC54
@@ -24383,7 +24383,7 @@ func_80240000_D9AEF0 = 0x80240000; // type:func rom:0xD9AEF0
 func_80240260_D9B150 = 0x80240260; // type:func rom:0xD9B150
 func_80240844_D9B734 = 0x80240844; // type:func rom:0xD9B734
 func_802409A8_D9B898 = 0x802409A8; // type:func rom:0xD9B898
-func_802409EC_D9B8DC = 0x802409EC; // type:func rom:0xD9B8DC
+omo_01_UnkFloAI_Main = 0x802409EC; // type:func rom:0xD9B8DC
 D_802412A0_D9C190 = 0x802412A0; // type:data rom:0xD9C190
 omo_02_UnsetCamera0MoveFlag1 = 0x80240000; // type:func rom:0xD9D4D0
 omo_02_SetCamera0MoveFlag1 = 0x8024001C; // type:func rom:0xD9D4EC
diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt
index 15a9595412..062fea8bcf 100644
--- a/ver/us/undefined_syms.txt
+++ b/ver/us/undefined_syms.txt
@@ -131,6 +131,7 @@ func_8002AA2C = 0x8002AA2C;
 func_80059AC8 = 0x80059AC8;
 dead_get_entity_by_index = 0x80118BB0;
 dead_fx_sun = 0x80077BD0;
+dead_fx_sun_undeclared = dead_fx_sun;
 dead_func_8003D660 = 0x80041080;
 dead_set_max_SP = 0x800F1D9C;
 dead_sync_status_menu = 0x800F1730;