1 files changed, 21 insertions, 123 deletions
diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c
index 33e7620f7..b58363d31 100644
--- a/src/script_pokemon_util_80F99CC.c
+++ b/src/script_pokemon_util_80F99CC.c
@@ -19,6 +19,8 @@
 #include "text.h"
 #include "ewram.h"
 
+extern const u8 gUnknown_08208238[];
+
 extern u8 gPlayerPartyCount;
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
@@ -297,130 +299,26 @@ void ScrSpecial_GetPokemonNicknameAndMoveName(void)
     StringCopy(gStringVar2, gMoveNames[data]);
 }
 
-// no. hard
-__attribute__((naked))
-void sub_80F9FDC(struct Pokemon *party, u8 var, u8 var2)
+void sub_80F9FDC(struct Pokemon *pkmn, u8 moveIndex1, u8 moveIndex2)
 {
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    mov r7, r10\n\
-    mov r6, r9\n\
-    mov r5, r8\n\
-    push {r5-r7}\n\
-    sub sp, 0x20\n\
-    mov r8, r0\n\
-    adds r5, r1, 0\n\
-    adds r4, r2, 0\n\
-    lsls r5, 24\n\
-    lsrs r5, 24\n\
-    lsls r4, 24\n\
-    lsrs r4, 24\n\
-    adds r0, r5, 0\n\
-    adds r0, 0xD\n\
-    str r0, [sp, 0x8]\n\
-    mov r0, r8\n\
-    ldr r1, [sp, 0x8]\n\
-    bl GetMonData\n\
-    mov r1, sp\n\
-    adds r1, 0x2\n\
-    str r1, [sp, 0x14]\n\
-    strh r0, [r1]\n\
-    adds r3, r4, 0\n\
-    adds r3, 0xD\n\
-    str r3, [sp, 0xC]\n\
-    mov r0, r8\n\
-    adds r1, r3, 0\n\
-    bl GetMonData\n\
-    mov r1, sp\n\
-    strh r0, [r1]\n\
-    adds r7, r5, 0\n\
-    adds r7, 0x11\n\
-    str r7, [sp, 0x10]\n\
-    mov r0, r8\n\
-    adds r1, r7, 0\n\
-    bl GetMonData\n\
-    mov r1, sp\n\
-    adds r1, 0x5\n\
-    str r1, [sp, 0x18]\n\
-    strb r0, [r1]\n\
-    adds r3, r4, 0\n\
-    adds r3, 0x11\n\
-    str r3, [sp, 0x1C]\n\
-    mov r0, r8\n\
-    adds r1, r3, 0\n\
-    bl GetMonData\n\
-    add r7, sp, 0x4\n\
-    mov r10, r7\n\
-    strb r0, [r7]\n\
-    mov r0, r8\n\
-    movs r1, 0x15\n\
-    bl GetMonData\n\
-    mov r6, sp\n\
-    adds r6, 0x6\n\
-    strb r0, [r6]\n\
-    ldr r1, _080FA0D8 @ =gUnknown_08208238\n\
-    adds r0, r5, r1\n\
-    ldrb r0, [r0]\n\
-    mov r9, r0\n\
-    ldrb r0, [r6]\n\
-    adds r2, r0, 0\n\
-    mov r3, r9\n\
-    ands r2, r3\n\
-    lsls r5, 1\n\
-    asrs r2, r5\n\
-    lsls r2, 24\n\
-    lsrs r2, 24\n\
-    adds r1, r4, r1\n\
-    ldrb r3, [r1]\n\
-    adds r1, r0, 0\n\
-    ands r1, r3\n\
-    lsls r4, 1\n\
-    asrs r1, r4\n\
-    lsls r1, 24\n\
-    lsrs r1, 24\n\
-    mov r7, r9\n\
-    bics r0, r7\n\
-    strb r0, [r6]\n\
-    ldrb r0, [r6]\n\
-    bics r0, r3\n\
-    strb r0, [r6]\n\
-    lsls r2, r4\n\
-    lsls r1, r5\n\
-    adds r2, r1\n\
-    ldrb r0, [r6]\n\
-    orrs r0, r2\n\
-    strb r0, [r6]\n\
-    mov r0, r8\n\
-    ldr r1, [sp, 0x8]\n\
-    mov r2, sp\n\
-    bl SetMonData\n\
-    mov r0, r8\n\
-    ldr r1, [sp, 0xC]\n\
-    ldr r2, [sp, 0x14]\n\
-    bl SetMonData\n\
-    mov r0, r8\n\
-    ldr r1, [sp, 0x10]\n\
-    mov r2, r10\n\
-    bl SetMonData\n\
-    mov r0, r8\n\
-    ldr r1, [sp, 0x1C]\n\
-    ldr r2, [sp, 0x18]\n\
-    bl SetMonData\n\
-    mov r0, r8\n\
-    movs r1, 0x15\n\
-    adds r2, r6, 0\n\
-    bl SetMonData\n\
-    add sp, 0x20\n\
-    pop {r3-r5}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    mov r10, r5\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_080FA0D8: .4byte gUnknown_08208238\n\
-    .syntax divided");
+    u16 move1 = GetMonData(pkmn, MON_DATA_MOVE1 + moveIndex1);
+    u16 move2 = GetMonData(pkmn, MON_DATA_MOVE1 + moveIndex2);
+    u8 pp1 = GetMonData(pkmn, MON_DATA_PP1 + moveIndex1);
+    u8 pp2 = GetMonData(pkmn, MON_DATA_PP1 + moveIndex2);
+    u8 bonuses = GetMonData(pkmn, MON_DATA_PP_BONUSES);
+
+    u8 r2 = (bonuses & gUnknown_08208238[moveIndex1]) >> (moveIndex1 * 2);
+    u8 r1 = (bonuses & gUnknown_08208238[moveIndex2]) >> (moveIndex2 * 2);
+
+    bonuses &= ~gUnknown_08208238[moveIndex1];
+    bonuses &= ~gUnknown_08208238[moveIndex2];
+    bonuses |= (r2 << (moveIndex2 * 2)) + (r1 << (moveIndex1 * 2));
+
+    SetMonData(pkmn, MON_DATA_MOVE1 + moveIndex1, &move2);
+    SetMonData(pkmn, MON_DATA_MOVE1 + moveIndex2, &move1);
+    SetMonData(pkmn, MON_DATA_PP1 + moveIndex1, &pp2);
+    SetMonData(pkmn, MON_DATA_PP1 + moveIndex2, &pp1);
+    SetMonData(pkmn, MON_DATA_PP_BONUSES, &bonuses);
 }
 
 void sub_80FA0DC(void)