sub_8123D98

3 files changed, 40 insertions, 137 deletions

diff --git a/asm/cable_car.s b/asm/cable_car.s
index 2e841ae04..aed9082cf 100644
--- a/asm/cable_car.s
+++ b/asm/cable_car.s
@@ -6,139 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_8123D98
-sub_8123D98: @ 8123D98
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	ldr r0, _08123E04 @ =gUnknown_02039274
-	ldr r6, [r0]
-	ldrb r0, [r6, 0x1]
-	cmp r0, 0xFF
-	bne _08123DA8
-	b _08123EB0
-_08123DA8:
-	ldr r0, _08123E08 @ =gSpecialVar_0x8004
-	ldrh r0, [r0]
-	cmp r0, 0
-	bne _08123E18
-	movs r0, 0x6
-	ldrsh r4, [r6, r0]
-	adds r0, r4, 0
-	bl __floatsisf
-	cmp r4, 0
-	bge _08123DC4
-	ldr r1, _08123E0C @ =0x47800000
-	bl __addsf3
-_08123DC4:
-	ldr r1, _08123E10 @ =0x3e0f5c29
-	bl __mulsf3
-	bl __fixunssfsi
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r5, 0x2E]
-	subs r1, r0
-	strh r1, [r5, 0x20]
-	movs r1, 0x6
-	ldrsh r4, [r6, r1]
-	adds r0, r4, 0
-	bl __floatsisf
-	cmp r4, 0
-	bge _08123DEC
-	ldr r1, _08123E0C @ =0x47800000
-	bl __addsf3
-_08123DEC:
-	ldr r1, _08123E14 @ =0x3d89374c
-	bl __mulsf3
-	bl __fixunssfsi
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r5, 0x30]
-	subs r1, r0
-	strh r1, [r5, 0x22]
-	b _08123E68
-	.align 2, 0
-_08123E04: .4byte gUnknown_02039274
-_08123E08: .4byte gSpecialVar_0x8004
-_08123E0C: .4byte 0x47800000
-_08123E10: .4byte 0x3e0f5c29
-_08123E14: .4byte 0x3d89374c
-_08123E18:
-	movs r0, 0x6
-	ldrsh r4, [r6, r0]
-	adds r0, r4, 0
-	bl __floatsisf
-	cmp r4, 0
-	bge _08123E2C
-	ldr r1, _08123E8C @ =0x47800000
-	bl __addsf3
-_08123E2C:
-	ldr r1, _08123E90 @ =0x3e0f5c29
-	bl __mulsf3
-	bl __fixunssfsi
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r5, 0x2E]
-	adds r0, r1
-	strh r0, [r5, 0x20]
-	movs r0, 0x6
-	ldrsh r4, [r6, r0]
-	adds r0, r4, 0
-	bl __floatsisf
-	cmp r4, 0
-	bge _08123E54
-	ldr r1, _08123E8C @ =0x47800000
-	bl __addsf3
-_08123E54:
-	ldr r1, _08123E94 @ =0x3d89374c
-	bl __mulsf3
-	bl __fixunssfsi
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r5, 0x30]
-	adds r0, r1
-	strh r0, [r5, 0x22]
-_08123E68:
-	movs r0, 0x32
-	ldrsh r2, [r5, r0]
-	cmp r2, 0
-	bne _08123E98
-	movs r0, 0x11
-	strh r0, [r5, 0x26]
-	ldrh r0, [r5, 0x34]
-	adds r1, r0, 0x1
-	strh r1, [r5, 0x34]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x9
-	ble _08123EB0
-	strh r2, [r5, 0x34]
-	ldrh r0, [r5, 0x32]
-	adds r0, 0x1
-	strh r0, [r5, 0x32]
-	b _08123EB0
-	.align 2, 0
-_08123E8C: .4byte 0x47800000
-_08123E90: .4byte 0x3e0f5c29
-_08123E94: .4byte 0x3d89374c
-_08123E98:
-	movs r2, 0
-	movs r0, 0x10
-	strh r0, [r5, 0x26]
-	ldrh r0, [r5, 0x34]
-	adds r1, r0, 0x1
-	strh r1, [r5, 0x34]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x9
-	ble _08123EB0
-	strh r2, [r5, 0x34]
-	strh r2, [r5, 0x32]
-_08123EB0:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8123D98
-
 	thumb_func_start sub_8123EB8
 sub_8123EB8: @ 8123EB8
 	push {lr}
diff --git a/asmdiff.sh b/asmdiff.sh
index a4b465b6e..a4b465b6e 100644..100755
--- a/asmdiff.sh
+++ b/asmdiff.sh
diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c
index 5a2f39a6f..30002bb47 100644
--- a/src/scene/cable_car.c
+++ b/src/scene/cable_car.c
@@ -467,13 +467,49 @@ void sub_8123CB8(struct Sprite *sprite)
     {
         if (gSpecialVar_0x8004 == 0)
         {
-            sprite->pos1.x = sprite->data0 - (u8)((f32)0.14 * S16TOPOSFLOAT(gUnknown_02039274->unk_0006));
-            sprite->pos1.y = sprite->data1 - (u8)((f32)0.067 * S16TOPOSFLOAT(gUnknown_02039274->unk_0006));
+            sprite->pos1.x = sprite->data0 - (u8)(0.14f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006));
+            sprite->pos1.y = sprite->data1 - (u8)(0.067f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006));
         }
         else
         {
-            sprite->pos1.x = sprite->data0 + (u8)((f32)0.14 * S16TOPOSFLOAT(gUnknown_02039274->unk_0006));
-            sprite->pos1.y = sprite->data1 + (u8)((f32)0.067 * S16TOPOSFLOAT(gUnknown_02039274->unk_0006));
+            sprite->pos1.x = sprite->data0 + (u8)(0.14f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006));
+            sprite->pos1.y = sprite->data1 + (u8)(0.067f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006));
+        }
+    }
+}
+
+void sub_8123D98(struct Sprite *sprite)
+{
+    if (gUnknown_02039274->unk_0001 != 255)
+    {
+        if (gSpecialVar_0x8004 == 0)
+        {
+            sprite->pos1.x = sprite->data0 - (u8)(0.14f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006));
+            sprite->pos1.y = sprite->data1 - (u8)(0.067f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006));
+        }
+        else
+        {
+            sprite->pos1.x = sprite->data0 + (u8)(0.14f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006));
+            sprite->pos1.y = sprite->data1 + (u8)(0.067f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006));
+        }
+        switch (sprite->data2)
+        {
+            case 0:
+                sprite->pos2.y = 17;
+                if (sprite->data3 ++ > 9)
+                {
+                    sprite->data3 = 0;
+                    sprite->data2 ++;
+                }
+                break;
+            default:
+                sprite->pos2.y = 16;
+                if (sprite->data3 ++ > 9)
+                {
+                    sprite->data3 = 0;
+                    sprite->data2 = 0;
+                }
+                break;
         }
     }
 }