From 9b907d121df5616b7e538c7847fd5037926a7456 Mon Sep 17 00:00:00 2001 From: Henny022p Date: Wed, 5 Jul 2023 00:53:54 +0200 Subject: various small documentation changes made during SGDQ23 while working on multiworld randomizer Co-authored-by: Ibot02 --- data/scripts/cloudTops/script_GregalHealthy.inc | 4 ++-- data/scripts/cloudTops/script_GregalSick.inc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'data/scripts/cloudTops') 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 -- cgit v1.2.3 From 488196754ea5225513dc900d23c53f2b157de409 Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Wed, 5 Jul 2023 21:34:08 +0200 Subject: Create new entity structs for NPCs --- data/scripts/cloudTops/script_Npc4EFirstCloud.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/cloudTops') diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc index 76d025fa..3ed822d7 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 -- cgit v1.2.3