sub_8123CB8

3 files changed, 31 insertions, 108 deletions

diff --git a/asm/cable_car.s b/asm/cable_car.s
index c9d2b377a..2e841ae04 100644
--- a/asm/cable_car.s
+++ b/asm/cable_car.s
@@ -6,110 +6,6 @@
 
 	.text
 
-	thumb_func_start nullsub_76
-nullsub_76: @ 8123CB4
-	bx lr
-	thumb_func_end nullsub_76
-
-	thumb_func_start sub_8123CB8
-sub_8123CB8: @ 8123CB8
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	ldr r0, _08123D20 @ =gUnknown_02039274
-	ldr r6, [r0]
-	ldrb r0, [r6, 0x1]
-	cmp r0, 0xFF
-	beq _08123D84
-	ldr r0, _08123D24 @ =gSpecialVar_0x8004
-	ldrh r0, [r0]
-	cmp r0, 0
-	bne _08123D34
-	movs r0, 0x6
-	ldrsh r4, [r6, r0]
-	adds r0, r4, 0
-	bl __floatsisf
-	cmp r4, 0
-	bge _08123CE2
-	ldr r1, _08123D28 @ =0x47800000
-	bl __addsf3
-_08123CE2:
-	ldr r1, _08123D2C @ =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 _08123D0A
-	ldr r1, _08123D28 @ =0x47800000
-	bl __addsf3
-_08123D0A:
-	ldr r1, _08123D30 @ =0x3d89374c
-	bl __mulsf3
-	bl __fixunssfsi
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r5, 0x30]
-	subs r1, r0
-	strh r1, [r5, 0x22]
-	b _08123D84
-	.align 2, 0
-_08123D20: .4byte gUnknown_02039274
-_08123D24: .4byte gSpecialVar_0x8004
-_08123D28: .4byte 0x47800000
-_08123D2C: .4byte 0x3e0f5c29
-_08123D30: .4byte 0x3d89374c
-_08123D34:
-	movs r0, 0x6
-	ldrsh r4, [r6, r0]
-	adds r0, r4, 0
-	bl __floatsisf
-	cmp r4, 0
-	bge _08123D48
-	ldr r1, _08123D8C @ =0x47800000
-	bl __addsf3
-_08123D48:
-	ldr r1, _08123D90 @ =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 _08123D70
-	ldr r1, _08123D8C @ =0x47800000
-	bl __addsf3
-_08123D70:
-	ldr r1, _08123D94 @ =0x3d89374c
-	bl __mulsf3
-	bl __fixunssfsi
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r5, 0x30]
-	adds r0, r1
-	strh r0, [r5, 0x22]
-_08123D84:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08123D8C: .4byte 0x47800000
-_08123D90: .4byte 0x3e0f5c29
-_08123D94: .4byte 0x3d89374c
-	thumb_func_end sub_8123CB8
-
 	thumb_func_start sub_8123D98
 sub_8123D98: @ 8123D98
 	push {r4-r6,lr}
diff --git a/include/sprite.h b/include/sprite.h
index 769e1584d..68bb0b0e1 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -120,10 +120,6 @@ union AffineAnimCmd
     {.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}}
 #define AFFINEANIMCMD_END \
     {.type = AFFINEANIMCMDTYPE_END}
-#define AFFINEANIMCMD_LOOP(_count) \
-    {.loop = {.type = AFFINEANIMCMDTYPE_LOOP, .count = _count}}
-#define AFFINEANIMCMD_JUMP(_target) \
-    {.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}}
 
 struct AffineAnimState
 {
diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c
index 6e4fe608e..5a2f39a6f 100644
--- a/src/scene/cable_car.c
+++ b/src/scene/cable_car.c
@@ -16,6 +16,15 @@
 
 // Static type declarations
 
+// Credits to Made (dolphin emoji)
+#define S16TOPOSFLOAT(val)   \
+({                           \
+    s16 v = (val);           \
+    float f = (float)v;      \
+    if(v < 0) f += 65536.0f; \
+    f;                       \
+})
+
 struct Unk_2017000 {
     u8 unk_0000;
     u8 unk_0001;
@@ -446,3 +455,25 @@ void sub_8123C40(void)
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
 }
+
+void nullsub_76(void)
+{
+
+}
+
+void sub_8123CB8(struct Sprite *sprite)
+{
+    if (gUnknown_02039274->unk_0001 != 255)
+    {
+        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));
+        }
+        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));
+        }
+    }
+}