Match sub_8149930 (see pret/pokeemerald#982)

1 files changed, 5 insertions, 43 deletions

diff --git a/src/pokemon_jump_2.c b/src/pokemon_jump_2.c
index c6b881f5b..f2322311b 100644
--- a/src/pokemon_jump_2.c
+++ b/src/pokemon_jump_2.c
@@ -1898,61 +1898,23 @@ static u16 sub_8149910(void)
     return gUnknown_846B764[index];
 }
 
-#ifdef NONMATCHING
-// Impossible to match.
 static u16 sub_8149930(void)
 {
     u32 val, i;
 
     val = 0;
-    for (i = 0; i < 5; val = gUnknown_846B76C[i][1], i++)
+    for (i = 0; i < 5; i++)
     {
         if (gUnknown_203F3D4->unk70.unk8 < gUnknown_846B76C[i][0])
             break;
+        else if (1) // required to match, see pret/pokeemerald#982
+            val = gUnknown_846B76C[i][1];
+        else
+            break;
     }
 
     return val;
 }
-#else
-NAKED
-static u16 sub_8149930(void)
-{
-    asm_unified("\n\
-    push {r4-r6,lr}\n\
-    movs r5, 0\n\
-    movs r4, 0\n\
-    ldr r3, =gUnknown_203F3D4\n\
-    ldr r0, [r3]\n\
-    ldr r2, =gUnknown_846B76C\n\
-    ldr r1, [r0, 0x78]\n\
-    ldr r0, [r2]\n\
-    cmp r1, r0\n\
-    bcc _0802C874\n\
-    ldr r5, [r2, 0x4]\n\
-    adds r6, r3, 0\n\
-    adds r3, r2, 0x4\n\
-_0802C852:\n\
-    adds r3, 0x8\n\
-    adds r2, 0x8\n\
-    adds r4, 0x1\n\
-    cmp r4, 0x4\n\
-    bhi _0802C874\n\
-    ldr r0, [r6]\n\
-    ldr r1, [r0, 0x78]\n\
-    ldr r0, [r2]\n\
-    cmp r1, r0\n\
-    bcc _0802C874\n\
-    ldr r5, [r3]\n\
-    b _0802C852\n\
-    .pool\n\
-_0802C874:\n\
-    lsls r0, r5, 16\n\
-    lsrs r0, 16\n\
-    pop {r4-r6}\n\
-    pop {r1}\n\
-    bx r1");
-}
-#endif
 
 static u16 sub_8149978(u16 item, u16 quantity)
 {