Merge pull request #439 from octorock/objects

19 files changed, 0 insertions, 292 deletions

diff --git a/data/const/object/object11.s b/data/const/object/object11.s
deleted file mode 100644
index e641e2c8..00000000
--- a/data/const/object/object11.s
+++ /dev/null
@@ -1,24 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812057C:: @ 0812057C
-	.4byte sub_08084D58
-	.4byte sub_08084E5C
-	.4byte sub_08084EB4
-
-gUnk_08120588:: @ 08120588
-	.incbin "object11/gUnk_08120588.bin"
-
-gUnk_0812059C:: @ 0812059C
-	.4byte sub_08084ECC
-	.4byte sub_08084ED8
-	.4byte sub_08084EFC
-	.4byte sub_08084F84
-	.4byte sub_08084F88
-	.4byte sub_08084F8C
-
-gUnk_081205B4:: @ 081205B4
-	.incbin "object11/gUnk_081205B4.bin"
diff --git a/data/const/object/object12.s b/data/const/object/object12.s
deleted file mode 100644
index fe6d961a..00000000
--- a/data/const/object/object12.s
+++ /dev/null
@@ -1,12 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081205BC:: @ 081205BC
-	.4byte sub_08084FD8
-	.4byte nullsub_115
-	.4byte sub_08085028
-	.4byte sub_080850B0
-	.4byte sub_080850CC
diff --git a/data/const/object/object1E.s b/data/const/object/object1E.s
deleted file mode 100644
index f3858134..00000000
--- a/data/const/object/object1E.s
+++ /dev/null
@@ -1,12 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081208B8:: @ 081208B8
-	.4byte sub_08087528
-	.4byte sub_080875F4
-
-gUnk_081208C0:: @ 081208C0
-	.incbin "object1E/gUnk_081208C0.bin"
diff --git a/data/const/object/object20.s b/data/const/object/object20.s
deleted file mode 100644
index 7946cb3b..00000000
--- a/data/const/object/object20.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08120A28:: @ 08120A28
-	.4byte sub_08087824
-	.4byte sub_08087888
diff --git a/data/const/object/object21.s b/data/const/object/object21.s
deleted file mode 100644
index 1cad260f..00000000
--- a/data/const/object/object21.s
+++ /dev/null
@@ -1,25 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08120A68:: @ 08120A68
-	.4byte sub_08087A10
-	.4byte sub_08087AFC
-	.4byte 00000000
-	.4byte sub_08087B58
-
-gUnk_08120A78:: @ 08120A78
-	.incbin "object21/gUnk_08120A78.bin"
-
-gUnk_08120A7A:: @ 08120A7A
-	.incbin "object21/gUnk_08120A7A.bin"
-
-gUnk_08120A80:: @ 08120A80
-	.4byte sub_08087B88
-	.4byte sub_08087B9C
-	.4byte sub_08087B9C
-
-gUnk_08120A8C:: @ 08120A8C
-	.incbin "object21/gUnk_08120A8C.bin"
diff --git a/data/const/object/object30.s b/data/const/object/object30.s
deleted file mode 100644
index ef30fe28..00000000
--- a/data/const/object/object30.s
+++ /dev/null
@@ -1,13 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08121188:: @ 08121188
-	.4byte sub_0808A870
-	.4byte sub_0808A8C8
-	.4byte sub_0808A8E0
-
-gUnk_08121194:: @ 08121194
-	.incbin "object30/gUnk_08121194.bin"
diff --git a/data/const/object/object3A.s b/data/const/object/object3A.s
deleted file mode 100644
index f8a65564..00000000
--- a/data/const/object/object3A.s
+++ /dev/null
@@ -1,19 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081215E8:: @ 081215E8
-	.incbin "object3A/gUnk_081215E8.bin"
-
-gUnk_08121638:: @ 08121638
-	.4byte sub_0808C6D4
-	.4byte sub_0808C74C
-
-gUnk_08121640:: @ 08121640
-	.4byte sub_0808C858
-	.4byte sub_0808C8B8
-
-gUnk_08121648:: @ 08121648
-	.incbin "object3A/gUnk_08121648.bin"
diff --git a/data/const/object/object3D.s b/data/const/object/object3D.s
deleted file mode 100644
index b1a6d6e2..00000000
--- a/data/const/object/object3D.s
+++ /dev/null
@@ -1,18 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081216BC:: @ 081216BC
-	.4byte sub_0808CF08
-	.4byte sub_0808CF5C
-	.4byte sub_0808D064
-
-gUnk_081216C8:: @ 081216C8
-.ifdef EU
-    @ TODO only small differences
-	.incbin "object3D/gUnk_081216C8_EU.bin"
-.else
-	.incbin "object3D/gUnk_081216C8_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
diff --git a/data/const/object/object42.s b/data/const/object/object42.s
deleted file mode 100644
index 8f1d215e..00000000
--- a/data/const/object/object42.s
+++ /dev/null
@@ -1,16 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081217A8:: @ 081217A8
-	.4byte sub_0808DDB4
-	.4byte sub_0808DDE0
-
-gUnk_081217B0:: @ 081217B0
-	.4byte sub_0808DDB4
-	.4byte sub_0808DDE8
-
-gUnk_081217B8:: @ 081217B8
-	.incbin "object42/gUnk_081217B8.bin"
diff --git a/data/const/object/object4B.s b/data/const/object/object4B.s
deleted file mode 100644
index a0055399..00000000
--- a/data/const/object/object4B.s
+++ /dev/null
@@ -1,15 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08121EB8:: @ 08121EB8
-	.4byte sub_0808F794
-	.4byte sub_0808F7A8
-	.4byte sub_0808F7D4
-	.4byte sub_0808F80C
-	.4byte sub_0808F858
-	.4byte sub_0808F8F0
-	.4byte sub_0808F914
-	.4byte sub_0808F940
diff --git a/data/const/object/object5B.s b/data/const/object/object5B.s
deleted file mode 100644
index 86b19c4a..00000000
--- a/data/const/object/object5B.s
+++ /dev/null
@@ -1,13 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08122794:: @ 08122794
-	.4byte sub_080928C8
-	.4byte nullsub_119
-
-gUnk_0812279C:: @ 0812279C
-	.4byte sub_08092930
-	.4byte sub_08092940
diff --git a/data/const/object/object64.s b/data/const/object/object64.s
deleted file mode 100644
index 7d9b1c55..00000000
--- a/data/const/object/object64.s
+++ /dev/null
@@ -1,16 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08122950:: @ 08122950
-	.incbin "object64/gUnk_08122950.bin"
-
-gUnk_0812295C:: @ 0812295C
-	.4byte sub_08093E3C
-	.4byte sub_08093EAC
-
-gUnk_08122964:: @ 08122964
-	.4byte sub_08093ED0
-	.4byte sub_08093EF0
diff --git a/data/const/object/object70.s b/data/const/object/object70.s
deleted file mode 100644
index 684856bd..00000000
--- a/data/const/object/object70.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081232A4:: @ 081232A4
-	.4byte sub_08097438
-	.4byte sub_080974A4
diff --git a/data/const/object/object74.s b/data/const/object/object74.s
deleted file mode 100644
index db514b9c..00000000
--- a/data/const/object/object74.s
+++ /dev/null
@@ -1,21 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08123328:: @ 08123328
-	.incbin "object74/gUnk_08123328.bin"
-
-gUnk_08123330:: @ 08123330
-	.4byte sub_08097B84
-	.4byte sub_08097BDC
-	.4byte sub_08097C18
-	.4byte sub_08097C20
-	.4byte sub_08097C1C
-
-gUnk_08123344:: @ 08123344
-	.incbin "object74/gUnk_08123344.bin"
-
-gUnk_0812336A:: @ 0812336A
-	.incbin "object74/gUnk_0812336A.bin"
diff --git a/data/const/object/objectB.s b/data/const/object/objectB.s
deleted file mode 100644
index 09182011..00000000
--- a/data/const/object/objectB.s
+++ /dev/null
@@ -1,11 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0811F7D8:: @ 0811F7D8
-	.4byte sub_08083BE0
-	.4byte sub_08083BF0
-	.4byte sub_08083C9C
-	.4byte sub_08083D28
diff --git a/data/const/object/objectB3.s b/data/const/object/objectB3.s
deleted file mode 100644
index 5a4925f1..00000000
--- a/data/const/object/objectB3.s
+++ /dev/null
@@ -1,19 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08124A10:: @ 08124A10
-	.4byte sub_080A0ADC
-	.4byte sub_080A0AF0
-
-gUnk_08124A18:: @ 08124A18
-	.4byte sub_080A0AC4
-	.4byte sub_080A0AD0
-
-gUnk_08124A20:: @ 08124A20
-	.4byte sub_080A0B4C
-	.4byte sub_080A0B60
-	.4byte sub_080A0B80
-
diff --git a/data/const/object/objectBD.s b/data/const/object/objectBD.s
deleted file mode 100644
index 18665ac9..00000000
--- a/data/const/object/objectBD.s
+++ /dev/null
@@ -1,15 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08125014:: @ 08125014
-	.incbin "objectBD/gUnk_08125014.bin"
-
-gUnk_0812503C:: @ 0812503C
-	.4byte sub_080A2274
-	.4byte sub_080A22B0
-	.4byte sub_080A22B0
-	.4byte sub_080A22B0
-	.4byte sub_080A22C4
diff --git a/data/const/object/objectD.s b/data/const/object/objectD.s
deleted file mode 100644
index c8fe5c96..00000000
--- a/data/const/object/objectD.s
+++ /dev/null
@@ -1,11 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0811F908:: @ 0811F908
-	.4byte sub_0808434C
-	.4byte sub_080843F8
-	.4byte sub_08084428
-	.4byte GetNextFrame
diff --git a/data/const/object/paper.s b/data/const/object/paper.s
deleted file mode 100644
index 212f6de6..00000000
--- a/data/const/object/paper.s
+++ /dev/null
@@ -1,14 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08122780:: @ 08122780
-	.4byte sub_08092734
-	.4byte sub_08092850
-
-gUnk_08122788:: @ 08122788
-	.4byte sub_0809274C
-	.4byte sub_080927AC
-	.4byte sub_080927D4