battle_script_commands.c: atk24 OK

2 files changed, 10 insertions, 234 deletions

diff --git a/include/battle.h b/include/battle.h
index 59eee8407..536ac5995 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -139,15 +139,14 @@ struct ProtectStruct
 
 struct SpecialStatus
 {
-    u8 statLowered:1;
-    u8 lightningRodRedirected:1;
-    u8 restoredBattlerSprite: 1;
-    u8 intimidatedMon:1;
-    u8 traced:1;
-    u8 ppNotAffectedByPressure:1;
-    u8 flag40:1;
-    u8 focusBanded:1;
-    u8 field1[3];
+    u32 statLowered:1;
+    u32 lightningRodRedirected:1;
+    u32 restoredBattlerSprite: 1;
+    u32 intimidatedMon:1;
+    u32 traced:1;
+    u32 ppNotAffectedByPressure:1;
+    u32 flag40:1;
+    u32 focusBanded:1;
     s32 dmg;
     s32 physicalDmg;
     s32 specialDmg;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 950536d6b..1eb25e62f 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -5572,8 +5572,6 @@ static void atk23_getexp(void)
     }
 }
 
-// very close permutation but still isn't right
-#ifdef NONMATCHING
 static void atk24(void)
 {
     u16 HP_count = 0;
@@ -5581,9 +5579,8 @@ static void atk24(void)
     s32 found1;
     s32 found2;
 
-    // should...? be like this, plethora of other attack routines do it too
-    if (gBattleControllerExecFlags == 0) // cmp r0, 0
-    { // beq 0x80209C6
+    if (gBattleControllerExecFlags == 0)
+    {
         for (i = 0; i < 6; i++)
         {
             if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) && !GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG))
@@ -5636,227 +5633,7 @@ static void atk24(void)
             gBattlescriptCurrInstr += 5;
         }
     }
