through sub_810380C

2 files changed, 38 insertions, 129 deletions

diff --git a/asm/slot_machine.s b/asm/slot_machine.s
index e19326a50..38573f519 100644
--- a/asm/slot_machine.s
+++ b/asm/slot_machine.s
@@ -5,135 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8103764
-sub_8103764: @ 8103764
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	adds r2, r1, 0
-	cmp r0, 0
-	bne _08103778
-	cmp r1, 0x1
-	beq _08103780
-_08103778:
-	cmp r0, 0x1
-	bne _08103784
-	cmp r2, 0
-	bne _08103784
-_08103780:
-	movs r0, 0x1
-	b _08103786
-_08103784:
-	movs r0, 0
-_08103786:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8103764
-
-	thumb_func_start sub_810378C
-sub_810378C: @ 810378C
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	cmp r0, 0
-	bne _081037A6
-	cmp r1, 0x1
-	bne _081037A6
-	cmp r2, 0
-	beq _081037B2
-_081037A6:
-	cmp r0, 0x1
-	bne _081037B6
-	cmp r1, 0
-	bne _081037B6
-	cmp r2, 0x1
-	bne _081037B6
-_081037B2:
-	movs r0, 0x1
-	b _081037B8
-_081037B6:
-	movs r0, 0
-_081037B8:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_810378C
-
-	thumb_func_start sub_81037BC
-sub_81037BC: @ 81037BC
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	cmp r0, 0
-	bne _081037D6
-	cmp r1, 0x1
-	bne _081037D6
-	cmp r2, 0
-	beq _08103802
-_081037D6:
-	cmp r0, 0x1
-	bne _081037E2
-	cmp r1, 0
-	bne _081037E2
-	cmp r2, 0x1
-	beq _08103802
-_081037E2:
-	cmp r0, 0
-	bne _081037EE
-	cmp r1, 0
-	bne _081037EE
-	cmp r2, 0x1
-	beq _08103802
-_081037EE:
-	cmp r0, 0x1
-	bne _081037FA
-	cmp r1, 0x1
-	bne _081037FA
-	cmp r2, 0
-	beq _08103802
-_081037FA:
-	cmp r0, r1
-	bne _08103806
-	cmp r0, r2
-	bne _08103806
-_08103802:
-	movs r0, 0
-	b _08103808
-_08103806:
-	movs r0, 0x1
-_08103808:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81037BC
-
-	thumb_func_start sub_810380C
-sub_810380C: @ 810380C
-	push {lr}
-	ldr r1, _08103828 @ =gUnknown_083ECB94
-	ldr r0, _0810382C @ =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
-_08103828: .4byte gUnknown_083ECB94
-_0810382C: .4byte gSharedMem
-	thumb_func_end sub_810380C
-
 	thumb_func_start sub_8103830
 sub_8103830: @ 8103830
 	push {r4-r7,lr}
diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c
index 9e5980446..a4b3175d2 100644
--- a/src/field/slot_machine.c
+++ b/src/field/slot_machine.c
@@ -1893,6 +1893,44 @@ __attribute__((naked)) void sub_8103668(void)
 }
 #endif // NONMATCHING
 
+bool8 sub_8103764(u8 a0, u8 a1)
+{
+    if ((a0 == 0 && a1 == 1) || (a0 == 1 && a1 == 0))
+    {
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 sub_810378C(u8 a0, u8 a1, u8 a2)
+{
+    if ((a0 == 0 && a1 == 1 && a2 == 0) || (a0 == 1 && a1 == 0 && a2 == 1))
+    {
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 sub_81037BC(u8 a0, u8 a1, u8 a2)
+{
+    if ((a0 == 0 && a1 == 1 && a2 == 0) ||
+        (a0 == 1 && a1 == 0 && a2 == 1) ||
+        (a0 == 0 && a1 == 0 && a2 == 1) ||
+        (a0 == 1 && a1 == 1 && a2 == 0) ||
+        (a0 == a1 && a0 == a2))
+    {
+        return FALSE;
+    }
+    return TRUE;
+}
+
+extern void (*const gUnknown_083ECB94[])(void);
+
+void sub_810380C(void)
+{
+    gUnknown_083ECB94[eSlotMachine->bet - 1]();
+}
+
 asm(".section .text_a");
 
 static void LoadSlotMachineWheelOverlay(void);