merge master

14 files changed, 0 insertions, 293 deletions

diff --git a/data/const/enemy/ballChainSoldier.s b/data/const/enemy/ballChainSoldier.s
index 69e8693f..e5f1597a 100644
--- a/data/const/enemy/ballChainSoldier.s
+++ b/data/const/enemy/ballChainSoldier.s
@@ -4,36 +4,6 @@
 	.section .rodata
     .align 2
 
-gUnk_080D06E0:: @ 080D06E0
-	.4byte sub_0803E538
-	.4byte sub_0803E550
-	.4byte sub_0803E560
-	.4byte sub_0803E570
-	.4byte sub_08001242
-	.4byte nullsub_20
-
-gUnk_080D06F8:: @ 080D06F8
-	.4byte sub_0803E580
-	.4byte sub_0803E5E8
-	.4byte sub_0803E61C
-	.4byte sub_0803E66C
-	.4byte sub_0803E6B4
-	.4byte sub_0803E6E0
-	.4byte sub_0803E71C
-	.4byte sub_0803E75C
-	.4byte sub_0803E7B4
-	.4byte sub_0803E7CC
-	.4byte sub_0803E818
-
-gUnk_080D0724:: @ 080D0724
-	.incbin "ballChainSoldier/gUnk_080D0724.bin"
-
-gUnk_080D0728:: @ 080D0728
-	.incbin "ballChainSoldier/gUnk_080D0728.bin"
-
-gUnk_080D0730:: @ 080D0730
-	.incbin "ballChainSoldier/gUnk_080D0730.bin"
-
 gSpriteAnimations_BallChainSoldier_3:: @ 080D0738
 	.include "animations/gSpriteAnimations_BallChainSoldier_3.s"
 
