Undo PokeCodec's PRs

This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.

Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.

1 files changed, 344 insertions, 44 deletions

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index fca2b3879..9cff332ca 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -3489,6 +3489,7 @@ static void Cmd_getexp(void)
     }
 }
 
+#ifdef NONMATCHING
 static void Cmd_unknown_24(void)
 {
     u16 HP_count = 0;
@@ -3520,9 +3521,7 @@ static void Cmd_unknown_24(void)
     if (HP_count == 0)
         gBattleOutcome |= B_OUTCOME_LOST;
 
-    HP_count = 0;
-
-    for (i = 0; i < PARTY_SIZE; i++)
+    for (HP_count = 0, i = 0; i < PARTY_SIZE; i++)
     {
         if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES) && !GetMonData(&gEnemyParty[i], MON_DATA_IS_EGG)
             && (!(gBattleTypeFlags & BATTLE_TYPE_ARENA) || !(gBattleStruct->arenaLostOpponentMons & gBitTable[i])))
@@ -3536,31 +3535,33 @@ static void Cmd_unknown_24(void)
 
     if (gBattleOutcome == 0 && (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)))
     {
-        s32 foundPlayer = 0, foundOpponent;
-        for (i = 0; i < gBattlersCount; i += 2)
+        s32 foundPlayer;
+        s32 foundOpponent;
+
+        // Impossible to decompile loops.
+        for (foundPlayer = 0, i = 0; i < gBattlersCount; i += 2)
         {
-            if ((gHitMarker & HITMARKER_FAINTED2(i)) && (!gSpecialStatuses[i].flag40))
+            if (HITMARKER_FAINTED2(i) & gHitMarker && !gSpecialStatuses[i].flag40)
                 foundPlayer++;
         }
 
-        foundOpponent = 0;
-        for (i = 1; i < gBattlersCount; i += 2)
+        for (foundOpponent = 0, i = 1; i < gBattlersCount; i += 2)
         {
-            if ((gHitMarker & HITMARKER_FAINTED2(i)) && (!gSpecialStatuses[i].flag40))
+            if (HITMARKER_FAINTED2(i) & gHitMarker && !gSpecialStatuses[i].flag40)
                 foundOpponent++;
         }
 
         if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
         {
             if (foundOpponent + foundPlayer > 1)
-                gBattlescriptCurrInstr = (u8*) T2_READ_32(gBattlescriptCurrInstr + 1);
+                gBattlescriptCurrInstr = T2_READ_PTR(gBattlescriptCurrInstr + 1);
             else
                 gBattlescriptCurrInstr += 5;
         }
         else
         {
             if (foundOpponent != 0 && foundPlayer != 0)
-                gBattlescriptCurrInstr = (u8*) T2_READ_32(gBattlescriptCurrInstr + 1);
+                gBattlescriptCurrInstr = T2_READ_PTR(gBattlescriptCurrInstr + 1);
             else
                 gBattlescriptCurrInstr += 5;
         }
@@ -3570,6 +3571,301 @@ static void Cmd_unknown_24(void)
         gBattlescriptCurrInstr += 5;
     }
 }
