Merge pull request #788 from kazblox/master

Fix NONMATCHINGs and actual English Debug support

1 files changed, 20 insertions, 201 deletions

diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c
index 0b3afa28d..b76e5f794 100644
--- a/src/debug/taya_debug_window.c
+++ b/src/debug/taya_debug_window.c
@@ -439,37 +439,37 @@ void debug_sub_8090C44(void)
     Menu_PrintText(eTayaLuckyNumber.charbuf, 1, 3);
 }
 
-#ifdef NONMATCHING
-// mayday mayday
 bool8 debug_sub_8090C88(void)
 {
     bool8 r8 = TRUE;
 
-    if (gMain.newKeys & DPAD_LEFT && eTayaLuckyNumber.digit != 0)
-    {
-        eTayaLuckyNumber.digit--;
-    }
-    else if (gMain.newKeys & DPAD_RIGHT && eTayaLuckyNumber.digit < 4)
-    {
-        eTayaLuckyNumber.digit++;
-    }
-    else
+    do
     {
+        if (gMain.newKeys & DPAD_LEFT && eTayaLuckyNumber.digit != 0)
+        {
+            eTayaLuckyNumber.digit--;
+            break;
+        }
+        if (gMain.newKeys & DPAD_RIGHT && eTayaLuckyNumber.digit < 4)
+        {
+            eTayaLuckyNumber.digit++;
+            break;
+        }
         if (gMain.newAndRepeatedKeys & DPAD_UP)
         {
             u8 r4;
 
             eTayaLuckyNumber.tempLuckyId = eTayaLuckyNumber.curLuckyId;
-            eTayaLuckyNumber.charbuf0 = 10000;
+            eTayaLuckyNumber.digitDeltaMagnitude = 10000;
             for (r4 = 0; r4 < eTayaLuckyNumber.digit; r4++)
-                eTayaLuckyNumber.charbuf0 /= 10;
-            eTayaLuckyNumber.tempLuckyId += eTayaLuckyNumber.charbuf0;
+                eTayaLuckyNumber.digitDeltaMagnitude /= 10;
+            eTayaLuckyNumber.tempLuckyId += eTayaLuckyNumber.digitDeltaMagnitude;
             if (eTayaLuckyNumber.tempLuckyId > 0xFFFF)
                 eTayaLuckyNumber.tempLuckyId = 0xFFFF;
             if (eTayaLuckyNumber.curLuckyId != eTayaLuckyNumber.tempLuckyId)
             {
                 eTayaLuckyNumber.curLuckyId = eTayaLuckyNumber.tempLuckyId;
-                goto check;
+                break;
             }
         }
         if (gMain.newAndRepeatedKeys & DPAD_DOWN)
@@ -477,16 +477,16 @@ bool8 debug_sub_8090C88(void)
             u8 r4;
 
             eTayaLuckyNumber.tempLuckyId = eTayaLuckyNumber.curLuckyId;
-            eTayaLuckyNumber.charbuf0 = 10000;
+            eTayaLuckyNumber.digitDeltaMagnitude = 10000;
             for (r4 = 0; r4 < eTayaLuckyNumber.digit; r4++)
-                eTayaLuckyNumber.charbuf0 /= 10;
-            eTayaLuckyNumber.tempLuckyId -= eTayaLuckyNumber.charbuf0;
+                eTayaLuckyNumber.digitDeltaMagnitude /= 10;
+            eTayaLuckyNumber.tempLuckyId -= eTayaLuckyNumber.digitDeltaMagnitude;
             if (eTayaLuckyNumber.tempLuckyId < 0)
                 eTayaLuckyNumber.tempLuckyId = 0;
             if (eTayaLuckyNumber.curLuckyId != eTayaLuckyNumber.tempLuckyId)
             {
                 eTayaLuckyNumber.curLuckyId = eTayaLuckyNumber.tempLuckyId;
-                goto check;
+                break;
             }
         }
         if (gMain.newKeys & B_BUTTON)
@@ -501,193 +501,12 @@ bool8 debug_sub_8090C88(void)
             return TRUE;
         }
         r8 = FALSE;
-    }
+    } while (0);
 
-check:
     if (r8)
         debug_sub_8090C44();
     return FALSE;
 }
