Decompile cable_car.c (#438)

4 files changed, 3 insertions, 109 deletions

diff --git a/data/cable_car.s b/data/cable_car.s
deleted file mode 100644
index c141e593c..000000000
--- a/data/cable_car.s
+++ /dev/null
@@ -1,106 +0,0 @@
-#include "constants/event_objects.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-    .align 2
-gUnknown_085CD66C:: @ 85CD66C
-    .4byte 0x000011c0, 0x000021d1, 0x000031e2, 0x000001f3
-
-    .align 2
-gCableCarMtChimneyTilemap:: @ 85CD67C
-	.incbin "graphics/misc/cable_car_mt_chimney_map.bin.lz"
-
-    .align 2
-gCableCarTreeTilemap:: @ 85CD7D4
-	.incbin "graphics/misc/cable_car_tree_map.bin.lz"
-
-    .align 2
-gCableCarMountainTilemap:: @ 85CD958
-	.incbin "graphics/misc/cable_car_mountain_map.bin.lz"
-
-    .align 2
-gCableCarPylonHookTilemapEntries:: @ 85CDB1C
-	.2byte 0x3000
-	.2byte 0x3001
-	.2byte 0x3002
-	.2byte 0x3003
-	.2byte 0x3004
-	.2byte 0x3005
-	.2byte 0x3006
-	.2byte 0x3007
-	.2byte 0x3008
-	.2byte 0x3009
-
-    .align 2
-gCableCarPylonStemTilemap:: @ 85CDB30
-	.incbin "graphics/misc/cable_car_pylon_stem_map.bin.lz"
-
-	.align 2
-gUnknown_085CDB54:: @ 85CDB54
-	obj_tiles gCableCar_Gfx, 0x800, 1
-	obj_tiles gCableCarDoor_Gfx, 0x40, 2
-	obj_tiles gCableCarCord_Gfx, 0x80, 3
-    null_obj_tiles
-
-	.align 2
-gUnknown_085CDB74:: @ 85CDB74
-	obj_pal gCableCar_Pal, 1
-	null_obj_pal
-
-	.align 2
-gOamData_85CDB84:: @ 85CDB84
-	.2byte 0x0300
-	.2byte 0xC000
-	.2byte 0x0800
-
-	.align 2
-gOamData_85CDB8C:: @ 85CDB8C
-	.2byte 0x4300
-	.2byte 0x0000
-	.2byte 0x0800
-
-	.align 2
-gOamData_85CDB94:: @ 85CDB94
-	.2byte 0x0300
-	.2byte 0x4000
-	.2byte 0x0800
-
-	.align 2
-gSpriteTemplate_85CDB9C:: @ 85CDB9C
-	spr_template 1, 1, gOamData_85CDB84, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8150868
-
-	.align 2
-gSpriteTemplate_85CDBB4:: @ 85CDBB4
-	spr_template 2, 1, gOamData_85CDB8C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8150868
-
-	.align 2
-gSpriteTemplate_85CDBCC:: @ 85CDBCC
-	spr_template 3, 1, gOamData_85CDB94, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, nullsub_58
-
-gCableCarPlayerGraphicsIDs:: @ 85CDBE4
-	.byte EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
-	.byte EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
-
-gMtChimneyHikerGraphicsIDs:: @ 85CDBE6
-	.byte EVENT_OBJ_GFX_HIKER
-	.byte EVENT_OBJ_GFX_CAMPER
-	.byte EVENT_OBJ_GFX_PICNICKER
-	.byte EVENT_OBJ_GFX_ZIGZAGOON_1 @ not used
-
-	.align 1
-gMtChimneyHikerCoords:: @ 85CDBEA
-	.2byte   0,  80
-	.2byte 240, 146
-
-gMtChimneyHikerMovementDelayTable:: @ 85CDBF2
-	.byte   0
-	.byte  60
-	.byte 120
-	.byte 170
-
-	.align 2
-gUnknown_085CDBF8:: @ 85CDBF8
-	.4byte sub_8150A68
-	.4byte sub_8150AF4
diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc
index 2544e6729..89fc9fd38 100644
--- a/data/maps/MtChimney_CableCarStation/scripts.inc
+++ b/data/maps/MtChimney_CableCarStation/scripts.inc
@@ -48,7 +48,7 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C
 	setvar VAR_0x40A3, 2
 	incrementgamestat 48
 	special CableCarWarp
-	special sub_814FC9C
+	special CableCar
 	waitstate
 	release
 	end
diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc
index 905e9e9ea..a7d3e8c7a 100644
--- a/data/maps/Route112_CableCarStation/scripts.inc
+++ b/data/maps/Route112_CableCarStation/scripts.inc
@@ -49,7 +49,7 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38
 	setvar VAR_0x40A3, 1
 	incrementgamestat 48
 	special CableCarWarp
-	special sub_814FC9C
+	special CableCar
 	waitstate
 	release
 	end
diff --git a/data/specials.inc b/data/specials.inc
index 080f2c042..8ee70c306 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -163,7 +163,7 @@ gSpecials:: @ 81DBA64
 	def_special GetRivalSonDaughterString
 	def_special SetFlagInVar
 	def_special CableCarWarp
-	def_special sub_814FC9C
+	def_special CableCar
 	def_special Overworld_PlaySpecialMapMusic
 	def_special StartWallClock
 	def_special Special_ViewWallClock