Split items and extract pointers

16 files changed, 202 insertions, 52 deletions

diff --git a/data/const/item/itemBomb.inc b/data/const/item/itemBomb.inc
new file mode 100644
index 00000000..99f9ef37
--- /dev/null
+++ b/data/const/item/itemBomb.inc
@@ -0,0 +1,9 @@
+gUnk_0811BD98:: @ 0811BD98
+	.4byte sub_08075FF8
+	.4byte 00000000
+	.4byte sub_08076488
+	.4byte sub_08076518
+	.4byte sub_080765E0
+
+gUnk_0811BDAC:: @ 0811BDAC
+	.incbin "baserom.gba", 0x11BDAC, 0x0000008
diff --git a/data/const/item/itemBoomerang.inc b/data/const/item/itemBoomerang.inc
new file mode 100644
index 00000000..e405bb3b
--- /dev/null
+++ b/data/const/item/itemBoomerang.inc
@@ -0,0 +1,3 @@
+gUnk_0811BD78:: @ 0811BD78
+	.4byte sub_08075D2C
+	.4byte sub_08075D88
diff --git a/data/const/item/itemBow.inc b/data/const/item/itemBow.inc
new file mode 100644
index 00000000..f4c164e7
--- /dev/null
+++ b/data/const/item/itemBow.inc
@@ -0,0 +1,8 @@
+
+gUnk_0811BD80:: @ 0811BD80
+	.4byte sub_08075DF4
+	.4byte sub_08075E40
+	.4byte sub_08075EC0
+	.4byte sub_08075F38
+	.4byte sub_08075F84
+	.4byte sub_08075D88
diff --git a/data/const/item/itemGustJar.inc b/data/const/item/itemGustJar.inc
new file mode 100644
index 00000000..824dfb31
--- /dev/null
+++ b/data/const/item/itemGustJar.inc
@@ -0,0 +1,5 @@
+gUnk_0811BDF4:: @ 0811BDF4
+	.4byte sub_08076DF4
+	.4byte sub_08076E60
+	.4byte sub_08076EC8
+	.4byte sub_08076F64
diff --git a/data/const/item/itemJarEmpty.inc b/data/const/item/itemJarEmpty.inc
new file mode 100644
index 00000000..b1d1143f
--- /dev/null
+++ b/data/const/item/itemJarEmpty.inc
@@ -0,0 +1,5 @@
+gUnk_0811BE28:: @ 0811BE28
+	.4byte sub_08077534
+	.4byte sub_08077618
+	.4byte sub_08077640
+	.4byte sub_0807766C
diff --git a/data/const/item/itemLantern.inc b/data/const/item/itemLantern.inc
new file mode 100644
index 00000000..7e275377
--- /dev/null
+++ b/data/const/item/itemLantern.inc
@@ -0,0 +1,5 @@
+gUnk_0811BD68:: @ 0811BD68
+	.4byte sub_08075A0C
+	.4byte sub_08075ADC
+	.4byte sub_08075B54
+	.4byte sub_08075C9C
diff --git a/data/const/item/itemMoleMitts.inc b/data/const/item/itemMoleMitts.inc
new file mode 100644
index 00000000..8b908a24
--- /dev/null
+++ b/data/const/item/itemMoleMitts.inc
@@ -0,0 +1,14 @@
+gUnk_0811BE04:: @ 0811BE04
+	.4byte sub_08077130
+	.4byte sub_080771C8
+	.4byte sub_080772A8
+	.4byte sub_08077448
+
+gUnk_0811BE14:: @ 0811BE14
+	.incbin "baserom.gba", 0x11BE14, 0x0000002
+
+gUnk_0811BE16:: @ 0811BE16
+	.incbin "baserom.gba", 0x11BE16, 0x0000008
+
+gUnk_0811BE1E:: @ 0811BE1E
+	.incbin "baserom.gba", 0x11BE1E, 0x000000A
diff --git a/data/const/item/itemOcarina.inc b/data/const/item/itemOcarina.inc
new file mode 100644
index 00000000..1c7d0931
--- /dev/null
+++ b/data/const/item/itemOcarina.inc
@@ -0,0 +1,3 @@
+gOcarinaStates:: @ 0811BDD8
+	.4byte OcarinaUse
+	.4byte OcarinaUpdate
diff --git a/data/const/item/itemPacciCane.inc b/data/const/item/itemPacciCane.inc
new file mode 100644
index 00000000..be948d8a
--- /dev/null
+++ b/data/const/item/itemPacciCane.inc
@@ -0,0 +1,3 @@
+gUnk_0811BDE0:: @ 0811BDE0
+	.4byte sub_08076C98
+	.4byte sub_08076CBC
diff --git a/data/const/item/itemPegasusBoots.inc b/data/const/item/itemPegasusBoots.inc
new file mode 100644
index 00000000..80735f20
--- /dev/null
+++ b/data/const/item/itemPegasusBoots.inc
@@ -0,0 +1,4 @@
+gUnk_0811BDCC:: @ 0811BDCC
+	.4byte sub_080768F8
+	.4byte sub_08076964
+	.4byte sub_08076A88
diff --git a/data/const/item/itemShield.inc b/data/const/item/itemShield.inc
new file mode 100644
index 00000000..107f799f
--- /dev/null
+++ b/data/const/item/itemShield.inc
@@ -0,0 +1,4 @@
+gUnk_0811BDE8:: @ 0811BDE8
+	.4byte sub_08076D04
+	.4byte sub_08076D34
+	.4byte sub_08076D94
diff --git a/data/const/item/itemSword.inc b/data/const/item/itemSword.inc
new file mode 100644
index 00000000..dc687f1a
--- /dev/null
+++ b/data/const/item/itemSword.inc
@@ -0,0 +1,10 @@
+gUnk_0811BD44:: @ 0811BD44
+	.4byte sub_08075338
+	.4byte sub_080754B8
+	.4byte sub_080755F0
+	.4byte sub_0807564C
+	.4byte sub_08075738
+	.4byte sub_08075580
+	.4byte sub_08075898
+	.4byte sub_080758B0
+	.4byte sub_08075900
diff --git a/data/const/item/itemTryPickupObject.inc b/data/const/item/itemTryPickupObject.inc
new file mode 100644
index 00000000..76adfecd
--- /dev/null
+++ b/data/const/item/itemTryPickupObject.inc
@@ -0,0 +1,8 @@
+
+gUnk_0811BDB4:: @ 0811BDB4
+	.4byte sub_080761C0
+	.4byte sub_080762D8
+	.4byte sub_08076488
+	.4byte sub_08076518
+	.4byte sub_080765E0
+	.4byte sub_0807660C
diff --git a/data/const/playerItem/playerItemSword.inc b/data/const/playerItem/playerItemSword.inc
new file mode 100644
index 00000000..306e6fe1
--- /dev/null
+++ b/data/const/playerItem/playerItemSword.inc
@@ -0,0 +1,4 @@
+gUnk_0812905C:: @ 0812905C
+	.4byte sub_080A758C
+	.4byte sub_080A76CC
+	.4byte sub_080A7824
diff --git a/data/data_0811BD44.s b/data/data_0811BD44.s
index 9ff36b90..fef839e0 100644
--- a/data/data_0811BD44.s
+++ b/data/data_0811BD44.s
@@ -4,56 +4,33 @@
 	.section .rodata
 	.align 2
 
