4 files changed, 3 insertions, 105 deletions
diff --git a/data/cable_car.s b/data/cable_car.s
deleted file mode 100644
index 775e53b6a..000000000
--- a/data/cable_car.s
+++ /dev/null
@@ -1,102 +0,0 @@
-#include "constants/map_objects.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gCableCarMtChimneyTilemap:: @ 8401820
-	.incbin "graphics/misc/cable_car_mt_chimney_map.bin.lz"
-
-	.align 2
-gCableCarTreeTilemap:: @ 8401978
-	.incbin "graphics/misc/cable_car_tree_map.bin.lz"
-
-	.align 2
-gCableCarMountainTilemap:: @ 8401AFC
-	.incbin "graphics/misc/cable_car_mountain_map.bin.lz"
-
-	.align 2
-gCableCarPylonHookTilemapEntries:: @ 8401CC0
-	.2byte 0x3000
-	.2byte 0x3001
-	.2byte 0x3002
-	.2byte 0x3003
-	.2byte 0x3004
-	.2byte 0x3005
-	.2byte 0x3006
-	.2byte 0x3007
-	.2byte 0x3008
-	.2byte 0x3009
-
-	.align 2
-gCableCarPylonStemTilemap:: @ 8401CD4
-	.incbin "graphics/misc/cable_car_pylon_stem_map.bin.lz"
-
-	.align 2
-gUnknown_08401CF8:: @ 8401CF8
-	obj_tiles gCableCar_Gfx, 0x800, 1
-	obj_tiles gCableCarDoor_Gfx, 0x40, 2
-	obj_tiles gCableCarCord_Gfx, 0x80, 3
-	.space 8
-
-	.align 2
-gUnknown_08401D18:: @ 8401D18
-	obj_pal gCableCar_Pal, 1
-	.space 8
-
-	.align 2
-gOamData_8401D28:: @ 8401D28
-	.2byte 0x0300
-	.2byte 0xC000
-	.2byte 0x0800
-
-	.align 2
-gOamData_8401D30:: @ 8401D30
-	.2byte 0x4300
-	.2byte 0x0000
-	.2byte 0x0800
-
-	.align 2
-gOamData_8401D38:: @ 8401D38
-	.2byte 0x0300
-	.2byte 0x4000
-	.2byte 0x0800
-
-	.align 2
-gSpriteTemplate_8401D40:: @ 8401D40
-	spr_template 1, 1, gOamData_8401D28, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8123CB8
-
-	.align 2
-gSpriteTemplate_8401D58:: @ 8401D58
-	spr_template 2, 1, gOamData_8401D30, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8123CB8
-
-	.align 2
-gSpriteTemplate_8401D70:: @ 8401D70
-	spr_template 3, 1, gOamData_8401D38, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, nullsub_76
-
-gCableCarPlayerGraphicsIDs:: @ 8401D88
-	.byte MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
-	.byte MAP_OBJ_GFX_RIVAL_MAY_NORMAL
-
-gMtChimneyHikerGraphicsIDs:: @ 8401D8A
-	.byte MAP_OBJ_GFX_HIKER
-	.byte MAP_OBJ_GFX_CAMPER
-	.byte MAP_OBJ_GFX_PICNICKER
-	.byte MAP_OBJ_GFX_POOCHYENA @ not used
-
-	.align 1
-gMtChimneyHikerCoords:: @ 8401D8E
-	.2byte   0,  80
-	.2byte 240, 146
-
-gMtChimneyHikerMovementDelayTable:: @ 8401D96
-	.byte   0
-	.byte  60
-	.byte 120
-	.byte 170
-
-	.align 2
-gUnknown_08401D9C:: @ 8401D9C
-	.4byte sub_8123EB8
-	.4byte sub_8123F44
diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc
index aefc68bda..6b0858bc5 100644
--- a/data/scripts/maps/MtChimney_CableCarStation.inc
+++ b/data/scripts/maps/MtChimney_CableCarStation.inc
@@ -48,7 +48,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C
 	setvar VAR_CABLE_CAR_STATION_STATE, 2
 	incrementgamestat GAME_STAT_RODE_CABLE_CAR
 	special CableCarWarp
-	special sub_8123218
+	special CableCar
 	waitstate
 	release
 	end
diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc
index adbea780e..0264342ea 100644
--- a/data/scripts/maps/Route112_CableCarStation.inc
+++ b/data/scripts/maps/Route112_CableCarStation.inc
@@ -49,7 +49,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD
 	setvar VAR_CABLE_CAR_STATION_STATE, 1
 	incrementgamestat GAME_STAT_RODE_CABLE_CAR
 	special CableCarWarp
-	special sub_8123218
+	special CableCar
 	waitstate
 	release
 	end
diff --git a/data/specials.inc b/data/specials.inc
index 032a3884c..6904a2b6b 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -159,7 +159,7 @@ gSpecials::
 	def_special GetRivalSonDaughterString
 	def_special SetFlagInVar
 	def_special CableCarWarp
-	def_special sub_8123218
+	def_special CableCar
 	def_special Overworld_PlaySpecialMapMusic
 	def_special StartWallClock
 	def_special ScrSpecial_ViewWallClock