Merge pull request #444 from hatal175/objects2

Decompile various objects

17 files changed, 3 insertions, 196 deletions

diff --git a/data/const/object/object10.s b/data/const/object/object10.s
deleted file mode 100644
index ea6d7265..00000000
--- a/data/const/object/object10.s
+++ /dev/null
@@ -1,16 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08120560:: @ 08120560
-	.4byte sub_0808483C
-	.4byte sub_080848C8
-	.4byte sub_080849D8
-
-gUnk_0812056C:: @ 0812056C
-	.incbin "object10/gUnk_0812056C.bin"
-
-gUnk_08120574:: @ 08120574
-	.incbin "object10/gUnk_08120574.bin"
diff --git a/data/const/object/object15.s b/data/const/object/object15.s
deleted file mode 100644
index 1b2ec904..00000000
--- a/data/const/object/object15.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08120648:: @ 08120648
-	.4byte sub_08086034
-	.4byte sub_08086054
diff --git a/data/const/object/object17.s b/data/const/object/object17.s
deleted file mode 100644
index 2f7cf510..00000000
--- a/data/const/object/object17.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08120660:: @ 08120660
-	.4byte sub_080861C4
-	.4byte sub_08086234
diff --git a/data/const/object/object1F.s b/data/const/object/object1F.s
deleted file mode 100644
index 9a818cb1..00000000
--- a/data/const/object/object1F.s
+++ /dev/null
@@ -1,16 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08120A0C:: @ 08120A0C
-	.4byte sub_080876A8
-	.4byte sub_0808776C
-	.4byte sub_080877A4
-
-gUnk_08120A18:: @ 08120A18
-	.incbin "object1F/gUnk_08120A18.bin"
-
-gUnk_08120A20:: @ 08120A20
-	.incbin "object1F/gUnk_08120A20.bin"
diff --git a/data/const/object/object37.s b/data/const/object/object37.s
deleted file mode 100644
index 1c6c757b..00000000
--- a/data/const/object/object37.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08121480:: @ 08121480
-	.4byte sub_0808BE00
-	.4byte sub_0808BE2C
diff --git a/data/const/object/object44.s b/data/const/object/object44.s
deleted file mode 100644
index ca4c690e..00000000
--- a/data/const/object/object44.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08121B8C:: @ 08121B8C
-	.4byte sub_0808E298
-	.4byte sub_0808E318
diff --git a/data/const/object/object45.s b/data/const/object/object45.s
deleted file mode 100644
index 3d3acfcb..00000000
--- a/data/const/object/object45.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08121BD8:: @ 08121BD8
-	.4byte sub_0808E42C
-	.4byte sub_0808E448
diff --git a/data/const/object/object53.s b/data/const/object/object53.s
deleted file mode 100644
index b9fb52e7..00000000
--- a/data/const/object/object53.s
+++ /dev/null
@@ -1,12 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08122280:: @ 08122280
-	.4byte sub_08091120
-	.4byte sub_08091198
-
-gUnk_08122288:: @ 08122288
-	.incbin "object53/gUnk_08122288.bin"
diff --git a/data/const/object/object63.s b/data/const/object/object63.s
deleted file mode 100644
index 0727682c..00000000
--- a/data/const/object/object63.s
+++ /dev/null
@@ -1,10 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08122944:: @ 08122944
-	.4byte sub_08093D88
-	.4byte sub_08093DE0
-	.4byte sub_08093E08
diff --git a/data/const/object/object67.s b/data/const/object/object67.s
deleted file mode 100644
index fa7974f9..00000000
--- a/data/const/object/object67.s
+++ /dev/null
@@ -1,18 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081229BC:: @ 081229BC
-	.4byte sub_08094148
-	.4byte sub_08094398
-	.4byte sub_08094424
-	.4byte sub_08094540
-	.4byte sub_08094570
-
-gUnk_081229D0:: @ 081229D0
-	.incbin "object67/gUnk_081229D0.bin"
-
-gUnk_081229F0:: @ 081229F0
-	.incbin "object67/gUnk_081229F0.bin"
diff --git a/data/const/object/object75.s b/data/const/object/object75.s
deleted file mode 100644
index 738b65b7..00000000
--- a/data/const/object/object75.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08121670:: @ 08121670
-	.4byte sub_0808C964
-	.4byte sub_0808CA10
diff --git a/data/const/object/object76.s b/data/const/object/object76.s
deleted file mode 100644
index 1e0542c4..00000000
--- a/data/const/object/object76.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08121678:: @ 08121678
-	.4byte sub_0808C964
-	.4byte sub_0808CA10
diff --git a/data/const/object/object79.s b/data/const/object/object79.s
deleted file mode 100644
index 179b2d69..00000000
--- a/data/const/object/object79.s
+++ /dev/null
@@ -1,13 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08123410:: @ 08123410
-	.4byte sub_08097FB4
-	.4byte sub_0809803C
-	.4byte sub_08098084
-
-gUnk_0812341C:: @ 0812341C
-	.incbin "object79/gUnk_0812341C.bin"
diff --git a/data/const/object/object81.s b/data/const/object/object81.s
deleted file mode 100644
index 662d1322..00000000
--- a/data/const/object/object81.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08123674:: @ 08123674
-	.4byte sub_08098C80
-	.4byte nullsub_124
diff --git a/data/const/object/object9.s b/data/const/object/object9.s
deleted file mode 100644
index 3af04d2d..00000000
--- a/data/const/object/object9.s
+++ /dev/null
@@ -1,18 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0811F744:: @ 0811F744
-.ifdef EU
-    @ TODO only small differences
-	.incbin "object9/gUnk_0811F744_EU.bin"
-.else
-	.incbin "object9/gUnk_0811F744_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_0811F754:: @ 0811F754
-	.4byte sub_08083914
-	.4byte sub_0808395C
-	.4byte sub_08083998
diff --git a/data/const/object/object9B.s b/data/const/object/object9B.s
deleted file mode 100644
index 224206d4..00000000
--- a/data/const/object/object9B.s
+++ /dev/null
@@ -1,13 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-
-gUnk_081242D0:: @ 081242D0
-	.4byte sub_0809E7C0
-	.4byte sub_0809E7E0
-
-gUnk_081242D8:: @ 081242D8
-	.incbin "object9B/gUnk_081242D8.bin"
diff --git a/data/const/object/treeHidingPortal.s b/data/const/object/treeHidingPortal.s
index 69399391..8ad175aa 100644
--- a/data/const/object/treeHidingPortal.s
+++ b/data/const/object/treeHidingPortal.s
@@ -4,12 +4,7 @@
 	.section .rodata
     .align 2
 
-gUnk_08124354:: @ 08124354
-	.4byte sub_0809E83C
-	.4byte sub_0809E86C
-	.4byte sub_0809E8BC
-	.4byte sub_0809E8EC
-
-gUnk_08124364:: @ 08124364
-	.incbin "treeHidingPortal/gUnk_08124364.bin"
+
+
+