Merge remote-tracking branch 'upstream/master' into tilemap-docs

103 files changed, 137 insertions, 136 deletions

diff --git a/data/animations/npc/sturgeon.s b/data/animations/npc/sturgeon.s
index a4fa9b14..dc4be7fd 100644
--- a/data/animations/npc/sturgeon.s
+++ b/data/animations/npc/sturgeon.s
@@ -45,4 +45,4 @@ gSpriteAnimations_Sturgeon:: @ 0810FBD0
 	.4byte gSpriteAnimations_Sturgeon_7
 	.4byte gSpriteAnimations_Sturgeon_8
 	.4byte gSpriteAnimations_Sturgeon_9
-	.4byte 00000000
\ No newline at end of file
+	.4byte 00000000
diff --git a/data/scripts/cloudTops/script_GregalHealthy.inc b/data/scripts/cloudTops/script_GregalHealthy.inc
index cbd342aa..10e0f160 100644
--- a/data/scripts/cloudTops/script_GregalHealthy.inc
+++ b/data/scripts/cloudTops/script_GregalHealthy.inc
@@ -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
diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc
index 26b0a439..6cc75af2 100644
--- a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc
+++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc
@@ -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
 	MoveTo 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
diff --git a/data/scripts/cloudTops/script_Siroc.inc b/data/scripts/cloudTops/script_Siroc.inc
index ba0c3e98..55efc778 100644
--- a/data/scripts/cloudTops/script_Siroc.inc
+++ b/data/scripts/cloudTops/script_Siroc.inc
@@ -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:
diff --git a/data/scripts/cloudTops/script_WindTribespeople1.inc b/data/scripts/cloudTops/script_WindTribespeople1.inc
index 4b962633..e39b027f 100644
--- a/data/scripts/cloudTops/script_WindTribespeople1.inc
+++ b/data/scripts/cloudTops/script_WindTribespeople1.inc
@@ -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
diff --git a/data/scripts/cloudTops/script_WindTribespeople2.inc b/data/scripts/cloudTops/script_WindTribespeople2.inc
index 37a99ee1..3eb9d71b 100644
--- a/data/scripts/cloudTops/script_WindTribespeople2.inc
+++ b/data/scripts/cloudTops/script_WindTribespeople2.inc
@@ -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
diff --git a/data/scripts/cloudTops/script_WindTribespeople3.inc b/data/scripts/cloudTops/script_WindTribespeople3.inc
index b10db604..7eee45f5 100644
--- a/data/scripts/cloudTops/script_WindTribespeople3.inc
+++ b/data/scripts/cloudTops/script_WindTribespeople3.inc
@@ -2,7 +2,7 @@
 SCRIPT_START script_WindTribespeople3
 	BeginBlock
 	SetEntitySpeed 0x0080
-	Call sub_0806C870
+	Call WindTribespeople_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_080149DE:
diff --git a/data/scripts/cloudTops/script_WindTribespeople4.inc b/data/scripts/cloudTops/script_WindTribespeople4.inc
index ba6fb854..33f31fe1 100644
--- a/data/scripts/cloudTops/script_WindTribespeople4.inc
+++ b/data/scripts/cloudTops/script_WindTribespeople4.inc
@@ -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:
diff --git a/data/scripts/cloudTops/script_WindTribespeople5.inc b/data/scripts/cloudTops/script_WindTribespeople5.inc
index 698f9bb2..cb93bd49 100644
--- a/data/scripts/cloudTops/script_WindTribespeople5.inc
+++ b/data/scripts/cloudTops/script_WindTribespeople5.inc
@@ -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:
diff --git a/data/scripts/cloudTops/script_WindTribespeople7.inc b/data/scripts/cloudTops/script_WindTribespeople7.inc
index 36fc4fed..eb33c128 100644
--- a/data/scripts/cloudTops/script_WindTribespeople7.inc
+++ b/data/scripts/cloudTops/script_WindTribespeople7.inc
@@ -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
diff --git a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc
index 96bf8f6d..1ee344ce 100644
--- a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc
+++ b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc
@@ -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
diff --git a/data/scripts/dhc/script_MinishterPothoStone.inc b/data/scripts/dhc/script_MinishterPothoStone.inc
index b4fa78a8..d09d7a9b 100644
--- a/data/scripts/dhc/script_MinishterPothoStone.inc
+++ b/data/scripts/dhc/script_MinishterPothoStone.inc
@@ -32,7 +32,7 @@ script_0800E0DE:
 	WaitUntilTextboxCloses
 	SetLocalFlag 0x0093
 script_0800E12E:
-	Call sub_080668F0
+	Call MinisterPotho_MakeInteractable
 	EnablePlayerControl
 	EndBlock
 script_0800E138:
diff --git a/data/scripts/dhc/script_MinisterPothoCell.inc b/data/scripts/dhc/script_MinisterPothoCell.inc
index 4fabc7ad..428097ae 100644
--- a/data/scripts/dhc/script_MinisterPothoCell.inc
+++ b/data/scripts/dhc/script_MinisterPothoCell.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_MinisterPothoCell
 	BeginBlock
 	SetAnimationState 0x0002
 	DoPostScriptAction 0x000a
-	Call sub_080668F0
+	Call MinisterPotho_MakeInteractable
 	EndBlock
 script_0800E41A:
 	CheckEntityInteractType
