Up through sub_810FAA0

4 files changed, 71 insertions, 172 deletions

diff --git a/asm/field_specials.s b/asm/field_specials.s
index ec0feccff..1b5c88fed 100755
--- a/asm/field_specials.s
+++ b/asm/field_specials.s
@@ -6,178 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_810F9AC
-sub_810F9AC: @ 810F9AC
-	push {r4,r5,lr}
-	ldr r2, _0810F9C0 @ =gScriptResult
-	ldrh r1, [r2]
-	ldr r0, _0810F9C4 @ =0x0000270f
-	cmp r1, r0
-	bls _0810F9C8
-	movs r0, 0
-	bl sub_80BF088
-	b _0810FA4A
-	.align 2, 0
-_0810F9C0: .4byte gScriptResult
-_0810F9C4: .4byte 0x0000270f
-_0810F9C8:
-	ldr r0, _0810F9D8 @ =0x000003e7
-	cmp r1, r0
-	bls _0810F9E0
-	ldr r4, _0810F9DC @ =gStringVar1
-	movs r0, 0xA1
-	strb r0, [r4]
-	adds r4, 0x1
-	b _0810FA04
-	.align 2, 0
-_0810F9D8: .4byte 0x000003e7
-_0810F9DC: .4byte gStringVar1
-_0810F9E0:
-	cmp r1, 0x63
-	bls _0810F9F4
-	ldr r4, _0810F9F0 @ =gStringVar1
-	movs r0, 0xA1
-	strb r0, [r4]
-	strb r0, [r4, 0x1]
-	adds r4, 0x2
-	b _0810FA04
-	.align 2, 0
-_0810F9F0: .4byte gStringVar1
-_0810F9F4:
-	cmp r1, 0x9
-	bls _0810FA24
-	ldr r4, _0810FA20 @ =gStringVar1
-	movs r0, 0xA1
-	strb r0, [r4]
-	strb r0, [r4, 0x1]
-	strb r0, [r4, 0x2]
-	adds r4, 0x3
-_0810FA04:
-	ldrh r5, [r2]
-	adds r0, r5, 0
-	bl sub_80BF0B8
-	adds r3, r0, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0
-	bl ConvertIntToDecimalStringN
-	b _0810FA4A
-	.align 2, 0
-_0810FA20: .4byte gStringVar1
-_0810FA24:
-	ldr r4, _0810FA50 @ =gStringVar1
-	movs r0, 0xA1
-	strb r0, [r4]
-	strb r0, [r4, 0x1]
-	strb r0, [r4, 0x2]
-	strb r0, [r4, 0x3]
-	adds r4, 0x4
-	ldrh r5, [r2]
-	adds r0, r5, 0
-	bl sub_80BF0B8
-	adds r3, r0, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0
-	bl ConvertIntToDecimalStringN
-_0810FA4A:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810FA50: .4byte gStringVar1
-	thumb_func_end sub_810F9AC
-
-	thumb_func_start ResetFanClub
-ResetFanClub: @ 810FA54
-	ldr r0, _0810FA68 @ =gSaveBlock1
-	ldr r2, _0810FA6C @ =0x000013c2
-	adds r1, r0, r2
-	movs r2, 0
-	strh r2, [r1]
-	ldr r1, _0810FA70 @ =0x000013c4
-	adds r0, r1
-	strh r2, [r0]
-	bx lr
-	.align 2, 0
-_0810FA68: .4byte gSaveBlock1
-_0810FA6C: .4byte 0x000013c2
-_0810FA70: .4byte 0x000013c4
-	thumb_func_end ResetFanClub
-
-	thumb_func_start sub_810FA74
-sub_810FA74: @ 810FA74
-	push {lr}
-	bl sub_810FF30
-	lsls r0, 24
-	cmp r0, 0
-	beq _0810FA90
-	bl sub_810FCE8
-	ldr r0, _0810FA94 @ =gSaveBlock1
-	ldr r1, _0810FA98 @ =gSaveBlock2
-	ldrh r1, [r1, 0xE]
-	ldr r2, _0810FA9C @ =0x000013c4
-	adds r0, r2
-	strh r1, [r0]
-_0810FA90:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810FA94: .4byte gSaveBlock1
-_0810FA98: .4byte gSaveBlock2
-_0810FA9C: .4byte 0x000013c4
-	thumb_func_end sub_810FA74
-
-	thumb_func_start sub_810FAA0
-sub_810FAA0: @ 810FAA0
-	push {r4,lr}
-	ldr r4, _0810FAF0 @ =gSaveBlock1
-	ldr r1, _0810FAF4 @ =0x000013c2
-	adds r0, r4, r1
-	ldrh r0, [r0]
-	lsrs r0, 7
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _0810FAE8
-	bl sub_810FF48
-	bl sub_810FD80
-	ldr r0, _0810FAF8 @ =gSaveBlock2
-	ldrh r1, [r0, 0xE]
-	ldr r2, _0810FAFC @ =0x000013c4
-	adds r0, r4, r2
-	strh r1, [r0]
-	ldr r0, _0810FB00 @ =0x00000315
-	bl FlagReset
-	ldr r0, _0810FB04 @ =0x00000316
-	bl FlagReset
-	ldr r0, _0810FB08 @ =0x00000317
-	bl FlagReset
-	movs r0, 0xC6
-	lsls r0, 2
-	bl FlagReset
-	ldr r0, _0810FB0C @ =0x00004095
-	movs r1, 0x1
-	bl VarSet
-_0810FAE8:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810FAF0: .4byte gSaveBlock1
-_0810FAF4: .4byte 0x000013c2
-_0810FAF8: .4byte gSaveBlock2
-_0810FAFC: .4byte 0x000013c4
-_0810FB00: .4byte 0x00000315
-_0810FB04: .4byte 0x00000316
-_0810FB08: .4byte 0x00000317
-_0810FB0C: .4byte 0x00004095
-	thumb_func_end sub_810FAA0
-
 	thumb_func_start sub_810FB10
 sub_810FB10: @ 810FB10
 	push {r4,r5,lr}
