diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2023-12-28 14:59:23 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2023-12-28 14:59:23 +0100 |
| commit | 768efa50b308be03737d7eae2a1069627ea48b79 (patch) | |
| tree | 447c266172ef82df68bfd6d4737acb499f2b1a9d /data/scripts/cloudTops | |
| parent | b6a94d5062076ce53a00609e1e661b9da9e7ee5b (diff) | |
| parent | dae4c669913c3dc4248291f2d843ac39525b2738 (diff) | |
Merge branch 'master' into tilemap-docs
Diffstat (limited to 'data/scripts/cloudTops')
| -rw-r--r-- | data/scripts/cloudTops/script_GregalHealthy.inc | 4 | ||||
| -rw-r--r-- | data/scripts/cloudTops/script_GregalSick.inc | 6 | ||||
| -rw-r--r-- | data/scripts/cloudTops/script_Npc4EFirstCloud.inc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/cloudTops/script_GregalHealthy.inc b/data/scripts/cloudTops/script_GregalHealthy.inc index 10e0f160..e82f4888 100644 --- a/data/scripts/cloudTops/script_GregalHealthy.inc +++ b/data/scripts/cloudTops/script_GregalHealthy.inc @@ -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 diff --git a/data/scripts/cloudTops/script_GregalSick.inc b/data/scripts/cloudTops/script_GregalSick.inc index 1466280d..2d0a85d1 100644 --- a/data/scripts/cloudTops/script_GregalSick.inc +++ b/data/scripts/cloudTops/script_GregalSick.inc @@ -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 diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc index 6cc75af2..dd31993b 100644 --- a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc +++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc @@ -12,7 +12,7 @@ SCRIPT_START script_Npc4EFirstCloud EndBlock script_0800D636: _0807EA4C - _0807E9F0 + UpdateFusion Call NPC4E_IsKinstoneFused JumpIf script_0800D650 Call EnablePauseMenu |