Merge pull request #80 from HookedBehemoth:beetle

decompile Beetle, DoorMimic and RockChuchu

14 files changed, 117 insertions, 262 deletions

diff --git a/data/animations/beetle.s b/data/animations/beetle.s
new file mode 100644
index 00000000..e9bdbbf0
--- /dev/null
+++ b/data/animations/beetle.s
@@ -0,0 +1,28 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnk_080CB5EC:: @ 080CB5EC
+	.incbin "baserom.gba", 0x0CB5EC, 0x0000014
+
+gUnk_080CB600:: @ 080CB600
+	.incbin "baserom.gba", 0x0CB600, 0x000001C
+
+gUnk_080CB61C:: @ 080CB61C
+	.incbin "baserom.gba", 0x0CB61C, 0x0000011
+
+gUnk_080CB62D:: @ 080CB62D
+	.incbin "baserom.gba", 0x0CB62D, 0x0000018
+
+gUnk_080CB645:: @ 080CB645
+	.incbin "baserom.gba", 0x0CB645, 0x0000018
+
+gUnk_080CB65D:: @ 080CB65D
+	.incbin "baserom.gba", 0x0CB65D, 0x0000014
+
+gUnk_080CB671:: @ 080CB671
+	.incbin "baserom.gba", 0x0CB671, 0x000000B
+
+gUnk_080CB67C:: @ 080CB67C
+	.incbin "baserom.gba", 0x0CB67C, 0x0000020
diff --git a/data/chuchuAnimations.s b/data/animations/chuchu.s
index 7b9b2642..7b9b2642 100644
--- a/data/chuchuAnimations.s
+++ b/data/animations/chuchu.s
diff --git a/data/darkNutAnimations.s b/data/animations/darkNut.s
index 67419e1d..67419e1d 100644
--- a/data/darkNutAnimations.s
+++ b/data/animations/darkNut.s
diff --git a/data/animations/doorMimic.s b/data/animations/doorMimic.s
new file mode 100644
index 00000000..deaf716b
--- /dev/null
+++ b/data/animations/doorMimic.s
@@ -0,0 +1,25 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnk_080CB8B4:: @ 080CB8B4
+	.incbin "baserom.gba", 0x0CB8B4, 0x0000005
+
+gUnk_080CB8B9:: @ 080CB8B9
+	.incbin "baserom.gba", 0x0CB8B9, 0x0000005
+
+gUnk_080CB8BE:: @ 080CB8BE
+	.incbin "baserom.gba", 0x0CB8BE, 0x0000019
+
+gUnk_080CB8D7:: @ 080CB8D7
+	.incbin "baserom.gba", 0x0CB8D7, 0x0000019
+
+gUnk_080CB8F0:: @ 080CB8F0
+	.incbin "baserom.gba", 0x0CB8F0, 0x0000011
+
+gUnk_080CB901:: @ 080CB901
+	.incbin "baserom.gba", 0x0CB901, 0x0000013
+
+gUnk_080CB914:: @ 080CB914
+	.incbin "baserom.gba", 0x0CB914, 0x0000034
diff --git a/data/animations/enemyE.s b/data/animations/enemyE.s
new file mode 100644
index 00000000..d958e227
--- /dev/null
+++ b/data/animations/enemyE.s
@@ -0,0 +1,7 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnk_080CBBEC:: @ 080CBBEC
+	.incbin "baserom.gba", 0x0CBBEC, 0x000004C
diff --git a/data/greatFairyAnimations.s b/data/animations/greatFairy.s
index 18a8727e..18a8727e 100644
--- a/data/greatFairyAnimations.s
+++ b/data/animations/greatFairy.s
diff --git a/data/animations/keese.s b/data/animations/keese.s
new file mode 100644
index 00000000..3275c2d1
--- /dev/null
+++ b/data/animations/keese.s
@@ -0,0 +1,13 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnk_080CB706:: @ 080CB706
+	.incbin "baserom.gba", 0x0CB706, 0x0000018
+
+gUnk_080CB71E:: @ 080CB71E
+	.incbin "baserom.gba", 0x0CB71E, 0x000000A
+
+gUnk_080CB728:: @ 080CB728
+	.incbin "baserom.gba", 0x0CB728, 0x000000C
diff --git a/data/leeverAnimations.s b/data/animations/leever.s
index 08fccd38..08fccd38 100644
--- a/data/leeverAnimations.s
+++ b/data/animations/leever.s
diff --git a/data/octorokAnimations.s b/data/animations/octorok.s
index d5e52e44..d5e52e44 100644
--- a/data/octorokAnimations.s
+++ b/data/animations/octorok.s
diff --git a/data/peahatAnimations.s b/data/animations/peahat.s
index 8977da85..8977da85 100644
--- a/data/peahatAnimations.s
+++ b/data/animations/peahat.s
diff --git a/data/animations/rockChuchu.s b/data/animations/rockChuchu.s
new file mode 100644
index 00000000..d28e303f
--- /dev/null
+++ b/data/animations/rockChuchu.s
@@ -0,0 +1,16 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnk_080CB96C:: @ 080CB96C
+	.incbin "baserom.gba", 0x0CB96C, 0x0000029
+
+gUnk_080CB995:: @ 080CB995
+	.incbin "baserom.gba", 0x0CB995, 0x0000041
+
+gUnk_080CB9D6:: @ 080CB9D6
+	.incbin "baserom.gba", 0x0CB9D6, 0x0000042
+
+gUnk_080CBA18:: @ 080CBA18
+	.incbin "baserom.gba", 0x0CBA18, 0x0000010
diff --git a/data/rollobiteAnimations.s b/data/animations/rollobite.s
index 1abb3ffd..1abb3ffd 100644
--- a/data/rollobiteAnimations.s
+++ b/data/animations/rollobite.s
diff --git a/data/animations/spinyChuchu.s b/data/animations/spinyChuchu.s
new file mode 100644
index 00000000..ab88f654
--- /dev/null
+++ b/data/animations/spinyChuchu.s
@@ -0,0 +1,28 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnk_080CBA64:: @ 080CBA64
+	.incbin "baserom.gba", 0x0CBA64, 0x0000041
+
+gUnk_080CBAA5:: @ 080CBAA5
+	.incbin "baserom.gba", 0x0CBAA5, 0x0000040
+
+gUnk_080CBAE5:: @ 080CBAE5
+	.incbin "baserom.gba", 0x0CBAE5, 0x0000018
+
+gUnk_080CBAFD:: @ 080CBAFD
+	.incbin "baserom.gba", 0x0CBAFD, 0x0000024
+
+gUnk_080CBB21:: @ 080CBB21
+	.incbin "baserom.gba", 0x0CBB21, 0x0000011
+
+gUnk_080CBB32:: @ 080CBB32
+	.incbin "baserom.gba", 0x0CBB32, 0x000000D
+
+gUnk_080CBB3F:: @ 080CBB3F
+	.incbin "baserom.gba", 0x0CBB3F, 0x0000005
+
+gUnk_080CBB44:: @ 080CBB44
+	.incbin "baserom.gba", 0x0CBB44, 0x0000020
diff --git a/data/data_080CB570.s b/data/data_080CBC38.s
index ae280443..6c805bb0 100644
--- a/data/data_080CB570.s
+++ b/data/data_080CBC38.s
@@ -2,268 +2,6 @@
 	.include "constants/constants.inc"
 
 	.section .rodata
