Merge branch 'master' into transitions

15 files changed, 1 insertions, 320 deletions

diff --git a/data/const/enemy/flyingPot.s b/data/const/enemy/flyingPot.s
deleted file mode 100644
index f02b1ecc..00000000
--- a/data/const/enemy/flyingPot.s
+++ /dev/null
@@ -1,34 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-
-gUnk_080CF244:: @ 080CF244
-	.4byte sub_0803708C
-	.4byte sub_080370A4
-	.4byte GenericKnockback
-	.4byte GenericDeath
-	.4byte GenericConfused
-	.4byte sub_0803712C
-
-gUnk_080CF25C:: @ 080CF25C
-	.4byte sub_08037220
-	.4byte sub_08037280
-	.4byte sub_080372E8
-	.4byte sub_0803737C
-	.4byte sub_080373B0
-	.4byte sub_080373C8
-	.4byte sub_080373E0
-
-gUnk_080CF278:: @ 080CF278
-	.4byte sub_08037144
-	.4byte sub_0803715C
-	.4byte sub_0803718C
-	.4byte sub_080371F8
-	.4byte nullsub_161
-	.4byte sub_08037218
-
-gUnk_080CF290:: @ 080CF290
-	.incbin "flyingPot/gUnk_080CF290.bin"
diff --git a/data/const/item/itemTryPickupObject.s b/data/const/item/itemTryPickupObject.s
index 2c523ea7..ba058a82 100644
--- a/data/const/item/itemTryPickupObject.s
+++ b/data/const/item/itemTryPickupObject.s
@@ -6,7 +6,7 @@
 
 
 gUnk_0811BDB4:: @ 0811BDB4
-	.4byte sub_080761C0
+	.4byte ItemPickupCheck
 	.4byte sub_080762D8
 	.4byte sub_08076488
 	.4byte sub_08076518
