diff --git a/include/common_structs.h b/include/common_structs.h
index 915228ef7f..a0b8842b7b 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -736,7 +736,7 @@ typedef struct BattleStatus {
     /* 0x45B */ char unk_45B[5];
     /* 0x460 */ s32 unk_460;
     /* 0x464 */ s32 unk_464;
-    /* 0x468 */ char unk_468[4];
+    /* 0x468 */ s32 unk_468;
     /* 0x46C */ s32 battleState; /* 0 = load assets, 1 = create actors, 4 = start scripts, 7 & 8 = unk */
     /* 0x470 */ s32 unk_470;
     /* 0x474 */ s32 unk_474;
@@ -834,6 +834,19 @@ typedef struct AnimatedMesh {
 
 typedef AnimatedMesh* AnimatedMeshList[MAX_ANIMATED_MESHES];
 
+typedef struct EffectInstanceData {
+    /* 0x00 */ s32 unk_00;
+    /* 0x04 */ Vec3f pos;
+    /* 0x10 */ Vec3f rotation;
+    /* 0x1C */ Vec3f scale;
+    /* 0x28 */ char unk_28[0x4];
+    /* 0x2C */ s32 unk_2C;
+    /* 0x30 */ f32 unk_30;
+    /* 0x34 */ char unk_34[0x30];
+    /* 0x64 */ f32 unk_64;
+    /* 0x68 */ char unk_68[0x18];
+} EffectInstanceData; // size = 0x80
+
 typedef struct PrintHandle {
     /* 0x000 */ char unk_00[16];
     /* 0x010 */ s8* printbuf;
@@ -929,7 +942,7 @@ typedef struct Effect {
     /* 0x00 */ s32 flags;
     /* 0x04 */ s32 effectIndex;
     /* 0x08 */ s32 instanceCounter;
-    /* 0x0C */ s32 unk_0C;  //? Maybe EffectInstanceData too ?
+    /* 0x0C */ EffectInstanceData* instanceData;  //? Maybe EffectInstanceData too ?
     /* 0x10 */ void (*update)(EffectInstance* effectInst);
     /* 0x14 */ void (*renderWorld)(EffectInstance* effectInst);
     /* 0x18 */ void (*unk_18)(EffectInstance* effectInst);
@@ -1700,7 +1713,7 @@ typedef struct PlayerStatus {
     /* 0x054 */ f32 currentSpeed;
     /* 0x058 */ f32 walkSpeed;
     /* 0x05C */ f32 runSpeed;
-    /* 0x060 */ char unk_60[4];
+    /* 0x060 */ s32 unk_60;
     /* 0x064 */ f32 unk_64;
     /* 0x068 */ f32 normalPitch;
     /* 0x06C */ f32 unk_6C;
@@ -1720,7 +1733,7 @@ typedef struct PlayerStatus {
     /* 0x0B0 */ s16 colliderHeight;
     /* 0x0B2 */ s16 colliderDiameter;
     /* 0x0B4 */ s8 actionState;
-    /* 0x0B5 */ u8 prevActionState;
+    /* 0x0B5 */ s8 prevActionState;
     /* 0x0B6 */ s8 fallState; ///< Also used as sleep state in Peach idle action
     /* 0x0B7 */ char unk_B7;
     /* 0x0B8 */ s32 anim;
@@ -1778,7 +1791,7 @@ typedef struct EncounterStatus {
     /* 0x01D */ s8 currentAreaIndex;
     /* 0x01E */ u8 currentMapIndex;
     /* 0x01F */ u8 currentEntryIndex;
-    /* 0x020 */ u8 mapID;
+    /* 0x020 */ s8 mapID;
     /* 0x021 */ s8 resetMapEncounterFlags;
     /* 0x021 */ char unk_22[2];
     /* 0x024 */ s32* npcGroupList;
@@ -1954,19 +1967,6 @@ typedef struct {
     /* 0x11630 */ Matrix4s matrixStack[0x200];
 } DisplayContext; // size = 0x19630
 
-typedef struct EffectInstanceData {
-    /* 0x00 */ s32 unk_00;
-    /* 0x04 */ Vec3f pos;
-    /* 0x10 */ Vec3f rotation;
-    /* 0x1C */ Vec3f scale;
-    /* 0x28 */ char unk_28[0x4];
-    /* 0x2C */ s32 unk_2C;
-    /* 0x30 */ f32 unk_30;
-    /* 0x34 */ char unk_34[0x30];
-    /* 0x64 */ f32 unk_64;
-    /* 0x68 */ char unk_68[0x18];
-} EffectInstanceData; // size = 0x80
-
 typedef struct Temp8010F250 {
     /* 0x00 */ s8 unk_00;
     /* 0x01 */ s8 unk_01;
@@ -2030,4 +2030,20 @@ typedef struct EntityModel {
 
 typedef EntityModel* EntityModelList[MAX_ENTITY_MODELS];
 
+typedef struct VirtualEntity {
+    /* 0x00 */ s32 entityModelIndex;
+    /* 0x04 */ Vec3f pos;
+    /* 0x10 */ Vec3f rot;
+    /* 0x1C */ Vec3f scale;
+    /* 0x28 */ Vec3f goalPos;
+    /* 0x34 */ f32 moveDist;
+    /* 0x38 */ f32 moveAngle;
+    /* 0x3C */ f32 moveSpeed;
+    /* 0x40 */ f32 jumpGravity;
+    /* 0x44 */ f32 jumpVelocity;
+    /* 0x48 */ f32 moveTime;
+} VirtualEntity; // size = 0x4C
+
+typedef VirtualEntity* VirtualEntityList[0x40];
+
 #endif
diff --git a/include/functions.h b/include/functions.h
index d7e394c421..e2ca6d4180 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -49,11 +49,25 @@ void func_802666E4(Actor* actor, f32 arg1, f32 arg2, f32 arg3, s16);
 void step_game_loop(void);
 s32 resume_all_group(s32 groupFlags);
 f32 length2D(f32 x, f32 y);
+void input_to_move_vector(f32* angle, f32* magnitude);
+void exec_ShakeCamX(s32 arg0, s32 arg1, s32 arg2, f32 arg3);
+f32 func_800E5348(void);
 
 void transform_point(Matrix4f mtx, f32, f32, f32, f32, f32*, f32*, f32*, f32*);
 void draw_number(s32 value, s32 x, s32 y, s32 arg3, s32 palette, s32 opacity, s32 style);
 void set_hud_element_scale(s32 index, f32 scale);
 
+void set_entity_model_render_command_list(s32 idx, u32* commandList);
+void set_entity_model_flags(s32 idx, s32 newFlags);
+void clear_entity_model_flags(s32 idx, s32 newFlags);
+void exec_entity_model_commandlist(s32 idx);
+s32 load_entity_model(s32* cmdList);
+
+f32 func_800E34D8(void);
+f32 func_800E3514(f32, s32* colliderID);
+s32 func_800E26C4(void);
+void func_802667F0(s32, Actor*, f32, f32, f32);
+
 void create_shadow_callback(Shadow* entity);
 void func_802E10F4(Entity* entity);
 void func_802E114C(void);
@@ -310,6 +324,10 @@ void func_80070970(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5);
 void func_800709D0(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5);
 void func_80070130(s32 arg0, f32 arg1, f32 arg2, f32 arg3);
 void func_800701F0(s32 arg0, f32 arg1, f32 arg2, f32 arg3);
+void func_80070370(s32, f32, f32, f32, f32, s32, s32, s32);
+void fx_sweat(s32, f32, f32, f32, f32, f32, s32);
+void func_80070A30(s32, f32, f32, f32, f32, s32, EffectInstanceData**);
+void func_80070EB0(s32, f32, f32, f32, f32, EffectInstanceData**);
 void add_xz_vec3f(Vec3f* vector, f32 speed, f32 angleDeg);
 void play_movement_dust_effects(s32 var0, f32 xPos, f32 yPos, f32 zPos, f32 angleDeg);
 void fx_walk_large(s32, f32, f32, f32, f32);
diff --git a/include/variables.h b/include/variables.h
index c9bd971a44..9110ce330d 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -250,6 +250,7 @@ extern UNK_TYPE D_800E92D8;
 extern UNK_TYPE D_80147574;
 extern UNK_TYPE D_80109270;
 extern UNK_TYPE D_80108558;
+
 extern s32 D_80108248;
 extern s32 D_80108518;
 extern s32 D_80108270;
@@ -259,6 +260,20 @@ extern s32 D_801086AC;
 extern s32 D_801083D8;
 extern s32 D_80108068;
 extern s32 D_80104BEC;
+
+extern s32 D_8010C920;
+extern s32 D_8010C940;
+extern s32 D_8010C954;
+extern s32 D_8010C958;
+extern s32 D_8010C95C;
+extern s32 D_8010C96C;
+extern s32 D_8010C980;
+extern s32 D_8010C9A0;
+extern f32 D_800F7B40;
+extern s32 D_800F7B44;
+extern f32 D_8010C938;
+extern f32 D_8010C990;
+
 extern Temp8010EBB0 D_8010EBB0; // something with partners
 extern Temp8010F250 D_8010F250; // sfx_play_sound state struct?
 
@@ -339,7 +354,7 @@ extern s32 gCurrentDisplayContextIndex;
 
 extern UNK_TYPE D_0A004350;
 extern UNK_TYPE D_0A0026F0;
-extern UNK_TYPE D_802EAE7C;
+extern u32* D_802EAE7C;
 
 extern s32 D_80291FA8[];
 extern s32 D_80291FD0[];
@@ -368,4 +383,9 @@ extern s32 D_803DA800;
 // Dead code
 extern PlayerStatus* dead_gPlayerStatusPtr;
 
+extern s32 D_80108A64;
+extern s32 bMarioIdleAnims[];
+extern s32 bMarioDefendAnims[];
+extern s32 bPeachIdleAnims[];
+
 #endif
diff --git a/src/105F90.c b/src/105F90.c
index 76dcaa1c04..6725e52f88 100644
--- a/src/105F90.c
+++ b/src/105F90.c
@@ -1,7 +1,7 @@
 #include "common.h"
 
-extern UNK_TYPE D_802EA728;
-extern UNK_TYPE D_802EA760;
+extern u32* D_802EA728;
+extern u32* D_802EA760;
 extern StaticEntityData D_802EA7BC;
 extern UNK_TYPE D_802EB3C0;
 
diff --git a/src/18F340.c b/src/18F340.c
index 19a37af2d8..2477282a6e 100644
--- a/src/18F340.c
+++ b/src/18F340.c
@@ -1,6 +1,29 @@
 #include "common.h"
 
-INCLUDE_ASM(s32, "18F340", func_80260A60);
+extern s32 D_80108AAC;
+extern s32 D_80108AD4;
+
+extern s32 D_8029FB90;
+extern f32 D_8029FB94;
+extern Effect* D_8029FB98;
+extern Effect* D_8029FB9C;
+extern HudElement* D_8029FBA0;
+extern s16 D_8029FBA4;
+extern s32 D_8029FBA8;
+extern s32 D_8029FBAC;
+extern s32 D_8029FBB0[];
+
+void func_80260A60(void) {
+    BattleStatus* battleStatus = &gBattleStatus;
+    ActorPart* actorPart = &battleStatus->playerActor->partsTable[0];
+
+    if (battleStatus->flags2 & 0x40) {
+        actorPart->idleAnimations = &bPeachIdleAnims;
+        set_animation(0, 0, 0xA0002);
+    } else if (!battleStatus->outtaSightActive) {
+        actorPart->idleAnimations = &bMarioIdleAnims;
+    }
+}
 
 ApiStatus IsPartnerImmobile(ScriptInstance* script, s32 isInitialCall) {
     BattleStatus* battleStatus = &gBattleStatus;
@@ -20,9 +43,28 @@ ApiStatus IsPartnerImmobile(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "18F340", activate_defend_command);
+ApiStatus activate_defend_command(ScriptInstance* script, s32 isInitialCall) {
+    ActorPart* actorPart = &gBattleStatus.playerActor->partsTable[0];
 
-INCLUDE_ASM(s32, "18F340", func_80260B70);
+    deduct_current_move_fp();
+    gBattleStatus.flags1 |= 0x400000;
+    actorPart->idleAnimations = &bMarioDefendAnims;
+    set_animation(0, 0, 0x10014);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80260B70(ScriptInstance* script, s32 isInitialCall) {
+    Actor* player = gBattleStatus.playerActor;
+
+    func_802667F0(2, player, player->currentPos.x, player->currentPos.y + 20.0f, player->currentPos.z);
+    sfx_play_sound(0x3FC);
+    script->varTable[0] = FALSE;
+    if (player->debuff == STATUS_FEAR || player->debuff == STATUS_DIZZY || player->debuff == STATUS_PARALYZE ||
+        player->debuff == STATUS_SLEEP ||player->debuff == STATUS_FROZEN || player->debuff == STATUS_STOP) {
+        script->varTable[0] = TRUE;
+    }
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "18F340", func_80260BF4);
 
@@ -60,17 +102,130 @@ ApiStatus func_80260E5C(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "18F340", func_80260E90);
+#define NAMESPACE base
+ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
+    BattleStatus* battleStatus = &gBattleStatus;
+    Actor* player = battleStatus->playerActor;
+    s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue;
+    f32 facingAngleSign = 0.0f;
+    s32 sleepTime = 0;
+    f32 posX, posY, posZ;
+    posY = player->currentPos.y + player->size.y;
 
-INCLUDE_ASM(s32, "18F340", func_80261064);
+    if (heroes_is_ability_active(player, ABILITY_REFUND) && sellValue > 0) {
+        s32 i;
+        s32 iconPosX, iconPosY, iconPosZ;
 
-INCLUDE_ASM(s32, "18F340", func_802610CC);
+        sellValue = (sellValue * 75 + 99) / 100;
 
-INCLUDE_ASM(s32, "18F340", func_80261164);
+        for (i = 0; i < sellValue; i++) {
+            posX = player->currentPos.x;
+            posZ = player->currentPos.z;
 
-INCLUDE_ASM(s32, "18F340", func_802611E8);
+            make_item_entity(ITEM_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0);
+            add_coins(1);
+            facingAngleSign += 30.0f;
+        }
 
+        sleepTime = (i * 3) + 30;
+
+        posX = player->currentPos.x;
+        posY = player->currentPos.y;
+        posZ = player->currentPos.z;
+        get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ);
+        D_8029FBA0 = create_icon(&D_80108A64);
+        set_icon_render_pos(D_8029FBA0, iconPosX + 36, iconPosY - 63);
+    }
+
+    script->varTable[0] = sleepTime;
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) {
+    s32 sellValue = gItemTable[gBattleStatus.selectedItemID].sellValue;
+
+    if (heroes_is_ability_active(gBattleStatus.playerActor, ABILITY_REFUND) && sellValue > 0) {
+        free_icon(D_8029FBA0);
+    }
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_802610CC(ScriptInstance* script, s32 isInitialCall) {
+    if (isInitialCall) {
+        func_8011D82C(1);
+        *D_801512F0 = 1;
+        set_background_color_blend(0, 0, 0, 0);
+        script->functionTemp[0].s = 20;
+    }
+
+    set_background_color_blend(0, 0, 0, ((20 - script->functionTemp[0].s) * 12) & 0xFC);
+
+    script->functionTemp[0].s -= 1;
+    do {} while(0); // TODO required to match
+    return (script->functionTemp[0].s == 0) * ApiStatus_DONE2;
+}
+
+ApiStatus func_80261164(ScriptInstance* script, s32 isInitialCall) {
+    if (isInitialCall) {
+        script->functionTemp[0].s = 20;
+        unfreeze_cam();
+    }
+
+    set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 12) & 0xFC);
+
+    script->functionTemp[0].s -= 1;
+    if (script->functionTemp[0].s == 0) {
+        set_background_color_blend(0, 0, 0, 0);
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus func_802611E8(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    StaticItem* item = &gItemTable[0x95];
+
+    playerData->curHP += item->potencyA;
+    if (playerData->curMaxHP < playerData->curHP) {
+        playerData->curHP = playerData->curMaxHP;
+    }
+    playerData->invItems[find_item(0x95)] = ITEM_NONE;
+    sort_items();
+    script->varTable[3] = item->potencyA;
+
+    return ApiStatus_DONE2;
+}
+
+// TODO something wrong with the struct breakdown for BattleStatus
+#ifdef NON_MATCHING
+ApiStatus func_8026127C(ScriptInstance* script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    BattleStatus* battleStatus = &gBattleStatus;
+
+    battleStatus->dangerFlags = 0;
+    gBattleState = battleStatus->unk_474;
+    battleStatus->battleState = battleStatus->unk_468;
+    battleStatus->flags1 |= 8;
+    battleStatus->flags2 &= ~0x8000000;
+
+    if (!(battleStatus->flags2 & 0x40)) {
+        if (playerData->curHP <= 1 && is_ability_active(ABILITY_MEGA_RUSH)) {
+            battleStatus->flags2 |= 0x8000000;
+            gBattleStatus.dangerFlags |= 1;
+        }
+        if (playerData->curHP <= 5 && is_ability_active(ABILITY_POWER_RUSH) && !(battleStatus->dangerFlags & 1)) {
+            battleStatus->flags2 |= 0x8000000;
+            gBattleStatus.dangerFlags |= 2;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+#else
 INCLUDE_ASM(s32, "18F340", func_8026127C);
+#endif
 
 ApiStatus func_80261388(ScriptInstance* script, s32 isInitialCall) {
     s32 partnerActorExists = gBattleStatus.partnerActor != NULL;
@@ -87,21 +242,146 @@ ApiStatus func_802613A8(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "18F340", func_802613BC);
+ApiStatus func_802613BC(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 var1 = get_variable(script, *args++);
+    s32 var2 = get_variable(script, *args++);
+    s32 var3 = get_variable(script, *args++);
 
-INCLUDE_ASM(s32, "18F340", func_80261478);
+    func_800720B0(6, var1, var2 + 15, var3, 1.2f, 30);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "18F340", func_80261530);
+ApiStatus func_80261478(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 var1 = get_variable(script, *args++);
+    s32 var2 = get_variable(script, *args++);
+    s32 var3 = get_variable(script, *args++);
 
-INCLUDE_ASM(s32, "18F340", func_802615C8);
+    func_80071750(9, var1, var2 + 15, var3, 5.0f, 15);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "18F340", func_80261648);
+ApiStatus func_80261530(ScriptInstance* script, s32 isInitialCall) {
+    if (isInitialCall) {
+        func_8011D82C(1);
+        *D_801512F0 = 1;
+        set_background_color_blend(0, 0, 0, 0);
+        script->functionTemp[0].s = 25;
+    }
 
-INCLUDE_ASM(s32, "18F340", func_802616B4);
+    set_background_color_blend(0, 0, 0, ((25 - script->functionTemp[0].s) * 10) & 0xFE);
 
-INCLUDE_ASM(s32, "18F340", func_802616F4);
+    script->functionTemp[0].s--;
+    do {} while(0); // TODO required to match
+    return (script->functionTemp[0].s == 0) * ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "18F340", func_802619B4);
+ApiStatus func_802615C8(ScriptInstance* script, s32 isInitialCall) {
+    if (isInitialCall) {
+        script->functionTemp[0].s = 25;
+    }
+
+    set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 10) & 0xFF);
+
+    script->functionTemp[0].s -= 5;
+    if (script->functionTemp[0].s == 0) {
+        set_background_color_blend(0, 0, 0, 0);
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus func_80261648(ScriptInstance* script, s32 isInitialCall) {
+    Npc* merlee = get_npc_unsafe(NPC_BTL_MERLEE);
+
+    if (isInitialCall) {
+        sfx_play_sound(0x24B);
+        merlee->alpha = 0;
+    }
+
+    merlee->alpha += 17;
+    if (merlee->alpha >= 0xFF) {
+        merlee->alpha = 0xFF;
+        return ApiStatus_DONE1;
+    }
+
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus func_802616B4(ScriptInstance* script, s32 isInitialCall) {
+    Npc* merlee = get_npc_unsafe(NPC_BTL_MERLEE);
+
+    merlee->alpha -= 17;
+    if (merlee->alpha == 0) {
+        merlee->alpha = 0;
+        return ApiStatus_DONE1;
+    }
+
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus func_802616F4(ScriptInstance* script, s32 isInitialCall) {
+    Npc* merlee = get_npc_unsafe(NPC_BTL_MERLEE);
+    EffectInstanceData* effectInstanceData;
+
+    if (isInitialCall) {
+        script->functionTemp[1].s = 0;
+        D_8029FB94 = merlee->pos.y;
+        D_8029FB98 = func_80071750(0, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.4f, 0);
+        D_8029FB9C = func_80071750(3, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.00001f, 0);
+        D_8029FBA4 = 0;
+        D_8029FB90 = 12;
+        sfx_play_sound(0x2074);
+    }
+    merlee->pos.y = D_8029FB94 + (sin_rad((script->functionTemp[1].s * TAU) / 360.0f) * 3.0f);
+
+    script->functionTemp[1].s += 10;
+    script->functionTemp[1].s = clamp_angle(script->functionTemp[1].s);
+
+    effectInstanceData = D_8029FB98->instanceData;
+    effectInstanceData->pos.x = merlee->pos.x;
+    effectInstanceData->pos.y = merlee->pos.y + 16.0f;
+    effectInstanceData->pos.z = merlee->pos.z;
+
+    effectInstanceData = D_8029FB9C->instanceData;
+    effectInstanceData->pos.x = merlee->pos.x;
+    effectInstanceData->pos.y = merlee->pos.y + 16.0f;
+    effectInstanceData->pos.z = merlee->pos.z + 5.0f;
+
+    if (D_8029FBA4 == 2) {
+        D_8029FB98->instanceData->unk_30 = 0.00001f;
+        D_8029FB9C->instanceData->unk_30 = 0.00001f;
+        D_8029FB98->flags |= 0x10;
+        D_8029FB9C->flags |= 0x10;
+        return ApiStatus_DONE1;
+    }
+
+    if (D_8029FBA4 == 1) {
+        effectInstanceData = D_8029FB98->instanceData;
+        effectInstanceData->unk_30 += 0.35;
+        if (effectInstanceData->unk_30 > 3.5) {
+            effectInstanceData->unk_30 = 3.5f;
+        }
+
+        if (D_8029FB90 != 0) {
+            D_8029FB90--;
+        } else {
+            effectInstanceData = D_8029FB9C->instanceData;
+            effectInstanceData->unk_30 += 0.5;
+            if (effectInstanceData->unk_30 > 5.0) {
+                D_8029FBA4 = 2;
+            }
+        }
+    }
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus func_802619B4(ScriptInstance* script, s32 isInitialCall) {
+    D_8029FBA4 = 1;
+    return ApiStatus_DONE2;
+}
 
 ApiStatus HasMerleeCastsLeft(ScriptInstance* script, s32 isInitialCall) {
     PlayerData* playerData = &gPlayerData;
@@ -113,13 +393,64 @@ ApiStatus HasMerleeCastsLeft(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "18F340", func_802619E8);
+ApiStatus func_802619E8(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 x = get_variable(script, *args++);
+    s32 y = get_variable(script, *args++);
+    s32 z = get_variable(script, *args++);
+    s32 screenX;
+    s32 screenY;
+    s32 screenZ;
 
-INCLUDE_ASM(s32, "18F340", func_80261B40);
+    get_screen_coords(gCurrentCameraID, x, y, z, &screenX, &screenY, &screenZ);
 
-INCLUDE_ASM(s32, "18F340", FXRecoverHP);
+    screenX += 30;
+    screenY -= 19;
 
-INCLUDE_ASM(s32, "18F340", FXRecoverFP);
+    if (script->varTable[10] > 0) {
+        D_8029FBAC = create_icon(&D_80108AD4);
+        set_icon_render_pos(D_8029FBAC, screenX, screenY);
+        screenY += 9;
+    }
+
+    if (script->varTable[11] > 0 || script->varTable[12] > 0) {
+        D_8029FBA8 = create_icon(&D_80108AAC);
+        set_icon_render_pos(D_8029FBA8, screenX, screenY);
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80261B40(ScriptInstance* script, s32 isInitialCall) {
+    if (script->varTable[10] > 0) {
+        free_icon(D_8029FBAC);
+    }
+    if (script->varTable[11] > 0 || script->varTable[12] > 0) {
+        free_icon(D_8029FBA8);
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus FXRecoverHP(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 var1 = get_variable(script, *args++);
+    s32 var2 = get_variable(script, *args++);
+    s32 var3 = get_variable(script, *args++);
+    s32 var4 = get_variable(script, *args++);
+
+    func_80071090(0, var1, var2, var3, var4);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus FXRecoverFP(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 var1 = get_variable(script, *args++);
+    s32 var2 = get_variable(script, *args++);
+    s32 var3 = get_variable(script, *args++);
+    s32 var4 = get_variable(script, *args++);
+
+    func_80071090(1, var1, var2, var3, var4);
+    return ApiStatus_DONE2;
+}
 
 ApiStatus IncrementPlayerHP(ScriptInstance* script, s32 isInitialCall) {
     PlayerData* playerData = &gPlayerData;
@@ -157,6 +488,53 @@ ApiStatus func_80261DD4(ScriptInstance* script, s32 isInitialCall) {
 
 INCLUDE_ASM(s32, "18F340", func_80261DF4);
 
-INCLUDE_ASM(s32, "18F340", func_80261FB4);
+ApiStatus func_80261FB4(ScriptInstance* script, s32 isInitialCall) {
+    ItemEntity* item = get_item_entity(script->varTable[10]);
+    Actor* player = gBattleStatus.playerActor;
+    s32 ft1;
+    f32 deltaX;
+    f32 deltaY;
+    f32 deltaZ;
 
-INCLUDE_ASM(s32, "18F340", func_802620F8);
+    if (isInitialCall) {
+        script->functionTemp[0].s = 0;
+        script->functionTemp[1].s = 10;
+    }
+
+    switch (script->functionTemp[0].s) {
+        case 0:
+            ft1 = script->functionTemp[1].s;
+            deltaX = player->currentPos.x - item->position.x;
+            deltaY = player->currentPos.y + 12.0f - item->position.y;
+            deltaZ = player->currentPos.z - 5.0f - item->position.z;
+
+            item->position.x += deltaX / ft1;
+            item->position.y += deltaY / ft1;
+            item->position.z += deltaZ / ft1;
+
+            item->position.y += dist2D(item->position.x, item->position.y, player->currentPos.x,
+                                       player->currentPos.y + 12.0f) / 5.0f;
+
+            if (script->functionTemp[1].s == 1) {
+                script->functionTemp[0].s = script->functionTemp[1].s;
+            }
+
+            script->functionTemp[1].s--;
+            break;
+        case 1:
+            return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus func_802620F8(ScriptInstance* script, s32 isInitialCall) {
+    // TODO get type correct
+    s32* temp_v1 = &D_8029FBB0[script->varTable[14]];
+
+    if (*temp_v1 != 0) {
+        (*temp_v1)--;
+        return ApiStatus_BLOCK;
+    }
+
+    return ApiStatus_DONE2;
+}
diff --git a/src/190B20.c b/src/190B20.c
index a867d2f564..58bb49fe80 100644
--- a/src/190B20.c
+++ b/src/190B20.c
@@ -1288,7 +1288,7 @@ INCLUDE_ASM(s32, "190B20", func_80266684);
 
 INCLUDE_ASM(void, "190B20", func_802666E4, Actor* actor, f32 arg1, f32 arg2, f32 arg3, s16 arg4);
 
-INCLUDE_ASM(s32, "190B20", func_802667F0);
+INCLUDE_ASM(void, "190B20", func_802667F0, s32 arg0, Actor* arg1, f32 arg2, f32 arg3, f32 arg4);
 
 INCLUDE_ASM(s32, "190B20", func_80266970);
 
diff --git a/src/19FAF0.c b/src/19FAF0.c
index a73a307e0a..b630717f7c 100644
--- a/src/19FAF0.c
+++ b/src/19FAF0.c
@@ -113,7 +113,7 @@ INCLUDE_ASM(s32, "19FAF0", PlayerFallToGoal, ScriptInstance* script, s32 isIniti
 ApiStatus PlayerLandJump(ScriptInstance *script, s32 isInitialCall) {
     Actor* player = gBattleStatus.playerActor;
     ActorMovementWalk* walkMovement = &player->walk;
-    
+
     if (isInitialCall) {
         script->functionTemp[0].s = 0;
     }
@@ -139,9 +139,9 @@ ApiStatus PlayerLandJump(ScriptInstance *script, s32 isInitialCall) {
 
     walkMovement->currentPos.y += walkMovement->velocity;
     walkMovement->velocity -= walkMovement->acceleration;
-    
+
     add_xz_vec3f(&walkMovement->currentPos, walkMovement->speed, walkMovement->angle);
-    
+
     player->currentPos.x = walkMovement->currentPos.x;
     player->currentPos.y = walkMovement->currentPos.y;
     player->currentPos.z = walkMovement->currentPos.z;
@@ -154,7 +154,7 @@ ApiStatus PlayerLandJump(ScriptInstance *script, s32 isInitialCall) {
 
         return ApiStatus_DONE1;
     }
-    
+
     return ApiStatus_BLOCK;
 }
 
diff --git a/src/4ac90_len_3910.c b/src/4ac90_len_3910.c
index 91cb14b00e..d4bb405195 100644
--- a/src/4ac90_len_3910.c
+++ b/src/4ac90_len_3910.c
@@ -63,7 +63,7 @@ INCLUDE_ASM(s32, "4ac90_len_3910", func_800702B0);
 
 INCLUDE_ASM(s32, "4ac90_len_3910", func_80070310);
 
-INCLUDE_ASM(s32, "4ac90_len_3910", func_80070370);
+INCLUDE_ASM(void, "4ac90_len_3910", func_80070370, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5, s32 arg6, s32 arg7);
 
 INCLUDE_ASM(s32, "4ac90_len_3910", func_800703D0);
 
@@ -86,7 +86,7 @@ INCLUDE_ASM(void, "4ac90_len_3910", func_800706D0, s32 arg0, f32 arg1, f32 arg2,
 
 INCLUDE_ASM(s32, "4ac90_len_3910", func_80070730);
 
-INCLUDE_ASM(s32, "4ac90_len_3910", fx_sweat);
+INCLUDE_ASM(void, "4ac90_len_3910", fx_sweat, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, s32 arg6);
 
 INCLUDE_ASM(s32, "4ac90_len_3910", fx_sleep_bubble);
 
@@ -100,7 +100,7 @@ INCLUDE_ASM(void, "4ac90_len_3910", func_80070970, s32 arg0, f32 arg1, f32 arg2,
 
 INCLUDE_ASM(void, "4ac90_len_3910", func_800709D0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5);
 
-INCLUDE_ASM(s32, "4ac90_len_3910", func_80070A30);
+INCLUDE_ASM(void, "4ac90_len_3910", func_80070A30, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5, EffectInstanceData** arg6);
 
 INCLUDE_ASM(void, "4ac90_len_3910", func_80070A90, s32 arg0, f32 arg1, f32 arg2, f32 arg3);
 
@@ -124,7 +124,7 @@ INCLUDE_ASM(s32, "4ac90_len_3910", func_80070DF0);
 
 INCLUDE_ASM(s32, "4ac90_len_3910", func_80070E50);
 
-INCLUDE_ASM(s32, "4ac90_len_3910", func_80070EB0);
+INCLUDE_ASM(void, "4ac90_len_3910", func_80070EB0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, EffectInstanceData** arg5);
 
 INCLUDE_ASM(s32, "4ac90_len_3910", func_80070F10);
 
diff --git a/src/7B440.c b/src/7B440.c
index 46a7420e35..d92e8809b3 100644
--- a/src/7B440.c
+++ b/src/7B440.c
@@ -1,18 +1,5 @@
 #include "common.h"
 
-extern s32 D_8010C920;
-extern s32 D_8010C940;
-extern s32 D_8010C954;
-extern s32 D_8010C958;
-extern s32 D_8010C95C;
-extern s32 D_8010C96C;
-extern s32 D_8010C980;
-extern s32 D_8010C9A0;
-extern s32 D_800F7B40;
-extern s32 D_800F7B44;
-extern s32 D_8010C938;
-extern s32 D_8010C990;
-
 void update_player_input(void) {
     PlayerStatus* playerStatus = &gPlayerStatus;
     s32 inputBufPos = playerStatus->inputBufPos;
@@ -68,7 +55,7 @@ void func_800E205C(void) {
     D_800F7B40 = 0;
     D_800F7B44 = 0;
     D_8010C938 = 0;
-    D_8010C990 = 0;
+    D_8010C990 = 0.0f;
     playerStatus->unk_0D = 1;
     playerStatus->renderMode = 0xD;
 
diff --git a/src/7bb60_len_41b0.c b/src/7bb60_len_41b0.c
index a2573b3ce4..40d08672e4 100644
--- a/src/7bb60_len_41b0.c
+++ b/src/7bb60_len_41b0.c
@@ -1,9 +1,6 @@
 #include "common.h"
 #include "world/partners.h"
 
-f32 func_800E34D8(void);
-f32 func_800E3514(f32, s32* colliderID);
-
 extern s32 D_8010C96C; // npc list index
 extern s16 D_8010C9B0;
 
@@ -22,16 +19,16 @@ s32 func_800E26C4(void) {
         actionState == ACTION_STATE_USE_TWEESTER ||
         actionState == ACTION_STATE_SPIN
        ) {
-        return 1;
+        return TRUE;
     }
 
     if (actionState == ACTION_STATE_RIDE) {
         if (playerData->currentPartner == PARTNER_LAKILESTER || playerData->currentPartner == PARTNER_BOW) {
             if (temp_8010EBB0->unk_00 != 0) {
-                return 1;
+                return TRUE;
             } else {
                 gPlayerStatusPtr->animFlags |= 4;
-                return 0;
+                return FALSE;
             }
         } else {
             if (temp_8010EBB0->unk_03 == 6 || temp_8010EBB0->unk_03 == 7) {
@@ -39,11 +36,11 @@ s32 func_800E26C4(void) {
             }
             if (temp_8010EBB0->unk_03 == 4) {
                 gPlayerStatusPtr->animFlags |= 4;
-                return 0;
+                return FALSE;
             }
         }
     }
-    return 0;
+    return FALSE;
 }
 
 void set_action_state(s32 actionState);
@@ -317,7 +314,7 @@ INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E5174);
 
 INCLUDE_ASM(s32, "7bb60_len_41b0", can_player_interact);
 
-INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E5348);
+INCLUDE_ASM(f32, "7bb60_len_41b0", func_800E5348, void);
 
 void func_800E546C(void) {
     f32 angle = 0.0f;
diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c
index eb6643d9cc..831311afd1 100644
--- a/src/a5dd0_len_114e0.c
+++ b/src/a5dd0_len_114e0.c
@@ -804,9 +804,9 @@ s32 is_player_action_state(ActionState actionState) {
     return actionState == gPlayerActionState;
 }
 
-void func_80110BCC(Entity* entity) {
+void func_80110BCC(Entity* entity, u32* commandList) {
     if (!(entity->flags & 8)) {
-        set_entity_model_render_command_list(entity->virtualModelIndex);
+        set_entity_model_render_command_list(entity->virtualModelIndex, commandList);
     }
 }
 
diff --git a/src/battle/item/coconut/lib.c b/src/battle/item/coconut/lib.c
index a39499dbd7..386244d1bf 100644
--- a/src/battle/item/coconut/lib.c
+++ b/src/battle/item/coconut/lib.c
@@ -1,6 +1,5 @@
 #include "coconut.h"
 
-void* D_80108A64; // an image
 static HudElement* D_802A1E80;
 
 // Returns time to sleep for on $x.
diff --git a/src/battle/item/dizzy_dial/lib.c b/src/battle/item/dizzy_dial/lib.c
index 7f25e97e70..2ad3774974 100644
--- a/src/battle/item/dizzy_dial/lib.c
+++ b/src/battle/item/dizzy_dial/lib.c
@@ -1,6 +1,5 @@
 #include "dizzy_dial.h"
 
-extern s32 D_80108A64;
 static s32* D_802A1CD0;
 static HudElement* D_802A1CD4;
 
diff --git a/src/battle/item/dried_shroom/lib.c b/src/battle/item/dried_shroom/lib.c
index d9c0a26532..f272fbcd65 100644
--- a/src/battle/item/dried_shroom/lib.c
+++ b/src/battle/item/dried_shroom/lib.c
@@ -1,6 +1,5 @@
 #include "dried_shroom.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A1A90;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/dusty_hammer/lib.c b/src/battle/item/dusty_hammer/lib.c
index ff026503df..ae2dbadfbb 100644
--- a/src/battle/item/dusty_hammer/lib.c
+++ b/src/battle/item/dusty_hammer/lib.c
@@ -1,6 +1,5 @@
 #include "dusty_hammer.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A1E80;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/egg_missile/lib.c b/src/battle/item/egg_missile/lib.c
index cb83310464..bf61c1a5c1 100644
--- a/src/battle/item/egg_missile/lib.c
+++ b/src/battle/item/egg_missile/lib.c
@@ -1,6 +1,5 @@
 #include "egg_missile.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A2890;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/electro_pop/lib.c b/src/battle/item/electro_pop/lib.c
index 1123cfd52b..21c989bfba 100644
--- a/src/battle/item/electro_pop/lib.c
+++ b/src/battle/item/electro_pop/lib.c
@@ -1,6 +1,5 @@
 #include "electro_pop.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A1D60;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/fire_flower/lib.c b/src/battle/item/fire_flower/lib.c
index 462b98bbcb..f34a848b40 100644
--- a/src/battle/item/fire_flower/lib.c
+++ b/src/battle/item/fire_flower/lib.c
@@ -1,6 +1,5 @@
 #include "fire_flower.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A1D70;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/food/lib.c b/src/battle/item/food/lib.c
index 8337cc91f5..96d4819fac 100644
--- a/src/battle/item/food/lib.c
+++ b/src/battle/item/food/lib.c
@@ -1,6 +1,5 @@
 #include "food.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A24D0;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/fright_jar/lib.c b/src/battle/item/fright_jar/lib.c
index 3c728f2e08..c55f1fa678 100644
--- a/src/battle/item/fright_jar/lib.c
+++ b/src/battle/item/fright_jar/lib.c
@@ -1,6 +1,5 @@
 #include "fright_jar.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A1CA0;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/hustle_drink/lib.c b/src/battle/item/hustle_drink/lib.c
index bc956a3151..856fad6410 100644
--- a/src/battle/item/hustle_drink/lib.c
+++ b/src/battle/item/hustle_drink/lib.c
@@ -1,6 +1,5 @@
 #include "hustle_drink.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A1E70;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/insecticide_herb/lib.c b/src/battle/item/insecticide_herb/lib.c
index 0f24e40243..d65d17b2bd 100644
--- a/src/battle/item/insecticide_herb/lib.c
+++ b/src/battle/item/insecticide_herb/lib.c
@@ -1,6 +1,5 @@
 #include "insecticide_herb.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A21C0;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/life_shroom/lib.c b/src/battle/item/life_shroom/lib.c
index e1604a36d6..2bee71fd28 100644
--- a/src/battle/item/life_shroom/lib.c
+++ b/src/battle/item/life_shroom/lib.c
@@ -1,6 +1,5 @@
 #include "life_shroom.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A21F0;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/mushroom/lib.c b/src/battle/item/mushroom/lib.c
index 1653dd9b8d..5e14170eb6 100644
--- a/src/battle/item/mushroom/lib.c
+++ b/src/battle/item/mushroom/lib.c
@@ -1,6 +1,5 @@
 #include "mushroom.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A2410;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/mystery/lib.c b/src/battle/item/mystery/lib.c
index 2786d2eea4..5ee256b5c9 100644
--- a/src/battle/item/mystery/lib.c
+++ b/src/battle/item/mystery/lib.c
@@ -1,6 +1,5 @@
 #include "mystery.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A25C0;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/pebble/lib.c b/src/battle/item/pebble/lib.c
index 1326977fb1..30217ae948 100644
--- a/src/battle/item/pebble/lib.c
+++ b/src/battle/item/pebble/lib.c
@@ -1,6 +1,5 @@
 #include "pebble.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A1E80;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/please_come_back/lib.c b/src/battle/item/please_come_back/lib.c
index ce48ab7cc0..ae4d0d4d8b 100644
--- a/src/battle/item/please_come_back/lib.c
+++ b/src/battle/item/please_come_back/lib.c
@@ -1,6 +1,5 @@
 #include "please_come_back.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A18E0;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/pow_block/lib.c b/src/battle/item/pow_block/lib.c
index 7baebd447b..432f0590bd 100644
--- a/src/battle/item/pow_block/lib.c
+++ b/src/battle/item/pow_block/lib.c
@@ -1,6 +1,5 @@
 #include "pow_block.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A2120;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/repel_gel/lib.c b/src/battle/item/repel_gel/lib.c
index 481b61d35c..3e833ad771 100644
--- a/src/battle/item/repel_gel/lib.c
+++ b/src/battle/item/repel_gel/lib.c
@@ -1,6 +1,5 @@
 #include "repel_gel.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A19C0;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/shooting_star/lib.c b/src/battle/item/shooting_star/lib.c
index 0f30cfbc91..4962d6e3d5 100644
--- a/src/battle/item/shooting_star/lib.c
+++ b/src/battle/item/shooting_star/lib.c
@@ -1,6 +1,5 @@
 #include "shooting_star.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A1EE0;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/sleepy_sheep/lib.c b/src/battle/item/sleepy_sheep/lib.c
index 930213c509..b440d39f08 100644
--- a/src/battle/item/sleepy_sheep/lib.c
+++ b/src/battle/item/sleepy_sheep/lib.c
@@ -1,6 +1,5 @@
 #include "sleepy_sheep.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A3F50;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/snowman_doll/lib.c b/src/battle/item/snowman_doll/lib.c
index ddad27f4cc..d30685a001 100644
--- a/src/battle/item/snowman_doll/lib.c
+++ b/src/battle/item/snowman_doll/lib.c
@@ -1,6 +1,5 @@
 #include "snowman_doll.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A1EB0;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/stone_cap/lib.c b/src/battle/item/stone_cap/lib.c
index 776f36d956..6d6885fa0f 100644
--- a/src/battle/item/stone_cap/lib.c
+++ b/src/battle/item/stone_cap/lib.c
@@ -1,6 +1,5 @@
 #include "stone_cap.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A1A60;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/stop_watch/lib.c b/src/battle/item/stop_watch/lib.c
index 95f744abd6..7b6432f067 100644
--- a/src/battle/item/stop_watch/lib.c
+++ b/src/battle/item/stop_watch/lib.c
@@ -1,6 +1,5 @@
 #include "stop_watch.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A1B40;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/strange_cake/lib.c b/src/battle/item/strange_cake/lib.c
index 923302759d..c0e02e4063 100644
--- a/src/battle/item/strange_cake/lib.c
+++ b/src/battle/item/strange_cake/lib.c
@@ -1,6 +1,5 @@
 #include "strange_cake.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A2DD0;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/super_soda/lib.c b/src/battle/item/super_soda/lib.c
index 15d7358b85..04485a0548 100644
--- a/src/battle/item/super_soda/lib.c
+++ b/src/battle/item/super_soda/lib.c
@@ -1,6 +1,5 @@
 #include "super_soda.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A2280;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/tasty_tonic/lib.c b/src/battle/item/tasty_tonic/lib.c
index 34c3c9a9cf..a6f26f7cce 100644
--- a/src/battle/item/tasty_tonic/lib.c
+++ b/src/battle/item/tasty_tonic/lib.c
@@ -1,6 +1,5 @@
 #include "tasty_tonic.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A1B40;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/thunder_bolt/lib.c b/src/battle/item/thunder_bolt/lib.c
index 6809ced607..4b569c4023 100644
--- a/src/battle/item/thunder_bolt/lib.c
+++ b/src/battle/item/thunder_bolt/lib.c
@@ -1,6 +1,5 @@
 #include "thunder_bolt.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A1C40;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/thunder_rage/lib.c b/src/battle/item/thunder_rage/lib.c
index c0dae201ab..df5d1e75e9 100644
--- a/src/battle/item/thunder_rage/lib.c
+++ b/src/battle/item/thunder_rage/lib.c
@@ -1,6 +1,5 @@
 #include "thunder_rage.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A1C90;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/ultra_shroom/lib.c b/src/battle/item/ultra_shroom/lib.c
index 467fb39867..0b52117001 100644
--- a/src/battle/item/ultra_shroom/lib.c
+++ b/src/battle/item/ultra_shroom/lib.c
@@ -1,6 +1,5 @@
 #include "ultra_shroom.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A1AC0;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/unknown_item/lib.c b/src/battle/item/unknown_item/lib.c
index de5cd3528e..a74f5c370a 100644
--- a/src/battle/item/unknown_item/lib.c
+++ b/src/battle/item/unknown_item/lib.c
@@ -1,6 +1,5 @@
 #include "unknown_item.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A1AA0;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/volt_shroom/lib.c b/src/battle/item/volt_shroom/lib.c
index 1954b9bdc6..9be2534591 100644
--- a/src/battle/item/volt_shroom/lib.c
+++ b/src/battle/item/volt_shroom/lib.c
@@ -1,6 +1,5 @@
 #include "volt_shroom.h"
 
-extern s32 D_80108A64;
 static HudElement* D_802A19B0;
 
 ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/evt/player_api.c b/src/evt/player_api.c
index 04bcacf69a..1c160fc66d 100644
--- a/src/evt/player_api.c
+++ b/src/evt/player_api.c
@@ -1,24 +1,11 @@
 #include "common.h"
 
-typedef struct UnkF5750 {
-    /* 0x00 */ s32 unk_00;
-    /* 0x04 */ s32 unk_04;
-    /* 0x08 */ s32 unk_08;
-    /* 0x0C */ s32 unk_0C;
-    /* 0x10 */ s32 unk_10;
-    /* 0x14 */ s32 unk_14;
-    /* 0x18 */ s32 unk_18;
-    /* 0x1C */ f32 unk_1C;
-    /* 0x20 */ f32 unk_20;
-    /* 0x24 */ f32 unk_24;
-} UnkF5750;
-
-typedef UnkF5750* UnkF5750List[0x40];
+Npc* playerNpc = (Npc*) 0x802DB270; // XXX: raw ptr
 
 extern s16 D_802DB5B0;
-extern UnkF5750List* D_802DB7C0;
-
-Npc* playerNpc = (Npc*) 0x802DB270; // XXX: raw ptr
+extern VirtualEntityList D_802DB5C0;
+extern VirtualEntityList D_802DB6C0;
+extern VirtualEntityList* D_802DB7C0;
 
 ApiStatus HidePlayerShadow(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
@@ -87,17 +74,16 @@ ApiStatus SetPlayerPos(ScriptInstance* script, s32 isInitialCall) {
 }
 
 ApiStatus SetPlayerCollisionSize(ScriptInstance* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
     Bytecode* args = script->ptrReadPos;
     s32 height = get_variable(script, *args++);
     s32 radius = get_variable(script, *args);
-    Npc* player = playerNpc;
-    PlayerStatus* playerStatus = &gPlayerStatus;
 
-    player->collisionHeight = height;
-    player->collisionRadius = radius;
+    playerNpc->collisionHeight = height;
+    playerNpc->collisionRadius = radius;
 
-    playerStatus->colliderHeight = player->collisionHeight;
-    playerStatus->colliderDiameter = player->collisionRadius;
+    playerStatus->colliderHeight = playerNpc->collisionHeight;
+    playerStatus->colliderDiameter = playerNpc->collisionRadius;
 
     return ApiStatus_DONE2;
 }
@@ -112,25 +98,23 @@ ApiStatus SetPlayerJumpscale(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-#ifdef NON_MATCHING
 ApiStatus SetPlayerAnimation(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    PlayerAnim animation;
+    PlayerAnim currentAnim = get_variable(script, *args++);
+    s32 shakeAnim = 0x80003;
 
-    animation = get_variable(script, *args);
+    playerNpc->currentAnim.w = currentAnim;
 
-    playerNpc->currentAnim = animation;
-    gPlayerAnimation = animation;
+    do { } while (0); // Needed to match for some reason
 
-    if (animation == 0x80003) {
+    gPlayerAnimation = playerNpc->currentAnim.w;
+
+    if (gPlayerAnimation == shakeAnim) {
         exec_ShakeCam1(0, 0, 2);
     }
 
     return ApiStatus_DONE2;
 }
-#else
-INCLUDE_ASM(s32, "evt/player_api", SetPlayerAnimation, ScriptInstance* script, s32 isInitialCall);
-#endif
 
 ApiStatus SetPlayerActionState(ScriptInstance* script, s32 isInitialCall) {
     set_action_state(get_variable(script, *script->ptrReadPos));
@@ -169,11 +153,179 @@ ApiStatus PlayerMoveTo(ScriptInstance* script, s32 isInitialCall) {
     return script->functionTemp[0].s < 0;
 }
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D1270);
+ApiStatus func_802D1270(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    PlayerStatus* playerStatus = &gPlayerStatus;
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D1380);
+    if (isInitialCall) {
+        f32 targetX = get_variable(script, *args++);
+        f32 targetZ = get_variable(script, *args++);
+        f32 var3 = get_float_variable(script, *args++);
+        f32 dist;
+        f32 moveSpeed;
 
-INCLUDE_ASM(s32, "evt/player_api", player_jump);
+        playerStatus->targetYaw = atan2(playerStatus->position.x, playerStatus->position.z, targetX, targetZ);
+        dist = dist2D(playerStatus->position.x, playerStatus->position.z, targetX, targetZ);
+        script->functionTemp[0].s = dist / var3;
+        moveSpeed = dist / script->functionTemp[0].s;
+
+        move_player(script->functionTemp[0].s, playerStatus->targetYaw, moveSpeed);
+    }
+
+    // functionTemp 0 is the time left
+    script->functionTemp[0].s--;
+    return (script->functionTemp[0].s < 0) * ApiStatus_DONE2;
+}
+
+ApiStatus func_802D1380(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (isInitialCall) {
+        f32 targetX = get_variable(script, *args++);
+        f32 targetZ = get_variable(script, *args++);
+
+        playerNpc->duration = get_variable(script, *args++);
+        playerStatus->targetYaw = atan2(playerStatus->position.x, playerStatus->position.z, targetX, targetZ);
+
+        if (playerNpc->duration != 0) {
+            playerNpc->moveSpeed = dist2D(playerStatus->position.x, playerStatus->position.z, targetX, targetZ) / (f32) playerNpc->duration;
+        } else {
+            playerNpc->duration = dist2D(playerStatus->position.x, playerStatus->position.z, targetX, targetZ) / playerNpc->moveSpeed;
+            if (playerNpc->duration == 0) {
+                playerNpc->duration = 1;
+            }
+        }
+
+        move_player(playerNpc->duration, playerStatus->targetYaw, playerNpc->moveSpeed);
+    }
+
+    return ApiStatus_DONE1;
+}
+
+s32 player_jump(ScriptInstance* script, s32 isInitialCall, s32 mode) {
+    Bytecode* args = script->ptrReadPos;
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    f32 xTemp;
+    f32 yTemp;
+    f32 zTemp;
+    f32 jumpVelocity;
+    s32 duration;
+    s32 animID;
+    f32 dist;
+
+    if (isInitialCall) {
+        script->functionTemp[0].s = 0;
+    }
+
+    if (script->functionTemp[0].s == 0) {
+        xTemp = get_variable(script, *args++);
+        yTemp = get_variable(script, *args++);
+        zTemp = get_variable(script, *args++);
+        duration = get_variable(script, *args++);
+
+        playerNpc->pos.x = playerStatus->position.x;
+        playerNpc->pos.y = playerStatus->position.y;
+        playerNpc->pos.z = playerStatus->position.z;
+        playerNpc->moveToPos.x = xTemp;
+        playerNpc->moveToPos.y = yTemp;
+        playerNpc->moveToPos.z = zTemp;
+        playerNpc->duration = duration;
+        playerNpc->yaw = playerStatus->targetYaw;
+
+        dist = dist2D(playerNpc->pos.x, playerNpc->pos.z, playerNpc->moveToPos.x, playerNpc->moveToPos.z);
+        if (dist > 1.0) {
+            playerNpc->yaw = atan2(playerNpc->pos.x, playerNpc->pos.z, playerNpc->moveToPos.x, playerNpc->moveToPos.z);
+        }
+
+        yTemp = playerNpc->moveToPos.y - playerNpc->pos.y;
+
+        if (playerNpc->duration == 0) {
+            playerNpc->duration = dist / playerNpc->moveSpeed;
+        } else {
+            playerNpc->moveSpeed = dist / playerNpc->duration;
+        }
+
+        playerNpc->jumpVelocity = (playerNpc->jumpScale * (playerNpc->duration - 1) / 2) + (yTemp / playerNpc->duration);
+        playerStatus->flags |= 8;
+        playerStatus->animFlags |= 0x10000000;
+
+        if (mode == 0) {
+            if (!(playerStatus->animFlags & 0x4000)) {
+                if (!(playerStatus->animFlags & 1)) {
+                    animID = 0x10007;
+                } else {
+                    animID = 0x60009;
+                }
+            } else {
+                animID = 0x90005;
+            }
+            func_800DFEFC(animID);
+            sfx_play_sound_at_player(SOUND_JUMP_2081, 0);
+        }
+        script->functionTemp[0].s = 1;
+    }
+
+    npc_move_heading(playerNpc, playerNpc->moveSpeed, playerNpc->yaw);
+    playerNpc->pos.y += playerNpc->jumpVelocity;
+    jumpVelocity = playerNpc->jumpVelocity; // TODO: temp needed and used specifically only once below for this to match
+    playerNpc->jumpVelocity -= playerNpc->jumpScale;
+
+    if (mode == 0 && jumpVelocity > 0.0f && playerNpc->jumpVelocity <= 0.0f) {
+        if (!(playerStatus->animFlags & 0x4000)) {
+            if (!(playerStatus->animFlags & 1)) {
+                animID = 0x10008;
+            } else {
+                animID = 0x6000A;
+            }
+        } else {
+            animID = 0x90005;
+        }
+        func_800DFEFC(animID);
+    }
+
+    playerStatus->position.x = playerNpc->pos.x;
+    playerStatus->position.y = playerNpc->pos.y;
+    playerStatus->position.z = playerNpc->pos.z;
+
+    if (mode == 0) {
+        playerStatus->targetYaw = playerNpc->yaw;
+    }
+
+    playerNpc->duration--;
+    if (playerNpc->duration == 0) {
+        playerStatus->flags &= -9;
+        playerStatus->animFlags &= ~0x10000000;
+
+        if (mode == 0) {
+            if (!(playerStatus->animFlags & 0x4000)) {
+                if (!(playerStatus->animFlags & 1)) {
+                    animID = 0x10009;
+                } else {
+                    animID = 0x6000B;
+                }
+            } else {
+                animID = 0x10003;
+            }
+            func_800DFEFC(animID);
+            func_8003D660(playerNpc, 2);
+        }
+
+        if (mode == 0 || mode == 2) {
+            s32 colliderID;
+
+            yTemp = func_800E3514(playerNpc->jumpVelocity, &colliderID);
+
+            if (colliderID >= 0) {
+                playerStatus->position.y = yTemp;
+                func_800E315C(colliderID);
+                func_800EFD08();
+            }
+        }
+        return TRUE;
+    }
+    return FALSE;
+}
 
 ApiStatus PlayerJump(ScriptInstance* script, s32 isInitialCall) {
     return player_jump(script, isInitialCall, 0);
@@ -195,13 +347,11 @@ ApiStatus InterpPlayerYaw(ScriptInstance* script, s32 isInitialCall) {
     s32* time = &script->functionTemp[3].s;
 
     if (isInitialCall) {
-        Npc** player = &playerNpc;
-
-        (*player)->yaw = playerStatus->targetYaw;
-        *initialYaw = (*player)->yaw;
+        playerNpc->yaw = playerStatus->targetYaw;
+        *initialYaw = playerNpc->yaw;
         *deltaYaw = get_float_variable(script, *args++) - *initialYaw;
         *time = get_variable(script, *args++);
-        (*player)->duration = 0;
+        playerNpc->duration = 0;
 
         if (*deltaYaw < -180.0f) {
             *deltaYaw += 360.0f;
@@ -212,26 +362,69 @@ ApiStatus InterpPlayerYaw(ScriptInstance* script, s32 isInitialCall) {
     }
 
     if (*time > 0) {
-        Npc** player = &playerNpc;
+        playerNpc->duration++;
+        playerNpc->yaw = *initialYaw + ((*deltaYaw * playerNpc->duration) / *time);
+        playerNpc->yaw = clamp_angle(playerNpc->yaw);
+        playerStatus->targetYaw = playerNpc->yaw;
 
-        (*player)->duration++;
-        (*player)->yaw = *initialYaw + ((*deltaYaw * (*player)->duration) / *time);
-        (*player)->yaw = clamp_angle((*player)->yaw);
-        playerStatus->targetYaw = (*player)->yaw;
-
-        return !((*player)->duration < *time);
+        return !(playerNpc->duration < *time);
     } else {
-        Npc** player = &playerNpc;
-
-        (*player)->yaw += *deltaYaw;
-        (*player)->yaw = clamp_angle((*player)->yaw);
-        playerStatus->targetYaw = (*player)->yaw;
+        playerNpc->yaw += *deltaYaw;
+        playerNpc->yaw = clamp_angle(playerNpc->yaw);
+        playerStatus->targetYaw = playerNpc->yaw;
 
         return ApiStatus_DONE2;
     }
 }
 
-INCLUDE_ASM(s32, "evt/player_api", PlayerFaceNpc, ScriptInstance* script, s32 isInitialCall);
+ApiStatus PlayerFaceNpc(ScriptInstance* script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    s32* args = script->ptrReadPos;
+    f32* playerTargetYaw = &script->functionTemp[1].f;
+    f32* angle = &script->functionTemp[2].f;
+    s32* ft3 = &script->functionTemp[3].s;
+
+    if (isInitialCall) {
+        NpcID npcID = get_variable(script, *args++);
+        Npc* npc;
+
+        if (npcID == NPC_SELF) {
+            npc = get_npc_safe(script->owner2.npcID);
+        } else if (npcID < -270000000) {
+            npc = (Npc*)npcID;
+        } else {
+            npc = get_npc_safe(npcID);
+            if (npc == NULL) {
+                return ApiStatus_DONE2;
+            }
+        }
+
+        *playerTargetYaw = playerNpc->yaw = playerStatus->targetYaw;
+        *angle = atan2(playerStatus->position.x, playerStatus->position.z, npc->pos.x, npc->pos.z) - *playerTargetYaw;
+        *ft3 = get_variable(script, *args++);
+
+        playerNpc->duration = 0;
+
+        if (*angle < -180.0f) {
+            *angle += 360.0f;
+        }
+        if (*angle > 180.0f) {
+            *angle -= 360.0f;
+        }
+    }
+
+    if (*ft3 > 0) {
+        playerNpc->duration++;
+        playerNpc->yaw = *playerTargetYaw + ((*angle * playerNpc->duration) / *ft3);
+        playerStatus->targetYaw = playerNpc->yaw = clamp_angle(playerNpc->yaw);
+        return (playerNpc->duration >= *ft3) * ApiStatus_DONE1;
+    }
+
+    playerNpc->yaw += *angle;
+    playerStatus->targetYaw = playerNpc->yaw = clamp_angle(playerNpc->yaw);
+
+    return ApiStatus_DONE2;
+}
 
 ApiStatus GetPlayerTargetYaw(ScriptInstance* script, s32 isInitialCall) {
     set_variable(script, *script->ptrReadPos, gPlayerStatus.targetYaw);
@@ -310,19 +503,88 @@ ApiStatus DisablePartner(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(ApiStatus, "evt/player_api", UseEntryHeading, ScriptInstance* script, s32 isInitialCall);
+ApiStatus UseEntryHeading(ScriptInstance *script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    MapConfig* mapConfig = get_current_map_header();
+    s32 var1 = get_variable(script, *args++);
+    s32 var2 = get_variable(script, *args++);
+    f32 entryX = script->varTable[1] = (*mapConfig->entryList)[gGameStatusPtr->entryID].x;
+    f32 entryY = script->varTable[2] = (*mapConfig->entryList)[gGameStatusPtr->entryID].y;
+    f32 entryZ = script->varTable[3] = (*mapConfig->entryList)[gGameStatusPtr->entryID].z;
+    f32 cosTheta;
+    f32 sinTheta;
+    f32 exitTangentFrac;
+    f32* blah;
+
+    sin_cos_deg(clamp_angle((*mapConfig->entryList)[gGameStatusPtr->entryID].yaw + 180.0f), &sinTheta, &cosTheta);
+
+    exitTangentFrac = gGameStatusPtr->exitTangent * 0.3f;
+    gPlayerStatus.position.x = (entryX + (var1 * sinTheta)) - (exitTangentFrac * cosTheta);
+    gPlayerStatus.position.z = (entryZ - (var1 * cosTheta)) - (exitTangentFrac * sinTheta);
+
+    blah = &script->varTable[5];
+    *blah = dist2D(gPlayerStatus.position.x, gPlayerStatus.position.z, entryX, entryZ) / var2;
+    gPlayerStatus.flags |= 0x4000000;
+
+    return ApiStatus_DONE2;
+}
 
 ApiStatus func_802D2148(ScriptInstance* script, s32 isInitialCall) {
     gPlayerStatus.flags &= ~0x4000000;
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(ApiStatus, "evt/player_api", UseExitHeading, ScriptInstance* script, s32 isInitialCall);
+ApiStatus UseExitHeading(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    MapConfig* mapConfig = get_current_map_header();
+    f32* varTableVar5 = &script->varTable[5];
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D23F8);
+    if (func_800E26C4()) {
+        s32 var1 = get_variable(script, *args++);
+        s32 entryID = get_variable(script, *args++);
+        f32 entryX = (*mapConfig->entryList)[entryID].x;
+        f32 entryZ = (*mapConfig->entryList)[entryID].z;
+        f32 temp = (var1 + 10.0f) / 2;
+        f32 temp_f2 = dist2D(entryX, entryZ, playerStatus->position.x, playerStatus->position.z) - temp;
+        f32 sinTheta;
+        f32 cosTheta;
+        f32 exitTangentFrac;
+
+        if (temp_f2 > 0.0f) {
+            if (temp_f2 > var1 + 10.0f) {
+                temp_f2 = var1 + 10.0f;
+            }
+            var1 -= temp_f2 / 2;
+        }
+
+        sin_cos_deg(clamp_angle((*mapConfig->entryList)[entryID].yaw + 180.0f), &sinTheta, &cosTheta);
+        gGameStatusPtr->exitTangent = (cosTheta * (playerStatus->position.x - entryX)) - (sinTheta * (entryZ - playerStatus->position.z));
+        exitTangentFrac = gGameStatusPtr->exitTangent * 0.3f;
+        script->varTable[1] = (playerStatus->position.x + (var1 * sinTheta)) - (exitTangentFrac * cosTheta);
+        script->varTable[3] = (playerStatus->position.z - (var1 * cosTheta)) - (exitTangentFrac * sinTheta);
+        script->varTable[2] = (*mapConfig->entryList)[entryID].y;
+        *varTableVar5 = var1 / 15;
+        playerStatus->animFlags |= 0x100000;
+        playerStatus->flags |= 0x4000000;
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+
+s32 func_802D23F8(void) {
+    if (gPlayerActionState == ACTION_STATE_IDLE || gPlayerActionState == ACTION_STATE_WALK ||
+        gPlayerActionState == ACTION_STATE_RUN || gPlayerActionState == ACTION_STATE_LAND ||
+        gPlayerActionState == ACTION_STATE_STEP_DOWN_LAND || gPlayerActionState == ACTION_STATE_GROUND_POUND ||
+        gPlayerActionState == ACTION_STATE_ULTRA_POUND || gPlayerActionState == ACTION_STATE_SPIN) {
+        return TRUE;
+    }
+    return FALSE;
+}
 
 ApiStatus WaitForPlayerTouchingFloor(ScriptInstance* script, s32 isInitialCall) {
-    if ((gCollisionStatus.currentFloor >= 0) && (func_802D23F8() != 0)) {
+    if ((gCollisionStatus.currentFloor >= 0) && func_802D23F8()) {
         return ApiStatus_DONE2;
     }
 
@@ -353,7 +615,81 @@ ApiStatus WaitForPlayerInputEnabled(ScriptInstance* script, s32 isInitialCall) {
     return !(gPlayerStatus.flags & 0x2000) * ApiStatus_DONE2;
 }
 
+//regs, the global at the end
+#ifdef NON_MATCHING
+ApiStatus func_802D2520(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    s32 a0 = *args++;
+    s32 val = get_variable(script, *args++);
+    s32 a2;
+    s32 a3;
+
+    func_802DDFF8(a0, 0, 0, 0, 0, 0, 0);
+
+    switch (val) {
+        case 0:
+            playerStatus->renderMode = 0xD;
+            func_802DDFF8(a0, 0, 0, 0, 0, 0, 0);
+            break;
+        case 2:
+        case 3:
+            playerStatus->renderMode = 0xD;
+        case 1:
+            func_802DDFF8(a0, val, 0, 0, 0, 0, 0);
+            break;
+        case 4:
+            playerStatus->renderMode = 13;
+            a2 = get_variable(script, *args++);
+            a3 = get_variable(script, *args++);
+            get_variable(script, *args++);
+            func_802DDFF8(a0, 4, a2, a3, 0, 0, 0);
+            break;
+        case 6:
+            playerStatus->renderMode = 13;
+            a2 = get_variable(script, *args++);
+            a3 = get_variable(script, *args++);
+            get_variable(script, *args++);
+            func_802DDFF8(a0, 6, a2, a3, 0, 0, 0);
+            break;
+        case 7:
+            playerStatus->renderMode = 22;
+            get_variable(script, *args++);
+            func_802DDFF8(a0, 7, 0xFF, 0xFF, 0, 0, 0);
+            break;
+        case 8:
+            playerStatus->renderMode = 22;
+            a3 = get_variable(script, *args++);
+            a2 = get_variable(script, *args++);
+            get_variable(script, *args++);
+            get_variable(script, *args++);
+            func_802DDFF8(a0, 8, a2, a3, 0, 0, 0);
+            break;
+        case 5:
+            playerStatus->renderMode = 13;
+            a2 = get_variable(script, *args++);
+            a3 = get_variable(script, *args++);
+            get_variable(script, *args++);
+            func_802DDFF8(a0, 5, a2, a3, 0, 0, 0);
+            break;
+        case 13:
+            playerStatus->renderMode = 22;
+            a2 = get_variable(script, *args++);
+            a3 = get_variable(script, *args++);
+            get_variable(script, *args++);
+            get_variable(script, *args++);
+            func_802DDFF8(a0, 13, a2, a3, 0, 0, 0);
+            break;
+        default:
+            break;
+    }
+
+    D_802DB5B0 = 0;
+    return ApiStatus_DONE2;
+}
+#else
 INCLUDE_ASM(ApiStatus, "evt/player_api", func_802D2520, ScriptInstance* script, s32 isInitialCall);
+#endif
 
 ApiStatus func_802D286C(ScriptInstance* script, s32 isInitialCall) {
     s32 temp = *script->ptrReadPos;
@@ -362,7 +698,49 @@ ApiStatus func_802D286C(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(ApiStatus, "evt/player_api", func_802D2884, ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802D2884(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    f32* ft1 = &script->functionTemp[1].f;
+    f32* angle = &script->functionTemp[2].f;
+    s32* ft3 = &script->functionTemp[3].s;
+
+    if (isInitialCall) {
+        f32 x = get_float_variable(script, *args++);
+        f32 z = get_float_variable(script, *args++);
+        f32 yawTemp;
+
+        *ft1 = playerNpc->yaw = playerStatus->targetYaw;
+
+        if (playerStatus->position.x != x || playerStatus->position.z != z) {
+            yawTemp = atan2(playerStatus->position.x, playerStatus->position.z, x, z);
+        } else {
+            yawTemp = playerStatus->targetYaw;
+        }
+
+        *angle = yawTemp - *ft1;
+        *ft3 = get_variable(script, *args++);
+        playerNpc->duration = 0;
+
+        if (*angle < -180.0f) {
+            *angle += 360.0f;
+        }
+        if (*angle > 180.0f) {
+            *angle -= 360.0f;
+        }
+    }
+
+    if (*ft3 > 0) {
+        playerNpc->duration++;
+        playerNpc->yaw = *ft1 + ((*angle * playerNpc->duration) / *ft3);
+        playerStatus->targetYaw = playerNpc->yaw = clamp_angle(playerNpc->yaw);
+        return !(playerNpc->duration < *ft3) * ApiStatus_DONE1;
+    }
+
+    playerNpc->yaw += *angle;
+    playerStatus->targetYaw = playerNpc->yaw = clamp_angle(playerNpc->yaw);
+    return ApiStatus_DONE2;
+}
 
 ApiStatus DisablePulseStone(ScriptInstance* script, s32 isInitialCall) {
     PlayerStatus* playerStatus = &gPlayerStatus;
@@ -449,32 +827,95 @@ ApiStatus PlaySoundAtPlayer(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D2D30);
+void func_802D2D30(u8 r, u8 g, u8 b, u8 a, u16 left, u16 top, u16 right, u16 bottom) {
+    gDPPipeSync(gMasterGfxPos++);
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D2ED4);
+    if (a == 0xFF) {
+        gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1, 0, 0, 0, PRIMITIVE, 0, 0, 0, 1);
+    } else {
+        gDPSetRenderMode(gMasterGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
+        gDPSetCombineMode(gMasterGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE);
+    }
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D2F34);
+    gDPSetPrimColor(gMasterGfxPos++, 0, 0, r, g, b, a);
+    gDPFillRectangle(gMasterGfxPos++, left, top, right, bottom);
+    gDPPipeSync(gMasterGfxPos++);
+    gDPSetRenderMode(gMasterGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2);
+    gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA);
+}
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D2FCC);
+void func_802D2ED4(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) {
+    u16 temp1 = arg4 + arg6;
+    u16 temp2 = arg5 + arg7;
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D3028);
+    func_802D2D30(arg0, arg1, arg2, arg3, arg4, arg5, temp1, temp2);
+}
+
+void func_802D2F34(VirtualEntity* virtualEntity, f32 arg1, f32 arg2) {
+    f32 theta = (arg2 * TAU) / 360.0f;
+    f32 sinTheta = sin_rad(theta);
+    f32 cosTheta = cos_rad(theta);
+
+    virtualEntity->pos.x += arg1 * sinTheta;
+    virtualEntity->pos.z += -arg1 * cosTheta;
+}
+
+void func_802D2FCC(void) {
+    s32 i;
+
+    for (i = 0; i < ARRAY_COUNT(*D_802DB7C0); i++) {
+        VirtualEntity* virtualEntity = (*D_802DB7C0)[i];
+
+        if (virtualEntity != NULL && virtualEntity->entityModelIndex >= 0) {
+            exec_entity_model_commandlist(virtualEntity->entityModelIndex);
+        }
+    }
+}
+
+INCLUDE_ASM(void, "evt/player_api", func_802D3028, void);
 
 INCLUDE_ASM(s32, "evt/player_api", func_802D31E0);
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D3398);
+ApiStatus func_802D3398(ScriptInstance* script, s32 isInitialCall) {
+    if (!gGameStatusPtr->isBattle) {
+        D_802DB7C0 = &D_802DB6C0;
+    } else {
+        D_802DB7C0 = &D_802DB5C0;
+    }
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D33D4);
+ApiStatus func_802D33D4(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 index = get_variable(script, *args++);
+    u32* cmdList = (u32*)get_variable(script, *args++);
+    VirtualEntity* virtualEntity = (*D_802DB7C0)[index];
+
+    virtualEntity->entityModelIndex = load_entity_model(cmdList);
+    virtualEntity->pos.x = 0.0f;
+    virtualEntity->pos.y = 0.0f;
+    virtualEntity->pos.z = 0.0f;
+    virtualEntity->rot.x = 0.0f;
+    virtualEntity->rot.y = 0.0f;
+    virtualEntity->rot.z = 0.0f;
+    virtualEntity->scale.x = 1.0f;
+    virtualEntity->scale.y = 1.0f;
+    virtualEntity->scale.z = 1.0f;
+    exec_entity_model_commandlist(virtualEntity->entityModelIndex);
+
+    return ApiStatus_DONE2;
+}
 
 ApiStatus func_802D3474(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     s32 outVar = *args++;
-    s32* unkStructPtr = get_variable(script, *args++);
-    UnkF5750* temp;
+    s32* unkStructPtr = (s32*)get_variable(script, *args++);
+    VirtualEntity* virtualEntity;
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(*D_802DB7C0); i++) {
-        temp = (*D_802DB7C0)[i];
-        if (temp->unk_00 < 0) {
+        virtualEntity = (*D_802DB7C0)[i];
+        if (virtualEntity->entityModelIndex < 0) {
             break;
         }
     }
@@ -483,18 +924,18 @@ ApiStatus func_802D3474(ScriptInstance* script, s32 isInitialCall) {
         return ApiStatus_DONE2;
     }
 
-    temp->unk_00 = load_entity_model(unkStructPtr);
-    temp->unk_04 = 0;
-    temp->unk_08 = 0;
-    temp->unk_0C = 0;
-    temp->unk_10 = 0;
-    temp->unk_14 = 0;
-    temp->unk_18 = 0;
-    temp->unk_1C = 1.0f;
-    temp->unk_20 = 1.0f;
-    temp->unk_24 = 1.0f;
+    virtualEntity->entityModelIndex = load_entity_model(unkStructPtr);
+    virtualEntity->pos.x = 0.0f;
+    virtualEntity->pos.y = 0.0f;
+    virtualEntity->pos.z = 0.0f;
+    virtualEntity->rot.x = 0.0f;
+    virtualEntity->rot.y = 0.0f;
+    virtualEntity->rot.z = 0.0f;
+    virtualEntity->scale.x = 1.0f;
+    virtualEntity->scale.y = 1.0f;
+    virtualEntity->scale.z = 1.0f;
 
-    exec_entity_model_commandlist(temp->unk_00);
+    exec_entity_model_commandlist(virtualEntity->entityModelIndex);
     set_variable(script, outVar, i);
 
     return ApiStatus_DONE2;
@@ -503,13 +944,13 @@ ApiStatus func_802D3474(ScriptInstance* script, s32 isInitialCall) {
 ApiStatus func_802D354C(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     s32 outVar = *args++;
-    s32* unkStructPtr = get_variable(script, *args++);
-    UnkF5750* temp;
+    s32* unkStructPtr = (s32*)get_variable(script, *args++);
+    VirtualEntity* virtualEntity;
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(*D_802DB7C0); i++) {
-        temp = (*D_802DB7C0)[i];
-        if (temp->unk_00 < 0) {
+        virtualEntity = (*D_802DB7C0)[i];
+        if (virtualEntity->entityModelIndex < 0) {
             break;
         }
     }
@@ -518,84 +959,483 @@ ApiStatus func_802D354C(ScriptInstance* script, s32 isInitialCall) {
         return ApiStatus_DONE2;
     }
 
-    temp->unk_00 = ALT_load_entity_model(unkStructPtr);
-    temp->unk_04 = 0;
-    temp->unk_08 = 0;
-    temp->unk_0C = 0;
-    temp->unk_10 = 0;
-    temp->unk_14 = 0;
-    temp->unk_18 = 0;
-    temp->unk_1C = 1.0f;
-    temp->unk_20 = 1.0f;
-    temp->unk_24 = 1.0f;
+    virtualEntity->entityModelIndex = ALT_load_entity_model(unkStructPtr);
+    virtualEntity->pos.x = 0.0f;
+    virtualEntity->pos.y = 0.0f;
+    virtualEntity->pos.z = 0.0f;
+    virtualEntity->rot.x = 0.0f;
+    virtualEntity->rot.y = 0.0f;
+    virtualEntity->rot.z = 0.0f;
+    virtualEntity->scale.x = 1.0f;
+    virtualEntity->scale.y = 1.0f;
+    virtualEntity->scale.z = 1.0f;
 
-    exec_entity_model_commandlist(temp->unk_00);
+    exec_entity_model_commandlist(virtualEntity->entityModelIndex);
     set_variable(script, outVar, i);
 
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(ApiStatus, "evt/player_api", func_802D3624, ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802D3624(ScriptInstance* script, s32 isInitialCall) {
+    VirtualEntity* virtualEntity = (*D_802DB7C0)[get_variable(script, *script->ptrReadPos)];
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D3674);
+    free_entity_model_by_index(virtualEntity->entityModelIndex);
+    virtualEntity->entityModelIndex = -1;
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(ApiStatus, "evt/player_api", func_802D36E0, ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802D3674(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 index = get_variable(script, *args++);
+    u32* commandList = (u32*)get_variable(script, *args++);
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D378C);
+    set_entity_model_render_command_list((*D_802DB7C0)[index]->entityModelIndex, commandList);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(ApiStatus, "evt/player_api", func_802D3840, ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802D36E0(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 index = get_variable(script, *args++);
+    f32 x = get_float_variable(script, *args++);
+    f32 y = get_float_variable(script, *args++);
+    f32 z = get_float_variable(script, *args++);
+    VirtualEntity* virtualEntity = (*D_802DB7C0)[index];
 
-INCLUDE_ASM(ApiStatus, "evt/player_api", func_802D38EC, ScriptInstance* script, s32 isInitialCall);
+    virtualEntity->pos.x = x;
+    virtualEntity->pos.y = y;
+    virtualEntity->pos.z = z;
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D3998);
+ApiStatus func_802D378C(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 index = get_variable(script, *args++);
+    VirtualEntity* virtualEntity = (*D_802DB7C0)[index];
+    s32 outVar1 = *args++;
+    s32 outVar2 = *args++;
+    s32 outVar3 = *args++;
 
-INCLUDE_ASM(ApiStatus, "evt/player_api", func_802D39FC, ScriptInstance* script, s32 isInitialCall);
+    set_variable(script, outVar1, virtualEntity->pos.x);
+    set_variable(script, outVar2, virtualEntity->pos.y);
+    set_variable(script, outVar3, virtualEntity->pos.z);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D3A60);
+ApiStatus func_802D3840(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 index = get_variable(script, *args++);
+    f32 x = get_float_variable(script, *args++);
+    f32 y = get_float_variable(script, *args++);
+    f32 z = get_float_variable(script, *args++);
+    VirtualEntity* virtualEntity = (*D_802DB7C0)[index];
 
+    virtualEntity->rot.x = x;
+    virtualEntity->rot.y = y;
+    virtualEntity->rot.z = z;
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_802D38EC(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 index = get_variable(script, *args++);
+    f32 x = get_float_variable(script, *args++);
+    f32 y = get_float_variable(script, *args++);
+    f32 z = get_float_variable(script, *args++);
+    VirtualEntity* virtualEntity = (*D_802DB7C0)[index];
+
+    virtualEntity->scale.x = x;
+    virtualEntity->scale.y = y;
+    virtualEntity->scale.z = z;
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_802D3998(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 index = get_variable(script, *args++);
+
+    (*D_802DB7C0)[index]->moveSpeed = get_float_variable(script, *args++);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_802D39FC(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 index = get_variable(script, *args++);
+
+    (*D_802DB7C0)[index]->jumpGravity = get_float_variable(script, *args++);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_802D3A60(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    VirtualEntity* virtualEntity;
+
+    if (isInitialCall) {
+        script->functionTemp[0].s = 0;
+    }
+
+    if (script->functionTemp[0].s == 0) {
+        s32 index = get_variable(script, *args++);
+        f32 xTemp = get_variable(script, *args++);
+        f32 yTemp = get_variable(script, *args++);
+        f32 zTemp = get_variable(script, *args++);
+        s32 moveTime = get_variable(script, *args++);
+        f32 goalPosX;
+        f32 goalPosZ;
+
+        virtualEntity = (*D_802DB7C0)[index];
+        script->functionTemp[1].s = index;
+
+        virtualEntity->goalPos.x = xTemp;
+        virtualEntity->goalPos.y = yTemp;
+        virtualEntity->goalPos.z = zTemp;
+
+        xTemp = virtualEntity->pos.x;
+        zTemp = virtualEntity->pos.z;
+
+        goalPosX = virtualEntity->goalPos.x;
+        goalPosZ = virtualEntity->goalPos.z;
+
+        virtualEntity->moveTime = moveTime;
+        virtualEntity->moveAngle = atan2(xTemp, zTemp, goalPosX, goalPosZ);
+        virtualEntity->moveDist = dist2D(xTemp, zTemp, goalPosX, goalPosZ);
+
+        if (virtualEntity->moveTime == 0.0f) {
+            virtualEntity->moveTime = virtualEntity->moveDist / virtualEntity->moveSpeed;
+        } else {
+            virtualEntity->moveSpeed = virtualEntity->moveDist / virtualEntity->moveTime;
+        }
+
+        script->functionTemp[0].s = 1;
+    }
+
+    virtualEntity = (*D_802DB7C0)[script->functionTemp[1].s];
+    func_802D2F34(virtualEntity, virtualEntity->moveSpeed, virtualEntity->moveAngle);
+    virtualEntity->moveTime--;
+
+    if (virtualEntity->moveTime <= 0.0f) {
+        virtualEntity->pos.x = virtualEntity->goalPos.x;
+        virtualEntity->pos.z = virtualEntity->goalPos.z;
+        return ApiStatus_DONE1;
+    }
+
+    return ApiStatus_BLOCK;
+}
+
+// float bs
+#ifdef NON_MATCHING
+ApiStatus func_802D3C58(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    VirtualEntity* virtualEntity;
+    s32 index;
+    f32 xTemp;
+    f32 yTemp;
+    f32 zTemp;
+    s32 moveTime;
+    f32 goalPosX;
+    f32 goalPosY;
+    f32 goalPosZ;
+
+    if (isInitialCall) {
+        script->functionTemp[0].s = 0;
+    }
+
+    if (script->functionTemp[0].s == 0) {
+        index = get_variable(script, *args++);
+        xTemp = get_variable(script, *args++);
+        yTemp = get_variable(script, *args++);
+        zTemp = get_variable(script, *args++);
+        moveTime = get_variable(script, *args++);
+
+        virtualEntity = (*D_802DB7C0)[index];
+        script->functionTemp[1].s = index;
+
+        virtualEntity->goalPos.x = xTemp;
+        virtualEntity->goalPos.y = yTemp;
+        virtualEntity->goalPos.z = zTemp;
+
+        xTemp = virtualEntity->pos.x;
+        yTemp = virtualEntity->pos.y;
+        zTemp = virtualEntity->pos.z;
+
+        goalPosX = virtualEntity->goalPos.x;
+        goalPosY = virtualEntity->goalPos.y;
+        goalPosZ = virtualEntity->goalPos.z;
+
+        goalPosY = goalPosY - yTemp;
+
+        virtualEntity->moveTime = moveTime;
+        virtualEntity->moveAngle = atan2(xTemp, zTemp, goalPosX, goalPosZ);
+        virtualEntity->moveDist = dist2D(zTemp, zTemp, goalPosX, goalPosZ);
+
+        if (virtualEntity->moveTime == 0.0f) {
+            virtualEntity->moveTime = virtualEntity->moveDist / virtualEntity->moveSpeed;
+        } else {
+            virtualEntity->moveSpeed = virtualEntity->moveDist / virtualEntity->moveTime;
+        }
+
+        virtualEntity->jumpVelocity = (virtualEntity->jumpGravity * virtualEntity->moveTime / 2) +
+                                      (goalPosY / virtualEntity->moveTime);
+        script->functionTemp[0].s = 1;
+    }
+
+    virtualEntity = (*D_802DB7C0)[script->functionTemp[1].s];
+    virtualEntity->pos.y += virtualEntity->jumpVelocity;
+    virtualEntity->jumpVelocity -= virtualEntity->jumpGravity;
+
+    func_802D2F34(virtualEntity, virtualEntity->moveSpeed, virtualEntity->moveAngle);
+
+    virtualEntity->moveTime -= 1.0f;
+    if (virtualEntity->moveTime <= 0.0f) {
+        virtualEntity->pos.x = virtualEntity->goalPos.x;
+        virtualEntity->pos.y = virtualEntity->goalPos.y;
+        virtualEntity->pos.z = virtualEntity->goalPos.z;
+        return ApiStatus_DONE1;
+    }
+
+    return ApiStatus_BLOCK;
+}
+#else
 INCLUDE_ASM(ApiStatus, "evt/player_api", func_802D3C58, ScriptInstance* script, s32 isInitialCall);
+#endif
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D3EB8);
+ApiStatus func_802D3EB8(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    VirtualEntity* virtualEntity;
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D3F74);
+    if (isInitialCall) {
+        script->functionTemp[0].s = 0;
+    }
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D3FC8);
+    if (script->functionTemp[0].s == 0) {
+        script->functionTemp[1].s = get_variable(script, *args++);
+        script->functionTemp[0].s = 1;
+    }
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D4050);
+    virtualEntity = (*D_802DB7C0)[script->functionTemp[1].s];
+    virtualEntity->pos.y += virtualEntity->jumpVelocity;
+    virtualEntity->jumpVelocity -= virtualEntity->jumpGravity;
 
-UnkF5750* func_802D4164(s32 index) {
+    func_802D2F34(virtualEntity, virtualEntity->moveSpeed, virtualEntity->moveAngle);
+
+    if (virtualEntity->pos.y < 0.0f) {
+        virtualEntity->pos.y = 0.0f;
+        return ApiStatus_DONE1;
+    }
+
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus func_802D3F74(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 index = get_variable(script, *args++);
+    s32 flags = *args++;
+
+    get_entity_model((*D_802DB7C0)[index]->entityModelIndex)->flags = flags;
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_802D3FC8(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 index = get_variable(script, *args++);
+    s32 flags = *args++;
+    s32 cond = get_variable(script, *args++);
+    VirtualEntity* virtualEntity = (*D_802DB7C0)[index];
+
+    if (cond) {
+        set_entity_model_flags(virtualEntity->entityModelIndex, flags);
+    } else {
+        clear_entity_model_flags(virtualEntity->entityModelIndex, flags);
+    }
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_802D4050(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 index = get_variable(script, *args++);
+    s32 var2 = get_variable(script, *args++);
+    EntityModel* entityModel = get_entity_model((*D_802DB7C0)[index]->entityModelIndex);
+
+    switch (var2) {
+        case -1:
+            entityModel->renderMode = 1;
+            break;
+        case 0:
+            entityModel->renderMode = 1;
+            get_variable(script, *args++);
+            get_variable(script, *args++);
+            get_variable(script, *args++);
+            break;
+        case 2:
+            entityModel->renderMode = 0xD;
+            get_variable(script, *args++);
+            get_variable(script, *args++);
+            get_variable(script, *args++);
+            break;
+        case 3:
+            entityModel->renderMode = 0x16;
+            get_variable(script, *args++);
+            break;
+        case 4:
+            entityModel->renderMode = 0x16;
+            get_variable(script, *args++);
+            get_variable(script, *args++);
+            get_variable(script, *args++);
+            get_variable(script, *args++);
+            break;
+    }
+    return ApiStatus_DONE2;
+}
+
+VirtualEntity* func_802D4164(s32 index) {
     return (*D_802DB7C0)[index];
 }
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D417C);
+VirtualEntity* func_802D417C(s32 index, s32* entityModelData) {
+    VirtualEntity* virtualEntity = (*D_802DB7C0)[index];
 
-void func_802D420C(UnkF5750* arg0);
-INCLUDE_ASM(void, "evt/player_api", func_802D420C, UnkF5750* arg0);
+    virtualEntity->entityModelIndex = load_entity_model(entityModelData);
+    virtualEntity->pos.x = 0.0f;
+    virtualEntity->pos.y = 0.0f;
+    virtualEntity->pos.z = 0.0f;
+    virtualEntity->rot.x = 0.0f;
+    virtualEntity->rot.y = 0.0f;
+    virtualEntity->rot.z = 0.0f;
+    virtualEntity->scale.x = 1.0f;
+    virtualEntity->scale.y = 1.0f;
+    virtualEntity->scale.z = 1.0f;
+    exec_entity_model_commandlist(virtualEntity->entityModelIndex);
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D42AC);
+    return (*D_802DB7C0)[index];
+}
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D4364);
+s32 func_802D420C(s32* cmdList) {
+    s32 i;
+    VirtualEntity* virtualEntity;
+
+    for (i = 0; i < ARRAY_COUNT(*D_802DB7C0); i++) {
+        virtualEntity = (*D_802DB7C0)[i];
+        if (virtualEntity->entityModelIndex < 0) {
+            break;
+        }
+    }
+
+    if (i >= ARRAY_COUNT(*D_802DB7C0)) {
+        return 0;
+    }
+
+    virtualEntity->entityModelIndex = load_entity_model(cmdList);
+    virtualEntity->pos.x = 0.0f;
+    virtualEntity->pos.y = 0.0f;
+    virtualEntity->pos.z = 0.0f;
+    virtualEntity->rot.x = 0.0f;
+    virtualEntity->rot.y = 0.0f;
+    virtualEntity->rot.z = 0.0f;
+    virtualEntity->scale.x = 1.0f;
+    virtualEntity->scale.y = 1.0f;
+    virtualEntity->scale.z = 1.0f;
+
+    exec_entity_model_commandlist(virtualEntity->entityModelIndex);
+
+    return i;
+}
+
+VirtualEntity* func_802D42AC(s32* cmdList) {
+    s32 i;
+    VirtualEntity* virtualEntity;
+
+    for (i = 0; i < ARRAY_COUNT(*D_802DB7C0); i++) {
+        virtualEntity = (*D_802DB7C0)[i];
+        if (virtualEntity->entityModelIndex < 0) {
+            break;
+        }
+    }
+
+    if (i >= ARRAY_COUNT(*D_802DB7C0)) {
+        return NULL;
+    }
+
+    virtualEntity->entityModelIndex = ALT_load_entity_model(cmdList);
+    virtualEntity->pos.x = 0.0f;
+    virtualEntity->pos.y = 0.0f;
+    virtualEntity->pos.z = 0.0f;
+    virtualEntity->rot.x = 0.0f;
+    virtualEntity->rot.y = 0.0f;
+    virtualEntity->rot.z = 0.0f;
+    virtualEntity->scale.x = 1.0f;
+    virtualEntity->scale.y = 1.0f;
+    virtualEntity->scale.z = 1.0f;
+
+    exec_entity_model_commandlist(virtualEntity->entityModelIndex);
+
+    return (*D_802DB7C0)[i];
+}
+
+void func_802D4364(s32 index, s32 arg1, s32 arg2, s32 arg3) {
+    VirtualEntity* virtualEntity = (*D_802DB7C0)[index];
+
+    virtualEntity->pos.x = arg1;
+    virtualEntity->pos.y = arg2;
+    virtualEntity->pos.z = arg3;
+}
 
 void func_802D43AC(s32 index, f32 arg1, f32 arg2, f32 arg3) {
-    UnkF5750* temp = (*D_802DB7C0)[index];
+    VirtualEntity* virtualEntity = (*D_802DB7C0)[index];
 
-    temp->unk_1C = arg1;
-    temp->unk_20 = arg2;
-    temp->unk_24 = arg3;
+    virtualEntity->scale.x = arg1;
+    virtualEntity->scale.y = arg2;
+    virtualEntity->scale.z = arg3;
 }
 
-void func_802D43D0(s32 index, s32 arg1, s32 arg2, s32 arg3) {
-    UnkF5750* temp = (*D_802DB7C0)[index];
+void func_802D43D0(s32 index, f32 arg1, f32 arg2, f32 arg3) {
+    VirtualEntity* virtualEntity = (*D_802DB7C0)[index];
 
-    temp->unk_10 = arg1;
-    temp->unk_14 = arg2;
-    temp->unk_18 = arg3;
+    virtualEntity->rot.x = arg1;
+    virtualEntity->rot.y = arg2;
+    virtualEntity->rot.z = arg3;
 }
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D43F4);
+void func_802D43F4(s32 index) {
+    VirtualEntity* virtualEntity = (*D_802DB7C0)[index];
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D4434);
+    free_entity_model_by_index(virtualEntity->entityModelIndex);
+    virtualEntity->entityModelIndex = -1;
+}
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D4488);
+void func_802D4434(VirtualEntity* arg0) {
+    s32 i;
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D4560);
+    for (i = 0; i < ARRAY_COUNT(*D_802DB7C0); i++) {
+        if ((*D_802DB7C0)[i] == arg0) {
+            func_802D43F4(i);
+            return;
+        }
+    }
+}
+
+void func_802D4488(void) {
+    s32 i;
+
+    if (!gGameStatusPtr->isBattle) {
+        D_802DB7C0 = &D_802DB6C0;
+    } else {
+        D_802DB7C0 = &D_802DB5C0;
+    }
+
+    for (i = 0; i < ARRAY_COUNT(*D_802DB7C0); i++) {
+        (*D_802DB7C0)[i] = heap_malloc(sizeof(VirtualEntity));
+        ASSERT((*D_802DB7C0)[i] != NULL);
+        (*D_802DB7C0)[i]->entityModelIndex = -1;
+    }
+
+    create_dynamic_entity_world(func_802D2FCC, func_802D3028);
+    create_dynamic_entity_backUI(NULL, func_802D31E0);
+}
+
+void func_802D4560(void) {
+    if (!gGameStatusPtr->isBattle) {
+        D_802DB7C0 = &D_802DB6C0;
+    } else {
+        D_802DB7C0 = &D_802DB5C0;
+    }
+}
diff --git a/src/npc.c b/src/npc.c
index 9d8624432b..452a26f749 100644
--- a/src/npc.c
+++ b/src/npc.c
@@ -759,10 +759,7 @@ INCLUDE_ASM(s32, "npc", func_8003B44C);
 
 INCLUDE_ASM(s32, "npc", func_8003B464);
 
-#ifdef NON_MATCHING
-// Rodata issues.
 void func_8003B47C(Npc* npc, s32 arg1, s32 arg2) {
-
     switch (npc->unk_B4) {
         case 0:
             func_8003B500(npc, arg1, arg2);
@@ -781,18 +778,15 @@ void func_8003B47C(Npc* npc, s32 arg1, s32 arg2) {
             break;
     }
 }
-#else
-INCLUDE_ASM(void, "npc", func_8003B47C, Npc* npc, s32 arg1, s32 arg2);
-#endif
 
 void func_8003B500(Npc* npc, s32 arg1, s32 arg2) {
-
     if (npc->unk_B6 != 0) {
         npc->screenSpaceOffset2D[0] = 0.0f;
         npc->screenSpaceOffset2D[1] = 0.0f;
         npc->unk_B6 = 0;
         npc->verticalStretch = 1.0f;
     }
+
     if (!(npc->flags & NPC_FLAG_NO_ANIMS_LOADED)) {
         s32 temp_a2 = (npc->alpha * npc->alpha2 / 255);
         s32 temp = temp_a2 < 255; // TODO: better match?
@@ -899,11 +893,6 @@ void func_8003C658(Npc* npc, s32 idx) {
 void func_8003C660(Npc* npc, s32 idx) {
 }
 
-void fx_sweat(s32, f32, f32, f32, f32, f32, s32);
-
-void func_80070A30(s32, f32, f32, f32, f32, s32, EffectInstanceData**);
-void func_80070EB0(s32, f32, f32, f32, f32, EffectInstanceData**);
-
 void func_8003C668(Npc* npc, s32 idx) {
     EffectInstanceData* instanceData;
 
@@ -1114,7 +1103,43 @@ Npc* npc_find_near_simple(f32 x, f32 y, f32 z, f32 radius) {
     return closestNpc;
 }
 
+// Needs work
+#ifdef NON_MATCHING
+s32 func_8003D1D4(s32 arg0) {
+    s32 entityIndex = (arg0 | 0x4000);
+    s32 yTemp = get_entity_by_index(entityIndex)->position.y - 10.0f;
+    s32 i;
+
+    for (i = 0; i < ARRAY_COUNT(*gCurrentNpcListPtr); i++) {
+        Npc* npc = (*gCurrentNpcListPtr)[i];
+
+        if (npc != NULL && npc->flags != 0) {
+            if (!(npc->flags & (0x80000000 | 0x4))) {
+                if (!(npc->pos.y < yTemp)) {
+                    s32 temp_v0;
+
+                    if (npc->flags & 0x8008) {
+                        temp_v0 = func_8003D2F8(npc);
+                        if (temp_v0 != 0) {
+                            if (entityIndex == temp_v0) {
+                                return i;
+                            }
+                        }
+                    } else if (npc->unk_84 & 0x4000) {
+                        if (entityIndex == npc->unk_84) {
+                            return i;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return -1;
+}
+#else
 INCLUDE_ASM(s32, "npc", func_8003D1D4);
+#endif
 
 s32 func_8003D2F8(Npc* npc) {
     f32 x;
@@ -1279,12 +1304,13 @@ void func_8003D788(Npc* npc, s32 arg1) {
         f32 x = npc->pos.x;
         f32 y = npc->pos.y + 0.0f;
         f32 z = npc->pos.z;
+
         if (phi_a2 == 0) {
             fx_walk_large(0, x, y, z, D_80077C10);
             D_80077C10 = clamp_angle(D_80077C10 + 35.0f);
-            return;
+        } else {
+            func_80072350(3, x, y, z,  13.0f, 10.0f, 1.0f, 5, 30);
         }
-        func_80072350(3, x, y, z,  13.0f, 10.0f, 1.0f, 5, 30);
     } else if (arg1 != 0) {
         if (D_80077C14++ >= 4) {
             D_80077C14 = 0;
@@ -1698,8 +1724,6 @@ Enemy* get_enemy(s32 npcID) {
     PANIC();
 }
 
-#ifdef NON_MATCHING
-// Matching, but having a TU padding issue
 Enemy* get_enemy_safe(s32 npcID) {
     EncounterStatus* currentEncounterStatus = &gCurrentEncounter;
     s32 i;
@@ -1707,6 +1731,7 @@ Enemy* get_enemy_safe(s32 npcID) {
 
     for (i = 0; i < currentEncounterStatus->numEncounters; i++) {
         Encounter* currentEncounter = currentEncounterStatus->encounterList[i];
+        
         if (currentEncounter != NULL) {
             for (j = 0; j < currentEncounter->count; j++) {
                 Enemy* currentEnemy = currentEncounter->enemy[j];
@@ -1718,6 +1743,3 @@ Enemy* get_enemy_safe(s32 npcID) {
     }
     return NULL;
 }
-#else
-INCLUDE_ASM(Enemy*, "npc", get_enemy_safe, s32 npcID);
-#endif
diff --git a/src/world/action/18.c b/src/world/action/18.c
index 9853bfe582..f5bdcb3373 100644
--- a/src/world/action/18.c
+++ b/src/world/action/18.c
@@ -1,7 +1,96 @@
 #include "common.h"
+#include "world/actions.h"
 
-INCLUDE_ASM(s32, "world/action/18", func_802B6000_E245D0);
+s32 D_802B6300_E248D0[] = {
+    0x000A0002, 0x000A002B, 0x000A002D, 0x000A002F, 0x000A0031, 0x000A0033, 0x000A0035, 0x000A0037, 0x000A0039,
+    0x000A003B, 0x000A003D, 0x000A003F, 0x000A0041, 0x000A0043, 0x000A0045, 0x000A0047, 0x000A0049, 0x000A004B,
+    0x000A004D
+};
 
-INCLUDE_ASM(s32, "world/action/18", func_802B6198_E24768);
+void func_802B6000_E245D0(void) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    f32 cosTheta;
+    f32 sinTheta;
+    s32 colliderID;
 
-INCLUDE_ASM(s32, "world/action/18", func_802B6230_E24800);
+    if (playerStatus->flags < 0) {
+        playerStatus->flags &= ~0x80000000;
+        func_800E5530();
+        if (!(playerStatus->animFlags & 0x1000)) {
+            s32 temp;
+
+            if (!(playerStatus->animFlags & 1)) {
+                temp = 0x10004;
+            } else {
+                temp = 0x60000;
+            }
+            func_800DFEFC(temp);
+        } else {
+            func_802B6198_E24768();
+        }
+        playerStatus->fallState = 0;
+        playerStatus->decorationList = 0;
+        playerStatus->unk_C2 = 0;
+        playerStatus->gravityIntegrator[0] = 17.7566f;
+        playerStatus->gravityIntegrator[1] = -11.3862f;
+        playerStatus->gravityIntegrator[2] = 3.5f;
+        playerStatus->gravityIntegrator[3] = -0.75f;
+    }
+
+    integrate_gravity();
+    sin_cos_rad((playerStatus->targetYaw * TAU) / 360.0f, &sinTheta, &cosTheta);
+    colliderID = -1;
+    playerStatus->position.x += sinTheta * 3.0f;
+    playerStatus->position.z -= cosTheta * 3.0f;
+
+    if (playerStatus->gravityIntegrator[0] < 0.0f) {
+        playerStatus->position.y = func_800E3514(playerStatus->gravityIntegrator[0], &colliderID);
+    } else {
+        playerStatus->position.y += playerStatus->gravityIntegrator[0];
+    }
+
+    if (colliderID >= 0) {
+        if (playerStatus->prevActionState != ACTION_STATE_SPIN) {
+            set_action_state(playerStatus->prevActionState);
+        } else {
+            update_locomotion_state();
+        }
+    }
+}
+
+void func_802B6198_E24768(void) {
+    if (!(gPlayerStatus.animFlags & 0x2000)) {
+        if (!(gGameStatusPtr->peachFlags & 0x10)) {
+            func_800DFEFC((D_802B6300_E248D0)[gGameStatusPtr->peachAnimIdx]);
+        } else {
+            func_800DFEFC(0xD000D); // dood
+        }
+    } else {
+        func_800E636C(world_actions_peachDisguises[gPlayerStatus.peachDisguise].unk_04);
+    }
+}
+
+void func_802B6230_E24800(void) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->flags < 0) {
+        playerStatus->flags &= ~0x80000000;
+        func_800DFEFC(0xA0005);
+        playerStatus->framesOnGround = 8;
+    }
+
+    if (playerStatus->framesOnGround != 0) {
+        playerStatus->framesOnGround--;
+        if (playerStatus->framesOnGround == 4) {
+            func_800E5098(1);
+        }
+    } else {
+        if (!(playerStatus->flags & 0x4000)) {
+            set_action_state(0);
+        } else if (playerStatus->currentSpeed >= playerStatus->runSpeed) {
+            set_action_state(2);
+        } else {
+            set_action_state(1);
+        }
+    }
+}
diff --git a/src/world/action/encounter.c b/src/world/action/encounter.c
index e1c60934f8..b013cf4129 100644
--- a/src/world/action/encounter.c
+++ b/src/world/action/encounter.c
@@ -1,15 +1,258 @@
 #include "common.h"
+#include "world/actions.h"
 
+extern f32 D_802B6770_E27C80;
+
+//wip - not good yet
+#ifdef NON_MATCHING
+void func_802B6000_E28A30(void) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->flags < 0) {
+        playerStatus->flags &= 0x7FF7FFF1;
+        playerStatus->fallState = 0;
+        playerStatus->framesOnGround = 0;
+        playerStatus->decorationList = 0;
+        playerStatus->unk_C2 = 0;
+        playerStatus->currentSpeed = 0.0f;
+        playerStatus->unk_8C = 0.0f;
+    }
+
+    if (playerStatus->animFlags & 0x400000) {
+        if (D_8010EBB0.unk_03 == 8) {
+            func_802BD100_317020(playerStatus->flags);
+        } else if (D_8010EBB0.unk_03 == 7) {
+            func_802BD100_317020(playerStatus->flags);
+        }
+    }
+}
+#else
 INCLUDE_ASM(s32, "world/action/encounter", func_802B6000_E28A30);
+#endif
 
+//wip - not good yet
+#ifdef NON_MATCHING
+void func_802B609C_E28ACC(void) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    s32 sp4C;
+    s32 sp48;
+    s32 sp44;
+    s32 sp40;
+    f32 sp3C;
+    f32 sp38;
+    f32 sp34;
+    f32 sp30;
+    f32 cosTheta;
+    f32 sinTheta;
+    f32 *temp_a1;
+    f32 *temp_a2;
+    f32 *temp_a3;
+    f32 *temp_v0;
+    f32 temp_f20;
+    f32 temp_f4;
+    f32 temp_f6;
+    f32 phi_f4;
+    f32 zDelta;
+    f32 phi_f20;
+
+    if (playerStatus->flags < 0) {
+        playerStatus->flags &= ~(0x80080000 | 0x80000 | 0x8 | 0x4 | 0x2);
+        playerStatus->fallState = 0;
+        playerStatus->framesOnGround = 0;
+        playerStatus->decorationList = 0;
+        playerStatus->unk_C2 = 0;
+        playerStatus->currentSpeed = 0.0f;
+        playerStatus->unk_8C = 0.0f;
+        D_802B6770_E27C80 = D_8010C938;
+    }
+
+    switch (playerStatus->fallState) {
+        case 0:
+            playerStatus->fallState++;
+        case 1:
+            break;
+        default:
+            return;
+    }
+
+    sin_cos_rad((D_8010C990 * TAU) / 360.0f, &sinTheta, &cosTheta);
+    temp_f20 = sinTheta * 3.0f;
+    sin_cos_rad((D_802B6770_E27C80 * TAU) / 360.0f, &sinTheta, &cosTheta);
+    temp_f4 = sinTheta * temp_f20;
+    temp_f6 = cosTheta * temp_f20;
+
+    if (!(fabs(temp_f4) < 0.1)) {
+        phi_f4 = temp_f4;
+    } else {
+        phi_f4 = 0.1f;
+        if (temp_f4 < 0.0f) {
+            phi_f4 = -0.1f;
+        }
+    }
+
+    zDelta = temp_f6;
+    if (fabs(temp_f6) < 0.1) {
+        zDelta = 0.1f;
+        if (temp_f6 < 0.0f) {
+            zDelta = -0.1f;
+        }
+    }
+
+    temp_a1 = &sp30;
+    temp_a2 = &sp34;
+    temp_v0 = &sp3C;
+
+    playerStatus->position.x += phi_f4;
+    playerStatus->position.z -= zDelta;
+    temp_a3 = &sp38;
+    sp30 = playerStatus->position.x;
+    sp34 = playerStatus->position.y;
+    sp38 = playerStatus->position.z;
+    sp3C = 5.0f;
+    if (func_800DE46C(&gPlayerStatus, temp_a1, temp_a2, temp_a3, temp_v0, &sp40, &sp44, &sp48, &sp4C) >= 0) {
+        playerStatus->position.y = sp34;
+    }
+
+    phi_f20 = 60.0f;
+    if (gGameStatusPtr->areaID == AREA_SBK) {
+        phi_f20 = 30.0f;
+    }
+
+    if (D_8010C990 < phi_f20) {
+        set_action_state(ACTION_STATE_FALLING);
+        gravity_use_fall_params();
+    }
+}
+#else
 INCLUDE_ASM(s32, "world/action/encounter", func_802B609C_E28ACC);
+#endif
 
-INCLUDE_ASM(s32, "world/action/encounter", func_802B6350_E28D80);
+void func_802B6350_E28D80(void) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
 
-INCLUDE_ASM(s32, "world/action/encounter", func_802B63D4_E28E04);
+    if (playerStatus->flags < 0) {
+        playerStatus->flags &= ~(0x80000000 | 0x80000 | 0x8 | 0x4 | 0x2);
+        playerStatus->fallState = 0;
+        playerStatus->framesOnGround = 0;
+        playerStatus->decorationList = 0;
+        playerStatus->unk_C2 = 0;
+        playerStatus->currentSpeed = 0.0f;
+        playerStatus->unk_8C = 0.0f;
 
-INCLUDE_ASM(s32, "world/action/encounter", func_802B6478_E28EA8);
+        if (playerStatus->animFlags & 0x1000) {
+            return;
+        }
+        playerStatus->framesOnGround = 5;
+    }
 
-INCLUDE_ASM(s32, "world/action/encounter", func_802B6508_E28F38);
+    playerStatus->framesOnGround--;
+    if (playerStatus->framesOnGround == 0) {
+        set_action_state(ACTION_STATE_IDLE);
+    }
+}
 
-INCLUDE_ASM(void, "world/action/encounter", func_802B6638_E29068, void);
+void func_802B63D4_E28E04(void) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->flags < 0) {
+        playerStatus->flags &= ~(0x80000000 | 0x8 | 0x4 | 0x2);
+        playerStatus->fallState = 0;
+        playerStatus->decorationList = 0;
+        playerStatus->unk_C2 = 0;
+        playerStatus->currentSpeed = 0.0f;
+        playerStatus->unk_8C = 0.0f;
+        func_800DFF78(0x10017);
+        playerStatus->framesOnGround = 30;
+    }
+
+    if (playerStatus->framesOnGround != 0) {
+        playerStatus->framesOnGround--;
+    } else if (!gGameStatusPtr->isBattle) {
+        set_action_state(ACTION_STATE_IDLE);
+    }
+}
+
+void func_802B6478_E28EA8(void) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->flags < 0) {
+        playerStatus->flags &= ~0x80000000;
+        playerStatus->flags |= 0x80000;
+        playerStatus->framesOnGround = 0;
+        playerStatus->fallState = 0;
+        playerStatus->currentSpeed = 0.0f;
+        playerStatus->unk_8C = 0.0f;
+        func_800DFF78(0x1001F);
+    }
+
+    if (!(playerStatus->animFlags & 0x200)) {
+        set_action_state(ACTION_STATE_IDLE);
+        playerStatus->flags &= ~0x80000;
+    }
+}
+
+void func_802B6508_E28F38(void) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->flags < 0) {
+        f32 angle;
+        f32 magnitude;
+
+        playerStatus->flags &= ~0x80000000;
+        playerStatus->currentSpeed = 0.0f;
+        playerStatus->unk_60 = 0;
+        playerStatus->framesOnGround = 5;
+        input_to_move_vector(&angle, &magnitude);
+
+        if (((angle >= 45.0f) && (angle <= 135.0f)) || ((angle >= 225.0f) && (angle <= 315.0f))) {
+            func_800DFF78(0x80000 | 0x20);
+        } else {
+            func_800DFEFC(0x60000 | 0x4);
+        }
+    }
+
+    check_input_jump();
+
+    if (playerStatus->animFlags & 0x800000) {
+        if (playerStatus->framesOnGround != 0) {
+            playerStatus->framesOnGround--;
+            if (playerStatus->framesOnGround == 0) {
+                set_action_state(ACTION_STATE_IDLE);
+            }
+        }
+    }
+}
+
+void func_802B6638_E29068(void) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+
+    if (playerStatus->flags < 0) {
+        playerStatus->flags &= ~0x80000000;
+        playerStatus->currentSpeed = 0.0f;
+        playerStatus->unk_60 = 0;
+
+        if (!(playerStatus->animFlags & 0x1000)) {
+            func_800DFF78(0x80007);
+        } else if (playerStatus->unk_C4 == 0) {
+            if (!(playerStatus->animFlags & 0x2000)) {
+                func_800DFF78(0xC0000);
+            } else {
+                func_800E636C(world_actions_peachDisguises[playerStatus->peachDisguise].unk_0C);
+            }
+        }
+        playerStatus->framesOnGround = 30;
+    }
+
+    if (playerStatus->animFlags & 0x1000) {
+        if (playerStatus->framesOnGround != 0) {
+            playerStatus->framesOnGround--;
+        } else if (playerStatus->unk_C4 == 0) {
+            if (!(playerStatus->animFlags & 0x2000)) {
+                func_800DFF78(0xA0001);
+            } else {
+                func_800E636C(world_actions_peachDisguises[playerStatus->peachDisguise].idle);
+            }
+        }
+    }
+}
diff --git a/src/world/action/hammer.c b/src/world/action/hammer.c
index bc7629eb0c..388c83ab7b 100644
--- a/src/world/action/hammer.c
+++ b/src/world/action/hammer.c
@@ -1,8 +1,99 @@
 #include "common.h"
 
-INCLUDE_ASM(s32, "world/action/hammer", func_802B6000_E24ED0);
+extern Vec3f* D_802B6DB0_E25C80;
 
-INCLUDE_ASM(s32, "world/action/hammer", func_802B6048_E24F18);
+s32 func_802B6000_E24ED0(s32 arg0) {
+    if (arg0 & 0x1000000) {
+        return TRUE;
+    }
+
+    switch (arg0 + ~0x6000F) {
+        case 1:
+        case 3:
+        case 5:
+        case 7:
+        case 9:
+        case 11:
+            return TRUE;
+    }
+    return FALSE;
+}
+
+void func_802B6048_E24F18(s32 arg0) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    f32 phi_f24;
+    s32 s2temp;
+    s32 phi_s1;
+    s32 soundID;
+    f32 theta;
+    f32 sinTheta;
+    f32 cosTheta;
+    s32 phi_s3;
+    f32 xTemp;
+    f32 yTemp;
+    f32 zTemp;
+
+    if (gPlayerData.hammerLevel == 2) {
+        phi_f24 = 1.2f;
+        s2temp = 1;
+        phi_s1 = 28;
+        soundID = 0x211A;
+    } else if (gPlayerData.hammerLevel == 1) {
+        phi_f24 = 0.8f;
+        s2temp = 1;
+        phi_s1 = 16;
+        soundID = 0x2119;
+    } else {
+        phi_f24 = 0.4f;
+        s2temp = 1;
+        phi_s1 = 4;
+        soundID = 0x2118;
+    }
+
+    theta = (func_800E5348() * TAU) / 360.0f;
+    sinTheta = sin_rad(theta) * 25.0f;
+    cosTheta = cos_rad(theta) * -25.0f;
+
+    if (arg0 < 0) {
+        phi_s3 = 6;
+        xTemp = playerStatus->position.x + sinTheta;
+        yTemp = playerStatus->position.y;
+        zTemp = playerStatus->position.z + cosTheta;
+    } else {
+        phi_s3 = 3;
+        xTemp = D_802B6DB0_E25C80->x + sinTheta;
+        yTemp = D_802B6DB0_E25C80->y + playerStatus->colliderHeight - 5.0f;
+        zTemp = D_802B6DB0_E25C80->z + cosTheta;
+        phi_s1 = 1;
+    }
+
+    exec_ShakeCamX(0, 2, s2temp, phi_f24);
+    func_80070370(0, xTemp, yTemp, zTemp, phi_s1, phi_s3, 0, (s2temp + 3) * 3);
+
+    switch (is_ability_active(ABILITY_ATTACK_F_X)) {
+        case 1:
+            soundID = 0x372;
+            break;
+        case 2:
+            soundID = 0xF1;
+            break;
+        case 3:
+            soundID = 0xDC;
+            break;
+        case 4:
+            soundID = 0x2072;
+            break;
+        case 5:
+            soundID = 0x2073;
+            break;
+        case 6:
+            soundID = 0x205B;
+            break;
+    }
+
+    sfx_play_sound_at_player(soundID, 0);
+    start_rumble(0x100, 0x32);
+}
 
 INCLUDE_ASM(s32, "world/action/hammer", func_802B62A4_E25174);
 
diff --git a/src/world/action/walk.c b/src/world/action/walk.c
index 7e16056bf7..295125258f 100644
--- a/src/world/action/walk.c
+++ b/src/world/action/walk.c
@@ -6,6 +6,7 @@ INCLUDE_ASM(void, "world/action/walk", func_802B6000_E236E0, void);
 // run
 INCLUDE_ASM(void, "world/action/walk", func_802B6288_E23968, void);
 
+// same as func_802B6198_E24768 but requires data stuff
 INCLUDE_ASM(void, "world/action/walk", func_802B6550_E23C30, void);
 
 INCLUDE_ASM(void, "world/action/walk", func_802B65E8_E23CC8, void);
diff --git a/src/world/actions.h b/src/world/actions.h
index 6324dc04fc..580bdf85ef 100644
--- a/src/world/actions.h
+++ b/src/world/actions.h
@@ -12,11 +12,11 @@ typedef struct Action {
 
 typedef struct DisguiseAnims {
     /* 0x00 */ NpcAnimID idle;
-    /* 0x04 */ NpcAnimID unk4;
-    /* 0x08 */ NpcAnimID unk8;
-    /* 0x0C */ NpcAnimID unkC;
-    /* 0x10 */ NpcAnimID unk10;
-    /* 0x10 */ NpcAnimID unk14;
+    /* 0x04 */ NpcAnimID unk_04;
+    /* 0x08 */ NpcAnimID unk_08;
+    /* 0x0C */ NpcAnimID unk_0C;
+    /* 0x10 */ NpcAnimID unk_10;
+    /* 0x10 */ NpcAnimID unk_14;
 } DisguiseAnims; // size = 0x18
 
 extern f32 D_800F7B90;
diff --git a/src/world/area_arn/arn_08/arn_08.h b/src/world/area_arn/arn_08/arn_08.h
index fc32507120..ea420aa875 100644
--- a/src/world/area_arn/arn_08/arn_08.h
+++ b/src/world/area_arn/arn_08/arn_08.h
@@ -4,7 +4,7 @@
 
 #define NAMESPACE arn_08
 
-f32 func_800E3514(f32, f32*);
+f32 func_800E3514(f32, s32*);
 f32 func_800E34D8(void);
 
 ApiStatus N(func_80240000_BF47A0)(ScriptInstance* script, s32 isInitialCall);
diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c
index d26186792c..a787c4eb93 100644
--- a/src/world/area_dgb/dgb_04/C36530.c
+++ b/src/world/area_dgb/dgb_04/C36530.c
@@ -1214,9 +1214,9 @@ ApiStatus N(func_802429D0_C38F00)(ScriptInstance* script, s32 isInitialCall) {
     }
 
     for (i = 0, userDataPtr = scriptPtr; i < 3; i++) {
-        ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.x = userDataPtr->unk_14[i];
-        ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.y = userDataPtr->unk_20[i];
-        ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.z = userDataPtr->unk_2C[i];
+        ((EffectInstanceData*)userDataPtr->unk_08[i]->instanceData)->rotation.x = userDataPtr->unk_14[i];
+        ((EffectInstanceData*)userDataPtr->unk_08[i]->instanceData)->rotation.y = userDataPtr->unk_20[i];
+        ((EffectInstanceData*)userDataPtr->unk_08[i]->instanceData)->rotation.z = userDataPtr->unk_2C[i];
     }
 
     return ApiStatus_BLOCK;
diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c
index 38e65fbd71..3a46d3cb84 100644
--- a/src/world/area_dro/dro_01/95B7E0.c
+++ b/src/world/area_dro/dro_01/95B7E0.c
@@ -30,7 +30,7 @@ enum {
     NPC_DRYITE5,
 };
 
-typedef struct N(Unk_Struct_1) {
+typedef struct Unk_Struct_1 {
     s32 unk_00;
     s32 unk_04;
     s32 unk_08;
@@ -46,7 +46,7 @@ typedef struct N(Unk_Struct_1) {
     f32 unk_30;
     f32 unk_34;
     s32 unk_38;
-} N(Unk_Struct_1);
+} Unk_Struct_1;
 
 typedef struct {
     s32 unk_00;
@@ -54,10 +54,10 @@ typedef struct {
     s32 unk_08;
     s32 unk_0C;
     s32 unk_10;
-    void (*unk_14)(N(Unk_Struct_1)*, s32);
-} N(Unk_Struct_2);
+    void (*unk_14)(Unk_Struct_1*, s32);
+} Unk_Struct_2;
 
-void N(func_802430C8_95E2C8)(N(Unk_Struct_1)* ptr, s32 arg1);
+void N(func_802430C8_95E2C8)(Unk_Struct_1* ptr, s32 arg1);
 
 Script N(80248504);
 
@@ -3304,14 +3304,14 @@ ApiStatus N(func_802427BC_95D9BC)(ScriptInstance* script, s32 isInitialCall) {
 
 ApiStatus N(func_80242858_95DA58)(ScriptInstance* script, s32 isInitialCall) {
     PlayerStatus* playerStatus = &gPlayerStatus;
-    N(Unk_Struct_2)* temp_s1 = get_variable(script, *script->ptrReadPos);
-    N(Unk_Struct_1)* ptr;
+    Unk_Struct_2* temp_s1 = get_variable(script, *script->ptrReadPos);
+    Unk_Struct_1* ptr;
     s32 atan_res1, atan_res2;
     s32 clamp;
     s32 res;
 
     if (isInitialCall) {
-        script->functionTemp[1].s = (N(Unk_Struct_1)*)heap_malloc(0x3C);
+        script->functionTemp[1].s = (Unk_Struct_1*)heap_malloc(0x3C);
         ptr = script->functionTemp[1].s;
         ptr->unk_00 = temp_s1->unk_00;
         ptr->unk_04 = temp_s1->unk_04;
@@ -3449,7 +3449,7 @@ ApiStatus N(func_80243084_95E284)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/GetFloorCollider.inc.c"
 
-void N(func_802430C8_95E2C8)(N(Unk_Struct_1)* ptr, s32 arg1) {
+void N(func_802430C8_95E2C8)(Unk_Struct_1* ptr, s32 arg1) {
     PlayerStatus* playerStatus = &gPlayerStatus;
 
     switch (arg1) {
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index 540890958e..93233036a5 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -3203,7 +3203,7 @@ ApiStatus N(func_80240A70_969C30)(ScriptInstance* script, s32 isInitialCall) {
         N(D_8024EFC8) = func_80072890(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)),
                                       get_variable(script, SI_ARRAY(3)), 1.0f, 0);
 
-        effectPtr = N(D_8024EFC0)->unk_0C;
+        effectPtr = N(D_8024EFC0)->instanceData;
         effectPtr->unk_18 = 0;
         effectPtr->unk_20 = 0;
         effectPtr->unk_24.s = 0;
@@ -3211,7 +3211,7 @@ ApiStatus N(func_80240A70_969C30)(ScriptInstance* script, s32 isInitialCall) {
         effectPtr->unk_1C = 0;
     }
 
-    effectPtr = N(D_8024EFC0)->unk_0C;
+    effectPtr = N(D_8024EFC0)->instanceData;
 
     effectPtr->unk_20 += 10;
     effectPtr->unk_28 += 10;
@@ -3234,7 +3234,7 @@ ApiStatus N(func_80240C88_969E48)(ScriptInstance* script, s32 isInitialCall) {
         N(D_8024EFC8)->flags |= 0x10;
     }
 
-    effectPtr = N(D_8024EFC0)->unk_0C;
+    effectPtr = N(D_8024EFC0)->instanceData;
     effectPtr->unk_18 -= 10;
     effectPtr->unk_20 -= 10;
     effectPtr->unk_24.s -= 10;
@@ -3258,7 +3258,7 @@ ApiStatus N(func_80240D3C_969EFC)(ScriptInstance* script, s32 isInitialCall) {
 
 ApiStatus N(func_80240D70_969F30)(ScriptInstance* script, s32 isInitialCall) {
     s32 var = get_variable(script, *script->ptrReadPos);
-    EffectInstanceDataThing* effectPtr = N(D_8024EFC0)->unk_0C;
+    EffectInstanceDataThing* effectPtr = N(D_8024EFC0)->instanceData;
 
     switch (var) {
         case 0:
diff --git a/src/world/area_flo/flo_08/CAED40.c b/src/world/area_flo/flo_08/CAED40.c
index 83b0b7489e..e01c3cd042 100644
--- a/src/world/area_flo/flo_08/CAED40.c
+++ b/src/world/area_flo/flo_08/CAED40.c
@@ -262,9 +262,9 @@ ApiStatus N(func_80240600_CAF340)(ScriptInstance* script, s32 isInitialCall) {
     }
 
     for (i = 0, userDataPtr = scriptPtr; i < 3; i++) {
-        ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.x = userDataPtr->unk_14[i];
-        ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.y = userDataPtr->unk_20[i];
-        ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.z = userDataPtr->unk_2C[i];
+        ((EffectInstanceData*)userDataPtr->unk_08[i]->instanceData)->rotation.x = userDataPtr->unk_14[i];
+        ((EffectInstanceData*)userDataPtr->unk_08[i]->instanceData)->rotation.y = userDataPtr->unk_20[i];
+        ((EffectInstanceData*)userDataPtr->unk_08[i]->instanceData)->rotation.z = userDataPtr->unk_2C[i];
     }
 
     return ApiStatus_BLOCK;
diff --git a/src/world/area_flo/flo_16/CD1F10.c b/src/world/area_flo/flo_16/CD1F10.c
index 823e8556d0..01ff94105b 100644
--- a/src/world/area_flo/flo_16/CD1F10.c
+++ b/src/world/area_flo/flo_16/CD1F10.c
@@ -669,9 +669,9 @@ ApiStatus N(func_802406E0_CD2510)(ScriptInstance* script, s32 isInitialCall) {
     }
 
     for (i = 0, userDataPtr = scriptPtr; i < 3; i++) {
-        ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.x = userDataPtr->unk_14[i];
-        ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.y = userDataPtr->unk_20[i];
-        ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.z = userDataPtr->unk_2C[i];
+        ((EffectInstanceData*)userDataPtr->unk_08[i]->instanceData)->rotation.x = userDataPtr->unk_14[i];
+        ((EffectInstanceData*)userDataPtr->unk_08[i]->instanceData)->rotation.y = userDataPtr->unk_20[i];
+        ((EffectInstanceData*)userDataPtr->unk_08[i]->instanceData)->rotation.z = userDataPtr->unk_2C[i];
     }
 
     return ApiStatus_BLOCK;
diff --git a/src/world/area_flo/flo_16/CD4770.c b/src/world/area_flo/flo_16/CD4770.c
index ef5df3b25a..cc19f306ee 100644
--- a/src/world/area_flo/flo_16/CD4770.c
+++ b/src/world/area_flo/flo_16/CD4770.c
@@ -3,7 +3,7 @@
 ApiStatus N(func_80242940_CD4770)(ScriptInstance* script, s32 isInitialCall) {
     script->varTable[0] = 0;
     do {} while (0);
-    if ((gPlayerActionState == ACTION_STATE_GROUND_POUND) || (gPlayerActionState == ACTION_STATE_ULTRA_POUND)) {
+    if (gPlayerActionState == ACTION_STATE_GROUND_POUND || gPlayerActionState == ACTION_STATE_ULTRA_POUND) {
         script->varTable[0] = 1;
     }
     return ApiStatus_DONE2;
diff --git a/src/world/area_hos/hos_10/A3F740.c b/src/world/area_hos/hos_10/A3F740.c
index 389a3dc2e9..3f904db658 100644
--- a/src/world/area_hos/hos_10/A3F740.c
+++ b/src/world/area_hos/hos_10/A3F740.c
@@ -1,3 +1,3 @@
 #include "hos_10.h"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_10/A3F740", func_80240000_A3F740);
+#include "world/common/SetPlayerSpriteSet2.inc.c"
diff --git a/src/world/area_jan/jan_01/B28030.c b/src/world/area_jan/jan_01/B28030.c
index fe125be895..3aed560480 100644
--- a/src/world/area_jan/jan_01/B28030.c
+++ b/src/world/area_jan/jan_01/B28030.c
@@ -24,4 +24,4 @@ INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240F30_B28F60);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80241154_B29184);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80241170_B291A0);
+#include "world/common/UnsetCamera0Flag1000.inc.c"
diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c
index 13e1e03551..c06f29acd3 100644
--- a/src/world/area_jan/jan_22/B84180.c
+++ b/src/world/area_jan/jan_22/B84180.c
@@ -189,7 +189,7 @@ ApiStatus N(func_80240E90_B85010)(ScriptInstance* script, s32 isInitialCall) {
 
 INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240FA8_B85128);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240FC4_B85144);
+#include "world/common/UnsetCamera0Flag1000.inc.c"
 
 ApiStatus PostChapter5StatUpdate(ScriptInstance* script, s32 isInitialCall) {
     PlayerData* playerData = &gPlayerData;
diff --git a/src/world/area_kkj/kkj_03/AC9710.c b/src/world/area_kkj/kkj_03/AC9710.c
index d1fc1db66a..0bc9e3db1a 100644
--- a/src/world/area_kkj/kkj_03/AC9710.c
+++ b/src/world/area_kkj/kkj_03/AC9710.c
@@ -1,3 +1,3 @@
 #include "kkj_03.h"
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_03/AC9710", func_80240000_AC9710);
+#include "world/common/SetPlayerSpriteSet2.inc.c"
diff --git a/src/world/area_kkj/kkj_13/AD5ED0.c b/src/world/area_kkj/kkj_13/AD5ED0.c
index 419ea8bc42..8eb7a9db0a 100644
--- a/src/world/area_kkj/kkj_13/AD5ED0.c
+++ b/src/world/area_kkj/kkj_13/AD5ED0.c
@@ -1,3 +1,3 @@
 #include "kkj_13.h"
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_13/AD5ED0", func_80240000_AD5ED0);
+#include "world/common/SetPlayerSpriteSet2.inc.c"
diff --git a/src/world/area_kkj/kkj_23/B02880.c b/src/world/area_kkj/kkj_23/B02880.c
index 96839c23cf..07c325b2fb 100644
--- a/src/world/area_kkj/kkj_23/B02880.c
+++ b/src/world/area_kkj/kkj_23/B02880.c
@@ -1,3 +1,3 @@
 #include "kkj_23.h"
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_23/B02880", func_80240000_B02880);
+#include "world/common/SetPlayerSpriteSet2.inc.c"
diff --git a/src/world/area_kkj/kkj_25/B06A00.c b/src/world/area_kkj/kkj_25/B06A00.c
index d36b49e016..5f52d6c467 100644
--- a/src/world/area_kkj/kkj_25/B06A00.c
+++ b/src/world/area_kkj/kkj_25/B06A00.c
@@ -1,3 +1,3 @@
 #include "kkj_25.h"
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06A00", func_80240000_B06A00);
+#include "world/common/SetPlayerSpriteSet2.inc.c"
diff --git a/src/world/area_kzn/kzn_18/C8C3F0.c b/src/world/area_kzn/kzn_18/C8C3F0.c
index e352bcdd12..525cc42176 100644
--- a/src/world/area_kzn/kzn_18/C8C3F0.c
+++ b/src/world/area_kzn/kzn_18/C8C3F0.c
@@ -2,6 +2,6 @@
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_18/C8C3F0", func_80240350_C8C3F0);
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_18/C8C3F0", func_8024036C_C8C40C);
+#include "world/common/UnsetCamera0Flag1000.inc.c"
 
 #include "world/common/GetFloorCollider.inc.c"
diff --git a/src/world/area_nok/nok_12/9FAAE0.c b/src/world/area_nok/nok_12/9FAAE0.c
index e879b0392b..42b75ec86f 100644
--- a/src/world/area_nok/nok_12/9FAAE0.c
+++ b/src/world/area_nok/nok_12/9FAAE0.c
@@ -2,4 +2,4 @@
 
 INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAAE0", func_802402F0_9FAAE0);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAAE0", func_8024030C_9FAAFC);
+#include "world/common/UnsetCamera0Flag1000.inc.c"
diff --git a/src/world/area_nok/nok_14/A029C0.c b/src/world/area_nok/nok_14/A029C0.c
index 7a84dd92c2..bcccdd48c5 100644
--- a/src/world/area_nok/nok_14/A029C0.c
+++ b/src/world/area_nok/nok_14/A029C0.c
@@ -2,4 +2,4 @@
 
 INCLUDE_ASM(s32, "world/area_nok/nok_14/A029C0", func_80240180_A029C0);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_14/A029C0", func_8024019C_A029DC);
+#include "world/common/UnsetCamera0Flag1000.inc.c"
diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c
index a7d22d4d7c..f3459bbea2 100644
--- a/src/world/area_omo/omo_04/DAD400.c
+++ b/src/world/area_omo/omo_04/DAD400.c
@@ -164,4 +164,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241AD0_DAEED0);
 
 INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241E04_DAF204);
 
-INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241E20_DAF220);
+#include "world/common/UnsetCamera0Flag1000.inc.c"
diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c
index 5f83a1c84d..6297155e6b 100644
--- a/src/world/area_omo/omo_07/DBD2B0.c
+++ b/src/world/area_omo/omo_07/DBD2B0.c
@@ -307,6 +307,6 @@ ApiStatus N(func_80242C84_DBFF34)(ScriptInstance* script, s32 isInitialCall) {
 
 INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242E70_DC0120);
 
-INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242E8C_DC013C);
+#include "world/common/UnsetCamera0Flag1000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242EA8_DC0158);
diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c
index efb6fb75de..e0921ca6b1 100644
--- a/src/world/area_omo/omo_09/DCD6B0.c
+++ b/src/world/area_omo/omo_09/DCD6B0.c
@@ -210,4 +210,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802435B8_DD0288);
 
 INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802435CC_DD029C);
 
-INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802435E8_DD02B8);
+#include "world/common/UnsetCamera0Flag1000.inc.c"
diff --git a/src/world/area_omo/omo_12/DDF310.c b/src/world/area_omo/omo_12/DDF310.c
index 8e13dd8a32..02b518331c 100644
--- a/src/world/area_omo/omo_12/DDF310.c
+++ b/src/world/area_omo/omo_12/DDF310.c
@@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_12/DDF310", func_80240184_DDF494);
 
 INCLUDE_ASM(s32, "world/area_omo/omo_12/DDF310", func_802402DC_DDF5EC);
 
-INCLUDE_ASM(s32, "world/area_omo/omo_12/DDF310", func_802402F8_DDF608);
+#include "world/common/UnsetCamera0Flag1000.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_12/DDF310", func_80240314_DDF624);
 
diff --git a/src/world/area_osr/osr_02/AB2170.c b/src/world/area_osr/osr_02/AB2170.c
index c980936b46..43e42d0552 100644
--- a/src/world/area_osr/osr_02/AB2170.c
+++ b/src/world/area_osr/osr_02/AB2170.c
@@ -1,3 +1,3 @@
 #include "osr_02.h"
 
-INCLUDE_ASM(s32, "world/area_osr/osr_02/AB2170", func_80240000_AB2170);
+#include "world/common/SetPlayerSpriteSet2.inc.c"
diff --git a/src/world/area_osr/osr_03/AB6290.c b/src/world/area_osr/osr_03/AB6290.c
index b830d27f33..469dcccdb2 100644
--- a/src/world/area_osr/osr_03/AB6290.c
+++ b/src/world/area_osr/osr_03/AB6290.c
@@ -1,3 +1,3 @@
 #include "osr_03.h"
 
-INCLUDE_ASM(s32, "world/area_osr/osr_03/AB6290", func_80240000_AB6290);
+#include "world/common/SetPlayerSpriteSet2.inc.c"
diff --git a/src/world/common/SetPlayerSpriteSet2.inc.c b/src/world/common/SetPlayerSpriteSet2.inc.c
new file mode 100644
index 0000000000..fe6a83584e
--- /dev/null
+++ b/src/world/common/SetPlayerSpriteSet2.inc.c
@@ -0,0 +1,6 @@
+#include "common.h"
+
+ApiStatus N(SetPlayerSpriteSet2)(ScriptInstance* script, s32 isInitialCall) {
+    gGameStatusPtr->playerSpriteSet = 2;
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/common/UnsetCamera0Flag1000.inc.c b/src/world/common/UnsetCamera0Flag1000.inc.c
new file mode 100644
index 0000000000..b4e1a88970
--- /dev/null
+++ b/src/world/common/UnsetCamera0Flag1000.inc.c
@@ -0,0 +1,9 @@
+#include "common.h"
+#include "map.h"
+
+ApiStatus N(UnsetCamera0Flag1000)(ScriptInstance* script, s32 isInitialCall) {
+    Camera* camera = CAM(0);
+
+    camera->flags &= ~0x1000;
+    return ApiStatus_DONE2;
+}
diff --git a/tools/splat/.gitrepo b/tools/splat/.gitrepo
index daa84bdda6..879fa31607 100644
--- a/tools/splat/.gitrepo
+++ b/tools/splat/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/ethteck/splat.git
 	branch = master
-	commit = 924414a51d0bcc52076b6ee7147b1bb1d20e804a
-	parent = 7515d21506205b43cccd28875f0d2765addb36ad
+	commit = 4c0a93eaed0df20d3c576cd10360cbf7a3506e23
+	parent = 567efbcb4b71f5c4c03080233b84750d6b144712
 	method = merge
 	cmdver = 0.4.3
diff --git a/tools/splat/create_config.py b/tools/splat/create_config.py
index a412a6088b..4ab4de735c 100755
--- a/tools/splat/create_config.py
+++ b/tools/splat/create_config.py
@@ -1,35 +1,45 @@
 #! /usr/bin/env python3
 
 import argparse
-from util.n64 import rominfo
-from util.n64 import find_code_length
+from util.n64 import rominfo, find_code_length
 
-parser = argparse.ArgumentParser(description="Create a splat config from a rom (currently only n64 .z64 roms supported)")
-parser.add_argument("rom", help="path to a .z64 rom")
+parser = argparse.ArgumentParser(description="Create a splat config from a ROM. "
+                                             "Only n64 .z64 ROMs are supported")
+parser.add_argument("rom", help="Path to a .z64 ROM")
 
 
 def main(rom_path):
     rom = rominfo.get_info(rom_path)
     basename = rom.name.replace(" ", "").lower()
 
-    header = \
-"""name: {0} ({1})
-basename: {2}
+    header = f"""
+name: {rom.name.title()} ({rom.get_country_name()})
+sha1: {rom.sha1}
 options:
-  find_file_boundaries: True
-  compiler: IDO
-  platform: n64
+  basename: {basename}
+  target_path: {rom_path}
   base_path: .
-  target_path: baserom.z64
-""".format(rom.name.title(), rom.get_country_name(), basename)
+  compiler: {rom.compiler}
+  find_file_boundaries: True
+  # platform: n64
+  # undefined_funcs_auto_path: undefined_funcs_auto.txt
+  # undefined_syms_auto_path: undefined_syms_auto.txt
+  # symbol_addrs_path: symbol_addrs.txt
+  # undefined_syms_path: undefined_syms.txt
+  # asm_path: asm
+  # src_path: src
+  # build_path: build
+  # extensions_path: tools/splat_ext
+  # section_order: [.text, .data, .rodata, .bss]
+""".lstrip()
 
     with open(rom_path, "rb") as f:
-      fbytes = f.read()
+        fbytes = f.read()
 
     first_section_end = find_code_length.run(fbytes, 0x1000, rom.entry_point)
 
-    segments = \
-"""segments:
+    segments = f"""
+segments:
   - name: header
     type: header
     start: 0x0
@@ -39,19 +49,17 @@ options:
   - name: main
     type: code
     start: 0x1000
-    vram: 0x{:X}
+    vram: 0x{rom.entry_point:X}
     subsegments:
       - [0x1000, asm]
   - type: bin
-    start: 0x{:X}
-  - [0x{:X}]
-""".format(rom.entry_point, first_section_end, rom.size)
+    start: 0x{first_section_end:X}
+  - [0x{rom.size:X}]
+""".lstrip()
 
-    outstr = header + segments
+    with open(basename + ".yaml", "w", newline="\n") as f:
+        f.write(header + segments)
 
-    outname = rom.name.replace(" ", "").lower()
-    with open(outname + ".yaml", "w", newline="\n") as f:
-        f.write(outstr)
 
 if __name__ == "__main__":
     args = parser.parse_args()
diff --git a/tools/splat/segtypes/linker_entry.py b/tools/splat/segtypes/linker_entry.py
index 2c6cf53c95..5ed935163c 100644
--- a/tools/splat/segtypes/linker_entry.py
+++ b/tools/splat/segtypes/linker_entry.py
@@ -78,7 +78,7 @@ class LinkerWriter():
                 if start % 0x10 != 0 and i != 0:
                     do_next = True
 
-            if entry.object_path:
+            if entry.object_path and entry.section == ".data":
                 path_cname = re.sub(r"[^0-9a-zA-Z_]", "_", str(entry.segment.dir / entry.segment.name) + ".".join(entry.object_path.suffixes[:-1]))
                 self._write_symbol(path_cname, ".")
 
@@ -150,7 +150,7 @@ class LinkerWriter():
         self._writeln(f". = __romPos;")
 
         vram = segment.vram_start
-        vram_str = f"0x{vram:X}" if isinstance(vram, int) else ""
+        vram_str = f"0x{vram:X} " if isinstance(vram, int) else ""
 
         if segment.parent:
             name = to_cname(segment.parent.name + "_" + segment.name)
@@ -159,7 +159,7 @@ class LinkerWriter():
 
         self._write_symbol(f"{name}_ROM_START", "__romPos")
         self._write_symbol(f"{name}_VRAM", f"ADDR(.{name})")
-        self._writeln(f".{name} {vram_str} : AT({name}_ROM_START) SUBALIGN({segment.subalign})")
+        self._writeln(f".{name} {vram_str}: AT({name}_ROM_START) SUBALIGN({segment.subalign})")
         self._begin_block()
 
     def _end_segment(self, segment: Segment):
diff --git a/tools/splat/segtypes/n64/ci8.py b/tools/splat/segtypes/n64/ci8.py
index 4185c791d2..b96bfd22ee 100644
--- a/tools/splat/segtypes/n64/ci8.py
+++ b/tools/splat/segtypes/n64/ci8.py
@@ -9,8 +9,8 @@ if TYPE_CHECKING:
     from segtypes.n64.palette import N64SegPalette as Palette
 
 class N64SegCi8(N64SegRgba16):
-    def __init__(self, segment, rom_start, rom_end):
-        super().__init__(segment, rom_start, rom_end)
+    def __init__(self, rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yaml):
+        super().__init__(rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yaml)
 
         self.palette: 'Optional[Palette]' = None
         self.palette_name = self.name
@@ -51,4 +51,4 @@ class N64SegCi8(N64SegRgba16):
         return self.width * self.height
 
     def cache(self):
-        return (self.config, self.rom_end, 1)
+        return (self.yaml, self.rom_end, 1)
diff --git a/tools/splat/segtypes/n64/code.py b/tools/splat/segtypes/n64/code.py
index 122b30c44d..5aeb3f0d99 100644
--- a/tools/splat/segtypes/n64/code.py
+++ b/tools/splat/segtypes/n64/code.py
@@ -6,8 +6,8 @@ from util.symbols import Symbol
 
 # code group
 class N64SegCode(N64SegGroup):
-    def __init__(self, segment, rom_start, rom_end):
-        super().__init__(segment, rom_start, rom_end)
+    def __init__(self, rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yaml):
+        super().__init__(rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yaml)
 
         self.reported_file_split = False
         self.labels_to_add = set()
diff --git a/tools/splat/segtypes/n64/codesubsegment.py b/tools/splat/segtypes/n64/codesubsegment.py
index daf8f4a669..22af28063a 100644
--- a/tools/splat/segtypes/n64/codesubsegment.py
+++ b/tools/splat/segtypes/n64/codesubsegment.py
@@ -360,7 +360,7 @@ class N64SegCodeSubsegment(Segment):
                 rom_offset += 4
 
     def should_scan(self) -> bool:
-        return options.mode_active("code")
+        return options.mode_active("code") and self.rom_start != "auto" and self.rom_end != "auto"
     
     def should_split(self) -> bool:
         return self.extract and options.mode_active("code")
diff --git a/tools/splat/segtypes/n64/group.py b/tools/splat/segtypes/n64/group.py
index d8ae2fd018..b1b8ee2dcb 100644
--- a/tools/splat/segtypes/n64/group.py
+++ b/tools/splat/segtypes/n64/group.py
@@ -1,3 +1,4 @@
+from collections import OrderedDict
 from typing import List, Dict, Optional
 import sys
 from segtypes.n64.segment import N64Segment
@@ -5,20 +6,20 @@ from segtypes.segment import RomAddr, Segment
 from util.symbols import Symbol
 
 class N64SegGroup(N64Segment):
-    def __init__(self, segment, rom_start, rom_end):
-        super().__init__(segment, rom_start, rom_end)
+    def __init__(self, rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yaml):
+        super().__init__(rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yaml)
 
         self.rodata_syms: Dict[int, List[Symbol]] = {}
 
         # TODO Note: These start/end vram options don't really do anything yet
-        self.data_vram_start: Optional[int] = segment.get("data_vram_start")
-        self.data_vram_end: Optional[int] = segment.get("data_vram_end")
-        self.rodata_vram_start: Optional[int] = segment.get("rodata_vram_start")
-        self.rodata_vram_end: Optional[int] = segment.get("rodata_vram_end")
-        self.bss_vram_start: Optional[int] = segment.get("bss_vram_start")
-        self.bss_vram_end: Optional[int] = segment.get("bss_vram_end")
+        self.data_vram_start: Optional[int] = yaml.get("data_vram_start")
+        self.data_vram_end: Optional[int] = yaml.get("data_vram_end")
+        self.rodata_vram_start: Optional[int] = yaml.get("rodata_vram_start")
+        self.rodata_vram_end: Optional[int] = yaml.get("rodata_vram_end")
+        self.bss_vram_start: Optional[int] = yaml.get("bss_vram_start")
+        self.bss_vram_end: Optional[int] = yaml.get("bss_vram_end")
 
-        self.subsegments = self.parse_subsegments(segment)
+        self.subsegments = self.parse_subsegments(yaml)
 
     @property
     def needs_symbols(self) -> bool:
@@ -27,8 +28,27 @@ class N64SegGroup(N64Segment):
                 return True
         return False
 
+    def handle_alls(self, segs, base_segs) -> bool:
+        for i, elem in enumerate(segs):
+            if elem.type.startswith("all_"):
+                alls = []
+
+                rep_type = f".{elem.type[4:]}"
+                replace_class = Segment.get_class_for_type(rep_type)
+
+                for base in base_segs.items():
+                    rep = replace_class("auto", "auto", rep_type, base[0], "auto", extract=False)
+                    rep.sibling = base[1]
+                    rep.parent = self
+                    alls.append(rep)
+
+                del segs[i]
+                segs[i:i] = alls
+                return True
+        return False
+
     def parse_subsegments(self, segment_yaml) -> List[Segment]:
-        base_segments: Dict[str, Segment] = {}
+        base_segments: OrderedDict[str, Segment] = OrderedDict()
         ret = []
         prev_start: RomAddr = -1
 
@@ -43,6 +63,10 @@ class N64SegGroup(N64Segment):
 
             typ = Segment.parse_segment_type(subsection_yaml)
 
+            if typ.startswith("all_"):
+                ret.append(Segment("auto", "auto", typ, "", "auto"))
+                continue
+
             segment_class = Segment.get_class_for_type(typ)
 
             start = Segment.parse_segment_start(subsection_yaml)
@@ -52,10 +76,10 @@ class N64SegGroup(N64Segment):
                 print(f"Error: Code segment {self.name} contains subsegments which are out of ascending rom order (0x{prev_start:X} followed by 0x{start:X})")
                 sys.exit(1)
 
-            segment: Segment = segment_class(subsection_yaml, start, end)
+            segment: Segment = Segment.from_yaml(segment_class, subsection_yaml, start, end)
             segment.sibling = base_segments.get(segment.name, None)
             segment.parent = self
-            
+
             if segment.rom_start != "auto":
                 assert isinstance(segment.rom_start, int)
                 segment.vram_start = self.rom_to_ram(segment.rom_start)
@@ -78,6 +102,11 @@ class N64SegGroup(N64Segment):
 
             prev_start = start
 
+        check = True
+
+        while check:
+            check = self.handle_alls(ret, base_segments)
+
         if self.rodata_vram_start != None and self.rodata_vram_end == None:
             assert self.vram_end is not None
             self.rodata_vram_end = self.vram_end
diff --git a/tools/splat/segtypes/n64/img.py b/tools/splat/segtypes/n64/img.py
index ad61827124..a87f84b9b4 100644
--- a/tools/splat/segtypes/n64/img.py
+++ b/tools/splat/segtypes/n64/img.py
@@ -5,29 +5,29 @@ from util import options
 from util import log
 
 class N64SegImg(N64Segment):
-    def __init__(self, segment, rom_start, rom_end):
-        super().__init__(segment, rom_start, rom_end)
+    def __init__(self, rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yaml):
+        super().__init__(rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yaml)
 
-        if type(segment) is dict:
+        if isinstance(yaml, dict):
             if self.extract:
-                self.width = segment["width"]
-                self.height = segment["height"]
+                self.width = yaml["width"]
+                self.height = yaml["height"]
 
-            self.flip_horizontal = bool(segment.get("flip_x", False))
-            self.flip_vertical = bool(segment.get("flip_y", False))
+            self.flip_horizontal = bool(yaml.get("flip_x", False))
+            self.flip_vertical = bool(yaml.get("flip_y", False))
 
-            if segment.get("flip"):
+            if yaml.get("flip"):
                 self.warn(f"'flip' parameter for img segments is deprecated; use flip_x and flip_y instead")
-                flip = segment.get("flip")
+                flip = yaml.get("flip")
 
                 self.flip_vertical = flip == "both" or flip.startswith("v") or flip == "y"
                 self.flip_horizontal = flip == "both" or flip.startswith("h") or flip == "x"
         else:
             if self.extract:
-                if len(segment) < 5:
+                if len(yaml) < 5:
                     log.error(f"Error: {self.name} is missing width and height parameters")
-                self.width = segment[3]
-                self.height = segment[4]
+                self.width = yaml[3]
+                self.height = yaml[4]
 
             self.flip_horizontal = False
             self.flip_vertical = False
diff --git a/tools/splat/segtypes/n64/palette.py b/tools/splat/segtypes/n64/palette.py
index 0e297478d0..ecd26ccebc 100644
--- a/tools/splat/segtypes/n64/palette.py
+++ b/tools/splat/segtypes/n64/palette.py
@@ -13,8 +13,8 @@ if TYPE_CHECKING:
 class N64SegPalette(N64Segment):
     require_unique_name = False
 
-    def __init__(self, segment, rom_start, rom_end):
-        super().__init__(segment, rom_start, rom_end)
+    def __init__(self, rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yaml):
+        super().__init__(rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yaml)
 
         self.raster: 'Optional[Raster]' = None
 
@@ -22,10 +22,10 @@ class N64SegPalette(N64Segment):
         #  1) same as the relevant raster segment name (max. 1 palette)
         #  2) relevant raster segment name + "." + unique palette name
         #  3) unique, referencing the relevant raster segment using `raster_name`
-        self.raster_name = segment.get(
+        self.raster_name = yaml.get(
             "raster_name",
             self.name.split(".")[0]
-        ) if type(segment) is dict else self.name.split(".")[0]
+        ) if isinstance(yaml, dict) else self.name.split(".")[0]
 
         if self.extract:
             if self.rom_end == "auto":
diff --git a/tools/splat/segtypes/segment.py b/tools/splat/segtypes/segment.py
index 6ce98b72f1..c82210ca95 100644
--- a/tools/splat/segtypes/segment.py
+++ b/tools/splat/segtypes/segment.py
@@ -1,6 +1,7 @@
 import importlib
-from typing import Dict, TYPE_CHECKING, Union, Optional, List
+from typing import Dict, TYPE_CHECKING, Type, Union, Optional, List
 from pathlib import Path
+
 from util import log
 from util import options
 from util.symbols import Symbol
@@ -89,8 +90,9 @@ class Segment:
             return str(segment["type"])
         else:
             return str(segment[1])
-        
-    def parse_segment_name(self, segment: Union[dict, list]) -> str:
+
+    @staticmethod
+    def parse_segment_name(cls, rom_start, segment: Union[dict, list]) -> str:
         if isinstance(segment, dict) and "name" in segment:
             return str(segment["name"])
         elif isinstance(segment, dict) and "dir" in segment:
@@ -98,28 +100,29 @@ class Segment:
         elif isinstance(segment, list) and len(segment) >= 3:
             return str(segment[2])
         else:
-            return str(self.__class__.get_default_name(self.rom_start))
+            return str(cls.get_default_name(rom_start))
 
-    def __init__(self, segment: Union[dict, list], rom_start: RomAddr, rom_end: RomAddr):
+    def __init__(self, rom_start, rom_end, type, name, vram_start, extract = True, 
+                 given_subalign = options.get_subalign(), given_is_overlay: Optional[bool] = False, given_dir: Path = Path(), args = [], yaml = {}):
         self.rom_start = rom_start
         self.rom_end = rom_end
-        self.type = Segment.parse_segment_type(segment)
-        self.name = self.parse_segment_name(segment)
-        self.given_dir = Path(segment.get("dir", "")) if isinstance(segment, dict) else Path()
-        self.vram_start = parse_segment_vram(segment)
-        self.extract = bool(segment.get("extract", True)) if isinstance(segment, dict) else True
-        self.config = segment
-        self.given_subalign = parse_segment_subalign(segment)
-        self.parent:Optional[Segment] = None
-        self.args:List[str] = [] if isinstance(segment, dict) else segment[3:]
-
-        self.given_is_overlay:Optional[bool] = segment.get("overlay", False) if isinstance(segment, dict) else False
-
-        self.sibling:Optional[Segment] = None
+        self.type = type
+        self.name = name
+        self.vram_start = vram_start
+        self.extract = extract
 
+        self.given_subalign = given_subalign
+        self.given_is_overlay = given_is_overlay
+        self.given_dir = given_dir
         self.given_seg_symbols: Dict[int, Symbol] = {} # Symbols known to be in this segment
         self.given_ext_symbols: Dict[int, Symbol] = {} # Symbols not in this segment but also not from other overlapping ram address ranges
 
+        self.parent:Optional[Segment] = None
+        self.sibling:Optional[Segment] = None
+
+        self.args:List[str] = args
+        self.yaml = yaml
+
         if "skip" in self.args:
             self.extract = False
 
@@ -136,6 +139,19 @@ class Segment:
             if self.rom_start > self.rom_end:
                 print(f"Error: segments out of order - ({self.name} starts at 0x{self.rom_start:X}, but next segment starts at 0x{self.rom_end:X})")
                 sys.exit(1)
+
+    @staticmethod
+    def from_yaml(cls: Type["Segment"], yaml: Union[dict, list], rom_start: RomAddr, rom_end: RomAddr):
+        type = Segment.parse_segment_type(yaml)
+        name = Segment.parse_segment_name(cls, rom_start, yaml)
+        vram_start = parse_segment_vram(yaml)
+        extract = bool(yaml.get("extract", True)) if isinstance(yaml, dict) else True
+        given_subalign = parse_segment_subalign(yaml)
+        given_is_overlay:Optional[bool] = yaml.get("overlay", False) if isinstance(yaml, dict) else False
+        given_dir = Path(yaml.get("dir", "")) if isinstance(yaml, dict) else Path()
+        args:List[str] = [] if isinstance(yaml, dict) else yaml[3:]
+
+        return cls(rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yaml)
     
     @property
     def needs_symbols(self) -> bool:
@@ -234,7 +250,7 @@ class Segment:
         pass
 
     def cache(self):
-        return (self.config, self.rom_end)
+        return (self.yaml, self.rom_end)
 
     def get_linker_section(self) -> str:
         return ".data"
diff --git a/tools/splat/split.py b/tools/splat/split.py
index a2f33d7fd3..22fa164e65 100755
--- a/tools/splat/split.py
+++ b/tools/splat/split.py
@@ -1,5 +1,6 @@
 #! /usr/bin/python3
 
+import hashlib
 from typing import Dict, List, Union, Set, Any
 import argparse
 import pylibyaml
@@ -48,7 +49,7 @@ def initialize_segments(config_segments: Union[dict, list]) -> List[Segment]:
         this_start = Segment.parse_segment_start(seg_yaml)
         next_start = Segment.parse_segment_start(config_segments[i + 1])
 
-        segment: Segment = segment_class(seg_yaml, this_start, next_start)
+        segment: Segment = Segment.from_yaml(segment_class, seg_yaml, this_start, next_start)
 
         if segment.require_unique_name:
             if segment.name in seen_segment_names:
@@ -115,11 +116,19 @@ def main(config_path, base_dir, target_path, modes, verbose, use_cache=True):
 
     options.initialize(config, config_path, base_dir, target_path)
     options.set("modes", modes)
-    options.set("verbose", verbose)
+
+    if verbose:
+        options.set("verbose", True)
 
     with options.get_target_path().open("rb") as f2:
         rom_bytes = f2.read()
 
+    if "sha1" in config:
+        sha1 = hashlib.sha1(rom_bytes).hexdigest()
+        e_sha1 = config["sha1"]
+        if e_sha1 != sha1:
+            log.error(f"sha1 mismatch: expected {e_sha1}, was {sha1}")
+
     # Create main output dir
     options.get_base_path().mkdir(parents=True, exist_ok=True)
 
diff --git a/tools/splat/stubs/png.pyi b/tools/splat/stubs/png.pyi
index e9343771a1..46543ef25b 100644
--- a/tools/splat/stubs/png.pyi
+++ b/tools/splat/stubs/png.pyi
@@ -1,7 +1,7 @@
 from collections import namedtuple
 from typing import Any, Optional
 
-Resolution = namedtuple('_Resolution', 'x y unit_is_meter')
+Resolution = namedtuple('Resolution', 'x y unit_is_meter')
 
 class Error(Exception): ...
 class FormatError(Error): ...
diff --git a/tools/splat/util/n64/Yay0decompress.py b/tools/splat/util/n64/Yay0decompress.py
index 9d4b82b7f2..4024f99ecb 100644
--- a/tools/splat/util/n64/Yay0decompress.py
+++ b/tools/splat/util/n64/Yay0decompress.py
@@ -3,6 +3,7 @@ import sys
 import os
 from ctypes import *
 from struct import pack, unpack_from
+from util import log
 
 tried_loading = False
 lib = None
@@ -46,6 +47,10 @@ def decompress_yay0(in_bytes, byte_order="big"):
     else:
         hdr = Yay0.from_buffer_copy(in_bytes, 0)
 
+    magic = getattr(hdr, hdr._fields_[0][0])
+    if magic != int.from_bytes(str.encode("Yay0"), byteorder="big"):
+        log.error(f"Yay0 magic is incorrect: {magic}")
+
     # create the input/output buffers, copying data to in
     src = (c_uint8 * len(in_bytes)).from_buffer_copy(in_bytes, 0)
     dst = (c_uint8 * hdr.uncompressedLength)()
diff --git a/tools/splat/util/n64/find_code_length.py b/tools/splat/util/n64/find_code_length.py
index 59759205d5..51da09e509 100755
--- a/tools/splat/util/n64/find_code_length.py
+++ b/tools/splat/util/n64/find_code_length.py
@@ -1,6 +1,8 @@
 #! /usr/bin/python3
 
 from capstone import *
+
+from capstone import Cs, CS_ARCH_MIPS, CS_MODE_MIPS64, CS_MODE_BIG_ENDIAN
 from capstone.mips import *
 
 import argparse
diff --git a/tools/splat/util/n64/rominfo.py b/tools/splat/util/n64/rominfo.py
index 57d548968c..640b397ae6 100755
--- a/tools/splat/util/n64/rominfo.py
+++ b/tools/splat/util/n64/rominfo.py
@@ -3,6 +3,7 @@
 import argparse
 from capstone import *
 from capstone.mips import *
+import hashlib
 import zlib
 
 parser = argparse.ArgumentParser(description='Gives information on n64 roms')
@@ -90,11 +91,15 @@ def get_info_bytes(rom_bytes, encoding):
     #     if rom_bytes.find(bytes(format, "ASCII")) != -1:
     #         compression_formats.append(format)
 
-    return N64Rom(name, country_code, libultra_version, crc1, crc2, cic, entry_point, len(rom_bytes))
+    compiler = get_compiler_info(rom_bytes, entry_point, print_result=False)
+
+    sha1 = hashlib.sha1(rom_bytes).hexdigest()
+
+    return N64Rom(name, country_code, libultra_version, crc1, crc2, cic, entry_point, len(rom_bytes), compiler, sha1)
 
 
 class N64Rom:
-    def __init__(self, name, country_code, libultra_version, crc1, crc2, cic, entry_point, size):
+    def __init__(self, name, country_code, libultra_version, crc1, crc2, cic, entry_point, size, compiler, sha1):
         self.name = name
         self.country_code = country_code
         self.libultra_version = libultra_version
@@ -103,11 +108,13 @@ class N64Rom:
         self.cic = cic
         self.entry_point = entry_point
         self.size = size
+        self.compiler = compiler
+        self.sha1 = sha1
 
     def get_country_name(self):
         return country_codes[self.country_code]
 
-def get_compiler_info(rom_bytes, entry_point):
+def get_compiler_info(rom_bytes, entry_point, print_result=True):
     md = Cs(CS_ARCH_MIPS, CS_MODE_MIPS64 + CS_MODE_BIG_ENDIAN)
     md.detail = True
 
@@ -121,8 +128,9 @@ def get_compiler_info(rom_bytes, entry_point):
             branches += 1
 
     compiler = "IDO" if branches > jumps else "GCC"
-
-    print(f"{branches} branches and {jumps} jumps detected in the first code segment. Compiler is most likely {compiler}")
+    if (print_result):
+        print(f"{branches} branches and {jumps} jumps detected in the first code segment. Compiler is most likely {compiler}")
+    return compiler
 
 # TODO: support .n64 extension
 def main():
diff --git a/tools/splat/util/options.py b/tools/splat/util/options.py
index 4a2aee48d8..62196876c2 100644
--- a/tools/splat/util/options.py
+++ b/tools/splat/util/options.py
@@ -32,6 +32,9 @@ def get_platform() -> str:
 def get_compiler() -> str:
     return opts.get("compiler", "IDO")
 
+def get_header_encoding() -> str:
+    return opts.get("header_encoding", "ASCII")
+
 def get_subalign() -> int:
     return opts.get("subalign", 16)
 
@@ -66,7 +69,7 @@ def get_symbol_addrs_path():
     return get_base_path() / opts.get("symbol_addrs_path", "symbol_addrs.txt")
 
 def get_build_path():
-    return get_base_path() / opts.get("build_path", "build")
+    return (get_base_path() / opts.get("build_path", "build")).resolve()
 
 def get_ld_script_path():
     return get_base_path() / opts.get("ld_script_path", f"{opts.get('basename')}.ld")
diff --git a/tools/splat_ext/PaperMarioMapFS.py b/tools/splat_ext/PaperMarioMapFS.py
index e4aca0ada3..929a1e4bf2 100644
--- a/tools/splat_ext/PaperMarioMapFS.py
+++ b/tools/splat_ext/PaperMarioMapFS.py
@@ -37,10 +37,10 @@ def add_file_ext(name: str) -> str:
         return name + ".bin"
 
 class N64SegPaperMarioMapFS(N64Segment):
-    def __init__(self, segment, rom_start, rom_end):
-        super().__init__(segment, rom_start, rom_end)
+    def __init__(self, rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yaml):
+        super().__init__(rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yaml)
 
-        self.files = segment["files"]
+        self.files = yaml["files"]
 
     def split(self, rom_bytes):
         fs_dir = options.get_asset_path() / self.dir / self.name
diff --git a/tools/splat_ext/PaperMarioMessages.py b/tools/splat_ext/PaperMarioMessages.py
index 856172194b..ecc6ac4c75 100644
--- a/tools/splat_ext/PaperMarioMessages.py
+++ b/tools/splat_ext/PaperMarioMessages.py
@@ -367,9 +367,10 @@ CHARSET_CREDITS = {
 }
 
 class N64SegPaperMarioMessages(N64Segment):
-    def __init__(self, segment, rom_start, rom_end):
-        super().__init__(segment, rom_start, rom_end)
-        self.files = segment.get("files", []) if type(segment) is dict else []
+    def __init__(self, rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yml):
+        super().__init__(rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yml)
+
+        self.files = yml.get("files", []) if isinstance(yml, dict) else []
 
         with (Path(__file__).parent / f"{self.name}.yaml").open("r") as f:
             self.msg_names = yaml.load(f.read(), Loader=yaml.SafeLoader)
@@ -493,4 +494,4 @@ class N64SegPaperMarioMessages(N64Segment):
             self.root_charset = CHARSET
 
     def cache(self):
-        return (self.config, self.rom_end, self.msg_names)
+        return (self.yaml, self.rom_end, self.msg_names)
diff --git a/tools/splat_ext/PaperMarioNpcSprites.py b/tools/splat_ext/PaperMarioNpcSprites.py
index 6f146829d2..e4ef980c3b 100644
--- a/tools/splat_ext/PaperMarioNpcSprites.py
+++ b/tools/splat_ext/PaperMarioNpcSprites.py
@@ -7,6 +7,7 @@ from util.color import unpack_color
 from util import options
 import png
 import xml.etree.ElementTree as ET
+import struct
 
 import pylibyaml
 import yaml
@@ -252,10 +253,10 @@ class Component:
 class N64SegPaperMarioNpcSprites(N64Segment):
     DEFAULT_SPRITE_NAMES = [f"{i:02X}" for i in range(0xEA)]
 
-    def __init__(self, segment, rom_start, rom_end):
-        super().__init__(segment, rom_start, rom_end)
+    def __init__(self, rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yml):
+        super().__init__(rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yml)
 
-        self.files = segment["files"]
+        self.files = yml["files"]
 
         with (Path(__file__).parent / f"{self.name}.yaml").open("r") as f:
             self.sprite_cfg = yaml.load(f.read(), Loader=yaml.SafeLoader)
@@ -295,4 +296,4 @@ class N64SegPaperMarioNpcSprites(N64Segment):
         return [LinkerEntry(self, out_paths, basepath, ".data")]
 
     def cache(self):
-        return (self.config, self.rom_end, self.sprite_cfg)
+        return (self.yaml, self.rom_end, self.sprite_cfg)
diff --git a/tools/update_symbol_addrs.py b/tools/update_symbol_addrs.py
index 8d974aae79..e60c8cabb4 100755
--- a/tools/update_symbol_addrs.py
+++ b/tools/update_symbol_addrs.py
@@ -23,6 +23,8 @@ elf_symbols = []
 
 ignores = set()
 
+verbose = False
+
 def read_ignores():
     with open(ignores_path) as f:
         lines = f.readlines()
diff --git a/ver/us/asm/data/1AF2D0.data.s b/ver/us/asm/data/1AF2D0.data.s
index 626817855d..91972759b8 100644
--- a/ver/us/asm/data/1AF2D0.data.s
+++ b/ver/us/asm/data/1AF2D0.data.s
@@ -201,7 +201,7 @@ glabel RunAwayFail
 .word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000000, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel RunAwayReset
-.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030002, 0x00000043, 0x00000002, UseCamPreset, 0x00000018, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000371, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000024, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000003FB, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000005A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetActorRotation, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000005, SetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0xF24A7E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000012, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000001, func_80260E90, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_80261064, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000008, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFFAB, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000029, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F8, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C80, 0x00000043, 0x00000001, func_80260E90, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_80261064, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030002, 0x00000043, 0x00000002, UseCamPreset, 0x00000018, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000371, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000024, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000003FB, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000005A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetActorRotation, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000005, SetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0xF24A7E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000012, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000001, base_GiveRefund, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, base_GiveRefundCleanup, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000008, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFFAB, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000029, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F8, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C80, 0x00000043, 0x00000001, base_GiveRefund, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, base_GiveRefundCleanup, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel PlayEatFX
 .word 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001C, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -210,7 +210,7 @@ glabel PlayDrinkFX
 .word 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010025, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel UseLifeShroom
-.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000001, func_80261388, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, DispatchEvent, 0x00000100, 0x00000040, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000100, 0x00000004, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000005, 0x00000001, 0x0000000A, 0x00000028, 0x00000002, 0xFE363C80, 0x00000019, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetPartAlpha, 0x00000100, 0xFFFFFFFF, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetPartAlpha, 0x00000100, 0xFFFFFFFF, 0x00000000, 0x00000013, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000001, func_802610CC, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, MakeItemEntity, 0x00000095, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C84, 0x00000010, 0x00000005, 0x00000001, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C84, 0x00000008, 0x0000000D, 0x00000002, 0xFE363C84, 0x000000FF, 0x00000024, 0x00000002, 0xFE363C84, 0x000000FF, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7E80, 0x00000043, 0x00000005, SetItemPos, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000043, 0x00000001, func_802613A8, 0x00000043, 0x00000001, func_80260E90, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_80261064, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000372, 0x00000027, 0x00000002, 0xFE363C84, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x0000006B, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xF24A7E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8F, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetItemFlags, 0xFE363C8A, 0x00000040, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, SetItemFlags, 0xFE363C8A, 0x00000040, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveEffect, 0xFE363C80, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002055, 0x00000043, 0x0000000F, PlayEffect, 0x00000022, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000046, 0x00000046, 0x0000000A, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000373, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000022, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000032, 0x00000014, 0x00000020, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x0000000F, PlayEffect, 0x00000022, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000032, 0x00000020, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetActorDispOffset, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetActorDispOffset, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetActorDispOffset, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000005, SetActorDispOffset, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorDispOffset, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000058, 0x00000000, 0x00000043, 0x00000001, func_80261164, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000374, 0x00000043, 0x00000005, SetActorRotation, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000001, func_802611E8, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x0000000F, PlayEffect, 0x00000040, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, FreezeBattleCam, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000000F, 0x00000058, 0x00000000, 0x00000043, 0x00000001, func_80261388, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000100, 0x00000004, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x0000000D, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetPartAlpha, 0x00000100, 0xFFFFFFFF, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, DispatchEvent, 0x00000100, 0x00000041, 0x00000043, 0x00000004, SetPartAlpha, 0x00000100, 0xFFFFFFFF, 0x000000FF, 0x00000013, 0x00000000, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000072, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000014, 0xF24A7E80, 0x0000000A, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_8026127C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000001, func_80261388, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, DispatchEvent, 0x00000100, 0x00000040, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000100, 0x00000004, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000005, 0x00000001, 0x0000000A, 0x00000028, 0x00000002, 0xFE363C80, 0x00000019, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetPartAlpha, 0x00000100, 0xFFFFFFFF, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetPartAlpha, 0x00000100, 0xFFFFFFFF, 0x00000000, 0x00000013, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000001, func_802610CC, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, MakeItemEntity, 0x00000095, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C84, 0x00000010, 0x00000005, 0x00000001, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C84, 0x00000008, 0x0000000D, 0x00000002, 0xFE363C84, 0x000000FF, 0x00000024, 0x00000002, 0xFE363C84, 0x000000FF, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7E80, 0x00000043, 0x00000005, SetItemPos, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000043, 0x00000001, func_802613A8, 0x00000043, 0x00000001, base_GiveRefund, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, base_GiveRefundCleanup, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000372, 0x00000027, 0x00000002, 0xFE363C84, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x0000006B, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xF24A7E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8F, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetItemFlags, 0xFE363C8A, 0x00000040, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, SetItemFlags, 0xFE363C8A, 0x00000040, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveEffect, 0xFE363C80, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002055, 0x00000043, 0x0000000F, PlayEffect, 0x00000022, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000046, 0x00000046, 0x0000000A, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000373, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000022, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000032, 0x00000014, 0x00000020, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x0000000F, PlayEffect, 0x00000022, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000032, 0x00000020, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetActorDispOffset, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetActorDispOffset, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetActorDispOffset, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000005, SetActorDispOffset, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorDispOffset, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000058, 0x00000000, 0x00000043, 0x00000001, func_80261164, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000374, 0x00000043, 0x00000005, SetActorRotation, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000001, func_802611E8, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x0000000F, PlayEffect, 0x00000040, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, FreezeBattleCam, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000000F, 0x00000058, 0x00000000, 0x00000043, 0x00000001, func_80261388, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000100, 0x00000004, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x0000000D, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetPartAlpha, 0x00000100, 0xFFFFFFFF, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, DispatchEvent, 0x00000100, 0x00000041, 0x00000043, 0x00000004, SetPartAlpha, 0x00000100, 0xFFFFFFFF, 0x000000FF, 0x00000013, 0x00000000, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000072, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000014, 0xF24A7E80, 0x0000000A, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_8026127C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel MerleeRunOut
 .word 0x00000043, 0x00000001, HasMerleeCastsLeft, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, ShowMessageBox, 0x00000003, 0x0000003C, 0x00000043, 0x00000001, WaitForMessageBoxDone, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/action/18.data.s b/ver/us/asm/data/world/action/18.data.s
deleted file mode 100644
index 0ddf7d92db..0000000000
--- a/ver/us/asm/data/world/action/18.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-glabel D_802B6300_E248D0
-.word 0x000A0002, 0x000A002B, 0x000A002D, 0x000A002F, 0x000A0031, 0x000A0033, 0x000A0035, 0x000A0037, 0x000A0039, 0x000A003B, 0x000A003D, 0x000A003F, 0x000A0041, 0x000A0043, 0x000A0045, 0x000A0047, 0x000A0049, 0x000A004B, 0x000A004D, 0x00000000
diff --git a/ver/us/asm/data/world/action/hammer.data.s b/ver/us/asm/data/world/action/hammer.data.s
index 7216598cbc..55f87dbfd7 100644
--- a/ver/us/asm/data/world/action/hammer.data.s
+++ b/ver/us/asm/data/world/action/hammer.data.s
@@ -4,6 +4,3 @@
 
 glabel D_802B6DB0_E25C80
 .word D_802B6E90_E2A300, 0x00000000, 0x00000000, 0x00000000
-
-glabel D_802B6DC0_E25C90
-.word 0x802B6010, 0x802B6040, 0x802B6010, 0x802B6040, 0x802B6010, 0x802B6040, 0x802B6010, 0x802B6040, 0x802B6010, 0x802B6040, 0x802B6010, 0x00000000
diff --git a/ver/us/asm/data/world/area_jan/jan_01/B299B0.data.s b/ver/us/asm/data/world/area_jan/jan_01/B299B0.data.s
index 877d47b2e4..9c00de0cd0 100644
--- a/ver/us/asm/data/world/area_jan/jan_01/B299B0.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_01/B299B0.data.s
@@ -21,7 +21,7 @@ glabel D_80241A70_B29AA0
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241AB4_B29AE4
-.word 0x00000045, 0x00000002, D_80241A70_B29AA0, 0xFE363C89, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000140, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8C80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000096, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0x0000003C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000001, func_80241170_B291A0, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000045, 0x00000002, D_80241A70_B29AA0, 0xFE363C89, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000140, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8C80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000096, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0x0000003C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000001, jan_01_UnsetCamera0Flag1000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241BCC_B29BFC
 .word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B6000B, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFDA8, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0010000D, 0x00000140, 0x0000003C, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000019, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000001AE, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00100010, 0x00000000, 0x0000003C, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000FA, 0x0000005A, 0x00000005, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C83, 0xFE363C82, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_80241154_B29184, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x00100011, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000000C, 0x00000046, 0x00000001, D_80241AB4_B29AE4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60009, 0x00B60001, 0x00000000, 0x0010000F, 0x00000024, 0x00000002, 0xF8406044, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000000C, 0x00000046, 0x00000001, D_80241AB4_B29AE4, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s b/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s
index 3292254c20..99aba8f379 100644
--- a/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s
@@ -108,7 +108,7 @@ glabel D_802434BC_B8763C
 .word 0x00000043, 0x00000006, PlaySoundAt, 0x8000001E, 0x00000000, 0x0000010E, 0x00000082, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000008, 0xF24A7E80, 0x00000043, 0x00000003, RandInt, 0x00000004, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000018, 0x00000003, 0x00000122, 0x0000009B, 0x00000000, 0x000000F0, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000018, 0x00000003, 0x00000113, 0x00000096, 0x00000000, 0x000000F0, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024364C_B877CC
-.word 0x00000003, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000017, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000016, 0x7FFFFE00, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000006, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000007, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000008, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000009, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000016, 0x7FFFFE00, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000006, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000008, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000009, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000045, 0x00000002, D_80242EA4_B87024, 0xFE363C89, 0x00000008, 0x00000001, 0x00000028, 0x00000049, 0x00000001, 0xFE363C89, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000012C, 0x000000FA, 0x00000096, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000012C, 0x000000FA, 0x00000096, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000044, 0x00000001, D_80242E08_B86F88, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80242EA4_B87024, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00980003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00980003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00980003, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00980003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000009, 0x00000165, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000006, 0xF24A8680, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000007, 0xF24A8680, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000009, 0x0000020C, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000009, 0x00000000, 0x00000000, 0x000000B4, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000009, 0x00000200, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000008, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x00000005, 0x0000005A, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C82, 0x00000050, 0x00000043, 0x00000004, SetPlayerPos, 0x00000091, 0x00000000, 0xFE363C82, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000073, 0x00000000, 0xFE363C82, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000005, SetNpcRotation, 0x00000009, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000B, 0x00000016, 0x00000001, 0x0000000B, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000A5, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A5, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5880, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000009, 0x00000200, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000009, 0x00000104, 0xFFFFFFEC, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000009, 0x00000000, 0x00000000, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00980003, 0x00000043, 0x00000006, NpcJump0, 0x00000009, 0x0000012C, 0x0000012C, 0xFFFFFFF2, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000009, 0x00000000, 0x00000000, 0x00000000, 0x00000045, 0x00000002, D_802434BC_B8763C, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00C40009, 0x00C40002, 0x00000000, 0x001000CA, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000008C, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000004, GetNpcVar, 0x00000001, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, StopSound, 0x8000001E, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000014, 0x00000016, 0x00000001, 0x00000014, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000044, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000076, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000049, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000028, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000021, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000034, 0x7FFFFE00, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00980001, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x000000FF, 0x000000CD, 0xFFFFFFE7, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0x000000C8, 0x000000B9, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0x00000152, 0x000000D4, 0xFFFFFFEC, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0x0000010B, 0x0000013A, 0xFFFFFFF4, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000A, 0x000002A6, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000043, 0x00000006, NpcJump0, 0x0000000A, 0xFE363C80, 0x00000000, 0x00000028, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00980005, 0x00980001, 0x00000000, 0x001000CC, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00980001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00980001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00980001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00980001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000012C, 0x000000FA, 0x00000096, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000012C, 0x000000FA, 0x00000096, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000A, 0x000002A6, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0x0000015E, 0x00000000, 0x00000064, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00980006, 0x00000043, 0x00000006, NpcJump0, 0x0000000A, 0x00000190, 0x000000D7, 0xFFFFFFE9, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00980005, 0x00980001, 0x00000000, 0x001000CD, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000043, 0x00000186, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000AA, 0x00000000, 0x0000003C, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0x00000009, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0x000000C8, 0xFE363C83, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x00000043, 0x00000005, ScaleModel, 0x00000040, 0x00000001, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000003D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000016, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000A5, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A5, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5880, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00C40009, 0x00C40002, 0x00000000, 0x001000CE, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000016, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000A, 0x000002A6, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x0000000A, 0x00000096, 0x00000000, 0x00000014, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00980003, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0x00000041, 0x00000019, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000009, 0x000002A7, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000009, 0x00000096, 0x00000000, 0x00000014, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00980003, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000009, 0x00000050, 0xFFFFFFF6, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000009, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000008, 0x000002A6, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000008, 0x00000096, 0x00000000, 0x00000014, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00980003, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000008, 0x0000005F, 0x00000019, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000008, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000007, 0x000002A7, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000007, 0x00000096, 0x00000000, 0x00000014, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00980003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0x0000006E, 0xFFFFFFF6, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000019, 0x00000016, 0x00000001, 0x00000019, 0x00000043, 0x00000004, GetNpcVar, 0x00000001, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00C40009, 0x00C40002, 0x00000000, 0x001000D0, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802425C0_B86740, 0x00000043, 0x00000002, AddKeyItem, 0x0000000F, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A4C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8880, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00C40009, 0x00C40002, 0x00000000, 0x001000D1, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000044, 0x00000001, D_80243420_B875A0, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000044, 0x00000001, D_80243420_B875A0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000009, 0x00000044, 0x00000001, D_80243420_B875A0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000044, 0x00000001, D_80243420_B875A0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00C40004, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000005, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0xFFFFFF88, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, BindNpcInteract, 0x00000006, D_802433A0_B87520, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000000, 0x00000043, 0x00000001, func_80240FC4_B85144, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8080, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000018, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000003, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000017, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000016, 0x7FFFFE00, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000006, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000007, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000008, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000009, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000016, 0x7FFFFE00, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000006, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000008, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000009, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000045, 0x00000002, D_80242EA4_B87024, 0xFE363C89, 0x00000008, 0x00000001, 0x00000028, 0x00000049, 0x00000001, 0xFE363C89, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000012C, 0x000000FA, 0x00000096, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000012C, 0x000000FA, 0x00000096, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000044, 0x00000001, D_80242E08_B86F88, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80242EA4_B87024, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00980003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00980003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00980003, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00980003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000009, 0x00000165, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000006, 0xF24A8680, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000007, 0xF24A8680, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000009, 0x0000020C, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000009, 0x00000000, 0x00000000, 0x000000B4, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000009, 0x00000200, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000008, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x00000005, 0x0000005A, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C82, 0x00000050, 0x00000043, 0x00000004, SetPlayerPos, 0x00000091, 0x00000000, 0xFE363C82, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000073, 0x00000000, 0xFE363C82, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000005, SetNpcRotation, 0x00000009, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000B, 0x00000016, 0x00000001, 0x0000000B, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000A5, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A5, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5880, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000009, 0x00000200, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000009, 0x00000104, 0xFFFFFFEC, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000009, 0x00000000, 0x00000000, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00980003, 0x00000043, 0x00000006, NpcJump0, 0x00000009, 0x0000012C, 0x0000012C, 0xFFFFFFF2, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000009, 0x00000000, 0x00000000, 0x00000000, 0x00000045, 0x00000002, D_802434BC_B8763C, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00C40009, 0x00C40002, 0x00000000, 0x001000CA, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000008C, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000004, GetNpcVar, 0x00000001, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, StopSound, 0x8000001E, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000014, 0x00000016, 0x00000001, 0x00000014, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000044, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000076, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000049, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000028, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000021, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000034, 0x7FFFFE00, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00980001, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x000000FF, 0x000000CD, 0xFFFFFFE7, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0x000000C8, 0x000000B9, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0x00000152, 0x000000D4, 0xFFFFFFEC, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0x0000010B, 0x0000013A, 0xFFFFFFF4, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000A, 0x000002A6, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000043, 0x00000006, NpcJump0, 0x0000000A, 0xFE363C80, 0x00000000, 0x00000028, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00980005, 0x00980001, 0x00000000, 0x001000CC, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00980001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00980001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00980001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00980001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000012C, 0x000000FA, 0x00000096, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000012C, 0x000000FA, 0x00000096, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000A, 0x000002A6, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0x0000015E, 0x00000000, 0x00000064, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00980006, 0x00000043, 0x00000006, NpcJump0, 0x0000000A, 0x00000190, 0x000000D7, 0xFFFFFFE9, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00980005, 0x00980001, 0x00000000, 0x001000CD, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000043, 0x00000186, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000AA, 0x00000000, 0x0000003C, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0x00000009, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0x000000C8, 0xFE363C83, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x00000043, 0x00000005, ScaleModel, 0x00000040, 0x00000001, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000003D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000016, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000A5, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A5, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5880, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00C40009, 0x00C40002, 0x00000000, 0x001000CE, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000016, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000A, 0x000002A6, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x0000000A, 0x00000096, 0x00000000, 0x00000014, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00980003, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0x00000041, 0x00000019, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000009, 0x000002A7, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000009, 0x00000096, 0x00000000, 0x00000014, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00980003, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000009, 0x00000050, 0xFFFFFFF6, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000009, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000008, 0x000002A6, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000008, 0x00000096, 0x00000000, 0x00000014, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00980003, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000008, 0x0000005F, 0x00000019, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000008, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000007, 0x000002A7, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000007, 0x00000096, 0x00000000, 0x00000014, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00980003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0x0000006E, 0xFFFFFFF6, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000019, 0x00000016, 0x00000001, 0x00000019, 0x00000043, 0x00000004, GetNpcVar, 0x00000001, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00C40009, 0x00C40002, 0x00000000, 0x001000D0, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802425C0_B86740, 0x00000043, 0x00000002, AddKeyItem, 0x0000000F, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A4C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8880, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00C40009, 0x00C40002, 0x00000000, 0x001000D1, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000044, 0x00000001, D_80243420_B875A0, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000044, 0x00000001, D_80243420_B875A0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000009, 0x00000044, 0x00000001, D_80243420_B875A0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000044, 0x00000001, D_80243420_B875A0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00C40004, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000005, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0xFFFFFF88, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, BindNpcInteract, 0x00000006, D_802433A0_B87520, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000000, 0x00000043, 0x00000001, jan_22_UnsetCamera0Flag1000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8080, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000018, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244A5C_B88BDC
 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000016, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024364C_B877CC, 0x00000016, 0x00000001, 0x00000017, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024364C_B877CC, 0x00000044, 0x00000001, D_80242E08_B86F88, 0x00000021, 0x00000002, 0x00000018, 0x00000025, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802433A0_B87520, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x00000104, 0x000000CD, 0xFFFFFFE7, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000000, 0x00000004, 0x00000001, 0x0000001E, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000027, 0x7FFFFE00, 0x00000043, 0x00000002, RemoveNpc, 0x00000006, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, RemoveNpc, 0x00000007, 0x00000043, 0x00000002, RemoveNpc, 0x00000008, 0x00000043, 0x00000002, RemoveNpc, 0x00000009, 0x00000043, 0x00000002, RemoveNpc, 0x0000000A, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -123,7 +123,7 @@ glabel D_8024511C_B8929C
 .word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000140, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000096, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80245208_B89388
-.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFE48, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000BC, 0x00000140, 0x0000003C, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000019, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000096, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0x00000004, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000140, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000C0, 0x00000000, 0x0000003C, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C83, 0xFE363C82, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_80240FA8_B85128, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x001000C1, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF8406044, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60009, 0x00B60001, 0x00000000, 0x001000BE, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60009, 0x00B60001, 0x00000000, 0x001000BF, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000046, 0x00000024, 0x00000002, 0xFE363C80, 0x00000046, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000012C, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8C80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0x0000003C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000000D, 0x00000057, 0x00000000, 0x00000045, 0x00000002, D_8024511C_B8929C, 0xFE363C89, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000001, func_80240FC4_B85144, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000023, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000000D, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFE48, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000BC, 0x00000140, 0x0000003C, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000019, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000096, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0x00000004, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000140, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000C0, 0x00000000, 0x0000003C, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C83, 0xFE363C82, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_80240FA8_B85128, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x001000C1, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF8406044, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60009, 0x00B60001, 0x00000000, 0x001000BE, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60009, 0x00B60001, 0x00000000, 0x001000BF, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000046, 0x00000024, 0x00000002, 0xFE363C80, 0x00000046, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000012C, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8C80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0x0000003C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000000D, 0x00000057, 0x00000000, 0x00000045, 0x00000002, D_8024511C_B8929C, 0xFE363C89, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000001, jan_22_UnsetCamera0Flag1000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000023, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000000D, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802458B0_B89A30
 .word 0x00000003, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE0180, 0x0000000E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000055, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000C5, 0x00000000, 0x0000003C, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFF06, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x001000C6, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFE2A, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s b/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s
index c9af853d60..02bb584b41 100644
--- a/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s
+++ b/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s
@@ -51,7 +51,7 @@ glabel D_80241360_C8D400
 .word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000022, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80240E44_C8CEE4, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802413B4_C8D454
-.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000064, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000064, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80240350_C8C3F0, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000011D, 0x00000019, 0x00000023, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000011D, 0x00000019, 0x00000023, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000321, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00360017, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00360001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00360004, 0x00360001, 0x00000000, 0x001000FF, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000322, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00360018, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000001, func_8024036C_C8C40C, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8680, 0x00000024, 0x00000002, 0xF840609E, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000064, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000064, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80240350_C8C3F0, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000011D, 0x00000019, 0x00000023, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000011D, 0x00000019, 0x00000023, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000321, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00360017, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00360001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00360004, 0x00360001, 0x00000000, 0x001000FF, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000322, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00360018, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000001, kzn_18_UnsetCamera0Flag1000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8680, 0x00000024, 0x00000002, 0xF840609E, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241618_C8D6B8
 .word 0x0000000A, 0x00000002, 0xF840609E, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802413B4_C8D454, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_nok/nok_12/9FD410.data.s b/ver/us/asm/data/world/area_nok/nok_12/9FD410.data.s
index 9d93c94e67..5d51a35477 100644
--- a/ver/us/asm/data/world/area_nok/nok_12/9FD410.data.s
+++ b/ver/us/asm/data/world/area_nok/nok_12/9FD410.data.s
@@ -3,4 +3,4 @@
 .section .data
 
 glabel D_80242C20_9FD410
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000001, func_802402F0_9FAAE0, 0x00000043, 0x00000007, func_802CB008, 0x00000000, 0x00000001, 0xFFFFFEF0, 0x00000000, 0xFFFFFFC8, 0x00000014, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, PlaySoundAt, 0x00000071, 0x00000000, 0xFFFFFEED, 0x00000000, 0xFFFFFFD9, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFEC0, 0x00000000, 0x0000000F, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000092, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000005, TranslateGroup, 0x00000092, 0x00000000, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000092, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, PlaySoundAt, 0x00000072, 0x00000000, 0xFFFFFEED, 0x00000000, 0xFFFFFFD9, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000086, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000087, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000088, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000089, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008A, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008E, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008F, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000090, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008C, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008D, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008E, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000090, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008E, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008F, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000090, 0x00000000, 0x00000050, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, PlaySoundAt, 0x00000073, 0x00000000, 0xFFFFFEED, 0x00000000, 0xFFFFFFD9, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008E, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008F, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000090, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008C, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008D, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008E, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000090, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008E, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008F, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000090, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008C, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008D, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008E, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000090, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000009, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, func_802CB008, 0x00000000, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000001, func_8024030C_9FAAFC, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF9E, 0x00000043, 0x00000003, SetGroupEnabled, 0x000000CE, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFF9E, 0x00000047, 0x00000005, D_80242C20_9FD410, 0x00020000, 0xF9718881, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000092, 0x00000000, 0xFFFFFEC0, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x000000CE, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000086, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000087, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000088, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000089, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008A, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008E, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008F, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000090, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008C, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008D, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008E, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000090, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008E, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008F, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000090, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008C, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008D, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008E, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000090, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000001, func_802402F0_9FAAE0, 0x00000043, 0x00000007, func_802CB008, 0x00000000, 0x00000001, 0xFFFFFEF0, 0x00000000, 0xFFFFFFC8, 0x00000014, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, PlaySoundAt, 0x00000071, 0x00000000, 0xFFFFFEED, 0x00000000, 0xFFFFFFD9, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFEC0, 0x00000000, 0x0000000F, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000092, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000005, TranslateGroup, 0x00000092, 0x00000000, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000092, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, PlaySoundAt, 0x00000072, 0x00000000, 0xFFFFFEED, 0x00000000, 0xFFFFFFD9, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000086, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000087, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000088, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000089, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008A, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008E, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008F, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000090, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008C, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008D, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008E, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000090, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008E, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008F, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000090, 0x00000000, 0x00000050, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, PlaySoundAt, 0x00000073, 0x00000000, 0xFFFFFEED, 0x00000000, 0xFFFFFFD9, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008E, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008F, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000090, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008C, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008D, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008E, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000090, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008E, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008F, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000090, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008C, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008D, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008E, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000090, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000009, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, func_802CB008, 0x00000000, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000001, nok_12_UnsetCamera0Flag1000, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF9E, 0x00000043, 0x00000003, SetGroupEnabled, 0x000000CE, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFF9E, 0x00000047, 0x00000005, D_80242C20_9FD410, 0x00020000, 0xF9718881, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000092, 0x00000000, 0xFFFFFEC0, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x000000CE, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000086, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000087, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000088, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000089, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008A, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008E, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008F, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000090, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008C, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008D, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008E, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000090, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008E, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008F, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000090, 0x00000000, 0x00000050, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008C, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008D, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008E, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000090, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_nok/nok_14/A057B0.data.s b/ver/us/asm/data/world/area_nok/nok_14/A057B0.data.s
index 4f1451b590..89777fa4d4 100644
--- a/ver/us/asm/data/world/area_nok/nok_14/A057B0.data.s
+++ b/ver/us/asm/data/world/area_nok/nok_14/A057B0.data.s
@@ -3,4 +3,4 @@
 .section .data
 
 glabel D_80242F70_A057B0
-.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000001, func_80240180_A029C0, 0x00000043, 0x00000007, func_802CB008, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0xFFFFFFC4, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFA5, 0x00000043, 0x00000006, PlaySoundAt, 0x00000071, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFC4, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF38, 0x00000000, 0x0000000F, 0x0000000C, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000063, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000005, TranslateGroup, 0x00000063, 0x00000000, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000063, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, PlaySoundAt, 0x00000067, 0x00000000, 0xFFFFFFAC, 0x00000000, 0xFFFFFFC4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000008, 0x0000000A, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000037, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000006, PlaySoundAt, 0x00000068, 0x00000000, 0xFFFFFFC8, 0x00000000, 0xFFFFFFC4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000008, 0x00000000, 0x00000003, 0x00000001, 0x00000018, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000003E, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000018, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000006, PlaySoundAt, 0x00000069, 0x00000000, 0xFFFFFFE4, 0x00000000, 0xFFFFFFC4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000008, 0x00000000, 0x00000003, 0x00000001, 0x00000015, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000045, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000006, PlaySoundAt, 0x0000006A, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFC4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000008, 0x00000000, 0x00000003, 0x00000001, 0x00000019, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000004C, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000019, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000006, PlaySoundAt, 0x0000006B, 0x00000000, 0x0000001C, 0x00000000, 0xFFFFFFC4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000008, 0x00000000, 0x00000003, 0x00000001, 0x00000016, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000016, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000006, PlaySoundAt, 0x0000006C, 0x00000000, 0x00000038, 0x00000000, 0xFFFFFFC4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000008, 0x00000000, 0x00000003, 0x00000001, 0x0000001A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000005A, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x0000001A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000006, PlaySoundAt, 0x0000006D, 0x00000000, 0x00000054, 0x00000000, 0xFFFFFFC4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000008, 0x00000000, 0x00000003, 0x00000001, 0x00000017, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000060, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000017, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000F, 0x7FFFFE00, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, func_802CB008, 0x00000000, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000001, func_8024019C_A029DC, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA5, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000047, 0x00000005, D_80242F70_A057B0, 0x00020000, 0xF9718882, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000063, 0x00000000, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000F, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000037, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000045, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000060, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000003E, 0x0000005A, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004C, 0x0000005A, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005A, 0x0000005A, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
+.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000001, func_80240180_A029C0, 0x00000043, 0x00000007, func_802CB008, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0xFFFFFFC4, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFA5, 0x00000043, 0x00000006, PlaySoundAt, 0x00000071, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFC4, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF38, 0x00000000, 0x0000000F, 0x0000000C, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000063, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000005, TranslateGroup, 0x00000063, 0x00000000, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000063, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, PlaySoundAt, 0x00000067, 0x00000000, 0xFFFFFFAC, 0x00000000, 0xFFFFFFC4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000008, 0x0000000A, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000037, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000006, PlaySoundAt, 0x00000068, 0x00000000, 0xFFFFFFC8, 0x00000000, 0xFFFFFFC4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000008, 0x00000000, 0x00000003, 0x00000001, 0x00000018, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000003E, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000018, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000006, PlaySoundAt, 0x00000069, 0x00000000, 0xFFFFFFE4, 0x00000000, 0xFFFFFFC4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000008, 0x00000000, 0x00000003, 0x00000001, 0x00000015, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000045, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000006, PlaySoundAt, 0x0000006A, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFC4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000008, 0x00000000, 0x00000003, 0x00000001, 0x00000019, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000004C, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000019, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000006, PlaySoundAt, 0x0000006B, 0x00000000, 0x0000001C, 0x00000000, 0xFFFFFFC4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000008, 0x00000000, 0x00000003, 0x00000001, 0x00000016, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000016, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000006, PlaySoundAt, 0x0000006C, 0x00000000, 0x00000038, 0x00000000, 0xFFFFFFC4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000008, 0x00000000, 0x00000003, 0x00000001, 0x0000001A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000005A, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x0000001A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000006, PlaySoundAt, 0x0000006D, 0x00000000, 0x00000054, 0x00000000, 0xFFFFFFC4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000008, 0x00000000, 0x00000003, 0x00000001, 0x00000017, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000060, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000017, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000F, 0x7FFFFE00, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, func_802CB008, 0x00000000, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000001, nok_14_UnsetCamera0Flag1000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA5, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000047, 0x00000005, D_80242F70_A057B0, 0x00020000, 0xF9718882, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000063, 0x00000000, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000F, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000037, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000045, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000060, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000003E, 0x0000005A, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004C, 0x0000005A, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005A, 0x0000005A, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s b/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s
index 1934561eff..a2f79762e1 100644
--- a/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s
+++ b/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s
@@ -93,7 +93,7 @@ glabel D_802430A8_DB04A8
 .word 0x00000000, 0x00220018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001A0000
 
 glabel D_802430D4_DB04D4
-.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000041A, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80241E04_DAF204, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8E80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000012C, 0xF24AAE80, 0xF24A5480, 0x0000000A, 0x00000002, 0xF5DE0258, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00260003, 0x00260001, 0x00000000, 0x000F003A, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00390005, 0x00390002, 0x00000000, 0x000F003B, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80241E20_DAF220, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000041A, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80241E04_DAF204, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8E80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000012C, 0xF24AAE80, 0xF24A5480, 0x0000000A, 0x00000002, 0xF5DE0258, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00260003, 0x00260001, 0x00000000, 0x000F003A, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00390005, 0x00390002, 0x00000000, 0x000F003B, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, omo_04_UnsetCamera0Flag1000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024324C_DB064C
 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405FCE, 0x00000001, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_omo/omo_07/DC0B80.data.s b/ver/us/asm/data/world/area_omo/omo_07/DC0B80.data.s
index 45c851a667..56abc1b047 100644
--- a/ver/us/asm/data/world/area_omo/omo_07/DC0B80.data.s
+++ b/ver/us/asm/data/world/area_omo/omo_07/DC0B80.data.s
@@ -54,7 +54,7 @@ glabel D_802447FC_DC1AAC
 .word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80244140_DC13F0, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802446DC_DC198C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244834_DC1AE4
-.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x000003DE, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80242E70_DC0120, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8E80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000012C, 0xF24AAE80, 0xF24A5480, 0x0000000A, 0x00000002, 0xF5DE0259, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x002B000B, 0x002B0001, 0x00000000, 0x000F003C, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x005A000A, 0x005A0002, 0x00000000, 0x000F003D, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80242E8C_DC013C, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x000003DE, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80242E70_DC0120, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8E80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000012C, 0xF24AAE80, 0xF24A5480, 0x0000000A, 0x00000002, 0xF5DE0259, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x002B000B, 0x002B0001, 0x00000000, 0x000F003C, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x005A000A, 0x005A0002, 0x00000000, 0x000F003D, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, omo_07_UnsetCamera0Flag1000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802449AC_DC1C5C
 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405FCF, 0x00000001, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_omo/omo_09/DD0900.data.s b/ver/us/asm/data/world/area_omo/omo_09/DD0900.data.s
index b4e40ee7f0..0dad537df0 100644
--- a/ver/us/asm/data/world/area_omo/omo_09/DD0900.data.s
+++ b/ver/us/asm/data/world/area_omo/omo_09/DD0900.data.s
@@ -51,7 +51,7 @@ glabel D_802455CC_DD229C
 .word 0x00000024, 0x00000002, 0xF971888B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF971888B, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E83, 0x00000001, 0x00000044, 0x00000001, D_8024520C_DD1EDC, 0x00000044, 0x00000001, D_8024534C_DD201C, 0x00000044, 0x00000001, D_8024548C_DD215C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802456FC_DD23CC
-.word 0x00000003, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B587, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B583, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0x00000000, 0x00000024, 0x00000002, 0xFD050F84, 0x00000000, 0x00000024, 0x00000002, 0xFD050F85, 0x00000000, 0x00000024, 0x00000002, 0xFD050F86, 0x00000000, 0x00000044, 0x00000001, D_80244204_DD0ED4, 0x00000044, 0x00000001, D_8024473C_DD140C, 0x00000044, 0x00000001, D_80244C74_DD1944, 0x00000008, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000005, IsPlayerWithin, 0x0000020D, 0x00000000, 0x000001F4, 0xF70F2E83, 0x0000000A, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000015, 0x00000008, 0x00000001, 0x00000064, 0x00000004, 0x00000001, 0x00000063, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFAA2B584, 0x00000027, 0x00000002, 0xFE363C81, 0xFAA2B585, 0x00000027, 0x00000002, 0xFE363C81, 0xFAA2B586, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B584, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B585, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000004, func_802402D0_DCCFA0, 0xFD050F80, 0xFD050F81, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B586, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000004, func_802402D0_DCCFA0, 0xFD050F80, 0xFFFFFFFF, 0xFD050F82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B585, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B586, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000004, func_802402D0_DCCFA0, 0xFFFFFFFF, 0xFD050F81, 0xFD050F82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B587, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000025, 0x00000B88, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, StopSound, 0x80000015, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, func_802402D0_DCCFA0, 0xFD050F80, 0xFD050F81, 0xFD050F82, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B587, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xF24BE280, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000001, 0x00000014, 0x00000001, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_80243CBC_DD098C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000001E5, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x000001CC, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000001FE, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x000001F1, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000217, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0x00000217, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000230, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0x0000023D, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000249, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0x00000262, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_80243CBC_DD098C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000001FE, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x000001F1, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000230, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0x0000023D, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xF24A8280, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_80243CBC_DD098C, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x000001E0, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0x00000096, 0x00000032, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_80243CBC_DD098C, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000217, 0x00000096, 0x00000032, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xF24A8280, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000014, 0x00000001, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_80243CBC_DD098C, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x000001E0, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0xFE363C81, 0x00000096, 0x00000032, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_80243CBC_DD098C, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x00000217, 0x00000096, 0x00000032, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xF24A8280, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000001, func_802435E8_DD02B8, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xFD050F8B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000F, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000003, 0x00000001, 0x00000063, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B583, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B584, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B585, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B586, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B587, 0x00000000, 0x00000024, 0x00000002, 0xF971888C, 0x00000000, 0x00000024, 0x00000002, 0xF971888D, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000000, 0x00000044, 0x00000001, D_802455CC_DD229C, 0x00000043, 0x00000003, EnableModel, 0x0000005F, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000065, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000061, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000066, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000063, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000067, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000003, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B587, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B583, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0x00000000, 0x00000024, 0x00000002, 0xFD050F84, 0x00000000, 0x00000024, 0x00000002, 0xFD050F85, 0x00000000, 0x00000024, 0x00000002, 0xFD050F86, 0x00000000, 0x00000044, 0x00000001, D_80244204_DD0ED4, 0x00000044, 0x00000001, D_8024473C_DD140C, 0x00000044, 0x00000001, D_80244C74_DD1944, 0x00000008, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000005, IsPlayerWithin, 0x0000020D, 0x00000000, 0x000001F4, 0xF70F2E83, 0x0000000A, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000015, 0x00000008, 0x00000001, 0x00000064, 0x00000004, 0x00000001, 0x00000063, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFAA2B584, 0x00000027, 0x00000002, 0xFE363C81, 0xFAA2B585, 0x00000027, 0x00000002, 0xFE363C81, 0xFAA2B586, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B584, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B585, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000004, func_802402D0_DCCFA0, 0xFD050F80, 0xFD050F81, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B586, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000004, func_802402D0_DCCFA0, 0xFD050F80, 0xFFFFFFFF, 0xFD050F82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B585, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B586, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000004, func_802402D0_DCCFA0, 0xFFFFFFFF, 0xFD050F81, 0xFD050F82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B587, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000025, 0x00000B88, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, StopSound, 0x80000015, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, func_802402D0_DCCFA0, 0xFD050F80, 0xFD050F81, 0xFD050F82, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B587, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xF24BE280, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000001, 0x00000014, 0x00000001, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_80243CBC_DD098C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000001E5, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x000001CC, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000001FE, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x000001F1, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000217, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0x00000217, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000230, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0x0000023D, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000249, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0x00000262, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_80243CBC_DD098C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000001FE, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x000001F1, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000230, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0x0000023D, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xF24A8280, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_80243CBC_DD098C, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x000001E0, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0x00000096, 0x00000032, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_80243CBC_DD098C, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000217, 0x00000096, 0x00000032, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xF24A8280, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000014, 0x00000001, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_80243CBC_DD098C, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x000001E0, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0xFE363C81, 0x00000096, 0x00000032, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_80243CBC_DD098C, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x00000217, 0x00000096, 0x00000032, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xF24A8280, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000001, omo_09_UnsetCamera0Flag1000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xFD050F8B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000F, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000003, 0x00000001, 0x00000063, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B583, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B584, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B585, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B586, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B587, 0x00000000, 0x00000024, 0x00000002, 0xF971888C, 0x00000000, 0x00000024, 0x00000002, 0xF971888D, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000000, 0x00000044, 0x00000001, D_802455CC_DD229C, 0x00000043, 0x00000003, EnableModel, 0x0000005F, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000065, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000061, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000066, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000063, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000067, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024636C_DD303C
 .word 0x0000005C, 0x0000005F, 0x00000061, 0x00000063, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000029, 0x0000005C, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002B, 0x0000005F, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002D, 0x00000061, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002F, 0x00000063, 0x00000047, 0x00000005, D_80243E04_DD0AD4, 0x00040000, 0x00000029, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243EEC_DD0BBC, 0x00040000, 0x0000002B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243FF4_DD0CC4, 0x00040000, 0x0000002D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802440FC_DD0DCC, 0x00040000, 0x0000002F, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000007, 0xFD050F80, 0x00000029, 0x00000002, 0xFD050F80, 0x0000002D, 0x00000043, 0x00000006, RotateModel, 0x0000006A, 0xFD050F80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006B, 0xFD050F80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006C, 0xFD050F80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006D, 0xFD050F80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000007, 0xFD050F81, 0x00000029, 0x00000002, 0xFD050F81, 0x0000002D, 0x00000043, 0x00000006, RotateModel, 0x0000006F, 0xFD050F81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000070, 0xFD050F81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000071, 0xFD050F81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000072, 0xFD050F81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000007, 0xFD050F82, 0x00000029, 0x00000002, 0xFD050F82, 0x0000002D, 0x00000043, 0x00000006, RotateModel, 0x00000074, 0xFD050F82, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000075, 0xFD050F82, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000076, 0xFD050F82, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000077, 0xFD050F82, 0x00000001, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B583, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B584, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B585, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B586, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B587, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000007A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000007B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000007C, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B587, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFBAA, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C81, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240534_DCD204, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000000, 0x00000044, 0x00000001, D_802455CC_DD229C, 0x00000043, 0x00000003, EnableModel, 0x0000005F, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000065, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000061, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000066, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000063, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000067, 0x00000000, 0x00000044, 0x00000001, D_802456FC_DD23CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_omo/omo_09/DD4150.data.s b/ver/us/asm/data/world/area_omo/omo_09/DD4150.data.s
index 697bc26461..0a8db2f4c0 100644
--- a/ver/us/asm/data/world/area_omo/omo_09/DD4150.data.s
+++ b/ver/us/asm/data/world/area_omo/omo_09/DD4150.data.s
@@ -78,7 +78,7 @@ glabel D_80247D90_DD4A60
 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405FFC, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xF8405FFC, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247E48_DD4B18
-.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000073A, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000096, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_802435CC_DD029C, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8E80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000012C, 0xF24AAE80, 0xF24A5480, 0x0000000A, 0x00000002, 0xF5DE025A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00310004, 0x00310004, 0x00000000, 0x000F003E, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00580008, 0x00580001, 0x00000000, 0x000F003F, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802435E8_DD02B8, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000073A, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000096, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_802435CC_DD029C, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8E80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000012C, 0xF24AAE80, 0xF24A5480, 0x0000000A, 0x00000002, 0xF5DE025A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00310004, 0x00310004, 0x00000000, 0x000F003E, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00580008, 0x00580001, 0x00000000, 0x000F003F, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, omo_09_UnsetCamera0Flag1000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247FE4_DD4CB4
 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405FD0, 0x00000001, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s b/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s
index 439ad346f1..33cf29312d 100644
--- a/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s
+++ b/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s
@@ -24,7 +24,7 @@ glabel D_80241018_DE0328
 .word 0x00000000, 0x00000000, 0x00000000, 0xC1C80000, 0xC0A00000, 0x00000000, 0xC2700000, 0x41F00000, 0x00000000, 0x00000000, 0x00000000, 0x41A00000, 0x00000000
 
 glabel D_8024104C_DE035C
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_802402DC_DDF5EC, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8280, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF2518280, 0xF24AB680, 0xF24A6280, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00060007, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000006, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, GetEncounterTriggerHitTier, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001F5, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x006D0003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x006D0004, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF9718890, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C82, 0x00000032, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE5, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFCE, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0x00000014, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0x00000014, 0xFE363C82, 0x00000014, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0x00000006, 0xFE363C82, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000048, 0x00000008, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xF9718890, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060005, 0x00060007, 0x00000000, 0x000F0058, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060005, 0x00060007, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060006, 0x00060001, 0x00000000, 0x000F0057, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00060001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x000F0059, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080011, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000001, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE7, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000003, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000001, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_80240FF4_DE0304, 0x00000003, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x0000000C, 0x00000012, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_80241018_DE0328, 0x00000003, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFF4, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, GetNextPathPos, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x000F005A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, omo_12_UnkFunc41, 0x00000001, 0x00000006, 0x00000043, 0x00000001, func_80240420_DDF730, 0x00000044, 0x00000001, 0x802405E4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018E, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80240608, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x000000C8, 0x000000FF, 0x0000002D, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x00000008, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, CloseMessage, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_802408A8_DDFBB8, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00060004, 0x00060001, 0x00000000, 0x000F005B, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000044, 0x00000001, D_80240F38_DE0248, 0x00000043, 0x00000001, func_802402F8_DDF608, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0x00000002, 0x00000043, 0x00000002, RemoveNpc, 0x00000003, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_802402DC_DDF5EC, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8280, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF2518280, 0xF24AB680, 0xF24A6280, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00060007, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000006, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, GetEncounterTriggerHitTier, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001F5, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x006D0003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x006D0004, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF9718890, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C82, 0x00000032, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE5, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFCE, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0x00000014, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0x00000014, 0xFE363C82, 0x00000014, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0x00000006, 0xFE363C82, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000048, 0x00000008, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xF9718890, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060005, 0x00060007, 0x00000000, 0x000F0058, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060005, 0x00060007, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060006, 0x00060001, 0x00000000, 0x000F0057, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00060001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x000F0059, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080011, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000001, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE7, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000003, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000001, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_80240FF4_DE0304, 0x00000003, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x0000000C, 0x00000012, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_80241018_DE0328, 0x00000003, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFF4, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, GetNextPathPos, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x000F005A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, omo_12_UnkFunc41, 0x00000001, 0x00000006, 0x00000043, 0x00000001, func_80240420_DDF730, 0x00000044, 0x00000001, 0x802405E4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018E, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80240608, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x000000C8, 0x000000FF, 0x0000002D, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x00000008, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, CloseMessage, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_802408A8_DDFBB8, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00060004, 0x00060001, 0x00000000, 0x000F005B, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000044, 0x00000001, D_80240F38_DE0248, 0x00000043, 0x00000001, omo_12_UnsetCamera0Flag1000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0x00000002, 0x00000043, 0x00000002, RemoveNpc, 0x00000003, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241E60_DE1170
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/nonmatchings/18F340/FXRecoverFP.s b/ver/us/asm/nonmatchings/18F340/FXRecoverFP.s
deleted file mode 100644
index c35e126479..0000000000
--- a/ver/us/asm/nonmatchings/18F340/FXRecoverFP.s
+++ /dev/null
@@ -1,52 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel FXRecoverFP
-/* 190548 80261C68 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 19054C 80261C6C AFB1001C */  sw        $s1, 0x1c($sp)
-/* 190550 80261C70 0080882D */  daddu     $s1, $a0, $zero
-/* 190554 80261C74 AFBF0028 */  sw        $ra, 0x28($sp)
-/* 190558 80261C78 AFB30024 */  sw        $s3, 0x24($sp)
-/* 19055C 80261C7C AFB20020 */  sw        $s2, 0x20($sp)
-/* 190560 80261C80 AFB00018 */  sw        $s0, 0x18($sp)
-/* 190564 80261C84 8E30000C */  lw        $s0, 0xc($s1)
-/* 190568 80261C88 8E050000 */  lw        $a1, ($s0)
-/* 19056C 80261C8C 0C0B1EAF */  jal       get_variable
-/* 190570 80261C90 26100004 */   addiu    $s0, $s0, 4
-/* 190574 80261C94 8E050000 */  lw        $a1, ($s0)
-/* 190578 80261C98 26100004 */  addiu     $s0, $s0, 4
-/* 19057C 80261C9C 0220202D */  daddu     $a0, $s1, $zero
-/* 190580 80261CA0 0C0B1EAF */  jal       get_variable
-/* 190584 80261CA4 0040982D */   daddu    $s3, $v0, $zero
-/* 190588 80261CA8 8E050000 */  lw        $a1, ($s0)
-/* 19058C 80261CAC 26100004 */  addiu     $s0, $s0, 4
-/* 190590 80261CB0 0220202D */  daddu     $a0, $s1, $zero
-/* 190594 80261CB4 0C0B1EAF */  jal       get_variable
-/* 190598 80261CB8 0040902D */   daddu    $s2, $v0, $zero
-/* 19059C 80261CBC 0220202D */  daddu     $a0, $s1, $zero
-/* 1905A0 80261CC0 8E050000 */  lw        $a1, ($s0)
-/* 1905A4 80261CC4 0C0B1EAF */  jal       get_variable
-/* 1905A8 80261CC8 0040802D */   daddu    $s0, $v0, $zero
-/* 1905AC 80261CCC 44930000 */  mtc1      $s3, $f0
-/* 1905B0 80261CD0 00000000 */  nop
-/* 1905B4 80261CD4 46800020 */  cvt.s.w   $f0, $f0
-/* 1905B8 80261CD8 44050000 */  mfc1      $a1, $f0
-/* 1905BC 80261CDC 44920000 */  mtc1      $s2, $f0
-/* 1905C0 80261CE0 00000000 */  nop
-/* 1905C4 80261CE4 46800020 */  cvt.s.w   $f0, $f0
-/* 1905C8 80261CE8 44060000 */  mfc1      $a2, $f0
-/* 1905CC 80261CEC 44900000 */  mtc1      $s0, $f0
-/* 1905D0 80261CF0 00000000 */  nop
-/* 1905D4 80261CF4 46800020 */  cvt.s.w   $f0, $f0
-/* 1905D8 80261CF8 44070000 */  mfc1      $a3, $f0
-/* 1905DC 80261CFC 24040001 */  addiu     $a0, $zero, 1
-/* 1905E0 80261D00 0C01C424 */  jal       func_80071090
-/* 1905E4 80261D04 AFA20010 */   sw       $v0, 0x10($sp)
-/* 1905E8 80261D08 8FBF0028 */  lw        $ra, 0x28($sp)
-/* 1905EC 80261D0C 8FB30024 */  lw        $s3, 0x24($sp)
-/* 1905F0 80261D10 8FB20020 */  lw        $s2, 0x20($sp)
-/* 1905F4 80261D14 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 1905F8 80261D18 8FB00018 */  lw        $s0, 0x18($sp)
-/* 1905FC 80261D1C 24020002 */  addiu     $v0, $zero, 2
-/* 190600 80261D20 03E00008 */  jr        $ra
-/* 190604 80261D24 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/18F340/FXRecoverHP.s b/ver/us/asm/nonmatchings/18F340/FXRecoverHP.s
deleted file mode 100644
index 250d999dcf..0000000000
--- a/ver/us/asm/nonmatchings/18F340/FXRecoverHP.s
+++ /dev/null
@@ -1,52 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel FXRecoverHP
-/* 190488 80261BA8 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 19048C 80261BAC AFB1001C */  sw        $s1, 0x1c($sp)
-/* 190490 80261BB0 0080882D */  daddu     $s1, $a0, $zero
-/* 190494 80261BB4 AFBF0028 */  sw        $ra, 0x28($sp)
-/* 190498 80261BB8 AFB30024 */  sw        $s3, 0x24($sp)
-/* 19049C 80261BBC AFB20020 */  sw        $s2, 0x20($sp)
-/* 1904A0 80261BC0 AFB00018 */  sw        $s0, 0x18($sp)
-/* 1904A4 80261BC4 8E30000C */  lw        $s0, 0xc($s1)
-/* 1904A8 80261BC8 8E050000 */  lw        $a1, ($s0)
-/* 1904AC 80261BCC 0C0B1EAF */  jal       get_variable
-/* 1904B0 80261BD0 26100004 */   addiu    $s0, $s0, 4
-/* 1904B4 80261BD4 8E050000 */  lw        $a1, ($s0)
-/* 1904B8 80261BD8 26100004 */  addiu     $s0, $s0, 4
-/* 1904BC 80261BDC 0220202D */  daddu     $a0, $s1, $zero
-/* 1904C0 80261BE0 0C0B1EAF */  jal       get_variable
-/* 1904C4 80261BE4 0040982D */   daddu    $s3, $v0, $zero
-/* 1904C8 80261BE8 8E050000 */  lw        $a1, ($s0)
-/* 1904CC 80261BEC 26100004 */  addiu     $s0, $s0, 4
-/* 1904D0 80261BF0 0220202D */  daddu     $a0, $s1, $zero
-/* 1904D4 80261BF4 0C0B1EAF */  jal       get_variable
-/* 1904D8 80261BF8 0040902D */   daddu    $s2, $v0, $zero
-/* 1904DC 80261BFC 0220202D */  daddu     $a0, $s1, $zero
-/* 1904E0 80261C00 8E050000 */  lw        $a1, ($s0)
-/* 1904E4 80261C04 0C0B1EAF */  jal       get_variable
-/* 1904E8 80261C08 0040802D */   daddu    $s0, $v0, $zero
-/* 1904EC 80261C0C 44930000 */  mtc1      $s3, $f0
-/* 1904F0 80261C10 00000000 */  nop
-/* 1904F4 80261C14 46800020 */  cvt.s.w   $f0, $f0
-/* 1904F8 80261C18 44050000 */  mfc1      $a1, $f0
-/* 1904FC 80261C1C 44920000 */  mtc1      $s2, $f0
-/* 190500 80261C20 00000000 */  nop
-/* 190504 80261C24 46800020 */  cvt.s.w   $f0, $f0
-/* 190508 80261C28 44060000 */  mfc1      $a2, $f0
-/* 19050C 80261C2C 44900000 */  mtc1      $s0, $f0
-/* 190510 80261C30 00000000 */  nop
-/* 190514 80261C34 46800020 */  cvt.s.w   $f0, $f0
-/* 190518 80261C38 44070000 */  mfc1      $a3, $f0
-/* 19051C 80261C3C 0000202D */  daddu     $a0, $zero, $zero
-/* 190520 80261C40 0C01C424 */  jal       func_80071090
-/* 190524 80261C44 AFA20010 */   sw       $v0, 0x10($sp)
-/* 190528 80261C48 8FBF0028 */  lw        $ra, 0x28($sp)
-/* 19052C 80261C4C 8FB30024 */  lw        $s3, 0x24($sp)
-/* 190530 80261C50 8FB20020 */  lw        $s2, 0x20($sp)
-/* 190534 80261C54 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 190538 80261C58 8FB00018 */  lw        $s0, 0x18($sp)
-/* 19053C 80261C5C 24020002 */  addiu     $v0, $zero, 2
-/* 190540 80261C60 03E00008 */  jr        $ra
-/* 190544 80261C64 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/18F340/activate_defend_command.s b/ver/us/asm/nonmatchings/18F340/activate_defend_command.s
deleted file mode 100644
index 202bd21542..0000000000
--- a/ver/us/asm/nonmatchings/18F340/activate_defend_command.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel activate_defend_command
-/* 18F3E4 80260B04 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 18F3E8 80260B08 AFB00010 */  sw        $s0, 0x10($sp)
-/* 18F3EC 80260B0C 3C10800E */  lui       $s0, %hi(gBattleStatus)
-/* 18F3F0 80260B10 2610C070 */  addiu     $s0, $s0, %lo(gBattleStatus)
-/* 18F3F4 80260B14 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 18F3F8 80260B18 AFB10014 */  sw        $s1, 0x14($sp)
-/* 18F3FC 80260B1C 8E0200D8 */  lw        $v0, 0xd8($s0)
-/* 18F400 80260B20 0C098EF2 */  jal       deduct_current_move_fp
-/* 18F404 80260B24 8C5101F4 */   lw       $s1, 0x1f4($v0)
-/* 18F408 80260B28 3C060001 */  lui       $a2, 1
-/* 18F40C 80260B2C 34C60014 */  ori       $a2, $a2, 0x14
-/* 18F410 80260B30 3C030040 */  lui       $v1, 0x40
-/* 18F414 80260B34 0000202D */  daddu     $a0, $zero, $zero
-/* 18F418 80260B38 8E020000 */  lw        $v0, ($s0)
-/* 18F41C 80260B3C 0080282D */  daddu     $a1, $a0, $zero
-/* 18F420 80260B40 00431025 */  or        $v0, $v0, $v1
-/* 18F424 80260B44 AE020000 */  sw        $v0, ($s0)
-/* 18F428 80260B48 3C028028 */  lui       $v0, %hi(bMarioDefendAnims)
-/* 18F42C 80260B4C 244232D4 */  addiu     $v0, $v0, %lo(bMarioDefendAnims)
-/* 18F430 80260B50 0C098F3F */  jal       set_animation
-/* 18F434 80260B54 AE220094 */   sw       $v0, 0x94($s1)
-/* 18F438 80260B58 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 18F43C 80260B5C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 18F440 80260B60 8FB00010 */  lw        $s0, 0x10($sp)
-/* 18F444 80260B64 24020002 */  addiu     $v0, $zero, 2
-/* 18F448 80260B68 03E00008 */  jr        $ra
-/* 18F44C 80260B6C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/18F340/func_80260A60.s b/ver/us/asm/nonmatchings/18F340/func_80260A60.s
deleted file mode 100644
index 24d3c16261..0000000000
--- a/ver/us/asm/nonmatchings/18F340/func_80260A60.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80260A60
-/* 18F340 80260A60 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 18F344 80260A64 3C02800E */  lui       $v0, %hi(gBattleStatus)
-/* 18F348 80260A68 2442C070 */  addiu     $v0, $v0, %lo(gBattleStatus)
-/* 18F34C 80260A6C 0040202D */  daddu     $a0, $v0, $zero
-/* 18F350 80260A70 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 18F354 80260A74 8C820004 */  lw        $v0, 4($a0)
-/* 18F358 80260A78 8C8300D8 */  lw        $v1, 0xd8($a0)
-/* 18F35C 80260A7C 30420040 */  andi      $v0, $v0, 0x40
-/* 18F360 80260A80 8C6301F4 */  lw        $v1, 0x1f4($v1)
-/* 18F364 80260A84 1040000A */  beqz      $v0, .L80260AB0
-/* 18F368 80260A88 3C06000A */   lui      $a2, 0xa
-/* 18F36C 80260A8C 3C028028 */  lui       $v0, %hi(bPeachIdleAnims)
-/* 18F370 80260A90 2442340C */  addiu     $v0, $v0, %lo(bPeachIdleAnims)
-/* 18F374 80260A94 AC620094 */  sw        $v0, 0x94($v1)
-/* 18F378 80260A98 34C60002 */  ori       $a2, $a2, 2
-/* 18F37C 80260A9C 0000202D */  daddu     $a0, $zero, $zero
-/* 18F380 80260AA0 0C098F3F */  jal       set_animation
-/* 18F384 80260AA4 0080282D */   daddu    $a1, $a0, $zero
-/* 18F388 80260AA8 080982B2 */  j         .L80260AC8
-/* 18F38C 80260AAC 00000000 */   nop
-.L80260AB0:
-/* 18F390 80260AB0 8082009A */  lb        $v0, 0x9a($a0)
-/* 18F394 80260AB4 14400004 */  bnez      $v0, .L80260AC8
-/* 18F398 80260AB8 00000000 */   nop
-/* 18F39C 80260ABC 3C028028 */  lui       $v0, %hi(bMarioIdleAnims)
-/* 18F3A0 80260AC0 24423238 */  addiu     $v0, $v0, %lo(bMarioIdleAnims)
-/* 18F3A4 80260AC4 AC620094 */  sw        $v0, 0x94($v1)
-.L80260AC8:
-/* 18F3A8 80260AC8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 18F3AC 80260ACC 03E00008 */  jr        $ra
-/* 18F3B0 80260AD0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/18F340/func_80260B70.s b/ver/us/asm/nonmatchings/18F340/func_80260B70.s
deleted file mode 100644
index 41eff556a6..0000000000
--- a/ver/us/asm/nonmatchings/18F340/func_80260B70.s
+++ /dev/null
@@ -1,38 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80260B70
-/* 18F450 80260B70 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 18F454 80260B74 AFB1001C */  sw        $s1, 0x1c($sp)
-/* 18F458 80260B78 0080882D */  daddu     $s1, $a0, $zero
-/* 18F45C 80260B7C AFB00018 */  sw        $s0, 0x18($sp)
-/* 18F460 80260B80 3C10800E */  lui       $s0, %hi(gBattleStatus+0xD8)
-/* 18F464 80260B84 8E10C148 */  lw        $s0, %lo(gBattleStatus+0xD8)($s0)
-/* 18F468 80260B88 3C0141A0 */  lui       $at, 0x41a0
-/* 18F46C 80260B8C 44811000 */  mtc1      $at, $f2
-/* 18F470 80260B90 24040002 */  addiu     $a0, $zero, 2
-/* 18F474 80260B94 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 18F478 80260B98 C6040148 */  lwc1      $f4, 0x148($s0)
-/* 18F47C 80260B9C C600014C */  lwc1      $f0, 0x14c($s0)
-/* 18F480 80260BA0 46022100 */  add.s     $f4, $f4, $f2
-/* 18F484 80260BA4 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 18F488 80260BA8 8E060144 */  lw        $a2, 0x144($s0)
-/* 18F48C 80260BAC 44072000 */  mfc1      $a3, $f4
-/* 18F490 80260BB0 0C0999FC */  jal       func_802667F0
-/* 18F494 80260BB4 0200282D */   daddu    $a1, $s0, $zero
-/* 18F498 80260BB8 0C05272D */  jal       sfx_play_sound
-/* 18F49C 80260BBC 240403FC */   addiu    $a0, $zero, 0x3fc
-/* 18F4A0 80260BC0 AE200084 */  sw        $zero, 0x84($s1)
-/* 18F4A4 80260BC4 92020210 */  lbu       $v0, 0x210($s0)
-/* 18F4A8 80260BC8 2442FFFD */  addiu     $v0, $v0, -3
-/* 18F4AC 80260BCC 2C420006 */  sltiu     $v0, $v0, 6
-/* 18F4B0 80260BD0 10400002 */  beqz      $v0, .L80260BDC
-/* 18F4B4 80260BD4 24020001 */   addiu    $v0, $zero, 1
-/* 18F4B8 80260BD8 AE220084 */  sw        $v0, 0x84($s1)
-.L80260BDC:
-/* 18F4BC 80260BDC 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 18F4C0 80260BE0 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 18F4C4 80260BE4 8FB00018 */  lw        $s0, 0x18($sp)
-/* 18F4C8 80260BE8 24020002 */  addiu     $v0, $zero, 2
-/* 18F4CC 80260BEC 03E00008 */  jr        $ra
-/* 18F4D0 80260BF0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/18F340/func_80260E90.s b/ver/us/asm/nonmatchings/18F340/func_80260E90.s
deleted file mode 100644
index b1debb2aba..0000000000
--- a/ver/us/asm/nonmatchings/18F340/func_80260E90.s
+++ /dev/null
@@ -1,125 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80260E90
-/* 18F770 80260E90 27BDFF98 */  addiu     $sp, $sp, -0x68
-/* 18F774 80260E94 AFB50044 */  sw        $s5, 0x44($sp)
-/* 18F778 80260E98 0080A82D */  daddu     $s5, $a0, $zero
-/* 18F77C 80260E9C AFB10034 */  sw        $s1, 0x34($sp)
-/* 18F780 80260EA0 0000882D */  daddu     $s1, $zero, $zero
-/* 18F784 80260EA4 2405001D */  addiu     $a1, $zero, 0x1d
-/* 18F788 80260EA8 F7B40050 */  sdc1      $f20, 0x50($sp)
-/* 18F78C 80260EAC 4480A000 */  mtc1      $zero, $f20
-/* 18F790 80260EB0 3C02800E */  lui       $v0, %hi(gBattleStatus)
-/* 18F794 80260EB4 2442C070 */  addiu     $v0, $v0, %lo(gBattleStatus)
-/* 18F798 80260EB8 AFBF0048 */  sw        $ra, 0x48($sp)
-/* 18F79C 80260EBC AFB40040 */  sw        $s4, 0x40($sp)
-/* 18F7A0 80260EC0 AFB3003C */  sw        $s3, 0x3c($sp)
-/* 18F7A4 80260EC4 AFB20038 */  sw        $s2, 0x38($sp)
-/* 18F7A8 80260EC8 AFB00030 */  sw        $s0, 0x30($sp)
-/* 18F7AC 80260ECC F7B80060 */  sdc1      $f24, 0x60($sp)
-/* 18F7B0 80260ED0 F7B60058 */  sdc1      $f22, 0x58($sp)
-/* 18F7B4 80260ED4 8C5300D8 */  lw        $s3, 0xd8($v0)
-/* 18F7B8 80260ED8 8442017A */  lh        $v0, 0x17a($v0)
-/* 18F7BC 80260EDC 0260202D */  daddu     $a0, $s3, $zero
-/* 18F7C0 80260EE0 00021140 */  sll       $v0, $v0, 5
-/* 18F7C4 80260EE4 3C128008 */  lui       $s2, %hi(gItemTable+0xC)
-/* 18F7C8 80260EE8 02429021 */  addu      $s2, $s2, $v0
-/* 18F7CC 80260EEC 865278EC */  lh        $s2, %lo(gItemTable+0xC)($s2)
-/* 18F7D0 80260EF0 92620191 */  lbu       $v0, 0x191($s3)
-/* 18F7D4 80260EF4 C6620148 */  lwc1      $f2, 0x148($s3)
-/* 18F7D8 80260EF8 44820000 */  mtc1      $v0, $f0
-/* 18F7DC 80260EFC 00000000 */  nop
-/* 18F7E0 80260F00 46800020 */  cvt.s.w   $f0, $f0
-/* 18F7E4 80260F04 0C099CAB */  jal       heroes_is_ability_active
-/* 18F7E8 80260F08 46001580 */   add.s    $f22, $f2, $f0
-/* 18F7EC 80260F0C 50400048 */  beql      $v0, $zero, .L80261030
-/* 18F7F0 80260F10 AEB10084 */   sw       $s1, 0x84($s5)
-/* 18F7F4 80260F14 1A400045 */  blez      $s2, .L8026102C
-/* 18F7F8 80260F18 3C0451EB */   lui      $a0, 0x51eb
-/* 18F7FC 80260F1C 3484851F */  ori       $a0, $a0, 0x851f
-/* 18F800 80260F20 00121880 */  sll       $v1, $s2, 2
-/* 18F804 80260F24 00721821 */  addu      $v1, $v1, $s2
-/* 18F808 80260F28 00031100 */  sll       $v0, $v1, 4
-/* 18F80C 80260F2C 00431023 */  subu      $v0, $v0, $v1
-/* 18F810 80260F30 24420063 */  addiu     $v0, $v0, 0x63
-/* 18F814 80260F34 00440018 */  mult      $v0, $a0
-/* 18F818 80260F38 000217C3 */  sra       $v0, $v0, 0x1f
-/* 18F81C 80260F3C 00004010 */  mfhi      $t0
-/* 18F820 80260F40 00081943 */  sra       $v1, $t0, 5
-/* 18F824 80260F44 00629023 */  subu      $s2, $v1, $v0
-/* 18F828 80260F48 0232102A */  slt       $v0, $s1, $s2
-/* 18F82C 80260F4C 10400019 */  beqz      $v0, .L80260FB4
-/* 18F830 80260F50 0220802D */   daddu    $s0, $s1, $zero
-/* 18F834 80260F54 24140017 */  addiu     $s4, $zero, 0x17
-/* 18F838 80260F58 3C0141F0 */  lui       $at, 0x41f0
-/* 18F83C 80260F5C 4481C000 */  mtc1      $at, $f24
-/* 18F840 80260F60 24110001 */  addiu     $s1, $zero, 1
-.L80260F64:
-/* 18F844 80260F64 C6600144 */  lwc1      $f0, 0x144($s3)
-/* 18F848 80260F68 C662014C */  lwc1      $f2, 0x14c($s3)
-/* 18F84C 80260F6C 4600A10D */  trunc.w.s $f4, $f20
-/* 18F850 80260F70 E7A40018 */  swc1      $f4, 0x18($sp)
-/* 18F854 80260F74 24040157 */  addiu     $a0, $zero, 0x157
-/* 18F858 80260F78 AFB10014 */  sw        $s1, 0x14($sp)
-/* 18F85C 80260F7C 26310003 */  addiu     $s1, $s1, 3
-/* 18F860 80260F80 26100001 */  addiu     $s0, $s0, 1
-/* 18F864 80260F84 4406B000 */  mfc1      $a2, $f22
-/* 18F868 80260F88 44050000 */  mfc1      $a1, $f0
-/* 18F86C 80260F8C 44071000 */  mfc1      $a3, $f2
-/* 18F870 80260F90 4618A500 */  add.s     $f20, $f20, $f24
-/* 18F874 80260F94 AFB40010 */  sw        $s4, 0x10($sp)
-/* 18F878 80260F98 0C04C4FD */  jal       make_item_entity
-/* 18F87C 80260F9C AFA0001C */   sw       $zero, 0x1c($sp)
-/* 18F880 80260FA0 0C03A830 */  jal       add_coins
-/* 18F884 80260FA4 24040001 */   addiu    $a0, $zero, 1
-/* 18F888 80260FA8 0212102A */  slt       $v0, $s0, $s2
-/* 18F88C 80260FAC 1440FFED */  bnez      $v0, .L80260F64
-/* 18F890 80260FB0 00000000 */   nop
-.L80260FB4:
-/* 18F894 80260FB4 00101040 */  sll       $v0, $s0, 1
-/* 18F898 80260FB8 00501021 */  addu      $v0, $v0, $s0
-/* 18F89C 80260FBC 2451001E */  addiu     $s1, $v0, 0x1e
-/* 18F8A0 80260FC0 C6600144 */  lwc1      $f0, 0x144($s3)
-/* 18F8A4 80260FC4 C6760148 */  lwc1      $f22, 0x148($s3)
-/* 18F8A8 80260FC8 C662014C */  lwc1      $f2, 0x14c($s3)
-/* 18F8AC 80260FCC 3C048007 */  lui       $a0, %hi(gCurrentCameraID)
-/* 18F8B0 80260FD0 8C847410 */  lw        $a0, %lo(gCurrentCameraID)($a0)
-/* 18F8B4 80260FD4 27A20020 */  addiu     $v0, $sp, 0x20
-/* 18F8B8 80260FD8 AFA20010 */  sw        $v0, 0x10($sp)
-/* 18F8BC 80260FDC 27A20024 */  addiu     $v0, $sp, 0x24
-/* 18F8C0 80260FE0 AFA20014 */  sw        $v0, 0x14($sp)
-/* 18F8C4 80260FE4 44050000 */  mfc1      $a1, $f0
-/* 18F8C8 80260FE8 4406B000 */  mfc1      $a2, $f22
-/* 18F8CC 80260FEC 44071000 */  mfc1      $a3, $f2
-/* 18F8D0 80260FF0 27A20028 */  addiu     $v0, $sp, 0x28
-/* 18F8D4 80260FF4 0C00B94E */  jal       get_screen_coords
-/* 18F8D8 80260FF8 AFA20018 */   sw       $v0, 0x18($sp)
-/* 18F8DC 80260FFC 3C048011 */  lui       $a0, %hi(D_80108A64)
-/* 18F8E0 80261000 24848A64 */  addiu     $a0, $a0, %lo(D_80108A64)
-/* 18F8E4 80261004 0C050529 */  jal       create_icon
-/* 18F8E8 80261008 00000000 */   nop
-/* 18F8EC 8026100C 8FA50020 */  lw        $a1, 0x20($sp)
-/* 18F8F0 80261010 8FA60024 */  lw        $a2, 0x24($sp)
-/* 18F8F4 80261014 0040202D */  daddu     $a0, $v0, $zero
-/* 18F8F8 80261018 3C01802A */  lui       $at, %hi(D_8029FBA0)
-/* 18F8FC 8026101C AC24FBA0 */  sw        $a0, %lo(D_8029FBA0)($at)
-/* 18F900 80261020 24A50024 */  addiu     $a1, $a1, 0x24
-/* 18F904 80261024 0C051261 */  jal       set_icon_render_pos
-/* 18F908 80261028 24C6FFC1 */   addiu    $a2, $a2, -0x3f
-.L8026102C:
-/* 18F90C 8026102C AEB10084 */  sw        $s1, 0x84($s5)
-.L80261030:
-/* 18F910 80261030 8FBF0048 */  lw        $ra, 0x48($sp)
-/* 18F914 80261034 8FB50044 */  lw        $s5, 0x44($sp)
-/* 18F918 80261038 8FB40040 */  lw        $s4, 0x40($sp)
-/* 18F91C 8026103C 8FB3003C */  lw        $s3, 0x3c($sp)
-/* 18F920 80261040 8FB20038 */  lw        $s2, 0x38($sp)
-/* 18F924 80261044 8FB10034 */  lw        $s1, 0x34($sp)
-/* 18F928 80261048 8FB00030 */  lw        $s0, 0x30($sp)
-/* 18F92C 8026104C D7B80060 */  ldc1      $f24, 0x60($sp)
-/* 18F930 80261050 D7B60058 */  ldc1      $f22, 0x58($sp)
-/* 18F934 80261054 D7B40050 */  ldc1      $f20, 0x50($sp)
-/* 18F938 80261058 24020002 */  addiu     $v0, $zero, 2
-/* 18F93C 8026105C 03E00008 */  jr        $ra
-/* 18F940 80261060 27BD0068 */   addiu    $sp, $sp, 0x68
diff --git a/ver/us/asm/nonmatchings/18F340/func_80261064.s b/ver/us/asm/nonmatchings/18F340/func_80261064.s
deleted file mode 100644
index ac74225ad9..0000000000
--- a/ver/us/asm/nonmatchings/18F340/func_80261064.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80261064
-/* 18F944 80261064 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 18F948 80261068 3C03800E */  lui       $v1, %hi(gBattleStatus)
-/* 18F94C 8026106C 2463C070 */  addiu     $v1, $v1, %lo(gBattleStatus)
-/* 18F950 80261070 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 18F954 80261074 AFB00010 */  sw        $s0, 0x10($sp)
-/* 18F958 80261078 8462017A */  lh        $v0, 0x17a($v1)
-/* 18F95C 8026107C 8C6400D8 */  lw        $a0, 0xd8($v1)
-/* 18F960 80261080 00021140 */  sll       $v0, $v0, 5
-/* 18F964 80261084 3C108008 */  lui       $s0, %hi(gItemTable+0xC)
-/* 18F968 80261088 02028021 */  addu      $s0, $s0, $v0
-/* 18F96C 8026108C 861078EC */  lh        $s0, %lo(gItemTable+0xC)($s0)
-/* 18F970 80261090 0C099CAB */  jal       heroes_is_ability_active
-/* 18F974 80261094 2405001D */   addiu    $a1, $zero, 0x1d
-/* 18F978 80261098 10400007 */  beqz      $v0, .L802610B8
-/* 18F97C 8026109C 00000000 */   nop
-/* 18F980 802610A0 1A000005 */  blez      $s0, .L802610B8
-/* 18F984 802610A4 00000000 */   nop
-/* 18F988 802610A8 3C04802A */  lui       $a0, %hi(D_8029FBA0)
-/* 18F98C 802610AC 8C84FBA0 */  lw        $a0, %lo(D_8029FBA0)($a0)
-/* 18F990 802610B0 0C05123D */  jal       free_icon
-/* 18F994 802610B4 00000000 */   nop
-.L802610B8:
-/* 18F998 802610B8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 18F99C 802610BC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 18F9A0 802610C0 24020002 */  addiu     $v0, $zero, 2
-/* 18F9A4 802610C4 03E00008 */  jr        $ra
-/* 18F9A8 802610C8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/18F340/func_802610CC.s b/ver/us/asm/nonmatchings/18F340/func_802610CC.s
deleted file mode 100644
index f46a328310..0000000000
--- a/ver/us/asm/nonmatchings/18F340/func_802610CC.s
+++ /dev/null
@@ -1,43 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802610CC
-/* 18F9AC 802610CC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 18F9B0 802610D0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 18F9B4 802610D4 0080802D */  daddu     $s0, $a0, $zero
-/* 18F9B8 802610D8 10A0000E */  beqz      $a1, .L80261114
-/* 18F9BC 802610DC AFBF0014 */   sw       $ra, 0x14($sp)
-/* 18F9C0 802610E0 0C04760B */  jal       func_8011D82C
-/* 18F9C4 802610E4 24040001 */   addiu    $a0, $zero, 1
-/* 18F9C8 802610E8 0000202D */  daddu     $a0, $zero, $zero
-/* 18F9CC 802610EC 0080282D */  daddu     $a1, $a0, $zero
-/* 18F9D0 802610F0 0080302D */  daddu     $a2, $a0, $zero
-/* 18F9D4 802610F4 0080382D */  daddu     $a3, $a0, $zero
-/* 18F9D8 802610F8 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* 18F9DC 802610FC 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* 18F9E0 80261100 24030001 */  addiu     $v1, $zero, 1
-/* 18F9E4 80261104 0C046F97 */  jal       set_background_color_blend
-/* 18F9E8 80261108 A0430000 */   sb       $v1, ($v0)
-/* 18F9EC 8026110C 24020014 */  addiu     $v0, $zero, 0x14
-/* 18F9F0 80261110 AE020070 */  sw        $v0, 0x70($s0)
-.L80261114:
-/* 18F9F4 80261114 0000202D */  daddu     $a0, $zero, $zero
-/* 18F9F8 80261118 0080282D */  daddu     $a1, $a0, $zero
-/* 18F9FC 8026111C 0080302D */  daddu     $a2, $a0, $zero
-/* 18FA00 80261120 8E030070 */  lw        $v1, 0x70($s0)
-/* 18FA04 80261124 24020014 */  addiu     $v0, $zero, 0x14
-/* 18FA08 80261128 00431023 */  subu      $v0, $v0, $v1
-/* 18FA0C 8026112C 00023840 */  sll       $a3, $v0, 1
-/* 18FA10 80261130 00E23821 */  addu      $a3, $a3, $v0
-/* 18FA14 80261134 00073880 */  sll       $a3, $a3, 2
-/* 18FA18 80261138 0C046F97 */  jal       set_background_color_blend
-/* 18FA1C 8026113C 30E700FC */   andi     $a3, $a3, 0xfc
-/* 18FA20 80261140 8E020070 */  lw        $v0, 0x70($s0)
-/* 18FA24 80261144 2442FFFF */  addiu     $v0, $v0, -1
-/* 18FA28 80261148 AE020070 */  sw        $v0, 0x70($s0)
-/* 18FA2C 8026114C 2C420001 */  sltiu     $v0, $v0, 1
-/* 18FA30 80261150 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 18FA34 80261154 8FB00010 */  lw        $s0, 0x10($sp)
-/* 18FA38 80261158 00021040 */  sll       $v0, $v0, 1
-/* 18FA3C 8026115C 03E00008 */  jr        $ra
-/* 18FA40 80261160 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/18F340/func_80261164.s b/ver/us/asm/nonmatchings/18F340/func_80261164.s
deleted file mode 100644
index e0a87bd3a9..0000000000
--- a/ver/us/asm/nonmatchings/18F340/func_80261164.s
+++ /dev/null
@@ -1,40 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80261164
-/* 18FA44 80261164 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 18FA48 80261168 AFB00010 */  sw        $s0, 0x10($sp)
-/* 18FA4C 8026116C 0080802D */  daddu     $s0, $a0, $zero
-/* 18FA50 80261170 10A00004 */  beqz      $a1, .L80261184
-/* 18FA54 80261174 AFBF0014 */   sw       $ra, 0x14($sp)
-/* 18FA58 80261178 24020014 */  addiu     $v0, $zero, 0x14
-/* 18FA5C 8026117C 0C093980 */  jal       unfreeze_cam
-/* 18FA60 80261180 AE020070 */   sw       $v0, 0x70($s0)
-.L80261184:
-/* 18FA64 80261184 0000202D */  daddu     $a0, $zero, $zero
-/* 18FA68 80261188 0080282D */  daddu     $a1, $a0, $zero
-/* 18FA6C 8026118C 8E020070 */  lw        $v0, 0x70($s0)
-/* 18FA70 80261190 0080302D */  daddu     $a2, $a0, $zero
-/* 18FA74 80261194 00023840 */  sll       $a3, $v0, 1
-/* 18FA78 80261198 00E23821 */  addu      $a3, $a3, $v0
-/* 18FA7C 8026119C 00073880 */  sll       $a3, $a3, 2
-/* 18FA80 802611A0 0C046F97 */  jal       set_background_color_blend
-/* 18FA84 802611A4 30E700FC */   andi     $a3, $a3, 0xfc
-/* 18FA88 802611A8 8E020070 */  lw        $v0, 0x70($s0)
-/* 18FA8C 802611AC 2442FFFF */  addiu     $v0, $v0, -1
-/* 18FA90 802611B0 10400003 */  beqz      $v0, .L802611C0
-/* 18FA94 802611B4 AE020070 */   sw       $v0, 0x70($s0)
-/* 18FA98 802611B8 08098476 */  j         .L802611D8
-/* 18FA9C 802611BC 0000102D */   daddu    $v0, $zero, $zero
-.L802611C0:
-/* 18FAA0 802611C0 0000202D */  daddu     $a0, $zero, $zero
-/* 18FAA4 802611C4 0080282D */  daddu     $a1, $a0, $zero
-/* 18FAA8 802611C8 0080302D */  daddu     $a2, $a0, $zero
-/* 18FAAC 802611CC 0C046F97 */  jal       set_background_color_blend
-/* 18FAB0 802611D0 0080382D */   daddu    $a3, $a0, $zero
-/* 18FAB4 802611D4 24020002 */  addiu     $v0, $zero, 2
-.L802611D8:
-/* 18FAB8 802611D8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 18FABC 802611DC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 18FAC0 802611E0 03E00008 */  jr        $ra
-/* 18FAC4 802611E4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/18F340/func_802611E8.s b/ver/us/asm/nonmatchings/18F340/func_802611E8.s
deleted file mode 100644
index b77b1b717e..0000000000
--- a/ver/us/asm/nonmatchings/18F340/func_802611E8.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802611E8
-/* 18FAC8 802611E8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 18FACC 802611EC AFB20018 */  sw        $s2, 0x18($sp)
-/* 18FAD0 802611F0 0080902D */  daddu     $s2, $a0, $zero
-/* 18FAD4 802611F4 3C048011 */  lui       $a0, %hi(gPlayerData)
-/* 18FAD8 802611F8 2484F290 */  addiu     $a0, $a0, %lo(gPlayerData)
-/* 18FADC 802611FC AFB10014 */  sw        $s1, 0x14($sp)
-/* 18FAE0 80261200 3C118009 */  lui       $s1, %hi(gItemTable+0x12A0)
-/* 18FAE4 80261204 26318B80 */  addiu     $s1, $s1, %lo(gItemTable+0x12A0)
-/* 18FAE8 80261208 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 18FAEC 8026120C AFB00010 */  sw        $s0, 0x10($sp)
-/* 18FAF0 80261210 90820002 */  lbu       $v0, 2($a0)
-/* 18FAF4 80261214 9223001B */  lbu       $v1, 0x1b($s1)
-/* 18FAF8 80261218 00431021 */  addu      $v0, $v0, $v1
-/* 18FAFC 8026121C A0820002 */  sb        $v0, 2($a0)
-/* 18FB00 80261220 00021600 */  sll       $v0, $v0, 0x18
-/* 18FB04 80261224 80830003 */  lb        $v1, 3($a0)
-/* 18FB08 80261228 00021603 */  sra       $v0, $v0, 0x18
-/* 18FB0C 8026122C 0062182A */  slt       $v1, $v1, $v0
-/* 18FB10 80261230 90820003 */  lbu       $v0, 3($a0)
-/* 18FB14 80261234 10600002 */  beqz      $v1, .L80261240
-/* 18FB18 80261238 0080802D */   daddu    $s0, $a0, $zero
-/* 18FB1C 8026123C A0820002 */  sb        $v0, 2($a0)
-.L80261240:
-/* 18FB20 80261240 0C039D91 */  jal       find_item
-/* 18FB24 80261244 24040095 */   addiu    $a0, $zero, 0x95
-/* 18FB28 80261248 00021040 */  sll       $v0, $v0, 1
-/* 18FB2C 8026124C 00501021 */  addu      $v0, $v0, $s0
-/* 18FB30 80261250 0C039DB3 */  jal       sort_items
-/* 18FB34 80261254 A44001B4 */   sh       $zero, 0x1b4($v0)
-/* 18FB38 80261258 8223001B */  lb        $v1, 0x1b($s1)
-/* 18FB3C 8026125C AE430090 */  sw        $v1, 0x90($s2)
-/* 18FB40 80261260 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 18FB44 80261264 8FB20018 */  lw        $s2, 0x18($sp)
-/* 18FB48 80261268 8FB10014 */  lw        $s1, 0x14($sp)
-/* 18FB4C 8026126C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 18FB50 80261270 24020002 */  addiu     $v0, $zero, 2
-/* 18FB54 80261274 03E00008 */  jr        $ra
-/* 18FB58 80261278 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/18F340/func_802613BC.s b/ver/us/asm/nonmatchings/18F340/func_802613BC.s
deleted file mode 100644
index c4e001539e..0000000000
--- a/ver/us/asm/nonmatchings/18F340/func_802613BC.s
+++ /dev/null
@@ -1,51 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802613BC
-/* 18FC9C 802613BC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 18FCA0 802613C0 AFB1001C */  sw        $s1, 0x1c($sp)
-/* 18FCA4 802613C4 0080882D */  daddu     $s1, $a0, $zero
-/* 18FCA8 802613C8 AFBF0024 */  sw        $ra, 0x24($sp)
-/* 18FCAC 802613CC AFB20020 */  sw        $s2, 0x20($sp)
-/* 18FCB0 802613D0 AFB00018 */  sw        $s0, 0x18($sp)
-/* 18FCB4 802613D4 8E30000C */  lw        $s0, 0xc($s1)
-/* 18FCB8 802613D8 8E050000 */  lw        $a1, ($s0)
-/* 18FCBC 802613DC 0C0B1EAF */  jal       get_variable
-/* 18FCC0 802613E0 26100004 */   addiu    $s0, $s0, 4
-/* 18FCC4 802613E4 8E050000 */  lw        $a1, ($s0)
-/* 18FCC8 802613E8 26100004 */  addiu     $s0, $s0, 4
-/* 18FCCC 802613EC 0220202D */  daddu     $a0, $s1, $zero
-/* 18FCD0 802613F0 0C0B1EAF */  jal       get_variable
-/* 18FCD4 802613F4 0040902D */   daddu    $s2, $v0, $zero
-/* 18FCD8 802613F8 0220202D */  daddu     $a0, $s1, $zero
-/* 18FCDC 802613FC 8E050000 */  lw        $a1, ($s0)
-/* 18FCE0 80261400 0C0B1EAF */  jal       get_variable
-/* 18FCE4 80261404 0040802D */   daddu    $s0, $v0, $zero
-/* 18FCE8 80261408 24040006 */  addiu     $a0, $zero, 6
-/* 18FCEC 8026140C 44921000 */  mtc1      $s2, $f2
-/* 18FCF0 80261410 00000000 */  nop
-/* 18FCF4 80261414 468010A0 */  cvt.s.w   $f2, $f2
-/* 18FCF8 80261418 2610000F */  addiu     $s0, $s0, 0xf
-/* 18FCFC 8026141C 44051000 */  mfc1      $a1, $f2
-/* 18FD00 80261420 44901000 */  mtc1      $s0, $f2
-/* 18FD04 80261424 00000000 */  nop
-/* 18FD08 80261428 468010A0 */  cvt.s.w   $f2, $f2
-/* 18FD0C 8026142C 44061000 */  mfc1      $a2, $f2
-/* 18FD10 80261430 44821000 */  mtc1      $v0, $f2
-/* 18FD14 80261434 00000000 */  nop
-/* 18FD18 80261438 468010A0 */  cvt.s.w   $f2, $f2
-/* 18FD1C 8026143C 3C013F99 */  lui       $at, 0x3f99
-/* 18FD20 80261440 3421999A */  ori       $at, $at, 0x999a
-/* 18FD24 80261444 44810000 */  mtc1      $at, $f0
-/* 18FD28 80261448 44071000 */  mfc1      $a3, $f2
-/* 18FD2C 8026144C 2403001E */  addiu     $v1, $zero, 0x1e
-/* 18FD30 80261450 AFA30014 */  sw        $v1, 0x14($sp)
-/* 18FD34 80261454 0C01C82C */  jal       func_800720B0
-/* 18FD38 80261458 E7A00010 */   swc1     $f0, 0x10($sp)
-/* 18FD3C 8026145C 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 18FD40 80261460 8FB20020 */  lw        $s2, 0x20($sp)
-/* 18FD44 80261464 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 18FD48 80261468 8FB00018 */  lw        $s0, 0x18($sp)
-/* 18FD4C 8026146C 24020002 */  addiu     $v0, $zero, 2
-/* 18FD50 80261470 03E00008 */  jr        $ra
-/* 18FD54 80261474 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/18F340/func_80261478.s b/ver/us/asm/nonmatchings/18F340/func_80261478.s
deleted file mode 100644
index 52a39674be..0000000000
--- a/ver/us/asm/nonmatchings/18F340/func_80261478.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80261478
-/* 18FD58 80261478 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 18FD5C 8026147C AFB1001C */  sw        $s1, 0x1c($sp)
-/* 18FD60 80261480 0080882D */  daddu     $s1, $a0, $zero
-/* 18FD64 80261484 AFBF0024 */  sw        $ra, 0x24($sp)
-/* 18FD68 80261488 AFB20020 */  sw        $s2, 0x20($sp)
-/* 18FD6C 8026148C AFB00018 */  sw        $s0, 0x18($sp)
-/* 18FD70 80261490 8E30000C */  lw        $s0, 0xc($s1)
-/* 18FD74 80261494 8E050000 */  lw        $a1, ($s0)
-/* 18FD78 80261498 0C0B1EAF */  jal       get_variable
-/* 18FD7C 8026149C 26100004 */   addiu    $s0, $s0, 4
-/* 18FD80 802614A0 8E050000 */  lw        $a1, ($s0)
-/* 18FD84 802614A4 26100004 */  addiu     $s0, $s0, 4
-/* 18FD88 802614A8 0220202D */  daddu     $a0, $s1, $zero
-/* 18FD8C 802614AC 0C0B1EAF */  jal       get_variable
-/* 18FD90 802614B0 0040902D */   daddu    $s2, $v0, $zero
-/* 18FD94 802614B4 0220202D */  daddu     $a0, $s1, $zero
-/* 18FD98 802614B8 8E050000 */  lw        $a1, ($s0)
-/* 18FD9C 802614BC 0C0B1EAF */  jal       get_variable
-/* 18FDA0 802614C0 0040802D */   daddu    $s0, $v0, $zero
-/* 18FDA4 802614C4 44921000 */  mtc1      $s2, $f2
-/* 18FDA8 802614C8 00000000 */  nop
-/* 18FDAC 802614CC 468010A0 */  cvt.s.w   $f2, $f2
-/* 18FDB0 802614D0 2403000F */  addiu     $v1, $zero, 0xf
-/* 18FDB4 802614D4 02038021 */  addu      $s0, $s0, $v1
-/* 18FDB8 802614D8 44051000 */  mfc1      $a1, $f2
-/* 18FDBC 802614DC 44901000 */  mtc1      $s0, $f2
-/* 18FDC0 802614E0 00000000 */  nop
-/* 18FDC4 802614E4 468010A0 */  cvt.s.w   $f2, $f2
-/* 18FDC8 802614E8 44061000 */  mfc1      $a2, $f2
-/* 18FDCC 802614EC 44821000 */  mtc1      $v0, $f2
-/* 18FDD0 802614F0 00000000 */  nop
-/* 18FDD4 802614F4 468010A0 */  cvt.s.w   $f2, $f2
-/* 18FDD8 802614F8 3C0140A0 */  lui       $at, 0x40a0
-/* 18FDDC 802614FC 44810000 */  mtc1      $at, $f0
-/* 18FDE0 80261500 44071000 */  mfc1      $a3, $f2
-/* 18FDE4 80261504 24040009 */  addiu     $a0, $zero, 9
-/* 18FDE8 80261508 AFA30014 */  sw        $v1, 0x14($sp)
-/* 18FDEC 8026150C 0C01C5D4 */  jal       func_80071750
-/* 18FDF0 80261510 E7A00010 */   swc1     $f0, 0x10($sp)
-/* 18FDF4 80261514 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 18FDF8 80261518 8FB20020 */  lw        $s2, 0x20($sp)
-/* 18FDFC 8026151C 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 18FE00 80261520 8FB00018 */  lw        $s0, 0x18($sp)
-/* 18FE04 80261524 24020002 */  addiu     $v0, $zero, 2
-/* 18FE08 80261528 03E00008 */  jr        $ra
-/* 18FE0C 8026152C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/18F340/func_80261530.s b/ver/us/asm/nonmatchings/18F340/func_80261530.s
deleted file mode 100644
index 0dd40586fb..0000000000
--- a/ver/us/asm/nonmatchings/18F340/func_80261530.s
+++ /dev/null
@@ -1,43 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80261530
-/* 18FE10 80261530 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 18FE14 80261534 AFB00010 */  sw        $s0, 0x10($sp)
-/* 18FE18 80261538 0080802D */  daddu     $s0, $a0, $zero
-/* 18FE1C 8026153C 10A0000E */  beqz      $a1, .L80261578
-/* 18FE20 80261540 AFBF0014 */   sw       $ra, 0x14($sp)
-/* 18FE24 80261544 0C04760B */  jal       func_8011D82C
-/* 18FE28 80261548 24040001 */   addiu    $a0, $zero, 1
-/* 18FE2C 8026154C 0000202D */  daddu     $a0, $zero, $zero
-/* 18FE30 80261550 0080282D */  daddu     $a1, $a0, $zero
-/* 18FE34 80261554 0080302D */  daddu     $a2, $a0, $zero
-/* 18FE38 80261558 0080382D */  daddu     $a3, $a0, $zero
-/* 18FE3C 8026155C 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* 18FE40 80261560 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* 18FE44 80261564 24030001 */  addiu     $v1, $zero, 1
-/* 18FE48 80261568 0C046F97 */  jal       set_background_color_blend
-/* 18FE4C 8026156C A0430000 */   sb       $v1, ($v0)
-/* 18FE50 80261570 24020019 */  addiu     $v0, $zero, 0x19
-/* 18FE54 80261574 AE020070 */  sw        $v0, 0x70($s0)
-.L80261578:
-/* 18FE58 80261578 0000202D */  daddu     $a0, $zero, $zero
-/* 18FE5C 8026157C 0080282D */  daddu     $a1, $a0, $zero
-/* 18FE60 80261580 0080302D */  daddu     $a2, $a0, $zero
-/* 18FE64 80261584 8E030070 */  lw        $v1, 0x70($s0)
-/* 18FE68 80261588 24020019 */  addiu     $v0, $zero, 0x19
-/* 18FE6C 8026158C 00431023 */  subu      $v0, $v0, $v1
-/* 18FE70 80261590 00023880 */  sll       $a3, $v0, 2
-/* 18FE74 80261594 00E23821 */  addu      $a3, $a3, $v0
-/* 18FE78 80261598 00073840 */  sll       $a3, $a3, 1
-/* 18FE7C 8026159C 0C046F97 */  jal       set_background_color_blend
-/* 18FE80 802615A0 30E700FE */   andi     $a3, $a3, 0xfe
-/* 18FE84 802615A4 8E020070 */  lw        $v0, 0x70($s0)
-/* 18FE88 802615A8 2442FFFF */  addiu     $v0, $v0, -1
-/* 18FE8C 802615AC AE020070 */  sw        $v0, 0x70($s0)
-/* 18FE90 802615B0 2C420001 */  sltiu     $v0, $v0, 1
-/* 18FE94 802615B4 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 18FE98 802615B8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 18FE9C 802615BC 00021040 */  sll       $v0, $v0, 1
-/* 18FEA0 802615C0 03E00008 */  jr        $ra
-/* 18FEA4 802615C4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/18F340/func_802615C8.s b/ver/us/asm/nonmatchings/18F340/func_802615C8.s
deleted file mode 100644
index a8ebf77d18..0000000000
--- a/ver/us/asm/nonmatchings/18F340/func_802615C8.s
+++ /dev/null
@@ -1,39 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802615C8
-/* 18FEA8 802615C8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 18FEAC 802615CC AFB00010 */  sw        $s0, 0x10($sp)
-/* 18FEB0 802615D0 0080802D */  daddu     $s0, $a0, $zero
-/* 18FEB4 802615D4 10A00003 */  beqz      $a1, .L802615E4
-/* 18FEB8 802615D8 AFBF0014 */   sw       $ra, 0x14($sp)
-/* 18FEBC 802615DC 24020019 */  addiu     $v0, $zero, 0x19
-/* 18FEC0 802615E0 AE020070 */  sw        $v0, 0x70($s0)
-.L802615E4:
-/* 18FEC4 802615E4 0000202D */  daddu     $a0, $zero, $zero
-/* 18FEC8 802615E8 0080282D */  daddu     $a1, $a0, $zero
-/* 18FECC 802615EC 8E020070 */  lw        $v0, 0x70($s0)
-/* 18FED0 802615F0 0080302D */  daddu     $a2, $a0, $zero
-/* 18FED4 802615F4 00023880 */  sll       $a3, $v0, 2
-/* 18FED8 802615F8 00E23821 */  addu      $a3, $a3, $v0
-/* 18FEDC 802615FC 00073840 */  sll       $a3, $a3, 1
-/* 18FEE0 80261600 0C046F97 */  jal       set_background_color_blend
-/* 18FEE4 80261604 30E700FE */   andi     $a3, $a3, 0xfe
-/* 18FEE8 80261608 8E020070 */  lw        $v0, 0x70($s0)
-/* 18FEEC 8026160C 2442FFFB */  addiu     $v0, $v0, -5
-/* 18FEF0 80261610 10400003 */  beqz      $v0, .L80261620
-/* 18FEF4 80261614 AE020070 */   sw       $v0, 0x70($s0)
-/* 18FEF8 80261618 0809858E */  j         .L80261638
-/* 18FEFC 8026161C 0000102D */   daddu    $v0, $zero, $zero
-.L80261620:
-/* 18FF00 80261620 0000202D */  daddu     $a0, $zero, $zero
-/* 18FF04 80261624 0080282D */  daddu     $a1, $a0, $zero
-/* 18FF08 80261628 0080302D */  daddu     $a2, $a0, $zero
-/* 18FF0C 8026162C 0C046F97 */  jal       set_background_color_blend
-/* 18FF10 80261630 0080382D */   daddu    $a3, $a0, $zero
-/* 18FF14 80261634 24020002 */  addiu     $v0, $zero, 2
-.L80261638:
-/* 18FF18 80261638 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 18FF1C 8026163C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 18FF20 80261640 03E00008 */  jr        $ra
-/* 18FF24 80261644 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/18F340/func_80261648.s b/ver/us/asm/nonmatchings/18F340/func_80261648.s
deleted file mode 100644
index b64b4c3cec..0000000000
--- a/ver/us/asm/nonmatchings/18F340/func_80261648.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80261648
-/* 18FF28 80261648 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 18FF2C 8026164C AFB00010 */  sw        $s0, 0x10($sp)
-/* 18FF30 80261650 00A0802D */  daddu     $s0, $a1, $zero
-/* 18FF34 80261654 2404FFF6 */  addiu     $a0, $zero, -0xa
-/* 18FF38 80261658 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 18FF3C 8026165C 0C00EABB */  jal       get_npc_unsafe
-/* 18FF40 80261660 AFB10014 */   sw       $s1, 0x14($sp)
-/* 18FF44 80261664 12000004 */  beqz      $s0, .L80261678
-/* 18FF48 80261668 0040882D */   daddu    $s1, $v0, $zero
-/* 18FF4C 8026166C 0C05272D */  jal       sfx_play_sound
-/* 18FF50 80261670 2404024B */   addiu    $a0, $zero, 0x24b
-/* 18FF54 80261674 A22000AC */  sb        $zero, 0xac($s1)
-.L80261678:
-/* 18FF58 80261678 922200AC */  lbu       $v0, 0xac($s1)
-/* 18FF5C 8026167C 24420011 */  addiu     $v0, $v0, 0x11
-/* 18FF60 80261680 A22200AC */  sb        $v0, 0xac($s1)
-/* 18FF64 80261684 304200FF */  andi      $v0, $v0, 0xff
-/* 18FF68 80261688 2C4200FF */  sltiu     $v0, $v0, 0xff
-/* 18FF6C 8026168C 14400004 */  bnez      $v0, .L802616A0
-/* 18FF70 80261690 0000102D */   daddu    $v0, $zero, $zero
-/* 18FF74 80261694 240200FF */  addiu     $v0, $zero, 0xff
-/* 18FF78 80261698 A22200AC */  sb        $v0, 0xac($s1)
-/* 18FF7C 8026169C 24020001 */  addiu     $v0, $zero, 1
-.L802616A0:
-/* 18FF80 802616A0 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 18FF84 802616A4 8FB10014 */  lw        $s1, 0x14($sp)
-/* 18FF88 802616A8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 18FF8C 802616AC 03E00008 */  jr        $ra
-/* 18FF90 802616B0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/18F340/func_802616B4.s b/ver/us/asm/nonmatchings/18F340/func_802616B4.s
deleted file mode 100644
index 6fc63c1eea..0000000000
--- a/ver/us/asm/nonmatchings/18F340/func_802616B4.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802616B4
-/* 18FF94 802616B4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 18FF98 802616B8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 18FF9C 802616BC 0C00EABB */  jal       get_npc_unsafe
-/* 18FFA0 802616C0 2404FFF6 */   addiu    $a0, $zero, -0xa
-/* 18FFA4 802616C4 0040182D */  daddu     $v1, $v0, $zero
-/* 18FFA8 802616C8 906200AC */  lbu       $v0, 0xac($v1)
-/* 18FFAC 802616CC 2442FFEF */  addiu     $v0, $v0, -0x11
-/* 18FFB0 802616D0 A06200AC */  sb        $v0, 0xac($v1)
-/* 18FFB4 802616D4 304200FF */  andi      $v0, $v0, 0xff
-/* 18FFB8 802616D8 14400003 */  bnez      $v0, .L802616E8
-/* 18FFBC 802616DC 0000102D */   daddu    $v0, $zero, $zero
-/* 18FFC0 802616E0 A06000AC */  sb        $zero, 0xac($v1)
-/* 18FFC4 802616E4 24020001 */  addiu     $v0, $zero, 1
-.L802616E8:
-/* 18FFC8 802616E8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 18FFCC 802616EC 03E00008 */  jr        $ra
-/* 18FFD0 802616F0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/18F340/func_802616F4.s b/ver/us/asm/nonmatchings/18F340/func_802616F4.s
deleted file mode 100644
index 5675ad9b58..0000000000
--- a/ver/us/asm/nonmatchings/18F340/func_802616F4.s
+++ /dev/null
@@ -1,193 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-glabel D_8029D590
-.double 0.35
-
-.section .text
-
-glabel func_802616F4
-/* 18FFD4 802616F4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 18FFD8 802616F8 AFB20020 */  sw        $s2, 0x20($sp)
-/* 18FFDC 802616FC 0080902D */  daddu     $s2, $a0, $zero
-/* 18FFE0 80261700 AFB00018 */  sw        $s0, 0x18($sp)
-/* 18FFE4 80261704 00A0802D */  daddu     $s0, $a1, $zero
-/* 18FFE8 80261708 2404FFF6 */  addiu     $a0, $zero, -0xa
-/* 18FFEC 8026170C AFBF0024 */  sw        $ra, 0x24($sp)
-/* 18FFF0 80261710 0C00EABB */  jal       get_npc_unsafe
-/* 18FFF4 80261714 AFB1001C */   sw       $s1, 0x1c($sp)
-/* 18FFF8 80261718 12000024 */  beqz      $s0, .L802617AC
-/* 18FFFC 8026171C 0040882D */   daddu    $s1, $v0, $zero
-/* 190000 80261720 AE400074 */  sw        $zero, 0x74($s2)
-/* 190004 80261724 C622003C */  lwc1      $f2, 0x3c($s1)
-/* 190008 80261728 3C013ECC */  lui       $at, 0x3ecc
-/* 19000C 8026172C 3421CCCD */  ori       $at, $at, 0xcccd
-/* 190010 80261730 44810000 */  mtc1      $at, $f0
-/* 190014 80261734 AFA00014 */  sw        $zero, 0x14($sp)
-/* 190018 80261738 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 19001C 8026173C 8E250038 */  lw        $a1, 0x38($s1)
-/* 190020 80261740 8E26003C */  lw        $a2, 0x3c($s1)
-/* 190024 80261744 8E270040 */  lw        $a3, 0x40($s1)
-/* 190028 80261748 3C01802A */  lui       $at, %hi(D_8029FB94)
-/* 19002C 8026174C E422FB94 */  swc1      $f2, %lo(D_8029FB94)($at)
-/* 190030 80261750 0C01C5D4 */  jal       func_80071750
-/* 190034 80261754 0000202D */   daddu    $a0, $zero, $zero
-/* 190038 80261758 3C013727 */  lui       $at, 0x3727
-/* 19003C 8026175C 3421C5AC */  ori       $at, $at, 0xc5ac
-/* 190040 80261760 44810000 */  mtc1      $at, $f0
-/* 190044 80261764 AFA00014 */  sw        $zero, 0x14($sp)
-/* 190048 80261768 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 19004C 8026176C 8E250038 */  lw        $a1, 0x38($s1)
-/* 190050 80261770 8E26003C */  lw        $a2, 0x3c($s1)
-/* 190054 80261774 8E270040 */  lw        $a3, 0x40($s1)
-/* 190058 80261778 3C01802A */  lui       $at, %hi(D_8029FB98)
-/* 19005C 8026177C AC22FB98 */  sw        $v0, %lo(D_8029FB98)($at)
-/* 190060 80261780 0C01C5D4 */  jal       func_80071750
-/* 190064 80261784 24040003 */   addiu    $a0, $zero, 3
-/* 190068 80261788 3C01802A */  lui       $at, %hi(D_8029FB9C)
-/* 19006C 8026178C AC22FB9C */  sw        $v0, %lo(D_8029FB9C)($at)
-/* 190070 80261790 2402000C */  addiu     $v0, $zero, 0xc
-/* 190074 80261794 3C01802A */  lui       $at, %hi(D_8029FBA4)
-/* 190078 80261798 A420FBA4 */  sh        $zero, %lo(D_8029FBA4)($at)
-/* 19007C 8026179C 3C01802A */  lui       $at, %hi(D_8029FB90)
-/* 190080 802617A0 AC22FB90 */  sw        $v0, %lo(D_8029FB90)($at)
-/* 190084 802617A4 0C05272D */  jal       sfx_play_sound
-/* 190088 802617A8 24042074 */   addiu    $a0, $zero, 0x2074
-.L802617AC:
-/* 19008C 802617AC 3C0140C9 */  lui       $at, 0x40c9
-/* 190090 802617B0 34210FD0 */  ori       $at, $at, 0xfd0
-/* 190094 802617B4 44810000 */  mtc1      $at, $f0
-/* 190098 802617B8 C64C0074 */  lwc1      $f12, 0x74($s2)
-/* 19009C 802617BC 46806320 */  cvt.s.w   $f12, $f12
-/* 1900A0 802617C0 46006302 */  mul.s     $f12, $f12, $f0
-/* 1900A4 802617C4 00000000 */  nop
-/* 1900A8 802617C8 3C0143B4 */  lui       $at, 0x43b4
-/* 1900AC 802617CC 44810000 */  mtc1      $at, $f0
-/* 1900B0 802617D0 0C00A85B */  jal       sin_rad
-/* 1900B4 802617D4 46006303 */   div.s    $f12, $f12, $f0
-/* 1900B8 802617D8 3C014040 */  lui       $at, 0x4040
-/* 1900BC 802617DC 44811000 */  mtc1      $at, $f2
-/* 1900C0 802617E0 00000000 */  nop
-/* 1900C4 802617E4 46020002 */  mul.s     $f0, $f0, $f2
-/* 1900C8 802617E8 00000000 */  nop
-/* 1900CC 802617EC 3C01802A */  lui       $at, %hi(D_8029FB94)
-/* 1900D0 802617F0 C422FB94 */  lwc1      $f2, %lo(D_8029FB94)($at)
-/* 1900D4 802617F4 46001080 */  add.s     $f2, $f2, $f0
-/* 1900D8 802617F8 E622003C */  swc1      $f2, 0x3c($s1)
-/* 1900DC 802617FC 8E420074 */  lw        $v0, 0x74($s2)
-/* 1900E0 80261800 2442000A */  addiu     $v0, $v0, 0xa
-/* 1900E4 80261804 44826000 */  mtc1      $v0, $f12
-/* 1900E8 80261808 00000000 */  nop
-/* 1900EC 8026180C 46806320 */  cvt.s.w   $f12, $f12
-/* 1900F0 80261810 0C00A6C9 */  jal       clamp_angle
-/* 1900F4 80261814 AE420074 */   sw       $v0, 0x74($s2)
-/* 1900F8 80261818 4600018D */  trunc.w.s $f6, $f0
-/* 1900FC 8026181C E6460074 */  swc1      $f6, 0x74($s2)
-/* 190100 80261820 3C05802A */  lui       $a1, %hi(D_8029FB98)
-/* 190104 80261824 8CA5FB98 */  lw        $a1, %lo(D_8029FB98)($a1)
-/* 190108 80261828 C6200038 */  lwc1      $f0, 0x38($s1)
-/* 19010C 8026182C 3C014180 */  lui       $at, 0x4180
-/* 190110 80261830 44811000 */  mtc1      $at, $f2
-/* 190114 80261834 8CA2000C */  lw        $v0, 0xc($a1)
-/* 190118 80261838 E4400004 */  swc1      $f0, 4($v0)
-/* 19011C 8026183C C620003C */  lwc1      $f0, 0x3c($s1)
-/* 190120 80261840 46020000 */  add.s     $f0, $f0, $f2
-/* 190124 80261844 3C08802A */  lui       $t0, %hi(D_8029FB9C)
-/* 190128 80261848 2508FB9C */  addiu     $t0, $t0, %lo(D_8029FB9C)
-/* 19012C 8026184C E4400008 */  swc1      $f0, 8($v0)
-/* 190130 80261850 C6200040 */  lwc1      $f0, 0x40($s1)
-/* 190134 80261854 8D040000 */  lw        $a0, ($t0)
-/* 190138 80261858 E440000C */  swc1      $f0, 0xc($v0)
-/* 19013C 8026185C 8C82000C */  lw        $v0, 0xc($a0)
-/* 190140 80261860 C6200038 */  lwc1      $f0, 0x38($s1)
-/* 190144 80261864 E4400004 */  swc1      $f0, 4($v0)
-/* 190148 80261868 C620003C */  lwc1      $f0, 0x3c($s1)
-/* 19014C 8026186C 46020000 */  add.s     $f0, $f0, $f2
-/* 190150 80261870 3C0140A0 */  lui       $at, 0x40a0
-/* 190154 80261874 44811000 */  mtc1      $at, $f2
-/* 190158 80261878 E4400008 */  swc1      $f0, 8($v0)
-/* 19015C 8026187C C6200040 */  lwc1      $f0, 0x40($s1)
-/* 190160 80261880 46020000 */  add.s     $f0, $f0, $f2
-/* 190164 80261884 3C07802A */  lui       $a3, %hi(D_8029FBA4)
-/* 190168 80261888 24E7FBA4 */  addiu     $a3, $a3, %lo(D_8029FBA4)
-/* 19016C 8026188C E440000C */  swc1      $f0, 0xc($v0)
-/* 190170 80261890 84E30000 */  lh        $v1, ($a3)
-/* 190174 80261894 24060002 */  addiu     $a2, $zero, 2
-/* 190178 80261898 14660011 */  bne       $v1, $a2, .L802618E0
-/* 19017C 8026189C 24020001 */   addiu    $v0, $zero, 1
-/* 190180 802618A0 8CA2000C */  lw        $v0, 0xc($a1)
-/* 190184 802618A4 3C013727 */  lui       $at, 0x3727
-/* 190188 802618A8 3421C5AC */  ori       $at, $at, 0xc5ac
-/* 19018C 802618AC 44810000 */  mtc1      $at, $f0
-/* 190190 802618B0 00000000 */  nop
-/* 190194 802618B4 E4400030 */  swc1      $f0, 0x30($v0)
-/* 190198 802618B8 8C82000C */  lw        $v0, 0xc($a0)
-/* 19019C 802618BC E4400030 */  swc1      $f0, 0x30($v0)
-/* 1901A0 802618C0 8CA20000 */  lw        $v0, ($a1)
-/* 1901A4 802618C4 34420010 */  ori       $v0, $v0, 0x10
-/* 1901A8 802618C8 ACA20000 */  sw        $v0, ($a1)
-/* 1901AC 802618CC 8C830000 */  lw        $v1, ($a0)
-/* 1901B0 802618D0 24020001 */  addiu     $v0, $zero, 1
-/* 1901B4 802618D4 34630010 */  ori       $v1, $v1, 0x10
-/* 1901B8 802618D8 08098667 */  j         .L8026199C
-/* 1901BC 802618DC AC830000 */   sw       $v1, ($a0)
-.L802618E0:
-/* 1901C0 802618E0 1462002E */  bne       $v1, $v0, .L8026199C
-/* 1901C4 802618E4 0000102D */   daddu    $v0, $zero, $zero
-/* 1901C8 802618E8 8CA2000C */  lw        $v0, 0xc($a1)
-/* 1901CC 802618EC C4400030 */  lwc1      $f0, 0x30($v0)
-/* 1901D0 802618F0 3C01802A */  lui       $at, %hi(D_8029D590)
-/* 1901D4 802618F4 D422D590 */  ldc1      $f2, %lo(D_8029D590)($at)
-/* 1901D8 802618F8 46000021 */  cvt.d.s   $f0, $f0
-/* 1901DC 802618FC 46220000 */  add.d     $f0, $f0, $f2
-/* 1901E0 80261900 3C01400C */  lui       $at, 0x400c
-/* 1901E4 80261904 44812800 */  mtc1      $at, $f5
-/* 1901E8 80261908 44802000 */  mtc1      $zero, $f4
-/* 1901EC 8026190C 46200020 */  cvt.s.d   $f0, $f0
-/* 1901F0 80261910 460000A1 */  cvt.d.s   $f2, $f0
-/* 1901F4 80261914 4622203C */  c.lt.d    $f4, $f2
-/* 1901F8 80261918 00000000 */  nop
-/* 1901FC 8026191C 45000005 */  bc1f      .L80261934
-/* 190200 80261920 E4400030 */   swc1     $f0, 0x30($v0)
-/* 190204 80261924 3C014060 */  lui       $at, 0x4060
-/* 190208 80261928 44810000 */  mtc1      $at, $f0
-/* 19020C 8026192C 00000000 */  nop
-/* 190210 80261930 E4400030 */  swc1      $f0, 0x30($v0)
-.L80261934:
-/* 190214 80261934 3C03802A */  lui       $v1, %hi(D_8029FB90)
-/* 190218 80261938 2463FB90 */  addiu     $v1, $v1, %lo(D_8029FB90)
-/* 19021C 8026193C 8C620000 */  lw        $v0, ($v1)
-/* 190220 80261940 10400003 */  beqz      $v0, .L80261950
-/* 190224 80261944 2442FFFF */   addiu    $v0, $v0, -1
-/* 190228 80261948 08098666 */  j         .L80261998
-/* 19022C 8026194C AC620000 */   sw       $v0, ($v1)
-.L80261950:
-/* 190230 80261950 8D020000 */  lw        $v0, ($t0)
-/* 190234 80261954 8C42000C */  lw        $v0, 0xc($v0)
-/* 190238 80261958 C4400030 */  lwc1      $f0, 0x30($v0)
-/* 19023C 8026195C 3C013FE0 */  lui       $at, 0x3fe0
-/* 190240 80261960 44811800 */  mtc1      $at, $f3
-/* 190244 80261964 44801000 */  mtc1      $zero, $f2
-/* 190248 80261968 46000021 */  cvt.d.s   $f0, $f0
-/* 19024C 8026196C 46220000 */  add.d     $f0, $f0, $f2
-/* 190250 80261970 3C014014 */  lui       $at, 0x4014
-/* 190254 80261974 44812800 */  mtc1      $at, $f5
-/* 190258 80261978 44802000 */  mtc1      $zero, $f4
-/* 19025C 8026197C 46200020 */  cvt.s.d   $f0, $f0
-/* 190260 80261980 460000A1 */  cvt.d.s   $f2, $f0
-/* 190264 80261984 4622203C */  c.lt.d    $f4, $f2
-/* 190268 80261988 00000000 */  nop
-/* 19026C 8026198C 45000002 */  bc1f      .L80261998
-/* 190270 80261990 E4400030 */   swc1     $f0, 0x30($v0)
-/* 190274 80261994 A4E60000 */  sh        $a2, ($a3)
-.L80261998:
-/* 190278 80261998 0000102D */  daddu     $v0, $zero, $zero
-.L8026199C:
-/* 19027C 8026199C 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 190280 802619A0 8FB20020 */  lw        $s2, 0x20($sp)
-/* 190284 802619A4 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 190288 802619A8 8FB00018 */  lw        $s0, 0x18($sp)
-/* 19028C 802619AC 03E00008 */  jr        $ra
-/* 190290 802619B0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/18F340/func_802619B4.s b/ver/us/asm/nonmatchings/18F340/func_802619B4.s
deleted file mode 100644
index c885ec41ec..0000000000
--- a/ver/us/asm/nonmatchings/18F340/func_802619B4.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802619B4
-/* 190294 802619B4 24020001 */  addiu     $v0, $zero, 1
-/* 190298 802619B8 3C01802A */  lui       $at, %hi(D_8029FBA4)
-/* 19029C 802619BC A422FBA4 */  sh        $v0, %lo(D_8029FBA4)($at)
-/* 1902A0 802619C0 03E00008 */  jr        $ra
-/* 1902A4 802619C4 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/18F340/func_802619E8.s b/ver/us/asm/nonmatchings/18F340/func_802619E8.s
deleted file mode 100644
index 76fae2085d..0000000000
--- a/ver/us/asm/nonmatchings/18F340/func_802619E8.s
+++ /dev/null
@@ -1,93 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802619E8
-/* 1902C8 802619E8 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* 1902CC 802619EC AFB20038 */  sw        $s2, 0x38($sp)
-/* 1902D0 802619F0 0080902D */  daddu     $s2, $a0, $zero
-/* 1902D4 802619F4 AFBF003C */  sw        $ra, 0x3c($sp)
-/* 1902D8 802619F8 AFB10034 */  sw        $s1, 0x34($sp)
-/* 1902DC 802619FC AFB00030 */  sw        $s0, 0x30($sp)
-/* 1902E0 80261A00 8E50000C */  lw        $s0, 0xc($s2)
-/* 1902E4 80261A04 8E050000 */  lw        $a1, ($s0)
-/* 1902E8 80261A08 0C0B1EAF */  jal       get_variable
-/* 1902EC 80261A0C 26100004 */   addiu    $s0, $s0, 4
-/* 1902F0 80261A10 8E050000 */  lw        $a1, ($s0)
-/* 1902F4 80261A14 26100004 */  addiu     $s0, $s0, 4
-/* 1902F8 80261A18 0240202D */  daddu     $a0, $s2, $zero
-/* 1902FC 80261A1C 0C0B1EAF */  jal       get_variable
-/* 190300 80261A20 0040882D */   daddu    $s1, $v0, $zero
-/* 190304 80261A24 0240202D */  daddu     $a0, $s2, $zero
-/* 190308 80261A28 8E050000 */  lw        $a1, ($s0)
-/* 19030C 80261A2C 0C0B1EAF */  jal       get_variable
-/* 190310 80261A30 0040802D */   daddu    $s0, $v0, $zero
-/* 190314 80261A34 44910000 */  mtc1      $s1, $f0
-/* 190318 80261A38 00000000 */  nop
-/* 19031C 80261A3C 46800020 */  cvt.s.w   $f0, $f0
-/* 190320 80261A40 44050000 */  mfc1      $a1, $f0
-/* 190324 80261A44 44900000 */  mtc1      $s0, $f0
-/* 190328 80261A48 00000000 */  nop
-/* 19032C 80261A4C 46800020 */  cvt.s.w   $f0, $f0
-/* 190330 80261A50 44060000 */  mfc1      $a2, $f0
-/* 190334 80261A54 44820000 */  mtc1      $v0, $f0
-/* 190338 80261A58 00000000 */  nop
-/* 19033C 80261A5C 46800020 */  cvt.s.w   $f0, $f0
-/* 190340 80261A60 3C048007 */  lui       $a0, %hi(gCurrentCameraID)
-/* 190344 80261A64 8C847410 */  lw        $a0, %lo(gCurrentCameraID)($a0)
-/* 190348 80261A68 44070000 */  mfc1      $a3, $f0
-/* 19034C 80261A6C 27A30020 */  addiu     $v1, $sp, 0x20
-/* 190350 80261A70 AFA30010 */  sw        $v1, 0x10($sp)
-/* 190354 80261A74 27A30024 */  addiu     $v1, $sp, 0x24
-/* 190358 80261A78 AFA30014 */  sw        $v1, 0x14($sp)
-/* 19035C 80261A7C 27A30028 */  addiu     $v1, $sp, 0x28
-/* 190360 80261A80 0C00B94E */  jal       get_screen_coords
-/* 190364 80261A84 AFA30018 */   sw       $v1, 0x18($sp)
-/* 190368 80261A88 8FA20020 */  lw        $v0, 0x20($sp)
-/* 19036C 80261A8C 2442001E */  addiu     $v0, $v0, 0x1e
-/* 190370 80261A90 AFA20020 */  sw        $v0, 0x20($sp)
-/* 190374 80261A94 8FA20024 */  lw        $v0, 0x24($sp)
-/* 190378 80261A98 8E4300AC */  lw        $v1, 0xac($s2)
-/* 19037C 80261A9C 2442FFED */  addiu     $v0, $v0, -0x13
-/* 190380 80261AA0 1860000F */  blez      $v1, .L80261AE0
-/* 190384 80261AA4 AFA20024 */   sw       $v0, 0x24($sp)
-/* 190388 80261AA8 3C048011 */  lui       $a0, %hi(D_80108AD4)
-/* 19038C 80261AAC 24848AD4 */  addiu     $a0, $a0, %lo(D_80108AD4)
-/* 190390 80261AB0 0C050529 */  jal       create_icon
-/* 190394 80261AB4 00000000 */   nop
-/* 190398 80261AB8 8FA50020 */  lw        $a1, 0x20($sp)
-/* 19039C 80261ABC 8FA60024 */  lw        $a2, 0x24($sp)
-/* 1903A0 80261AC0 0040202D */  daddu     $a0, $v0, $zero
-/* 1903A4 80261AC4 3C01802A */  lui       $at, %hi(D_8029FBAC)
-/* 1903A8 80261AC8 AC24FBAC */  sw        $a0, %lo(D_8029FBAC)($at)
-/* 1903AC 80261ACC 0C051261 */  jal       set_icon_render_pos
-/* 1903B0 80261AD0 00000000 */   nop
-/* 1903B4 80261AD4 8FA20024 */  lw        $v0, 0x24($sp)
-/* 1903B8 80261AD8 24420009 */  addiu     $v0, $v0, 9
-/* 1903BC 80261ADC AFA20024 */  sw        $v0, 0x24($sp)
-.L80261AE0:
-/* 1903C0 80261AE0 8E4200B0 */  lw        $v0, 0xb0($s2)
-/* 1903C4 80261AE4 1C400004 */  bgtz      $v0, .L80261AF8
-/* 1903C8 80261AE8 00000000 */   nop
-/* 1903CC 80261AEC 8E4200B4 */  lw        $v0, 0xb4($s2)
-/* 1903D0 80261AF0 1840000C */  blez      $v0, .L80261B24
-/* 1903D4 80261AF4 00000000 */   nop
-.L80261AF8:
-/* 1903D8 80261AF8 3C048011 */  lui       $a0, %hi(D_80108AAC)
-/* 1903DC 80261AFC 24848AAC */  addiu     $a0, $a0, %lo(D_80108AAC)
-/* 1903E0 80261B00 0C050529 */  jal       create_icon
-/* 1903E4 80261B04 00000000 */   nop
-/* 1903E8 80261B08 8FA50020 */  lw        $a1, 0x20($sp)
-/* 1903EC 80261B0C 8FA60024 */  lw        $a2, 0x24($sp)
-/* 1903F0 80261B10 0040202D */  daddu     $a0, $v0, $zero
-/* 1903F4 80261B14 3C01802A */  lui       $at, %hi(D_8029FBA8)
-/* 1903F8 80261B18 AC24FBA8 */  sw        $a0, %lo(D_8029FBA8)($at)
-/* 1903FC 80261B1C 0C051261 */  jal       set_icon_render_pos
-/* 190400 80261B20 00000000 */   nop
-.L80261B24:
-/* 190404 80261B24 8FBF003C */  lw        $ra, 0x3c($sp)
-/* 190408 80261B28 8FB20038 */  lw        $s2, 0x38($sp)
-/* 19040C 80261B2C 8FB10034 */  lw        $s1, 0x34($sp)
-/* 190410 80261B30 8FB00030 */  lw        $s0, 0x30($sp)
-/* 190414 80261B34 24020002 */  addiu     $v0, $zero, 2
-/* 190418 80261B38 03E00008 */  jr        $ra
-/* 19041C 80261B3C 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/18F340/func_80261B40.s b/ver/us/asm/nonmatchings/18F340/func_80261B40.s
deleted file mode 100644
index 35b29e08ef..0000000000
--- a/ver/us/asm/nonmatchings/18F340/func_80261B40.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80261B40
-/* 190420 80261B40 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 190424 80261B44 AFB00010 */  sw        $s0, 0x10($sp)
-/* 190428 80261B48 0080802D */  daddu     $s0, $a0, $zero
-/* 19042C 80261B4C AFBF0014 */  sw        $ra, 0x14($sp)
-/* 190430 80261B50 8E0200AC */  lw        $v0, 0xac($s0)
-/* 190434 80261B54 18400005 */  blez      $v0, .L80261B6C
-/* 190438 80261B58 00000000 */   nop
-/* 19043C 80261B5C 3C04802A */  lui       $a0, %hi(D_8029FBAC)
-/* 190440 80261B60 8C84FBAC */  lw        $a0, %lo(D_8029FBAC)($a0)
-/* 190444 80261B64 0C05123D */  jal       free_icon
-/* 190448 80261B68 00000000 */   nop
-.L80261B6C:
-/* 19044C 80261B6C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 190450 80261B70 1C400004 */  bgtz      $v0, .L80261B84
-/* 190454 80261B74 00000000 */   nop
-/* 190458 80261B78 8E0200B4 */  lw        $v0, 0xb4($s0)
-/* 19045C 80261B7C 18400005 */  blez      $v0, .L80261B94
-/* 190460 80261B80 00000000 */   nop
-.L80261B84:
-/* 190464 80261B84 3C04802A */  lui       $a0, %hi(D_8029FBA8)
-/* 190468 80261B88 8C84FBA8 */  lw        $a0, %lo(D_8029FBA8)($a0)
-/* 19046C 80261B8C 0C05123D */  jal       free_icon
-/* 190470 80261B90 00000000 */   nop
-.L80261B94:
-/* 190474 80261B94 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 190478 80261B98 8FB00010 */  lw        $s0, 0x10($sp)
-/* 19047C 80261B9C 24020002 */  addiu     $v0, $zero, 2
-/* 190480 80261BA0 03E00008 */  jr        $ra
-/* 190484 80261BA4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/18F340/func_80261FB4.s b/ver/us/asm/nonmatchings/18F340/func_80261FB4.s
deleted file mode 100644
index a220471ccc..0000000000
--- a/ver/us/asm/nonmatchings/18F340/func_80261FB4.s
+++ /dev/null
@@ -1,91 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80261FB4
-/* 190894 80261FB4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 190898 80261FB8 AFB20018 */  sw        $s2, 0x18($sp)
-/* 19089C 80261FBC 0080902D */  daddu     $s2, $a0, $zero
-/* 1908A0 80261FC0 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 1908A4 80261FC4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 1908A8 80261FC8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 1908AC 80261FCC F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 1908B0 80261FD0 8E4400AC */  lw        $a0, 0xac($s2)
-/* 1908B4 80261FD4 0C04C3D6 */  jal       get_item_entity
-/* 1908B8 80261FD8 00A0802D */   daddu    $s0, $a1, $zero
-/* 1908BC 80261FDC 3C04800E */  lui       $a0, %hi(gBattleStatus+0xD8)
-/* 1908C0 80261FE0 8C84C148 */  lw        $a0, %lo(gBattleStatus+0xD8)($a0)
-/* 1908C4 80261FE4 12000004 */  beqz      $s0, .L80261FF8
-/* 1908C8 80261FE8 0040882D */   daddu    $s1, $v0, $zero
-/* 1908CC 80261FEC 2402000A */  addiu     $v0, $zero, 0xa
-/* 1908D0 80261FF0 AE400070 */  sw        $zero, 0x70($s2)
-/* 1908D4 80261FF4 AE420074 */  sw        $v0, 0x74($s2)
-.L80261FF8:
-/* 1908D8 80261FF8 8E430070 */  lw        $v1, 0x70($s2)
-/* 1908DC 80261FFC 10600005 */  beqz      $v1, .L80262014
-/* 1908E0 80262000 24020001 */   addiu    $v0, $zero, 1
-/* 1908E4 80262004 10620032 */  beq       $v1, $v0, .L802620D0
-/* 1908E8 80262008 0000102D */   daddu    $v0, $zero, $zero
-/* 1908EC 8026200C 08098837 */  j         .L802620DC
-/* 1908F0 80262010 00000000 */   nop
-.L80262014:
-/* 1908F4 80262014 C4880144 */  lwc1      $f8, 0x144($a0)
-/* 1908F8 80262018 C62A0008 */  lwc1      $f10, 8($s1)
-/* 1908FC 8026201C C4840148 */  lwc1      $f4, 0x148($a0)
-/* 190900 80262020 460A4201 */  sub.s     $f8, $f8, $f10
-/* 190904 80262024 3C014140 */  lui       $at, 0x4140
-/* 190908 80262028 44816000 */  mtc1      $at, $f12
-/* 19090C 8026202C C482014C */  lwc1      $f2, 0x14c($a0)
-/* 190910 80262030 460C2100 */  add.s     $f4, $f4, $f12
-/* 190914 80262034 3C0140A0 */  lui       $at, 0x40a0
-/* 190918 80262038 4481A000 */  mtc1      $at, $f20
-/* 19091C 8026203C 00000000 */  nop
-/* 190920 80262040 46141081 */  sub.s     $f2, $f2, $f20
-/* 190924 80262044 C620000C */  lwc1      $f0, 0xc($s1)
-/* 190928 80262048 46002101 */  sub.s     $f4, $f4, $f0
-/* 19092C 8026204C C6460074 */  lwc1      $f6, 0x74($s2)
-/* 190930 80262050 468031A0 */  cvt.s.w   $f6, $f6
-/* 190934 80262054 46064203 */  div.s     $f8, $f8, $f6
-/* 190938 80262058 46085280 */  add.s     $f10, $f10, $f8
-/* 19093C 8026205C C6200010 */  lwc1      $f0, 0x10($s1)
-/* 190940 80262060 46001081 */  sub.s     $f2, $f2, $f0
-/* 190944 80262064 C628000C */  lwc1      $f8, 0xc($s1)
-/* 190948 80262068 46062103 */  div.s     $f4, $f4, $f6
-/* 19094C 8026206C 46044200 */  add.s     $f8, $f8, $f4
-/* 190950 80262070 46061083 */  div.s     $f2, $f2, $f6
-/* 190954 80262074 46020000 */  add.s     $f0, $f0, $f2
-/* 190958 80262078 E62A0008 */  swc1      $f10, 8($s1)
-/* 19095C 8026207C E628000C */  swc1      $f8, 0xc($s1)
-/* 190960 80262080 E6200010 */  swc1      $f0, 0x10($s1)
-/* 190964 80262084 C4800148 */  lwc1      $f0, 0x148($a0)
-/* 190968 80262088 460C0000 */  add.s     $f0, $f0, $f12
-/* 19096C 8026208C 46004386 */  mov.s     $f14, $f8
-/* 190970 80262090 8C860144 */  lw        $a2, 0x144($a0)
-/* 190974 80262094 44070000 */  mfc1      $a3, $f0
-/* 190978 80262098 0C00A7B5 */  jal       dist2D
-/* 19097C 8026209C 46005306 */   mov.s    $f12, $f10
-/* 190980 802620A0 C622000C */  lwc1      $f2, 0xc($s1)
-/* 190984 802620A4 46140003 */  div.s     $f0, $f0, $f20
-/* 190988 802620A8 46001080 */  add.s     $f2, $f2, $f0
-/* 19098C 802620AC E622000C */  swc1      $f2, 0xc($s1)
-/* 190990 802620B0 8E430074 */  lw        $v1, 0x74($s2)
-/* 190994 802620B4 24020001 */  addiu     $v0, $zero, 1
-/* 190998 802620B8 50620001 */  beql      $v1, $v0, .L802620C0
-/* 19099C 802620BC AE430070 */   sw       $v1, 0x70($s2)
-.L802620C0:
-/* 1909A0 802620C0 8E420074 */  lw        $v0, 0x74($s2)
-/* 1909A4 802620C4 2442FFFF */  addiu     $v0, $v0, -1
-/* 1909A8 802620C8 08098836 */  j         .L802620D8
-/* 1909AC 802620CC AE420074 */   sw       $v0, 0x74($s2)
-.L802620D0:
-/* 1909B0 802620D0 08098837 */  j         .L802620DC
-/* 1909B4 802620D4 24020002 */   addiu    $v0, $zero, 2
-.L802620D8:
-/* 1909B8 802620D8 0000102D */  daddu     $v0, $zero, $zero
-.L802620DC:
-/* 1909BC 802620DC 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 1909C0 802620E0 8FB20018 */  lw        $s2, 0x18($sp)
-/* 1909C4 802620E4 8FB10014 */  lw        $s1, 0x14($sp)
-/* 1909C8 802620E8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 1909CC 802620EC D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 1909D0 802620F0 03E00008 */  jr        $ra
-/* 1909D4 802620F4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/18F340/func_802620F8.s b/ver/us/asm/nonmatchings/18F340/func_802620F8.s
deleted file mode 100644
index cdfd2ac099..0000000000
--- a/ver/us/asm/nonmatchings/18F340/func_802620F8.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802620F8
-/* 1909D8 802620F8 8C8200BC */  lw        $v0, 0xbc($a0)
-/* 1909DC 802620FC 3C03802A */  lui       $v1, %hi(D_8029FBB0)
-/* 1909E0 80262100 2463FBB0 */  addiu     $v1, $v1, %lo(D_8029FBB0)
-/* 1909E4 80262104 00021080 */  sll       $v0, $v0, 2
-/* 1909E8 80262108 00431821 */  addu      $v1, $v0, $v1
-/* 1909EC 8026210C 8C620000 */  lw        $v0, ($v1)
-/* 1909F0 80262110 14400003 */  bnez      $v0, .L80262120
-/* 1909F4 80262114 2442FFFF */   addiu    $v0, $v0, -1
-/* 1909F8 80262118 03E00008 */  jr        $ra
-/* 1909FC 8026211C 24020002 */   addiu    $v0, $zero, 2
-.L80262120:
-/* 190A00 80262120 AC620000 */  sw        $v0, ($v1)
-/* 190A04 80262124 03E00008 */  jr        $ra
-/* 190A08 80262128 0000102D */   daddu    $v0, $zero, $zero
-/* 190A0C 8026212C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/evt/player_api/PlayerFaceNpc.s b/ver/us/asm/nonmatchings/evt/player_api/PlayerFaceNpc.s
deleted file mode 100644
index eaa84e5042..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/PlayerFaceNpc.s
+++ /dev/null
@@ -1,147 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel PlayerFaceNpc
-/* F64B4 802D1B04 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* F64B8 802D1B08 AFB20018 */  sw        $s2, 0x18($sp)
-/* F64BC 802D1B0C 0080902D */  daddu     $s2, $a0, $zero
-/* F64C0 802D1B10 AFB60028 */  sw        $s6, 0x28($sp)
-/* F64C4 802D1B14 3C168011 */  lui       $s6, %hi(gPlayerStatus)
-/* F64C8 802D1B18 26D6EFC8 */  addiu     $s6, $s6, %lo(gPlayerStatus)
-/* F64CC 802D1B1C AFB50024 */  sw        $s5, 0x24($sp)
-/* F64D0 802D1B20 26550074 */  addiu     $s5, $s2, 0x74
-/* F64D4 802D1B24 AFB10014 */  sw        $s1, 0x14($sp)
-/* F64D8 802D1B28 26510078 */  addiu     $s1, $s2, 0x78
-/* F64DC 802D1B2C AFB40020 */  sw        $s4, 0x20($sp)
-/* F64E0 802D1B30 AFBF002C */  sw        $ra, 0x2c($sp)
-/* F64E4 802D1B34 AFB3001C */  sw        $s3, 0x1c($sp)
-/* F64E8 802D1B38 AFB00010 */  sw        $s0, 0x10($sp)
-/* F64EC 802D1B3C 8E53000C */  lw        $s3, 0xc($s2)
-/* F64F0 802D1B40 10A00043 */  beqz      $a1, .L802D1C50
-/* F64F4 802D1B44 2654007C */   addiu    $s4, $s2, 0x7c
-/* F64F8 802D1B48 8E650000 */  lw        $a1, ($s3)
-/* F64FC 802D1B4C 0C0B1EAF */  jal       get_variable
-/* F6500 802D1B50 26730004 */   addiu    $s3, $s3, 4
-/* F6504 802D1B54 0040202D */  daddu     $a0, $v0, $zero
-/* F6508 802D1B58 2402FFFF */  addiu     $v0, $zero, -1
-/* F650C 802D1B5C 14820006 */  bne       $a0, $v0, .L802D1B78
-/* F6510 802D1B60 3C02EFE8 */   lui      $v0, 0xefe8
-/* F6514 802D1B64 8E44014C */  lw        $a0, 0x14c($s2)
-/* F6518 802D1B68 0C00EAD2 */  jal       get_npc_safe
-/* F651C 802D1B6C 00000000 */   nop
-/* F6520 802D1B70 080B46E7 */  j         .L802D1B9C
-/* F6524 802D1B74 0040202D */   daddu    $a0, $v0, $zero
-.L802D1B78:
-/* F6528 802D1B78 34422080 */  ori       $v0, $v0, 0x2080
-/* F652C 802D1B7C 0082102A */  slt       $v0, $a0, $v0
-/* F6530 802D1B80 14400006 */  bnez      $v0, .L802D1B9C
-/* F6534 802D1B84 00000000 */   nop
-/* F6538 802D1B88 0C00EAD2 */  jal       get_npc_safe
-/* F653C 802D1B8C 00000000 */   nop
-/* F6540 802D1B90 0040202D */  daddu     $a0, $v0, $zero
-/* F6544 802D1B94 1080005A */  beqz      $a0, .L802D1D00
-/* F6548 802D1B98 24020002 */   addiu    $v0, $zero, 2
-.L802D1B9C:
-/* F654C 802D1B9C 3C10802E */  lui       $s0, %hi(playerNpc)
-/* F6550 802D1BA0 26109D20 */  addiu     $s0, $s0, %lo(playerNpc)
-/* F6554 802D1BA4 8E020000 */  lw        $v0, ($s0)
-/* F6558 802D1BA8 C6C00080 */  lwc1      $f0, 0x80($s6)
-/* F655C 802D1BAC E440000C */  swc1      $f0, 0xc($v0)
-/* F6560 802D1BB0 E6A00000 */  swc1      $f0, ($s5)
-/* F6564 802D1BB4 C6CC0028 */  lwc1      $f12, 0x28($s6)
-/* F6568 802D1BB8 C6CE0030 */  lwc1      $f14, 0x30($s6)
-/* F656C 802D1BBC 8C860038 */  lw        $a2, 0x38($a0)
-/* F6570 802D1BC0 0C00A720 */  jal       atan2
-/* F6574 802D1BC4 8C870040 */   lw       $a3, 0x40($a0)
-/* F6578 802D1BC8 C6A20000 */  lwc1      $f2, ($s5)
-/* F657C 802D1BCC 46020001 */  sub.s     $f0, $f0, $f2
-/* F6580 802D1BD0 E6200000 */  swc1      $f0, ($s1)
-/* F6584 802D1BD4 8E650000 */  lw        $a1, ($s3)
-/* F6588 802D1BD8 0C0B1EAF */  jal       get_variable
-/* F658C 802D1BDC 0240202D */   daddu    $a0, $s2, $zero
-/* F6590 802D1BE0 AE820000 */  sw        $v0, ($s4)
-/* F6594 802D1BE4 8E020000 */  lw        $v0, ($s0)
-/* F6598 802D1BE8 3C01C334 */  lui       $at, 0xc334
-/* F659C 802D1BEC 44810000 */  mtc1      $at, $f0
-/* F65A0 802D1BF0 A440008E */  sh        $zero, 0x8e($v0)
-/* F65A4 802D1BF4 C6220000 */  lwc1      $f2, ($s1)
-/* F65A8 802D1BF8 4600103C */  c.lt.s    $f2, $f0
-/* F65AC 802D1BFC 00000000 */  nop
-/* F65B0 802D1C00 45000007 */  bc1f      .L802D1C20
-/* F65B4 802D1C04 00000000 */   nop
-/* F65B8 802D1C08 3C0143B4 */  lui       $at, 0x43b4
-/* F65BC 802D1C0C 44810000 */  mtc1      $at, $f0
-/* F65C0 802D1C10 00000000 */  nop
-/* F65C4 802D1C14 46001000 */  add.s     $f0, $f2, $f0
-/* F65C8 802D1C18 E6200000 */  swc1      $f0, ($s1)
-/* F65CC 802D1C1C C6220000 */  lwc1      $f2, ($s1)
-.L802D1C20:
-/* F65D0 802D1C20 3C014334 */  lui       $at, 0x4334
-/* F65D4 802D1C24 44810000 */  mtc1      $at, $f0
-/* F65D8 802D1C28 00000000 */  nop
-/* F65DC 802D1C2C 4602003C */  c.lt.s    $f0, $f2
-/* F65E0 802D1C30 00000000 */  nop
-/* F65E4 802D1C34 45000006 */  bc1f      .L802D1C50
-/* F65E8 802D1C38 00000000 */   nop
-/* F65EC 802D1C3C 3C0143B4 */  lui       $at, 0x43b4
-/* F65F0 802D1C40 44810000 */  mtc1      $at, $f0
-/* F65F4 802D1C44 00000000 */  nop
-/* F65F8 802D1C48 46001001 */  sub.s     $f0, $f2, $f0
-/* F65FC 802D1C4C E6200000 */  swc1      $f0, ($s1)
-.L802D1C50:
-/* F6600 802D1C50 8E820000 */  lw        $v0, ($s4)
-/* F6604 802D1C54 1C40000E */  bgtz      $v0, .L802D1C90
-/* F6608 802D1C58 00000000 */   nop
-/* F660C 802D1C5C 3C10802E */  lui       $s0, %hi(playerNpc)
-/* F6610 802D1C60 26109D20 */  addiu     $s0, $s0, %lo(playerNpc)
-/* F6614 802D1C64 8E020000 */  lw        $v0, ($s0)
-/* F6618 802D1C68 C6200000 */  lwc1      $f0, ($s1)
-/* F661C 802D1C6C C44C000C */  lwc1      $f12, 0xc($v0)
-/* F6620 802D1C70 46006300 */  add.s     $f12, $f12, $f0
-/* F6624 802D1C74 0C00A6C9 */  jal       clamp_angle
-/* F6628 802D1C78 E44C000C */   swc1     $f12, 0xc($v0)
-/* F662C 802D1C7C 8E030000 */  lw        $v1, ($s0)
-/* F6630 802D1C80 24020002 */  addiu     $v0, $zero, 2
-/* F6634 802D1C84 E460000C */  swc1      $f0, 0xc($v1)
-/* F6638 802D1C88 080B4740 */  j         .L802D1D00
-/* F663C 802D1C8C E6C00080 */   swc1     $f0, 0x80($s6)
-.L802D1C90:
-/* F6640 802D1C90 3C10802E */  lui       $s0, %hi(playerNpc)
-/* F6644 802D1C94 26109D20 */  addiu     $s0, $s0, %lo(playerNpc)
-/* F6648 802D1C98 8E030000 */  lw        $v1, ($s0)
-/* F664C 802D1C9C 9462008E */  lhu       $v0, 0x8e($v1)
-/* F6650 802D1CA0 24420001 */  addiu     $v0, $v0, 1
-/* F6654 802D1CA4 A462008E */  sh        $v0, 0x8e($v1)
-/* F6658 802D1CA8 00021400 */  sll       $v0, $v0, 0x10
-/* F665C 802D1CAC 00021403 */  sra       $v0, $v0, 0x10
-/* F6660 802D1CB0 C6200000 */  lwc1      $f0, ($s1)
-/* F6664 802D1CB4 44821000 */  mtc1      $v0, $f2
-/* F6668 802D1CB8 00000000 */  nop
-/* F666C 802D1CBC 468010A0 */  cvt.s.w   $f2, $f2
-/* F6670 802D1CC0 46020002 */  mul.s     $f0, $f0, $f2
-/* F6674 802D1CC4 00000000 */  nop
-/* F6678 802D1CC8 C6AC0000 */  lwc1      $f12, ($s5)
-/* F667C 802D1CCC C6820000 */  lwc1      $f2, ($s4)
-/* F6680 802D1CD0 468010A0 */  cvt.s.w   $f2, $f2
-/* F6684 802D1CD4 46020003 */  div.s     $f0, $f0, $f2
-/* F6688 802D1CD8 46006300 */  add.s     $f12, $f12, $f0
-/* F668C 802D1CDC 0C00A6C9 */  jal       clamp_angle
-/* F6690 802D1CE0 E46C000C */   swc1     $f12, 0xc($v1)
-/* F6694 802D1CE4 8E020000 */  lw        $v0, ($s0)
-/* F6698 802D1CE8 E440000C */  swc1      $f0, 0xc($v0)
-/* F669C 802D1CEC E6C00080 */  swc1      $f0, 0x80($s6)
-/* F66A0 802D1CF0 8442008E */  lh        $v0, 0x8e($v0)
-/* F66A4 802D1CF4 8E830000 */  lw        $v1, ($s4)
-/* F66A8 802D1CF8 0043102A */  slt       $v0, $v0, $v1
-/* F66AC 802D1CFC 38420001 */  xori      $v0, $v0, 1
-.L802D1D00:
-/* F66B0 802D1D00 8FBF002C */  lw        $ra, 0x2c($sp)
-/* F66B4 802D1D04 8FB60028 */  lw        $s6, 0x28($sp)
-/* F66B8 802D1D08 8FB50024 */  lw        $s5, 0x24($sp)
-/* F66BC 802D1D0C 8FB40020 */  lw        $s4, 0x20($sp)
-/* F66C0 802D1D10 8FB3001C */  lw        $s3, 0x1c($sp)
-/* F66C4 802D1D14 8FB20018 */  lw        $s2, 0x18($sp)
-/* F66C8 802D1D18 8FB10014 */  lw        $s1, 0x14($sp)
-/* F66CC 802D1D1C 8FB00010 */  lw        $s0, 0x10($sp)
-/* F66D0 802D1D20 03E00008 */  jr        $ra
-/* F66D4 802D1D24 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/evt/player_api/SetPlayerAnimation.s b/ver/us/asm/nonmatchings/evt/player_api/SetPlayerAnimation.s
deleted file mode 100644
index affedc6edc..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/SetPlayerAnimation.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel SetPlayerAnimation
-/* F5A34 802D1084 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* F5A38 802D1088 AFBF0010 */  sw        $ra, 0x10($sp)
-/* F5A3C 802D108C 8C82000C */  lw        $v0, 0xc($a0)
-/* F5A40 802D1090 0C0B1EAF */  jal       get_variable
-/* F5A44 802D1094 8C450000 */   lw       $a1, ($v0)
-/* F5A48 802D1098 3C040008 */  lui       $a0, 8
-/* F5A4C 802D109C 3C03802E */  lui       $v1, %hi(playerNpc)
-/* F5A50 802D10A0 8C639D20 */  lw        $v1, %lo(playerNpc)($v1)
-/* F5A54 802D10A4 34840003 */  ori       $a0, $a0, 3
-/* F5A58 802D10A8 AC620028 */  sw        $v0, 0x28($v1)
-/* F5A5C 802D10AC 3C018011 */  lui       $at, %hi(gPlayerAnimation)
-/* F5A60 802D10B0 AC22F080 */  sw        $v0, %lo(gPlayerAnimation)($at)
-/* F5A64 802D10B4 14440004 */  bne       $v0, $a0, .L802D10C8
-/* F5A68 802D10B8 0000202D */   daddu    $a0, $zero, $zero
-/* F5A6C 802D10BC 0080282D */  daddu     $a1, $a0, $zero
-/* F5A70 802D10C0 0C0B2D5B */  jal       exec_ShakeCam1
-/* F5A74 802D10C4 24060002 */   addiu    $a2, $zero, 2
-.L802D10C8:
-/* F5A78 802D10C8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* F5A7C 802D10CC 24020002 */  addiu     $v0, $zero, 2
-/* F5A80 802D10D0 03E00008 */  jr        $ra
-/* F5A84 802D10D4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/evt/player_api/UseEntryHeading.s b/ver/us/asm/nonmatchings/evt/player_api/UseEntryHeading.s
deleted file mode 100644
index f980ef589d..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/UseEntryHeading.s
+++ /dev/null
@@ -1,122 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel UseEntryHeading
-/* F6920 802D1F70 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* F6924 802D1F74 AFB20020 */  sw        $s2, 0x20($sp)
-/* F6928 802D1F78 0080902D */  daddu     $s2, $a0, $zero
-/* F692C 802D1F7C AFBF0028 */  sw        $ra, 0x28($sp)
-/* F6930 802D1F80 AFB30024 */  sw        $s3, 0x24($sp)
-/* F6934 802D1F84 AFB1001C */  sw        $s1, 0x1c($sp)
-/* F6938 802D1F88 AFB00018 */  sw        $s0, 0x18($sp)
-/* F693C 802D1F8C F7B60038 */  sdc1      $f22, 0x38($sp)
-/* F6940 802D1F90 F7B40030 */  sdc1      $f20, 0x30($sp)
-/* F6944 802D1F94 0C016AFA */  jal       get_current_map_header
-/* F6948 802D1F98 8E50000C */   lw       $s0, 0xc($s2)
-/* F694C 802D1F9C 0240202D */  daddu     $a0, $s2, $zero
-/* F6950 802D1FA0 0040882D */  daddu     $s1, $v0, $zero
-/* F6954 802D1FA4 8E050000 */  lw        $a1, ($s0)
-/* F6958 802D1FA8 0C0B1EAF */  jal       get_variable
-/* F695C 802D1FAC 26100004 */   addiu    $s0, $s0, 4
-/* F6960 802D1FB0 0240202D */  daddu     $a0, $s2, $zero
-/* F6964 802D1FB4 8E050000 */  lw        $a1, ($s0)
-/* F6968 802D1FB8 0C0B1EAF */  jal       get_variable
-/* F696C 802D1FBC 0040982D */   daddu    $s3, $v0, $zero
-/* F6970 802D1FC0 3C108007 */  lui       $s0, %hi(gGameStatusPtr)
-/* F6974 802D1FC4 2610419C */  addiu     $s0, $s0, %lo(gGameStatusPtr)
-/* F6978 802D1FC8 8E050000 */  lw        $a1, ($s0)
-/* F697C 802D1FCC 84A3008E */  lh        $v1, 0x8e($a1)
-/* F6980 802D1FD0 8E240014 */  lw        $a0, 0x14($s1)
-/* F6984 802D1FD4 00031900 */  sll       $v1, $v1, 4
-/* F6988 802D1FD8 00641821 */  addu      $v1, $v1, $a0
-/* F698C 802D1FDC C4600000 */  lwc1      $f0, ($v1)
-/* F6990 802D1FE0 4600020D */  trunc.w.s $f8, $f0
-/* F6994 802D1FE4 44074000 */  mfc1      $a3, $f8
-/* F6998 802D1FE8 00000000 */  nop
-/* F699C 802D1FEC AE470088 */  sw        $a3, 0x88($s2)
-/* F69A0 802D1FF0 84A3008E */  lh        $v1, 0x8e($a1)
-/* F69A4 802D1FF4 8E240014 */  lw        $a0, 0x14($s1)
-/* F69A8 802D1FF8 00031900 */  sll       $v1, $v1, 4
-/* F69AC 802D1FFC 00641821 */  addu      $v1, $v1, $a0
-/* F69B0 802D2000 C4600004 */  lwc1      $f0, 4($v1)
-/* F69B4 802D2004 4600020D */  trunc.w.s $f8, $f0
-/* F69B8 802D2008 E648008C */  swc1      $f8, 0x8c($s2)
-/* F69BC 802D200C 84A3008E */  lh        $v1, 0x8e($a1)
-/* F69C0 802D2010 8E240014 */  lw        $a0, 0x14($s1)
-/* F69C4 802D2014 00031900 */  sll       $v1, $v1, 4
-/* F69C8 802D2018 00641821 */  addu      $v1, $v1, $a0
-/* F69CC 802D201C C4600008 */  lwc1      $f0, 8($v1)
-/* F69D0 802D2020 3C014334 */  lui       $at, 0x4334
-/* F69D4 802D2024 44816000 */  mtc1      $at, $f12
-/* F69D8 802D2028 4600020D */  trunc.w.s $f8, $f0
-/* F69DC 802D202C 44064000 */  mfc1      $a2, $f8
-/* F69E0 802D2030 00000000 */  nop
-/* F69E4 802D2034 AE460090 */  sw        $a2, 0x90($s2)
-/* F69E8 802D2038 84A3008E */  lh        $v1, 0x8e($a1)
-/* F69EC 802D203C 8E240014 */  lw        $a0, 0x14($s1)
-/* F69F0 802D2040 00031900 */  sll       $v1, $v1, 4
-/* F69F4 802D2044 00641821 */  addu      $v1, $v1, $a0
-/* F69F8 802D2048 C460000C */  lwc1      $f0, 0xc($v1)
-/* F69FC 802D204C 4487A000 */  mtc1      $a3, $f20
-/* F6A00 802D2050 00000000 */  nop
-/* F6A04 802D2054 4680A520 */  cvt.s.w   $f20, $f20
-/* F6A08 802D2058 460C0300 */  add.s     $f12, $f0, $f12
-/* F6A0C 802D205C 4486B000 */  mtc1      $a2, $f22
-/* F6A10 802D2060 00000000 */  nop
-/* F6A14 802D2064 4680B5A0 */  cvt.s.w   $f22, $f22
-/* F6A18 802D2068 0C00A6C9 */  jal       clamp_angle
-/* F6A1C 802D206C 0040882D */   daddu    $s1, $v0, $zero
-/* F6A20 802D2070 46000306 */  mov.s     $f12, $f0
-/* F6A24 802D2074 27A50010 */  addiu     $a1, $sp, 0x10
-/* F6A28 802D2078 0C00A88D */  jal       sin_cos_deg
-/* F6A2C 802D207C 27A60014 */   addiu    $a2, $sp, 0x14
-/* F6A30 802D2080 C7A40010 */  lwc1      $f4, 0x10($sp)
-/* F6A34 802D2084 44937000 */  mtc1      $s3, $f14
-/* F6A38 802D2088 00000000 */  nop
-/* F6A3C 802D208C 468073A0 */  cvt.s.w   $f14, $f14
-/* F6A40 802D2090 46047302 */  mul.s     $f12, $f14, $f4
-/* F6A44 802D2094 00000000 */  nop
-/* F6A48 802D2098 8E020000 */  lw        $v0, ($s0)
-/* F6A4C 802D209C 3C013E99 */  lui       $at, 0x3e99
-/* F6A50 802D20A0 3421999A */  ori       $at, $at, 0x999a
-/* F6A54 802D20A4 44810000 */  mtc1      $at, $f0
-/* F6A58 802D20A8 C4420094 */  lwc1      $f2, 0x94($v0)
-/* F6A5C 802D20AC 46001082 */  mul.s     $f2, $f2, $f0
-/* F6A60 802D20B0 00000000 */  nop
-/* F6A64 802D20B4 C7A00014 */  lwc1      $f0, 0x14($sp)
-/* F6A68 802D20B8 46007382 */  mul.s     $f14, $f14, $f0
-/* F6A6C 802D20BC 00000000 */  nop
-/* F6A70 802D20C0 46001182 */  mul.s     $f6, $f2, $f0
-/* F6A74 802D20C4 00000000 */  nop
-/* F6A78 802D20C8 46041082 */  mul.s     $f2, $f2, $f4
-/* F6A7C 802D20CC 00000000 */  nop
-/* F6A80 802D20D0 460CA300 */  add.s     $f12, $f20, $f12
-/* F6A84 802D20D4 460EB381 */  sub.s     $f14, $f22, $f14
-/* F6A88 802D20D8 46066301 */  sub.s     $f12, $f12, $f6
-/* F6A8C 802D20DC 4406A000 */  mfc1      $a2, $f20
-/* F6A90 802D20E0 4407B000 */  mfc1      $a3, $f22
-/* F6A94 802D20E4 46027381 */  sub.s     $f14, $f14, $f2
-/* F6A98 802D20E8 3C108011 */  lui       $s0, %hi(gPlayerStatus)
-/* F6A9C 802D20EC 2610EFC8 */  addiu     $s0, $s0, %lo(gPlayerStatus)
-/* F6AA0 802D20F0 E60C0028 */  swc1      $f12, 0x28($s0)
-/* F6AA4 802D20F4 0C00A7B5 */  jal       dist2D
-/* F6AA8 802D20F8 E60E0030 */   swc1     $f14, 0x30($s0)
-/* F6AAC 802D20FC 44911000 */  mtc1      $s1, $f2
-/* F6AB0 802D2100 00000000 */  nop
-/* F6AB4 802D2104 468010A0 */  cvt.s.w   $f2, $f2
-/* F6AB8 802D2108 46020003 */  div.s     $f0, $f0, $f2
-/* F6ABC 802D210C E6400098 */  swc1      $f0, 0x98($s2)
-/* F6AC0 802D2110 8E030000 */  lw        $v1, ($s0)
-/* F6AC4 802D2114 3C040400 */  lui       $a0, 0x400
-/* F6AC8 802D2118 00641825 */  or        $v1, $v1, $a0
-/* F6ACC 802D211C AE030000 */  sw        $v1, ($s0)
-/* F6AD0 802D2120 8FBF0028 */  lw        $ra, 0x28($sp)
-/* F6AD4 802D2124 8FB30024 */  lw        $s3, 0x24($sp)
-/* F6AD8 802D2128 8FB20020 */  lw        $s2, 0x20($sp)
-/* F6ADC 802D212C 8FB1001C */  lw        $s1, 0x1c($sp)
-/* F6AE0 802D2130 8FB00018 */  lw        $s0, 0x18($sp)
-/* F6AE4 802D2134 D7B60038 */  ldc1      $f22, 0x38($sp)
-/* F6AE8 802D2138 D7B40030 */  ldc1      $f20, 0x30($sp)
-/* F6AEC 802D213C 24020002 */  addiu     $v0, $zero, 2
-/* F6AF0 802D2140 03E00008 */  jr        $ra
-/* F6AF4 802D2144 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/evt/player_api/UseExitHeading.s b/ver/us/asm/nonmatchings/evt/player_api/UseExitHeading.s
deleted file mode 100644
index f0ed2f1252..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/UseExitHeading.s
+++ /dev/null
@@ -1,170 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel UseExitHeading
-/* F6B1C 802D216C 27BDFF98 */  addiu     $sp, $sp, -0x68
-/* F6B20 802D2170 AFB30024 */  sw        $s3, 0x24($sp)
-/* F6B24 802D2174 0080982D */  daddu     $s3, $a0, $zero
-/* F6B28 802D2178 AFBF0030 */  sw        $ra, 0x30($sp)
-/* F6B2C 802D217C AFB5002C */  sw        $s5, 0x2c($sp)
-/* F6B30 802D2180 AFB40028 */  sw        $s4, 0x28($sp)
-/* F6B34 802D2184 AFB20020 */  sw        $s2, 0x20($sp)
-/* F6B38 802D2188 AFB1001C */  sw        $s1, 0x1c($sp)
-/* F6B3C 802D218C AFB00018 */  sw        $s0, 0x18($sp)
-/* F6B40 802D2190 F7BE0060 */  sdc1      $f30, 0x60($sp)
-/* F6B44 802D2194 F7BC0058 */  sdc1      $f28, 0x58($sp)
-/* F6B48 802D2198 F7BA0050 */  sdc1      $f26, 0x50($sp)
-/* F6B4C 802D219C F7B80048 */  sdc1      $f24, 0x48($sp)
-/* F6B50 802D21A0 F7B60040 */  sdc1      $f22, 0x40($sp)
-/* F6B54 802D21A4 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* F6B58 802D21A8 8E70000C */  lw        $s0, 0xc($s3)
-/* F6B5C 802D21AC 0C016AFA */  jal       get_current_map_header
-/* F6B60 802D21B0 26750098 */   addiu    $s5, $s3, 0x98
-/* F6B64 802D21B4 3C128011 */  lui       $s2, %hi(gPlayerStatus)
-/* F6B68 802D21B8 2652EFC8 */  addiu     $s2, $s2, %lo(gPlayerStatus)
-/* F6B6C 802D21BC 0C0389B1 */  jal       func_800E26C4
-/* F6B70 802D21C0 0040A02D */   daddu    $s4, $v0, $zero
-/* F6B74 802D21C4 1040007D */  beqz      $v0, .L802D23BC
-/* F6B78 802D21C8 0000102D */   daddu    $v0, $zero, $zero
-/* F6B7C 802D21CC 8E050000 */  lw        $a1, ($s0)
-/* F6B80 802D21D0 26100004 */  addiu     $s0, $s0, 4
-/* F6B84 802D21D4 0C0B1EAF */  jal       get_variable
-/* F6B88 802D21D8 0260202D */   daddu    $a0, $s3, $zero
-/* F6B8C 802D21DC 0040882D */  daddu     $s1, $v0, $zero
-/* F6B90 802D21E0 8E050000 */  lw        $a1, ($s0)
-/* F6B94 802D21E4 0C0B1EAF */  jal       get_variable
-/* F6B98 802D21E8 0260202D */   daddu    $a0, $s3, $zero
-/* F6B9C 802D21EC 0040802D */  daddu     $s0, $v0, $zero
-/* F6BA0 802D21F0 00101100 */  sll       $v0, $s0, 4
-/* F6BA4 802D21F4 4491C000 */  mtc1      $s1, $f24
-/* F6BA8 802D21F8 00000000 */  nop
-/* F6BAC 802D21FC 4680C620 */  cvt.s.w   $f24, $f24
-/* F6BB0 802D2200 8E460028 */  lw        $a2, 0x28($s2)
-/* F6BB4 802D2204 8E830014 */  lw        $v1, 0x14($s4)
-/* F6BB8 802D2208 3C014120 */  lui       $at, 0x4120
-/* F6BBC 802D220C 44810000 */  mtc1      $at, $f0
-/* F6BC0 802D2210 3C013F00 */  lui       $at, 0x3f00
-/* F6BC4 802D2214 4481D000 */  mtc1      $at, $f26
-/* F6BC8 802D2218 8E470030 */  lw        $a3, 0x30($s2)
-/* F6BCC 802D221C 4600C580 */  add.s     $f22, $f24, $f0
-/* F6BD0 802D2220 00431021 */  addu      $v0, $v0, $v1
-/* F6BD4 802D2224 C45C0000 */  lwc1      $f28, ($v0)
-/* F6BD8 802D2228 461AB502 */  mul.s     $f20, $f22, $f26
-/* F6BDC 802D222C 00000000 */  nop
-/* F6BE0 802D2230 C45E0008 */  lwc1      $f30, 8($v0)
-/* F6BE4 802D2234 4600E306 */  mov.s     $f12, $f28
-/* F6BE8 802D2238 0C00A7B5 */  jal       dist2D
-/* F6BEC 802D223C 4600F386 */   mov.s    $f14, $f30
-/* F6BF0 802D2240 46140081 */  sub.s     $f2, $f0, $f20
-/* F6BF4 802D2244 44800000 */  mtc1      $zero, $f0
-/* F6BF8 802D2248 00000000 */  nop
-/* F6BFC 802D224C 4602003C */  c.lt.s    $f0, $f2
-/* F6C00 802D2250 00000000 */  nop
-/* F6C04 802D2254 4502000B */  bc1fl     .L802D2284
-/* F6C08 802D2258 00108100 */   sll      $s0, $s0, 4
-/* F6C0C 802D225C 4602B03C */  c.lt.s    $f22, $f2
-/* F6C10 802D2260 00000000 */  nop
-/* F6C14 802D2264 45030001 */  bc1tl     .L802D226C
-/* F6C18 802D2268 4600B086 */   mov.s    $f2, $f22
-.L802D226C:
-/* F6C1C 802D226C 461A1002 */  mul.s     $f0, $f2, $f26
-/* F6C20 802D2270 00000000 */  nop
-/* F6C24 802D2274 4600C001 */  sub.s     $f0, $f24, $f0
-/* F6C28 802D2278 4600040D */  trunc.w.s $f16, $f0
-/* F6C2C 802D227C 44118000 */  mfc1      $s1, $f16
-/* F6C30 802D2280 00108100 */  sll       $s0, $s0, 4
-.L802D2284:
-/* F6C34 802D2284 8E820014 */  lw        $v0, 0x14($s4)
-/* F6C38 802D2288 3C014334 */  lui       $at, 0x4334
-/* F6C3C 802D228C 44816000 */  mtc1      $at, $f12
-/* F6C40 802D2290 02021021 */  addu      $v0, $s0, $v0
-/* F6C44 802D2294 C440000C */  lwc1      $f0, 0xc($v0)
-/* F6C48 802D2298 0C00A6C9 */  jal       clamp_angle
-/* F6C4C 802D229C 460C0300 */   add.s    $f12, $f0, $f12
-/* F6C50 802D22A0 46000306 */  mov.s     $f12, $f0
-/* F6C54 802D22A4 27A50010 */  addiu     $a1, $sp, 0x10
-/* F6C58 802D22A8 0C00A88D */  jal       sin_cos_deg
-/* F6C5C 802D22AC 27A60014 */   addiu    $a2, $sp, 0x14
-/* F6C60 802D22B0 C7AA0010 */  lwc1      $f10, 0x10($sp)
-/* F6C64 802D22B4 44913000 */  mtc1      $s1, $f6
-/* F6C68 802D22B8 00000000 */  nop
-/* F6C6C 802D22BC 468031A0 */  cvt.s.w   $f6, $f6
-/* F6C70 802D22C0 460A3302 */  mul.s     $f12, $f6, $f10
-/* F6C74 802D22C4 00000000 */  nop
-/* F6C78 802D22C8 C7A80014 */  lwc1      $f8, 0x14($sp)
-/* F6C7C 802D22CC 46083182 */  mul.s     $f6, $f6, $f8
-/* F6C80 802D22D0 00000000 */  nop
-/* F6C84 802D22D4 C6420028 */  lwc1      $f2, 0x28($s2)
-/* F6C88 802D22D8 461C1081 */  sub.s     $f2, $f2, $f28
-/* F6C8C 802D22DC 46024082 */  mul.s     $f2, $f8, $f2
-/* F6C90 802D22E0 00000000 */  nop
-/* F6C94 802D22E4 C6400030 */  lwc1      $f0, 0x30($s2)
-/* F6C98 802D22E8 4600F001 */  sub.s     $f0, $f30, $f0
-/* F6C9C 802D22EC 46005002 */  mul.s     $f0, $f10, $f0
-/* F6CA0 802D22F0 00000000 */  nop
-/* F6CA4 802D22F4 46001081 */  sub.s     $f2, $f2, $f0
-/* F6CA8 802D22F8 3C013E99 */  lui       $at, 0x3e99
-/* F6CAC 802D22FC 3421999A */  ori       $at, $at, 0x999a
-/* F6CB0 802D2300 44812000 */  mtc1      $at, $f4
-/* F6CB4 802D2304 00000000 */  nop
-/* F6CB8 802D2308 46041102 */  mul.s     $f4, $f2, $f4
-/* F6CBC 802D230C 00000000 */  nop
-/* F6CC0 802D2310 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* F6CC4 802D2314 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* F6CC8 802D2318 46082382 */  mul.s     $f14, $f4, $f8
-/* F6CCC 802D231C 00000000 */  nop
-/* F6CD0 802D2320 E4420094 */  swc1      $f2, 0x94($v0)
-/* F6CD4 802D2324 C6400028 */  lwc1      $f0, 0x28($s2)
-/* F6CD8 802D2328 460C0000 */  add.s     $f0, $f0, $f12
-/* F6CDC 802D232C 460E0001 */  sub.s     $f0, $f0, $f14
-/* F6CE0 802D2330 460A2102 */  mul.s     $f4, $f4, $f10
-/* F6CE4 802D2334 00000000 */  nop
-/* F6CE8 802D2338 4600040D */  trunc.w.s $f16, $f0
-/* F6CEC 802D233C E6700088 */  swc1      $f16, 0x88($s3)
-/* F6CF0 802D2340 C6400030 */  lwc1      $f0, 0x30($s2)
-/* F6CF4 802D2344 46060001 */  sub.s     $f0, $f0, $f6
-/* F6CF8 802D2348 3C038888 */  lui       $v1, 0x8888
-/* F6CFC 802D234C 46040001 */  sub.s     $f0, $f0, $f4
-/* F6D00 802D2350 34638889 */  ori       $v1, $v1, 0x8889
-/* F6D04 802D2354 001127C3 */  sra       $a0, $s1, 0x1f
-/* F6D08 802D2358 4600040D */  trunc.w.s $f16, $f0
-/* F6D0C 802D235C E6700090 */  swc1      $f16, 0x90($s3)
-/* F6D10 802D2360 8E820014 */  lw        $v0, 0x14($s4)
-/* F6D14 802D2364 02230018 */  mult      $s1, $v1
-/* F6D18 802D2368 02028021 */  addu      $s0, $s0, $v0
-/* F6D1C 802D236C C6000004 */  lwc1      $f0, 4($s0)
-/* F6D20 802D2370 24020002 */  addiu     $v0, $zero, 2
-/* F6D24 802D2374 4600040D */  trunc.w.s $f16, $f0
-/* F6D28 802D2378 E670008C */  swc1      $f16, 0x8c($s3)
-/* F6D2C 802D237C 00004010 */  mfhi      $t0
-/* F6D30 802D2380 01111821 */  addu      $v1, $t0, $s1
-/* F6D34 802D2384 000318C3 */  sra       $v1, $v1, 3
-/* F6D38 802D2388 00641823 */  subu      $v1, $v1, $a0
-/* F6D3C 802D238C 44830000 */  mtc1      $v1, $f0
-/* F6D40 802D2390 00000000 */  nop
-/* F6D44 802D2394 46800020 */  cvt.s.w   $f0, $f0
-/* F6D48 802D2398 E6A00000 */  swc1      $f0, ($s5)
-/* F6D4C 802D239C 8E430004 */  lw        $v1, 4($s2)
-/* F6D50 802D23A0 3C040010 */  lui       $a0, 0x10
-/* F6D54 802D23A4 00641825 */  or        $v1, $v1, $a0
-/* F6D58 802D23A8 AE430004 */  sw        $v1, 4($s2)
-/* F6D5C 802D23AC 8E430000 */  lw        $v1, ($s2)
-/* F6D60 802D23B0 3C040400 */  lui       $a0, 0x400
-/* F6D64 802D23B4 00641825 */  or        $v1, $v1, $a0
-/* F6D68 802D23B8 AE430000 */  sw        $v1, ($s2)
-.L802D23BC:
-/* F6D6C 802D23BC 8FBF0030 */  lw        $ra, 0x30($sp)
-/* F6D70 802D23C0 8FB5002C */  lw        $s5, 0x2c($sp)
-/* F6D74 802D23C4 8FB40028 */  lw        $s4, 0x28($sp)
-/* F6D78 802D23C8 8FB30024 */  lw        $s3, 0x24($sp)
-/* F6D7C 802D23CC 8FB20020 */  lw        $s2, 0x20($sp)
-/* F6D80 802D23D0 8FB1001C */  lw        $s1, 0x1c($sp)
-/* F6D84 802D23D4 8FB00018 */  lw        $s0, 0x18($sp)
-/* F6D88 802D23D8 D7BE0060 */  ldc1      $f30, 0x60($sp)
-/* F6D8C 802D23DC D7BC0058 */  ldc1      $f28, 0x58($sp)
-/* F6D90 802D23E0 D7BA0050 */  ldc1      $f26, 0x50($sp)
-/* F6D94 802D23E4 D7B80048 */  ldc1      $f24, 0x48($sp)
-/* F6D98 802D23E8 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* F6D9C 802D23EC D7B40038 */  ldc1      $f20, 0x38($sp)
-/* F6DA0 802D23F0 03E00008 */  jr        $ra
-/* F6DA4 802D23F4 27BD0068 */   addiu    $sp, $sp, 0x68
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D1270.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D1270.s
deleted file mode 100644
index 6ba44f792e..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D1270.s
+++ /dev/null
@@ -1,73 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D1270
-/* F5C20 802D1270 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* F5C24 802D1274 AFB10014 */  sw        $s1, 0x14($sp)
-/* F5C28 802D1278 0080882D */  daddu     $s1, $a0, $zero
-/* F5C2C 802D127C AFB20018 */  sw        $s2, 0x18($sp)
-/* F5C30 802D1280 3C128011 */  lui       $s2, %hi(gPlayerStatus)
-/* F5C34 802D1284 2652EFC8 */  addiu     $s2, $s2, %lo(gPlayerStatus)
-/* F5C38 802D1288 AFBF001C */  sw        $ra, 0x1c($sp)
-/* F5C3C 802D128C AFB00010 */  sw        $s0, 0x10($sp)
-/* F5C40 802D1290 F7B80030 */  sdc1      $f24, 0x30($sp)
-/* F5C44 802D1294 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* F5C48 802D1298 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* F5C4C 802D129C 10A0002A */  beqz      $a1, .L802D1348
-/* F5C50 802D12A0 8E30000C */   lw       $s0, 0xc($s1)
-/* F5C54 802D12A4 8E050000 */  lw        $a1, ($s0)
-/* F5C58 802D12A8 0C0B1EAF */  jal       get_variable
-/* F5C5C 802D12AC 26100004 */   addiu    $s0, $s0, 4
-/* F5C60 802D12B0 8E050000 */  lw        $a1, ($s0)
-/* F5C64 802D12B4 26100004 */  addiu     $s0, $s0, 4
-/* F5C68 802D12B8 4482C000 */  mtc1      $v0, $f24
-/* F5C6C 802D12BC 00000000 */  nop
-/* F5C70 802D12C0 4680C620 */  cvt.s.w   $f24, $f24
-/* F5C74 802D12C4 0C0B1EAF */  jal       get_variable
-/* F5C78 802D12C8 0220202D */   daddu    $a0, $s1, $zero
-/* F5C7C 802D12CC 8E050000 */  lw        $a1, ($s0)
-/* F5C80 802D12D0 4482B000 */  mtc1      $v0, $f22
-/* F5C84 802D12D4 00000000 */  nop
-/* F5C88 802D12D8 4680B5A0 */  cvt.s.w   $f22, $f22
-/* F5C8C 802D12DC 0C0B210B */  jal       get_float_variable
-/* F5C90 802D12E0 0220202D */   daddu    $a0, $s1, $zero
-/* F5C94 802D12E4 C64C0028 */  lwc1      $f12, 0x28($s2)
-/* F5C98 802D12E8 C64E0030 */  lwc1      $f14, 0x30($s2)
-/* F5C9C 802D12EC 4406C000 */  mfc1      $a2, $f24
-/* F5CA0 802D12F0 4407B000 */  mfc1      $a3, $f22
-/* F5CA4 802D12F4 0C00A720 */  jal       atan2
-/* F5CA8 802D12F8 46000506 */   mov.s    $f20, $f0
-/* F5CAC 802D12FC C64C0028 */  lwc1      $f12, 0x28($s2)
-/* F5CB0 802D1300 C64E0030 */  lwc1      $f14, 0x30($s2)
-/* F5CB4 802D1304 4406C000 */  mfc1      $a2, $f24
-/* F5CB8 802D1308 4407B000 */  mfc1      $a3, $f22
-/* F5CBC 802D130C 0C00A7B5 */  jal       dist2D
-/* F5CC0 802D1310 E6400080 */   swc1     $f0, 0x80($s2)
-/* F5CC4 802D1314 46140503 */  div.s     $f20, $f0, $f20
-/* F5CC8 802D1318 4600A10D */  trunc.w.s $f4, $f20
-/* F5CCC 802D131C 44042000 */  mfc1      $a0, $f4
-/* F5CD0 802D1320 00000000 */  nop
-/* F5CD4 802D1324 44841000 */  mtc1      $a0, $f2
-/* F5CD8 802D1328 00000000 */  nop
-/* F5CDC 802D132C 468010A0 */  cvt.s.w   $f2, $f2
-/* F5CE0 802D1330 46020003 */  div.s     $f0, $f0, $f2
-/* F5CE4 802D1334 AE240070 */  sw        $a0, 0x70($s1)
-/* F5CE8 802D1338 8E450080 */  lw        $a1, 0x80($s2)
-/* F5CEC 802D133C 44060000 */  mfc1      $a2, $f0
-/* F5CF0 802D1340 0C0389DE */  jal       move_player
-/* F5CF4 802D1344 00000000 */   nop
-.L802D1348:
-/* F5CF8 802D1348 8E230070 */  lw        $v1, 0x70($s1)
-/* F5CFC 802D134C 2463FFFF */  addiu     $v1, $v1, -1
-/* F5D00 802D1350 000317C3 */  sra       $v0, $v1, 0x1f
-/* F5D04 802D1354 AE230070 */  sw        $v1, 0x70($s1)
-/* F5D08 802D1358 8FBF001C */  lw        $ra, 0x1c($sp)
-/* F5D0C 802D135C 8FB20018 */  lw        $s2, 0x18($sp)
-/* F5D10 802D1360 8FB10014 */  lw        $s1, 0x14($sp)
-/* F5D14 802D1364 8FB00010 */  lw        $s0, 0x10($sp)
-/* F5D18 802D1368 D7B80030 */  ldc1      $f24, 0x30($sp)
-/* F5D1C 802D136C D7B60028 */  ldc1      $f22, 0x28($sp)
-/* F5D20 802D1370 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* F5D24 802D1374 30420002 */  andi      $v0, $v0, 2
-/* F5D28 802D1378 03E00008 */  jr        $ra
-/* F5D2C 802D137C 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D1380.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D1380.s
deleted file mode 100644
index ec61f47886..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D1380.s
+++ /dev/null
@@ -1,95 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D1380
-/* F5D30 802D1380 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* F5D34 802D1384 AFB10014 */  sw        $s1, 0x14($sp)
-/* F5D38 802D1388 0080882D */  daddu     $s1, $a0, $zero
-/* F5D3C 802D138C AFB20018 */  sw        $s2, 0x18($sp)
-/* F5D40 802D1390 3C128011 */  lui       $s2, %hi(gPlayerStatus)
-/* F5D44 802D1394 2652EFC8 */  addiu     $s2, $s2, %lo(gPlayerStatus)
-/* F5D48 802D1398 AFBF001C */  sw        $ra, 0x1c($sp)
-/* F5D4C 802D139C AFB00010 */  sw        $s0, 0x10($sp)
-/* F5D50 802D13A0 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* F5D54 802D13A4 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* F5D58 802D13A8 10A00044 */  beqz      $a1, .L802D14BC
-/* F5D5C 802D13AC 8E30000C */   lw       $s0, 0xc($s1)
-/* F5D60 802D13B0 8E050000 */  lw        $a1, ($s0)
-/* F5D64 802D13B4 0C0B1EAF */  jal       get_variable
-/* F5D68 802D13B8 26100004 */   addiu    $s0, $s0, 4
-/* F5D6C 802D13BC 8E050000 */  lw        $a1, ($s0)
-/* F5D70 802D13C0 26100004 */  addiu     $s0, $s0, 4
-/* F5D74 802D13C4 4482B000 */  mtc1      $v0, $f22
-/* F5D78 802D13C8 00000000 */  nop
-/* F5D7C 802D13CC 4680B5A0 */  cvt.s.w   $f22, $f22
-/* F5D80 802D13D0 0C0B1EAF */  jal       get_variable
-/* F5D84 802D13D4 0220202D */   daddu    $a0, $s1, $zero
-/* F5D88 802D13D8 8E050000 */  lw        $a1, ($s0)
-/* F5D8C 802D13DC 4482A000 */  mtc1      $v0, $f20
-/* F5D90 802D13E0 00000000 */  nop
-/* F5D94 802D13E4 4680A520 */  cvt.s.w   $f20, $f20
-/* F5D98 802D13E8 0C0B1EAF */  jal       get_variable
-/* F5D9C 802D13EC 0220202D */   daddu    $a0, $s1, $zero
-/* F5DA0 802D13F0 3C10802E */  lui       $s0, %hi(playerNpc)
-/* F5DA4 802D13F4 26109D20 */  addiu     $s0, $s0, %lo(playerNpc)
-/* F5DA8 802D13F8 8E030000 */  lw        $v1, ($s0)
-/* F5DAC 802D13FC 4406B000 */  mfc1      $a2, $f22
-/* F5DB0 802D1400 4407A000 */  mfc1      $a3, $f20
-/* F5DB4 802D1404 A462008E */  sh        $v0, 0x8e($v1)
-/* F5DB8 802D1408 C64C0028 */  lwc1      $f12, 0x28($s2)
-/* F5DBC 802D140C 0C00A720 */  jal       atan2
-/* F5DC0 802D1410 C64E0030 */   lwc1     $f14, 0x30($s2)
-/* F5DC4 802D1414 8E020000 */  lw        $v0, ($s0)
-/* F5DC8 802D1418 E6400080 */  swc1      $f0, 0x80($s2)
-/* F5DCC 802D141C 8442008E */  lh        $v0, 0x8e($v0)
-/* F5DD0 802D1420 1040000F */  beqz      $v0, .L802D1460
-/* F5DD4 802D1424 00000000 */   nop
-/* F5DD8 802D1428 C64C0028 */  lwc1      $f12, 0x28($s2)
-/* F5DDC 802D142C C64E0030 */  lwc1      $f14, 0x30($s2)
-/* F5DE0 802D1430 4406B000 */  mfc1      $a2, $f22
-/* F5DE4 802D1434 4407A000 */  mfc1      $a3, $f20
-/* F5DE8 802D1438 0C00A7B5 */  jal       dist2D
-/* F5DEC 802D143C 00000000 */   nop
-/* F5DF0 802D1440 8E030000 */  lw        $v1, ($s0)
-/* F5DF4 802D1444 8462008E */  lh        $v0, 0x8e($v1)
-/* F5DF8 802D1448 44821000 */  mtc1      $v0, $f2
-/* F5DFC 802D144C 00000000 */  nop
-/* F5E00 802D1450 468010A0 */  cvt.s.w   $f2, $f2
-/* F5E04 802D1454 46020003 */  div.s     $f0, $f0, $f2
-/* F5E08 802D1458 080B4529 */  j         .L802D14A4
-/* F5E0C 802D145C E4600018 */   swc1     $f0, 0x18($v1)
-.L802D1460:
-/* F5E10 802D1460 C64C0028 */  lwc1      $f12, 0x28($s2)
-/* F5E14 802D1464 C64E0030 */  lwc1      $f14, 0x30($s2)
-/* F5E18 802D1468 4406B000 */  mfc1      $a2, $f22
-/* F5E1C 802D146C 4407A000 */  mfc1      $a3, $f20
-/* F5E20 802D1470 0C00A7B5 */  jal       dist2D
-/* F5E24 802D1474 00000000 */   nop
-/* F5E28 802D1478 8E030000 */  lw        $v1, ($s0)
-/* F5E2C 802D147C C4620018 */  lwc1      $f2, 0x18($v1)
-/* F5E30 802D1480 46020003 */  div.s     $f0, $f0, $f2
-/* F5E34 802D1484 4600010D */  trunc.w.s $f4, $f0
-/* F5E38 802D1488 44022000 */  mfc1      $v0, $f4
-/* F5E3C 802D148C 00000000 */  nop
-/* F5E40 802D1490 A462008E */  sh        $v0, 0x8e($v1)
-/* F5E44 802D1494 00021400 */  sll       $v0, $v0, 0x10
-/* F5E48 802D1498 14400002 */  bnez      $v0, .L802D14A4
-/* F5E4C 802D149C 24020001 */   addiu    $v0, $zero, 1
-/* F5E50 802D14A0 A462008E */  sh        $v0, 0x8e($v1)
-.L802D14A4:
-/* F5E54 802D14A4 3C02802E */  lui       $v0, %hi(playerNpc)
-/* F5E58 802D14A8 8C429D20 */  lw        $v0, %lo(playerNpc)($v0)
-/* F5E5C 802D14AC 8E450080 */  lw        $a1, 0x80($s2)
-/* F5E60 802D14B0 8444008E */  lh        $a0, 0x8e($v0)
-/* F5E64 802D14B4 0C0389DE */  jal       move_player
-/* F5E68 802D14B8 8C460018 */   lw       $a2, 0x18($v0)
-.L802D14BC:
-/* F5E6C 802D14BC 8FBF001C */  lw        $ra, 0x1c($sp)
-/* F5E70 802D14C0 8FB20018 */  lw        $s2, 0x18($sp)
-/* F5E74 802D14C4 8FB10014 */  lw        $s1, 0x14($sp)
-/* F5E78 802D14C8 8FB00010 */  lw        $s0, 0x10($sp)
-/* F5E7C 802D14CC D7B60028 */  ldc1      $f22, 0x28($sp)
-/* F5E80 802D14D0 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* F5E84 802D14D4 24020001 */  addiu     $v0, $zero, 1
-/* F5E88 802D14D8 03E00008 */  jr        $ra
-/* F5E8C 802D14DC 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D23F8.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D23F8.s
deleted file mode 100644
index eebe134f1c..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D23F8.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D23F8
-/* F6DA8 802D23F8 3C038011 */  lui       $v1, %hi(gPlayerActionState)
-/* F6DAC 802D23FC 9063F07C */  lbu       $v1, %lo(gPlayerActionState)($v1)
-/* F6DB0 802D2400 2C620003 */  sltiu     $v0, $v1, 3
-/* F6DB4 802D2404 1440000D */  bnez      $v0, .L802D243C
-/* F6DB8 802D2408 00031600 */   sll      $v0, $v1, 0x18
-/* F6DBC 802D240C 00021E03 */  sra       $v1, $v0, 0x18
-/* F6DC0 802D2410 2402000A */  addiu     $v0, $zero, 0xa
-/* F6DC4 802D2414 10620009 */  beq       $v1, $v0, .L802D243C
-/* F6DC8 802D2418 2402000B */   addiu    $v0, $zero, 0xb
-/* F6DCC 802D241C 10620007 */  beq       $v1, $v0, .L802D243C
-/* F6DD0 802D2420 2402000E */   addiu    $v0, $zero, 0xe
-/* F6DD4 802D2424 10620005 */  beq       $v1, $v0, .L802D243C
-/* F6DD8 802D2428 24020010 */   addiu    $v0, $zero, 0x10
-/* F6DDC 802D242C 10620003 */  beq       $v1, $v0, .L802D243C
-/* F6DE0 802D2430 2402001A */   addiu    $v0, $zero, 0x1a
-/* F6DE4 802D2434 14620003 */  bne       $v1, $v0, .L802D2444
-/* F6DE8 802D2438 00000000 */   nop
-.L802D243C:
-/* F6DEC 802D243C 03E00008 */  jr        $ra
-/* F6DF0 802D2440 24020001 */   addiu    $v0, $zero, 1
-.L802D2444:
-/* F6DF4 802D2444 03E00008 */  jr        $ra
-/* F6DF8 802D2448 0000102D */   daddu    $v0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D2884.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D2884.s
deleted file mode 100644
index af36a37f97..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D2884.s
+++ /dev/null
@@ -1,148 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D2884
-/* F7234 802D2884 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* F7238 802D2888 AFB20018 */  sw        $s2, 0x18($sp)
-/* F723C 802D288C 0080902D */  daddu     $s2, $a0, $zero
-/* F7240 802D2890 AFB3001C */  sw        $s3, 0x1c($sp)
-/* F7244 802D2894 3C138011 */  lui       $s3, %hi(gPlayerStatus)
-/* F7248 802D2898 2673EFC8 */  addiu     $s3, $s3, %lo(gPlayerStatus)
-/* F724C 802D289C AFB50024 */  sw        $s5, 0x24($sp)
-/* F7250 802D28A0 26550074 */  addiu     $s5, $s2, 0x74
-/* F7254 802D28A4 AFB10014 */  sw        $s1, 0x14($sp)
-/* F7258 802D28A8 26510078 */  addiu     $s1, $s2, 0x78
-/* F725C 802D28AC AFB40020 */  sw        $s4, 0x20($sp)
-/* F7260 802D28B0 AFBF0028 */  sw        $ra, 0x28($sp)
-/* F7264 802D28B4 AFB00010 */  sw        $s0, 0x10($sp)
-/* F7268 802D28B8 F7B40030 */  sdc1      $f20, 0x30($sp)
-/* F726C 802D28BC 8E50000C */  lw        $s0, 0xc($s2)
-/* F7270 802D28C0 10A00043 */  beqz      $a1, .L802D29D0
-/* F7274 802D28C4 2654007C */   addiu    $s4, $s2, 0x7c
-/* F7278 802D28C8 8E050000 */  lw        $a1, ($s0)
-/* F727C 802D28CC 0C0B210B */  jal       get_float_variable
-/* F7280 802D28D0 26100004 */   addiu    $s0, $s0, 4
-/* F7284 802D28D4 0240202D */  daddu     $a0, $s2, $zero
-/* F7288 802D28D8 8E050000 */  lw        $a1, ($s0)
-/* F728C 802D28DC 0C0B210B */  jal       get_float_variable
-/* F7290 802D28E0 46000506 */   mov.s    $f20, $f0
-/* F7294 802D28E4 3C02802E */  lui       $v0, %hi(playerNpc)
-/* F7298 802D28E8 8C429D20 */  lw        $v0, %lo(playerNpc)($v0)
-/* F729C 802D28EC C6620080 */  lwc1      $f2, 0x80($s3)
-/* F72A0 802D28F0 26100004 */  addiu     $s0, $s0, 4
-/* F72A4 802D28F4 E442000C */  swc1      $f2, 0xc($v0)
-/* F72A8 802D28F8 E6420074 */  swc1      $f2, 0x74($s2)
-/* F72AC 802D28FC C66C0028 */  lwc1      $f12, 0x28($s3)
-/* F72B0 802D2900 46146032 */  c.eq.s    $f12, $f20
-/* F72B4 802D2904 00000000 */  nop
-/* F72B8 802D2908 45000006 */  bc1f      .L802D2924
-/* F72BC 802D290C 46000086 */   mov.s    $f2, $f0
-/* F72C0 802D2910 C6600030 */  lwc1      $f0, 0x30($s3)
-/* F72C4 802D2914 46020032 */  c.eq.s    $f0, $f2
-/* F72C8 802D2918 00000000 */  nop
-/* F72CC 802D291C 45010008 */  bc1t      .L802D2940
-/* F72D0 802D2920 00000000 */   nop
-.L802D2924:
-/* F72D4 802D2924 C66E0030 */  lwc1      $f14, 0x30($s3)
-/* F72D8 802D2928 4406A000 */  mfc1      $a2, $f20
-/* F72DC 802D292C 44071000 */  mfc1      $a3, $f2
-/* F72E0 802D2930 0C00A720 */  jal       atan2
-/* F72E4 802D2934 00000000 */   nop
-/* F72E8 802D2938 080B4A51 */  j         .L802D2944
-/* F72EC 802D293C 46000086 */   mov.s    $f2, $f0
-.L802D2940:
-/* F72F0 802D2940 C6620080 */  lwc1      $f2, 0x80($s3)
-.L802D2944:
-/* F72F4 802D2944 C6A00000 */  lwc1      $f0, ($s5)
-/* F72F8 802D2948 46001001 */  sub.s     $f0, $f2, $f0
-/* F72FC 802D294C E6200000 */  swc1      $f0, ($s1)
-/* F7300 802D2950 8E050000 */  lw        $a1, ($s0)
-/* F7304 802D2954 0C0B1EAF */  jal       get_variable
-/* F7308 802D2958 0240202D */   daddu    $a0, $s2, $zero
-/* F730C 802D295C AE820000 */  sw        $v0, ($s4)
-/* F7310 802D2960 3C02802E */  lui       $v0, %hi(playerNpc)
-/* F7314 802D2964 8C429D20 */  lw        $v0, %lo(playerNpc)($v0)
-/* F7318 802D2968 3C01C334 */  lui       $at, 0xc334
-/* F731C 802D296C 44810000 */  mtc1      $at, $f0
-/* F7320 802D2970 A440008E */  sh        $zero, 0x8e($v0)
-/* F7324 802D2974 C6220000 */  lwc1      $f2, ($s1)
-/* F7328 802D2978 4600103C */  c.lt.s    $f2, $f0
-/* F732C 802D297C 00000000 */  nop
-/* F7330 802D2980 45000007 */  bc1f      .L802D29A0
-/* F7334 802D2984 00000000 */   nop
-/* F7338 802D2988 3C0143B4 */  lui       $at, 0x43b4
-/* F733C 802D298C 44810000 */  mtc1      $at, $f0
-/* F7340 802D2990 00000000 */  nop
-/* F7344 802D2994 46001000 */  add.s     $f0, $f2, $f0
-/* F7348 802D2998 E6200000 */  swc1      $f0, ($s1)
-/* F734C 802D299C C6220000 */  lwc1      $f2, ($s1)
-.L802D29A0:
-/* F7350 802D29A0 3C014334 */  lui       $at, 0x4334
-/* F7354 802D29A4 44810000 */  mtc1      $at, $f0
-/* F7358 802D29A8 00000000 */  nop
-/* F735C 802D29AC 4602003C */  c.lt.s    $f0, $f2
-/* F7360 802D29B0 00000000 */  nop
-/* F7364 802D29B4 45000006 */  bc1f      .L802D29D0
-/* F7368 802D29B8 00000000 */   nop
-/* F736C 802D29BC 3C0143B4 */  lui       $at, 0x43b4
-/* F7370 802D29C0 44810000 */  mtc1      $at, $f0
-/* F7374 802D29C4 00000000 */  nop
-/* F7378 802D29C8 46001001 */  sub.s     $f0, $f2, $f0
-/* F737C 802D29CC E6200000 */  swc1      $f0, ($s1)
-.L802D29D0:
-/* F7380 802D29D0 8E820000 */  lw        $v0, ($s4)
-/* F7384 802D29D4 1C40000E */  bgtz      $v0, .L802D2A10
-/* F7388 802D29D8 00000000 */   nop
-/* F738C 802D29DC 3C10802E */  lui       $s0, %hi(playerNpc)
-/* F7390 802D29E0 26109D20 */  addiu     $s0, $s0, %lo(playerNpc)
-/* F7394 802D29E4 8E020000 */  lw        $v0, ($s0)
-/* F7398 802D29E8 C6200000 */  lwc1      $f0, ($s1)
-/* F739C 802D29EC C44C000C */  lwc1      $f12, 0xc($v0)
-/* F73A0 802D29F0 46006300 */  add.s     $f12, $f12, $f0
-/* F73A4 802D29F4 0C00A6C9 */  jal       clamp_angle
-/* F73A8 802D29F8 E44C000C */   swc1     $f12, 0xc($v0)
-/* F73AC 802D29FC 8E030000 */  lw        $v1, ($s0)
-/* F73B0 802D2A00 24020002 */  addiu     $v0, $zero, 2
-/* F73B4 802D2A04 E460000C */  swc1      $f0, 0xc($v1)
-/* F73B8 802D2A08 080B4AA0 */  j         .L802D2A80
-/* F73BC 802D2A0C E6600080 */   swc1     $f0, 0x80($s3)
-.L802D2A10:
-/* F73C0 802D2A10 3C10802E */  lui       $s0, %hi(playerNpc)
-/* F73C4 802D2A14 26109D20 */  addiu     $s0, $s0, %lo(playerNpc)
-/* F73C8 802D2A18 8E030000 */  lw        $v1, ($s0)
-/* F73CC 802D2A1C 9462008E */  lhu       $v0, 0x8e($v1)
-/* F73D0 802D2A20 24420001 */  addiu     $v0, $v0, 1
-/* F73D4 802D2A24 A462008E */  sh        $v0, 0x8e($v1)
-/* F73D8 802D2A28 00021400 */  sll       $v0, $v0, 0x10
-/* F73DC 802D2A2C 00021403 */  sra       $v0, $v0, 0x10
-/* F73E0 802D2A30 C6200000 */  lwc1      $f0, ($s1)
-/* F73E4 802D2A34 44821000 */  mtc1      $v0, $f2
-/* F73E8 802D2A38 00000000 */  nop
-/* F73EC 802D2A3C 468010A0 */  cvt.s.w   $f2, $f2
-/* F73F0 802D2A40 46020002 */  mul.s     $f0, $f0, $f2
-/* F73F4 802D2A44 00000000 */  nop
-/* F73F8 802D2A48 C6AC0000 */  lwc1      $f12, ($s5)
-/* F73FC 802D2A4C C6820000 */  lwc1      $f2, ($s4)
-/* F7400 802D2A50 468010A0 */  cvt.s.w   $f2, $f2
-/* F7404 802D2A54 46020003 */  div.s     $f0, $f0, $f2
-/* F7408 802D2A58 46006300 */  add.s     $f12, $f12, $f0
-/* F740C 802D2A5C 0C00A6C9 */  jal       clamp_angle
-/* F7410 802D2A60 E46C000C */   swc1     $f12, 0xc($v1)
-/* F7414 802D2A64 8E020000 */  lw        $v0, ($s0)
-/* F7418 802D2A68 E440000C */  swc1      $f0, 0xc($v0)
-/* F741C 802D2A6C E6600080 */  swc1      $f0, 0x80($s3)
-/* F7420 802D2A70 8442008E */  lh        $v0, 0x8e($v0)
-/* F7424 802D2A74 8E830000 */  lw        $v1, ($s4)
-/* F7428 802D2A78 0043102A */  slt       $v0, $v0, $v1
-/* F742C 802D2A7C 38420001 */  xori      $v0, $v0, 1
-.L802D2A80:
-/* F7430 802D2A80 8FBF0028 */  lw        $ra, 0x28($sp)
-/* F7434 802D2A84 8FB50024 */  lw        $s5, 0x24($sp)
-/* F7438 802D2A88 8FB40020 */  lw        $s4, 0x20($sp)
-/* F743C 802D2A8C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* F7440 802D2A90 8FB20018 */  lw        $s2, 0x18($sp)
-/* F7444 802D2A94 8FB10014 */  lw        $s1, 0x14($sp)
-/* F7448 802D2A98 8FB00010 */  lw        $s0, 0x10($sp)
-/* F744C 802D2A9C D7B40030 */  ldc1      $f20, 0x30($sp)
-/* F7450 802D2AA0 03E00008 */  jr        $ra
-/* F7454 802D2AA4 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D2D30.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D2D30.s
deleted file mode 100644
index b67656a03d..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D2D30.s
+++ /dev/null
@@ -1,111 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D2D30
-/* F76E0 802D2D30 27BDFFF8 */  addiu     $sp, $sp, -8
-/* F76E4 802D2D34 0080602D */  daddu     $t4, $a0, $zero
-/* F76E8 802D2D38 00A0682D */  daddu     $t5, $a1, $zero
-/* F76EC 802D2D3C 00E0582D */  daddu     $t3, $a3, $zero
-/* F76F0 802D2D40 3C08800A */  lui       $t0, %hi(gMasterGfxPos)
-/* F76F4 802D2D44 2508A66C */  addiu     $t0, $t0, %lo(gMasterGfxPos)
-/* F76F8 802D2D48 3C02E700 */  lui       $v0, 0xe700
-/* F76FC 802D2D4C AFB00000 */  sw        $s0, ($sp)
-/* F7700 802D2D50 8D070000 */  lw        $a3, ($t0)
-/* F7704 802D2D54 97B9001A */  lhu       $t9, 0x1a($sp)
-/* F7708 802D2D58 97B0001E */  lhu       $s0, 0x1e($sp)
-/* F770C 802D2D5C 97AF0022 */  lhu       $t7, 0x22($sp)
-/* F7710 802D2D60 97B80026 */  lhu       $t8, 0x26($sp)
-/* F7714 802D2D64 00E0182D */  daddu     $v1, $a3, $zero
-/* F7718 802D2D68 24E70008 */  addiu     $a3, $a3, 8
-/* F771C 802D2D6C AD070000 */  sw        $a3, ($t0)
-/* F7720 802D2D70 AC620000 */  sw        $v0, ($v1)
-/* F7724 802D2D74 AC600004 */  sw        $zero, 4($v1)
-/* F7728 802D2D78 316300FF */  andi      $v1, $t3, 0xff
-/* F772C 802D2D7C 240200FF */  addiu     $v0, $zero, 0xff
-/* F7730 802D2D80 1462000A */  bne       $v1, $v0, .L802D2DAC
-/* F7734 802D2D84 00C0702D */   daddu    $t6, $a2, $zero
-/* F7738 802D2D88 3C04FCFF */  lui       $a0, 0xfcff
-/* F773C 802D2D8C 3484FFFF */  ori       $a0, $a0, 0xffff
-/* F7740 802D2D90 3C03FFFD */  lui       $v1, 0xfffd
-/* F7744 802D2D94 3463FCFE */  ori       $v1, $v1, 0xfcfe
-/* F7748 802D2D98 24E20008 */  addiu     $v0, $a3, 8
-/* F774C 802D2D9C AD020000 */  sw        $v0, ($t0)
-/* F7750 802D2DA0 ACE40000 */  sw        $a0, ($a3)
-/* F7754 802D2DA4 080B4B7B */  j         .L802D2DEC
-/* F7758 802D2DA8 ACE30004 */   sw       $v1, 4($a3)
-.L802D2DAC:
-/* F775C 802D2DAC 3C05E200 */  lui       $a1, 0xe200
-/* F7760 802D2DB0 34A5001C */  ori       $a1, $a1, 0x1c
-/* F7764 802D2DB4 3C030050 */  lui       $v1, 0x50
-/* F7768 802D2DB8 34634240 */  ori       $v1, $v1, 0x4240
-/* F776C 802D2DBC 3C06FCFF */  lui       $a2, 0xfcff
-/* F7770 802D2DC0 34C6FFFF */  ori       $a2, $a2, 0xffff
-/* F7774 802D2DC4 3C04FFFD */  lui       $a0, 0xfffd
-/* F7778 802D2DC8 3484F6FB */  ori       $a0, $a0, 0xf6fb
-/* F777C 802D2DCC 24E20008 */  addiu     $v0, $a3, 8
-/* F7780 802D2DD0 AD020000 */  sw        $v0, ($t0)
-/* F7784 802D2DD4 24E20010 */  addiu     $v0, $a3, 0x10
-/* F7788 802D2DD8 ACE50000 */  sw        $a1, ($a3)
-/* F778C 802D2DDC ACE30004 */  sw        $v1, 4($a3)
-/* F7790 802D2DE0 AD020000 */  sw        $v0, ($t0)
-/* F7794 802D2DE4 ACE60008 */  sw        $a2, 8($a3)
-/* F7798 802D2DE8 ACE4000C */  sw        $a0, 0xc($a3)
-.L802D2DEC:
-/* F779C 802D2DEC 3C09E200 */  lui       $t1, 0xe200
-/* F77A0 802D2DF0 3529001C */  ori       $t1, $t1, 0x1c
-/* F77A4 802D2DF4 3C070F0A */  lui       $a3, 0xf0a
-/* F77A8 802D2DF8 34E77008 */  ori       $a3, $a3, 0x7008
-/* F77AC 802D2DFC 3C0AFCFF */  lui       $t2, 0xfcff
-/* F77B0 802D2E00 354AFFFF */  ori       $t2, $t2, 0xffff
-/* F77B4 802D2E04 3C08FFFC */  lui       $t0, 0xfffc
-/* F77B8 802D2E08 3C06800A */  lui       $a2, %hi(gMasterGfxPos)
-/* F77BC 802D2E0C 24C6A66C */  addiu     $a2, $a2, %lo(gMasterGfxPos)
-/* F77C0 802D2E10 3508F279 */  ori       $t0, $t0, 0xf279
-/* F77C4 802D2E14 3C02FA00 */  lui       $v0, 0xfa00
-/* F77C8 802D2E18 8CC50000 */  lw        $a1, ($a2)
-/* F77CC 802D2E1C 000C1E00 */  sll       $v1, $t4, 0x18
-/* F77D0 802D2E20 00A0202D */  daddu     $a0, $a1, $zero
-/* F77D4 802D2E24 24A50008 */  addiu     $a1, $a1, 8
-/* F77D8 802D2E28 ACC50000 */  sw        $a1, ($a2)
-/* F77DC 802D2E2C AC820000 */  sw        $v0, ($a0)
-/* F77E0 802D2E30 31A200FF */  andi      $v0, $t5, 0xff
-/* F77E4 802D2E34 00021400 */  sll       $v0, $v0, 0x10
-/* F77E8 802D2E38 00621825 */  or        $v1, $v1, $v0
-/* F77EC 802D2E3C 31C200FF */  andi      $v0, $t6, 0xff
-/* F77F0 802D2E40 00021200 */  sll       $v0, $v0, 8
-/* F77F4 802D2E44 00621825 */  or        $v1, $v1, $v0
-/* F77F8 802D2E48 316200FF */  andi      $v0, $t3, 0xff
-/* F77FC 802D2E4C 00621825 */  or        $v1, $v1, $v0
-/* F7800 802D2E50 24A20008 */  addiu     $v0, $a1, 8
-/* F7804 802D2E54 AC830004 */  sw        $v1, 4($a0)
-/* F7808 802D2E58 31E403FF */  andi      $a0, $t7, 0x3ff
-/* F780C 802D2E5C 00042380 */  sll       $a0, $a0, 0xe
-/* F7810 802D2E60 ACC20000 */  sw        $v0, ($a2)
-/* F7814 802D2E64 330203FF */  andi      $v0, $t8, 0x3ff
-/* F7818 802D2E68 00021080 */  sll       $v0, $v0, 2
-/* F781C 802D2E6C 3C03F600 */  lui       $v1, 0xf600
-/* F7820 802D2E70 00431025 */  or        $v0, $v0, $v1
-/* F7824 802D2E74 00822025 */  or        $a0, $a0, $v0
-/* F7828 802D2E78 332303FF */  andi      $v1, $t9, 0x3ff
-/* F782C 802D2E7C 00031B80 */  sll       $v1, $v1, 0xe
-/* F7830 802D2E80 320203FF */  andi      $v0, $s0, 0x3ff
-/* F7834 802D2E84 00021080 */  sll       $v0, $v0, 2
-/* F7838 802D2E88 00621825 */  or        $v1, $v1, $v0
-/* F783C 802D2E8C 24A20010 */  addiu     $v0, $a1, 0x10
-/* F7840 802D2E90 ACA40000 */  sw        $a0, ($a1)
-/* F7844 802D2E94 ACA30004 */  sw        $v1, 4($a1)
-/* F7848 802D2E98 ACC20000 */  sw        $v0, ($a2)
-/* F784C 802D2E9C 3C02E700 */  lui       $v0, 0xe700
-/* F7850 802D2EA0 ACA20008 */  sw        $v0, 8($a1)
-/* F7854 802D2EA4 24A20018 */  addiu     $v0, $a1, 0x18
-/* F7858 802D2EA8 ACA0000C */  sw        $zero, 0xc($a1)
-/* F785C 802D2EAC ACC20000 */  sw        $v0, ($a2)
-/* F7860 802D2EB0 24A20020 */  addiu     $v0, $a1, 0x20
-/* F7864 802D2EB4 ACA90010 */  sw        $t1, 0x10($a1)
-/* F7868 802D2EB8 ACA70014 */  sw        $a3, 0x14($a1)
-/* F786C 802D2EBC ACC20000 */  sw        $v0, ($a2)
-/* F7870 802D2EC0 ACAA0018 */  sw        $t2, 0x18($a1)
-/* F7874 802D2EC4 ACA8001C */  sw        $t0, 0x1c($a1)
-/* F7878 802D2EC8 8FB00000 */  lw        $s0, ($sp)
-/* F787C 802D2ECC 03E00008 */  jr        $ra
-/* F7880 802D2ED0 27BD0008 */   addiu    $sp, $sp, 8
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D2ED4.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D2ED4.s
deleted file mode 100644
index 7a45f37310..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D2ED4.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D2ED4
-/* F7884 802D2ED4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* F7888 802D2ED8 308400FF */  andi      $a0, $a0, 0xff
-/* F788C 802D2EDC 30A500FF */  andi      $a1, $a1, 0xff
-/* F7890 802D2EE0 30C600FF */  andi      $a2, $a2, 0xff
-/* F7894 802D2EE4 8FA20038 */  lw        $v0, 0x38($sp)
-/* F7898 802D2EE8 8FA8003C */  lw        $t0, 0x3c($sp)
-/* F789C 802D2EEC 8FA30040 */  lw        $v1, 0x40($sp)
-/* F78A0 802D2EF0 8FA90044 */  lw        $t1, 0x44($sp)
-/* F78A4 802D2EF4 30E700FF */  andi      $a3, $a3, 0xff
-/* F78A8 802D2EF8 AFBF0020 */  sw        $ra, 0x20($sp)
-/* F78AC 802D2EFC 00431821 */  addu      $v1, $v0, $v1
-/* F78B0 802D2F00 01094821 */  addu      $t1, $t0, $t1
-/* F78B4 802D2F04 3042FFFF */  andi      $v0, $v0, 0xffff
-/* F78B8 802D2F08 3108FFFF */  andi      $t0, $t0, 0xffff
-/* F78BC 802D2F0C 3063FFFF */  andi      $v1, $v1, 0xffff
-/* F78C0 802D2F10 3129FFFF */  andi      $t1, $t1, 0xffff
-/* F78C4 802D2F14 AFA20010 */  sw        $v0, 0x10($sp)
-/* F78C8 802D2F18 AFA80014 */  sw        $t0, 0x14($sp)
-/* F78CC 802D2F1C AFA30018 */  sw        $v1, 0x18($sp)
-/* F78D0 802D2F20 0C0B4B4C */  jal       func_802D2D30
-/* F78D4 802D2F24 AFA9001C */   sw       $t1, 0x1c($sp)
-/* F78D8 802D2F28 8FBF0020 */  lw        $ra, 0x20($sp)
-/* F78DC 802D2F2C 03E00008 */  jr        $ra
-/* F78E0 802D2F30 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D2F34.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D2F34.s
deleted file mode 100644
index 6730018baf..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D2F34.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D2F34
-/* F78E4 802D2F34 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* F78E8 802D2F38 F7B60020 */  sdc1      $f22, 0x20($sp)
-/* F78EC 802D2F3C 4485B000 */  mtc1      $a1, $f22
-/* F78F0 802D2F40 3C0140C9 */  lui       $at, 0x40c9
-/* F78F4 802D2F44 34210FD0 */  ori       $at, $at, 0xfd0
-/* F78F8 802D2F48 44810000 */  mtc1      $at, $f0
-/* F78FC 802D2F4C 44862000 */  mtc1      $a2, $f4
-/* F7900 802D2F50 F7B40018 */  sdc1      $f20, 0x18($sp)
-/* F7904 802D2F54 46002502 */  mul.s     $f20, $f4, $f0
-/* F7908 802D2F58 00000000 */  nop
-/* F790C 802D2F5C AFB00010 */  sw        $s0, 0x10($sp)
-/* F7910 802D2F60 3C0143B4 */  lui       $at, 0x43b4
-/* F7914 802D2F64 44810000 */  mtc1      $at, $f0
-/* F7918 802D2F68 0080802D */  daddu     $s0, $a0, $zero
-/* F791C 802D2F6C AFBF0014 */  sw        $ra, 0x14($sp)
-/* F7920 802D2F70 4600A503 */  div.s     $f20, $f20, $f0
-/* F7924 802D2F74 0C00A85B */  jal       sin_rad
-/* F7928 802D2F78 4600A306 */   mov.s    $f12, $f20
-/* F792C 802D2F7C 4600A306 */  mov.s     $f12, $f20
-/* F7930 802D2F80 0C00A874 */  jal       cos_rad
-/* F7934 802D2F84 46000506 */   mov.s    $f20, $f0
-/* F7938 802D2F88 4614B502 */  mul.s     $f20, $f22, $f20
-/* F793C 802D2F8C 00000000 */  nop
-/* F7940 802D2F90 4600B587 */  neg.s     $f22, $f22
-/* F7944 802D2F94 4600B582 */  mul.s     $f22, $f22, $f0
-/* F7948 802D2F98 00000000 */  nop
-/* F794C 802D2F9C C6020004 */  lwc1      $f2, 4($s0)
-/* F7950 802D2FA0 46141080 */  add.s     $f2, $f2, $f20
-/* F7954 802D2FA4 C600000C */  lwc1      $f0, 0xc($s0)
-/* F7958 802D2FA8 46160000 */  add.s     $f0, $f0, $f22
-/* F795C 802D2FAC E6020004 */  swc1      $f2, 4($s0)
-/* F7960 802D2FB0 E600000C */  swc1      $f0, 0xc($s0)
-/* F7964 802D2FB4 8FBF0014 */  lw        $ra, 0x14($sp)
-/* F7968 802D2FB8 8FB00010 */  lw        $s0, 0x10($sp)
-/* F796C 802D2FBC D7B60020 */  ldc1      $f22, 0x20($sp)
-/* F7970 802D2FC0 D7B40018 */  ldc1      $f20, 0x18($sp)
-/* F7974 802D2FC4 03E00008 */  jr        $ra
-/* F7978 802D2FC8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D2FCC.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D2FCC.s
deleted file mode 100644
index a63bf19a28..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D2FCC.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D2FCC
-/* F797C 802D2FCC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* F7980 802D2FD0 AFB00010 */  sw        $s0, 0x10($sp)
-/* F7984 802D2FD4 0000802D */  daddu     $s0, $zero, $zero
-/* F7988 802D2FD8 AFBF0014 */  sw        $ra, 0x14($sp)
-.L802D2FDC:
-/* F798C 802D2FDC 3C03802E */  lui       $v1, %hi(D_802DB7C0)
-/* F7990 802D2FE0 8C63B7C0 */  lw        $v1, %lo(D_802DB7C0)($v1)
-/* F7994 802D2FE4 00101080 */  sll       $v0, $s0, 2
-/* F7998 802D2FE8 00431021 */  addu      $v0, $v0, $v1
-/* F799C 802D2FEC 8C420000 */  lw        $v0, ($v0)
-/* F79A0 802D2FF0 10400006 */  beqz      $v0, .L802D300C
-/* F79A4 802D2FF4 26100001 */   addiu    $s0, $s0, 1
-/* F79A8 802D2FF8 8C440000 */  lw        $a0, ($v0)
-/* F79AC 802D2FFC 04800003 */  bltz      $a0, .L802D300C
-/* F79B0 802D3000 00000000 */   nop
-/* F79B4 802D3004 0C0483C1 */  jal       exec_entity_model_commandlist
-/* F79B8 802D3008 00000000 */   nop
-.L802D300C:
-/* F79BC 802D300C 2A020040 */  slti      $v0, $s0, 0x40
-/* F79C0 802D3010 1440FFF2 */  bnez      $v0, .L802D2FDC
-/* F79C4 802D3014 00000000 */   nop
-/* F79C8 802D3018 8FBF0014 */  lw        $ra, 0x14($sp)
-/* F79CC 802D301C 8FB00010 */  lw        $s0, 0x10($sp)
-/* F79D0 802D3020 03E00008 */  jr        $ra
-/* F79D4 802D3024 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D3398.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D3398.s
deleted file mode 100644
index a65b68a203..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D3398.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D3398
-/* F7D48 802D3398 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* F7D4C 802D339C 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* F7D50 802D33A0 80420070 */  lb        $v0, 0x70($v0)
-/* F7D54 802D33A4 14400005 */  bnez      $v0, .L802D33BC
-/* F7D58 802D33A8 00000000 */   nop
-/* F7D5C 802D33AC 3C02802E */  lui       $v0, %hi(D_802DB6C0)
-/* F7D60 802D33B0 2442B6C0 */  addiu     $v0, $v0, %lo(D_802DB6C0)
-/* F7D64 802D33B4 080B4CF1 */  j         .L802D33C4
-/* F7D68 802D33B8 00000000 */   nop
-.L802D33BC:
-/* F7D6C 802D33BC 3C02802E */  lui       $v0, %hi(D_802DB5C0)
-/* F7D70 802D33C0 2442B5C0 */  addiu     $v0, $v0, %lo(D_802DB5C0)
-.L802D33C4:
-/* F7D74 802D33C4 3C01802E */  lui       $at, %hi(D_802DB7C0)
-/* F7D78 802D33C8 AC22B7C0 */  sw        $v0, %lo(D_802DB7C0)($at)
-/* F7D7C 802D33CC 03E00008 */  jr        $ra
-/* F7D80 802D33D0 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D33D4.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D33D4.s
deleted file mode 100644
index ee85ceef99..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D33D4.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D33D4
-/* F7D84 802D33D4 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* F7D88 802D33D8 AFB10014 */  sw        $s1, 0x14($sp)
-/* F7D8C 802D33DC 0080882D */  daddu     $s1, $a0, $zero
-/* F7D90 802D33E0 AFBF0018 */  sw        $ra, 0x18($sp)
-/* F7D94 802D33E4 AFB00010 */  sw        $s0, 0x10($sp)
-/* F7D98 802D33E8 8E30000C */  lw        $s0, 0xc($s1)
-/* F7D9C 802D33EC 8E050000 */  lw        $a1, ($s0)
-/* F7DA0 802D33F0 0C0B1EAF */  jal       get_variable
-/* F7DA4 802D33F4 26100004 */   addiu    $s0, $s0, 4
-/* F7DA8 802D33F8 0220202D */  daddu     $a0, $s1, $zero
-/* F7DAC 802D33FC 8E050000 */  lw        $a1, ($s0)
-/* F7DB0 802D3400 0C0B1EAF */  jal       get_variable
-/* F7DB4 802D3404 0040802D */   daddu    $s0, $v0, $zero
-/* F7DB8 802D3408 0040202D */  daddu     $a0, $v0, $zero
-/* F7DBC 802D340C 3C02802E */  lui       $v0, %hi(D_802DB7C0)
-/* F7DC0 802D3410 8C42B7C0 */  lw        $v0, %lo(D_802DB7C0)($v0)
-/* F7DC4 802D3414 00108080 */  sll       $s0, $s0, 2
-/* F7DC8 802D3418 02028021 */  addu      $s0, $s0, $v0
-/* F7DCC 802D341C 0C048338 */  jal       load_entity_model
-/* F7DD0 802D3420 8E100000 */   lw       $s0, ($s0)
-/* F7DD4 802D3424 3C013F80 */  lui       $at, 0x3f80
-/* F7DD8 802D3428 44810000 */  mtc1      $at, $f0
-/* F7DDC 802D342C AE020000 */  sw        $v0, ($s0)
-/* F7DE0 802D3430 0040202D */  daddu     $a0, $v0, $zero
-/* F7DE4 802D3434 AE000004 */  sw        $zero, 4($s0)
-/* F7DE8 802D3438 AE000008 */  sw        $zero, 8($s0)
-/* F7DEC 802D343C AE00000C */  sw        $zero, 0xc($s0)
-/* F7DF0 802D3440 AE000010 */  sw        $zero, 0x10($s0)
-/* F7DF4 802D3444 AE000014 */  sw        $zero, 0x14($s0)
-/* F7DF8 802D3448 AE000018 */  sw        $zero, 0x18($s0)
-/* F7DFC 802D344C E600001C */  swc1      $f0, 0x1c($s0)
-/* F7E00 802D3450 E6000020 */  swc1      $f0, 0x20($s0)
-/* F7E04 802D3454 0C0483C1 */  jal       exec_entity_model_commandlist
-/* F7E08 802D3458 E6000024 */   swc1     $f0, 0x24($s0)
-/* F7E0C 802D345C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* F7E10 802D3460 8FB10014 */  lw        $s1, 0x14($sp)
-/* F7E14 802D3464 8FB00010 */  lw        $s0, 0x10($sp)
-/* F7E18 802D3468 24020002 */  addiu     $v0, $zero, 2
-/* F7E1C 802D346C 03E00008 */  jr        $ra
-/* F7E20 802D3470 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D3624.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D3624.s
deleted file mode 100644
index f3694d0f3d..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D3624.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D3624
-/* F7FD4 802D3624 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* F7FD8 802D3628 AFBF0014 */  sw        $ra, 0x14($sp)
-/* F7FDC 802D362C AFB00010 */  sw        $s0, 0x10($sp)
-/* F7FE0 802D3630 8C82000C */  lw        $v0, 0xc($a0)
-/* F7FE4 802D3634 0C0B1EAF */  jal       get_variable
-/* F7FE8 802D3638 8C450000 */   lw       $a1, ($v0)
-/* F7FEC 802D363C 3C03802E */  lui       $v1, %hi(D_802DB7C0)
-/* F7FF0 802D3640 8C63B7C0 */  lw        $v1, %lo(D_802DB7C0)($v1)
-/* F7FF4 802D3644 00021080 */  sll       $v0, $v0, 2
-/* F7FF8 802D3648 00431021 */  addu      $v0, $v0, $v1
-/* F7FFC 802D364C 8C500000 */  lw        $s0, ($v0)
-/* F8000 802D3650 0C048B7F */  jal       free_entity_model_by_index
-/* F8004 802D3654 8E040000 */   lw       $a0, ($s0)
-/* F8008 802D3658 2403FFFF */  addiu     $v1, $zero, -1
-/* F800C 802D365C AE030000 */  sw        $v1, ($s0)
-/* F8010 802D3660 8FBF0014 */  lw        $ra, 0x14($sp)
-/* F8014 802D3664 8FB00010 */  lw        $s0, 0x10($sp)
-/* F8018 802D3668 24020002 */  addiu     $v0, $zero, 2
-/* F801C 802D366C 03E00008 */  jr        $ra
-/* F8020 802D3670 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D3674.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D3674.s
deleted file mode 100644
index 6bace352a0..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D3674.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D3674
-/* F8024 802D3674 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* F8028 802D3678 AFB10014 */  sw        $s1, 0x14($sp)
-/* F802C 802D367C 0080882D */  daddu     $s1, $a0, $zero
-/* F8030 802D3680 AFBF0018 */  sw        $ra, 0x18($sp)
-/* F8034 802D3684 AFB00010 */  sw        $s0, 0x10($sp)
-/* F8038 802D3688 8E30000C */  lw        $s0, 0xc($s1)
-/* F803C 802D368C 8E050000 */  lw        $a1, ($s0)
-/* F8040 802D3690 0C0B1EAF */  jal       get_variable
-/* F8044 802D3694 26100004 */   addiu    $s0, $s0, 4
-/* F8048 802D3698 0220202D */  daddu     $a0, $s1, $zero
-/* F804C 802D369C 8E050000 */  lw        $a1, ($s0)
-/* F8050 802D36A0 0C0B1EAF */  jal       get_variable
-/* F8054 802D36A4 0040802D */   daddu    $s0, $v0, $zero
-/* F8058 802D36A8 3C03802E */  lui       $v1, %hi(D_802DB7C0)
-/* F805C 802D36AC 8C63B7C0 */  lw        $v1, %lo(D_802DB7C0)($v1)
-/* F8060 802D36B0 00108080 */  sll       $s0, $s0, 2
-/* F8064 802D36B4 02038021 */  addu      $s0, $s0, $v1
-/* F8068 802D36B8 8E030000 */  lw        $v1, ($s0)
-/* F806C 802D36BC 8C640000 */  lw        $a0, ($v1)
-/* F8070 802D36C0 0C048B5F */  jal       set_entity_model_render_command_list
-/* F8074 802D36C4 0040282D */   daddu    $a1, $v0, $zero
-/* F8078 802D36C8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* F807C 802D36CC 8FB10014 */  lw        $s1, 0x14($sp)
-/* F8080 802D36D0 8FB00010 */  lw        $s0, 0x10($sp)
-/* F8084 802D36D4 24020002 */  addiu     $v0, $zero, 2
-/* F8088 802D36D8 03E00008 */  jr        $ra
-/* F808C 802D36DC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D36E0.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D36E0.s
deleted file mode 100644
index a4755c308c..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D36E0.s
+++ /dev/null
@@ -1,47 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D36E0
-/* F8090 802D36E0 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* F8094 802D36E4 AFB20018 */  sw        $s2, 0x18($sp)
-/* F8098 802D36E8 0080902D */  daddu     $s2, $a0, $zero
-/* F809C 802D36EC AFBF001C */  sw        $ra, 0x1c($sp)
-/* F80A0 802D36F0 AFB10014 */  sw        $s1, 0x14($sp)
-/* F80A4 802D36F4 AFB00010 */  sw        $s0, 0x10($sp)
-/* F80A8 802D36F8 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* F80AC 802D36FC F7B40020 */  sdc1      $f20, 0x20($sp)
-/* F80B0 802D3700 8E50000C */  lw        $s0, 0xc($s2)
-/* F80B4 802D3704 8E050000 */  lw        $a1, ($s0)
-/* F80B8 802D3708 0C0B1EAF */  jal       get_variable
-/* F80BC 802D370C 26100004 */   addiu    $s0, $s0, 4
-/* F80C0 802D3710 8E050000 */  lw        $a1, ($s0)
-/* F80C4 802D3714 26100004 */  addiu     $s0, $s0, 4
-/* F80C8 802D3718 0240202D */  daddu     $a0, $s2, $zero
-/* F80CC 802D371C 0C0B210B */  jal       get_float_variable
-/* F80D0 802D3720 0040882D */   daddu    $s1, $v0, $zero
-/* F80D4 802D3724 8E050000 */  lw        $a1, ($s0)
-/* F80D8 802D3728 26100004 */  addiu     $s0, $s0, 4
-/* F80DC 802D372C 0240202D */  daddu     $a0, $s2, $zero
-/* F80E0 802D3730 0C0B210B */  jal       get_float_variable
-/* F80E4 802D3734 46000586 */   mov.s    $f22, $f0
-/* F80E8 802D3738 0240202D */  daddu     $a0, $s2, $zero
-/* F80EC 802D373C 8E050000 */  lw        $a1, ($s0)
-/* F80F0 802D3740 0C0B210B */  jal       get_float_variable
-/* F80F4 802D3744 46000506 */   mov.s    $f20, $f0
-/* F80F8 802D3748 3C02802E */  lui       $v0, %hi(D_802DB7C0)
-/* F80FC 802D374C 8C42B7C0 */  lw        $v0, %lo(D_802DB7C0)($v0)
-/* F8100 802D3750 00118880 */  sll       $s1, $s1, 2
-/* F8104 802D3754 02228821 */  addu      $s1, $s1, $v0
-/* F8108 802D3758 8E230000 */  lw        $v1, ($s1)
-/* F810C 802D375C E4760004 */  swc1      $f22, 4($v1)
-/* F8110 802D3760 E4740008 */  swc1      $f20, 8($v1)
-/* F8114 802D3764 E460000C */  swc1      $f0, 0xc($v1)
-/* F8118 802D3768 8FBF001C */  lw        $ra, 0x1c($sp)
-/* F811C 802D376C 8FB20018 */  lw        $s2, 0x18($sp)
-/* F8120 802D3770 8FB10014 */  lw        $s1, 0x14($sp)
-/* F8124 802D3774 8FB00010 */  lw        $s0, 0x10($sp)
-/* F8128 802D3778 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* F812C 802D377C D7B40020 */  ldc1      $f20, 0x20($sp)
-/* F8130 802D3780 24020002 */  addiu     $v0, $zero, 2
-/* F8134 802D3784 03E00008 */  jr        $ra
-/* F8138 802D3788 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D378C.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D378C.s
deleted file mode 100644
index 9b9c8fa05b..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D378C.s
+++ /dev/null
@@ -1,49 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D378C
-/* F813C 802D378C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* F8140 802D3790 AFB20018 */  sw        $s2, 0x18($sp)
-/* F8144 802D3794 0080902D */  daddu     $s2, $a0, $zero
-/* F8148 802D3798 AFBF0020 */  sw        $ra, 0x20($sp)
-/* F814C 802D379C AFB3001C */  sw        $s3, 0x1c($sp)
-/* F8150 802D37A0 AFB10014 */  sw        $s1, 0x14($sp)
-/* F8154 802D37A4 AFB00010 */  sw        $s0, 0x10($sp)
-/* F8158 802D37A8 8E50000C */  lw        $s0, 0xc($s2)
-/* F815C 802D37AC 8E050000 */  lw        $a1, ($s0)
-/* F8160 802D37B0 0C0B1EAF */  jal       get_variable
-/* F8164 802D37B4 26100004 */   addiu    $s0, $s0, 4
-/* F8168 802D37B8 8E050000 */  lw        $a1, ($s0)
-/* F816C 802D37BC 26100004 */  addiu     $s0, $s0, 4
-/* F8170 802D37C0 00021080 */  sll       $v0, $v0, 2
-/* F8174 802D37C4 3C03802E */  lui       $v1, %hi(D_802DB7C0)
-/* F8178 802D37C8 8C63B7C0 */  lw        $v1, %lo(D_802DB7C0)($v1)
-/* F817C 802D37CC 00431021 */  addu      $v0, $v0, $v1
-/* F8180 802D37D0 8C510000 */  lw        $s1, ($v0)
-/* F8184 802D37D4 8E130000 */  lw        $s3, ($s0)
-/* F8188 802D37D8 C6200004 */  lwc1      $f0, 4($s1)
-/* F818C 802D37DC 8E100004 */  lw        $s0, 4($s0)
-/* F8190 802D37E0 4600008D */  trunc.w.s $f2, $f0
-/* F8194 802D37E4 44061000 */  mfc1      $a2, $f2
-/* F8198 802D37E8 0C0B2026 */  jal       set_variable
-/* F819C 802D37EC 0240202D */   daddu    $a0, $s2, $zero
-/* F81A0 802D37F0 0240202D */  daddu     $a0, $s2, $zero
-/* F81A4 802D37F4 C6200008 */  lwc1      $f0, 8($s1)
-/* F81A8 802D37F8 4600008D */  trunc.w.s $f2, $f0
-/* F81AC 802D37FC 44061000 */  mfc1      $a2, $f2
-/* F81B0 802D3800 0C0B2026 */  jal       set_variable
-/* F81B4 802D3804 0260282D */   daddu    $a1, $s3, $zero
-/* F81B8 802D3808 0240202D */  daddu     $a0, $s2, $zero
-/* F81BC 802D380C C620000C */  lwc1      $f0, 0xc($s1)
-/* F81C0 802D3810 4600008D */  trunc.w.s $f2, $f0
-/* F81C4 802D3814 44061000 */  mfc1      $a2, $f2
-/* F81C8 802D3818 0C0B2026 */  jal       set_variable
-/* F81CC 802D381C 0200282D */   daddu    $a1, $s0, $zero
-/* F81D0 802D3820 8FBF0020 */  lw        $ra, 0x20($sp)
-/* F81D4 802D3824 8FB3001C */  lw        $s3, 0x1c($sp)
-/* F81D8 802D3828 8FB20018 */  lw        $s2, 0x18($sp)
-/* F81DC 802D382C 8FB10014 */  lw        $s1, 0x14($sp)
-/* F81E0 802D3830 8FB00010 */  lw        $s0, 0x10($sp)
-/* F81E4 802D3834 24020002 */  addiu     $v0, $zero, 2
-/* F81E8 802D3838 03E00008 */  jr        $ra
-/* F81EC 802D383C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D3840.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D3840.s
deleted file mode 100644
index 3aa9909da5..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D3840.s
+++ /dev/null
@@ -1,47 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D3840
-/* F81F0 802D3840 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* F81F4 802D3844 AFB20018 */  sw        $s2, 0x18($sp)
-/* F81F8 802D3848 0080902D */  daddu     $s2, $a0, $zero
-/* F81FC 802D384C AFBF001C */  sw        $ra, 0x1c($sp)
-/* F8200 802D3850 AFB10014 */  sw        $s1, 0x14($sp)
-/* F8204 802D3854 AFB00010 */  sw        $s0, 0x10($sp)
-/* F8208 802D3858 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* F820C 802D385C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* F8210 802D3860 8E50000C */  lw        $s0, 0xc($s2)
-/* F8214 802D3864 8E050000 */  lw        $a1, ($s0)
-/* F8218 802D3868 0C0B1EAF */  jal       get_variable
-/* F821C 802D386C 26100004 */   addiu    $s0, $s0, 4
-/* F8220 802D3870 8E050000 */  lw        $a1, ($s0)
-/* F8224 802D3874 26100004 */  addiu     $s0, $s0, 4
-/* F8228 802D3878 0240202D */  daddu     $a0, $s2, $zero
-/* F822C 802D387C 0C0B210B */  jal       get_float_variable
-/* F8230 802D3880 0040882D */   daddu    $s1, $v0, $zero
-/* F8234 802D3884 8E050000 */  lw        $a1, ($s0)
-/* F8238 802D3888 26100004 */  addiu     $s0, $s0, 4
-/* F823C 802D388C 0240202D */  daddu     $a0, $s2, $zero
-/* F8240 802D3890 0C0B210B */  jal       get_float_variable
-/* F8244 802D3894 46000586 */   mov.s    $f22, $f0
-/* F8248 802D3898 0240202D */  daddu     $a0, $s2, $zero
-/* F824C 802D389C 8E050000 */  lw        $a1, ($s0)
-/* F8250 802D38A0 0C0B210B */  jal       get_float_variable
-/* F8254 802D38A4 46000506 */   mov.s    $f20, $f0
-/* F8258 802D38A8 3C02802E */  lui       $v0, %hi(D_802DB7C0)
-/* F825C 802D38AC 8C42B7C0 */  lw        $v0, %lo(D_802DB7C0)($v0)
-/* F8260 802D38B0 00118880 */  sll       $s1, $s1, 2
-/* F8264 802D38B4 02228821 */  addu      $s1, $s1, $v0
-/* F8268 802D38B8 8E230000 */  lw        $v1, ($s1)
-/* F826C 802D38BC E4760010 */  swc1      $f22, 0x10($v1)
-/* F8270 802D38C0 E4740014 */  swc1      $f20, 0x14($v1)
-/* F8274 802D38C4 E4600018 */  swc1      $f0, 0x18($v1)
-/* F8278 802D38C8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* F827C 802D38CC 8FB20018 */  lw        $s2, 0x18($sp)
-/* F8280 802D38D0 8FB10014 */  lw        $s1, 0x14($sp)
-/* F8284 802D38D4 8FB00010 */  lw        $s0, 0x10($sp)
-/* F8288 802D38D8 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* F828C 802D38DC D7B40020 */  ldc1      $f20, 0x20($sp)
-/* F8290 802D38E0 24020002 */  addiu     $v0, $zero, 2
-/* F8294 802D38E4 03E00008 */  jr        $ra
-/* F8298 802D38E8 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D38EC.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D38EC.s
deleted file mode 100644
index 14ba2625c4..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D38EC.s
+++ /dev/null
@@ -1,47 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D38EC
-/* F829C 802D38EC 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* F82A0 802D38F0 AFB20018 */  sw        $s2, 0x18($sp)
-/* F82A4 802D38F4 0080902D */  daddu     $s2, $a0, $zero
-/* F82A8 802D38F8 AFBF001C */  sw        $ra, 0x1c($sp)
-/* F82AC 802D38FC AFB10014 */  sw        $s1, 0x14($sp)
-/* F82B0 802D3900 AFB00010 */  sw        $s0, 0x10($sp)
-/* F82B4 802D3904 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* F82B8 802D3908 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* F82BC 802D390C 8E50000C */  lw        $s0, 0xc($s2)
-/* F82C0 802D3910 8E050000 */  lw        $a1, ($s0)
-/* F82C4 802D3914 0C0B1EAF */  jal       get_variable
-/* F82C8 802D3918 26100004 */   addiu    $s0, $s0, 4
-/* F82CC 802D391C 8E050000 */  lw        $a1, ($s0)
-/* F82D0 802D3920 26100004 */  addiu     $s0, $s0, 4
-/* F82D4 802D3924 0240202D */  daddu     $a0, $s2, $zero
-/* F82D8 802D3928 0C0B210B */  jal       get_float_variable
-/* F82DC 802D392C 0040882D */   daddu    $s1, $v0, $zero
-/* F82E0 802D3930 8E050000 */  lw        $a1, ($s0)
-/* F82E4 802D3934 26100004 */  addiu     $s0, $s0, 4
-/* F82E8 802D3938 0240202D */  daddu     $a0, $s2, $zero
-/* F82EC 802D393C 0C0B210B */  jal       get_float_variable
-/* F82F0 802D3940 46000586 */   mov.s    $f22, $f0
-/* F82F4 802D3944 0240202D */  daddu     $a0, $s2, $zero
-/* F82F8 802D3948 8E050000 */  lw        $a1, ($s0)
-/* F82FC 802D394C 0C0B210B */  jal       get_float_variable
-/* F8300 802D3950 46000506 */   mov.s    $f20, $f0
-/* F8304 802D3954 3C02802E */  lui       $v0, %hi(D_802DB7C0)
-/* F8308 802D3958 8C42B7C0 */  lw        $v0, %lo(D_802DB7C0)($v0)
-/* F830C 802D395C 00118880 */  sll       $s1, $s1, 2
-/* F8310 802D3960 02228821 */  addu      $s1, $s1, $v0
-/* F8314 802D3964 8E230000 */  lw        $v1, ($s1)
-/* F8318 802D3968 E476001C */  swc1      $f22, 0x1c($v1)
-/* F831C 802D396C E4740020 */  swc1      $f20, 0x20($v1)
-/* F8320 802D3970 E4600024 */  swc1      $f0, 0x24($v1)
-/* F8324 802D3974 8FBF001C */  lw        $ra, 0x1c($sp)
-/* F8328 802D3978 8FB20018 */  lw        $s2, 0x18($sp)
-/* F832C 802D397C 8FB10014 */  lw        $s1, 0x14($sp)
-/* F8330 802D3980 8FB00010 */  lw        $s0, 0x10($sp)
-/* F8334 802D3984 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* F8338 802D3988 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* F833C 802D398C 24020002 */  addiu     $v0, $zero, 2
-/* F8340 802D3990 03E00008 */  jr        $ra
-/* F8344 802D3994 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D3998.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D3998.s
deleted file mode 100644
index 29e1841e47..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D3998.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D3998
-/* F8348 802D3998 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* F834C 802D399C AFB10014 */  sw        $s1, 0x14($sp)
-/* F8350 802D39A0 0080882D */  daddu     $s1, $a0, $zero
-/* F8354 802D39A4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* F8358 802D39A8 AFB00010 */  sw        $s0, 0x10($sp)
-/* F835C 802D39AC 8E30000C */  lw        $s0, 0xc($s1)
-/* F8360 802D39B0 8E050000 */  lw        $a1, ($s0)
-/* F8364 802D39B4 0C0B1EAF */  jal       get_variable
-/* F8368 802D39B8 26100004 */   addiu    $s0, $s0, 4
-/* F836C 802D39BC 0220202D */  daddu     $a0, $s1, $zero
-/* F8370 802D39C0 8E050000 */  lw        $a1, ($s0)
-/* F8374 802D39C4 0C0B210B */  jal       get_float_variable
-/* F8378 802D39C8 0040802D */   daddu    $s0, $v0, $zero
-/* F837C 802D39CC 3C02802E */  lui       $v0, %hi(D_802DB7C0)
-/* F8380 802D39D0 8C42B7C0 */  lw        $v0, %lo(D_802DB7C0)($v0)
-/* F8384 802D39D4 00108080 */  sll       $s0, $s0, 2
-/* F8388 802D39D8 02028021 */  addu      $s0, $s0, $v0
-/* F838C 802D39DC 8E030000 */  lw        $v1, ($s0)
-/* F8390 802D39E0 E460003C */  swc1      $f0, 0x3c($v1)
-/* F8394 802D39E4 8FBF0018 */  lw        $ra, 0x18($sp)
-/* F8398 802D39E8 8FB10014 */  lw        $s1, 0x14($sp)
-/* F839C 802D39EC 8FB00010 */  lw        $s0, 0x10($sp)
-/* F83A0 802D39F0 24020002 */  addiu     $v0, $zero, 2
-/* F83A4 802D39F4 03E00008 */  jr        $ra
-/* F83A8 802D39F8 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D39FC.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D39FC.s
deleted file mode 100644
index be5583f7ac..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D39FC.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D39FC
-/* F83AC 802D39FC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* F83B0 802D3A00 AFB10014 */  sw        $s1, 0x14($sp)
-/* F83B4 802D3A04 0080882D */  daddu     $s1, $a0, $zero
-/* F83B8 802D3A08 AFBF0018 */  sw        $ra, 0x18($sp)
-/* F83BC 802D3A0C AFB00010 */  sw        $s0, 0x10($sp)
-/* F83C0 802D3A10 8E30000C */  lw        $s0, 0xc($s1)
-/* F83C4 802D3A14 8E050000 */  lw        $a1, ($s0)
-/* F83C8 802D3A18 0C0B1EAF */  jal       get_variable
-/* F83CC 802D3A1C 26100004 */   addiu    $s0, $s0, 4
-/* F83D0 802D3A20 0220202D */  daddu     $a0, $s1, $zero
-/* F83D4 802D3A24 8E050000 */  lw        $a1, ($s0)
-/* F83D8 802D3A28 0C0B210B */  jal       get_float_variable
-/* F83DC 802D3A2C 0040802D */   daddu    $s0, $v0, $zero
-/* F83E0 802D3A30 3C02802E */  lui       $v0, %hi(D_802DB7C0)
-/* F83E4 802D3A34 8C42B7C0 */  lw        $v0, %lo(D_802DB7C0)($v0)
-/* F83E8 802D3A38 00108080 */  sll       $s0, $s0, 2
-/* F83EC 802D3A3C 02028021 */  addu      $s0, $s0, $v0
-/* F83F0 802D3A40 8E030000 */  lw        $v1, ($s0)
-/* F83F4 802D3A44 E4600040 */  swc1      $f0, 0x40($v1)
-/* F83F8 802D3A48 8FBF0018 */  lw        $ra, 0x18($sp)
-/* F83FC 802D3A4C 8FB10014 */  lw        $s1, 0x14($sp)
-/* F8400 802D3A50 8FB00010 */  lw        $s0, 0x10($sp)
-/* F8404 802D3A54 24020002 */  addiu     $v0, $zero, 2
-/* F8408 802D3A58 03E00008 */  jr        $ra
-/* F840C 802D3A5C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D3A60.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D3A60.s
deleted file mode 100644
index 56a531aefd..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D3A60.s
+++ /dev/null
@@ -1,136 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D3A60
-/* F8410 802D3A60 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* F8414 802D3A64 AFB20018 */  sw        $s2, 0x18($sp)
-/* F8418 802D3A68 0080902D */  daddu     $s2, $a0, $zero
-/* F841C 802D3A6C AFBF001C */  sw        $ra, 0x1c($sp)
-/* F8420 802D3A70 AFB10014 */  sw        $s1, 0x14($sp)
-/* F8424 802D3A74 AFB00010 */  sw        $s0, 0x10($sp)
-/* F8428 802D3A78 F7BA0038 */  sdc1      $f26, 0x38($sp)
-/* F842C 802D3A7C F7B80030 */  sdc1      $f24, 0x30($sp)
-/* F8430 802D3A80 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* F8434 802D3A84 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* F8438 802D3A88 8E51000C */  lw        $s1, 0xc($s2)
-/* F843C 802D3A8C 54A00001 */  bnel      $a1, $zero, .L802D3A94
-/* F8440 802D3A90 AE400070 */   sw       $zero, 0x70($s2)
-.L802D3A94:
-/* F8444 802D3A94 8E420070 */  lw        $v0, 0x70($s2)
-/* F8448 802D3A98 14400049 */  bnez      $v0, .L802D3BC0
-/* F844C 802D3A9C 00000000 */   nop
-/* F8450 802D3AA0 8E250000 */  lw        $a1, ($s1)
-/* F8454 802D3AA4 26310004 */  addiu     $s1, $s1, 4
-/* F8458 802D3AA8 0C0B1EAF */  jal       get_variable
-/* F845C 802D3AAC 0240202D */   daddu    $a0, $s2, $zero
-/* F8460 802D3AB0 8E250000 */  lw        $a1, ($s1)
-/* F8464 802D3AB4 26310004 */  addiu     $s1, $s1, 4
-/* F8468 802D3AB8 0240202D */  daddu     $a0, $s2, $zero
-/* F846C 802D3ABC 0C0B1EAF */  jal       get_variable
-/* F8470 802D3AC0 0040802D */   daddu    $s0, $v0, $zero
-/* F8474 802D3AC4 4482D000 */  mtc1      $v0, $f26
-/* F8478 802D3AC8 00000000 */  nop
-/* F847C 802D3ACC 4680D6A0 */  cvt.s.w   $f26, $f26
-/* F8480 802D3AD0 8E250000 */  lw        $a1, ($s1)
-/* F8484 802D3AD4 26310004 */  addiu     $s1, $s1, 4
-/* F8488 802D3AD8 0C0B1EAF */  jal       get_variable
-/* F848C 802D3ADC 0240202D */   daddu    $a0, $s2, $zero
-/* F8490 802D3AE0 8E250000 */  lw        $a1, ($s1)
-/* F8494 802D3AE4 26310004 */  addiu     $s1, $s1, 4
-/* F8498 802D3AE8 4482A000 */  mtc1      $v0, $f20
-/* F849C 802D3AEC 00000000 */  nop
-/* F84A0 802D3AF0 4680A520 */  cvt.s.w   $f20, $f20
-/* F84A4 802D3AF4 0C0B1EAF */  jal       get_variable
-/* F84A8 802D3AF8 0240202D */   daddu    $a0, $s2, $zero
-/* F84AC 802D3AFC 4482C000 */  mtc1      $v0, $f24
-/* F84B0 802D3B00 00000000 */  nop
-/* F84B4 802D3B04 4680C620 */  cvt.s.w   $f24, $f24
-/* F84B8 802D3B08 8E250000 */  lw        $a1, ($s1)
-/* F84BC 802D3B0C 0C0B1EAF */  jal       get_variable
-/* F84C0 802D3B10 0240202D */   daddu    $a0, $s2, $zero
-/* F84C4 802D3B14 3C04802E */  lui       $a0, %hi(D_802DB7C0)
-/* F84C8 802D3B18 8C84B7C0 */  lw        $a0, %lo(D_802DB7C0)($a0)
-/* F84CC 802D3B1C 00101880 */  sll       $v1, $s0, 2
-/* F84D0 802D3B20 00641821 */  addu      $v1, $v1, $a0
-/* F84D4 802D3B24 8C710000 */  lw        $s1, ($v1)
-/* F84D8 802D3B28 AE500074 */  sw        $s0, 0x74($s2)
-/* F84DC 802D3B2C E63A0028 */  swc1      $f26, 0x28($s1)
-/* F84E0 802D3B30 C63A0004 */  lwc1      $f26, 4($s1)
-/* F84E4 802D3B34 E6380030 */  swc1      $f24, 0x30($s1)
-/* F84E8 802D3B38 C638000C */  lwc1      $f24, 0xc($s1)
-/* F84EC 802D3B3C E634002C */  swc1      $f20, 0x2c($s1)
-/* F84F0 802D3B40 C6340028 */  lwc1      $f20, 0x28($s1)
-/* F84F4 802D3B44 C6360030 */  lwc1      $f22, 0x30($s1)
-/* F84F8 802D3B48 44820000 */  mtc1      $v0, $f0
-/* F84FC 802D3B4C 00000000 */  nop
-/* F8500 802D3B50 46800020 */  cvt.s.w   $f0, $f0
-/* F8504 802D3B54 E6200048 */  swc1      $f0, 0x48($s1)
-/* F8508 802D3B58 4600D306 */  mov.s     $f12, $f26
-/* F850C 802D3B5C 4406A000 */  mfc1      $a2, $f20
-/* F8510 802D3B60 4407B000 */  mfc1      $a3, $f22
-/* F8514 802D3B64 0C00A720 */  jal       atan2
-/* F8518 802D3B68 4600C386 */   mov.s    $f14, $f24
-/* F851C 802D3B6C 4600D306 */  mov.s     $f12, $f26
-/* F8520 802D3B70 4406A000 */  mfc1      $a2, $f20
-/* F8524 802D3B74 4407B000 */  mfc1      $a3, $f22
-/* F8528 802D3B78 4600C386 */  mov.s     $f14, $f24
-/* F852C 802D3B7C 0C00A7B5 */  jal       dist2D
-/* F8530 802D3B80 E6200038 */   swc1     $f0, 0x38($s1)
-/* F8534 802D3B84 C6260048 */  lwc1      $f6, 0x48($s1)
-/* F8538 802D3B88 44801000 */  mtc1      $zero, $f2
-/* F853C 802D3B8C 46000106 */  mov.s     $f4, $f0
-/* F8540 802D3B90 46023032 */  c.eq.s    $f6, $f2
-/* F8544 802D3B94 00000000 */  nop
-/* F8548 802D3B98 45000005 */  bc1f      .L802D3BB0
-/* F854C 802D3B9C E6240034 */   swc1     $f4, 0x34($s1)
-/* F8550 802D3BA0 C620003C */  lwc1      $f0, 0x3c($s1)
-/* F8554 802D3BA4 46002003 */  div.s     $f0, $f4, $f0
-/* F8558 802D3BA8 080B4EEE */  j         .L802D3BB8
-/* F855C 802D3BAC E6200048 */   swc1     $f0, 0x48($s1)
-.L802D3BB0:
-/* F8560 802D3BB0 46062003 */  div.s     $f0, $f4, $f6
-/* F8564 802D3BB4 E620003C */  swc1      $f0, 0x3c($s1)
-.L802D3BB8:
-/* F8568 802D3BB8 24020001 */  addiu     $v0, $zero, 1
-/* F856C 802D3BBC AE420070 */  sw        $v0, 0x70($s2)
-.L802D3BC0:
-/* F8570 802D3BC0 8E420074 */  lw        $v0, 0x74($s2)
-/* F8574 802D3BC4 3C03802E */  lui       $v1, %hi(D_802DB7C0)
-/* F8578 802D3BC8 8C63B7C0 */  lw        $v1, %lo(D_802DB7C0)($v1)
-/* F857C 802D3BCC 00021080 */  sll       $v0, $v0, 2
-/* F8580 802D3BD0 00431021 */  addu      $v0, $v0, $v1
-/* F8584 802D3BD4 8C510000 */  lw        $s1, ($v0)
-/* F8588 802D3BD8 8E25003C */  lw        $a1, 0x3c($s1)
-/* F858C 802D3BDC 8E260038 */  lw        $a2, 0x38($s1)
-/* F8590 802D3BE0 0C0B4BCD */  jal       func_802D2F34
-/* F8594 802D3BE4 0220202D */   daddu    $a0, $s1, $zero
-/* F8598 802D3BE8 C6200048 */  lwc1      $f0, 0x48($s1)
-/* F859C 802D3BEC 3C013F80 */  lui       $at, 0x3f80
-/* F85A0 802D3BF0 44811000 */  mtc1      $at, $f2
-/* F85A4 802D3BF4 00000000 */  nop
-/* F85A8 802D3BF8 46020001 */  sub.s     $f0, $f0, $f2
-/* F85AC 802D3BFC 44801000 */  mtc1      $zero, $f2
-/* F85B0 802D3C00 00000000 */  nop
-/* F85B4 802D3C04 4602003E */  c.le.s    $f0, $f2
-/* F85B8 802D3C08 00000000 */  nop
-/* F85BC 802D3C0C 45010003 */  bc1t      .L802D3C1C
-/* F85C0 802D3C10 E6200048 */   swc1     $f0, 0x48($s1)
-/* F85C4 802D3C14 080B4F0C */  j         .L802D3C30
-/* F85C8 802D3C18 0000102D */   daddu    $v0, $zero, $zero
-.L802D3C1C:
-/* F85CC 802D3C1C C6200028 */  lwc1      $f0, 0x28($s1)
-/* F85D0 802D3C20 C6220030 */  lwc1      $f2, 0x30($s1)
-/* F85D4 802D3C24 24020001 */  addiu     $v0, $zero, 1
-/* F85D8 802D3C28 E6200004 */  swc1      $f0, 4($s1)
-/* F85DC 802D3C2C E622000C */  swc1      $f2, 0xc($s1)
-.L802D3C30:
-/* F85E0 802D3C30 8FBF001C */  lw        $ra, 0x1c($sp)
-/* F85E4 802D3C34 8FB20018 */  lw        $s2, 0x18($sp)
-/* F85E8 802D3C38 8FB10014 */  lw        $s1, 0x14($sp)
-/* F85EC 802D3C3C 8FB00010 */  lw        $s0, 0x10($sp)
-/* F85F0 802D3C40 D7BA0038 */  ldc1      $f26, 0x38($sp)
-/* F85F4 802D3C44 D7B80030 */  ldc1      $f24, 0x30($sp)
-/* F85F8 802D3C48 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* F85FC 802D3C4C D7B40020 */  ldc1      $f20, 0x20($sp)
-/* F8600 802D3C50 03E00008 */  jr        $ra
-/* F8604 802D3C54 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D3EB8.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D3EB8.s
deleted file mode 100644
index 350041ee07..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D3EB8.s
+++ /dev/null
@@ -1,55 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D3EB8
-/* F8868 802D3EB8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* F886C 802D3EBC AFB00010 */  sw        $s0, 0x10($sp)
-/* F8870 802D3EC0 0080802D */  daddu     $s0, $a0, $zero
-/* F8874 802D3EC4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* F8878 802D3EC8 8E03000C */  lw        $v1, 0xc($s0)
-/* F887C 802D3ECC 54A00001 */  bnel      $a1, $zero, .L802D3ED4
-/* F8880 802D3ED0 AE000070 */   sw       $zero, 0x70($s0)
-.L802D3ED4:
-/* F8884 802D3ED4 8E020070 */  lw        $v0, 0x70($s0)
-/* F8888 802D3ED8 14400007 */  bnez      $v0, .L802D3EF8
-/* F888C 802D3EDC 00000000 */   nop
-/* F8890 802D3EE0 8C650000 */  lw        $a1, ($v1)
-/* F8894 802D3EE4 0C0B1EAF */  jal       get_variable
-/* F8898 802D3EE8 0200202D */   daddu    $a0, $s0, $zero
-/* F889C 802D3EEC AE020074 */  sw        $v0, 0x74($s0)
-/* F88A0 802D3EF0 24020001 */  addiu     $v0, $zero, 1
-/* F88A4 802D3EF4 AE020070 */  sw        $v0, 0x70($s0)
-.L802D3EF8:
-/* F88A8 802D3EF8 8E020074 */  lw        $v0, 0x74($s0)
-/* F88AC 802D3EFC 3C03802E */  lui       $v1, %hi(D_802DB7C0)
-/* F88B0 802D3F00 8C63B7C0 */  lw        $v1, %lo(D_802DB7C0)($v1)
-/* F88B4 802D3F04 00021080 */  sll       $v0, $v0, 2
-/* F88B8 802D3F08 00431021 */  addu      $v0, $v0, $v1
-/* F88BC 802D3F0C 8C500000 */  lw        $s0, ($v0)
-/* F88C0 802D3F10 C6040008 */  lwc1      $f4, 8($s0)
-/* F88C4 802D3F14 C6000044 */  lwc1      $f0, 0x44($s0)
-/* F88C8 802D3F18 C6020040 */  lwc1      $f2, 0x40($s0)
-/* F88CC 802D3F1C 46002100 */  add.s     $f4, $f4, $f0
-/* F88D0 802D3F20 8E05003C */  lw        $a1, 0x3c($s0)
-/* F88D4 802D3F24 8E060038 */  lw        $a2, 0x38($s0)
-/* F88D8 802D3F28 46020001 */  sub.s     $f0, $f0, $f2
-/* F88DC 802D3F2C 0200202D */  daddu     $a0, $s0, $zero
-/* F88E0 802D3F30 E6040008 */  swc1      $f4, 8($s0)
-/* F88E4 802D3F34 0C0B4BCD */  jal       func_802D2F34
-/* F88E8 802D3F38 E6000044 */   swc1     $f0, 0x44($s0)
-/* F88EC 802D3F3C C6000008 */  lwc1      $f0, 8($s0)
-/* F88F0 802D3F40 44801000 */  mtc1      $zero, $f2
-/* F88F4 802D3F44 00000000 */  nop
-/* F88F8 802D3F48 4602003C */  c.lt.s    $f0, $f2
-/* F88FC 802D3F4C 00000000 */  nop
-/* F8900 802D3F50 45030003 */  bc1tl     .L802D3F60
-/* F8904 802D3F54 E6020008 */   swc1     $f2, 8($s0)
-/* F8908 802D3F58 080B4FD9 */  j         .L802D3F64
-/* F890C 802D3F5C 0000102D */   daddu    $v0, $zero, $zero
-.L802D3F60:
-/* F8910 802D3F60 24020001 */  addiu     $v0, $zero, 1
-.L802D3F64:
-/* F8914 802D3F64 8FBF0014 */  lw        $ra, 0x14($sp)
-/* F8918 802D3F68 8FB00010 */  lw        $s0, 0x10($sp)
-/* F891C 802D3F6C 03E00008 */  jr        $ra
-/* F8920 802D3F70 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D3F74.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D3F74.s
deleted file mode 100644
index f66618c776..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D3F74.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D3F74
-/* F8924 802D3F74 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* F8928 802D3F78 AFBF0014 */  sw        $ra, 0x14($sp)
-/* F892C 802D3F7C AFB00010 */  sw        $s0, 0x10($sp)
-/* F8930 802D3F80 8C90000C */  lw        $s0, 0xc($a0)
-/* F8934 802D3F84 8E050000 */  lw        $a1, ($s0)
-/* F8938 802D3F88 0C0B1EAF */  jal       get_variable
-/* F893C 802D3F8C 26100004 */   addiu    $s0, $s0, 4
-/* F8940 802D3F90 3C03802E */  lui       $v1, %hi(D_802DB7C0)
-/* F8944 802D3F94 8C63B7C0 */  lw        $v1, %lo(D_802DB7C0)($v1)
-/* F8948 802D3F98 00021080 */  sll       $v0, $v0, 2
-/* F894C 802D3F9C 00431021 */  addu      $v0, $v0, $v1
-/* F8950 802D3FA0 8C420000 */  lw        $v0, ($v0)
-/* F8954 802D3FA4 8C440000 */  lw        $a0, ($v0)
-/* F8958 802D3FA8 0C048B77 */  jal       get_entity_model
-/* F895C 802D3FAC 8E100000 */   lw       $s0, ($s0)
-/* F8960 802D3FB0 AC500000 */  sw        $s0, ($v0)
-/* F8964 802D3FB4 8FBF0014 */  lw        $ra, 0x14($sp)
-/* F8968 802D3FB8 8FB00010 */  lw        $s0, 0x10($sp)
-/* F896C 802D3FBC 24020002 */  addiu     $v0, $zero, 2
-/* F8970 802D3FC0 03E00008 */  jr        $ra
-/* F8974 802D3FC4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D3FC8.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D3FC8.s
deleted file mode 100644
index 4ab357abe1..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D3FC8.s
+++ /dev/null
@@ -1,40 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D3FC8
-/* F8978 802D3FC8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* F897C 802D3FCC AFB10014 */  sw        $s1, 0x14($sp)
-/* F8980 802D3FD0 0080882D */  daddu     $s1, $a0, $zero
-/* F8984 802D3FD4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* F8988 802D3FD8 AFB00010 */  sw        $s0, 0x10($sp)
-/* F898C 802D3FDC 8E30000C */  lw        $s0, 0xc($s1)
-/* F8990 802D3FE0 8E050000 */  lw        $a1, ($s0)
-/* F8994 802D3FE4 0C0B1EAF */  jal       get_variable
-/* F8998 802D3FE8 26100004 */   addiu    $s0, $s0, 4
-/* F899C 802D3FEC 0220202D */  daddu     $a0, $s1, $zero
-/* F89A0 802D3FF0 8E050004 */  lw        $a1, 4($s0)
-/* F89A4 802D3FF4 8E100000 */  lw        $s0, ($s0)
-/* F89A8 802D3FF8 0C0B1EAF */  jal       get_variable
-/* F89AC 802D3FFC 0040882D */   daddu    $s1, $v0, $zero
-/* F89B0 802D4000 3C03802E */  lui       $v1, %hi(D_802DB7C0)
-/* F89B4 802D4004 8C63B7C0 */  lw        $v1, %lo(D_802DB7C0)($v1)
-/* F89B8 802D4008 00118880 */  sll       $s1, $s1, 2
-/* F89BC 802D400C 02238821 */  addu      $s1, $s1, $v1
-/* F89C0 802D4010 10400006 */  beqz      $v0, .L802D402C
-/* F89C4 802D4014 8E240000 */   lw       $a0, ($s1)
-/* F89C8 802D4018 8C840000 */  lw        $a0, ($a0)
-/* F89CC 802D401C 0C048BBA */  jal       set_entity_model_flags
-/* F89D0 802D4020 0200282D */   daddu    $a1, $s0, $zero
-/* F89D4 802D4024 080B500E */  j         .L802D4038
-/* F89D8 802D4028 00000000 */   nop
-.L802D402C:
-/* F89DC 802D402C 8C840000 */  lw        $a0, ($a0)
-/* F89E0 802D4030 0C048BC9 */  jal       clear_entity_model_flags
-/* F89E4 802D4034 0200282D */   daddu    $a1, $s0, $zero
-.L802D4038:
-/* F89E8 802D4038 8FBF0018 */  lw        $ra, 0x18($sp)
-/* F89EC 802D403C 8FB10014 */  lw        $s1, 0x14($sp)
-/* F89F0 802D4040 8FB00010 */  lw        $s0, 0x10($sp)
-/* F89F4 802D4044 24020002 */  addiu     $v0, $zero, 2
-/* F89F8 802D4048 03E00008 */  jr        $ra
-/* F89FC 802D404C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D4050.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D4050.s
deleted file mode 100644
index aa388eb781..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D4050.s
+++ /dev/null
@@ -1,88 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-glabel jtbl_802DA240
-.word L802D40D4_F8A84, L802D40E0_F8A90, L802D4148_F8AF8, L802D40EC_F8A9C, L802D40F8_F8AA8, L802D4104_F8AB4
-
-.section .text
-
-glabel func_802D4050
-/* F8A00 802D4050 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* F8A04 802D4054 AFB20018 */  sw        $s2, 0x18($sp)
-/* F8A08 802D4058 0080902D */  daddu     $s2, $a0, $zero
-/* F8A0C 802D405C AFBF001C */  sw        $ra, 0x1c($sp)
-/* F8A10 802D4060 AFB10014 */  sw        $s1, 0x14($sp)
-/* F8A14 802D4064 AFB00010 */  sw        $s0, 0x10($sp)
-/* F8A18 802D4068 8E51000C */  lw        $s1, 0xc($s2)
-/* F8A1C 802D406C 8E250000 */  lw        $a1, ($s1)
-/* F8A20 802D4070 0C0B1EAF */  jal       get_variable
-/* F8A24 802D4074 26310004 */   addiu    $s1, $s1, 4
-/* F8A28 802D4078 0240202D */  daddu     $a0, $s2, $zero
-/* F8A2C 802D407C 8E250000 */  lw        $a1, ($s1)
-/* F8A30 802D4080 0C0B1EAF */  jal       get_variable
-/* F8A34 802D4084 0040802D */   daddu    $s0, $v0, $zero
-/* F8A38 802D4088 3C03802E */  lui       $v1, %hi(D_802DB7C0)
-/* F8A3C 802D408C 8C63B7C0 */  lw        $v1, %lo(D_802DB7C0)($v1)
-/* F8A40 802D4090 00108080 */  sll       $s0, $s0, 2
-/* F8A44 802D4094 02038021 */  addu      $s0, $s0, $v1
-/* F8A48 802D4098 8E030000 */  lw        $v1, ($s0)
-/* F8A4C 802D409C 26310004 */  addiu     $s1, $s1, 4
-/* F8A50 802D40A0 8C640000 */  lw        $a0, ($v1)
-/* F8A54 802D40A4 0C048B77 */  jal       get_entity_model
-/* F8A58 802D40A8 0040802D */   daddu    $s0, $v0, $zero
-/* F8A5C 802D40AC 0040182D */  daddu     $v1, $v0, $zero
-/* F8A60 802D40B0 26100001 */  addiu     $s0, $s0, 1
-/* F8A64 802D40B4 2E020006 */  sltiu     $v0, $s0, 6
-/* F8A68 802D40B8 10400023 */  beqz      $v0, L802D4148_F8AF8
-/* F8A6C 802D40BC 00101080 */   sll      $v0, $s0, 2
-/* F8A70 802D40C0 3C01802E */  lui       $at, %hi(jtbl_802DA240)
-/* F8A74 802D40C4 00220821 */  addu      $at, $at, $v0
-/* F8A78 802D40C8 8C22A240 */  lw        $v0, %lo(jtbl_802DA240)($at)
-/* F8A7C 802D40CC 00400008 */  jr        $v0
-/* F8A80 802D40D0 00000000 */   nop
-glabel L802D40D4_F8A84
-/* F8A84 802D40D4 24020001 */  addiu     $v0, $zero, 1
-/* F8A88 802D40D8 080B5052 */  j         L802D4148_F8AF8
-/* F8A8C 802D40DC A0620004 */   sb       $v0, 4($v1)
-glabel L802D40E0_F8A90
-/* F8A90 802D40E0 24020001 */  addiu     $v0, $zero, 1
-/* F8A94 802D40E4 080B5047 */  j         .L802D411C
-/* F8A98 802D40E8 A0620004 */   sb       $v0, 4($v1)
-glabel L802D40EC_F8A9C
-/* F8A9C 802D40EC 2402000D */  addiu     $v0, $zero, 0xd
-/* F8AA0 802D40F0 080B5047 */  j         .L802D411C
-/* F8AA4 802D40F4 A0620004 */   sb       $v0, 4($v1)
-glabel L802D40F8_F8AA8
-/* F8AA8 802D40F8 24020016 */  addiu     $v0, $zero, 0x16
-/* F8AAC 802D40FC 080B504F */  j         .L802D413C
-/* F8AB0 802D4100 A0620004 */   sb       $v0, 4($v1)
-glabel L802D4104_F8AB4
-/* F8AB4 802D4104 24020016 */  addiu     $v0, $zero, 0x16
-/* F8AB8 802D4108 A0620004 */  sb        $v0, 4($v1)
-/* F8ABC 802D410C 8E250000 */  lw        $a1, ($s1)
-/* F8AC0 802D4110 26310004 */  addiu     $s1, $s1, 4
-/* F8AC4 802D4114 0C0B1EAF */  jal       get_variable
-/* F8AC8 802D4118 0240202D */   daddu    $a0, $s2, $zero
-.L802D411C:
-/* F8ACC 802D411C 8E250000 */  lw        $a1, ($s1)
-/* F8AD0 802D4120 26310004 */  addiu     $s1, $s1, 4
-/* F8AD4 802D4124 0C0B1EAF */  jal       get_variable
-/* F8AD8 802D4128 0240202D */   daddu    $a0, $s2, $zero
-/* F8ADC 802D412C 8E250000 */  lw        $a1, ($s1)
-/* F8AE0 802D4130 26310004 */  addiu     $s1, $s1, 4
-/* F8AE4 802D4134 0C0B1EAF */  jal       get_variable
-/* F8AE8 802D4138 0240202D */   daddu    $a0, $s2, $zero
-.L802D413C:
-/* F8AEC 802D413C 8E250000 */  lw        $a1, ($s1)
-/* F8AF0 802D4140 0C0B1EAF */  jal       get_variable
-/* F8AF4 802D4144 0240202D */   daddu    $a0, $s2, $zero
-glabel L802D4148_F8AF8
-/* F8AF8 802D4148 8FBF001C */  lw        $ra, 0x1c($sp)
-/* F8AFC 802D414C 8FB20018 */  lw        $s2, 0x18($sp)
-/* F8B00 802D4150 8FB10014 */  lw        $s1, 0x14($sp)
-/* F8B04 802D4154 8FB00010 */  lw        $s0, 0x10($sp)
-/* F8B08 802D4158 24020002 */  addiu     $v0, $zero, 2
-/* F8B0C 802D415C 03E00008 */  jr        $ra
-/* F8B10 802D4160 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D417C.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D417C.s
deleted file mode 100644
index 45734dd3a7..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D417C.s
+++ /dev/null
@@ -1,40 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D417C
-/* F8B2C 802D417C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* F8B30 802D4180 AFB20018 */  sw        $s2, 0x18($sp)
-/* F8B34 802D4184 3C12802E */  lui       $s2, %hi(D_802DB7C0)
-/* F8B38 802D4188 2652B7C0 */  addiu     $s2, $s2, %lo(D_802DB7C0)
-/* F8B3C 802D418C AFB10014 */  sw        $s1, 0x14($sp)
-/* F8B40 802D4190 00048880 */  sll       $s1, $a0, 2
-/* F8B44 802D4194 AFBF001C */  sw        $ra, 0x1c($sp)
-/* F8B48 802D4198 AFB00010 */  sw        $s0, 0x10($sp)
-/* F8B4C 802D419C 8E420000 */  lw        $v0, ($s2)
-/* F8B50 802D41A0 02221021 */  addu      $v0, $s1, $v0
-/* F8B54 802D41A4 8C500000 */  lw        $s0, ($v0)
-/* F8B58 802D41A8 0C048338 */  jal       load_entity_model
-/* F8B5C 802D41AC 00A0202D */   daddu    $a0, $a1, $zero
-/* F8B60 802D41B0 3C013F80 */  lui       $at, 0x3f80
-/* F8B64 802D41B4 44810000 */  mtc1      $at, $f0
-/* F8B68 802D41B8 AE020000 */  sw        $v0, ($s0)
-/* F8B6C 802D41BC 0040202D */  daddu     $a0, $v0, $zero
-/* F8B70 802D41C0 AE000004 */  sw        $zero, 4($s0)
-/* F8B74 802D41C4 AE000008 */  sw        $zero, 8($s0)
-/* F8B78 802D41C8 AE00000C */  sw        $zero, 0xc($s0)
-/* F8B7C 802D41CC AE000010 */  sw        $zero, 0x10($s0)
-/* F8B80 802D41D0 AE000014 */  sw        $zero, 0x14($s0)
-/* F8B84 802D41D4 AE000018 */  sw        $zero, 0x18($s0)
-/* F8B88 802D41D8 E600001C */  swc1      $f0, 0x1c($s0)
-/* F8B8C 802D41DC E6000020 */  swc1      $f0, 0x20($s0)
-/* F8B90 802D41E0 0C0483C1 */  jal       exec_entity_model_commandlist
-/* F8B94 802D41E4 E6000024 */   swc1     $f0, 0x24($s0)
-/* F8B98 802D41E8 8E420000 */  lw        $v0, ($s2)
-/* F8B9C 802D41EC 8FBF001C */  lw        $ra, 0x1c($sp)
-/* F8BA0 802D41F0 8FB20018 */  lw        $s2, 0x18($sp)
-/* F8BA4 802D41F4 8FB00010 */  lw        $s0, 0x10($sp)
-/* F8BA8 802D41F8 02228821 */  addu      $s1, $s1, $v0
-/* F8BAC 802D41FC 8E220000 */  lw        $v0, ($s1)
-/* F8BB0 802D4200 8FB10014 */  lw        $s1, 0x14($sp)
-/* F8BB4 802D4204 03E00008 */  jr        $ra
-/* F8BB8 802D4208 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D420C.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D420C.s
deleted file mode 100644
index 261db13601..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D420C.s
+++ /dev/null
@@ -1,47 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D420C
-/* F8BBC 802D420C 3C03802E */  lui       $v1, %hi(D_802DB7C0)
-/* F8BC0 802D4210 8C63B7C0 */  lw        $v1, %lo(D_802DB7C0)($v1)
-/* F8BC4 802D4214 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* F8BC8 802D4218 AFB10014 */  sw        $s1, 0x14($sp)
-/* F8BCC 802D421C 0000882D */  daddu     $s1, $zero, $zero
-/* F8BD0 802D4220 AFBF0018 */  sw        $ra, 0x18($sp)
-/* F8BD4 802D4224 AFB00010 */  sw        $s0, 0x10($sp)
-.L802D4228:
-/* F8BD8 802D4228 8C700000 */  lw        $s0, ($v1)
-/* F8BDC 802D422C 8E020000 */  lw        $v0, ($s0)
-/* F8BE0 802D4230 04400006 */  bltz      $v0, .L802D424C
-/* F8BE4 802D4234 2A220040 */   slti     $v0, $s1, 0x40
-/* F8BE8 802D4238 26310001 */  addiu     $s1, $s1, 1
-/* F8BEC 802D423C 2A220040 */  slti      $v0, $s1, 0x40
-/* F8BF0 802D4240 1440FFF9 */  bnez      $v0, .L802D4228
-/* F8BF4 802D4244 24630004 */   addiu    $v1, $v1, 4
-/* F8BF8 802D4248 2A220040 */  slti      $v0, $s1, 0x40
-.L802D424C:
-/* F8BFC 802D424C 50400012 */  beql      $v0, $zero, .L802D4298
-/* F8C00 802D4250 0000102D */   daddu    $v0, $zero, $zero
-/* F8C04 802D4254 0C048338 */  jal       load_entity_model
-/* F8C08 802D4258 00000000 */   nop
-/* F8C0C 802D425C 3C013F80 */  lui       $at, 0x3f80
-/* F8C10 802D4260 44810000 */  mtc1      $at, $f0
-/* F8C14 802D4264 AE020000 */  sw        $v0, ($s0)
-/* F8C18 802D4268 0040202D */  daddu     $a0, $v0, $zero
-/* F8C1C 802D426C AE000004 */  sw        $zero, 4($s0)
-/* F8C20 802D4270 AE000008 */  sw        $zero, 8($s0)
-/* F8C24 802D4274 AE00000C */  sw        $zero, 0xc($s0)
-/* F8C28 802D4278 AE000010 */  sw        $zero, 0x10($s0)
-/* F8C2C 802D427C AE000014 */  sw        $zero, 0x14($s0)
-/* F8C30 802D4280 AE000018 */  sw        $zero, 0x18($s0)
-/* F8C34 802D4284 E600001C */  swc1      $f0, 0x1c($s0)
-/* F8C38 802D4288 E6000020 */  swc1      $f0, 0x20($s0)
-/* F8C3C 802D428C 0C0483C1 */  jal       exec_entity_model_commandlist
-/* F8C40 802D4290 E6000024 */   swc1     $f0, 0x24($s0)
-/* F8C44 802D4294 0220102D */  daddu     $v0, $s1, $zero
-.L802D4298:
-/* F8C48 802D4298 8FBF0018 */  lw        $ra, 0x18($sp)
-/* F8C4C 802D429C 8FB10014 */  lw        $s1, 0x14($sp)
-/* F8C50 802D42A0 8FB00010 */  lw        $s0, 0x10($sp)
-/* F8C54 802D42A4 03E00008 */  jr        $ra
-/* F8C58 802D42A8 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D42AC.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D42AC.s
deleted file mode 100644
index 383658f299..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D42AC.s
+++ /dev/null
@@ -1,53 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D42AC
-/* F8C5C 802D42AC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* F8C60 802D42B0 AFB10014 */  sw        $s1, 0x14($sp)
-/* F8C64 802D42B4 0000882D */  daddu     $s1, $zero, $zero
-/* F8C68 802D42B8 AFB20018 */  sw        $s2, 0x18($sp)
-/* F8C6C 802D42BC 3C12802E */  lui       $s2, %hi(D_802DB7C0)
-/* F8C70 802D42C0 2652B7C0 */  addiu     $s2, $s2, %lo(D_802DB7C0)
-/* F8C74 802D42C4 AFBF001C */  sw        $ra, 0x1c($sp)
-/* F8C78 802D42C8 AFB00010 */  sw        $s0, 0x10($sp)
-/* F8C7C 802D42CC 8E430000 */  lw        $v1, ($s2)
-.L802D42D0:
-/* F8C80 802D42D0 8C700000 */  lw        $s0, ($v1)
-/* F8C84 802D42D4 8E020000 */  lw        $v0, ($s0)
-/* F8C88 802D42D8 04400006 */  bltz      $v0, .L802D42F4
-/* F8C8C 802D42DC 2A220040 */   slti     $v0, $s1, 0x40
-/* F8C90 802D42E0 26310001 */  addiu     $s1, $s1, 1
-/* F8C94 802D42E4 2A220040 */  slti      $v0, $s1, 0x40
-/* F8C98 802D42E8 1440FFF9 */  bnez      $v0, .L802D42D0
-/* F8C9C 802D42EC 24630004 */   addiu    $v1, $v1, 4
-/* F8CA0 802D42F0 2A220040 */  slti      $v0, $s1, 0x40
-.L802D42F4:
-/* F8CA4 802D42F4 10400015 */  beqz      $v0, .L802D434C
-/* F8CA8 802D42F8 0000102D */   daddu    $v0, $zero, $zero
-/* F8CAC 802D42FC 0C048379 */  jal       ALT_load_entity_model
-/* F8CB0 802D4300 00000000 */   nop
-/* F8CB4 802D4304 3C013F80 */  lui       $at, 0x3f80
-/* F8CB8 802D4308 44810000 */  mtc1      $at, $f0
-/* F8CBC 802D430C AE020000 */  sw        $v0, ($s0)
-/* F8CC0 802D4310 0040202D */  daddu     $a0, $v0, $zero
-/* F8CC4 802D4314 AE000004 */  sw        $zero, 4($s0)
-/* F8CC8 802D4318 AE000008 */  sw        $zero, 8($s0)
-/* F8CCC 802D431C AE00000C */  sw        $zero, 0xc($s0)
-/* F8CD0 802D4320 AE000010 */  sw        $zero, 0x10($s0)
-/* F8CD4 802D4324 AE000014 */  sw        $zero, 0x14($s0)
-/* F8CD8 802D4328 AE000018 */  sw        $zero, 0x18($s0)
-/* F8CDC 802D432C E600001C */  swc1      $f0, 0x1c($s0)
-/* F8CE0 802D4330 E6000020 */  swc1      $f0, 0x20($s0)
-/* F8CE4 802D4334 0C0483C1 */  jal       exec_entity_model_commandlist
-/* F8CE8 802D4338 E6000024 */   swc1     $f0, 0x24($s0)
-/* F8CEC 802D433C 8E430000 */  lw        $v1, ($s2)
-/* F8CF0 802D4340 00111080 */  sll       $v0, $s1, 2
-/* F8CF4 802D4344 00431021 */  addu      $v0, $v0, $v1
-/* F8CF8 802D4348 8C420000 */  lw        $v0, ($v0)
-.L802D434C:
-/* F8CFC 802D434C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* F8D00 802D4350 8FB20018 */  lw        $s2, 0x18($sp)
-/* F8D04 802D4354 8FB10014 */  lw        $s1, 0x14($sp)
-/* F8D08 802D4358 8FB00010 */  lw        $s0, 0x10($sp)
-/* F8D0C 802D435C 03E00008 */  jr        $ra
-/* F8D10 802D4360 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D4364.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D4364.s
deleted file mode 100644
index c3152dc47a..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D4364.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D4364
-/* F8D14 802D4364 3C02802E */  lui       $v0, %hi(D_802DB7C0)
-/* F8D18 802D4368 8C42B7C0 */  lw        $v0, %lo(D_802DB7C0)($v0)
-/* F8D1C 802D436C 00042080 */  sll       $a0, $a0, 2
-/* F8D20 802D4370 00822021 */  addu      $a0, $a0, $v0
-/* F8D24 802D4374 8C820000 */  lw        $v0, ($a0)
-/* F8D28 802D4378 44850000 */  mtc1      $a1, $f0
-/* F8D2C 802D437C 00000000 */  nop
-/* F8D30 802D4380 46800020 */  cvt.s.w   $f0, $f0
-/* F8D34 802D4384 E4400004 */  swc1      $f0, 4($v0)
-/* F8D38 802D4388 44860000 */  mtc1      $a2, $f0
-/* F8D3C 802D438C 00000000 */  nop
-/* F8D40 802D4390 46800020 */  cvt.s.w   $f0, $f0
-/* F8D44 802D4394 E4400008 */  swc1      $f0, 8($v0)
-/* F8D48 802D4398 44870000 */  mtc1      $a3, $f0
-/* F8D4C 802D439C 00000000 */  nop
-/* F8D50 802D43A0 46800020 */  cvt.s.w   $f0, $f0
-/* F8D54 802D43A4 03E00008 */  jr        $ra
-/* F8D58 802D43A8 E440000C */   swc1     $f0, 0xc($v0)
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D43F4.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D43F4.s
deleted file mode 100644
index 1ff255fffb..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D43F4.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D43F4
-/* F8DA4 802D43F4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* F8DA8 802D43F8 3C02802E */  lui       $v0, %hi(D_802DB7C0)
-/* F8DAC 802D43FC 8C42B7C0 */  lw        $v0, %lo(D_802DB7C0)($v0)
-/* F8DB0 802D4400 00042080 */  sll       $a0, $a0, 2
-/* F8DB4 802D4404 AFBF0014 */  sw        $ra, 0x14($sp)
-/* F8DB8 802D4408 AFB00010 */  sw        $s0, 0x10($sp)
-/* F8DBC 802D440C 00822021 */  addu      $a0, $a0, $v0
-/* F8DC0 802D4410 8C900000 */  lw        $s0, ($a0)
-/* F8DC4 802D4414 0C048B7F */  jal       free_entity_model_by_index
-/* F8DC8 802D4418 8E040000 */   lw       $a0, ($s0)
-/* F8DCC 802D441C 2402FFFF */  addiu     $v0, $zero, -1
-/* F8DD0 802D4420 AE020000 */  sw        $v0, ($s0)
-/* F8DD4 802D4424 8FBF0014 */  lw        $ra, 0x14($sp)
-/* F8DD8 802D4428 8FB00010 */  lw        $s0, 0x10($sp)
-/* F8DDC 802D442C 03E00008 */  jr        $ra
-/* F8DE0 802D4430 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D4434.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D4434.s
deleted file mode 100644
index 6e5858dee9..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D4434.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D4434
-/* F8DE4 802D4434 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* F8DE8 802D4438 AFBF0010 */  sw        $ra, 0x10($sp)
-/* F8DEC 802D443C 0080282D */  daddu     $a1, $a0, $zero
-/* F8DF0 802D4440 0000202D */  daddu     $a0, $zero, $zero
-.L802D4444:
-/* F8DF4 802D4444 3C02802E */  lui       $v0, %hi(D_802DB7C0)
-/* F8DF8 802D4448 8C42B7C0 */  lw        $v0, %lo(D_802DB7C0)($v0)
-/* F8DFC 802D444C 00041880 */  sll       $v1, $a0, 2
-/* F8E00 802D4450 00621821 */  addu      $v1, $v1, $v0
-/* F8E04 802D4454 8C620000 */  lw        $v0, ($v1)
-/* F8E08 802D4458 54450005 */  bnel      $v0, $a1, .L802D4470
-/* F8E0C 802D445C 24840001 */   addiu    $a0, $a0, 1
-/* F8E10 802D4460 0C0B50FD */  jal       func_802D43F4
-/* F8E14 802D4464 00000000 */   nop
-/* F8E18 802D4468 080B511F */  j         .L802D447C
-/* F8E1C 802D446C 00000000 */   nop
-.L802D4470:
-/* F8E20 802D4470 28820040 */  slti      $v0, $a0, 0x40
-/* F8E24 802D4474 1440FFF3 */  bnez      $v0, .L802D4444
-/* F8E28 802D4478 00000000 */   nop
-.L802D447C:
-/* F8E2C 802D447C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* F8E30 802D4480 03E00008 */  jr        $ra
-/* F8E34 802D4484 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D4488.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D4488.s
deleted file mode 100644
index 538f0059f3..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D4488.s
+++ /dev/null
@@ -1,63 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D4488
-/* F8E38 802D4488 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* F8E3C 802D448C 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* F8E40 802D4490 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* F8E44 802D4494 AFBF001C */  sw        $ra, 0x1c($sp)
-/* F8E48 802D4498 AFB20018 */  sw        $s2, 0x18($sp)
-/* F8E4C 802D449C AFB10014 */  sw        $s1, 0x14($sp)
-/* F8E50 802D44A0 AFB00010 */  sw        $s0, 0x10($sp)
-/* F8E54 802D44A4 80420070 */  lb        $v0, 0x70($v0)
-/* F8E58 802D44A8 14400005 */  bnez      $v0, .L802D44C0
-/* F8E5C 802D44AC 00000000 */   nop
-/* F8E60 802D44B0 3C02802E */  lui       $v0, %hi(D_802DB6C0)
-/* F8E64 802D44B4 2442B6C0 */  addiu     $v0, $v0, %lo(D_802DB6C0)
-/* F8E68 802D44B8 080B5132 */  j         .L802D44C8
-/* F8E6C 802D44BC 00000000 */   nop
-.L802D44C0:
-/* F8E70 802D44C0 3C02802E */  lui       $v0, %hi(D_802DB5C0)
-/* F8E74 802D44C4 2442B5C0 */  addiu     $v0, $v0, %lo(D_802DB5C0)
-.L802D44C8:
-/* F8E78 802D44C8 3C01802E */  lui       $at, %hi(D_802DB7C0)
-/* F8E7C 802D44CC AC22B7C0 */  sw        $v0, %lo(D_802DB7C0)($at)
-/* F8E80 802D44D0 0000882D */  daddu     $s1, $zero, $zero
-/* F8E84 802D44D4 2412FFFF */  addiu     $s2, $zero, -1
-/* F8E88 802D44D8 0220802D */  daddu     $s0, $s1, $zero
-.L802D44DC:
-/* F8E8C 802D44DC 0C00AB39 */  jal       heap_malloc
-/* F8E90 802D44E0 2404004C */   addiu    $a0, $zero, 0x4c
-/* F8E94 802D44E4 3C03802E */  lui       $v1, %hi(D_802DB7C0)
-/* F8E98 802D44E8 8C63B7C0 */  lw        $v1, %lo(D_802DB7C0)($v1)
-/* F8E9C 802D44EC 02031821 */  addu      $v1, $s0, $v1
-/* F8EA0 802D44F0 14400003 */  bnez      $v0, .L802D4500
-/* F8EA4 802D44F4 AC620000 */   sw       $v0, ($v1)
-.L802D44F8:
-/* F8EA8 802D44F8 080B513E */  j         .L802D44F8
-/* F8EAC 802D44FC 00000000 */   nop
-.L802D4500:
-/* F8EB0 802D4500 3C02802E */  lui       $v0, %hi(D_802DB7C0)
-/* F8EB4 802D4504 8C42B7C0 */  lw        $v0, %lo(D_802DB7C0)($v0)
-/* F8EB8 802D4508 26310001 */  addiu     $s1, $s1, 1
-/* F8EBC 802D450C 02021021 */  addu      $v0, $s0, $v0
-/* F8EC0 802D4510 8C420000 */  lw        $v0, ($v0)
-/* F8EC4 802D4514 AC520000 */  sw        $s2, ($v0)
-/* F8EC8 802D4518 2A220040 */  slti      $v0, $s1, 0x40
-/* F8ECC 802D451C 1440FFEF */  bnez      $v0, .L802D44DC
-/* F8ED0 802D4520 26100004 */   addiu    $s0, $s0, 4
-/* F8ED4 802D4524 3C04802D */  lui       $a0, %hi(func_802D2FCC)
-/* F8ED8 802D4528 24842FCC */  addiu     $a0, $a0, %lo(func_802D2FCC)
-/* F8EDC 802D452C 3C05802D */  lui       $a1, %hi(func_802D3028)
-/* F8EE0 802D4530 0C048C56 */  jal       create_dynamic_entity_world
-/* F8EE4 802D4534 24A53028 */   addiu    $a1, $a1, %lo(func_802D3028)
-/* F8EE8 802D4538 3C05802D */  lui       $a1, %hi(func_802D31E0)
-/* F8EEC 802D453C 24A531E0 */  addiu     $a1, $a1, %lo(func_802D31E0)
-/* F8EF0 802D4540 0C048CC8 */  jal       create_dynamic_entity_backUI
-/* F8EF4 802D4544 0000202D */   daddu    $a0, $zero, $zero
-/* F8EF8 802D4548 8FBF001C */  lw        $ra, 0x1c($sp)
-/* F8EFC 802D454C 8FB20018 */  lw        $s2, 0x18($sp)
-/* F8F00 802D4550 8FB10014 */  lw        $s1, 0x14($sp)
-/* F8F04 802D4554 8FB00010 */  lw        $s0, 0x10($sp)
-/* F8F08 802D4558 03E00008 */  jr        $ra
-/* F8F0C 802D455C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/evt/player_api/func_802D4560.s b/ver/us/asm/nonmatchings/evt/player_api/func_802D4560.s
deleted file mode 100644
index 33a4dfa7a8..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/func_802D4560.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802D4560
-/* F8F10 802D4560 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* F8F14 802D4564 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* F8F18 802D4568 80420070 */  lb        $v0, 0x70($v0)
-/* F8F1C 802D456C 14400007 */  bnez      $v0, .L802D458C
-/* F8F20 802D4570 00000000 */   nop
-/* F8F24 802D4574 3C02802E */  lui       $v0, %hi(D_802DB6C0)
-/* F8F28 802D4578 2442B6C0 */  addiu     $v0, $v0, %lo(D_802DB6C0)
-/* F8F2C 802D457C 3C01802E */  lui       $at, %hi(D_802DB7C0)
-/* F8F30 802D4580 AC22B7C0 */  sw        $v0, %lo(D_802DB7C0)($at)
-/* F8F34 802D4584 03E00008 */  jr        $ra
-/* F8F38 802D4588 00000000 */   nop
-.L802D458C:
-/* F8F3C 802D458C 3C02802E */  lui       $v0, %hi(D_802DB5C0)
-/* F8F40 802D4590 2442B5C0 */  addiu     $v0, $v0, %lo(D_802DB5C0)
-/* F8F44 802D4594 3C01802E */  lui       $at, %hi(D_802DB7C0)
-/* F8F48 802D4598 AC22B7C0 */  sw        $v0, %lo(D_802DB7C0)($at)
-/* F8F4C 802D459C 03E00008 */  jr        $ra
-/* F8F50 802D45A0 00000000 */   nop
-/* F8F54 802D45A4 00000000 */  nop
-/* F8F58 802D45A8 00000000 */  nop
-/* F8F5C 802D45AC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/evt/player_api/player_jump.s b/ver/us/asm/nonmatchings/evt/player_api/player_jump.s
deleted file mode 100644
index 5c3d5117d9..0000000000
--- a/ver/us/asm/nonmatchings/evt/player_api/player_jump.s
+++ /dev/null
@@ -1,280 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel player_jump
-/* F5E90 802D14E0 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* F5E94 802D14E4 AFB20020 */  sw        $s2, 0x20($sp)
-/* F5E98 802D14E8 0080902D */  daddu     $s2, $a0, $zero
-/* F5E9C 802D14EC AFB30024 */  sw        $s3, 0x24($sp)
-/* F5EA0 802D14F0 AFB1001C */  sw        $s1, 0x1c($sp)
-/* F5EA4 802D14F4 3C118011 */  lui       $s1, %hi(gPlayerStatus)
-/* F5EA8 802D14F8 2631EFC8 */  addiu     $s1, $s1, %lo(gPlayerStatus)
-/* F5EAC 802D14FC AFBF0028 */  sw        $ra, 0x28($sp)
-/* F5EB0 802D1500 AFB00018 */  sw        $s0, 0x18($sp)
-/* F5EB4 802D1504 F7B80040 */  sdc1      $f24, 0x40($sp)
-/* F5EB8 802D1508 F7B60038 */  sdc1      $f22, 0x38($sp)
-/* F5EBC 802D150C F7B40030 */  sdc1      $f20, 0x30($sp)
-/* F5EC0 802D1510 8E50000C */  lw        $s0, 0xc($s2)
-/* F5EC4 802D1514 10A00002 */  beqz      $a1, .L802D1520
-/* F5EC8 802D1518 00C0982D */   daddu    $s3, $a2, $zero
-/* F5ECC 802D151C AE400070 */  sw        $zero, 0x70($s2)
-.L802D1520:
-/* F5ED0 802D1520 8E420070 */  lw        $v0, 0x70($s2)
-/* F5ED4 802D1524 1440007E */  bnez      $v0, .L802D1720
-/* F5ED8 802D1528 00000000 */   nop
-/* F5EDC 802D152C 8E050000 */  lw        $a1, ($s0)
-/* F5EE0 802D1530 26100004 */  addiu     $s0, $s0, 4
-/* F5EE4 802D1534 0C0B1EAF */  jal       get_variable
-/* F5EE8 802D1538 0240202D */   daddu    $a0, $s2, $zero
-/* F5EEC 802D153C 8E050000 */  lw        $a1, ($s0)
-/* F5EF0 802D1540 26100004 */  addiu     $s0, $s0, 4
-/* F5EF4 802D1544 4482B000 */  mtc1      $v0, $f22
-/* F5EF8 802D1548 00000000 */  nop
-/* F5EFC 802D154C 4680B5A0 */  cvt.s.w   $f22, $f22
-/* F5F00 802D1550 0C0B1EAF */  jal       get_variable
-/* F5F04 802D1554 0240202D */   daddu    $a0, $s2, $zero
-/* F5F08 802D1558 4482C000 */  mtc1      $v0, $f24
-/* F5F0C 802D155C 00000000 */  nop
-/* F5F10 802D1560 4680C620 */  cvt.s.w   $f24, $f24
-/* F5F14 802D1564 8E050000 */  lw        $a1, ($s0)
-/* F5F18 802D1568 26100004 */  addiu     $s0, $s0, 4
-/* F5F1C 802D156C 0C0B1EAF */  jal       get_variable
-/* F5F20 802D1570 0240202D */   daddu    $a0, $s2, $zero
-/* F5F24 802D1574 8E050000 */  lw        $a1, ($s0)
-/* F5F28 802D1578 4482A000 */  mtc1      $v0, $f20
-/* F5F2C 802D157C 00000000 */  nop
-/* F5F30 802D1580 4680A520 */  cvt.s.w   $f20, $f20
-/* F5F34 802D1584 0C0B1EAF */  jal       get_variable
-/* F5F38 802D1588 0240202D */   daddu    $a0, $s2, $zero
-/* F5F3C 802D158C 3C10802E */  lui       $s0, %hi(playerNpc)
-/* F5F40 802D1590 26109D20 */  addiu     $s0, $s0, %lo(playerNpc)
-/* F5F44 802D1594 8E030000 */  lw        $v1, ($s0)
-/* F5F48 802D1598 C6200028 */  lwc1      $f0, 0x28($s1)
-/* F5F4C 802D159C E4600038 */  swc1      $f0, 0x38($v1)
-/* F5F50 802D15A0 46000306 */  mov.s     $f12, $f0
-/* F5F54 802D15A4 C620002C */  lwc1      $f0, 0x2c($s1)
-/* F5F58 802D15A8 E460003C */  swc1      $f0, 0x3c($v1)
-/* F5F5C 802D15AC C6200030 */  lwc1      $f0, 0x30($s1)
-/* F5F60 802D15B0 E4760060 */  swc1      $f22, 0x60($v1)
-/* F5F64 802D15B4 4406B000 */  mfc1      $a2, $f22
-/* F5F68 802D15B8 E4740068 */  swc1      $f20, 0x68($v1)
-/* F5F6C 802D15BC 4407A000 */  mfc1      $a3, $f20
-/* F5F70 802D15C0 E4780064 */  swc1      $f24, 0x64($v1)
-/* F5F74 802D15C4 A462008E */  sh        $v0, 0x8e($v1)
-/* F5F78 802D15C8 E4600040 */  swc1      $f0, 0x40($v1)
-/* F5F7C 802D15CC 46000386 */  mov.s     $f14, $f0
-/* F5F80 802D15D0 C6200080 */  lwc1      $f0, 0x80($s1)
-/* F5F84 802D15D4 0C00A7B5 */  jal       dist2D
-/* F5F88 802D15D8 E460000C */   swc1     $f0, 0xc($v1)
-/* F5F8C 802D15DC 46000506 */  mov.s     $f20, $f0
-/* F5F90 802D15E0 3C013FF0 */  lui       $at, 0x3ff0
-/* F5F94 802D15E4 44811800 */  mtc1      $at, $f3
-/* F5F98 802D15E8 44801000 */  mtc1      $zero, $f2
-/* F5F9C 802D15EC 4600A021 */  cvt.d.s   $f0, $f20
-/* F5FA0 802D15F0 4620103C */  c.lt.d    $f2, $f0
-/* F5FA4 802D15F4 00000000 */  nop
-/* F5FA8 802D15F8 45000009 */  bc1f      .L802D1620
-/* F5FAC 802D15FC 00000000 */   nop
-/* F5FB0 802D1600 8E020000 */  lw        $v0, ($s0)
-/* F5FB4 802D1604 C44C0038 */  lwc1      $f12, 0x38($v0)
-/* F5FB8 802D1608 C44E0040 */  lwc1      $f14, 0x40($v0)
-/* F5FBC 802D160C 8C460060 */  lw        $a2, 0x60($v0)
-/* F5FC0 802D1610 0C00A720 */  jal       atan2
-/* F5FC4 802D1614 8C470068 */   lw       $a3, 0x68($v0)
-/* F5FC8 802D1618 8E020000 */  lw        $v0, ($s0)
-/* F5FCC 802D161C E440000C */  swc1      $f0, 0xc($v0)
-.L802D1620:
-/* F5FD0 802D1620 8E030000 */  lw        $v1, ($s0)
-/* F5FD4 802D1624 C4620064 */  lwc1      $f2, 0x64($v1)
-/* F5FD8 802D1628 C460003C */  lwc1      $f0, 0x3c($v1)
-/* F5FDC 802D162C 8462008E */  lh        $v0, 0x8e($v1)
-/* F5FE0 802D1630 14400007 */  bnez      $v0, .L802D1650
-/* F5FE4 802D1634 46001601 */   sub.s    $f24, $f2, $f0
-/* F5FE8 802D1638 C4600018 */  lwc1      $f0, 0x18($v1)
-/* F5FEC 802D163C 4600A003 */  div.s     $f0, $f20, $f0
-/* F5FF0 802D1640 4600018D */  trunc.w.s $f6, $f0
-/* F5FF4 802D1644 44023000 */  mfc1      $v0, $f6
-/* F5FF8 802D1648 080B4599 */  j         .L802D1664
-/* F5FFC 802D164C A462008E */   sh       $v0, 0x8e($v1)
-.L802D1650:
-/* F6000 802D1650 44820000 */  mtc1      $v0, $f0
-/* F6004 802D1654 00000000 */  nop
-/* F6008 802D1658 46800020 */  cvt.s.w   $f0, $f0
-/* F600C 802D165C 4600A003 */  div.s     $f0, $f20, $f0
-/* F6010 802D1660 E4600018 */  swc1      $f0, 0x18($v1)
-.L802D1664:
-/* F6014 802D1664 3C03802E */  lui       $v1, %hi(playerNpc)
-/* F6018 802D1668 8C639D20 */  lw        $v1, %lo(playerNpc)($v1)
-/* F601C 802D166C 8464008E */  lh        $a0, 0x8e($v1)
-/* F6020 802D1670 C4620014 */  lwc1      $f2, 0x14($v1)
-/* F6024 802D1674 2482FFFF */  addiu     $v0, $a0, -1
-/* F6028 802D1678 44820000 */  mtc1      $v0, $f0
-/* F602C 802D167C 00000000 */  nop
-/* F6030 802D1680 46800020 */  cvt.s.w   $f0, $f0
-/* F6034 802D1684 46001082 */  mul.s     $f2, $f2, $f0
-/* F6038 802D1688 00000000 */  nop
-/* F603C 802D168C 3C013F00 */  lui       $at, 0x3f00
-/* F6040 802D1690 44810000 */  mtc1      $at, $f0
-/* F6044 802D1694 00000000 */  nop
-/* F6048 802D1698 46001082 */  mul.s     $f2, $f2, $f0
-/* F604C 802D169C 00000000 */  nop
-/* F6050 802D16A0 44840000 */  mtc1      $a0, $f0
-/* F6054 802D16A4 00000000 */  nop
-/* F6058 802D16A8 46800020 */  cvt.s.w   $f0, $f0
-/* F605C 802D16AC 4600C003 */  div.s     $f0, $f24, $f0
-/* F6060 802D16B0 46001080 */  add.s     $f2, $f2, $f0
-/* F6064 802D16B4 E462001C */  swc1      $f2, 0x1c($v1)
-/* F6068 802D16B8 8E220000 */  lw        $v0, ($s1)
-/* F606C 802D16BC 8E230004 */  lw        $v1, 4($s1)
-/* F6070 802D16C0 34420008 */  ori       $v0, $v0, 8
-/* F6074 802D16C4 AE220000 */  sw        $v0, ($s1)
-/* F6078 802D16C8 3C021000 */  lui       $v0, 0x1000
-/* F607C 802D16CC 00621825 */  or        $v1, $v1, $v0
-/* F6080 802D16D0 16600011 */  bnez      $s3, .L802D1718
-/* F6084 802D16D4 AE230004 */   sw       $v1, 4($s1)
-/* F6088 802D16D8 30624000 */  andi      $v0, $v1, 0x4000
-/* F608C 802D16DC 14400008 */  bnez      $v0, .L802D1700
-/* F6090 802D16E0 3C040009 */   lui      $a0, 9
-/* F6094 802D16E4 3C040006 */  lui       $a0, 6
-/* F6098 802D16E8 30620001 */  andi      $v0, $v1, 1
-/* F609C 802D16EC 14400005 */  bnez      $v0, .L802D1704
-/* F60A0 802D16F0 34840009 */   ori      $a0, $a0, 9
-/* F60A4 802D16F4 3C040001 */  lui       $a0, 1
-/* F60A8 802D16F8 080B45C1 */  j         .L802D1704
-/* F60AC 802D16FC 34840007 */   ori      $a0, $a0, 7
-.L802D1700:
-/* F60B0 802D1700 34840005 */  ori       $a0, $a0, 5
-.L802D1704:
-/* F60B4 802D1704 0C037FBF */  jal       func_800DFEFC
-/* F60B8 802D1708 00000000 */   nop
-/* F60BC 802D170C 24042081 */  addiu     $a0, $zero, 0x2081
-/* F60C0 802D1710 0C052736 */  jal       sfx_play_sound_at_player
-/* F60C4 802D1714 0000282D */   daddu    $a1, $zero, $zero
-.L802D1718:
-/* F60C8 802D1718 24020001 */  addiu     $v0, $zero, 1
-/* F60CC 802D171C AE420070 */  sw        $v0, 0x70($s2)
-.L802D1720:
-/* F60D0 802D1720 3C10802E */  lui       $s0, %hi(playerNpc)
-/* F60D4 802D1724 26109D20 */  addiu     $s0, $s0, %lo(playerNpc)
-/* F60D8 802D1728 8E040000 */  lw        $a0, ($s0)
-/* F60DC 802D172C 8C850018 */  lw        $a1, 0x18($a0)
-/* F60E0 802D1730 0C00EA95 */  jal       npc_move_heading
-/* F60E4 802D1734 8C86000C */   lw       $a2, 0xc($a0)
-/* F60E8 802D1738 8E020000 */  lw        $v0, ($s0)
-/* F60EC 802D173C C440001C */  lwc1      $f0, 0x1c($v0)
-/* F60F0 802D1740 C442003C */  lwc1      $f2, 0x3c($v0)
-/* F60F4 802D1744 46000106 */  mov.s     $f4, $f0
-/* F60F8 802D1748 46001080 */  add.s     $f2, $f2, $f0
-/* F60FC 802D174C C4400014 */  lwc1      $f0, 0x14($v0)
-/* F6100 802D1750 46002001 */  sub.s     $f0, $f4, $f0
-/* F6104 802D1754 E442003C */  swc1      $f2, 0x3c($v0)
-/* F6108 802D1758 16600019 */  bnez      $s3, .L802D17C0
-/* F610C 802D175C E440001C */   swc1     $f0, 0x1c($v0)
-/* F6110 802D1760 44801000 */  mtc1      $zero, $f2
-/* F6114 802D1764 00000000 */  nop
-/* F6118 802D1768 4604103C */  c.lt.s    $f2, $f4
-/* F611C 802D176C 00000000 */  nop
-/* F6120 802D1770 45000013 */  bc1f      .L802D17C0
-/* F6124 802D1774 00000000 */   nop
-/* F6128 802D1778 4602003E */  c.le.s    $f0, $f2
-/* F612C 802D177C 00000000 */  nop
-/* F6130 802D1780 4500000F */  bc1f      .L802D17C0
-/* F6134 802D1784 00000000 */   nop
-/* F6138 802D1788 8E230004 */  lw        $v1, 4($s1)
-/* F613C 802D178C 30624000 */  andi      $v0, $v1, 0x4000
-/* F6140 802D1790 14400008 */  bnez      $v0, .L802D17B4
-/* F6144 802D1794 3C040009 */   lui      $a0, 9
-/* F6148 802D1798 3C040006 */  lui       $a0, 6
-/* F614C 802D179C 30620001 */  andi      $v0, $v1, 1
-/* F6150 802D17A0 14400005 */  bnez      $v0, .L802D17B8
-/* F6154 802D17A4 3484000A */   ori      $a0, $a0, 0xa
-/* F6158 802D17A8 3C040001 */  lui       $a0, 1
-/* F615C 802D17AC 080B45EE */  j         .L802D17B8
-/* F6160 802D17B0 34840008 */   ori      $a0, $a0, 8
-.L802D17B4:
-/* F6164 802D17B4 34840005 */  ori       $a0, $a0, 5
-.L802D17B8:
-/* F6168 802D17B8 0C037FBF */  jal       func_800DFEFC
-/* F616C 802D17BC 00000000 */   nop
-.L802D17C0:
-/* F6170 802D17C0 3C03802E */  lui       $v1, %hi(playerNpc)
-/* F6174 802D17C4 24639D20 */  addiu     $v1, $v1, %lo(playerNpc)
-/* F6178 802D17C8 8C620000 */  lw        $v0, ($v1)
-/* F617C 802D17CC C4400038 */  lwc1      $f0, 0x38($v0)
-/* F6180 802D17D0 E6200028 */  swc1      $f0, 0x28($s1)
-/* F6184 802D17D4 C440003C */  lwc1      $f0, 0x3c($v0)
-/* F6188 802D17D8 E620002C */  swc1      $f0, 0x2c($s1)
-/* F618C 802D17DC C4400040 */  lwc1      $f0, 0x40($v0)
-/* F6190 802D17E0 16600003 */  bnez      $s3, .L802D17F0
-/* F6194 802D17E4 E6200030 */   swc1     $f0, 0x30($s1)
-/* F6198 802D17E8 C440000C */  lwc1      $f0, 0xc($v0)
-/* F619C 802D17EC E6200080 */  swc1      $f0, 0x80($s1)
-.L802D17F0:
-/* F61A0 802D17F0 8C630000 */  lw        $v1, ($v1)
-/* F61A4 802D17F4 9462008E */  lhu       $v0, 0x8e($v1)
-/* F61A8 802D17F8 2442FFFF */  addiu     $v0, $v0, -1
-/* F61AC 802D17FC A462008E */  sh        $v0, 0x8e($v1)
-/* F61B0 802D1800 00021400 */  sll       $v0, $v0, 0x10
-/* F61B4 802D1804 1440002E */  bnez      $v0, .L802D18C0
-/* F61B8 802D1808 0000102D */   daddu    $v0, $zero, $zero
-/* F61BC 802D180C 3C02EFFF */  lui       $v0, 0xefff
-/* F61C0 802D1810 3442FFFF */  ori       $v0, $v0, 0xffff
-/* F61C4 802D1814 2404FFF7 */  addiu     $a0, $zero, -9
-/* F61C8 802D1818 8E230000 */  lw        $v1, ($s1)
-/* F61CC 802D181C 8E250004 */  lw        $a1, 4($s1)
-/* F61D0 802D1820 00641824 */  and       $v1, $v1, $a0
-/* F61D4 802D1824 00A21024 */  and       $v0, $a1, $v0
-/* F61D8 802D1828 AE230000 */  sw        $v1, ($s1)
-/* F61DC 802D182C 16600014 */  bnez      $s3, .L802D1880
-/* F61E0 802D1830 AE220004 */   sw       $v0, 4($s1)
-/* F61E4 802D1834 30A24000 */  andi      $v0, $a1, 0x4000
-/* F61E8 802D1838 14400008 */  bnez      $v0, .L802D185C
-/* F61EC 802D183C 3C040001 */   lui      $a0, 1
-/* F61F0 802D1840 3C040006 */  lui       $a0, 6
-/* F61F4 802D1844 30A20001 */  andi      $v0, $a1, 1
-/* F61F8 802D1848 14400005 */  bnez      $v0, .L802D1860
-/* F61FC 802D184C 3484000B */   ori      $a0, $a0, 0xb
-/* F6200 802D1850 3C040001 */  lui       $a0, 1
-/* F6204 802D1854 080B4618 */  j         .L802D1860
-/* F6208 802D1858 34840009 */   ori      $a0, $a0, 9
-.L802D185C:
-/* F620C 802D185C 34840003 */  ori       $a0, $a0, 3
-.L802D1860:
-/* F6210 802D1860 0C037FBF */  jal       func_800DFEFC
-/* F6214 802D1864 00000000 */   nop
-/* F6218 802D1868 3C04802E */  lui       $a0, %hi(playerNpc)
-/* F621C 802D186C 8C849D20 */  lw        $a0, %lo(playerNpc)($a0)
-/* F6220 802D1870 0C00F598 */  jal       func_8003D660
-/* F6224 802D1874 24050002 */   addiu    $a1, $zero, 2
-/* F6228 802D1878 12600004 */  beqz      $s3, .L802D188C
-/* F622C 802D187C 00000000 */   nop
-.L802D1880:
-/* F6230 802D1880 24020002 */  addiu     $v0, $zero, 2
-/* F6234 802D1884 1662000E */  bne       $s3, $v0, .L802D18C0
-/* F6238 802D1888 24020001 */   addiu    $v0, $zero, 1
-.L802D188C:
-/* F623C 802D188C 3C02802E */  lui       $v0, %hi(playerNpc)
-/* F6240 802D1890 8C429D20 */  lw        $v0, %lo(playerNpc)($v0)
-/* F6244 802D1894 C44C001C */  lwc1      $f12, 0x1c($v0)
-/* F6248 802D1898 0C038D45 */  jal       func_800E3514
-/* F624C 802D189C 27A50010 */   addiu    $a1, $sp, 0x10
-/* F6250 802D18A0 8FA40010 */  lw        $a0, 0x10($sp)
-/* F6254 802D18A4 04800005 */  bltz      $a0, .L802D18BC
-/* F6258 802D18A8 46000606 */   mov.s    $f24, $f0
-/* F625C 802D18AC 0C038C57 */  jal       func_800E315C
-/* F6260 802D18B0 E638002C */   swc1     $f24, 0x2c($s1)
-/* F6264 802D18B4 0C03BF42 */  jal       func_800EFD08
-/* F6268 802D18B8 00000000 */   nop
-.L802D18BC:
-/* F626C 802D18BC 24020001 */  addiu     $v0, $zero, 1
-.L802D18C0:
-/* F6270 802D18C0 8FBF0028 */  lw        $ra, 0x28($sp)
-/* F6274 802D18C4 8FB30024 */  lw        $s3, 0x24($sp)
-/* F6278 802D18C8 8FB20020 */  lw        $s2, 0x20($sp)
-/* F627C 802D18CC 8FB1001C */  lw        $s1, 0x1c($sp)
-/* F6280 802D18D0 8FB00018 */  lw        $s0, 0x18($sp)
-/* F6284 802D18D4 D7B80040 */  ldc1      $f24, 0x40($sp)
-/* F6288 802D18D8 D7B60038 */  ldc1      $f22, 0x38($sp)
-/* F628C 802D18DC D7B40030 */  ldc1      $f20, 0x30($sp)
-/* F6290 802D18E0 03E00008 */  jr        $ra
-/* F6294 802D18E4 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/npc/func_8003B47C.s b/ver/us/asm/nonmatchings/npc/func_8003B47C.s
deleted file mode 100644
index 8abd635bcc..0000000000
--- a/ver/us/asm/nonmatchings/npc/func_8003B47C.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-glabel jtbl_800984C8
-.word L8003B4AC_168AC, L8003B4BC_168BC, L8003B4CC_168CC, L8003B4DC_168DC, L8003B4EC_168EC, 0
-
-.section .text
-
-glabel func_8003B47C
-/* 1687C 8003B47C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 16880 8003B480 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 16884 8003B484 808300B4 */  lb        $v1, 0xb4($a0)
-/* 16888 8003B488 2C620005 */  sltiu     $v0, $v1, 5
-/* 1688C 8003B48C 10400019 */  beqz      $v0, .L8003B4F4
-/* 16890 8003B490 00C0382D */   daddu    $a3, $a2, $zero
-/* 16894 8003B494 00031080 */  sll       $v0, $v1, 2
-/* 16898 8003B498 3C01800A */  lui       $at, %hi(jtbl_800984C8)
-/* 1689C 8003B49C 00220821 */  addu      $at, $at, $v0
-/* 168A0 8003B4A0 8C2284C8 */  lw        $v0, %lo(jtbl_800984C8)($at)
-/* 168A4 8003B4A4 00400008 */  jr        $v0
-/* 168A8 8003B4A8 00000000 */   nop
-glabel L8003B4AC_168AC
-/* 168AC 8003B4AC 0C00ED40 */  jal       func_8003B500
-/* 168B0 8003B4B0 00E0302D */   daddu    $a2, $a3, $zero
-/* 168B4 8003B4B4 0800ED3D */  j         .L8003B4F4
-/* 168B8 8003B4B8 00000000 */   nop
-glabel L8003B4BC_168BC
-/* 168BC 8003B4BC 0C00ED6D */  jal       func_8003B5B4
-/* 168C0 8003B4C0 00E0302D */   daddu    $a2, $a3, $zero
-/* 168C4 8003B4C4 0800ED3D */  j         .L8003B4F4
-/* 168C8 8003B4C8 00000000 */   nop
-glabel L8003B4CC_168CC
-/* 168CC 8003B4CC 0C00EE98 */  jal       func_8003BA60
-/* 168D0 8003B4D0 0000302D */   daddu    $a2, $zero, $zero
-/* 168D4 8003B4D4 0800ED3D */  j         .L8003B4F4
-/* 168D8 8003B4D8 00000000 */   nop
-glabel L8003B4DC_168DC
-/* 168DC 8003B4DC 0C00EE98 */  jal       func_8003BA60
-/* 168E0 8003B4E0 24060001 */   addiu    $a2, $zero, 1
-/* 168E4 8003B4E4 0800ED3D */  j         .L8003B4F4
-/* 168E8 8003B4E8 00000000 */   nop
-glabel L8003B4EC_168EC
-/* 168EC 8003B4EC 0C00EFB6 */  jal       func_8003BED8
-/* 168F0 8003B4F0 00E0302D */   daddu    $a2, $a3, $zero
-.L8003B4F4:
-/* 168F4 8003B4F4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 168F8 8003B4F8 03E00008 */  jr        $ra
-/* 168FC 8003B4FC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/npc/get_enemy_safe.s b/ver/us/asm/nonmatchings/npc/get_enemy_safe.s
deleted file mode 100644
index dd9998eeee..0000000000
--- a/ver/us/asm/nonmatchings/npc/get_enemy_safe.s
+++ /dev/null
@@ -1,45 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel get_enemy_safe
-/* 1A168 8003ED68 3C03800B */  lui       $v1, %hi(gCurrentEncounter)
-/* 1A16C 8003ED6C 24630F10 */  addiu     $v1, $v1, %lo(gCurrentEncounter)
-/* 1A170 8003ED70 8062001C */  lb        $v0, 0x1c($v1)
-/* 1A174 8003ED74 1840001A */  blez      $v0, .L8003EDE0
-/* 1A178 8003ED78 0000382D */   daddu    $a3, $zero, $zero
-/* 1A17C 8003ED7C 0040502D */  daddu     $t2, $v0, $zero
-/* 1A180 8003ED80 0060482D */  daddu     $t1, $v1, $zero
-.L8003ED84:
-/* 1A184 8003ED84 8D220028 */  lw        $v0, 0x28($t1)
-/* 1A188 8003ED88 50400012 */  beql      $v0, $zero, .L8003EDD4
-/* 1A18C 8003ED8C 24E70001 */   addiu    $a3, $a3, 1
-/* 1A190 8003ED90 8C430000 */  lw        $v1, ($v0)
-/* 1A194 8003ED94 1860000E */  blez      $v1, .L8003EDD0
-/* 1A198 8003ED98 0000302D */   daddu    $a2, $zero, $zero
-/* 1A19C 8003ED9C 0060402D */  daddu     $t0, $v1, $zero
-/* 1A1A0 8003EDA0 0040282D */  daddu     $a1, $v0, $zero
-.L8003EDA4:
-/* 1A1A4 8003EDA4 8CA30004 */  lw        $v1, 4($a1)
-/* 1A1A8 8003EDA8 10600006 */  beqz      $v1, .L8003EDC4
-/* 1A1AC 8003EDAC 24C60001 */   addiu    $a2, $a2, 1
-/* 1A1B0 8003EDB0 84620008 */  lh        $v0, 8($v1)
-/* 1A1B4 8003EDB4 14440004 */  bne       $v0, $a0, .L8003EDC8
-/* 1A1B8 8003EDB8 00C8102A */   slt      $v0, $a2, $t0
-/* 1A1BC 8003EDBC 03E00008 */  jr        $ra
-/* 1A1C0 8003EDC0 0060102D */   daddu    $v0, $v1, $zero
-.L8003EDC4:
-/* 1A1C4 8003EDC4 00C8102A */  slt       $v0, $a2, $t0
-.L8003EDC8:
-/* 1A1C8 8003EDC8 1440FFF6 */  bnez      $v0, .L8003EDA4
-/* 1A1CC 8003EDCC 24A50004 */   addiu    $a1, $a1, 4
-.L8003EDD0:
-/* 1A1D0 8003EDD0 24E70001 */  addiu     $a3, $a3, 1
-.L8003EDD4:
-/* 1A1D4 8003EDD4 00EA102A */  slt       $v0, $a3, $t2
-/* 1A1D8 8003EDD8 1440FFEA */  bnez      $v0, .L8003ED84
-/* 1A1DC 8003EDDC 25290004 */   addiu    $t1, $t1, 4
-.L8003EDE0:
-/* 1A1E0 8003EDE0 03E00008 */  jr        $ra
-/* 1A1E4 8003EDE4 0000102D */   daddu    $v0, $zero, $zero
-/* 1A1E8 8003EDE8 00000000 */  nop
-/* 1A1EC 8003EDEC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/action/18/func_802B6000_E245D0.s b/ver/us/asm/nonmatchings/world/action/18/func_802B6000_E245D0.s
deleted file mode 100644
index 12862cf637..0000000000
--- a/ver/us/asm/nonmatchings/world/action/18/func_802B6000_E245D0.s
+++ /dev/null
@@ -1,114 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802B6000_E245D0
-/* E245D0 802B6000 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* E245D4 802B6004 AFB00020 */  sw        $s0, 0x20($sp)
-/* E245D8 802B6008 3C108011 */  lui       $s0, %hi(gPlayerStatus)
-/* E245DC 802B600C 2610EFC8 */  addiu     $s0, $s0, %lo(gPlayerStatus)
-/* E245E0 802B6010 AFBF0024 */  sw        $ra, 0x24($sp)
-/* E245E4 802B6014 8E030000 */  lw        $v1, ($s0)
-/* E245E8 802B6018 04610024 */  bgez      $v1, .L802B60AC
-/* E245EC 802B601C 3C027FFF */   lui      $v0, 0x7fff
-/* E245F0 802B6020 3442FFFF */  ori       $v0, $v0, 0xffff
-/* E245F4 802B6024 00621024 */  and       $v0, $v1, $v0
-/* E245F8 802B6028 0C03954C */  jal       func_800E5530
-/* E245FC 802B602C AE020000 */   sw       $v0, ($s0)
-/* E24600 802B6030 8E030004 */  lw        $v1, 4($s0)
-/* E24604 802B6034 30621000 */  andi      $v0, $v1, 0x1000
-/* E24608 802B6038 14400009 */  bnez      $v0, .L802B6060
-/* E2460C 802B603C 30620001 */   andi     $v0, $v1, 1
-/* E24610 802B6040 14400003 */  bnez      $v0, .L802B6050
-/* E24614 802B6044 3C040006 */   lui      $a0, 6
-/* E24618 802B6048 3C040001 */  lui       $a0, 1
-/* E2461C 802B604C 34840004 */  ori       $a0, $a0, 4
-.L802B6050:
-/* E24620 802B6050 0C037FBF */  jal       func_800DFEFC
-/* E24624 802B6054 00000000 */   nop
-/* E24628 802B6058 080AD81A */  j         .L802B6068
-/* E2462C 802B605C 00000000 */   nop
-.L802B6060:
-/* E24630 802B6060 0C0AD866 */  jal       func_802B6198_E24768
-/* E24634 802B6064 00000000 */   nop
-.L802B6068:
-/* E24638 802B6068 3C01418E */  lui       $at, 0x418e
-/* E2463C 802B606C 34210D84 */  ori       $at, $at, 0xd84
-/* E24640 802B6070 44810000 */  mtc1      $at, $f0
-/* E24644 802B6074 3C01C136 */  lui       $at, 0xc136
-/* E24648 802B6078 34212DE0 */  ori       $at, $at, 0x2de0
-/* E2464C 802B607C 44811000 */  mtc1      $at, $f2
-/* E24650 802B6080 3C014060 */  lui       $at, 0x4060
-/* E24654 802B6084 44812000 */  mtc1      $at, $f4
-/* E24658 802B6088 3C01BF40 */  lui       $at, 0xbf40
-/* E2465C 802B608C 44813000 */  mtc1      $at, $f6
-/* E24660 802B6090 A20000B6 */  sb        $zero, 0xb6($s0)
-/* E24664 802B6094 A60000C0 */  sh        $zero, 0xc0($s0)
-/* E24668 802B6098 A60000C2 */  sh        $zero, 0xc2($s0)
-/* E2466C 802B609C E6000070 */  swc1      $f0, 0x70($s0)
-/* E24670 802B60A0 E6020074 */  swc1      $f2, 0x74($s0)
-/* E24674 802B60A4 E6040078 */  swc1      $f4, 0x78($s0)
-/* E24678 802B60A8 E606007C */  swc1      $f6, 0x7c($s0)
-.L802B60AC:
-/* E2467C 802B60AC 0C038D12 */  jal       integrate_gravity
-/* E24680 802B60B0 00000000 */   nop
-/* E24684 802B60B4 C60C0080 */  lwc1      $f12, 0x80($s0)
-/* E24688 802B60B8 3C0140C9 */  lui       $at, 0x40c9
-/* E2468C 802B60BC 34210FD0 */  ori       $at, $at, 0xfd0
-/* E24690 802B60C0 44810000 */  mtc1      $at, $f0
-/* E24694 802B60C4 00000000 */  nop
-/* E24698 802B60C8 46006302 */  mul.s     $f12, $f12, $f0
-/* E2469C 802B60CC 00000000 */  nop
-/* E246A0 802B60D0 27A50010 */  addiu     $a1, $sp, 0x10
-/* E246A4 802B60D4 3C0143B4 */  lui       $at, 0x43b4
-/* E246A8 802B60D8 44810000 */  mtc1      $at, $f0
-/* E246AC 802B60DC 27A60014 */  addiu     $a2, $sp, 0x14
-/* E246B0 802B60E0 0C00A82D */  jal       sin_cos_rad
-/* E246B4 802B60E4 46006303 */   div.s    $f12, $f12, $f0
-/* E246B8 802B60E8 C7A00010 */  lwc1      $f0, 0x10($sp)
-/* E246BC 802B60EC 3C014040 */  lui       $at, 0x4040
-/* E246C0 802B60F0 44811000 */  mtc1      $at, $f2
-/* E246C4 802B60F4 00000000 */  nop
-/* E246C8 802B60F8 46020002 */  mul.s     $f0, $f0, $f2
-/* E246CC 802B60FC 00000000 */  nop
-/* E246D0 802B6100 C7A40014 */  lwc1      $f4, 0x14($sp)
-/* E246D4 802B6104 46022102 */  mul.s     $f4, $f4, $f2
-/* E246D8 802B6108 00000000 */  nop
-/* E246DC 802B610C 2402FFFF */  addiu     $v0, $zero, -1
-/* E246E0 802B6110 C6020028 */  lwc1      $f2, 0x28($s0)
-/* E246E4 802B6114 C60C0070 */  lwc1      $f12, 0x70($s0)
-/* E246E8 802B6118 46001080 */  add.s     $f2, $f2, $f0
-/* E246EC 802B611C 44803000 */  mtc1      $zero, $f6
-/* E246F0 802B6120 C6000030 */  lwc1      $f0, 0x30($s0)
-/* E246F4 802B6124 4606603C */  c.lt.s    $f12, $f6
-/* E246F8 802B6128 46040001 */  sub.s     $f0, $f0, $f4
-/* E246FC 802B612C AFA20018 */  sw        $v0, 0x18($sp)
-/* E24700 802B6130 E6020028 */  swc1      $f2, 0x28($s0)
-/* E24704 802B6134 45000005 */  bc1f      .L802B614C
-/* E24708 802B6138 E6000030 */   swc1     $f0, 0x30($s0)
-/* E2470C 802B613C 0C038D45 */  jal       func_800E3514
-/* E24710 802B6140 27A50018 */   addiu    $a1, $sp, 0x18
-/* E24714 802B6144 080AD856 */  j         .L802B6158
-/* E24718 802B6148 E600002C */   swc1     $f0, 0x2c($s0)
-.L802B614C:
-/* E2471C 802B614C C600002C */  lwc1      $f0, 0x2c($s0)
-/* E24720 802B6150 460C0000 */  add.s     $f0, $f0, $f12
-/* E24724 802B6154 E600002C */  swc1      $f0, 0x2c($s0)
-.L802B6158:
-/* E24728 802B6158 8FA20018 */  lw        $v0, 0x18($sp)
-/* E2472C 802B615C 0440000A */  bltz      $v0, .L802B6188
-/* E24730 802B6160 2402001A */   addiu    $v0, $zero, 0x1a
-/* E24734 802B6164 820400B5 */  lb        $a0, 0xb5($s0)
-/* E24738 802B6168 10820005 */  beq       $a0, $v0, .L802B6180
-/* E2473C 802B616C 00000000 */   nop
-/* E24740 802B6170 0C039769 */  jal       set_action_state
-/* E24744 802B6174 00000000 */   nop
-/* E24748 802B6178 080AD862 */  j         .L802B6188
-/* E2474C 802B617C 00000000 */   nop
-.L802B6180:
-/* E24750 802B6180 0C0397DA */  jal       update_locomotion_state
-/* E24754 802B6184 00000000 */   nop
-.L802B6188:
-/* E24758 802B6188 8FBF0024 */  lw        $ra, 0x24($sp)
-/* E2475C 802B618C 8FB00020 */  lw        $s0, 0x20($sp)
-/* E24760 802B6190 03E00008 */  jr        $ra
-/* E24764 802B6194 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/action/18/func_802B6198_E24768.s b/ver/us/asm/nonmatchings/world/action/18/func_802B6198_E24768.s
deleted file mode 100644
index 6d2fb8d946..0000000000
--- a/ver/us/asm/nonmatchings/world/action/18/func_802B6198_E24768.s
+++ /dev/null
@@ -1,45 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802B6198_E24768
-/* E24768 802B6198 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* E2476C 802B619C 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* E24770 802B61A0 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* E24774 802B61A4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* E24778 802B61A8 8C620004 */  lw        $v0, 4($v1)
-/* E2477C 802B61AC 30422000 */  andi      $v0, $v0, 0x2000
-/* E24780 802B61B0 14400013 */  bnez      $v0, .L802B6200
-/* E24784 802B61B4 00000000 */   nop
-/* E24788 802B61B8 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* E2478C 802B61BC 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* E24790 802B61C0 9062007E */  lbu       $v0, 0x7e($v1)
-/* E24794 802B61C4 30420010 */  andi      $v0, $v0, 0x10
-/* E24798 802B61C8 14400009 */  bnez      $v0, .L802B61F0
-/* E2479C 802B61CC 3C04000D */   lui      $a0, 0xd
-/* E247A0 802B61D0 90620080 */  lbu       $v0, 0x80($v1)
-/* E247A4 802B61D4 00021080 */  sll       $v0, $v0, 2
-/* E247A8 802B61D8 3C04802B */  lui       $a0, %hi(D_802B6300_E248D0)
-/* E247AC 802B61DC 00822021 */  addu      $a0, $a0, $v0
-/* E247B0 802B61E0 0C037FBF */  jal       func_800DFEFC
-/* E247B4 802B61E4 8C846300 */   lw       $a0, %lo(D_802B6300_E248D0)($a0)
-/* E247B8 802B61E8 080AD889 */  j         .L802B6224
-/* E247BC 802B61EC 00000000 */   nop
-.L802B61F0:
-/* E247C0 802B61F0 0C037FBF */  jal       func_800DFEFC
-/* E247C4 802B61F4 3484000D */   ori      $a0, $a0, 0xd
-/* E247C8 802B61F8 080AD889 */  j         .L802B6224
-/* E247CC 802B61FC 00000000 */   nop
-.L802B6200:
-/* E247D0 802B6200 8063000C */  lb        $v1, 0xc($v1)
-/* E247D4 802B6204 00031040 */  sll       $v0, $v1, 1
-/* E247D8 802B6208 00431021 */  addu      $v0, $v0, $v1
-/* E247DC 802B620C 000210C0 */  sll       $v0, $v0, 3
-/* E247E0 802B6210 3C04800F */  lui       $a0, %hi(world_actions_peachDisguises+0x4)
-/* E247E4 802B6214 00822021 */  addu      $a0, $a0, $v0
-/* E247E8 802B6218 8C847C20 */  lw        $a0, %lo(world_actions_peachDisguises+0x4)($a0)
-/* E247EC 802B621C 0C0398DB */  jal       func_800E636C
-/* E247F0 802B6220 00000000 */   nop
-.L802B6224:
-/* E247F4 802B6224 8FBF0010 */  lw        $ra, 0x10($sp)
-/* E247F8 802B6228 03E00008 */  jr        $ra
-/* E247FC 802B622C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/action/18/func_802B6230_E24800.s b/ver/us/asm/nonmatchings/world/action/18/func_802B6230_E24800.s
deleted file mode 100644
index ef01ca33c6..0000000000
--- a/ver/us/asm/nonmatchings/world/action/18/func_802B6230_E24800.s
+++ /dev/null
@@ -1,60 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802B6230_E24800
-/* E24800 802B6230 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* E24804 802B6234 AFB00010 */  sw        $s0, 0x10($sp)
-/* E24808 802B6238 3C108011 */  lui       $s0, %hi(gPlayerStatus)
-/* E2480C 802B623C 2610EFC8 */  addiu     $s0, $s0, %lo(gPlayerStatus)
-/* E24810 802B6240 AFBF0018 */  sw        $ra, 0x18($sp)
-/* E24814 802B6244 AFB10014 */  sw        $s1, 0x14($sp)
-/* E24818 802B6248 8E030000 */  lw        $v1, ($s0)
-/* E2481C 802B624C 0461000A */  bgez      $v1, .L802B6278
-/* E24820 802B6250 0200882D */   daddu    $s1, $s0, $zero
-/* E24824 802B6254 3C027FFF */  lui       $v0, 0x7fff
-/* E24828 802B6258 3442FFFF */  ori       $v0, $v0, 0xffff
-/* E2482C 802B625C 3C04000A */  lui       $a0, 0xa
-/* E24830 802B6260 34840005 */  ori       $a0, $a0, 5
-/* E24834 802B6264 00621024 */  and       $v0, $v1, $v0
-/* E24838 802B6268 0C037FBF */  jal       func_800DFEFC
-/* E2483C 802B626C AE020000 */   sw       $v0, ($s0)
-/* E24840 802B6270 24020008 */  addiu     $v0, $zero, 8
-/* E24844 802B6274 A6020008 */  sh        $v0, 8($s0)
-.L802B6278:
-/* E24848 802B6278 86020008 */  lh        $v0, 8($s0)
-/* E2484C 802B627C 96030008 */  lhu       $v1, 8($s0)
-/* E24850 802B6280 1040000B */  beqz      $v0, .L802B62B0
-/* E24854 802B6284 2462FFFF */   addiu    $v0, $v1, -1
-/* E24858 802B6288 A6020008 */  sh        $v0, 8($s0)
-/* E2485C 802B628C 00021400 */  sll       $v0, $v0, 0x10
-/* E24860 802B6290 00021403 */  sra       $v0, $v0, 0x10
-/* E24864 802B6294 24030004 */  addiu     $v1, $zero, 4
-/* E24868 802B6298 14430012 */  bne       $v0, $v1, .L802B62E4
-/* E2486C 802B629C 00000000 */   nop
-/* E24870 802B62A0 0C039426 */  jal       func_800E5098
-/* E24874 802B62A4 24040001 */   addiu    $a0, $zero, 1
-/* E24878 802B62A8 080AD8B9 */  j         .L802B62E4
-/* E2487C 802B62AC 00000000 */   nop
-.L802B62B0:
-/* E24880 802B62B0 8E020000 */  lw        $v0, ($s0)
-/* E24884 802B62B4 30424000 */  andi      $v0, $v0, 0x4000
-/* E24888 802B62B8 10400008 */  beqz      $v0, .L802B62DC
-/* E2488C 802B62BC 0000202D */   daddu    $a0, $zero, $zero
-/* E24890 802B62C0 C6220054 */  lwc1      $f2, 0x54($s1)
-/* E24894 802B62C4 C620005C */  lwc1      $f0, 0x5c($s1)
-/* E24898 802B62C8 4602003E */  c.le.s    $f0, $f2
-/* E2489C 802B62CC 00000000 */  nop
-/* E248A0 802B62D0 45000002 */  bc1f      .L802B62DC
-/* E248A4 802B62D4 24040001 */   addiu    $a0, $zero, 1
-/* E248A8 802B62D8 24040002 */  addiu     $a0, $zero, 2
-.L802B62DC:
-/* E248AC 802B62DC 0C039769 */  jal       set_action_state
-/* E248B0 802B62E0 00000000 */   nop
-.L802B62E4:
-/* E248B4 802B62E4 8FBF0018 */  lw        $ra, 0x18($sp)
-/* E248B8 802B62E8 8FB10014 */  lw        $s1, 0x14($sp)
-/* E248BC 802B62EC 8FB00010 */  lw        $s0, 0x10($sp)
-/* E248C0 802B62F0 03E00008 */  jr        $ra
-/* E248C4 802B62F4 27BD0020 */   addiu    $sp, $sp, 0x20
-/* E248C8 802B62F8 00000000 */  nop
-/* E248CC 802B62FC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/action/encounter/func_802B6350_E28D80.s b/ver/us/asm/nonmatchings/world/action/encounter/func_802B6350_E28D80.s
deleted file mode 100644
index 0817916a4a..0000000000
--- a/ver/us/asm/nonmatchings/world/action/encounter/func_802B6350_E28D80.s
+++ /dev/null
@@ -1,39 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802B6350_E28D80
-/* E28D80 802B6350 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* E28D84 802B6354 3C048011 */  lui       $a0, %hi(gPlayerStatus)
-/* E28D88 802B6358 2484EFC8 */  addiu     $a0, $a0, %lo(gPlayerStatus)
-/* E28D8C 802B635C AFBF0010 */  sw        $ra, 0x10($sp)
-/* E28D90 802B6360 8C850000 */  lw        $a1, ($a0)
-/* E28D94 802B6364 04A10010 */  bgez      $a1, .L802B63A8
-/* E28D98 802B6368 0080302D */   daddu    $a2, $a0, $zero
-/* E28D9C 802B636C 3C027FF7 */  lui       $v0, 0x7ff7
-/* E28DA0 802B6370 3442FFF1 */  ori       $v0, $v0, 0xfff1
-/* E28DA4 802B6374 8C830004 */  lw        $v1, 4($a0)
-/* E28DA8 802B6378 00A21024 */  and       $v0, $a1, $v0
-/* E28DAC 802B637C AC820000 */  sw        $v0, ($a0)
-/* E28DB0 802B6380 A08000B6 */  sb        $zero, 0xb6($a0)
-/* E28DB4 802B6384 A4800008 */  sh        $zero, 8($a0)
-/* E28DB8 802B6388 A48000C0 */  sh        $zero, 0xc0($a0)
-/* E28DBC 802B638C A48000C2 */  sh        $zero, 0xc2($a0)
-/* E28DC0 802B6390 AC800054 */  sw        $zero, 0x54($a0)
-/* E28DC4 802B6394 30631000 */  andi      $v1, $v1, 0x1000
-/* E28DC8 802B6398 1460000B */  bnez      $v1, .L802B63C8
-/* E28DCC 802B639C AC80008C */   sw       $zero, 0x8c($a0)
-/* E28DD0 802B63A0 24020005 */  addiu     $v0, $zero, 5
-/* E28DD4 802B63A4 A4820008 */  sh        $v0, 8($a0)
-.L802B63A8:
-/* E28DD8 802B63A8 94C20008 */  lhu       $v0, 8($a2)
-/* E28DDC 802B63AC 2442FFFF */  addiu     $v0, $v0, -1
-/* E28DE0 802B63B0 A4C20008 */  sh        $v0, 8($a2)
-/* E28DE4 802B63B4 00021400 */  sll       $v0, $v0, 0x10
-/* E28DE8 802B63B8 14400003 */  bnez      $v0, .L802B63C8
-/* E28DEC 802B63BC 00000000 */   nop
-/* E28DF0 802B63C0 0C039769 */  jal       set_action_state
-/* E28DF4 802B63C4 0000202D */   daddu    $a0, $zero, $zero
-.L802B63C8:
-/* E28DF8 802B63C8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* E28DFC 802B63CC 03E00008 */  jr        $ra
-/* E28E00 802B63D0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/action/encounter/func_802B63D4_E28E04.s b/ver/us/asm/nonmatchings/world/action/encounter/func_802B63D4_E28E04.s
deleted file mode 100644
index 81bd3e138e..0000000000
--- a/ver/us/asm/nonmatchings/world/action/encounter/func_802B63D4_E28E04.s
+++ /dev/null
@@ -1,48 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802B63D4_E28E04
-/* E28E04 802B63D4 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* E28E08 802B63D8 AFB00010 */  sw        $s0, 0x10($sp)
-/* E28E0C 802B63DC 3C108011 */  lui       $s0, %hi(gPlayerStatus)
-/* E28E10 802B63E0 2610EFC8 */  addiu     $s0, $s0, %lo(gPlayerStatus)
-/* E28E14 802B63E4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* E28E18 802B63E8 AFB10014 */  sw        $s1, 0x14($sp)
-/* E28E1C 802B63EC 8E030000 */  lw        $v1, ($s0)
-/* E28E20 802B63F0 0461000F */  bgez      $v1, .L802B6430
-/* E28E24 802B63F4 0200882D */   daddu    $s1, $s0, $zero
-/* E28E28 802B63F8 3C027FFF */  lui       $v0, 0x7fff
-/* E28E2C 802B63FC 3442FFF1 */  ori       $v0, $v0, 0xfff1
-/* E28E30 802B6400 3C040001 */  lui       $a0, 1
-/* E28E34 802B6404 34840017 */  ori       $a0, $a0, 0x17
-/* E28E38 802B6408 00621024 */  and       $v0, $v1, $v0
-/* E28E3C 802B640C AE020000 */  sw        $v0, ($s0)
-/* E28E40 802B6410 A20000B6 */  sb        $zero, 0xb6($s0)
-/* E28E44 802B6414 A60000C0 */  sh        $zero, 0xc0($s0)
-/* E28E48 802B6418 A60000C2 */  sh        $zero, 0xc2($s0)
-/* E28E4C 802B641C AE000054 */  sw        $zero, 0x54($s0)
-/* E28E50 802B6420 0C037FDE */  jal       func_800DFF78
-/* E28E54 802B6424 AE00008C */   sw       $zero, 0x8c($s0)
-/* E28E58 802B6428 2402001E */  addiu     $v0, $zero, 0x1e
-/* E28E5C 802B642C A6020008 */  sh        $v0, 8($s0)
-.L802B6430:
-/* E28E60 802B6430 86220008 */  lh        $v0, 8($s1)
-/* E28E64 802B6434 96230008 */  lhu       $v1, 8($s1)
-/* E28E68 802B6438 10400003 */  beqz      $v0, .L802B6448
-/* E28E6C 802B643C 2462FFFF */   addiu    $v0, $v1, -1
-/* E28E70 802B6440 080AD919 */  j         .L802B6464
-/* E28E74 802B6444 A6220008 */   sh       $v0, 8($s1)
-.L802B6448:
-/* E28E78 802B6448 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* E28E7C 802B644C 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* E28E80 802B6450 80420070 */  lb        $v0, 0x70($v0)
-/* E28E84 802B6454 14400003 */  bnez      $v0, .L802B6464
-/* E28E88 802B6458 00000000 */   nop
-/* E28E8C 802B645C 0C039769 */  jal       set_action_state
-/* E28E90 802B6460 0000202D */   daddu    $a0, $zero, $zero
-.L802B6464:
-/* E28E94 802B6464 8FBF0018 */  lw        $ra, 0x18($sp)
-/* E28E98 802B6468 8FB10014 */  lw        $s1, 0x14($sp)
-/* E28E9C 802B646C 8FB00010 */  lw        $s0, 0x10($sp)
-/* E28EA0 802B6470 03E00008 */  jr        $ra
-/* E28EA4 802B6474 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/action/encounter/func_802B6478_E28EA8.s b/ver/us/asm/nonmatchings/world/action/encounter/func_802B6478_E28EA8.s
deleted file mode 100644
index f51278ccbd..0000000000
--- a/ver/us/asm/nonmatchings/world/action/encounter/func_802B6478_E28EA8.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802B6478_E28EA8
-/* E28EA8 802B6478 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* E28EAC 802B647C 3C058011 */  lui       $a1, %hi(gPlayerStatus)
-/* E28EB0 802B6480 24A5EFC8 */  addiu     $a1, $a1, %lo(gPlayerStatus)
-/* E28EB4 802B6484 AFBF0014 */  sw        $ra, 0x14($sp)
-/* E28EB8 802B6488 AFB00010 */  sw        $s0, 0x10($sp)
-/* E28EBC 802B648C 8CA20000 */  lw        $v0, ($a1)
-/* E28EC0 802B6490 0441000E */  bgez      $v0, .L802B64CC
-/* E28EC4 802B6494 00A0802D */   daddu    $s0, $a1, $zero
-/* E28EC8 802B6498 3C037FFF */  lui       $v1, 0x7fff
-/* E28ECC 802B649C 3463FFFF */  ori       $v1, $v1, 0xffff
-/* E28ED0 802B64A0 3C040001 */  lui       $a0, 1
-/* E28ED4 802B64A4 3484001F */  ori       $a0, $a0, 0x1f
-/* E28ED8 802B64A8 00431824 */  and       $v1, $v0, $v1
-/* E28EDC 802B64AC 3C020008 */  lui       $v0, 8
-/* E28EE0 802B64B0 00621825 */  or        $v1, $v1, $v0
-/* E28EE4 802B64B4 ACA30000 */  sw        $v1, ($a1)
-/* E28EE8 802B64B8 A4A00008 */  sh        $zero, 8($a1)
-/* E28EEC 802B64BC A0A000B6 */  sb        $zero, 0xb6($a1)
-/* E28EF0 802B64C0 ACA00054 */  sw        $zero, 0x54($a1)
-/* E28EF4 802B64C4 0C037FDE */  jal       func_800DFF78
-/* E28EF8 802B64C8 ACA0008C */   sw       $zero, 0x8c($a1)
-.L802B64CC:
-/* E28EFC 802B64CC 8E020004 */  lw        $v0, 4($s0)
-/* E28F00 802B64D0 30420200 */  andi      $v0, $v0, 0x200
-/* E28F04 802B64D4 14400008 */  bnez      $v0, .L802B64F8
-/* E28F08 802B64D8 00000000 */   nop
-/* E28F0C 802B64DC 0C039769 */  jal       set_action_state
-/* E28F10 802B64E0 0000202D */   daddu    $a0, $zero, $zero
-/* E28F14 802B64E4 3C03FFF7 */  lui       $v1, 0xfff7
-/* E28F18 802B64E8 8E020000 */  lw        $v0, ($s0)
-/* E28F1C 802B64EC 3463FFFF */  ori       $v1, $v1, 0xffff
-/* E28F20 802B64F0 00431024 */  and       $v0, $v0, $v1
-/* E28F24 802B64F4 AE020000 */  sw        $v0, ($s0)
-.L802B64F8:
-/* E28F28 802B64F8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* E28F2C 802B64FC 8FB00010 */  lw        $s0, 0x10($sp)
-/* E28F30 802B6500 03E00008 */  jr        $ra
-/* E28F34 802B6504 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/action/encounter/func_802B6508_E28F38.s b/ver/us/asm/nonmatchings/world/action/encounter/func_802B6508_E28F38.s
deleted file mode 100644
index 14886b8f30..0000000000
--- a/ver/us/asm/nonmatchings/world/action/encounter/func_802B6508_E28F38.s
+++ /dev/null
@@ -1,85 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802B6508_E28F38
-/* E28F38 802B6508 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* E28F3C 802B650C AFB00018 */  sw        $s0, 0x18($sp)
-/* E28F40 802B6510 3C108011 */  lui       $s0, %hi(gPlayerStatus)
-/* E28F44 802B6514 2610EFC8 */  addiu     $s0, $s0, %lo(gPlayerStatus)
-/* E28F48 802B6518 AFBF001C */  sw        $ra, 0x1c($sp)
-/* E28F4C 802B651C 8E030000 */  lw        $v1, ($s0)
-/* E28F50 802B6520 04610030 */  bgez      $v1, .L802B65E4
-/* E28F54 802B6524 3C027FFF */   lui      $v0, 0x7fff
-/* E28F58 802B6528 3442FFFF */  ori       $v0, $v0, 0xffff
-/* E28F5C 802B652C 27A40010 */  addiu     $a0, $sp, 0x10
-/* E28F60 802B6530 00621024 */  and       $v0, $v1, $v0
-/* E28F64 802B6534 AE020000 */  sw        $v0, ($s0)
-/* E28F68 802B6538 24020005 */  addiu     $v0, $zero, 5
-/* E28F6C 802B653C 27A50014 */  addiu     $a1, $sp, 0x14
-/* E28F70 802B6540 AE000054 */  sw        $zero, 0x54($s0)
-/* E28F74 802B6544 AE000060 */  sw        $zero, 0x60($s0)
-/* E28F78 802B6548 0C0388C1 */  jal       input_to_move_vector
-/* E28F7C 802B654C A6020008 */   sh       $v0, 8($s0)
-/* E28F80 802B6550 C7A20010 */  lwc1      $f2, 0x10($sp)
-/* E28F84 802B6554 3C014234 */  lui       $at, 0x4234
-/* E28F88 802B6558 44810000 */  mtc1      $at, $f0
-/* E28F8C 802B655C 00000000 */  nop
-/* E28F90 802B6560 4602003E */  c.le.s    $f0, $f2
-/* E28F94 802B6564 00000000 */  nop
-/* E28F98 802B6568 45000008 */  bc1f      .L802B658C
-/* E28F9C 802B656C 00000000 */   nop
-/* E28FA0 802B6570 3C014307 */  lui       $at, 0x4307
-/* E28FA4 802B6574 44810000 */  mtc1      $at, $f0
-/* E28FA8 802B6578 00000000 */  nop
-/* E28FAC 802B657C 4600103E */  c.le.s    $f2, $f0
-/* E28FB0 802B6580 00000000 */  nop
-/* E28FB4 802B6584 45010011 */  bc1t      .L802B65CC
-/* E28FB8 802B6588 3C040008 */   lui      $a0, 8
-.L802B658C:
-/* E28FBC 802B658C 3C014361 */  lui       $at, 0x4361
-/* E28FC0 802B6590 44810000 */  mtc1      $at, $f0
-/* E28FC4 802B6594 00000000 */  nop
-/* E28FC8 802B6598 4602003E */  c.le.s    $f0, $f2
-/* E28FCC 802B659C 00000000 */  nop
-/* E28FD0 802B65A0 4500000E */  bc1f      .L802B65DC
-/* E28FD4 802B65A4 3C040006 */   lui      $a0, 6
-/* E28FD8 802B65A8 3C01439D */  lui       $at, 0x439d
-/* E28FDC 802B65AC 34218000 */  ori       $at, $at, 0x8000
-/* E28FE0 802B65B0 44810000 */  mtc1      $at, $f0
-/* E28FE4 802B65B4 00000000 */  nop
-/* E28FE8 802B65B8 4600103E */  c.le.s    $f2, $f0
-/* E28FEC 802B65BC 00000000 */  nop
-/* E28FF0 802B65C0 45000006 */  bc1f      .L802B65DC
-/* E28FF4 802B65C4 00000000 */   nop
-/* E28FF8 802B65C8 3C040008 */  lui       $a0, 8
-.L802B65CC:
-/* E28FFC 802B65CC 0C037FDE */  jal       func_800DFF78
-/* E29000 802B65D0 34840020 */   ori      $a0, $a0, 0x20
-/* E29004 802B65D4 080AD979 */  j         .L802B65E4
-/* E29008 802B65D8 00000000 */   nop
-.L802B65DC:
-/* E2900C 802B65DC 0C037FBF */  jal       func_800DFEFC
-/* E29010 802B65E0 34840004 */   ori      $a0, $a0, 4
-.L802B65E4:
-/* E29014 802B65E4 0C039858 */  jal       check_input_jump
-/* E29018 802B65E8 00000000 */   nop
-/* E2901C 802B65EC 8E020004 */  lw        $v0, 4($s0)
-/* E29020 802B65F0 3C030080 */  lui       $v1, 0x80
-/* E29024 802B65F4 00431024 */  and       $v0, $v0, $v1
-/* E29028 802B65F8 1040000B */  beqz      $v0, .L802B6628
-/* E2902C 802B65FC 00000000 */   nop
-/* E29030 802B6600 86020008 */  lh        $v0, 8($s0)
-/* E29034 802B6604 96030008 */  lhu       $v1, 8($s0)
-/* E29038 802B6608 10400007 */  beqz      $v0, .L802B6628
-/* E2903C 802B660C 2462FFFF */   addiu    $v0, $v1, -1
-/* E29040 802B6610 A6020008 */  sh        $v0, 8($s0)
-/* E29044 802B6614 00021400 */  sll       $v0, $v0, 0x10
-/* E29048 802B6618 14400003 */  bnez      $v0, .L802B6628
-/* E2904C 802B661C 00000000 */   nop
-/* E29050 802B6620 0C039769 */  jal       set_action_state
-/* E29054 802B6624 0000202D */   daddu    $a0, $zero, $zero
-.L802B6628:
-/* E29058 802B6628 8FBF001C */  lw        $ra, 0x1c($sp)
-/* E2905C 802B662C 8FB00018 */  lw        $s0, 0x18($sp)
-/* E29060 802B6630 03E00008 */  jr        $ra
-/* E29064 802B6634 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/action/encounter/func_802B6638_E29068.s b/ver/us/asm/nonmatchings/world/action/encounter/func_802B6638_E29068.s
deleted file mode 100644
index e5e588c2d1..0000000000
--- a/ver/us/asm/nonmatchings/world/action/encounter/func_802B6638_E29068.s
+++ /dev/null
@@ -1,85 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802B6638_E29068
-/* E29068 802B6638 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* E2906C 802B663C AFB00010 */  sw        $s0, 0x10($sp)
-/* E29070 802B6640 3C108011 */  lui       $s0, %hi(gPlayerStatus)
-/* E29074 802B6644 2610EFC8 */  addiu     $s0, $s0, %lo(gPlayerStatus)
-/* E29078 802B6648 AFBF0014 */  sw        $ra, 0x14($sp)
-/* E2907C 802B664C 8E030000 */  lw        $v1, ($s0)
-/* E29080 802B6650 04610023 */  bgez      $v1, .L802B66E0
-/* E29084 802B6654 3C027FFF */   lui      $v0, 0x7fff
-/* E29088 802B6658 3442FFFF */  ori       $v0, $v0, 0xffff
-/* E2908C 802B665C 8E040004 */  lw        $a0, 4($s0)
-/* E29090 802B6660 00621024 */  and       $v0, $v1, $v0
-/* E29094 802B6664 AE020000 */  sw        $v0, ($s0)
-/* E29098 802B6668 AE000054 */  sw        $zero, 0x54($s0)
-/* E2909C 802B666C 30821000 */  andi      $v0, $a0, 0x1000
-/* E290A0 802B6670 14400006 */  bnez      $v0, .L802B668C
-/* E290A4 802B6674 AE000060 */   sw       $zero, 0x60($s0)
-/* E290A8 802B6678 3C040008 */  lui       $a0, 8
-/* E290AC 802B667C 0C037FDE */  jal       func_800DFF78
-/* E290B0 802B6680 34840007 */   ori      $a0, $a0, 7
-/* E290B4 802B6684 080AD9B7 */  j         .L802B66DC
-/* E290B8 802B6688 2402001E */   addiu    $v0, $zero, 0x1e
-.L802B668C:
-/* E290BC 802B668C 820200C4 */  lb        $v0, 0xc4($s0)
-/* E290C0 802B6690 14400012 */  bnez      $v0, .L802B66DC
-/* E290C4 802B6694 2402001E */   addiu    $v0, $zero, 0x1e
-/* E290C8 802B6698 30822000 */  andi      $v0, $a0, 0x2000
-/* E290CC 802B669C 14400005 */  bnez      $v0, .L802B66B4
-/* E290D0 802B66A0 00000000 */   nop
-/* E290D4 802B66A4 0C037FDE */  jal       func_800DFF78
-/* E290D8 802B66A8 3C04000C */   lui      $a0, 0xc
-/* E290DC 802B66AC 080AD9B7 */  j         .L802B66DC
-/* E290E0 802B66B0 2402001E */   addiu    $v0, $zero, 0x1e
-.L802B66B4:
-/* E290E4 802B66B4 8203000C */  lb        $v1, 0xc($s0)
-/* E290E8 802B66B8 00031040 */  sll       $v0, $v1, 1
-/* E290EC 802B66BC 00431021 */  addu      $v0, $v0, $v1
-/* E290F0 802B66C0 000210C0 */  sll       $v0, $v0, 3
-/* E290F4 802B66C4 3C04800F */  lui       $a0, %hi(world_actions_peachDisguises+0xC)
-/* E290F8 802B66C8 00822021 */  addu      $a0, $a0, $v0
-/* E290FC 802B66CC 8C847C28 */  lw        $a0, %lo(world_actions_peachDisguises+0xC)($a0)
-/* E29100 802B66D0 0C0398DB */  jal       func_800E636C
-/* E29104 802B66D4 00000000 */   nop
-/* E29108 802B66D8 2402001E */  addiu     $v0, $zero, 0x1e
-.L802B66DC:
-/* E2910C 802B66DC A6020008 */  sh        $v0, 8($s0)
-.L802B66E0:
-/* E29110 802B66E0 8E040004 */  lw        $a0, 4($s0)
-/* E29114 802B66E4 30821000 */  andi      $v0, $a0, 0x1000
-/* E29118 802B66E8 10400019 */  beqz      $v0, .L802B6750
-/* E2911C 802B66EC 00000000 */   nop
-/* E29120 802B66F0 86020008 */  lh        $v0, 8($s0)
-/* E29124 802B66F4 96030008 */  lhu       $v1, 8($s0)
-/* E29128 802B66F8 10400003 */  beqz      $v0, .L802B6708
-/* E2912C 802B66FC 2462FFFF */   addiu    $v0, $v1, -1
-/* E29130 802B6700 080AD9D4 */  j         .L802B6750
-/* E29134 802B6704 A6020008 */   sh       $v0, 8($s0)
-.L802B6708:
-/* E29138 802B6708 820200C4 */  lb        $v0, 0xc4($s0)
-/* E2913C 802B670C 14400010 */  bnez      $v0, .L802B6750
-/* E29140 802B6710 30822000 */   andi     $v0, $a0, 0x2000
-/* E29144 802B6714 14400005 */  bnez      $v0, .L802B672C
-/* E29148 802B6718 3C04000A */   lui      $a0, 0xa
-/* E2914C 802B671C 0C037FDE */  jal       func_800DFF78
-/* E29150 802B6720 34840001 */   ori      $a0, $a0, 1
-/* E29154 802B6724 080AD9D4 */  j         .L802B6750
-/* E29158 802B6728 00000000 */   nop
-.L802B672C:
-/* E2915C 802B672C 8203000C */  lb        $v1, 0xc($s0)
-/* E29160 802B6730 00031040 */  sll       $v0, $v1, 1
-/* E29164 802B6734 00431021 */  addu      $v0, $v0, $v1
-/* E29168 802B6738 000210C0 */  sll       $v0, $v0, 3
-/* E2916C 802B673C 3C04800F */  lui       $a0, %hi(world_actions_peachDisguises)
-/* E29170 802B6740 00822021 */  addu      $a0, $a0, $v0
-/* E29174 802B6744 8C847C1C */  lw        $a0, %lo(world_actions_peachDisguises)($a0)
-/* E29178 802B6748 0C0398DB */  jal       func_800E636C
-/* E2917C 802B674C 00000000 */   nop
-.L802B6750:
-/* E29180 802B6750 8FBF0014 */  lw        $ra, 0x14($sp)
-/* E29184 802B6754 8FB00010 */  lw        $s0, 0x10($sp)
-/* E29188 802B6758 03E00008 */  jr        $ra
-/* E2918C 802B675C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/action/hammer/func_802B6000_E24ED0.s b/ver/us/asm/nonmatchings/world/action/hammer/func_802B6000_E24ED0.s
deleted file mode 100644
index 7de3659267..0000000000
--- a/ver/us/asm/nonmatchings/world/action/hammer/func_802B6000_E24ED0.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802B6000_E24ED0
-/* E24ED0 802B6000 3C020100 */  lui       $v0, 0x100
-/* E24ED4 802B6004 00821024 */  and       $v0, $a0, $v0
-/* E24ED8 802B6008 10400003 */  beqz      $v0, .L802B6018
-/* E24EDC 802B600C 3C02FFF9 */   lui      $v0, 0xfff9
-/* E24EE0 802B6010 03E00008 */  jr        $ra
-/* E24EE4 802B6014 24020001 */   addiu    $v0, $zero, 1
-.L802B6018:
-/* E24EE8 802B6018 3442FFEF */  ori       $v0, $v0, 0xffef
-/* E24EEC 802B601C 00822021 */  addu      $a0, $a0, $v0
-/* E24EF0 802B6020 2C82000B */  sltiu     $v0, $a0, 0xb
-/* E24EF4 802B6024 10400006 */  beqz      $v0, .L802B6040
-/* E24EF8 802B6028 00041080 */   sll      $v0, $a0, 2
-/* E24EFC 802B602C 3C01802B */  lui       $at, %hi(D_802B6DC0_E25C90)
-/* E24F00 802B6030 00220821 */  addu      $at, $at, $v0
-/* E24F04 802B6034 8C226DC0 */  lw        $v0, %lo(D_802B6DC0_E25C90)($at)
-/* E24F08 802B6038 00400008 */  jr        $v0
-/* E24F0C 802B603C 00000000 */   nop
-.L802B6040:
-/* E24F10 802B6040 03E00008 */  jr        $ra
-/* E24F14 802B6044 0000102D */   daddu    $v0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/action/hammer/func_802B6048_E24F18.s b/ver/us/asm/nonmatchings/world/action/hammer/func_802B6048_E24F18.s
deleted file mode 100644
index 9796401950..0000000000
--- a/ver/us/asm/nonmatchings/world/action/hammer/func_802B6048_E24F18.s
+++ /dev/null
@@ -1,174 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-glabel jtbl_802B6DF0_E25CC0
-.word L802B6230_E25100, L802B6238_E25108, L802B6240_E25110, L802B6248_E25118, L802B6250_E25120, L802B6258_E25128
-
-.section .text
-
-glabel func_802B6048_E24F18
-/* E24F18 802B6048 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* E24F1C 802B604C AFB3002C */  sw        $s3, 0x2c($sp)
-/* E24F20 802B6050 AFB40030 */  sw        $s4, 0x30($sp)
-/* E24F24 802B6054 3C148011 */  lui       $s4, %hi(gPlayerStatus)
-/* E24F28 802B6058 2694EFC8 */  addiu     $s4, $s4, %lo(gPlayerStatus)
-/* E24F2C 802B605C 3C038011 */  lui       $v1, %hi(gPlayerData+0x1)
-/* E24F30 802B6060 8063F291 */  lb        $v1, %lo(gPlayerData+0x1)($v1)
-/* E24F34 802B6064 24020002 */  addiu     $v0, $zero, 2
-/* E24F38 802B6068 AFBF0034 */  sw        $ra, 0x34($sp)
-/* E24F3C 802B606C AFB20028 */  sw        $s2, 0x28($sp)
-/* E24F40 802B6070 AFB10024 */  sw        $s1, 0x24($sp)
-/* E24F44 802B6074 AFB00020 */  sw        $s0, 0x20($sp)
-/* E24F48 802B6078 F7BA0050 */  sdc1      $f26, 0x50($sp)
-/* E24F4C 802B607C F7B80048 */  sdc1      $f24, 0x48($sp)
-/* E24F50 802B6080 F7B60040 */  sdc1      $f22, 0x40($sp)
-/* E24F54 802B6084 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* E24F58 802B6088 14620008 */  bne       $v1, $v0, .L802B60AC
-/* E24F5C 802B608C 0080982D */   daddu    $s3, $a0, $zero
-/* E24F60 802B6090 3C013F99 */  lui       $at, 0x3f99
-/* E24F64 802B6094 3421999A */  ori       $at, $at, 0x999a
-/* E24F68 802B6098 4481C000 */  mtc1      $at, $f24
-/* E24F6C 802B609C 24120001 */  addiu     $s2, $zero, 1
-/* E24F70 802B60A0 2411001C */  addiu     $s1, $zero, 0x1c
-/* E24F74 802B60A4 080AD83A */  j         .L802B60E8
-/* E24F78 802B60A8 2410211A */   addiu    $s0, $zero, 0x211a
-.L802B60AC:
-/* E24F7C 802B60AC 24020001 */  addiu     $v0, $zero, 1
-/* E24F80 802B60B0 14620008 */  bne       $v1, $v0, .L802B60D4
-/* E24F84 802B60B4 24120001 */   addiu    $s2, $zero, 1
-/* E24F88 802B60B8 3C013F4C */  lui       $at, 0x3f4c
-/* E24F8C 802B60BC 3421CCCD */  ori       $at, $at, 0xcccd
-/* E24F90 802B60C0 4481C000 */  mtc1      $at, $f24
-/* E24F94 802B60C4 0040902D */  daddu     $s2, $v0, $zero
-/* E24F98 802B60C8 24110010 */  addiu     $s1, $zero, 0x10
-/* E24F9C 802B60CC 080AD83A */  j         .L802B60E8
-/* E24FA0 802B60D0 24102119 */   addiu    $s0, $zero, 0x2119
-.L802B60D4:
-/* E24FA4 802B60D4 3C013ECC */  lui       $at, 0x3ecc
-/* E24FA8 802B60D8 3421CCCD */  ori       $at, $at, 0xcccd
-/* E24FAC 802B60DC 4481C000 */  mtc1      $at, $f24
-/* E24FB0 802B60E0 24110004 */  addiu     $s1, $zero, 4
-/* E24FB4 802B60E4 24102118 */  addiu     $s0, $zero, 0x2118
-.L802B60E8:
-/* E24FB8 802B60E8 0C0394D2 */  jal       func_800E5348
-/* E24FBC 802B60EC 00000000 */   nop
-/* E24FC0 802B60F0 3C0140C9 */  lui       $at, 0x40c9
-/* E24FC4 802B60F4 34210FD0 */  ori       $at, $at, 0xfd0
-/* E24FC8 802B60F8 44811000 */  mtc1      $at, $f2
-/* E24FCC 802B60FC 00000000 */  nop
-/* E24FD0 802B6100 46020502 */  mul.s     $f20, $f0, $f2
-/* E24FD4 802B6104 00000000 */  nop
-/* E24FD8 802B6108 3C0143B4 */  lui       $at, 0x43b4
-/* E24FDC 802B610C 44810000 */  mtc1      $at, $f0
-/* E24FE0 802B6110 00000000 */  nop
-/* E24FE4 802B6114 4600A503 */  div.s     $f20, $f20, $f0
-/* E24FE8 802B6118 0C00A85B */  jal       sin_rad
-/* E24FEC 802B611C 4600A306 */   mov.s    $f12, $f20
-/* E24FF0 802B6120 3C0141C8 */  lui       $at, 0x41c8
-/* E24FF4 802B6124 44811000 */  mtc1      $at, $f2
-/* E24FF8 802B6128 00000000 */  nop
-/* E24FFC 802B612C 46020582 */  mul.s     $f22, $f0, $f2
-/* E25000 802B6130 00000000 */  nop
-/* E25004 802B6134 0C00A874 */  jal       cos_rad
-/* E25008 802B6138 4600A306 */   mov.s    $f12, $f20
-/* E2500C 802B613C 3C01C1C8 */  lui       $at, 0xc1c8
-/* E25010 802B6140 44811000 */  mtc1      $at, $f2
-/* E25014 802B6144 00000000 */  nop
-/* E25018 802B6148 46020082 */  mul.s     $f2, $f0, $f2
-/* E2501C 802B614C 00000000 */  nop
-/* E25020 802B6150 06610008 */  bgez      $s3, .L802B6174
-/* E25024 802B6154 24130003 */   addiu    $s3, $zero, 3
-/* E25028 802B6158 C6800028 */  lwc1      $f0, 0x28($s4)
-/* E2502C 802B615C 24130006 */  addiu     $s3, $zero, 6
-/* E25030 802B6160 46160680 */  add.s     $f26, $f0, $f22
-/* E25034 802B6164 C6800030 */  lwc1      $f0, 0x30($s4)
-/* E25038 802B6168 C694002C */  lwc1      $f20, 0x2c($s4)
-/* E2503C 802B616C 080AD86D */  j         .L802B61B4
-/* E25040 802B6170 46020580 */   add.s    $f22, $f0, $f2
-.L802B6174:
-/* E25044 802B6174 3C02802B */  lui       $v0, %hi(D_802B6DB0_E25C80)
-/* E25048 802B6178 8C426DB0 */  lw        $v0, %lo(D_802B6DB0_E25C80)($v0)
-/* E2504C 802B617C C4400000 */  lwc1      $f0, ($v0)
-/* E25050 802B6180 46160680 */  add.s     $f26, $f0, $f22
-/* E25054 802B6184 C4400008 */  lwc1      $f0, 8($v0)
-/* E25058 802B6188 868300B0 */  lh        $v1, 0xb0($s4)
-/* E2505C 802B618C 46020580 */  add.s     $f22, $f0, $f2
-/* E25060 802B6190 C4420004 */  lwc1      $f2, 4($v0)
-/* E25064 802B6194 44830000 */  mtc1      $v1, $f0
-/* E25068 802B6198 00000000 */  nop
-/* E2506C 802B619C 46800020 */  cvt.s.w   $f0, $f0
-/* E25070 802B61A0 46001080 */  add.s     $f2, $f2, $f0
-/* E25074 802B61A4 3C0140A0 */  lui       $at, 0x40a0
-/* E25078 802B61A8 44810000 */  mtc1      $at, $f0
-/* E2507C 802B61AC 24110001 */  addiu     $s1, $zero, 1
-/* E25080 802B61B0 46001501 */  sub.s     $f20, $f2, $f0
-.L802B61B4:
-/* E25084 802B61B4 0000202D */  daddu     $a0, $zero, $zero
-/* E25088 802B61B8 24050002 */  addiu     $a1, $zero, 2
-/* E2508C 802B61BC 4407C000 */  mfc1      $a3, $f24
-/* E25090 802B61C0 0C0B2D72 */  jal       exec_ShakeCamX
-/* E25094 802B61C4 0240302D */   daddu    $a2, $s2, $zero
-/* E25098 802B61C8 0000202D */  daddu     $a0, $zero, $zero
-/* E2509C 802B61CC 44910000 */  mtc1      $s1, $f0
-/* E250A0 802B61D0 00000000 */  nop
-/* E250A4 802B61D4 46800020 */  cvt.s.w   $f0, $f0
-/* E250A8 802B61D8 26430003 */  addiu     $v1, $s2, 3
-/* E250AC 802B61DC 00031040 */  sll       $v0, $v1, 1
-/* E250B0 802B61E0 4405D000 */  mfc1      $a1, $f26
-/* E250B4 802B61E4 4406A000 */  mfc1      $a2, $f20
-/* E250B8 802B61E8 4407B000 */  mfc1      $a3, $f22
-/* E250BC 802B61EC 00431021 */  addu      $v0, $v0, $v1
-/* E250C0 802B61F0 E7A00010 */  swc1      $f0, 0x10($sp)
-/* E250C4 802B61F4 AFB30014 */  sw        $s3, 0x14($sp)
-/* E250C8 802B61F8 AFA00018 */  sw        $zero, 0x18($sp)
-/* E250CC 802B61FC 0C01C0DC */  jal       func_80070370
-/* E250D0 802B6200 AFA2001C */   sw       $v0, 0x1c($sp)
-/* E250D4 802B6204 0C03A752 */  jal       is_ability_active
-/* E250D8 802B6208 2404000F */   addiu    $a0, $zero, 0xf
-/* E250DC 802B620C 2443FFFF */  addiu     $v1, $v0, -1
-/* E250E0 802B6210 2C620006 */  sltiu     $v0, $v1, 6
-/* E250E4 802B6214 10400011 */  beqz      $v0, .L802B625C
-/* E250E8 802B6218 00031080 */   sll      $v0, $v1, 2
-/* E250EC 802B621C 3C01802B */  lui       $at, %hi(jtbl_802B6DF0_E25CC0)
-/* E250F0 802B6220 00220821 */  addu      $at, $at, $v0
-/* E250F4 802B6224 8C226DF0 */  lw        $v0, %lo(jtbl_802B6DF0_E25CC0)($at)
-/* E250F8 802B6228 00400008 */  jr        $v0
-/* E250FC 802B622C 00000000 */   nop
-glabel L802B6230_E25100
-/* E25100 802B6230 080AD897 */  j         .L802B625C
-/* E25104 802B6234 24100372 */   addiu    $s0, $zero, 0x372
-glabel L802B6238_E25108
-/* E25108 802B6238 080AD897 */  j         .L802B625C
-/* E2510C 802B623C 241000F1 */   addiu    $s0, $zero, 0xf1
-glabel L802B6240_E25110
-/* E25110 802B6240 080AD897 */  j         .L802B625C
-/* E25114 802B6244 241000DC */   addiu    $s0, $zero, 0xdc
-glabel L802B6248_E25118
-/* E25118 802B6248 080AD897 */  j         .L802B625C
-/* E2511C 802B624C 24102072 */   addiu    $s0, $zero, 0x2072
-glabel L802B6250_E25120
-/* E25120 802B6250 080AD897 */  j         .L802B625C
-/* E25124 802B6254 24102073 */   addiu    $s0, $zero, 0x2073
-glabel L802B6258_E25128
-/* E25128 802B6258 2410205B */  addiu     $s0, $zero, 0x205b
-.L802B625C:
-/* E2512C 802B625C 0200202D */  daddu     $a0, $s0, $zero
-/* E25130 802B6260 0C052736 */  jal       sfx_play_sound_at_player
-/* E25134 802B6264 0000282D */   daddu    $a1, $zero, $zero
-/* E25138 802B6268 24040100 */  addiu     $a0, $zero, 0x100
-/* E2513C 802B626C 0C00A3C2 */  jal       start_rumble
-/* E25140 802B6270 24050032 */   addiu    $a1, $zero, 0x32
-/* E25144 802B6274 8FBF0034 */  lw        $ra, 0x34($sp)
-/* E25148 802B6278 8FB40030 */  lw        $s4, 0x30($sp)
-/* E2514C 802B627C 8FB3002C */  lw        $s3, 0x2c($sp)
-/* E25150 802B6280 8FB20028 */  lw        $s2, 0x28($sp)
-/* E25154 802B6284 8FB10024 */  lw        $s1, 0x24($sp)
-/* E25158 802B6288 8FB00020 */  lw        $s0, 0x20($sp)
-/* E2515C 802B628C D7BA0050 */  ldc1      $f26, 0x50($sp)
-/* E25160 802B6290 D7B80048 */  ldc1      $f24, 0x48($sp)
-/* E25164 802B6294 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* E25168 802B6298 D7B40038 */  ldc1      $f20, 0x38($sp)
-/* E2516C 802B629C 03E00008 */  jr        $ra
-/* E25170 802B62A0 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3F740/func_80240000_A3F740.s b/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3F740/func_80240000_A3F740.s
deleted file mode 100644
index f53bb66d93..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3F740/func_80240000_A3F740.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_A3F740
-/* A3F740 80240000 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* A3F744 80240004 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* A3F748 80240008 24020002 */  addiu     $v0, $zero, 2
-/* A3F74C 8024000C A0620084 */  sb        $v0, 0x84($v1)
-/* A3F750 80240010 03E00008 */  jr        $ra
-/* A3F754 80240014 0000102D */   daddu    $v0, $zero, $zero
-/* A3F758 80240018 00000000 */  nop
-/* A3F75C 8024001C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80241170_B291A0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80241170_B291A0.s
deleted file mode 100644
index 9da4b2cd6c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80241170_B291A0.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241170_B291A0
-/* B291A0 80241170 3C03800B */  lui       $v1, %hi(gCameras)
-/* B291A4 80241174 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* B291A8 80241178 94620000 */  lhu       $v0, ($v1)
-/* B291AC 8024117C 3042EFFF */  andi      $v0, $v0, 0xefff
-/* B291B0 80241180 A4620000 */  sh        $v0, ($v1)
-/* B291B4 80241184 03E00008 */  jr        $ra
-/* B291B8 80241188 24020002 */   addiu    $v0, $zero, 2
-/* B291BC 8024118C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240FC4_B85144.s b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240FC4_B85144.s
deleted file mode 100644
index c0ebdd95c4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240FC4_B85144.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240FC4_B85144
-/* B85144 80240FC4 3C03800B */  lui       $v1, %hi(gCameras)
-/* B85148 80240FC8 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* B8514C 80240FCC 94620000 */  lhu       $v0, ($v1)
-/* B85150 80240FD0 3042EFFF */  andi      $v0, $v0, 0xefff
-/* B85154 80240FD4 A4620000 */  sh        $v0, ($v1)
-/* B85158 80240FD8 03E00008 */  jr        $ra
-/* B8515C 80240FDC 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_03/AC9710/func_80240000_AC9710.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_03/AC9710/func_80240000_AC9710.s
deleted file mode 100644
index 602d080e65..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_03/AC9710/func_80240000_AC9710.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_AC9710
-/* AC9710 80240000 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* AC9714 80240004 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* AC9718 80240008 24020002 */  addiu     $v0, $zero, 2
-/* AC971C 8024000C A0620084 */  sb        $v0, 0x84($v1)
-/* AC9720 80240010 03E00008 */  jr        $ra
-/* AC9724 80240014 0000102D */   daddu    $v0, $zero, $zero
-/* AC9728 80240018 00000000 */  nop
-/* AC972C 8024001C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_13/AD5ED0/func_80240000_AD5ED0.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_13/AD5ED0/func_80240000_AD5ED0.s
deleted file mode 100644
index 27d784cc2e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_13/AD5ED0/func_80240000_AD5ED0.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_AD5ED0
-/* AD5ED0 80240000 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* AD5ED4 80240004 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* AD5ED8 80240008 24020002 */  addiu     $v0, $zero, 2
-/* AD5EDC 8024000C A0620084 */  sb        $v0, 0x84($v1)
-/* AD5EE0 80240010 03E00008 */  jr        $ra
-/* AD5EE4 80240014 0000102D */   daddu    $v0, $zero, $zero
-/* AD5EE8 80240018 00000000 */  nop
-/* AD5EEC 8024001C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B02880/func_80240000_B02880.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B02880/func_80240000_B02880.s
deleted file mode 100644
index 24603063de..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B02880/func_80240000_B02880.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_B02880
-/* B02880 80240000 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* B02884 80240004 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* B02888 80240008 24020002 */  addiu     $v0, $zero, 2
-/* B0288C 8024000C A0620084 */  sb        $v0, 0x84($v1)
-/* B02890 80240010 03E00008 */  jr        $ra
-/* B02894 80240014 0000102D */   daddu    $v0, $zero, $zero
-/* B02898 80240018 00000000 */  nop
-/* B0289C 8024001C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06A00/func_80240000_B06A00.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06A00/func_80240000_B06A00.s
deleted file mode 100644
index 81f8ec4f9c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06A00/func_80240000_B06A00.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_B06A00
-/* B06A00 80240000 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* B06A04 80240004 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* B06A08 80240008 24020002 */  addiu     $v0, $zero, 2
-/* B06A0C 8024000C A0620084 */  sb        $v0, 0x84($v1)
-/* B06A10 80240010 03E00008 */  jr        $ra
-/* B06A14 80240014 0000102D */   daddu    $v0, $zero, $zero
-/* B06A18 80240018 00000000 */  nop
-/* B06A1C 8024001C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_18/C8C3F0/func_8024036C_C8C40C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_18/C8C3F0/func_8024036C_C8C40C.s
deleted file mode 100644
index 790947be76..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_18/C8C3F0/func_8024036C_C8C40C.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024036C_C8C40C
-/* C8C40C 8024036C 3C03800B */  lui       $v1, %hi(gCameras)
-/* C8C410 80240370 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* C8C414 80240374 94620000 */  lhu       $v0, ($v1)
-/* C8C418 80240378 3042EFFF */  andi      $v0, $v0, 0xefff
-/* C8C41C 8024037C A4620000 */  sh        $v0, ($v1)
-/* C8C420 80240380 03E00008 */  jr        $ra
-/* C8C424 80240384 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAAE0/func_8024030C_9FAAFC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAAE0/func_8024030C_9FAAFC.s
deleted file mode 100644
index 80a6134648..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAAE0/func_8024030C_9FAAFC.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024030C_9FAAFC
-/* 9FAAFC 8024030C 3C03800B */  lui       $v1, %hi(gCameras)
-/* 9FAB00 80240310 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* 9FAB04 80240314 94620000 */  lhu       $v0, ($v1)
-/* 9FAB08 80240318 3042EFFF */  andi      $v0, $v0, 0xefff
-/* 9FAB0C 8024031C A4620000 */  sh        $v0, ($v1)
-/* 9FAB10 80240320 03E00008 */  jr        $ra
-/* 9FAB14 80240324 24020002 */   addiu    $v0, $zero, 2
-/* 9FAB18 80240328 00000000 */  nop
-/* 9FAB1C 8024032C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A029C0/func_8024019C_A029DC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A029C0/func_8024019C_A029DC.s
deleted file mode 100644
index 64c6d5615f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A029C0/func_8024019C_A029DC.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024019C_A029DC
-/* A029DC 8024019C 3C03800B */  lui       $v1, %hi(gCameras)
-/* A029E0 802401A0 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* A029E4 802401A4 94620000 */  lhu       $v0, ($v1)
-/* A029E8 802401A8 3042EFFF */  andi      $v0, $v0, 0xefff
-/* A029EC 802401AC A4620000 */  sh        $v0, ($v1)
-/* A029F0 802401B0 03E00008 */  jr        $ra
-/* A029F4 802401B4 24020002 */   addiu    $v0, $zero, 2
-/* A029F8 802401B8 00000000 */  nop
-/* A029FC 802401BC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241E20_DAF220.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241E20_DAF220.s
deleted file mode 100644
index c4bb768dd3..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241E20_DAF220.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241E20_DAF220
-/* DAF220 80241E20 3C03800B */  lui       $v1, %hi(gCameras)
-/* DAF224 80241E24 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* DAF228 80241E28 94620000 */  lhu       $v0, ($v1)
-/* DAF22C 80241E2C 3042EFFF */  andi      $v0, $v0, 0xefff
-/* DAF230 80241E30 A4620000 */  sh        $v0, ($v1)
-/* DAF234 80241E34 03E00008 */  jr        $ra
-/* DAF238 80241E38 24020002 */   addiu    $v0, $zero, 2
-/* DAF23C 80241E3C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242E8C_DC013C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242E8C_DC013C.s
deleted file mode 100644
index 6186ef1072..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242E8C_DC013C.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242E8C_DC013C
-/* DC013C 80242E8C 3C03800B */  lui       $v1, %hi(gCameras)
-/* DC0140 80242E90 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* DC0144 80242E94 94620000 */  lhu       $v0, ($v1)
-/* DC0148 80242E98 3042EFFF */  andi      $v0, $v0, 0xefff
-/* DC014C 80242E9C A4620000 */  sh        $v0, ($v1)
-/* DC0150 80242EA0 03E00008 */  jr        $ra
-/* DC0154 80242EA4 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435E8_DD02B8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435E8_DD02B8.s
deleted file mode 100644
index 021431578c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435E8_DD02B8.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802435E8_DD02B8
-/* DD02B8 802435E8 3C03800B */  lui       $v1, %hi(gCameras)
-/* DD02BC 802435EC 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* DD02C0 802435F0 94620000 */  lhu       $v0, ($v1)
-/* DD02C4 802435F4 3042EFFF */  andi      $v0, $v0, 0xefff
-/* DD02C8 802435F8 A4620000 */  sh        $v0, ($v1)
-/* DD02CC 802435FC 03E00008 */  jr        $ra
-/* DD02D0 80243600 24020002 */   addiu    $v0, $zero, 2
-/* DD02D4 80243604 00000000 */  nop
-/* DD02D8 80243608 00000000 */  nop
-/* DD02DC 8024360C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802402F8_DDF608.s b/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802402F8_DDF608.s
deleted file mode 100644
index 576ddf255f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802402F8_DDF608.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402F8_DDF608
-/* DDF608 802402F8 3C03800B */  lui       $v1, %hi(gCameras)
-/* DDF60C 802402FC 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* DDF610 80240300 94620000 */  lhu       $v0, ($v1)
-/* DDF614 80240304 3042EFFF */  andi      $v0, $v0, 0xefff
-/* DDF618 80240308 A4620000 */  sh        $v0, ($v1)
-/* DDF61C 8024030C 03E00008 */  jr        $ra
-/* DDF620 80240310 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_02/AB2170/func_80240000_AB2170.s b/ver/us/asm/nonmatchings/world/area_osr/osr_02/AB2170/func_80240000_AB2170.s
deleted file mode 100644
index 0898ae7dad..0000000000
--- a/ver/us/asm/nonmatchings/world/area_osr/osr_02/AB2170/func_80240000_AB2170.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_AB2170
-/* AB2170 80240000 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* AB2174 80240004 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* AB2178 80240008 24020002 */  addiu     $v0, $zero, 2
-/* AB217C 8024000C A0620084 */  sb        $v0, 0x84($v1)
-/* AB2180 80240010 03E00008 */  jr        $ra
-/* AB2184 80240014 0000102D */   daddu    $v0, $zero, $zero
-/* AB2188 80240018 00000000 */  nop
-/* AB218C 8024001C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB6290/func_80240000_AB6290.s b/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB6290/func_80240000_AB6290.s
deleted file mode 100644
index 74c658032b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB6290/func_80240000_AB6290.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_AB6290
-/* AB6290 80240000 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* AB6294 80240004 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* AB6298 80240008 24020002 */  addiu     $v0, $zero, 2
-/* AB629C 8024000C A0620084 */  sb        $v0, 0x84($v1)
-/* AB62A0 80240010 03E00008 */  jr        $ra
-/* AB62A4 80240014 0000102D */   daddu    $v0, $zero, $zero
-/* AB62A8 80240018 00000000 */  nop
-/* AB62AC 8024001C 00000000 */  nop
diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml
index 02a414e3c8..0c724f9c4d 100644
--- a/ver/us/splat.yaml
+++ b/ver/us/splat.yaml
@@ -1,5 +1,6 @@
 name: Paper Mario (North America)
 basename: papermario
+sha1: 3837f44cda784b466c9a2d99df70d77c322b97a0
 options:
   find_file_boundaries: True
   compiler: GCC
@@ -10014,7 +10015,7 @@ segments:
     overlay: True
     subsegments:
     - [0xE245D0, c, 18]
-    - [0xE248D0, data, 18]
+    - [0xE248D0, .data, 18]
   - type: code
     name: world_action_land
     dir: world/action
@@ -10032,7 +10033,7 @@ segments:
     subsegments:
     - [0xE24ED0, c, hammer]
     - [0xE25C80, data, hammer]
-    - [0xE25CC0, .rodata, hammer]
+    - [0xE25C90, .rodata, hammer]
   - type: code
     name: world_action_spin
     dir: world/action
diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
index 61bd602b69..7796f3e0c0 100644
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@@ -3975,8 +3975,8 @@ func_80260DB8 = 0x80260DB8; // type:func rom:0x18F698
 func_80260DD8 = 0x80260DD8; // type:func rom:0x18F6B8
 func_80260E38 = 0x80260E38; // type:func rom:0x18F718
 func_80260E5C = 0x80260E5C; // type:func rom:0x18F73C
-func_80260E90 = 0x80260E90; // type:func rom:0x18F770
-func_80261064 = 0x80261064; // type:func rom:0x18F944
+base_GiveRefund = 0x80260E90; // type:func rom:0x18F770
+base_GiveRefundCleanup = 0x80261064; // type:func rom:0x18F944
 func_802610CC = 0x802610CC; // type:func rom:0x18F9AC
 func_80261164 = 0x80261164; // type:func rom:0x18FA44
 func_802611E8 = 0x802611E8; // type:func rom:0x18FAC8
@@ -10223,7 +10223,7 @@ func_80240000_9FA7F0 = 0x80240000; // type:func rom:0x9FA7F0
 func_80240180_9FA970 = 0x80240180; // type:func rom:0x9FA970
 nok_12_SetEntityPosition = 0x80240224; // type:func rom:0x9FAA14
 func_802402F0_9FAAE0 = 0x802402F0; // type:func rom:0x9FAAE0
-func_8024030C_9FAAFC = 0x8024030C; // type:func rom:0x9FAAFC
+nok_12_UnsetCamera0Flag1000 = 0x8024030C; // type:func rom:0x9FAAFC
 nok_12_foliage_setup_shear_mtx = 0x80240330; // type:func rom:0x9FAB20
 nok_12_TransformFoliage = 0x802403A0; // type:func rom:0x9FAB90
 nok_12_set_script_owner_npc_anim = 0x80240570; // type:func rom:0x9FAD60
@@ -10266,7 +10266,7 @@ D_80242134_A02734 = 0x80242134; // type:data rom:0xA02734
 D_802421D0_A027D0 = 0x802421D0; // type:data rom:0xA027D0
 func_80240000_A02840 = 0x80240000; // type:func rom:0xA02840
 func_80240180_A029C0 = 0x80240180; // type:func rom:0xA029C0
-func_8024019C_A029DC = 0x8024019C; // type:func rom:0xA029DC
+nok_14_UnsetCamera0Flag1000 = 0x8024019C; // type:func rom:0xA029DC
 nok_14_set_script_owner_npc_anim = 0x802401C0; // type:func rom:0xA02A00
 func_8024023C_A02A7C = 0x8024023C; // type:func rom:0xA02A7C
 nok_14_UnkNpcAIFunc12 = 0x80240370; // type:func rom:0xA02BB0
@@ -11623,7 +11623,7 @@ func_80240BEC_B28C1C = 0x80240BEC; // type:func rom:0xB28C1C
 jan_01_UnkDurationCheck = 0x80240EEC; // type:func rom:0xB28F1C
 func_80240F30_B28F60 = 0x80240F30; // type:func rom:0xB28F60
 func_80241154_B29184 = 0x80241154; // type:func rom:0xB29184
-func_80241170_B291A0 = 0x80241170; // type:func rom:0xB291A0
+jan_01_UnsetCamera0Flag1000 = 0x80241170; // type:func rom:0xB291A0
 jan_01_foliage_setup_shear_mtx = 0x80241190; // type:func rom:0xB291C0
 jan_01_TransformFoliage = 0x80241200; // type:func rom:0xB29230
 D_802443F0_B2C420 = 0x802443F0; // type:data rom:0xB2C420
@@ -12034,7 +12034,7 @@ func_80240B94_B84D14 = 0x80240B94; // type:func rom:0xB84D14
 func_80240E90_B85010 = 0x80240E90; // type:func rom:0xB85010
 jan_22_GetItemName = 0x80240F44; // type:func rom:0xB850C4
 func_80240FA8_B85128 = 0x80240FA8; // type:func rom:0xB85128
-func_80240FC4_B85144 = 0x80240FC4; // type:func rom:0xB85144
+jan_22_UnsetCamera0Flag1000 = 0x80240FC4; // type:func rom:0xB85144
 PostChapter5StatUpdate = 0x80240FE0; // type:func rom:0xB85160
 func_80241020_B851A0 = 0x80241020; // type:func rom:0xB851A0
 func_802410C4_B85244 = 0x802410C4; // type:func rom:0xB85244
@@ -14473,7 +14473,7 @@ func_80240000_C8C0A0 = 0x80240000; // type:func rom:0xC8C0A0
 kzn_18_UnkTexturePanFunc = 0x80240040; // type:func rom:0xC8C0E0
 kzn_18_UnkTexturePanFunc2 = 0x80240164; // type:func rom:0xC8C204
 func_80240350_C8C3F0 = 0x80240350; // type:func rom:0xC8C3F0
-func_8024036C_C8C40C = 0x8024036C; // type:func rom:0xC8C40C
+kzn_18_UnsetCamera0Flag1000 = 0x8024036C; // type:func rom:0xC8C40C
 kzn_18_GetFloorCollider = 0x80240388; // type:func rom:0xC8C428
 kzn_19_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC8DBB0
 kzn_19_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC8DCD4
@@ -16673,7 +16673,7 @@ func_802419D8_DAEDD8 = 0x802419D8; // type:func rom:0xDAEDD8
 func_80241A70_DAEE70 = 0x80241A70; // type:func rom:0xDAEE70
 func_80241AD0_DAEED0 = 0x80241AD0; // type:func rom:0xDAEED0
 func_80241E04_DAF204 = 0x80241E04; // type:func rom:0xDAF204
-func_80241E20_DAF220 = 0x80241E20; // type:func rom:0xDAF220
+omo_04_UnsetCamera0Flag1000 = 0x80241E20; // type:func rom:0xDAF220
 func_80241E40_DAF240 = 0x80241E40; // type:func rom:0xDAF240
 D_80242630_DAFA30 = 0x80242630; // type:data rom:0xDAFA30
 D_80242EF0_DB02F0 = 0x80242EF0; // type:data rom:0xDB02F0
@@ -16769,7 +16769,7 @@ omo_07_UnkFunc6 = 0x802427D0; // type:func rom:0xDBFA80
 omo_07_UnkFunc5 = 0x80242B60; // type:func rom:0xDBFE10
 func_80242C84_DBFF34 = 0x80242C84; // type:func rom:0xDBFF34
 func_80242E70_DC0120 = 0x80242E70; // type:func rom:0xDC0120
-func_80242E8C_DC013C = 0x80242E8C; // type:func rom:0xDC013C
+omo_07_UnsetCamera0Flag1000 = 0x80242E8C; // type:func rom:0xDC013C
 func_80242EA8_DC0158 = 0x80242EA8; // type:func rom:0xDC0158
 func_80242F20_DC01D0 = 0x80242F20; // type:func rom:0xDC01D0
 omo_07_GetItemName = 0x80242FD4; // type:func rom:0xDC0284
@@ -16851,7 +16851,7 @@ func_8024356C_DD023C = 0x8024356C; // type:func rom:0xDD023C
 omo_09_GetEncounterEnemyIsOwner = 0x80243580; // type:func rom:0xDD0250
 func_802435B8_DD0288 = 0x802435B8; // type:func rom:0xDD0288
 func_802435CC_DD029C = 0x802435CC; // type:func rom:0xDD029C
-func_802435E8_DD02B8 = 0x802435E8; // type:func rom:0xDD02B8
+omo_09_UnsetCamera0Flag1000 = 0x802435E8; // type:func rom:0xDD02B8
 func_80243610_DD02E0 = 0x80243610; // type:func rom:0xDD02E0
 D_80243A80_DD0750 = 0x80243A80; // type:data rom:0xDD0750
 D_80243A90_DD0760 = 0x80243A90; // type:data rom:0xDD0760
@@ -16909,7 +16909,7 @@ D_80241E98_DDE6C8 = 0x80241E98; // type:data rom:0xDDE6C8
 omo_12_UnkFunc41 = 0x80240000; // type:func rom:0xDDF310
 func_80240184_DDF494 = 0x80240184; // type:func rom:0xDDF494
 func_802402DC_DDF5EC = 0x802402DC; // type:func rom:0xDDF5EC
-func_802402F8_DDF608 = 0x802402F8; // type:func rom:0xDDF608
+omo_12_UnsetCamera0Flag1000 = 0x802402F8; // type:func rom:0xDDF608
 func_80240314_DDF624 = 0x80240314; // type:func rom:0xDDF624
 func_802403D8_DDF6E8 = 0x802403D8; // type:func rom:0xDDF6E8
 func_80240420_DDF730 = 0x80240420; // type:func rom:0xDDF730