through sub_810FCE8

2 files changed, 41 insertions, 93 deletions

diff --git a/asm/field_specials.s b/asm/field_specials.s
index 5ac79cc5a..d8115fa61 100755
--- a/asm/field_specials.s
+++ b/asm/field_specials.s
@@ -6,99 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_810FCB0
-sub_810FCB0: @ 810FCB0
-	push {r4,r5,lr}
-	movs r3, 0
-	movs r2, 0
-	ldr r0, _0810FCE4 @ =gSaveBlock1 + 0x13C2
-	ldrh r4, [r0]
-	movs r5, 0x1
-_0810FCBC:
-	adds r1, r2, 0
-	adds r1, 0x8
-	adds r0, r4, 0
-	asrs r0, r1
-	ands r0, r5
-	cmp r0, 0
-	beq _0810FCD0
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-_0810FCD0:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0x7
-	bls _0810FCBC
-	adds r0, r3, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0810FCE4: .4byte gSaveBlock1 + 0x13C2
-	thumb_func_end sub_810FCB0
-
-	thumb_func_start sub_810FCE8
-sub_810FCE8: @ 810FCE8
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	movs r5, 0
-	ldr r2, _0810FD08 @ =gSaveBlock2
-	ldrh r1, [r2, 0xE]
-	ldr r0, _0810FD0C @ =0x000003e6
-	cmp r1, r0
-	bhi _0810FD54
-	ldr r7, _0810FD10 @ =gSaveBlock1
-	adds r6, r2, 0
-	ldr r0, _0810FD14 @ =0x000013c4
-	adds r0, r7
-	mov r8, r0
-	b _0810FD36
-	.align 2, 0
-_0810FD08: .4byte gSaveBlock2
-_0810FD0C: .4byte 0x000003e6
-_0810FD10: .4byte gSaveBlock1
-_0810FD14: .4byte 0x000013c4
-_0810FD18:
-	ldrh r1, [r6, 0xE]
-	ldr r0, _0810FD4C @ =0x000013c4
-	adds r4, r7, r0
-	ldrh r0, [r4]
-	subs r1, r0
-	cmp r1, 0xB
-	ble _0810FD54
-	bl sub_810FC18
-	ldrh r0, [r4]
-	adds r0, 0xC
-	strh r0, [r4]
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-_0810FD36:
-	bl sub_810FCB0
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x4
-	bhi _0810FD50
-	ldrh r0, [r6, 0xE]
-	mov r1, r8
-	strh r0, [r1]
-	b _0810FD54
-	.align 2, 0
-_0810FD4C: .4byte 0x000013c4
-_0810FD50:
-	cmp r5, 0x8
-	bne _0810FD18
-_0810FD54:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_810FCE8
-
 	thumb_func_start sub_810FD60
 sub_810FD60: @ 810FD60
 	ldr r0, _0810FD74 @ =gSaveBlock1
diff --git a/src/field_specials.c b/src/field_specials.c
index 13a726ee3..8a6860e1e 100755
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -2200,3 +2200,44 @@ int sub_810FC18(void)
     }
     return retval;
 }
+
+u16 sub_810FCB0(void)
+{
+    u8 i;
+    u8 retval = 0;
+    for (i=0; i<8; i++)
+    {
+        if ((gSaveBlock1.vars[0x41] >> (i + 8)) & 1)
+        {
+            retval ++;
+        }
+    }
+    return retval;
+}
+
+void sub_810FCE8(void)
+{
+    u8 i = 0;
+    if (gSaveBlock2.playTimeHours < 999)
+    {
+        while (1)
+        {
+            if (sub_810FCB0() < 5)
+            {
+                gSaveBlock1.vars[0x42] = gSaveBlock2.playTimeHours;
+                break;
+            }
+            else if (i == 8)
+            {
+                break;
+            }
+            else if (gSaveBlock2.playTimeHours - gSaveBlock1.vars[0x42] < 12)
+            {
+                return;
+            }
+            sub_810FC18();
+            gSaveBlock1.vars[0x42] += 12;
+            i++;
+        }
+    }
+}