diff --git a/data/const/object/bird.s b/data/const/object/bird.s
deleted file mode 100644
index c07b7eb7..00000000
--- a/data/const/object/bird.s
+++ /dev/null
@@ -1,34 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08123EC0:: @ 08123EC0
-	.4byte sub_0809CF3C
-	.4byte sub_0809D030
-	.4byte sub_0809D0F4
-	.4byte sub_0809D178
-	.4byte sub_0809D178
-	.4byte sub_0809D178
-	.4byte sub_0809D178
-	.4byte sub_0809D178
-	.4byte sub_0809D1F0
-	.4byte sub_0809D498
-	.4byte sub_0809D66C
-
-gUnk_08123EEC:: @ 08123EEC
-	.4byte sub_0809CF54
-	.4byte sub_0809CFEC
-
-gUnk_08123EF4:: @ 08123EF4
-	.4byte sub_0809D048
-	.4byte sub_0809D06C
-
-gUnk_08123EFC:: @ 08123EFC
-	.4byte sub_0809D084
-	.4byte sub_0809D0AC
-
-gUnk_08123F04:: @ 08123F04
-	.4byte sub_0809D10C
-	.4byte sub_0809D130
diff --git a/data/const/object/mazaalBossObject.s b/data/const/object/mazaalBossObject.s
deleted file mode 100644
index a58e800e..00000000
--- a/data/const/object/mazaalBossObject.s
+++ /dev/null
@@ -1,16 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08123D28:: @ 08123D28
-	.4byte sub_0809AB04
-	.4byte sub_0809ABA4
-	.4byte sub_0809ABB0
-	.4byte sub_0809ABD4
-	.4byte sub_0809ABF4
-	.4byte sub_0809AC3C
-	.4byte sub_0809ACA0
-	.4byte sub_0809ACCC
-	.4byte sub_0809ACE8
diff --git a/data/const/object/minecart.s b/data/const/object/minecart.s
deleted file mode 100644
index 049745c8..00000000
--- a/data/const/object/minecart.s
+++ /dev/null
@@ -1,21 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081223A8:: @ 081223A8
-	.4byte sub_080916EC
-	.4byte sub_080917DC
-	.4byte sub_080918A4
-	.4byte sub_080919AC
-	.4byte sub_08091C0C
-	.4byte sub_08091C98
-	.4byte sub_08091CC8
-	.4byte sub_08091D90
-
-gUnk_081223C8:: @ 081223C8
-	.incbin "minecart/gUnk_081223C8.bin"
-
-gUnk_081223D0:: @ 081223D0
-	.incbin "minecart/gUnk_081223D0.bin"
diff --git a/data/const/object/object96.s b/data/const/object/object96.s
deleted file mode 100644
index 88aad895..00000000
--- a/data/const/object/object96.s
+++ /dev/null
@@ -1,83 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08123FB0:: @ 08123FB0
-	.4byte sub_0809D91C
-	.4byte sub_0809D93C
-	.4byte 0x30300000
-	.4byte 0x133c3c01
-	.4byte 0x00010000
-	.4byte 0x00001800
-	.4byte 0x00400060
-	.4byte 0x00014021
-	.4byte sub_0809D91C
-	.4byte 00000000
-	.4byte 00000000
-	.4byte 0x10636300
-	.4byte 00000000
-	.4byte 0x00001800
-	.4byte 0x00180000
-.ifdef JP
-	.4byte 0x000000CD
-.else
-.ifdef DEMO_JP
-	.4byte 0x000000CD
-.else
-.ifdef EU
-	.4byte 0x000000CD  @ TODO deduplicate
-.else
-	.4byte 0x000000d0
-.endif
-.endif
-.endif
-	.4byte sub_0809D91C
-	.4byte 00000000
-	.4byte 00000000
-	.4byte 0x0f3c3c00
-	.4byte 0x00010000
-	.4byte 0x00001800
-	.4byte 0x00400060
-	.4byte 0x00014021
-	.4byte sub_0809D91C
-	.4byte 00000000
-	.4byte 00000000
-	.4byte 0x023c3c00
-	.4byte 0x00010000
-	.4byte 0x00001800
-	.4byte 0x00400140
-	.4byte 0x00014021
-	.4byte sub_0809D91C
-	.4byte 00000000
-	.4byte 00000000
-	.4byte 0x0d3c3c00
-	.4byte 0x00010000
-	.4byte 0x00001800
-	.4byte 0x00400060
-	.4byte 0x00014021
-	.4byte sub_0809D91C
-	.4byte 00000000
-	.4byte 00000000
-	.4byte 0x1a3c3c00
-	.4byte 0x00010000
-	.4byte 0x00001800
-	.4byte 0x00400100
-	.4byte 0x00014021
-	.4byte sub_0809D91C
-	.4byte 00000000
-	.4byte 00000000
-	.4byte 0x133c3c00
-	.4byte 0x00010000
-	.4byte 0x00001800
-	.4byte 0x00400060
-
-	.incbin "object96/gUnk_08123FB0.bin"
-
-gUnk_081240B0:: @ 081240B0
-	.4byte sub_0809D7A8
-	.4byte sub_0809D824
-	.4byte sub_0809D860
-	.4byte sub_0809D8C8
-
diff --git a/data/const/object/object98.s b/data/const/object/object98.s
deleted file mode 100644
index 732233be..00000000
--- a/data/const/object/object98.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812418C:: @ 0812418C
-	.4byte sub_0809E360
-	.4byte sub_0809E3E4
diff --git a/data/const/object/objectA6.s b/data/const/object/objectA6.s
deleted file mode 100644
index 112174af..00000000
--- a/data/const/object/objectA6.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08124800:: @ 08124800
-	.4byte sub_0809F920
-	.4byte sub_0809F964
diff --git a/data/const/object/objectA9.s b/data/const/object/objectA9.s
deleted file mode 100644
index 50217af0..00000000
--- a/data/const/object/objectA9.s
+++ /dev/null
@@ -1,16 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08124850:: @ 08124850
-	.4byte sub_0809FEF8
-	.4byte sub_0809FF28
-	.4byte DeleteEntity
-
-gUnk_0812485C:: @ 0812485C
-	.incbin "objectA9/gUnk_0812485C.bin"
-
-gUnk_08124860:: @ 08124860
-	.incbin "objectA9/gUnk_08124860.bin"
diff --git a/data/const/object/objectAB.s b/data/const/object/objectAB.s
deleted file mode 100644
index 3ac4b9fb..00000000
--- a/data/const/object/objectAB.s
+++ /dev/null
@@ -1,10 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812486C:: @ 0812486C
-	.4byte sub_080A00F8
-	.4byte sub_080A012C
-	.4byte sub_080A0158
diff --git a/data/const/object/objectAD.s b/data/const/object/objectAD.s
deleted file mode 100644
index a569ed91..00000000
--- a/data/const/object/objectAD.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_081248BC:: @ 081248BC
-	.4byte sub_080A04A4
-	.4byte sub_080A04E0
diff --git a/data/const/object/objectB4.s b/data/const/object/objectB4.s
deleted file mode 100644
index cc9159af..00000000
--- a/data/const/object/objectB4.s
+++ /dev/null
@@ -1,17 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08124B10:: @ 08124B10
-	.incbin "objectB4/gUnk_08124B10.bin"
-
-gUnk_08124B20:: @ 08124B20
-	.4byte sub_080A0BA8
-	.4byte sub_080A0CE8
-	.4byte sub_080A0D70
-	.4byte sub_080A0E08
-
-gUnk_08124B30:: @ 08124B30
-	.incbin "objectB4/gUnk_08124B30.bin"
diff --git a/data/const/object/objectB9.s b/data/const/object/objectB9.s
deleted file mode 100644
index 7a5da340..00000000
--- a/data/const/object/objectB9.s
+++ /dev/null
@@ -1,21 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08124C20:: @ 08124C20
-	.incbin "objectB9/gUnk_08124C20.bin"
-
-gUnk_08124C48:: @ 08124C48
-	.incbin "objectB9/gUnk_08124C48.bin"
-
-gUnk_08124EA0:: @ 08124EA0
-	.incbin "objectB9/gUnk_08124EA0.bin"
-
-gUnk_08124EC8:: @ 08124EC8
-	.incbin "objectB9/gUnk_08124EC8.bin"
-
-gUnk_08124ECC:: @ 08124ECC
-	.incbin "objectB9/gUnk_08124ECC.bin"
-
diff --git a/data/const/object/objectBlockingStairs.s b/data/const/object/objectBlockingStairs.s
deleted file mode 100644
index a68959bf..00000000
--- a/data/const/object/objectBlockingStairs.s
+++ /dev/null
@@ -1,27 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_0812283C:: @ 0812283C
-	.4byte sub_08092EEC
-	.4byte sub_08092F68
-	.4byte sub_080930F4
-	.4byte sub_08093178
-	.4byte nullsub_120
-
-gUnk_08122850:: @ 08122850
-	.incbin "objectBlockingStairs/gUnk_08122850.bin"
-
-gUnk_08122862:: @ 08122862
-	.incbin "objectBlockingStairs/gUnk_08122862.bin"
-
-gUnk_08122874:: @ 08122874
-	.incbin "objectBlockingStairs/gUnk_08122874.bin"
-
-gUnk_08122886:: @ 08122886
-	.incbin "objectBlockingStairs/gUnk_08122886.bin"
-
-gUnk_08122898:: @ 08122898
-	.incbin "objectBlockingStairs/gUnk_08122898.bin"
diff --git a/data/const/object/picoBloom.s b/data/const/object/picoBloom.s
deleted file mode 100644
index db60592d..00000000
--- a/data/const/object/picoBloom.s
+++ /dev/null
@@ -1,13 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08123568:: @ 08123568
-	.4byte sub_08098A90
-	.4byte sub_08098AD0
-	.4byte sub_08098AE8
-
-gUnk_08123574:: @ 08123574
-	.incbin "picoBloom/gUnk_08123574.bin"