+#else
+NAKED
+static void Cmd_unknown_24(void)
+{
+    asm("\n\
+        .syntax unified\n\
+        push {r4-r7,lr}\n\
+        mov r7, r8\n\
+        push {r7}\n\
+        movs r6, 0\n\
+        ldr r0, =gBattleControllerExecFlags\n\
+        ldr r0, [r0]\n\
+        cmp r0, 0\n\
+        beq _0804ACE2\n\
+        b _0804AF22\n\
+    _0804ACE2:\n\
+        ldr r0, =gBattleTypeFlags\n\
+        ldr r0, [r0]\n\
+        movs r1, 0x80\n\
+        lsls r1, 15\n\
+        ands r0, r1\n\
+        cmp r0, 0\n\
+        beq _0804AD48\n\
+        ldr r0, =gPartnerTrainerId\n\
+        ldrh r1, [r0]\n\
+        ldr r0, =0x00000c03\n\
+        cmp r1, r0\n\
+        bne _0804AD48\n\
+        movs r5, 0\n\
+    _0804ACFC:\n\
+        movs r0, 0x64\n\
+        adds r1, r5, 0\n\
+        muls r1, r0\n\
+        ldr r0, =gPlayerParty\n\
+        adds r4, r1, r0\n\
+        adds r0, r4, 0\n\
+        movs r1, 0xB\n\
+        bl GetMonData\n\
+        cmp r0, 0\n\
+        beq _0804AD2C\n\
+        adds r0, r4, 0\n\
+        movs r1, 0x2D\n\
+        bl GetMonData\n\
+        cmp r0, 0\n\
+        bne _0804AD2C\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\
+    _0804AD2C:\n\
+        adds r5, 0x1\n\
+        cmp r5, 0x2\n\
+        ble _0804ACFC\n\
+        b _0804ADA8\n\
+        .pool\n\
+    _0804AD48:\n\
+        movs r5, 0\n\
+    _0804AD4A:\n\
+        movs r0, 0x64\n\
+        adds r1, r5, 0\n\
+        muls r1, r0\n\
+        ldr r0, =gPlayerParty\n\
+        adds r4, r1, r0\n\
+        adds r0, r4, 0\n\
+        movs r1, 0xB\n\
+        bl GetMonData\n\
+        cmp r0, 0\n\
+        beq _0804ADA2\n\
+        adds r0, r4, 0\n\
+        movs r1, 0x2D\n\
+        bl GetMonData\n\
+        cmp r0, 0\n\
+        bne _0804ADA2\n\
+        ldr r0, =gBattleTypeFlags\n\
+        ldr r0, [r0]\n\
+        movs r1, 0x80\n\
+        lsls r1, 11\n\
+        ands r0, r1\n\
+        cmp r0, 0\n\
+        beq _0804AD94\n\
+        ldr r0, =gBattleStruct\n\
+        ldr r0, [r0]\n\
+        movs r1, 0xA8\n\
+        lsls r1, 2\n\
+        adds r0, r1\n\
+        ldrb r1, [r0]\n\
+        ldr r2, =gBitTable\n\
+        lsls r0, r5, 2\n\
+        adds r0, r2\n\
+        ldr r0, [r0]\n\
+        ands r1, r0\n\
+        cmp r1, 0\n\
+        bne _0804ADA2\n\
+    _0804AD94:\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\
+    _0804ADA2:\n\
+        adds r5, 0x1\n\
+        cmp r5, 0x5\n\
+        ble _0804AD4A\n\
+    _0804ADA8:\n\
+        cmp r6, 0\n\
+        bne _0804ADB6\n\
+        ldr r0, =gBattleOutcome\n\
+        ldrb r1, [r0]\n\
+        movs r2, 0x2\n\
+        orrs r1, r2\n\
+        strb r1, [r0]\n\
+    _0804ADB6:\n\
+        movs r6, 0\n\
+        movs r5, 0\n\
+    _0804ADBA:\n\
+        movs r0, 0x64\n\
+        adds r1, r5, 0\n\
+        muls r1, r0\n\
+        ldr r0, =gEnemyParty\n\
+        adds r4, r1, r0\n\
+        adds r0, r4, 0\n\
+        movs r1, 0xB\n\
+        bl GetMonData\n\
+        cmp r0, 0\n\
+        beq _0804AE10\n\
+        adds r0, r4, 0\n\
+        movs r1, 0x2D\n\
+        bl GetMonData\n\
+        cmp r0, 0\n\
+        bne _0804AE10\n\
+        ldr r0, =gBattleTypeFlags\n\
+        ldr r0, [r0]\n\
+        movs r1, 0x80\n\
+        lsls r1, 11\n\
+        ands r0, r1\n\
+        cmp r0, 0\n\
+        beq _0804AE02\n\
+        ldr r0, =gBattleStruct\n\
+        ldr r0, [r0]\n\
+        ldr r1, =0x000002a1\n\
+        adds r0, r1\n\
+        ldrb r1, [r0]\n\
+        ldr r2, =gBitTable\n\
+        lsls r0, r5, 2\n\
+        adds r0, r2\n\
+        ldr r0, [r0]\n\
+        ands r1, r0\n\
+        cmp r1, 0\n\
+        bne _0804AE10\n\
+    _0804AE02:\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\
+    _0804AE10:\n\
+        adds r5, 0x1\n\
+        cmp r5, 0x5\n\
+        ble _0804ADBA\n\
+        ldr r2, =gBattleOutcome\n\
+        cmp r6, 0\n\
+        bne _0804AE24\n\
+        ldrb r0, [r2]\n\
+        movs r1, 0x1\n\
+        orrs r0, r1\n\
+        strb r0, [r2]\n\
+    _0804AE24:\n\
+        ldrb r0, [r2]\n\
+        cmp r0, 0\n\
+        bne _0804AF1A\n\
+        ldr r0, =gBattleTypeFlags\n\
+        ldr r1, [r0]\n\
+        ldr r2, =0x02000002\n\
+        ands r1, r2\n\
+        mov r8, r0\n\
+        cmp r1, 0\n\
+        beq _0804AF1A\n\
+        movs r3, 0\n\
+        movs r5, 0\n\
+        ldr r0, =gBattlersCount\n\
+        ldrb r1, [r0]\n\
+        mov r12, r0\n\
+        ldr r7, =gBattlescriptCurrInstr\n\
+        cmp r3, r1\n\
+        bge _0804AE70\n\
+        ldr r0, =gHitMarker\n\
+        movs r6, 0x80\n\
+        lsls r6, 21\n\
+        ldr r4, [r0]\n\
+        adds r2, r1, 0\n\
+        ldr r1, =gSpecialStatuses\n\
+    _0804AE54:\n\
+        adds r0, r6, 0\n\
+        lsls r0, r5\n\
+        ands r0, r4\n\
+        cmp r0, 0\n\
+        beq _0804AE68\n\
+        ldrb r0, [r1]\n\
+        lsls r0, 25\n\
+        cmp r0, 0\n\
+        blt _0804AE68\n\
+        adds r3, 0x1\n\
+    _0804AE68:\n\
+        adds r1, 0x28\n\
+        adds r5, 0x2\n\
+        cmp r5, r2\n\
+        blt _0804AE54\n\
+    _0804AE70:\n\
+        movs r2, 0\n\
+        movs r5, 0x1\n\
+        mov r4, r12\n\
+        ldrb r1, [r4]\n\
+        cmp r5, r1\n\
+        bge _0804AEAA\n\
+        ldr r0, =gHitMarker\n\
+        movs r4, 0x80\n\
+        lsls r4, 21\n\
+        mov r12, r4\n\
+        ldr r6, [r0]\n\
+        ldr r0, =gSpecialStatuses\n\
+        adds r4, r1, 0\n\
+        adds r1, r0, 0\n\
+        adds r1, 0x14\n\
+    _0804AE8E:\n\
+        mov r0, r12\n\
+        lsls r0, r5\n\
+        ands r0, r6\n\
+        cmp r0, 0\n\
+        beq _0804AEA2\n\
+        ldrb r0, [r1]\n\
+        lsls r0, 25\n\
+        cmp r0, 0\n\
+        blt _0804AEA2\n\
+        adds r2, 0x1\n\
+    _0804AEA2:\n\
+        adds r1, 0x28\n\
+        adds r5, 0x2\n\
+        cmp r5, r4\n\
+        blt _0804AE8E\n\
+    _0804AEAA:\n\
+        mov r1, r8\n\
+        ldr r0, [r1]\n\
+        movs r1, 0x40\n\
+        ands r0, r1\n\
+        cmp r0, 0\n\
+        beq _0804AEF0\n\
+        adds r0, r2, r3\n\
+        cmp r0, 0x1\n\
+        bgt _0804AEF8\n\
+        b _0804AF12\n\
+        .pool\n\
+    _0804AEF0:\n\
+        cmp r2, 0\n\
+        beq _0804AF12\n\
+        cmp r3, 0\n\
+        beq _0804AF12\n\
+    _0804AEF8:\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 _0804AF22\n\
+    _0804AF12:\n\
+        ldr r0, [r7]\n\
+        adds r0, 0x5\n\
+        str r0, [r7]\n\
+        b _0804AF22\n\
+    _0804AF1A:\n\
+        ldr r1, =gBattlescriptCurrInstr\n\
+        ldr r0, [r1]\n\
+        adds r0, 0x5\n\
+        str r0, [r1]\n\
+    _0804AF22:\n\
+        pop {r3}\n\
+        mov r8, r3\n\
+        pop {r4-r7}\n\
+        pop {r0}\n\
+        bx r0\n\
+        .pool\n\
+        .syntax divided");
+}
+
+#endif // NONMATCHING
 
 static void MoveValuesCleanUp(void)
 {
@@ -4661,10 +4957,8 @@ static void Cmd_jumpifcantswitch(void)
             || (gStatuses3[gActiveBattler] & STATUS3_ROOTED)))
     {
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 2);
-        return;
     }