diff --git a/data/scripts/graveyard/script_DampeInside2.inc b/data/scripts/graveyard/script_DampeInside2.inc
index fba10fd3..eb800d94 100644
--- a/data/scripts/graveyard/script_DampeInside2.inc
+++ b/data/scripts/graveyard/script_DampeInside2.inc
@@ -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
diff --git a/data/scripts/graveyard/script_DampeOuside.inc b/data/scripts/graveyard/script_DampeOuside.inc
index b1cede54..ff39fe74 100644
--- a/data/scripts/graveyard/script_DampeOuside.inc
+++ b/data/scripts/graveyard/script_DampeOuside.inc
@@ -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:
diff --git a/data/scripts/graveyard/script_GhostBrothers.inc b/data/scripts/graveyard/script_GhostBrothers.inc
index b9fed2f1..5f9c6d81 100644
--- a/data/scripts/graveyard/script_GhostBrothers.inc
+++ b/data/scripts/graveyard/script_GhostBrothers.inc
@@ -1,7 +1,7 @@
 @ Graveyard GhostBrothers
 SCRIPT_START script_GhostBrothers
 	BeginBlock
-	Call sub_08065D00
+	Call GhostBrothers_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x000a
diff --git a/data/scripts/hyruleCastle/script_KingDaltus.inc b/data/scripts/hyruleCastle/script_KingDaltus.inc
index 09965292..d62653a3 100644
--- a/data/scripts/hyruleCastle/script_KingDaltus.inc
+++ b/data/scripts/hyruleCastle/script_KingDaltus.inc
@@ -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
diff --git a/data/scripts/hyruleCastle/script_MinisterPotho.inc b/data/scripts/hyruleCastle/script_MinisterPotho.inc
index 6bd64932..a5b4e11c 100644
--- a/data/scripts/hyruleCastle/script_MinisterPotho.inc
+++ b/data/scripts/hyruleCastle/script_MinisterPotho.inc
@@ -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:
diff --git a/data/scripts/hyruleTown/script_Anju.inc b/data/scripts/hyruleTown/script_Anju.inc
index adfccdb4..bf743b41 100644
--- a/data/scripts/hyruleTown/script_Anju.inc
+++ b/data/scripts/hyruleTown/script_Anju.inc
@@ -2,7 +2,7 @@
 SCRIPT_START script_Anju
 	BeginBlock
 	DoPostScriptAction 0x0001
-	Call sub_0806C354
+	Call Anju_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_0801015A:
@@ -16,7 +16,7 @@ script_0801015A:
 	WaitUntilTextboxCloses
 	CheckTextboxResult
 	JumpIfNot script_080101A6
-	Call sub_080A1608
+	Call CuccoMinigame_TellObjective
 	WaitUntilTextboxCloses
 	EnablePlayerControl
 	CallWithArg CuccoMinigame_Init, script_080101AC
@@ -25,7 +25,7 @@ script_0801015A:
 	SetRoomFlag 0x0001
 	Jump script_0801015A
 script_0801019E:
-	Call sub_080A1608
+	Call CuccoMinigame_TellObjective
 	WaitUntilTextboxCloses
 script_080101A6:
 	EnablePlayerControl
@@ -60,14 +60,14 @@ script_080101AC:
 	SetFade4
 	WaitForFadeFinish
 	PlayBGM
-	Call sub_080A13B4
+	Call CuccoMinigame_Results
 	WaitUntilTextboxCloses
 	JumpIfNot script_08010240
-	Call sub_080A13E8
+	Call CuccoMinigame_WinItem
 	WaitPlayerGetItem
-	Call sub_080A1460
+	Call CuccoMinigame_WinRupees
 	WaitUntilTextboxCloses
-	Call sub_080A14A8
+	Call CuccoMinigame_AdvanceLevel
 script_08010240:
 	Call EnablePauseMenu
 	EnablePlayerControl
diff --git a/data/scripts/hyruleTown/script_Beedle.inc b/data/scripts/hyruleTown/script_Beedle.inc
index 49342981..d7c28c23 100644
--- a/data/scripts/hyruleTown/script_Beedle.inc
+++ b/data/scripts/hyruleTown/script_Beedle.inc
@@ -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
diff --git a/data/scripts/hyruleTown/script_Brocco.inc b/data/scripts/hyruleTown/script_Brocco.inc
index f01bc951..3637207a 100644
--- a/data/scripts/hyruleTown/script_Brocco.inc
+++ b/data/scripts/hyruleTown/script_Brocco.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_Brocco
 	BeginBlock
 	SetAnimationState 0x0004
 	SetAnimation 0x0000
-	Call sub_080636F4
+	Call Brocco_MakeInteractable
 	DoPostScriptAction 0x000a
 	Call SetPriorityMessage
 	EndBlock
diff --git a/data/scripts/hyruleTown/script_Carpenter.inc b/data/scripts/hyruleTown/script_Carpenter.inc
index 9a29615b..3358f344 100644
--- a/data/scripts/hyruleTown/script_Carpenter.inc
+++ b/data/scripts/hyruleTown/script_Carpenter.inc
@@ -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
diff --git a/data/scripts/hyruleTown/script_CatPerson.inc b/data/scripts/hyruleTown/script_CatPerson.inc
index 73cfba96..975ff68d 100644
--- a/data/scripts/hyruleTown/script_CatPerson.inc
+++ b/data/scripts/hyruleTown/script_CatPerson.inc
@@ -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
diff --git a/data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc b/data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc
index f81c9e64..2ef2df5a 100644
--- a/data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc
+++ b/data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc
@@ -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
diff --git a/data/scripts/hyruleTown/script_Din.inc b/data/scripts/hyruleTown/script_Din.inc
index 3382477f..64cce82b 100644
--- a/data/scripts/hyruleTown/script_Din.inc
+++ b/data/scripts/hyruleTown/script_Din.inc
@@ -1,7 +1,7 @@
 @ Hyrule Town Din
 SCRIPT_START script_Din
 	BeginBlock
