sub_81248AC

3 files changed, 25 insertions, 64 deletions

diff --git a/asm/cable_car.s b/asm/cable_car.s
deleted file mode 100644
index 59b613556..000000000
--- a/asm/cable_car.s
+++ /dev/null
@@ -1,63 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_81248AC
-sub_81248AC: @ 81248AC
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	beq _081248BA
-	cmp r0, 0x1
-	beq _081248E4
-_081248BA:
-	ldr r1, _081248E0 @ =gUnknown_02039274
-	ldr r2, [r1]
-	movs r3, 0
-	movs r0, 0x2
-	strb r0, [r2, 0x1B]
-	ldr r0, [r1]
-	strb r3, [r0, 0x19]
-	ldr r2, [r1]
-	movs r0, 0x14
-	strb r0, [r2, 0x1A]
-	ldr r1, [r1]
-	movs r0, 0xC
-	strb r0, [r1, 0x18]
-	bl sub_812446C
-	bl sub_81245F4
-	b _08124906
-	.align 2, 0
-_081248E0: .4byte gUnknown_02039274
-_081248E4:
-	ldr r1, _08124914 @ =gUnknown_02039274
-	ldr r2, [r1]
-	movs r0, 0x2
-	strb r0, [r2, 0x1B]
-	ldr r2, [r1]
-	movs r0, 0x1C
-	strb r0, [r2, 0x19]
-	ldr r2, [r1]
-	movs r0, 0x14
-	strb r0, [r2, 0x1A]
-	ldr r1, [r1]
-	movs r0, 0x4
-	strb r0, [r1, 0x18]
-	bl sub_812446C
-	bl sub_812476C
-_08124906:
-	ldr r0, _08124914 @ =gUnknown_02039274
-	ldr r1, [r0]
-	movs r0, 0
-	strb r0, [r1, 0x1C]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08124914: .4byte gUnknown_02039274
-	thumb_func_end sub_81248AC
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/ld_script.txt b/ld_script.txt
index 0571d8823..07345eb18 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -348,7 +348,6 @@ SECTIONS {
         src/battle/battle_message.o(.text);
         src/field/choose_party.o(.text);
         src/scene/cable_car.o(.text);
-        asm/cable_car.o(.text);
         asm/roulette_util.o(.text);
         asm/cable_car_util.o(.text);
         src/unused_8124F94.o(.text);
diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c
index edfc566e8..f12d80dba 100644
--- a/src/scene/cable_car.c
+++ b/src/scene/cable_car.c
@@ -958,3 +958,28 @@ void sub_812476C(void)
         sub_812446C();
     }
 }
+
+void sub_81248AC(u8 a0)
+{
+    switch (a0)
+    {
+        case 0:
+        default:
+            gUnknown_02039274->unk_001b = 2;
+            gUnknown_02039274->unk_0019 = 0;
+            gUnknown_02039274->unk_001a = 20;
+            gUnknown_02039274->unk_0018 = 12;
+            sub_812446C();
+            sub_81245F4();
+            break;
+        case 1:
+            gUnknown_02039274->unk_001b = 2;
+            gUnknown_02039274->unk_0019 = 28;
+            gUnknown_02039274->unk_001a = 20;
+            gUnknown_02039274->unk_0018 = 4;
+            sub_812446C();
+            sub_812476C();
+            break;
+    }
+    gUnknown_02039274->unk_001c = 0;
+}