diff --git a/src/battle/partner/6FAD10.c b/src/battle/partner/6FAD10.c
index a62918178f..15dbab519c 100644
--- a/src/battle/partner/6FAD10.c
+++ b/src/battle/partner/6FAD10.c
@@ -1,11 +1,225 @@
 #include "common.h"
+#include "battle/battle.h"
 
-INCLUDE_ASM(s32, "battle/partner/6FAD10", func_80238000_6FAD10);
+ApiStatus func_80238000_6FAD10(ScriptInstance* script, s32 isInitialCall) {
+    BattleStatus* battleStatus = &gBattleStatus;
+    Bytecode* args = script->ptrReadPos;
+    s32 x = get_variable(script, *args++);
+    s32 y = get_variable(script, *args++);
+    s32 z = get_variable(script, *args++);
+    s16 selectedMoveID;
+    s32 soundID;
 
-INCLUDE_ASM(s32, "battle/partner/6FAD10", func_80238244_6FAF54);
+    func_80070130(0, x, y, z);
+    selectedMoveID = battleStatus->selectedMoveID;
 
-INCLUDE_ASM(s32, "battle/partner/6FAD10", func_80238358_6FB068);
+    switch (selectedMoveID) {
+        case 146:
+            if (script->varTable[10] > 0) {
+                func_800701F0(1, x, y + 20, z);
+            } else {
+                func_800701F0(0, x, y + 20, z);
+            }
+            sfx_play_sound(8214);
+            break;
+        case 147:
+            if (script->varTable[10] > 0) {
+                func_800701F0(1, x, y + 20, z);
+            } else {
+                func_800701F0(0, x, y + 20, z);
+            }
+            sfx_play_sound(8215);
+            break;
+        case 148:
+            if (script->varTable[10] > 0) {
+                func_800701F0(2, x, y + 20, z);
+            } else {
+                func_800701F0(1, x, y + 20, z);
+            }
+            sfx_play_sound(8215);
+            break;
+        default:
+            func_800701F0(0, x, y + 20, z);
+            sfx_play_sound(8214);
+            break;
+    }
 
-INCLUDE_ASM(s32, "battle/partner/6FAD10", func_8023849C_6FB1AC);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "battle/partner/6FAD10", func_80238590_6FB2A0);
+ApiStatus func_80238244_6FAF54(ScriptInstance* script, s32 isInitialCall) {
+    BattleStatus* battleStatus = &gBattleStatus;
+    Actor* partnerActor = battleStatus->partnerActor;
+    ActorMovement* partnerActorMovement = &partnerActor->walk;
+
+    if (isInitialCall) {
+        partnerActor->walk.currentPos.x = partnerActor->currentPos.x;
+        partnerActor->walk.currentPos.y = partnerActor->currentPos.y;
+        partnerActor->walk.currentPos.z = partnerActor->currentPos.z;
+    }
+
+    add_xz_vec3f(&partnerActorMovement->currentPos, partnerActor->walk.speed, partnerActor->walk.angle);
+
+    if (partnerActor->walk.speed < 4.0f) {
+        play_movement_dust_effects(0, partnerActor->walk.currentPos.x, partnerActor->walk.currentPos.y,
+                                   partnerActor->walk.currentPos.z, partnerActor->walk.angle);
+    } else {
+        play_movement_dust_effects(1, partnerActor->walk.currentPos.x, partnerActor->walk.currentPos.y,
+                                   partnerActor->walk.currentPos.z, partnerActor->walk.angle);
+    }
+
+    partnerActorMovement->speed /= 1.5;
+
+    partnerActor->currentPos.x = partnerActorMovement->currentPos.x;
+    partnerActor->currentPos.y = partnerActorMovement->currentPos.y;
+    partnerActor->currentPos.z = partnerActorMovement->currentPos.z;
+
+    if (partnerActorMovement->speed < 1.0) {
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus func_80238358_6FB068(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    BattleStatus* battleStatus = &gBattleStatus;
+    Actor* partnerActor = battleStatus->partnerActor;
+    s32 var0 = get_variable(script, *args++);
+    s32 var1 = 0;
+
+    switch (partnerActor->staticActorData->level) {
+        case 0:
+            if (var0 < 36) {
+                var1 = 1;
+            } else if (var0 < 61) {
+                var1 = 2;
+            } else if (var0 < 81) {
+                var1 = 3;
+            } else if (var0 < 100) {
+                var1 = 4;
+            } else {
+                var1 = 5;
+            }
+            break;
+        case 1:
+            if (var0 < 36) {
+                var1 = 1;
+            } else if (var0 < 61) {
+                var1 = 3;
+            } else if (var0 < 81) {
+                var1 = 4;
+            } else if (var0 < 100) {
+                var1 = 5;
+            } else {
+                var1 = 6;
+            }
+            break;
+        case 2:
+            if (var0 < 36) {
+                var1 = 1;
+            } else if (var0 < 61) {
+                var1 = 3;
+            } else if (var0 < 81) {
+                var1 = 5;
+            } else if (var0 < 100) {
+                var1 = 6;
+            } else {
+                var1 = 7;
+            }
+            break;
+    }
+
+
+    if (!(var0 < 100)) {
+        script->varTable[0] = 1;
+    } else {
+        script->varTable[0] = 0;
+    }
+
+    script->varTable[15] = var1;
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_8023849C_6FB1AC(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    BattleStatus* battleStatus = &gBattleStatus;
+    Actor* partnerActor = battleStatus->partnerActor;
+    s32 var0 = get_variable(script, *args++);
+    s32 var1 = 0;
+
+    switch (partnerActor->staticActorData->level) {
+        case 1:
+            if (var0 < 36) {
+                var1 = 1;
+            } else if (var0 < 61) {
+                var1 = 3;
+            } else if (var0 < 81) {
+                var1 = 4;
+            } else if (var0 < 100) {
+                var1 = 5;
+            } else {
+                var1 = 6;
+            }
+            break;
+        case 2:
+            if (var0 < 36) {
+                var1 = 1;
+            } else if (var0 < 61) {
+                var1 = 3;
+            } else if (var0 < 81) {
+                var1 = 5;
+            } else if (var0 < 100) {
+                var1 = 6;
+            } else {
+                var1 = 7;
+            }
+    }
+
+
+    if (!(var0 < 100)) {
+        script->varTable[0] = 1;
+    } else {
+        script->varTable[0] = 0;
+    }
+
+    script->varTable[15] = var1;
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80238590_6FB2A0(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    BattleStatus* battleStatus = &gBattleStatus;
+    Actor* partnerActor = battleStatus->partnerActor;
+    s32 var0 = get_variable(script, *args++);
+    s32 var1 = 0;
+
+    switch (partnerActor->staticActorData->level) {
+        case 2:
+            if (var0 < 36) {
+                var1 = 1;
+            } else if (var0 < 61) {
+                var1 = 3;
+            } else if (var0 < 81) {
+                var1 = 5;
+            } else if (var0 < 100) {
+                var1 = 6;
+            } else {
+                var1 = 7;
+            }
+            break;
+    }
+
+
+    if (!(var0 < 100)) {
+        script->varTable[0] = TRUE;
+    } else {
+        script->varTable[0] = FALSE;
+    }
+
+    script->varTable[15] = var1;
+
+    return ApiStatus_DONE2;
+}
diff --git a/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238000_6FAD10.s b/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238000_6FAD10.s
deleted file mode 100644
index 9e2ab06b72..0000000000
--- a/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238000_6FAD10.s
+++ /dev/null
@@ -1,161 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80238000_6FAD10
-/* 6FAD10 80238000 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* 6FAD14 80238004 AFB10014 */  sw        $s1, 0x14($sp)
-/* 6FAD18 80238008 0080882D */  daddu     $s1, $a0, $zero
-/* 6FAD1C 8023800C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 6FAD20 80238010 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 6FAD24 80238014 AFB20018 */  sw        $s2, 0x18($sp)
-/* 6FAD28 80238018 AFB00010 */  sw        $s0, 0x10($sp)
-/* 6FAD2C 8023801C F7B60030 */  sdc1      $f22, 0x30($sp)
-/* 6FAD30 80238020 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* 6FAD34 80238024 8E30000C */  lw        $s0, 0xc($s1)
-/* 6FAD38 80238028 8E050000 */  lw        $a1, ($s0)
-/* 6FAD3C 8023802C 0C0B1EAF */  jal       get_variable
-/* 6FAD40 80238030 26100004 */   addiu    $s0, $s0, 4
-/* 6FAD44 80238034 8E050000 */  lw        $a1, ($s0)
-/* 6FAD48 80238038 26100004 */  addiu     $s0, $s0, 4
-/* 6FAD4C 8023803C 0220202D */  daddu     $a0, $s1, $zero
-/* 6FAD50 80238040 0C0B1EAF */  jal       get_variable
-/* 6FAD54 80238044 0040982D */   daddu    $s3, $v0, $zero
-/* 6FAD58 80238048 0220202D */  daddu     $a0, $s1, $zero
-/* 6FAD5C 8023804C 8E050000 */  lw        $a1, ($s0)
-/* 6FAD60 80238050 0C0B1EAF */  jal       get_variable
-/* 6FAD64 80238054 0040802D */   daddu    $s0, $v0, $zero
-/* 6FAD68 80238058 4493A000 */  mtc1      $s3, $f20
-/* 6FAD6C 8023805C 00000000 */  nop
-/* 6FAD70 80238060 4680A520 */  cvt.s.w   $f20, $f20
-/* 6FAD74 80238064 0040902D */  daddu     $s2, $v0, $zero
-/* 6FAD78 80238068 4492B000 */  mtc1      $s2, $f22
-/* 6FAD7C 8023806C 00000000 */  nop
-/* 6FAD80 80238070 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 6FAD84 80238074 44900000 */  mtc1      $s0, $f0
-/* 6FAD88 80238078 00000000 */  nop
-/* 6FAD8C 8023807C 46800020 */  cvt.s.w   $f0, $f0
-/* 6FAD90 80238080 4405A000 */  mfc1      $a1, $f20
-/* 6FAD94 80238084 4407B000 */  mfc1      $a3, $f22
-/* 6FAD98 80238088 44060000 */  mfc1      $a2, $f0
-/* 6FAD9C 8023808C 0C01C04C */  jal       func_80070130
-/* 6FADA0 80238090 0000202D */   daddu    $a0, $zero, $zero
-/* 6FADA4 80238094 3C03800E */  lui       $v1, %hi(gBattleStatus+0x17C)
-/* 6FADA8 80238098 8463C1EC */  lh        $v1, %lo(gBattleStatus+0x17C)($v1)
-/* 6FADAC 8023809C 24020093 */  addiu     $v0, $zero, 0x93
-/* 6FADB0 802380A0 1062001F */  beq       $v1, $v0, .L80238120
-/* 6FADB4 802380A4 28620094 */   slti     $v0, $v1, 0x94
-/* 6FADB8 802380A8 10400005 */  beqz      $v0, .L802380C0
-/* 6FADBC 802380AC 24020092 */   addiu    $v0, $zero, 0x92
-/* 6FADC0 802380B0 10620008 */  beq       $v1, $v0, .L802380D4
-/* 6FADC4 802380B4 00000000 */   nop
-/* 6FADC8 802380B8 0808E074 */  j         .L802381D0
-/* 6FADCC 802380BC 00000000 */   nop
-.L802380C0:
-/* 6FADD0 802380C0 24020094 */  addiu     $v0, $zero, 0x94
-/* 6FADD4 802380C4 1062002C */  beq       $v1, $v0, .L80238178
-/* 6FADD8 802380C8 00000000 */   nop
-/* 6FADDC 802380CC 0808E074 */  j         .L802381D0
-/* 6FADE0 802380D0 00000000 */   nop
-.L802380D4:
-/* 6FADE4 802380D4 8E2200AC */  lw        $v0, 0xac($s1)
-/* 6FADE8 802380D8 18400009 */  blez      $v0, .L80238100
-/* 6FADEC 802380DC 26020014 */   addiu    $v0, $s0, 0x14
-/* 6FADF0 802380E0 44820000 */  mtc1      $v0, $f0
-/* 6FADF4 802380E4 00000000 */  nop
-/* 6FADF8 802380E8 46800020 */  cvt.s.w   $f0, $f0
-/* 6FADFC 802380EC 4405A000 */  mfc1      $a1, $f20
-/* 6FAE00 802380F0 4407B000 */  mfc1      $a3, $f22
-/* 6FAE04 802380F4 44060000 */  mfc1      $a2, $f0
-/* 6FAE08 802380F8 0808E082 */  j         .L80238208
-/* 6FAE0C 802380FC 24040001 */   addiu    $a0, $zero, 1
-.L80238100:
-/* 6FAE10 80238100 44820000 */  mtc1      $v0, $f0
-/* 6FAE14 80238104 00000000 */  nop
-/* 6FAE18 80238108 46800020 */  cvt.s.w   $f0, $f0
-/* 6FAE1C 8023810C 4405A000 */  mfc1      $a1, $f20
-/* 6FAE20 80238110 4407B000 */  mfc1      $a3, $f22
-/* 6FAE24 80238114 44060000 */  mfc1      $a2, $f0
-/* 6FAE28 80238118 0808E082 */  j         .L80238208
-/* 6FAE2C 8023811C 0000202D */   daddu    $a0, $zero, $zero
-.L80238120:
-/* 6FAE30 80238120 8E2200AC */  lw        $v0, 0xac($s1)
-/* 6FAE34 80238124 18400009 */  blez      $v0, .L8023814C
-/* 6FAE38 80238128 26020014 */   addiu    $v0, $s0, 0x14
-/* 6FAE3C 8023812C 44820000 */  mtc1      $v0, $f0
-/* 6FAE40 80238130 00000000 */  nop
-/* 6FAE44 80238134 46800020 */  cvt.s.w   $f0, $f0
-/* 6FAE48 80238138 4405A000 */  mfc1      $a1, $f20
-/* 6FAE4C 8023813C 4407B000 */  mfc1      $a3, $f22
-/* 6FAE50 80238140 44060000 */  mfc1      $a2, $f0
-/* 6FAE54 80238144 0808E05A */  j         .L80238168
-/* 6FAE58 80238148 24040001 */   addiu    $a0, $zero, 1
-.L8023814C:
-/* 6FAE5C 8023814C 44820000 */  mtc1      $v0, $f0
-/* 6FAE60 80238150 00000000 */  nop
-/* 6FAE64 80238154 46800020 */  cvt.s.w   $f0, $f0
-/* 6FAE68 80238158 4405A000 */  mfc1      $a1, $f20
-/* 6FAE6C 8023815C 4407B000 */  mfc1      $a3, $f22
-/* 6FAE70 80238160 44060000 */  mfc1      $a2, $f0
-/* 6FAE74 80238164 0000202D */  daddu     $a0, $zero, $zero
-.L80238168:
-/* 6FAE78 80238168 0C01C07C */  jal       func_800701F0
-/* 6FAE7C 8023816C 00000000 */   nop
-/* 6FAE80 80238170 0808E085 */  j         .L80238214
-/* 6FAE84 80238174 24042017 */   addiu    $a0, $zero, 0x2017
-.L80238178:
-/* 6FAE88 80238178 8E2200AC */  lw        $v0, 0xac($s1)
-/* 6FAE8C 8023817C 18400009 */  blez      $v0, .L802381A4
-/* 6FAE90 80238180 26020014 */   addiu    $v0, $s0, 0x14
-/* 6FAE94 80238184 44820000 */  mtc1      $v0, $f0
-/* 6FAE98 80238188 00000000 */  nop
-/* 6FAE9C 8023818C 46800020 */  cvt.s.w   $f0, $f0
-/* 6FAEA0 80238190 4405A000 */  mfc1      $a1, $f20
-/* 6FAEA4 80238194 4407B000 */  mfc1      $a3, $f22
-/* 6FAEA8 80238198 44060000 */  mfc1      $a2, $f0
-/* 6FAEAC 8023819C 0808E070 */  j         .L802381C0
-/* 6FAEB0 802381A0 24040002 */   addiu    $a0, $zero, 2
-.L802381A4:
-/* 6FAEB4 802381A4 44820000 */  mtc1      $v0, $f0
-/* 6FAEB8 802381A8 00000000 */  nop
-/* 6FAEBC 802381AC 46800020 */  cvt.s.w   $f0, $f0
-/* 6FAEC0 802381B0 4405A000 */  mfc1      $a1, $f20
-/* 6FAEC4 802381B4 4407B000 */  mfc1      $a3, $f22
-/* 6FAEC8 802381B8 44060000 */  mfc1      $a2, $f0
-/* 6FAECC 802381BC 24040001 */  addiu     $a0, $zero, 1
-.L802381C0:
-/* 6FAED0 802381C0 0C01C07C */  jal       func_800701F0
-/* 6FAED4 802381C4 00000000 */   nop
-/* 6FAED8 802381C8 0808E085 */  j         .L80238214
-/* 6FAEDC 802381CC 24042017 */   addiu    $a0, $zero, 0x2017
-.L802381D0:
-/* 6FAEE0 802381D0 44930000 */  mtc1      $s3, $f0
-/* 6FAEE4 802381D4 00000000 */  nop
-/* 6FAEE8 802381D8 46800020 */  cvt.s.w   $f0, $f0
-/* 6FAEEC 802381DC 26020014 */  addiu     $v0, $s0, 0x14
-/* 6FAEF0 802381E0 44050000 */  mfc1      $a1, $f0
-/* 6FAEF4 802381E4 44820000 */  mtc1      $v0, $f0
-/* 6FAEF8 802381E8 00000000 */  nop
-/* 6FAEFC 802381EC 46800020 */  cvt.s.w   $f0, $f0
-/* 6FAF00 802381F0 44060000 */  mfc1      $a2, $f0
-/* 6FAF04 802381F4 44920000 */  mtc1      $s2, $f0
-/* 6FAF08 802381F8 00000000 */  nop
-/* 6FAF0C 802381FC 46800020 */  cvt.s.w   $f0, $f0
-/* 6FAF10 80238200 44070000 */  mfc1      $a3, $f0
-/* 6FAF14 80238204 0000202D */  daddu     $a0, $zero, $zero
-.L80238208:
-/* 6FAF18 80238208 0C01C07C */  jal       func_800701F0
-/* 6FAF1C 8023820C 00000000 */   nop
-/* 6FAF20 80238210 24042016 */  addiu     $a0, $zero, 0x2016
-.L80238214:
-/* 6FAF24 80238214 0C05272D */  jal       sfx_play_sound
-/* 6FAF28 80238218 00000000 */   nop
-/* 6FAF2C 8023821C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 6FAF30 80238220 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 6FAF34 80238224 8FB20018 */  lw        $s2, 0x18($sp)
-/* 6FAF38 80238228 8FB10014 */  lw        $s1, 0x14($sp)
-/* 6FAF3C 8023822C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 6FAF40 80238230 D7B60030 */  ldc1      $f22, 0x30($sp)
-/* 6FAF44 80238234 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* 6FAF48 80238238 24020002 */  addiu     $v0, $zero, 2
-/* 6FAF4C 8023823C 03E00008 */  jr        $ra
-/* 6FAF50 80238240 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238244_6FAF54.s b/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238244_6FAF54.s
deleted file mode 100644
index 04add46a90..0000000000
--- a/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238244_6FAF54.s
+++ /dev/null
@@ -1,77 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80238244_6FAF54
-/* 6FAF54 80238244 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 6FAF58 80238248 AFB00018 */  sw        $s0, 0x18($sp)
-/* 6FAF5C 8023824C 3C10800E */  lui       $s0, %hi(gBattleStatus+0xDC)
-/* 6FAF60 80238250 8E10C14C */  lw        $s0, %lo(gBattleStatus+0xDC)($s0)
-/* 6FAF64 80238254 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 6FAF68 80238258 AFB1001C */  sw        $s1, 0x1c($sp)
-/* 6FAF6C 8023825C 10A00007 */  beqz      $a1, .L8023827C
-/* 6FAF70 80238260 2611000C */   addiu    $s1, $s0, 0xc
-/* 6FAF74 80238264 C6000144 */  lwc1      $f0, 0x144($s0)
-/* 6FAF78 80238268 C6020148 */  lwc1      $f2, 0x148($s0)
-/* 6FAF7C 8023826C C604014C */  lwc1      $f4, 0x14c($s0)
-/* 6FAF80 80238270 E600000C */  swc1      $f0, 0xc($s0)
-/* 6FAF84 80238274 E6020010 */  swc1      $f2, 0x10($s0)
-/* 6FAF88 80238278 E6040014 */  swc1      $f4, 0x14($s0)
-.L8023827C:
-/* 6FAF8C 8023827C 8E05004C */  lw        $a1, 0x4c($s0)
-/* 6FAF90 80238280 8E060054 */  lw        $a2, 0x54($s0)
-/* 6FAF94 80238284 0C09904A */  jal       add_xz_vec3f
-/* 6FAF98 80238288 0220202D */   daddu    $a0, $s1, $zero
-/* 6FAF9C 8023828C C602004C */  lwc1      $f2, 0x4c($s0)
-/* 6FAFA0 80238290 3C014080 */  lui       $at, 0x4080
-/* 6FAFA4 80238294 44810000 */  mtc1      $at, $f0
-/* 6FAFA8 80238298 00000000 */  nop
-/* 6FAFAC 8023829C 4600103C */  c.lt.s    $f2, $f0
-/* 6FAFB0 802382A0 00000000 */  nop
-/* 6FAFB4 802382A4 45000007 */  bc1f      .L802382C4
-/* 6FAFB8 802382A8 0000202D */   daddu    $a0, $zero, $zero
-/* 6FAFBC 802382AC C6000054 */  lwc1      $f0, 0x54($s0)
-/* 6FAFC0 802382B0 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 6FAFC4 802382B4 8E05000C */  lw        $a1, 0xc($s0)
-/* 6FAFC8 802382B8 8E060010 */  lw        $a2, 0x10($s0)
-/* 6FAFCC 802382BC 0808E0B7 */  j         .L802382DC
-/* 6FAFD0 802382C0 8E070014 */   lw       $a3, 0x14($s0)
-.L802382C4:
-/* 6FAFD4 802382C4 C6000054 */  lwc1      $f0, 0x54($s0)
-/* 6FAFD8 802382C8 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 6FAFDC 802382CC 8E05000C */  lw        $a1, 0xc($s0)
-/* 6FAFE0 802382D0 8E060010 */  lw        $a2, 0x10($s0)
-/* 6FAFE4 802382D4 8E070014 */  lw        $a3, 0x14($s0)
-/* 6FAFE8 802382D8 24040001 */  addiu     $a0, $zero, 1
-.L802382DC:
-/* 6FAFEC 802382DC 0C0990BC */  jal       play_movement_dust_effects
-/* 6FAFF0 802382E0 00000000 */   nop
-/* 6FAFF4 802382E4 C6200040 */  lwc1      $f0, 0x40($s1)
-/* 6FAFF8 802382E8 3C013FF8 */  lui       $at, 0x3ff8
-/* 6FAFFC 802382EC 44811800 */  mtc1      $at, $f3
-/* 6FB000 802382F0 44801000 */  mtc1      $zero, $f2
-/* 6FB004 802382F4 46000021 */  cvt.d.s   $f0, $f0
-/* 6FB008 802382F8 46220003 */  div.d     $f0, $f0, $f2
-/* 6FB00C 802382FC C6220000 */  lwc1      $f2, ($s1)
-/* 6FB010 80238300 46200020 */  cvt.s.d   $f0, $f0
-/* 6FB014 80238304 E6200040 */  swc1      $f0, 0x40($s1)
-/* 6FB018 80238308 E6020144 */  swc1      $f2, 0x144($s0)
-/* 6FB01C 8023830C C6200004 */  lwc1      $f0, 4($s1)
-/* 6FB020 80238310 E6000148 */  swc1      $f0, 0x148($s0)
-/* 6FB024 80238314 C6200008 */  lwc1      $f0, 8($s1)
-/* 6FB028 80238318 E600014C */  swc1      $f0, 0x14c($s0)
-/* 6FB02C 8023831C C6200040 */  lwc1      $f0, 0x40($s1)
-/* 6FB030 80238320 3C013FF0 */  lui       $at, 0x3ff0
-/* 6FB034 80238324 44811800 */  mtc1      $at, $f3
-/* 6FB038 80238328 44801000 */  mtc1      $zero, $f2
-/* 6FB03C 8023832C 46000021 */  cvt.d.s   $f0, $f0
-/* 6FB040 80238330 4622003C */  c.lt.d    $f0, $f2
-/* 6FB044 80238334 00000000 */  nop
-/* 6FB048 80238338 45010002 */  bc1t      .L80238344
-/* 6FB04C 8023833C 24020002 */   addiu    $v0, $zero, 2
-/* 6FB050 80238340 0000102D */  daddu     $v0, $zero, $zero
-.L80238344:
-/* 6FB054 80238344 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 6FB058 80238348 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 6FB05C 8023834C 8FB00018 */  lw        $s0, 0x18($sp)
-/* 6FB060 80238350 03E00008 */  jr        $ra
-/* 6FB064 80238354 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238358_6FB068.s b/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238358_6FB068.s
deleted file mode 100644
index 8de2cef08f..0000000000
--- a/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238358_6FB068.s
+++ /dev/null
@@ -1,92 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80238358_6FB068
-/* 6FB068 80238358 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 6FB06C 8023835C AFB10014 */  sw        $s1, 0x14($sp)
-/* 6FB070 80238360 0080882D */  daddu     $s1, $a0, $zero
-/* 6FB074 80238364 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 6FB078 80238368 AFB00010 */  sw        $s0, 0x10($sp)
-/* 6FB07C 8023836C 8E22000C */  lw        $v0, 0xc($s1)
-/* 6FB080 80238370 8C450000 */  lw        $a1, ($v0)
-/* 6FB084 80238374 3C10800E */  lui       $s0, %hi(gBattleStatus+0xDC)
-/* 6FB088 80238378 8E10C14C */  lw        $s0, %lo(gBattleStatus+0xDC)($s0)
-/* 6FB08C 8023837C 0C0B1EAF */  jal       get_variable
-/* 6FB090 80238380 00000000 */   nop
-/* 6FB094 80238384 8E030008 */  lw        $v1, 8($s0)
-/* 6FB098 80238388 0040282D */  daddu     $a1, $v0, $zero
-/* 6FB09C 8023838C 90630006 */  lbu       $v1, 6($v1)
-/* 6FB0A0 80238390 24020001 */  addiu     $v0, $zero, 1
-/* 6FB0A4 80238394 1062001A */  beq       $v1, $v0, .L80238400
-/* 6FB0A8 80238398 0000202D */   daddu    $a0, $zero, $zero
-/* 6FB0AC 8023839C 28620002 */  slti      $v0, $v1, 2
-/* 6FB0B0 802383A0 10400005 */  beqz      $v0, .L802383B8
-/* 6FB0B4 802383A4 24020002 */   addiu    $v0, $zero, 2
-/* 6FB0B8 802383A8 10600007 */  beqz      $v1, .L802383C8
-/* 6FB0BC 802383AC 28A20064 */   slti     $v0, $a1, 0x64
-/* 6FB0C0 802383B0 0808E11C */  j         .L80238470
-/* 6FB0C4 802383B4 00000000 */   nop
-.L802383B8:
-/* 6FB0C8 802383B8 1062001F */  beq       $v1, $v0, .L80238438
-/* 6FB0CC 802383BC 28A20064 */   slti     $v0, $a1, 0x64
-/* 6FB0D0 802383C0 0808E11C */  j         .L80238470
-/* 6FB0D4 802383C4 00000000 */   nop
-.L802383C8:
-/* 6FB0D8 802383C8 28A20024 */  slti      $v0, $a1, 0x24
-/* 6FB0DC 802383CC 14400027 */  bnez      $v0, .L8023846C
-/* 6FB0E0 802383D0 24040001 */   addiu    $a0, $zero, 1
-/* 6FB0E4 802383D4 28A2003D */  slti      $v0, $a1, 0x3d
-/* 6FB0E8 802383D8 14400024 */  bnez      $v0, .L8023846C
-/* 6FB0EC 802383DC 24040002 */   addiu    $a0, $zero, 2
-/* 6FB0F0 802383E0 28A20051 */  slti      $v0, $a1, 0x51
-/* 6FB0F4 802383E4 14400021 */  bnez      $v0, .L8023846C
-/* 6FB0F8 802383E8 24040003 */   addiu    $a0, $zero, 3
-/* 6FB0FC 802383EC 28A20064 */  slti      $v0, $a1, 0x64
-/* 6FB100 802383F0 1040001F */  beqz      $v0, .L80238470
-/* 6FB104 802383F4 24040005 */   addiu    $a0, $zero, 5
-/* 6FB108 802383F8 0808E11C */  j         .L80238470
-/* 6FB10C 802383FC 24040004 */   addiu    $a0, $zero, 4
-.L80238400:
-/* 6FB110 80238400 28A20024 */  slti      $v0, $a1, 0x24
-/* 6FB114 80238404 14400019 */  bnez      $v0, .L8023846C
-/* 6FB118 80238408 24040001 */   addiu    $a0, $zero, 1
-/* 6FB11C 8023840C 28A2003D */  slti      $v0, $a1, 0x3d
-/* 6FB120 80238410 14400016 */  bnez      $v0, .L8023846C
-/* 6FB124 80238414 24040003 */   addiu    $a0, $zero, 3
-/* 6FB128 80238418 28A20051 */  slti      $v0, $a1, 0x51
-/* 6FB12C 8023841C 14400013 */  bnez      $v0, .L8023846C
-/* 6FB130 80238420 24040004 */   addiu    $a0, $zero, 4
-/* 6FB134 80238424 28A20064 */  slti      $v0, $a1, 0x64
-/* 6FB138 80238428 10400011 */  beqz      $v0, .L80238470
-/* 6FB13C 8023842C 24040006 */   addiu    $a0, $zero, 6
-/* 6FB140 80238430 0808E11C */  j         .L80238470
-/* 6FB144 80238434 24040005 */   addiu    $a0, $zero, 5
-.L80238438:
-/* 6FB148 80238438 28A20024 */  slti      $v0, $a1, 0x24
-/* 6FB14C 8023843C 1440000B */  bnez      $v0, .L8023846C
-/* 6FB150 80238440 24040001 */   addiu    $a0, $zero, 1
-/* 6FB154 80238444 28A2003D */  slti      $v0, $a1, 0x3d
-/* 6FB158 80238448 14400008 */  bnez      $v0, .L8023846C
-/* 6FB15C 8023844C 24040003 */   addiu    $a0, $zero, 3
-/* 6FB160 80238450 28A20051 */  slti      $v0, $a1, 0x51
-/* 6FB164 80238454 14400005 */  bnez      $v0, .L8023846C
-/* 6FB168 80238458 24040005 */   addiu    $a0, $zero, 5
-/* 6FB16C 8023845C 28A20064 */  slti      $v0, $a1, 0x64
-/* 6FB170 80238460 10400003 */  beqz      $v0, .L80238470
-/* 6FB174 80238464 24040007 */   addiu    $a0, $zero, 7
-/* 6FB178 80238468 24040006 */  addiu     $a0, $zero, 6
-.L8023846C:
-/* 6FB17C 8023846C 28A20064 */  slti      $v0, $a1, 0x64
-.L80238470:
-/* 6FB180 80238470 54400003 */  bnel      $v0, $zero, .L80238480
-/* 6FB184 80238474 AE200084 */   sw       $zero, 0x84($s1)
-/* 6FB188 80238478 24020001 */  addiu     $v0, $zero, 1
-/* 6FB18C 8023847C AE220084 */  sw        $v0, 0x84($s1)
-.L80238480:
-/* 6FB190 80238480 AE2400C0 */  sw        $a0, 0xc0($s1)
-/* 6FB194 80238484 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 6FB198 80238488 8FB10014 */  lw        $s1, 0x14($sp)
-/* 6FB19C 8023848C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 6FB1A0 80238490 24020002 */  addiu     $v0, $zero, 2
-/* 6FB1A4 80238494 03E00008 */  jr        $ra
-/* 6FB1A8 80238498 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_8023849C_6FB1AC.s b/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_8023849C_6FB1AC.s
deleted file mode 100644
index 63672f379b..0000000000
--- a/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_8023849C_6FB1AC.s
+++ /dev/null
@@ -1,70 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8023849C_6FB1AC
-/* 6FB1AC 8023849C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 6FB1B0 802384A0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 6FB1B4 802384A4 0080882D */  daddu     $s1, $a0, $zero
-/* 6FB1B8 802384A8 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 6FB1BC 802384AC AFB00010 */  sw        $s0, 0x10($sp)
-/* 6FB1C0 802384B0 8E22000C */  lw        $v0, 0xc($s1)
-/* 6FB1C4 802384B4 8C450000 */  lw        $a1, ($v0)
-/* 6FB1C8 802384B8 3C10800E */  lui       $s0, %hi(gBattleStatus+0xDC)
-/* 6FB1CC 802384BC 8E10C14C */  lw        $s0, %lo(gBattleStatus+0xDC)($s0)
-/* 6FB1D0 802384C0 0C0B1EAF */  jal       get_variable
-/* 6FB1D4 802384C4 00000000 */   nop
-/* 6FB1D8 802384C8 8E030008 */  lw        $v1, 8($s0)
-/* 6FB1DC 802384CC 0040282D */  daddu     $a1, $v0, $zero
-/* 6FB1E0 802384D0 90630006 */  lbu       $v1, 6($v1)
-/* 6FB1E4 802384D4 24020001 */  addiu     $v0, $zero, 1
-/* 6FB1E8 802384D8 10620006 */  beq       $v1, $v0, .L802384F4
-/* 6FB1EC 802384DC 0000202D */   daddu    $a0, $zero, $zero
-/* 6FB1F0 802384E0 24020002 */  addiu     $v0, $zero, 2
-/* 6FB1F4 802384E4 10620011 */  beq       $v1, $v0, .L8023852C
-/* 6FB1F8 802384E8 28A20064 */   slti     $v0, $a1, 0x64
-/* 6FB1FC 802384EC 0808E159 */  j         .L80238564
-/* 6FB200 802384F0 00000000 */   nop
-.L802384F4:
-/* 6FB204 802384F4 28A20024 */  slti      $v0, $a1, 0x24
-/* 6FB208 802384F8 14400019 */  bnez      $v0, .L80238560
-/* 6FB20C 802384FC 24040001 */   addiu    $a0, $zero, 1
-/* 6FB210 80238500 28A2003D */  slti      $v0, $a1, 0x3d
-/* 6FB214 80238504 14400016 */  bnez      $v0, .L80238560
-/* 6FB218 80238508 24040003 */   addiu    $a0, $zero, 3
-/* 6FB21C 8023850C 28A20051 */  slti      $v0, $a1, 0x51
-/* 6FB220 80238510 14400013 */  bnez      $v0, .L80238560
-/* 6FB224 80238514 24040004 */   addiu    $a0, $zero, 4
-/* 6FB228 80238518 28A20064 */  slti      $v0, $a1, 0x64
-/* 6FB22C 8023851C 10400011 */  beqz      $v0, .L80238564
-/* 6FB230 80238520 24040006 */   addiu    $a0, $zero, 6
-/* 6FB234 80238524 0808E159 */  j         .L80238564
-/* 6FB238 80238528 24040005 */   addiu    $a0, $zero, 5
-.L8023852C:
-/* 6FB23C 8023852C 28A20024 */  slti      $v0, $a1, 0x24
-/* 6FB240 80238530 1440000B */  bnez      $v0, .L80238560
-/* 6FB244 80238534 24040001 */   addiu    $a0, $zero, 1
-/* 6FB248 80238538 28A2003D */  slti      $v0, $a1, 0x3d
-/* 6FB24C 8023853C 14400008 */  bnez      $v0, .L80238560
-/* 6FB250 80238540 24040003 */   addiu    $a0, $zero, 3
-/* 6FB254 80238544 28A20051 */  slti      $v0, $a1, 0x51
-/* 6FB258 80238548 14400005 */  bnez      $v0, .L80238560
-/* 6FB25C 8023854C 24040005 */   addiu    $a0, $zero, 5
-/* 6FB260 80238550 28A20064 */  slti      $v0, $a1, 0x64
-/* 6FB264 80238554 10400003 */  beqz      $v0, .L80238564
-/* 6FB268 80238558 24040007 */   addiu    $a0, $zero, 7
-/* 6FB26C 8023855C 24040006 */  addiu     $a0, $zero, 6
-.L80238560:
-/* 6FB270 80238560 28A20064 */  slti      $v0, $a1, 0x64
-.L80238564:
-/* 6FB274 80238564 54400003 */  bnel      $v0, $zero, .L80238574
-/* 6FB278 80238568 AE200084 */   sw       $zero, 0x84($s1)
-/* 6FB27C 8023856C 24020001 */  addiu     $v0, $zero, 1
-/* 6FB280 80238570 AE220084 */  sw        $v0, 0x84($s1)
-.L80238574:
-/* 6FB284 80238574 AE2400C0 */  sw        $a0, 0xc0($s1)
-/* 6FB288 80238578 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 6FB28C 8023857C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 6FB290 80238580 8FB00010 */  lw        $s0, 0x10($sp)
-/* 6FB294 80238584 24020002 */  addiu     $v0, $zero, 2
-/* 6FB298 80238588 03E00008 */  jr        $ra
-/* 6FB29C 8023858C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238590_6FB2A0.s b/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238590_6FB2A0.s
deleted file mode 100644
index 158527a857..0000000000
--- a/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238590_6FB2A0.s
+++ /dev/null
@@ -1,51 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80238590_6FB2A0
-/* 6FB2A0 80238590 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 6FB2A4 80238594 AFB10014 */  sw        $s1, 0x14($sp)
-/* 6FB2A8 80238598 0080882D */  daddu     $s1, $a0, $zero
-/* 6FB2AC 8023859C AFBF0018 */  sw        $ra, 0x18($sp)
-/* 6FB2B0 802385A0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 6FB2B4 802385A4 8E22000C */  lw        $v0, 0xc($s1)
-/* 6FB2B8 802385A8 8C450000 */  lw        $a1, ($v0)
-/* 6FB2BC 802385AC 3C10800E */  lui       $s0, %hi(gBattleStatus+0xDC)
-/* 6FB2C0 802385B0 8E10C14C */  lw        $s0, %lo(gBattleStatus+0xDC)($s0)
-/* 6FB2C4 802385B4 0C0B1EAF */  jal       get_variable
-/* 6FB2C8 802385B8 00000000 */   nop
-/* 6FB2CC 802385BC 8E030008 */  lw        $v1, 8($s0)
-/* 6FB2D0 802385C0 0040282D */  daddu     $a1, $v0, $zero
-/* 6FB2D4 802385C4 90630006 */  lbu       $v1, 6($v1)
-/* 6FB2D8 802385C8 24020002 */  addiu     $v0, $zero, 2
-/* 6FB2DC 802385CC 1462000E */  bne       $v1, $v0, .L80238608
-/* 6FB2E0 802385D0 0000202D */   daddu    $a0, $zero, $zero
-/* 6FB2E4 802385D4 28A20024 */  slti      $v0, $a1, 0x24
-/* 6FB2E8 802385D8 1440000B */  bnez      $v0, .L80238608
-/* 6FB2EC 802385DC 24040001 */   addiu    $a0, $zero, 1
-/* 6FB2F0 802385E0 28A2003D */  slti      $v0, $a1, 0x3d
-/* 6FB2F4 802385E4 14400008 */  bnez      $v0, .L80238608
-/* 6FB2F8 802385E8 24040003 */   addiu    $a0, $zero, 3
-/* 6FB2FC 802385EC 28A20051 */  slti      $v0, $a1, 0x51
-/* 6FB300 802385F0 14400005 */  bnez      $v0, .L80238608
-/* 6FB304 802385F4 24040005 */   addiu    $a0, $zero, 5
-/* 6FB308 802385F8 28A20064 */  slti      $v0, $a1, 0x64
-/* 6FB30C 802385FC 10400003 */  beqz      $v0, .L8023860C
-/* 6FB310 80238600 24040007 */   addiu    $a0, $zero, 7
-/* 6FB314 80238604 24040006 */  addiu     $a0, $zero, 6
-.L80238608:
-/* 6FB318 80238608 28A20064 */  slti      $v0, $a1, 0x64
-.L8023860C:
-/* 6FB31C 8023860C 54400003 */  bnel      $v0, $zero, .L8023861C
-/* 6FB320 80238610 AE200084 */   sw       $zero, 0x84($s1)
-/* 6FB324 80238614 24020001 */  addiu     $v0, $zero, 1
-/* 6FB328 80238618 AE220084 */  sw        $v0, 0x84($s1)
-.L8023861C:
-/* 6FB32C 8023861C AE2400C0 */  sw        $a0, 0xc0($s1)
-/* 6FB330 80238620 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 6FB334 80238624 8FB10014 */  lw        $s1, 0x14($sp)
-/* 6FB338 80238628 8FB00010 */  lw        $s0, 0x10($sp)
-/* 6FB33C 8023862C 24020002 */  addiu     $v0, $zero, 2
-/* 6FB340 80238630 03E00008 */  jr        $ra
-/* 6FB344 80238634 27BD0020 */   addiu    $sp, $sp, 0x20
-/* 6FB348 80238638 00000000 */  nop
-/* 6FB34C 8023863C 00000000 */  nop