Real match InBoxInput_Normal

1 files changed, 7 insertions, 322 deletions

diff --git a/src/pokemon_storage_system_5.c b/src/pokemon_storage_system_5.c
index c3009d3c2..ceff9e599 100644
--- a/src/pokemon_storage_system_5.c
+++ b/src/pokemon_storage_system_5.c
@@ -1153,19 +1153,19 @@ u8 HandleInput_InBox(void)
     }
 }
 
-#ifdef NONMATCHING
 u8 InBoxInput_Normal(void)
 {
     u8 retVal;
-    s8 cursorArea = sBoxCursorArea;
-    s8 cursorPosition = sBoxCursorPosition;
-
-    sPSSData->field_CD2 = 0;
-    sPSSData->field_CD3 = 0;
-    sPSSData->field_CD7 = 0;
+    s8 cursorArea;
+    s8 cursorPosition;
 
     do
     {
+        cursorArea = sBoxCursorArea;
+        cursorPosition = sBoxCursorPosition;
+        sPSSData->field_CD2 = 0;
+        sPSSData->field_CD3 = 0;
+        sPSSData->field_CD7 = 0;
         if (JOY_REPT(DPAD_UP))
         {
             retVal = TRUE;
@@ -1290,318 +1290,3 @@ u8 InBoxInput_Normal(void)
 
     return retVal;
 }
-#else
-NAKED
-u8 InBoxInput_Normal(void)
-{
-    asm_unified("\tpush {r4-r7,lr}\n"
-                "\tmov r7, r10\n"
-                "\tmov r6, r9\n"
-                "\tmov r5, r8\n"
-                "\tpush {r5-r7}\n"
-                "\tldr r0, _08094058 @ =sBoxCursorArea\n"
-                "\tldrb r0, [r0]\n"
-                "\tmov r8, r0\n"
-                "\tldr r2, _0809405C @ =sBoxCursorPosition\n"
-                "\tldrb r4, [r2]\n"
-                "\tldr r5, _08094060 @ =sPSSData\n"
-                "\tldr r0, [r5]\n"
-                "\tldr r1, _08094064 @ =0x00000cce\n"
-                "\tmov r10, r1\n"
-                "\tadd r0, r10\n"
-                "\tmovs r1, 0\n"
-                "\tstrb r1, [r0]\n"
-                "\tldr r0, [r5]\n"
-                "\tldr r7, _08094068 @ =0x00000ccf\n"
-                "\tadds r0, r7\n"
-                "\tstrb r1, [r0]\n"
-                "\tldr r0, [r5]\n"
-                "\tldr r3, _0809406C @ =0x00000cd3\n"
-                "\tmov r9, r3\n"
-                "\tadd r0, r9\n"
-                "\tstrb r1, [r0]\n"
-                "\tldr r6, _08094070 @ =gMain\n"
-                "\tldrh r1, [r6, 0x30]\n"
-                "\tmovs r0, 0x40\n"
-                "\tands r0, r1\n"
-                "\tadds r3, r2, 0\n"
-                "\tcmp r0, 0\n"
-                "\tbeq _08094018\n"
-                "\tb _08094208\n"
-                "_08094018:\n"
-                "\tmovs r0, 0x80\n"
-                "\tands r0, r1\n"
-                "\tcmp r0, 0\n"
-                "\tbeq _08094074\n"
-                "\tmovs r6, 0x1\n"
-                "\tlsls r0, r4, 24\n"
-                "\tmovs r1, 0xC0\n"
-                "\tlsls r1, 19\n"
-                "\tadds r0, r1\n"
-                "\tlsrs r4, r0, 24\n"
-                "\tasrs r0, 24\n"
-                "\tcmp r0, 0x1D\n"
-                "\tbgt _08094034\n"
-                "\tb _08094224\n"
-                "_08094034:\n"
-                "\tmovs r2, 0x3\n"
-                "\tmov r8, r2\n"
-                "\tsubs r0, 0x1E\n"
-                "\tlsls r0, 24\n"
-                "\tasrs r0, 24\n"
-                "\tmovs r1, 0x3\n"
-                "\tbl __divsi3\n"
-                "\tlsls r0, 24\n"
-                "\tlsrs r4, r0, 24\n"
-                "\tldr r0, [r5]\n"
-                "\tadd r0, r10\n"
-                "\tstrb r6, [r0]\n"
-                "\tldr r0, [r5]\n"
-                "\tadd r0, r9\n"
-                "\tstrb r6, [r0]\n"
-                "\tb _08094224\n"
-                "\t.align 2, 0\n"
-                "_08094058: .4byte sBoxCursorArea\n"
-                "_0809405C: .4byte sBoxCursorPosition\n"
-                "_08094060: .4byte sPSSData\n"
-                "_08094064: .4byte 0x00000cce\n"
-                "_08094068: .4byte 0x00000ccf\n"
-                "_0809406C: .4byte 0x00000cd3\n"
-                "_08094070: .4byte gMain\n"
-                "_08094074:\n"
-                "\tmovs r0, 0x20\n"
-                "\tands r0, r1\n"
-                "\tcmp r0, 0\n"
-                "\tbeq _080940AA\n"
-                "\tmovs r6, 0x1\n"
-                "\tmovs r0, 0\n"
-                "\tldrsb r0, [r3, r0]\n"
-                "\tmovs r1, 0x6\n"
-                "\tbl __modsi3\n"
-                "\tlsls r0, 24\n"
-                "\tcmp r0, 0\n"
-                "\tbeq _08094096\n"
-                "\tlsls r0, r4, 24\n"
-                "\tmovs r3, 0xFF\n"
-                "\tlsls r3, 24\n"
-                "\tb _08094218\n"
-                "_08094096:\n"
-                "\tldr r0, [r5]\n"
-                "\tadds r0, r7\n"
-                "\tmovs r1, 0xFF\n"
-                "\tstrb r1, [r0]\n"
-                "\tlsls r0, r4, 24\n"
-                "\tmovs r1, 0xA0\n"
-                "\tlsls r1, 19\n"
-                "\tadds r0, r1\n"
-                "\tlsrs r4, r0, 24\n"
-                "\tb _08094224\n"
-                "_080940AA:\n"
-                "\tmovs r0, 0x10\n"
-                "\tands r0, r1\n"
-                "\tcmp r0, 0\n"
-                "\tbeq _080940DE\n"
-                "\tmovs r6, 0x1\n"
-                "\tmovs r0, 0\n"
-                "\tldrsb r0, [r3, r0]\n"
-                "\tadds r0, 0x1\n"
-                "\tmovs r1, 0x6\n"
-                "\tbl __modsi3\n"
-                "\tcmp r0, 0\n"
-                "\tbeq _080940D0\n"
-                "\tlsls r0, r4, 24\n"
-                "\tmovs r2, 0x80\n"
-                "\tlsls r2, 17\n"
-                "\tadds r0, r2\n"
-                "\tlsrs r4, r0, 24\n"
-                "\tb _08094224\n"
-                "_080940D0:\n"
-                "\tldr r0, [r5]\n"
-                "\tadds r0, r7\n"
-                "\tstrb r6, [r0]\n"
-                "\tlsls r0, r4, 24\n"
-                "\tmovs r3, 0xFB\n"
-                "\tlsls r3, 24\n"
-                "\tb _08094218\n"
-                "_080940DE:\n"
-                "\tldrh r1, [r6, 0x2E]\n"
-                "\tmovs r0, 0x8\n"
-                "\tands r0, r1\n"
-                "\tcmp r0, 0\n"
-                "\tbeq _080940EC\n"
-                "\tmovs r6, 0x1\n"
-                "\tb _0809421E\n"
-                "_080940EC:\n"
-                "\tmovs r4, 0x1\n"
-                "\tmovs r0, 0x1\n"
-                "\tands r0, r1\n"
-                "\tcmp r0, 0\n"
-                "\tbeq _080941B0\n"
-                "\tbl sub_8094924\n"
-                "\tlsls r0, 24\n"
-                "\tcmp r0, 0\n"
-                "\tbeq _080941B0\n"
-                "\tldr r0, _0809410C @ =sCanOnlyMove\n"
-                "\tldrb r0, [r0]\n"
-                "\tcmp r0, 0\n"
-                "\tbne _08094110\n"
-                "\tmovs r0, 0x8\n"
-                "\tb _08094232\n"
-                "\t.align 2, 0\n"
-                "_0809410C: .4byte sCanOnlyMove\n"
-                "_08094110:\n"
-                "\tldr r1, [r5]\n"
-                "\tldrb r0, [r1, 0x1]\n"
-                "\tcmp r0, 0x2\n"
-                "\tbne _08094120\n"
-                "\tldr r0, _0809413C @ =sIsMonBeingMoved\n"
-                "\tldrb r0, [r0]\n"
-                "\tcmp r0, 0x1\n"
-                "\tbne _080941A0\n"
-                "_08094120:\n"
-                "\tmovs r0, 0\n"
-                "\tbl sub_8094E50\n"
-                "\tsubs r0, 0x1\n"
-                "\tlsls r0, 24\n"
-                "\tasrs r0, 24\n"
-                "\tcmp r0, 0xE\n"
-                "\tbhi _080941B0\n"
-                "\tlsls r0, 2\n"
-                "\tldr r1, _08094140 @ =_08094144\n"
-                "\tadds r0, r1\n"
-                "\tldr r0, [r0]\n"
-                "\tmov pc, r0\n"
-                "\t.align 2, 0\n"
-                "_0809413C: .4byte sIsMonBeingMoved\n"
-                "_08094140: .4byte _08094144\n"
-                "\t.align 2, 0\n"
-                "_08094144:\n"
-                "\t.4byte _08094180\n"
-                "\t.4byte _08094184\n"
-                "\t.4byte _08094188\n"
-                "\t.4byte _0809418C\n"
-                "\t.4byte _08094190\n"
-                "\t.4byte _080941B0\n"
-                "\t.4byte _080941B0\n"
-                "\t.4byte _080941B0\n"
-                "\t.4byte _080941B0\n"
-                "\t.4byte _080941B0\n"
-                "\t.4byte _080941B0\n"
-                "\t.4byte _08094194\n"
-                "\t.4byte _08094198\n"
-                "\t.4byte _080941B0\n"
-                "\t.4byte _0809419C\n"
-                "_08094180:\n"
-                "\tmovs r0, 0xB\n"
-                "\tb _08094232\n"
-                "_08094184:\n"
-                "\tmovs r0, 0xC\n"
-                "\tb _08094232\n"
-                "_08094188:\n"
-                "\tmovs r0, 0xD\n"
-                "\tb _08094232\n"
-                "_0809418C:\n"
-                "\tmovs r0, 0xE\n"
-                "\tb _08094232\n"
-                "_08094190:\n"
-                "\tmovs r0, 0xF\n"
-                "\tb _08094232\n"
-                "_08094194:\n"
-                "\tmovs r0, 0x10\n"
-                "\tb _08094232\n"
-                "_08094198:\n"
-                "\tmovs r0, 0x11\n"
-                "\tb _08094232\n"
-                "_0809419C:\n"
-                "\tmovs r0, 0x12\n"
-                "\tb _08094232\n"
-                "_080941A0:\n"
-                "\tldr r2, _080941AC @ =0x000021ef\n"
-                "\tadds r0, r1, r2\n"
-                "\tstrb r4, [r0]\n"
-                "\tmovs r0, 0x14\n"
-                "\tb _08094232\n"
-                "\t.align 2, 0\n"
-                "_080941AC: .4byte 0x000021ef\n"
-                "_080941B0:\n"
-                "\tldr r2, _080941C0 @ =gMain\n"
-                "\tldrh r1, [r2, 0x2E]\n"
-                "\tmovs r0, 0x2\n"
-                "\tands r0, r1\n"
-                "\tcmp r0, 0\n"
-                "\tbeq _080941C4\n"
-                "\tmovs r0, 0x13\n"
-                "\tb _08094232\n"
-                "\t.align 2, 0\n"
-                "_080941C0: .4byte gMain\n"
-                "_080941C4:\n"
-                "\tldr r0, _080941E0 @ =gSaveBlock2Ptr\n"
-                "\tldr r0, [r0]\n"
-                "\tldrb r0, [r0, 0x13]\n"
-                "\tcmp r0, 0x1\n"
-                "\tbne _080941F2\n"
-                "\tldrh r1, [r2, 0x2C]\n"
-                "\tmovs r0, 0x80\n"
-                "\tlsls r0, 2\n"
-                "\tands r0, r1\n"
-                "\tcmp r0, 0\n"
-                "\tbeq _080941E4\n"
-                "\tmovs r0, 0xA\n"
-                "\tb _08094232\n"
-                "\t.align 2, 0\n"
-                "_080941E0: .4byte gSaveBlock2Ptr\n"
-                "_080941E4:\n"
-                "\tmovs r0, 0x80\n"
-                "\tlsls r0, 1\n"
-                "\tands r0, r1\n"
-                "\tcmp r0, 0\n"
-                "\tbeq _080941F2\n"
-                "\tmovs r0, 0x9\n"
-                "\tb _08094232\n"
-                "_080941F2:\n"
-                "\tldrh r1, [r2, 0x2E]\n"
-                "\tmovs r0, 0x4\n"
-                "\tands r0, r1\n"
-                "\tcmp r0, 0\n"
-                "\tbeq _08094204\n"
-                "\tbl sub_8094C84\n"
-                "\tmovs r0, 0\n"
-                "\tb _08094232\n"
-                "_08094204:\n"
-                "\tmovs r6, 0\n"
-                "\tb _08094230\n"
-                "_08094208:\n"
-                "\tmovs r6, 0x1\n"
-                "\tmovs r0, 0\n"
-                "\tldrsb r0, [r2, r0]\n"
-                "\tcmp r0, 0x5\n"
-                "\tble _0809421E\n"
-                "\tlsls r0, r4, 24\n"
-                "\tmovs r3, 0xFA\n"
-                "\tlsls r3, 24\n"
-                "_08094218:\n"
-                "\tadds r0, r3\n"
-                "\tlsrs r4, r0, 24\n"
-                "\tb _08094224\n"
-                "_0809421E:\n"
-                "\tmovs r0, 0x2\n"
-                "\tmov r8, r0\n"
-                "\tmovs r4, 0\n"
-                "_08094224:\n"
-                "\tcmp r6, 0\n"
-                "\tbeq _08094230\n"
-                "\tmov r0, r8\n"
-                "\tadds r1, r4, 0\n"
-                "\tbl sub_80927E8\n"
-                "_08094230:\n"
-                "\tadds r0, r6, 0\n"
-                "_08094232:\n"
-                "\tpop {r3-r5}\n"
-                "\tmov r8, r3\n"
-                "\tmov r9, r4\n"
-                "\tmov r10, r5\n"
-                "\tpop {r4-r7}\n"
-                "\tpop {r1}\n"
-                "\tbx r1");
-}
-#endif