-	.align 2
-
-gUnk_080CB570:: @ 080CB570
-	.incbin "baserom.gba", 0x0CB570, 0x0000018
-
-gUnk_080CB588:: @ 080CB588
-	.incbin "baserom.gba", 0x0CB588, 0x0000008
-
-gUnk_080CB590:: @ 080CB590
-	.incbin "baserom.gba", 0x0CB590, 0x0000018
-
-gUnk_080CB5A8:: @ 080CB5A8
-	.incbin "baserom.gba", 0x0CB5A8, 0x0000020
-
-gUnk_080CB5C8:: @ 080CB5C8
-	.incbin "baserom.gba", 0x0CB5C8, 0x000000C
-
-gUnk_080CB5D4:: @ 080CB5D4
-	.incbin "baserom.gba", 0x0CB5D4, 0x0000008
-
-gUnk_080CB5DC:: @ 080CB5DC
-	.incbin "baserom.gba", 0x0CB5DC, 0x0000008
-
-gUnk_080CB5E4:: @ 080CB5E4
-	.incbin "baserom.gba", 0x0CB5E4, 0x0000008
-
-gUnk_080CB5EC:: @ 080CB5EC
-	.incbin "baserom.gba", 0x0CB5EC, 0x0000014
-
-gUnk_080CB600:: @ 080CB600
-	.incbin "baserom.gba", 0x0CB600, 0x000001C
-
-gUnk_080CB61C:: @ 080CB61C
-	.incbin "baserom.gba", 0x0CB61C, 0x0000011
-
-gUnk_080CB62D:: @ 080CB62D
-	.incbin "baserom.gba", 0x0CB62D, 0x0000018
-
-gUnk_080CB645:: @ 080CB645
-	.incbin "baserom.gba", 0x0CB645, 0x0000018
-
-gUnk_080CB65D:: @ 080CB65D
-	.incbin "baserom.gba", 0x0CB65D, 0x0000014
-
-gUnk_080CB671:: @ 080CB671
-	.incbin "baserom.gba", 0x0CB671, 0x000000B
-
-gUnk_080CB67C:: @ 080CB67C
-	.incbin "baserom.gba", 0x0CB67C, 0x0000020
-
-gUnk_080CB69C:: @ 080CB69C
-	.incbin "baserom.gba", 0x0CB69C, 0x0000018
-
-gUnk_080CB6B4:: @ 080CB6B4
-	.incbin "baserom.gba", 0x0CB6B4, 0x0000010
-
-gUnk_080CB6C4:: @ 080CB6C4
-	.incbin "baserom.gba", 0x0CB6C4, 0x000000C
-
-gUnk_080CB6D0:: @ 080CB6D0
-	.incbin "baserom.gba", 0x0CB6D0, 0x0000006
-
-gUnk_080CB6D6:: @ 080CB6D6
-	.incbin "baserom.gba", 0x0CB6D6, 0x0000020
-
-gUnk_080CB6F6:: @ 080CB6F6
-	.incbin "baserom.gba", 0x0CB6F6, 0x0000010
-
-gUnk_080CB706:: @ 080CB706
-	.incbin "baserom.gba", 0x0CB706, 0x0000018
-
-gUnk_080CB71E:: @ 080CB71E
-	.incbin "baserom.gba", 0x0CB71E, 0x000000A
-
-gUnk_080CB728:: @ 080CB728
-	.incbin "baserom.gba", 0x0CB728, 0x000000C
-
-gUnk_080CB734:: @ 080CB734
-	.incbin "baserom.gba", 0x0CB734, 0x0000018
-
-gUnk_080CB74C:: @ 080CB74C
-	.incbin "baserom.gba", 0x0CB74C, 0x0000018
-
-gUnk_080CB764:: @ 080CB764
-	.incbin "baserom.gba", 0x0CB764, 0x0000008
-
-gUnk_080CB76C:: @ 080CB76C
-	.incbin "baserom.gba", 0x0CB76C, 0x0000030
-
-gUnk_080CB79C:: @ 080CB79C
-	.incbin "baserom.gba", 0x0CB79C, 0x0000008
-
-gUnk_080CB7A4:: @ 080CB7A4
-	.incbin "baserom.gba", 0x0CB7A4, 0x0000008
-
-gUnk_080CB7AC:: @ 080CB7AC
-	.incbin "baserom.gba", 0x0CB7AC, 0x0000008
-
-gUnk_080CB7B4:: @ 080CB7B4
-	.incbin "baserom.gba", 0x0CB7B4, 0x0000008
-
-gUnk_080CB7BC:: @ 080CB7BC
-	.incbin "baserom.gba", 0x0CB7BC, 0x0000008
-
-gUnk_080CB7C4:: @ 080CB7C4
-	.incbin "baserom.gba", 0x0CB7C4, 0x0000008
-
-gUnk_080CB7CC:: @ 080CB7CC
-	.incbin "baserom.gba", 0x0CB7CC, 0x0000008
-
-gUnk_080CB7D4:: @ 080CB7D4
-	.incbin "baserom.gba", 0x0CB7D4, 0x0000008
-
-gUnk_080CB7DC:: @ 080CB7DC
-	.incbin "baserom.gba", 0x0CB7DC, 0x0000008
-
-gUnk_080CB7E4:: @ 080CB7E4
-	.incbin "baserom.gba", 0x0CB7E4, 0x0000008
-
-gUnk_080CB7EC:: @ 080CB7EC
-	.incbin "baserom.gba", 0x0CB7EC, 0x0000008
-
-gUnk_080CB7F4:: @ 080CB7F4
-	.incbin "baserom.gba", 0x0CB7F4, 0x0000030
-
-gUnk_080CB824:: @ 080CB824
-	.incbin "baserom.gba", 0x0CB824, 0x0000008
-
-gUnk_080CB82C:: @ 080CB82C
-	.incbin "baserom.gba", 0x0CB82C, 0x0000008
-
-gUnk_080CB834:: @ 080CB834
-	.incbin "baserom.gba", 0x0CB834, 0x0000008
-
-gUnk_080CB83C:: @ 080CB83C
-	.incbin "baserom.gba", 0x0CB83C, 0x0000008
-
-gUnk_080CB844:: @ 080CB844
-	.incbin "baserom.gba", 0x0CB844, 0x0000008
-
-gUnk_080CB84C:: @ 080CB84C
-	.incbin "baserom.gba", 0x0CB84C, 0x0000008
-
-gUnk_080CB854:: @ 080CB854
-	.incbin "baserom.gba", 0x0CB854, 0x0000008
-
-gUnk_080CB85C:: @ 080CB85C
-	.incbin "baserom.gba", 0x0CB85C, 0x0000008
-
-gUnk_080CB864:: @ 080CB864
-	.incbin "baserom.gba", 0x0CB864, 0x0000008
-
-gUnk_080CB86C:: @ 080CB86C
-	.incbin "baserom.gba", 0x0CB86C, 0x0000008
-
-gUnk_080CB874:: @ 080CB874
-	.incbin "baserom.gba", 0x0CB874, 0x0000030
-
-gUnk_080CB8A4:: @ 080CB8A4
-	.incbin "baserom.gba", 0x0CB8A4, 0x0000010
-
-gUnk_080CB8B4:: @ 080CB8B4
-	.incbin "baserom.gba", 0x0CB8B4, 0x0000005
-
-gUnk_080CB8B9:: @ 080CB8B9
-	.incbin "baserom.gba", 0x0CB8B9, 0x0000005
-
-gUnk_080CB8BE:: @ 080CB8BE
-	.incbin "baserom.gba", 0x0CB8BE, 0x0000019
-
-gUnk_080CB8D7:: @ 080CB8D7
-	.incbin "baserom.gba", 0x0CB8D7, 0x0000019
-
-gUnk_080CB8F0:: @ 080CB8F0
-	.incbin "baserom.gba", 0x0CB8F0, 0x0000011
-
-gUnk_080CB901:: @ 080CB901
-	.incbin "baserom.gba", 0x0CB901, 0x0000013
-
-gUnk_080CB914:: @ 080CB914
-	.incbin "baserom.gba", 0x0CB914, 0x0000034
-
-gUnk_080CB948:: @ 080CB948
-	.incbin "baserom.gba", 0x0CB948, 0x0000018
-
-gUnk_080CB960:: @ 080CB960
-	.incbin "baserom.gba", 0x0CB960, 0x000000C
-
-gUnk_080CB96C:: @ 080CB96C
-	.incbin "baserom.gba", 0x0CB96C, 0x0000029
-
-gUnk_080CB995:: @ 080CB995
-	.incbin "baserom.gba", 0x0CB995, 0x0000041
-
-gUnk_080CB9D6:: @ 080CB9D6
-	.incbin "baserom.gba", 0x0CB9D6, 0x0000042
-
-gUnk_080CBA18:: @ 080CBA18
-	.incbin "baserom.gba", 0x0CBA18, 0x0000010
-
-gUnk_080CBA28:: @ 080CBA28
-	.incbin "baserom.gba", 0x0CBA28, 0x0000018
-
-gUnk_080CBA40:: @ 080CBA40
-	.incbin "baserom.gba", 0x0CBA40, 0x0000020
-
-gUnk_080CBA60:: @ 080CBA60
-	.incbin "baserom.gba", 0x0CBA60, 0x0000004
-
-gUnk_080CBA64:: @ 080CBA64
-	.incbin "baserom.gba", 0x0CBA64, 0x0000041
-
-gUnk_080CBAA5:: @ 080CBAA5
-	.incbin "baserom.gba", 0x0CBAA5, 0x0000040
-
-gUnk_080CBAE5:: @ 080CBAE5
-	.incbin "baserom.gba", 0x0CBAE5, 0x0000018
-
-gUnk_080CBAFD:: @ 080CBAFD
-	.incbin "baserom.gba", 0x0CBAFD, 0x0000024
-
-gUnk_080CBB21:: @ 080CBB21
-	.incbin "baserom.gba", 0x0CBB21, 0x0000011
-
-gUnk_080CBB32:: @ 080CBB32
-	.incbin "baserom.gba", 0x0CBB32, 0x000000D
-
-gUnk_080CBB3F:: @ 080CBB3F
-	.incbin "baserom.gba", 0x0CBB3F, 0x0000005
-
-gUnk_080CBB44:: @ 080CBB44
-	.incbin "baserom.gba", 0x0CBB44, 0x0000020
-
-gUnk_080CBB64:: @ 080CBB64
-	.incbin "baserom.gba", 0x0CBB64, 0x0000018
-
-gUnk_080CBB7C:: @ 080CBB7C
-	.incbin "baserom.gba", 0x0CBB7C, 0x0000014
-
-gUnk_080CBB90:: @ 080CBB90
-	.incbin "baserom.gba", 0x0CBB90, 0x0000010
-
-gUnk_080CBBA0:: @ 080CBBA0
-	.incbin "baserom.gba", 0x0CBBA0, 0x0000014
-
-gUnk_080CBBB4:: @ 080CBBB4
-	.incbin "baserom.gba", 0x0CBBB4, 0x0000008
-
-gUnk_080CBBBC:: @ 080CBBBC
-	.incbin "baserom.gba", 0x0CBBBC, 0x0000008
-
-gUnk_080CBBC4:: @ 080CBBC4
-	.incbin "baserom.gba", 0x0CBBC4, 0x0000004
-
-gUnk_080CBBC8:: @ 080CBBC8
-	.incbin "baserom.gba", 0x0CBBC8, 0x0000014
-
-gUnk_080CBBDC:: @ 080CBBDC
-	.incbin "baserom.gba", 0x0CBBDC, 0x0000010
-
-gUnk_080CBBEC:: @ 080CBBEC
-	.incbin "baserom.gba", 0x0CBBEC, 0x000004C
 
 gUnk_080CBC38:: @ 080CBC38
 	.incbin "baserom.gba", 0x0CBC38, 0x0000018