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 @@
@ 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
@@ -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
@@ -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