object2A.c ok

asm/code_08016DF8.s

@@ -296,7 +296,7 @@ _0801702E:
 	ands r0, r1
 	cmp r0, #0
 	beq _08017046
-	bl sub_08077B2C
+	bl ResetLink
 _08017046:
 	ldr r0, [r4, #0x30]
 	movs r1, #0x80
@@ -521,7 +521,7 @@ sub_080171F0: @ 0x080171F0
 	ldrb r0, [r4, #0x1a]
 	cmp r0, #0
 	beq _08017202
-	bl sub_08077B2C
+	bl ResetLink
 _08017202:
 	ldrb r0, [r4, #0x14]
 	cmp r0, #0
@@ -2415,7 +2415,7 @@ _08017FC2:
 	adds r1, #0x3d
 	movs r0, #0xf8
 	strb r0, [r1]
-	bl sub_08077B2C
+	bl ResetLink
 	movs r0, #1
 	b _08018020
 _08018002:

asm/code_08070698.s

@@ -178,7 +178,7 @@ _080707F8:
 _08070800:
 	ldr r0, _08070814 @ =gLinkEntity
 	bl sub_0806F948
-	bl sub_08077B2C
+	bl ResetLink
 	adds r0, r5, #0
 	bl sub_08077698
 	b _08070BE4
@@ -307,7 +307,7 @@ _080708E4:
 	ldrb r0, [r0, #6]
 	cmp r0, #0
 	bne _08070902
-	bl sub_08077B2C
+	bl ResetLink
 _08070902:
 	ldr r0, [r4, #0x30]
 	ands r0, r6
@@ -757,7 +757,7 @@ _08070C7E:
 	rsbs r0, r0, #0
 	ands r0, r1
 	strb r0, [r2]
-	bl sub_08077B2C
+	bl ResetLink
 	bl sub_0807A108
 	movs r0, #0x7b
 	bl PlaySFX
@@ -896,7 +896,7 @@ _08070DA2:
 	movs r0, #0xa6
 	lsls r0, r0, #1
 	bl PlaySFX
-	bl sub_08077B2C
+	bl ResetLink
 	bl sub_08078F60
 	pop {r4, pc}
 	.align 2, 0
@@ -1200,7 +1200,7 @@ _08071004:
 _08071008:
 	movs r0, #1
 	strb r0, [r4, #0xd]
-	bl sub_08077B2C
+	bl ResetLink
 	bl sub_08078F60
 	pop {r4, pc}
 	.align 2, 0
@@ -1303,7 +1303,7 @@ sub_080710A8: @ 0x080710A8
 	ands r3, r0
 	cmp r3, #0
 	bne _080710FA
-	bl sub_08077B2C
+	bl ResetLink
 	ldr r0, [r5, #0x30]
 	movs r1, #8
 	ands r0, r1
@@ -1567,7 +1567,7 @@ _080712E0:
 _080712E2:
 	strh r0, [r5, #8]
 _080712E4:
-	bl sub_08077B2C
+	bl ResetLink
 	pop {r4, r5, pc}
 	.align 2, 0
 _080712EC: .4byte 0x0000044C
@@ -2329,7 +2329,7 @@ _0807189C: .4byte gUnk_0811BAD4
 sub_080718A0: @ 0x080718A0
 	push {r4, r5, lr}
 	adds r4, r0, #0
-	bl sub_08077B2C
+	bl ResetLink
 	ldr r0, _080718EC @ =gUnk_03000B80
 	adds r0, #0x63
 	movs r1, #0
@@ -2846,7 +2846,7 @@ _08071C5A:
 	strb r3, [r2, #6]
 	adds r0, r4, #0
 	bl sub_0800451C
-	bl sub_08077B2C
+	bl ResetLink
 	movs r0, #0x87
 	bl PlaySFX
 _08071C9C:
@@ -3127,7 +3127,7 @@ _08071EAC: .4byte gUnk_0811BB48
 sub_08071EB0: @ 0x08071EB0
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_08077B2C
+	bl ResetLink
 	adds r0, r4, #0
 	movs r1, #0xe
 	bl CreatePlayerBomb
@@ -3367,7 +3367,7 @@ sub_08072064: @ 0x08072064
 	lsls r0, r0, #8
 	orrs r1, r0
 	strh r1, [r2, #8]
-	bl sub_08077B2C
+	bl ResetLink
 	pop {pc}
 	.align 2, 0
 _08072094: .4byte gLinkState
@@ -3478,7 +3478,7 @@ _08072154:
 	lsls r0, r0, #1
 _08072158:
 	strh r0, [r2, #8]
-	bl sub_08077B2C
+	bl ResetLink
 	adds r0, r4, #0
 	bl sub_08072168
 	pop {r4, pc}
@@ -3723,7 +3723,7 @@ _08072332:
 	ldr r1, _08072350 @ =0x00000401
 	orrs r0, r1
 	str r0, [r5, #0x30]
-	bl sub_08077B2C
+	bl ResetLink
 	movs r0, #0x92
 	lsls r0, r0, #1
 	bl PlaySFX
@@ -4132,7 +4132,7 @@ _0807266E:
 	movs r0, #1
 	strb r0, [r4, #0xd]
 	strb r1, [r4, #0xe]
-	bl sub_08077B2C
+	bl ResetLink
 	ldr r3, [r5, #0x30]
 	movs r0, #0x80
 	ands r0, r3
@@ -4626,7 +4626,7 @@ _08072A14:
 	orrs r1, r2
 	ldrb r2, [r6]
 	bl SetTile
-	bl sub_08077B2C
+	bl ResetLink
 	adds r0, r5, #0
 	bl sub_08072A60
 	movs r0, #0x81
@@ -5015,7 +5015,7 @@ _08072D30:
 	movs r0, #5
 	strb r0, [r4, #0xe]
 	strb r1, [r4, #0xf]
-	bl sub_08077B2C
+	bl ResetLink
 _08072D4E:
 	pop {r4, pc}
 	.align 2, 0

asm/code_080732D0.s

@@ -247,7 +247,7 @@ sub_08073468: @ 0x08073468
 	movs r3, #0
 	bl CreateObjectWithParent
 _080734AC:
-	bl sub_08077B2C
+	bl ResetLink
 	ldr r0, [r4, #0x20]
 	cmp r0, #0
 	bgt _080734C0
@@ -1639,7 +1639,7 @@ sub_08073F04: @ 0x08073F04
 	rsbs r1, r1, #0
 	ands r0, r1
 	str r0, [r2, #0x30]
-	bl sub_08077B2C
+	bl ResetLink
 	pop {pc}
 	.align 2, 0
 _08073F48: .4byte gLinkState
@@ -2025,7 +2025,7 @@ sub_08074200: @ 0x08074200
 	ldrb r0, [r4, #0xc]
 	cmp r0, #3
 	beq _08074226
-	bl sub_08077B2C
+	bl ResetLink
 	ldr r1, _08074228 @ =gLinkState
 	movs r0, #3
 	strb r0, [r1, #0xc]
@@ -2270,7 +2270,7 @@ sub_080743A4: @ 0x080743A4
 	strb r1, [r0, #0x10]
 	adds r0, #0x42
 	strb r3, [r0]
-	bl sub_08077B2C
+	bl ResetLink
 	pop {pc}
 	.align 2, 0
 _080743D0: .4byte gLinkState
@@ -2873,7 +2873,7 @@ _08074840:
 _08074862:
 	ldr r0, _080748B0 @ =0x000001A5
 	bl PlaySFX
-	bl sub_08077B2C
+	bl ResetLink
 _0807486C:
 	ldr r5, _080748AC @ =gLinkState
 	adds r4, r5, #0
@@ -3040,7 +3040,7 @@ sub_0807496C: @ 0x0807496C
 	adds r1, #0x38
 	movs r0, #3
 	strb r0, [r1]
-	bl sub_08077B2C
+	bl ResetLink
 _080749A2:
 	pop {r4, pc}
 	.align 2, 0
@@ -3124,7 +3124,7 @@ _08074A34:
 	strh r0, [r5, #8]
 	strb r1, [r4, #0x15]
 _08074A3C:
-	bl sub_08077B2C
+	bl ResetLink
 _08074A40:
 	pop {r4, r5, pc}
 	.align 2, 0
@@ -3367,7 +3367,7 @@ _08074BF4: .4byte gLinkState
 sub_08074BF8: @ 0x08074BF8
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_08077B2C
+	bl ResetLink
 	adds r2, r4, #0
 	adds r2, #0x29
 	ldrb r1, [r2]

asm/code_08076C80.s

@@ -1716,6 +1716,6 @@ _08077B1C: .4byte 0xFF7FFFFF
 	thumb_func_start sub_08077B20
 sub_08077B20: @ 0x08077B20
 	push {lr}
-	bl sub_08077B2C
+	bl ResetLink
 	bl sub_08077AEC
 	pop {pc}

asm/code_08078778.s

@@ -1497,7 +1497,7 @@ _08079374:
 	ldrb r0, [r4, #2]
 	cmp r0, #0
 	bne _080793CA
-	bl sub_08077B2C
+	bl ResetLink
 	ldr r0, [r4, #0x30]
 	movs r1, #8
 	ands r0, r1

asm/code_0807CC3C.s

@@ -7062,7 +7062,7 @@ sub_0807FF6C: @ 0x0807FF6C
 	strh r1, [r0]
 	adds r0, #4
 	strh r1, [r0]
-	bl sub_08077B2C
+	bl ResetLink
 	bl sub_080791D0
 	ldr r0, _0807FFCC @ =gUnk_03004030
 	ldrb r0, [r0, #8]

asm/code_080A5574.s

@@ -11392,7 +11392,7 @@ _080AAC84:
 	adds r1, r4, #0
 	bl ResolveEntityOnTop
 _080AAC8C:
-	bl sub_08077B2C
+	bl ResetLink
 	ldr r2, _080AACB4 @ =gLinkState
 	ldrb r1, [r2, #0x1a]
 	movs r0, #0x80
@@ -11863,7 +11863,7 @@ _080AAFE0:
 _080AAFFC: .4byte gLinkEntity
 _080AB000: .4byte gLinkState
 _080AB004:
-	bl sub_08077B2C
+	bl ResetLink
 	ldr r2, _080AB02C @ =gLinkState
 	ldrb r1, [r2, #0x1a]
 	movs r0, #0x80

asm/ghini.s

@@ -986,7 +986,7 @@ _0803F734: .4byte 0x0000FFFE
 sub_0803F738: @ 0x0803F738
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_08077B2C
+	bl ResetLink
 	ldr r2, _0803F768 @ =gLinkState
 	ldrb r1, [r2, #0x1a]
 	movs r0, #0x80

asm/gibdo.s

@@ -328,7 +328,7 @@ sub_080376D0: @ 0x080376D0
 	bl sub_080379EC
 	cmp r0, #0
 	bne _0803773A
-	bl sub_08077B2C
+	bl ResetLink
 	ldr r2, _08037724 @ =gLinkState
 	ldrb r1, [r2, #0x1a]
 	movs r0, #0x80

asm/itemForSale.s

@@ -133,7 +133,7 @@ _080818F0:
 	movs r0, #1
 	strb r0, [r4, #0xd]
 	bl sub_08078B48
-	bl sub_08077B2C
+	bl ResetLink
 	ldr r1, _08081924 @ =gLinkState
 	movs r0, #4
 	strb r0, [r1, #5]

asm/likeLike.s

@@ -439,7 +439,7 @@ _0802808E:
 	.align 2, 0
 _08028098: .4byte gUnk_02002A40
 _0802809C:
-	bl sub_08077B2C
+	bl ResetLink
 	ldr r2, _08028104 @ =gLinkState
 	ldrb r1, [r2, #0x1a]
 	movs r0, #0x80

asm/lilypadLarge.s

@@ -1317,7 +1317,7 @@ _08085EBE:
 	beq _08085EE8
 	bl DeleteEntity
 _08085EE8:
-	bl sub_08077B2C
+	bl ResetLink
 	pop {pc}
 	.align 2, 0
 _08085EF0: .4byte gLinkEntity

asm/mazaalBracelet.s

@@ -3046,7 +3046,7 @@ _0803B820: .4byte gLinkEntity
 sub_0803B824: @ 0x0803B824
 	push {r4, r5, lr}
 	adds r5, r0, #0
-	bl sub_08077B2C
+	bl ResetLink
 	ldr r2, _0803B864 @ =gLinkState
 	ldrb r1, [r2, #0x1a]
 	movs r0, #0x80

asm/minecart.s

@@ -6,650 +6,6 @@
 
 	.text
 
-
-	thumb_func_start Minecart
-Minecart: @ 0x080916CC
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r1, _080916E8 @ =gUnk_081223A8
-	ldrb r0, [r4, #0xc]
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r1, [r0]
-	adds r0, r4, #0
-	bl _call_via_r1
-	adds r4, #0x41
-	movs r0, #0
-	strb r0, [r4]
-	pop {r4, pc}
-	.align 2, 0
-_080916E8: .4byte gUnk_081223A8
-
-	thumb_func_start sub_080916EC
-sub_080916EC: @ 0x080916EC
-	push {r4, r5, r6, r7, lr}
-	adds r6, r0, #0
-	ldrb r0, [r6, #0xe]
-	lsls r0, r0, #3
-	ldr r1, _080917C8 @ =gUnk_030010EC
-	adds r7, r0, r1
-	adds r0, r6, #0
-	adds r0, #0x84
-	str r7, [r0]
-	ldr r0, _080917CC @ =gRoomControls
-	ldrb r0, [r0, #5]
-	ldrb r1, [r7, #4]
-	cmp r0, r1
-	bne _08091716
-	ldr r0, _080917D0 @ =gLinkState
-	ldr r0, [r0, #0x30]
-	movs r1, #0x80
-	lsls r1, r1, #5
-	ands r0, r1
-	cmp r0, #0
-	beq _0809171A
-_08091716:
-	bl DeleteThisEntity
-_0809171A:
-	ldr r4, _080917CC @ =gRoomControls
-	ldrh r1, [r7]
-	movs r5, #0x3f
-	adds r0, r5, #0
-	ands r0, r1
-	lsls r0, r0, #4
-	ldrh r2, [r4, #6]
-	adds r0, r0, r2
-	adds r0, #8
-	strh r0, [r6, #0x2e]
-	ldrh r1, [r7]
-	movs r0, #0xfc
-	lsls r0, r0, #4
-	ands r0, r1
-	lsrs r0, r0, #2
-	ldrh r3, [r4, #8]
-	adds r0, r0, r3
-	adds r0, #8
-	strh r0, [r6, #0x32]
-	ldrb r0, [r7, #5]
-	strb r0, [r6, #0x14]
-	ldrb r0, [r7, #6]
-	strb r0, [r6, #0xb]
-	movs r2, #1
-	strb r2, [r6, #0xc]
-	ldr r0, _080917D4 @ =gUnk_080FD310
-	str r0, [r6, #0x48]
-	ldrb r1, [r6, #0x10]
-	movs r0, #0x80
-	orrs r0, r1
-	strb r0, [r6, #0x10]
-	adds r0, r6, #0
-	adds r0, #0x3f
-	strb r2, [r0]
-	adds r1, r6, #0
-	adds r1, #0x3c
-	movs r0, #0x47
-	strb r0, [r1]
-	adds r1, #4
-	movs r0, #0x44
-	strb r0, [r1]
-	subs r1, #5
-	movs r0, #0x80
-	strb r0, [r1]
-	ldrb r0, [r6, #0x14]
-	lsls r0, r0, #3
-	strb r0, [r6, #0x15]
-	movs r0, #0xe0
-	lsls r0, r0, #3
-	strh r0, [r6, #0x24]
-	adds r2, r6, #0
-	adds r2, #0x29
-	ldrb r1, [r2]
-	movs r0, #0x39
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #0x18
-	orrs r0, r1
-	strb r0, [r2]
-	ldrb r1, [r6, #0x14]
-	adds r1, #4
-	ldrb r0, [r6, #0xb]
-	adds r1, r1, r0
-	adds r0, r6, #0
-	bl InitAnimationForceUpdate
-	ldr r0, _080917D8 @ =0x00004022
-	movs r2, #0x2e
-	ldrsh r1, [r6, r2]
-	ldrh r2, [r4, #6]
-	subs r1, r1, r2
-	asrs r1, r1, #4
-	ands r1, r5
-	movs r3, #0x32
-	ldrsh r2, [r6, r3]
-	ldrh r3, [r4, #8]
-	subs r2, r2, r3
-	asrs r2, r2, #4
-	ands r2, r5
-	lsls r2, r2, #6
-	orrs r1, r2
-	adds r2, r6, #0
-	adds r2, #0x38
-	ldrb r2, [r2]
-	bl SetTile
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_080917C8: .4byte gUnk_030010EC
-_080917CC: .4byte gRoomControls
-_080917D0: .4byte gLinkState
-_080917D4: .4byte gUnk_080FD310
-_080917D8: .4byte 0x00004022
-
-	thumb_func_start sub_080917DC
-sub_080917DC: @ 0x080917DC
-	push {r4, lr}
-	adds r4, r0, #0
-	adds r0, #0x41
-	ldrb r1, [r0]
-	movs r0, #0x7f
-	ands r0, r1
-	cmp r0, #0x1d
-	bne _08091810
-	movs r0, #0xa8
-	lsls r0, r0, #0xa
-	str r0, [r4, #0x20]
-	movs r0, #7
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0x14]
-	adds r1, #4
-	ldrb r0, [r4, #0xb]
-	adds r1, r1, r0
-	adds r0, r4, #0
-	bl InitAnimationForceUpdate
-	ldr r0, _0809180C @ =0x0000013B
-	bl PlaySFX
-	b _080918A0
-	.align 2, 0
-_0809180C: .4byte 0x0000013B
-_08091810:
-	adds r0, r4, #0
-	bl sub_0800445C
-	cmp r0, #0
-	beq _0809184A
-	ldr r2, _08091840 @ =gLinkState
-	ldr r0, [r2, #0x30]
-	ldr r1, _08091844 @ =0x00040080
-	ands r0, r1
-	cmp r0, #0
-	bne _08091848
-	ldrb r0, [r2, #0x1c]
-	cmp r0, #0
-	bne _08091848
-	ldrb r0, [r2, #5]
-	cmp r0, #0
-	bne _08091848
-	ldrb r0, [r2, #2]
-	cmp r0, #0
-	bne _08091848
-	ldrb r0, [r4, #0xe]
-	adds r0, #1
-	b _0809184A
-	.align 2, 0
-_08091840: .4byte gLinkState
-_08091844: .4byte 0x00040080
-_08091848:
-	movs r0, #0
-_0809184A:
-	strb r0, [r4, #0xe]
-	ldrb r0, [r4, #0xb]
-	cmp r0, #0
-	bne _0809189C
-	ldrb r0, [r4, #0xe]
-	cmp r0, #8
-	bls _080918A0
-	ldrb r0, [r4, #0xc]
-	adds r0, #1
-	strb r0, [r4, #0xc]
-	ldr r2, _08091894 @ =gLinkState
-	movs r0, #0x81
-	strb r0, [r2, #2]
-	ldr r0, [r2, #0x30]
-	movs r1, #0x80
-	lsls r1, r1, #0x13
-	orrs r0, r1
-	str r0, [r2, #0x30]
-	ldr r1, _08091898 @ =gLinkEntity
-	movs r0, #0x80
-	lsls r0, r0, #0xa
-	str r0, [r1, #0x20]
-	movs r0, #0x80
-	lsls r0, r0, #1
-	strh r0, [r1, #0x24]
-	ldrb r2, [r1, #0x10]
-	movs r0, #0x7f
-	ands r0, r2
-	strb r0, [r1, #0x10]
-	bl sub_08077B2C
-	bl sub_0807A108
-	movs r0, #0x7c
-	bl PlaySFX
-	b _080918A0
-	.align 2, 0
-_08091894: .4byte gLinkState
-_08091898: .4byte gLinkEntity
-_0809189C:
-	movs r0, #0
-	strb r0, [r4, #0xe]
-_080918A0:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_080918A4
-sub_080918A4: @ 0x080918A4
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldr r5, _08091964 @ =gLinkEntity
-	adds r1, r5, #0
-	movs r2, #2
-	movs r3, #2
-	bl sub_080041A0
-	cmp r0, #0
-	beq _08091974
-	ldrh r0, [r4, #0x2e]
-	strh r0, [r5, #0x2e]
-	ldrh r0, [r4, #0x32]
-	strh r0, [r5, #0x32]
-	movs r0, #0x36
-	ldrsh r1, [r5, r0]
-	movs r0, #0x10
-	rsbs r0, r0, #0
-	cmp r1, r0
-	ble _0809197E
-	ldr r0, [r5, #0x20]
-	cmp r0, #0
-	bge _080919A4
-	ldrb r0, [r4, #0x14]
-	lsls r0, r0, #1
-	strb r0, [r5, #0x14]
-	ldr r2, _08091968 @ =gLinkState
-	ldr r0, [r2, #0x30]
-	movs r1, #0x80
-	lsls r1, r1, #0x13
-	eors r0, r1
-	movs r1, #0x80
-	lsls r1, r1, #5
-	orrs r0, r1
-	str r0, [r2, #0x30]
-	ldrb r0, [r4, #0xc]
-	adds r0, #1
-	strb r0, [r4, #0xc]
-	movs r0, #1
-	strb r0, [r4, #0xf]
-	ldrb r0, [r4, #0x10]
-	movs r2, #0x20
-	orrs r0, r2
-	strb r0, [r4, #0x10]
-	adds r1, r4, #0
-	adds r1, #0x3f
-	movs r0, #0x97
-	strb r0, [r1]
-	adds r0, r5, #0
-	adds r0, #0x3c
-	ldrb r0, [r0]
-	adds r0, #1
-	subs r1, #3
-	orrs r0, r2
-	strb r0, [r1]
-	adds r0, r5, #0
-	adds r0, #0x3b
-	ldrb r0, [r0]
-	adds r2, r4, #0
-	adds r2, #0x3b
-	strb r0, [r2]
-	adds r1, #4
-	movs r0, #0x18
-	strb r0, [r1]
-	adds r1, #4
-	movs r0, #8
-	strb r0, [r1]
-	adds r0, r4, #0
-	bl sub_0801766C
-	movs r1, #0x2e
-	ldrsh r0, [r4, r1]
-	ldr r2, _0809196C @ =gRoomControls
-	ldrh r1, [r2, #6]
-	subs r0, r0, r1
-	asrs r0, r0, #4
-	movs r3, #0x3f
-	ands r0, r3
-	movs r5, #0x32
-	ldrsh r1, [r4, r5]
-	ldrh r2, [r2, #8]
-	subs r1, r1, r2
-	asrs r1, r1, #4
-	ands r1, r3
-	lsls r1, r1, #6
-	orrs r0, r1
-	adds r1, r4, #0
-	adds r1, #0x38
-	ldrb r1, [r1]
-	bl sub_0807BA8C
-	ldr r0, _08091970 @ =0x00000137
-	bl PlaySFX
-	b _0809197E
-	.align 2, 0
-_08091964: .4byte gLinkEntity
-_08091968: .4byte gLinkState
-_0809196C: .4byte gRoomControls
-_08091970: .4byte 0x00000137
-_08091974:
-	adds r0, r5, #0
-	adds r1, r4, #0
-	bl GetFacingDirection
-	strb r0, [r5, #0x15]
-_0809197E:
-	ldr r3, _080919A8 @ =gLinkEntity
-	ldr r0, [r3, #0x20]
-	cmp r0, #0
-	bge _080919A4
-	adds r0, r4, #0
-	adds r0, #0x29
-	ldrb r1, [r0]
-	lsls r1, r1, #0x1d
-	lsrs r1, r1, #0x1d
-	subs r1, #1
-	adds r3, #0x29
-	movs r0, #7
-	ands r1, r0
-	ldrb r2, [r3]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-_080919A4:
-	pop {r4, r5, pc}
-	.align 2, 0
-_080919A8: .4byte gLinkEntity
-
-	thumb_func_start sub_080919AC
-sub_080919AC: @ 0x080919AC
-	push {r4, r5, r6, r7, lr}
-	mov r7, r8
-	push {r7}
-	adds r5, r0, #0
-	ldr r1, _080919D4 @ =gRoomControls
-	movs r0, #0
-	mov r8, r0
-	movs r0, #7
-	strb r0, [r1, #0xe]
-	ldr r0, _080919D8 @ =gLinkState
-	ldr r0, [r0, #0x30]
-	movs r1, #0x80
-	lsls r1, r1, #5
-	ands r0, r1
-	cmp r0, #0
-	bne _080919DC
-	movs r0, #1
-	strb r0, [r5, #0xc]
-	b _08091C04
-	.align 2, 0
-_080919D4: .4byte gRoomControls
-_080919D8: .4byte gLinkState
-_080919DC:
-	ldr r4, _08091A14 @ =gLinkEntity
-	adds r6, r4, #0
-	adds r6, #0x5a
-	ldrb r1, [r6]
-	movs r7, #0xf
-	adds r0, r7, #0
-	ands r0, r1
-	cmp r0, #0
-	bne _08091A22
-	ldrb r1, [r5, #0x10]
-	movs r0, #0x7f
-	ands r0, r1
-	strb r0, [r5, #0x10]
-	adds r0, r5, #0
-	adds r1, r4, #0
-	bl CopyPosition
-	ldrb r1, [r6]
-	movs r0, #0xf0
-	ands r0, r1
-	cmp r0, #0x10
-	bne _08091A18
-	adds r1, r5, #0
-	adds r1, #0x63
-	movs r0, #1
-	strb r0, [r1]
-	b _08091C04
-	.align 2, 0
-_08091A14: .4byte gLinkEntity
-_08091A18:
-	adds r0, r5, #0
-	adds r0, #0x63
-	mov r1, r8
-	strb r1, [r0]
-	b _08091C04
-_08091A22:
-	ldrb r0, [r5, #0x10]
-	movs r1, #0x80
-	orrs r0, r1
-	strb r0, [r5, #0x10]
-	mov r0, r8
-	strh r0, [r4, #0x24]
-	adds r0, r5, #0
-	bl sub_0806F69C
-	adds r0, r5, #0
-	adds r1, r4, #0
-	bl CopyPosition
-	adds r0, r5, #0
-	adds r0, #0x29
-	ldrb r1, [r0]
-	lsls r1, r1, #0x1d
-	lsrs r1, r1, #0x1d
-	subs r1, #1
-	adds r3, r4, #0
-	adds r3, #0x29
-	movs r0, #7
-	ands r1, r0
-	ldrb r2, [r3]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-	adds r0, r5, #0
-	bl sub_08091DDC
-	cmp r0, #0
-	beq _08091A68
-	b _08091C04
-_08091A68:
-	ldr r0, _08091AD8 @ =gUnk_030010A0
-	ldr r0, [r0]
-	ands r0, r7
-	cmp r0, #0
-	bne _08091A7A
-	movs r0, #0x9c
-	lsls r0, r0, #1
-	bl PlaySFX
-_08091A7A:
-	ldrb r0, [r5, #0xf]
-	subs r0, #1
-	strb r0, [r5, #0xf]
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	cmp r0, #0xff
-	bne _08091A92
-	movs r0, #0x7b
-	bl PlaySFX
-	movs r0, #0x3c
-	strb r0, [r5, #0xf]
-_08091A92:
-	ldr r2, _08091ADC @ =gUnk_081223C8
-	ldrb r0, [r5, #0x14]
-	lsls r0, r0, #1
-	adds r1, r0, r2
-	ldrb r1, [r1]
-	lsls r1, r1, #0x18
-	asrs r1, r1, #0x18
-	adds r0, #1
-	adds r0, r0, r2
-	movs r2, #0
-	ldrsb r2, [r0, r2]
-	adds r0, r5, #0
-	bl sub_080002B4
-	adds r4, r0, #0
-	ldr r1, _08091AE0 @ =gUnk_081223D8
-	ldrb r0, [r5, #0x14]
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r1, [r0]
-	adds r0, r4, #0
-	bl sub_08007DD6
-	cmp r0, #0
-	bne _08091AE4
-	ldrb r0, [r5, #0x15]
-	movs r1, #0x10
-	eors r0, r1
-	strb r0, [r5, #0x15]
-	ldrb r0, [r5, #0x14]
-	movs r1, #2
-	eors r0, r1
-	strb r0, [r5, #0x14]
-	b _08091BD8
-	.align 2, 0
-_08091AD8: .4byte gUnk_030010A0
-_08091ADC: .4byte gUnk_081223C8
-_08091AE0: .4byte gUnk_081223D8
-_08091AE4:
-	adds r0, r4, #0
-	subs r0, #0x64
-	cmp r0, #0xb
-	bhi _08091BD8
-	lsls r0, r0, #2
-	ldr r1, _08091AF8 @ =_08091AFC
-	adds r0, r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08091AF8: .4byte _08091AFC
-_08091AFC: @ jump table
-	.4byte _08091B2C @ case 0
-	.4byte _08091BD8 @ case 1
-	.4byte _08091BD8 @ case 2
-	.4byte _08091BB8 @ case 3
-	.4byte _08091BB8 @ case 4
-	.4byte _08091BB8 @ case 5
-	.4byte _08091BB8 @ case 6
-	.4byte _08091BD8 @ case 7
-	.4byte _08091BB8 @ case 8
-	.4byte _08091BB8 @ case 9
-	.4byte _08091BB8 @ case 10
-	.4byte _08091BB8 @ case 11
-_08091B2C:
-	ldrb r1, [r5, #0x10]
-	movs r0, #0xdf
-	ands r0, r1
-	strb r0, [r5, #0x10]
-	adds r1, r5, #0
-	adds r1, #0x3f
-	movs r0, #1
-	strb r0, [r1]
-	subs r1, #3
-	movs r0, #0x47
-	strb r0, [r1]
-	adds r1, #4
-	movs r0, #0x44
-	strb r0, [r1]
-	subs r1, #5
-	movs r4, #0x80
-	movs r0, #0x80
-	strb r0, [r1]
-	movs r0, #6
-	strb r0, [r5, #0xc]
-	adds r0, r5, #0
-	bl sub_08017744
-	ldr r2, _08091BAC @ =gLinkState
-	movs r0, #0x41
-	strb r0, [r2, #2]
-	ldr r0, [r2, #0x30]
-	movs r1, #0x80
-	lsls r1, r1, #5
-	eors r0, r1
-	movs r1, #0x80
-	lsls r1, r1, #0x13
-	orrs r0, r1
-	str r0, [r2, #0x30]
-	ldr r1, _08091BB0 @ =gLinkEntity
-	movs r0, #0x80
-	lsls r0, r0, #0xa
-	str r0, [r1, #0x20]
-	movs r0, #0x80
-	lsls r0, r0, #2
-	strh r0, [r1, #0x24]
-	ldrb r0, [r5, #0x14]
-	lsls r0, r0, #1
-	strb r0, [r1, #0x14]
-	ldrb r0, [r5, #0x15]
-	strb r0, [r1, #0x15]
-	ldrb r0, [r1, #0x10]
-	orrs r4, r0
-	strb r4, [r1, #0x10]
-	adds r0, r5, #0
-	bl sub_08004168
-	ldrb r1, [r5, #0x14]
-	adds r1, #0xc
-	adds r0, r5, #0
-	bl InitAnimationForceUpdate
-	movs r0, #0x78
-	bl PlaySFX
-	ldr r0, _08091BB4 @ =0x00000139
-	bl PlaySFX
-	b _08091C04
-	.align 2, 0
-_08091BAC: .4byte gLinkState
-_08091BB0: .4byte gLinkEntity
-_08091BB4: .4byte 0x00000139
-_08091BB8:
-	adds r0, r5, #0
-	bl sub_080002B8
-	cmp r4, r0
-	bne _08091BD8
-	adds r0, r5, #0
-	bl sub_08091C0C
-	ldr r1, _08091BD4 @ =gLinkEntity
-	ldrb r0, [r5, #0x14]
-	lsls r0, r0, #1
-	strb r0, [r1, #0x14]
-	b _08091C04
-	.align 2, 0
-_08091BD4: .4byte gLinkEntity
-_08091BD8:
-	ldr r2, _08091BF8 @ =gLinkEntity
-	ldrb r0, [r5, #0x14]
-	lsls r1, r0, #1
-	strb r1, [r2, #0x14]
-	adds r1, r5, #0
-	adds r1, #0x58
-	ldrb r1, [r1]
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	cmp r1, r0
-	bne _08091BFC
-	adds r0, r5, #0
-	bl UpdateAnimationSingleFrame
-	b _08091C04
-	.align 2, 0
-_08091BF8: .4byte gLinkEntity
-_08091BFC:
-	ldrb r1, [r5, #0x14]
-	adds r0, r5, #0
-	bl InitAnimationForceUpdate
-_08091C04:
-	pop {r3}
-	mov r8, r3
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-
 	thumb_func_start sub_08091C0C
 sub_08091C0C: @ 0x08091C0C
 	push {r4, lr}

asm/non_matching/minecart/sub_080919AC.inc

@@ -0,0 +1,287 @@
+	.include "asm/macros.inc"
+
+	.include "constants/constants.inc"
+
+	.syntax unified
+
+	.text
+
+    .syntax unified
+	push {r4, r5, r6, r7, lr}
+	mov r7, r8
+	push {r7}
+	adds r5, r0, #0
+	ldr r1, _080919D4 @ =gRoomControls
+	movs r0, #0
+	mov r8, r0
+	movs r0, #7
+	strb r0, [r1, #0xe]
+	ldr r0, _080919D8 @ =gLinkState
+	ldr r0, [r0, #0x30]
+	movs r1, #0x80
+	lsls r1, r1, #5
+	ands r0, r1
+	cmp r0, #0
+	bne _080919DC
+	movs r0, #1
+	strb r0, [r5, #0xc]
+	b _08091C04
+	.align 2, 0
+_080919D4: .4byte gRoomControls
+_080919D8: .4byte gLinkState
+_080919DC:
+	ldr r4, _08091A14 @ =gLinkEntity
+	adds r6, r4, #0
+	adds r6, #0x5a
+	ldrb r1, [r6]
+	movs r7, #0xf
+	adds r0, r7, #0
+	ands r0, r1
+	cmp r0, #0
+	bne _08091A22
+	ldrb r1, [r5, #0x10]
+	movs r0, #0x7f
+	ands r0, r1
+	strb r0, [r5, #0x10]
+	adds r0, r5, #0
+	adds r1, r4, #0
+	bl CopyPosition
+	ldrb r1, [r6]
+	movs r0, #0xf0
+	ands r0, r1
+	cmp r0, #0x10
+	bne _08091A18
+	adds r1, r5, #0
+	adds r1, #0x63
+	movs r0, #1
+	strb r0, [r1]
+	b _08091C04
+	.align 2, 0
+_08091A14: .4byte gLinkEntity
+_08091A18:
+	adds r0, r5, #0
+	adds r0, #0x63
+	mov r1, r8
+	strb r1, [r0]
+	b _08091C04
+_08091A22:
+	ldrb r0, [r5, #0x10]
+	movs r1, #0x80
+	orrs r0, r1
+	strb r0, [r5, #0x10]
+	mov r0, r8
+	strh r0, [r4, #0x24]
+	adds r0, r5, #0
+	bl sub_0806F69C
+	adds r0, r5, #0
+	adds r1, r4, #0
+	bl CopyPosition
+	adds r0, r5, #0
+	adds r0, #0x29
+	ldrb r1, [r0]
+	lsls r1, r1, #0x1d
+	lsrs r1, r1, #0x1d
+	subs r1, #1
+	adds r3, r4, #0
+	adds r3, #0x29
+	movs r0, #7
+	ands r1, r0
+	ldrb r2, [r3]
+	movs r0, #8
+	rsbs r0, r0, #0
+	ands r0, r2
+	orrs r0, r1
+	strb r0, [r3]
+	adds r0, r5, #0
+	bl sub_08091DDC
+	cmp r0, #0
+	beq _08091A68
+	b _08091C04
+_08091A68:
+	ldr r0, _08091AD8 @ =gUnk_030010A0
+	ldr r0, [r0]
+	ands r0, r7
+	cmp r0, #0
+	bne _08091A7A
+	movs r0, #0x9c
+	lsls r0, r0, #1
+	bl PlaySFX
+_08091A7A:
+	ldrb r0, [r5, #0xf]
+	subs r0, #1
+	strb r0, [r5, #0xf]
+	lsls r0, r0, #0x18
+	lsrs r0, r0, #0x18
+	cmp r0, #0xff
+	bne _08091A92
+	movs r0, #0x7b
+	bl PlaySFX
+	movs r0, #0x3c
+	strb r0, [r5, #0xf]
+_08091A92:
+	ldr r2, _08091ADC @ =gUnk_081223C8
+	ldrb r0, [r5, #0x14]
+	lsls r0, r0, #1
+	adds r1, r0, r2
+	ldrb r1, [r1]
+	lsls r1, r1, #0x18
+	asrs r1, r1, #0x18
+	adds r0, #1
+	adds r0, r0, r2
+	movs r2, #0
+	ldrsb r2, [r0, r2]
+	adds r0, r5, #0
+	bl sub_080002B4
+	adds r4, r0, #0
+	ldr r1, _08091AE0 @ =gUnk_081223D8
+	ldrb r0, [r5, #0x14]
+	lsls r0, r0, #2
+	adds r0, r0, r1
+	ldr r1, [r0]
+	adds r0, r4, #0
+	bl sub_08007DD6
+	cmp r0, #0
+	bne _08091AE4
+	ldrb r0, [r5, #0x15]
+	movs r1, #0x10
+	eors r0, r1
+	strb r0, [r5, #0x15]
+	ldrb r0, [r5, #0x14]
+	movs r1, #2
+	eors r0, r1
+	strb r0, [r5, #0x14]
+	b _08091BD8
+	.align 2, 0
+_08091AD8: .4byte gUnk_030010A0
+_08091ADC: .4byte gUnk_081223C8
+_08091AE0: .4byte gUnk_081223D8
+_08091AE4:
+	adds r0, r4, #0
+	subs r0, #0x64
+	cmp r0, #0xb
+	bhi _08091BD8
+	lsls r0, r0, #2
+	ldr r1, _08091AF8 @ =_08091AFC
+	adds r0, r0, r1
+	ldr r0, [r0]
+	mov pc, r0
+	.align 2, 0
+_08091AF8: .4byte _08091AFC
+_08091AFC: @ jump table
+	.4byte _08091B2C @ case 0
+	.4byte _08091BD8 @ case 1
+	.4byte _08091BD8 @ case 2
+	.4byte _08091BB8 @ case 3
+	.4byte _08091BB8 @ case 4
+	.4byte _08091BB8 @ case 5
+	.4byte _08091BB8 @ case 6
+	.4byte _08091BD8 @ case 7
+	.4byte _08091BB8 @ case 8
+	.4byte _08091BB8 @ case 9
+	.4byte _08091BB8 @ case 10
+	.4byte _08091BB8 @ case 11
+_08091B2C:
+	ldrb r1, [r5, #0x10]
+	movs r0, #0xdf
+	ands r0, r1
+	strb r0, [r5, #0x10]
+	adds r1, r5, #0
+	adds r1, #0x3f
+	movs r0, #1
+	strb r0, [r1]
+	subs r1, #3
+	movs r0, #0x47
+	strb r0, [r1]
+	adds r1, #4
+	movs r0, #0x44
+	strb r0, [r1]
+	subs r1, #5
+	movs r4, #0x80
+	movs r0, #0x80
+	strb r0, [r1]
+	movs r0, #6
+	strb r0, [r5, #0xc]
+	adds r0, r5, #0
+	bl sub_08017744
+	ldr r2, _08091BAC @ =gLinkState
+	movs r0, #0x41
+	strb r0, [r2, #2]
+	ldr r0, [r2, #0x30]
+	movs r1, #0x80
+	lsls r1, r1, #5
+	eors r0, r1
+	movs r1, #0x80
+	lsls r1, r1, #0x13
+	orrs r0, r1
+	str r0, [r2, #0x30]
+	ldr r1, _08091BB0 @ =gLinkEntity
+	movs r0, #0x80
+	lsls r0, r0, #0xa
+	str r0, [r1, #0x20]
+	movs r0, #0x80
+	lsls r0, r0, #2
+	strh r0, [r1, #0x24]
+	ldrb r0, [r5, #0x14]
+	lsls r0, r0, #1
+	strb r0, [r1, #0x14]
+	ldrb r0, [r5, #0x15]
+	strb r0, [r1, #0x15]
+	ldrb r0, [r1, #0x10]
+	orrs r4, r0
+	strb r4, [r1, #0x10]
+	adds r0, r5, #0
+	bl sub_08004168
+	ldrb r1, [r5, #0x14]
+	adds r1, #0xc
+	adds r0, r5, #0
+	bl InitAnimationForceUpdate
+	movs r0, #0x78
+	bl PlaySFX
+	ldr r0, _08091BB4 @ =0x00000139
+	bl PlaySFX
+	b _08091C04
+	.align 2, 0
+_08091BAC: .4byte gLinkState
+_08091BB0: .4byte gLinkEntity
+_08091BB4: .4byte 0x00000139
+_08091BB8:
+	adds r0, r5, #0
+	bl sub_080002B8
+	cmp r4, r0
+	bne _08091BD8
+	adds r0, r5, #0
+	bl sub_08091C0C
+	ldr r1, _08091BD4 @ =gLinkEntity
+	ldrb r0, [r5, #0x14]
+	lsls r0, r0, #1
+	strb r0, [r1, #0x14]
+	b _08091C04
+	.align 2, 0
+_08091BD4: .4byte gLinkEntity
+_08091BD8:
+	ldr r2, _08091BF8 @ =gLinkEntity
+	ldrb r0, [r5, #0x14]
+	lsls r1, r0, #1
+	strb r1, [r2, #0x14]
+	adds r1, r5, #0
+	adds r1, #0x58
+	ldrb r1, [r1]
+	lsls r0, r0, #0x18
+	lsrs r0, r0, #0x18
+	cmp r1, r0
+	bne _08091BFC
+	adds r0, r5, #0
+	bl UpdateAnimationSingleFrame
+	b _08091C04
+	.align 2, 0
+_08091BF8: .4byte gLinkEntity
+_08091BFC:
+	ldrb r1, [r5, #0x14]
+	adds r0, r5, #0
+	bl InitAnimationForceUpdate
+_08091C04:
+	pop {r3}
+	mov r8, r3
+	pop {r4, r5, r6, r7, pc}
+	.align 2, 0
+    .syntax divided

asm/object2A.s

@@ -7,93 +7,6 @@
 	.text
 
 
-	thumb_func_start Object2A
-Object2A: @ 0x08089B00
-	push {lr}
-	ldr r2, _08089B14 @ =gUnk_08120DD0
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_08089B14: .4byte gUnk_08120DD0
-
-	thumb_func_start sub_08089B18
-sub_08089B18: @ 0x08089B18
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	movs r2, #1
-	movs r6, #1
-	strb r6, [r4, #0xc]
-	ldrb r1, [r4, #0x18]
-	movs r5, #4
-	rsbs r5, r5, #0
-	adds r0, r5, #0
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r4, #0x18]
-	ldrb r0, [r4, #0xb]
-	cmp r0, #0
-	beq _08089B38
-	strb r0, [r4, #0xe]
-_08089B38:
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-	ldrb r0, [r4, #0xa]
-	cmp r0, #2
-	beq _08089B66
-	cmp r0, #2
-	bgt _08089B50
-	cmp r0, #1
-	beq _08089B5A
-	b _08089B96
-_08089B50:
-	cmp r0, #3
-	beq _08089B72
-	cmp r0, #4
-	beq _08089B7C
-	b _08089B96
-_08089B5A:
-	ldrh r0, [r4, #0x32]
-	subs r0, #8
-	strh r0, [r4, #0x32]
-	movs r0, #0x28
-	strb r0, [r4, #0xe]
-	b _08089B96
-_08089B66:
-	movs r0, #0xf
-	strb r0, [r4, #0xe]
-	adds r0, r4, #0
-	bl sub_08004168
-	b _08089B96
-_08089B72:
-	ldr r0, [r4, #0x50]
-	adds r1, r4, #0
-	bl CopyPosition
-	b _08089B96
-_08089B7C:
-	adds r0, r4, #0
-	adds r0, #0x86
-	ldrh r0, [r0]
-	bl CheckFlags
-	cmp r0, #0
-	bne _08089B96
-	ldrb r1, [r4, #0x18]
-	adds r0, r5, #0
-	ands r0, r1
-	strb r0, [r4, #0x18]
-	strb r6, [r4, #0xd]
-	b _08089B9E
-_08089B96:
-	movs r0, #0x92
-	lsls r0, r0, #1
-	bl sub_08004488
-_08089B9E:
-	pop {r4, r5, r6, pc}
-
 	thumb_func_start sub_08089BA0
 sub_08089BA0: @ 0x08089BA0
 	push {r4, r5, r6, lr}

asm/pesto.s

@@ -2096,7 +2096,7 @@ _08024E9A:
 _08024EC8: .4byte gUnk_02002A40
 _08024ECC:
 	ldr r6, _08024F48 @ =gLinkEntity
-	bl sub_08077B2C
+	bl ResetLink
 	ldr r2, _08024F4C @ =gLinkState
 	ldr r0, [r2, #0x30]
 	movs r1, #0x80

asm/respawnLink.s

@@ -6,8 +6,8 @@
 
 	.text
 
-	thumb_func_start sub_08077B2C
-sub_08077B2C: @ 0x08077B2C
+	thumb_func_start ResetLink
+ResetLink: @ 0x08077B2C
 	push {r4, r5, lr}
 	movs r4, #0
 	ldr r5, _08077B88 @ =gUnk_03000B80

asm/stairsInteract.s

@@ -123,7 +123,7 @@ _080732B8:
 	movs r0, #0
 	str r0, [r1, #0x30]
 	bl sub_0807A108
-	bl sub_08077B2C
+	bl ResetLink
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
 _080732CC: .4byte gRoomControls

asm/vaatiProjectile.s

@@ -507,7 +507,7 @@ _0803E442:
 sub_0803E444: @ 0x0803E444
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_08077B2C
+	bl ResetLink
 	ldr r2, _0803E478 @ =gLinkState
 	ldrb r1, [r2, #0x1a]
 	movs r0, #0x80