match sub_803C434

1 files changed, 11 insertions, 105 deletions

diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index a77edbdb2..f02ce6170 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -80,125 +80,31 @@ u8 CountAliveMons(u8 a1)
     return retVal;
 }
 
-#ifdef NONMATCHING
 u8 sub_803C434(u8 a1)
 {
-    u32 status0 = GetBankIdentity(a1);
-    register u8 status_ asm("r4");
-    u8 status;
-    register u32 mask1 asm("r1") = 1;
-    register u32 mask2 asm("r6") = 1;
-
-    status_ = mask2;
-    status_ &= status0;
-    status = status_ ^ mask1;
-
-    {
-        register u16 val_ asm("r1") = gBattleTypeFlags;
-        u32 val = mask2;
-        val &= val_;
-        if (!val)
-        {
-            return GetBankByPlayerAI(status);
-        }
-    }
+    u8 status = GetBankIdentity(a1) & 1;
 
+    status ^= 1;
+    if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
+        return GetBankByPlayerAI(status);
     if (CountAliveMons(0) > 1)
     {
-        u16 r = Random();
-        register u32 val asm("r1") = mask2;
-        val &= r;
-        if (!val)
-        {
-            u32 status2 = 2;
-            status2 ^= status;
-            return GetBankByPlayerAI(status2);
-        }
+        u8 val;
+
+        if ((Random() & 1) == 0)
+            val = status ^ 2;
         else
-        {
-            return GetBankByPlayerAI(status);
-        }
+            val = status;
+        return GetBankByPlayerAI(val);
     }
     else
     {
-        if (gAbsentBankFlags & gBitTable[status])
+        if ((gAbsentBankFlags & gBitTable[status]))
             return GetBankByPlayerAI(status ^ 2);
         else
             return GetBankByPlayerAI(status);
     }
 }
-#else
-__attribute__((naked))
-u8 sub_803C434(u8 a1)
-{
-    asm(".syntax unified\n\
-    push {r4-r6,lr}\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    bl GetBankIdentity\n\
-    movs r1, 0x1\n\
-    movs r6, 0x1\n\
-    adds r4, r6, 0\n\
-    ands r4, r0\n\
-    eors r4, r1\n\
-    adds r5, r4, 0\n\
-    ldr r0, _0803C45C\n\
-    ldrh r1, [r0]\n\
-    adds r0, r6, 0\n\
-    ands r0, r1\n\
-    cmp r0, 0\n\
-    bne _0803C460\n\
-    adds r0, r4, 0\n\
-    b _0803C4AA\n\
-    .align 2, 0\n\
-_0803C45C: .4byte gBattleTypeFlags\n\
-_0803C460:\n\
-    movs r0, 0\n\
-    bl CountAliveMons\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    cmp r0, 0x1\n\
-    bls _0803C484\n\
-    bl Random\n\
-    adds r1, r6, 0\n\
-    ands r1, r0\n\
-    cmp r1, 0\n\
-    bne _0803C480\n\
-    movs r0, 0x2\n\
-    eors r0, r4\n\
-    b _0803C4AA\n\
-_0803C480:\n\
-    adds r0, r4, 0\n\
-    b _0803C4AA\n\
-_0803C484:\n\
-    ldr r0, _0803C49C\n\
-    ldrb r1, [r0]\n\
-    ldr r2, _0803C4A0\n\
-    lsls r0, r4, 2\n\
-    adds r0, r2\n\
-    ldr r0, [r0]\n\
-    ands r1, r0\n\
-    cmp r1, 0\n\
-    bne _0803C4A4\n\
-    adds r0, r4, 0\n\
-    b _0803C4AA\n\
-    .align 2, 0\n\
-_0803C49C: .4byte gAbsentBankFlags\n\
-_0803C4A0: .4byte gBitTable\n\
-_0803C4A4:\n\
-    movs r0, 0x2\n\
-    eors r5, r0\n\
-    adds r0, r5, 0\n\
-_0803C4AA:\n\
-    bl GetBankByPlayerAI\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    pop {r4-r6}\n\
-    pop {r1}\n\
-    bx r1\n\
-    .syntax divided\n");
-}
-#endif
 
 u8 GetMonGender(struct Pokemon *mon)
 {