-	Call sub_08064828
+	Call Din_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
diff --git a/data/scripts/hyruleTown/script_Din2.inc b/data/scripts/hyruleTown/script_Din2.inc
index cf4f02a1..19993357 100644
--- a/data/scripts/hyruleTown/script_Din2.inc
+++ b/data/scripts/hyruleTown/script_Din2.inc
@@ -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
diff --git a/data/scripts/hyruleTown/script_DinAlone.inc b/data/scripts/hyruleTown/script_DinAlone.inc
index 61ddd2c3..1e035f0a 100644
--- a/data/scripts/hyruleTown/script_DinAlone.inc
+++ b/data/scripts/hyruleTown/script_DinAlone.inc
@@ -1,7 +1,7 @@
 @ Din completely alone
 SCRIPT_START script_DinAlone
 	BeginBlock
-	Call sub_08064828
+	Call Din_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
diff --git a/data/scripts/hyruleTown/script_DinMovedIn.inc b/data/scripts/hyruleTown/script_DinMovedIn.inc
index 578f3182..e4b269a1 100644
--- a/data/scripts/hyruleTown/script_DinMovedIn.inc
+++ b/data/scripts/hyruleTown/script_DinMovedIn.inc
@@ -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
diff --git a/data/scripts/hyruleTown/script_DogPersonInCatHouse.inc b/data/scripts/hyruleTown/script_DogPersonInCatHouse.inc
index 2cc56734..ddb3beef 100644
--- a/data/scripts/hyruleTown/script_DogPersonInCatHouse.inc
+++ b/data/scripts/hyruleTown/script_DogPersonInCatHouse.inc
@@ -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
diff --git a/data/scripts/hyruleTown/script_Farore.inc b/data/scripts/hyruleTown/script_Farore.inc
index 3477a9fb..5fc0a12b 100644
--- a/data/scripts/hyruleTown/script_Farore.inc
+++ b/data/scripts/hyruleTown/script_Farore.inc
@@ -1,7 +1,7 @@
 @ Hyrule Town Farore
 SCRIPT_START script_Farore
 	BeginBlock
-	Call sub_08064A28
+	Call Farore_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
diff --git a/data/scripts/hyruleTown/script_Farore2.inc b/data/scripts/hyruleTown/script_Farore2.inc
index 0f3e9303..252b83c8 100644
--- a/data/scripts/hyruleTown/script_Farore2.inc
+++ b/data/scripts/hyruleTown/script_Farore2.inc
@@ -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
diff --git a/data/scripts/hyruleTown/script_FaroreAlone.inc b/data/scripts/hyruleTown/script_FaroreAlone.inc
index 03a869de..30b0b454 100644
--- a/data/scripts/hyruleTown/script_FaroreAlone.inc
+++ b/data/scripts/hyruleTown/script_FaroreAlone.inc
@@ -1,7 +1,7 @@
 @ Farore completely alone
 SCRIPT_START script_FaroreAlone
 	BeginBlock
-	Call sub_08064A28
+	Call Farore_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
diff --git a/data/scripts/hyruleTown/script_FaroreMovedIn.inc b/data/scripts/hyruleTown/script_FaroreMovedIn.inc
index 1ea10abe..5437e6ef 100644
--- a/data/scripts/hyruleTown/script_FaroreMovedIn.inc
+++ b/data/scripts/hyruleTown/script_FaroreMovedIn.inc
@@ -1,7 +1,7 @@
 @ Farore moved in 
 SCRIPT_START script_FaroreMovedIn
 	BeginBlock
-	Call sub_08064A28
+	Call Farore_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
diff --git a/data/scripts/hyruleTown/script_ForestMinish11.inc b/data/scripts/hyruleTown/script_ForestMinish11.inc
index 9d5214c7..48fed47e 100644
--- a/data/scripts/hyruleTown/script_ForestMinish11.inc
+++ b/data/scripts/hyruleTown/script_ForestMinish11.inc
@@ -1,7 +1,7 @@
 @ Forest Minish above cafe
 SCRIPT_START script_ForestMinish11
 	BeginBlock
-	Call sub_08060090
+	Call ForestMinish_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_0800E6BE:
diff --git a/data/scripts/hyruleTown/script_HurdyGurdyMan.inc b/data/scripts/hyruleTown/script_HurdyGurdyMan.inc
index 7daf6e2c..1ebc20b4 100644
--- a/data/scripts/hyruleTown/script_HurdyGurdyMan.inc
+++ b/data/scripts/hyruleTown/script_HurdyGurdyMan.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_HurdyGurdyMan
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0004
 	SetAnimation 0x0008
-	Call sub_0806E440
+	Call HurdyGurdyMan_MakeInteractable
 	EndBlock
 script_08010BCA:
 	CheckEntityInteractType
diff --git a/data/scripts/hyruleTown/script_Kid1.inc b/data/scripts/hyruleTown/script_Kid1.inc
index 732289b5..1b1af5dd 100644
--- a/data/scripts/hyruleTown/script_Kid1.inc
+++ b/data/scripts/hyruleTown/script_Kid1.inc
@@ -2,7 +2,7 @@
 SCRIPT_START script_Kid1
 	BeginBlock
 	DoPostScriptAction 0x0000
-	Call sub_08062A48
+	Call Kid_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_080102A6:
diff --git a/data/scripts/hyruleTown/script_Kid2.inc b/data/scripts/hyruleTown/script_Kid2.inc
index 65a9125b..a0c65639 100644
--- a/data/scripts/hyruleTown/script_Kid2.inc
+++ b/data/scripts/hyruleTown/script_Kid2.inc
@@ -2,7 +2,7 @@
 SCRIPT_START script_Kid2
 	BeginBlock
 	DoPostScriptAction 0x0000