-
-    if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
+    else if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
     {
         #ifndef NONMATCHING
             asm("":::"r5");
@@ -5362,21 +5656,21 @@ static void Cmd_yesnoboxlearnmove(void)
         BattleCreateYesNoCursorAt(0);
         break;
     case 1:
-        if (JOY_NEW(DPAD_UP) && gBattleCommunication[CURSOR_POSITION] != 0)
+        if (gMain.newKeys & DPAD_UP && gBattleCommunication[CURSOR_POSITION] != 0)
         {
             PlaySE(SE_SELECT);
             BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
             gBattleCommunication[CURSOR_POSITION] = 0;
             BattleCreateYesNoCursorAt(0);
         }
-        if (JOY_NEW(DPAD_DOWN) && gBattleCommunication[CURSOR_POSITION] == 0)
+        if (gMain.newKeys & DPAD_DOWN && gBattleCommunication[CURSOR_POSITION] == 0)
         {
             PlaySE(SE_SELECT);
             BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
             gBattleCommunication[CURSOR_POSITION] = 1;
             BattleCreateYesNoCursorAt(1);
         }
-        if (JOY_NEW(A_BUTTON))
+        if (gMain.newKeys & A_BUTTON)
         {
             PlaySE(SE_SELECT);
             if (gBattleCommunication[1] == 0)
@@ -5390,7 +5684,7 @@ static void Cmd_yesnoboxlearnmove(void)
                 gBattleScripting.learnMoveState = 5;
             }
         }