diff --git a/include/tv.h b/include/tv.h
index b4847848b..e2001c7f3 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -106,5 +106,6 @@ void DoTVShowTodaysSmartShopper(void);
 void sub_80BE3BC(void);
 void UpdateTVShowsPerDay(u16);
 void sub_80C045C();
+void sub_80BF088(u8, u32);
 
 #endif // GUARD_TV_H
diff --git a/include/vars.h b/include/vars.h
index 50ca97818..f31ebde84 100755
--- a/include/vars.h
+++ b/include/vars.h
@@ -32,6 +32,7 @@
 #define VAR_0x4054                 0x4054
 
 #define VAR_0x4089                 0x4089
+#define VAR_0x4095                 0x4095
 #define VAR_0x4097                 0x4097
 #define VAR_0x409a                 0x409a
 #define VAR_PORTHOLE               0x40B4
diff --git a/src/field_specials.c b/src/field_specials.c
index 02b3581fd..214afebf8 100755
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -2053,3 +2053,72 @@ bool8 sub_810F96C(void)
     }
     return TRUE;
 }
+
+void sub_810F9AC(void)
+{
+    if (gScriptResult >= 10000)
+    {
+        sub_80BF088(0, gScriptResult);
+    }
+    else if (gScriptResult >= 1000)
+    {
+        gStringVar1[0] = 0xa1; // "0"
+        ConvertIntToDecimalStringN(gStringVar1 + 1, gScriptResult, 0, sub_80BF0B8(gScriptResult));
+    }
+    else if (gScriptResult >= 100)
+    {
+        gStringVar1[0] = 0xa1; // "0"
+        gStringVar1[1] = 0xa1; // "0"
+        ConvertIntToDecimalStringN(gStringVar1 + 2, gScriptResult, 0, sub_80BF0B8(gScriptResult));
+    }
+    else if (gScriptResult >= 10)
+    {
+        gStringVar1[0] = 0xa1; // "0"
+        gStringVar1[1] = 0xa1; // "0"
+        gStringVar1[2] = 0xa1; // "0"
+        ConvertIntToDecimalStringN(gStringVar1 + 3, gScriptResult, 0, sub_80BF0B8(gScriptResult));
+    }
+    else
+    {
+        gStringVar1[0] = 0xa1; // "0"
+        gStringVar1[1] = 0xa1; // "0"
+        gStringVar1[2] = 0xa1; // "0"
+        gStringVar1[3] = 0xa1; // "0"
+        ConvertIntToDecimalStringN(gStringVar1 + 4, gScriptResult, 0, sub_80BF0B8(gScriptResult));
+    }
+}
+
+bool8 sub_810FF30(void);
+void sub_810FCE8(void);
+void sub_810FF48(void);
+void sub_810FD80(void);
+
+void ResetFanClub(void)
+{
+    gSaveBlock1.vars[0x41] = 0;
+    gSaveBlock1.vars[0x42] = 0;
+}
+
+void sub_810FA74(void)
+{
+    if (sub_810FF30())
+    {
+        sub_810FCE8();
+        gSaveBlock1.vars[0x42] = gSaveBlock2.playTimeHours;
+    }
+}
+
+void sub_810FAA0(void)
+{
+    if (!((gSaveBlock1.vars[0x41] >> 7) & 1))
+    {
+        sub_810FF48();
+        sub_810FD80();
+        gSaveBlock1.vars[0x42] = gSaveBlock2.playTimeHours;
+        FlagReset(0x315);
+        FlagReset(0x316);
+        FlagReset(0x317);
+        FlagReset(0x318);
+        VarSet(VAR_0x4095, 1);
+    }
+}