-	Call sub_08062A48
+	Call Kid_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_080102F2:
diff --git a/data/scripts/hyruleTown/script_Kid4.inc b/data/scripts/hyruleTown/script_Kid4.inc
index da188edd..4b15c564 100644
--- a/data/scripts/hyruleTown/script_Kid4.inc
+++ b/data/scripts/hyruleTown/script_Kid4.inc
@@ -2,7 +2,7 @@
 SCRIPT_START script_Kid4
 	BeginBlock
 	DoPostScriptAction 0x0000
-	Call sub_08062A48
+	Call Kid_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_080103C2:
diff --git a/data/scripts/hyruleTown/script_Kid5.inc b/data/scripts/hyruleTown/script_Kid5.inc
index 4465b197..ac7006a4 100644
--- a/data/scripts/hyruleTown/script_Kid5.inc
+++ b/data/scripts/hyruleTown/script_Kid5.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_Kid5
 	BeginBlock
 	SetAnimation 0x0008
 script_08010622:
-	Call sub_08062A48
+	Call Kid_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_0801062E:
diff --git a/data/scripts/hyruleTown/script_KidInn.inc b/data/scripts/hyruleTown/script_KidInn.inc
index e33b7daa..1fcdc2e1 100644
--- a/data/scripts/hyruleTown/script_KidInn.inc
+++ b/data/scripts/hyruleTown/script_KidInn.inc
@@ -2,7 +2,7 @@
 SCRIPT_START script_KidInn
 	BeginBlock
 	DoPostScriptAction 0x000a
-	Call sub_08062A48
+	Call Kid_MakeInteractable
 	DoPostScriptAction 0x0000
 script_0800D5AC:
 	EndBlock
diff --git a/data/scripts/hyruleTown/script_LibraryVisitor.inc b/data/scripts/hyruleTown/script_LibraryVisitor.inc
index 1d0d7132..680ac8e4 100644
--- a/data/scripts/hyruleTown/script_LibraryVisitor.inc
+++ b/data/scripts/hyruleTown/script_LibraryVisitor.inc
@@ -2,7 +2,7 @@
 SCRIPT_START script_LibraryVisitor
 	BeginBlock
 	Call sub_08061FD8
-	Call sub_08061E70
+	Call Townsperson_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_08008DA0:
diff --git a/data/scripts/hyruleTown/script_Mama.inc b/data/scripts/hyruleTown/script_Mama.inc
index c286a0d2..f8ab1a20 100644
--- a/data/scripts/hyruleTown/script_Mama.inc
+++ b/data/scripts/hyruleTown/script_Mama.inc
@@ -1,7 +1,7 @@
 @ Hyrule Town Mama
 SCRIPT_START script_Mama
 	BeginBlock
-	Call sub_0806C4F8
+	Call Mama_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0000
 	EndBlock
diff --git a/data/scripts/hyruleTown/script_Mayor.inc b/data/scripts/hyruleTown/script_Mayor.inc
index 1761b2cf..5b04586a 100644
--- a/data/scripts/hyruleTown/script_Mayor.inc
+++ b/data/scripts/hyruleTown/script_Mayor.inc
@@ -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
diff --git a/data/scripts/hyruleTown/script_MutohInMill.inc b/data/scripts/hyruleTown/script_MutohInMill.inc
index ee10eeba..ef84ee3e 100644
--- a/data/scripts/hyruleTown/script_MutohInMill.inc
+++ b/data/scripts/hyruleTown/script_MutohInMill.inc
@@ -1,7 +1,7 @@
 @ Hyrule Town Mutoh
 SCRIPT_START script_MutohInMill
 	BeginBlock
-	Call sub_08067100
+	Call Mutoh_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
diff --git a/data/scripts/hyruleTown/script_Nayru.inc b/data/scripts/hyruleTown/script_Nayru.inc
index e311efcc..6798b860 100644
--- a/data/scripts/hyruleTown/script_Nayru.inc
+++ b/data/scripts/hyruleTown/script_Nayru.inc
@@ -1,7 +1,7 @@
 @ Hyrule Town Nayru
 SCRIPT_START script_Nayru
 	BeginBlock
-	Call sub_08064928
+	Call Nayru_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
diff --git a/data/scripts/hyruleTown/script_Nayru2.inc b/data/scripts/hyruleTown/script_Nayru2.inc
index ab085b28..b4555057 100644
--- a/data/scripts/hyruleTown/script_Nayru2.inc
+++ b/data/scripts/hyruleTown/script_Nayru2.inc
@@ -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
diff --git a/data/scripts/hyruleTown/script_NayruAlone.inc b/data/scripts/hyruleTown/script_NayruAlone.inc
index 6fbd687d..9b72c947 100644
--- a/data/scripts/hyruleTown/script_NayruAlone.inc
+++ b/data/scripts/hyruleTown/script_NayruAlone.inc
@@ -1,7 +1,7 @@
 @ Nayru completely alone
 SCRIPT_START script_NayruAlone
 	BeginBlock
-	Call sub_08064928
+	Call Nayru_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
diff --git a/data/scripts/hyruleTown/script_NayruMovedIn.inc b/data/scripts/hyruleTown/script_NayruMovedIn.inc
index 8a143338..50645ef0 100644
--- a/data/scripts/hyruleTown/script_NayruMovedIn.inc
+++ b/data/scripts/hyruleTown/script_NayruMovedIn.inc
@@ -1,7 +1,7 @@
 @ Nayru moved in
 SCRIPT_START script_NayruMovedIn
 	BeginBlock
-	Call sub_08064928
+	Call Nayru_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0001
 	DoPostScriptAction 0x000a