-        else if (JOY_NEW(B_BUTTON))
+        else if (gMain.newKeys & B_BUTTON)
         {
             PlaySE(SE_SELECT);
             gBattleScripting.learnMoveState = 5;
@@ -5479,21 +5773,21 @@ static void Cmd_yesnoboxstoplearningmove(void)
         BattleCreateYesNoCursorAt(0);
         break;
     case 1:
-        if (JOY_NEW(DPAD_UP) && gBattleCommunication[CURSOR_POSITION] != 0)
+        if (gMain.newKeys & DPAD_UP && gBattleCommunication[CURSOR_POSITION] != 0)
         {
             PlaySE(SE_SELECT);
             BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
             gBattleCommunication[CURSOR_POSITION] = 0;
             BattleCreateYesNoCursorAt(0);
         }
-        if (JOY_NEW(DPAD_DOWN) && gBattleCommunication[CURSOR_POSITION] == 0)
+        if (gMain.newKeys & DPAD_DOWN && gBattleCommunication[CURSOR_POSITION] == 0)
         {
             PlaySE(SE_SELECT);
             BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
             gBattleCommunication[CURSOR_POSITION] = 1;
             BattleCreateYesNoCursorAt(1);
         }
-        if (JOY_NEW(A_BUTTON))
+        if (gMain.newKeys & A_BUTTON)
         {
             PlaySE(SE_SELECT);
 
@@ -5504,7 +5798,7 @@ static void Cmd_yesnoboxstoplearningmove(void)
 
             HandleBattleWindow(0x18, 0x8, 0x1D, 0xD, WINDOW_CLEAR);
         }
-        else if (JOY_NEW(B_BUTTON))
+        else if (gMain.newKeys & B_BUTTON)
         {
             PlaySE(SE_SELECT);
             gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
@@ -5537,8 +5831,8 @@ static void Cmd_hitanimation(void)
 static u32 GetTrainerMoneyToGive(u16 trainerId)
 {
     u32 i = 0;
-    u32 moneyReward;
-    u8 lastMonLevel = 0;
+    u32 lastMonLevel = 0;
+    u32 moneyReward = 0;
 
     if (trainerId == TRAINER_SECRET_BASE)
     {
@@ -5774,28 +6068,28 @@ static void Cmd_yesnobox(void)
         BattleCreateYesNoCursorAt(0);
         break;
     case 1:
-        if (JOY_NEW(DPAD_UP) && gBattleCommunication[CURSOR_POSITION] != 0)
+        if (gMain.newKeys & DPAD_UP && gBattleCommunication[CURSOR_POSITION] != 0)
         {
             PlaySE(SE_SELECT);
             BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
             gBattleCommunication[CURSOR_POSITION] = 0;
             BattleCreateYesNoCursorAt(0);
         }
-        if (JOY_NEW(DPAD_DOWN) && gBattleCommunication[CURSOR_POSITION] == 0)
+        if (gMain.newKeys & DPAD_DOWN && gBattleCommunication[CURSOR_POSITION] == 0)
         {
             PlaySE(SE_SELECT);
             BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
             gBattleCommunication[CURSOR_POSITION] = 1;
             BattleCreateYesNoCursorAt(1);
         }
-        if (JOY_NEW(B_BUTTON))
+        if (gMain.newKeys & B_BUTTON)
         {
             gBattleCommunication[CURSOR_POSITION] = 1;
             PlaySE(SE_SELECT);
             HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
             gBattlescriptCurrInstr++;
         }
-        else if (JOY_NEW(A_BUTTON))
+        else if (gMain.newKeys & A_BUTTON)
         {
             PlaySE(SE_SELECT);
             HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
@@ -6038,7 +6332,7 @@ static void PutLevelAndGenderOnLvlUpBox(void)
     printerTemplate.currentY = 0;
     printerTemplate.letterSpacing = 0;
     printerTemplate.lineSpacing = 0;
-    printerTemplate.style = 0;
+    printerTemplate.unk = 0;
     printerTemplate.fgColor = TEXT_COLOR_WHITE;
     printerTemplate.bgColor = TEXT_COLOR_TRANSPARENT;
     printerTemplate.shadowColor = TEXT_COLOR_DARK_GREY;
@@ -7129,12 +7423,18 @@ static void Cmd_forcerandomswitch(void)
     s32 i;
     s32 battler1PartyId = 0;
     s32 battler2PartyId = 0;
-    s32 firstMonId;
-    s32 lastMonId = 0; // + 1
-    s32 monsCount;
+
+    #ifdef NONMATCHING
+        s32 lastMonId = 0; // + 1
+    #else
+        register s32 lastMonId asm("r8") = 0; // + 1
+    #endif // NONMATCHING
+
+    s32 firstMonId = 0;
+    s32 monsCount = 0;
     struct Pokemon* party = NULL;
     s32 validMons = 0;
-    s32 minNeeded;
+    s32 minNeeded = 0;
 
     if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER))
     {
@@ -7246,14 +7546,14 @@ static void Cmd_forcerandomswitch(void)
             {
                 do
                 {
-                    do
-                    {
-                        i = Random() % monsCount;
-                        i += firstMonId;
-                    } while (i == battler2PartyId || i == battler1PartyId);
-                } while (GetMonData(&party[i], MON_DATA_SPECIES) == SPECIES_NONE
+                    i = Random() % monsCount;
+                    i += firstMonId;
+                }
+                while (i == battler2PartyId
+                       || i == battler1PartyId
+                       || GetMonData(&party[i], MON_DATA_SPECIES) == SPECIES_NONE
                        || GetMonData(&party[i], MON_DATA_IS_EGG) == TRUE
-                       || GetMonData(&party[i], MON_DATA_HP) == 0); // Should be one while loop, conjoined by an ||, but that doesn't match. Equivalent logic though
+                       || GetMonData(&party[i], MON_DATA_HP) == 0);
             }
             *(gBattleStruct->monToSwitchIntoId + gBattlerTarget) = i;
 
@@ -10072,21 +10372,21 @@ static void Cmd_trygivecaughtmonnick(void)
         BattleCreateYesNoCursorAt(0);
         break;
     case 1:
-        if (JOY_NEW(DPAD_UP) && gBattleCommunication[CURSOR_POSITION] != 0)
+        if (gMain.newKeys & DPAD_UP && gBattleCommunication[CURSOR_POSITION] != 0)
         {
             PlaySE(SE_SELECT);
             BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
             gBattleCommunication[CURSOR_POSITION] = 0;
             BattleCreateYesNoCursorAt(0);
         }
-        if (JOY_NEW(DPAD_DOWN) && gBattleCommunication[CURSOR_POSITION] == 0)
+        if (gMain.newKeys & DPAD_DOWN && gBattleCommunication[CURSOR_POSITION] == 0)
         {
             PlaySE(SE_SELECT);
             BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
             gBattleCommunication[CURSOR_POSITION] = 1;
             BattleCreateYesNoCursorAt(1);
         }
-        if (JOY_NEW(A_BUTTON))
+        if (gMain.newKeys & A_BUTTON)
         {
             PlaySE(SE_SELECT);
             if (gBattleCommunication[CURSOR_POSITION] == 0)
@@ -10099,7 +10399,7 @@ static void Cmd_trygivecaughtmonnick(void)
                 gBattleCommunication[MULTIUSE_STATE] = 4;
             }
         }
-        else if (JOY_NEW(B_BUTTON))
+        else if (gMain.newKeys & B_BUTTON)
         {
             PlaySE(SE_SELECT);
             gBattleCommunication[MULTIUSE_STATE] = 4;