through sub_810535C

3 files changed, 67 insertions, 238 deletions

diff --git a/asm/slot_machine.s b/asm/slot_machine.s
index 000acd198..83e89cc22 100644
--- a/asm/slot_machine.s
+++ b/asm/slot_machine.s
@@ -5,241 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_81051C0
-sub_81051C0: @ 81051C0
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	ldr r0, _0810526C @ =gSpriteTemplate_83ED474
-	movs r7, 0xB8
-	lsls r7, 1
-	adds r1, r7, 0
-	movs r2, 0x34
-	movs r3, 0x7
-	bl CreateSprite
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r0, r4, 4
-	adds r0, r4
-	lsls r0, 2
-	ldr r1, _08105270 @ =gSprites
-	mov r10, r1
-	adds r2, r0, r1
-	ldrb r1, [r2, 0x5]
-	movs r5, 0xD
-	negs r5, r5
-	adds r0, r5, 0
-	ands r0, r1
-	movs r3, 0x4
-	mov r9, r3
-	mov r1, r9
-	orrs r0, r1
-	strb r0, [r2, 0x5]
-	adds r1, r2, 0
-	adds r1, 0x3E
-	ldrb r0, [r1]
-	movs r3, 0x2
-	mov r8, r3
-	mov r3, r8
-	orrs r0, r3
-	strb r0, [r1]
-	ldr r1, _08105274 @ =gSubspriteTables_83ED73C
-	adds r0, r2, 0
-	bl SetSubspriteTables
-	ldr r6, _08105278 @ =gSharedMem
-	adds r0, r6, 0
-	adds r0, 0x49
-	strb r4, [r0]
-	ldr r0, _0810527C @ =gSpriteTemplate_83ED48C
-	adds r1, r7, 0
-	movs r2, 0x54
-	movs r3, 0x7
-	bl CreateSprite
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r0, r4, 4
-	adds r0, r4
-	lsls r0, 2
-	mov r1, r10
-	adds r2, r0, r1
-	ldrb r0, [r2, 0x5]
-	ands r5, r0
-	mov r3, r9
-	orrs r5, r3
-	strb r5, [r2, 0x5]
-	adds r1, r2, 0
-	adds r1, 0x3E
-	ldrb r0, [r1]
-	mov r3, r8
-	orrs r0, r3
-	strb r0, [r1]
-	ldr r1, _08105280 @ =gSubspriteTables_83ED75C
-	adds r0, r2, 0
-	bl SetSubspriteTables
-	adds r6, 0x4A
-	strb r4, [r6]
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810526C: .4byte gSpriteTemplate_83ED474
-_08105270: .4byte gSprites
-_08105274: .4byte gSubspriteTables_83ED73C
-_08105278: .4byte gSharedMem
-_0810527C: .4byte gSpriteTemplate_83ED48C
-_08105280: .4byte gSubspriteTables_83ED75C
-	thumb_func_end sub_81051C0
-
-	thumb_func_start sub_8105284
-sub_8105284: @ 8105284
-	push {r4,lr}
-	ldr r0, _081052D8 @ =gSpriteTemplate_83ED4A4
-	ldr r1, _081052DC @ =gSpriteCoordOffsetX
-	ldrh r2, [r1]
-	movs r1, 0xA8
-	subs r1, r2
-	lsls r1, 16
-	asrs r1, 16
-	movs r2, 0x50
-	movs r3, 0x7
-	bl CreateSprite
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r0, r4, 4
-	adds r0, r4
-	lsls r0, 2
-	ldr r1, _081052E0 @ =gSprites
-	adds r0, r1
-	ldrb r2, [r0, 0x5]
-	movs r1, 0xD
-	negs r1, r1
-	ands r1, r2
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r0, 0x5]
-	adds r3, r0, 0
-	adds r3, 0x3E
-	ldrb r1, [r3]
-	movs r2, 0x2
-	orrs r1, r2
-	strb r1, [r3]
-	ldr r1, _081052E4 @ =gSubspriteTables_83ED78C
-	bl SetSubspriteTables
-	ldr r0, _081052E8 @ =gSharedMem
-	adds r0, 0x42
-	strb r4, [r0]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081052D8: .4byte gSpriteTemplate_83ED4A4
-_081052DC: .4byte gSpriteCoordOffsetX
-_081052E0: .4byte gSprites
-_081052E4: .4byte gSubspriteTables_83ED78C
-_081052E8: .4byte gSharedMem
-	thumb_func_end sub_8105284
-
-	thumb_func_start sub_81052EC
-sub_81052EC: @ 81052EC
-	push {r4-r7,lr}
-	movs r4, 0
-	movs r5, 0
-	ldr r6, _08105350 @ =gSharedMem + 0x4B
-_081052F4:
-	ldr r0, _08105354 @ =gSpriteTemplate_83ED4BC
-	movs r1, 0xB8
-	lsls r1, 1
-	movs r2, 0
-	movs r3, 0xA
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r3, r0, 4
-	adds r3, r0
-	lsls r3, 2
-	ldr r1, _08105358 @ =gSprites
-	adds r3, r1
-	ldrb r2, [r3, 0x5]
-	movs r7, 0xD
-	negs r7, r7
-	adds r1, r7, 0
-	ands r2, r1
-	movs r1, 0x4
-	orrs r2, r1
-	strb r2, [r3, 0x5]
-	movs r1, 0x3E
-	adds r1, r3
-	mov r12, r1
-	ldrb r1, [r1]
-	movs r2, 0x2
-	orrs r1, r2
-	mov r2, r12
-	strb r1, [r2]
-	strh r5, [r3, 0x3C]
-	adds r1, r4, r6
-	strb r0, [r1]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r0, r5, 16
-	movs r7, 0xA0
-	lsls r7, 13
-	adds r0, r7
-	lsrs r5, r0, 16
-	cmp r4, 0x2
-	bls _081052F4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08105350: .4byte gSharedMem + 0x4B
-_08105354: .4byte gSpriteTemplate_83ED4BC
-_08105358: .4byte gSprites
-	thumb_func_end sub_81052EC
-
-	thumb_func_start sub_810535C
-sub_810535C: @ 810535C
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r1, _0810539C @ =gSharedMem
-	ldrh r0, [r4, 0x3C]
-	ldrh r1, [r1, 0x14]
-	adds r0, r1
-	lsls r0, 16
-	asrs r0, 16
-	movs r1, 0x28
-	bl __modsi3
-	lsls r0, 16
-	asrs r0, 16
-	adds r1, r0, 0
-	adds r1, 0x3B
-	strh r1, [r4, 0x22]
-	movs r1, 0x14
-	bl __divsi3
-	lsls r0, 16
-	asrs r0, 16
-	bl sub_8102C48
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl StartSpriteAnimIfDifferent
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810539C: .4byte gSharedMem
-	thumb_func_end sub_810535C
-
 	thumb_func_start sub_81053A0
 sub_81053A0: @ 81053A0
 	push {r4-r7,lr}
