through sub_81245F4

3 files changed, 39 insertions, 193 deletions

diff --git a/asm/cable_car.s b/asm/cable_car.s
index 92518cef6..c4b9d9ab7 100644
--- a/asm/cable_car.s
+++ b/asm/cable_car.s
@@ -5,194 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_81245F4
-sub_81245F4: @ 81245F4
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x8
-	movs r0, 0
-	mov r12, r0
-	ldr r2, _0812475C @ =gUnknown_02039274
-	ldr r0, [r2]
-	mov r1, r12
-	strb r1, [r0, 0x1E]
-	strb r1, [r0, 0x1D]
-	ldr r1, [r2]
-	ldrb r0, [r1, 0x8]
-	strb r0, [r1, 0x1F]
-	ldr r0, [r2]
-	ldrb r1, [r0, 0x9]
-	adds r0, 0x20
-	strb r1, [r0]
-	ldr r4, [r2]
-	ldrb r1, [r4, 0x19]
-	adds r3, r1, 0
-	adds r3, 0x1E
-	adds r0, r3, 0
-	mov r9, r2
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r3, r0
-	strb r0, [r4, 0x19]
-	mov r2, r9
-	ldr r1, [r2]
-	ldrb r0, [r1, 0x18]
-	subs r0, 0x2
-	strb r0, [r1, 0x18]
-	ldr r0, [r2]
-	ldrb r1, [r0, 0x1A]
-	adds r2, r1, 0
-	adds r2, 0x17
-	adds r0, r2, 0
-	ldr r3, _08124760 @ =gUnknown_0203927A
-	mov r10, r3
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r2, r0
-	mov r4, r10
-	strb r0, [r4]
-	ldr r7, _08124764 @ =gUnknown_02039278
-	ldr r0, _08124768 @ =gUnknown_02039279
-	mov r8, r0
-_08124658:
-	mov r1, r9
-	ldr r3, [r1]
-	ldrb r0, [r3, 0x19]
-	strb r0, [r7]
-	mov r2, r10
-	ldrb r0, [r2]
-	mov r4, r12
-	adds r1, r0, r4
-	adds r0, r1, 0
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r1, r0
-	mov r1, r8
-	strb r0, [r1]
-	ldrb r2, [r7]
-	lsls r2, 1
-	ldrb r0, [r1]
-	lsls r0, 6
-	adds r2, r0
-	adds r6, r3, 0
-	adds r6, 0xFC
-	adds r2, r6, r2
-	ldrb r1, [r3, 0x18]
-	lsls r1, 1
-	mov r4, r12
-	lsls r0, r4, 1
-	add r0, r12
-	lsls r5, r0, 3
-	adds r1, r5
-	adds r4, r3, 0
-	adds r4, 0x22
-	adds r1, r4, r1
-	ldrh r0, [r1]
-	strh r0, [r2]
-	ldrb r1, [r7]
-	adds r2, r1, 0x1
-	adds r0, r2, 0
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r2, r0
-	strb r0, [r7]
-	ldrb r1, [r7]
-	lsls r1, 1
-	mov r2, r8
-	ldrb r0, [r2]
-	lsls r0, 6
-	adds r1, r0
-	adds r1, r6, r1
-	ldrb r0, [r3, 0x18]
-	adds r0, 0x1
-	lsls r0, 1
-	adds r0, r5
-	adds r0, r4, r0
-	ldrh r0, [r0]
-	strh r0, [r1]
-	mov r0, r12
-	adds r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	mov r12, r0
-	cmp r0, 0x8
-	bls _08124658
-	ldr r4, _08124764 @ =gUnknown_02039278
-	mov r5, r9
-	ldr r3, [r5]
-	ldrb r1, [r3, 0x19]
-	adds r2, r1, 0
-	adds r2, 0x1E
-	adds r0, r2, 0
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r2, r0
-	strb r0, [r4]
-	adds r0, r3, 0
-	adds r0, 0xFC
-	ldrb r2, [r4]
-	movs r1, 0x2
-	str r1, [sp]
-	movs r6, 0x20
-	str r6, [sp, 0x4]
-	movs r1, 0
-	movs r3, 0
-	bl sub_8124E7C
-	ldr r1, [r5]
-	ldrb r0, [r1, 0x18]
-	cmp r0, 0
-	bne _0812474C
-	ldrb r2, [r1, 0x1A]
-	adds r3, r2, 0
-	adds r3, 0x1D
-	adds r0, r3, 0
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r3, r0
-	strb r0, [r1, 0x1A]
-	mov r3, r9
-	ldr r1, [r3]
-	movs r0, 0xC
-	strb r0, [r1, 0x18]
-	bl sub_812446C
-	mov r4, r9
-	ldr r1, [r4]
-	ldrb r3, [r1, 0x1A]
-	adds r4, r3, 0x1
-	adds r0, r4, 0
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r4, r0
-	ldr r2, _08124764 @ =gUnknown_02039278
-	strb r0, [r2]
-	adds r0, r1, 0
-	adds r0, 0xFC
-	ldrb r3, [r2]
-	str r6, [sp]
-	movs r1, 0x9
-	str r1, [sp, 0x4]
-	movs r1, 0
-	movs r2, 0
-	bl sub_8124E7C
-_0812474C:
-	add sp, 0x8
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812475C: .4byte gUnknown_02039274
-_08124760: .4byte gUnknown_0203927A
-_08124764: .4byte gUnknown_02039278
-_08124768: .4byte gUnknown_02039279
-	thumb_func_end sub_81245F4
-
 	thumb_func_start sub_812476C
 sub_812476C: @ 812476C
 	push {r4-r7,lr}
