From 7f1c1351f2208bc36c851903d458aeaf17285dab Mon Sep 17 00:00:00 2001
From: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
Date: Wed, 29 Dec 2021 07:22:01 -0500
Subject: [PATCH] Match actor_api.c (#585)

* Decomp 3 197F40 functions

* 2 more

* oops

* 3 more

* Match the last of actor_api.c

* comments
---
 include/functions.h                           |   5 +
 src/{197F40.c => actor_api.c}                 | 502 +++++++++++++++++-
 src/battle/battle.h                           |   2 +
 .../asm/nonmatchings/197F40/CancelEnemyTurn.s |  29 -
 .../nonmatchings/197F40/ChooseNextTarget.s    |  93 ----
 .../asm/nonmatchings/197F40/GetOwnerTarget.s  |  30 --
 .../nonmatchings/197F40/ResetActorSounds.s    | 133 -----
 .../asm/nonmatchings/197F40/SetActorSounds.s  |  81 ---
 .../asm/nonmatchings/197F40/SetPartSounds.s   |  91 ----
 .../asm/nonmatchings/197F40/func_8026E914.s   |  28 -
 .../asm/nonmatchings/197F40/func_8026E9A0.s   |  27 -
 .../asm/nonmatchings/197F40/func_8026EB20.s   |  59 --
 .../asm/nonmatchings/197F40/func_8026ED20.s   |  56 --
 .../asm/nonmatchings/197F40/func_8026EDE4.s   |  46 --
 .../asm/nonmatchings/197F40/func_8026F1A0.s   |  42 --
 .../197F40/set_goal_pos_to_part.s             | 176 ------
 .../197F40/set_part_goal_to_actor_part.s      | 162 ------
 .../{197F40 => actor_api}/func_8026E558.s     |   0
 ver/us/splat.yaml                             |   4 +-
 19 files changed, 489 insertions(+), 1077 deletions(-)
 rename src/{197F40.c => actor_api.c} (85%)
 delete mode 100644 ver/us/asm/nonmatchings/197F40/CancelEnemyTurn.s
 delete mode 100644 ver/us/asm/nonmatchings/197F40/ChooseNextTarget.s
 delete mode 100644 ver/us/asm/nonmatchings/197F40/GetOwnerTarget.s
 delete mode 100644 ver/us/asm/nonmatchings/197F40/ResetActorSounds.s
 delete mode 100644 ver/us/asm/nonmatchings/197F40/SetActorSounds.s
 delete mode 100644 ver/us/asm/nonmatchings/197F40/SetPartSounds.s
 delete mode 100644 ver/us/asm/nonmatchings/197F40/func_8026E914.s
 delete mode 100644 ver/us/asm/nonmatchings/197F40/func_8026E9A0.s
 delete mode 100644 ver/us/asm/nonmatchings/197F40/func_8026EB20.s
 delete mode 100644 ver/us/asm/nonmatchings/197F40/func_8026ED20.s
 delete mode 100644 ver/us/asm/nonmatchings/197F40/func_8026EDE4.s
 delete mode 100644 ver/us/asm/nonmatchings/197F40/func_8026F1A0.s
 delete mode 100644 ver/us/asm/nonmatchings/197F40/set_goal_pos_to_part.s
 delete mode 100644 ver/us/asm/nonmatchings/197F40/set_part_goal_to_actor_part.s
 rename ver/us/asm/nonmatchings/{197F40 => actor_api}/func_8026E558.s (100%)

diff --git a/include/functions.h b/include/functions.h
index 36344b90ce..1ea2510f66 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -541,6 +541,11 @@ void sfx_play_sound_with_params(s32 arg0, u8 arg1, u8 arg2, s16 arg3);
 s32 func_8004A784(Npc* npc, f32 arg1, f32* arg2, f32* arg3, f32* arg4, f32* arg5);
 void base_UnkNpcAIFunc1(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory);
 void UnkNpcAIFunc1(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory);
+void func_80266AF8(Actor*);
+void func_80266EA8(ActorPart*, s32);
+void func_80266E40(Actor*);
+void remove_player_buffs(s32);
+s32 is_actor_hp_bar_visible(Actor*);
 
 void sin_cos_rad(f32 rad, f32* outSinTheta, f32* outCosTheta);
 
diff --git a/src/197F40.c b/src/actor_api.c
similarity index 85%
rename from src/197F40.c
rename to src/actor_api.c
index e0b177ed67..b58cd684f3 100644
--- a/src/197F40.c
+++ b/src/actor_api.c
@@ -40,9 +40,80 @@ s32 get_nearest_home_index(f32 x, f32 y, f32 z) {
     return yVal | (xVal << 2);
 }
 
-INCLUDE_ASM(void, "197F40", set_goal_pos_to_part, f32* goalPos, s32 target, s32 partIndex);
+void set_goal_pos_to_part(ActorState* state, s32 actorID, s32 partIndex) {
+    s32 temp_s0 = actorID & 0x700;
+    Actor* actor = get_actor(actorID);
+    ActorPart* part;
 
-INCLUDE_ASM(s32, "197F40", set_part_goal_to_actor_part);
+    switch (temp_s0) {
+        case ACTOR_PLAYER:
+            part = get_actor_part(actor, 0);
+            state->goalPos.x = actor->currentPos.x + part->partOffset.x * actor->scalingFactor;
+            state->goalPos.y = actor->currentPos.y + part->partOffset.y * actor->scalingFactor;
+            state->goalPos.z = actor->currentPos.z + 10.0f;
+            if (actor->stoneStatus == STATUS_STONE) {
+                state->goalPos.y -= actor->scalingFactor * 5.0f;
+            }
+            break;
+        case ACTOR_PARTNER:
+        case ACTOR_ENEMY0:
+            part = get_actor_part(actor, partIndex);
+            if (!(part->flags & ACTOR_PART_FLAG_100000)) {
+                state->goalPos.x = actor->currentPos.x + (part->partOffset.x + part->targetOffset.x) * actor->scalingFactor;
+                if (!(actor->flags & ACTOR_PART_FLAG_800)) {
+                    state->goalPos.y = actor->currentPos.y + (part->partOffset.y + part->targetOffset.y) * actor->scalingFactor;
+                } else {
+                    state->goalPos.y = actor->currentPos.y + (-part->partOffset.y - part->targetOffset.y) * actor->scalingFactor;
+                }
+                state->goalPos.z = actor->currentPos.z + part->partOffset.z + 10.0f;
+            } else {
+                state->goalPos.x = part->absolutePosition.x + part->targetOffset.x;
+                if (!(actor->flags & ACTOR_PART_FLAG_800)) {
+                    state->goalPos.y = part->absolutePosition.y + part->targetOffset.y * actor->scalingFactor;
+                } else {
+                    state->goalPos.y = part->absolutePosition.y - part->targetOffset.y * actor->scalingFactor;
+                }
+                state->goalPos.z = part->absolutePosition.z + 10.0f;
+            }
+            break;
+    }
+}
+
+void set_part_goal_to_actor_part(ActorPartMovement* movement, s32 actorID, s32 partIndex) {
+    s32 actorGroup = actorID & 0x700;
+    Actor* actor = get_actor(actorID);
+    ActorPart* part;
+
+    switch (actorGroup) {
+        case ACTOR_PLAYER:
+            part = get_actor_part(actor, 0);
+            part->movement->goalPos.x = actor->currentPos.x + part->partOffset.x * actor->scalingFactor;
+            part->movement->goalPos.y = actor->currentPos.y + part->partOffset.y * actor->scalingFactor;
+            part->movement->goalPos.z = actor->currentPos.z;
+            break;
+        case ACTOR_PARTNER:
+        case ACTOR_ENEMY0:
+            part = get_actor_part(actor, partIndex);
+            if (!(part->flags & ACTOR_PART_FLAG_100000)) {
+                part->movement->goalPos.x = actor->currentPos.x + (part->partOffset.x + part->targetOffset.x) * actor->scalingFactor;
+                if (!(actor->flags & ACTOR_PART_FLAG_800)) {
+                    part->movement->goalPos.y = actor->currentPos.y + (part->partOffset.y + part->targetOffset.y) * actor->scalingFactor;
+                } else {
+                    part->movement->goalPos.y = actor->currentPos.y + (-part->partOffset.y - part->targetOffset.y) * actor->scalingFactor;
+                }
+                part->movement->goalPos.z = actor->currentPos.z + part->partOffset.z;
+            } else {
+                part->movement->goalPos.x = part->absolutePosition.x + part->targetOffset.x;
+                if (!(actor->flags & ACTOR_PART_FLAG_800)) {
+                    part->movement->goalPos.y = part->absolutePosition.y + part->targetOffset.y * actor->scalingFactor;
+                } else {
+                    part->movement->goalPos.y = part->absolutePosition.y - part->targetOffset.y * actor->scalingFactor;
+                }
+                part->movement->goalPos.z = part->absolutePosition.z;
+            }
+            break;
+    }
+}
 
 void set_actor_current_position(s32 actorID, f32 x, f32 y, f32 z) {
     Actor* actor = get_actor(actorID);
@@ -329,7 +400,7 @@ ApiStatus SetGoalPos(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     s32 actorID = evt_get_variable(script, *args++);
     Actor* actor;
-    ActorMovement* walk;
+    ActorState* walk;
     f32 x, y, z;
 
     if (actorID == ACTOR_SELF) {
@@ -339,7 +410,7 @@ ApiStatus SetGoalPos(Evt* script, s32 isInitialCall) {
     walk = &actor->state;
 
     if (*args == -12345678) {
-        x = actor->state.goalPos.x;
+        x = walk->goalPos.x;
     } else {
         x = evt_get_variable(script, *args);
     }
@@ -2181,7 +2252,22 @@ ApiStatus WaitForState(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "197F40", CancelEnemyTurn);
+ApiStatus CancelEnemyTurn(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    BattleStatus* battleStatus = &gBattleStatus;
+    s32 temp_v0 = evt_get_variable(script, *args++);
+
+    switch (temp_v0) {
+        case 0:
+            battleStatus->unk_94 = 1;
+            break;
+        case 1:
+            battleStatus->unk_94 = -1;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
 
 ApiStatus func_8026E260(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
@@ -2238,9 +2324,159 @@ ApiStatus SetOwnerTarget(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "197F40", ChooseNextTarget);
+ApiStatus ChooseNextTarget(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    Actor* actor = get_actor(script->owner1.actorID);
+    s32 temp_v0 = evt_get_variable(script, *args++);
+    s32 temp = *args++;
+    SelectableTarget* target;
+    s32 temp_v0_3;
+    s32 phi_v1;
+    s32 phi_a2;
 
-INCLUDE_ASM(s32, "197F40", func_8026E558);
+    if (temp_v0 == -1) {
+        actor->selectedTargetIndex = 0;
+        target = &actor->targetData[actor->targetIndexList[0]];
+        actor->targetActorID = target->actorID;
+        actor->targetPartIndex = target->partID;
+        return ApiStatus_DONE2;
+    }
+
+    if (temp_v0 == 0xA) {
+        actor->selectedTargetIndex = actor->targetListLength - 1;
+        target = &actor->targetData[actor->targetIndexList[actor->selectedTargetIndex]];
+        actor->targetActorID = target->actorID;
+        actor->targetPartIndex = target->partID;
+        return ApiStatus_DONE2;
+    }
+
+    phi_v1 = actor->selectedTargetIndex;
+    temp_v0_3 = actor->targetListLength;
+    phi_a2 = 0;
+
+    if (temp_v0 == 0) {
+        phi_v1++;
+    } else {
+        phi_v1--;
+    }
+
+    if (phi_v1 < 0) {
+        phi_v1 = temp_v0_3 - 1;
+        phi_a2 = -1;
+    }
+
+    if (phi_v1 >= temp_v0_3) {
+        phi_v1 = 0;
+        phi_a2 = -1;
+    }
+
+    actor->selectedTargetIndex = phi_v1;
+    target = &actor->targetData[actor->targetIndexList[actor->selectedTargetIndex]];
+    actor->targetActorID = target->actorID;
+    actor->targetPartIndex = target->partID;
+    evt_set_variable(script, temp, phi_a2);
+
+    return ApiStatus_DONE2;
+}
+
+#ifdef NON_MATCHING
+s32 func_8026E558(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    Actor* actor;
+    f32 y;
+    f32 x;
+    f32 z;
+    s32 temp_s0_3;
+    s32 temp_s2;
+    s8 temp_v0_4;
+    SelectableTarget* target;
+    s32 row;
+    s32 column;
+    s32 layer;
+    s32 phi_a2;
+    s32 i;
+
+    actor = (Actor *) evt_get_variable(script, *args++);
+    temp_s2 = evt_get_variable(script, *args++);
+    temp_s0_3 = *args++;
+
+    if (actor == ACTOR_SELF) {
+        actor = (Actor *) script->owner1.actor;
+    }
+
+    actor = get_actor((s32) actor);
+    x = actor->currentPos.x;
+    y = actor->currentPos.y;
+    z = actor->currentPos.z;
+    if (y < 40.0f) {
+        phi_a2 = -1;
+        row = 0;
+    } else {
+        phi_a2 = -1;
+        row = 1;
+        if (!(y < 85.0f)) {
+            row = 3;
+            if (y < 100.0f) {
+                row = 2;
+            }
+        }
+    }
+
+    column = 0;
+    if (!(x < 25.0f)) {
+        column = 1;
+        if (!(x < 65.0f)) {
+            column = 3;
+            if (x < 105.0f) {
+                column = 2;
+            }
+        }
+    }
+
+    layer = 1;
+    if (z < -30.0f) {
+        layer = 0;
+    }
+
+    switch (temp_s2) {
+        case 0:
+            for (i = 0; i < actor->targetListLength; i++) {
+                target = &actor->targetData[actor->targetIndexList[i]];
+                if (target->homeCol == column && target->layer == layer && target->homeRow < row) {
+                    actor->targetActorID = target->actorID;
+                    actor->targetPartIndex = target->partID;
+                    phi_a2 = 0;
+                }
+            }
+            break;
+        case 1:
+            for (i = 0; i < actor->targetListLength; i++) {
+                target = &actor->targetData[actor->targetIndexList[i]];
+                if (target->homeCol == column && target->layer == layer && target->homeRow < row) {
+                    actor->targetActorID = target->actorID;
+                    actor->targetPartIndex = target->partID;
+                    phi_a2 = 0;
+                }
+            }
+            break;
+        case -1:
+            for (i = 0; i < actor->targetListLength; i++) {
+                target = &actor->targetData[actor->targetIndexList[i]];
+                if (target->homeCol == column && target->layer == layer && target->homeRow < row) {
+                    actor->targetActorID = target->actorID;
+                    actor->targetPartIndex = target->partID;
+                    phi_a2 = 0;
+                }
+            }
+            break;
+    }
+    evt_set_variable(script, temp_s0_3, phi_a2);
+    return ApiStatus_DONE2;
+}
+#else
+s32 func_8026E558(Evt*, s32);
+INCLUDE_ASM(s32, "actor_api", func_8026E558);
+#endif
 
 ApiStatus GetTargetListLength(Evt* script) {
     Bytecode* args = script->ptrReadPos;
@@ -2249,16 +2485,47 @@ ApiStatus GetTargetListLength(Evt* script) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "197F40", GetOwnerTarget);
+ApiStatus GetOwnerTarget(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    Actor* actor = get_actor(script->owner1.enemyID);
+    s32 actorID = *args++;
+    s32 partIndex = *args++;
 
-INCLUDE_ASM(s32, "197F40", func_8026E914);
+    evt_set_variable(script, actorID, actor->targetActorID);
+    evt_set_variable(script, partIndex, actor->targetPartIndex);
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_8026E914(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 temp_v0 = *args++;
+    s32 temp_s1 = *args++;
+
+    evt_set_variable(script, temp_v0, gBattleStatus.currentTargetID2);
+    evt_set_variable(script, temp_s1, gBattleStatus.currentTargetPart2);
+
+    return ApiStatus_DONE2;
+}
 
 ApiStatus GetPlayerActorID(Evt* script, s32 isInitialCall) {
     evt_set_variable(script, *script->ptrReadPos, gBattleStatus.attackerActorID);
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "197F40", func_8026E9A0);
+ApiStatus func_8026E9A0(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 temp_s0;
+    s32 temp_s0_2;
+
+    temp_s0 = evt_get_variable(script, *args++);
+    temp_s0_2 = evt_get_variable(script, *args++);
+
+    gBattleStatus.currentTargetPart2 = temp_s0_2;
+    gBattleStatus.currentTargetID2 = temp_s0;
+
+    return ApiStatus_DONE2;
+}
 
 ApiStatus GetDistanceToGoal(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
@@ -2295,7 +2562,24 @@ ApiStatus func_8026EA7C(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "197F40", func_8026EB20);
+ApiStatus func_8026EB20(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 actorID = evt_get_variable(script, *args++);
+    s32 temp_s3 = evt_get_variable(script, *args++);
+    DecorationTable* decorationTable;
+
+    if (actorID == ACTOR_SELF) {
+        actorID = script->owner1.actorID;
+    }
+
+    decorationTable = get_actor_part(get_actor(actorID), temp_s3)->decorationTable;
+    decorationTable->unk_740 = evt_get_variable(script, *args++);
+    decorationTable->unk_742 = evt_get_variable(script, *args++);
+    decorationTable->unk_744 = evt_get_variable(script, *args++);
+    decorationTable->unk_746 = evt_get_variable(script, *args++);
+
+    return ApiStatus_DONE2;
+}
 
 ApiStatus func_8026EBF8(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
@@ -2304,7 +2588,7 @@ ApiStatus func_8026EBF8(Evt* script, s32 isInitialCall) {
     DecorationTable* table;
 
     if (actorID == ACTOR_SELF) {
-        actorID = script->owner1.enemyID;
+        actorID = script->owner1.actorID;
     }
 
     table = get_actor_part(get_actor(actorID), partIndex)->decorationTable;
@@ -2321,9 +2605,42 @@ ApiStatus func_8026EBF8(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "197F40", func_8026ED20);
+ApiStatus func_8026ED20(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 actorID = evt_get_variable(script, *args++);
+    s32 temp_s0_3 = evt_get_variable(script, *args++);
+    s32 temp_s3 = evt_get_variable(script, *args++);
+    ActorPart* actorPart;
 
-INCLUDE_ASM(s32, "197F40", func_8026EDE4);
+
+    if (actorID == ACTOR_SELF) {
+        actorID = script->owner1.actorID;
+    }
+
+    actorPart = get_actor_part(get_actor(actorID), temp_s0_3);
+    if (temp_s3) {
+        actorPart->flags |= ACTOR_FLAG_1000000;
+    } else {
+        actorPart->flags &= ~ACTOR_FLAG_1000000;
+    }
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_8026EDE4(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 actorID = evt_get_variable(script, *args++);
+    s32 partIndex = evt_get_variable(script, *args++);
+    s32 temp_s3 = evt_get_variable(script, *args++);
+
+    if (actorID == ACTOR_SELF) {
+        actorID = script->owner1.actorID;
+    }
+
+    func_80266EA8(get_actor_part(get_actor(actorID), partIndex), temp_s3);
+
+    return ApiStatus_DONE2;
+}
 
 ApiStatus AddActorDecoration(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
@@ -2335,7 +2652,7 @@ ApiStatus AddActorDecoration(Evt* script, s32 isInitialCall) {
     ActorPart* actorPart;
 
     if (actorID == ACTOR_SELF) {
-        actorID = script->owner1.enemyID;
+        actorID = script->owner1.actorID;
     }
 
     actor = get_actor(actorID);
@@ -2407,7 +2724,25 @@ ApiStatus UseIdleAnimation(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "197F40", func_8026F1A0);
+s32 func_8026F1A0(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 actorID = evt_get_variable(script, *args++);
+    s32 temp_s0_3 = evt_get_variable(script, *args++);
+    Actor* actor;
+
+    if (actorID == ACTOR_SELF) {
+        actorID = script->owner1.actorID;
+    }
+
+    actor = get_actor(actorID);
+
+    if (temp_s0_3 == 0) {
+        actor->flags &= ~ACTOR_FLAG_8000000;
+        func_80266E40(actor);
+    }
+
+    return ApiStatus_DONE2;
+}
 
 ApiStatus  GetStatusFlags(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
@@ -2425,7 +2760,7 @@ ApiStatus  GetStatusFlags(Evt* script, s32 isInitialCall) {
     s32 flags;
 
     if (actorID == ACTOR_SELF) {
-        actorID = script->owner1.enemyID;
+        actorID = script->owner1.actorID;
     }
     actor = get_actor(actorID);
     debuff = actor->debuff;
@@ -2618,20 +2953,143 @@ ApiStatus ResetAllActorSounds(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "197F40", SetActorSounds);
+s32 SetActorSounds(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 actorID = evt_get_variable(script, *args++);
+    Actor* actor;
+    s32 temp_s0_4;
+    s32 temp_s1;
+    s32 temp_s3;
 
-INCLUDE_ASM(s32, "197F40", ResetActorSounds);
+    if (actorID == ACTOR_SELF) {
+        actorID = script->owner1.actorID;
+    }
 
-INCLUDE_ASM(s32, "197F40", SetPartSounds);
+    temp_s3 = evt_get_variable(script, *args++);
+    temp_s0_4 = evt_get_variable(script, *args++);
+    temp_s1 = evt_get_variable(script, *args++);
+    actor = get_actor(actorID);
+
+    switch (temp_s3) {
+        case 0:
+            actor->actorTypeData1[0] = temp_s0_4;
+            actor->actorTypeData1[1] = temp_s1;
+            break;
+        case 1:
+            actor->actorTypeData1[2] = temp_s0_4;
+            actor->actorTypeData1[3] = temp_s1;
+            break;
+        case 2:
+            actor->actorTypeData1[4] = temp_s0_4;
+            break;
+        case 3:
+            actor->actorTypeData1[5] = temp_s0_4;
+            break;
+        case 4:
+            actor->actorTypeData1b[0] = temp_s0_4;
+            break;
+        case 5:
+            actor->actorTypeData1b[1] = temp_s0_4;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus ResetActorSounds(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 actorID = evt_get_variable(script, *args++);
+    Actor* actor;
+    s32 temp_s3;
+
+    if (actorID == ACTOR_SELF) {
+        actorID = script->owner1.actorID;
+    }
+
+    temp_s3 = evt_get_variable(script, *args++);
+    evt_get_variable(script, *args++);
+    evt_get_variable(script, *args++);
+    actor = get_actor(actorID);
+
+    switch (temp_s3) {
+        case 0:
+            actor->actorTypeData1[0] = bActorSoundTable[actor->actorType].walk[0];
+            actor->actorTypeData1[1] = bActorSoundTable[actor->actorType].walk[1];
+            break;
+        case 1:
+            actor->actorTypeData1[2] = bActorSoundTable[actor->actorType].fly[0];
+            actor->actorTypeData1[3] = bActorSoundTable[actor->actorType].fly[1];
+            break;
+        case 2:
+            actor->actorTypeData1[4] = bActorSoundTable[actor->actorType].jump;
+            break;
+        case 3:
+            actor->actorTypeData1[5] = bActorSoundTable[actor->actorType].hurt;
+            break;
+        case 4:
+            actor->actorTypeData1b[0] = bActorSoundTable[actor->actorType].delay[0];
+            break;
+        case 5:
+            actor->actorTypeData1b[1] = bActorSoundTable[actor->actorType].delay[1];
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus SetPartSounds(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 actorID = evt_get_variable(script, *args++);
+    ActorPart* actorPart;
+    s32 partIndex;
+    s32 temp_s1_5;
+    s32 temp_s2;
+    s32 temp_s4;
+
+    if (actorID == ACTOR_SELF) {
+        actorID = script->owner1.actorID;
+    }
+
+    partIndex = evt_get_variable(script, *args++);
+    temp_s4 = evt_get_variable(script, *args++);
+    temp_s1_5 = evt_get_variable(script, *args++);
+    temp_s2 = evt_get_variable(script, *args++);
+    actorPart = get_actor_part(get_actor(actorID), partIndex);
+
+    switch (temp_s4) {
+        case 0:
+            actorPart->partTypeData[0] = temp_s1_5;
+            actorPart->partTypeData[1] = temp_s2;
+            break;
+        case 1:
+            actorPart->partTypeData[2] = temp_s1_5;
+            actorPart->partTypeData[3] = temp_s2;
+            break;
+        case 2:
+            actorPart->partTypeData[4] = temp_s1_5;
+            break;
+        case 3:
+            actorPart->partTypeData[5] = temp_s1_5;
+            break;
+        case 4:
+            actorPart->actorTypeData2b[0] = temp_s1_5;
+            break;
+        case 5:
+            actorPart->actorTypeData2b[1] = temp_s1_5;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
 
 ApiStatus SetActorType(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* actorID = evt_get_variable(script, *args++);
+    s32 actorID = evt_get_variable(script, *args++);
     Actor* enemy;
     s32 actorType;
 
     if (actorID == ACTOR_SELF) {
-        actorID = script->owner1.enemyID;
+        actorID = script->owner1.actorID;
     }
 
     actorType = evt_get_variable(script, *args++);
diff --git a/src/battle/battle.h b/src/battle/battle.h
index 3f10b124b5..423164cbea 100644
--- a/src/battle/battle.h
+++ b/src/battle/battle.h
@@ -336,6 +336,8 @@ typedef struct ActorSounds {
     /* 0x18 */ s16 delay[2]; ///< Number of frames to wait between walk/fly sounds. Negative values are in distance.
 } ActorSounds; // size = 0x1C
 
+extern ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT];
+
 typedef struct ActorOffsets {
     /* 0x00 */ Vec3b tattleCam;
     /* 0x03 */ s8 shadow;
diff --git a/ver/us/asm/nonmatchings/197F40/CancelEnemyTurn.s b/ver/us/asm/nonmatchings/197F40/CancelEnemyTurn.s
deleted file mode 100644
index 5b1644c6ee..0000000000
--- a/ver/us/asm/nonmatchings/197F40/CancelEnemyTurn.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel CancelEnemyTurn
-/* 19CAE8 8026E208 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 19CAEC 8026E20C AFBF0014 */  sw        $ra, 0x14($sp)
-/* 19CAF0 8026E210 AFB00010 */  sw        $s0, 0x10($sp)
-/* 19CAF4 8026E214 8C82000C */  lw        $v0, 0xc($a0)
-/* 19CAF8 8026E218 0C0B1EAF */  jal       evt_get_variable
-/* 19CAFC 8026E21C 8C450000 */   lw       $a1, ($v0)
-/* 19CB00 8026E220 3C10800E */  lui       $s0, %hi(gBattleStatus)
-/* 19CB04 8026E224 2610C070 */  addiu     $s0, $s0, %lo(gBattleStatus)
-/* 19CB08 8026E228 0040182D */  daddu     $v1, $v0, $zero
-/* 19CB0C 8026E22C 10600005 */  beqz      $v1, .L8026E244
-/* 19CB10 8026E230 24020001 */   addiu    $v0, $zero, 1
-/* 19CB14 8026E234 10620004 */  beq       $v1, $v0, .L8026E248
-/* 19CB18 8026E238 2402FFFF */   addiu    $v0, $zero, -1
-/* 19CB1C 8026E23C 0809B893 */  j         .L8026E24C
-/* 19CB20 8026E240 00000000 */   nop
-.L8026E244:
-/* 19CB24 8026E244 24020001 */  addiu     $v0, $zero, 1
-.L8026E248:
-/* 19CB28 8026E248 A2020094 */  sb        $v0, 0x94($s0)
-.L8026E24C:
-/* 19CB2C 8026E24C 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 19CB30 8026E250 8FB00010 */  lw        $s0, 0x10($sp)
-/* 19CB34 8026E254 24020002 */  addiu     $v0, $zero, 2
-/* 19CB38 8026E258 03E00008 */  jr        $ra
-/* 19CB3C 8026E25C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/197F40/ChooseNextTarget.s b/ver/us/asm/nonmatchings/197F40/ChooseNextTarget.s
deleted file mode 100644
index dc415da1fb..0000000000
--- a/ver/us/asm/nonmatchings/197F40/ChooseNextTarget.s
+++ /dev/null
@@ -1,93 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel ChooseNextTarget
-/* 19CCF4 8026E414 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 19CCF8 8026E418 AFB20018 */  sw        $s2, 0x18($sp)
-/* 19CCFC 8026E41C 0080902D */  daddu     $s2, $a0, $zero
-/* 19CD00 8026E420 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 19CD04 8026E424 AFB10014 */  sw        $s1, 0x14($sp)
-/* 19CD08 8026E428 AFB00010 */  sw        $s0, 0x10($sp)
-/* 19CD0C 8026E42C 8E440148 */  lw        $a0, 0x148($s2)
-/* 19CD10 8026E430 0C09A75B */  jal       get_actor
-/* 19CD14 8026E434 8E50000C */   lw       $s0, 0xc($s2)
-/* 19CD18 8026E438 8E050000 */  lw        $a1, ($s0)
-/* 19CD1C 8026E43C 26100004 */  addiu     $s0, $s0, 4
-/* 19CD20 8026E440 0240202D */  daddu     $a0, $s2, $zero
-/* 19CD24 8026E444 0C0B1EAF */  jal       evt_get_variable
-/* 19CD28 8026E448 0040882D */   daddu    $s1, $v0, $zero
-/* 19CD2C 8026E44C 0040202D */  daddu     $a0, $v0, $zero
-/* 19CD30 8026E450 2402FFFF */  addiu     $v0, $zero, -1
-/* 19CD34 8026E454 8E050000 */  lw        $a1, ($s0)
-/* 19CD38 8026E458 14820004 */  bne       $a0, $v0, .L8026E46C
-/* 19CD3C 8026E45C 2402000A */   addiu    $v0, $zero, 0xa
-/* 19CD40 8026E460 8223040D */  lb        $v1, 0x40d($s1)
-/* 19CD44 8026E464 0809B924 */  j         .L8026E490
-/* 19CD48 8026E468 A2200425 */   sb       $zero, 0x425($s1)
-.L8026E46C:
-/* 19CD4C 8026E46C 14820013 */  bne       $a0, $v0, .L8026E4BC
-/* 19CD50 8026E470 00000000 */   nop
-/* 19CD54 8026E474 9222040C */  lbu       $v0, 0x40c($s1)
-/* 19CD58 8026E478 2442FFFF */  addiu     $v0, $v0, -1
-/* 19CD5C 8026E47C A2220425 */  sb        $v0, 0x425($s1)
-/* 19CD60 8026E480 00021600 */  sll       $v0, $v0, 0x18
-/* 19CD64 8026E484 00021603 */  sra       $v0, $v0, 0x18
-/* 19CD68 8026E488 02221021 */  addu      $v0, $s1, $v0
-/* 19CD6C 8026E48C 8043040D */  lb        $v1, 0x40d($v0)
-.L8026E490:
-/* 19CD70 8026E490 00031080 */  sll       $v0, $v1, 2
-/* 19CD74 8026E494 00431021 */  addu      $v0, $v0, $v1
-/* 19CD78 8026E498 00021080 */  sll       $v0, $v0, 2
-/* 19CD7C 8026E49C 2442022C */  addiu     $v0, $v0, 0x22c
-/* 19CD80 8026E4A0 02221821 */  addu      $v1, $s1, $v0
-/* 19CD84 8026E4A4 94620000 */  lhu       $v0, ($v1)
-/* 19CD88 8026E4A8 A6220428 */  sh        $v0, 0x428($s1)
-/* 19CD8C 8026E4AC 90630003 */  lbu       $v1, 3($v1)
-/* 19CD90 8026E4B0 24020002 */  addiu     $v0, $zero, 2
-/* 19CD94 8026E4B4 0809B950 */  j         .L8026E540
-/* 19CD98 8026E4B8 A2230426 */   sb       $v1, 0x426($s1)
-.L8026E4BC:
-/* 19CD9C 8026E4BC 82230425 */  lb        $v1, 0x425($s1)
-/* 19CDA0 8026E4C0 8222040C */  lb        $v0, 0x40c($s1)
-/* 19CDA4 8026E4C4 14800003 */  bnez      $a0, .L8026E4D4
-/* 19CDA8 8026E4C8 0000302D */   daddu    $a2, $zero, $zero
-/* 19CDAC 8026E4CC 0809B936 */  j         .L8026E4D8
-/* 19CDB0 8026E4D0 24630001 */   addiu    $v1, $v1, 1
-.L8026E4D4:
-/* 19CDB4 8026E4D4 2463FFFF */  addiu     $v1, $v1, -1
-.L8026E4D8:
-/* 19CDB8 8026E4D8 04630004 */  bgezl     $v1, .L8026E4EC
-/* 19CDBC 8026E4DC 0062102A */   slt      $v0, $v1, $v0
-/* 19CDC0 8026E4E0 2443FFFF */  addiu     $v1, $v0, -1
-/* 19CDC4 8026E4E4 2406FFFF */  addiu     $a2, $zero, -1
-/* 19CDC8 8026E4E8 0062102A */  slt       $v0, $v1, $v0
-.L8026E4EC:
-/* 19CDCC 8026E4EC 14400004 */  bnez      $v0, .L8026E500
-/* 19CDD0 8026E4F0 00031600 */   sll      $v0, $v1, 0x18
-/* 19CDD4 8026E4F4 0000182D */  daddu     $v1, $zero, $zero
-/* 19CDD8 8026E4F8 2406FFFF */  addiu     $a2, $zero, -1
-/* 19CDDC 8026E4FC 00031600 */  sll       $v0, $v1, 0x18
-.L8026E500:
-/* 19CDE0 8026E500 00021603 */  sra       $v0, $v0, 0x18
-/* 19CDE4 8026E504 02221021 */  addu      $v0, $s1, $v0
-/* 19CDE8 8026E508 A2230425 */  sb        $v1, 0x425($s1)
-/* 19CDEC 8026E50C 8043040D */  lb        $v1, 0x40d($v0)
-/* 19CDF0 8026E510 00031080 */  sll       $v0, $v1, 2
-/* 19CDF4 8026E514 00431021 */  addu      $v0, $v0, $v1
-/* 19CDF8 8026E518 00021080 */  sll       $v0, $v0, 2
-/* 19CDFC 8026E51C 2442022C */  addiu     $v0, $v0, 0x22c
-/* 19CE00 8026E520 02221821 */  addu      $v1, $s1, $v0
-/* 19CE04 8026E524 94620000 */  lhu       $v0, ($v1)
-/* 19CE08 8026E528 A6220428 */  sh        $v0, 0x428($s1)
-/* 19CE0C 8026E52C 90620003 */  lbu       $v0, 3($v1)
-/* 19CE10 8026E530 0240202D */  daddu     $a0, $s2, $zero
-/* 19CE14 8026E534 0C0B2026 */  jal       evt_set_variable
-/* 19CE18 8026E538 A2220426 */   sb       $v0, 0x426($s1)
-/* 19CE1C 8026E53C 24020002 */  addiu     $v0, $zero, 2
-.L8026E540:
-/* 19CE20 8026E540 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 19CE24 8026E544 8FB20018 */  lw        $s2, 0x18($sp)
-/* 19CE28 8026E548 8FB10014 */  lw        $s1, 0x14($sp)
-/* 19CE2C 8026E54C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 19CE30 8026E550 03E00008 */  jr        $ra
-/* 19CE34 8026E554 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/197F40/GetOwnerTarget.s b/ver/us/asm/nonmatchings/197F40/GetOwnerTarget.s
deleted file mode 100644
index 23539cb460..0000000000
--- a/ver/us/asm/nonmatchings/197F40/GetOwnerTarget.s
+++ /dev/null
@@ -1,30 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel GetOwnerTarget
-/* 19D18C 8026E8AC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 19D190 8026E8B0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 19D194 8026E8B4 0080882D */  daddu     $s1, $a0, $zero
-/* 19D198 8026E8B8 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 19D19C 8026E8BC AFB20018 */  sw        $s2, 0x18($sp)
-/* 19D1A0 8026E8C0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 19D1A4 8026E8C4 8E240148 */  lw        $a0, 0x148($s1)
-/* 19D1A8 8026E8C8 0C09A75B */  jal       get_actor
-/* 19D1AC 8026E8CC 8E30000C */   lw       $s0, 0xc($s1)
-/* 19D1B0 8026E8D0 0040902D */  daddu     $s2, $v0, $zero
-/* 19D1B4 8026E8D4 8E050000 */  lw        $a1, ($s0)
-/* 19D1B8 8026E8D8 86460428 */  lh        $a2, 0x428($s2)
-/* 19D1BC 8026E8DC 8E100004 */  lw        $s0, 4($s0)
-/* 19D1C0 8026E8E0 0C0B2026 */  jal       evt_set_variable
-/* 19D1C4 8026E8E4 0220202D */   daddu    $a0, $s1, $zero
-/* 19D1C8 8026E8E8 0220202D */  daddu     $a0, $s1, $zero
-/* 19D1CC 8026E8EC 82460426 */  lb        $a2, 0x426($s2)
-/* 19D1D0 8026E8F0 0C0B2026 */  jal       evt_set_variable
-/* 19D1D4 8026E8F4 0200282D */   daddu    $a1, $s0, $zero
-/* 19D1D8 8026E8F8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 19D1DC 8026E8FC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 19D1E0 8026E900 8FB10014 */  lw        $s1, 0x14($sp)
-/* 19D1E4 8026E904 8FB00010 */  lw        $s0, 0x10($sp)
-/* 19D1E8 8026E908 24020002 */  addiu     $v0, $zero, 2
-/* 19D1EC 8026E90C 03E00008 */  jr        $ra
-/* 19D1F0 8026E910 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/197F40/ResetActorSounds.s b/ver/us/asm/nonmatchings/197F40/ResetActorSounds.s
deleted file mode 100644
index fd195c8a17..0000000000
--- a/ver/us/asm/nonmatchings/197F40/ResetActorSounds.s
+++ /dev/null
@@ -1,133 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel jtbl_8029D7D8
-.word .L8026F8D4_19E1B4, .L8026F914_19E1F4, .L8026F954_19E234, .L8026F978_19E258, .L8026F99C_19E27C, .L8026F9C0_19E2A0
-
-.section .text
-
-glabel ResetActorSounds
-/* 19E118 8026F838 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 19E11C 8026F83C AFB20018 */  sw        $s2, 0x18($sp)
-/* 19E120 8026F840 0080902D */  daddu     $s2, $a0, $zero
-/* 19E124 8026F844 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 19E128 8026F848 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 19E12C 8026F84C AFB10014 */  sw        $s1, 0x14($sp)
-/* 19E130 8026F850 AFB00010 */  sw        $s0, 0x10($sp)
-/* 19E134 8026F854 8E50000C */  lw        $s0, 0xc($s2)
-/* 19E138 8026F858 8E050000 */  lw        $a1, ($s0)
-/* 19E13C 8026F85C 0C0B1EAF */  jal       evt_get_variable
-/* 19E140 8026F860 26100004 */   addiu    $s0, $s0, 4
-/* 19E144 8026F864 0040882D */  daddu     $s1, $v0, $zero
-/* 19E148 8026F868 2402FF81 */  addiu     $v0, $zero, -0x7f
-/* 19E14C 8026F86C 16220002 */  bne       $s1, $v0, .L8026F878
-/* 19E150 8026F870 00000000 */   nop
-/* 19E154 8026F874 8E510148 */  lw        $s1, 0x148($s2)
-.L8026F878:
-/* 19E158 8026F878 8E050000 */  lw        $a1, ($s0)
-/* 19E15C 8026F87C 26100004 */  addiu     $s0, $s0, 4
-/* 19E160 8026F880 0C0B1EAF */  jal       evt_get_variable
-/* 19E164 8026F884 0240202D */   daddu    $a0, $s2, $zero
-/* 19E168 8026F888 8E050000 */  lw        $a1, ($s0)
-/* 19E16C 8026F88C 26100004 */  addiu     $s0, $s0, 4
-/* 19E170 8026F890 0240202D */  daddu     $a0, $s2, $zero
-/* 19E174 8026F894 0C0B1EAF */  jal       evt_get_variable
-/* 19E178 8026F898 0040982D */   daddu    $s3, $v0, $zero
-/* 19E17C 8026F89C 8E050000 */  lw        $a1, ($s0)
-/* 19E180 8026F8A0 0C0B1EAF */  jal       evt_get_variable
-/* 19E184 8026F8A4 0240202D */   daddu    $a0, $s2, $zero
-/* 19E188 8026F8A8 0C09A75B */  jal       get_actor
-/* 19E18C 8026F8AC 0220202D */   daddu    $a0, $s1, $zero
-/* 19E190 8026F8B0 0040202D */  daddu     $a0, $v0, $zero
-/* 19E194 8026F8B4 2E620006 */  sltiu     $v0, $s3, 6
-/* 19E198 8026F8B8 10400049 */  beqz      $v0, .L8026F9E0
-/* 19E19C 8026F8BC 00131080 */   sll      $v0, $s3, 2
-/* 19E1A0 8026F8C0 3C01802A */  lui       $at, %hi(jtbl_8029D7D8)
-/* 19E1A4 8026F8C4 00220821 */  addu      $at, $at, $v0
-/* 19E1A8 8026F8C8 8C22D7D8 */  lw        $v0, %lo(jtbl_8029D7D8)($at)
-/* 19E1AC 8026F8CC 00400008 */  jr        $v0
-/* 19E1B0 8026F8D0 00000000 */   nop
-.L8026F8D4_19E1B4:
-/* 19E1B4 8026F8D4 90830136 */  lbu       $v1, 0x136($a0)
-/* 19E1B8 8026F8D8 000310C0 */  sll       $v0, $v1, 3
-/* 19E1BC 8026F8DC 00431023 */  subu      $v0, $v0, $v1
-/* 19E1C0 8026F8E0 00021080 */  sll       $v0, $v0, 2
-/* 19E1C4 8026F8E4 3C018028 */  lui       $at, %hi(bActorSoundTable)
-/* 19E1C8 8026F8E8 00220821 */  addu      $at, $at, $v0
-/* 19E1CC 8026F8EC 8C221468 */  lw        $v0, %lo(bActorSoundTable)($at)
-/* 19E1D0 8026F8F0 AC82019C */  sw        $v0, 0x19c($a0)
-/* 19E1D4 8026F8F4 000310C0 */  sll       $v0, $v1, 3
-/* 19E1D8 8026F8F8 00431023 */  subu      $v0, $v0, $v1
-/* 19E1DC 8026F8FC 00021080 */  sll       $v0, $v0, 2
-/* 19E1E0 8026F900 3C018028 */  lui       $at, %hi(bActorSoundTable+0x4)
-/* 19E1E4 8026F904 00220821 */  addu      $at, $at, $v0
-/* 19E1E8 8026F908 8C22146C */  lw        $v0, %lo(bActorSoundTable+0x4)($at)
-/* 19E1EC 8026F90C 0809BE78 */  j         .L8026F9E0
-/* 19E1F0 8026F910 AC8201A0 */   sw       $v0, 0x1a0($a0)
-.L8026F914_19E1F4:
-/* 19E1F4 8026F914 90830136 */  lbu       $v1, 0x136($a0)
-/* 19E1F8 8026F918 000310C0 */  sll       $v0, $v1, 3
-/* 19E1FC 8026F91C 00431023 */  subu      $v0, $v0, $v1
-/* 19E200 8026F920 00021080 */  sll       $v0, $v0, 2
-/* 19E204 8026F924 3C018028 */  lui       $at, %hi(bActorSoundTable+0x8)
-/* 19E208 8026F928 00220821 */  addu      $at, $at, $v0
-/* 19E20C 8026F92C 8C221470 */  lw        $v0, %lo(bActorSoundTable+0x8)($at)
-/* 19E210 8026F930 AC8201A4 */  sw        $v0, 0x1a4($a0)
-/* 19E214 8026F934 000310C0 */  sll       $v0, $v1, 3
-/* 19E218 8026F938 00431023 */  subu      $v0, $v0, $v1
-/* 19E21C 8026F93C 00021080 */  sll       $v0, $v0, 2
-/* 19E220 8026F940 3C018028 */  lui       $at, %hi(bActorSoundTable+0xC)
-/* 19E224 8026F944 00220821 */  addu      $at, $at, $v0
-/* 19E228 8026F948 8C221474 */  lw        $v0, %lo(bActorSoundTable+0xC)($at)
-/* 19E22C 8026F94C 0809BE78 */  j         .L8026F9E0
-/* 19E230 8026F950 AC8201A8 */   sw       $v0, 0x1a8($a0)
-.L8026F954_19E234:
-/* 19E234 8026F954 90820136 */  lbu       $v0, 0x136($a0)
-/* 19E238 8026F958 000218C0 */  sll       $v1, $v0, 3
-/* 19E23C 8026F95C 00621823 */  subu      $v1, $v1, $v0
-/* 19E240 8026F960 00031880 */  sll       $v1, $v1, 2
-/* 19E244 8026F964 3C028028 */  lui       $v0, %hi(bActorSoundTable+0x10)
-/* 19E248 8026F968 00431021 */  addu      $v0, $v0, $v1
-/* 19E24C 8026F96C 8C421478 */  lw        $v0, %lo(bActorSoundTable+0x10)($v0)
-/* 19E250 8026F970 0809BE78 */  j         .L8026F9E0
-/* 19E254 8026F974 AC8201AC */   sw       $v0, 0x1ac($a0)
-.L8026F978_19E258:
-/* 19E258 8026F978 90820136 */  lbu       $v0, 0x136($a0)
-/* 19E25C 8026F97C 000218C0 */  sll       $v1, $v0, 3
-/* 19E260 8026F980 00621823 */  subu      $v1, $v1, $v0
-/* 19E264 8026F984 00031880 */  sll       $v1, $v1, 2
-/* 19E268 8026F988 3C028028 */  lui       $v0, %hi(bActorSoundTable+0x14)
-/* 19E26C 8026F98C 00431021 */  addu      $v0, $v0, $v1
-/* 19E270 8026F990 8C42147C */  lw        $v0, %lo(bActorSoundTable+0x14)($v0)
-/* 19E274 8026F994 0809BE78 */  j         .L8026F9E0
-/* 19E278 8026F998 AC8201B0 */   sw       $v0, 0x1b0($a0)
-.L8026F99C_19E27C:
-/* 19E27C 8026F99C 90820136 */  lbu       $v0, 0x136($a0)
-/* 19E280 8026F9A0 000218C0 */  sll       $v1, $v0, 3
-/* 19E284 8026F9A4 00621823 */  subu      $v1, $v1, $v0
-/* 19E288 8026F9A8 00031880 */  sll       $v1, $v1, 2
-/* 19E28C 8026F9AC 3C028028 */  lui       $v0, %hi(bActorSoundTable+0x18)
-/* 19E290 8026F9B0 00431021 */  addu      $v0, $v0, $v1
-/* 19E294 8026F9B4 94421480 */  lhu       $v0, %lo(bActorSoundTable+0x18)($v0)
-/* 19E298 8026F9B8 0809BE78 */  j         .L8026F9E0
-/* 19E29C 8026F9BC A48201B4 */   sh       $v0, 0x1b4($a0)
-.L8026F9C0_19E2A0:
-/* 19E2A0 8026F9C0 90820136 */  lbu       $v0, 0x136($a0)
-/* 19E2A4 8026F9C4 000218C0 */  sll       $v1, $v0, 3
-/* 19E2A8 8026F9C8 00621823 */  subu      $v1, $v1, $v0
-/* 19E2AC 8026F9CC 00031880 */  sll       $v1, $v1, 2
-/* 19E2B0 8026F9D0 3C028028 */  lui       $v0, %hi(bActorSoundTable+0x1A)
-/* 19E2B4 8026F9D4 00431021 */  addu      $v0, $v0, $v1
-/* 19E2B8 8026F9D8 94421482 */  lhu       $v0, %lo(bActorSoundTable+0x1A)($v0)
-/* 19E2BC 8026F9DC A48201B6 */  sh        $v0, 0x1b6($a0)
-.L8026F9E0:
-/* 19E2C0 8026F9E0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 19E2C4 8026F9E4 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 19E2C8 8026F9E8 8FB20018 */  lw        $s2, 0x18($sp)
-/* 19E2CC 8026F9EC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 19E2D0 8026F9F0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 19E2D4 8026F9F4 24020002 */  addiu     $v0, $zero, 2
-/* 19E2D8 8026F9F8 03E00008 */  jr        $ra
-/* 19E2DC 8026F9FC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/197F40/SetActorSounds.s b/ver/us/asm/nonmatchings/197F40/SetActorSounds.s
deleted file mode 100644
index 2c41a3e87d..0000000000
--- a/ver/us/asm/nonmatchings/197F40/SetActorSounds.s
+++ /dev/null
@@ -1,81 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel jtbl_8029D7C0
-.word .L8026F7E4_19E0C4, .L8026F7F0_19E0D0, .L8026F7FC_19E0DC, .L8026F804_19E0E4, .L8026F80C_19E0EC, .L8026F814_19E0F4
-
-.section .text
-
-glabel SetActorSounds
-/* 19E020 8026F740 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 19E024 8026F744 AFB20018 */  sw        $s2, 0x18($sp)
-/* 19E028 8026F748 0080902D */  daddu     $s2, $a0, $zero
-/* 19E02C 8026F74C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 19E030 8026F750 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 19E034 8026F754 AFB10014 */  sw        $s1, 0x14($sp)
-/* 19E038 8026F758 AFB00010 */  sw        $s0, 0x10($sp)
-/* 19E03C 8026F75C 8E50000C */  lw        $s0, 0xc($s2)
-/* 19E040 8026F760 8E050000 */  lw        $a1, ($s0)
-/* 19E044 8026F764 0C0B1EAF */  jal       evt_get_variable
-/* 19E048 8026F768 26100004 */   addiu    $s0, $s0, 4
-/* 19E04C 8026F76C 0040882D */  daddu     $s1, $v0, $zero
-/* 19E050 8026F770 2402FF81 */  addiu     $v0, $zero, -0x7f
-/* 19E054 8026F774 16220002 */  bne       $s1, $v0, .L8026F780
-/* 19E058 8026F778 00000000 */   nop
-/* 19E05C 8026F77C 8E510148 */  lw        $s1, 0x148($s2)
-.L8026F780:
-/* 19E060 8026F780 8E050000 */  lw        $a1, ($s0)
-/* 19E064 8026F784 26100004 */  addiu     $s0, $s0, 4
-/* 19E068 8026F788 0C0B1EAF */  jal       evt_get_variable
-/* 19E06C 8026F78C 0240202D */   daddu    $a0, $s2, $zero
-/* 19E070 8026F790 8E050000 */  lw        $a1, ($s0)
-/* 19E074 8026F794 26100004 */  addiu     $s0, $s0, 4
-/* 19E078 8026F798 0240202D */  daddu     $a0, $s2, $zero
-/* 19E07C 8026F79C 0C0B1EAF */  jal       evt_get_variable
-/* 19E080 8026F7A0 0040982D */   daddu    $s3, $v0, $zero
-/* 19E084 8026F7A4 0240202D */  daddu     $a0, $s2, $zero
-/* 19E088 8026F7A8 8E050000 */  lw        $a1, ($s0)
-/* 19E08C 8026F7AC 0C0B1EAF */  jal       evt_get_variable
-/* 19E090 8026F7B0 0040802D */   daddu    $s0, $v0, $zero
-/* 19E094 8026F7B4 0220202D */  daddu     $a0, $s1, $zero
-/* 19E098 8026F7B8 0C09A75B */  jal       get_actor
-/* 19E09C 8026F7BC 0040882D */   daddu    $s1, $v0, $zero
-/* 19E0A0 8026F7C0 0040182D */  daddu     $v1, $v0, $zero
-/* 19E0A4 8026F7C4 2E620006 */  sltiu     $v0, $s3, 6
-/* 19E0A8 8026F7C8 10400013 */  beqz      $v0, .L8026F818
-/* 19E0AC 8026F7CC 00131080 */   sll      $v0, $s3, 2
-/* 19E0B0 8026F7D0 3C01802A */  lui       $at, %hi(jtbl_8029D7C0)
-/* 19E0B4 8026F7D4 00220821 */  addu      $at, $at, $v0
-/* 19E0B8 8026F7D8 8C22D7C0 */  lw        $v0, %lo(jtbl_8029D7C0)($at)
-/* 19E0BC 8026F7DC 00400008 */  jr        $v0
-/* 19E0C0 8026F7E0 00000000 */   nop
-.L8026F7E4_19E0C4:
-/* 19E0C4 8026F7E4 AC70019C */  sw        $s0, 0x19c($v1)
-/* 19E0C8 8026F7E8 0809BE06 */  j         .L8026F818
-/* 19E0CC 8026F7EC AC7101A0 */   sw       $s1, 0x1a0($v1)
-.L8026F7F0_19E0D0:
-/* 19E0D0 8026F7F0 AC7001A4 */  sw        $s0, 0x1a4($v1)
-/* 19E0D4 8026F7F4 0809BE06 */  j         .L8026F818
-/* 19E0D8 8026F7F8 AC7101A8 */   sw       $s1, 0x1a8($v1)
-.L8026F7FC_19E0DC:
-/* 19E0DC 8026F7FC 0809BE06 */  j         .L8026F818
-/* 19E0E0 8026F800 AC7001AC */   sw       $s0, 0x1ac($v1)
-.L8026F804_19E0E4:
-/* 19E0E4 8026F804 0809BE06 */  j         .L8026F818
-/* 19E0E8 8026F808 AC7001B0 */   sw       $s0, 0x1b0($v1)
-.L8026F80C_19E0EC:
-/* 19E0EC 8026F80C 0809BE06 */  j         .L8026F818
-/* 19E0F0 8026F810 A47001B4 */   sh       $s0, 0x1b4($v1)
-.L8026F814_19E0F4:
-/* 19E0F4 8026F814 A47001B6 */  sh        $s0, 0x1b6($v1)
-.L8026F818:
-/* 19E0F8 8026F818 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 19E0FC 8026F81C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 19E100 8026F820 8FB20018 */  lw        $s2, 0x18($sp)
-/* 19E104 8026F824 8FB10014 */  lw        $s1, 0x14($sp)
-/* 19E108 8026F828 8FB00010 */  lw        $s0, 0x10($sp)
-/* 19E10C 8026F82C 24020002 */  addiu     $v0, $zero, 2
-/* 19E110 8026F830 03E00008 */  jr        $ra
-/* 19E114 8026F834 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/197F40/SetPartSounds.s b/ver/us/asm/nonmatchings/197F40/SetPartSounds.s
deleted file mode 100644
index ef5f645774..0000000000
--- a/ver/us/asm/nonmatchings/197F40/SetPartSounds.s
+++ /dev/null
@@ -1,91 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel jtbl_8029D7F0
-.word .L8026FAC8_19E3A8, .L8026FAD4_19E3B4, .L8026FAE0_19E3C0, .L8026FAE8_19E3C8, .L8026FAF0_19E3D0, .L8026FAF8_19E3D8
-
-.section .text
-
-glabel SetPartSounds
-/* 19E2E0 8026FA00 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 19E2E4 8026FA04 AFB20018 */  sw        $s2, 0x18($sp)
-/* 19E2E8 8026FA08 0080902D */  daddu     $s2, $a0, $zero
-/* 19E2EC 8026FA0C AFBF0024 */  sw        $ra, 0x24($sp)
-/* 19E2F0 8026FA10 AFB40020 */  sw        $s4, 0x20($sp)
-/* 19E2F4 8026FA14 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 19E2F8 8026FA18 AFB10014 */  sw        $s1, 0x14($sp)
-/* 19E2FC 8026FA1C AFB00010 */  sw        $s0, 0x10($sp)
-/* 19E300 8026FA20 8E51000C */  lw        $s1, 0xc($s2)
-/* 19E304 8026FA24 8E250000 */  lw        $a1, ($s1)
-/* 19E308 8026FA28 0C0B1EAF */  jal       evt_get_variable
-/* 19E30C 8026FA2C 26310004 */   addiu    $s1, $s1, 4
-/* 19E310 8026FA30 0040982D */  daddu     $s3, $v0, $zero
-/* 19E314 8026FA34 2402FF81 */  addiu     $v0, $zero, -0x7f
-/* 19E318 8026FA38 16620002 */  bne       $s3, $v0, .L8026FA44
-/* 19E31C 8026FA3C 00000000 */   nop
-/* 19E320 8026FA40 8E530148 */  lw        $s3, 0x148($s2)
-.L8026FA44:
-/* 19E324 8026FA44 8E250000 */  lw        $a1, ($s1)
-/* 19E328 8026FA48 26310004 */  addiu     $s1, $s1, 4
-/* 19E32C 8026FA4C 0C0B1EAF */  jal       evt_get_variable
-/* 19E330 8026FA50 0240202D */   daddu    $a0, $s2, $zero
-/* 19E334 8026FA54 8E250000 */  lw        $a1, ($s1)
-/* 19E338 8026FA58 26310004 */  addiu     $s1, $s1, 4
-/* 19E33C 8026FA5C 0240202D */  daddu     $a0, $s2, $zero
-/* 19E340 8026FA60 0C0B1EAF */  jal       evt_get_variable
-/* 19E344 8026FA64 0040802D */   daddu    $s0, $v0, $zero
-/* 19E348 8026FA68 8E250000 */  lw        $a1, ($s1)
-/* 19E34C 8026FA6C 26310004 */  addiu     $s1, $s1, 4
-/* 19E350 8026FA70 0240202D */  daddu     $a0, $s2, $zero
-/* 19E354 8026FA74 0C0B1EAF */  jal       evt_get_variable
-/* 19E358 8026FA78 0040A02D */   daddu    $s4, $v0, $zero
-/* 19E35C 8026FA7C 0240202D */  daddu     $a0, $s2, $zero
-/* 19E360 8026FA80 8E250000 */  lw        $a1, ($s1)
-/* 19E364 8026FA84 0C0B1EAF */  jal       evt_get_variable
-/* 19E368 8026FA88 0040882D */   daddu    $s1, $v0, $zero
-/* 19E36C 8026FA8C 0260202D */  daddu     $a0, $s3, $zero
-/* 19E370 8026FA90 0C09A75B */  jal       get_actor
-/* 19E374 8026FA94 0040902D */   daddu    $s2, $v0, $zero
-/* 19E378 8026FA98 0040202D */  daddu     $a0, $v0, $zero
-/* 19E37C 8026FA9C 0C099117 */  jal       get_actor_part
-/* 19E380 8026FAA0 0200282D */   daddu    $a1, $s0, $zero
-/* 19E384 8026FAA4 0040182D */  daddu     $v1, $v0, $zero
-/* 19E388 8026FAA8 2E820006 */  sltiu     $v0, $s4, 6
-/* 19E38C 8026FAAC 10400013 */  beqz      $v0, .L8026FAFC
-/* 19E390 8026FAB0 00141080 */   sll      $v0, $s4, 2
-/* 19E394 8026FAB4 3C01802A */  lui       $at, %hi(jtbl_8029D7F0)
-/* 19E398 8026FAB8 00220821 */  addu      $at, $at, $v0
-/* 19E39C 8026FABC 8C22D7F0 */  lw        $v0, %lo(jtbl_8029D7F0)($at)
-/* 19E3A0 8026FAC0 00400008 */  jr        $v0
-/* 19E3A4 8026FAC4 00000000 */   nop
-.L8026FAC8_19E3A8:
-/* 19E3A8 8026FAC8 AC7100A4 */  sw        $s1, 0xa4($v1)
-/* 19E3AC 8026FACC 0809BEBF */  j         .L8026FAFC
-/* 19E3B0 8026FAD0 AC7200A8 */   sw       $s2, 0xa8($v1)
-.L8026FAD4_19E3B4:
-/* 19E3B4 8026FAD4 AC7100AC */  sw        $s1, 0xac($v1)
-/* 19E3B8 8026FAD8 0809BEBF */  j         .L8026FAFC
-/* 19E3BC 8026FADC AC7200B0 */   sw       $s2, 0xb0($v1)
-.L8026FAE0_19E3C0:
-/* 19E3C0 8026FAE0 0809BEBF */  j         .L8026FAFC
-/* 19E3C4 8026FAE4 AC7100B4 */   sw       $s1, 0xb4($v1)
-.L8026FAE8_19E3C8:
-/* 19E3C8 8026FAE8 0809BEBF */  j         .L8026FAFC
-/* 19E3CC 8026FAEC AC7100B8 */   sw       $s1, 0xb8($v1)
-.L8026FAF0_19E3D0:
-/* 19E3D0 8026FAF0 0809BEBF */  j         .L8026FAFC
-/* 19E3D4 8026FAF4 A47100BC */   sh       $s1, 0xbc($v1)
-.L8026FAF8_19E3D8:
-/* 19E3D8 8026FAF8 A47100BE */  sh        $s1, 0xbe($v1)
-.L8026FAFC:
-/* 19E3DC 8026FAFC 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 19E3E0 8026FB00 8FB40020 */  lw        $s4, 0x20($sp)
-/* 19E3E4 8026FB04 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 19E3E8 8026FB08 8FB20018 */  lw        $s2, 0x18($sp)
-/* 19E3EC 8026FB0C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 19E3F0 8026FB10 8FB00010 */  lw        $s0, 0x10($sp)
-/* 19E3F4 8026FB14 24020002 */  addiu     $v0, $zero, 2
-/* 19E3F8 8026FB18 03E00008 */  jr        $ra
-/* 19E3FC 8026FB1C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/197F40/func_8026E914.s b/ver/us/asm/nonmatchings/197F40/func_8026E914.s
deleted file mode 100644
index cd599906d9..0000000000
--- a/ver/us/asm/nonmatchings/197F40/func_8026E914.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8026E914
-/* 19D1F4 8026E914 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 19D1F8 8026E918 AFB00010 */  sw        $s0, 0x10($sp)
-/* 19D1FC 8026E91C 0080802D */  daddu     $s0, $a0, $zero
-/* 19D200 8026E920 AFB20018 */  sw        $s2, 0x18($sp)
-/* 19D204 8026E924 3C12800E */  lui       $s2, %hi(gBattleStatus)
-/* 19D208 8026E928 2652C070 */  addiu     $s2, $s2, %lo(gBattleStatus)
-/* 19D20C 8026E92C AFBF001C */  sw        $ra, 0x1c($sp)
-/* 19D210 8026E930 AFB10014 */  sw        $s1, 0x14($sp)
-/* 19D214 8026E934 8E02000C */  lw        $v0, 0xc($s0)
-/* 19D218 8026E938 864601A4 */  lh        $a2, 0x1a4($s2)
-/* 19D21C 8026E93C 8C450000 */  lw        $a1, ($v0)
-/* 19D220 8026E940 0C0B2026 */  jal       evt_set_variable
-/* 19D224 8026E944 8C510004 */   lw       $s1, 4($v0)
-/* 19D228 8026E948 0200202D */  daddu     $a0, $s0, $zero
-/* 19D22C 8026E94C 824601A6 */  lb        $a2, 0x1a6($s2)
-/* 19D230 8026E950 0C0B2026 */  jal       evt_set_variable
-/* 19D234 8026E954 0220282D */   daddu    $a1, $s1, $zero
-/* 19D238 8026E958 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 19D23C 8026E95C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 19D240 8026E960 8FB10014 */  lw        $s1, 0x14($sp)
-/* 19D244 8026E964 8FB00010 */  lw        $s0, 0x10($sp)
-/* 19D248 8026E968 24020002 */  addiu     $v0, $zero, 2
-/* 19D24C 8026E96C 03E00008 */  jr        $ra
-/* 19D250 8026E970 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/197F40/func_8026E9A0.s b/ver/us/asm/nonmatchings/197F40/func_8026E9A0.s
deleted file mode 100644
index 2aa3f44c7d..0000000000
--- a/ver/us/asm/nonmatchings/197F40/func_8026E9A0.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8026E9A0
-/* 19D280 8026E9A0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 19D284 8026E9A4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 19D288 8026E9A8 0080882D */  daddu     $s1, $a0, $zero
-/* 19D28C 8026E9AC AFBF0018 */  sw        $ra, 0x18($sp)
-/* 19D290 8026E9B0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 19D294 8026E9B4 8E30000C */  lw        $s0, 0xc($s1)
-/* 19D298 8026E9B8 8E050000 */  lw        $a1, ($s0)
-/* 19D29C 8026E9BC 0C0B1EAF */  jal       evt_get_variable
-/* 19D2A0 8026E9C0 26100004 */   addiu    $s0, $s0, 4
-/* 19D2A4 8026E9C4 0220202D */  daddu     $a0, $s1, $zero
-/* 19D2A8 8026E9C8 8E050000 */  lw        $a1, ($s0)
-/* 19D2AC 8026E9CC 0C0B1EAF */  jal       evt_get_variable
-/* 19D2B0 8026E9D0 0040802D */   daddu    $s0, $v0, $zero
-/* 19D2B4 8026E9D4 3C03800E */  lui       $v1, %hi(gBattleStatus)
-/* 19D2B8 8026E9D8 2463C070 */  addiu     $v1, $v1, %lo(gBattleStatus)
-/* 19D2BC 8026E9DC A06201A6 */  sb        $v0, 0x1a6($v1)
-/* 19D2C0 8026E9E0 A47001A4 */  sh        $s0, 0x1a4($v1)
-/* 19D2C4 8026E9E4 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 19D2C8 8026E9E8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 19D2CC 8026E9EC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 19D2D0 8026E9F0 24020002 */  addiu     $v0, $zero, 2
-/* 19D2D4 8026E9F4 03E00008 */  jr        $ra
-/* 19D2D8 8026E9F8 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/197F40/func_8026EB20.s b/ver/us/asm/nonmatchings/197F40/func_8026EB20.s
deleted file mode 100644
index 6e827a29c7..0000000000
--- a/ver/us/asm/nonmatchings/197F40/func_8026EB20.s
+++ /dev/null
@@ -1,59 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8026EB20
-/* 19D400 8026EB20 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 19D404 8026EB24 AFB20018 */  sw        $s2, 0x18($sp)
-/* 19D408 8026EB28 0080902D */  daddu     $s2, $a0, $zero
-/* 19D40C 8026EB2C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 19D410 8026EB30 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 19D414 8026EB34 AFB10014 */  sw        $s1, 0x14($sp)
-/* 19D418 8026EB38 AFB00010 */  sw        $s0, 0x10($sp)
-/* 19D41C 8026EB3C 8E51000C */  lw        $s1, 0xc($s2)
-/* 19D420 8026EB40 8E250000 */  lw        $a1, ($s1)
-/* 19D424 8026EB44 0C0B1EAF */  jal       evt_get_variable
-/* 19D428 8026EB48 26310004 */   addiu    $s1, $s1, 4
-/* 19D42C 8026EB4C 0040802D */  daddu     $s0, $v0, $zero
-/* 19D430 8026EB50 8E250000 */  lw        $a1, ($s1)
-/* 19D434 8026EB54 26310004 */  addiu     $s1, $s1, 4
-/* 19D438 8026EB58 0C0B1EAF */  jal       evt_get_variable
-/* 19D43C 8026EB5C 0240202D */   daddu    $a0, $s2, $zero
-/* 19D440 8026EB60 0040982D */  daddu     $s3, $v0, $zero
-/* 19D444 8026EB64 2402FF81 */  addiu     $v0, $zero, -0x7f
-/* 19D448 8026EB68 16020002 */  bne       $s0, $v0, .L8026EB74
-/* 19D44C 8026EB6C 00000000 */   nop
-/* 19D450 8026EB70 8E500148 */  lw        $s0, 0x148($s2)
-.L8026EB74:
-/* 19D454 8026EB74 0C09A75B */  jal       get_actor
-/* 19D458 8026EB78 0200202D */   daddu    $a0, $s0, $zero
-/* 19D45C 8026EB7C 0040202D */  daddu     $a0, $v0, $zero
-/* 19D460 8026EB80 0C099117 */  jal       get_actor_part
-/* 19D464 8026EB84 0260282D */   daddu    $a1, $s3, $zero
-/* 19D468 8026EB88 8E250000 */  lw        $a1, ($s1)
-/* 19D46C 8026EB8C 26310004 */  addiu     $s1, $s1, 4
-/* 19D470 8026EB90 8C5000C0 */  lw        $s0, 0xc0($v0)
-/* 19D474 8026EB94 0C0B1EAF */  jal       evt_get_variable
-/* 19D478 8026EB98 0240202D */   daddu    $a0, $s2, $zero
-/* 19D47C 8026EB9C A6020740 */  sh        $v0, 0x740($s0)
-/* 19D480 8026EBA0 8E250000 */  lw        $a1, ($s1)
-/* 19D484 8026EBA4 26310004 */  addiu     $s1, $s1, 4
-/* 19D488 8026EBA8 0C0B1EAF */  jal       evt_get_variable
-/* 19D48C 8026EBAC 0240202D */   daddu    $a0, $s2, $zero
-/* 19D490 8026EBB0 A6020742 */  sh        $v0, 0x742($s0)
-/* 19D494 8026EBB4 8E250000 */  lw        $a1, ($s1)
-/* 19D498 8026EBB8 26310004 */  addiu     $s1, $s1, 4
-/* 19D49C 8026EBBC 0C0B1EAF */  jal       evt_get_variable
-/* 19D4A0 8026EBC0 0240202D */   daddu    $a0, $s2, $zero
-/* 19D4A4 8026EBC4 A6020744 */  sh        $v0, 0x744($s0)
-/* 19D4A8 8026EBC8 8E250000 */  lw        $a1, ($s1)
-/* 19D4AC 8026EBCC 0C0B1EAF */  jal       evt_get_variable
-/* 19D4B0 8026EBD0 0240202D */   daddu    $a0, $s2, $zero
-/* 19D4B4 8026EBD4 A6020746 */  sh        $v0, 0x746($s0)
-/* 19D4B8 8026EBD8 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 19D4BC 8026EBDC 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 19D4C0 8026EBE0 8FB20018 */  lw        $s2, 0x18($sp)
-/* 19D4C4 8026EBE4 8FB10014 */  lw        $s1, 0x14($sp)
-/* 19D4C8 8026EBE8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 19D4CC 8026EBEC 24020002 */  addiu     $v0, $zero, 2
-/* 19D4D0 8026EBF0 03E00008 */  jr        $ra
-/* 19D4D4 8026EBF4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/197F40/func_8026ED20.s b/ver/us/asm/nonmatchings/197F40/func_8026ED20.s
deleted file mode 100644
index e465f37fbf..0000000000
--- a/ver/us/asm/nonmatchings/197F40/func_8026ED20.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8026ED20
-/* 19D600 8026ED20 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 19D604 8026ED24 AFB20018 */  sw        $s2, 0x18($sp)
-/* 19D608 8026ED28 0080902D */  daddu     $s2, $a0, $zero
-/* 19D60C 8026ED2C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 19D610 8026ED30 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 19D614 8026ED34 AFB10014 */  sw        $s1, 0x14($sp)
-/* 19D618 8026ED38 AFB00010 */  sw        $s0, 0x10($sp)
-/* 19D61C 8026ED3C 8E50000C */  lw        $s0, 0xc($s2)
-/* 19D620 8026ED40 8E050000 */  lw        $a1, ($s0)
-/* 19D624 8026ED44 0C0B1EAF */  jal       evt_get_variable
-/* 19D628 8026ED48 26100004 */   addiu    $s0, $s0, 4
-/* 19D62C 8026ED4C 0040882D */  daddu     $s1, $v0, $zero
-/* 19D630 8026ED50 8E050000 */  lw        $a1, ($s0)
-/* 19D634 8026ED54 26100004 */  addiu     $s0, $s0, 4
-/* 19D638 8026ED58 0C0B1EAF */  jal       evt_get_variable
-/* 19D63C 8026ED5C 0240202D */   daddu    $a0, $s2, $zero
-/* 19D640 8026ED60 0240202D */  daddu     $a0, $s2, $zero
-/* 19D644 8026ED64 8E050000 */  lw        $a1, ($s0)
-/* 19D648 8026ED68 0C0B1EAF */  jal       evt_get_variable
-/* 19D64C 8026ED6C 0040802D */   daddu    $s0, $v0, $zero
-/* 19D650 8026ED70 0040982D */  daddu     $s3, $v0, $zero
-/* 19D654 8026ED74 2402FF81 */  addiu     $v0, $zero, -0x7f
-/* 19D658 8026ED78 16220002 */  bne       $s1, $v0, .L8026ED84
-/* 19D65C 8026ED7C 00000000 */   nop
-/* 19D660 8026ED80 8E510148 */  lw        $s1, 0x148($s2)
-.L8026ED84:
-/* 19D664 8026ED84 0C09A75B */  jal       get_actor
-/* 19D668 8026ED88 0220202D */   daddu    $a0, $s1, $zero
-/* 19D66C 8026ED8C 0040202D */  daddu     $a0, $v0, $zero
-/* 19D670 8026ED90 0C099117 */  jal       get_actor_part
-/* 19D674 8026ED94 0200282D */   daddu    $a1, $s0, $zero
-/* 19D678 8026ED98 12600005 */  beqz      $s3, .L8026EDB0
-/* 19D67C 8026ED9C 0040202D */   daddu    $a0, $v0, $zero
-/* 19D680 8026EDA0 8C820000 */  lw        $v0, ($a0)
-/* 19D684 8026EDA4 3C030100 */  lui       $v1, 0x100
-/* 19D688 8026EDA8 0809BB70 */  j         .L8026EDC0
-/* 19D68C 8026EDAC 00431025 */   or       $v0, $v0, $v1
-.L8026EDB0:
-/* 19D690 8026EDB0 3C03FEFF */  lui       $v1, 0xfeff
-/* 19D694 8026EDB4 8C820000 */  lw        $v0, ($a0)
-/* 19D698 8026EDB8 3463FFFF */  ori       $v1, $v1, 0xffff
-/* 19D69C 8026EDBC 00431024 */  and       $v0, $v0, $v1
-.L8026EDC0:
-/* 19D6A0 8026EDC0 AC820000 */  sw        $v0, ($a0)
-/* 19D6A4 8026EDC4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 19D6A8 8026EDC8 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 19D6AC 8026EDCC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 19D6B0 8026EDD0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 19D6B4 8026EDD4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 19D6B8 8026EDD8 24020002 */  addiu     $v0, $zero, 2
-/* 19D6BC 8026EDDC 03E00008 */  jr        $ra
-/* 19D6C0 8026EDE0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/197F40/func_8026EDE4.s b/ver/us/asm/nonmatchings/197F40/func_8026EDE4.s
deleted file mode 100644
index 368ea13531..0000000000
--- a/ver/us/asm/nonmatchings/197F40/func_8026EDE4.s
+++ /dev/null
@@ -1,46 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8026EDE4
-/* 19D6C4 8026EDE4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 19D6C8 8026EDE8 AFB20018 */  sw        $s2, 0x18($sp)
-/* 19D6CC 8026EDEC 0080902D */  daddu     $s2, $a0, $zero
-/* 19D6D0 8026EDF0 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 19D6D4 8026EDF4 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 19D6D8 8026EDF8 AFB10014 */  sw        $s1, 0x14($sp)
-/* 19D6DC 8026EDFC AFB00010 */  sw        $s0, 0x10($sp)
-/* 19D6E0 8026EE00 8E50000C */  lw        $s0, 0xc($s2)
-/* 19D6E4 8026EE04 8E050000 */  lw        $a1, ($s0)
-/* 19D6E8 8026EE08 0C0B1EAF */  jal       evt_get_variable
-/* 19D6EC 8026EE0C 26100004 */   addiu    $s0, $s0, 4
-/* 19D6F0 8026EE10 0040882D */  daddu     $s1, $v0, $zero
-/* 19D6F4 8026EE14 8E050000 */  lw        $a1, ($s0)
-/* 19D6F8 8026EE18 26100004 */  addiu     $s0, $s0, 4
-/* 19D6FC 8026EE1C 0C0B1EAF */  jal       evt_get_variable
-/* 19D700 8026EE20 0240202D */   daddu    $a0, $s2, $zero
-/* 19D704 8026EE24 0240202D */  daddu     $a0, $s2, $zero
-/* 19D708 8026EE28 8E050000 */  lw        $a1, ($s0)
-/* 19D70C 8026EE2C 0C0B1EAF */  jal       evt_get_variable
-/* 19D710 8026EE30 0040802D */   daddu    $s0, $v0, $zero
-/* 19D714 8026EE34 0040982D */  daddu     $s3, $v0, $zero
-/* 19D718 8026EE38 2402FF81 */  addiu     $v0, $zero, -0x7f
-/* 19D71C 8026EE3C 16220002 */  bne       $s1, $v0, .L8026EE48
-/* 19D720 8026EE40 00000000 */   nop
-/* 19D724 8026EE44 8E510148 */  lw        $s1, 0x148($s2)
-.L8026EE48:
-/* 19D728 8026EE48 0C09A75B */  jal       get_actor
-/* 19D72C 8026EE4C 0220202D */   daddu    $a0, $s1, $zero
-/* 19D730 8026EE50 0040202D */  daddu     $a0, $v0, $zero
-/* 19D734 8026EE54 0C099117 */  jal       get_actor_part
-/* 19D738 8026EE58 0200282D */   daddu    $a1, $s0, $zero
-/* 19D73C 8026EE5C 0040202D */  daddu     $a0, $v0, $zero
-/* 19D740 8026EE60 0C099BAA */  jal       func_80266EA8
-/* 19D744 8026EE64 0260282D */   daddu    $a1, $s3, $zero
-/* 19D748 8026EE68 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 19D74C 8026EE6C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 19D750 8026EE70 8FB20018 */  lw        $s2, 0x18($sp)
-/* 19D754 8026EE74 8FB10014 */  lw        $s1, 0x14($sp)
-/* 19D758 8026EE78 8FB00010 */  lw        $s0, 0x10($sp)
-/* 19D75C 8026EE7C 24020002 */  addiu     $v0, $zero, 2
-/* 19D760 8026EE80 03E00008 */  jr        $ra
-/* 19D764 8026EE84 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/197F40/func_8026F1A0.s b/ver/us/asm/nonmatchings/197F40/func_8026F1A0.s
deleted file mode 100644
index b75040643f..0000000000
--- a/ver/us/asm/nonmatchings/197F40/func_8026F1A0.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8026F1A0
-/* 19DA80 8026F1A0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 19DA84 8026F1A4 AFB20018 */  sw        $s2, 0x18($sp)
-/* 19DA88 8026F1A8 0080902D */  daddu     $s2, $a0, $zero
-/* 19DA8C 8026F1AC AFBF001C */  sw        $ra, 0x1c($sp)
-/* 19DA90 8026F1B0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 19DA94 8026F1B4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 19DA98 8026F1B8 8E50000C */  lw        $s0, 0xc($s2)
-/* 19DA9C 8026F1BC 8E050000 */  lw        $a1, ($s0)
-/* 19DAA0 8026F1C0 0C0B1EAF */  jal       evt_get_variable
-/* 19DAA4 8026F1C4 26100004 */   addiu    $s0, $s0, 4
-/* 19DAA8 8026F1C8 0040882D */  daddu     $s1, $v0, $zero
-/* 19DAAC 8026F1CC 8E050000 */  lw        $a1, ($s0)
-/* 19DAB0 8026F1D0 0C0B1EAF */  jal       evt_get_variable
-/* 19DAB4 8026F1D4 0240202D */   daddu    $a0, $s2, $zero
-/* 19DAB8 8026F1D8 0040802D */  daddu     $s0, $v0, $zero
-/* 19DABC 8026F1DC 2402FF81 */  addiu     $v0, $zero, -0x7f
-/* 19DAC0 8026F1E0 16220002 */  bne       $s1, $v0, .L8026F1EC
-/* 19DAC4 8026F1E4 00000000 */   nop
-/* 19DAC8 8026F1E8 8E510148 */  lw        $s1, 0x148($s2)
-.L8026F1EC:
-/* 19DACC 8026F1EC 0C09A75B */  jal       get_actor
-/* 19DAD0 8026F1F0 0220202D */   daddu    $a0, $s1, $zero
-/* 19DAD4 8026F1F4 16000007 */  bnez      $s0, .L8026F214
-/* 19DAD8 8026F1F8 0040202D */   daddu    $a0, $v0, $zero
-/* 19DADC 8026F1FC 3C03F7FF */  lui       $v1, 0xf7ff
-/* 19DAE0 8026F200 8C820000 */  lw        $v0, ($a0)
-/* 19DAE4 8026F204 3463FFFF */  ori       $v1, $v1, 0xffff
-/* 19DAE8 8026F208 00431024 */  and       $v0, $v0, $v1
-/* 19DAEC 8026F20C 0C099B90 */  jal       func_80266E40
-/* 19DAF0 8026F210 AC820000 */   sw       $v0, ($a0)
-.L8026F214:
-/* 19DAF4 8026F214 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 19DAF8 8026F218 8FB20018 */  lw        $s2, 0x18($sp)
-/* 19DAFC 8026F21C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 19DB00 8026F220 8FB00010 */  lw        $s0, 0x10($sp)
-/* 19DB04 8026F224 24020002 */  addiu     $v0, $zero, 2
-/* 19DB08 8026F228 03E00008 */  jr        $ra
-/* 19DB0C 8026F22C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/197F40/set_goal_pos_to_part.s b/ver/us/asm/nonmatchings/197F40/set_goal_pos_to_part.s
deleted file mode 100644
index 22decddf82..0000000000
--- a/ver/us/asm/nonmatchings/197F40/set_goal_pos_to_part.s
+++ /dev/null
@@ -1,176 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel set_goal_pos_to_part
-/* 198034 80269754 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 198038 80269758 AFB20018 */  sw        $s2, 0x18($sp)
-/* 19803C 8026975C 0080902D */  daddu     $s2, $a0, $zero
-/* 198040 80269760 00A0202D */  daddu     $a0, $a1, $zero
-/* 198044 80269764 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 198048 80269768 00C0982D */  daddu     $s3, $a2, $zero
-/* 19804C 8026976C AFB00010 */  sw        $s0, 0x10($sp)
-/* 198050 80269770 30900700 */  andi      $s0, $a0, 0x700
-/* 198054 80269774 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 198058 80269778 0C09A75B */  jal       get_actor
-/* 19805C 8026977C AFB10014 */   sw       $s1, 0x14($sp)
-/* 198060 80269780 0040882D */  daddu     $s1, $v0, $zero
-/* 198064 80269784 24020100 */  addiu     $v0, $zero, 0x100
-/* 198068 80269788 12020035 */  beq       $s0, $v0, .L80269860
-/* 19806C 8026978C 2A020101 */   slti     $v0, $s0, 0x101
-/* 198070 80269790 50400005 */  beql      $v0, $zero, .L802697A8
-/* 198074 80269794 24020200 */   addiu    $v0, $zero, 0x200
-/* 198078 80269798 12000007 */  beqz      $s0, .L802697B8
-/* 19807C 8026979C 0220202D */   daddu    $a0, $s1, $zero
-/* 198080 802697A0 0809A66F */  j         .L802699BC
-/* 198084 802697A4 00000000 */   nop
-.L802697A8:
-/* 198088 802697A8 1202002E */  beq       $s0, $v0, .L80269864
-/* 19808C 802697AC 0220202D */   daddu    $a0, $s1, $zero
-/* 198090 802697B0 0809A66F */  j         .L802699BC
-/* 198094 802697B4 00000000 */   nop
-.L802697B8:
-/* 198098 802697B8 0C099117 */  jal       get_actor_part
-/* 19809C 802697BC 0000282D */   daddu    $a1, $zero, $zero
-/* 1980A0 802697C0 0040202D */  daddu     $a0, $v0, $zero
-/* 1980A4 802697C4 84820014 */  lh        $v0, 0x14($a0)
-/* 1980A8 802697C8 C6200188 */  lwc1      $f0, 0x188($s1)
-/* 1980AC 802697CC 44821000 */  mtc1      $v0, $f2
-/* 1980B0 802697D0 00000000 */  nop
-/* 1980B4 802697D4 468010A0 */  cvt.s.w   $f2, $f2
-/* 1980B8 802697D8 46001082 */  mul.s     $f2, $f2, $f0
-/* 1980BC 802697DC 00000000 */  nop
-/* 1980C0 802697E0 C6200144 */  lwc1      $f0, 0x144($s1)
-/* 1980C4 802697E4 46020000 */  add.s     $f0, $f0, $f2
-/* 1980C8 802697E8 E640000C */  swc1      $f0, 0xc($s2)
-/* 1980CC 802697EC 84820016 */  lh        $v0, 0x16($a0)
-/* 1980D0 802697F0 C6200188 */  lwc1      $f0, 0x188($s1)
-/* 1980D4 802697F4 44821000 */  mtc1      $v0, $f2
-/* 1980D8 802697F8 00000000 */  nop
-/* 1980DC 802697FC 468010A0 */  cvt.s.w   $f2, $f2
-/* 1980E0 80269800 46001082 */  mul.s     $f2, $f2, $f0
-/* 1980E4 80269804 00000000 */  nop
-/* 1980E8 80269808 C6200148 */  lwc1      $f0, 0x148($s1)
-/* 1980EC 8026980C 46020000 */  add.s     $f0, $f0, $f2
-/* 1980F0 80269810 3C014120 */  lui       $at, 0x4120
-/* 1980F4 80269814 44811000 */  mtc1      $at, $f2
-/* 1980F8 80269818 E6400010 */  swc1      $f0, 0x10($s2)
-/* 1980FC 8026981C C620014C */  lwc1      $f0, 0x14c($s1)
-/* 198100 80269820 46020000 */  add.s     $f0, $f0, $f2
-/* 198104 80269824 E6400014 */  swc1      $f0, 0x14($s2)
-/* 198108 80269828 82230214 */  lb        $v1, 0x214($s1)
-/* 19810C 8026982C 2402000C */  addiu     $v0, $zero, 0xc
-/* 198110 80269830 14620062 */  bne       $v1, $v0, .L802699BC
-/* 198114 80269834 00000000 */   nop
-/* 198118 80269838 C6200188 */  lwc1      $f0, 0x188($s1)
-/* 19811C 8026983C 3C0140A0 */  lui       $at, 0x40a0
-/* 198120 80269840 44811000 */  mtc1      $at, $f2
-/* 198124 80269844 00000000 */  nop
-/* 198128 80269848 46020002 */  mul.s     $f0, $f0, $f2
-/* 19812C 8026984C 00000000 */  nop
-/* 198130 80269850 C6420010 */  lwc1      $f2, 0x10($s2)
-/* 198134 80269854 46001081 */  sub.s     $f2, $f2, $f0
-/* 198138 80269858 0809A66F */  j         .L802699BC
-/* 19813C 8026985C E6420010 */   swc1     $f2, 0x10($s2)
-.L80269860:
-/* 198140 80269860 0220202D */  daddu     $a0, $s1, $zero
-.L80269864:
-/* 198144 80269864 0C099117 */  jal       get_actor_part
-/* 198148 80269868 0260282D */   daddu    $a1, $s3, $zero
-/* 19814C 8026986C 0040202D */  daddu     $a0, $v0, $zero
-/* 198150 80269870 8C820000 */  lw        $v0, ($a0)
-/* 198154 80269874 3C030010 */  lui       $v1, 0x10
-/* 198158 80269878 00431024 */  and       $v0, $v0, $v1
-/* 19815C 8026987C 1440002A */  bnez      $v0, .L80269928
-/* 198160 80269880 00000000 */   nop
-/* 198164 80269884 84820014 */  lh        $v0, 0x14($a0)
-/* 198168 80269888 8483006C */  lh        $v1, 0x6c($a0)
-/* 19816C 8026988C C6200188 */  lwc1      $f0, 0x188($s1)
-/* 198170 80269890 00431021 */  addu      $v0, $v0, $v1
-/* 198174 80269894 44821000 */  mtc1      $v0, $f2
-/* 198178 80269898 00000000 */  nop
-/* 19817C 8026989C 468010A0 */  cvt.s.w   $f2, $f2
-/* 198180 802698A0 46001082 */  mul.s     $f2, $f2, $f0
-/* 198184 802698A4 00000000 */  nop
-/* 198188 802698A8 C6200144 */  lwc1      $f0, 0x144($s1)
-/* 19818C 802698AC 46020000 */  add.s     $f0, $f0, $f2
-/* 198190 802698B0 E640000C */  swc1      $f0, 0xc($s2)
-/* 198194 802698B4 8E220000 */  lw        $v0, ($s1)
-/* 198198 802698B8 30420800 */  andi      $v0, $v0, 0x800
-/* 19819C 802698BC 14400006 */  bnez      $v0, .L802698D8
-/* 1981A0 802698C0 00000000 */   nop
-/* 1981A4 802698C4 84820016 */  lh        $v0, 0x16($a0)
-/* 1981A8 802698C8 8483006E */  lh        $v1, 0x6e($a0)
-/* 1981AC 802698CC C6200188 */  lwc1      $f0, 0x188($s1)
-/* 1981B0 802698D0 0809A63B */  j         .L802698EC
-/* 1981B4 802698D4 00431021 */   addu     $v0, $v0, $v1
-.L802698D8:
-/* 1981B8 802698D8 84820016 */  lh        $v0, 0x16($a0)
-/* 1981BC 802698DC 8483006E */  lh        $v1, 0x6e($a0)
-/* 1981C0 802698E0 C6200188 */  lwc1      $f0, 0x188($s1)
-/* 1981C4 802698E4 00021023 */  negu      $v0, $v0
-/* 1981C8 802698E8 00431023 */  subu      $v0, $v0, $v1
-.L802698EC:
-/* 1981CC 802698EC 44821000 */  mtc1      $v0, $f2
-/* 1981D0 802698F0 00000000 */  nop
-/* 1981D4 802698F4 468010A0 */  cvt.s.w   $f2, $f2
-/* 1981D8 802698F8 46001082 */  mul.s     $f2, $f2, $f0
-/* 1981DC 802698FC 00000000 */  nop
-/* 1981E0 80269900 C6200148 */  lwc1      $f0, 0x148($s1)
-/* 1981E4 80269904 46020000 */  add.s     $f0, $f0, $f2
-/* 1981E8 80269908 E6400010 */  swc1      $f0, 0x10($s2)
-/* 1981EC 8026990C 84820018 */  lh        $v0, 0x18($a0)
-/* 1981F0 80269910 C620014C */  lwc1      $f0, 0x14c($s1)
-/* 1981F4 80269914 44821000 */  mtc1      $v0, $f2
-/* 1981F8 80269918 00000000 */  nop
-/* 1981FC 8026991C 468010A0 */  cvt.s.w   $f2, $f2
-/* 198200 80269920 0809A66A */  j         .L802699A8
-/* 198204 80269924 46020000 */   add.s    $f0, $f0, $f2
-.L80269928:
-/* 198208 80269928 8482006C */  lh        $v0, 0x6c($a0)
-/* 19820C 8026992C C480002C */  lwc1      $f0, 0x2c($a0)
-/* 198210 80269930 44821000 */  mtc1      $v0, $f2
-/* 198214 80269934 00000000 */  nop
-/* 198218 80269938 468010A0 */  cvt.s.w   $f2, $f2
-/* 19821C 8026993C 46020000 */  add.s     $f0, $f0, $f2
-/* 198220 80269940 E640000C */  swc1      $f0, 0xc($s2)
-/* 198224 80269944 8E220000 */  lw        $v0, ($s1)
-/* 198228 80269948 30420800 */  andi      $v0, $v0, 0x800
-/* 19822C 8026994C 1440000B */  bnez      $v0, .L8026997C
-/* 198230 80269950 00000000 */   nop
-/* 198234 80269954 8482006E */  lh        $v0, 0x6e($a0)
-/* 198238 80269958 C6200188 */  lwc1      $f0, 0x188($s1)
-/* 19823C 8026995C 44821000 */  mtc1      $v0, $f2
-/* 198240 80269960 00000000 */  nop
-/* 198244 80269964 468010A0 */  cvt.s.w   $f2, $f2
-/* 198248 80269968 46001082 */  mul.s     $f2, $f2, $f0
-/* 19824C 8026996C 00000000 */  nop
-/* 198250 80269970 C4800030 */  lwc1      $f0, 0x30($a0)
-/* 198254 80269974 0809A668 */  j         .L802699A0
-/* 198258 80269978 46020000 */   add.s    $f0, $f0, $f2
-.L8026997C:
-/* 19825C 8026997C 8482006E */  lh        $v0, 0x6e($a0)
-/* 198260 80269980 C6200188 */  lwc1      $f0, 0x188($s1)
-/* 198264 80269984 44821000 */  mtc1      $v0, $f2
-/* 198268 80269988 00000000 */  nop
-/* 19826C 8026998C 468010A0 */  cvt.s.w   $f2, $f2
-/* 198270 80269990 46001082 */  mul.s     $f2, $f2, $f0
-/* 198274 80269994 00000000 */  nop
-/* 198278 80269998 C4800030 */  lwc1      $f0, 0x30($a0)
-/* 19827C 8026999C 46020001 */  sub.s     $f0, $f0, $f2
-.L802699A0:
-/* 198280 802699A0 E6400010 */  swc1      $f0, 0x10($s2)
-/* 198284 802699A4 C4800034 */  lwc1      $f0, 0x34($a0)
-.L802699A8:
-/* 198288 802699A8 3C014120 */  lui       $at, 0x4120
-/* 19828C 802699AC 44811000 */  mtc1      $at, $f2
-/* 198290 802699B0 00000000 */  nop
-/* 198294 802699B4 46020000 */  add.s     $f0, $f0, $f2
-/* 198298 802699B8 E6400014 */  swc1      $f0, 0x14($s2)
-.L802699BC:
-/* 19829C 802699BC 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 1982A0 802699C0 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 1982A4 802699C4 8FB20018 */  lw        $s2, 0x18($sp)
-/* 1982A8 802699C8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 1982AC 802699CC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 1982B0 802699D0 03E00008 */  jr        $ra
-/* 1982B4 802699D4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/197F40/set_part_goal_to_actor_part.s b/ver/us/asm/nonmatchings/197F40/set_part_goal_to_actor_part.s
deleted file mode 100644
index c238f99336..0000000000
--- a/ver/us/asm/nonmatchings/197F40/set_part_goal_to_actor_part.s
+++ /dev/null
@@ -1,162 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel set_part_goal_to_actor_part
-/* 1982B8 802699D8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 1982BC 802699DC 00A0202D */  daddu     $a0, $a1, $zero
-/* 1982C0 802699E0 AFB20018 */  sw        $s2, 0x18($sp)
-/* 1982C4 802699E4 00C0902D */  daddu     $s2, $a2, $zero
-/* 1982C8 802699E8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 1982CC 802699EC 30900700 */  andi      $s0, $a0, 0x700
-/* 1982D0 802699F0 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 1982D4 802699F4 0C09A75B */  jal       get_actor
-/* 1982D8 802699F8 AFB10014 */   sw       $s1, 0x14($sp)
-/* 1982DC 802699FC 0040882D */  daddu     $s1, $v0, $zero
-/* 1982E0 80269A00 24020100 */  addiu     $v0, $zero, 0x100
-/* 1982E4 80269A04 12020028 */  beq       $s0, $v0, .L80269AA8
-/* 1982E8 80269A08 2A020101 */   slti     $v0, $s0, 0x101
-/* 1982EC 80269A0C 50400005 */  beql      $v0, $zero, .L80269A24
-/* 1982F0 80269A10 24020200 */   addiu    $v0, $zero, 0x200
-/* 1982F4 80269A14 12000007 */  beqz      $s0, .L80269A34
-/* 1982F8 80269A18 0220202D */   daddu    $a0, $s1, $zero
-/* 1982FC 80269A1C 0809A703 */  j         .L80269C0C
-/* 198300 80269A20 00000000 */   nop
-.L80269A24:
-/* 198304 80269A24 12020021 */  beq       $s0, $v0, .L80269AAC
-/* 198308 80269A28 0220202D */   daddu    $a0, $s1, $zero
-/* 19830C 80269A2C 0809A703 */  j         .L80269C0C
-/* 198310 80269A30 00000000 */   nop
-.L80269A34:
-/* 198314 80269A34 0C099117 */  jal       get_actor_part
-/* 198318 80269A38 0000282D */   daddu    $a1, $zero, $zero
-/* 19831C 80269A3C 0040202D */  daddu     $a0, $v0, $zero
-/* 198320 80269A40 84820014 */  lh        $v0, 0x14($a0)
-/* 198324 80269A44 C6220188 */  lwc1      $f2, 0x188($s1)
-/* 198328 80269A48 44820000 */  mtc1      $v0, $f0
-/* 19832C 80269A4C 00000000 */  nop
-/* 198330 80269A50 46800020 */  cvt.s.w   $f0, $f0
-/* 198334 80269A54 46020002 */  mul.s     $f0, $f0, $f2
-/* 198338 80269A58 00000000 */  nop
-/* 19833C 80269A5C C6220144 */  lwc1      $f2, 0x144($s1)
-/* 198340 80269A60 46001080 */  add.s     $f2, $f2, $f0
-/* 198344 80269A64 8C820010 */  lw        $v0, 0x10($a0)
-/* 198348 80269A68 E442000C */  swc1      $f2, 0xc($v0)
-/* 19834C 80269A6C 84820016 */  lh        $v0, 0x16($a0)
-/* 198350 80269A70 C6220188 */  lwc1      $f2, 0x188($s1)
-/* 198354 80269A74 44820000 */  mtc1      $v0, $f0
-/* 198358 80269A78 00000000 */  nop
-/* 19835C 80269A7C 46800020 */  cvt.s.w   $f0, $f0
-/* 198360 80269A80 46020002 */  mul.s     $f0, $f0, $f2
-/* 198364 80269A84 00000000 */  nop
-/* 198368 80269A88 C6220148 */  lwc1      $f2, 0x148($s1)
-/* 19836C 80269A8C 46001080 */  add.s     $f2, $f2, $f0
-/* 198370 80269A90 8C820010 */  lw        $v0, 0x10($a0)
-/* 198374 80269A94 E4420010 */  swc1      $f2, 0x10($v0)
-/* 198378 80269A98 8C820010 */  lw        $v0, 0x10($a0)
-/* 19837C 80269A9C C620014C */  lwc1      $f0, 0x14c($s1)
-/* 198380 80269AA0 0809A703 */  j         .L80269C0C
-/* 198384 80269AA4 E4400014 */   swc1     $f0, 0x14($v0)
-.L80269AA8:
-/* 198388 80269AA8 0220202D */  daddu     $a0, $s1, $zero
-.L80269AAC:
-/* 19838C 80269AAC 0C099117 */  jal       get_actor_part
-/* 198390 80269AB0 0240282D */   daddu    $a1, $s2, $zero
-/* 198394 80269AB4 0040202D */  daddu     $a0, $v0, $zero
-/* 198398 80269AB8 8C820000 */  lw        $v0, ($a0)
-/* 19839C 80269ABC 3C030010 */  lui       $v1, 0x10
-/* 1983A0 80269AC0 00431024 */  and       $v0, $v0, $v1
-/* 1983A4 80269AC4 1440002D */  bnez      $v0, .L80269B7C
-/* 1983A8 80269AC8 00000000 */   nop
-/* 1983AC 80269ACC 84820014 */  lh        $v0, 0x14($a0)
-/* 1983B0 80269AD0 8483006C */  lh        $v1, 0x6c($a0)
-/* 1983B4 80269AD4 C6220188 */  lwc1      $f2, 0x188($s1)
-/* 1983B8 80269AD8 00431021 */  addu      $v0, $v0, $v1
-/* 1983BC 80269ADC 44820000 */  mtc1      $v0, $f0
-/* 1983C0 80269AE0 00000000 */  nop
-/* 1983C4 80269AE4 46800020 */  cvt.s.w   $f0, $f0
-/* 1983C8 80269AE8 46020002 */  mul.s     $f0, $f0, $f2
-/* 1983CC 80269AEC 00000000 */  nop
-/* 1983D0 80269AF0 C6220144 */  lwc1      $f2, 0x144($s1)
-/* 1983D4 80269AF4 46001080 */  add.s     $f2, $f2, $f0
-/* 1983D8 80269AF8 8C820010 */  lw        $v0, 0x10($a0)
-/* 1983DC 80269AFC E442000C */  swc1      $f2, 0xc($v0)
-/* 1983E0 80269B00 8E220000 */  lw        $v0, ($s1)
-/* 1983E4 80269B04 30420800 */  andi      $v0, $v0, 0x800
-/* 1983E8 80269B08 14400006 */  bnez      $v0, .L80269B24
-/* 1983EC 80269B0C 00000000 */   nop
-/* 1983F0 80269B10 84820016 */  lh        $v0, 0x16($a0)
-/* 1983F4 80269B14 8483006E */  lh        $v1, 0x6e($a0)
-/* 1983F8 80269B18 C6220188 */  lwc1      $f2, 0x188($s1)
-/* 1983FC 80269B1C 0809A6CE */  j         .L80269B38
-/* 198400 80269B20 00431021 */   addu     $v0, $v0, $v1
-.L80269B24:
-/* 198404 80269B24 84820016 */  lh        $v0, 0x16($a0)
-/* 198408 80269B28 8483006E */  lh        $v1, 0x6e($a0)
-/* 19840C 80269B2C C6220188 */  lwc1      $f2, 0x188($s1)
-/* 198410 80269B30 00021023 */  negu      $v0, $v0
-/* 198414 80269B34 00431023 */  subu      $v0, $v0, $v1
-.L80269B38:
-/* 198418 80269B38 44820000 */  mtc1      $v0, $f0
-/* 19841C 80269B3C 00000000 */  nop
-/* 198420 80269B40 46800020 */  cvt.s.w   $f0, $f0
-/* 198424 80269B44 46020002 */  mul.s     $f0, $f0, $f2
-/* 198428 80269B48 00000000 */  nop
-/* 19842C 80269B4C C6220148 */  lwc1      $f2, 0x148($s1)
-/* 198430 80269B50 46001080 */  add.s     $f2, $f2, $f0
-/* 198434 80269B54 8C820010 */  lw        $v0, 0x10($a0)
-/* 198438 80269B58 E4420010 */  swc1      $f2, 0x10($v0)
-/* 19843C 80269B5C 84820018 */  lh        $v0, 0x18($a0)
-/* 198440 80269B60 C620014C */  lwc1      $f0, 0x14c($s1)
-/* 198444 80269B64 44821000 */  mtc1      $v0, $f2
-/* 198448 80269B68 00000000 */  nop
-/* 19844C 80269B6C 468010A0 */  cvt.s.w   $f2, $f2
-/* 198450 80269B70 8C820010 */  lw        $v0, 0x10($a0)
-/* 198454 80269B74 0809A702 */  j         .L80269C08
-/* 198458 80269B78 46020000 */   add.s    $f0, $f0, $f2
-.L80269B7C:
-/* 19845C 80269B7C 8482006C */  lh        $v0, 0x6c($a0)
-/* 198460 80269B80 C480002C */  lwc1      $f0, 0x2c($a0)
-/* 198464 80269B84 44821000 */  mtc1      $v0, $f2
-/* 198468 80269B88 00000000 */  nop
-/* 19846C 80269B8C 468010A0 */  cvt.s.w   $f2, $f2
-/* 198470 80269B90 46020000 */  add.s     $f0, $f0, $f2
-/* 198474 80269B94 8C820010 */  lw        $v0, 0x10($a0)
-/* 198478 80269B98 E440000C */  swc1      $f0, 0xc($v0)
-/* 19847C 80269B9C 8E220000 */  lw        $v0, ($s1)
-/* 198480 80269BA0 30420800 */  andi      $v0, $v0, 0x800
-/* 198484 80269BA4 1440000B */  bnez      $v0, .L80269BD4
-/* 198488 80269BA8 00000000 */   nop
-/* 19848C 80269BAC 8482006E */  lh        $v0, 0x6e($a0)
-/* 198490 80269BB0 C6220188 */  lwc1      $f2, 0x188($s1)
-/* 198494 80269BB4 44820000 */  mtc1      $v0, $f0
-/* 198498 80269BB8 00000000 */  nop
-/* 19849C 80269BBC 46800020 */  cvt.s.w   $f0, $f0
-/* 1984A0 80269BC0 46020002 */  mul.s     $f0, $f0, $f2
-/* 1984A4 80269BC4 00000000 */  nop
-/* 1984A8 80269BC8 C4820030 */  lwc1      $f2, 0x30($a0)
-/* 1984AC 80269BCC 0809A6FE */  j         .L80269BF8
-/* 1984B0 80269BD0 46001080 */   add.s    $f2, $f2, $f0
-.L80269BD4:
-/* 1984B4 80269BD4 8482006E */  lh        $v0, 0x6e($a0)
-/* 1984B8 80269BD8 C6220188 */  lwc1      $f2, 0x188($s1)
-/* 1984BC 80269BDC 44820000 */  mtc1      $v0, $f0
-/* 1984C0 80269BE0 00000000 */  nop
-/* 1984C4 80269BE4 46800020 */  cvt.s.w   $f0, $f0
-/* 1984C8 80269BE8 46020002 */  mul.s     $f0, $f0, $f2
-/* 1984CC 80269BEC 00000000 */  nop
-/* 1984D0 80269BF0 C4820030 */  lwc1      $f2, 0x30($a0)
-/* 1984D4 80269BF4 46001081 */  sub.s     $f2, $f2, $f0
-.L80269BF8:
-/* 1984D8 80269BF8 8C820010 */  lw        $v0, 0x10($a0)
-/* 1984DC 80269BFC E4420010 */  swc1      $f2, 0x10($v0)
-/* 1984E0 80269C00 8C820010 */  lw        $v0, 0x10($a0)
-/* 1984E4 80269C04 C4800034 */  lwc1      $f0, 0x34($a0)
-.L80269C08:
-/* 1984E8 80269C08 E4400014 */  swc1      $f0, 0x14($v0)
-.L80269C0C:
-/* 1984EC 80269C0C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 1984F0 80269C10 8FB20018 */  lw        $s2, 0x18($sp)
-/* 1984F4 80269C14 8FB10014 */  lw        $s1, 0x14($sp)
-/* 1984F8 80269C18 8FB00010 */  lw        $s0, 0x10($sp)
-/* 1984FC 80269C1C 03E00008 */  jr        $ra
-/* 198500 80269C20 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/197F40/func_8026E558.s b/ver/us/asm/nonmatchings/actor_api/func_8026E558.s
similarity index 100%
rename from ver/us/asm/nonmatchings/197F40/func_8026E558.s
rename to ver/us/asm/nonmatchings/actor_api/func_8026E558.s
diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml
index 52ad26ba96..2e7d6d438b 100644
--- a/ver/us/splat.yaml
+++ b/ver/us/splat.yaml
@@ -1025,7 +1025,7 @@ segments:
     - [0x190B20, c, 190B20]
     - [0x1967B0, c, load_script]
     - [0x196AA0, c, 196AA0]
-    - [0x197F40, c, 197F40]
+    - [0x197F40, c, actor_api]
     - [0x19FAF0, c, 19FAF0]
     - [0x1A5830, c, 1A5830]
     - [0x1AC760, c]
@@ -1044,7 +1044,7 @@ segments:
     - [0x1CBE70, .rodata, 18F340]
     - [0x1CBE80, .rodata, 190B20]
     - [0x1CBF80, .rodata, 196AA0]
-    - [0x1CC0A0, .rodata, 197F40]
+    - [0x1CC0A0, .rodata, actor_api]
     - [0x1CC160, .rodata, 19FAF0]
     - [0x1CC270, .rodata, 1A5830]
   - [0x1CC310, ci4,     icon/present, 32, 32]