summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/cloudTops/script_Npc4EFirstCloud.inc2
-rw-r--r--data/scripts/hyruleTown/script_Beedle.inc6
-rw-r--r--data/scripts/npc/script_MysteriousWall.inc2
-rw-r--r--data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc2
-rw-r--r--data/scripts/sanctuary/script_Npc4EPedestal.inc2
-rw-r--r--data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc2
-rw-r--r--data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc2
-rw-r--r--data/scripts/unused/script_08012C68.inc2
-rw-r--r--data/scripts/unused/script_08013D04.inc2
-rw-r--r--data/scripts/unused/script_08013D44.inc2
-rw-r--r--data/scripts/unused/script_08013D84.inc2
-rw-r--r--data/scripts/unused/script_08013DC4.inc2
-rw-r--r--data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc2
-rw-r--r--data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc2
14 files changed, 16 insertions, 16 deletions
diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc
index 11010e65..76d025fa 100644
--- a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc
+++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc
@@ -8,7 +8,7 @@ SCRIPT_START script_Npc4EFirstCloud
Call NPC4E_IsKinstoneFused
JumpIf script_0800D6AE
Call NPC4E_MakeFuserInteractable
- CallWithArg sub_0806DA04, 0x00000002
+ CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000002
EndBlock
script_0800D636:
_0807EA4C
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/npc/script_MysteriousWall.inc b/data/scripts/npc/script_MysteriousWall.inc
index 4775eb3c..d0bc0a83 100644
--- a/data/scripts/npc/script_MysteriousWall.inc
+++ b/data/scripts/npc/script_MysteriousWall.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_MysteriousWall
Call NPC4E_IsKinstoneFused
JumpIf script_0800B9AC
Call NPC4E_MakeFuserInteractable
- CallWithArg sub_0806DA04, 0x00000005
+ CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000005
EndBlock
script_0800B98A:
_0807EA4C
diff --git a/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc b/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc
index f8734547..f1f81b23 100644
--- a/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc
+++ b/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc
@@ -8,7 +8,7 @@ script_0801427C:
JumpIfNot script_0801427C
BeginBlock
Call MakeCheckableObjectInteractable
- CallWithArg sub_0806DA04, 0x00000008
+ 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 ec28c798..415d4c04 100644
--- a/data/scripts/sanctuary/script_Npc4EPedestal.inc
+++ b/data/scripts/sanctuary/script_Npc4EPedestal.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_Npc4EPedestal
EndBlock
BeginBlock
Call MakePedestalInteractable
- CallWithArg sub_0806DA04, 0x00000003
+ 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 4f456f91..181600cc 100644
--- a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
+++ b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_Npc4ESecondSanctuary
EndBlock
BeginBlock
Call MakePedestalInteractable
- CallWithArg sub_0806DA04, 0x00000003
+ 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 c88ca358..ffb033f9 100644
--- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
+++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_Npc4EThirdSanctuary
EndBlock
BeginBlock
Call MakePedestalInteractable
- CallWithArg sub_0806DA04, 0x00000003
+ CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000003
EndBlock
script_080138D0:
CheckEntityInteractType
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 d65b8f3d..ee68a6c7 100644
--- a/data/scripts/unused/script_08013D04.inc
+++ b/data/scripts/unused/script_08013D04.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_08013D04
BeginBlock
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 e8ea0b64..5cdc5f41 100644
--- a/data/scripts/unused/script_08013D44.inc
+++ b/data/scripts/unused/script_08013D44.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_08013D44
BeginBlock
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 5eef78d1..b46c6696 100644
--- a/data/scripts/unused/script_08013D84.inc
+++ b/data/scripts/unused/script_08013D84.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_08013D84
BeginBlock
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 3a744cbe..4fefe05b 100644
--- a/data/scripts/unused/script_08013DC4.inc
+++ b/data/scripts/unused/script_08013DC4.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_08013DC4
BeginBlock
Call MakePedestalInteractable
DoPostScriptAction 0x0008
- CallWithArg sub_0806DA04, 0x00000004
+ CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000004
EndBlock
script_08013DDC:
CheckEntityInteractType
diff --git a/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc b/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc
index efda3b1e..0c4a11a3 100644
--- a/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc
+++ b/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_NPC4ESourceOfTheFlow
CheckKinstoneFused KINSTONE_SOURCE_FLOW
JumpIf script_08016028
_0807EA88 KINSTONE_SOURCE_FLOW
- CallWithArg sub_0806DA04, 0x00000007
+ CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000007
DoPostScriptAction 0x000a
EndBlock
script_08015FE4:
diff --git a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc
index 6dd84635..3265af54 100644
--- a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc
+++ b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_Npc4EWindRuinsTextBoard
Call MakeCheckableObjectInteractable
DoPostScriptAction 0x0008
SetIntVariable 0x00000001
- Call sub_0806DA04
+ Call NPC4E_ChangeInteractableHitbox
EndBlock
script_0800D88E:
CheckEntityInteractType
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 08:29:13 +0000