diff --git a/include/cable_car_util.h b/include/cable_car_util.h
index 76198af02..d109190b0 100644
--- a/include/cable_car_util.h
+++ b/include/cable_car_util.h
@@ -7,7 +7,7 @@
 
 // Exported ROM declarations
 
-void sub_8124F08(u16 *dest, const u16 *src, u8 x, u8 y, u8 width, u8 height);
-void sub_8124E7C(u16 *dest, u16 a1, u8 a2, u8 a3, u8 a4, u8 a5);
+void sub_8124F08(void *dest, const u16 *src, u8 x, u8 y, u8 width, u8 height);
+void sub_8124E7C(void *dest, u16 a1, u8 a2, u8 a3, u8 a4, u8 a5);
 
 #endif //GUARD_CABLE_CAR_UTIL_H
diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c
index 3582ce4fd..3d93010a2 100644
--- a/src/scene/cable_car.c
+++ b/src/scene/cable_car.c
@@ -44,7 +44,11 @@ struct CableCarEwramStruct1 {
     u8 filler_0000e[6];
     u8 unk_0014;
     u8 unk_0015;
-    u8 filler_0016[5];
+    u8 unk_0016;
+    u8 unk_0017;
+    u8 unk_0018;
+    u8 unk_0019;
+    u8 unk_001a;
     u8 unk_001b;
     u8 unk_001c;
     u8 unk_001d;
@@ -53,7 +57,7 @@ struct CableCarEwramStruct1 {
     u8 unk_0020;
     u16 unk_0022[9][12];
     u8 filler_00fa[2];
-    u16 unk_00fc[0x400];
+    u16 unk_00fc[0x20][0x20];
     u16 unk_08fc[0x400];
 }; // size 0x10FC
 
@@ -895,4 +899,34 @@ void sub_8124598(void)
     {
         sub_812476C();
     }
-}
\ No newline at end of file
+}
+
+void sub_81245F4(void)
+{
+    u8 i = 0;
+
+    gUnknown_02039274->unk_001d = gUnknown_02039274->unk_001e = 0;
+    gUnknown_02039274->unk_001f = gUnknown_02039274->unk_0008;
+    gUnknown_02039274->unk_0020 = gUnknown_02039274->unk_0009;
+    gUnknown_02039274->unk_0019 = (gUnknown_02039274->unk_0019 + 30) % 32;
+    gUnknown_02039274->unk_0018 -= 2;
+    gUnknown_0203927A = (gUnknown_02039274->unk_001a + 23) % 32;
+    for (i = 0; i < 9; i++)
+    {
+        gUnknown_02039278 = gUnknown_02039274->unk_0019;
+        gUnknown_02039279 = (gUnknown_0203927A + i) % 32;
+        gUnknown_02039274->unk_00fc[gUnknown_02039279][gUnknown_02039278] = gUnknown_02039274->unk_0022[i][gUnknown_02039274->unk_0018];
+        gUnknown_02039278 = (gUnknown_02039278 + 1) % 32;
+        gUnknown_02039274->unk_00fc[gUnknown_02039279][gUnknown_02039278] = gUnknown_02039274->unk_0022[i][gUnknown_02039274->unk_0018 + 1];
+    }
+    gUnknown_02039278 = (gUnknown_02039274->unk_0019 + 30) % 32;
+    sub_8124E7C(gUnknown_02039274->unk_00fc, 0, gUnknown_02039278, 0, 2, 32);
+    if (gUnknown_02039274->unk_0018 == 0)
+    {
+        gUnknown_02039274->unk_001a = (gUnknown_02039274->unk_001a + 29) % 32;
+        gUnknown_02039274->unk_0018 = 12;
+        sub_812446C();
+        gUnknown_02039278 = (gUnknown_02039274->unk_001a + 1) % 32;
+        sub_8124E7C(gUnknown_02039274->unk_00fc, 0, 0, gUnknown_02039278, 32, 9);
+    }
+}