Merge pull request #337 from octorock/push-and-pull

8 files changed, 0 insertions, 182 deletions

diff --git a/data/const/object/bigIceBlock.s b/data/const/object/bigIceBlock.s
deleted file mode 100644
index 9f4ddda5..00000000
--- a/data/const/object/bigIceBlock.s
+++ /dev/null
@@ -1,14 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081237A0:: @ 081237A0
-	.4byte sub_0809975C
-	.4byte sub_080997CC
-	.4byte sub_080997F4
-	.4byte sub_08099880
-
-gUnk_081237B0:: @ 081237B0
-	.incbin "bigIceBlock/gUnk_081237B0.bin"
diff --git a/data/const/object/blockPushed.s b/data/const/object/blockPushed.s
deleted file mode 100644
index e0f47781..00000000
--- a/data/const/object/blockPushed.s
+++ /dev/null
@@ -1,27 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0811F624:: @ 0811F624
-	.4byte sub_08082EB4
-	.4byte sub_08083094
-
-gUnk_0811F62C:: @ 0811F62C
-	.incbin "blockPushed/gUnk_0811F62C.bin"
-
-gUnk_0811F634:: @ 0811F634
-	.incbin "blockPushed/gUnk_0811F634.bin"
-
-gUnk_0811F63C:: @ 0811F63C
-	.incbin "blockPushed/gUnk_0811F63C.bin"
-
-gUnk_0811F644:: @ 0811F644
-	.incbin "blockPushed/gUnk_0811F644.bin"
-
-gUnk_0811F64C:: @ 0811F64C
-	.4byte gUnk_0811F62C
-	.4byte gUnk_0811F634
-	.4byte gUnk_0811F63C
-	.4byte gUnk_0811F644
diff --git a/data/const/object/pullableMushroom.s b/data/const/object/pullableMushroom.s
deleted file mode 100644
index f5544b83..00000000
--- a/data/const/object/pullableMushroom.s
+++ /dev/null
@@ -1,47 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081211A4:: @ 081211A4
-	.4byte sub_0808AA1C
-	.4byte sub_0808AB68
-	.4byte sub_0808AE84
-	.4byte sub_0808AFF0
-
-gUnk_081211B4:: @ 081211B4
-	.4byte sub_0808AB80
-	.4byte sub_0808AB98
-	.4byte sub_0808ABC4
-
-gUnk_081211C0:: @ 081211C0
-	.4byte sub_0808ACEC
-	.4byte sub_0808ADA0
-	.4byte sub_0808ADF0
-
-gUnk_081211CC:: @ 081211CC
-	.incbin "pullableMushroom/gUnk_081211CC.bin"
-
-gUnk_081211DC:: @ 081211DC
-	.4byte sub_0808AEB0
-	.4byte sub_0808AFD4
-
-gUnk_081211E4:: @ 081211E4
-	.incbin "pullableMushroom/gUnk_081211E4.bin"
-
-gUnk_081211EC:: @ 081211EC
-	.4byte sub_0808B05C
-	.4byte sub_0808B0BC
-
-gUnk_081211F4:: @ 081211F4
-	.incbin "pullableMushroom/gUnk_081211F4.bin"
-
-gUnk_081211F5:: @ 081211F5
-	.incbin "pullableMushroom/gUnk_081211F5.bin"
-
-gUnk_081211FC:: @ 081211FC
-	.incbin "pullableMushroom/gUnk_081211FC.bin"
-
-gUnk_081211FD:: @ 081211FD
-	.incbin "pullableMushroom/gUnk_081211FD.bin"
diff --git a/data/const/object/pushableFurniture.s b/data/const/object/pushableFurniture.s
deleted file mode 100644
index 3a4c4a30..00000000
--- a/data/const/object/pushableFurniture.s
+++ /dev/null
@@ -1,16 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08121ED8:: @ 08121ED8
-	.4byte sub_0808F990
-	.4byte sub_0808FACC
-	.4byte sub_0808FC3C
-
-gUnk_08121EE4:: @ 08121EE4
-	.incbin "pushableFurniture/gUnk_08121EE4.bin"
-
-gUnk_08121EF0:: @ 08121EF0
-	.incbin "pushableFurniture/gUnk_08121EF0.bin"
diff --git a/data/const/object/pushableGrave.s b/data/const/object/pushableGrave.s
deleted file mode 100644
index a4a31527..00000000
--- a/data/const/object/pushableGrave.s
+++ /dev/null
@@ -1,18 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081232AC:: @ 081232AC
-	.4byte sub_080975A0
-	.4byte sub_08097730
-	.4byte sub_08097748
-	.4byte sub_080977A0
-	.4byte nullsub_528
-
-gUnk_081232C0:: @ 081232C0
-	.incbin "pushableGrave/gUnk_081232C0.bin"
-
-gUnk_081232DE:: @ 081232DE
-	.incbin "pushableGrave/gUnk_081232DE.bin"
diff --git a/data/const/object/pushableRock.s b/data/const/object/pushableRock.s
deleted file mode 100644
index a795b34e..00000000
--- a/data/const/object/pushableRock.s
+++ /dev/null
@@ -1,14 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08121078:: @ 08121078
-	.4byte sub_0808A50C
-	.4byte sub_0808A550
-	.4byte sub_0808A5E0
-	.4byte sub_0808A61C
-
-gUnk_08121088:: @ 08121088
-	.incbin "pushableRock/gUnk_08121088.bin"
diff --git a/data/const/object/pushableStatue.s b/data/const/object/pushableStatue.s
deleted file mode 100644
index 900dc875..00000000
--- a/data/const/object/pushableStatue.s
+++ /dev/null
@@ -1,28 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08120C98:: @ 08120C98
-	.4byte sub_080891F4
-	.4byte sub_0808923C
-	.4byte sub_080892C4
-	.4byte sub_080893EC
-	.4byte sub_08089400
-
-gUnk_08120CAC:: @ 08120CAC
-	.4byte sub_08089300
-	.4byte sub_080893E0
-
-gUnk_08120CB4:: @ 08120CB4
-	.incbin "pushableStatue/gUnk_08120CB4.bin"
-
-gUnk_08120CBC:: @ 08120CBC
-	.incbin "pushableStatue/gUnk_08120CBC.bin"
-
-gUnk_08120CCC:: @ 08120CCC
-	.incbin "pushableStatue/gUnk_08120CCC.bin"
-
-gUnk_08120D6C:: @ 08120D6C
-	.incbin "pushableStatue/gUnk_08120D6C.bin"
diff --git a/data/const/object/smallIceBlock.s b/data/const/object/smallIceBlock.s
deleted file mode 100644
index 9107a43f..00000000
--- a/data/const/object/smallIceBlock.s
+++ /dev/null
@@ -1,18 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08123734:: @ 08123734
-	.4byte sub_080991CC
-	.4byte sub_08099248
-	.4byte sub_08099310
-	.4byte sub_08099330
-	.4byte sub_080993CC
-
-gUnk_08123748:: @ 08123748
-	.incbin "smallIceBlock/gUnk_08123748.bin"
-
-gUnk_08123750:: @ 08123750
-	.incbin "smallIceBlock/gUnk_08123750.bin"