From 57f00c0eae4cc00fa329df0d13752f7de096054f Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Sun, 26 Dec 2021 23:44:43 +0100 Subject: Name some script commands --- data/scripts/npc/script_08012C48.inc | 2 +- data/scripts/npc/script_BladeBrothers.inc | 4 ++-- data/scripts/npc/script_ForestMinish18.inc | 12 ++++++------ data/scripts/npc/script_ForestMinish19.inc | 20 ++++++++++---------- data/scripts/npc/script_ForestMinish20.inc | 12 ++++++------ data/scripts/npc/script_PlayerAtBladeBrothers.inc | 2 +- data/scripts/npc/script_PlayerAtGreatFairy.inc | 2 +- data/scripts/npc/script_TingleSiblings.inc | 2 +- 8 files changed, 28 insertions(+), 28 deletions(-) (limited to 'data/scripts/npc') diff --git a/data/scripts/npc/script_08012C48.inc b/data/scripts/npc/script_08012C48.inc index 2eb2b3d3..18d2a03d 100644 --- a/data/scripts/npc/script_08012C48.inc +++ b/data/scripts/npc/script_08012C48.inc @@ -5,7 +5,7 @@ SCRIPT_START script_08012C48 SetEntitySpeed 0x0280 EndBlock _0807EDD4 0x0388, 0x0168 - _0807E5F8 0x00000100 + SetSyncFlag 0x00000100 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/npc/script_BladeBrothers.inc b/data/scripts/npc/script_BladeBrothers.inc index 3192f64e..8fec6673 100644 --- a/data/scripts/npc/script_BladeBrothers.inc +++ b/data/scripts/npc/script_BladeBrothers.inc @@ -22,10 +22,10 @@ script_08016204: WaitUntilTextboxCloses Call sub_08068DD0 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_08016346 StartPlayerScript script_PlayerAtBladeBrothers - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 _0807EB74 Call sub_08068C8C JumpIf script_08016262 diff --git a/data/scripts/npc/script_ForestMinish18.inc b/data/scripts/npc/script_ForestMinish18.inc index 5e70440e..4198e7da 100644 --- a/data/scripts/npc/script_ForestMinish18.inc +++ b/data/scripts/npc/script_ForestMinish18.inc @@ -3,12 +3,12 @@ SCRIPT_START script_ForestMinish18 SetEntitySpeed 0x0100 script_08016700: _0807EC94 0x0030 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Wait 0x000f DoPostScriptAction 0x0000 _0807EB44 0x0004 - WaitForSomething 0x00000001 - _0807E610 0x00000001 + WaitForSyncFlag 0x00000001 + ClearSyncFlag 0x00000001 DoPostScriptAction 0x0003 Wait 0x0002 _0807EB44 0x0006 @@ -18,14 +18,14 @@ script_08016700: _0807EB44 0x0002 Wait 0x0002 _0807EB44 0x0004 - WaitForSomething 0x00000001 - _0807E610 0x00000001 + WaitForSyncFlag 0x00000001 + ClearSyncFlag 0x00000001 _0807ECF4 0x0030 Wait 0x000f DoPostScriptAction 0x0000 _0807EB44 0x0004 Wait 0x001e - _0807E5F8 0x00000006 + SetSyncFlag 0x00000006 DoPostScriptAction 0x0003 Wait 0x0002 _0807EB44 0x0006 diff --git a/data/scripts/npc/script_ForestMinish19.inc b/data/scripts/npc/script_ForestMinish19.inc index ddf9962f..1e5e8056 100644 --- a/data/scripts/npc/script_ForestMinish19.inc +++ b/data/scripts/npc/script_ForestMinish19.inc @@ -2,15 +2,15 @@ SCRIPT_START script_ForestMinish19 SetEntitySpeed 0x0100 script_0801679C: - WaitForSomething 0x00000002 - _0807E610 0x00000002 + WaitForSyncFlag 0x00000002 + ClearSyncFlag 0x00000002 _0807EC94 0x0030 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Wait 0x000f DoPostScriptAction 0x0000 _0807EB44 0x0004 - WaitForSomething 0x00000002 - _0807E610 0x00000002 + WaitForSyncFlag 0x00000002 + ClearSyncFlag 0x00000002 DoPostScriptAction 0x0003 Wait 0x0002 _0807EB44 0x0006 @@ -20,15 +20,15 @@ script_0801679C: _0807EB44 0x0002 Wait 0x0002 _0807EB44 0x0004 - WaitForSomething 0x00000002 - _0807E610 0x00000002 + WaitForSyncFlag 0x00000002 + ClearSyncFlag 0x00000002 _0807ECF4 0x0030 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Wait 0x000f DoPostScriptAction 0x0000 _0807EB44 0x0004 - WaitForSomething 0x00000002 - _0807E610 0x00000002 + WaitForSyncFlag 0x00000002 + ClearSyncFlag 0x00000002 DoPostScriptAction 0x0003 Wait 0x0002 _0807EB44 0x0006 diff --git a/data/scripts/npc/script_ForestMinish20.inc b/data/scripts/npc/script_ForestMinish20.inc index 96cb2c4b..e9aa1833 100644 --- a/data/scripts/npc/script_ForestMinish20.inc +++ b/data/scripts/npc/script_ForestMinish20.inc @@ -2,14 +2,14 @@ SCRIPT_START script_ForestMinish20 SetEntitySpeed 0x0100 script_08016848: - WaitForSomething 0x00000004 - _0807E610 0x00000004 + WaitForSyncFlag 0x00000004 + ClearSyncFlag 0x00000004 _0807EC94 0x0030 Wait 0x000f DoPostScriptAction 0x0000 _0807EB44 0x0004 Wait 0x001e - _0807E5F8 0x00000003 + SetSyncFlag 0x00000003 DoPostScriptAction 0x0003 Wait 0x0002 _0807EB44 0x0006 @@ -21,12 +21,12 @@ script_08016848: _0807EB44 0x0004 Wait 0x003c _0807ECF4 0x0030 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Wait 0x000f DoPostScriptAction 0x0000 _0807EB44 0x0004 - WaitForSomething 0x00000004 - _0807E610 0x00000004 + WaitForSyncFlag 0x00000004 + ClearSyncFlag 0x00000004 DoPostScriptAction 0x0003 Wait 0x0002 _0807EB44 0x0006 diff --git a/data/scripts/npc/script_PlayerAtBladeBrothers.inc b/data/scripts/npc/script_PlayerAtBladeBrothers.inc index 7026967e..7db4fb9c 100644 --- a/data/scripts/npc/script_PlayerAtBladeBrothers.inc +++ b/data/scripts/npc/script_PlayerAtBladeBrothers.inc @@ -4,6 +4,6 @@ SCRIPT_START script_PlayerAtBladeBrothers _0807EDD4 0x0078, 0x0050 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/npc/script_PlayerAtGreatFairy.inc b/data/scripts/npc/script_PlayerAtGreatFairy.inc index cbea15ed..8839a3cb 100644 --- a/data/scripts/npc/script_PlayerAtGreatFairy.inc +++ b/data/scripts/npc/script_PlayerAtGreatFairy.inc @@ -10,7 +10,7 @@ SCRIPT_START script_PlayerAtGreatFairy script_0800B7EE: _0807E8E4_0 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 SCRIPT_END script_0800B7FC: CallWithArg sub_0807F4F8, 0x00000090 diff --git a/data/scripts/npc/script_TingleSiblings.inc b/data/scripts/npc/script_TingleSiblings.inc index 62b59de5..8393ee87 100644 --- a/data/scripts/npc/script_TingleSiblings.inc +++ b/data/scripts/npc/script_TingleSiblings.inc @@ -14,7 +14,7 @@ script_0801690A: Call sub_08064F28 WaitUntilTextboxCloses JumpIfNot script_08016926 - _0807F034 0x003d + GivePlayerItem 0x003d WaitPlayerGetItem script_08016926: _0807E878 -- cgit v1.2.3