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

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

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:

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

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