finish player.c

2 files changed, 42 insertions, 111 deletions

diff --git a/data/data_0811B9E0.s b/data/data_0811B9E0.s
deleted file mode 100644
index fed89541..00000000
--- a/data/data_0811B9E0.s
+++ /dev/null
@@ -1,69 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2
-
-gUnk_0811BC08:: @ 0811BC08
-	.4byte sub_08073468
-	.4byte sub_080734D4
-	.4byte sub_08073504
-	.4byte sub_08073584
-	.4byte sub_0807379C
-	.4byte sub_080737BC
-	.4byte sub_0807380C
-	.4byte sub_08073884
-
-gUnk_0811BC28:: @ 0811BC28
-	.incbin "data_0811B9E0/gUnk_0811BC28.bin"
-
-gUnk_0811BC30:: @ 0811BC30
-	.incbin "data_0811B9E0/gUnk_0811BC30.bin"
-
-gUnk_0811BC38:: @ 0811BC38
-	.incbin "data_0811B9E0/gUnk_0811BC38.bin"
-
-gUnk_0811BC40:: @ 0811BC40
-	.incbin "data_0811B9E0/gUnk_0811BC40.bin"
-
-gUnk_0811BC48:: @ 0811BC48
-	.4byte sub_08073924
-	.4byte sub_08073968
-	.4byte sub_080739EC
-	.4byte sub_08073A94
-	.4byte sub_08073B8C
-	.4byte sub_08073C30
-
-gUnk_0811BC60:: @ 0811BC60
-	.4byte sub_08073C80
-	.4byte sub_08073D20
-	.4byte sub_08073F04
-	.4byte sub_08073F4C
-	.4byte sub_08073FD0
-	.4byte sub_08074018
-	.4byte sub_08074060
-	.4byte sub_080740D8
-
-gUnk_0811BC80:: @ 0811BC80
-	.incbin "data_0811B9E0/gUnk_0811BC80.bin"
-
-gUnk_0811BC88:: @ 0811BC88
-	.4byte sub_08074C68
-	.4byte sub_08074CF8
-	.4byte sub_08074F00
-	.4byte sub_080750F4
-
-gUnk_0811BC98:: @ 0811BC98
-	.4byte sub_08074F1C
-	.4byte sub_08074F2C
-	.4byte sub_08074F44
-	.4byte sub_08074F8C
-	.4byte sub_08074FEC
-	.4byte sub_0807501C
-	.4byte sub_0807508C
-
-gUnk_0811BCB4:: @ 0811BCB4
-	.4byte sub_08075110
-	.4byte sub_0807513C
-	.4byte sub_0807518C
-	.4byte sub_080751B4
diff --git a/data/data_0811BE38.s b/data/data_0811BE38.s
index 2dc78e95..5a8aebd2 100644
--- a/data/data_0811BE38.s
+++ b/data/data_0811BE38.s
@@ -90,52 +90,52 @@ gUnk_0811C118:: @ 0811C118
 	.incbin "data_0811BE38/gUnk_0811C118.bin"
 
 gUnk_0811C120:: @ 0811C120
-	.4byte nullsub_112
-	.4byte sub_08074200
+	.4byte SurfaceAction_DoNothing
+	.4byte SurfaceAction_Pit
 	.4byte 00000000
 	.4byte 00000000
-	.4byte sub_0807422C
-	.4byte sub_08074238
-	.4byte sub_080742AC
-	.4byte sub_080742E4
-	.4byte sub_08074314
-	.4byte sub_08074338
-	.4byte sub_0807435C
-	.4byte sub_08074380
-	.4byte sub_08074638
-	.4byte sub_08074B4C
-	.4byte sub_08074B74
-	.4byte sub_08074BA0
-	.4byte sub_08074BCC
-	.4byte sub_08074678
-	.4byte nullsub_112
-	.4byte nullsub_112
-	.4byte sub_080743D4
-	.4byte sub_0807441C
-	.4byte sub_0807450C
-	.4byte sub_08074584
-	.4byte sub_080745B4
-	.4byte sub_0807479C
-	.4byte sub_080748C4
-	.4byte sub_080748DC
-	.4byte sub_08074918
+	.4byte SurfaceAction_SlopeGndGndVertical
+	.4byte SurfaceAction_SlopeGndGndHorizontal
+	.4byte SurfaceAction_6
+	.4byte SurfaceAction_7
+	.4byte SurfaceAction_MinishDoorFront
+	.4byte SurfaceAction_MinishDoorBack
+	.4byte SurfaceAction_A
+	.4byte SurfaceAction_B
+	.4byte SurfaceAction_SlopeGndWater
+	.4byte SurfaceAction_D
+	.4byte SurfaceAction_E
+	.4byte SurfaceAction_F
+	.4byte SurfaceAction_10
+	.4byte SurfaceAction_Swamp
+	.4byte SurfaceAction_DoNothing
+	.4byte SurfaceAction_DoNothing
+	.4byte SurfaceAction_14
+	.4byte SurfaceAction_CloneTile
+	.4byte SurfaceAction_16
+	.4byte SurfaceAction_Ice
+	.4byte SurfaceAction_ShallowWater
+	.4byte SurfaceAction_Water
+	.4byte SurfaceAction_Button
+	.4byte SurfaceAction_1B
+	.4byte SurfaceAction_1C
 	.4byte 00000000
-	.4byte sub_0807496C
+	.4byte SurfaceAction_Ladder
 	.4byte 00000000
-	.4byte sub_08074A48
-	.4byte sub_0807450C
-	.4byte nullsub_504
-	.4byte sub_080742AC
-	.4byte sub_080742AC
-	.4byte sub_08074A9C
-	.4byte sub_08074AF4
-	.4byte sub_08074B18
-	.4byte sub_0807422C
-	.4byte sub_08074238
-	.4byte sub_080749D4
-	.4byte sub_0807493C
-	.4byte sub_080749A8
-	.4byte sub_08074A9C
+	.4byte SurfaceAction_20
+	.4byte SurfaceAction_16
+	.4byte SurfaceAction_22
+	.4byte SurfaceAction_6
+	.4byte SurfaceAction_6
+	.4byte SurfaceAction_Dust
+	.4byte SurfaceAction_26
+	.4byte SurfaceAction_Hole
+	.4byte SurfaceAction_SlopeGndGndVertical
+	.4byte SurfaceAction_SlopeGndGndHorizontal
+	.4byte SurfaceAction_AutoLadder
+	.4byte SurfaceAction_ClimbWall
+	.4byte SurfaceAction_2C
+	.4byte SurfaceAction_Dust
 
 gUnk_0811C1D8:: @ 0811C1D8
 	.4byte gUnk_0811C240