diff --git a/data/scripts/hyruleTown/script_OldLadyCatHouse1.inc b/data/scripts/hyruleTown/script_OldLadyCatHouse1.inc
index c5905a83..3f6dcb4a 100644
--- a/data/scripts/hyruleTown/script_OldLadyCatHouse1.inc
+++ b/data/scripts/hyruleTown/script_OldLadyCatHouse1.inc
@@ -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
diff --git a/data/scripts/hyruleTown/script_OldLadyCatHouse2.inc b/data/scripts/hyruleTown/script_OldLadyCatHouse2.inc
index edaf3a11..1c1ce611 100644
--- a/data/scripts/hyruleTown/script_OldLadyCatHouse2.inc
+++ b/data/scripts/hyruleTown/script_OldLadyCatHouse2.inc
@@ -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
diff --git a/data/scripts/hyruleTown/script_Phonograph.inc b/data/scripts/hyruleTown/script_Phonograph.inc
index 12071bc5..ae6c6ed3 100644
--- a/data/scripts/hyruleTown/script_Phonograph.inc
+++ b/data/scripts/hyruleTown/script_Phonograph.inc
@@ -1,7 +1,7 @@
 @ Phonograph
 SCRIPT_START script_Phonograph
 	BeginBlock
-	Call sub_0807F934
+	Call MakeCheckableObjectInteractable
 	EndBlock
 script_0800BA46:
 	CheckEntityInteractType
diff --git a/data/scripts/hyruleTown/script_Pina.inc b/data/scripts/hyruleTown/script_Pina.inc
index 866ef334..8cfc8f8d 100644
--- a/data/scripts/hyruleTown/script_Pina.inc
+++ b/data/scripts/hyruleTown/script_Pina.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_Pina
 	BeginBlock
 	SetAnimationState 0x0004
 	SetAnimation 0x0000
-	Call sub_08063CAC
+	Call Pina_MakeInteractable
 	DoPostScriptAction 0x000a
 	Call SetPriorityMessage
 	EndBlock
diff --git a/data/scripts/hyruleTown/script_Postman.inc b/data/scripts/hyruleTown/script_Postman.inc
index 3c531a62..ee05632e 100644
--- a/data/scripts/hyruleTown/script_Postman.inc
+++ b/data/scripts/hyruleTown/script_Postman.inc
@@ -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
diff --git a/data/scripts/hyruleTown/script_Rem.inc b/data/scripts/hyruleTown/script_Rem.inc
index fa58f73d..a7384e2a 100644
--- a/data/scripts/hyruleTown/script_Rem.inc
+++ b/data/scripts/hyruleTown/script_Rem.inc
@@ -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
diff --git a/data/scripts/hyruleTown/script_SittingPerson.inc b/data/scripts/hyruleTown/script_SittingPerson.inc
index f61560d7..3fecc6df 100644
--- a/data/scripts/hyruleTown/script_SittingPerson.inc
+++ b/data/scripts/hyruleTown/script_SittingPerson.inc
@@ -1,7 +1,7 @@
 @ Hyrule Town SittingPerson
 SCRIPT_START script_SittingPerson
 	BeginBlock
-	Call sub_080639D0
+	Call SittingPerson_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 	BeginBlock
diff --git a/data/scripts/hyruleTown/script_SmallTownMinish.inc b/data/scripts/hyruleTown/script_SmallTownMinish.inc
index d97d0801..8c3b2727 100644
--- a/data/scripts/hyruleTown/script_SmallTownMinish.inc
+++ b/data/scripts/hyruleTown/script_SmallTownMinish.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_SmallTownMinish
 	BeginBlock
 	CheckPlayerMinish
 	JumpIfNot script_08010BAC
-	Call sub_0807F924
+	Call MakeInteractableAsMinish
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x0007
diff --git a/data/scripts/hyruleTown/script_Sturgeon.inc b/data/scripts/hyruleTown/script_Sturgeon.inc
index db91eb49..a73997bd 100644
--- a/data/scripts/hyruleTown/script_Sturgeon.inc
+++ b/data/scripts/hyruleTown/script_Sturgeon.inc
@@ -1,7 +1,7 @@
 @ Library Sturgeon
 SCRIPT_START script_Sturgeon
 	BeginBlock
-	Call sub_08064CC0
+	Call Sturgeon_MakeInteractable
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0007
 	SetAnimationState 0x0002
diff --git a/data/scripts/hyruleTown/script_Teachers.inc b/data/scripts/hyruleTown/script_Teachers.inc
index b7898239..202a48dc 100644
--- a/data/scripts/hyruleTown/script_Teachers.inc
+++ b/data/scripts/hyruleTown/script_Teachers.inc
@@ -1,7 +1,7 @@
 @ Hyrule Town Teachers
 SCRIPT_START script_Teachers
 	BeginBlock
-	Call sub_0806C674
+	Call Teachers_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0004
 	EndBlock
diff --git a/data/scripts/hyruleTown/script_TownMinish1.inc b/data/scripts/hyruleTown/script_TownMinish1.inc
index 248f4c2d..30be6472 100644
--- a/data/scripts/hyruleTown/script_TownMinish1.inc
+++ b/data/scripts/hyruleTown/script_TownMinish1.inc
@@ -2,7 +2,7 @@
 @ also in library, cafe
 SCRIPT_START script_TownMinish1
 	BeginBlock
-	Call sub_0806ADFC
+	Call TownMinish_MakeInteractable
 	DoPostScriptAction 0x000a
 script_0800E6F4:
 	EndBlock
diff --git a/data/scripts/hyruleTown/script_Townsperson1.inc b/data/scripts/hyruleTown/script_Townsperson1.inc
index 259d47b4..55bebc1f 100644
--- a/data/scripts/hyruleTown/script_Townsperson1.inc
+++ b/data/scripts/hyruleTown/script_Townsperson1.inc
@@ -2,7 +2,7 @@
 SCRIPT_START script_Townsperson1
 	BeginBlock
 	Call sub_08061FE4