-gUnk_0811BD44:: @ 0811BD44
-	.incbin "baserom.gba", 0x11BD44, 0x0000024
+	@ TODO convert .inc files into .s files and include them in linker.ld
+	.include "data/const/item/itemSword.inc"
 
-gUnk_0811BD68:: @ 0811BD68
-	.incbin "baserom.gba", 0x11BD68, 0x0000010
+	.include "data/const/item/itemLantern.inc"
 
-gUnk_0811BD78:: @ 0811BD78
-	.incbin "baserom.gba", 0x11BD78, 0x0000008
+	.include "data/const/item/itemBoomerang.inc"
 
-gUnk_0811BD80:: @ 0811BD80
-	.incbin "baserom.gba", 0x11BD80, 0x0000018
+	.include "data/const/item/itemBow.inc"
 
-gUnk_0811BD98:: @ 0811BD98
-	.incbin "baserom.gba", 0x11BD98, 0x0000014
+	.include "data/const/item/itemBomb.inc"
 
-gUnk_0811BDAC:: @ 0811BDAC
-	.incbin "baserom.gba", 0x11BDAC, 0x0000008
+	.include "data/const/item/itemTryPickupObject.inc"
 
-gUnk_0811BDB4:: @ 0811BDB4
-	.incbin "baserom.gba", 0x11BDB4, 0x0000018
+	.include "data/const/item/itemPegasusBoots.inc"
 
-gUnk_0811BDCC:: @ 0811BDCC
-	.incbin "baserom.gba", 0x11BDCC, 0x000000C
+	.include "data/const/item/itemOcarina.inc"
 
-gOcarinaStates:: @ 0811BDD8
-	.incbin "baserom.gba", 0x11BDD8, 0x0000008
+	.include "data/const/item/itemPacciCane.inc"
 
