From f9c3aeb9194e7c670742dc9b99ca90131c24ddc1 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 24 Nov 2017 22:30:20 -0500
Subject: [PATCH] sub_8135380

---
 asm/wallclock.s | 95 -------------------------------------------------
 ld_script.txt   |  1 -
 src/wallclock.c | 30 +++++++++++++++-
 3 files changed, 29 insertions(+), 97 deletions(-)
 delete mode 100644 asm/wallclock.s

diff --git a/asm/wallclock.s b/asm/wallclock.s
deleted file mode 100644
index 5c590488f0..0000000000
--- a/asm/wallclock.s
+++ /dev/null
@@ -1,95 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8135380
-sub_8135380: @ 8135380
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r2, =gTasks
-	movs r0, 0x2E
-	ldrsh r1, [r4, r0]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	movs r1, 0x12
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	beq _081353C0
-	ldrh r1, [r4, 0x30]
-	adds r0, r1, 0
-	subs r0, 0x69
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1D
-	bhi _081353AC
-	adds r0, r1, 0x5
-	strh r0, [r4, 0x30]
-_081353AC:
-	ldrh r1, [r4, 0x30]
-	movs r2, 0x30
-	ldrsh r0, [r4, r2]
-	cmp r0, 0x68
-	bgt _081353E0
-	adds r0, r1, 0x1
-	b _081353DE
-	.pool
-_081353C0:
-	ldrh r1, [r4, 0x30]
-	adds r0, r1, 0
-	subs r0, 0x5B
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1D
-	bhi _081353D2
-	subs r0, r1, 0x5
-	strh r0, [r4, 0x30]
-_081353D2:
-	ldrh r1, [r4, 0x30]
-	movs r2, 0x30
-	ldrsh r0, [r4, r2]
-	cmp r0, 0x78
-	ble _081353E0
-	subs r0, r1, 0x1
-_081353DE:
-	strh r0, [r4, 0x30]
-_081353E0:
-	ldrh r0, [r4, 0x30]
-	bl Cos2
-	lsls r0, 16
-	asrs r0, 16
-	lsls r1, r0, 4
-	subs r1, r0
-	lsls r0, r1, 1
-	cmp r0, 0
-	bge _081353F8
-	ldr r1, =0x00000fff
-	adds r0, r1
-_081353F8:
-	asrs r0, 12
-	strh r0, [r4, 0x24]
-	ldrh r0, [r4, 0x30]
-	bl Sin2
-	lsls r0, 16
-	asrs r0, 16
-	lsls r1, r0, 4
-	subs r1, r0
-	lsls r0, r1, 1
-	cmp r0, 0
-	bge _08135414
-	ldr r2, =0x00000fff
-	adds r0, r2
-_08135414:
-	asrs r0, 12
-	strh r0, [r4, 0x26]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8135380
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/ld_script.txt b/ld_script.txt
index df0a02cc5c..c5c627d6c3 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -179,7 +179,6 @@ SECTIONS {
         asm/trader.o(.text);
         src/starter_choose.o(.text);
         src/wallclock.o(.text);
-        asm/wallclock.o(.text);
         asm/rom6.o(.text);
         asm/battle_records.o(.text);
         asm/pokedex_area_screen.o(.text);
diff --git a/src/wallclock.c b/src/wallclock.c
index 6c78d72a11..436c498f4f 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -50,7 +50,7 @@ static void sub_8135130(u8 taskId);
 static void sub_81351AC(struct Sprite *sprite);
 static void sub_8135244(struct Sprite *sprite);
 static void sub_81352DC(struct Sprite *sprite);
-void sub_8135380(struct Sprite *sprite);
+static void sub_8135380(struct Sprite *sprite);
 
 // rodata
 
@@ -1007,3 +1007,31 @@ static void sub_81352DC(struct Sprite *sprite)
     sprite->pos2.x = Cos2(sprite->data1) * 30 / 0x1000;
     sprite->pos2.y = Sin2(sprite->data1) * 30 / 0x1000;
 }
+
+static void sub_8135380(struct Sprite *sprite)
+{
+    if (gTasks[sprite->data0].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM])
+    {
+        if ((u16)(sprite->data1 - 105) < 30)
+        {
+            sprite->data1 += 5;
+        }
+        if (sprite->data1 < 105)
+        {
+            sprite->data1++;
+        }
+    }
+    else
+    {
+        if ((u16)(sprite->data1 - 91) < 30)
+        {
+            sprite->data1 -= 5;
+        }
+        if (sprite->data1 > 120)
+        {
+            sprite->data1--;
+        }
+    }
+    sprite->pos2.x = Cos2(sprite->data1) * 30 / 0x1000;
+    sprite->pos2.y = Sin2(sprite->data1) * 30 / 0x1000;
+}