-	Call sub_08061E70
+	Call Townsperson_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_080100DC:
diff --git a/data/scripts/hyruleTown/script_Townsperson2.inc b/data/scripts/hyruleTown/script_Townsperson2.inc
index 535ade2e..f0b2e9ad 100644
--- a/data/scripts/hyruleTown/script_Townsperson2.inc
+++ b/data/scripts/hyruleTown/script_Townsperson2.inc
@@ -2,7 +2,7 @@
 SCRIPT_START script_Townsperson2
 	BeginBlock
 	Call sub_08061FE4
-	Call sub_08061E70
+	Call Townsperson_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_08010110:
diff --git a/data/scripts/hyruleTown/script_TownspersonInDogHouse.inc b/data/scripts/hyruleTown/script_TownspersonInDogHouse.inc
index 7be84de5..a3da4d63 100644
--- a/data/scripts/hyruleTown/script_TownspersonInDogHouse.inc
+++ b/data/scripts/hyruleTown/script_TownspersonInDogHouse.inc
@@ -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
diff --git a/data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc b/data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc
index ce39d48f..a1346c00 100644
--- a/data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc
+++ b/data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc
@@ -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
diff --git a/data/scripts/lakeHylia/script_ForestMinish3.inc b/data/scripts/lakeHylia/script_ForestMinish3.inc
index 26ad3f5a..4a0ab477 100644
--- a/data/scripts/lakeHylia/script_ForestMinish3.inc
+++ b/data/scripts/lakeHylia/script_ForestMinish3.inc
@@ -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:
diff --git a/data/scripts/lonLonRanch/script_GoronPunching.inc b/data/scripts/lonLonRanch/script_GoronPunching.inc
index ebe77add..992ee9eb 100644
--- a/data/scripts/lonLonRanch/script_GoronPunching.inc
+++ b/data/scripts/lonLonRanch/script_GoronPunching.inc
@@ -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
diff --git a/data/scripts/minishWoods/script_BombMinish.inc b/data/scripts/minishWoods/script_BombMinish.inc
index 2be316b6..5f2b461a 100644
--- a/data/scripts/minishWoods/script_BombMinish.inc
+++ b/data/scripts/minishWoods/script_BombMinish.inc
@@ -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
diff --git a/data/scripts/minishWoods/script_CutsceneOrchestratorPotionBlue.inc b/data/scripts/minishWoods/script_CutsceneOrchestratorPotionBlue.inc
index 3856ef0a..ea855b06 100644
--- a/data/scripts/minishWoods/script_CutsceneOrchestratorPotionBlue.inc
+++ b/data/scripts/minishWoods/script_CutsceneOrchestratorPotionBlue.inc
@@ -1,7 +1,7 @@
 @ Syrup CUTSCENE_ORCHESTRATOR Potion
 SCRIPT_START script_CutsceneOrchestratorPotionBlue
 	BeginBlock
-	Call sub_080787B4
+	Call AddInteractableCheckableObject
 	EndBlock
 script_08016146:
 	CheckEntityInteractType
diff --git a/data/scripts/minishWoods/script_CutsceneOrchestratorPotionRed.inc b/data/scripts/minishWoods/script_CutsceneOrchestratorPotionRed.inc
index 4000dbfb..17b15a7b 100644
--- a/data/scripts/minishWoods/script_CutsceneOrchestratorPotionRed.inc
+++ b/data/scripts/minishWoods/script_CutsceneOrchestratorPotionRed.inc
@@ -1,7 +1,7 @@
 @ CUTSCENE_ORCHESTRATOR in witch hut?
 SCRIPT_START script_CutsceneOrchestratorPotionRed
 	BeginBlock
-	Call sub_080787B4
+	Call AddInteractableCheckableObject
 	EndBlock
 script_0801619A:
 	CheckEntityInteractType
diff --git a/data/scripts/minishWoods/script_ForestMinish10.inc b/data/scripts/minishWoods/script_ForestMinish10.inc
index 9ee0b042..6c3c5fa8 100644
--- a/data/scripts/minishWoods/script_ForestMinish10.inc
+++ b/data/scripts/minishWoods/script_ForestMinish10.inc
@@ -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:
diff --git a/data/scripts/minishWoods/script_ForestMinish4.inc b/data/scripts/minishWoods/script_ForestMinish4.inc
index 2663d585..3008312b 100644
--- a/data/scripts/minishWoods/script_ForestMinish4.inc
+++ b/data/scripts/minishWoods/script_ForestMinish4.inc
@@ -2,7 +2,7 @@
 SCRIPT_START script_ForestMinish4
 	BeginBlock
 script_0800C5FE:
-	Call sub_08060090
+	Call ForestMinish_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_0800C60A:
diff --git a/data/scripts/mtCrenel/script_CrenelHermit.inc b/data/scripts/mtCrenel/script_CrenelHermit.inc
index 91d499ad..59430538 100644
--- a/data/scripts/mtCrenel/script_CrenelHermit.inc
+++ b/data/scripts/mtCrenel/script_CrenelHermit.inc
@@ -1,7 +1,7 @@
 @ Crenel Hermit
 SCRIPT_START script_CrenelHermit
 	BeginBlock
-	Call sub_08061E70
+	Call Townsperson_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0004
 	Call sub_08061FD8
diff --git a/data/scripts/mtCrenel/script_MelariInRoom.inc b/data/scripts/mtCrenel/script_MelariInRoom.inc
index 3e5b9e8a..b0581826 100644
--- a/data/scripts/mtCrenel/script_MelariInRoom.inc
+++ b/data/scripts/mtCrenel/script_MelariInRoom.inc
@@ -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
diff --git a/data/scripts/mtCrenel/script_MountainMinish1.inc b/data/scripts/mtCrenel/script_MountainMinish1.inc
index 20e946d1..e745e8dd 100644
--- a/data/scripts/mtCrenel/script_MountainMinish1.inc
+++ b/data/scripts/mtCrenel/script_MountainMinish1.inc
@@ -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:
diff --git a/data/scripts/mtCrenel/script_MountainMinish2.inc b/data/scripts/mtCrenel/script_MountainMinish2.inc
index de34aca9..cdf4e14d 100644
--- a/data/scripts/mtCrenel/script_MountainMinish2.inc
+++ b/data/scripts/mtCrenel/script_MountainMinish2.inc
@@ -1,7 +1,7 @@
 @ Mines Mountain Minish
 SCRIPT_START script_MountainMinish2
 	BeginBlock
