diff --git a/asm/acroBandits.s b/asm/acroBandits.s
index 7fe1413e..10da8314 100644
--- a/asm/acroBandits.s
+++ b/asm/acroBandits.s
@@ -37,7 +37,7 @@ _08031898: .4byte gUnk_080012C8
 _0803189C:
 	ldr r4, _080318C0 @ =gUnk_080CE56C
 	adds r0, r5, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/bird.s b/asm/bird.s
index 3216e5e7..9b6e916e 100644
--- a/asm/bird.s
+++ b/asm/bird.s
@@ -296,7 +296,7 @@ _0809D14C:
 	movs r0, #0x17
 	movs r1, #0
 	movs r2, #0
-	bl sub_080A7C00
+	bl CreateItemEntity
 	ldr r0, _0809D174 @ =gUnk_02002A40
 	ldr r1, [r0, #0x40]
 	movs r2, #0x80
diff --git a/asm/bombPeahat.s b/asm/bombPeahat.s
index 47f175d6..f7d116d5 100644
--- a/asm/bombPeahat.s
+++ b/asm/bombPeahat.s
@@ -31,7 +31,7 @@ _0802A82C: .4byte gUnk_080012C8
 _0802A830:
 	ldr r4, _0802A848 @ =gUnk_080CD0F0
 	adds r0, r5, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/bombarossa.s b/asm/bombarossa.s
index 3e36c481..b45ef759 100644
--- a/asm/bombarossa.s
+++ b/asm/bombarossa.s
@@ -12,7 +12,7 @@ Bombarossa: @ 0x080333B8
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080333D0 @ =gUnk_080CEB38
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/book.s b/asm/book.s
index d8c32947..74ed9443 100644
--- a/asm/book.s
+++ b/asm/book.s
@@ -303,7 +303,7 @@ _0809B5D0:
 	adds r0, #0x39
 	movs r1, #0
 	movs r2, #0
-	bl sub_080A7C00
+	bl CreateItemEntity
 	bl DeleteThisEntity
 _0809B5EA:
 	pop {r4, pc}
diff --git a/asm/businessScrub.s b/asm/businessScrub.s
index 2f5b40d8..f928082b 100644
--- a/asm/businessScrub.s
+++ b/asm/businessScrub.s
@@ -573,7 +573,7 @@ _08028D5C:
 _08028D70:
 	ldrb r0, [r6, #8]
 	movs r2, #0
-	bl sub_080A7C00
+	bl CreateItemEntity
 	movs r0, #6
 	strb r0, [r5, #0xc]
 	movs r0, #4
@@ -593,14 +593,14 @@ _08028D9C:
 	ldrb r0, [r6, #8]
 	ldrb r1, [r6, #9]
 	movs r2, #0
-	bl sub_080A7C00
+	bl CreateItemEntity
 	movs r0, #4
 	b _08028DB6
 _08028DAA:
 	ldrb r0, [r6, #8]
 	ldrb r1, [r6, #9]
 	movs r2, #0
-	bl sub_080A7C00
+	bl CreateItemEntity
 	movs r0, #8
 _08028DB6:
 	strb r0, [r5, #0xe]
diff --git a/asm/chaser.s b/asm/chaser.s
index a8148d16..d038cae7 100644
--- a/asm/chaser.s
+++ b/asm/chaser.s
@@ -27,7 +27,7 @@ _0802B4F8: .4byte gUnk_080012C8
 _0802B4FC:
 	ldr r4, _0802B514 @ =gUnk_080CD27C
 	adds r0, r5, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/chestSpawner.s b/asm/chestSpawner.s
index f9081c59..74c804fe 100644
--- a/asm/chestSpawner.s
+++ b/asm/chestSpawner.s
@@ -368,7 +368,7 @@ _08084086:
 	ldrb r0, [r1, #2]
 	ldrb r1, [r1, #3]
 	movs r2, #0
-	bl sub_080A7C00
+	bl CreateItemEntity
 	b _080840A4
 _0808409C:
 	adds r1, #8
diff --git a/asm/chuchu.s b/asm/chuchu.s
index 4259141f..bb425f76 100644
--- a/asm/chuchu.s
+++ b/asm/chuchu.s
@@ -81,7 +81,7 @@ _0801EE9E:
 	strb r4, [r0]
 	ldr r4, _0801EED0 @ =gUnk_080CA21C
 	adds r0, r5, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/chuchuBoss.s b/asm/chuchuBoss.s
index 1912cf16..8313d95f 100644
--- a/asm/chuchuBoss.s
+++ b/asm/chuchuBoss.s
@@ -12,7 +12,7 @@ ChuchuBoss: @ 0x08025CA0
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _08025CB8 @ =gUnk_080CC19C
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/code_080011C4.s b/asm/code_080011C4.s
index 7d437caf..d2bba212 100644
--- a/asm/code_080011C4.s
+++ b/asm/code_080011C4.s
@@ -139,7 +139,7 @@ EnemyFunctionHandler: @ 0x0800129E
 	b _080012BA
 _080012B2:
 	adds r0, r4, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	adds r1, r5, #0
 _080012BA:
 	lsls r0, r0, #2
@@ -1153,8 +1153,8 @@ gUnk_0800275C::
 	.byte 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x00, 0x06, 0x06, 0x06
 	.byte 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06
 
-	thumb_func_start sub_0800279C
-sub_0800279C: @ 0x0800279C
+	thumb_func_start GetNextFunction
+GetNextFunction: @ 0x0800279C
 	movs r1, #0x3a
 	ldrb r3, [r0, r1]
 	movs r2, #4
diff --git a/asm/code_080A5574.s b/asm/code_080A5574.s
index a6015e72..d735a6b2 100644
--- a/asm/code_080A5574.s
+++ b/asm/code_080A5574.s
@@ -4886,8 +4886,8 @@ _080A7BCE:
 	.align 2, 0
 _080A7BFC: .4byte gLinkState
 
-	thumb_func_start sub_080A7C00
-sub_080A7C00: @ 0x080A7C00
+	thumb_func_start CreateItemEntity
+CreateItemEntity: @ 0x080A7C00
 	push {r4, lr}
 	bl GiveItemWithCutscene
 	adds r4, r0, #0
@@ -4999,13 +4999,13 @@ _080A7CB0:
 	ldrb r0, [r4, #2]
 	ldrb r1, [r4, #3]
 	movs r2, #0
-	bl sub_080A7C00
+	bl CreateItemEntity
 	b _080A7CDC
 _080A7CD2:
 	movs r0, #0x60
 	movs r1, #0
 	movs r2, #0
-	bl sub_080A7C00
+	bl CreateItemEntity
 _080A7CDC:
 	movs r0, #0x74
 	adds r1, r5, #0
@@ -5484,7 +5484,7 @@ sub_080A8030: @ 0x080A8030
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080A8048 @ =gUnk_081295D0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -5670,7 +5670,7 @@ sub_080A8190: @ 0x080A8190
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080A81A8 @ =gUnk_0812960C
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -5860,7 +5860,7 @@ sub_080A82F8: @ 0x080A82F8
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080A8310 @ =gUnk_08129650
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -6039,7 +6039,7 @@ sub_080A843C: @ 0x080A843C
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080A8454 @ =gUnk_081296F0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -6368,7 +6368,7 @@ sub_080A86BC: @ 0x080A86BC
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080A86D4 @ =gUnk_08129718
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -6508,7 +6508,7 @@ sub_080A87C8: @ 0x080A87C8
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080A87E0 @ =gUnk_08129740
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -6869,7 +6869,7 @@ _080A8A64:
 sub_080A8A68: @ 0x080A8A68
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	cmp r0, #0
 	beq _080A8A78
 	bl DeleteThisEntity
@@ -7028,7 +7028,7 @@ _080A8B94:
 sub_080A8B98: @ 0x080A8B98
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	cmp r0, #0
 	beq _080A8BA8
 	bl DeleteThisEntity
@@ -7173,7 +7173,7 @@ _080A8CA8:
 sub_080A8CAC: @ 0x080A8CAC
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	cmp r0, #0
 	beq _080A8CBC
 	bl DeleteThisEntity
@@ -7319,7 +7319,7 @@ sub_080A8DC0: @ 0x080A8DC0
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080A8DD8 @ =gUnk_08129954
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -7988,7 +7988,7 @@ sub_080A9300: @ 0x080A9300
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080A9318 @ =gUnk_081299D0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -8378,7 +8378,7 @@ sub_080A95DC: @ 0x080A95DC
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080A95F4 @ =gUnk_08129ABC
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -8909,7 +8909,7 @@ sub_080A9A00: @ 0x080A9A00
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080A9A18 @ =gUnk_08129AE0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -9311,7 +9311,7 @@ sub_080A9CA8: @ 0x080A9CA8
 _080A9CB8:
 	ldr r4, _080A9CD0 @ =gUnk_08129B58
 	adds r0, r5, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -9440,7 +9440,7 @@ sub_080A9DA4: @ 0x080A9DA4
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080A9DBC @ =gUnk_08129BEC
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -9554,7 +9554,7 @@ _080A9E60:
 _080A9E78:
 	ldr r4, _080A9E90 @ =gUnk_08129C7C
 	adds r0, r5, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -10276,7 +10276,7 @@ sub_080AA400: @ 0x080AA400
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080AA418 @ =gUnk_08129FB8
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -10612,7 +10612,7 @@ sub_080AA68C: @ 0x080AA68C
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080AA6A4 @ =gUnk_0812A014
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -11188,7 +11188,7 @@ sub_080AAAE8: @ 0x080AAAE8
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080AAB00 @ =gUnk_0812A3C0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -11331,7 +11331,7 @@ sub_080AABF0: @ 0x080AABF0
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080AAC08 @ =gUnk_0812A418
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -12236,7 +12236,7 @@ sub_080AB2A8: @ 0x080AB2A8
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080AB2C0 @ =gUnk_0812A4C8
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -12548,7 +12548,7 @@ sub_080AB510: @ 0x080AB510
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080AB528 @ =gUnk_0812A58C
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -13437,7 +13437,7 @@ sub_080ABB8C: @ 0x080ABB8C
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080ABBA4 @ =gUnk_0812A7D4
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -13903,7 +13903,7 @@ sub_080ABF24: @ 0x080ABF24
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080ABF3C @ =gUnk_0812A84C
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -13973,7 +13973,7 @@ sub_080ABFB0: @ 0x080ABFB0
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080ABFC8 @ =gUnk_0812A954
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -15180,7 +15180,7 @@ sub_080AC8A8: @ 0x080AC8A8
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080AC8C0 @ =gUnk_0812A9D8
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
@@ -15382,7 +15382,7 @@ sub_080ACA34: @ 0x080ACA34
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080ACA4C @ =gUnk_0812AA5C
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/crow.s b/asm/crow.s
index 0001b378..1175197f 100644
--- a/asm/crow.s
+++ b/asm/crow.s
@@ -12,7 +12,7 @@ Crow: @ 0x080327F4
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _0803280C @ =gUnk_080CE978
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/cuccoAggr.s b/asm/cuccoAggr.s
index d2683c94..e6bb9f84 100644
--- a/asm/cuccoAggr.s
+++ b/asm/cuccoAggr.s
@@ -27,7 +27,7 @@ _08038CC4: .4byte gUnk_080012C8
 _08038CC8:
 	ldr r4, _08038CF4 @ =gUnk_080CF778
 	adds r0, r5, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/cuccoChickAggr.s b/asm/cuccoChickAggr.s
index c32f8704..5755667c 100644
--- a/asm/cuccoChickAggr.s
+++ b/asm/cuccoChickAggr.s
@@ -12,7 +12,7 @@ CuccoChickAggr: @ 0x08022918
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _08022930 @ =gUnk_080CBB64
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/doorMimic.s b/asm/doorMimic.s
index c2fc2c79..210e6853 100644
--- a/asm/doorMimic.s
+++ b/asm/doorMimic.s
@@ -12,7 +12,7 @@ DoorMimic: @ 0x08021FA8
 	push {r4, r5, lr}
 	adds r4, r0, #0
 	ldr r5, _08021FD4 @ =gUnk_080CB734
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r5
 	ldr r1, [r0]
diff --git a/asm/dust.s b/asm/dust.s
index aedf1019..9ca3ee56 100644
--- a/asm/dust.s
+++ b/asm/dust.s
@@ -12,7 +12,7 @@ Dust: @ 0x08044118
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _08044130 @ =gUnk_080D1588
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/enemy50.s b/asm/enemy50.s
index ea313bbc..e3eba6bf 100644
--- a/asm/enemy50.s
+++ b/asm/enemy50.s
@@ -33,7 +33,7 @@ _08040B4E:
 _08040B5C:
 	ldr r4, _08040B80 @ =gUnk_080D0DC4
 	adds r0, r5, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/enemy62.s b/asm/enemy62.s
index 4df37992..29d3f30b 100644
--- a/asm/enemy62.s
+++ b/asm/enemy62.s
@@ -19,7 +19,7 @@ Enemy62: @ 0x08048D98
 _08048DA8:
 	ldr r4, _08048E00 @ =gUnk_080D22D8
 	adds r0, r5, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/figurineDevice.s b/asm/figurineDevice.s
index 93dbc017..cc17c5a3 100644
--- a/asm/figurineDevice.s
+++ b/asm/figurineDevice.s
@@ -1352,7 +1352,7 @@ _080885E8:
 	movs r0, #0x3e
 	movs r1, #0
 	movs r2, #0
-	bl sub_080A7C00
+	bl CreateItemEntity
 	movs r0, #0x59
 	bl SetGlobalFlag
 _0808860A:
diff --git a/asm/flyingPot.s b/asm/flyingPot.s
index 9a313860..ebe75329 100644
--- a/asm/flyingPot.s
+++ b/asm/flyingPot.s
@@ -27,7 +27,7 @@ _0803706C: .4byte gUnk_080012C8
 _08037070:
 	ldr r4, _08037088 @ =gUnk_080CF244
 	adds r0, r5, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/flyingSkull.s b/asm/flyingSkull.s
index 12ff421f..0c0f04d8 100644
--- a/asm/flyingSkull.s
+++ b/asm/flyingSkull.s
@@ -27,7 +27,7 @@ _08039BC0: .4byte gUnk_080012C8
 _08039BC4:
 	ldr r4, _08039BDC @ =gUnk_080CFB84
 	adds r0, r5, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/ghini.s b/asm/ghini.s
index 3c96a7e7..d28047dd 100644
--- a/asm/ghini.s
+++ b/asm/ghini.s
@@ -12,7 +12,7 @@ Ghini: @ 0x0803EFDC
 	push {r4, r5, lr}
 	adds r4, r0, #0
 	ldr r5, _0803F004 @ =gUnk_080D0924
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r5
 	ldr r1, [r0]
diff --git a/asm/gleerok.s b/asm/gleerok.s
index 21b19d00..5c977940 100644
--- a/asm/gleerok.s
+++ b/asm/gleerok.s
@@ -12,7 +12,7 @@ Gleerok: @ 0x0802D018
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _0802D030 @ =gUnk_080CD748
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/gyorgChild.s b/asm/gyorgChild.s
index 37ab7824..3bd94177 100644
--- a/asm/gyorgChild.s
+++ b/asm/gyorgChild.s
@@ -30,7 +30,7 @@ GyorgChild: @ 0x08048640
 _08048664:
 	ldr r4, _08048680 @ =gUnk_080D1E6C
 	adds r0, r5, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/gyorgFemaleEye.s b/asm/gyorgFemaleEye.s
index 9b3ebc72..294cd90b 100644
--- a/asm/gyorgFemaleEye.s
+++ b/asm/gyorgFemaleEye.s
@@ -19,7 +19,7 @@ GyorgFemaleEye: @ 0x08048988
 _08048998:
 	ldr r4, _080489B0 @ =gUnk_080D1F64
 	adds r0, r5, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/heartContainer.s b/asm/heartContainer.s
index 8e6cecef..747f1932 100644
--- a/asm/heartContainer.s
+++ b/asm/heartContainer.s
@@ -143,7 +143,7 @@ sub_0808E764: @ 0x0808E764
 	movs r0, #0x62
 	movs r1, #0
 	movs r2, #0
-	bl sub_080A7C00
+	bl CreateItemEntity
 	bl DeleteThisEntity
 _0808E79A:
 	pop {r4, pc}
diff --git a/asm/itemOnGround.s b/asm/itemOnGround.s
index a661c914..b48bbb9f 100644
--- a/asm/itemOnGround.s
+++ b/asm/itemOnGround.s
@@ -1337,7 +1337,7 @@ _08081438:
 	ldrb r0, [r4, #0xa]
 	ldrb r1, [r4, #0xb]
 	movs r2, #0
-	bl sub_080A7C00
+	bl CreateItemEntity
 	movs r0, #1
 _0808144C:
 	pop {r4, pc}
diff --git a/asm/keese.s b/asm/keese.s
index 51dcdfcc..0fd55b50 100644
--- a/asm/keese.s
+++ b/asm/keese.s
@@ -12,7 +12,7 @@ Keese: @ 0x08021D64
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _08021D7C @ =gUnk_080CB69C
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/lakituCloud.s b/asm/lakituCloud.s
index e6cb8f9c..69a60a52 100644
--- a/asm/lakituCloud.s
+++ b/asm/lakituCloud.s
@@ -12,7 +12,7 @@ LakituCloud: @ 0x0803CCB8
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _0803CCD0 @ =gUnk_080D0418
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/madderpillar.s b/asm/madderpillar.s
index 8afb6739..77093d9d 100644
--- a/asm/madderpillar.s
+++ b/asm/madderpillar.s
@@ -25,7 +25,7 @@ sub_08029870: @ 0x08029870
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _08029888 @ =gUnk_080CCD60
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/mazaalBracelet.s b/asm/mazaalBracelet.s
index 691f7bbb..ac265753 100644
--- a/asm/mazaalBracelet.s
+++ b/asm/mazaalBracelet.s
@@ -12,7 +12,7 @@ MazaalBracelet: @ 0x0803A154
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _0803A16C @ =gUnk_080CFC14
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/mazaalHead.s b/asm/mazaalHead.s
index 77bd1540..ab086909 100644
--- a/asm/mazaalHead.s
+++ b/asm/mazaalHead.s
@@ -12,7 +12,7 @@ MazaalHead: @ 0x08033ED4
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _08033EEC @ =gUnk_080CEC88
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/mazaalMacro.s b/asm/mazaalMacro.s
index 7e49f777..518c8047 100644
--- a/asm/mazaalMacro.s
+++ b/asm/mazaalMacro.s
@@ -12,7 +12,7 @@ MazaalMacro: @ 0x08034C60
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _08034C78 @ =gUnk_080CEE90
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/object1C.s b/asm/object1C.s
deleted file mode 100644
index 59ea0ca7..00000000
--- a/asm/object1C.s
+++ /dev/null
@@ -1,43 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Object1C
-Object1C: @ 0x080874A0
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xc]
-	cmp r0, #0
-	bne _080874AE
-	movs r0, #1
-	strb r0, [r4, #0xc]
-_080874AE:
-	adds r0, r4, #0
-	adds r0, #0x80
-	movs r1, #0
-	ldrsh r0, [r0, r1]
-	adds r1, r4, #0
-	adds r1, #0x82
-	movs r2, #0
-	ldrsh r1, [r1, r2]
-	movs r2, #0x10
-	movs r3, #0x10
-	bl CheckRectOnScreen
-	cmp r0, #0
-	bne _080874DC
-	ldr r2, [r4, #0x50]
-	movs r1, #1
-	ldrb r4, [r4, #0xb]
-	lsls r1, r4
-	ldr r0, [r2, #0x20]
-	bics r0, r1
-	str r0, [r2, #0x20]
-	bl DeleteThisEntity
-_080874DC:
-	pop {r4, pc}
-	.align 2, 0
diff --git a/asm/object1D.s b/asm/object1D.s
deleted file mode 100644
index 7dc93cd3..00000000
--- a/asm/object1D.s
+++ /dev/null
@@ -1,32 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Object1D
-Object1D: @ 0x080874E0
-	push {lr}
-	ldr r2, _080874F4 @ =gUnk_081208A0
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_080874F4: .4byte gUnk_081208A0
-
-	thumb_func_start sub_080874F8
-sub_080874F8: @ 0x080874F8
-	push {lr}
-	bl DeleteThisEntity
-	pop {pc}
-
-	thumb_func_start nullsub_117
-nullsub_117: @ 0x08087500
-	bx lr
-	.align 2, 0
diff --git a/asm/object30.s b/asm/object30.s
index 2316dc9d..c89903a3 100644
--- a/asm/object30.s
+++ b/asm/object30.s
@@ -151,7 +151,7 @@ _0808A954:
 	ldrb r1, [r4, #0xb]
 	movs r0, #0x5c
 	movs r2, #0
-	bl sub_080A7C00
+	bl CreateItemEntity
 	bl DeleteThisEntity
 _0808A962:
 	pop {r4, pc}
diff --git a/asm/object6A.s b/asm/object6A.s
index 205d1840..f9105e1a 100644
--- a/asm/object6A.s
+++ b/asm/object6A.s
@@ -812,7 +812,7 @@ _08095040:
 	movs r0, #0x1c
 	movs r1, #0
 	movs r2, #0
-	bl sub_080A7C00
+	bl CreateItemEntity
 	movs r0, #0x5b
 	bl SetGlobalFlag
 	movs r0, #0x3c
@@ -897,7 +897,7 @@ _080950F0:
 	movs r0, #0x5b
 	movs r1, #0
 	movs r2, #0
-	bl sub_080A7C00
+	bl CreateItemEntity
 	bl DeleteThisEntity
 _0809510A:
 	ldrb r4, [r5, #0xa]
diff --git a/asm/object96.s b/asm/object96.s
index 6e13a445..dab90295 100644
--- a/asm/object96.s
+++ b/asm/object96.s
@@ -195,7 +195,7 @@ _0809D8E8:
 	ldrb r0, [r6, #0xd]
 	ldrb r1, [r5, #0xb]
 	movs r2, #0
-	bl sub_080A7C00
+	bl CreateItemEntity
 	ldrh r0, [r6, #0x1c]
 	cmp r0, #0
 	beq _0809D906
diff --git a/asm/objectA8.s b/asm/objectA8.s
index 9849694e..39a853be 100644
--- a/asm/objectA8.s
+++ b/asm/objectA8.s
@@ -6,86 +6,6 @@
 
 	.text
 
-
-	thumb_func_start ObjectA8
-ObjectA8: @ 0x0809F9DC
-	push {r4, lr}
-	adds r4, r0, #0
-	adds r0, #0x41
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _0809FA9A
-	movs r0, #0x7f
-	ands r0, r1
-	cmp r0, #0x1f
-	bhi _0809FA9A
-	lsls r0, r0, #2
-	ldr r1, _0809FA00 @ =_0809FA04
-	adds r0, r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0809FA00: .4byte _0809FA04
-_0809FA04: @ jump table
-	.4byte _0809FA84 @ case 0
-	.4byte _0809FA84 @ case 1
-	.4byte _0809FA9A @ case 2
-	.4byte _0809FA9A @ case 3
-	.4byte _0809FA84 @ case 4
-	.4byte _0809FA84 @ case 5
-	.4byte _0809FA84 @ case 6
-	.4byte _0809FA9A @ case 7
-	.4byte _0809FA84 @ case 8
-	.4byte _0809FA84 @ case 9
-	.4byte _0809FA84 @ case 10
-	.4byte _0809FA84 @ case 11
-	.4byte _0809FA84 @ case 12
-	.4byte _0809FA9A @ case 13
-	.4byte _0809FA9A @ case 14
-	.4byte _0809FA9A @ case 15
-	.4byte _0809FA9A @ case 16
-	.4byte _0809FA9A @ case 17
-	.4byte _0809FA9A @ case 18
-	.4byte _0809FA9A @ case 19
-	.4byte _0809FA9A @ case 20
-	.4byte _0809FA9A @ case 21
-	.4byte _0809FA9A @ case 22
-	.4byte _0809FA9A @ case 23
-	.4byte _0809FA9A @ case 24
-	.4byte _0809FA9A @ case 25
-	.4byte _0809FA9A @ case 26
-	.4byte _0809FA9A @ case 27
-	.4byte _0809FA9A @ case 28
-	.4byte _0809FA9A @ case 29
-	.4byte _0809FA84 @ case 30
-	.4byte _0809FA84 @ case 31
-_0809FA84:
-	movs r0, #5
-	strb r0, [r4, #0xc]
-	ldr r0, _0809FAB4 @ =gLinkEntity
-	str r0, [r4, #0x54]
-	ldrb r0, [r4, #0xa]
-	movs r1, #0
-	movs r2, #0
-	bl sub_080A7C00
-	bl DeleteThisEntity
-_0809FA9A:
-	ldr r0, _0809FAB8 @ =gUnk_08124824
-	ldrb r1, [r4, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r0
-	ldr r1, [r1]
-	adds r0, r4, #0
-	bl _call_via_r1
-	adds r0, r4, #0
-	bl sub_08080CB4
-	pop {r4, pc}
-	.align 2, 0
-_0809FAB4: .4byte gLinkEntity
-_0809FAB8: .4byte gUnk_08124824
-
 	thumb_func_start sub_0809FABC
 sub_0809FABC: @ 0x0809FABC
 	push {lr}
diff --git a/asm/octorokBoss.s b/asm/octorokBoss.s
index e2fb8a96..75068ea8 100644
--- a/asm/octorokBoss.s
+++ b/asm/octorokBoss.s
@@ -12,7 +12,7 @@ OctorokBoss: @ 0x080351BC
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _080351D4 @ =gUnk_080CF040
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/octorokGolden.s b/asm/octorokGolden.s
index 05713658..4908da57 100644
--- a/asm/octorokGolden.s
+++ b/asm/octorokGolden.s
@@ -26,7 +26,7 @@ _08037C58: .4byte gUnk_080012C8
 _08037C5C:
 	ldr r4, _08037C80 @ =gUnk_080CF46C
 	adds r0, r5, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/pesto.s b/asm/pesto.s
index e4fa8202..92aaa8c8 100644
--- a/asm/pesto.s
+++ b/asm/pesto.s
@@ -12,7 +12,7 @@ Pesto: @ 0x08023F28
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _08023F40 @ =gUnk_080CBEC4
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/ropeGolden.s b/asm/ropeGolden.s
index 6f75451b..33e71afb 100644
--- a/asm/ropeGolden.s
+++ b/asm/ropeGolden.s
@@ -27,7 +27,7 @@ _080381CC: .4byte gUnk_080012C8
 _080381D0:
 	ldr r4, _080381F4 @ =gUnk_080CF4C8
 	adds r0, r5, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/rupeeLike.s b/asm/rupeeLike.s
index 74b1e2f9..8794d88d 100644
--- a/asm/rupeeLike.s
+++ b/asm/rupeeLike.s
@@ -33,7 +33,7 @@ _080292C4:
 _080292CE:
 	ldr r4, _080292F4 @ =gUnk_080CCC00
 	adds r0, r5, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/sluggula.s b/asm/sluggula.s
index 8a4f7baf..5727894a 100644
--- a/asm/sluggula.s
+++ b/asm/sluggula.s
@@ -44,7 +44,7 @@ _08023BD4: .4byte gUnk_080012C8
 _08023BD8:
 	ldr r4, _08023BFC @ =gUnk_080CBDD4
 	adds r0, r5, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/smallPesto.s b/asm/smallPesto.s
index eaada49e..5a9c1156 100644
--- a/asm/smallPesto.s
+++ b/asm/smallPesto.s
@@ -6,109 +6,6 @@
 
 	.text
 
-
-	thumb_func_start SmallPesto
-SmallPesto: @ 0x08031664
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	ldr r4, _0803167C @ =gUnk_080CE530
-	bl sub_0800279C
-	lsls r0, r0, #2
-	adds r0, r0, r4
-	ldr r1, [r0]
-	adds r0, r5, #0
-	bl _call_via_r1
-	pop {r4, r5, pc}
-	.align 2, 0
-_0803167C: .4byte gUnk_080CE530
-
-	thumb_func_start sub_08031680
-sub_08031680: @ 0x08031680
-	push {lr}
-	ldr r2, _08031694 @ =gUnk_080CE548
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_08031694: .4byte gUnk_080CE548
-
-	thumb_func_start nullsub_152
-nullsub_152: @ 0x08031698
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_0803169C
-sub_0803169C: @ 0x0803169C
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_08004274
-	adds r0, r4, #0
-	bl sub_0806F520
-	cmp r0, #0
-	bne _080316C4
-	movs r2, #1
-	strb r2, [r4, #0xc]
-	strb r0, [r4, #0xd]
-	ldrb r1, [r4, #0x10]
-	movs r0, #0x80
-	orrs r0, r1
-	strb r0, [r4, #0x10]
-	movs r0, #0x40
-	strh r0, [r4, #0x24]
-	strb r2, [r4, #0xf]
-	b _080316D4
-_080316C4:
-	ldr r0, _080316D8 @ =gUnk_080CE554
-	ldrb r1, [r4, #0xd]
-	lsls r1, r1, #2
-	adds r1, r1, r0
-	ldr r1, [r1]
-	adds r0, r4, #0
-	bl _call_via_r1
-_080316D4:
-	pop {r4, pc}
-	.align 2, 0
-_080316D8: .4byte gUnk_080CE554
-
-	thumb_func_start sub_080316DC
-sub_080316DC: @ 0x080316DC
-	movs r1, #1
-	strb r1, [r0, #0xd]
-	movs r1, #0x3c
-	strb r1, [r0, #0x1d]
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_080316E8
-sub_080316E8: @ 0x080316E8
-	push {lr}
-	bl sub_0806F4E8
-	pop {pc}
-
-	thumb_func_start sub_080316F0
-sub_080316F0: @ 0x080316F0
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0806F3E4
-	cmp r0, #0
-	beq _08031702
-	adds r0, r4, #0
-	bl sub_0804A7D4
-_08031702:
-	pop {r4, pc}
-
-	thumb_func_start sub_08031704
-sub_08031704: @ 0x08031704
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0804A720
-	adds r0, r4, #0
-	bl sub_080317F8
-	pop {r4, pc}
-
 	thumb_func_start sub_08031714
 sub_08031714: @ 0x08031714
 	push {r4, lr}
diff --git a/asm/spark.s b/asm/spark.s
index feff0898..d914dd9d 100644
--- a/asm/spark.s
+++ b/asm/spark.s
@@ -12,7 +12,7 @@ Spark: @ 0x0802B2AC
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _0802B2C4 @ =gUnk_080CD234
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/stockwell.s b/asm/stockwell.s
index ad2b1fa7..44d43e42 100644
--- a/asm/stockwell.s
+++ b/asm/stockwell.s
@@ -334,7 +334,7 @@ sub_080652B0: @ 0x080652B0
 	movs r0, #0x36
 	movs r1, #0
 	movs r2, #0
-	bl sub_080A7C00
+	bl CreateItemEntity
 _080652DA:
 	pop {pc}
 	.align 2, 0
diff --git a/asm/sub_0804AA30.s b/asm/sub_0804AA30.s
index 0182681d..9360eece 100644
--- a/asm/sub_0804AA30.s
+++ b/asm/sub_0804AA30.s
@@ -17,7 +17,7 @@ sub_0804AA30: @ 0x0804AA30
 	ands r0, r1
 	strb r0, [r6]
 	adds r0, r4, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	ldrb r2, [r6]
 	movs r1, #0x80
 	orrs r1, r2
diff --git a/asm/takkuri.s b/asm/takkuri.s
index 0208a37a..0ceec3a5 100644
--- a/asm/takkuri.s
+++ b/asm/takkuri.s
@@ -12,7 +12,7 @@ Takkuri: @ 0x0803BB7C
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _0803BB94 @ =gUnk_080CFF3C
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/vaatiArm.s b/asm/vaatiArm.s
index 9c1dd320..4bf6ef42 100644
--- a/asm/vaatiArm.s
+++ b/asm/vaatiArm.s
@@ -12,7 +12,7 @@ VaatiArm: @ 0x08042554
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	ldr r4, _0804256C @ =gUnk_080D1230
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/vaatiEyesMacro.s b/asm/vaatiEyesMacro.s
index 517d704c..dc8f3005 100644
--- a/asm/vaatiEyesMacro.s
+++ b/asm/vaatiEyesMacro.s
@@ -12,7 +12,7 @@ VaatiEyesMacro: @ 0x0802EC6C
 	push {r4, r5, lr}
 	adds r4, r0, #0
 	ldr r5, _0802EC94 @ =gUnk_080CDE34
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r5
 	ldr r1, [r0]
diff --git a/asm/vaatiProjectile.s b/asm/vaatiProjectile.s
index b97a1adf..46cd8c40 100644
--- a/asm/vaatiProjectile.s
+++ b/asm/vaatiProjectile.s
@@ -26,7 +26,7 @@ VaatiProjectile: @ 0x0803E08C
 _0803E0AA:
 	ldr r4, _0803E0C0 @ =gUnk_080D0648
 	adds r0, r5, #0
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r1, [r0]
diff --git a/asm/wallMaster.s b/asm/wallMaster.s
index 34d06403..8afe932c 100644
--- a/asm/wallMaster.s
+++ b/asm/wallMaster.s
@@ -12,7 +12,7 @@ WallMaster: @ 0x0802A408
 	push {r4, r5, lr}
 	adds r4, r0, #0
 	ldr r5, _0802A430 @ =gUnk_080CD07C
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r5
 	ldr r1, [r0]
diff --git a/asm/wallMaster2.s b/asm/wallMaster2.s
index 4504a130..bf87a4e4 100644
--- a/asm/wallMaster2.s
+++ b/asm/wallMaster2.s
@@ -12,7 +12,7 @@ WallMaster2: @ 0x0802CC3C
 	push {r4, r5, lr}
 	adds r4, r0, #0
 	ldr r5, _0802CC64 @ =gUnk_080CD6FC
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r5
 	ldr r1, [r0]
diff --git a/asm/wizzrobeFire.s b/asm/wizzrobeFire.s
index 1b2ddc3c..f1f59e33 100644
--- a/asm/wizzrobeFire.s
+++ b/asm/wizzrobeFire.s
@@ -12,7 +12,7 @@ WizzrobeFire: @ 0x0802FB30
 	push {r4, r5, lr}
 	adds r4, r0, #0
 	ldr r5, _0802FB58 @ =gUnk_080CDFC4
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r5
 	ldr r1, [r0]
diff --git a/asm/wizzrobeIce.s b/asm/wizzrobeIce.s
index 24ed7713..82fc0f89 100644
--- a/asm/wizzrobeIce.s
+++ b/asm/wizzrobeIce.s
@@ -12,7 +12,7 @@ WizzrobeIce: @ 0x0802FDD4
 	push {r4, r5, lr}
 	adds r4, r0, #0
 	ldr r5, _0802FDFC @ =gUnk_080CE074
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r5
 	ldr r1, [r0]
diff --git a/asm/wizzrobeWind.s b/asm/wizzrobeWind.s
index 42840110..50a0edde 100644
--- a/asm/wizzrobeWind.s
+++ b/asm/wizzrobeWind.s
@@ -12,7 +12,7 @@ WizzrobeWind: @ 0x0802F4A0
 	push {r4, r5, lr}
 	adds r4, r0, #0
 	ldr r5, _0802F4C8 @ =gUnk_080CDF50
-	bl sub_0800279C
+	bl GetNextFunction
 	lsls r0, r0, #2
 	adds r0, r0, r5
 	ldr r1, [r0]
diff --git a/data/ddump b/data/ddump
new file mode 100755
index 00000000..453db075
Binary files /dev/null and b/data/ddump differ
diff --git a/data/gfx.ddscript b/data/gfx.ddscript
new file mode 100644
index 00000000..2a633998
--- /dev/null
+++ b/data/gfx.ddscript
@@ -0,0 +1,2 @@
+$data :
+.data $data
\ No newline at end of file
diff --git a/data/ptr_array.ddscript b/data/ptr_array.ddscript
new file mode 100755
index 00000000..336e382d
--- /dev/null
+++ b/data/ptr_array.ddscript
@@ -0,0 +1,2 @@
+$ptr :4 int:4 checkptr:1
+.4byte $*ptr
\ No newline at end of file
diff --git a/linker.ld b/linker.ld
index 59d907ed..3127916e 100644
--- a/linker.ld
+++ b/linker.ld
@@ -364,6 +364,7 @@ SECTIONS {
 		asm/armos.o(.text);
 		asm/eyegore.o(.text);
 		asm/rope.o(.text);
+		src/smallPesto.o(.text);
 		asm/smallPesto.o(.text);
 		asm/acroBandits.o(.text);
 		src/bladeTrap.o(.text);
@@ -613,8 +614,8 @@ SECTIONS {
 		src/object1A.o(.text);
 		src/greatFairy.o(.text);
 		asm/greatFairy.o(.text);
-		asm/object1C.o(.text);
-		asm/object1D.o(.text);
+		src/object1C.o(.text);
+		src/object1D.o(.text);
 		asm/object1E.o(.text);
 		asm/object1F.o(.text);
 		asm/object20.o(.text);
@@ -754,6 +755,7 @@ SECTIONS {
 		asm/objectA5.o(.text);
 		asm/objectA6.o(.text);
 		asm/objectA7.o(.text);
+		src/objectA8.o(.text);
 		asm/objectA8.o(.text);
 		asm/objectA9.o(.text);
 		asm/waterfallOpening.o(.text);
diff --git a/src/object1C.c b/src/object1C.c
new file mode 100644
index 00000000..333420b6
--- /dev/null
+++ b/src/object1C.c
@@ -0,0 +1,19 @@
+#include "global.h"
+#include "entity.h"
+
+extern u32 CheckRectOnScreen(s16, s16, u32, u32);
+extern void DeleteThisEntity();
+
+void Object1C(Entity *this)
+{
+  s32 iVar1;
+  
+  if (this->action == 0) {
+    this->action = 1;
+  }
+  iVar1 = CheckRectOnScreen(this->field_0x80, this->field_0x82, 0x10, 0x10);
+  if (iVar1 == 0) {
+    this->parent->field_0x20 &= ~(1 << this->entityType.parameter2);
+    DeleteThisEntity();
+  }
+}
\ No newline at end of file
diff --git a/src/object1D.c b/src/object1D.c
new file mode 100644
index 00000000..a31c355a
--- /dev/null
+++ b/src/object1D.c
@@ -0,0 +1,18 @@
+#include "global.h"
+#include "entity.h"
+
+void DeleteThisEntity();
+
+extern void (*gUnk_081208A0[])(Entity*);
+
+void Object1D(Entity *this)
+{
+  gUnk_081208A0[this->action](this);
+}
+
+void sub_080874F8(Entity* this)
+{
+  DeleteThisEntity();
+}
+
+void nullsub_117(){}
\ No newline at end of file
diff --git a/src/objectA8.c b/src/objectA8.c
new file mode 100644
index 00000000..b1fdc6a7
--- /dev/null
+++ b/src/objectA8.c
@@ -0,0 +1,36 @@
+#include "global.h"
+#include "entity.h"
+
+extern void CreateItemEntity(u32, u32, u32);
+extern void DeleteThisEntity();
+extern void sub_08080CB4(Entity*);
+
+extern void (*gUnk_08124824[])(Entity*);
+
+extern Entity gLinkEntity;
+
+void ObjectA8(Entity *this)
+{
+  if ((this->bitfield & 0x80) != 0) {
+    switch(this->bitfield & 0x7f) {
+    case 0:
+    case 1:
+    case 4:
+    case 5:
+    case 6:
+    case 8:
+    case 9:
+    case 10:
+    case 0xb:
+    case 0xc:
+    case 0x1e:
+    case 0x1f:
+      this->action = 5;
+      this->attachedEntity = &gLinkEntity;
+      CreateItemEntity((this->entityType).parameter1, 0, 0);
+      DeleteThisEntity();
+    }
+  }
+  gUnk_08124824[this->action](this);
+  sub_08080CB4(this);
+}
\ No newline at end of file
diff --git a/src/smallPesto.c b/src/smallPesto.c
new file mode 100644
index 00000000..0fe534a2
--- /dev/null
+++ b/src/smallPesto.c
@@ -0,0 +1,69 @@
+#include "global.h"
+#include "entity.h"
+
+extern u32 GetNextFunction(Entity*);
+extern u32 sub_08004274(Entity*);
+extern u32 sub_0806F520(Entity*);
+extern void sub_0806F4E8(Entity*);
+extern u32 sub_0806F3E4();
+extern void sub_0804A7D4(Entity*);
+extern void sub_0804A720(Entity*);
+extern void sub_080317F8(Entity*);
+
+extern void (*gUnk_080CE530[])(Entity*);
+extern void (*gUnk_080CE548[])(Entity*);
+extern void (*gUnk_080CE554[])(Entity*);
+
+void SmallPesto(Entity *this)
+{
+  gUnk_080CE530[GetNextFunction(this)](this);
+}
+
+void sub_08031680(Entity *this)
+{
+  gUnk_080CE548[this->action](this);
+}
+
+void nullsub_152(){}
+
+void sub_0803169C(Entity *this)
+{
+  s32 iVar1;
+  
+  sub_08004274(this);
+  iVar1 = sub_0806F520(this);
+  if (iVar1 == 0) {
+    this->action = 1;
+    this->previousActionFlag = 0;
+    this->flags = this->flags | 0x80;
+    this->nonPlanarMovement = 0x40;
+    this->field_0xf = 1;
+  }
+  else {
+    gUnk_080CE554[this->previousActionFlag](this);
+  }
+}
+
+void sub_080316DC(Entity *this)
+{
+  this->previousActionFlag = 1;
+  this->filler[1] = 0x3c;
+}
+
+void sub_080316E8(Entity *this)
+{
+    sub_0806F4E8(this);
+}
+
+void sub_080316F0(Entity *this)
+{
+  if (sub_0806F3E4()) {
+    sub_0804A7D4(this);
+  }
+}
+
+void sub_08031704(Entity *this)
+{
+  sub_0804A720(this);
+  sub_080317F8(this);
+}
\ No newline at end of file
diff --git a/tools/aif2pcm/.gitignore b/tools/aif2pcm/.gitignore
old mode 100644
new mode 100755
diff --git a/tools/aif2pcm/LICENSE b/tools/aif2pcm/LICENSE
old mode 100644
new mode 100755
diff --git a/tools/aif2pcm/Makefile b/tools/aif2pcm/Makefile
old mode 100644
new mode 100755
diff --git a/tools/aif2pcm/extended.c b/tools/aif2pcm/extended.c
old mode 100644
new mode 100755
diff --git a/tools/aif2pcm/main.c b/tools/aif2pcm/main.c
old mode 100644
new mode 100755
diff --git a/tools/bin2c/.gitignore b/tools/bin2c/.gitignore
old mode 100644
new mode 100755
diff --git a/tools/bin2c/LICENSE b/tools/bin2c/LICENSE
old mode 100644
new mode 100755
diff --git a/tools/bin2c/Makefile b/tools/bin2c/Makefile
old mode 100644
new mode 100755
diff --git a/tools/bin2c/bin2c.c b/tools/bin2c/bin2c.c
old mode 100644
new mode 100755
diff --git a/tools/gbafix/.gitignore b/tools/gbafix/.gitignore
old mode 100644
new mode 100755
diff --git a/tools/gbafix/COPYING b/tools/gbafix/COPYING
old mode 100644
new mode 100755
diff --git a/tools/gbafix/Makefile b/tools/gbafix/Makefile
old mode 100644
new mode 100755
diff --git a/tools/gbafix/elf.h b/tools/gbafix/elf.h
old mode 100644
new mode 100755
diff --git a/tools/gbafix/gbafix.c b/tools/gbafix/gbafix.c
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/.gitignore b/tools/gbagfx/.gitignore
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/LICENSE b/tools/gbagfx/LICENSE
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/Makefile b/tools/gbagfx/Makefile
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/convert_png.c b/tools/gbagfx/convert_png.c
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/convert_png.h b/tools/gbagfx/convert_png.h
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/font.c b/tools/gbagfx/font.c
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/font.h b/tools/gbagfx/font.h
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/gfx.c b/tools/gbagfx/gfx.c
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/gfx.h b/tools/gbagfx/gfx.h
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/global.h b/tools/gbagfx/global.h
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/huff.c b/tools/gbagfx/huff.c
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/huff.h b/tools/gbagfx/huff.h
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/jasc_pal.c b/tools/gbagfx/jasc_pal.c
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/jasc_pal.h b/tools/gbagfx/jasc_pal.h
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/lz.c b/tools/gbagfx/lz.c
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/lz.h b/tools/gbagfx/lz.h
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/main.c b/tools/gbagfx/main.c
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/options.h b/tools/gbagfx/options.h
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/rl.c b/tools/gbagfx/rl.c
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/rl.h b/tools/gbagfx/rl.h
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/util.c b/tools/gbagfx/util.c
old mode 100644
new mode 100755
diff --git a/tools/gbagfx/util.h b/tools/gbagfx/util.h
old mode 100644
new mode 100755
diff --git a/tools/mid2agb/.gitignore b/tools/mid2agb/.gitignore
old mode 100644
new mode 100755
diff --git a/tools/mid2agb/LICENSE b/tools/mid2agb/LICENSE
old mode 100644
new mode 100755
diff --git a/tools/mid2agb/Makefile b/tools/mid2agb/Makefile
old mode 100644
new mode 100755
diff --git a/tools/mid2agb/agb.cpp b/tools/mid2agb/agb.cpp
old mode 100644
new mode 100755
diff --git a/tools/mid2agb/agb.h b/tools/mid2agb/agb.h
old mode 100644
new mode 100755
diff --git a/tools/mid2agb/error.cpp b/tools/mid2agb/error.cpp
old mode 100644
new mode 100755
diff --git a/tools/mid2agb/error.h b/tools/mid2agb/error.h
old mode 100644
new mode 100755
diff --git a/tools/mid2agb/main.cpp b/tools/mid2agb/main.cpp
old mode 100644
new mode 100755
diff --git a/tools/mid2agb/main.h b/tools/mid2agb/main.h
old mode 100644
new mode 100755
diff --git a/tools/mid2agb/midi.cpp b/tools/mid2agb/midi.cpp
old mode 100644
new mode 100755
diff --git a/tools/mid2agb/midi.h b/tools/mid2agb/midi.h
old mode 100644
new mode 100755
diff --git a/tools/mid2agb/tables.cpp b/tools/mid2agb/tables.cpp
old mode 100644
new mode 100755
diff --git a/tools/mid2agb/tables.h b/tools/mid2agb/tables.h
old mode 100644
new mode 100755
diff --git a/tools/preproc/.gitignore b/tools/preproc/.gitignore
old mode 100644
new mode 100755
diff --git a/tools/preproc/LICENSE b/tools/preproc/LICENSE
old mode 100644
new mode 100755
diff --git a/tools/preproc/Makefile b/tools/preproc/Makefile
old mode 100644
new mode 100755
diff --git a/tools/preproc/asm_file.cpp b/tools/preproc/asm_file.cpp
old mode 100644
new mode 100755
diff --git a/tools/preproc/asm_file.h b/tools/preproc/asm_file.h
old mode 100644
new mode 100755
diff --git a/tools/preproc/c_file.cpp b/tools/preproc/c_file.cpp
old mode 100644
new mode 100755
diff --git a/tools/preproc/c_file.h b/tools/preproc/c_file.h
old mode 100644
new mode 100755
diff --git a/tools/preproc/char_util.h b/tools/preproc/char_util.h
old mode 100644
new mode 100755
diff --git a/tools/preproc/charmap.cpp b/tools/preproc/charmap.cpp
old mode 100644
new mode 100755
diff --git a/tools/preproc/charmap.h b/tools/preproc/charmap.h
old mode 100644
new mode 100755
diff --git a/tools/preproc/preproc.cpp b/tools/preproc/preproc.cpp
old mode 100644
new mode 100755
diff --git a/tools/preproc/preproc.h b/tools/preproc/preproc.h
old mode 100644
new mode 100755
diff --git a/tools/preproc/string_parser.cpp b/tools/preproc/string_parser.cpp
old mode 100644
new mode 100755
diff --git a/tools/preproc/string_parser.h b/tools/preproc/string_parser.h
old mode 100644
new mode 100755
diff --git a/tools/preproc/utf8.cpp b/tools/preproc/utf8.cpp
old mode 100644
new mode 100755
diff --git a/tools/preproc/utf8.h b/tools/preproc/utf8.h
old mode 100644
new mode 100755
diff --git a/tools/scaninc/.gitignore b/tools/scaninc/.gitignore
old mode 100644
new mode 100755
diff --git a/tools/scaninc/LICENSE b/tools/scaninc/LICENSE
old mode 100644
new mode 100755
diff --git a/tools/scaninc/Makefile b/tools/scaninc/Makefile
old mode 100644
new mode 100755
diff --git a/tools/scaninc/asm_file.cpp b/tools/scaninc/asm_file.cpp
old mode 100644
new mode 100755
diff --git a/tools/scaninc/asm_file.h b/tools/scaninc/asm_file.h
old mode 100644
new mode 100755
diff --git a/tools/scaninc/c_file.cpp b/tools/scaninc/c_file.cpp
old mode 100644
new mode 100755
diff --git a/tools/scaninc/c_file.h b/tools/scaninc/c_file.h
old mode 100644
new mode 100755
diff --git a/tools/scaninc/scaninc.cpp b/tools/scaninc/scaninc.cpp
old mode 100644
new mode 100755
diff --git a/tools/scaninc/scaninc.h b/tools/scaninc/scaninc.h
old mode 100644
new mode 100755
diff --git a/tools/scaninc/source_file.cpp b/tools/scaninc/source_file.cpp
old mode 100644
new mode 100755
diff --git a/tools/scaninc/source_file.h b/tools/scaninc/source_file.h
old mode 100644
new mode 100755