Merge pull request #607 from Catobat/interaction-stuff

2026-07-08 14:36:41 -04:00 · 2023-05-13 17:02:28 -07:00
parent c2ad020de6 19e8407596
commit dd5bce7442
208 changed files with 989 additions and 946 deletions
@@ -4,7 +4,7 @@
 	mov r6, sb
 	mov r5, r8
 	push {r5, r6, r7}
-	ldr r0, _080784FC @ =gUnk_03003DF0
+	ldr r0, _080784FC @ =gPossibleInteraction
 	ldrb r1, [r0]
 	mov r8, r0
 	cmp r1, #0
@@ -12,7 +12,7 @@
 	ldr r0, [r0, #4]
 	b _0807876A
 	.align 2, 0
-_080784FC: .4byte gUnk_03003DF0
+_080784FC: .4byte gPossibleInteraction
 _08078500:
 	ldr r2, _08078528 @ =gPlayerState
 	adds r0, r2, #0
@@ -74,27 +74,27 @@ _08078598:
 	movs r0, #0xff
 	mov r1, r8
 	strb r0, [r1, #3]
-	ldr r0, _080785AC @ =gUnk_0811C000
+	ldr r0, _080785AC @ =gNoInteraction
 	str r0, [r1, #4]
 	movs r1, #1
 	mov r2, r8
 	strb r1, [r2]
 	b _0807876A
 	.align 2, 0
-_080785AC: .4byte gUnk_0811C000
+_080785AC: .4byte gNoInteraction
 _080785B0:
 	ldr r0, [r2, #0x30]
 	movs r1, #0x80
 	ands r0, r1
 	cmp r0, #0
 	bne _080785F0
-	bl HasDungeonMap
+	bl HasDungeonSmallKey
 	cmp r0, #0
 	beq _080785C4
 	movs r0, #1
 _080785C4:
 	adds r7, r0, #0
-	bl HasDungeonCompass
+	bl HasDungeonBigKey
 	cmp r0, #0
 	beq _080785D2
 	movs r0, #2
@@ -104,21 +104,21 @@ _080785D2:
 	ldrb r0, [r3, #0x14]
 	movs r1, #6
 	ands r1, r0
-	ldr r0, _080785E8 @ =gUnk_0811C00C
+	ldr r0, _080785E8 @ =gPlayerInteractHitboxOffsetNormal
 	adds r2, r1, r0
-	ldr r5, _080785EC @ =gUnk_03003DF0
+	ldr r5, _080785EC @ =gPossibleInteraction
 	mov r8, r5
 	b _080785FE
 	.align 2, 0
 _080785E4: .4byte gPlayerEntity
-_080785E8: .4byte gUnk_0811C00C
-_080785EC: .4byte gUnk_03003DF0
+_080785E8: .4byte gPlayerInteractHitboxOffsetNormal
+_080785EC: .4byte gPossibleInteraction
 _080785F0:
 	ldr r3, _08078624 @ =gPlayerEntity
 	ldrb r0, [r3, #0x14]
 	movs r1, #6
 	ands r1, r0
-	ldr r0, _08078628 @ =gUnk_0811C014
+	ldr r0, _08078628 @ =gPlayerInteractHitboxOffsetMinish
 	adds r2, r1, r0
 	movs r7, #0
 _080785FE:
@@ -138,12 +138,12 @@ _080785FE:
 	adds r1, r1, r0
 	mov sb, r1
 	movs r6, #0
-	ldr r5, _0807862C @ =gUnk_03003DF8
+	ldr r5, _0807862C @ =gInteractableObjects
 	b _08078724
 	.align 2, 0
 _08078624: .4byte gPlayerEntity
-_08078628: .4byte gUnk_0811C014
-_0807862C: .4byte gUnk_03003DF8
+_08078628: .4byte gPlayerInteractHitboxOffsetMinish
+_0807862C: .4byte gInteractableObjects
 _08078630:
 	ldrb r1, [r5]
 	movs r3, #1
@@ -264,7 +264,7 @@ _08078714:
 	lsls r0, r6, #1
 	adds r0, r0, r6
 	lsls r0, r0, #2
-	ldr r3, _08078754 @ =gUnk_03003DF8
+	ldr r3, _08078754 @ =gInteractableObjects
 	adds r5, r0, r3
 _08078724:
 	ldr r2, [r5, #8]
@@ -292,12 +292,12 @@ _0807873A:
 	str r0, [r5, #4]
 	b _08078762
 	.align 2, 0
-_08078754: .4byte gUnk_03003DF8
+_08078754: .4byte gInteractableObjects
 _08078758:
 	movs r0, #0xff
 	mov r1, r8
 	strb r0, [r1, #3]
-	ldr r0, _08078774 @ =gUnk_0811C000
+	ldr r0, _08078774 @ =gNoInteraction
 	str r0, [r1, #4]
 _08078762:
 	movs r0, #1
@@ -311,5 +311,5 @@ _0807876A:
 	mov sl, r5
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_08078774: .4byte gUnk_0811C000
+_08078774: .4byte gNoInteraction
 	.syntax divided
@@ -786,9 +786,13 @@ gUnk_08002325:: @ 08002325
 gUnk_0800232C:: @ 0800232C
 	.incbin "code_080011C4/gUnk_0800232C.bin"

+@ used for business scrub fusers, together with first 4 bytes of next table
+@ each entry contains 6 bytes, the first 3 describe which entities are described by this,
+@ the last 3 contain fuser id and text id for fuser name
 gUnk_0800232E:: @ 0800232E
 	.incbin "code_080011C4/gUnk_0800232E.bin"

+@ same as above, but for other fusers
 gUnk_08002342:: @ 08002342
 	.incbin "code_080011C4/gUnk_08002342.bin"

@@ -798,11 +802,12 @@ GetFuserId: @ 0x08002632
 	ldr r4, _0800269C @ =gUnk_0800232E
 	ldrb r3, [r0, #8]
 	cmp r3, #3
-	beq _08002642
+	beq enemy
 	cmp r3, #7
-	bne _08002684
+	bne not_found
+npc: @ 0x08002640
 	ldr r4, _080026A0 @ =gUnk_08002342
-_08002642:
+enemy: @ 0x08002642
 	ldrb r3, [r0, #9]
 	lsls r1, r3, #0x10
 	ldrb r3, [r0, #0xa]
@@ -810,43 +815,48 @@ _08002642:
 	orrs r1, r3
 	ldrb r3, [r0, #0xb]
 	orrs r1, r3
-	add r6, pc, #0x38
-_08002652:
+	add r6, pc, #(entity_type_bitmasks - next - 2) @ pointer to entity_type_bitmasks
+next: @ 0x08002652
 	adds r4, #6
-	ldrb r3, [r4]
+	ldrb r3, [r4] @ entity id
 	lsls r2, r3, #0x10
-	beq _08002684
+	beq not_found @ end of list reached
 	movs r5, #0
-	ldrb r3, [r4, #1]
+	ldrb r3, [r4, #1] @ entity type, or 0xff for any
 	cmp r3, #0xff
-	bne _08002664
+	bne must_match_entity_type
 	movs r5, #8
-_08002664:
+must_match_entity_type: @ 0x08002664
 	lsls r3, r3, #8
 	orrs r2, r3
-	ldrb r3, [r4, #2]
+	ldrb r3, [r4, #2] @ entity type2, or 0xff for any
 	cmp r3, #0xff
-	bne _08002670
+	bne must_match_entity_type2
 	adds r5, #4
-_08002670:
+must_match_entity_type2: @ 0x08002670
 	orrs r2, r3
 	ldr r5, [r6, r5]
 	adds r3, r1, #0
 	ands r3, r5
 	ands r2, r5
 	cmp r3, r2
-	bne _08002652
-	ldrb r0, [r4, #3]
-	ldrh r1, [r4, #4]
+	bne next
+match: @ 0x0800267E
+	ldrb r0, [r4, #3] @ fuser id
+	ldrh r1, [r4, #4] @ text id for fuser name, used in KinstoneMenu_080A4494
 	pop {r4, r5, r6, r7, pc}
-_08002684:
+not_found: @ 0x08002684
 	movs r0, #0
 	movs r1, #0
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_0800268C:
+entity_type_bitmasks: @ 0x0800268C
+@ each 0xFF means that entity member must match
+@         type2 type  id
 	.byte 0xFF, 0xFF, 0xFF, 0x00
-	.byte 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00
+	.byte 0x00, 0xFF, 0xFF, 0x00
+	.byte 0xFF, 0x00, 0xFF, 0x00
+	.byte 0x00, 0x00, 0xFF, 0x00
 _0800269C: .4byte gUnk_0800232E
 _080026A0: .4byte gUnk_08002342

@@ -1,7 +1,7 @@
@ Cloud Tops Gregal healthy
 SCRIPT_START script_GregalHealthy
 	BeginBlock
-	Call sub_0806CD58
+	Call Gregal_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0004
 	SetAnimation 0x0006
@@ -5,15 +5,15 @@ SCRIPT_START script_Npc4EFirstCloud
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x000b
 	DoPostScriptAction 0x0008
-	Call sub_0806DAAC
+	Call NPC4E_IsKinstoneFused
 	JumpIf script_0800D6AE
-	Call sub_0806DAD0
-	CallWithArg sub_0806DA04, 0x00000002
+	Call NPC4E_MakeFuserInteractable
+	CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000002
 	EndBlock
 script_0800D636:
 	_0807EA4C
 	_0807E9F0
-	Call sub_0806DAAC
+	Call NPC4E_IsKinstoneFused
 	JumpIf script_0800D650
 	Call EnablePauseMenu
 	EnablePlayerControl
@@ -28,9 +28,9 @@ script_0800D650:
 	CameraTargetEntity
 	_0807EDD4 0x01e8, 0x01b8
 	Wait 0x003c
-	Call sub_0806DAE8
+	Call NPC4E_SetPinwheelFlag
 	Wait 0x0078
-	Call sub_0806DB44
+	Call NPC4E_IsEveryPinwheelActivated
 	JumpIfNot script_Npc4EKinstoneFused
 	LoadRoomEntityList gUnk_080DD730
 	DoPostScriptAction 0x0006
@@ -1,7 +1,7 @@
@ Cloud Tops Windtribespeople Leader Siroc
 SCRIPT_START script_Siroc
 	BeginBlock
-	Call sub_0806C870
+	Call WindTribespeople_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_08014AD2:
@@ -1,7 +1,7 @@
@ Cloud Tops WindTribespeople blocking exit
 SCRIPT_START script_WindTribespeople1
 	BeginBlock
-	Call sub_0806C870
+	Call WindTribespeople_MakeInteractable
 	DoPostScriptAction 0x000a
 	CheckGlobalFlag WARP_EVENT_END
 	JumpIf script_08014976
@@ -1,7 +1,7 @@
@ Cloud Top Windtribespeople woman on first floor
 SCRIPT_START script_WindTribespeople2
 	BeginBlock
-	Call sub_0806C870
+	Call WindTribespeople_MakeInteractable
 	DoPostScriptAction 0x000a
 	CheckGlobalFlag WARP_EVENT_END
 	JumpIfNot script_080149C6
@@ -2,7 +2,7 @@
 SCRIPT_START script_WindTribespeople3
 	BeginBlock
 	SetEntitySpeed 0x0080
-	Call sub_0806C870
+	Call WindTribespeople_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_080149DE:
@@ -1,7 +1,7 @@
@ Cloud Tops Windtribespeople blocking way up
 SCRIPT_START script_WindTribespeople4
 	BeginBlock
-	Call sub_0806C870
+	Call WindTribespeople_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_08014A36:
@@ -1,7 +1,7 @@
@ Cloud Tops Windtribespeople at the bed
 SCRIPT_START script_WindTribespeople5
 	BeginBlock
-	Call sub_0806C870
+	Call WindTribespeople_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_08014A62:
@@ -3,7 +3,7 @@ SCRIPT_START script_WindTribespeople7
 	BeginBlock
 	CheckGlobalFlag KUMOTATSUMAKI
 	JumpIf script_08014CD4
-	Call sub_0806C870
+	Call WindTribespeople_MakeInteractable
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0000
 	EndBlock
@@ -17,7 +17,7 @@ SCRIPT_START script_HurdyGurdyManFirstKinstone
 	_0807E8E4_0
 	SetSyncFlag 0x00000040
 	WaitForSyncFlagAndClear 0x00000002
-	Call sub_0806E440
+	Call HurdyGurdyMan_MakeInteractable
 	Wait 0x0078
 	SetSyncFlag 0x00000040
 	WaitForSyncFlagAndClear 0x00000002
@@ -32,7 +32,7 @@ script_0800E0DE:
 	WaitUntilTextboxCloses
 	SetLocalFlag 0x0093
 script_0800E12E:
-	Call sub_080668F0
+	Call MinisterPotho_MakeInteractable
 	EnablePlayerControl
 	EndBlock
 script_0800E138:
@@ -3,7 +3,7 @@ SCRIPT_START script_MinisterPothoCell
 	BeginBlock
 	SetAnimationState 0x0002
 	DoPostScriptAction 0x000a
-	Call sub_080668F0
+	Call MinisterPotho_MakeInteractable
 	EndBlock
 script_0800E41A:
 	CheckEntityInteractType
@@ -1,7 +1,7 @@
@ Graveyard Dampe in house 2?
 SCRIPT_START script_DampeInside2
 	BeginBlock
-	Call sub_0806BE3C
+	Call Dampe_MakeInteractable
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0007
 	EndBlock
@@ -14,7 +14,7 @@ script_08009646:
 	Call sub_0806BF44
 	JumpIf script_08009646
 	EndBlock
-	Call sub_0806BE3C
+	Call Dampe_MakeInteractable
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0007
 script_08009660:
@@ -1,7 +1,7 @@
@ Graveyard GhostBrothers
 SCRIPT_START script_GhostBrothers
 	BeginBlock
-	Call sub_08065D00
+	Call GhostBrothers_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x000a
@@ -3,7 +3,7 @@ SCRIPT_START script_KingDaltus
 	BeginBlock
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
-	Call sub_0806672C
+	Call KingDaltus_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 	Jump script_0800917C
@@ -4,7 +4,7 @@ SCRIPT_START script_MinisterPotho
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
 script_0800927E:
-	Call sub_080668F0
+	Call MinisterPotho_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_0800928A:
@@ -2,7 +2,7 @@
 SCRIPT_START script_Anju
 	BeginBlock
 	DoPostScriptAction 0x0001
-	Call sub_0806C354
+	Call Anju_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_0801015A:
@@ -19,7 +19,7 @@ script_08010502:
 	MessageNoOverlap TEXT_PICOLYTE, 0x10
 	WaitUntilTextboxCloses
 script_0801052E:
-	Call sub_080634E4
+	Call Beedle_GetObjectType
 	JumpTable script_08010544, script_08010558, script_08010570, script_08010570, script_0801054C, script_08010564, script_08010570
 script_08010544:
 	MessageNoOverlap TEXT_PICOLYTE, 0x0d
@@ -37,7 +37,7 @@ script_08010564:
 	JumpIfNot script_080105DC
 	Jump script_08010570
 script_08010570:
-	Call sub_080634EC
+	Call Beedle_ConfirmBuyItem
 	CallWithArg ScriptCommand_SaleItemConfirmMessage, 0x00000000
 	WaitUntilTextboxCloses
 	CheckTextboxResult
@@ -46,7 +46,7 @@ script_08010570:
 	JumpIfNot script_080105C4
 	CheckBottleContaining ITEM_BOTTLE_EMPTY
 	JumpIfNot script_080105CC
-	Call sub_08063504
+	Call Beedle_IsBottleInInventory
 	JumpIf script_080105D4
 	MessageNoOverlap TEXT_PICOLYTE, 0x07
 	WaitUntilTextboxCloses
@@ -3,7 +3,7 @@ SCRIPT_START script_Brocco
 	BeginBlock
 	SetAnimationState 0x0004
 	SetAnimation 0x0000
-	Call sub_080636F4
+	Call Brocco_MakeInteractable
 	DoPostScriptAction 0x000a
 	Call SetPriorityMessage
 	EndBlock
@@ -4,7 +4,7 @@ SCRIPT_START script_Carpenter
 	SetAnimationState 0x0004
 	CallWithArg sub_080672B0, 0x00000000
 	DoPostScriptAction 0x000a
-	Call sub_08067314
+	Call Carpenter_MakeInteractable
 	EndBlock
 script_08010AB4:
 	CheckEntityInteractType
@@ -1,7 +1,7 @@
@ Hyrule Townsperson house with cat
 SCRIPT_START script_CatPerson
 	BeginBlock
-	Call sub_08061E70
+	Call Townsperson_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0004
 	Call sub_08061FD8
@@ -1,7 +1,7 @@
@ Hyrule Town Cat person talking to Dog person
 SCRIPT_START script_CatPersonTalkingToDogPerson
 	BeginBlock
-	Call sub_08061E70
+	Call Townsperson_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0002
 	Call sub_08061FD8
@@ -1,7 +1,7 @@
@ Hyrule Town Din
 SCRIPT_START script_Din
 	BeginBlock
-	Call sub_08064828
+	Call Din_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
@@ -1,7 +1,7 @@
@ Hyrule Town Din when one of them has moved in
 SCRIPT_START script_Din2
 	BeginBlock
-	Call sub_08064828
+	Call Din_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
@@ -1,7 +1,7 @@
@ Din completely alone
 SCRIPT_START script_DinAlone
 	BeginBlock
-	Call sub_08064828
+	Call Din_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
@@ -1,7 +1,7 @@
@ Hyrule Town Din moved in
 SCRIPT_START script_DinMovedIn
 	BeginBlock
-	Call sub_08064828
+	Call Din_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
@@ -1,7 +1,7 @@
@ Hyrule Town Dog person talking to Cat person
 SCRIPT_START script_DogPersonInCatHouse
 	BeginBlock
-	Call sub_08061E70
+	Call Townsperson_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0006
 	Call sub_08061FD8
@@ -19,7 +19,7 @@ script_0800EB7C:
 	Call sub_08061FD8
 	Jump script_0800EB7C
 	BeginBlock
-	Call sub_08061E70
+	Call Townsperson_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0002
 	Call sub_08061FD8
@@ -1,7 +1,7 @@
@ Hyrule Town Farore
 SCRIPT_START script_Farore
 	BeginBlock
-	Call sub_08064A28
+	Call Farore_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
@@ -1,7 +1,7 @@
@ Hyrule Town Farore when one of them has moved in
 SCRIPT_START script_Farore2
 	BeginBlock
-	Call sub_08064A28
+	Call Farore_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
@@ -1,7 +1,7 @@
@ Farore completely alone
 SCRIPT_START script_FaroreAlone
 	BeginBlock
-	Call sub_08064A28
+	Call Farore_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
@@ -1,7 +1,7 @@
@ Farore moved in 
 SCRIPT_START script_FaroreMovedIn
 	BeginBlock
-	Call sub_08064A28
+	Call Farore_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
@@ -1,7 +1,7 @@
@ Forest Minish above cafe
 SCRIPT_START script_ForestMinish11
 	BeginBlock
-	Call sub_08060090
+	Call ForestMinish_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_0800E6BE:
@@ -4,7 +4,7 @@ SCRIPT_START script_HurdyGurdyMan
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0004
 	SetAnimation 0x0008
-	Call sub_0806E440
+	Call HurdyGurdyMan_MakeInteractable
 	EndBlock
 script_08010BCA:
 	CheckEntityInteractType
@@ -2,7 +2,7 @@
 SCRIPT_START script_Kid1
 	BeginBlock
 	DoPostScriptAction 0x0000
-	Call sub_08062A48
+	Call Kid_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_080102A6:
@@ -2,7 +2,7 @@
 SCRIPT_START script_Kid2
 	BeginBlock
 	DoPostScriptAction 0x0000
-	Call sub_08062A48
+	Call Kid_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_080102F2:
@@ -2,7 +2,7 @@
 SCRIPT_START script_Kid4
 	BeginBlock
 	DoPostScriptAction 0x0000
-	Call sub_08062A48
+	Call Kid_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_080103C2:
@@ -3,7 +3,7 @@ SCRIPT_START script_Kid5
 	BeginBlock
 	SetAnimation 0x0008
 script_08010622:
-	Call sub_08062A48
+	Call Kid_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_0801062E:
@@ -2,7 +2,7 @@
 SCRIPT_START script_KidInn
 	BeginBlock
 	DoPostScriptAction 0x000a
-	Call sub_08062A48
+	Call Kid_MakeInteractable
 	DoPostScriptAction 0x0000
 script_0800D5AC:
 	EndBlock
@@ -2,7 +2,7 @@
 SCRIPT_START script_LibraryVisitor
 	BeginBlock
 	Call sub_08061FD8
-	Call sub_08061E70
+	Call Townsperson_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_08008DA0:
@@ -1,7 +1,7 @@
@ Hyrule Town Mama
 SCRIPT_START script_Mama
 	BeginBlock
-	Call sub_0806C4F8
+	Call Mama_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0000
 	EndBlock
@@ -1,7 +1,7 @@
@ Hyrule Town Mayor Hagen
 SCRIPT_START script_Mayor
 	BeginBlock
-	Call sub_0806CE5C
+	Call MayorHagen_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0004
 	SetAnimation 0x0008
@@ -1,7 +1,7 @@
@ Hyrule Town Mutoh
 SCRIPT_START script_MutohInMill
 	BeginBlock
-	Call sub_08067100
+	Call Mutoh_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
@@ -1,7 +1,7 @@
@ Hyrule Town Nayru
 SCRIPT_START script_Nayru
 	BeginBlock
-	Call sub_08064928
+	Call Nayru_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
@@ -1,7 +1,7 @@
@ Hyrule Town Nayru when one of them has moved in
 SCRIPT_START script_Nayru2
 	BeginBlock
-	Call sub_08064928
+	Call Nayru_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
@@ -1,7 +1,7 @@
@ Nayru completely alone
 SCRIPT_START script_NayruAlone
 	BeginBlock
-	Call sub_08064928
+	Call Nayru_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
@@ -1,7 +1,7 @@
@ Nayru moved in
 SCRIPT_START script_NayruMovedIn
 	BeginBlock
-	Call sub_08064928
+	Call Nayru_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
@@ -1,7 +1,7 @@
@ Older lady in cat persons house 
 SCRIPT_START script_OldLadyCatHouse1
 	BeginBlock
-	Call sub_08061E70
+	Call Townsperson_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0004
 	Call sub_08061FD8
@@ -1,7 +1,7 @@
@ Older lady in cat persons house
 SCRIPT_START script_OldLadyCatHouse2
 	BeginBlock
-	Call sub_08061E70
+	Call Townsperson_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0006
 	Call sub_08061FD8
@@ -1,7 +1,7 @@
@ Phonograph
 SCRIPT_START script_Phonograph
 	BeginBlock
-	Call sub_0807F934
+	Call MakeCheckableObjectInteractable
 	EndBlock
 script_0800BA46:
 	CheckEntityInteractType
@@ -3,7 +3,7 @@ SCRIPT_START script_Pina
 	BeginBlock
 	SetAnimationState 0x0004
 	SetAnimation 0x0000
-	Call sub_08063CAC
+	Call Pina_MakeInteractable
 	DoPostScriptAction 0x000a
 	Call SetPriorityMessage
 	EndBlock
@@ -10,7 +10,7 @@ SCRIPT_START script_Postman
 	Call sub_0806075C
 	EndBlock
 	WaitUntilTextboxCloses
-	Call sub_080606C0
+	Call Postman_MakeInteractable
 script_08010B10:
 	EndBlock
 	Call sub_0806076C
@@ -1,7 +1,7 @@
@ Hyrule Town Rem
 SCRIPT_START script_Rem
 	BeginBlock
-	CallWithArg sub_0806A93C, 0x12345678
+	CallWithArg Rem_MakeInteractable, 0x12345678
 	SetAnimationState 0x0004
 	SetAnimation 0x0002
 	CheckInventory1 ITEM_PEGASUS_BOOTS
@@ -1,7 +1,7 @@
@ Hyrule Town SittingPerson
 SCRIPT_START script_SittingPerson
 	BeginBlock
-	Call sub_080639D0
+	Call SittingPerson_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 	BeginBlock
@@ -3,7 +3,7 @@ SCRIPT_START script_SmallTownMinish
 	BeginBlock
 	CheckPlayerMinish
 	JumpIfNot script_08010BAC
-	Call sub_0807F924
+	Call MakeInteractableAsMinish
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x0007
@@ -1,7 +1,7 @@
@ Library Sturgeon
 SCRIPT_START script_Sturgeon
 	BeginBlock
-	Call sub_08064CC0
+	Call Sturgeon_MakeInteractable
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0007
 	SetAnimationState 0x0002
@@ -1,7 +1,7 @@
@ Hyrule Town Teachers
 SCRIPT_START script_Teachers
 	BeginBlock
-	Call sub_0806C674
+	Call Teachers_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0004
 	EndBlock
@@ -2,7 +2,7 @@
@ also in library, cafe
 SCRIPT_START script_TownMinish1
 	BeginBlock
-	Call sub_0806ADFC
+	Call TownMinish_MakeInteractable
 	DoPostScriptAction 0x000a
 script_0800E6F4:
 	EndBlock
@@ -2,7 +2,7 @@
 SCRIPT_START script_Townsperson1
 	BeginBlock
 	Call sub_08061FE4
-	Call sub_08061E70
+	Call Townsperson_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_080100DC:
@@ -2,7 +2,7 @@
 SCRIPT_START script_Townsperson2
 	BeginBlock
 	Call sub_08061FE4
-	Call sub_08061E70
+	Call Townsperson_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_08010110:
@@ -1,7 +1,7 @@
@ Hyrule Townsperson house with dog
 SCRIPT_START script_TownspersonInDogHouse
 	BeginBlock
-	Call sub_08061E70
+	Call Townsperson_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0004
 	Call sub_08061FD8
@@ -1,7 +1,7 @@
@ Hyrule Town Windstribepeople in house
 SCRIPT_START script_WindTribespeopleVisitor
 	BeginBlock
-	Call sub_0806C870
+	Call WindTribespeople_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0004
 	SetAnimation 0x0000
@@ -1,7 +1,7 @@
@ Lake Hylia Forest Minish telling us to go to the library
 SCRIPT_START script_ForestMinish3
 	BeginBlock
-	Call sub_08060090
+	Call ForestMinish_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_0800C5D6:
@@ -4,7 +4,7 @@ SCRIPT_START script_GoronPunching
 	_0807E9D4
 	Call sub_080694EC
 	DoPostScriptAction 0x000a
-	Call sub_080694B0
+	Call Goron_MakeInteractable
 	EndBlock
 script_0800B9CA:
 	Call CheckInteractType
@@ -2,7 +2,7 @@
 SCRIPT_START script_BombMinish
 	BeginBlock
 	SetAnimationState 0x0004
-	Call sub_08060090
+	Call ForestMinish_MakeInteractable
 	DoPostScriptAction 0x000a
 	CheckKinstoneFused KINSTONE_1C
 	JumpIf script_08009FD2
@@ -1,7 +1,7 @@
@ Syrup CUTSCENE_ORCHESTRATOR Potion
 SCRIPT_START script_CutsceneOrchestratorPotionBlue
 	BeginBlock
-	Call sub_080787B4
+	Call AddInteractableCheckableObject
 	EndBlock
 script_08016146:
 	CheckEntityInteractType
@@ -1,7 +1,7 @@
@ CUTSCENE_ORCHESTRATOR in witch hut?
 SCRIPT_START script_CutsceneOrchestratorPotionRed
 	BeginBlock
-	Call sub_080787B4
+	Call AddInteractableCheckableObject
 	EndBlock
 script_0801619A:
 	CheckEntityInteractType
@@ -3,7 +3,7 @@ SCRIPT_START script_ForestMinish10
 	BeginBlock
 	CheckInventory1 ITEM_JABBERNUT
 	JumpIfNot script_0800C5FE
-	Call sub_08060090
+	Call ForestMinish_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_0800CD92:
@@ -2,7 +2,7 @@
 SCRIPT_START script_ForestMinish4
 	BeginBlock
 script_0800C5FE:
-	Call sub_08060090
+	Call ForestMinish_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_0800C60A:
@@ -1,7 +1,7 @@
@ Crenel Hermit
 SCRIPT_START script_CrenelHermit
 	BeginBlock
-	Call sub_08061E70
+	Call Townsperson_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0004
 	Call sub_08061FD8
@@ -1,7 +1,7 @@
@ Mines Melari in his room
 SCRIPT_START script_MelariInRoom
 	BeginBlock
-	Call sub_08068884
+	Call Melari_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0004
 	SetAnimation 0x0000
@@ -1,7 +1,7 @@
@ Mines Mountain Minish before beds
 SCRIPT_START script_MountainMinish1
 	BeginBlock
-	Call sub_08068104
+	Call MountainMinish_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_0800CF5E:
@@ -1,7 +1,7 @@
@ Mines Mountain Minish
 SCRIPT_START script_MountainMinish2
 	BeginBlock
-	Call sub_08068104
+	Call MountainMinish_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_0800CF96:
@@ -1,7 +1,7 @@
@ Mines Mountain Minish at exit
 SCRIPT_START script_MountainMinish4
 	BeginBlock
-	Call sub_08068104
+	Call MountainMinish_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_0800D35E:
@@ -2,7 +2,7 @@
 SCRIPT_START script_MountainMinish5
 	BeginBlock
 	SetEntitySpeed 0x0100
-	Call sub_08068104
+	Call MountainMinish_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_0800D426:
@@ -42,7 +42,7 @@ script_0800D426:
 	.2byte 0x0000
 	BeginBlock
 	DoPostScriptAction 0x000a
-	Call sub_08062A48
+	Call Kid_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
 script_0800D4E4:
@@ -2,7 +2,7 @@
@ Hyrule Town Carpenter
 SCRIPT_START script_CarpenterOutsideTown
 	BeginBlock
-	Call sub_08067314
+	Call Carpenter_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0004
 	SetIntVariable 0x00000000
@@ -1,7 +1,7 @@
@ Outside Castle Mutoh
 SCRIPT_START script_MutohOutsideTown
 	BeginBlock
-	Call sub_08067100
+	Call Mutoh_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
@@ -1,7 +1,7 @@
@ Farmer
 SCRIPT_START script_Farmer
 	BeginBlock
-	Call sub_0806BCD4
+	Call Farmers_MakeInteractable
 	DoPostScriptAction 0x000a
 	CallWithArg sub_0806BC94, 0x00000000
 	EndBlock
@@ -30,9 +30,10 @@ script_0800B134:
 	Call sub_0807F650
 	_0807E9F0
 .ifndef EU
+	@! @bug: In EU, Eenie is marked as done fusing if kinstone menu is closed without fusing
 	JumpIfNot script_0800B160
 .endif
-	Call sub_0806BCC0
+	Call Farmers_MarkEenieFuserDoner
 script_0800B160:
 	Call EnablePauseMenu
 	EnablePlayerControl
@@ -3,10 +3,10 @@ SCRIPT_START script_MysteriousWall
 	BeginBlock
 	DoPostScriptAction 0x000b
 	DoPostScriptAction 0x0008
-	Call sub_0806DAAC
+	Call NPC4E_IsKinstoneFused
 	JumpIf script_0800B9AC
-	Call sub_0806DAD0
-	CallWithArg sub_0806DA04, 0x00000005
+	Call NPC4E_MakeFuserInteractable
+	CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000005
 	EndBlock
 script_0800B98A:
 	_0807EA4C
@@ -16,7 +16,7 @@ script_0800B98A:
 	EnablePlayerControl
 	Jump script_0800B98A
 script_0800B99E:
-	Call sub_0806F188
+	Call MarkFuserDone
 	Call EnablePauseMenu
 	EnablePlayerControl
 script_0800B9AC:
@@ -1,7 +1,7 @@
@ Tingle Siblings
 SCRIPT_START script_TingleSiblings
 	BeginBlock
-	Call sub_08064EA4
+	Call TingleSiblings_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x000a
@@ -1,8 +1,8 @@
@ All Windcrests
 SCRIPT_START script_Windcrest
 	BeginBlock
-	Call sub_0807F934
-	Call sub_080A2124
+	Call MakeCheckableObjectInteractable
+	Call Windcrest_ChangeInteractableHitbox
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0007
 	EndBlock
@@ -23,7 +23,7 @@ script_08013C2A:
 script_08013C32:
 	BeginBlock
 	DoPostScriptAction 0x0007
-	Call sub_0807F934
+	Call MakeCheckableObjectInteractable
 	DoPostScriptAction 0x000a
 	CallWithArg sub_080962F8, 0x00000000
 .ifndef EU
@@ -7,8 +7,8 @@ script_0801427C:
 	CheckLocalFlag 0x0078
 	JumpIfNot script_0801427C
 	BeginBlock
-	Call sub_0807F934
-	CallWithArg sub_0806DA04, 0x00000008
+	Call MakeCheckableObjectInteractable
+	CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000008
 	EndBlock
 script_08014298:
 	CheckEntityInteractType
@@ -4,8 +4,8 @@ SCRIPT_START script_Npc4EPedestal
 	DoPostScriptAction 0x0008
 	EndBlock
 	BeginBlock
-	Call sub_0807F92C
-	CallWithArg sub_0806DA04, 0x00000003
+	Call MakePedestalInteractable
+	CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000003
 	EndBlock
 script_080134F8:
 	CheckEntityInteractType
@@ -4,8 +4,8 @@ SCRIPT_START script_Npc4ESecondSanctuary
 	DoPostScriptAction 0x0008
 	EndBlock
 	BeginBlock
-	Call sub_0807F92C
-	CallWithArg sub_0806DA04, 0x00000003
+	Call MakePedestalInteractable
+	CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000003
 	EndBlock
 script_0801373C:
 	CheckEntityInteractType
@@ -4,8 +4,8 @@ SCRIPT_START script_Npc4EThirdSanctuary
 	DoPostScriptAction 0x0008
 	EndBlock
 	BeginBlock
-	Call sub_0807F92C
-	CallWithArg sub_0806DA04, 0x00000003
+	Call MakePedestalInteractable
+	CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000003
 	EndBlock
 script_080138D0:
 	CheckEntityInteractType
@@ -1,7 +1,7 @@
@ Hyrule Fields? ForestMinish with Beanstock left to Minish Woods
 SCRIPT_START script_ForestMinish2
 	BeginBlock
-	Call sub_08060090
+	Call ForestMinish_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_0800C592:
@@ -2,8 +2,8 @@
 SCRIPT_START script_SmithAtLinksHouse
 	BeginBlock
 	Call SetPriorityMessage
-	Call sub_08066288
-	Call sub_08066274
+	Call Smith_MakeInteractable
+	Call Smith_ChangeInteractableHitbox
 	DoPostScriptAction 0x000a
 	SetAnimation 0x000c
 	SetAction 0x0003
@@ -4,7 +4,7 @@ SCRIPT_START script_08012C68
 	_0807E9D4
 	DoPostScriptAction 0x0008
 	SetIntVariable 0x00000000
-	Call sub_0806DA04
+	Call NPC4E_ChangeInteractableHitbox
 	EndBlock
 script_08012C7E:
 	CheckEntityInteractType
@@ -1,9 +1,9 @@
@ TODO UNUSED?
 SCRIPT_START script_08013D04
 	BeginBlock
-	Call sub_0807F92C
+	Call MakePedestalInteractable
 	DoPostScriptAction 0x0008
-	CallWithArg sub_0806DA04, 0x00000004
+	CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000004
 	EndBlock
 script_08013D1C:
 	CheckEntityInteractType
@@ -1,9 +1,9 @@
@ TODO UNUSED?
 SCRIPT_START script_08013D44
 	BeginBlock
-	Call sub_0807F92C
+	Call MakePedestalInteractable
 	DoPostScriptAction 0x0008
-	CallWithArg sub_0806DA04, 0x00000004
+	CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000004
 	EndBlock
 script_08013D5C:
 	CheckEntityInteractType
@@ -1,9 +1,9 @@
@ TODO UNUSED?
 SCRIPT_START script_08013D84
 	BeginBlock
-	Call sub_0807F92C
+	Call MakePedestalInteractable
 	DoPostScriptAction 0x0008
-	CallWithArg sub_0806DA04, 0x00000004
+	CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000004
 	EndBlock
 script_08013D9C:
 	CheckEntityInteractType
@@ -1,9 +1,9 @@
@ TODO UNUSED?
 SCRIPT_START script_08013DC4
 	BeginBlock
-	Call sub_0807F92C
+	Call MakePedestalInteractable
 	DoPostScriptAction 0x0008
-	CallWithArg sub_0806DA04, 0x00000004
+	CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000004
 	EndBlock
 script_08013DDC:
 	CheckEntityInteractType
@@ -27,7 +27,7 @@ SCRIPT_START script_08016384
 	FacePlayerAndCheckDist
 	HasRupees 200
 	CheckTextboxResult
-	CheckKinstoneFused KINSTONE_1
+	CheckKinstoneFused KINSTONE_MYSTERIOUS_CLOUD_TOP_RIGHT
 	BuyItem ITEM_BOMBS10, 0x0000
 	CheckBottleContaining ITEM_BOTTLE_EMPTY
 	VariableBitSet 0x00000000
@@ -28,7 +28,7 @@ SCRIPT_START script_08016482
 	_0807E9D4
 	_0807E9DC
 	_0807E9E4 0x0000
-	_0807EA88 0x0001
+	_0807EA88 KINSTONE_MYSTERIOUS_CLOUD_TOP_RIGHT
 	WaitUntilTextboxCloses
 	MessageFromTarget TEXT_LOCATIONS, 0x01
 	MessageNoOverlap 0x0601
@@ -1,7 +1,7 @@
@ Waterfalls MINISH_VILLAGE_OBJECT during kinstone cutscene?
 SCRIPT_START script_MinishVillageObjectLeftStoneOpening
 	BeginBlock
-	CheckKinstoneFused KINSTONE_9
+	CheckKinstoneFused KINSTONE_SOURCE_FLOW
 	JumpIf script_MinishVillageObjectLeftStone
 	EndBlock
 	WaitForSyncFlagAndClear 0x00000001
@@ -1,7 +1,7 @@
@ Waterfalls MINISH_VILLAGE_OBJECT during kinstone cutscene?
 SCRIPT_START script_MinishVillageObjectRightStoneOpening
 	BeginBlock
-	CheckKinstoneFused KINSTONE_9
+	CheckKinstoneFused KINSTONE_SOURCE_FLOW
 	JumpIf script_MinishVillageObjectRightStone
 	EndBlock
 	WaitForSyncFlagAndClear 0x00000002
@@ -2,17 +2,17 @@
 SCRIPT_START script_NPC4ESourceOfTheFlow
 	BeginBlock
 	Call sub_0806DB84
-	CheckKinstoneFused KINSTONE_9
+	CheckKinstoneFused KINSTONE_SOURCE_FLOW
 	JumpIf script_08016028
-	_0807EA88 0x0009
-	CallWithArg sub_0806DA04, 0x00000007
+	_0807EA88 KINSTONE_SOURCE_FLOW
+	CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000007
 	DoPostScriptAction 0x000a
 	EndBlock
 script_08015FE4:
 	_0807EA4C
 	_0807E9F0
 	SetPlayerIdle
-	CheckKinstoneFused KINSTONE_9
+	CheckKinstoneFused KINSTONE_SOURCE_FLOW
 	JumpIf script_08015FFE
 	Call EnablePauseMenu
 	EnablePlayerControl
--- a/Show More
+++ b/Show More