-gUnk_0811BDE0:: @ 0811BDE0
-	.incbin "baserom.gba", 0x11BDE0, 0x0000008
+	.include "data/const/item/itemShield.inc"
 
-gUnk_0811BDE8:: @ 0811BDE8
-	.incbin "baserom.gba", 0x11BDE8, 0x000000C
+	.include "data/const/item/itemGustJar.inc"
 
-gUnk_0811BDF4:: @ 0811BDF4
-	.incbin "baserom.gba", 0x11BDF4, 0x0000010
+	.include "data/const/item/itemMoleMitts.inc"
 
-gUnk_0811BE04:: @ 0811BE04
-	.incbin "baserom.gba", 0x11BE04, 0x0000010
+	.include "data/const/item/itemJarEmpty.inc"
 
-gUnk_0811BE14:: @ 0811BE14
-	.incbin "baserom.gba", 0x11BE14, 0x0000002
-
-gUnk_0811BE16:: @ 0811BE16
-	.incbin "baserom.gba", 0x11BE16, 0x0000008
-
-gUnk_0811BE1E:: @ 0811BE1E
-	.incbin "baserom.gba", 0x11BE1E, 0x000000A
-
-gUnk_0811BE28:: @ 0811BE28
-	.incbin "baserom.gba", 0x11BE28, 0x0000010
 
 gUnk_0811BE38:: @ 0811BE38
 	.incbin "baserom.gba", 0x11BE38, 0x0000008
@@ -65,13 +42,23 @@ gUnk_0811BE48:: @ 0811BE48
 	.incbin "baserom.gba", 0x11BE48, 0x0000180
 
 gUnk_0811BFC8:: @ 0811BFC8
-	.incbin "baserom.gba", 0x11BFC8, 0x0000018
+	.4byte sub_080779E8
+	.4byte sub_080779EC
+	.4byte sub_08077A18
+	.4byte sub_08077A48
+	.4byte sub_08077A98
+	.4byte sub_08077AC8
 
 gUnk_0811BFE0:: @ 0811BFE0
 	.incbin "baserom.gba", 0x11BFE0, 0x0000008
 
 gUnk_0811BFE8:: @ 0811BFE8
-	.incbin "baserom.gba", 0x11BFE8, 0x0000018
+	.4byte sub_08078008
+	.4byte sub_08078124
+	.4byte sub_08078140
+	.4byte sub_08078070
+	.4byte sub_080780E0
+	.4byte sub_08078108
 
 gUnk_0811C000:: @ 0811C000
 	.incbin "baserom.gba", 0x11C000, 0x000000C
@@ -92,7 +79,8 @@ gUnk_0811C090:: @ 0811C090
 	.incbin "baserom.gba", 0x11C090, 0x0000020
 
 gUnk_0811C0B0:: @ 0811C0B0
-	.incbin "baserom.gba", 0x11C0B0, 0x0000008
+	.4byte gUnk_0811C070
+	.4byte gUnk_0811C090
 
 gUnk_0811C0B8:: @ 0811C0B8
 	.incbin "baserom.gba", 0x11C0B8, 0x0000010
@@ -104,7 +92,10 @@ gUnk_0811C0D8:: @ 0811C0D8
 	.incbin "baserom.gba", 0x11C0D8, 0x0000010
 
 gUnk_0811C0E8:: @ 0811C0E8
-	.incbin "baserom.gba", 0x11C0E8, 0x0000010
+	.4byte gUnk_0811C0B8
+	.4byte gUnk_0811C0D8
+	.4byte gUnk_0811C0B8
+	.4byte gUnk_0811C0C8
 
 gUnk_0811C0F8:: @ 0811C0F8
 	.incbin "baserom.gba", 0x11C0F8, 0x0000008
@@ -122,13 +113,64 @@ gUnk_0811C118:: @ 0811C118
 	.incbin "baserom.gba", 0x11C118, 0x0000008
 
 gUnk_0811C120:: @ 0811C120
