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

This commit is contained in:
octorock
2023-05-31 23:51:20 +02:00
254 changed files with 4013 additions and 4939 deletions
+1 -1
View File
@@ -4,7 +4,7 @@ SCRIPT_START script_08012C68
_0807E9D4
DoPostScriptAction 0x0008
SetIntVariable 0x00000000
Call sub_0806DA04
Call NPC4E_ChangeInteractableHitbox
EndBlock
script_08012C7E:
CheckEntityInteractType
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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