through sub_8103668 (nonmatching)

2 files changed, 250 insertions, 289 deletions

diff --git a/asm/slot_machine.s b/asm/slot_machine.s
index 9e90a08bd..e19326a50 100644
--- a/asm/slot_machine.s
+++ b/asm/slot_machine.s
@@ -5,295 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8103540
-sub_8103540: @ 8103540
-	push {lr}
-	ldr r1, _0810355C @ =gUnknown_083ECB88
-	ldr r0, _08103560 @ =gSharedMem
-	movs r2, 0x12
-	ldrsh r0, [r0, r2]
-	subs r0, 0x1
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	bl _call_via_r0
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810355C: .4byte gUnknown_083ECB88
-_08103560: .4byte gSharedMem
-	thumb_func_end sub_8103540
-
-	thumb_func_start sub_8103564
-sub_8103564: @ 8103564
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x4
-	ldr r4, _081035D0 @ =gSharedMem
-	movs r1, 0x34
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _081035E0
-	ldrb r1, [r4, 0x4]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _081035E0
-	ldrh r0, [r4, 0x2E]
-	movs r1, 0x2
-	subs r1, r0
-	lsls r1, 16
-	asrs r1, 16
-	movs r0, 0
-	bl sub_8102BF8
-	mov r1, sp
-	strb r0, [r1]
-	mov r0, sp
-	bl sub_8103520
-	lsls r0, 24
-	cmp r0, 0
-	beq _081035E0
-	movs r5, 0
-	mov r7, sp
-	movs r0, 0x2
-	mov r8, r0
-	adds r6, r4, 0
-_081035AA:
-	lsls r0, r5, 16
-	asrs r4, r0, 16
-	mov r0, r8
-	subs r1, r0, r4
-	lsls r1, 16
-	asrs r1, 16
-	movs r0, 0x1
-	bl sub_8102BF8
-	ldrb r1, [r7]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r1, r0
-	bne _081035D4
-	movs r0, 0x2
-	strh r0, [r6, 0x36]
-	strh r5, [r6, 0x30]
-	b _081035E0
-	.align 2, 0
-_081035D0: .4byte gSharedMem
-_081035D4:
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-	asrs r0, 16
-	cmp r0, 0x4
-	ble _081035AA
-_081035E0:
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8103564
-
-	thumb_func_start j5_08111E84
-j5_08111E84: @ 81035EC
-	push {r4-r7,lr}
-	sub sp, 0x4
-	ldr r4, _08103650 @ =gSharedMem
-	ldrh r2, [r4, 0x34]
-	movs r1, 0x34
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _08103660
-	ldrb r1, [r4, 0x4]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _08103660
-	ldrh r1, [r4, 0x2E]
-	subs r1, r2, r1
-	lsls r1, 16
-	asrs r1, 16
-	movs r0, 0
-	bl sub_8102BF8
-	mov r1, sp
-	strb r0, [r1]
-	mov r0, sp
-	bl sub_8103520
-	lsls r0, 24
-	cmp r0, 0
-	beq _08103660
-	movs r6, 0
-	mov r7, sp
-	adds r5, r4, 0
-_0810362A:
-	ldrh r1, [r5, 0x34]
-	lsls r0, r6, 16
-	asrs r4, r0, 16
-	subs r1, r4
-	lsls r1, 16
-	asrs r1, 16
-	movs r0, 0x1
-	bl sub_8102BF8
-	ldrb r1, [r7]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r1, r0
-	bne _08103654
-	ldrh r0, [r5, 0x34]
-	strh r0, [r5, 0x36]
-	strh r6, [r5, 0x30]
-	b _08103660
-	.align 2, 0
-_08103650: .4byte gSharedMem
-_08103654:
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r6, r0, 16
-	asrs r0, 16
-	cmp r0, 0x4
-	ble _0810362A
-_08103660:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end j5_08111E84
-
-	thumb_func_start sub_8103668
-sub_8103668: @ 8103668
-	push {r4-r7,lr}
-	sub sp, 0x4
-	ldr r4, _0810368C @ =gSharedMem
-	ldrh r3, [r4, 0x34]
-	movs r0, 0x34
-	ldrsh r2, [r4, r0]
-	cmp r2, 0
-	beq _0810375A
-	ldrb r1, [r4, 0x4]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0810375A
-	cmp r2, 0x2
-	bne _081036AE
-	bl j5_08111E84
-	b _0810375A
-	.align 2, 0
-_0810368C: .4byte gSharedMem
-_08103690:
-	ldr r0, _0810369C @ =gSharedMem
-	movs r1, 0
-	strh r6, [r0, 0x36]
-	strh r1, [r0, 0x30]
-	b _0810375A
-	.align 2, 0
-_0810369C: .4byte gSharedMem
-_081036A0:
-	movs r0, 0x2
-	strh r0, [r5, 0x36]
-	adds r0, r4, 0x1
-	strh r0, [r5, 0x30]
-	b _0810375A
-_081036AA:
-	movs r0, 0x3
-	b _08103736
-_081036AE:
-	ldrh r1, [r4, 0x2E]
-	subs r1, r3, r1
-	lsls r1, 16
-	asrs r1, 16
-	movs r0, 0
-	bl sub_8102BF8
-	mov r1, sp
-	strb r0, [r1]
-	mov r0, sp
-	bl sub_8103520
-	lsls r0, 24
-	cmp r0, 0
-	beq _0810375A
-	movs r6, 0x2
-	movs r1, 0x34
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x3
-	bne _081036D8
-	movs r6, 0x3
-_081036D8:
-	movs r5, 0
-	mov r7, sp
-_081036DC:
-	lsls r0, r6, 16
-	asrs r4, r0, 16
-	movs r0, 0x1
-	adds r1, r4, 0
-	bl sub_8102BF8
-	ldrb r1, [r7]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r1, r0
-	beq _08103690
-	lsls r1, r5, 16
-	movs r0, 0x80
-	lsls r0, 9
-	adds r1, r0
-	subs r0, r4, 0x1
-	lsls r0, 16
-	lsrs r6, r0, 16
-	lsrs r5, r1, 16
-	asrs r1, 16
-	cmp r1, 0x1
-	ble _081036DC
-	movs r6, 0x1
-	mov r7, sp
-	ldr r5, _0810373C @ =gSharedMem
-_0810370E:
-	ldrh r1, [r5, 0x34]
-	lsls r0, r6, 16
-	asrs r4, r0, 16
-	subs r1, r4
-	lsls r1, 16
-	asrs r1, 16
-	movs r0, 0x1
-	bl sub_8102BF8
-	ldrb r1, [r7]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r1, r0
-	bne _0810374E
-	movs r1, 0x34
-	ldrsh r0, [r5, r1]
-	cmp r0, 0x1
-	bne _08103740
-	cmp r4, 0x2
-	ble _081036A0
-_08103736:
-	strh r0, [r5, 0x36]
-	strh r6, [r5, 0x30]
-	b _0810375A
-	.align 2, 0
-_0810373C: .4byte gSharedMem
-_08103740:
-	cmp r4, 0x2
-	ble _081036AA
-	movs r0, 0x2
-	strh r0, [r5, 0x36]
-	subs r0, r4, 0x1
-	strh r0, [r5, 0x30]
-	b _0810375A
-_0810374E:
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r6, r0, 16
-	asrs r0, 16
-	cmp r0, 0x4
-	ble _0810370E
-_0810375A:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8103668
-
 	thumb_func_start sub_8103764
 sub_8103764: @ 8103764
 	push {lr}
diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c
index 612dcd49f..9e5980446 100644
--- a/src/field/slot_machine.c
+++ b/src/field/slot_machine.c
@@ -1643,6 +1643,256 @@ bool8 sub_8103520(u8 *a0)
     return FALSE;
 }
 
+extern void (*gUnknown_083ECB88[])(void);
+
+void sub_8103540(void)
+{
+    gUnknown_083ECB88[eSlotMachine->bet - 1]();
+}
+
+void sub_8103564(void)
+{
+    if (eSlotMachine->unk34[0] != 0 && eSlotMachine->unk04 & 0x80)
+    {
+        u8 sp0 = sub_8102BF8(0, 2 - eSlotMachine->unk2E[0]);
+        if (sub_8103520(&sp0))
+        {
+            s16 i;
+            for (i = 0; i < 5; i++)
+            {
+                if (sp0 == sub_8102BF8(1, 2 - i))
+                {
+                    eSlotMachine->unk34[1] = 2;
+                    eSlotMachine->unk2E[1] = i;
+                    break;
+                }
+            }
+        }
+    }
+}
+
+void j5_08111E84(void)
+{
+    if (eSlotMachine->unk34[0] != 0 && eSlotMachine->unk04 & 0x80)
+    {
+        u8 sp0 = sub_8102BF8(0, eSlotMachine->unk34[0] - eSlotMachine->unk2E[0]);
+        if (sub_8103520(&sp0))
+        {
+            s16 i;
+            for (i = 0; i < 5; i++)
+            {
+                if (sp0 == sub_8102BF8(1, eSlotMachine->unk34[0] - i))
+                {
+                    eSlotMachine->unk34[1] = eSlotMachine->unk34[0];
+                    eSlotMachine->unk2E[1] = i;
+                    break;
+                }
+            }
+        }
+    }
+}
+
+#ifdef NONMATCHING // variable r6 is mistakenly plopped into r5,
+                   // and variable i is mistakenly plopped into r6
+void sub_8103668(void)
+{
+    if (eSlotMachine->unk34[0] != 0 && eSlotMachine->unk04 & 0x80)
+    {
+        if (eSlotMachine->unk34[0] == 2)
+        {
+            j5_08111E84();
+        }
+        else
+        {
+            u8 sp0 = sub_8102BF8(0, eSlotMachine->unk34[0] - eSlotMachine->unk2E[0]);
+            if (sub_8103520(&sp0))
+            {
+                s16 i;
+                s16 r6 = 2;
+                if (eSlotMachine->unk34[0] == 3)
+                    r6 = 3;
+                for (i = 0; i < 2; i++, r6--)
+                {
+                    if (sp0 == sub_8102BF8(1, r6))
+                    {
+                        eSlotMachine->unk34[1] = r6;
+                        eSlotMachine->unk2E[1] = 0;
+                        return;
+                    }
+                }
+                for (i = 1; i < 5; i++)
+                {
+                    if (sp0 == sub_8102BF8(1, eSlotMachine->unk34[0] - i))
+                    {
+                        if (eSlotMachine->unk34[0] == 1)
+                        {
+                            if (i < 3)
+                            {
+                                eSlotMachine->unk34[1] = 2;
+                                eSlotMachine->unk2E[1] = i + 1;
+                            }
+                            else
+                            {
+                                eSlotMachine->unk34[1] = 1;
+                                eSlotMachine->unk2E[1] = i;
+                            }
+                        }
+                        else
+                        {
+                            if (i < 3)
+                            {
+                                eSlotMachine->unk34[1] = 3;
+                                eSlotMachine->unk2E[1] = i;
+                            }
+                            else
+                            {
+                                eSlotMachine->unk34[1] = 2;
+                                eSlotMachine->unk2E[1] = i - 1;
+                            }
+                        }
+                        return;
+                    }
+                }
+            }
+        }
+    }
+}
+#else
+__attribute__((naked)) void sub_8103668(void)
+{
+    asm_unified("\tpush {r4-r7,lr}\n"
+                    "\tsub sp, 0x4\n"
+                    "\tldr r4, _0810368C @ =gSharedMem\n"
+                    "\tldrh r3, [r4, 0x34]\n"
+                    "\tmovs r0, 0x34\n"
+                    "\tldrsh r2, [r4, r0]\n"
+                    "\tcmp r2, 0\n"
+                    "\tbeq _0810375A\n"
+                    "\tldrb r1, [r4, 0x4]\n"
+                    "\tmovs r0, 0x80\n"
+                    "\tands r0, r1\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _0810375A\n"
+                    "\tcmp r2, 0x2\n"
+                    "\tbne _081036AE\n"
+                    "\tbl j5_08111E84\n"
+                    "\tb _0810375A\n"
+                    "\t.align 2, 0\n"
+                    "_0810368C: .4byte gSharedMem\n"
+                    "_08103690:\n"
+                    "\tldr r0, _0810369C @ =gSharedMem\n"
+                    "\tmovs r1, 0\n"
+                    "\tstrh r6, [r0, 0x36]\n"
+                    "\tstrh r1, [r0, 0x30]\n"
+                    "\tb _0810375A\n"
+                    "\t.align 2, 0\n"
+                    "_0810369C: .4byte gSharedMem\n"
+                    "_081036A0:\n"
+                    "\tmovs r0, 0x2\n"
+                    "\tstrh r0, [r5, 0x36]\n"
+                    "\tadds r0, r4, 0x1\n"
+                    "\tstrh r0, [r5, 0x30]\n"
+                    "\tb _0810375A\n"
+                    "_081036AA:\n"
+                    "\tmovs r0, 0x3\n"
+                    "\tb _08103736\n"
+                    "_081036AE:\n"
+                    "\tldrh r1, [r4, 0x2E]\n"
+                    "\tsubs r1, r3, r1\n"
+                    "\tlsls r1, 16\n"
+                    "\tasrs r1, 16\n"
+                    "\tmovs r0, 0\n"
+                    "\tbl sub_8102BF8\n"
+                    "\tmov r1, sp\n"
+                    "\tstrb r0, [r1]\n"
+                    "\tmov r0, sp\n"
+                    "\tbl sub_8103520\n"
+                    "\tlsls r0, 24\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _0810375A\n"
+                    "\tmovs r6, 0x2\n"
+                    "\tmovs r1, 0x34\n"
+                    "\tldrsh r0, [r4, r1]\n"
+                    "\tcmp r0, 0x3\n"
+                    "\tbne _081036D8\n"
+                    "\tmovs r6, 0x3\n"
+                    "_081036D8:\n"
+                    "\tmovs r5, 0\n"
+                    "\tmov r7, sp\n"
+                    "_081036DC:\n"
+                    "\tlsls r0, r6, 16\n"
+                    "\tasrs r4, r0, 16\n"
+                    "\tmovs r0, 0x1\n"
+                    "\tadds r1, r4, 0\n"
+                    "\tbl sub_8102BF8\n"
+                    "\tldrb r1, [r7]\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r0, 24\n"
+                    "\tcmp r1, r0\n"
+                    "\tbeq _08103690\n"
+                    "\tlsls r1, r5, 16\n"
+                    "\tmovs r0, 0x80\n"
+                    "\tlsls r0, 9\n"
+                    "\tadds r1, r0\n"
+                    "\tsubs r0, r4, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r6, r0, 16\n"
+                    "\tlsrs r5, r1, 16\n"
+                    "\tasrs r1, 16\n"
+                    "\tcmp r1, 0x1\n"
+                    "\tble _081036DC\n"
+                    "\tmovs r6, 0x1\n"
+                    "\tmov r7, sp\n"
+                    "\tldr r5, _0810373C @ =gSharedMem\n"
+                    "_0810370E:\n"
+                    "\tldrh r1, [r5, 0x34]\n"
+                    "\tlsls r0, r6, 16\n"
+                    "\tasrs r4, r0, 16\n"
+                    "\tsubs r1, r4\n"
+                    "\tlsls r1, 16\n"
+                    "\tasrs r1, 16\n"
+                    "\tmovs r0, 0x1\n"
+                    "\tbl sub_8102BF8\n"
+                    "\tldrb r1, [r7]\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r0, 24\n"
+                    "\tcmp r1, r0\n"
+                    "\tbne _0810374E\n"
+                    "\tmovs r1, 0x34\n"
+                    "\tldrsh r0, [r5, r1]\n"
+                    "\tcmp r0, 0x1\n"
+                    "\tbne _08103740\n"
+                    "\tcmp r4, 0x2\n"
+                    "\tble _081036A0\n"
+                    "_08103736:\n"
+                    "\tstrh r0, [r5, 0x36]\n"
+                    "\tstrh r6, [r5, 0x30]\n"
+                    "\tb _0810375A\n"
+                    "\t.align 2, 0\n"
+                    "_0810373C: .4byte gSharedMem\n"
+                    "_08103740:\n"
+                    "\tcmp r4, 0x2\n"
+                    "\tble _081036AA\n"
+                    "\tmovs r0, 0x2\n"
+                    "\tstrh r0, [r5, 0x36]\n"
+                    "\tsubs r0, r4, 0x1\n"
+                    "\tstrh r0, [r5, 0x30]\n"
+                    "\tb _0810375A\n"
+                    "_0810374E:\n"
+                    "\tadds r0, r4, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r6, r0, 16\n"
+                    "\tasrs r0, 16\n"
+                    "\tcmp r0, 0x4\n"
+                    "\tble _0810370E\n"
+                    "_0810375A:\n"
+                    "\tadd sp, 0x4\n"
+                    "\tpop {r4-r7}\n"
+                    "\tpop {r0}\n"
+                    "\tbx r0");
+}
+#endif // NONMATCHING
+
 asm(".section .text_a");
 
 static void LoadSlotMachineWheelOverlay(void);