-	Call sub_08068104
+	Call MountainMinish_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_0800CF96:
diff --git a/data/scripts/mtCrenel/script_MountainMinish4.inc b/data/scripts/mtCrenel/script_MountainMinish4.inc
index d42891a8..04340d41 100644
--- a/data/scripts/mtCrenel/script_MountainMinish4.inc
+++ b/data/scripts/mtCrenel/script_MountainMinish4.inc
@@ -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:
diff --git a/data/scripts/mtCrenel/script_MountainMinish5.inc b/data/scripts/mtCrenel/script_MountainMinish5.inc
index c1a52532..c1d44127 100644
--- a/data/scripts/mtCrenel/script_MountainMinish5.inc
+++ b/data/scripts/mtCrenel/script_MountainMinish5.inc
@@ -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:
diff --git a/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc b/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc
index e9af8375..49beaa01 100644
--- a/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc
+++ b/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc
@@ -2,7 +2,7 @@
 @ Hyrule Town Carpenter
 SCRIPT_START script_CarpenterOutsideTown
 	BeginBlock
-	Call sub_08067314
+	Call Carpenter_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0004
 	SetIntVariable 0x00000000
diff --git a/data/scripts/northHyruleField/script_MutohOutsideTown.inc b/data/scripts/northHyruleField/script_MutohOutsideTown.inc
index 72f84118..a5f0a4f3 100644
--- a/data/scripts/northHyruleField/script_MutohOutsideTown.inc
+++ b/data/scripts/northHyruleField/script_MutohOutsideTown.inc
@@ -1,7 +1,7 @@
 @ Outside Castle Mutoh
 SCRIPT_START script_MutohOutsideTown
 	BeginBlock
-	Call sub_08067100
+	Call Mutoh_MakeInteractable
 	DoPostScriptAction 0x000a
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
diff --git a/data/scripts/npc/script_Farmer.inc b/data/scripts/npc/script_Farmer.inc
index 9d281c12..11f0566f 100644
--- a/data/scripts/npc/script_Farmer.inc
+++ b/data/scripts/npc/script_Farmer.inc
@@ -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
diff --git a/data/scripts/npc/script_MysteriousWall.inc b/data/scripts/npc/script_MysteriousWall.inc
index aa780c91..28ab2c5e 100644
--- a/data/scripts/npc/script_MysteriousWall.inc
+++ b/data/scripts/npc/script_MysteriousWall.inc
@@ -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:
diff --git a/data/scripts/npc/script_TingleSiblings.inc b/data/scripts/npc/script_TingleSiblings.inc
index d5ea4160..0719e620 100644
--- a/data/scripts/npc/script_TingleSiblings.inc
+++ b/data/scripts/npc/script_TingleSiblings.inc
@@ -1,7 +1,7 @@
 @ Tingle Siblings
 SCRIPT_START script_TingleSiblings
 	BeginBlock
-	Call sub_08064EA4
+	Call TingleSiblings_MakeInteractable
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x000a
diff --git a/data/scripts/npc/script_Windcrest.inc b/data/scripts/npc/script_Windcrest.inc
index 130ad98a..37417368 100644
--- a/data/scripts/npc/script_Windcrest.inc
+++ b/data/scripts/npc/script_Windcrest.inc
@@ -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
diff --git a/data/scripts/sanctuary/script_CutsceneMiscObjectTextBoard.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectTextBoard.inc
index 520adfe2..54bf63fb 100644
--- a/data/scripts/sanctuary/script_CutsceneMiscObjectTextBoard.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectTextBoard.inc
@@ -23,7 +23,7 @@ script_08013C2A:
 script_08013C32:
 	BeginBlock
 	DoPostScriptAction 0x0007
-	Call sub_0807F934
+	Call MakeCheckableObjectInteractable
 	DoPostScriptAction 0x000a
 	CallWithArg sub_080962F8, 0x00000000
 .ifndef EU
diff --git a/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc b/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc
index 50f58794..f1f81b23 100644
--- a/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc
+++ b/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc
@@ -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
diff --git a/data/scripts/sanctuary/script_Npc4EPedestal.inc b/data/scripts/sanctuary/script_Npc4EPedestal.inc
index 12cce538..415d4c04 100644
--- a/data/scripts/sanctuary/script_Npc4EPedestal.inc
+++ b/data/scripts/sanctuary/script_Npc4EPedestal.inc
@@ -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
diff --git a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
index 5da4a9ad..181600cc 100644
--- a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
+++ b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
@@ -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
diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
index abe02e5b..ffb033f9 100644
--- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
+++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
@@ -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
diff --git a/data/scripts/southHyruleField/script_ForestMinish2.inc b/data/scripts/southHyruleField/script_ForestMinish2.inc
index 5fa3a178..3919af08 100644
--- a/data/scripts/southHyruleField/script_ForestMinish2.inc
+++ b/data/scripts/southHyruleField/script_ForestMinish2.inc
@@ -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:
diff --git a/data/scripts/southHyruleField/script_SmithAtLinksHouse.inc b/data/scripts/southHyruleField/script_SmithAtLinksHouse.inc
index 91e708c4..ce69f63d 100644
--- a/data/scripts/southHyruleField/script_SmithAtLinksHouse.inc
+++ b/data/scripts/southHyruleField/script_SmithAtLinksHouse.inc
@@ -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
diff --git a/data/scripts/unused/script_08012C68.inc b/data/scripts/unused/script_08012C68.inc
index f4c081b7..78e7faf3 100644
--- a/data/scripts/unused/script_08012C68.inc
+++ b/data/scripts/unused/script_08012C68.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_08012C68
 	_0807E9D4
 	DoPostScriptAction 0x0008
 	SetIntVariable 0x00000000
