Merge branch 'master' into tilemap-docs

This commit is contained in:
octorock
2023-12-28 14:59:23 +01:00
495 changed files with 14619 additions and 16191 deletions
@@ -17,9 +17,9 @@ script_08014C4C:
script_08014C56:
Call sub_0806CCB4
JumpIfNot script_08014C56
CheckLocalFlag 0x0066
CheckLocalFlag SORA_ELDER_TALK2ND
JumpIf script_08014C7C
SetLocalFlag 0x0066
SetLocalFlag SORA_ELDER_TALK2ND
MessageNoOverlap TEXT_WIND_TRIBE, 0x0d
WaitUntilTextboxCloses
GivePlayerItem ITEM_LIGHT_ARROW
+3 -3
View File
@@ -4,7 +4,7 @@ SCRIPT_START script_GregalSick
DoPostScriptAction 0x000a
SetAnimation 0x0000
EndBlock
CheckLocalFlag 0x0063
CheckLocalFlag SORA_ELDER_RECOVER
JumpIf script_08014BE8
script_08014B48:
EndBlock
@@ -54,9 +54,9 @@ script_08014BF2:
CheckEntityInteractType
JumpIfNot script_08014BF2
SetPlayerIdle
CheckLocalFlag 0x0065
CheckLocalFlag SORA_ELDER_TALK1ST
JumpIf script_08014C1C
SetLocalFlag 0x0065
SetLocalFlag SORA_ELDER_TALK1ST
MessageNoOverlap TEXT_WIND_TRIBE, 0x07
WaitUntilTextboxCloses
SetIntVariable 100
@@ -12,7 +12,7 @@ SCRIPT_START script_Npc4EFirstCloud
EndBlock
script_0800D636:
_0807EA4C
_0807E9F0
UpdateFusion
Call NPC4E_IsKinstoneFused
JumpIf script_0800D650
Call EnablePauseMenu