-	.incbin "baserom.gba", 0x11C120, 0x00000B8
+	.4byte nullsub_112
+	.4byte sub_08074200
+	.4byte 00000000
+	.4byte 00000000
+	.4byte sub_0807422C
+	.4byte sub_08074238
+	.4byte sub_080742AC
+	.4byte sub_080742E4
+	.4byte sub_08074314
+	.4byte sub_08074338
+	.4byte sub_0807435C
+	.4byte sub_08074380
+	.4byte sub_08074638
+	.4byte sub_08074B4C
+	.4byte sub_08074B74
+	.4byte sub_08074BA0
+	.4byte sub_08074BCC
+	.4byte sub_08074678
+	.4byte nullsub_112
+	.4byte nullsub_112
+	.4byte sub_080743D4
+	.4byte sub_0807441C
+	.4byte sub_0807450C
+	.4byte sub_08074584
+	.4byte sub_080745B4
+	.4byte sub_0807479C
+	.4byte sub_080748C4
+	.4byte sub_080748DC
+	.4byte sub_08074918
+	.4byte 00000000
+	.4byte sub_0807496C
+	.4byte 00000000
+	.4byte sub_08074A48
+	.4byte sub_0807450C
+	.4byte nullsub_504
+	.4byte sub_080742AC
+	.4byte sub_080742AC
+	.4byte sub_08074A9C
+	.4byte sub_08074AF4
+	.4byte sub_08074B18
+	.4byte sub_0807422C
+	.4byte sub_08074238
+	.4byte sub_080749D4
+	.4byte sub_0807493C
+	.4byte sub_080749A8
+	.4byte sub_08074A9C
 
 gUnk_0811C1D8:: @ 0811C1D8
-	.incbin "baserom.gba", 0x11C1D8, 0x0000010
+	.4byte gUnk_0811C240
+	.4byte gUnk_0811C24A
+	.4byte gUnk_0811C254
+	.4byte gUnk_0811C25E
 
 gUnk_0811C1E8:: @ 0811C1E8
-	.incbin "baserom.gba", 0x11C1E8, 0x0000010
+	.4byte gUnk_0811C1F8
+	.4byte gUnk_0811C20A
+	.4byte gUnk_0811C21C
+	.4byte gUnk_0811C22E
 
 gUnk_0811C1F8:: @ 0811C1F8
 	.incbin "baserom.gba", 0x11C1F8, 0x0000012
@@ -158,13 +200,22 @@ gUnk_0811C268:: @ 0811C268
 	.incbin "baserom.gba", 0x11C268, 0x0000014
 
 gUnk_0811C27C:: @ 0811C27C
-	.incbin "baserom.gba", 0x11C27C, 0x0000008
+	.4byte sub_0807B114
+	.4byte sub_0807B128
 
 gUnk_0811C284:: @ 0811C284
-	.incbin "baserom.gba", 0x11C284, 0x0000014
+	.4byte sub_0807B1A8
+	.4byte sub_0807B144
+	.4byte nullsub_506
+	.4byte sub_0807B178
+	.4byte sub_0807B2F8
 
 gUnk_0811C298:: @ 0811C298
-	.incbin "baserom.gba", 0x11C298, 0x0000014
+	.4byte sub_0807B1DC
+	.4byte sub_0807B1EC
+	.4byte sub_0807B21C
+	.4byte sub_0807B264
+	.4byte sub_0807B2B8
 
 gUnk_0811C2AC:: @ 0811C2AC
 	.incbin "baserom.gba", 0x11C2AC, 0x0000020
diff --git a/data/data_08124712.s b/data/data_08124712.s
index 80ae3de1..29a9f4d7 100644
--- a/data/data_08124712.s
+++ b/data/data_08124712.s
@@ -653,13 +653,27 @@ gUnk_08129004:: @ 08129004
 	.incbin "baserom.gba", 0x129004, 0x0000018
 
 gUnk_0812901C:: @ 0812901C
-	.incbin "baserom.gba", 0x12901C, 0x0000014
+	.4byte sub_080A7250
+	.4byte sub_080A7328
+	.4byte sub_080A7528
+	.4byte sub_080A73A8
+	.4byte sub_080A74C8
 
 gUnk_08129030:: @ 08129030
-	.incbin "baserom.gba", 0x129030, 0x000002C
-
-gUnk_0812905C:: @ 0812905C
-	.incbin "baserom.gba", 0x12905C, 0x000000C
+	.4byte sub_080A71DC
+	.4byte sub_080A4EA0
+	.4byte sub_080A71DC
+	.4byte sub_080A64FC
+	.4byte DrawKinstoneMenu
+	.4byte sub_08051E68
+	.4byte sub_0804AB54
+	.4byte sub_080A45A4
+	.4byte sub_08054870
+	.4byte sub_080A6C74
+	.4byte sub_080A6AB8
+	
+	@ TODO convert .inc files into .s files and include them in linker.ld
+	.include "data/const/playerItem/playerItemSword.inc"
 
 gUnk_08129068:: @ 08129068
 	.incbin "baserom.gba", 0x129068, 0x0000004