diff --git a/include/slot_machine.h b/include/slot_machine.h
index 004538b14..78744d0e4 100644
--- a/include/slot_machine.h
+++ b/include/slot_machine.h
@@ -30,9 +30,13 @@ struct SlotMachineEwramStruct {
     /*0x3D*/ u8 unk3D;
     /*0x3E*/ u8 unk3E;
     /*0x3F*/ u8 unk3F;
-    /*0x40*/ u8 filler40[4];
+    /*0x40*/ u8 filler40[2];
+    /*0x42*/ u8 unk42;
+    /*0x43*/ u8 unk43;
     /*0x44*/ u8 unk44[5];
-    /*0x49*/ u8 filler49[5];
+    /*0x49*/ u8 unk49;
+    /*0x4A*/ u8 unk4A;
+    /*0x49*/ u8 unk4B[3];
     /*0x4E*/ u8 unk4E;
     /*0x4F*/ u8 filler4F[9];
     /*0x58*/ u16 win0h;
diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c
index 9246e9428..3aaad9a8b 100644
--- a/src/field/slot_machine.c
+++ b/src/field/slot_machine.c
@@ -3082,7 +3082,7 @@ void nullsub_69(struct Task *task)
 
 }
 
-const struct SpriteTemplate gSpriteTemplate_83ED414;
+extern const struct SpriteTemplate gSpriteTemplate_83ED414;
 
 void sub_8104EA8(void)
 {
@@ -3191,6 +3191,66 @@ void sub_8105170(struct Sprite *sprite)
     }
 }
 
+extern const struct SpriteTemplate gSpriteTemplate_83ED474;
+extern const struct SpriteTemplate gSpriteTemplate_83ED48C;
+extern const struct SubspriteTable gSubspriteTables_83ED73C[];
+extern const struct SubspriteTable gSubspriteTables_83ED75C[];
+
+void sub_81051C0(void)
+{
+    u8 spriteId = CreateSprite(&gSpriteTemplate_83ED474, 0x170, 0x34, 7);
+    struct Sprite *sprite = gSprites + spriteId;
+    sprite->oam.priority = 1;
+    sprite->coordOffsetEnabled = TRUE;
+    SetSubspriteTables(sprite, gSubspriteTables_83ED73C);
+    eSlotMachine->unk49 = spriteId;
+
+    spriteId = CreateSprite(&gSpriteTemplate_83ED48C, 0x170, 0x54, 7);
+    sprite = gSprites + spriteId;
+    sprite->oam.priority = 1;
+    sprite->coordOffsetEnabled = TRUE;
+    SetSubspriteTables(sprite, gSubspriteTables_83ED75C);
+    eSlotMachine->unk4A = spriteId;
+}
+
+extern const struct SpriteTemplate gSpriteTemplate_83ED4A4;
+extern const struct SubspriteTable gSubspriteTables_83ED78C[];
+
+void sub_8105284(void)
+{
+    u8 spriteId = CreateSprite(&gSpriteTemplate_83ED4A4, 0xa8 - gSpriteCoordOffsetX, 0x50, 7);
+    struct Sprite *sprite = gSprites + spriteId;
+    sprite->oam.priority = 1;
+    sprite->coordOffsetEnabled = TRUE;
+    SetSubspriteTables(sprite, gSubspriteTables_83ED78C);
+    eSlotMachine->unk42 = spriteId;
+}
+
+extern const struct SpriteTemplate gSpriteTemplate_83ED4BC;
+
+void sub_81052EC(void)
+{
+    u8 i;
+    s16 r5;
+    for (i = 0, r5 = 0; i < 3; i++, r5 += 20)
+    {
+        u8 spriteId = CreateSprite(&gSpriteTemplate_83ED4BC, 0x170, 0x00, 10);
+        struct Sprite *sprite = gSprites + spriteId;
+        sprite->oam.priority = 1;
+        sprite->coordOffsetEnabled = TRUE;
+        sprite->data[7] = r5;
+        eSlotMachine->unk4B[i] = spriteId;
+    }
+}
+
+void sub_810535C(struct Sprite *sprite)
+{
+    s16 r0 = (u16)(eSlotMachine->unk14 + sprite->data[7]);
+    r0 %= 40;
+    sprite->pos1.y = r0 + 59;
+    StartSpriteAnimIfDifferent(sprite, sub_8102C48(r0 / 20));
+}
+
 asm(".section .text_b");
 
 static void sub_8106448(void) {