-    // b 0x8020B46
-}
-#else
-NAKED
-static void atk24(void)
-{
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    mov r7, r8\n\
-    push {r7}\n\
-    movs r6, 0\n\
-    ldr r0, _08020AF0 @ =gBattleControllerExecFlags\n\
-    ldr r0, [r0]\n\
-    cmp r0, 0\n\
-    beq _080209C6\n\
-    b _08020B46\n\
-_080209C6:\n\
-    movs r5, 0\n\
-_080209C8:\n\
-    movs r0, 0x64\n\
-    adds r1, r5, 0\n\
-    muls r1, r0\n\
-    ldr r0, _08020AF4 @ =gPlayerParty\n\
-    adds r4, r1, r0\n\
-    adds r0, r4, 0\n\
-    movs r1, 0xB\n\
-    bl GetMonData\n\
-    cmp r0, 0\n\
-    beq _080209F8\n\
-    adds r0, r4, 0\n\
-    movs r1, 0x2D\n\
-    bl GetMonData\n\
-    cmp r0, 0\n\
-    bne _080209F8\n\
-    adds r0, r4, 0\n\
-    movs r1, 0x39\n\
-    bl GetMonData\n\
-    adds r0, r6, r0\n\
-    lsls r0, 16\n\
-    lsrs r6, r0, 16\n\
-_080209F8:\n\
-    adds r5, 0x1\n\
-    cmp r5, 0x5\n\
-    ble _080209C8\n\
-    cmp r6, 0\n\
-    bne _08020A0C\n\
-    ldr r0, _08020AF8 @ =gBattleOutcome\n\
-    ldrb r1, [r0]\n\
-    movs r2, 0x2\n\
-    orrs r1, r2\n\
-    strb r1, [r0]\n\
-_08020A0C:\n\
-    movs r6, 0\n\
-    movs r5, 0\n\
-_08020A10:\n\
-    movs r0, 0x64\n\
-    adds r1, r5, 0\n\
-    muls r1, r0\n\
-    ldr r0, _08020AFC @ =gEnemyParty\n\
-    adds r4, r1, r0\n\
-    adds r0, r4, 0\n\
-    movs r1, 0xB\n\
-    bl GetMonData\n\
-    cmp r0, 0\n\
-    beq _08020A40\n\
-    adds r0, r4, 0\n\
-    movs r1, 0x2D\n\
-    bl GetMonData\n\
-    cmp r0, 0\n\
-    bne _08020A40\n\
-    adds r0, r4, 0\n\
-    movs r1, 0x39\n\
-    bl GetMonData\n\
-    adds r0, r6, r0\n\
-    lsls r0, 16\n\
-    lsrs r6, r0, 16\n\
-_08020A40:\n\
-    adds r5, 0x1\n\
-    cmp r5, 0x5\n\
-    ble _08020A10\n\
-    ldr r2, _08020AF8 @ =gBattleOutcome\n\
-    cmp r6, 0\n\
-    bne _08020A54\n\
-    ldrb r0, [r2]\n\
-    movs r1, 0x1\n\
-    orrs r0, r1\n\
-    strb r0, [r2]\n\
-_08020A54:\n\
-    ldrb r0, [r2]\n\
-    cmp r0, 0\n\
-    bne _08020B3E\n\
-    ldr r2, _08020B00 @ =gBattleTypeFlags\n\
-    ldrh r1, [r2]\n\
-    movs r0, 0x2\n\
-    ands r0, r1\n\
-    mov r8, r2\n\
-    cmp r0, 0\n\
-    beq _08020B3E\n\
-    movs r2, 0\n\
-    movs r5, 0\n\
-    ldr r0, _08020B04 @ =gBattlersCount\n\
-    ldrb r3, [r0]\n\
-    mov r12, r0\n\
-    ldr r7, _08020B08 @ =gBattlescriptCurrInstr\n\
-    cmp r2, r3\n\
-    bge _08020AA0\n\
-    ldr r0, _08020B0C @ =gHitMarker\n\
-    movs r1, 0x80\n\
-    lsls r1, 21\n\
-    ldr r6, [r0]\n\
-    adds r4, r3, 0\n\
-    ldr r3, _08020B10 @ =gSpecialStatuses\n\
-_08020A84:\n\
-    adds r0, r1, 0\n\
-    lsls r0, r5\n\
-    ands r0, r6\n\
-    cmp r0, 0\n\
-    beq _08020A98\n\
-    ldrb r0, [r3]\n\
-    lsls r0, 25\n\
-    cmp r0, 0\n\
-    blt _08020A98\n\
-    adds r2, 0x1\n\
-_08020A98:\n\
-    adds r3, 0x28\n\
-    adds r5, 0x2\n\
-    cmp r5, r4\n\
-    blt _08020A84\n\
-_08020AA0:\n\
-    movs r4, 0\n\
-    movs r5, 0x1\n\
-    mov r0, r12\n\
-    ldrb r3, [r0]\n\
-    cmp r5, r3\n\
-    bge _08020ADA\n\
-    ldr r0, _08020B0C @ =gHitMarker\n\
-    movs r1, 0x80\n\
-    lsls r1, 21\n\
-    mov r12, r1\n\
-    ldr r1, [r0]\n\
-    ldr r0, _08020B10 @ =gSpecialStatuses\n\
-    adds r6, r3, 0\n\
-    adds r3, r0, 0\n\
-    adds r3, 0x14\n\
-_08020ABE:\n\
-    mov r0, r12\n\
-    lsls r0, r5\n\
-    ands r0, r1\n\
-    cmp r0, 0\n\
-    beq _08020AD2\n\
-    ldrb r0, [r3]\n\
-    lsls r0, 25\n\
-    cmp r0, 0\n\
-    blt _08020AD2\n\
-    adds r4, 0x1\n\
-_08020AD2:\n\
-    adds r3, 0x28\n\
-    adds r5, 0x2\n\
-    cmp r5, r6\n\
-    blt _08020ABE\n\
-_08020ADA:\n\
-    mov r0, r8\n\
-    ldrh r1, [r0]\n\
-    movs r0, 0x40\n\
-    ands r0, r1\n\
-    cmp r0, 0\n\
-    beq _08020B14\n\
-    adds r0, r4, r2\n\
-    cmp r0, 0x1\n\
-    bgt _08020B1C\n\
-    b _08020B36\n\
-    .align 2, 0\n\
-_08020AF0: .4byte gBattleControllerExecFlags\n\
-_08020AF4: .4byte gPlayerParty\n\
-_08020AF8: .4byte gBattleOutcome\n\
-_08020AFC: .4byte gEnemyParty\n\
-_08020B00: .4byte gBattleTypeFlags\n\
-_08020B04: .4byte gBattlersCount\n\
-_08020B08: .4byte gBattlescriptCurrInstr\n\
-_08020B0C: .4byte gHitMarker\n\
-_08020B10: .4byte gSpecialStatuses\n\
-_08020B14:\n\
-    cmp r4, 0\n\
-    beq _08020B36\n\
-    cmp r2, 0\n\
-    beq _08020B36\n\
-_08020B1C:\n\
-    ldr r2, [r7]\n\
-    ldrb r1, [r2, 0x1]\n\
-    ldrb r0, [r2, 0x2]\n\
-    lsls r0, 8\n\
-    adds r1, r0\n\
-    ldrb r0, [r2, 0x3]\n\
-    lsls r0, 16\n\
-    adds r1, r0\n\
-    ldrb r0, [r2, 0x4]\n\
-    lsls r0, 24\n\
-    adds r1, r0\n\
-    str r1, [r7]\n\
-    b _08020B46\n\
-_08020B36:\n\
-    ldr r0, [r7]\n\
-    adds r0, 0x5\n\
-    str r0, [r7]\n\
-    b _08020B46\n\
-_08020B3E:\n\
-    ldr r1, _08020B50 @ =gBattlescriptCurrInstr\n\
-    ldr r0, [r1]\n\
-    adds r0, 0x5\n\
-    str r0, [r1]\n\
-_08020B46:\n\
-    pop {r3}\n\
-    mov r8, r3\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_08020B50: .4byte gBattlescriptCurrInstr\n\
-        .syntax divided\n");
 }
-#endif // NONMATCHING
 
 static void MoveValuesCleanUp(void)
 {