diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-12-26 23:44:43 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-12-27 00:11:56 +0100 |
| commit | 57f00c0eae4cc00fa329df0d13752f7de096054f (patch) | |
| tree | f8764779c623c1f7fc17f8a0d466c9a758a19a05 /data/scripts/cutscene | |
| parent | 2ccf89a1fb89e01f449e1d4ce734c57943fa093b (diff) | |
Name some script commands
Diffstat (limited to 'data/scripts/cutscene')
147 files changed, 965 insertions, 965 deletions
diff --git a/data/scripts/cutscene/ezlo/script_EzloCap.inc b/data/scripts/cutscene/ezlo/script_EzloCap.inc index bd5017e4..29b94ee9 100644 --- a/data/scripts/cutscene/ezlo/script_EzloCap.inc +++ b/data/scripts/cutscene/ezlo/script_EzloCap.inc @@ -5,32 +5,32 @@ SCRIPT_START script_EzloCap DoPostScriptAction 0x0007 EndBlock _0807E930 0x0020 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 _0807E930 0x0022 Call sub_0807F3C8 MessageFromTargetPos 0x1102, 0x000c WaitUntilTextboxCloses _0807E930 0x0020 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 _0807E930 0x0021 Call sub_0807F3C8 MessageFromTargetPos 0x1103, 0x000c WaitUntilTextboxCloses _0807E930 0x0020 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0011 _0807E930 0x001c MessageFromTargetPos 0x1105, 0x000c WaitUntilTextboxCloses _0807E930 0x0020 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 _0807E930 0x0022 Call sub_0807F3C8 MessageFromTargetPos 0x1106, 0x000c @@ -40,8 +40,8 @@ SCRIPT_START script_EzloCap MessageFromTargetPos 0x1107, 0x000c WaitUntilTextboxCloses _0807E930 0x0020 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 _0807E930 0x0021 Call sub_0807F3C8 MessageFromTargetPos 0x1108, 0x000c @@ -53,7 +53,7 @@ SCRIPT_START script_EzloCap _0807E930 0x0020 DoPostScriptAction 0x000a _0807E9D4 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 script_080127F2: EndBlock BeginBlock @@ -76,38 +76,38 @@ script_08012824: CallWithArg sub_0807F5B0, 0x0000003c Call sub_080791D0 EndBlock - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x000b - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 Call sub_0806D944 _0807E930 0x0010 MessageFromTargetPos 0x110a, 0x000c WaitUntilTextboxCloses _0807E930 0x001f - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 _0807E930 0x0010 MessageFromTargetPos 0x110b, 0x000c WaitUntilTextboxCloses _0807E930 0x001f - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c _0807E930 0x0010 MessageFromTargetPos 0x110c, 0x000c WaitUntilTextboxCloses _0807E930 0x001f - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 _0807E930 0x0010 MessageFromTargetPos 0x110d, 0x000c WaitUntilTextboxCloses _0807E930 0x001f - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 _0807E930 0x0010 MessageFromTargetPos 0x110e, 0x000c WaitUntilTextboxCloses @@ -117,8 +117,8 @@ script_08012824: _0807EC1C 0x0010 DoPostScriptAction 0x000a _0807E9D4 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 script_08012904: EndBlock BeginBlock @@ -153,8 +153,8 @@ script_0801293A: WaitUntilTextboxCloses Call sub_0807DF50 _0807E878 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 script_08012984: EndBlock BeginBlock @@ -190,8 +190,8 @@ script_080129BA: WaitUntilTextboxCloses Call sub_0807DF50 _0807E878 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 script_08012A08: EndBlock BeginBlock @@ -239,6 +239,6 @@ script_08012A74: _0807EB28 0x1112 EndBlock WaitUntilTextboxCloses - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc index a238743e..f059f75b 100644 --- a/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc +++ b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc @@ -16,7 +16,7 @@ script_0801248A: CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 - WaitFor_2 + WaitForFadeFinish _0807E858 0x0000 Call sub_080791BC LoadRoomEntityList gUnk_080F4D70 @@ -25,29 +25,29 @@ script_0801248A: Call sub_0807F844 _0807E778 0x0004 _0807E800 0x00000000 - WaitFor_2 + WaitForFadeFinish PlayBgm BGM_EZLO_THEME - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000080 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 StopBgm _0807E778 0x0004 _0807E80C 0x00000000 - WaitFor_2 + WaitForFadeFinish MoveEntityToPlayer Call sub_0807F844 CameraTargetPlayer SetFadeMask 0xffffffff _0807E778 0x0004 _0807E800 0x00000000 - WaitFor_2 + WaitForFadeFinish Call sub_0807DF50 _0807E878 PlayBGM @@ -60,55 +60,55 @@ script_08012566: Call sub_0806DC7C StopBgm StartPlayerScript script_PlayerEzloBeingBullied - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 SetEntityPositionRelative 0x0388, 0x0168 _0807F0B4 0x0001 CameraTargetEntity Wait 0x005a - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 PlayBgm BGM_EZLO_THEME - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000080 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 StopBgm PlayBgm BGM_FIGHT_THEME2 Call sub_0807DF50 _0807E878 - _0807E5F8 0x00000050 + SetSyncFlag 0x00000050 LoadRoomEntityList gUnk_080F51D0 - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 _0807E864 Call sub_0807FA40 Call sub_0807DF28 PlaySound SFX_SECRET StopBgm - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 StartPlayerScript script_PlayerDefeatedOctoroks - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 _0807E8E4_0 PlayBgm BGM_EZLO_THEME Wait 0x001e - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 StopBgm Wait 0x003c PlayBGM @@ -117,12 +117,12 @@ script_08012566: CameraTargetPlayer Call sub_0807DF50 _0807E878 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 StopBgm Wait 0x003c PlayBGM diff --git a/data/scripts/cutscene/ezlo/script_Object6ALeftBullyingOctorok.inc b/data/scripts/cutscene/ezlo/script_Object6ALeftBullyingOctorok.inc index 3aa979f2..4528f6df 100644 --- a/data/scripts/cutscene/ezlo/script_Object6ALeftBullyingOctorok.inc +++ b/data/scripts/cutscene/ezlo/script_Object6ALeftBullyingOctorok.inc @@ -5,17 +5,17 @@ SCRIPT_START script_Object6ALeftBullyingOctorok DoPostScriptAction 0x0007 _0807E930 0x0001 EndBlock - WaitForSomething2 0x00000040 + WaitForSyncFlagAndClear 0x00000040 _0807E930 0x0005 Wait 0x001e - _0807E5F8 0x00000080 + SetSyncFlag 0x00000080 _0807E930 0x0001 - WaitForSomething2 0x00000040 + WaitForSyncFlagAndClear 0x00000040 _0807E930 0x0005 Wait 0x001e - _0807E5F8 0x00000080 + SetSyncFlag 0x00000080 _0807E930 0x0001 - WaitForSomething2 0x00000040 + WaitForSyncFlagAndClear 0x00000040 Wait 0x0001 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/ezlo/script_Object6ARightBullyingOctorok.inc b/data/scripts/cutscene/ezlo/script_Object6ARightBullyingOctorok.inc index f715c8ca..8051b6b5 100644 --- a/data/scripts/cutscene/ezlo/script_Object6ARightBullyingOctorok.inc +++ b/data/scripts/cutscene/ezlo/script_Object6ARightBullyingOctorok.inc @@ -5,17 +5,17 @@ SCRIPT_START script_Object6ARightBullyingOctorok DoPostScriptAction 0x0007 _0807E930 0x0003 EndBlock - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 _0807E930 0x0007 Wait 0x001e - _0807E5F8 0x00000020 + SetSyncFlag 0x00000020 _0807E930 0x0003 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 _0807E930 0x0007 Wait 0x001e - _0807E5F8 0x00000020 + SetSyncFlag 0x00000020 _0807E930 0x0003 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 Wait 0x0001 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc b/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc index 19d3b88a..f53814e1 100644 --- a/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc +++ b/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc @@ -7,6 +7,6 @@ SCRIPT_START script_PlayerDefeatedOctoroks _0807EDD4 0x0388, 0x0180 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc b/data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc index 3d67f251..edf2a936 100644 --- a/data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc +++ b/data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc @@ -7,7 +7,7 @@ SCRIPT_START script_PlayerEzloBeingBullied DoPostScriptAction 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/intro/script_HouseDoorIntro.inc b/data/scripts/cutscene/intro/script_HouseDoorIntro.inc index 41718dc5..45d64e58 100644 --- a/data/scripts/cutscene/intro/script_HouseDoorIntro.inc +++ b/data/scripts/cutscene/intro/script_HouseDoorIntro.inc @@ -2,7 +2,7 @@ SCRIPT_START script_HouseDoorIntro BeginBlock EndBlock - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 @ Open door PlaySound SFX_F0 DoPostScriptAction 0x0008 @@ -14,7 +14,7 @@ SCRIPT_START script_HouseDoorIntro _0807E778 0x0004 @ Circle transition _0807E80C 0x00000000 - WaitFor_2 @ Wait for end of transition + WaitForFadeFinish @ Wait for end of transition Call sub_0805367C SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/intro/script_IntroCameraTarget.inc b/data/scripts/cutscene/intro/script_IntroCameraTarget.inc index d208ad40..1df4f5a3 100644 --- a/data/scripts/cutscene/intro/script_IntroCameraTarget.inc +++ b/data/scripts/cutscene/intro/script_IntroCameraTarget.inc @@ -8,9 +8,9 @@ SCRIPT_START script_IntroCameraTarget _0807E778 0x0002 @ Fade in DoFade4 - WaitFor_2 @ TODO wait for fade to be finished + WaitForFadeFinish @ TODO wait for fade to be finished Wait 0x0078 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Call sub_08053648 @ Move camera target down _0807EDD4 0x0240, 0x0228 diff --git a/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc b/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc index 24a29289..4fe5b4ae 100644 --- a/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc @@ -9,9 +9,9 @@ SCRIPT_START script_Npc4EOutsideLinksHouse EndBlock _0807E778 0x0010 DoFade6 - WaitFor_2 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + WaitForFadeFinish + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 _0807F0B4 0x0004 CameraTargetPlayer Call sub_0807DF50 diff --git a/data/scripts/cutscene/intro/script_Object69Intro.inc b/data/scripts/cutscene/intro/script_Object69Intro.inc index 3165207b..059bb9f7 100644 --- a/data/scripts/cutscene/intro/script_Object69Intro.inc +++ b/data/scripts/cutscene/intro/script_Object69Intro.inc @@ -3,12 +3,12 @@ SCRIPT_START script_Object69Intro BeginBlock Call sub_0807DF28 _0807E864 - _0807E5F8 0x00000000 + SetSyncFlag 0x00000000 EndBlock - WaitFor_2 + WaitForFadeFinish Wait 0x0078 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000001 SetGlobalFlag 0x001c Call sub_0807DF50 _0807E878 diff --git a/data/scripts/cutscene/intro/script_PlayerIntro.inc b/data/scripts/cutscene/intro/script_PlayerIntro.inc index 862bf6e6..e89495c8 100644 --- a/data/scripts/cutscene/intro/script_PlayerIntro.inc +++ b/data/scripts/cutscene/intro/script_PlayerIntro.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerIntro _0807E864 SetLocalFlag 0x0046 EndBlock - WaitFor_2 + WaitForFadeFinish Wait 0x001e @ Wake up message MessageFromTarget 0x1005 diff --git a/data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc b/data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc index 3f349401..8bec701d 100644 --- a/data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc +++ b/data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc @@ -4,25 +4,25 @@ SCRIPT_START script_PlayerMoveToSmith _0807E8E4_1 SetEntitySpeed 0x00c0 EndBlock - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c _0807EDD4 0x0040, 0x0060 _0807EDD4 0x0060, 0x0068 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x0000 _0807E8E4_0 Wait 0x000f PlaySound SFX_VO_ZELDA1 DoPostScriptAction 0x0000 Wait 0x001e - _0807E5F8 0x00000008 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000002 _0807EDD4 0x0070, 0x005c _0807E8E4_1 DoPostScriptAction 0x0000 Wait 0x000f - _0807E5F8 0x00000008 - WaitForSomething2 0x00000002 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000002 + SetSyncFlag 0x00000008 SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_SmithIntro.inc b/data/scripts/cutscene/intro/script_SmithIntro.inc index e1e63bf5..d26a3683 100644 --- a/data/scripts/cutscene/intro/script_SmithIntro.inc +++ b/data/scripts/cutscene/intro/script_SmithIntro.inc @@ -11,8 +11,8 @@ SCRIPT_START script_SmithIntro CameraTargetEntity _0807E778 0x0004 _0807E800 0x00000000 - WaitFor_2 - WaitForSomething2 0x00000008 + WaitForFadeFinish + WaitForSyncFlagAndClear 0x00000008 DoPostScriptAction 0x0004 Wait 0x001e _0807E930 0x000b @@ -20,8 +20,8 @@ SCRIPT_START script_SmithIntro MessageFromTarget 0x1002 WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 _0807E908 0x0001 _0807EB44 0x0004 _0807EDD4 0x00b8, 0x005c @@ -33,6 +33,6 @@ SCRIPT_START script_SmithIntro Wait 0x001e _0807E778 0x0002 DoFade5 - WaitFor_2 + WaitForFadeFinish Call sub_08053634 SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_SmithIntro2.inc b/data/scripts/cutscene/intro/script_SmithIntro2.inc index 6ad10242..fff723fa 100644 --- a/data/scripts/cutscene/intro/script_SmithIntro2.inc +++ b/data/scripts/cutscene/intro/script_SmithIntro2.inc @@ -13,7 +13,7 @@ SCRIPT_START script_SmithIntro2 _0807E864 StartPlayerScript script_PlayerMoveToSmith Call sub_0807DF28 - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 _0807EDD4 0x0080, 0x005c _0807EB44 0x0006 DoPostScriptAction 0x0000 @@ -23,15 +23,15 @@ SCRIPT_START script_SmithIntro2 _0807E8E4_1 WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 _0807EB8C DoPostScriptAction 0x0001 MessageFromTargetPos 0x100b, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000008 _0807EDD4 0x007c, 0x005c Wait 0x000f DoPostScriptAction 0x000d @@ -39,18 +39,18 @@ SCRIPT_START script_SmithIntro2 _0807EB44 0x0006 DoPostScriptAction 0x000c DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000008 Call sub_08053250 @ Give player rusty sword - _0807F034 0x0034 + GivePlayerItem 0x0034 WaitPlayerGetItem _0807E8E4_1 DoPostScriptAction 0x0001 MessageFromTargetPos 0x100c, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 script_08009C4C: @ Talk to Smith DoPostScriptAction 0x000a diff --git a/data/scripts/cutscene/intro/script_ZeldaIntro.inc b/data/scripts/cutscene/intro/script_ZeldaIntro.inc index 8c6cbb80..6f2c28ec 100644 --- a/data/scripts/cutscene/intro/script_ZeldaIntro.inc +++ b/data/scripts/cutscene/intro/script_ZeldaIntro.inc @@ -6,19 +6,19 @@ SCRIPT_START script_ZeldaIntro _0807EB44 0x0002 DoPostScriptAction 0x0008 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0007 _0807EDD4 0x0068, 0x0060 Wait 0x000f MessageFromTarget 0x1001 WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0001 MessageFromTarget 0x1003 WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc b/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc index 8c776a85..7386e1cf 100644 --- a/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc @@ -13,7 +13,7 @@ SCRIPT_START script_ZeldaLeaveLinksHouse DoPostScriptAction 0x0008 _0807E778 0x0010 DoFade5 - WaitFor_2 + WaitForFadeFinish Call sub_08053634 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc b/data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc index c53e3594..d86a142b 100644 --- a/data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc @@ -5,7 +5,7 @@ SCRIPT_START script_ZeldaMoveToLinksHouse SetEntitySpeed 0x00c0 DoPostScriptAction 0x0008 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0007 _0807EDD4 0x01e8, 0x0200 _0807EDD4 0x01f8, 0x0218 @@ -21,7 +21,7 @@ SCRIPT_START script_ZeldaMoveToLinksHouse _0807EDD4 0x0290, 0x0198 Wait 0x001e @ Door is opening - _0807E5F8 0x00000010 @ Send signal to door + SetSyncFlag 0x00000010 @ Send signal to door _0807EDD4 0x0290, 0x0190 DoPostScriptAction 0x0008 _0807EDD4 0x0290, 0x0188 diff --git a/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc b/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc index acd3f102..9a200b2f 100644 --- a/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc @@ -9,12 +9,12 @@ SCRIPT_START script_ZeldaOutsideLinksHouse _0807EB44 0x0004 DoPostScriptAction 0x0000 EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Call sub_08066E08 _0807E864 MessageFromTargetPos 0x1010, 0x000c WaitUntilTextboxCloses - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 script_08014D1E: EndBlock BeginBlock diff --git a/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc index 4e986e81..282bbec0 100644 --- a/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc +++ b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc @@ -5,20 +5,20 @@ SCRIPT_START script_ZeldaTalkToSmith SetEntitySpeed 0x0100 Call sub_0807F348 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0004 _0807EB74 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 _0807EB74 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 _0807EB74 _0807EB8C DoPostScriptAction 0x0001 MessageFromTargetPos 0x100a, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 _0807EB8C DoPostScriptAction 0x0001 _0807EB8C diff --git a/data/scripts/cutscene/introAssembly/script_GuardAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_GuardAtAssembly.inc index 4b6b7c79..804be255 100644 --- a/data/scripts/cutscene/introAssembly/script_GuardAtAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_GuardAtAssembly.inc @@ -4,7 +4,7 @@ SCRIPT_START script_GuardAtAssembly _0807EB44 0x0000 _0807E930 0x0000 EndBlock - WaitForSomething 0x00000010 + WaitForSyncFlag 0x00000010 PlaySound SFX_11C _0807E930 0x0001 Wait 0x0010 diff --git a/data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc index 9b88ae6c..5ea4ba26 100644 --- a/data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc @@ -8,54 +8,54 @@ SCRIPT_START script_KingDaltusAtAssembly _0807E9D4 DoPostScriptAction 0x000a EndBlock - WaitForSomething2 0x00000080 + WaitForSyncFlagAndClear 0x00000080 _0807EB44 0x0004 _0807ECC4 0x0008 _0807E930 0x0004 MessageFromTargetPos 0x1050, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 _0807E930 0x0004 MessageFromTargetPos 0x1052, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 _0807EB44 0x0006 _0807E930 0x0005 MessageFromTargetPos 0x1054, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 _0807EB44 0x0004 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 _0807E930 0x0004 MessageFromTargetPos 0x1056, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 _0807E930 0x0004 MessageFromTargetPos 0x1057, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 _0807E930 0x0004 MessageFromTargetPos 0x1058, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 _0807E930 0x0004 MessageFromTargetPos 0x105c, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000100 + SetSyncFlag 0x00000100 script_0800917C: CheckEntityInteractType JumpIfNot script_0800917C diff --git a/data/scripts/cutscene/introAssembly/script_MinisterPothoAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_MinisterPothoAtAssembly.inc index 4142d592..fe1106ed 100644 --- a/data/scripts/cutscene/introAssembly/script_MinisterPothoAtAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_MinisterPothoAtAssembly.inc @@ -4,14 +4,14 @@ SCRIPT_START script_MinisterPothoAtAssembly _0807EB44 0x0004 DoPostScriptAction 0x0000 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 _0807EB44 0x0002 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 _0807EB44 0x0004 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 BeginBlock _0807E9D4 DoPostScriptAction 0x000a diff --git a/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc b/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc index 3b00fdf8..e871a204 100644 --- a/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc @@ -14,58 +14,58 @@ script_08008E12: WaitForPlayerAction0x17 Wait 0x003c StartPlayerScript script_PlayerEnters - WaitForSomething2 0x00000020 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000020 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 Wait 0x003c - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 Wait 0x000f - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 MessageFromTargetPos 0x1053, 0x000e WaitUntilTextboxCloses - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000020 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 - _0807F034 0x0035 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000020 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + GivePlayerItem 0x0035 WaitPlayerGetItem StartPlayerScript script_PlayerGetSword - WaitForSomething2 0x00000020 + WaitForSyncFlagAndClear 0x00000020 _0807E8E4_0 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000010 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000010 Wait 0x0078 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 _0807E8E4_1 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 - _0807F034 0x0047 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + GivePlayerItem 0x0047 WaitPlayerGetItem SetIntVariable 0x00000003 Call sub_0807F420 _0807E8E4_0 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 _0807F0B4 0x0004 CameraTargetPlayer SetGlobalFlag 0x0015 diff --git a/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc b/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc index 47cdcef5..c2b49497 100644 --- a/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc @@ -7,14 +7,14 @@ SCRIPT_START script_PlayerEnters _0807EDD4 0x00b8, 0x0090 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000040 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000040 DoPostScriptAction 0x0001 _0807EDD4 0x0088, 0x0078 _0807EB44 0x0000 DoPostScriptAction 0x0000 Wait 0x000f - _0807E5F8 0x00000020 + SetSyncFlag 0x00000020 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc b/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc index fb1ff121..af4e4dd7 100644 --- a/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc @@ -7,7 +7,7 @@ SCRIPT_START script_PlayerGetSword Call sub_0807F304 MessageFromTargetPos 0x0501, 0x000e WaitUntilTextboxCloses - _0807E5F8 0x00000020 + SetSyncFlag 0x00000020 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc b/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc index 5943b93a..931c03f4 100644 --- a/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc @@ -20,7 +20,7 @@ SCRIPT_START script_PlayerWakingUpInHyruleCastle Wait 0x003c _0807E778 0x0004 DoFade4 - WaitFor_2 + WaitForFadeFinish script_08009EA4: Call sub_0807F0D8 JumpIfNot script_08009EA4 diff --git a/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc index d5f52ed6..56c32d55 100644 --- a/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc @@ -5,26 +5,26 @@ SCRIPT_START script_SmithAtAssembly _0807EB44 0x0006 DoPostScriptAction 0x0000 EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 _0807EB74 DoPostScriptAction 0x0001 MessageFromTargetPos 0x105b, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x0005 Wait 0x003c DoPostScriptAction 0x0001 MessageFromTargetPos 0x1051, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x0004 Wait 0x003c _0807EB74 @@ -33,11 +33,11 @@ SCRIPT_START script_SmithAtAssembly MessageFromTargetPos 0x1055, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 _0807EB74 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 _0807EDD4 0x0098, 0x0078 @@ -47,7 +47,7 @@ SCRIPT_START script_SmithAtAssembly MessageFromTargetPos 0x1059, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 BeginBlock _0807E9D4 DoPostScriptAction 0x000a diff --git a/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc b/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc index c9cd9e1d..6771b682 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc @@ -5,8 +5,8 @@ SCRIPT_START script_080157AC _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 _0807E878 script_080157DA: @@ -17,30 +17,30 @@ script_080157DA: Call sub_0807DF28 Call sub_0807F3F8 Wait 0x003c - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 StartPlayerScript script_PlayerIntroBusinessScrub1 _0807F0B4 0x0001 SetEntityPositionRelative 0x0248, 0x0218 CameraTargetEntity Call sub_0807F5C0 - WaitForSomething2 0x00000010 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000020 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000010 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000020 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 StartPlayerScript script_PlayerIntroBusinessScrub2 - WaitForSomething2 0x00000010 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000010 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 MessageFromTargetPos 0x1066, 0x0002 WaitUntilTextboxCloses - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 _0807E878 Call sub_08066F94 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 script_08015880: CheckRoomFlag 0x0000 JumpIfNot script_08015880 @@ -54,16 +54,16 @@ script_08015888: SetEntityPositionRelative 0x0248, 0x0208 CameraTargetEntity StartPlayerScript script_PlayerIntroBusinessScrub3 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 MessageFromTargetPos 0x106a, 0x000c WaitUntilTextboxCloses - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Wait 0x0078 _0807E8E4_2 MessageFromTargetPos 0x1068, 0x0002 WaitUntilTextboxCloses - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 .ifdef JP SetLocalFlag 0x0089 .else diff --git a/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc b/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc index b53d5a0a..0ec77806 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc @@ -5,7 +5,7 @@ SCRIPT_START script_08015B14 SetEntitySpeed 0x0300 EndBlock _0807EDD4 0x0248, 0x0218 - _0807E5F8 0x00000020 + SetSyncFlag 0x00000020 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc b/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc index c4d17a30..d93ccb08 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc @@ -26,7 +26,7 @@ SCRIPT_START script_08015B34 MessageFromTargetPos 0x2506, 0x0002 WaitUntilTextboxCloses StartPlayerScript script_PlayerAtIntroBusinessScrub4 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 Call sub_0807DF50 _0807E878 Jump script_08015B34 diff --git a/data/scripts/cutscene/introBusinessScrub/script_BusinessScrubIntro.inc b/data/scripts/cutscene/introBusinessScrub/script_BusinessScrubIntro.inc index f549c630..52ceeee2 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_BusinessScrubIntro.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_BusinessScrubIntro.inc @@ -6,14 +6,14 @@ SCRIPT_START script_BusinessScrubIntro _0807EB44 0x0004 DoPostScriptAction 0x0000 EndBlock - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 _0807E908 0x0007 - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 _0807E908 0x0006 SetRoomFlag 0x0000 _0807EB44 0x0004 DoPostScriptAction 0x0000 - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 Wait 0x003c PlaySound SFX_SECRET Call sub_08046078 diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc index 1b3b8636..02806a81 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerAtIntroBusinessScrub4 _0807EC64 0x0010 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc index 729f3715..a83e7979 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc @@ -4,6 +4,6 @@ SCRIPT_START script_PlayerIntroBusinessScrub1 _0807EDD4 0x0218, 0x0238 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc index 76ba35a0..ca673adf 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc @@ -4,6 +4,6 @@ SCRIPT_START script_PlayerIntroBusinessScrub2 _0807EDD4 0x0238, 0x0228 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc index e30904f6..d9bb7e36 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc @@ -4,6 +4,6 @@ SCRIPT_START script_PlayerIntroBusinessScrub3 _0807EDD4 0x0248, 0x0208 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc index 3a1d1d3d..1d91c7f0 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc @@ -6,7 +6,7 @@ SCRIPT_START script_ZeldaIntroBusinessScrub DoPostScriptAction 0x000b Call sub_08066D04 EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 BeginBlock Call sub_08066D14 MoveEntityToPlayer @@ -22,12 +22,12 @@ SCRIPT_START script_ZeldaIntroBusinessScrub SetEntityPositionRelative 0x0248, 0x0218 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 Call sub_0807F3C8 PlaySound SFX_VO_ZELDA3 SetEntitySpeed 0x0200 @@ -36,19 +36,19 @@ SCRIPT_START script_ZeldaIntroBusinessScrub Call sub_0807F2D4 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 _0807EDD4 0x0238, 0x0238 _0807EB44 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a _0807E9D4 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 script_08015A32: EndBlock BeginBlock @@ -66,9 +66,9 @@ script_08015A54: DoPostScriptAction 0x000b _0807EB44 0x0000 DoPostScriptAction 0x0000 - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Call sub_08066D4C - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/introCeremony/script_08011890.inc b/data/scripts/cutscene/introCeremony/script_08011890.inc index cbad968b..9ccc9bc5 100644 --- a/data/scripts/cutscene/introCeremony/script_08011890.inc +++ b/data/scripts/cutscene/introCeremony/script_08011890.inc @@ -11,7 +11,7 @@ SCRIPT_START script_08011890 _0807EDD4 0x01f8, 0x0088 Call sub_08094B80 PlaySound SFX_1CC - _0807E5F8 0x10000000 - WaitForSomething2 0x08000000 + SetSyncFlag 0x10000000 + WaitForSyncFlagAndClear 0x08000000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc b/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc index 84046e60..59b81dea 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc @@ -1,15 +1,15 @@ @ Intro Ceremony Guard bottom right SCRIPT_START script_GuardBottomRight - _0807E610 0x00002000 - _0807E5F8 0x00004000 - WaitForSomething2 0x00002000 + ClearSyncFlag 0x00002000 + SetSyncFlag 0x00004000 + WaitForSyncFlagAndClear 0x00002000 _0807E930 0x0005 _0807EB44 0x0002 _0807EC94 0x0010 _0807EB44 0x0004 _0807E930 0x0002 - _0807E5F8 0x00004000 - WaitForSomething2 0x00002000 + SetSyncFlag 0x00004000 + WaitForSyncFlagAndClear 0x00002000 DoPostScriptAction 0x0004 Wait 0x003c _0807E930 0x0012 @@ -20,8 +20,8 @@ SCRIPT_START script_GuardBottomRight _0807EDD4 0x0200, 0x0098 _0807EDD4 0x0200, 0x00c8 _0807E930 0x0013 - _0807E5F8 0x00004000 - WaitForSomething2 0x00002000 + SetSyncFlag 0x00004000 + WaitForSyncFlagAndClear 0x00002000 DoPostScriptAction 0x0010 Wait 0x000a DoPostScriptAction 0x0010 @@ -30,6 +30,6 @@ SCRIPT_START script_GuardBottomRight SetEntitySpeed 0x0400 SetEntityDirection 0x0002 _0807EC1C 0x003c - _0807E5F8 0x00004000 + SetSyncFlag 0x00004000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc b/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc index b558aaa0..33d049b7 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc @@ -7,7 +7,7 @@ SCRIPT_START script_GuardCarryingChest Call sub_08095244 Call sub_0807F338 EndBlock - WaitForSomething 0x0002a800 + WaitForSyncFlag 0x0002a800 DoPostScriptAction 0x0007 _0807E930 0x0006 _0807ECC4 0x0010 @@ -20,16 +20,16 @@ SCRIPT_START script_GuardCarryingChest JumpTable script_08011312, script_GuardBottomRight, script_GuardTopLeft, script_GuardTopRight @ Guard bottom left: script_08011312: - _0807E610 0x00000800 - _0807E5F8 0x00001000 - WaitForSomething2 0x00000800 + ClearSyncFlag 0x00000800 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00000800 _0807E930 0x0007 _0807EB44 0x0006 _0807ECF4 0x0010 _0807EB44 0x0004 _0807E930 0x0002 - _0807E5F8 0x00001000 - WaitForSomething2 0x00000800 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00000800 DoPostScriptAction 0x0004 Wait 0x003c _0807E930 0x0012 @@ -40,8 +40,8 @@ script_08011312: _0807EDD4 0x01f0, 0x0098 _0807EDD4 0x01f0, 0x00c8 _0807E930 0x0013 - _0807E5F8 0x00001000 - WaitForSomething2 0x00000800 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00000800 DoPostScriptAction 0x0010 Wait 0x000a DoPostScriptAction 0x0010 @@ -50,6 +50,6 @@ script_08011312: SetEntitySpeed 0x0400 SetEntityDirection 0x001e _0807EC1C 0x003c - _0807E5F8 0x00001000 + SetSyncFlag 0x00001000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_GuardEntryLeft.inc b/data/scripts/cutscene/introCeremony/script_GuardEntryLeft.inc index 4efe80a7..c826ed27 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardEntryLeft.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardEntryLeft.inc @@ -5,12 +5,12 @@ SCRIPT_START script_GuardEntryLeft _0807EB44 0x0002 _0807E930 0x0001 EndBlock - WaitForSomething2 0x00080000 + WaitForSyncFlagAndClear 0x00080000 _0807E930 0x0005 PlaySound SFX_11C _0807ECF4 0x0010 _0807E930 0x0001 - _0807E5F8 0x00100000 - WaitForSomething2 0x00080000 + SetSyncFlag 0x00100000 + WaitForSyncFlagAndClear 0x00080000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_GuardEntryRight.inc b/data/scripts/cutscene/introCeremony/script_GuardEntryRight.inc index 487b0bec..3a132ca8 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardEntryRight.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardEntryRight.inc @@ -5,12 +5,12 @@ SCRIPT_START script_GuardEntryRight _0807EB44 0x0006 _0807E930 0x0003 EndBlock - WaitForSomething2 0x00200000 + WaitForSyncFlagAndClear 0x00200000 _0807E930 0x0007 PlaySound SFX_11C _0807EC94 0x0010 _0807E930 0x0003 - _0807E5F8 0x00400000 - WaitForSomething2 0x00200000 + SetSyncFlag 0x00400000 + WaitForSyncFlagAndClear 0x00200000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc b/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc index fd1af748..d8dd17d9 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc @@ -1,8 +1,8 @@ @ Intro Ceremony Guard top left SCRIPT_START script_GuardTopLeft - _0807E610 0x00008000 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + ClearSyncFlag 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 _0807E930 0x0007 _0807EB44 0x0006 _0807ECF4 0x0020 @@ -10,35 +10,35 @@ SCRIPT_START script_GuardTopLeft _0807E930 0x0006 _0807ECC4 0x0010 _0807E930 0x0002 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x0004 Wait 0x003c _0807E930 0x0012 PlaySound SFX_EM_MOBLIN_SPEAR - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 _0807E930 0x0014 SetEntitySpeed 0x0100 _0807EDD4 0x01e8, 0x0098 SetEntitySpeed 0x0040 _0807EEF4 0x0000, 0x0010 _0807E930 0x0013 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x000d _0807E930 0x0014 SetEntitySpeed 0x0020 _0807EEF4 0x0000, 0xfff0 _0807E930 0x0013 DoPostScriptAction 0x0010 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 Call sub_0807F3C8 _0807E930 0x0014 SetEntitySpeed 0x0400 SetEntityDirection 0x001e _0807EC1C 0x003c - _0807E5F8 0x00010000 + SetSyncFlag 0x00010000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc b/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc index 9b8b000e..1a5b8eb3 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc @@ -1,8 +1,8 @@ @ Intro Ceremony Guard top right SCRIPT_START script_GuardTopRight - _0807E610 0x00020000 - _0807E5F8 0x00040000 - WaitForSomething2 0x00020000 + ClearSyncFlag 0x00020000 + SetSyncFlag 0x00040000 + WaitForSyncFlagAndClear 0x00020000 _0807E930 0x0005 _0807EB44 0x0002 _0807EC94 0x0020 @@ -10,36 +10,36 @@ SCRIPT_START script_GuardTopRight _0807E930 0x0006 _0807ECC4 0x0010 _0807E930 0x0002 - _0807E5F8 0x00040000 - WaitForSomething2 0x00020000 + SetSyncFlag 0x00040000 + WaitForSyncFlagAndClear 0x00020000 DoPostScriptAction 0x0004 Wait 0x003c _0807E930 0x0012 PlaySound SFX_EM_MOBLIN_SPEAR - _0807E5F8 0x00040000 - WaitForSomething2 0x00020000 + SetSyncFlag 0x00040000 + WaitForSyncFlagAndClear 0x00020000 _0807E930 0x0014 SetEntitySpeed 0x0100 _0807EDD4 0x0208, 0x0098 SetEntitySpeed 0x0040 _0807EEF4 0x0000, 0x0010 _0807E930 0x0013 - _0807E5F8 0x00040000 - WaitForSomething2 0x00020000 + SetSyncFlag 0x00040000 + WaitForSyncFlagAndClear 0x00020000 DoPostScriptAction 0x000d _0807E930 0x0014 SetEntitySpeed 0x0020 _0807EEF4 0x0000, 0xfff0 _0807E930 0x0013 DoPostScriptAction 0x0010 - _0807E5F8 0x00040000 - WaitForSomething2 0x00020000 + SetSyncFlag 0x00040000 + WaitForSyncFlagAndClear 0x00020000 Call sub_0807F3C8 _0807E930 0x0014 SetEntitySpeed 0x0400 SetEntityDirection 0x0002 _0807EC1C 0x003c - _0807E5F8 0x00040000 + SetSyncFlag 0x00040000 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc b/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc index 2e28b685..cab32512 100644 --- a/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc +++ b/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc @@ -6,14 +6,14 @@ SCRIPT_START script_KingDaltusIntroCeremony SetEntitySpeed 0x0100 EndBlock Call sub_0807F338 - WaitForSomething2 0x00000040 + WaitForSyncFlagAndClear 0x00000040 DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 SetEntitySpeed 0x0040 _0807EDD4 0x01f8, 0x0048 DoPostScriptAction 0x0000 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000040 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000040 DoPostScriptAction 0x0010 Wait 0x001e DoPostScriptAction 0x0010 @@ -21,6 +21,6 @@ SCRIPT_START script_KingDaltusIntroCeremony SetEntitySpeed 0x0400 SetEntityDirection 0x0008 _0807EC1C 0x003c - _0807E5F8 0x00000080 + SetSyncFlag 0x00000080 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_MinisterPothoIntroCastle.inc b/data/scripts/cutscene/introCeremony/script_MinisterPothoIntroCastle.inc index ecae12e4..0af3031f 100644 --- a/data/scripts/cutscene/introCeremony/script_MinisterPothoIntroCastle.inc +++ b/data/scripts/cutscene/introCeremony/script_MinisterPothoIntroCastle.inc @@ -20,23 +20,23 @@ script_08011134: JumpIfNot script_08011134 LoadRoomEntityList gUnk_080F06B0 DoPostScriptAction 0x000b - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 SetEntityPositionRelative 0x01b8, 0x0058 _0807EB44 0x0004 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 _0807EB44 0x0006 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 _0807EB44 0x0004 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 _0807ECC4 0x0010 DoPostScriptAction 0x0000 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0010 Wait 0x001e DoPostScriptAction 0x0010 @@ -44,7 +44,7 @@ script_08011134: SetEntitySpeed 0x0400 SetEntityDirection 0x001c _0807EC1C 0x003c - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 DoPostScriptAction 0x0006 SCRIPT_END .ifdef JP diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc index f17ba3ea..f64d4428 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc @@ -11,20 +11,20 @@ SCRIPT_START script_Npc4EMonsters CallWithArg sub_0807FB28, 0x00000003 Wait 0x001e PlaySound SFX_12C - _0807E5F8 0x00800000 - WaitForSomething2 0x01000000 + SetSyncFlag 0x00800000 + WaitForSyncFlagAndClear 0x01000000 _0807E778 0x0004 DoFade7 - WaitFor_2 + WaitForFadeFinish Wait 0x003c PlaySound SFX_SPIRITS_RELEASE PlaySound SFX_1C2 LoadRoomEntityList gUnk_080F0770 - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 _0807E778 0x0002 DoFade6 - WaitFor_2 + WaitForFadeFinish CallWithArg DeleteManager36, 0x00000002 _0807F0C8 0x0000, 0x0000 Call sub_0806DC3C @@ -33,21 +33,21 @@ SCRIPT_START script_Npc4EMonsters CallWithArg sub_0807F29C, gUnk_080049F6 _0807F0B4 0x0001 SetEntityPositionRelative 0x01f8, 0x0068 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Wait 0x001e - _0807E5F8 0x00000040 - WaitForSomething2 0x00000008 - WaitForSomething2 0x00000080 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000008 + WaitForSyncFlagAndClear 0x00000080 PlaySound SFX_1C3 - _0807E5F8 0x20000000 + SetSyncFlag 0x20000000 Wait 0x0078 CallWithArg sub_0807F29C, 0x00000000 Call sub_0806DC58 - _0807E5F8 0x40000000 - _0807E5F8 0x00000010 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000020 - WaitForSomething2 0x00000200 + SetSyncFlag 0x40000000 + SetSyncFlag 0x00000010 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000020 + WaitForSyncFlagAndClear 0x00000200 MessageFromTargetPos 0x1045, 0x000c WaitUntilTextboxCloses MessageFromTargetPos 0x1046, 0x0000 diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc index 62ab6228..69a6d693 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc @@ -1,10 +1,10 @@ @ Intro Ceremony NPC4E Vaati attacking SCRIPT_START script_Npc4EVaatiAttacking Wait 0x003c - _0807E5F8 0x00000100 - WaitForSomething2 0x00000200 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000200 StartPlayerScript script_PlayerProtectingZelda - WaitForSomething2 0x00000400 + WaitForSyncFlagAndClear 0x00000400 MessageFromTargetPos 0x1047, 0x0000 WaitUntilTextboxCloses Call sub_0806DC3C @@ -12,12 +12,12 @@ SCRIPT_START script_Npc4EVaatiAttacking CallWithArg sub_0807F244, 0x0000000d CallWithArg sub_0807F29C, gUnk_080049F6 Wait 0x001e - _0807E5F8 0x00000100 - WaitForSomething2 0x00000200 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000200 CallWithArg sub_0807F29C, 0x00000000 Call sub_0806DC58 Wait 0x003c - _0807E5F8 0x08000000 + SetSyncFlag 0x08000000 PlaySound SFX_125 CallWithArg sub_0807FB28, 0x00000003 Wait 0x000f @@ -25,20 +25,20 @@ SCRIPT_START script_Npc4EVaatiAttacking CallWithArg sub_0807FB28, 0x00000003 CallWithArg DeleteManager36, 0x00000002 _0807F0C8 0x0000, 0x0000 - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 StopBgm Wait 0x003c MessageFromTargetPos 0x104a, 0x0000 WaitUntilTextboxCloses - _0807E5F8 0x00000100 - WaitForSomething2 0x00000200 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000200 MessageFromTargetPos 0x1049, 0x0000 WaitUntilTextboxCloses SetEntityPositionRelative 0x01f8, 0x0098 Wait 0x0078 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000200 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000200 Call sub_0804BCDC DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_Object6AMonsterFromChest.inc b/data/scripts/cutscene/introCeremony/script_Object6AMonsterFromChest.inc index 994c88a1..786aa81e 100644 --- a/data/scripts/cutscene/introCeremony/script_Object6AMonsterFromChest.inc +++ b/data/scripts/cutscene/introCeremony/script_Object6AMonsterFromChest.inc @@ -1,6 +1,6 @@ @ Intro Ceremony OBJECT_6A Monster from Chest SCRIPT_START script_Object6AMonsterFromChest - WaitForSomething 0x20000000 + WaitForSyncFlag 0x20000000 Call sub_0809567C SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/introCeremony/script_Object6ASwordInChest.inc b/data/scripts/cutscene/introCeremony/script_Object6ASwordInChest.inc index 5ce1fc5e..3b4b91f2 100644 --- a/data/scripts/cutscene/introCeremony/script_Object6ASwordInChest.inc +++ b/data/scripts/cutscene/introCeremony/script_Object6ASwordInChest.inc @@ -3,18 +3,18 @@ SCRIPT_START script_Object6ASwordInChest BeginBlock Call sub_08095330 EndBlock - WaitForSomething2 0x00800000 + WaitForSyncFlagAndClear 0x00800000 _0807EF3C 0x0000, 0x0020 - _0807E5F8 0x01000000 - WaitForSomething2 0x00800000 + SetSyncFlag 0x01000000 + WaitForSyncFlagAndClear 0x00800000 Call sub_08095364 PlaySound SFX_122 Wait 0x003c - _0807E5F8 0x01000000 - WaitForSomething2 0x00800000 + SetSyncFlag 0x01000000 + WaitForSyncFlagAndClear 0x00800000 _0807E930 0x0002 - _0807E5F8 0x01000000 - WaitForSomething2 0x00800000 + SetSyncFlag 0x01000000 + WaitForSyncFlagAndClear 0x00800000 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc b/data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc index 95d01756..0d800ec9 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc @@ -3,8 +3,8 @@ SCRIPT_START script_PlayerAtIntroCeremony SetEntityPositionRelative 0x01a8, 0x0058 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000400 - _0807E610 0x00000002 + SetSyncFlag 0x00000400 + ClearSyncFlag 0x00000002 EndBlock Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc b/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc index 85909eb4..386826af 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc @@ -12,6 +12,6 @@ SCRIPT_START script_PlayerFainting DoPostScriptAction 0x0011 EndBlock Call sub_0807F2D4 - WaitForSomething 0x80000000 + WaitForSyncFlag 0x80000000 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc b/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc index e9fa7bae..f3d1557d 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc @@ -6,6 +6,6 @@ SCRIPT_START script_PlayerIntroCastle _0807EDD4 0x01e8, 0x0050 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000400 + SetSyncFlag 0x00000400 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc b/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc index b83227b8..e0c26443 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc @@ -8,6 +8,6 @@ SCRIPT_START script_PlayerProtectingZelda _0807EDD4 0x01d8, 0x0068 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000400 + SetSyncFlag 0x00000400 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc b/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc index 7224f273..c00eb537 100644 --- a/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc +++ b/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc @@ -6,7 +6,7 @@ SCRIPT_START script_VaatiDarkMagic Call nullsub_527 Call sub_08094B80 EndBlock - WaitForSomething2 0x08000000 + WaitForSyncFlagAndClear 0x08000000 Call sub_08094B6C _0807EDD4 0x01d8, 0x0078 StartPlayerScript script_PlayerFainting @@ -14,8 +14,8 @@ SCRIPT_START script_VaatiDarkMagic Call sub_08094B80 PlaySound SFX_VO_ZELDA7 PlaySound SFX_1C6 - _0807E5F8 0x10000000 - WaitForSomething2 0x08000000 + SetSyncFlag 0x10000000 + WaitForSyncFlagAndClear 0x08000000 PlaySound SFX_11D DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc b/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc index 0758dc29..2557a4c2 100644 --- a/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc +++ b/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc @@ -5,32 +5,32 @@ SCRIPT_START script_VaatiIntroCeremony SetEntitySpeed 0x0100 EndBlock Call sub_0807F338 - WaitForSomething2 0x00000100 + WaitForSyncFlagAndClear 0x00000100 DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x00d0 DoPostScriptAction 0x0000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000100 _0807EB44 0x0004 DoPostScriptAction 0x001c Call sub_0807F2D4 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000100 _0807EB44 0x0000 DoPostScriptAction 0x001c Call sub_0807F2D4 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000100 _0807EB44 0x0000 DoPostScriptAction 0x001a Call sub_0807F2D4 DoPostScriptAction 0x0000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000100 _0807EB44 0x0000 DoPostScriptAction 0x0014 PlaySound SFX_CHARGING_UP @@ -38,30 +38,30 @@ SCRIPT_START script_VaatiIntroCeremony Wait 0x00f0 DoPostScriptAction 0x0016 PlaySound SFX_1CB - WaitForSomething2 0x10000000 + WaitForSyncFlagAndClear 0x10000000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000100 SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 _0807EDD4 0x01d8, 0x00a8 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000100 DoPostScriptAction 0x0014 PlaySound SFX_1C4 CallWithArg sub_0809545C, script_VaatiDarkMagic - _0807E5F8 0x00000200 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000100 Wait 0x003c DoPostScriptAction 0x0016 PlaySound SFX_1C5 - _0807E5F8 0x08000000 - WaitForSomething2 0x10000000 + SetSyncFlag 0x08000000 + WaitForSyncFlagAndClear 0x10000000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000100 SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0098 @@ -75,12 +75,12 @@ SCRIPT_START script_VaatiIntroCeremony _0807EB44 0x0004 DoPostScriptAction 0x0000 Wait 0x001e - _0807E5F8 0x00000200 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000100 Call sub_08066CA4 DoPostScriptAction 0x0008 Wait 0x0078 - _0807E5F8 0x00000200 + SetSyncFlag 0x00000200 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc b/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc index 9c4bc258..b0554ed0 100644 --- a/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc +++ b/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc @@ -6,7 +6,7 @@ SCRIPT_START script_ZeldaIntroCastle Call sub_08066D04 EndBlock Call sub_0807F338 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 Call sub_08066D14 JumpIf script_080111F6 MoveEntityToPlayer @@ -20,28 +20,28 @@ script_08011206: _0807EDD4 0x01f8, 0x0050 _0807EB74 DoPostScriptAction 0x0000 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0020 DoPostScriptAction 0x0008 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 SetEntitySpeed 0x0040 _0807EDD4 0x01e8, 0x0040 DoPostScriptAction 0x0000 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 Call sub_08095810 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0001 _0807EDD4 0x01d8, 0x0058 DoPostScriptAction 0x0000 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 PlaySound SFX_1C9 DoPostScriptAction 0x0010 Wait 0x0014 @@ -50,7 +50,7 @@ script_08011206: DoPostScriptAction 0x0010 Call sub_0807F2D4 PlaySound SFX_1CA - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_ZeldaMagic.inc b/data/scripts/cutscene/introCeremony/script_ZeldaMagic.inc index b9e3dc17..03506c59 100644 --- a/data/scripts/cutscene/introCeremony/script_ZeldaMagic.inc +++ b/data/scripts/cutscene/introCeremony/script_ZeldaMagic.inc @@ -1,5 +1,5 @@ @ Intro Ceremony OBJECT_6A Zelda shine or something? SCRIPT_START script_ZeldaMagic - WaitForSomething 0x40000000 + WaitForSyncFlag 0x40000000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc index 85512814..ea3471c4 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc @@ -4,22 +4,22 @@ SCRIPT_START script_Npc4EIntroCastle Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_PlayerIntroCastle - WaitForSomething2 0x00000400 + WaitForSyncFlagAndClear 0x00000400 _0807F078 0x0034, 0x0002 MessageFromTargetPos 0x1036, 0x000c WaitUntilTextboxCloses - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 MessageFromTargetPos 0x1037, 0x0002 WaitUntilTextboxCloses - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 MessageFromTargetPos 0x1038, 0x000c WaitUntilTextboxCloses StopBgm _0807E778 0x0004 DoFade5 - WaitFor_2 + WaitForFadeFinish Call sub_08064180 Call sub_08064180 Call sub_08064180 @@ -29,10 +29,10 @@ SCRIPT_START script_Npc4EIntroCastle Call sub_08064180 Call sub_08064180 LoadRoomEntityList gUnk_080F06E0 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 StartPlayerScript script_PlayerAtIntroCeremony - WaitForSomething2 0x00000400 + WaitForSyncFlagAndClear 0x00000400 SetEntityPositionRelative 0x01f8, 0x0050 _0807F0B4 0x0007 CameraTargetEntity @@ -40,82 +40,82 @@ SCRIPT_START script_Npc4EIntroCastle _0807F0B4 0x0001 _0807E778 0x0001 DoFade4 - _0807E5F8 0x0002a800 - WaitForSomething2 0x00055000 + SetSyncFlag 0x0002a800 + WaitForSyncFlagAndClear 0x00055000 SetEntityPositionRelative 0x01f8, 0x0078 Wait 0x003c - _0807E5F8 0x00800000 - WaitForSomething2 0x01000000 - _0807E5F8 0x0002a800 - WaitForSomething2 0x00055000 + SetSyncFlag 0x00800000 + WaitForSyncFlagAndClear 0x01000000 + SetSyncFlag 0x0002a800 + WaitForSyncFlagAndClear 0x00055000 _0807E8E4_1 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 MessageFromTargetPos 0x1039, 0x000c WaitUntilTextboxCloses PlayBgm BGM_CASTLE_TOURNAMENT _0807E8E4_2 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000010 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000020 - WaitForSomething2 0x00000080 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000010 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000020 + WaitForSyncFlagAndClear 0x00000080 Wait 0x012c - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 MessageFromTargetPos 0x103a, 0x000c WaitUntilTextboxCloses SetEntityPositionRelative 0x01f8, 0x01c0 _0807F0B4 0x0004 Wait 0x0078 - _0807E5F8 0x00280000 - WaitForSomething2 0x00500000 - _0807E5F8 0x00000100 + SetSyncFlag 0x00280000 + WaitForSyncFlagAndClear 0x00500000 + SetSyncFlag 0x00000100 SetEntityPositionRelative 0x01f8, 0x0220 SetEntitySpeed 0x0100 _0807EDD4 0x01f8, 0x0098 Wait 0x003c - WaitForSomething2 0x00000200 - _0807E5F8 0x00280000 + WaitForSyncFlagAndClear 0x00000200 + SetSyncFlag 0x00280000 StopBgm PlaySound SFX_9B - _0807E5F8 0x00000100 - WaitForSomething2 0x00000200 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000200 MessageFromTargetPos 0x1043, 0x0000 WaitUntilTextboxCloses PlayBgm BGM_VAATI_THEME - _0807E5F8 0x00000100 - WaitForSomething2 0x00000200 - _0807E5F8 0x0002a800 - WaitForSomething2 0x00055000 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000200 + SetSyncFlag 0x0002a800 + WaitForSyncFlagAndClear 0x00055000 PlaySound SFX_1C7 PlaySound SFX_BUTTON_DEPRESS - _0807E5F8 0x00000100 - _0807E5F8 0x00002800 + SetSyncFlag 0x00000100 + SetSyncFlag 0x00002800 CallWithArg sub_0807FB28, 0x00000003 - WaitForSomething2 0x00000200 - WaitForSomething2 0x00005000 - _0807E5F8 0x00028000 - WaitForSomething2 0x00050000 + WaitForSyncFlagAndClear 0x00000200 + WaitForSyncFlagAndClear 0x00005000 + SetSyncFlag 0x00028000 + WaitForSyncFlagAndClear 0x00050000 MessageFromTargetPos 0x1044, 0x0000 WaitUntilTextboxCloses SetEntityPositionRelative 0x01f8, 0x0098 StopBgm Wait 0x003c PlayBgm BGM_VAATI_REBORN - _0807E5F8 0x00028000 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000200 - WaitForSomething2 0x00050000 + SetSyncFlag 0x00028000 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000200 + WaitForSyncFlagAndClear 0x00050000 CallWithArg sub_0807FB28, 0x00000003 PlaySound SFX_BUTTON_DEPRESS - _0807E5F8 0x00028000 - WaitForSomething2 0x00050000 + SetSyncFlag 0x00028000 + WaitForSyncFlagAndClear 0x00050000 PlaySound SFX_125 CallWithArg sub_0807FB28, 0x00000003 - _0807E5F8 0x08000000 - _0807E5F8 0x00800000 - WaitForSomething2 0x01000000 + SetSyncFlag 0x08000000 + SetSyncFlag 0x00800000 + WaitForSyncFlagAndClear 0x01000000 CallWithArg CreateManager36, 0x00000002 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc index db8de660..67df44fd 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc @@ -20,9 +20,9 @@ SCRIPT_START script_Npc4EIntroTown Call sub_0807F844 _0807E778 0x0002 DoFade6 - WaitFor_2 + WaitForFadeFinish StartPlayerScript script_PlayerIntro1 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 _0807F0B4 0x0001 SetEntityPositionRelative 0x00c8, 0x0218 Call sub_0807F5C0 @@ -31,60 +31,60 @@ SCRIPT_START script_Npc4EIntroTown _0807F0B4 0x0002 SetEntityPositionRelative 0x00c8, 0x0368 Call sub_0807F5C0 - WaitForSomething2 0x00000001 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000001 + WaitForSyncFlagAndClear 0x00000004 @ First message from Zelda MessageFromTargetPos 0x2501, 0x0000 WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 @ Zelda ran off. Give control to the player _0807F0B4 0x0004 CameraTargetPlayer Call sub_0807DF50 _0807E878 - _0807E5F8 0x00000010 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000004 _0807E864 Call sub_0807DF28 StartPlayerScript script_PlayerIntro2 - WaitForSomething2 0x00000001 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 MessageFromTargetPos 0x2503, 0x000e WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 Call sub_0807DF50 _0807E878 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 _0807E864 Call sub_0807DF28 StartPlayerScript script_PlayerIntro3 - WaitForSomething2 0x00000001 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 MessageFromTargetPos 0x2504, 0x000e WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 Call sub_0807DF50 _0807E878 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 _0807E864 Call sub_0807DF28 StartPlayerScript script_PlayerIntro4 - WaitForSomething2 0x00000001 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 MessageFromTargetPos 0x2505, 0x000e WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 Call sub_0807DF50 _0807E878 @ Wait for Link at Pina - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 _0807E864 Call sub_0807DF28 Call sub_08063C5C @@ -101,7 +101,7 @@ SCRIPT_START script_Npc4EIntroTown CameraTargetEntity Wait 0x001e Call sub_08063C2C - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 MessageFromTargetPos 0x1022, 0x000e WaitUntilTextboxCloses _0807E8E4_0 @@ -123,8 +123,8 @@ SCRIPT_START script_Npc4EIntroTown Call sub_08063C5C MessageFromTargetPos 0x1026, 0x000e WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 _0807E8E4_1 Call sub_08063C2C MessageFromTargetPos 0x1027, 0x0000 @@ -144,8 +144,8 @@ SCRIPT_START script_Npc4EIntroTown Call sub_08063C14 Call sub_08094D70 PlaySound SFX_103 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 Call sub_08063C14 Call sub_08094D10 Wait 0x001e @@ -157,7 +157,7 @@ SCRIPT_START script_Npc4EIntroTown MessageFromTargetPos 0x102b, 0x0000 WaitUntilTextboxCloses @ Give the shield to the player - _0807F034 0x000d + GivePlayerItem 0x000d WaitPlayerGetItem Call sub_0806DC3C Call sub_080791BC @@ -176,7 +176,7 @@ SCRIPT_START script_Npc4EIntroTown _0807F0B4 0x0004 CameraTargetPlayer Wait 0x000a - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08063C44 .ifdef JP SetLocalFlag 0x00ca diff --git a/data/scripts/cutscene/introTown/script_Object69IntroTown.inc b/data/scripts/cutscene/introTown/script_Object69IntroTown.inc index 7ef81598..ff9f8d27 100644 --- a/data/scripts/cutscene/introTown/script_Object69IntroTown.inc +++ b/data/scripts/cutscene/introTown/script_Object69IntroTown.inc @@ -14,7 +14,7 @@ SCRIPT_START script_Object69IntroTown .endif .endif JumpIf script_0800FD50 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 script_0800FD1A: @ Prevent Link from leaving CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040 @@ -38,7 +38,7 @@ script_0800FD1A: MessageFromTargetPos 0x2506, 0x0000 WaitUntilTextboxCloses StartPlayerScript script_PlayerIntroTown - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 _0807E878 Jump script_0800FD1A script_0800FD50: @@ -50,7 +50,7 @@ script_0800FD5C: MessageFromTargetPos 0x106c, 0x0000 WaitUntilTextboxCloses StartPlayerScript script_PlayerIntroTown - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 _0807E878 Jump script_0800FD50 .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro1.inc b/data/scripts/cutscene/introTown/script_PlayerIntro1.inc index ba36e8ab..4732932e 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro1.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro1.inc @@ -6,6 +6,6 @@ SCRIPT_START script_PlayerIntro1 SetEntityPositionRelative 0x00d8, 0x0398 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro2.inc b/data/scripts/cutscene/introTown/script_PlayerIntro2.inc index 6ce812b6..94540b8a 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro2.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro2.inc @@ -6,6 +6,6 @@ SCRIPT_START script_PlayerIntro2 _0807EDD4 0x00a0, 0x0278 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro3.inc b/data/scripts/cutscene/introTown/script_PlayerIntro3.inc index cccb6450..4f48ea8c 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro3.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro3.inc @@ -6,6 +6,6 @@ SCRIPT_START script_PlayerIntro3 _0807EDD4 0x0078, 0x01c0 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro4.inc b/data/scripts/cutscene/introTown/script_PlayerIntro4.inc index 76ca7bd4..9d304aea 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro4.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro4.inc @@ -6,6 +6,6 @@ SCRIPT_START script_PlayerIntro4 _0807EDD4 0x0108, 0x01c8 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro5.inc b/data/scripts/cutscene/introTown/script_PlayerIntro5.inc index 721060d3..ce887cd2 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro5.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro5.inc @@ -13,6 +13,6 @@ script_0800FB10: _0807EDD4 0x00e8, 0x0270 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/introTown/script_PlayerIntroTown.inc b/data/scripts/cutscene/introTown/script_PlayerIntroTown.inc index e4ba634a..a15642df 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntroTown.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerIntroTown _0807EC64 0x0020 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc b/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc index 1b3fbac7..6cda5954 100644 --- a/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc @@ -6,7 +6,7 @@ SCRIPT_START script_ZeldaIntroTown SetEntitySpeed 0x0080 Call sub_08066D04 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 Call sub_08066D14 JumpIf script_0800FB6C MoveEntityToPlayer @@ -15,26 +15,26 @@ script_0800FB6C: SetEntityPositionRelative 0x00b8, 0x0398 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 _0807EDD4 0x00b8, 0x0318 SetEntityPositionRelative 0x00a0, 0x0260 _0807EB44 0x0000 DoPostScriptAction 0x0001 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x000a _0807E9D4 script_0800FBAE: _0807E30C JumpIfNot script_0800FBAE DoPostScriptAction 0x000b - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 _0807EDD4 0x00a0, 0x0268 _0807EDD4 0x0070, 0x0268 @@ -42,41 +42,41 @@ script_0800FBAE: SetEntityPositionRelative 0x0078, 0x01a8 _0807EB44 0x0000 DoPostScriptAction 0x0001 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x000a script_0800FC06: _0807E30C JumpIfNot script_0800FC06 DoPostScriptAction 0x000b - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 _0807EDD4 0x00f8, 0x01a8 SetEntityPositionRelative 0x0118, 0x01c8 _0807EB44 0x0002 DoPostScriptAction 0x0001 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x000a script_0800FC52: _0807E30C JumpIfNot script_0800FC52 DoPostScriptAction 0x000b - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 _0807EDD4 0x0118, 0x0260 SetEntityPositionRelative 0x00f8, 0x0270 _0807EB44 0x0000 DoPostScriptAction 0x0001 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x000a script_0800FC9E: @ Wait at Pina for Link @@ -85,23 +85,23 @@ script_0800FC9E: DoPostScriptAction 0x000b _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x0004 - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x000d SetEntitySpeed 0x0040 _0807EC94 0x0020 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x000c SetEntitySpeed 0x0040 _0807ECF4 0x0020 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 Call sub_08066D4C DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc index 59b5403d..2f96db73 100644 --- a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc @@ -7,20 +7,20 @@ SCRIPT_START script_HurdyGurdyManFirstKinstone EndBlock Call sub_0807F348 _0807EB44 0x0002 - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 _0807EDD4 0x01b8, 0x0328 - _0807E5F8 0x00000040 + SetSyncFlag 0x00000040 _0807EDD4 0x01f8, 0x0328 _0807EB44 0x0004 _0807E930 0x0008 _0807E8E4_0 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000002 Call sub_0806E440 Wait 0x0078 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000002 script_0800F1E6: EndBlock BeginBlock @@ -36,7 +36,7 @@ script_0800F1E6: MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone1 - WaitForSomething2 0x00000400 + WaitForSyncFlagAndClear 0x00000400 _0807E878 Jump script_0800F1E6 script_0800F22A: @@ -52,7 +52,7 @@ script_0800F22A: MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone2 - WaitForSomething2 0x00000400 + WaitForSyncFlagAndClear 0x00000400 _0807E878 Jump script_0800F1E6 script_0800F26A: @@ -68,7 +68,7 @@ script_0800F26A: MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone3 - WaitForSomething2 0x00000400 + WaitForSyncFlagAndClear 0x00000400 _0807E878 Jump script_0800F1E6 script_0800F2AA: @@ -84,7 +84,7 @@ script_0800F2AA: MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone4 - WaitForSomething2 0x00000400 + WaitForSyncFlagAndClear 0x00000400 _0807E878 Jump script_0800F1E6 script_0800F2EA: @@ -104,11 +104,11 @@ script_0800F2EA: Jump script_0800F1E6 script_0800F314: EndBlock - _0807E5F8 0x00000040 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 _0807EB44 0x0002 _0807EEF4 0x00c0, 0x0000 - _0807E5F8 0x00000040 + SetSyncFlag 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone1.inc b/data/scripts/cutscene/kinstones/script_KidKinstone1.inc index 45b1ce72..21c9883d 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone1.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone1.inc @@ -9,7 +9,7 @@ SCRIPT_START script_KidKinstone1 DoPostScriptAction 0x000b EndBlock Call sub_0807F348 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0007 _0807EDD4 0x01f8, 0x0318 _0807EDD4 0x0208, 0x0318 @@ -17,7 +17,7 @@ SCRIPT_START script_KidKinstone1 _0807EB44 0x0006 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - _0807E5F8 0x00000080 + SetSyncFlag 0x00000080 script_0800F3EA: EndBlock BeginBlock @@ -30,7 +30,7 @@ script_0800F3EA: WaitUntilTextboxCloses _0807E878 script_0800F402: - TestBit 0x00000004 + CheckSyncFlagAndClear 0x00000004 JumpIfNot script_0800F3EA EndBlock DoPostScriptAction 0x000b @@ -38,6 +38,6 @@ script_0800F402: SetEntitySpeed 0x0100 _0807EC64 0x0010 _0807EDD4 0x0288, 0x0328 - _0807E5F8 0x00000080 + SetSyncFlag 0x00000080 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone2.inc b/data/scripts/cutscene/kinstones/script_KidKinstone2.inc index c197dfec..d3cdd400 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone2.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone2.inc @@ -9,14 +9,14 @@ SCRIPT_START script_KidKinstone2 DoPostScriptAction 0x000b EndBlock Call sub_0807F348 - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 DoPostScriptAction 0x0007 _0807EDD4 0x01d8, 0x0328 _0807EDD4 0x01f8, 0x0348 _0807EB44 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - _0807E5F8 0x00000100 + SetSyncFlag 0x00000100 script_0800F478: EndBlock BeginBlock @@ -29,7 +29,7 @@ script_0800F478: WaitUntilTextboxCloses _0807E878 script_0800F490: - TestBit 0x00000008 + CheckSyncFlagAndClear 0x00000008 JumpIfNot script_0800F478 EndBlock DoPostScriptAction 0x000b @@ -38,7 +38,7 @@ script_0800F490: _0807EC94 0x0010 _0807EC64 0x0020 _0807EDD4 0x0288, 0x0328 - _0807E5F8 0x00000100 + SetSyncFlag 0x00000100 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone3.inc b/data/scripts/cutscene/kinstones/script_KidKinstone3.inc index 1b55066e..1039e878 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone3.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone3.inc @@ -9,14 +9,14 @@ SCRIPT_START script_KidKinstone3 DoPostScriptAction 0x000b EndBlock Call sub_0807F348 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0007 _0807EDD4 0x01c8, 0x0328 _0807EDD4 0x01e8, 0x0338 _0807EB44 0x0002 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - _0807E5F8 0x00000200 + SetSyncFlag 0x00000200 script_0800F50C: EndBlock BeginBlock @@ -29,7 +29,7 @@ script_0800F50C: WaitUntilTextboxCloses _0807E878 script_0800F524: - TestBit 0x00000010 + CheckSyncFlagAndClear 0x00000010 JumpIfNot script_0800F50C EndBlock DoPostScriptAction 0x000b @@ -37,7 +37,7 @@ script_0800F524: SetEntitySpeed 0x0100 _0807EC64 0x0010 _0807EDD4 0x0288, 0x0328 - _0807E5F8 0x00000200 + SetSyncFlag 0x00000200 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc index 33bd8b48..80a76584 100644 --- a/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc @@ -12,35 +12,35 @@ script_0800F09A: Call sub_0807DF28 LoadRoomEntityList gUnk_080EE8AC StartPlayerScript script_PlayerAtFirstKinstone - WaitForSomething2 0x00000001 - _0807E5F8 0x0000001e - WaitForSomething2 0x00000040 + WaitForSyncFlagAndClear 0x00000001 + SetSyncFlag 0x0000001e + WaitForSyncFlagAndClear 0x00000040 MessageFromTargetPos 0x1201, 0x000c WaitUntilTextboxCloses - WaitForSomething2 0x000003c0 + WaitForSyncFlagAndClear 0x000003c0 _0807E8E4_0 MessageFromTargetPos 0x1202, 0x000c WaitUntilTextboxCloses - _0807F034 0x0067 + GivePlayerItem 0x0067 WaitPlayerGetItem _0807E8E4_0 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000040 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000040 MessageFromTargetPos 0x1203, 0x000c WaitUntilTextboxCloses - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_0807DF50 _0807E878 - WaitForSomething2 0x00000040 + WaitForSyncFlagAndClear 0x00000040 script_0800F11A: CheckKinstoneFused 0x0032 JumpIfNot script_0800F11A _0807E864 Call sub_0807DF28 - _0807E5F8 0x0000001e + SetSyncFlag 0x0000001e Wait 0x003c _0807E8E4_1 - WaitForSomething2 0x000003c0 + WaitForSyncFlagAndClear 0x000003c0 Call sub_0807DF50 _0807E878 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc index 40305c72..d039a201 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc @@ -11,6 +11,6 @@ SCRIPT_START script_PlayerAtFirstKinstone _0807EDD4 0x01f8, 0x0338 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc index cc32b8ed..941d969d 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone1 SetEntitySpeed 0x0100 _0807EC94 0x0008 - _0807E5F8 0x00000400 + SetSyncFlag 0x00000400 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc index a8d17ccd..8bcc7ac1 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone2 SetEntitySpeed 0x0100 _0807ECF4 0x0008 - _0807E5F8 0x00000400 + SetSyncFlag 0x00000400 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc index e951333f..a86cda57 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone3 SetEntitySpeed 0x0100 _0807ECC4 0x0008 - _0807E5F8 0x00000400 + SetSyncFlag 0x00000400 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc index db5813b5..01316111 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone4 SetEntitySpeed 0x0100 _0807EC64 0x0008 - _0807E5F8 0x00000400 + SetSyncFlag 0x00000400 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc index 15ae2605..c1d7b3bb 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc @@ -7,29 +7,29 @@ SCRIPT_START script_ForestMinish5 DoPostScriptAction 0x000f Call sub_0807F338 EndBlock - WaitForSomething2 0x00000200 + WaitForSyncFlagAndClear 0x00000200 DoPostScriptAction 0x0007 _0807EDD4 0x0208, 0x0308 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000400 - WaitForSomething2 0x00000200 + SetSyncFlag 0x00000400 + WaitForSyncFlagAndClear 0x00000200 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 - _0807E5F8 0x00000400 - WaitForSomething2 0x00000200 + SetSyncFlag 0x00000400 + WaitForSyncFlagAndClear 0x00000200 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f _0807EDD4 0x0208, 0x0328 DoPostScriptAction 0x0000 - _0807E5F8 0x00000400 - WaitForSomething2 0x00000200 + SetSyncFlag 0x00000400 + WaitForSyncFlagAndClear 0x00000200 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f _0807EDD4 0x0208, 0x02b0 - _0807E5F8 0x00000400 + SetSyncFlag 0x00000400 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc index 6fe0af32..06076fd2 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc @@ -7,25 +7,25 @@ SCRIPT_START script_ForestMinish6 DoPostScriptAction 0x000f Call sub_0807F338 EndBlock - WaitForSomething2 0x00000800 + WaitForSyncFlagAndClear 0x00000800 DoPostScriptAction 0x0007 _0807EB44 0x0002 DoPostScriptAction 0x0001 _0807EDD4 0x01a8, 0x0330 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00001000 - WaitForSomething2 0x00000800 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00000800 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f _0807EDD4 0x01f8, 0x0348 DoPostScriptAction 0x0000 - _0807E5F8 0x00001000 - WaitForSomething2 0x00000800 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00000800 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f _0807EDD4 0x0178, 0x0328 - _0807E5F8 0x00001000 + SetSyncFlag 0x00001000 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc index 63c90ea4..4e862a77 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc @@ -7,29 +7,29 @@ SCRIPT_START script_ForestMinish7 DoPostScriptAction 0x000f Call sub_0807F338 EndBlock - WaitForSomething2 0x00002000 + WaitForSyncFlagAndClear 0x00002000 DoPostScriptAction 0x0007 _0807EDD4 0x0258, 0x0330 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00004000 - WaitForSomething2 0x00002000 + SetSyncFlag 0x00004000 + WaitForSyncFlagAndClear 0x00002000 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f _0807EDD4 0x0218, 0x0340 DoPostScriptAction 0x0000 - _0807E5F8 0x00004000 - WaitForSomething2 0x00002000 + SetSyncFlag 0x00004000 + WaitForSyncFlagAndClear 0x00002000 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 - _0807E5F8 0x00004000 - WaitForSomething2 0x00002000 + SetSyncFlag 0x00004000 + WaitForSyncFlagAndClear 0x00002000 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f _0807EDD4 0x0288, 0x02d8 - _0807E5F8 0x00004000 + SetSyncFlag 0x00004000 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc index 738c4983..945415dc 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc @@ -7,29 +7,29 @@ SCRIPT_START script_ForestMinish8 DoPostScriptAction 0x000f Call sub_0807F338 EndBlock - WaitForSomething2 0x00008000 + WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x0007 _0807EDD4 0x01b8, 0x0320 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f _0807EDD4 0x01f8, 0x0330 DoPostScriptAction 0x0000 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f _0807EDD4 0x0188, 0x02d8 - _0807E5F8 0x00010000 + SetSyncFlag 0x00010000 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc index 2c974e25..4b350a06 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc @@ -7,23 +7,23 @@ SCRIPT_START script_ForestMinish9 DoPostScriptAction 0x000f Call sub_0807F338 EndBlock - WaitForSomething2 0x00020000 + WaitForSyncFlagAndClear 0x00020000 DoPostScriptAction 0x0007 _0807EDD4 0x0268, 0x0338 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00040000 - WaitForSomething2 0x00020000 + SetSyncFlag 0x00040000 + WaitForSyncFlagAndClear 0x00020000 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f _0807EDD4 0x0218, 0x0350 DoPostScriptAction 0x0000 - _0807E5F8 0x00040000 - WaitForSomething2 0x00020000 + SetSyncFlag 0x00040000 + WaitForSyncFlagAndClear 0x00020000 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f _0807EDD4 0x02a8, 0x0328 - _0807E5F8 0x00040000 + SetSyncFlag 0x00040000 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc b/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc index 81567508..6419dba0 100644 --- a/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc +++ b/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc @@ -11,68 +11,68 @@ script_0800C928: Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_PlayerAtVillageIntro - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 Wait 0x003c _0807EB28 0x1125 WaitUntilTextboxCloses - _0807E5F8 0x00000800 + SetSyncFlag 0x00000800 _0807E8E4_3 Wait 0x003c - _0807E5F8 0x00000200 + SetSyncFlag 0x00000200 _0807E8E4_0 Wait 0x001e - _0807E5F8 0x00002000 + SetSyncFlag 0x00002000 _0807E8E4_1 Wait 0x0014 - _0807E5F8 0x00020000 + SetSyncFlag 0x00020000 _0807E8E4_1 Wait 0x000a - _0807E5F8 0x00008000 + SetSyncFlag 0x00008000 _0807E8E4_3 Wait 0x001e - WaitForSomething2 0x00000400 - WaitForSomething2 0x00001000 - WaitForSomething2 0x00004000 - WaitForSomething2 0x00010000 - WaitForSomething2 0x00040000 + WaitForSyncFlagAndClear 0x00000400 + WaitForSyncFlagAndClear 0x00001000 + WaitForSyncFlagAndClear 0x00004000 + WaitForSyncFlagAndClear 0x00010000 + WaitForSyncFlagAndClear 0x00040000 _0807E8E4_0 Wait 0x003c - _0807E5F8 0x00000200 - WaitForSomething2 0x00000400 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000400 _0807E8E4_0 MessageFromTarget 0x1126 Call sub_0807F40C WaitUntilTextboxCloses - _0807E5F8 0x00000200 - _0807E5F8 0x00000800 - _0807E5F8 0x00002000 - _0807E5F8 0x00008000 - _0807E5F8 0x00020000 - WaitForSomething2 0x00000400 - WaitForSomething2 0x00001000 - WaitForSomething2 0x00004000 - WaitForSomething2 0x00010000 - WaitForSomething2 0x00040000 - _0807E5F8 0x00008000 - WaitForSomething2 0x00010000 + SetSyncFlag 0x00000200 + SetSyncFlag 0x00000800 + SetSyncFlag 0x00002000 + SetSyncFlag 0x00008000 + SetSyncFlag 0x00020000 + WaitForSyncFlagAndClear 0x00000400 + WaitForSyncFlagAndClear 0x00001000 + WaitForSyncFlagAndClear 0x00004000 + WaitForSyncFlagAndClear 0x00010000 + WaitForSyncFlagAndClear 0x00040000 + SetSyncFlag 0x00008000 + WaitForSyncFlagAndClear 0x00010000 _0807E8E4_3 MessageFromTarget 0x1127 WaitUntilTextboxCloses - _0807E5F8 0x00002000 - WaitForSomething2 0x00004000 + SetSyncFlag 0x00002000 + WaitForSyncFlagAndClear 0x00004000 _0807E8E4_1 MessageFromTarget 0x1128 WaitUntilTextboxCloses - _0807E5F8 0x00000200 - _0807E5F8 0x00000800 - _0807E5F8 0x00002000 - _0807E5F8 0x00008000 - _0807E5F8 0x00020000 - WaitForSomething2 0x00000400 - WaitForSomething2 0x00001000 - WaitForSomething2 0x00004000 - WaitForSomething2 0x00010000 - WaitForSomething2 0x00040000 + SetSyncFlag 0x00000200 + SetSyncFlag 0x00000800 + SetSyncFlag 0x00002000 + SetSyncFlag 0x00008000 + SetSyncFlag 0x00020000 + WaitForSyncFlagAndClear 0x00000400 + WaitForSyncFlagAndClear 0x00001000 + WaitForSyncFlagAndClear 0x00004000 + WaitForSyncFlagAndClear 0x00010000 + WaitForSyncFlagAndClear 0x00040000 _0807E8E4_0 _0807EB28 0x1129 WaitUntilTextboxCloses diff --git a/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc b/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc index 9ad9b910..81855968 100644 --- a/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc +++ b/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc @@ -8,7 +8,7 @@ SCRIPT_START script_PlayerAtVillageIntro SetEntitySpeed 0x0080 _0807EDD4 0x0208, 0x0340 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc b/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc index ba131031..5931fc5e 100644 --- a/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc +++ b/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc @@ -6,7 +6,7 @@ SCRIPT_START script_EzloCapExplainingOriginStory EndBlock _0807E930 0x001f Call sub_0806D944 - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 _0807E930 0x0010 MessageFromTargetPos 0x1314, 0x000c WaitUntilTextboxCloses @@ -20,6 +20,6 @@ script_080153C2: Call sub_0806D9A4 DoPostScriptAction 0x0008 Wait 0x0078 - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_MinishEzlo.inc b/data/scripts/cutscene/originStory/script_MinishEzlo.inc index cf2b0806..bd1ee7c1 100644 --- a/data/scripts/cutscene/originStory/script_MinishEzlo.inc +++ b/data/scripts/cutscene/originStory/script_MinishEzlo.inc @@ -7,19 +7,19 @@ SCRIPT_START script_MinishEzlo Call sub_0807F338 EndBlock CallWithArg sub_0806AF60, 0x00000000 - WaitForSomething2 0x00008000 + WaitForSyncFlagAndClear 0x00008000 CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0078, 0x00b8 _0807EB44 0x0000 CallWithArg sub_0806AF60, 0x00000000 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x000d _0807EB44 0x0000 CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0078, 0x00c8 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 _0807EB44 0x0000 CallWithArg sub_0806AF60, 0x00000000 DoPostScriptAction 0x0010 @@ -31,11 +31,11 @@ SCRIPT_START script_MinishEzlo CallWithArg sub_0807FB28, 0x00000003 Wait 0x000a DoPostScriptAction 0x0010 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 _0807E930 0x000d Call sub_0807F2D4 - _0807E5F8 0x00010000 + SetSyncFlag 0x00010000 Wait 0x003c DoPostScriptAction 0x0005 Wait 0x003c diff --git a/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc b/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc index aa254ab2..c505a57d 100644 --- a/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc +++ b/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc @@ -1,27 +1,27 @@ @ Ezlo Cutscene OBJECT_69 Camera Target? SCRIPT_START script_Object69CameraTarget - _0807E5F8 0x00000800 - WaitForSomething2 0x00001000 + SetSyncFlag 0x00000800 + WaitForSyncFlagAndClear 0x00001000 PlaySound SFX_125 CallWithArg sub_0807FB28, 0x00000003 - _0807E5F8 0x00048000 - WaitForSomething2 0x00090000 + SetSyncFlag 0x00048000 + WaitForSyncFlagAndClear 0x00090000 MessageFromTargetPos 0x1311, 0x0002 WaitUntilTextboxCloses - _0807E5F8 0x00008000 - WaitForSomething2 0x00010000 - _0807E5F8 0x00048000 - WaitForSomething2 0x00010000 + SetSyncFlag 0x00008000 + WaitForSyncFlagAndClear 0x00010000 + SetSyncFlag 0x00048000 + WaitForSyncFlagAndClear 0x00010000 CallWithArg DeleteManager36, 0x00000001 _0807F0C8 0x0000, 0x0000 MessageFromTargetPos 0x1312, 0x000c WaitUntilTextboxCloses - _0807E5F8 0x00000800 - WaitForSomething2 0x00001000 + SetSyncFlag 0x00000800 + WaitForSyncFlagAndClear 0x00001000 StopBgm _0807E778 0x0004 DoFade5 - WaitFor_2 + WaitForFadeFinish SetRoomFlag 0x0001 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc b/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc index 667db5fc..2ad51bff 100644 --- a/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc +++ b/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc @@ -8,22 +8,22 @@ SCRIPT_START script_Object69MinishVaati PlayBgm BGM_EZLO_STORY _0807E778 0x0004 DoFade4 - WaitFor_2 + WaitForFadeFinish Wait 0x003c - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000800 - WaitForSomething2 0x00001000 - _0807E5F8 0x00000880 - WaitForSomething2 0x00001100 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000800 + WaitForSyncFlagAndClear 0x00001000 + SetSyncFlag 0x00000880 + WaitForSyncFlagAndClear 0x00001100 _0807F0B4 0x0004 SetEntityPositionRelative 0x0078, 0x0090 MessageFromTargetPos 0x1330, 0x0002 WaitUntilTextboxCloses - _0807E5F8 0x00008000 - WaitForSomething2 0x00010000 - _0807E5F8 0x00000880 - WaitForSomething2 0x00001000 + SetSyncFlag 0x00008000 + WaitForSyncFlagAndClear 0x00010000 + SetSyncFlag 0x00000880 + WaitForSyncFlagAndClear 0x00001000 Wait 0x003c MessageFromTargetPos 0x130d, 0x0002 WaitUntilTextboxCloses diff --git a/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc b/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc index 6ed25d62..b1f37aad 100644 --- a/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc +++ b/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc @@ -14,15 +14,15 @@ script_08014FCC: _0807F0B4 0x0001 CameraTargetEntity StartPlayerScript script_PlayerAtVaatisAppearance - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 MessageFromTargetPos 0x1301, 0x0002 WaitUntilTextboxCloses Call sub_0807F3F8 Wait 0x003c - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 PlayBgm BGM_VAATI_THEME _0807EB28 0x1302 WaitUntilTextboxCloses @@ -32,8 +32,8 @@ script_08014FCC: WaitUntilTextboxCloses MessageFromTargetPos 0x1305, 0x0002 WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 _0807EB28 0x1306 WaitUntilTextboxCloses StopBgm @@ -41,7 +41,7 @@ script_08014FCC: CameraTargetEntity _0807F0B4 0x0003 SetEntityPositionRelative 0x01f8, 0x0148 - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Call sub_0804F6A8 Wait 0x0004 Call sub_0804F808 @@ -64,7 +64,7 @@ script_08014FCC: Call sub_0804F8E0 PlaySound SFX_10B Wait 0x003c - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 PlaySound SFX_1B0 Call sub_0804F79C Wait 0x000a @@ -81,7 +81,7 @@ script_08015104: Call sub_0807DF28 StopBgm StartPlayerScript script_PlayerDefeatedMoblins - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Wait 0x003c Call sub_0804F6A8 Wait 0x0004 @@ -126,7 +126,7 @@ script_08015104: CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 - WaitFor_2 + WaitForFadeFinish Call sub_08053B3C BeginBlock _0807E864 @@ -139,13 +139,13 @@ script_08015104: _0807E80C 0x00000000 EndBlock StartPlayerScript script_PlayerSeenOriginStory - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 LoadRoomEntityList gUnk_080F7CB0 _0807E778 0x0004 _0807E800 0x00000000 - WaitFor_2 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000010 + WaitForFadeFinish + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000010 BeginBlock _0807E8E4_2 _0807EB28 0x1315 diff --git a/data/scripts/cutscene/originStory/script_Object6ADarkMagic.inc b/data/scripts/cutscene/originStory/script_Object6ADarkMagic.inc index 655d8258..8b914690 100644 --- a/data/scripts/cutscene/originStory/script_Object6ADarkMagic.inc +++ b/data/scripts/cutscene/originStory/script_Object6ADarkMagic.inc @@ -11,11 +11,11 @@ SCRIPT_START script_Object6ADarkMagic _0807EDD4 0x0078, 0x00b8 PlaySound SFX_1C6 Call sub_08094B80 - _0807E5F8 0x00020000 + SetSyncFlag 0x00020000 SetEntitySpeed 0x0080 - WaitForSomething2 0x00040000 + WaitForSyncFlagAndClear 0x00040000 _0807EDD4 0x0078, 0x00c8 - _0807E5F8 0x00080000 - WaitForSomething2 0x00040000 + SetSyncFlag 0x00080000 + WaitForSyncFlagAndClear 0x00040000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc b/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc index 56f0f57a..93cafa90 100644 --- a/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc +++ b/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc @@ -5,17 +5,17 @@ SCRIPT_START script_Object6AMinishCap SetEntitySpeed 0x0040 Call sub_08094B80 EndBlock - WaitForSomething2 0x00000080 + WaitForSyncFlagAndClear 0x00000080 CallWithArg CreateManager36, 0x00000003 Call sub_08094B0C _0807EDD4 0x0078, 0x0068 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 _0807EF3C 0xff80, 0x0000 CallWithArg DeleteManager36, 0x00000003 Wait 0x003c - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 _0807E930 0x0001 Call sub_0807F2D4 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc b/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc index 668b0930..39c0de0c 100644 --- a/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc +++ b/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc @@ -7,6 +7,6 @@ SCRIPT_START script_PlayerAtVaatisAppearance _0807EDD4 0x01f8, 0x00b8 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc b/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc index 21b9fb9d..76d0f7dc 100644 --- a/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc +++ b/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc @@ -7,6 +7,6 @@ SCRIPT_START script_PlayerDefeatedMoblins _0807EDD4 0x01f8, 0x0148 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc b/data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc index 15faade4..0445fe14 100644 --- a/data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc +++ b/data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc @@ -6,6 +6,6 @@ SCRIPT_START script_PlayerSeenOriginStory EndBlock _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc b/data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc index a3c96b65..4f30a21d 100644 --- a/data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc +++ b/data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc @@ -9,7 +9,7 @@ SCRIPT_START script_PlayerStoneWallsAppear _0807EB44 0x0006 Wait 0x000a _0807EB44 0x0004 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc b/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc index b9759827..50664ad7 100644 --- a/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc +++ b/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc @@ -7,6 +7,6 @@ SCRIPT_START script_PlayerTryToFollowVaati _0807EDD4 0x01f8, 0x0148 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_Vaati.inc b/data/scripts/cutscene/originStory/script_Vaati.inc index 8cdeb503..fd727120 100644 --- a/data/scripts/cutscene/originStory/script_Vaati.inc +++ b/data/scripts/cutscene/originStory/script_Vaati.inc @@ -7,7 +7,7 @@ SCRIPT_START script_Vaati DoPostScriptAction 0x0017 Call sub_0807F180 EndBlock - WaitForSomething2 0x00000800 + WaitForSyncFlagAndClear 0x00000800 _0807EB44 0x0002 DoPostScriptAction 0x0017 Wait 0x000a @@ -15,33 +15,33 @@ SCRIPT_START script_Vaati DoPostScriptAction 0x0017 _0807EB44 0x0004 DoPostScriptAction 0x001b - _0807E5F8 0x00001000 - WaitForSomething2 0x00000800 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00000800 Wait 0x0078 DoPostScriptAction 0x0004 Wait 0x0014 - _0807E5F8 0x00001000 - WaitForSomething2 0x00000800 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00000800 DoPostScriptAction 0x0018 Call sub_0807F2D4 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00001000 - WaitForSomething2 0x00000800 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00000800 _0807EB44 0x0004 DoPostScriptAction 0x0014 CallWithArg sub_0809545C, script_Object6ADarkMagic PlaySound SFX_1C4 Wait 0x0078 DoPostScriptAction 0x0016 - WaitForSomething2 0x00020000 + WaitForSyncFlagAndClear 0x00020000 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00001000 - WaitForSomething2 0x00000800 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00000800 Call sub_08066CA4 DoPostScriptAction 0x0008 Wait 0x0078 - _0807E5F8 0x00001000 + SetSyncFlag 0x00001000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc b/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc index 0f6a9aef..26990404 100644 --- a/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc +++ b/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc @@ -6,26 +6,26 @@ SCRIPT_START script_VaatiAppearsAgain DoPostScriptAction 0x0000 Call sub_0807F354 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 Call sub_08066C94 Wait 0x00e9 DoPostScriptAction 0x0007 DoPostScriptAction 0x001e - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 Wait 0x0014 _0807EB44 0x0000 DoPostScriptAction 0x001c Call sub_0807F2D4 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 PlaySound SFX_F5 DoPostScriptAction 0x001f SetEntitySpeed 0x0200 DoPostScriptAction 0x000d DoPostScriptAction 0x0000 _0807ECC4 0x0030 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_EzloCapOutro.inc b/data/scripts/cutscene/outro/script_EzloCapOutro.inc index 63226166..a923e5cc 100644 --- a/data/scripts/cutscene/outro/script_EzloCapOutro.inc +++ b/data/scripts/cutscene/outro/script_EzloCapOutro.inc @@ -10,27 +10,27 @@ SCRIPT_START script_EzloCapOutro CallWithArg sub_0807F98C, 0xfff00000 EndBlock _0807E930 0x0023 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 CallWithArg sub_0807F6E8, 0x00000008 DoPostScriptAction 0x0007 PlaySound SFX_SPARKLES - _0807E610 0x00000800 + ClearSyncFlag 0x00000800 CallWithArg sub_080960C4, script_Object6AEzloDismounting Wait 0x003c _0807EDD4 0x0088, 0x0068 Wait 0x0078 - _0807E5F8 0x00000800 + SetSyncFlag 0x00000800 PlaySound SFX_143 _0807EF3C 0x0000, 0x0020 _0807E930 0x001f - _0807E5F8 0x00000200 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000010 Wait 0x0078 DoPostScriptAction 0x0004 Wait 0x003c - _0807E5F8 0x00000200 + SetSyncFlag 0x00000200 Wait 0x0001 DoPostScriptAction 0x0008 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_EzloZeldaMagic.inc b/data/scripts/cutscene/outro/script_EzloZeldaMagic.inc index 8d029aff..e7707cc8 100644 --- a/data/scripts/cutscene/outro/script_EzloZeldaMagic.inc +++ b/data/scripts/cutscene/outro/script_EzloZeldaMagic.inc @@ -5,7 +5,7 @@ SCRIPT_START script_EzloZeldaMagic DoPostScriptAction 0x000b CallWithArg sub_0807F994, 0x0000fff8 EndBlock - WaitForSomething 0x00000020 + WaitForSyncFlag 0x00000020 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/outro/script_GuardStoneOutro1.inc b/data/scripts/cutscene/outro/script_GuardStoneOutro1.inc index 73c218ed..bdfb1c15 100644 --- a/data/scripts/cutscene/outro/script_GuardStoneOutro1.inc +++ b/data/scripts/cutscene/outro/script_GuardStoneOutro1.inc @@ -5,9 +5,9 @@ SCRIPT_START script_GuardStoneOutro1 _0807EB44 0x0004 _0807E930 0x0010 EndBlock - WaitForSomething 0x00000001 + WaitForSyncFlag 0x00000001 _0807E930 0x0002 - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0004 Wait 0x003c script_0800A80C: diff --git a/data/scripts/cutscene/outro/script_GuardStoneOutro2.inc b/data/scripts/cutscene/outro/script_GuardStoneOutro2.inc index f33f9425..59f06757 100644 --- a/data/scripts/cutscene/outro/script_GuardStoneOutro2.inc +++ b/data/scripts/cutscene/outro/script_GuardStoneOutro2.inc @@ -5,9 +5,9 @@ SCRIPT_START script_GuardStoneOutro2 _0807EB44 0x0004 _0807E930 0x0010 EndBlock - WaitForSomething 0x00000001 + WaitForSyncFlag 0x00000001 _0807E930 0x0002 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c script_0800A848: diff --git a/data/scripts/cutscene/outro/script_GuardStoneOutro3.inc b/data/scripts/cutscene/outro/script_GuardStoneOutro3.inc index 66af4c81..f7d9c800 100644 --- a/data/scripts/cutscene/outro/script_GuardStoneOutro3.inc +++ b/data/scripts/cutscene/outro/script_GuardStoneOutro3.inc @@ -5,9 +5,9 @@ SCRIPT_START script_GuardStoneOutro3 _0807EB44 0x0004 _0807E930 0x0010 EndBlock - WaitForSomething 0x00000001 + WaitForSyncFlag 0x00000001 _0807E930 0x0002 - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 DoPostScriptAction 0x0004 Wait 0x003c script_0800A884: diff --git a/data/scripts/cutscene/outro/script_MaidStoneOutro1.inc b/data/scripts/cutscene/outro/script_MaidStoneOutro1.inc index e355a772..46f28809 100644 --- a/data/scripts/cutscene/outro/script_MaidStoneOutro1.inc +++ b/data/scripts/cutscene/outro/script_MaidStoneOutro1.inc @@ -5,9 +5,9 @@ SCRIPT_START script_MaidStoneOutro1 _0807EB44 0x0004 _0807E930 0x0008 EndBlock - WaitForSomething 0x00000001 + WaitForSyncFlag 0x00000001 DoPostScriptAction 0x0000 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0004 Wait 0x003c script_0800A8C0: diff --git a/data/scripts/cutscene/outro/script_MaidStoneOutro2.inc b/data/scripts/cutscene/outro/script_MaidStoneOutro2.inc index f3884c80..f25c8c27 100644 --- a/data/scripts/cutscene/outro/script_MaidStoneOutro2.inc +++ b/data/scripts/cutscene/outro/script_MaidStoneOutro2.inc @@ -5,9 +5,9 @@ SCRIPT_START script_MaidStoneOutro2 _0807EB44 0x0004 _0807E930 0x0008 EndBlock - WaitForSomething 0x00000001 + WaitForSyncFlag 0x00000001 DoPostScriptAction 0x0000 - WaitForSomething2 0x00000020 + WaitForSyncFlagAndClear 0x00000020 DoPostScriptAction 0x0004 Wait 0x003c script_0800A8FC: diff --git a/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc index 4a526a99..83ef8867 100644 --- a/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc +++ b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc @@ -7,7 +7,7 @@ SCRIPT_START script_MinishEzloGoodbye _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0004 Wait 0x001e _0807EB44 0x0002 @@ -15,44 +15,44 @@ SCRIPT_START script_MinishEzloGoodbye Wait 0x0006 _0807EB44 0x0000 CallWithArg sub_0807F3D8, 0x00000000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 _0807EB44 0x0002 CallWithArg sub_0807F3D8, 0x00000000 Wait 0x0014 _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 _0807E930 0x000c Call sub_0807F2D4 Call sub_08094B94 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 _0807E930 0x000f Call sub_0807F2D4 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 CallWithArg sub_080960C4, script_Object6AEzloFinalMagic _0807E930 0x0012 Call sub_0807F2D4 Wait 0x001e - _0807E5F8 0x00000020 + SetSyncFlag 0x00000020 StopBgm Call CreateDust Call sub_0806305C Call sub_080630A4 _0807EF3C 0x0000, 0x0020 Wait 0x001e - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xfff0 Wait 0x003c _0807EEF4 0x0000, 0xfff0 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 _0807EDD4 0x0088, 0x0040 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_MinishEzloOutro.inc b/data/scripts/cutscene/outro/script_MinishEzloOutro.inc index 77e67238..55f29440 100644 --- a/data/scripts/cutscene/outro/script_MinishEzloOutro.inc +++ b/data/scripts/cutscene/outro/script_MinishEzloOutro.inc @@ -7,26 +7,26 @@ SCRIPT_START script_MinishEzloOutro _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 _0807E930 0x000e DoPostScriptAction 0x0007 Call sub_0807F2D4 DoPostScriptAction 0x0004 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000002 _0807E930 0x000c Call sub_0807F2D4 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000002 _0807E930 0x000f Call sub_0807F2D4 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000002 _0807E930 0x000c Call sub_0807F2D4 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000002 CallWithArg sub_080960C4, script_EzloZeldaMagic - _0807E5F8 0x00000040 + SetSyncFlag 0x00000040 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc index 6abb3708..06f842dd 100644 --- a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc +++ b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc @@ -1,37 +1,37 @@ @ Outro NPC4E Minish Portal is closing SCRIPT_START script_Npc4EMinishPortalClosing Call sub_0808D2CC - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 _0807E8E4_0 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000080 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000080 OffsetEntityPosition 0x0000, 0xffe0 Call sub_0807F5C0 Wait 0x003c CallWithArg DeleteManager36, 0x00000001 _0807F0C8 0x0000, 0x0000 Wait 0x003c - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 MessageFromTargetPos 0x165f, 0x000e WaitUntilTextboxCloses StartPlayerScript script_PlayerAtEzlo - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 MessageFromTargetPos 0x1660, 0x000e WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 MessageFromTargetPos 0x1661, 0x000e WaitUntilTextboxCloses - _0807E5F8 0x00000008 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 OffsetEntityPosition 0x0000, 0x0020 Call sub_0807F5C0 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 StartPlayerScript script_PlayerGetGreenCap - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Wait 0x003c MessageFromTargetPos 0x1662, 0x000e WaitUntilTextboxCloses @@ -39,31 +39,31 @@ SCRIPT_START script_Npc4EMinishPortalClosing WaitUntilTextboxCloses OffsetEntityPosition 0x0000, 0xffe0 Call sub_0807F5C0 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 StartPlayerScript script_PlayerSayGoodbye - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Wait 0x003c MessageFromTargetPos 0x1665, 0x000e WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 Wait 0x0078 Call sub_0808D280 Wait 0x0078 _0807E778 0x0004 DoFade5 - WaitFor_2 + WaitForFadeFinish Call sub_0807FB94 @ Roll Credits MoveEntityToPlayer Call sub_0807F844 _0807F0B4 0x0004 CameraTargetPlayer - _0807E5F8 0x80000000 + SetSyncFlag 0x80000000 DoFade4 - WaitFor_2 + WaitForFadeFinish Call sub_0807DF50 _0807E878 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc b/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc index f63a9c53..83c7004d 100644 --- a/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc +++ b/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc @@ -7,13 +7,13 @@ SCRIPT_START script_Npc4EMinishWoods Call sub_0807F844 EndBlock Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Wait 0x001e - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Wait 0x0014 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Wait 0x000a - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Wait 0x003c CallWithArg sub_0806DA1C, 0x0000000d DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc b/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc index 1ae3df45..22d244b2 100644 --- a/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc +++ b/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc @@ -7,13 +7,13 @@ SCRIPT_START script_Npc4EMtCrenel Call sub_0807F844 EndBlock Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Wait 0x000a - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Wait 0x0014 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Wait 0x001e - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Wait 0x003c CallWithArg sub_0806DA1C, 0x0000000e DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/outro/script_Npc4EOutro.inc b/data/scripts/cutscene/outro/script_Npc4EOutro.inc index d05b8ba4..844ac95f 100644 --- a/data/scripts/cutscene/outro/script_Npc4EOutro.inc +++ b/data/scripts/cutscene/outro/script_Npc4EOutro.inc @@ -10,53 +10,53 @@ SCRIPT_START script_Npc4EOutro EndBlock Wait 0x003c StartPlayerScript script_PlayerAtOutro - WaitForSomething2 0x00000001 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000080 + WaitForSyncFlagAndClear 0x00000001 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000080 MessageFromTargetPos 0x1659, 0x0000 WaitUntilTextboxCloses Wait 0x003c - _0807E5F8 0x00000010 - WaitForSomething2 0x00000200 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000200 + SetSyncFlag 0x00000004 _0807E8E4_0 - WaitForSomething2 0x00000080 - _0807E5F8 0x00000010 - WaitForSomething2 0x00000200 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000040 - _0807E5F8 0x00000004 + WaitForSyncFlagAndClear 0x00000080 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000200 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000040 + SetSyncFlag 0x00000004 Call sub_0807F3F8 - WaitForSomething2 0x00000080 + WaitForSyncFlagAndClear 0x00000080 MessageFromTargetPos 0x165a, 0x000e WaitUntilTextboxCloses Wait 0x003c MessageFromTargetPos 0x165b, 0x000e WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000040 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000040 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000100 Wait 0x003c _0807E8E4_3 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000080 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000080 Wait 0x003c - _0807E5F8 0x00000008 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000006 - WaitForSomething2 0x000000c0 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000006 + WaitForSyncFlagAndClear 0x000000c0 MessageFromTargetPos 0x165c, 0x000e WaitUntilTextboxCloses StopBgm MessageFromTargetPos 0x165d, 0x000e WaitUntilTextboxCloses - _0807E5F8 0x00000006 - WaitForSomething2 0x000000c0 - _0807E5F8 0x00000006 - WaitForSomething2 0x00000080 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000006 + WaitForSyncFlagAndClear 0x000000c0 + SetSyncFlag 0x00000006 + WaitForSyncFlagAndClear 0x00000080 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000100 PlayBgm BGM_INTRO_CUTSCENE PlaySound SFX_APPARATE CallWithArg sub_0806DA1C, 0x00000007 diff --git a/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc b/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc index e85a727a..9cbea7ad 100644 --- a/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc +++ b/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc @@ -10,22 +10,22 @@ SCRIPT_START script_Npc4EUnfreezeCastleStaff PlaySound SFX_EVAPORATE _0807E778 0x0004 DoFade7 - WaitFor_2 - _0807E5F8 0x00000001 + WaitForFadeFinish + SetSyncFlag 0x00000001 PlaySound SFX_APPARATE _0807E778 0x0002 DoFade6 - WaitFor_2 + WaitForFadeFinish Wait 0x001e - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Wait 0x0014 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Wait 0x000a - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Wait 0x0005 - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 Wait 0x0002 - _0807E5F8 0x00000020 + SetSyncFlag 0x00000020 Wait 0x0078 CallWithArg sub_0806DA1C, 0x0000000c DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/outro/script_Object6AEzloDismounting.inc b/data/scripts/cutscene/outro/script_Object6AEzloDismounting.inc index 200d28b9..e97a4de3 100644 --- a/data/scripts/cutscene/outro/script_Object6AEzloDismounting.inc +++ b/data/scripts/cutscene/outro/script_Object6AEzloDismounting.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object6AEzloDismounting DoPostScriptAction 0x000b CallWithArg sub_0807F994, 0x0000fff8 EndBlock - WaitForSomething 0x00000800 + WaitForSyncFlag 0x00000800 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/outro/script_Object6AEzloFinalMagic.inc b/data/scripts/cutscene/outro/script_Object6AEzloFinalMagic.inc index 8deeaa16..93468e3d 100644 --- a/data/scripts/cutscene/outro/script_Object6AEzloFinalMagic.inc +++ b/data/scripts/cutscene/outro/script_Object6AEzloFinalMagic.inc @@ -6,7 +6,7 @@ SCRIPT_START script_Object6AEzloFinalMagic CallWithArg sub_0807F994, 0x0000fff8 PlaySound SFX_SPARKLES EndBlock - WaitForSomething 0x00000020 + WaitForSyncFlag 0x00000020 PlaySound SFX_143 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_Object6AMinishCapOutro.inc b/data/scripts/cutscene/outro/script_Object6AMinishCapOutro.inc index c53774ad..3b5704d0 100644 --- a/data/scripts/cutscene/outro/script_Object6AMinishCapOutro.inc +++ b/data/scripts/cutscene/outro/script_Object6AMinishCapOutro.inc @@ -7,25 +7,25 @@ SCRIPT_START script_Object6AMinishCapOutro _0807E930 0x0005 Call sub_0807F348 EndBlock - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 PlaySound SFX_SPARKLES - _0807E610 0x00000800 + ClearSyncFlag 0x00000800 CallWithArg sub_080960C4, script_Object6AEzloDismounting _0807E930 0x0002 Call sub_08094B0C _0807EDD4 0x0068, 0x0088 Call sub_08094B80 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000008 Call sub_08094B3C _0807E930 0x0004 - _0807E5F8 0x00000800 + SetSyncFlag 0x00000800 PlaySound SFX_143 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000008 DoPostScriptAction 0x0008 Call sub_080961B0 PlaySound SFX_FA Wait 0x003c - _0807E5F8 0x00000100 + SetSyncFlag 0x00000100 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_Object6AOctorok1.inc b/data/scripts/cutscene/outro/script_Object6AOctorok1.inc index 357948d8..71af9ff5 100644 --- a/data/scripts/cutscene/outro/script_Object6AOctorok1.inc +++ b/data/scripts/cutscene/outro/script_Object6AOctorok1.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object6AOctorok1 DoPostScriptAction 0x0007 _0807E930 0x0001 EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_Object6AOctorok2.inc b/data/scripts/cutscene/outro/script_Object6AOctorok2.inc index 1d821ef4..1a823f2d 100644 --- a/data/scripts/cutscene/outro/script_Object6AOctorok2.inc +++ b/data/scripts/cutscene/outro/script_Object6AOctorok2.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object6AOctorok2 DoPostScriptAction 0x0007 _0807E930 0x0002 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_Object6AOctorok3.inc b/data/scripts/cutscene/outro/script_Object6AOctorok3.inc index 4a40f72b..9e970232 100644 --- a/data/scripts/cutscene/outro/script_Object6AOctorok3.inc +++ b/data/scripts/cutscene/outro/script_Object6AOctorok3.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object6AOctorok3 DoPostScriptAction 0x0007 _0807E930 0x0000 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_Object6AOctorok4.inc b/data/scripts/cutscene/outro/script_Object6AOctorok4.inc index 1c305c02..ce4e0e15 100644 --- a/data/scripts/cutscene/outro/script_Object6AOctorok4.inc +++ b/data/scripts/cutscene/outro/script_Object6AOctorok4.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object6AOctorok4 DoPostScriptAction 0x0007 _0807E930 0x0003 EndBlock - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_Object6ATektite1.inc b/data/scripts/cutscene/outro/script_Object6ATektite1.inc index 347784db..a8599488 100644 --- a/data/scripts/cutscene/outro/script_Object6ATektite1.inc +++ b/data/scripts/cutscene/outro/script_Object6ATektite1.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object6ATektite1 DoPostScriptAction 0x0007 _0807E930 0x0000 EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_Object6ATektite2.inc b/data/scripts/cutscene/outro/script_Object6ATektite2.inc index e9ef6154..3f666062 100644 --- a/data/scripts/cutscene/outro/script_Object6ATektite2.inc +++ b/data/scripts/cutscene/outro/script_Object6ATektite2.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object6ATektite2 DoPostScriptAction 0x0007 _0807E930 0x0000 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_Object6ATektite3.inc b/data/scripts/cutscene/outro/script_Object6ATektite3.inc index eb0f4191..c088f9cf 100644 --- a/data/scripts/cutscene/outro/script_Object6ATektite3.inc +++ b/data/scripts/cutscene/outro/script_Object6ATektite3.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object6ATektite3 DoPostScriptAction 0x0007 _0807E930 0x0000 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_Object6ATektite4.inc b/data/scripts/cutscene/outro/script_Object6ATektite4.inc index a26b1514..68f9a905 100644 --- a/data/scripts/cutscene/outro/script_Object6ATektite4.inc +++ b/data/scripts/cutscene/outro/script_Object6ATektite4.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object6ATektite4 DoPostScriptAction 0x0007 _0807E930 0x0000 EndBlock - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_Object6ATheLittleHat.inc b/data/scripts/cutscene/outro/script_Object6ATheLittleHat.inc index 06d0d8c7..da1e3fab 100644 --- a/data/scripts/cutscene/outro/script_Object6ATheLittleHat.inc +++ b/data/scripts/cutscene/outro/script_Object6ATheLittleHat.inc @@ -6,11 +6,11 @@ SCRIPT_START script_Object6ATheLittleHat DoPostScriptAction 0x000b _0807E930 0x0000 EndBlock - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 Call sub_08094B80 _0807EF3C 0x0000, 0x0001 - _0807E5F8 0x00000010 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000008 DoPostScriptAction 0x0008 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_Object6AZeldaMagic.inc b/data/scripts/cutscene/outro/script_Object6AZeldaMagic.inc index f7a0d74e..b4456a55 100644 --- a/data/scripts/cutscene/outro/script_Object6AZeldaMagic.inc +++ b/data/scripts/cutscene/outro/script_Object6AZeldaMagic.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object6AZeldaMagic DoPostScriptAction 0x000b CallWithArg sub_0807F994, 0x0000fff8 EndBlock - WaitForSomething 0x00001000 + WaitForSyncFlag 0x00001000 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc b/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc index 9e72802e..c04735bc 100644 --- a/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc +++ b/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc @@ -6,6 +6,6 @@ SCRIPT_START script_PlayerAtEzlo _0807EDD4 0x0088, 0x0080 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC .2byte 0x0000 diff --git a/data/scripts/cutscene/outro/script_PlayerAtOutro.inc b/data/scripts/cutscene/outro/script_PlayerAtOutro.inc index c96f4435..3aef29f7 100644 --- a/data/scripts/cutscene/outro/script_PlayerAtOutro.inc +++ b/data/scripts/cutscene/outro/script_PlayerAtOutro.inc @@ -9,6 +9,6 @@ SCRIPT_START script_PlayerAtOutro Wait 0x000a _0807EB44 0x0006 Wait 0x000a - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC .2byte 0x0000 diff --git a/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc b/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc index 1d626969..9b99fff7 100644 --- a/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc +++ b/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc @@ -7,7 +7,7 @@ SCRIPT_START script_PlayerGetGreenCap EndBlock Call sub_0807F304 Wait 0x005a - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 BeginBlock CallWithArg sub_0807F6F8, 0x00000008 CallWithArg sub_0807F238, 0x000008e4 @@ -21,6 +21,6 @@ SCRIPT_START script_PlayerGetGreenCap Wait 0x0004 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC .2byte 0x0000 diff --git a/data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc b/data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc index 9e6c305d..a209c670 100644 --- a/data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc +++ b/data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc @@ -6,5 +6,5 @@ SCRIPT_START script_PlayerSayGoodbye _0807EC64 0x0020 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/outro/script_ZeldaGoodbye.inc b/data/scripts/cutscene/outro/script_ZeldaGoodbye.inc index 244494f8..470bddb0 100644 --- a/data/scripts/cutscene/outro/script_ZeldaGoodbye.inc +++ b/data/scripts/cutscene/outro/script_ZeldaGoodbye.inc @@ -7,10 +7,10 @@ SCRIPT_START script_ZeldaGoodbye _0807EB44 0x0002 DoPostScriptAction 0x0000 EndBlock - WaitForSomething2 0x00000040 + WaitForSyncFlagAndClear 0x00000040 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000080 - WaitForSomething2 0x80000000 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x80000000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_ZeldaOutro.inc b/data/scripts/cutscene/outro/script_ZeldaOutro.inc index 77e64220..d639a25a 100644 --- a/data/scripts/cutscene/outro/script_ZeldaOutro.inc +++ b/data/scripts/cutscene/outro/script_ZeldaOutro.inc @@ -7,7 +7,7 @@ SCRIPT_START script_ZeldaOutro _0807EB44 0x0002 DoPostScriptAction 0x0000 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 BeginBlock DoPostScriptAction 0x0004 Call sub_0807F3F8 @@ -16,29 +16,29 @@ SCRIPT_START script_ZeldaOutro _0807EC94 0x0010 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000004 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c - _0807E5F8 0x00000080 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000004 _0807EB44 0x0004 DoPostScriptAction 0x0000 PlaySound SFX_SPARKLES CallWithArg sub_080960C4, script_Object6AZeldaMagic - _0807E5F8 0x00000080 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000004 PlaySound SFX_143 - _0807E5F8 0x00001000 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00001000 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000004 Call sub_08066E68 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000004 PlaySound SFX_SPARKLES CallWithArg sub_080960C4, script_EzloZeldaMagic Wait 0x0078 @@ -54,8 +54,8 @@ SCRIPT_START script_ZeldaOutro PlaySound SFX_153 CallWithArg sub_0807FADC, 0x00000001 PlaySound SFX_143 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/reveal/script_08013494.inc b/data/scripts/cutscene/reveal/script_08013494.inc index a383f68b..fb3b1606 100644 --- a/data/scripts/cutscene/reveal/script_08013494.inc +++ b/data/scripts/cutscene/reveal/script_08013494.inc @@ -13,7 +13,7 @@ SCRIPT_START script_08013494 Call sub_08094B80 PlaySound SFX_1CC Call sub_0807F36C - _0807E5F8 0x00000080 + SetSyncFlag 0x00000080 EndBlock DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/reveal/script_FakeKingDaltus.inc b/data/scripts/cutscene/reveal/script_FakeKingDaltus.inc index 5c5a8d48..4f9e3683 100644 --- a/data/scripts/cutscene/reveal/script_FakeKingDaltus.inc +++ b/data/scripts/cutscene/reveal/script_FakeKingDaltus.inc @@ -6,10 +6,10 @@ SCRIPT_START script_FakeKingDaltus DoPostScriptAction 0x000b Call sub_0807F338 EndBlock - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 Call sub_08061F94 Wait 0x000a - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc b/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc index 15048906..9d81e3fb 100644 --- a/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc +++ b/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc @@ -6,17 +6,17 @@ SCRIPT_START script_Object3EPictureBackRoom Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_PlayerAtPicture - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 _0807EB28 0x1601 WaitUntilTextboxCloses StartPlayerScript script_PlayerMoveToPicture - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 _0807E778 0x0004 DoFade5 - WaitFor_2 + WaitForFadeFinish LoadRoomEntityList gUnk_080F5680 StartPlayerScript script_PlayerSanctuaryIntro - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 MoveEntityToPlayer OffsetEntityPosition 0x0000, 0xfff0 Call sub_0807F844 @@ -24,29 +24,29 @@ SCRIPT_START script_Object3EPictureBackRoom Call sub_080536B8 _0807E864 Call sub_0807DF28 - WaitFor_2 + WaitForFadeFinish MessageFromTargetPos 0x1602, 0x000c WaitUntilTextboxCloses - _0807E5F8 0x00000008 - WaitForSomething2 0x00000010 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000040 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000040 PlayBgm BGM_VAATI_THEME StartPlayerScript script_PlayerDistanceFromVaati - WaitForSomething2 0x00000002 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000040 + WaitForSyncFlagAndClear 0x00000002 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000040 StartPlayerScript script_PlayerFaintAgain - _0807E5F8 0x00000020 - WaitForSomething2 0x00000042 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000042 MessageFromTargetPos 0x1603, 0x000c WaitUntilTextboxCloses - _0807E5F8 0x00000020 - WaitForSomething2 0x00000040 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000040 SetFadeMask 0xffff7fff _0807E778 0x0004 DoFade5 - WaitFor_2 + WaitForFadeFinish StopBgm _0807E858 0x0000 Wait 0x003c @@ -57,9 +57,9 @@ SCRIPT_START script_Object3EPictureBackRoom SetFadeMask 0xffffffff _0807E778 0x0004 DoFade4 - WaitFor_2 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + WaitForFadeFinish + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 _0807EB28 0x1605 WaitUntilTextboxCloses SetLocalFlag 0x0078 diff --git a/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc b/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc index 9651271d..69a76452 100644 --- a/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc +++ b/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc @@ -7,6 +7,6 @@ SCRIPT_START script_PlayerAtPicture _0807EDD4 0x0098, 0x0058 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc b/data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc index fa626ffc..ed636572 100644 --- a/data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc +++ b/data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc @@ -8,7 +8,7 @@ SCRIPT_START script_PlayerDistanceFromVaati _0807ECC4 0x0020 DoPostScriptAction 0x0000 DoPostScriptAction 0x000c - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc b/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc index 2a7d728c..91f9285d 100644 --- a/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc +++ b/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc @@ -4,14 +4,14 @@ SCRIPT_START script_PlayerFaintAgain Call sub_0807F2D4 Call sub_0807F1E8 Call sub_0807F2D4 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 PlaySound SFX_PLY_JUMP _0807EB44 0x0004 Call sub_0807F210 _0807EF3C 0x0200, 0x0020 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc b/data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc index 7a621543..76237d60 100644 --- a/data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc +++ b/data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc @@ -6,7 +6,7 @@ SCRIPT_START script_PlayerMoveToPicture DoPostScriptAction 0x0001 _0807EC64 0x0020 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/reveal/script_VaatiSanctuary.inc b/data/scripts/cutscene/reveal/script_VaatiSanctuary.inc index a45f9d55..ca88188c 100644 --- a/data/scripts/cutscene/reveal/script_VaatiSanctuary.inc +++ b/data/scripts/cutscene/reveal/script_VaatiSanctuary.inc @@ -6,30 +6,30 @@ SCRIPT_START script_VaatiSanctuary DoPostScriptAction 0x000b Call sub_0807F338 EndBlock - WaitForSomething2 0x00000020 + WaitForSyncFlagAndClear 0x00000020 SetEntityPositionRelative 0x0098, 0x0048 Call sub_08066C94 Wait 0x00e9 DoPostScriptAction 0x0007 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000020 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000020 Wait 0x003c DoPostScriptAction 0x0014 PlaySound SFX_CHARGING_UP CallWithArg sub_08095420, script_08013494 Wait 0x005a DoPostScriptAction 0x0016 - WaitForSomething2 0x00000080 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000020 + WaitForSyncFlagAndClear 0x00000080 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000020 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000020 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000020 Call sub_08066CA4 DoPostScriptAction 0x0008 Wait 0x0078 - _0807E5F8 0x00000040 + SetSyncFlag 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/takeover/script_GuardTakeover.inc b/data/scripts/cutscene/takeover/script_GuardTakeover.inc index fb77a159..42af6737 100644 --- a/data/scripts/cutscene/takeover/script_GuardTakeover.inc +++ b/data/scripts/cutscene/takeover/script_GuardTakeover.inc @@ -5,15 +5,15 @@ SCRIPT_START script_GuardTakeover _0807EB44 0x0000 _0807E930 0x0000 EndBlock - WaitForSomething 0x00000040 + WaitForSyncFlag 0x00000040 _0807E930 0x0004 _0807EC64 0x00c0 _0807E930 0x0000 Wait 0x003c - _0807E5F8 0x00000080 - WaitForSomething 0x00000200 + SetSyncFlag 0x00000080 + WaitForSyncFlag 0x00000200 DoPostScriptAction 0x0005 - WaitForSomething 0x00000400 + WaitForSyncFlag 0x00000400 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc b/data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc index b9b72d11..f4263027 100644 --- a/data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc +++ b/data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc @@ -4,24 +4,24 @@ SCRIPT_START script_KingDaltusTakeover _0807EB44 0x0004 DoPostScriptAction 0x0000 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x1319 WaitUntilTextboxCloses - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 MessageNoOverlap 0x131a WaitUntilTextboxCloses - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 MessageNoOverlap 0x131d WaitUntilTextboxCloses - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 MessageNoOverlap 0x131e WaitUntilTextboxCloses - _0807E5F8 0x00000008 - WaitForSomething 0x00000400 + SetSyncFlag 0x00000008 + WaitForSyncFlag 0x00000400 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc b/data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc index 850184e6..c3f81281 100644 --- a/data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc +++ b/data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc @@ -4,12 +4,12 @@ SCRIPT_START script_MinisterPothoTakeover _0807EB44 0x0004 DoPostScriptAction 0x0000 EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 MessageNoOverlap 0x131c WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething 0x00000200 + SetSyncFlag 0x00000002 + WaitForSyncFlag 0x00000200 DoPostScriptAction 0x0005 - WaitForSomething 0x00000400 + WaitForSyncFlag 0x00000400 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/takeover/script_Object69Takeover.inc b/data/scripts/cutscene/takeover/script_Object69Takeover.inc index 8dc1eaf9..d8ff3cae 100644 --- a/data/scripts/cutscene/takeover/script_Object69Takeover.inc +++ b/data/scripts/cutscene/takeover/script_Object69Takeover.inc @@ -11,11 +11,11 @@ script_08015BF0: Call sub_0807DF28 Call sub_0807FBC4 StartPlayerScript script_PlayerAtTakeover - WaitForSomething2 0x00000100 + WaitForSyncFlagAndClear 0x00000100 CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 - WaitFor_2 + WaitForFadeFinish StopBgm Call sub_08053BE8 BeginBlock @@ -28,7 +28,7 @@ script_08015BF0: EndBlock _0807E778 0x0004 _0807E800 0x00000000 - WaitFor_2 + WaitForFadeFinish PlayBGM _0807EB28 0x131f WaitUntilTextboxCloses diff --git a/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc b/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc index 61543da9..10feed63 100644 --- a/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc +++ b/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc @@ -7,61 +7,61 @@ SCRIPT_START script_Object69TakeoverCutscene EndBlock _0807E778 0x0004 DoFade4 - WaitFor_2 + WaitForFadeFinish Wait 0x003c _0807F0B4 0x0004 SetEntityPositionRelative 0x0088, 0x00e0 CameraTargetEntity Wait 0x003c PlayBgm BGM_VAATI_THEME - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 _0807F0B4 0x0004 SetEntityPositionRelative 0x0088, 0x0070 CameraTargetEntity Wait 0x003c - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 _0807F0B4 0x0004 SetEntityPositionRelative 0x0088, 0x00e0 CameraTargetEntity Wait 0x003c - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 _0807F0B4 0x0004 SetEntityPositionRelative 0x0088, 0x0070 CameraTargetEntity Wait 0x003c - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 _0807E778 0x0004 DoFade5 - WaitFor_2 - _0807E5F8 0x00000010 + WaitForFadeFinish + SetSyncFlag 0x00000010 LoadRoomEntityList gUnk_080FCE30 StopBgm Wait 0x0078 _0807E778 0x0004 DoFade4 - WaitFor_2 + WaitForFadeFinish PlayBgm BGM_DIGGING_CAVE - _0807E5F8 0x00000040 - WaitForSomething2 0x00000080 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000200 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000080 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000200 Wait 0x003c - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 _0807E778 0x0004 DoFade5 - WaitFor_2 + WaitForFadeFinish StopBgm SetRoomFlag 0x0000 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc index 7e98b2b7..551025aa 100644 --- a/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc +++ b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc @@ -15,6 +15,6 @@ SCRIPT_START script_PlayerAtTakeover Call sub_0807F304 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000100 + SetSyncFlag 0x00000100 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/takeover/script_VaatiTakeover.inc b/data/scripts/cutscene/takeover/script_VaatiTakeover.inc index 6762ddeb..14796d93 100644 --- a/data/scripts/cutscene/takeover/script_VaatiTakeover.inc +++ b/data/scripts/cutscene/takeover/script_VaatiTakeover.inc @@ -6,7 +6,7 @@ SCRIPT_START script_VaatiTakeover DoPostScriptAction 0x0000 DoPostScriptAction 0x001d EndBlock - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 Call sub_08066C94 Wait 0x00e9 DoPostScriptAction 0x0007 @@ -16,26 +16,26 @@ SCRIPT_START script_VaatiTakeover DoPostScriptAction 0x001c Call sub_0807F2D4 DoPostScriptAction 0x0000 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 Call sub_08066CA4 DoPostScriptAction 0x0008 Wait 0x00bc - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 SetEntityPositionRelative 0x0088, 0x0068 Call sub_08066C94 Wait 0x00e8 DoPostScriptAction 0x0007 DoPostScriptAction 0x001e Wait 0x0014 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0014 Wait 0x001e MessageNoOverlap 0x131b WaitUntilTextboxCloses - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/takeover/script_ZeldaStoneTakeover.inc b/data/scripts/cutscene/takeover/script_ZeldaStoneTakeover.inc index beea2b4a..00b1bc9a 100644 --- a/data/scripts/cutscene/takeover/script_ZeldaStoneTakeover.inc +++ b/data/scripts/cutscene/takeover/script_ZeldaStoneTakeover.inc @@ -4,7 +4,7 @@ SCRIPT_START script_ZeldaStoneTakeover DoPostScriptAction 0x000a Call sub_08066E38 EndBlock - WaitForSomething 0x00000400 + WaitForSyncFlag 0x00000400 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 |