-#else
-NAKED bool8 debug_sub_8090C88(void)
-{
-    asm("\tpush\t{r4, r5, r6, r7, lr}\n"
-        "\tmov\tr7, r8\n"
-        "\tpush\t{r7}\n"
-        "\tadd\tsp, sp, #0xfffffffc\n"
-        "\tmov\tr0, #0x1\n"
-        "\tmov\tr8, r0\n"
-        "\tldr\tr2, ._59        @ gMain\n"
-        "\tldrh\tr1, [r2, #0x2e]\n"
-        "\tmov\tr0, #0x20\n"
-        "\tand\tr0, r0, r1\n"
-        "\tadd\tr3, r2, #0\n"
-        "\tcmp\tr0, #0\n"
-        "\tbeq\t._57\t@cond_branch\n"
-        "\tldr\tr1, ._59 + 4    @ gSharedMem\n"
-        "\tldrb\tr0, [r1]\n"
-        "\tcmp\tr0, #0\n"
-        "\tbeq\t._57\t@cond_branch\n"
-        "\tsub\tr0, r0, #0x1\n"
-        "\tstrb\tr0, [r1]\n"
-        "\tb\t._62\n"
-        "._60:\n"
-        "\t.align\t2, 0\n"
-        "._59:\n"
-        "\t.word\tgMain\n"
-        "\t.word\tgSharedMem\n"
-        "._67:\n"
-        "\tadd\tr0, r0, #0x1\n"
-        "\tstrb\tr0, [r1]\n"
-        "\tb\t._62\n"
-        "._77:\n"
-        "\tstrh\tr1, [r7, #0x8]\n"
-        "\tb\t._62\n"
-        "._79:\n"
-        "\tldr\tr0, ._64        @ gSharedMem\n"
-        "\tldrh\tr0, [r0, #0x8]\n"
-        "\tbl\tSetLotteryNumber16_Unused\n"
-        "._78:\n"
-        "\tbl\tCloseMenu\n"
-        "\tmov\tr0, #0x1\n"
-        "\tb\t._63\n"
-        "._65:\n"
-        "\t.align\t2, 0\n"
-        "._64:\n"
-        "\t.word\tgSharedMem\n"
-        "._57:\n"
-        "\tldrh\tr1, [r3, #0x2e]\n"
-        "\tmov\tr0, #0x10\n"
-        "\tand\tr0, r0, r1\n"
-        "\tcmp\tr0, #0\n"
-        "\tbeq\t._66\t@cond_branch\n"
-        "\tldr\tr1, ._81        @ gSharedMem\n"
-        "\tldrb\tr0, [r1]\n"
-        "\tcmp\tr0, #0x3\n"
-        "\tbls\t._67\t@cond_branch\n"
-        "._66:\n"
-        "\tldrh\tr1, [r3, #0x30]\n"
-        "\tmov\tr0, #0x40\n"
-        "\tand\tr0, r0, r1\n"
-        "\tcmp\tr0, #0\n"
-        "\tbeq\t._68\t@cond_branch\n"
-        "\tldr\tr0, ._81        @ gSharedMem\n"
-        "\tldrh\tr1, [r0, #0x8]\n"
-        "\tstr\tr1, [r0, #0xc]\n"
-        "\tldr\tr1, ._81 + 4    @ 0x2710\n"
-        "\tstrh\tr1, [r0, #0x10]\n"
-        "\tmov\tr4, #0x0\n"
-        "\tldrb\tr1, [r0]\n"
-        "\tadd\tr7, r0, #0\n"
-        "\tcmp\tr4, r1\n"
-        "\tbcs\t._69\t@cond_branch\n"
-        "\tadd\tr5, r7, #0\n"
-        "\tadd\tr6, r1, #0\n"
-        "._70:\n"
-        "\tldrh\tr0, [r5, #0x10]\n"
-        "\tmov\tr1, #0xa\n"
-        "\tstr\tr3, [sp]\n"
-        "\tbl\t__udivsi3\n"
-        "\tstrh\tr0, [r5, #0x10]\n"
-        "\tadd\tr0, r4, #1\n"
-        "\tlsl\tr0, r0, #0x18\n"
-        "\tlsr\tr4, r0, #0x18\n"
-        "\tldr\tr3, [sp]\n"
-        "\tcmp\tr4, r6\n"
-        "\tbcc\t._70\t@cond_branch\n"
-        "._69:\n"
-        "\tldrh\tr1, [r7, #0x10]\n"
-        "\tldr\tr0, [r7, #0xc]\n"
-        "\tadd\tr0, r0, r1\n"
-        "\tstr\tr0, [r7, #0xc]\n"
-        "\tldr\tr1, ._81 + 8    @ 0xffff\n"
-        "\tcmp\tr0, r1\n"
-        "\tble\t._71\t@cond_branch\n"
-        "\tstr\tr1, [r7, #0xc]\n"
-        "._71:\n"
-        "\tldrh\tr0, [r7, #0x8]\n"
-        "\tldr\tr1, [r7, #0xc]\n"
-        "\tcmp\tr0, r1\n"
-        "\tbne\t._77\t@cond_branch\n"
-        "._68:\n"
-        "\tldrh\tr1, [r3, #0x30]\n"
-        "\tmov\tr0, #0x80\n"
-        "\tand\tr0, r0, r1\n"
-        "\tcmp\tr0, #0\n"
-        "\tbeq\t._73\t@cond_branch\n"
-        "\tldr\tr0, ._81        @ gSharedMem\n"
-        "\tldrh\tr1, [r0, #0x8]\n"
-        "\tstr\tr1, [r0, #0xc]\n"
-        "\tldr\tr1, ._81 + 4    @ 0x2710\n"
-        "\tstrh\tr1, [r0, #0x10]\n"
-        "\tmov\tr4, #0x0\n"
-        "\tldrb\tr1, [r0]\n"
-        "\tadd\tr7, r0, #0\n"
-        "\tcmp\tr4, r1\n"
-        "\tbcs\t._74\t@cond_branch\n"
-        "\tadd\tr5, r7, #0\n"
-        "\tadd\tr6, r1, #0\n"
-        "._75:\n"
-        "\tldrh\tr0, [r5, #0x10]\n"
-        "\tmov\tr1, #0xa\n"
-        "\tstr\tr3, [sp]\n"
-        "\tbl\t__udivsi3\n"
-        "\tstrh\tr0, [r5, #0x10]\n"
-        "\tadd\tr0, r4, #1\n"
-        "\tlsl\tr0, r0, #0x18\n"
-        "\tlsr\tr4, r0, #0x18\n"
-        "\tldr\tr3, [sp]\n"
-        "\tcmp\tr4, r6\n"
-        "\tbcc\t._75\t@cond_branch\n"
-        "._74:\n"
-        "\tadd\tr2, r7, #0\n"
-        "\tldrh\tr1, [r2, #0x10]\n"
-        "\tldr\tr0, [r2, #0xc]\n"
-        "\tsub\tr0, r0, r1\n"
-        "\tstr\tr0, [r2, #0xc]\n"
-        "\tcmp\tr0, #0\n"
-        "\tbge\t._76\t@cond_branch\n"
-        "\tmov\tr0, #0x0\n"
-        "\tstr\tr0, [r2, #0xc]\n"
-        "._76:\n"
-        "\tldrh\tr0, [r2, #0x8]\n"
-        "\tldr\tr1, [r2, #0xc]\n"
-        "\tcmp\tr0, r1\n"
-        "\tbne\t._77\t@cond_branch\n"
-        "._73:\n"
-        "\tldrh\tr2, [r3, #0x2e]\n"
-        "\tmov\tr0, #0x2\n"
-        "\tand\tr0, r0, r2\n"
-        "\tcmp\tr0, #0\n"
-        "\tbne\t._78\t@cond_branch\n"
-        "\tmov\tr0, #0x1\n"
-        "\tand\tr0, r0, r2\n"
-        "\tcmp\tr0, #0\n"
-        "\tbne\t._79\t@cond_branch\n"
-        "\tmov\tr0, #0x0\n"
-        "\tmov\tr8, r0\n"
-        "._62:\n"
-        "\tmov\tr0, r8\n"
-        "\tcmp\tr0, #0\n"
-        "\tbeq\t._80\t@cond_branch\n"
-        "\tbl\tdebug_sub_8090C44\n"
-        "._80:\n"
-        "\tmov\tr0, #0x0\n"
-        "._63:\n"
-        "\tadd\tsp, sp, #0x4\n"
-        "\tpop\t{r3}\n"
-        "\tmov\tr8, r3\n"
-        "\tpop\t{r4, r5, r6, r7}\n"
-        "\tpop\t{r1}\n"
-        "\tbx\tr1\n"
-        "._82:\n"
-        "\t.align\t2, 0\n"
-        "._81:\n"
-        "\t.word\tgSharedMem\n"
-        "\t.word\t0x2710\n"
-        "\t.word\t0xffff");
-}
-#endif // NONMATCHING
 
 bool8 TayaDebugMenu_PKMNLottery(void)
 {