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 | |
| parent | 2ccf89a1fb89e01f449e1d4ce734c57943fa093b (diff) | |
Name some script commands
Diffstat (limited to 'data/scripts')
357 files changed, 1517 insertions, 1517 deletions
diff --git a/data/scripts/castorWilds/script_CastorWildsStatueRight.inc b/data/scripts/castorWilds/script_CastorWildsStatueRight.inc index d6d70d72..e5553e6f 100644 --- a/data/scripts/castorWilds/script_CastorWildsStatueRight.inc +++ b/data/scripts/castorWilds/script_CastorWildsStatueRight.inc @@ -22,7 +22,7 @@ script_0800B2E2: Call sub_080676E0 Call sub_08067534 DoPostScriptAction 0x0012 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 script_0800B302: EndBlock SCRIPT_END diff --git a/data/scripts/castorWilds/script_CastorWildsStatueRock.inc b/data/scripts/castorWilds/script_CastorWildsStatueRock.inc index 4c062cae..3cb8cec3 100644 --- a/data/scripts/castorWilds/script_CastorWildsStatueRock.inc +++ b/data/scripts/castorWilds/script_CastorWildsStatueRock.inc @@ -34,14 +34,14 @@ script_0800B348: Call sub_0806757C script_0800B350: EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 PlaySound SFX_ITEM_BOMB_EXPLODE Call sub_080676D8 Call sub_0806757C Call sub_080675D4 Wait 0x0014 BeginBlock - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 CheckKinstoneFused 0x0006 JumpIfNot script_0800B350 CheckKinstoneFused 0x0007 diff --git a/data/scripts/castorWilds/script_GreatFairyRupees.inc b/data/scripts/castorWilds/script_GreatFairyRupees.inc index ee7fcd05..2385d474 100644 --- a/data/scripts/castorWilds/script_GreatFairyRupees.inc +++ b/data/scripts/castorWilds/script_GreatFairyRupees.inc @@ -12,9 +12,9 @@ script_0800B6D4: _0807E864 Call sub_0807F9A4 StartPlayerScript script_PlayerAtGreatFairy - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 SetRoomFlag 0x0000 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 CheckLocalFlag 0x009f JumpIf script_0800B7A2 MessageNoOverlap 0x057b @@ -23,6 +23,6 @@ script_0800B6D4: JumpIf script_0800B6A6 WaitUntilTextboxCloses SetLocalFlag 0x009f - _0807F034 0x0064 + GivePlayerItem 0x0064 Jump script_0800B698 .2byte 0x0000 diff --git a/data/scripts/castorWilds/script_Object69.inc b/data/scripts/castorWilds/script_Object69.inc index 17eed592..0bb907d2 100644 --- a/data/scripts/castorWilds/script_Object69.inc +++ b/data/scripts/castorWilds/script_Object69.inc @@ -1,7 +1,7 @@ @ Castor Wilds OBJECT_69? SCRIPT_START script_Object69 BeginBlock - _0807E5F8 0x00000000 + SetSyncFlag 0x00000000 .ifdef JP CheckLocalFlag 0x001e .else @@ -19,13 +19,13 @@ SCRIPT_START script_Object69 SetEntitySpeed 0x00c0 EndBlock script_0800B216: - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Call sub_0807DF28 MoveEntityToPlayer CameraTargetEntity _0807EDD4 0x0068, 0x0380 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 Call sub_0807DF50 Wait 0x000c CameraTargetPlayer diff --git a/data/scripts/castorWilds/script_Object69DarknutFight.inc b/data/scripts/castorWilds/script_Object69DarknutFight.inc index fd531758..c62e659d 100644 --- a/data/scripts/castorWilds/script_Object69DarknutFight.inc +++ b/data/scripts/castorWilds/script_Object69DarknutFight.inc @@ -8,8 +8,8 @@ SCRIPT_START script_Object69DarknutFight WaitForPlayerAction0x17 StartPlayerScript script_PlayerAtDarknutFight Wait 0x0018 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 SetRoomFlag 0x0000 Wait 0x0010 PlayBgm BGM_FIGHT_THEME diff --git a/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc b/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc index b122fc5b..1c974574 100644 --- a/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc +++ b/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtDarknutFight BeginBlock DoPostScriptAction 0x0000 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x00e0 _0807EDD4 0x0088, 0x0090 ClearLocalFlag 0x0039 @@ -12,6 +12,6 @@ SCRIPT_START script_PlayerAtDarknutFight Wait 0x002c LoadRoomEntityList gUnk_080DA260 Wait 0x001e - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_0807921C SCRIPT_END diff --git a/data/scripts/cloudTops/script_GregalHealthy.inc b/data/scripts/cloudTops/script_GregalHealthy.inc index 1da04bec..646b5d39 100644 --- a/data/scripts/cloudTops/script_GregalHealthy.inc +++ b/data/scripts/cloudTops/script_GregalHealthy.inc @@ -22,7 +22,7 @@ script_08014C56: SetLocalFlag 0x0066 MessageNoOverlap 0x2f0d WaitUntilTextboxCloses - _0807F034 0x000a + GivePlayerItem 0x000a WaitPlayerGetItem Jump script_08014C82 script_08014C7C: diff --git a/data/scripts/cloudTops/script_GregalSick.inc b/data/scripts/cloudTops/script_GregalSick.inc index 10661252..dac29473 100644 --- a/data/scripts/cloudTops/script_GregalSick.inc +++ b/data/scripts/cloudTops/script_GregalSick.inc @@ -25,9 +25,9 @@ script_08014B70: EndBlock _0807E864 Call sub_0807DF28 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 DoPostScriptAction 0x0004 - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 _0807E930 0x0010 Call sub_0806CCF8 Wait 0x0014 @@ -43,8 +43,8 @@ script_08014B70: Wait 0x0014 Call sub_0806CD4C PlaySound SFX_SECRET - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 _0807E878 script_08014BE8: @@ -60,7 +60,7 @@ script_08014BF2: MessageNoOverlap 0x2f07 WaitUntilTextboxCloses SetIntVariable 0x00000064 - _0807F034 0x003f + GivePlayerItem 0x003f WaitPlayerGetItem Jump script_08014C22 script_08014C1C: diff --git a/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc b/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc index 2e3297b3..c2d465d4 100644 --- a/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc +++ b/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc @@ -7,12 +7,12 @@ SCRIPT_START script_Object69GreatWhirlwindRevealed CameraTargetEntity Call sub_0807FBC4 EndBlock - _0807E5F8 0x00000008 - WaitForSomething2 0x00000010 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 - _0807E5F8 0x0000000a - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000010 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + SetSyncFlag 0x0000000a + WaitForSyncFlagAndClear 0x00000004 _0807EEB4 _0807F0B4 0x0004 CameraTargetPlayer diff --git a/data/scripts/cloudTops/script_PlayerAtSiroc.inc b/data/scripts/cloudTops/script_PlayerAtSiroc.inc index a2a5ef87..5dd59161 100644 --- a/data/scripts/cloudTops/script_PlayerAtSiroc.inc +++ b/data/scripts/cloudTops/script_PlayerAtSiroc.inc @@ -6,6 +6,6 @@ SCRIPT_START script_PlayerAtSiroc _0807EDD4 0x0078, 0x0040 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cloudTops/script_Siroc.inc b/data/scripts/cloudTops/script_Siroc.inc index c45610b2..679d1966 100644 --- a/data/scripts/cloudTops/script_Siroc.inc +++ b/data/scripts/cloudTops/script_Siroc.inc @@ -10,7 +10,7 @@ script_08014AD2: _0807E864 _0807EB74 StartPlayerScript script_PlayerAtSiroc - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 _0807EB74 CheckLocalFlag 0x0064 JumpIf script_08014AFE diff --git a/data/scripts/cloudTops/script_WindTribespeople6.inc b/data/scripts/cloudTops/script_WindTribespeople6.inc index dd9332bf..fea83201 100644 --- a/data/scripts/cloudTops/script_WindTribespeople6.inc +++ b/data/scripts/cloudTops/script_WindTribespeople6.inc @@ -3,14 +3,14 @@ SCRIPT_START script_WindTribespeople6 BeginBlock DoPostScriptAction 0x000a EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 _0807EB74 DoPostScriptAction 0x0004 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 MessageNoOverlap 0x2f0a WaitUntilTextboxCloses - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 script_08014AAC: _0807E30C JumpIfNot script_08014AAC diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc index 19d94f87..0561a0fb 100644 --- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc +++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc @@ -7,7 +7,7 @@ SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed1 _0807EB44 0x0004 DoPostScriptAction 0x0000 EndBlock - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 DoPostScriptAction 0x0004 Wait 0x003c PlaySound SFX_123 @@ -15,12 +15,12 @@ SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed1 _0807EDD4 0x01e0, 0x01d8 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 _0807EB44 0x0002 DoPostScriptAction 0x0001 - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 Jump script_0800D80C diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc index 076d46f1..53f64c9b 100644 --- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc +++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc @@ -6,10 +6,10 @@ SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed2 SetEntityPositionRelative 0x0268, 0x01d8 SetEntitySpeed 0x0100 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 _0807EDD4 0x01f0, 0x01d8 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 script_0800D80C: SetEntitySpeed 0x0100 _0807EEF4 0x0000, 0xffe0 @@ -21,7 +21,7 @@ script_0800D82A: CallWithArg sub_0807F8D0, 0xffffe000 Call sub_0807F8BC JumpIf script_0800D82A - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 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 diff --git a/data/scripts/dhc/script_KingDaltusStone.inc b/data/scripts/dhc/script_KingDaltusStone.inc index 21346968..ee83a886 100644 --- a/data/scripts/dhc/script_KingDaltusStone.inc +++ b/data/scripts/dhc/script_KingDaltusStone.inc @@ -42,7 +42,7 @@ script_0800E3C8: MessageNoOverlap 0x240c WaitUntilTextboxCloses Wait 0x000f - _0807F034 0x0053 + GivePlayerItem 0x0053 WaitPlayerGetItem SetLocalFlag 0x0071 _0807E878 diff --git a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc index a604a7b8..7862193e 100644 --- a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc @@ -15,8 +15,8 @@ script_0800DB7C: _0807EB28 0x1648 WaitUntilTextboxCloses Call sub_0804D7EC - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 _0807E878 script_0800DBCA: @@ -29,18 +29,18 @@ script_0800DBCA: Call sub_0807F3F8 Wait 0x003c StartPlayerScript script_PlayerRescuedZelda - WaitForSomething2 0x00000004 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 - _0807E5F8 0x00000001 + WaitForSyncFlagAndClear 0x00000004 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + SetSyncFlag 0x00000001 StartPlayerScript script_PlayerAfterDefeatingV2 - WaitForSomething2 0x00000006 + WaitForSyncFlagAndClear 0x00000006 MessageFromTargetPos 0x1643, 0x0002 WaitUntilTextboxCloses _0807EB28 0x1645 WaitUntilTextboxCloses Call sub_0807F3F8 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 StopBgm Call sub_08094F98 CallWithArg CreateManager36, 0x00000001 diff --git a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc index b1cc0f18..901ce247 100644 --- a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc +++ b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc @@ -3,15 +3,15 @@ SCRIPT_START script_Npc4ECastleCollapsing Wait 0x003c PlayBgm BGM_CASTLE_COLLAPSE StartPlayerScript script_PlayerStonesFall - WaitForSomething2 0x00000006 + WaitForSyncFlagAndClear 0x00000006 _0807EB28 0x1646 WaitUntilTextboxCloses - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 StartPlayerScript script_PlayerCastleCollapsing CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 - WaitFor_2 + WaitForFadeFinish CallWithArg DeleteManager36, 0x00000001 _0807F0C8 0x0000, 0x0000 SetLocalFlag 0x0079 diff --git a/data/scripts/dhc/script_Npc4EV3Defeated.inc b/data/scripts/dhc/script_Npc4EV3Defeated.inc index d1c4dc6f..c2f60ee1 100644 --- a/data/scripts/dhc/script_Npc4EV3Defeated.inc +++ b/data/scripts/dhc/script_Npc4EV3Defeated.inc @@ -20,8 +20,8 @@ script_0800A0FE: _0807E778 0x0002 DoFade6 EndBlock - WaitFor_2 - WaitForSomething2 0x00000004 + WaitForFadeFinish + WaitForSyncFlagAndClear 0x00000004 CallWithArg sub_0806DA1C, 0x00000006 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/dhc/script_Object69CastleEscape.inc b/data/scripts/dhc/script_Object69CastleEscape.inc index 677a4280..ffd72119 100644 --- a/data/scripts/dhc/script_Object69CastleEscape.inc +++ b/data/scripts/dhc/script_Object69CastleEscape.inc @@ -4,8 +4,8 @@ SCRIPT_START script_Object69CastleEscape Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_PlayerCastleEscape - WaitForSomething2 0x00000001 - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000001 + WaitForSyncFlagAndClear 0x00000002 _0807EB28 0x1647 WaitUntilTextboxCloses SetLocalFlag 0x007a diff --git a/data/scripts/dhc/script_Object69V2Defeated.inc b/data/scripts/dhc/script_Object69V2Defeated.inc index 74a59508..9d356a54 100644 --- a/data/scripts/dhc/script_Object69V2Defeated.inc +++ b/data/scripts/dhc/script_Object69V2Defeated.inc @@ -11,9 +11,9 @@ SCRIPT_START script_Object69V2Defeated WaitUntilTextboxCloses SetRoomFlag 0x0000 Wait 0x001e - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 StartPlayerScript script_PlayerV2Defeated - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 _0807E878 DoPostScriptAction 0x0006 diff --git a/data/scripts/dhc/script_Object69VaatiWithZelda.inc b/data/scripts/dhc/script_Object69VaatiWithZelda.inc index 4f71ba77..e66a3b15 100644 --- a/data/scripts/dhc/script_Object69VaatiWithZelda.inc +++ b/data/scripts/dhc/script_Object69VaatiWithZelda.inc @@ -15,11 +15,11 @@ script_0800DA64: SetEntityPositionRelative 0x0078, 0x0080 CameraTargetEntity Call sub_0807F5C0 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 MessageFromTargetPos 0x162d, 0x0002 WaitUntilTextboxCloses - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Wait 0x001e MessageFromTargetPos 0x162e, 0x0002 WaitUntilTextboxCloses diff --git a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc index 6431badd..77dc7aaa 100644 --- a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc +++ b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc @@ -13,8 +13,8 @@ SCRIPT_START script_Object6AV3DefeatedMinishCap _0807EF3C 0xff80, 0x0000 PlaySound SFX_143 _0807E930 0x0004 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Wait 0x003c - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc index 1854ede1..093a1833 100644 --- a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc +++ b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object6AV3DefeatedMinishCap2 DoPostScriptAction 0x000b CallWithArg sub_0807F994, 0x0000fff8 EndBlock - WaitForSomething 0x00000002 + WaitForSyncFlag 0x00000002 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc b/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc index 56ce6d79..8c72e4c3 100644 --- a/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc @@ -8,7 +8,7 @@ SCRIPT_START script_PlayerAfterDefeatingV2 DoPostScriptAction 0x0000 _0807ECC4 0x0010 DoPostScriptAction 0x000c - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_PlayerCastleCollapsing.inc b/data/scripts/dhc/script_PlayerCastleCollapsing.inc index 565fce6f..dff8b0a0 100644 --- a/data/scripts/dhc/script_PlayerCastleCollapsing.inc +++ b/data/scripts/dhc/script_PlayerCastleCollapsing.inc @@ -6,6 +6,6 @@ SCRIPT_START script_PlayerCastleCollapsing _0807EB44 0x0004 DoPostScriptAction 0x0000 _0807EEF4 0x0000, 0x0080 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerCastleEscape.inc b/data/scripts/dhc/script_PlayerCastleEscape.inc index ea20bf30..997799ad 100644 --- a/data/scripts/dhc/script_PlayerCastleEscape.inc +++ b/data/scripts/dhc/script_PlayerCastleEscape.inc @@ -6,6 +6,6 @@ SCRIPT_START script_PlayerCastleEscape _0807EDD4 0x0198, 0x01c8 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerRescuedZelda.inc b/data/scripts/dhc/script_PlayerRescuedZelda.inc index d4412b4b..23a6112c 100644 --- a/data/scripts/dhc/script_PlayerRescuedZelda.inc +++ b/data/scripts/dhc/script_PlayerRescuedZelda.inc @@ -7,7 +7,7 @@ SCRIPT_START script_PlayerRescuedZelda _0807EDD4 0x0078, 0x00a0 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_PlayerStonesFall.inc b/data/scripts/dhc/script_PlayerStonesFall.inc index e1ba8278..5f9e57d1 100644 --- a/data/scripts/dhc/script_PlayerStonesFall.inc +++ b/data/scripts/dhc/script_PlayerStonesFall.inc @@ -5,6 +5,6 @@ SCRIPT_START script_PlayerStonesFall DoPostScriptAction 0x0000 CallWithArg sub_0807F238, 0x000003c5 Call sub_0807F304 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerV2Defeated.inc b/data/scripts/dhc/script_PlayerV2Defeated.inc index 62cbbc18..33f6d785 100644 --- a/data/scripts/dhc/script_PlayerV2Defeated.inc +++ b/data/scripts/dhc/script_PlayerV2Defeated.inc @@ -3,10 +3,10 @@ SCRIPT_START script_PlayerV2Defeated BeginBlock SetEntitySpeed 0x00c0 EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x0001 _0807EDD4 0x00a8, 0x002c - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_VaatiWithZelda.inc b/data/scripts/dhc/script_VaatiWithZelda.inc index 84ff00d4..252052f3 100644 --- a/data/scripts/dhc/script_VaatiWithZelda.inc +++ b/data/scripts/dhc/script_VaatiWithZelda.inc @@ -5,7 +5,7 @@ SCRIPT_START script_VaatiWithZelda _0807EB44 0x0000 DoPostScriptAction 0x0014 EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Wait 0x003c DoPostScriptAction 0x0004 Wait 0x003c @@ -14,8 +14,8 @@ SCRIPT_START script_VaatiWithZelda Call sub_0807F2D4 DoPostScriptAction 0x0000 Wait 0x003c - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 _0807EB44 0x0004 DoPostScriptAction 0x0014 SCRIPT_END diff --git a/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc index 0f35ea99..c52b1a81 100644 --- a/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc @@ -4,9 +4,9 @@ SCRIPT_START script_ZeldaAfterDefeatingV2 DoPostScriptAction 0x000a Call sub_08066E38 EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 CallWithArg sub_0807F8E8, 0x00000000 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 script_0800DCD0: CheckRoomFlag 0x0000 JumpIfNot script_0800DCD0 @@ -14,7 +14,7 @@ script_0800DCD0: Wait 0x003c DoPostScriptAction 0x0010 SetEntityPositionRelative 0x0078, 0x0068 - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 StopBgm Call sub_08066E50 PlaySound SFX_1C9 @@ -36,8 +36,8 @@ script_0800DCD0: _0807EB44 0x0004 DoPostScriptAction 0x0000 Wait 0x003c - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 _0807EEF4 0x0000, 0x0008 _0807EB44 0x0004 @@ -46,8 +46,8 @@ script_0800DCD0: Call sub_08066E80 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x0004 Wait 0x003c _0807EB44 0x0002 @@ -61,8 +61,8 @@ script_0800DCD0: Wait 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 _0807EEF4 0x0000, 0x0080 SCRIPT_END diff --git a/data/scripts/dhc/script_ZeldaCastleEscape.inc b/data/scripts/dhc/script_ZeldaCastleEscape.inc index c6553c8e..83fd2afd 100644 --- a/data/scripts/dhc/script_ZeldaCastleEscape.inc +++ b/data/scripts/dhc/script_ZeldaCastleEscape.inc @@ -15,7 +15,7 @@ SCRIPT_START script_ZeldaCastleEscape _0807EDD4 0x0198, 0x01a8 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08066D4C DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/fow/script_MazaalMacroDefeated.inc b/data/scripts/fow/script_MazaalMacroDefeated.inc index 02a44d56..624a5513 100644 --- a/data/scripts/fow/script_MazaalMacroDefeated.inc +++ b/data/scripts/fow/script_MazaalMacroDefeated.inc @@ -6,7 +6,7 @@ SCRIPT_START script_MazaalMacroDefeated Wait 0x0078 _0807E908 0x0004 StartPlayerScript script_PlayerDefeatedMazaal - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 Wait 0x000c _0807E908 0x0005 SCRIPT_END diff --git a/data/scripts/fow/script_Object89Mazaal.inc b/data/scripts/fow/script_Object89Mazaal.inc index 28c36a5c..b5c522c0 100644 --- a/data/scripts/fow/script_Object89Mazaal.inc +++ b/data/scripts/fow/script_Object89Mazaal.inc @@ -6,7 +6,7 @@ SCRIPT_START script_Object89Mazaal Wait 0x0018 _0807E864 StartPlayerScript script_PlayerAtMazaal - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 _0807E908 0x0002 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/fow/script_PlayerAtMazaal.inc b/data/scripts/fow/script_PlayerAtMazaal.inc index 80b81ae5..75086071 100644 --- a/data/scripts/fow/script_PlayerAtMazaal.inc +++ b/data/scripts/fow/script_PlayerAtMazaal.inc @@ -8,6 +8,6 @@ SCRIPT_START script_PlayerAtMazaal Wait 0x0008 DoPostScriptAction 0x0000 Wait 0x0008 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/fow/script_PlayerDefeatedMazaal.inc b/data/scripts/fow/script_PlayerDefeatedMazaal.inc index 19afd13a..0f6d278a 100644 --- a/data/scripts/fow/script_PlayerDefeatedMazaal.inc +++ b/data/scripts/fow/script_PlayerDefeatedMazaal.inc @@ -14,7 +14,7 @@ SCRIPT_START script_PlayerDefeatedMazaal Wait 0x0015 _0807EB44 0x0004 Wait 0x0008 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 _0807EDD4 0x0088, 0x0158 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/graveyard/script_GraveyardHouseDoor.inc b/data/scripts/graveyard/script_GraveyardHouseDoor.inc index 04e54f7d..631a1c19 100644 --- a/data/scripts/graveyard/script_GraveyardHouseDoor.inc +++ b/data/scripts/graveyard/script_GraveyardHouseDoor.inc @@ -13,7 +13,7 @@ script_080096AC: Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_PlayerAtGraveyardHouseDoor - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 PlaySound SFX_111 DoPostScriptAction 0x0008 LoadRoomEntityList gUnk_080D9048 diff --git a/data/scripts/graveyard/script_GreatFairyArrows.inc b/data/scripts/graveyard/script_GreatFairyArrows.inc index d78252c3..e43be1bd 100644 --- a/data/scripts/graveyard/script_GreatFairyArrows.inc +++ b/data/scripts/graveyard/script_GreatFairyArrows.inc @@ -9,14 +9,14 @@ script_0800B618: _0807E864 Call sub_0807F9A4 StartPlayerScript script_PlayerAtGreatFairy - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 SetRoomFlag 0x0000 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 CheckLocalFlag 0x009e JumpIf script_0800B7A2 MessageNoOverlap 0x0583 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_0800B684 Wait 0x000f MessageNoOverlap 0x0584 @@ -32,7 +32,7 @@ script_0800B684: script_0800B68E: WaitUntilTextboxCloses SetLocalFlag 0x009e - _0807F034 0x0066 + GivePlayerItem 0x0066 script_0800B698: WaitPlayerGetItem _0807EB8C @@ -42,10 +42,10 @@ script_0800B698: script_0800B6A6: _0807E778 0x0004 DoFade7 - WaitFor_2 + WaitForFadeFinish Call sub_080873FC DoFade6 - WaitFor_2 + WaitForFadeFinish CameraTargetPlayer Wait 0x001e Call sub_0807DF50 diff --git a/data/scripts/graveyard/script_KingGustav.inc b/data/scripts/graveyard/script_KingGustav.inc index 14fceb9f..f1b2e0fc 100644 --- a/data/scripts/graveyard/script_KingGustav.inc +++ b/data/scripts/graveyard/script_KingGustav.inc @@ -11,7 +11,7 @@ script_0800D962: Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_PlayerAtKingGustav - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Wait 0x003c _0807EB44 0x0004 DoPostScriptAction 0x0000 @@ -20,13 +20,13 @@ script_0800D962: SetEntity0x20 0xffff8000 MessageNoOverlap 0x1701 WaitUntilTextboxCloses - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 MessageNoOverlap 0x1702 WaitUntilTextboxCloses SetEntity0x20 0x00010000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 _0807F050 0x006d WaitPlayerGetItem _0807EB28 0x1703 diff --git a/data/scripts/graveyard/script_Object69CrowStealingKey.inc b/data/scripts/graveyard/script_Object69CrowStealingKey.inc index d4eeac98..9c0bf816 100644 --- a/data/scripts/graveyard/script_Object69CrowStealingKey.inc +++ b/data/scripts/graveyard/script_Object69CrowStealingKey.inc @@ -9,14 +9,14 @@ SCRIPT_START script_Object69CrowStealingKey Wait 0x000a _0807E8E4_3 Wait 0x0032 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 StartPlayerScript script_PlayerGetKeyStolen - WaitForSomething2 0x00000040 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000010 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000040 + WaitForSyncFlagAndClear 0x00000040 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000040 _0807F078 0x003c, 0x0000 SetGlobalFlag 0x0020 _0807E8E4_3 diff --git a/data/scripts/graveyard/script_Object6AKingsGravestone.inc b/data/scripts/graveyard/script_Object6AKingsGravestone.inc index 57b0a88c..b8a09309 100644 --- a/data/scripts/graveyard/script_Object6AKingsGravestone.inc +++ b/data/scripts/graveyard/script_Object6AKingsGravestone.inc @@ -4,12 +4,12 @@ SCRIPT_START script_Object6AKingsGravestone DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0007 Wait 0x003c - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 _0807EDD4 0x0118, 0x0060 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/graveyard/script_Object97FirstCrow.inc b/data/scripts/graveyard/script_Object97FirstCrow.inc index 40e0dd9a..4c5e2c80 100644 --- a/data/scripts/graveyard/script_Object97FirstCrow.inc +++ b/data/scripts/graveyard/script_Object97FirstCrow.inc @@ -6,7 +6,7 @@ SCRIPT_START script_Object97FirstCrow SetEntitySpeed 0x0300 Call sub_0807F348 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 PlaySound SFX_123 Call sub_0807F1A0 script_08009816: @@ -15,7 +15,7 @@ script_08009816: _0807EE30 JumpIfNot script_08009816 EndBlock - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Call sub_0807FBD4 PlaySound SFX_1F3 DoPostScriptAction 0x0006 diff --git a/data/scripts/graveyard/script_Object97SecondCrow.inc b/data/scripts/graveyard/script_Object97SecondCrow.inc index c3b86b00..131fe158 100644 --- a/data/scripts/graveyard/script_Object97SecondCrow.inc +++ b/data/scripts/graveyard/script_Object97SecondCrow.inc @@ -6,13 +6,13 @@ SCRIPT_START script_Object97SecondCrow SetEntitySpeed 0x0300 Call sub_0807F348 EndBlock - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 Call sub_0809E0A0 Call sub_0809E0D4 PlaySound SFX_1F3 Call sub_0807FBD4 PlaySound SFX_1F3 - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc index 4fbb447d..5d193069 100644 --- a/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc +++ b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc @@ -8,7 +8,7 @@ SCRIPT_START script_PlayerAtGraveyardHouseDoor Wait 0x000a DoPostScriptAction 0x0004 Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 DoPostScriptAction 0x000d SetEntitySpeed 0x0100 _0807ECC4 0x0010 diff --git a/data/scripts/graveyard/script_PlayerAtKingGustav.inc b/data/scripts/graveyard/script_PlayerAtKingGustav.inc index 92ced678..d1214171 100644 --- a/data/scripts/graveyard/script_PlayerAtKingGustav.inc +++ b/data/scripts/graveyard/script_PlayerAtKingGustav.inc @@ -7,6 +7,6 @@ SCRIPT_START script_PlayerAtKingGustav _0807EDD4 0x0118, 0x0060 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/graveyard/script_PlayerGetKeyStolen.inc b/data/scripts/graveyard/script_PlayerGetKeyStolen.inc index 4848e38c..c805299a 100644 --- a/data/scripts/graveyard/script_PlayerGetKeyStolen.inc +++ b/data/scripts/graveyard/script_PlayerGetKeyStolen.inc @@ -8,14 +8,14 @@ SCRIPT_START script_PlayerGetKeyStolen _0807ECF4 0x0004 Call sub_0807F1E8 Wait 0x001e - _0807E5F8 0x00000040 - WaitForSomething2 0x00000020 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000020 PlaySound SFX_PLY_JUMP _0807EB44 0x0004 Call sub_0807F210 _0807EF3C 0x0200, 0x0020 DoPostScriptAction 0x0000 - _0807E5F8 0x00000040 + SetSyncFlag 0x00000040 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc b/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc index 6837ac18..9f2a3cd7 100644 --- a/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc +++ b/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc @@ -6,7 +6,7 @@ SCRIPT_START script_Object69SanctuaryEntrance Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_PlayerAtSanctuaryEntrance - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 _0807EB28 0x132d WaitUntilTextboxCloses .ifdef JP diff --git a/data/scripts/hyruleTown/script_Anju.inc b/data/scripts/hyruleTown/script_Anju.inc index 6603d7fb..827726c2 100644 --- a/data/scripts/hyruleTown/script_Anju.inc +++ b/data/scripts/hyruleTown/script_Anju.inc @@ -14,7 +14,7 @@ script_0801015A: JumpIf script_0801019E MessageFromTargetPos 0x3001, 0x0000 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_080101A6 Call sub_080A1608 WaitUntilTextboxCloses @@ -43,7 +43,7 @@ script_080101AC: StopBgm _0807E778 0x0004 DoFade5 - WaitFor_2 + WaitForFadeFinish CallWithArg sub_0807F75C, 0x03400378 Call sub_080791BC Call sub_0807FB74 @@ -58,7 +58,7 @@ script_080101AC: EndBlock _0807E778 0x0004 DoFade4 - WaitFor_2 + WaitForFadeFinish PlayBGM Call sub_080A13B4 WaitUntilTextboxCloses diff --git a/data/scripts/hyruleTown/script_BedAtSimons.inc b/data/scripts/hyruleTown/script_BedAtSimons.inc index 8a2c4116..3d37f36d 100644 --- a/data/scripts/hyruleTown/script_BedAtSimons.inc +++ b/data/scripts/hyruleTown/script_BedAtSimons.inc @@ -6,7 +6,7 @@ SCRIPT_START script_BedAtSimons SetIntVariable 0x00000000 DoPostScriptAction 0x0001 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 BeginBlock SetIntVariable 0x00000001 DoPostScriptAction 0x0001 diff --git a/data/scripts/hyruleTown/script_Beedle.inc b/data/scripts/hyruleTown/script_Beedle.inc index acbd42c2..38c53a6c 100644 --- a/data/scripts/hyruleTown/script_Beedle.inc +++ b/data/scripts/hyruleTown/script_Beedle.inc @@ -40,11 +40,11 @@ script_08010570: Call sub_080634EC CallWithArg sub_0807F78C, 0x00000000 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_080105E0 CallWithArg sub_0807F7C4, 0x00000000 JumpIfNot script_080105C4 - _0807E48C 0x0020 + CheckBottleContaining 0x0020 JumpIfNot script_080105CC Call sub_08063504 JumpIf script_080105D4 diff --git a/data/scripts/hyruleTown/script_Carlov.inc b/data/scripts/hyruleTown/script_Carlov.inc index 7192157a..ac6a116b 100644 --- a/data/scripts/hyruleTown/script_Carlov.inc +++ b/data/scripts/hyruleTown/script_Carlov.inc @@ -16,7 +16,7 @@ script_08014462: MessageFromTarget 0x4202 MessageFromTarget 0x4203 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_080144F0 DoPostScriptAction 0x0001 Wait 0x008c diff --git a/data/scripts/hyruleTown/script_Carlov2.inc b/data/scripts/hyruleTown/script_Carlov2.inc index f97b9799..89c39d57 100644 --- a/data/scripts/hyruleTown/script_Carlov2.inc +++ b/data/scripts/hyruleTown/script_Carlov2.inc @@ -13,7 +13,7 @@ script_0801463A: .else JumpIf script_080146A0 .endif - TestBit 0x00000004 + CheckSyncFlagAndClear 0x00000004 JumpIf script_0801477A .ifdef EU CheckPlayerInRegion 0x0078, 0x0078, 0x0810 @@ -26,8 +26,8 @@ script_0801463A: script_0801469A: StartPlayerScript script_PlayerAtCarlov Wait 0x0010 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 _0807E878 Jump script_0801463A script_080146E2: @@ -80,8 +80,8 @@ script_08014672: WaitUntilTextboxCloses StartPlayerScript script_PlayerAtCarlov Wait 0x0010 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 _0807E878 Jump script_0801463A script_080146A0: @@ -146,7 +146,7 @@ script_0801472E: ClearRoomFlag 0x0006 Call sub_08088544 script_0801473C: - _0807E3E8 + CheckTextboxResult JumpIfNot script_08014770 WaitUntilTextboxCloses _0807E3BC 0x0001 @@ -183,7 +183,7 @@ script_0801478A: WaitUntilTextboxCloses Call sub_080885B0 WaitPlayerGetItem - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Jump script_080147CE script_080147A4: _0807E930 0x0009 diff --git a/data/scripts/hyruleTown/script_CarlovChest.inc b/data/scripts/hyruleTown/script_CarlovChest.inc index bb1fe576..88a59859 100644 --- a/data/scripts/hyruleTown/script_CarlovChest.inc +++ b/data/scripts/hyruleTown/script_CarlovChest.inc @@ -9,11 +9,11 @@ script_080148F4: Call sub_0806E140 JumpIfNot script_08014932 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_08014938 _0807E864 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 Call sub_0806E1E0 WaitUntilTextboxCloses Wait 0x0018 @@ -23,8 +23,8 @@ script_08014932: WaitUntilTextboxCloses Jump script_08014938 script_08014938: - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 Call sub_0806E1FC Wait 0x001e Call sub_0807DF50 diff --git a/data/scripts/hyruleTown/script_CarlovGame.inc b/data/scripts/hyruleTown/script_CarlovGame.inc index d13a2afa..f22343fa 100644 --- a/data/scripts/hyruleTown/script_CarlovGame.inc +++ b/data/scripts/hyruleTown/script_CarlovGame.inc @@ -13,9 +13,9 @@ SCRIPT_START script_CarlovGame MessageFromTargetPos 0x4215, 0x000c _0807E878 script_0801482E: - TestBit 0x00000001 + CheckSyncFlagAndClear 0x00000001 JumpIf script_08014862 - TestBit 0x00000004 + CheckSyncFlagAndClear 0x00000004 JumpIf script_08014878 _0807E30C JumpIfNot script_0801482E @@ -30,18 +30,18 @@ script_08014862: _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Jump script_0801482E script_08014878: _0807E930 0x0009 Wait 0x003c _0807E930 0x0002 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Jump script_0801482E script_0801488E: - TestBit 0x00000001 + CheckSyncFlagAndClear 0x00000001 JumpIf script_080148C2 - TestBit 0x00000004 + CheckSyncFlagAndClear 0x00000004 JumpIf script_080148D8 _0807E30C JumpIfNot script_0801488E @@ -57,12 +57,12 @@ script_080148C2: _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Jump script_0801488E script_080148D8: _0807E930 0x0009 Wait 0x003c _0807E930 0x0002 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Jump script_0801488E .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Din.inc b/data/scripts/hyruleTown/script_Din.inc index 5e4efe0e..b78e1802 100644 --- a/data/scripts/hyruleTown/script_Din.inc +++ b/data/scripts/hyruleTown/script_Din.inc @@ -38,7 +38,7 @@ script_08011CC2: DoPostScriptAction 0x0000 MessageNoOverlap 0x3105 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIf script_08011D0E _0807E878 _0807EB44 0x0004 diff --git a/data/scripts/hyruleTown/script_Din2.inc b/data/scripts/hyruleTown/script_Din2.inc index b7740421..31c5c728 100644 --- a/data/scripts/hyruleTown/script_Din2.inc +++ b/data/scripts/hyruleTown/script_Din2.inc @@ -27,7 +27,7 @@ script_08011E96: script_08011ECC: MessageNoOverlap 0x3111 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIf script_08011EF4 script_08011ED8: _0807E878 diff --git a/data/scripts/hyruleTown/script_DinMovedIn.inc b/data/scripts/hyruleTown/script_DinMovedIn.inc index e51fe95b..c0ee74ba 100644 --- a/data/scripts/hyruleTown/script_DinMovedIn.inc +++ b/data/scripts/hyruleTown/script_DinMovedIn.inc @@ -19,7 +19,7 @@ script_0801203A: SetLocalFlag 0x0094 Jump script_0801209E script_0801205E: - _0807E48C 0x0031 + CheckBottleContaining 0x0031 JumpIfNot script_08012070 MessageNoOverlap 0x3123 WaitUntilTextboxCloses @@ -27,13 +27,13 @@ script_0801205E: script_08012070: MessageNoOverlap 0x3124 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_0801209E - _0807E48C 0x0020 + CheckBottleContaining 0x0020 JumpIfNot script_0801209A MessageNoOverlap 0x3125 WaitUntilTextboxCloses - _0807F034 0x0031 + GivePlayerItem 0x0031 WaitPlayerGetItem .ifdef USA Call sub_0807FC24 diff --git a/data/scripts/hyruleTown/script_DrLeftDoor.inc b/data/scripts/hyruleTown/script_DrLeftDoor.inc index 138575a6..9e92d307 100644 --- a/data/scripts/hyruleTown/script_DrLeftDoor.inc +++ b/data/scripts/hyruleTown/script_DrLeftDoor.inc @@ -14,7 +14,7 @@ script_0800EF50: MessageFromTarget 0x4d01 WaitUntilTextboxCloses StartPlayerScript script_PlayerAtDrLeftDoor - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Wait 0x000f _0807E878 Jump script_0800EF50 diff --git a/data/scripts/hyruleTown/script_Farore.inc b/data/scripts/hyruleTown/script_Farore.inc index 6ab0b9c9..23de485b 100644 --- a/data/scripts/hyruleTown/script_Farore.inc +++ b/data/scripts/hyruleTown/script_Farore.inc @@ -38,7 +38,7 @@ script_08011E1A: DoPostScriptAction 0x0000 MessageNoOverlap 0x3104 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIf script_08011E66 _0807E878 _0807EB44 0x0004 diff --git a/data/scripts/hyruleTown/script_Farore2.inc b/data/scripts/hyruleTown/script_Farore2.inc index fcb12dfe..7920be1f 100644 --- a/data/scripts/hyruleTown/script_Farore2.inc +++ b/data/scripts/hyruleTown/script_Farore2.inc @@ -27,7 +27,7 @@ script_08011FAE: script_08011FE4: MessageNoOverlap 0x3110 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIf script_0801200C script_08011FF0: _0807E878 diff --git a/data/scripts/hyruleTown/script_FaroreMovedIn.inc b/data/scripts/hyruleTown/script_FaroreMovedIn.inc index 1d3e38a0..474b8dea 100644 --- a/data/scripts/hyruleTown/script_FaroreMovedIn.inc +++ b/data/scripts/hyruleTown/script_FaroreMovedIn.inc @@ -19,7 +19,7 @@ script_08012152: SetLocalFlag 0x0096 Jump script_080121B6 script_08012176: - _0807E48C 0x0030 + CheckBottleContaining 0x0030 JumpIfNot script_08012188 MessageNoOverlap 0x311d WaitUntilTextboxCloses @@ -27,13 +27,13 @@ script_08012176: script_08012188: MessageNoOverlap 0x311e WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_080121B6 - _0807E48C 0x0020 + CheckBottleContaining 0x0020 JumpIfNot script_080121B2 MessageNoOverlap 0x311f WaitUntilTextboxCloses - _0807F034 0x0030 + GivePlayerItem 0x0030 WaitPlayerGetItem .ifdef USA Call sub_0807FC24 diff --git a/data/scripts/hyruleTown/script_FirstHouseDoor.inc b/data/scripts/hyruleTown/script_FirstHouseDoor.inc index b30659fa..56501984 100644 --- a/data/scripts/hyruleTown/script_FirstHouseDoor.inc +++ b/data/scripts/hyruleTown/script_FirstHouseDoor.inc @@ -17,7 +17,7 @@ script_0801091C: WaitUntilTextboxCloses script_08010942: StartPlayerScript script_PlayerAtInnDoor - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Call sub_0807DF50 _0807E878 Jump script_0801091C diff --git a/data/scripts/hyruleTown/script_GoronMerchant.inc b/data/scripts/hyruleTown/script_GoronMerchant.inc index 014193bf..66d1a451 100644 --- a/data/scripts/hyruleTown/script_GoronMerchant.inc +++ b/data/scripts/hyruleTown/script_GoronMerchant.inc @@ -51,7 +51,7 @@ script_08010860: _0807EB74 Call sub_08069660 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_080108B2 Call GoronMerchant_TryToBuyKinstone JumpIfNot script_080108B2 diff --git a/data/scripts/hyruleTown/script_InnDoor.inc b/data/scripts/hyruleTown/script_InnDoor.inc index b88ef151..931ee30e 100644 --- a/data/scripts/hyruleTown/script_InnDoor.inc +++ b/data/scripts/hyruleTown/script_InnDoor.inc @@ -6,7 +6,7 @@ SCRIPT_START script_InnDoor Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_PlayerAtInnDoor - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 CheckRoomFlag 0x0001 JumpIf script_08010900 _0807EB28 0x0b63 diff --git a/data/scripts/hyruleTown/script_Librari.inc b/data/scripts/hyruleTown/script_Librari.inc index 06bae1ad..8aa1476a 100644 --- a/data/scripts/hyruleTown/script_Librari.inc +++ b/data/scripts/hyruleTown/script_Librari.inc @@ -17,7 +17,7 @@ script_0800E974: WaitUntilTextboxCloses DoPostScriptAction 0x000b StartPlayerScript script_PlayerStepOnTrap - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x000a MessageFromTarget 0x4a24 WaitUntilTextboxCloses @@ -27,7 +27,7 @@ script_0800E974: WaitUntilTextboxCloses _0807E930 0x0000 StartPlayerScript script_PlayerActivatedTrapCard - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 SetLocalFlag 0x0074 PlaySound SFX_SECRET Wait 0x00f0 diff --git a/data/scripts/hyruleTown/script_LibrariLater.inc b/data/scripts/hyruleTown/script_LibrariLater.inc index f6d3c71c..cca9ae05 100644 --- a/data/scripts/hyruleTown/script_LibrariLater.inc +++ b/data/scripts/hyruleTown/script_LibrariLater.inc @@ -17,7 +17,7 @@ script_08012440: CheckLocalFlag 0x00b3 JumpIf script_08012474 SetLocalFlag 0x00b3 - _0807F034 0x0062 + GivePlayerItem 0x0062 WaitPlayerGetItem .ifdef USA SetLocalFlag 0x00d0 diff --git a/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc b/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc index f606616c..888e490f 100644 --- a/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc +++ b/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc @@ -29,8 +29,8 @@ script_08008BD2: MessageNoOverlap 0x490c WaitUntilTextboxCloses LoadRoomEntityList gUnk_080D6784 - WaitForSomething 0x00000001 - WaitForSomething 0x00000004 + WaitForSyncFlag 0x00000001 + WaitForSyncFlag 0x00000004 Wait 0x000f PlaySound SFX_SECRET _0807E930 0x0004 diff --git a/data/scripts/hyruleTown/script_MalonHyruleTown.inc b/data/scripts/hyruleTown/script_MalonHyruleTown.inc index 3e73e037..6e1f2b13 100644 --- a/data/scripts/hyruleTown/script_MalonHyruleTown.inc +++ b/data/scripts/hyruleTown/script_MalonHyruleTown.inc @@ -19,14 +19,14 @@ script_08014F4A: CallWithArg sub_0807F854, 0x00010064 EndBlock WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_08014FA6 HasRupees 0x0064 JumpIfNot script_08014F9A - _0807E48C 0x0020 + CheckBottleContaining 0x0020 JumpIfNot script_08014FA2 ModRupees 0xff9c - _0807F034 0x0022 + GivePlayerItem 0x0022 WaitPlayerGetItem MessageNoOverlap 0x3b11 Jump script_08014FA6 diff --git a/data/scripts/hyruleTown/script_Marcy.inc b/data/scripts/hyruleTown/script_Marcy.inc index 5cfcb3a4..f54f82fd 100644 --- a/data/scripts/hyruleTown/script_Marcy.inc +++ b/data/scripts/hyruleTown/script_Marcy.inc @@ -16,7 +16,7 @@ script_08010746: JumpIfNot script_08010786 EndBlock WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_08010786 HasRupees 0x00c8 JumpIf script_08010778 diff --git a/data/scripts/hyruleTown/script_Nayru.inc b/data/scripts/hyruleTown/script_Nayru.inc index 383bb3e1..2815c9c5 100644 --- a/data/scripts/hyruleTown/script_Nayru.inc +++ b/data/scripts/hyruleTown/script_Nayru.inc @@ -38,7 +38,7 @@ script_08011D6E: DoPostScriptAction 0x0000 MessageNoOverlap 0x3103 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIf script_08011DBA _0807E878 _0807EB44 0x0004 diff --git a/data/scripts/hyruleTown/script_Nayru2.inc b/data/scripts/hyruleTown/script_Nayru2.inc index a7ee5772..c4ab770d 100644 --- a/data/scripts/hyruleTown/script_Nayru2.inc +++ b/data/scripts/hyruleTown/script_Nayru2.inc @@ -27,7 +27,7 @@ script_08011F22: script_08011F58: MessageNoOverlap 0x310f WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIf script_08011F80 script_08011F64: _0807E878 diff --git a/data/scripts/hyruleTown/script_NayruMovedIn.inc b/data/scripts/hyruleTown/script_NayruMovedIn.inc index e754a9f5..dbef277e 100644 --- a/data/scripts/hyruleTown/script_NayruMovedIn.inc +++ b/data/scripts/hyruleTown/script_NayruMovedIn.inc @@ -19,7 +19,7 @@ script_080120C6: SetLocalFlag 0x0095 Jump script_0801212A script_080120EA: - _0807E48C 0x002f + CheckBottleContaining 0x002f JumpIfNot script_080120FC MessageNoOverlap 0x3117 WaitUntilTextboxCloses @@ -27,13 +27,13 @@ script_080120EA: script_080120FC: MessageNoOverlap 0x3118 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_0801212A - _0807E48C 0x0020 + CheckBottleContaining 0x0020 JumpIfNot script_08012126 MessageNoOverlap 0x3119 WaitUntilTextboxCloses - _0807F034 0x002f + GivePlayerItem 0x002f WaitPlayerGetItem .ifdef USA Call sub_0807FC24 diff --git a/data/scripts/hyruleTown/script_Object69AllBooksCollected.inc b/data/scripts/hyruleTown/script_Object69AllBooksCollected.inc index d45cec4b..dabc4629 100644 --- a/data/scripts/hyruleTown/script_Object69AllBooksCollected.inc +++ b/data/scripts/hyruleTown/script_Object69AllBooksCollected.inc @@ -6,13 +6,13 @@ SCRIPT_START script_Object69AllBooksCollected CameraTargetEntity EndBlock Wait 0x001e - _0807E5F8 0x00000002 - WaitForSomething 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlag 0x00000001 Wait 0x000f _0807F0B4 0x0004 CameraTargetPlayer Wait 0x001e - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc b/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc index 8601a1a6..00761031 100644 --- a/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc +++ b/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc @@ -4,7 +4,7 @@ SCRIPT_START script_Object69SimonsSimulation _0807E888 EndBlock CallWithArg sub_0806C2A0, 0x00000001 - WaitFor_2 + WaitForFadeFinish Wait 0x003c _0807E878 SetRoomFlag 0x0000 @@ -28,7 +28,7 @@ script_08011C28: WaitPlayerGetItem Wait 0x001e CallWithArg sub_0806C2A0, 0x00000000 - WaitFor_2 + WaitForFadeFinish Wait 0x003c Call sub_0806C280 SCRIPT_END diff --git a/data/scripts/hyruleTown/script_Object6ACarlov2.inc b/data/scripts/hyruleTown/script_Object6ACarlov2.inc index 192e0708..a10f0656 100644 --- a/data/scripts/hyruleTown/script_Object6ACarlov2.inc +++ b/data/scripts/hyruleTown/script_Object6ACarlov2.inc @@ -30,8 +30,8 @@ script_08014632: script_08014642: CheckRoomFlag 0x0009 JumpIf script_08014642 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 Call sub_0807DF50 _0807E878 Jump script_080145F8 @@ -43,8 +43,8 @@ script_08014642: script_08014608: CheckRoomFlag 0x0004 JumpIf script_08014608 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 Call sub_0807DF50 _0807E878 Jump script_080145F8 diff --git a/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc b/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc index f688efa6..ad162bf7 100644 --- a/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc +++ b/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc @@ -12,8 +12,8 @@ script_0801454C: WaitUntilTextboxCloses StartPlayerScript script_PlayerWhenLeavingCarlovAlreadyPaid Wait 0x0010 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 _0807E878 Jump script_0801454C SCRIPT_END diff --git a/data/scripts/hyruleTown/script_Phonograph.inc b/data/scripts/hyruleTown/script_Phonograph.inc index 6bdd817e..b4cae722 100644 --- a/data/scripts/hyruleTown/script_Phonograph.inc +++ b/data/scripts/hyruleTown/script_Phonograph.inc @@ -10,7 +10,7 @@ script_0800BA46: Call sub_0807DF28 MessageFromTarget 0x3301 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_0800BA6C StopBgm Call sub_0806E964 diff --git a/data/scripts/hyruleTown/script_PhonographDoor.inc b/data/scripts/hyruleTown/script_PhonographDoor.inc index 00f9c7b0..f5de6c5e 100644 --- a/data/scripts/hyruleTown/script_PhonographDoor.inc +++ b/data/scripts/hyruleTown/script_PhonographDoor.inc @@ -23,7 +23,7 @@ SCRIPT_START script_PhonographDoor Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_PlayerCannotEnter - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 CheckRoomFlag 0x0001 JumpIf script_080109DE _0807EB28 0x0b64 diff --git a/data/scripts/hyruleTown/script_Pita.inc b/data/scripts/hyruleTown/script_Pita.inc index d03c5f28..eaa60fe9 100644 --- a/data/scripts/hyruleTown/script_Pita.inc +++ b/data/scripts/hyruleTown/script_Pita.inc @@ -21,7 +21,7 @@ script_080106E0: Call sub_08062EB8 CallWithArg sub_0807F78C, 0x00000000 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_08010726 WaitUntilTextboxCloses BuyItem 0x0000, 0x0000 diff --git a/data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc b/data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc index 1ade796e..32ceacb2 100644 --- a/data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc +++ b/data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc @@ -10,7 +10,7 @@ SCRIPT_START script_PlayerActivatedTrapCard DoPostScriptAction 0x0000 DoPostScriptAction 0x0005 Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_PlayerAtCarlov.inc b/data/scripts/hyruleTown/script_PlayerAtCarlov.inc index dc9ef22d..68bd0226 100644 --- a/data/scripts/hyruleTown/script_PlayerAtCarlov.inc +++ b/data/scripts/hyruleTown/script_PlayerAtCarlov.inc @@ -1,11 +1,11 @@ @ Player at Carlov SCRIPT_START script_PlayerAtCarlov EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x00e0 _0807EDD4 0x0078, 0x0068 DoPostScriptAction 0x0000 Wait 0x0010 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_0807921C SCRIPT_END diff --git a/data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc b/data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc index ea4304ac..985483a2 100644 --- a/data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc +++ b/data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc @@ -6,7 +6,7 @@ SCRIPT_START script_PlayerAtDrLeftDoor _0807EB44 0x0004 DoPostScriptAction 0x0001 _0807ECC4 0x0008 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_PlayerAtInnDoor.inc b/data/scripts/hyruleTown/script_PlayerAtInnDoor.inc index 87908590..d74971cd 100644 --- a/data/scripts/hyruleTown/script_PlayerAtInnDoor.inc +++ b/data/scripts/hyruleTown/script_PlayerAtInnDoor.inc @@ -6,7 +6,7 @@ SCRIPT_START script_PlayerAtInnDoor _0807ECC4 0x0010 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_PlayerAtRem.inc b/data/scripts/hyruleTown/script_PlayerAtRem.inc index c39158d6..14ab94ad 100644 --- a/data/scripts/hyruleTown/script_PlayerAtRem.inc +++ b/data/scripts/hyruleTown/script_PlayerAtRem.inc @@ -10,6 +10,6 @@ SCRIPT_START script_PlayerAtRem Wait 0x0008 DoPostScriptAction 0x0004 Wait 0x000f - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_PlayerCannotEnter.inc b/data/scripts/hyruleTown/script_PlayerCannotEnter.inc index 1c1a7c5f..9ae17985 100644 --- a/data/scripts/hyruleTown/script_PlayerCannotEnter.inc +++ b/data/scripts/hyruleTown/script_PlayerCannotEnter.inc @@ -6,7 +6,7 @@ SCRIPT_START script_PlayerCannotEnter _0807EC94 0x0010 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_PlayerSleepingInn.inc b/data/scripts/hyruleTown/script_PlayerSleepingInn.inc index fc76be34..eb09df0a 100644 --- a/data/scripts/hyruleTown/script_PlayerSleepingInn.inc +++ b/data/scripts/hyruleTown/script_PlayerSleepingInn.inc @@ -8,7 +8,7 @@ SCRIPT_START script_PlayerSleepingInn Wait 0x003c _0807E778 0x0004 DoFade4 - WaitFor_2 + WaitForFadeFinish script_08010A78: Call sub_0807F0D8 JumpIfNot script_08010A78 diff --git a/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc b/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc index 3aa0da5a..1666a56b 100644 --- a/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc +++ b/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc @@ -7,6 +7,6 @@ SCRIPT_START script_PlayerStepOnTrap DoPostScriptAction 0x0001 _0807EDD4 0x0078, 0x0080 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/hyruleTown/script_PlayerWakingUpAtSimons.inc b/data/scripts/hyruleTown/script_PlayerWakingUpAtSimons.inc index 45d0c2bd..748c70ef 100644 --- a/data/scripts/hyruleTown/script_PlayerWakingUpAtSimons.inc +++ b/data/scripts/hyruleTown/script_PlayerWakingUpAtSimons.inc @@ -5,10 +5,10 @@ SCRIPT_START script_PlayerWakingUpAtSimons EndBlock Wait 0x003c CallWithArg sub_0806C2A0, 0x00000001 - WaitFor_2 + WaitForFadeFinish Wait 0x003c DoPostScriptAction 0x0014 Wait 0x001e - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc b/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc index 77d229c6..be67e071 100644 --- a/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc +++ b/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc @@ -1,11 +1,11 @@ @ Player at Carlov when trying to leave when already paid SCRIPT_START script_PlayerWhenLeavingCarlovAlreadyPaid EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x00e0 _0807EDD4 0x0078, 0x0078 DoPostScriptAction 0x0000 Wait 0x0010 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_0807921C SCRIPT_END diff --git a/data/scripts/hyruleTown/script_RemFallingAsleep.inc b/data/scripts/hyruleTown/script_RemFallingAsleep.inc index a94b3e56..b685fd1f 100644 --- a/data/scripts/hyruleTown/script_RemFallingAsleep.inc +++ b/data/scripts/hyruleTown/script_RemFallingAsleep.inc @@ -9,7 +9,7 @@ SCRIPT_START script_RemFallingAsleep SetLocalFlag 0x0060 ClearLocalFlag 0x0061 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 _0807E908 0x0004 Call sub_0806A958 CallWithArg sub_0807F93C, 0x0000f2f4 @@ -61,8 +61,8 @@ script_08013006: Wait 0x00f0 MessageNoOverlap 0x4405 WaitUntilTextboxCloses - _0807E5F8 0x00000200 - _0807F034 0x0015 + SetSyncFlag 0x00000200 + GivePlayerItem 0x0015 WaitPlayerGetItem _0807EB8C MessageNoOverlap 0x4406 diff --git a/data/scripts/hyruleTown/script_Simon.inc b/data/scripts/hyruleTown/script_Simon.inc index 4c5531d3..4eb0c09c 100644 --- a/data/scripts/hyruleTown/script_Simon.inc +++ b/data/scripts/hyruleTown/script_Simon.inc @@ -8,7 +8,7 @@ SCRIPT_START script_Simon EndBlock CheckGlobalFlag 0x0050 JumpIfNot script_08011B84 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 _0807EB44 0x0006 DoPostScriptAction 0x0004 Wait 0x003c @@ -26,7 +26,7 @@ script_08011B84: _0807EB74 MessageNoOverlap 0x3d01 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIf script_08011BA4 script_08011B9A: _0807E878 @@ -45,7 +45,7 @@ script_08011BBC: MessageNoOverlap 0x3d06 WaitUntilTextboxCloses CallWithArg sub_0806C2A0, 0x00000000 - WaitFor_2 + WaitForFadeFinish Wait 0x003c Call sub_0806C224 Jump script_08011B9A diff --git a/data/scripts/hyruleTown/script_SimonsDoor.inc b/data/scripts/hyruleTown/script_SimonsDoor.inc index 96601212..af0ab35f 100644 --- a/data/scripts/hyruleTown/script_SimonsDoor.inc +++ b/data/scripts/hyruleTown/script_SimonsDoor.inc @@ -6,7 +6,7 @@ SCRIPT_START script_SimonsDoor Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_PlayerCannotEnter - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 CheckRoomFlag 0x0001 JumpIf script_08010994 _0807EB28 0x0b63 diff --git a/data/scripts/hyruleTown/script_StockwellBuy.inc b/data/scripts/hyruleTown/script_StockwellBuy.inc index ade623f7..66e1b75f 100644 --- a/data/scripts/hyruleTown/script_StockwellBuy.inc +++ b/data/scripts/hyruleTown/script_StockwellBuy.inc @@ -3,7 +3,7 @@ SCRIPT_START script_StockwellBuy EndBlock _0807E864 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_080143AC Wait 0x001e Call sub_08065370 diff --git a/data/scripts/hyruleTown/script_StockwellDogFood.inc b/data/scripts/hyruleTown/script_StockwellDogFood.inc index bbcb3dd7..ea0f8908 100644 --- a/data/scripts/hyruleTown/script_StockwellDogFood.inc +++ b/data/scripts/hyruleTown/script_StockwellDogFood.inc @@ -9,7 +9,7 @@ SCRIPT_START script_StockwellDogFood Wait 0x003c MessageNoOverlap 0x2c16 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIf script_080143FA SetIntVariable 0x00000002 Call sub_08065528 @@ -22,7 +22,7 @@ script_080143FA: Wait 0x000a SetIntVariable 0x00000000 Call sub_08065528 - _0807F034 0x0036 + GivePlayerItem 0x0036 WaitPlayerGetItem MessageNoOverlap 0x2c19 WaitUntilTextboxCloses diff --git a/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc b/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc index e88200b9..a0742182 100644 --- a/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc +++ b/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc @@ -8,7 +8,7 @@ SCRIPT_START script_SturgeonAllBooksCollected SetEntitySpeed 0x0300 PlaySound SFX_STAIRS EndBlock - WaitForSomething 0x00000002 + WaitForSyncFlag 0x00000002 MessageNoOverlap 0x490d WaitUntilTextboxCloses DoPostScriptAction 0x0007 @@ -49,7 +49,7 @@ SCRIPT_START script_SturgeonAllBooksCollected _0807EDD4 0x0068, 0x0018 Call sub_08064D10 PlaySound SFX_STAIRS - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_TownMinish1.inc b/data/scripts/hyruleTown/script_TownMinish1.inc index d8004d43..48a4ba7c 100644 --- a/data/scripts/hyruleTown/script_TownMinish1.inc +++ b/data/scripts/hyruleTown/script_TownMinish1.inc @@ -22,7 +22,7 @@ script_0800E708: Jump script_0800E6F4 script_0800E722: WaitUntilTextboxCloses - _0807F034 0x0057 + GivePlayerItem 0x0057 WaitPlayerGetItem WaitUntilTextboxCloses _0807E878 diff --git a/data/scripts/hyruleTown/script_TownMinish4.inc b/data/scripts/hyruleTown/script_TownMinish4.inc index 6925a769..e28d7805 100644 --- a/data/scripts/hyruleTown/script_TownMinish4.inc +++ b/data/scripts/hyruleTown/script_TownMinish4.inc @@ -8,7 +8,7 @@ script_0800ED98: BeginBlock CheckEntityInteractType JumpIf script_0800EDB6 - TestBit 0x00000001 + CheckSyncFlagAndClear 0x00000001 JumpIf script_0800EE12 Call sub_0806AEE4 Jump script_0800ED98 @@ -19,30 +19,30 @@ script_0800EDB6: CheckLocalFlag 0x00ae JumpIf script_0800EE3E Wait 0x000a - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 MessageFromTarget 0x4c07 WaitUntilTextboxCloses - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 MessageFromTarget 0x4c08 WaitUntilTextboxCloses - _0807E5F8 0x00000020 + SetSyncFlag 0x00000020 MessageFromTarget 0x4c09 WaitUntilTextboxCloses SetIntVariable 0x00000503 Call sub_0807F420 - _0807E5F8 0x00000040 + SetSyncFlag 0x00000040 Call sub_0807DF50 _0807E878 SetLocalFlag 0x00ae Jump script_0800ED98 script_0800EE12: EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 _0807EB44 0x0002 CallWithArg sub_0806AF60, 0x00000008 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 Call sub_0806AED8 - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 Jump script_0800ED98 script_0800EE3E: MessageFromTarget 0x4c16 diff --git a/data/scripts/hyruleTown/script_TownMinish5.inc b/data/scripts/hyruleTown/script_TownMinish5.inc index 5eaf7777..e389bbcc 100644 --- a/data/scripts/hyruleTown/script_TownMinish5.inc +++ b/data/scripts/hyruleTown/script_TownMinish5.inc @@ -8,7 +8,7 @@ script_0800EE58: BeginBlock CheckEntityInteractType JumpIf script_0800EE76 - TestBit 0x00000001 + CheckSyncFlagAndClear 0x00000001 JumpIf script_0800EED2 Call sub_0806AEE4 Jump script_0800EE58 @@ -19,30 +19,30 @@ script_0800EE76: CheckLocalFlag 0x00ae JumpIf script_0800EEFE Wait 0x000a - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 MessageFromTarget 0x4c07 WaitUntilTextboxCloses - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 MessageFromTarget 0x4c08 WaitUntilTextboxCloses - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 MessageFromTarget 0x4c09 WaitUntilTextboxCloses SetIntVariable 0x00000503 Call sub_0807F420 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Call sub_0807DF50 _0807E878 SetLocalFlag 0x00ae Jump script_0800EE58 script_0800EED2: EndBlock - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 _0807EB44 0x0006 CallWithArg sub_0806AF60, 0x00000008 - WaitForSomething2 0x00000020 + WaitForSyncFlagAndClear 0x00000020 Call sub_0806AED8 - WaitForSomething2 0x00000040 + WaitForSyncFlagAndClear 0x00000040 Jump script_0800EE58 script_0800EEFE: MessageFromTarget 0x4c15 @@ -52,13 +52,13 @@ script_0800EEFE: Jump script_0800EE58 MessageFromTarget 0x4c07 WaitUntilTextboxCloses - _0807E5F8 0x00000012 + SetSyncFlag 0x00000012 Wait 0x000a MessageFromTarget 0x4c08 WaitUntilTextboxCloses - _0807E5F8 0x00000024 + SetSyncFlag 0x00000024 MessageFromTarget 0x4c09 WaitUntilTextboxCloses - _0807E5F8 0x00000048 + SetSyncFlag 0x00000048 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_BigGoronKinstone2.inc b/data/scripts/kinstoneFusion/script_BigGoronKinstone2.inc index bcc6ae9a..527e5cd8 100644 --- a/data/scripts/kinstoneFusion/script_BigGoronKinstone2.inc +++ b/data/scripts/kinstoneFusion/script_BigGoronKinstone2.inc @@ -4,7 +4,7 @@ SCRIPT_START script_BigGoronKinstone2 Call sub_0806D660 SetEntitySpeed 0x0080 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 CallWithArg sub_0807F4F8, 0x00000048 Call sub_0806D66C Wait 0x000f diff --git a/data/scripts/kinstoneFusion/script_BigGoronKinstone3.inc b/data/scripts/kinstoneFusion/script_BigGoronKinstone3.inc index a7ed3fdc..cd1f8fca 100644 --- a/data/scripts/kinstoneFusion/script_BigGoronKinstone3.inc +++ b/data/scripts/kinstoneFusion/script_BigGoronKinstone3.inc @@ -4,7 +4,7 @@ SCRIPT_START script_BigGoronKinstone3 Call sub_0806D660 SetEntitySpeed 0x0080 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 CallWithArg sub_0807F4F8, 0x00000048 Call sub_0806D66C Wait 0x000f @@ -12,6 +12,6 @@ SCRIPT_START script_BigGoronKinstone3 Call sub_0806D67C _0807F0C8 0x001e, 0x0000 PlaySound SFX_10B - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc b/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc index 76f39ce4..f4a43257 100644 --- a/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc +++ b/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc @@ -9,6 +9,6 @@ SCRIPT_START script_BigGoronKinstone4 Wait 0x001e MessageNoOverlap 0x1d00 WaitUntilTextboxCloses - _0807E5F8 0x00000006 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000006 + WaitForSyncFlagAndClear 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc index 9d560766..2262d29c 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Goron1Kinstone2 _0807E930 0x0008 Call sub_0807F348 EndBlock - WaitFor_2 + WaitForFadeFinish Wait 0x00f0 _0807E930 0x0000 Wait 0x003c @@ -13,26 +13,26 @@ SCRIPT_START script_Goron1Kinstone2 WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 script_0800BD1C: CheckRoomFlag 0x00ff JumpIfNot script_0800BD1C - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e0c WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x0168 _0807E930 0x0000 Wait 0x003c _0807EB44 0x0002 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xffe0 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc index 21008023..145f5a99 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Goron1Kinstone3 _0807E930 0x0008 Call sub_0807F348 EndBlock - WaitFor_2 + WaitForFadeFinish Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0002 diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc index 66b724a4..0756ea9e 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Goron1Kinstone4 _0807E930 0x0008 Call sub_0807F348 EndBlock - WaitFor_2 + WaitForFadeFinish Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0002 diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc index fd835e10..d1561411 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Goron1Kinstone5 _0807E930 0x0008 Call sub_0807F348 EndBlock - WaitFor_2 + WaitForFadeFinish Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0002 diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc index 7457449d..6d2ee65f 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Goron1Kinstone6 _0807E930 0x0008 Call sub_0807F348 EndBlock - WaitFor_2 + WaitForFadeFinish Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0002 diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc index b438f5dd..5aeac45c 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc @@ -7,18 +7,18 @@ SCRIPT_START script_Goron2Kinstone2 SetEntitySpeed 0x0080 Call sub_0807F348 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000270 Wait 0x001e MessageNoOverlap 0x0e0b WaitUntilTextboxCloses - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 _0807EDD4 0x0088, 0x0228 Wait 0x000f - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00b4 @@ -29,7 +29,7 @@ SCRIPT_START script_Goron2Kinstone2 _0807E930 0x0000 Wait 0x003c _0807EB44 0x0006 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xffe0 Call sub_08054968 diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc index 0906ab67..99a41fc4 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Goron2Kinstone3 _0807E930 0x0008 Call sub_0807F348 EndBlock - WaitFor_2 + WaitForFadeFinish Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0006 @@ -13,20 +13,20 @@ SCRIPT_START script_Goron2Kinstone3 WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 script_0800BE88: _0807EB44 0x0004 script_0800BE8C: CheckRoomFlag 0x00ff JumpIfNot script_0800BE8C - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08054F64 _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e0f WaitUntilTextboxCloses - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f _0807E930 0x0008 diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc index d0e7f176..c8305e1f 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Goron2Kinstone4 _0807E930 0x0008 Call sub_0807F348 EndBlock - WaitFor_2 + WaitForFadeFinish Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0006 @@ -13,20 +13,20 @@ SCRIPT_START script_Goron2Kinstone4 WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 script_0800BFA4: _0807EB44 0x0004 script_0800BFA8: CheckRoomFlag 0x00ff JumpIfNot script_0800BFA8 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08054F64 _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e12 WaitUntilTextboxCloses - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f _0807E930 0x0008 diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc index 9faaee2b..c82afd3a 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Goron2Kinstone5 _0807E930 0x0008 Call sub_0807F348 EndBlock - WaitFor_2 + WaitForFadeFinish Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0006 @@ -13,20 +13,20 @@ SCRIPT_START script_Goron2Kinstone5 WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 script_0800C11C: _0807EB44 0x0004 script_0800C120: CheckRoomFlag 0x00ff JumpIfNot script_0800C120 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08054F64 _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e15 WaitUntilTextboxCloses - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f _0807E930 0x0008 diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc index bcd34839..87a5b960 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Goron2Kinstone6 _0807E930 0x0008 Call sub_0807F348 EndBlock - WaitFor_2 + WaitForFadeFinish Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0006 @@ -13,20 +13,20 @@ SCRIPT_START script_Goron2Kinstone6 WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 script_0800C244: _0807EB44 0x0004 script_0800C248: CheckRoomFlag 0x00ff JumpIfNot script_0800C248 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08054F64 _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e18 WaitUntilTextboxCloses - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f _0807E930 0x0008 diff --git a/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc b/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc index 1616c8fc..fc4e637f 100644 --- a/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc +++ b/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc @@ -7,18 +7,18 @@ SCRIPT_START script_Goron3Kinstone3 SetEntitySpeed 0x0080 Call sub_0807F348 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 Wait 0x001e MessageNoOverlap 0x0e0e WaitUntilTextboxCloses - _0807E5F8 0x0000000c - WaitForSomething2 0x00000002 + SetSyncFlag 0x0000000c + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 _0807EDD4 0x0088, 0x0178 Wait 0x000f - _0807E5F8 0x0000000c + SetSyncFlag 0x0000000c DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00f0 diff --git a/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc index 29de7389..9d81f728 100644 --- a/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc +++ b/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc @@ -7,20 +7,20 @@ SCRIPT_START script_Goron4Kinstone4 SetEntitySpeed 0x0080 Call sub_0807F348 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 Wait 0x001e MessageNoOverlap 0x0e11 WaitUntilTextboxCloses - _0807E5F8 0x0000001c - WaitForSomething2 0x00000002 + SetSyncFlag 0x0000001c + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 _0807EDD4 0x0088, 0x0188 _0807EDD4 0x00a8, 0x0188 _0807EDD4 0x00a8, 0x0178 Wait 0x000f - _0807E5F8 0x0000001c + SetSyncFlag 0x0000001c DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00b4 @@ -30,7 +30,7 @@ SCRIPT_START script_Goron4Kinstone4 _0807EB44 0x0004 _0807E930 0x0000 Wait 0x003c - _0807E5F8 0x0000001c + SetSyncFlag 0x0000001c SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xffe0 Call sub_08054968 diff --git a/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc b/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc index 0b75e7a9..7f86fcd3 100644 --- a/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc +++ b/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc @@ -7,20 +7,20 @@ SCRIPT_START script_Goron5Kinstone5 SetEntitySpeed 0x0080 Call sub_0807F348 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000128 Wait 0x001e MessageNoOverlap 0x0e14 WaitUntilTextboxCloses - _0807E5F8 0x0000003c - WaitForSomething2 0x00000002 + SetSyncFlag 0x0000003c + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 _0807EDD4 0x0098, 0x00e8 _0807EDD4 0x00a8, 0x00e8 _0807EDD4 0x00a8, 0x00d8 Wait 0x000f - _0807E5F8 0x0000003c + SetSyncFlag 0x0000003c DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00f0 diff --git a/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc b/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc index 1fb61b08..54967407 100644 --- a/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc +++ b/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc @@ -7,20 +7,20 @@ SCRIPT_START script_Goron6Kindstone6 SetEntitySpeed 0x0080 Call sub_0807F348 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000128 Wait 0x001e MessageNoOverlap 0x0e17 WaitUntilTextboxCloses - _0807E5F8 0x0000007c - WaitForSomething2 0x00000002 + SetSyncFlag 0x0000007c + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 _0807EDD4 0x0098, 0x00e8 _0807EDD4 0x00c8, 0x00e8 _0807EDD4 0x00c8, 0x00d8 Wait 0x000f - _0807E5F8 0x0000007c + SetSyncFlag 0x0000007c DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00b4 @@ -30,7 +30,7 @@ SCRIPT_START script_Goron6Kindstone6 _0807EB44 0x0004 _0807E930 0x0000 Wait 0x003c - _0807E5F8 0x0000007c + SetSyncFlag 0x0000007c SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xffe0 Call sub_08054968 diff --git a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoron.inc b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoron.inc index 24f5b296..e6bb438f 100644 --- a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoron.inc +++ b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoron.inc @@ -6,7 +6,7 @@ SCRIPT_START script_ObjectB3KinstoneSparkGoron _0807E930 0x0004 DoPostScriptAction 0x0008 EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Wait 0x000a DoPostScriptAction 0x0007 PlaySound SFX_136 diff --git a/data/scripts/lakeHylia/script_KingGustafHologram.inc b/data/scripts/lakeHylia/script_KingGustafHologram.inc index df7f4860..66c576f1 100644 --- a/data/scripts/lakeHylia/script_KingGustafHologram.inc +++ b/data/scripts/lakeHylia/script_KingGustafHologram.inc @@ -15,7 +15,7 @@ script_08012368: DoFade5 _0807E858 0x0080 EndBlock - WaitFor_2 + WaitForFadeFinish PlayBgm BGM_ELEMENTAL_SANCTUARY _0807EB28 0x1401 WaitUntilTextboxCloses @@ -27,7 +27,7 @@ script_08012368: Wait 0x003c _0807E8E4_0 StartPlayerScript script_PlayerAfterToD - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 MessageNoOverlap 0x1402 WaitUntilTextboxCloses StopBgm @@ -39,7 +39,7 @@ script_08012368: DoFade4 _0807E858 0x0080 EndBlock - WaitFor_2 + WaitForFadeFinish PlayBGM _0807EB28 0x1403 WaitUntilTextboxCloses diff --git a/data/scripts/lakeHylia/script_PlayerAfterToD.inc b/data/scripts/lakeHylia/script_PlayerAfterToD.inc index c84c96c6..8ad9a855 100644 --- a/data/scripts/lakeHylia/script_PlayerAfterToD.inc +++ b/data/scripts/lakeHylia/script_PlayerAfterToD.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerAfterToD EndBlock DoPostScriptAction 0x0004 Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/lonLonRanch/script_LonLonRanchDoor.inc b/data/scripts/lonLonRanch/script_LonLonRanchDoor.inc index 06147589..6172c951 100644 --- a/data/scripts/lonLonRanch/script_LonLonRanchDoor.inc +++ b/data/scripts/lonLonRanch/script_LonLonRanchDoor.inc @@ -5,16 +5,16 @@ SCRIPT_START script_LonLonRanchDoor CheckGlobalFlag 0x001d JumpIf script_0800B5BC EndBlock - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0008 PlaySound SFX_111 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0007 PlaySound SFX_111 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0008 PlaySound SFX_111 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0007 PlaySound SFX_111 script_0800B5BC: diff --git a/data/scripts/lonLonRanch/script_MalonLostKey.inc b/data/scripts/lonLonRanch/script_MalonLostKey.inc index c9ca75d0..7298bdca 100644 --- a/data/scripts/lonLonRanch/script_MalonLostKey.inc +++ b/data/scripts/lonLonRanch/script_MalonLostKey.inc @@ -10,7 +10,7 @@ script_0800B4BC: BeginBlock CheckEntityInteractType JumpIf script_0800B4D4 - TestBit 0x00000008 + CheckSyncFlagAndClear 0x00000008 JumpIf script_0800B4F0 Jump script_0800B4BC script_0800B4D4: @@ -25,20 +25,20 @@ script_0800B4D4: Jump script_0800B4BC script_0800B4F0: EndBlock - _0807E610 0x00000008 + ClearSyncFlag 0x00000008 _0807EDD4 0x0134, 0x0288 _0807EB44 0x0004 - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 MessageFromTarget 0x2016 WaitUntilTextboxCloses _0807EDD4 0x0158, 0x0288 DoPostScriptAction 0x0000 _0807EB44 0x0000 Wait 0x000a - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 DoPostScriptAction 0x0008 Wait 0x001e - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 SetGlobalFlag 0x001d Call sub_0807921C _0807E878 diff --git a/data/scripts/lonLonRanch/script_PlayerGiveKey.inc b/data/scripts/lonLonRanch/script_PlayerGiveKey.inc index b1559811..2034cd11 100644 --- a/data/scripts/lonLonRanch/script_PlayerGiveKey.inc +++ b/data/scripts/lonLonRanch/script_PlayerGiveKey.inc @@ -7,6 +7,6 @@ SCRIPT_START script_PlayerGiveKey Wait 0x000a _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 SCRIPT_END diff --git a/data/scripts/lonLonRanch/script_TalonGotKey.inc b/data/scripts/lonLonRanch/script_TalonGotKey.inc index abdcc262..1fb43ad5 100644 --- a/data/scripts/lonLonRanch/script_TalonGotKey.inc +++ b/data/scripts/lonLonRanch/script_TalonGotKey.inc @@ -9,11 +9,11 @@ SCRIPT_START script_TalonGotKey EndBlock Wait 0x000a DoPostScriptAction 0x0004 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 StartPlayerScript script_PlayerGiveKey _0807EDD4 0x0140, 0x0298 _0807EB74 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 _0807EB74 Wait 0x003c PlaySound SFX_TASK_COMPLETE @@ -27,11 +27,11 @@ SCRIPT_START script_TalonGotKey Wait 0x000a _0807EDD4 0x0158, 0x0288 Wait 0x0014 - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 _0807EDD4 0x0158, 0x0280 Wait 0x000a DoPostScriptAction 0x0008 - _0807E5F8 0x00000010 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000010 + SetSyncFlag 0x00000008 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/lonLonRanch/script_TalonInside.inc b/data/scripts/lonLonRanch/script_TalonInside.inc index 81a53026..71485a34 100644 --- a/data/scripts/lonLonRanch/script_TalonInside.inc +++ b/data/scripts/lonLonRanch/script_TalonInside.inc @@ -14,11 +14,11 @@ script_08014E64: _0807EB74 CallWithArg sub_0807F78C, 0x00000022 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_08014EBC CallWithArg sub_0807F7C4, 0x00000022 JumpIfNot script_08014EB0 - _0807E48C 0x0020 + CheckBottleContaining 0x0020 JumpIfNot script_08014EB8 CallWithArg sub_0807F800, 0x00000022 WaitPlayerGetItem diff --git a/data/scripts/minishWoods/script_08012D18.inc b/data/scripts/minishWoods/script_08012D18.inc index 8bffc355..9b8be5cf 100644 --- a/data/scripts/minishWoods/script_08012D18.inc +++ b/data/scripts/minishWoods/script_08012D18.inc @@ -15,7 +15,7 @@ SCRIPT_START script_08012D18 _0807EB28 0x111a WaitUntilTextboxCloses StartPlayerScript script_PlayerCannotEnter - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Call sub_0807DF50 _0807E878 Jump script_08012D18 diff --git a/data/scripts/minishWoods/script_BombMinish.inc b/data/scripts/minishWoods/script_BombMinish.inc index a9c6e55c..7a57205d 100644 --- a/data/scripts/minishWoods/script_BombMinish.inc +++ b/data/scripts/minishWoods/script_BombMinish.inc @@ -20,12 +20,12 @@ script_08009F36: Call sub_0807DF28 DoPostScriptAction 0x000b StartPlayerScript script_PlayerAtBombMinish - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 Call sub_0806014C MessageFromTargetPos 0x1f01, 0x0000 WaitUntilTextboxCloses Wait 0x001e - _0807F034 0x0065 + GivePlayerItem 0x0065 WaitPlayerGetItem DoPostScriptAction 0x000a Call sub_0807DF50 @@ -67,13 +67,13 @@ script_08009FDC: _0807E864 MessageNoOverlap 0x1f0e WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIf script_0800A002 _0807E878 Jump script_08009FDC script_0800A002: Wait 0x0008 - _0807F034 0x0008 + GivePlayerItem 0x0008 Call sub_08060318 WaitPlayerGetItem Wait 0x0008 @@ -94,20 +94,20 @@ script_0800A024: JumpIf script_0800A052 MessageNoOverlap 0x1f14 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIf script_0800A002 _0807E878 Jump script_0800A024 script_0800A052: MessageNoOverlap 0x1f11 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIf script_0800A064 _0807E878 Jump script_0800A024 script_0800A064: Wait 0x0008 - _0807F034 0x0007 + GivePlayerItem 0x0007 Call sub_08060318 WaitPlayerGetItem Wait 0x0008 diff --git a/data/scripts/minishWoods/script_Festari.inc b/data/scripts/minishWoods/script_Festari.inc index 2ce99363..ebaca487 100644 --- a/data/scripts/minishWoods/script_Festari.inc +++ b/data/scripts/minishWoods/script_Festari.inc @@ -20,7 +20,7 @@ script_0800C652: DoPostScriptAction 0x000b script_0800C674: StartPlayerScript script_PlayerAtFestari - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x000a script_0800C684: CheckInventory1 0x0040 diff --git a/data/scripts/minishWoods/script_ForestMinish10.inc b/data/scripts/minishWoods/script_ForestMinish10.inc index d1c1c825..cc7dfc2e 100644 --- a/data/scripts/minishWoods/script_ForestMinish10.inc +++ b/data/scripts/minishWoods/script_ForestMinish10.inc @@ -36,22 +36,22 @@ script_0800CDC4: script_0800CDEC: MessageNoOverlap 0x213e WaitUntilTextboxCloses - _0807E48C 0x0023 + CheckBottleContaining 0x0023 JumpIfNot script_0800CE14 MessageNoOverlap 0x214b WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0023 WaitPlayerGetItem Jump script_0800CE32 script_0800CE14: - _0807E48C 0x0022 + CheckBottleContaining 0x0022 JumpIfNot script_0800CF40 MessageNoOverlap 0x214b WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0022 @@ -76,11 +76,11 @@ script_0800CE46: script_0800CE6E: MessageNoOverlap 0x2142 WaitUntilTextboxCloses - _0807E48C 0x0027 + CheckBottleContaining 0x0027 JumpIfNot script_0800CF40 MessageNoOverlap 0x214c WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0027 @@ -104,11 +104,11 @@ script_0800CEA6: script_0800CECE: MessageNoOverlap 0x2146 WaitUntilTextboxCloses - _0807E48C 0x0024 + CheckBottleContaining 0x0024 JumpIfNot script_0800CF40 MessageNoOverlap 0x214d WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0024 diff --git a/data/scripts/minishWoods/script_Gentari.inc b/data/scripts/minishWoods/script_Gentari.inc index 12570732..4d7c8507 100644 --- a/data/scripts/minishWoods/script_Gentari.inc +++ b/data/scripts/minishWoods/script_Gentari.inc @@ -9,7 +9,7 @@ script_0800C780: _0807E864 Call sub_0807DF28 StartPlayerScript script_PlayerAtGentari - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 CheckInventory1 0x0040 JumpIf script_0800C824 CheckInventory1 0x005b diff --git a/data/scripts/minishWoods/script_Object69PotionBlue.inc b/data/scripts/minishWoods/script_Object69PotionBlue.inc index 324555ce..365530bf 100644 --- a/data/scripts/minishWoods/script_Object69PotionBlue.inc +++ b/data/scripts/minishWoods/script_Object69PotionBlue.inc @@ -9,9 +9,9 @@ script_08016146: _0807E864 GetInventoryValue 0x0025 MessageFromTargetTable 0x2d03, 0x2d02, 0x2d02, 0x2d02 - _0807E3E8 + CheckTextboxResult JumpIfNot script_0801618A - _0807E48C 0x0020 + CheckBottleContaining 0x0020 JumpIf script_08016172 MessageFromTarget 0x2d0c Jump script_0801618A diff --git a/data/scripts/minishWoods/script_Object69PotionRed.inc b/data/scripts/minishWoods/script_Object69PotionRed.inc index edb403c8..6e3ed4a2 100644 --- a/data/scripts/minishWoods/script_Object69PotionRed.inc +++ b/data/scripts/minishWoods/script_Object69PotionRed.inc @@ -9,9 +9,9 @@ script_0801619A: _0807E864 GetInventoryValue 0x0024 MessageFromTargetTable 0x2d05, 0x2d04, 0x2d04, 0x2d04 - _0807E3E8 + CheckTextboxResult JumpIfNot script_080161E2 - _0807E48C 0x0020 + CheckBottleContaining 0x0020 JumpIf script_080161C6 MessageFromTarget 0x2d0c Jump script_080161E2 diff --git a/data/scripts/minishWoods/script_PlayerAtBombMinish.inc b/data/scripts/minishWoods/script_PlayerAtBombMinish.inc index c9508e71..8d5d71c9 100644 --- a/data/scripts/minishWoods/script_PlayerAtBombMinish.inc +++ b/data/scripts/minishWoods/script_PlayerAtBombMinish.inc @@ -8,6 +8,6 @@ SCRIPT_START script_PlayerAtBombMinish _0807EB44 0x0000 Wait 0x000f DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/minishWoods/script_PlayerAtFestari.inc b/data/scripts/minishWoods/script_PlayerAtFestari.inc index 503c9c9a..3f69b969 100644 --- a/data/scripts/minishWoods/script_PlayerAtFestari.inc +++ b/data/scripts/minishWoods/script_PlayerAtFestari.inc @@ -7,6 +7,6 @@ SCRIPT_START script_PlayerAtFestari _0807EB44 0x0000 Wait 0x000f DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/minishWoods/script_PlayerAtGentari.inc b/data/scripts/minishWoods/script_PlayerAtGentari.inc index 343334bd..f53f6f0e 100644 --- a/data/scripts/minishWoods/script_PlayerAtGentari.inc +++ b/data/scripts/minishWoods/script_PlayerAtGentari.inc @@ -8,6 +8,6 @@ SCRIPT_START script_PlayerAtGentari _0807EB44 0x0000 Wait 0x000f DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/minishWoods/script_Syrup.inc b/data/scripts/minishWoods/script_Syrup.inc index 903e18b6..332de656 100644 --- a/data/scripts/minishWoods/script_Syrup.inc +++ b/data/scripts/minishWoods/script_Syrup.inc @@ -8,15 +8,15 @@ script_080160B0: BeginBlock CheckEntityInteractType JumpIf script_080160E0 - TestBit 0x00000008 + CheckSyncFlagAndClear 0x00000008 JumpIf script_080160D2 - TestBit 0x00000010 + CheckSyncFlagAndClear 0x00000010 JumpIf script_080160D2 Jump script_080160B0 script_080160D2: EndBlock _0807EB74 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 Jump script_080160B0 script_080160E0: _0807E864 @@ -26,7 +26,7 @@ script_080160E0: JumpIfNot script_0801611A MessageFromTarget 0x2d07 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_08016132 BuyItem 0x0000, 0x0000 JumpIf script_0801610C diff --git a/data/scripts/mtCrenel/script_GreatFairyBombs.inc b/data/scripts/mtCrenel/script_GreatFairyBombs.inc index 1117dc70..e25eb65f 100644 --- a/data/scripts/mtCrenel/script_GreatFairyBombs.inc +++ b/data/scripts/mtCrenel/script_GreatFairyBombs.inc @@ -10,9 +10,9 @@ script_0800B734: Wait 0x000a Call sub_0807F9A4 StartPlayerScript script_PlayerAtGreatFairy - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 SetRoomFlag 0x0000 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 CheckLocalFlag 0x00a0 JumpIf script_0800B7A2 MessageNoOverlap 0x0580 @@ -25,17 +25,17 @@ script_0800B734: script_0800B794: WaitUntilTextboxCloses SetLocalFlag 0x00a0 - _0807F034 0x0065 + GivePlayerItem 0x0065 Jump script_0800B698 script_0800B7A2: MessageNoOverlap 0x0590 WaitUntilTextboxCloses _0807E778 0x0010 DoFade7 - WaitFor_2 + WaitForFadeFinish ModHealth 0x00a0 DoFade6 - WaitFor_2 + WaitForFadeFinish MessageNoOverlap 0x057f WaitUntilTextboxCloses Jump script_0800B6A6 diff --git a/data/scripts/mtCrenel/script_Melari.inc b/data/scripts/mtCrenel/script_Melari.inc index 082a77c2..ccf1c55a 100644 --- a/data/scripts/mtCrenel/script_Melari.inc +++ b/data/scripts/mtCrenel/script_Melari.inc @@ -16,12 +16,12 @@ script_0800CFD2: JumpIf script_0800CFFA CheckInventory1 0x0041 JumpIfNot script_0800CFEC - _0807E5F8 0x00000020 + SetSyncFlag 0x00000020 Jump script_0800CFFA script_0800CFEC: CheckLocalFlag 0x007e JumpIfNot script_0800CFFA - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 script_0800CFFA: EndBlock BeginBlock @@ -42,21 +42,21 @@ script_0800D032: CheckInventory1 0x0041 JumpIfNot script_0800D098 StartPlayerScript script_PlayerAtMelari - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 MessageFromTargetPos 0x125c, 0x0002 WaitUntilTextboxCloses StartPlayerScript script_PlayerPlaceBrokenSword - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 _0807EB44 0x0002 SetIntVariable 0x00000000 Call sub_0806C028 Wait 0x000f - _0807E5F8 0x00000020 + SetSyncFlag 0x00000020 StartPlayerScript script_PlayerGetWhiteSword - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 MessageFromTargetPos 0x125d, 0x0002 Jump script_0800D17C script_0800D098: @@ -66,18 +66,18 @@ script_0800D098: Jump script_0800D17C script_0800D0A8: StartPlayerScript script_PlayerAtMelari - WaitForSomething2 0x00000008 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000004 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000004 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000004 _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 MessageFromTargetPos 0x123d, 0x0002 WaitUntilTextboxCloses StartPlayerScript script_PlayerPlaceBrokenSword - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 _0807EB44 0x0002 SetIntVariable 0x00000000 Call sub_0806C028 @@ -87,23 +87,23 @@ script_0800D108: ComparePlayerAction 0x0008 JumpIf script_0800D108 PlaySound SFX_F8 - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 SetLocalFlag 0x007e MessageFromTargetPos 0x123e, 0x0002 WaitUntilTextboxCloses Wait 0x000f _0807E930 0x0009 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 Wait 0x001e MessageFromTargetPos 0x123f, 0x0002 WaitUntilTextboxCloses - _0807E5F8 0x00000001 - WaitForSomething2 0x00000004 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000004 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000004 _0807E930 0x0008 Wait 0x003c Call sub_08095164 diff --git a/data/scripts/mtCrenel/script_MountainMinish3.inc b/data/scripts/mtCrenel/script_MountainMinish3.inc index 9320c9e1..2fe3f475 100644 --- a/data/scripts/mtCrenel/script_MountainMinish3.inc +++ b/data/scripts/mtCrenel/script_MountainMinish3.inc @@ -11,7 +11,7 @@ script_0800D282: JumpIf script_0800D2EA script_0800D292: BeginBlock - TestBit 0x00000001 + CheckSyncFlagAndClear 0x00000001 JumpIf script_0800D2C6 CheckEntityInteractType JumpIf script_0800D2B0 @@ -28,12 +28,12 @@ script_0800D2B0: Jump script_0800D282 script_0800D2C6: EndBlock - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 + SetSyncFlag 0x00000004 _0807E930 0x000c - WaitForSomething2 0x00000001 - _0807E5F8 0x00000004 + WaitForSyncFlagAndClear 0x00000001 + SetSyncFlag 0x00000004 script_0800D2EA: _0807E930 0x000b script_0800D2EE: diff --git a/data/scripts/mtCrenel/script_MountainMinish4.inc b/data/scripts/mtCrenel/script_MountainMinish4.inc index a3555d08..a953ebfa 100644 --- a/data/scripts/mtCrenel/script_MountainMinish4.inc +++ b/data/scripts/mtCrenel/script_MountainMinish4.inc @@ -26,7 +26,7 @@ script_0800D372: CheckPlayerInRegion 0x0090, 0x0130, 0x0810 JumpIfNot script_0800D3B2 StartPlayerScript script_PlayerAtMountainMinishExit - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 script_0800D3B2: _0807EB44 0x0002 _0807E930 0x0005 diff --git a/data/scripts/mtCrenel/script_Object6ABrokenSword.inc b/data/scripts/mtCrenel/script_Object6ABrokenSword.inc index 33f2b78f..d586f992 100644 --- a/data/scripts/mtCrenel/script_Object6ABrokenSword.inc +++ b/data/scripts/mtCrenel/script_Object6ABrokenSword.inc @@ -7,9 +7,9 @@ SCRIPT_START script_Object6ABrokenSword JumpIf script_0800D242 DoPostScriptAction 0x0008 EndBlock - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0007 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 SCRIPT_END script_0800D242: DoPostScriptAction 0x0007 diff --git a/data/scripts/mtCrenel/script_Object6ARepairedSword.inc b/data/scripts/mtCrenel/script_Object6ARepairedSword.inc index 4c92069f..d857059e 100644 --- a/data/scripts/mtCrenel/script_Object6ARepairedSword.inc +++ b/data/scripts/mtCrenel/script_Object6ARepairedSword.inc @@ -3,9 +3,9 @@ SCRIPT_START script_Object6ARepairedSword BeginBlock DoPostScriptAction 0x0008 EndBlock - WaitForSomething2 0x00000020 + WaitForSyncFlagAndClear 0x00000020 DoPostScriptAction 0x0007 - WaitForSomething2 0x00000020 + WaitForSyncFlagAndClear 0x00000020 DoPostScriptAction 0x0008 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/mtCrenel/script_PlayerAtMelari.inc b/data/scripts/mtCrenel/script_PlayerAtMelari.inc index 9e2afbbe..409ed3cc 100644 --- a/data/scripts/mtCrenel/script_PlayerAtMelari.inc +++ b/data/scripts/mtCrenel/script_PlayerAtMelari.inc @@ -6,6 +6,6 @@ SCRIPT_START script_PlayerAtMelari _0807EDD4 0x0170, 0x0140 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc b/data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc index 31c59aff..0934f626 100644 --- a/data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc +++ b/data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc @@ -7,7 +7,7 @@ SCRIPT_START script_PlayerAtMountainMinishExit DoPostScriptAction 0x0000 DoPostScriptAction 0x000d _0807ECC4 0x0020 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc b/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc index 08b4550e..d9138b1b 100644 --- a/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc +++ b/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc @@ -7,6 +7,6 @@ SCRIPT_START script_PlayerGetWhiteSword Call sub_0807F304 MessageNoOverlap 0x0502 WaitUntilTextboxCloses - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc b/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc index f9a0b91c..0cda5bcd 100644 --- a/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc +++ b/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc @@ -7,7 +7,7 @@ SCRIPT_START script_PlayerPlaceBrokenSword _0807EDD4 0x01a8, 0x0120 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/npc/script_08012C48.inc b/data/scripts/npc/script_08012C48.inc index 2eb2b3d3..18d2a03d 100644 --- a/data/scripts/npc/script_08012C48.inc +++ b/data/scripts/npc/script_08012C48.inc @@ -5,7 +5,7 @@ SCRIPT_START script_08012C48 SetEntitySpeed 0x0280 EndBlock _0807EDD4 0x0388, 0x0168 - _0807E5F8 0x00000100 + SetSyncFlag 0x00000100 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/npc/script_BladeBrothers.inc b/data/scripts/npc/script_BladeBrothers.inc index 3192f64e..8fec6673 100644 --- a/data/scripts/npc/script_BladeBrothers.inc +++ b/data/scripts/npc/script_BladeBrothers.inc @@ -22,10 +22,10 @@ script_08016204: WaitUntilTextboxCloses Call sub_08068DD0 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_08016346 StartPlayerScript script_PlayerAtBladeBrothers - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 _0807EB74 Call sub_08068C8C JumpIf script_08016262 diff --git a/data/scripts/npc/script_ForestMinish18.inc b/data/scripts/npc/script_ForestMinish18.inc index 5e70440e..4198e7da 100644 --- a/data/scripts/npc/script_ForestMinish18.inc +++ b/data/scripts/npc/script_ForestMinish18.inc @@ -3,12 +3,12 @@ SCRIPT_START script_ForestMinish18 SetEntitySpeed 0x0100 script_08016700: _0807EC94 0x0030 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Wait 0x000f DoPostScriptAction 0x0000 _0807EB44 0x0004 - WaitForSomething 0x00000001 - _0807E610 0x00000001 + WaitForSyncFlag 0x00000001 + ClearSyncFlag 0x00000001 DoPostScriptAction 0x0003 Wait 0x0002 _0807EB44 0x0006 @@ -18,14 +18,14 @@ script_08016700: _0807EB44 0x0002 Wait 0x0002 _0807EB44 0x0004 - WaitForSomething 0x00000001 - _0807E610 0x00000001 + WaitForSyncFlag 0x00000001 + ClearSyncFlag 0x00000001 _0807ECF4 0x0030 Wait 0x000f DoPostScriptAction 0x0000 _0807EB44 0x0004 Wait 0x001e - _0807E5F8 0x00000006 + SetSyncFlag 0x00000006 DoPostScriptAction 0x0003 Wait 0x0002 _0807EB44 0x0006 diff --git a/data/scripts/npc/script_ForestMinish19.inc b/data/scripts/npc/script_ForestMinish19.inc index ddf9962f..1e5e8056 100644 --- a/data/scripts/npc/script_ForestMinish19.inc +++ b/data/scripts/npc/script_ForestMinish19.inc @@ -2,15 +2,15 @@ SCRIPT_START script_ForestMinish19 SetEntitySpeed 0x0100 script_0801679C: - WaitForSomething 0x00000002 - _0807E610 0x00000002 + WaitForSyncFlag 0x00000002 + ClearSyncFlag 0x00000002 _0807EC94 0x0030 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Wait 0x000f DoPostScriptAction 0x0000 _0807EB44 0x0004 - WaitForSomething 0x00000002 - _0807E610 0x00000002 + WaitForSyncFlag 0x00000002 + ClearSyncFlag 0x00000002 DoPostScriptAction 0x0003 Wait 0x0002 _0807EB44 0x0006 @@ -20,15 +20,15 @@ script_0801679C: _0807EB44 0x0002 Wait 0x0002 _0807EB44 0x0004 - WaitForSomething 0x00000002 - _0807E610 0x00000002 + WaitForSyncFlag 0x00000002 + ClearSyncFlag 0x00000002 _0807ECF4 0x0030 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Wait 0x000f DoPostScriptAction 0x0000 _0807EB44 0x0004 - WaitForSomething 0x00000002 - _0807E610 0x00000002 + WaitForSyncFlag 0x00000002 + ClearSyncFlag 0x00000002 DoPostScriptAction 0x0003 Wait 0x0002 _0807EB44 0x0006 diff --git a/data/scripts/npc/script_ForestMinish20.inc b/data/scripts/npc/script_ForestMinish20.inc index 96cb2c4b..e9aa1833 100644 --- a/data/scripts/npc/script_ForestMinish20.inc +++ b/data/scripts/npc/script_ForestMinish20.inc @@ -2,14 +2,14 @@ SCRIPT_START script_ForestMinish20 SetEntitySpeed 0x0100 script_08016848: - WaitForSomething 0x00000004 - _0807E610 0x00000004 + WaitForSyncFlag 0x00000004 + ClearSyncFlag 0x00000004 _0807EC94 0x0030 Wait 0x000f DoPostScriptAction 0x0000 _0807EB44 0x0004 Wait 0x001e - _0807E5F8 0x00000003 + SetSyncFlag 0x00000003 DoPostScriptAction 0x0003 Wait 0x0002 _0807EB44 0x0006 @@ -21,12 +21,12 @@ script_08016848: _0807EB44 0x0004 Wait 0x003c _0807ECF4 0x0030 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Wait 0x000f DoPostScriptAction 0x0000 _0807EB44 0x0004 - WaitForSomething 0x00000004 - _0807E610 0x00000004 + WaitForSyncFlag 0x00000004 + ClearSyncFlag 0x00000004 DoPostScriptAction 0x0003 Wait 0x0002 _0807EB44 0x0006 diff --git a/data/scripts/npc/script_PlayerAtBladeBrothers.inc b/data/scripts/npc/script_PlayerAtBladeBrothers.inc index 7026967e..7db4fb9c 100644 --- a/data/scripts/npc/script_PlayerAtBladeBrothers.inc +++ b/data/scripts/npc/script_PlayerAtBladeBrothers.inc @@ -4,6 +4,6 @@ SCRIPT_START script_PlayerAtBladeBrothers _0807EDD4 0x0078, 0x0050 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/npc/script_PlayerAtGreatFairy.inc b/data/scripts/npc/script_PlayerAtGreatFairy.inc index cbea15ed..8839a3cb 100644 --- a/data/scripts/npc/script_PlayerAtGreatFairy.inc +++ b/data/scripts/npc/script_PlayerAtGreatFairy.inc @@ -10,7 +10,7 @@ SCRIPT_START script_PlayerAtGreatFairy script_0800B7EE: _0807E8E4_0 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 SCRIPT_END script_0800B7FC: CallWithArg sub_0807F4F8, 0x00000090 diff --git a/data/scripts/npc/script_TingleSiblings.inc b/data/scripts/npc/script_TingleSiblings.inc index 62b59de5..8393ee87 100644 --- a/data/scripts/npc/script_TingleSiblings.inc +++ b/data/scripts/npc/script_TingleSiblings.inc @@ -14,7 +14,7 @@ script_0801690A: Call sub_08064F28 WaitUntilTextboxCloses JumpIfNot script_08016926 - _0807F034 0x003d + GivePlayerItem 0x003d WaitPlayerGetItem script_08016926: _0807E878 diff --git a/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc b/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc index f727cd1a..56929281 100644 --- a/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc +++ b/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc @@ -23,7 +23,7 @@ script_08013FF0: _0807EB28 0x1508 WaitUntilTextboxCloses StartPlayerScript script_PlayerSanctuary - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Call sub_0807DF50 _0807E878 Jump script_08013FF0 diff --git a/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc index 520a148b..3939de1e 100644 --- a/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc +++ b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc @@ -8,7 +8,7 @@ SCRIPT_START script_Npc4EFinalSwordRumble CameraTargetEntity Wait 0x003c .endif - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Wait 0x0078 CallWithArg DeleteManager36, 0x00000001 _0807F0C8 0x0000, 0x0000 diff --git a/data/scripts/sanctuary/script_Npc4EPedestal.inc b/data/scripts/sanctuary/script_Npc4EPedestal.inc index ee6a1058..43bc49a9 100644 --- a/data/scripts/sanctuary/script_Npc4EPedestal.inc +++ b/data/scripts/sanctuary/script_Npc4EPedestal.inc @@ -13,7 +13,7 @@ script_080134F8: _0807E864 Call sub_0807DF28 StartPlayerScript script_PlayerAtPedestal - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 CallWithArg sub_08095A1C, script_Object6ASwordInPedestal PlaySound SFX_ELEMENT_PLACE Wait 0x005a @@ -22,7 +22,7 @@ script_080134F8: CallWithArg sub_08095D54, script_Object6AEarthElementFloating CallWithArg sub_08095D54, script_Object6AFireElementFloating EndBlock - WaitForSomething2 0x18000000 + WaitForSyncFlagAndClear 0x18000000 BeginBlock PlaySound SFX_ELEMENT_CHARGE CallWithArg sub_08095D8C, script_Object6ASwordChange1 @@ -36,22 +36,22 @@ script_080134F8: EndBlock Wait 0x003c CallWithArg CreateManager36, 0x00000000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00002000 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00002000 PlaySound SFX_1D2 CallWithArg sub_08095D8C, script_Object6ASwordCharge9 CallWithArg sub_08095D8C, script_Object6ASwordCharge10 - _0807E5F8 0x00000400 - WaitForSomething2 0x00004000 + SetSyncFlag 0x00000400 + WaitForSyncFlagAndClear 0x00004000 Wait 0x0078 - _0807E5F8 0x00000060 + SetSyncFlag 0x00000060 CallWithArg DeleteManager36, 0x00000000 Wait 0x0078 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 Wait 0x003c StartPlayerScript script_PlayerPickUpSword - _0807E5F8 0x00000080 + SetSyncFlag 0x00000080 _0807F078 0x0003, 0x0001 Call sub_0806DC3C Call sub_0806DC58 @@ -60,15 +60,15 @@ script_080134F8: _0807E778 0x0004 DoFade7 PlaySound SFX_EVAPORATE - WaitFor_2 + WaitForFadeFinish Wait 0x003c - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 _0807E778 0x0002 DoFade6 - WaitFor_2 + WaitForFadeFinish PlaySound SFX_109 MessageFromTargetPos 0x0503, 0x000c WaitUntilTextboxCloses - _0807E5F8 0x00040000 + SetSyncFlag 0x00040000 CallWithArg CreateManager36, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc b/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc index 2f6668f6..d34f479b 100644 --- a/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc +++ b/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc @@ -18,7 +18,7 @@ script_08013B1E: _0807EB28 0x1507 WaitUntilTextboxCloses StartPlayerScript script_PlayerSanctuary - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Call sub_0807DF50 _0807E878 Jump script_08013B1E diff --git a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc index 982e53f7..e5bef48f 100644 --- a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc +++ b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc @@ -13,7 +13,7 @@ script_0801373C: _0807E864 Call sub_0807DF28 StartPlayerScript script_PlayerAtPedestal - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 CallWithArg sub_08095A1C, script_Object6ASword2 PlaySound SFX_ELEMENT_PLACE Wait 0x005a @@ -21,7 +21,7 @@ script_0801373C: PlaySound SFX_ELEMENT_FLOAT CallWithArg sub_08095D54, script_Object6AWaterElementFloating EndBlock - WaitForSomething2 0x20000000 + WaitForSyncFlagAndClear 0x20000000 BeginBlock PlaySound SFX_ELEMENT_CHARGE CallWithArg sub_08095D8C, script_Object6ASwordChange1 @@ -37,24 +37,24 @@ script_0801373C: EndBlock Wait 0x003c CallWithArg CreateManager36, 0x00000000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00002000 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00002000 PlaySound SFX_1D2 CallWithArg sub_08095D8C, script_Object6ASwordCharge9 CallWithArg sub_08095D8C, script_Object6ASwordCharge10 - _0807E5F8 0x00000400 - WaitForSomething2 0x00004000 - _0807E5F8 0x00000800 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00000400 + WaitForSyncFlagAndClear 0x00004000 + SetSyncFlag 0x00000800 + WaitForSyncFlagAndClear 0x00008000 Wait 0x0078 - _0807E5F8 0x00000060 + SetSyncFlag 0x00000060 CallWithArg DeleteManager36, 0x00000000 Wait 0x0078 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 Wait 0x003c StartPlayerScript script_PlayerPickUpSword - _0807E5F8 0x00000080 + SetSyncFlag 0x00000080 _0807F078 0x0004, 0x0001 Call sub_0806DC3C Call sub_0806DC58 @@ -63,16 +63,16 @@ script_0801373C: _0807E778 0x0004 DoFade7 PlaySound SFX_EVAPORATE - WaitFor_2 + WaitForFadeFinish Wait 0x003c - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 _0807E778 0x0002 DoFade6 - WaitFor_2 + WaitForFadeFinish PlaySound SFX_109 MessageFromTargetPos 0x0504, 0x000c WaitUntilTextboxCloses - _0807E5F8 0x00040000 + SetSyncFlag 0x00040000 SetLocalFlag 0x007b Call sub_08053250 Call sub_0807DF50 diff --git a/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc index 2cebfed6..24eb4ce1 100644 --- a/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc +++ b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc @@ -6,12 +6,12 @@ SCRIPT_START script_Npc4ESpawnTextBoard SetEntityPositionRelative 0x00e8, 0x00a8 CameraTargetEntity Wait 0x003c - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Wait 0x0078 CallWithArg DeleteManager36, 0x00000001 _0807F0C8 0x0000, 0x0000 StartPlayerScript script_PlayerTextBoardAppears - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 _0807EB28 0x1501 WaitUntilTextboxCloses _0807F0B4 0x0004 diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc index 5a6acd5a..05e2ccd9 100644 --- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc +++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc @@ -13,7 +13,7 @@ script_080138D0: _0807E864 Call sub_0807DF28 StartPlayerScript script_PlayerAtPedestal - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 CallWithArg sub_08095A1C, script_Object6ASword3 PlaySound SFX_ELEMENT_PLACE Wait 0x005a @@ -21,7 +21,7 @@ script_080138D0: PlaySound SFX_ELEMENT_FLOAT CallWithArg sub_08095D54, script_Object6AWindElementFloating EndBlock - WaitForSomething2 0x40000000 + WaitForSyncFlagAndClear 0x40000000 BeginBlock PlaySound SFX_ELEMENT_CHARGE CallWithArg sub_08095D8C, script_Object6ASwordChange1 @@ -39,26 +39,26 @@ script_080138D0: EndBlock Wait 0x003c CallWithArg CreateManager36, 0x00000000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00002000 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00002000 PlaySound SFX_1D2 CallWithArg sub_08095D8C, script_Object6ASwordCharge9 CallWithArg sub_08095D8C, script_Object6ASwordCharge10 - _0807E5F8 0x00000400 - WaitForSomething2 0x00004000 - _0807E5F8 0x00000800 - WaitForSomething2 0x00008000 - _0807E5F8 0x00001000 - WaitForSomething2 0x00010000 + SetSyncFlag 0x00000400 + WaitForSyncFlagAndClear 0x00004000 + SetSyncFlag 0x00000800 + WaitForSyncFlagAndClear 0x00008000 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00010000 Wait 0x0078 - _0807E5F8 0x00000060 + SetSyncFlag 0x00000060 CallWithArg DeleteManager36, 0x00000000 Wait 0x0078 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 Wait 0x003c StartPlayerScript script_PlayerPickUpFinalSword - _0807E5F8 0x00000080 + SetSyncFlag 0x00000080 _0807F078 0x0006, 0x0001 Call sub_0807AEE4 Call sub_0806DC3C @@ -68,16 +68,16 @@ script_080138D0: _0807E778 0x0004 DoFade7 PlaySound SFX_EVAPORATE - WaitFor_2 + WaitForFadeFinish Wait 0x003c - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 _0807E778 0x0002 DoFade6 - WaitFor_2 + WaitForFadeFinish PlaySound SFX_109 MessageFromTargetPos 0x0505, 0x000c WaitUntilTextboxCloses - _0807E5F8 0x00040000 + SetSyncFlag 0x00040000 .ifndef EU _0807F0B4 0x0002 SetEntityPositionRelative 0x00e8, 0x00d8 diff --git a/data/scripts/sanctuary/script_Object6AEarthElementFloating.inc b/data/scripts/sanctuary/script_Object6AEarthElementFloating.inc index 554c5cc7..4ab4fd4d 100644 --- a/data/scripts/sanctuary/script_Object6AEarthElementFloating.inc +++ b/data/scripts/sanctuary/script_Object6AEarthElementFloating.inc @@ -7,6 +7,6 @@ SCRIPT_START script_Object6AEarthElementFloating SetEntitySpeed 0x0080 _0807EDD4 0x00b0, 0x00f8 _0807E930 0x0001 - _0807E5F8 0x08000000 + SetSyncFlag 0x08000000 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6AFireElementFloating.inc b/data/scripts/sanctuary/script_Object6AFireElementFloating.inc index f1f623c8..0e1febcc 100644 --- a/data/scripts/sanctuary/script_Object6AFireElementFloating.inc +++ b/data/scripts/sanctuary/script_Object6AFireElementFloating.inc @@ -7,6 +7,6 @@ SCRIPT_START script_Object6AFireElementFloating SetEntitySpeed 0x0080 _0807EDD4 0x0120, 0x00f8 _0807E930 0x0003 - _0807E5F8 0x10000000 + SetSyncFlag 0x10000000 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6ASword2.inc b/data/scripts/sanctuary/script_Object6ASword2.inc index 34de116e..fab7bbba 100644 --- a/data/scripts/sanctuary/script_Object6ASword2.inc +++ b/data/scripts/sanctuary/script_Object6ASword2.inc @@ -4,11 +4,11 @@ SCRIPT_START script_Object6ASword2 DoPostScriptAction 0x0007 _0807E930 0x0009 EndBlock - WaitForSomething2 0x00000080 + WaitForSyncFlagAndClear 0x00000080 _0807E930 0x000c Call sub_0807F2D4 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6ASword3.inc b/data/scripts/sanctuary/script_Object6ASword3.inc index f44a9697..74a51519 100644 --- a/data/scripts/sanctuary/script_Object6ASword3.inc +++ b/data/scripts/sanctuary/script_Object6ASword3.inc @@ -4,11 +4,11 @@ SCRIPT_START script_Object6ASword3 DoPostScriptAction 0x0007 _0807E930 0x000a EndBlock - WaitForSomething2 0x00000080 + WaitForSyncFlagAndClear 0x00000080 _0807E930 0x000d Call sub_0807F2D4 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6ASwordChange1.inc b/data/scripts/sanctuary/script_Object6ASwordChange1.inc index 7c41e39c..d17fcb9e 100644 --- a/data/scripts/sanctuary/script_Object6ASwordChange1.inc +++ b/data/scripts/sanctuary/script_Object6ASwordChange1.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object6ASwordChange1 _0807E930 0x0000 Call sub_0807F738 EndBlock - WaitForSomething 0x00000040 + WaitForSyncFlag 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge10.inc b/data/scripts/sanctuary/script_Object6ASwordCharge10.inc index 5a3fcf8d..11e22661 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge10.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge10.inc @@ -7,7 +7,7 @@ SCRIPT_START script_Object6ASwordCharge10 Call sub_0807F714 CallWithArg sub_0807F994, 0x0000fffc EndBlock - WaitForSomething 0x00000020 + WaitForSyncFlag 0x00000020 Wait 0x0078 Call sub_0807F2D4 DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge11.inc b/data/scripts/sanctuary/script_Object6ASwordCharge11.inc index 3d2b2cd9..9bc8084e 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge11.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge11.inc @@ -1,6 +1,6 @@ @ Sanctuary third time OBJECT_6A ? SCRIPT_START script_Object6ASwordCharge11 - TestBit 0x00020000 + CheckSyncFlagAndClear 0x00020000 JumpIf script_08014264 Wait 0x0008 CallWithArg sub_08095EAC, 0x00000000 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge2.inc b/data/scripts/sanctuary/script_Object6ASwordCharge2.inc index d3e23d65..d4ad0786 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge2.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge2.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object6ASwordCharge2 _0807E930 0x0001 Call sub_0807F738 EndBlock - WaitForSomething 0x00000040 + WaitForSyncFlag 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge3.inc b/data/scripts/sanctuary/script_Object6ASwordCharge3.inc index 72f35164..dc8c915c 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge3.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge3.inc @@ -6,6 +6,6 @@ SCRIPT_START script_Object6ASwordCharge3 Call sub_0807F738 OffsetEntityPosition 0x0000, 0xfff0 EndBlock - WaitForSomething 0x00000040 + WaitForSyncFlag 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge4.inc b/data/scripts/sanctuary/script_Object6ASwordCharge4.inc index e693e365..55fea219 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge4.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge4.inc @@ -6,6 +6,6 @@ SCRIPT_START script_Object6ASwordCharge4 Call sub_0807F738 OffsetEntityPosition 0x0000, 0xfff0 EndBlock - WaitForSomething 0x00000040 + WaitForSyncFlag 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge5.inc b/data/scripts/sanctuary/script_Object6ASwordCharge5.inc index 22e19902..deba7486 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge5.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge5.inc @@ -4,12 +4,12 @@ SCRIPT_START script_Object6ASwordCharge5 DoPostScriptAction 0x0007 _0807E930 0x0004 EndBlock - WaitForSomething2 0x00000200 + WaitForSyncFlagAndClear 0x00000200 _0807E930 0x0008 Call sub_0807F2D4 _0807E930 0x000c - _0807E5F8 0x00002000 - WaitForSomething 0x00000020 + SetSyncFlag 0x00002000 + WaitForSyncFlag 0x00000020 _0807E930 0x0010 Call sub_0807F2D4 DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge6.inc b/data/scripts/sanctuary/script_Object6ASwordCharge6.inc index e40ad2be..6712fe80 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge6.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge6.inc @@ -4,12 +4,12 @@ SCRIPT_START script_Object6ASwordCharge6 DoPostScriptAction 0x0007 _0807E930 0x0005 EndBlock - WaitForSomething2 0x00000400 + WaitForSyncFlagAndClear 0x00000400 _0807E930 0x0009 Call sub_0807F2D4 _0807E930 0x000d - _0807E5F8 0x00004000 - WaitForSomething 0x00000020 + SetSyncFlag 0x00004000 + WaitForSyncFlag 0x00000020 _0807E930 0x0011 Call sub_0807F2D4 DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge8.inc b/data/scripts/sanctuary/script_Object6ASwordCharge8.inc index 38ad04ca..db235e91 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge8.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge8.inc @@ -5,12 +5,12 @@ SCRIPT_START script_Object6ASwordCharge8 _0807E930 0x0007 OffsetEntityPosition 0x0000, 0xfff0 EndBlock - WaitForSomething2 0x00001000 + WaitForSyncFlagAndClear 0x00001000 _0807E930 0x000b Call sub_0807F2D4 _0807E930 0x000f - _0807E5F8 0x00010000 - WaitForSomething 0x00000020 + SetSyncFlag 0x00010000 + WaitForSyncFlag 0x00000020 _0807E930 0x0013 Call sub_0807F2D4 DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge9.inc b/data/scripts/sanctuary/script_Object6ASwordCharge9.inc index 5c2d7dca..2920f0bc 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge9.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge9.inc @@ -6,7 +6,7 @@ SCRIPT_START script_Object6ASwordCharge9 Call sub_0807F714 CallWithArg sub_0807F994, 0x0000fffc EndBlock - WaitForSomething 0x00000020 + WaitForSyncFlag 0x00000020 Wait 0x0078 Call sub_0807F2D4 DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc b/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc index d83de50e..7681251b 100644 --- a/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc +++ b/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc @@ -4,11 +4,11 @@ SCRIPT_START script_Object6ASwordInPedestal DoPostScriptAction 0x0007 _0807E930 0x0008 EndBlock - WaitForSomething2 0x00000080 + WaitForSyncFlagAndClear 0x00000080 _0807E930 0x000b Call sub_0807F2D4 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6ATextBoard.inc b/data/scripts/sanctuary/script_Object6ATextBoard.inc index 0d465a7f..174f0b6d 100644 --- a/data/scripts/sanctuary/script_Object6ATextBoard.inc +++ b/data/scripts/sanctuary/script_Object6ATextBoard.inc @@ -13,7 +13,7 @@ SCRIPT_START script_Object6ATextBoard JumpIfNot script_08013C98 EndBlock DoPostScriptAction 0x0008 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 _0807E908 0x0002 PlaySound SFX_134 Jump script_08013C32 @@ -33,7 +33,7 @@ script_08013C32: script_08013C58: EndBlock BeginBlock - TestBit 0x00000008 + CheckSyncFlagAndClear 0x00000008 JumpIf script_08013C92 CheckEntityInteractType JumpIfNot script_08013C58 diff --git a/data/scripts/sanctuary/script_Object6AWaterElementFloating.inc b/data/scripts/sanctuary/script_Object6AWaterElementFloating.inc index f325a16c..5571ce4f 100644 --- a/data/scripts/sanctuary/script_Object6AWaterElementFloating.inc +++ b/data/scripts/sanctuary/script_Object6AWaterElementFloating.inc @@ -7,6 +7,6 @@ SCRIPT_START script_Object6AWaterElementFloating SetEntitySpeed 0x0080 _0807EDD4 0x0120, 0x0168 _0807E930 0x0005 - _0807E5F8 0x20000000 + SetSyncFlag 0x20000000 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6AWindElementFloating.inc b/data/scripts/sanctuary/script_Object6AWindElementFloating.inc index d50d3f3f..c88547f6 100644 --- a/data/scripts/sanctuary/script_Object6AWindElementFloating.inc +++ b/data/scripts/sanctuary/script_Object6AWindElementFloating.inc @@ -7,6 +7,6 @@ SCRIPT_START script_Object6AWindElementFloating SetEntitySpeed 0x0080 _0807EDD4 0x00b0, 0x0168 _0807E930 0x0007 - _0807E5F8 0x40000000 + SetSyncFlag 0x40000000 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc b/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc index c56f06ee..e56b82e0 100644 --- a/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc +++ b/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc @@ -5,12 +5,12 @@ SCRIPT_START script_Objet6ASwordCharge7 _0807E930 0x0006 OffsetEntityPosition 0x0000, 0xfff0 EndBlock - WaitForSomething2 0x00000800 + WaitForSyncFlagAndClear 0x00000800 _0807E930 0x000a Call sub_0807F2D4 _0807E930 0x000e - _0807E5F8 0x00008000 - WaitForSomething 0x00000020 + SetSyncFlag 0x00008000 + WaitForSyncFlag 0x00000020 _0807E930 0x0012 Call sub_0807F2D4 DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_PlayerAtPedestal.inc b/data/scripts/sanctuary/script_PlayerAtPedestal.inc index be558d2e..f67ff329 100644 --- a/data/scripts/sanctuary/script_PlayerAtPedestal.inc +++ b/data/scripts/sanctuary/script_PlayerAtPedestal.inc @@ -13,6 +13,6 @@ script_08013704: _0807EDD4 0x00e8, 0x0124 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc b/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc index b257b2f5..69721bca 100644 --- a/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc +++ b/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc @@ -7,6 +7,6 @@ SCRIPT_START script_PlayerAtSanctuaryEntrance _0807EB44 0x0000 DoPostScriptAction 0x0000 Wait 0x001e - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/sanctuary/script_PlayerGetElement.inc b/data/scripts/sanctuary/script_PlayerGetElement.inc index e834ef9f..c1285a04 100644 --- a/data/scripts/sanctuary/script_PlayerGetElement.inc +++ b/data/scripts/sanctuary/script_PlayerGetElement.inc @@ -14,8 +14,8 @@ script_0800A0D2: _0807E8E4_0 Wait 0x0008 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 Wait 0x003c SetEntitySpeed 0x0080 _0807EC64 0x0030 diff --git a/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc b/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc index bffaefd0..e2e0c734 100644 --- a/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc +++ b/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc @@ -5,9 +5,9 @@ SCRIPT_START script_PlayerPickUpFinalSword CallWithArg sub_0807F238, 0x000008e3 Call sub_08096028 Wait 0x0078 - _0807E5F8 0x00020000 + SetSyncFlag 0x00020000 Call sub_0807F304 Wait 0x0078 - WaitForSomething2 0x00040000 + WaitForSyncFlagAndClear 0x00040000 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/sanctuary/script_PlayerPickUpSword.inc b/data/scripts/sanctuary/script_PlayerPickUpSword.inc index a6e18822..49aea300 100644 --- a/data/scripts/sanctuary/script_PlayerPickUpSword.inc +++ b/data/scripts/sanctuary/script_PlayerPickUpSword.inc @@ -4,10 +4,10 @@ SCRIPT_START script_PlayerPickUpSword CallWithArg sub_0807F238, 0x000008bf Call sub_08096028 Wait 0x003c - _0807E5F8 0x00020000 + SetSyncFlag 0x00020000 Call sub_0807F304 Wait 0x0078 - WaitForSomething2 0x00040000 + WaitForSyncFlagAndClear 0x00040000 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_PlayerSanctuary.inc b/data/scripts/sanctuary/script_PlayerSanctuary.inc index a860cd9c..2548d3a1 100644 --- a/data/scripts/sanctuary/script_PlayerSanctuary.inc +++ b/data/scripts/sanctuary/script_PlayerSanctuary.inc @@ -6,7 +6,7 @@ SCRIPT_START script_PlayerSanctuary _0807EC64 0x0010 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc b/data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc index 5fea928d..7ba6faad 100644 --- a/data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc +++ b/data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc @@ -4,6 +4,6 @@ SCRIPT_START script_PlayerSanctuaryIntro _0807EB44 0x0000 SetEntityPositionRelative 0x0098, 0x0070 EndBlock - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc b/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc index 35c0f79a..29f92dd2 100644 --- a/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc +++ b/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc @@ -6,6 +6,6 @@ SCRIPT_START script_PlayerTextBoardAppears _0807EDD4 0x00e8, 0x00a8 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/southHyruleField/script_BedInLinksRoom.inc b/data/scripts/southHyruleField/script_BedInLinksRoom.inc index 1ce23a20..4300e653 100644 --- a/data/scripts/southHyruleField/script_BedInLinksRoom.inc +++ b/data/scripts/southHyruleField/script_BedInLinksRoom.inc @@ -5,7 +5,7 @@ SCRIPT_START script_BedInLinksRoom SetIntVariable 0x00000002 DoPostScriptAction 0x0001 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 BeginBlock SetIntVariable 0x00000003 DoPostScriptAction 0x0001 diff --git a/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc b/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc index a295cc26..7fc77564 100644 --- a/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc +++ b/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc @@ -9,16 +9,16 @@ script_08009DF0: Call sub_0807F9A4 Wait 0x0008 _0807EB28 0x3207 - _0807E3E8 + CheckTextboxResult JumpIfNot script_08009E4E Call sub_0807DF28 _0807E778 0x0002 DoFade5 - WaitFor_2 + WaitForFadeFinish Call sub_0804E864 Wait 0x001e - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 _0807EB28 0x3209 Wait 0x000f WaitUntilTextboxCloses diff --git a/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc b/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc index dcd55630..1b74f94c 100644 --- a/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc +++ b/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc @@ -3,11 +3,11 @@ SCRIPT_START script_PlayerWakeAfterRest BeginBlock Call sub_0807DF28 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 _0807E778 0x0002 DoFade4 - WaitFor_2 + WaitForFadeFinish DoPostScriptAction 0x0014 Wait 0x001e - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 SCRIPT_END diff --git a/data/scripts/unused/script_0800FB2C.inc b/data/scripts/unused/script_0800FB2C.inc index fb2209b0..2e11fe58 100644 --- a/data/scripts/unused/script_0800FB2C.inc +++ b/data/scripts/unused/script_0800FB2C.inc @@ -2,7 +2,7 @@ SCRIPT_START script_0800FB2C _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/unused/script_08012B24.inc b/data/scripts/unused/script_08012B24.inc index 9a5df12d..fe88c6a6 100644 --- a/data/scripts/unused/script_08012B24.inc +++ b/data/scripts/unused/script_08012B24.inc @@ -6,7 +6,7 @@ SCRIPT_START script_08012B24 EndBlock DoPostScriptAction 0x0001 _0807ECC4 0x0008 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 CallWithArg sub_0807FB64, 0xffffffe2 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/unused/script_08012B50.inc b/data/scripts/unused/script_08012B50.inc index e83e0540..b97d546b 100644 --- a/data/scripts/unused/script_08012B50.inc +++ b/data/scripts/unused/script_08012B50.inc @@ -6,7 +6,7 @@ SCRIPT_START script_08012B50 EndBlock DoPostScriptAction 0x0001 _0807EC64 0x0008 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 CallWithArg sub_0807FB64, 0xffffffe2 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/unused/script_08012B7C.inc b/data/scripts/unused/script_08012B7C.inc index b6b44f07..d562bd07 100644 --- a/data/scripts/unused/script_08012B7C.inc +++ b/data/scripts/unused/script_08012B7C.inc @@ -6,7 +6,7 @@ SCRIPT_START script_08012B7C EndBlock DoPostScriptAction 0x0001 _0807EC94 0x0008 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 CallWithArg sub_0807FB64, 0xffffffe2 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/unused/script_08013D04.inc b/data/scripts/unused/script_08013D04.inc index f53391a3..276d2f05 100644 --- a/data/scripts/unused/script_08013D04.inc +++ b/data/scripts/unused/script_08013D04.inc @@ -10,7 +10,7 @@ script_08013D1C: JumpIfNot script_08013D1C CallWithArg sub_08095D54, 0x00000000 PlaySound SFX_ELEMENT_PLACE - _0807E5F8 0x08000000 + SetSyncFlag 0x08000000 Call sub_080791BC DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/unused/script_08013D44.inc b/data/scripts/unused/script_08013D44.inc index 0c0c832f..e375acd4 100644 --- a/data/scripts/unused/script_08013D44.inc +++ b/data/scripts/unused/script_08013D44.inc @@ -10,7 +10,7 @@ script_08013D5C: JumpIfNot script_08013D5C CallWithArg sub_08095D54, 0x00000001 PlaySound SFX_ELEMENT_PLACE - _0807E5F8 0x10000000 + SetSyncFlag 0x10000000 Call sub_080791BC DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/unused/script_08013D84.inc b/data/scripts/unused/script_08013D84.inc index 7c41421f..53a064ac 100644 --- a/data/scripts/unused/script_08013D84.inc +++ b/data/scripts/unused/script_08013D84.inc @@ -10,7 +10,7 @@ script_08013D9C: JumpIfNot script_08013D9C CallWithArg sub_08095D54, 0x00000002 PlaySound SFX_ELEMENT_PLACE - _0807E5F8 0x20000000 + SetSyncFlag 0x20000000 Call sub_080791BC DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/unused/script_08013DC4.inc b/data/scripts/unused/script_08013DC4.inc index 0d04b036..62c876c7 100644 --- a/data/scripts/unused/script_08013DC4.inc +++ b/data/scripts/unused/script_08013DC4.inc @@ -10,7 +10,7 @@ script_08013DDC: JumpIfNot script_08013DDC CallWithArg sub_08095D54, 0x00000003 PlaySound SFX_ELEMENT_PLACE - _0807E5F8 0x40000000 + SetSyncFlag 0x40000000 Call sub_080791BC DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/unused/script_080155F4.inc b/data/scripts/unused/script_080155F4.inc index ae645fa8..7c934a2a 100644 --- a/data/scripts/unused/script_080155F4.inc +++ b/data/scripts/unused/script_080155F4.inc @@ -1,9 +1,9 @@ @ TODO UNUSED? SCRIPT_START script_080155F4 - WaitForSomething2 0x00000020 + WaitForSyncFlagAndClear 0x00000020 _0807E930 0x0000 Wait 0x0014 - _0807E5F8 0x00000040 + SetSyncFlag 0x00000040 script_08015608: CheckRoomFlag 0x0001 JumpIfNot script_08015608 diff --git a/data/scripts/unused/script_08015A7C.inc b/data/scripts/unused/script_08015A7C.inc index 88c9b653..3034137b 100644 --- a/data/scripts/unused/script_08015A7C.inc +++ b/data/scripts/unused/script_08015A7C.inc @@ -5,7 +5,7 @@ SCRIPT_START script_08015A7C _0807EC64 0x0010 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/unused/script_08015AA0.inc b/data/scripts/unused/script_08015AA0.inc index aaad91f3..e0187879 100644 --- a/data/scripts/unused/script_08015AA0.inc +++ b/data/scripts/unused/script_08015AA0.inc @@ -5,7 +5,7 @@ SCRIPT_START script_08015AA0 _0807EC94 0x0010 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/unused/script_08015F80.inc b/data/scripts/unused/script_08015F80.inc index bf99b59a..af659a4f 100644 --- a/data/scripts/unused/script_08015F80.inc +++ b/data/scripts/unused/script_08015F80.inc @@ -4,9 +4,9 @@ SCRIPT_START script_08015F80 _0807EB44 0x0004 DoPostScriptAction 0x0000 EndBlock - WaitForSomething 0x00000200 + WaitForSyncFlag 0x00000200 DoPostScriptAction 0x0005 - WaitForSomething 0x00000400 + WaitForSyncFlag 0x00000400 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/unused/script_08016384.inc b/data/scripts/unused/script_08016384.inc index 507b9dcc..8d5b915f 100644 --- a/data/scripts/unused/script_08016384.inc +++ b/data/scripts/unused/script_08016384.inc @@ -13,7 +13,7 @@ SCRIPT_START script_08016384 Call script_08016384 CallWithArg script_08016384, 0x12345678 LoadRoomEntityList script_08016384 - TestBit 0x00000001 + CheckSyncFlagAndClear 0x00000001 CheckInventory1 0x0001 CheckInventory2 0x0001 HasRoomItemForSale @@ -38,10 +38,10 @@ SCRIPT_START script_08016384 CheckEntityInteractType _0807E30C HasRupees 0x00c8 - _0807E3E8 + CheckTextboxResult CheckKinstoneFused 0x0001 BuyItem 0x006c, 0x0000 - _0807E48C 0x0020 + CheckBottleContaining 0x0020 _0807E4CC 0x00000000 _0807E4EC 0x00000000 _0807E514 0x00000000 @@ -50,8 +50,8 @@ SCRIPT_START script_08016384 EntityHasHeight ComparePlayerAction 0x0001 ComparePlayerAnimationState 0x0004 - _0807E5F8 0x00000001 - _0807E610 0x00000002 + SetSyncFlag 0x00000001 + ClearSyncFlag 0x00000002 SetLocalFlag 0x0067 SetLocalFlagByBank 0x0100, 0x0001 ClearLocalFlag 0x0067 @@ -60,11 +60,11 @@ SCRIPT_START script_08016384 SetRoomFlag 0x0000 ClearRoomFlag 0x0000 Wait 0x001e - WaitForSomething 0x00000001 - WaitForSomething2 0x00000002 + WaitForSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 WaitPlayerGetItem WaitForPlayerAction0x17 WaitFor_1 - WaitFor_2 + WaitForFadeFinish _0807E778 0x0004 SetFadeMask 0x0000ffff diff --git a/data/scripts/unused/script_08016482.inc b/data/scripts/unused/script_08016482.inc index cbd4b1d4..d7a983b0 100644 --- a/data/scripts/unused/script_08016482.inc +++ b/data/scripts/unused/script_08016482.inc @@ -69,7 +69,7 @@ SCRIPT_START script_08016482 ModHealth 0x0010 IncreaseMaxHealth _0807F050 0x0001 - _0807F034 0x0001 + GivePlayerItem 0x0001 GetInventoryValue 0x0001 _0807F078 0x0001, 0x0002 _0807F088 0x0001 diff --git a/data/scripts/veilFalls/script_BigGoronTalk.inc b/data/scripts/veilFalls/script_BigGoronTalk.inc index cb070bfe..ceb73548 100644 --- a/data/scripts/veilFalls/script_BigGoronTalk.inc +++ b/data/scripts/veilFalls/script_BigGoronTalk.inc @@ -49,7 +49,7 @@ script_080093DA: script_080093EE: MessageNoOverlapVar WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_08009376 Wait 0x001e MessageNoOverlap 0x1d08 diff --git a/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc b/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc index ae9416fe..9bd85e9f 100644 --- a/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc +++ b/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc @@ -1,7 +1,7 @@ @ Veil Falls NPC4E Source of the Flow during opening Kinstone cutscene SCRIPT_START script_NPC4ESouurceOfTheFlowOpening - _0807E5F8 0x00000003 - WaitForSomething2 0x0000000c + SetSyncFlag 0x00000003 + WaitForSyncFlagAndClear 0x0000000c _0807F0C8 0x0000, 0x0000 PlaySound SFX_SECRET _0807EB28 0x0b1f diff --git a/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc b/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc index cb69c950..d14749c2 100644 --- a/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc +++ b/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc @@ -4,12 +4,12 @@ SCRIPT_START script_Object3ELeftStoneOpening CheckKinstoneFused 0x0009 JumpIf script_Object3ELeftStone EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x0010 Wait 0x003c SetEntitySpeed 0x0020 _0807ECF4 0x0080 Wait 0x001e DoPostScriptAction 0x0010 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 SCRIPT_END diff --git a/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc b/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc index ef2f0020..b8dfa814 100644 --- a/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc +++ b/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc @@ -4,12 +4,12 @@ SCRIPT_START script_Object3ERightStoneOpening CheckKinstoneFused 0x0009 JumpIf script_Object3ERightStone EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0010 Wait 0x003c SetEntitySpeed 0x0020 _0807EC94 0x0080 Wait 0x001e DoPostScriptAction 0x0010 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 SCRIPT_END diff --git a/data/scripts/westernWood/script_MoblinLady.inc b/data/scripts/westernWood/script_MoblinLady.inc index 05c272db..75d7093e 100644 --- a/data/scripts/westernWood/script_MoblinLady.inc +++ b/data/scripts/westernWood/script_MoblinLady.inc @@ -15,7 +15,7 @@ script_08012338: CheckLocalFlag 0x0042 JumpIf script_0801235A SetLocalFlag 0x0042 - _0807F034 0x0057 + GivePlayerItem 0x0057 WaitPlayerGetItem script_0801235A: _0807E878 diff --git a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc index 8b0662a7..3c0338b0 100644 --- a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc +++ b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc @@ -14,7 +14,7 @@ script_0800D88E: CheckLocalFlag 0x0045 JumpIf script_0800D8B0 StartPlayerScript script_PlayerAtTextboard - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 script_0800D8B0: _0807E8E4_0 MessageNoOverlap 0x1324 diff --git a/data/scripts/windRuins/script_PlayerAtTextboard.inc b/data/scripts/windRuins/script_PlayerAtTextboard.inc index dbee2f6d..a3c2a068 100644 --- a/data/scripts/windRuins/script_PlayerAtTextboard.inc +++ b/data/scripts/windRuins/script_PlayerAtTextboard.inc @@ -7,6 +7,6 @@ SCRIPT_START script_PlayerAtTextboard _0807EDD4 0x00a0, 0x0078 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END |