-	Call sub_0806DA04
+	Call NPC4E_ChangeInteractableHitbox
 	EndBlock
 script_08012C7E:
 	CheckEntityInteractType
diff --git a/data/scripts/unused/script_08013D04.inc b/data/scripts/unused/script_08013D04.inc
index 42887fa3..ee68a6c7 100644
--- a/data/scripts/unused/script_08013D04.inc
+++ b/data/scripts/unused/script_08013D04.inc
@@ -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
diff --git a/data/scripts/unused/script_08013D44.inc b/data/scripts/unused/script_08013D44.inc
index 98c44d0d..5cdc5f41 100644
--- a/data/scripts/unused/script_08013D44.inc
+++ b/data/scripts/unused/script_08013D44.inc
@@ -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
diff --git a/data/scripts/unused/script_08013D84.inc b/data/scripts/unused/script_08013D84.inc
index bc67ff99..b46c6696 100644
--- a/data/scripts/unused/script_08013D84.inc
+++ b/data/scripts/unused/script_08013D84.inc
@@ -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
diff --git a/data/scripts/unused/script_08013DC4.inc b/data/scripts/unused/script_08013DC4.inc
index ac92c6db..4fefe05b 100644
--- a/data/scripts/unused/script_08013DC4.inc
+++ b/data/scripts/unused/script_08013DC4.inc
@@ -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
diff --git a/data/scripts/unused/script_08016384.inc b/data/scripts/unused/script_08016384.inc
index b1975a48..0a5eeacf 100644
--- a/data/scripts/unused/script_08016384.inc
+++ b/data/scripts/unused/script_08016384.inc
@@ -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
diff --git a/data/scripts/unused/script_08016482.inc b/data/scripts/unused/script_08016482.inc
index dd58b799..8692711c 100644
--- a/data/scripts/unused/script_08016482.inc
+++ b/data/scripts/unused/script_08016482.inc
@@ -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
diff --git a/data/scripts/veilFalls/script_MinishVillageObjectLeftStoneOpening.inc b/data/scripts/veilFalls/script_MinishVillageObjectLeftStoneOpening.inc
index 3d552cdb..3f5ac7fb 100644
--- a/data/scripts/veilFalls/script_MinishVillageObjectLeftStoneOpening.inc
+++ b/data/scripts/veilFalls/script_MinishVillageObjectLeftStoneOpening.inc
@@ -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
diff --git a/data/scripts/veilFalls/script_MinishVillageObjectRightStoneOpening.inc b/data/scripts/veilFalls/script_MinishVillageObjectRightStoneOpening.inc
index f5194dff..76ea1d57 100644
--- a/data/scripts/veilFalls/script_MinishVillageObjectRightStoneOpening.inc
+++ b/data/scripts/veilFalls/script_MinishVillageObjectRightStoneOpening.inc
@@ -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
diff --git a/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc b/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc
index 6bac4d40..0c4a11a3 100644
--- a/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc
+++ b/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc
@@ -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
diff --git a/data/scripts/westernWood/script_ForestMinish1.inc b/data/scripts/westernWood/script_ForestMinish1.inc
index 3e681372..62197602 100644
--- a/data/scripts/westernWood/script_ForestMinish1.inc
+++ b/data/scripts/westernWood/script_ForestMinish1.inc
@@ -1,7 +1,7 @@
 @ Western Wood Forest Minish
 SCRIPT_START script_ForestMinish1
 	BeginBlock
-	Call sub_08060090
+	Call ForestMinish_MakeInteractable
 	DoPostScriptAction 0x000a
 	EndBlock
 script_0800C55E:
diff --git a/data/scripts/westernWood/script_PercyInside.inc b/data/scripts/westernWood/script_PercyInside.inc
index e1c5666a..a6a04076 100644
--- a/data/scripts/westernWood/script_PercyInside.inc
+++ b/data/scripts/westernWood/script_PercyInside.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_PercyInside
 	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x000a
-	Call sub_0806B60C
+	Call Percy_MakeInteractable
 	EndBlock
 script_08012E9E:
 	CheckEntityInteractType
diff --git a/data/scripts/westernWood/script_PercyOutside.inc b/data/scripts/westernWood/script_PercyOutside.inc
index 612d4b1a..a0f02b15 100644
--- a/data/scripts/westernWood/script_PercyOutside.inc
+++ b/data/scripts/westernWood/script_PercyOutside.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_PercyOutside
 	SetAnimationState 0x0004
 	CallWithArg sub_0807F3D8, 0x00000008
 	DoPostScriptAction 0x000a
-	Call sub_0806B60C
+	Call Percy_MakeInteractable
 	EndBlock
 script_08012EDC:
 	CheckEntityInteractType
diff --git a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc
index 84713eee..3265af54 100644
--- a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc
+++ b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc
@@ -1,10 +1,10 @@
 @ After Mazaal NPC4E text board
 SCRIPT_START script_Npc4EWindRuinsTextBoard
 	BeginBlock
-	Call sub_0807F934
+	Call MakeCheckableObjectInteractable
 	DoPostScriptAction 0x0008
 	SetIntVariable 0x00000001
-	Call sub_0806DA04
+	Call NPC4E_ChangeInteractableHitbox
 	EndBlock
 script_0800D88E:
 	CheckEntityInteractType