diff --git a/data/const/enemy/bombarossa.s b/data/const/enemy/bombarossa.s
deleted file mode 100644
index d721bc55..00000000
--- a/data/const/enemy/bombarossa.s
+++ /dev/null
@@ -1,5 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
diff --git a/data/const/enemy/cuccoAggr.s b/data/const/enemy/cuccoAggr.s
deleted file mode 100644
index 8e0d0c64..00000000
--- a/data/const/enemy/cuccoAggr.s
+++ /dev/null
@@ -1,53 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_080CF778:: @ 080CF778
-	.4byte sub_08038CF8
-	.4byte sub_08038D10
-	.4byte sub_08001324
-	.4byte sub_0804A7D4
-	.4byte sub_08001242
-	.4byte nullsub_165
-
-gUnk_080CF790:: @ 080CF790
-	.4byte sub_08038D78
-	.4byte sub_08038DA0
-	.4byte sub_08038DC0
-	.4byte sub_08038EE0
-	.4byte sub_08038F20
-	.4byte sub_08038F44
-	.4byte sub_08038FA0
-
-gUnk_080CF7AC:: @ 080CF7AC
-	.4byte sub_08038DD8
-	.4byte sub_08038E18
-	.4byte sub_08038EAC
-	.4byte sub_08038ED0
-
-gUnk_080CF7BC:: @ 080CF7BC
-	.incbin "cuccoAggr/gUnk_080CF7BC.bin"
-
-gUnk_080CF7BE:: @ 080CF7BE
-	.incbin "cuccoAggr/gUnk_080CF7BE.bin"
-
-gUnk_080CF7C2:: @ 080CF7C2
-	.incbin "cuccoAggr/gUnk_080CF7C2.bin"
-
-gUnk_080CF7C4:: @ 080CF7C4
-	.incbin "cuccoAggr/gUnk_080CF7C4.bin"
-
-gUnk_080CF824:: @ 080CF824
-	.incbin "cuccoAggr/gUnk_080CF824.bin"
-
-gUnk_080CF828:: @ 080CF828
-	.incbin "cuccoAggr/gUnk_080CF828.bin"
-
-gUnk_080CF82C:: @ 080CF82C
-	.incbin "cuccoAggr/gUnk_080CF82C.bin"
-
-gUnk_080CF82E:: @ 080CF82E
-	.incbin "cuccoAggr/gUnk_080CF82E.bin"
-
diff --git a/data/const/enemy/enemy49.s b/data/const/enemy/enemy49.s
deleted file mode 100644
index 3e229956..00000000
--- a/data/const/enemy/enemy49.s
+++ /dev/null
@@ -1,17 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_080D0448:: @ 080D0448
-	.4byte sub_0803CE98
-	.4byte sub_0803CF24
-	.4byte sub_0803CF38
-	.4byte sub_0803CF94
-
-gUnk_080D0458:: @ 080D0458
-	.incbin "enemy49/gUnk_080D0458.bin"
-
-gUnk_080D0468:: @ 080D0468
-	.incbin "enemy49/gUnk_080D0468.bin"
diff --git a/data/const/enemy/enemy66.s b/data/const/enemy/enemy66.s
deleted file mode 100644
index 98a7f045..00000000
--- a/data/const/enemy/enemy66.s
+++ /dev/null
@@ -1,10 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_080D2ABC:: @ 080D2ABC
-	.incbin "enemy66/gUnk_080D2ABC.bin"
-	.4byte sub_08029270
-	.incbin "enemy66/gUnk_080D2ABC_1.bin"
diff --git a/data/const/enemy/gibdo.s b/data/const/enemy/gibdo.s
deleted file mode 100644
index 841e5f3f..00000000
--- a/data/const/enemy/gibdo.s
+++ /dev/null
@@ -1,25 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gGibdo:: @ 080CF294
-	.4byte Gibdo_OnTick+1
-	.4byte sub_080374A4
-	.4byte sub_08001324
-	.4byte sub_0804A7D4
-	.4byte sub_08001242
-	.4byte nullsub_162
-
-gUnk_080CF2AC:: @ 080CF2AC
-	.4byte sub_08037558
-	.4byte sub_08037580
-	.4byte sub_080375A4
-	.4byte sub_080375F8
-	.4byte sub_08037624
-	.4byte sub_08037690
-	.4byte sub_080376D0
-	.4byte sub_0803773C
-	.4byte sub_0803775C
-
diff --git a/data/const/enemy/spinyBeetle.s b/data/const/enemy/spinyBeetle.s
deleted file mode 100644
index a8d3efeb..00000000
--- a/data/const/enemy/spinyBeetle.s
+++ /dev/null
@@ -1,27 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-unusedLabel_0CEBDC::
-	.incbin "spinyBeetle/unusedLabel_0CEBDC.bin"
-
-gUnk_080CEBEC:: @ 080CEBEC 
-	.4byte sub_080337BC
-	.4byte sub_080337D4
-	.4byte sub_08001324
-	.4byte sub_0804A7D4
-	.4byte sub_08033870
-	.4byte nullsub_159
-
-gUnk_080CEC04:: @ 080CEC04
-	.4byte sub_08033890
-	.4byte sub_08033958
-	.4byte sub_08033A7C
-	.4byte sub_08033ACC
-	.4byte sub_08033B44
-	.4byte sub_08033C94
-
-gUnk_080CEC1C:: @ 080CEC1C
-	.incbin "spinyBeetle/gUnk_080CEC1C.bin"
diff --git a/data/const/manager/manager1.s b/data/const/manager/manager1.s
deleted file mode 100644
index d713920a..00000000
--- a/data/const/manager/manager1.s
+++ /dev/null
@@ -1,27 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08107C1C:: @ 08107C1C
-	.incbin "manager1/gUnk_08107C1C.bin"
-
-gUnk_08107C30:: @ 08107C30
-	.incbin "manager1/gUnk_08107C30.bin"
-
-gUnk_08107C40:: @ 08107C40
-	.incbin "manager1/gUnk_08107C40.bin"
-
-gUnk_08107C48:: @ 08107C48
-	.4byte nullsub_494
-	.4byte nullsub_494
-	.4byte sub_080573AC
-	.4byte nullsub_494
-	.4byte sub_08057450
-
-gUnk_08107C5C:: @ 08107C5C
-	.4byte sub_08057118
-	.4byte sub_08057174
-	.4byte sub_0805728C
-	.4byte sub_080572D4
diff --git a/data/const/object/bigPushableLever.s b/data/const/object/bigPushableLever.s
deleted file mode 100644
index 51139f8a..00000000
--- a/data/const/object/bigPushableLever.s
+++ /dev/null
@@ -1,19 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081236DC:: @ 081236DC
-	.4byte sub_08098EF8
-	.4byte sub_08098F14
-	.4byte sub_08098F90
-
-gUnk_081236E8:: @ 081236E8
-	.incbin "bigPushableLever/gUnk_081236E8.bin"
-
-gUnk_081236EC:: @ 081236EC
-	.incbin "bigPushableLever/gUnk_081236EC.bin"
-
-gUnk_081236F4:: @ 081236F4
-	.incbin "bigPushableLever/gUnk_081236F4.bin"
diff --git a/data/const/object/hittableLever.s b/data/const/object/hittableLever.s
deleted file mode 100644
index 2eb08f28..00000000
--- a/data/const/object/hittableLever.s
+++ /dev/null
@@ -1,12 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08121178:: @ 08121178
-	.4byte sub_0808A71C
-	.4byte sub_0808A778
-
-gUnk_08121180:: @ 08121180
-	.incbin "hittableLever/gUnk_08121180.bin"
diff --git a/data/const/object/object2A.s b/data/const/object/object2A.s
deleted file mode 100644
index d94ddbf4..00000000
--- a/data/const/object/object2A.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08120DD0:: @ 08120DD0
-	.4byte sub_08089B18
-	.4byte sub_08089BA0
diff --git a/data/const/object/pressurePlate.s b/data/const/object/pressurePlate.s
deleted file mode 100644
index 15f9e807..00000000
--- a/data/const/object/pressurePlate.s
+++ /dev/null
@@ -1,13 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08120BE0:: @ 08120BE0
-	.4byte sub_08088840
-	.4byte sub_0808886C
-	.4byte sub_080888F4
-
-gUnk_08120BEC:: @ 08120BEC
-	.incbin "PressurePlate/gUnk_08120BEC.bin"
diff --git a/data/const/object/pullableLever.s b/data/const/object/pullableLever.s
deleted file mode 100644
index da94c059..00000000
--- a/data/const/object/pullableLever.s
+++ /dev/null
@@ -1,27 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08122294:: @ 08122294
-	.4byte sub_08091264
-	.4byte sub_08091338
-	.4byte sub_08091360
-
-gUnk_081222A0:: @ 081222A0
-	.4byte sub_08091444
-	.4byte sub_08091470
-
-gUnk_081222A8:: @ 081222A8
-	.incbin "pullableLever/gUnk_081222A8.bin"
-
-gUnk_081222B0:: @ 081222B0
-	.4byte sub_08091380
-	.4byte sub_08091438
-
-gUnk_081222B8:: @ 081222B8
-	.incbin "pullableLever/gUnk_081222B8.bin"
-
-gUnk_081222C0:: @ 081222C0
-	.incbin "pullableLever/gUnk_081222C0.bin"
diff --git a/data/const/object/pushableLever.s b/data/const/object/pushableLever.s
deleted file mode 100644
index 1b8fca63..00000000
--- a/data/const/object/pushableLever.s
+++ /dev/null
@@ -1,19 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08123494:: @ 08123494
-	.4byte sub_08098278
-	.4byte sub_08098294
-	.4byte sub_08098304
-
-gUnk_081234A0:: @ 081234A0
-	.incbin "pushableLever/gUnk_081234A0.bin"
-
-gUnk_081234A4:: @ 081234A4
-	.incbin "pushableLever/gUnk_081234A4.bin"
-
-gUnk_081234AC:: @ 081234AC
-	.incbin "pushableLever/gUnk_081234AC.bin"