through sub_8105170

2 files changed, 72 insertions, 245 deletions

diff --git a/asm/slot_machine.s b/asm/slot_machine.s
index 6a5d36d95..000acd198 100644
--- a/asm/slot_machine.s
+++ b/asm/slot_machine.s
@@ -5,245 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8104FF4
-sub_8104FF4: @ 8104FF4
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	adds r5, r0, 0
-	adds r6, r1, 0
-	mov r8, r2
-	adds r4, r3, 0
-	mov r0, r8
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	lsls r4, 16
-	lsrs r4, 16
-	ldr r0, _08105060 @ =gSpriteTemplate_83ED42C
-	lsls r5, 16
-	asrs r5, 16
-	lsls r6, 16
-	asrs r6, 16
-	adds r1, r5, 0
-	adds r2, r6, 0
-	movs r3, 0xD
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	ldr r0, _08105064 @ =gSprites
-	adds r2, r0
-	ldrb r1, [r2, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x8
-	orrs r0, r1
-	strb r0, [r2, 0x5]
-	mov r0, r8
-	strh r0, [r2, 0x2E]
-	strh r4, [r2, 0x30]
-	lsls r4, 16
-	asrs r4, 16
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 1
-	strh r0, [r2, 0x32]
-	ldr r0, _08105068 @ =0x0000ffff
-	strh r0, [r2, 0x34]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08105060: .4byte gSpriteTemplate_83ED42C
-_08105064: .4byte gSprites
-_08105068: .4byte 0x0000ffff
-	thumb_func_end sub_8104FF4
-
-	thumb_func_start sub_810506C
-sub_810506C: @ 810506C
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r1, _081050C0 @ =gSharedMem
-	ldrh r2, [r1, 0xC]
-	movs r3, 0x2E
-	ldrsh r0, [r4, r3]
-	cmp r0, 0
-	beq _0810507E
-	ldrh r2, [r1, 0xE]
-_0810507E:
-	movs r1, 0x34
-	ldrsh r0, [r4, r1]
-	cmp r0, r2
-	beq _081050B8
-	strh r2, [r4, 0x34]
-	ldrh r1, [r4, 0x32]
-	adds r0, r2, 0
-	bl __umodsi3
-	lsls r0, 16
-	lsrs r2, r0, 16
-	ldrh r1, [r4, 0x30]
-	adds r0, r2, 0
-	bl __udivsi3
-	lsls r0, 16
-	movs r3, 0xE0
-	lsls r3, 11
-	adds r0, r3
-	lsrs r2, r0, 16
-	adds r0, r2, 0
-	bl GetSpriteTileStartByTag
-	adds r1, r4, 0
-	adds r1, 0x40
-	strh r0, [r1]
-	adds r0, r4, 0
-	bl SetSpriteSheetFrameTileNum
-_081050B8:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081050C0: .4byte gSharedMem
-	thumb_func_end sub_810506C
-
-	thumb_func_start sub_81050C4
-sub_81050C4: @ 81050C4
-	push {lr}
-	ldr r0, _081050F4 @ =gSpriteTemplate_83ED444
-	movs r1, 0x58
-	movs r2, 0x48
-	movs r3, 0xF
-	bl CreateSprite
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r2, _081050F8 @ =gSprites
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r0, 0x5]
-	movs r2, 0xC
-	orrs r1, r2
-	strb r1, [r0, 0x5]
-	ldr r1, _081050FC @ =gSubspriteTables_83ED704
-	bl SetSubspriteTables
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081050F4: .4byte gSpriteTemplate_83ED444
-_081050F8: .4byte gSprites
-_081050FC: .4byte gSubspriteTables_83ED704
-	thumb_func_end sub_81050C4
-
-	thumb_func_start sub_8105100
-sub_8105100: @ 8105100
-	push {lr}
-	ldr r0, _08105140 @ =gSpriteTemplate_83ED45C
-	movs r1, 0x8C
-	lsls r1, 1
-	movs r2, 0x50
-	movs r3, 0x1
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _08105144 @ =gSprites
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	adds r2, r1
-	ldrb r3, [r2, 0x5]
-	movs r1, 0xD
-	negs r1, r1
-	ands r1, r3
-	movs r3, 0x4
-	orrs r1, r3
-	strb r1, [r2, 0x5]
-	adds r2, 0x3E
-	ldrb r1, [r2]
-	movs r3, 0x2
-	orrs r1, r3
-	strb r1, [r2]
-	ldr r1, _08105148 @ =gSharedMem
-	adds r1, 0x3F
-	strb r0, [r1]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08105140: .4byte gSpriteTemplate_83ED45C
-_08105144: .4byte gSprites
-_08105148: .4byte gSharedMem
-	thumb_func_end sub_8105100
-
-	thumb_func_start sub_810514C
-sub_810514C: @ 810514C
-	push {lr}
-	ldr r0, _08105168 @ =gSharedMem
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0810516C @ =gSprites
-	adds r0, r1
-	bl DestroySprite
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08105168: .4byte gSharedMem
-_0810516C: .4byte gSprites
-	thumb_func_end sub_810514C
-
-	thumb_func_start sub_8105170
-sub_8105170: @ 8105170
-	push {lr}
-	adds r2, r0, 0
-	movs r0, 0
-	strh r0, [r2, 0x24]
-	strh r0, [r2, 0x26]
-	adds r0, r2, 0
-	adds r0, 0x2A
-	ldrb r0, [r0]
-	cmp r0, 0x4
-	bne _081051B6
-	movs r0, 0x8
-	strh r0, [r2, 0x24]
-	strh r0, [r2, 0x26]
-	adds r0, r2, 0
-	adds r0, 0x2B
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _081051A4
-	adds r0, r2, 0
-	adds r0, 0x2C
-	ldrb r1, [r0]
-	movs r0, 0x3F
-	ands r0, r1
-	cmp r0, 0
-	bne _081051B2
-	b _081051B6
-_081051A4:
-	adds r0, r2, 0
-	adds r0, 0x2C
-	ldrb r1, [r0]
-	movs r0, 0x3F
-	ands r0, r1
-	cmp r0, 0
-	bne _081051B6
-_081051B2:
-	ldr r0, _081051BC @ =0x0000fff8
-	strh r0, [r2, 0x26]
-_081051B6:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081051BC: .4byte 0x0000fff8
-	thumb_func_end sub_8105170
-
 	thumb_func_start sub_81051C0
 sub_81051C0: @ 81051C0
 	push {r4-r7,lr}
diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c
index d6e078139..9246e9428 100644
--- a/src/field/slot_machine.c
+++ b/src/field/slot_machine.c
@@ -186,7 +186,7 @@ void nullsub_69(struct Task *task);
 void sub_8104E74(u8 taskId);
 void sub_8104EA8(void);
 void sub_8104F8C(void);
-void sub_8104FF4(s16 a0, s16 a1, u8 a2, s16 a3);
+void sub_8104FF4(s16 x, s16 y, u8 a2, s16 a3);
 void sub_81050C4(void);
 void sub_8105100(void);
 void sub_810514C(void);
@@ -3114,14 +3114,80 @@ void sub_8104F18(struct Sprite *sprite)
 void sub_8104F8C(void)
 {
     s16 i;
-    s16 r4;
-    for (r4 = 203, i = 1; i < 10000; i *= 10, r4 -= 7)
+    s16 x;
+    for (x = 203, i = 1; i < 10000; i *= 10, x -= 7)
     {
-        sub_8104FF4(r4, 23, 0, i);
+        sub_8104FF4(x, 23, 0, i);
     }
-    for (r4 = 235, i = 1; i < 10000; i *= 10, r4 -= 7)
+    for (x = 235, i = 1; i < 10000; i *= 10, x -= 7)
     {
-        sub_8104FF4(r4, 23, 1, i);
+        sub_8104FF4(x, 23, 1, i);
+    }
+}
+
+extern const struct SpriteTemplate gSpriteTemplate_83ED42C;
+
+void sub_8104FF4(s16 x, s16 y, u8 a2, s16 a3)
+{
+    struct Sprite *sprite = gSprites + CreateSprite(&gSpriteTemplate_83ED42C, x, y, 13);
+    sprite->oam.priority = 2;
+    sprite->data[0] = a2;
+    sprite->data[1] = a3;
+    sprite->data[2] = a3 * 10;
+    sprite->data[3] = -1;
+}
+
+void sub_810506C(struct Sprite *sprite)
+{
+    u16 tag = eSlotMachine->coins;
+    if (sprite->data[0])
+        tag = eSlotMachine->unk0E;
+    if (sprite->data[3] != tag)
+    {
+        sprite->data[3] = tag;
+        tag %= (u16)sprite->data[2];
+        tag /= (u16)sprite->data[1];
+        tag += 7;
+        sprite->sheetTileStart = GetSpriteTileStartByTag(tag);
+        SetSpriteSheetFrameTileNum(sprite);
+    }
+}
+
+extern const struct SpriteTemplate gSpriteTemplate_83ED444;
+extern const struct SubspriteTable gSubspriteTables_83ED704[];
+
+void sub_81050C4(void)
+{
+    u8 spriteId = CreateSprite(&gSpriteTemplate_83ED444, 0x58, 0x48, 15);
+    gSprites[spriteId].oam.priority = 3;
+    SetSubspriteTables(gSprites + spriteId, gSubspriteTables_83ED704);
+}
+
+extern const struct SpriteTemplate gSpriteTemplate_83ED45C;
+
+void sub_8105100(void)
+{
+    u8 spriteId = CreateSprite(&gSpriteTemplate_83ED45C, 0x118, 0x50, 1);
+    gSprites[spriteId].oam.priority = 1;
+    gSprites[spriteId].coordOffsetEnabled = TRUE;
+    eSlotMachine->unk3F = spriteId;
+}
+
+void sub_810514C(void)
+{
+    DestroySprite(gSprites + eSlotMachine->unk3F);
+}
+
+void sub_8105170(struct Sprite *sprite)
+{
+    sprite->pos2.y = sprite->pos2.x = 0;
+    if (sprite->animNum == 4)
+    {
+        sprite->pos2.y = sprite->pos2.x = 8;
+        if ((sprite->animCmdIndex != 0 && sprite->animDelayCounter != 0) || (sprite->animCmdIndex == 0 && sprite->animDelayCounter == 0))
+        {
+            sprite->pos2.y = -8;
+        }
     }
 }