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,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
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
+1 -1
View File
@@ -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