diff options
| author | theo3 <arisstephenson2@gmail.com> | 2021-12-27 21:26:32 -0800 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2021-12-27 21:26:32 -0800 |
| commit | c4f2efe13278c5aeb094be914513d19f5ddbce2b (patch) | |
| tree | 37a900c68d5a4918d8ae5502390666e45516f630 /data/scripts/cutscene | |
| parent | ebaa6d76fa94540c12fad5eed634a796423fbd7b (diff) | |
label script functions
Diffstat (limited to 'data/scripts/cutscene')
156 files changed, 729 insertions, 729 deletions
diff --git a/data/scripts/cutscene/ezlo/script_EzloCap.inc b/data/scripts/cutscene/ezlo/script_EzloCap.inc index 29b94ee9..f13702bc 100644 --- a/data/scripts/cutscene/ezlo/script_EzloCap.inc +++ b/data/scripts/cutscene/ezlo/script_EzloCap.inc @@ -4,20 +4,20 @@ SCRIPT_START script_EzloCap SetEntitySpeed 0x0040 DoPostScriptAction 0x0007 EndBlock - _0807E930 0x0020 + SetAnimation 0x0020 WaitForSyncFlagAndClear 0x00000004 - _0807E930 0x0022 + SetAnimation 0x0022 Call sub_0807F3C8 MessageFromTargetPos 0x1102, 0x000c WaitUntilTextboxCloses - _0807E930 0x0020 + SetAnimation 0x0020 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807E930 0x0021 + SetAnimation 0x0021 Call sub_0807F3C8 MessageFromTargetPos 0x1103, 0x000c WaitUntilTextboxCloses - _0807E930 0x0020 + SetAnimation 0x0020 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0004 @@ -25,32 +25,32 @@ SCRIPT_START script_EzloCap SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0011 - _0807E930 0x001c + SetAnimation 0x001c MessageFromTargetPos 0x1105, 0x000c WaitUntilTextboxCloses - _0807E930 0x0020 + SetAnimation 0x0020 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807E930 0x0022 + SetAnimation 0x0022 Call sub_0807F3C8 MessageFromTargetPos 0x1106, 0x000c WaitUntilTextboxCloses - _0807E930 0x001c + SetAnimation 0x001c Call sub_0806D96C MessageFromTargetPos 0x1107, 0x000c WaitUntilTextboxCloses - _0807E930 0x0020 + SetAnimation 0x0020 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807E930 0x0021 + SetAnimation 0x0021 Call sub_0807F3C8 MessageFromTargetPos 0x1108, 0x000c WaitUntilTextboxCloses - _0807E930 0x001c + SetAnimation 0x001c Call sub_0806D96C MessageFromTargetPos 0x1109, 0x000c WaitUntilTextboxCloses - _0807E930 0x0020 + SetAnimation 0x0020 DoPostScriptAction 0x000a _0807E9D4 SetSyncFlag 0x00000008 @@ -62,16 +62,16 @@ script_080127F2: CheckEntityInteractType JumpIfNot script_080127F2 EndBlock - _0807E864 + SetPlayerIdle Call sub_0806D944 - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x1114, 0x000c WaitUntilTextboxCloses - _0807E930 0x0020 - _0807E878 + SetAnimation 0x0020 + EnablePlayerControl Jump script_080127F2 script_08012824: - _0807E864 + SetPlayerIdle _0807E9DC CallWithArg sub_0807F5B0, 0x0000003c Call sub_080791D0 @@ -82,39 +82,39 @@ script_08012824: SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 Call sub_0806D944 - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x110a, 0x000c WaitUntilTextboxCloses - _0807E930 0x001f + SetAnimation 0x001f SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x110b, 0x000c WaitUntilTextboxCloses - _0807E930 0x001f + SetAnimation 0x001f SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x110c, 0x000c WaitUntilTextboxCloses - _0807E930 0x001f + SetAnimation 0x001f SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x110d, 0x000c WaitUntilTextboxCloses - _0807E930 0x001f + SetAnimation 0x001f SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x110e, 0x000c WaitUntilTextboxCloses - _0807E930 0x0018 + SetAnimation 0x0018 SetEntitySpeed 0x0080 Call sub_0806D908 - _0807EC1C 0x0010 + WalkForward 0x0010 DoPostScriptAction 0x000a _0807E9D4 SetSyncFlag 0x00000008 @@ -129,30 +129,30 @@ script_08012904: JumpIfNot script_0801293A Jump script_08012904 script_08012920: - _0807E864 - _0807E930 0x0010 + SetPlayerIdle + SetAnimation 0x0010 EndBlock MessageFromTargetPos 0x1115, 0x000c WaitUntilTextboxCloses - _0807E930 0x0018 - _0807E878 + SetAnimation 0x0018 + EnablePlayerControl Jump script_08012904 script_0801293A: EndBlock - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 - _0807EB8C + FaceAwayFromPlayer Call sub_0806D944 - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x110f, 0x000c - _0807E930 0x0018 + SetAnimation 0x0018 SetEntitySpeed 0x0080 Call sub_0806D908 - _0807EC1C 0x0050 + WalkForward 0x0050 WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 script_08012984: @@ -165,31 +165,31 @@ script_08012984: JumpIfNot script_080129BA Jump script_08012984 script_080129A0: - _0807E864 - _0807E930 0x0010 + SetPlayerIdle + SetAnimation 0x0010 EndBlock MessageFromTargetPos 0x1115, 0x000c WaitUntilTextboxCloses - _0807E930 0x0018 - _0807E878 + SetAnimation 0x0018 + EnablePlayerControl Jump script_08012984 script_080129BA: EndBlock - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 - _0807EB8C + FaceAwayFromPlayer Call sub_0806D944 - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x1110, 0x000c - _0807E930 0x0018 + SetAnimation 0x0018 SetEntitySpeed 0x0080 Call sub_0806D908 - _0807EC1C 0x0050 - _0807E930 0x0018 + WalkForward 0x0050 + SetAnimation 0x0018 WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 script_08012A08: @@ -202,32 +202,32 @@ script_08012A08: JumpIfNot script_08012A3E Jump script_08012A08 script_08012A24: - _0807E864 - _0807E930 0x0010 + SetPlayerIdle + SetAnimation 0x0010 EndBlock MessageFromTargetPos 0x1115, 0x000c WaitUntilTextboxCloses - _0807E930 0x0018 - _0807E878 + SetAnimation 0x0018 + EnablePlayerControl Jump script_08012A08 script_08012A3E: EndBlock - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StopBgm DoPostScriptAction 0x000b - _0807EB8C + FaceAwayFromPlayer Call sub_0806D944 - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x1111, 0x000c - _0807E930 0x0018 + SetAnimation 0x0018 SetEntitySpeed 0x0080 Call sub_0806D8A0 script_08012A74: _0807EE30 JumpIfNot script_08012A74 - _0807E930 0x001f + SetAnimation 0x001f WaitUntilTextboxCloses StartPlayerScript script_PlayerGetEzloCap Call sub_0806D9A4 @@ -236,7 +236,7 @@ script_08012A74: PlayBgm BGM_EZLO_THEME BeginBlock _0807E8E4_2 - _0807EB28 0x1112 + EzloMessage 0x1112 EndBlock WaitUntilTextboxCloses SetSyncFlag 0x00000008 diff --git a/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc index f059f75b..f9350061 100644 --- a/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc +++ b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc @@ -7,14 +7,14 @@ script_0801248A: CheckPlayerInRegion 0x0208, 0x02c8, 0x4020 JumpIfNot script_0801248A StopBgm - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerAtFirstLookAtEzlo MessageFromTargetPos 0x1101, 0x0007 WaitUntilTextboxCloses CameraTargetPlayer - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E80C 0x00000000 WaitForFadeFinish _0807E858 0x0000 @@ -23,7 +23,7 @@ script_0801248A: Call DeleteAllEnemies SetEntityPositionRelative 0x0388, 0x0168 Call sub_0807F844 - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E800 0x00000000 WaitForFadeFinish PlayBgm BGM_EZLO_THEME @@ -38,24 +38,24 @@ script_0801248A: SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 StopBgm - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E80C 0x00000000 WaitForFadeFinish MoveEntityToPlayer Call sub_0807F844 CameraTargetPlayer SetFadeMask 0xffffffff - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E800 0x00000000 WaitForFadeFinish Call sub_0807DF50 - _0807E878 + EnablePlayerControl PlayBGM script_08012566: CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020 JumpIfNot script_08012566 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 Call sub_0806DC7C StopBgm @@ -83,12 +83,12 @@ script_08012566: StopBgm PlayBgm BGM_FIGHT_THEME2 Call sub_0807DF50 - _0807E878 + EnablePlayerControl SetSyncFlag 0x00000050 LoadRoomEntityList gUnk_080F51D0 WaitForSyncFlagAndClear 0x00000008 - _0807E864 - Call sub_0807FA40 + SetPlayerIdle + Call WaitForPlayerNormalOrTalkEzlo Call sub_0807DF28 PlaySound SFX_SECRET StopBgm @@ -116,7 +116,7 @@ script_08012566: _0807F0B4 0x0004 CameraTargetPlayer Call sub_0807DF50 - _0807E878 + EnablePlayerControl SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 SetSyncFlag 0x00000004 @@ -128,8 +128,8 @@ script_08012566: PlayBGM Call sub_08054570 SetGlobalFlag 0x0014 - CallWithArg sub_0807F6F8, 0x00000008 + CallWithArg ResetPlayerFlag, 0x00000008 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/ezlo/script_Object6ALeftBullyingOctorok.inc b/data/scripts/cutscene/ezlo/script_Object6ALeftBullyingOctorok.inc index 4528f6df..3a0fb547 100644 --- a/data/scripts/cutscene/ezlo/script_Object6ALeftBullyingOctorok.inc +++ b/data/scripts/cutscene/ezlo/script_Object6ALeftBullyingOctorok.inc @@ -1,20 +1,20 @@ @ First look at Ezlo OBJECT_6A left octorok SCRIPT_START script_Object6ALeftBullyingOctorok BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0007 - _0807E930 0x0001 + SetAnimation 0x0001 EndBlock WaitForSyncFlagAndClear 0x00000040 - _0807E930 0x0005 + SetAnimation 0x0005 Wait 0x001e SetSyncFlag 0x00000080 - _0807E930 0x0001 + SetAnimation 0x0001 WaitForSyncFlagAndClear 0x00000040 - _0807E930 0x0005 + SetAnimation 0x0005 Wait 0x001e SetSyncFlag 0x00000080 - _0807E930 0x0001 + SetAnimation 0x0001 WaitForSyncFlagAndClear 0x00000040 Wait 0x0001 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/ezlo/script_Object6ARightBullyingOctorok.inc b/data/scripts/cutscene/ezlo/script_Object6ARightBullyingOctorok.inc index 8051b6b5..c64fa666 100644 --- a/data/scripts/cutscene/ezlo/script_Object6ARightBullyingOctorok.inc +++ b/data/scripts/cutscene/ezlo/script_Object6ARightBullyingOctorok.inc @@ -1,20 +1,20 @@ @ First look at Ezlo OBJECT_6A right octorok SCRIPT_START script_Object6ARightBullyingOctorok BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0007 - _0807E930 0x0003 + SetAnimation 0x0003 EndBlock WaitForSyncFlagAndClear 0x00000010 - _0807E930 0x0007 + SetAnimation 0x0007 Wait 0x001e SetSyncFlag 0x00000020 - _0807E930 0x0003 + SetAnimation 0x0003 WaitForSyncFlagAndClear 0x00000010 - _0807E930 0x0007 + SetAnimation 0x0007 Wait 0x001e SetSyncFlag 0x00000020 - _0807E930 0x0003 + SetAnimation 0x0003 WaitForSyncFlagAndClear 0x00000010 Wait 0x0001 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/ezlo/script_PlayerAtFirstLookAtEzlo.inc b/data/scripts/cutscene/ezlo/script_PlayerAtFirstLookAtEzlo.inc index 1330fd87..f2dc81c9 100644 --- a/data/scripts/cutscene/ezlo/script_PlayerAtFirstLookAtEzlo.inc +++ b/data/scripts/cutscene/ezlo/script_PlayerAtFirstLookAtEzlo.inc @@ -2,9 +2,9 @@ SCRIPT_START script_PlayerAtFirstLookAtEzlo EndBlock script_08012AB2: - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a Jump script_08012AB2 .2byte 0x0000 diff --git a/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc b/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc index f53814e1..017b7111 100644 --- a/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc +++ b/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerDefeatedOctoroks EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0388, 0x0180 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc b/data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc index edf2a936..1082a4b1 100644 --- a/data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc +++ b/data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerEzloBeingBullied BeginBlock SetEntitySpeed 0x0080 EndBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x0004 Wait 0x003c diff --git a/data/scripts/cutscene/intro/script_HouseDoorIntro.inc b/data/scripts/cutscene/intro/script_HouseDoorIntro.inc index 45d64e58..089a2992 100644 --- a/data/scripts/cutscene/intro/script_HouseDoorIntro.inc +++ b/data/scripts/cutscene/intro/script_HouseDoorIntro.inc @@ -11,7 +11,7 @@ SCRIPT_START script_HouseDoorIntro PlaySound SFX_F1 DoPostScriptAction 0x0007 Wait 0x005a - _0807E778 0x0004 + SetFadeTime 0x0004 @ Circle transition _0807E80C 0x00000000 WaitForFadeFinish @ Wait for end of transition diff --git a/data/scripts/cutscene/intro/script_IntroCameraTarget.inc b/data/scripts/cutscene/intro/script_IntroCameraTarget.inc index 1df4f5a3..764464ad 100644 --- a/data/scripts/cutscene/intro/script_IntroCameraTarget.inc +++ b/data/scripts/cutscene/intro/script_IntroCameraTarget.inc @@ -5,7 +5,7 @@ SCRIPT_START script_IntroCameraTarget SetEntitySpeed 0x0080 Wait 0x0078 PlayBgm BGM_MINISH_CAP - _0807E778 0x0002 + SetFadeTime 0x0002 @ Fade in DoFade4 WaitForFadeFinish @ TODO wait for fade to be finished diff --git a/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc b/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc index 4fe5b4ae..9acf2548 100644 --- a/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc @@ -3,11 +3,11 @@ SCRIPT_START script_Npc4EOutsideLinksHouse BeginBlock SetEntityPositionRelative 0x0238, 0x01a8 Call sub_0807F844 - Call sub_0807F348 - _0807E864 + Call SetPriorityMessage + SetPlayerIdle Call sub_0807DF28 EndBlock - _0807E778 0x0010 + SetFadeTime 0x0010 DoFade6 WaitForFadeFinish SetSyncFlag 0x00000001 @@ -15,7 +15,7 @@ SCRIPT_START script_Npc4EOutsideLinksHouse _0807F0B4 0x0004 CameraTargetPlayer Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/intro/script_Object69Intro.inc b/data/scripts/cutscene/intro/script_Object69Intro.inc index 059bb9f7..1e643580 100644 --- a/data/scripts/cutscene/intro/script_Object69Intro.inc +++ b/data/scripts/cutscene/intro/script_Object69Intro.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Object69Intro BeginBlock Call sub_0807DF28 - _0807E864 + SetPlayerIdle SetSyncFlag 0x00000000 EndBlock WaitForFadeFinish @@ -11,6 +11,6 @@ SCRIPT_START script_Object69Intro WaitForSyncFlagAndClear 0x00000001 SetGlobalFlag 0x001c Call sub_0807DF50 - _0807E878 + EnablePlayerControl Call sub_0807921C SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_PlayerIntro.inc b/data/scripts/cutscene/intro/script_PlayerIntro.inc index e89495c8..5f06f18e 100644 --- a/data/scripts/cutscene/intro/script_PlayerIntro.inc +++ b/data/scripts/cutscene/intro/script_PlayerIntro.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerIntro BeginBlock Call sub_0807DF28 - _0807E864 + SetPlayerIdle SetLocalFlag 0x0046 EndBlock WaitForFadeFinish @@ -18,7 +18,7 @@ SCRIPT_START script_PlayerIntro Wait 0x001e @ Give control to the player? Call sub_08053250 - _0807E878 + EnablePlayerControl Call sub_0807DF50 Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_SmithIntro.inc b/data/scripts/cutscene/intro/script_SmithIntro.inc index d26a3683..ae998135 100644 --- a/data/scripts/cutscene/intro/script_SmithIntro.inc +++ b/data/scripts/cutscene/intro/script_SmithIntro.inc @@ -1,37 +1,37 @@ @ Intro Smith 1 SCRIPT_START script_SmithIntro BeginBlock - Call sub_0807F348 + Call SetPriorityMessage SetEntitySpeed 0x0040 - _0807EB44 0x0004 - _0807E930 0x000c - _0807E908 0x0003 + SetAnimationState 0x0004 + SetAnimation 0x000c + SetAction 0x0003 EndBlock Wait 0x001e CameraTargetEntity - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E800 0x00000000 WaitForFadeFinish WaitForSyncFlagAndClear 0x00000008 DoPostScriptAction 0x0004 Wait 0x001e - _0807E930 0x000b + SetAnimation 0x000b Wait 0x001e MessageFromTarget 0x1002 WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 - _0807E908 0x0001 - _0807EB44 0x0004 + SetAction 0x0001 + SetAnimationState 0x0004 _0807EDD4 0x00b8, 0x005c - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0001 MessageFromTarget 0x1004 WaitUntilTextboxCloses DoPostScriptAction 0x0000 Wait 0x001e - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade5 WaitForFadeFinish Call sub_08053634 diff --git a/data/scripts/cutscene/intro/script_SmithIntro2.inc b/data/scripts/cutscene/intro/script_SmithIntro2.inc index fff723fa..b9760692 100644 --- a/data/scripts/cutscene/intro/script_SmithIntro2.inc +++ b/data/scripts/cutscene/intro/script_SmithIntro2.inc @@ -1,21 +1,21 @@ @ Intro Smith 2 SCRIPT_START script_SmithIntro2 BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 SetEntitySpeed 0x0080 _0807E9D4 - Call sub_0807F348 + Call SetPriorityMessage EndBlock CheckGlobalFlag 0x0013 JumpIf script_08009C4C - _0807E888 + DisablePlayerControl Wait 0x000a - _0807E864 + SetPlayerIdle StartPlayerScript script_PlayerMoveToSmith Call sub_0807DF28 WaitForSyncFlagAndClear 0x00000008 _0807EDD4 0x0080, 0x005c - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 Wait 0x000f DoPostScriptAction 0x0001 @@ -25,7 +25,7 @@ SCRIPT_START script_SmithIntro2 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 - _0807EB8C + FaceAwayFromPlayer DoPostScriptAction 0x0001 MessageFromTargetPos 0x100b, 0x0000 WaitUntilTextboxCloses @@ -36,7 +36,7 @@ SCRIPT_START script_SmithIntro2 Wait 0x000f DoPostScriptAction 0x000d _0807EDD4 0x0084, 0x005c - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x000c DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 @@ -57,10 +57,10 @@ script_08009C4C: script_08009C50: CheckEntityInteractType JumpIfNot script_08009C50 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x100e - _0807E878 + EnablePlayerControl Jump script_08009C50 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/intro/script_ZeldaIntro.inc b/data/scripts/cutscene/intro/script_ZeldaIntro.inc index 6f2c28ec..f9dd8999 100644 --- a/data/scripts/cutscene/intro/script_ZeldaIntro.inc +++ b/data/scripts/cutscene/intro/script_ZeldaIntro.inc @@ -1,9 +1,9 @@ @ Intro Zelda at Smith SCRIPT_START script_ZeldaIntro BeginBlock - Call sub_0807F348 + Call SetPriorityMessage SetEntitySpeed 0x00c0 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0008 EndBlock WaitForSyncFlagAndClear 0x00000004 diff --git a/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc b/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc index 7386e1cf..164293e8 100644 --- a/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc @@ -2,7 +2,7 @@ SCRIPT_START script_ZeldaLeaveLinksHouse BeginBlock SetEntitySpeed 0x0100 - _0807EB44 0x0006 + SetAnimationState 0x0006 EndBlock _0807EDD4 0x0078, 0x0060 _0807EDD4 0x0078, 0x007c @@ -11,7 +11,7 @@ SCRIPT_START script_ZeldaLeaveLinksHouse Wait 0x0008 _0807EDD4 0x0078, 0x0098 DoPostScriptAction 0x0008 - _0807E778 0x0010 + SetFadeTime 0x0010 DoFade5 WaitForFadeFinish Call sub_08053634 diff --git a/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc b/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc index 9a200b2f..dfd487d0 100644 --- a/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc @@ -6,12 +6,12 @@ SCRIPT_START script_ZeldaOutsideLinksHouse Call sub_08066D04 Call sub_08066D14 SetEntityPositionRelative 0x01e8, 0x0180 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000001 Call sub_08066E08 - _0807E864 + SetPlayerIdle MessageFromTargetPos 0x1010, 0x000c WaitUntilTextboxCloses SetSyncFlag 0x00000002 @@ -22,41 +22,41 @@ script_08014D1E: CheckPlayerInRegion 0x01d8, 0x0160, 0x3050 JumpIfNot script_08014D1E EndBlock - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 MessageNoOverlap 0x1012 WaitUntilTextboxCloses - _0807EC64 0x0040 - _0807EB44 0x0004 + WalkNorth 0x0040 + SetAnimationState 0x0004 Call sub_08066E08 SetEntityPositionRelative 0x01f8, 0x00c8 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08014D60: @ Between trees CallWithArg sub_0807F6B4, 0x000000e8 JumpIf script_08014D60 - _0807E864 + SetPlayerIdle Call sub_0807DF28 MessageNoOverlap 0x1013 WaitUntilTextboxCloses - _0807EC64 0x0040 - _0807EB44 0x0004 + WalkNorth 0x0040 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetEntityPositionRelative 0x01e8, 0x0028 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08014D96: @ Before hyrule town entry CheckPlayerInRegion 0x01f8, 0x0028, 0x2040 JumpIfNot script_08014D96 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 MessageNoOverlap 0x1014 WaitUntilTextboxCloses - _0807EC64 0x0018 + WalkNorth 0x0018 .ifdef JP SetLocalFlag 0x006b .else @@ -71,6 +71,6 @@ script_08014D96: .endif .endif Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc index 282bbec0..31780509 100644 --- a/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc +++ b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc @@ -1,28 +1,28 @@ @ Intro Zelda at Smith 2 SCRIPT_START script_ZeldaTalkToSmith BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 SetEntitySpeed 0x0100 - Call sub_0807F348 + Call SetPriorityMessage EndBlock WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0004 - _0807EB74 + FacePlayer WaitForSyncFlagAndClear 0x00000004 - _0807EB74 + FacePlayer WaitForSyncFlagAndClear 0x00000004 - _0807EB74 - _0807EB8C + FacePlayer + FaceAwayFromPlayer DoPostScriptAction 0x0001 MessageFromTargetPos 0x100a, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807EB8C + FaceAwayFromPlayer DoPostScriptAction 0x0001 - _0807EB8C - _0807EB44 0x0002 + FaceAwayFromPlayer + SetAnimationState 0x0002 MessageFromTargetPos 0x100d, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 @@ -35,7 +35,7 @@ SCRIPT_START script_ZeldaTalkToSmith SetGlobalFlag 0x0013 Call sub_0807DF50 Call sub_080791D0 - _0807E878 + EnablePlayerControl EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/introAssembly/script_GuardAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_GuardAtAssembly.inc index 804be255..1c324e64 100644 --- a/data/scripts/cutscene/introAssembly/script_GuardAtAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_GuardAtAssembly.inc @@ -1,19 +1,19 @@ @ Intro Assembly Guard SCRIPT_START script_GuardAtAssembly BeginBlock - _0807EB44 0x0000 - _0807E930 0x0000 + SetAnimationState 0x0000 + SetAnimation 0x0000 EndBlock WaitForSyncFlag 0x00000010 PlaySound SFX_11C - _0807E930 0x0001 + SetAnimation 0x0001 Wait 0x0010 PlaySound SFX_11C - _0807EB44 0x0004 - _0807E930 0x0006 + SetAnimationState 0x0004 + SetAnimation 0x0006 Wait 0x0010 DoPostScriptAction 0x000f SetEntitySpeed 0x0200 - _0807ECC4 0x1c20 + WalkSouth 0x1c20 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc index 5ea4ba26..fe73a920 100644 --- a/data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc @@ -1,57 +1,57 @@ @ Intro Assembly King Daltus SCRIPT_START script_KingDaltusAtAssembly BeginBlock - Call sub_0807F348 + Call SetPriorityMessage SetEntitySpeed 0x0100 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 _0807E9D4 DoPostScriptAction 0x000a EndBlock WaitForSyncFlagAndClear 0x00000080 - _0807EB44 0x0004 - _0807ECC4 0x0008 - _0807E930 0x0004 + SetAnimationState 0x0004 + WalkSouth 0x0008 + SetAnimation 0x0004 MessageFromTargetPos 0x1050, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 - _0807E930 0x0004 + SetAnimation 0x0004 MessageFromTargetPos 0x1052, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 - _0807EB44 0x0006 - _0807E930 0x0005 + SetAnimationState 0x0006 + SetAnimation 0x0005 MessageFromTargetPos 0x1054, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 - _0807EB44 0x0004 + SetAnimationState 0x0004 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 - _0807E930 0x0004 + SetAnimation 0x0004 MessageFromTargetPos 0x1056, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 - _0807E930 0x0004 + SetAnimation 0x0004 MessageFromTargetPos 0x1057, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 - _0807E930 0x0004 + SetAnimation 0x0004 MessageFromTargetPos 0x1058, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 - _0807E930 0x0004 + SetAnimation 0x0004 MessageFromTargetPos 0x105c, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 @@ -59,10 +59,10 @@ SCRIPT_START script_KingDaltusAtAssembly script_0800917C: CheckEntityInteractType JumpIfNot script_0800917C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806673C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800917C diff --git a/data/scripts/cutscene/introAssembly/script_MinisterPothoAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_MinisterPothoAtAssembly.inc index fe1106ed..1ea38210 100644 --- a/data/scripts/cutscene/introAssembly/script_MinisterPothoAtAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_MinisterPothoAtAssembly.inc @@ -1,16 +1,16 @@ @ Intro Assembly Minister Potho SCRIPT_START script_MinisterPothoAtAssembly BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000004 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 - _0807EB44 0x0002 + SetAnimationState 0x0002 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807EB44 0x0004 + SetAnimationState 0x0004 SetSyncFlag 0x00000008 BeginBlock _0807E9D4 diff --git a/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc b/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc index e871a204..ca9a741d 100644 --- a/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc @@ -6,12 +6,12 @@ SCRIPT_START script_Npc4EIntroAssembly script_08008E12: CheckPlayerInRegion 0x00d8, 0x0098, 0x4020 JumpIfNot script_08008E12 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 _0807F0B4 0x0001 CameraTargetEntity - WaitForPlayerAction0x17 + WaitForPlayerEnterRoom Wait 0x003c StartPlayerScript script_PlayerEnters WaitForSyncFlagAndClear 0x00000020 @@ -62,7 +62,7 @@ script_08008E12: GivePlayerItem 0x0047 WaitPlayerGetItem SetIntVariable 0x00000003 - Call sub_0807F420 + Call LoadMenu _0807E8E4_0 SetSyncFlag 0x00000080 WaitForSyncFlagAndClear 0x00000100 @@ -71,7 +71,7 @@ script_08008E12: SetGlobalFlag 0x0015 Call sub_0806DCC0 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc b/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc index c2b49497..b5bf75ce 100644 --- a/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc @@ -5,13 +5,13 @@ SCRIPT_START script_PlayerEnters EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x00b8, 0x0090 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000040 DoPostScriptAction 0x0001 _0807EDD4 0x0088, 0x0078 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 Wait 0x000f SetSyncFlag 0x00000020 diff --git a/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc b/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc index af4e4dd7..e2fd2766 100644 --- a/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc @@ -1,10 +1,10 @@ @ Intro Assembly Player gets Sword SCRIPT_START script_PlayerGetSword _0807F078 0x0001, 0x0001 - CallWithArg sub_0807F918, 0x00000001 + CallWithArg PutItemAnySlot, 0x00000001 PlaySound SFX_109 - CallWithArg sub_0807F238, 0x0000045f - Call sub_0807F304 + CallWithArg SetPlayerAnimation2, 0x0000045f + Call WaitForPlayerFrameHiBit MessageFromTargetPos 0x0501, 0x000e WaitUntilTextboxCloses SetSyncFlag 0x00000020 diff --git a/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc b/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc index 931c03f4..862275c2 100644 --- a/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerWakingUpInHyruleCastle BeginBlock Call sub_0807DF28 - _0807E864 + SetPlayerIdle .ifdef JP SetLocalFlag 0x009e .else @@ -18,16 +18,16 @@ SCRIPT_START script_PlayerWakingUpInHyruleCastle .endif EndBlock Wait 0x003c - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade4 WaitForFadeFinish script_08009EA4: - Call sub_0807F0D8 + Call CheckAnyKeyPressed JumpIfNot script_08009EA4 DoPostScriptAction 0x0014 Wait 0x000a Call sub_08053250 - _0807E878 + EnablePlayerControl Call sub_0807DF50 Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc index 56c32d55..63184c10 100644 --- a/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc @@ -1,19 +1,19 @@ @ Intro Assembly Smith SCRIPT_START script_SmithAtAssembly BeginBlock - Call sub_0807F348 - _0807EB44 0x0006 + Call SetPriorityMessage + SetAnimationState 0x0006 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000001 - _0807EB74 + FacePlayer DoPostScriptAction 0x0001 MessageFromTargetPos 0x105b, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 @@ -27,21 +27,21 @@ SCRIPT_START script_SmithAtAssembly WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x0004 Wait 0x003c - _0807EB74 - _0807EB8C + FacePlayer + FaceAwayFromPlayer DoPostScriptAction 0x0001 MessageFromTargetPos 0x1055, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - _0807EB74 + FacePlayer SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 _0807EDD4 0x0098, 0x0078 - _0807EB74 + FacePlayer DoPostScriptAction 0x0000 DoPostScriptAction 0x0001 MessageFromTargetPos 0x1059, 0x0000 diff --git a/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc b/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc index 6771b682..2a9be68c 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc @@ -2,20 +2,20 @@ SCRIPT_START script_080157AC CheckPlayerInRegion 0x01f8, 0x0310, 0x2020 JumpIfNot script_080157AC - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_080157DA: CheckPlayerInRegion 0x0250, 0x0230, 0x3040 JumpIfNot script_080157DA - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 @@ -23,7 +23,7 @@ script_080157DA: _0807F0B4 0x0001 SetEntityPositionRelative 0x0248, 0x0218 CameraTargetEntity - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder WaitForSyncFlagAndClear 0x00000010 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000020 @@ -38,7 +38,7 @@ script_080157DA: SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Call sub_08066F94 SetSyncFlag 0x00000008 script_08015880: @@ -48,7 +48,7 @@ script_08015888: WaitUntilTextboxCloses ComparePlayerAction 0x001c JumpIf script_08015888 - _0807E864 + SetPlayerIdle Call sub_0807DF28 _0807F0B4 0x0002 SetEntityPositionRelative 0x0248, 0x0208 @@ -79,7 +79,7 @@ script_08015888: .endif Call sub_08066FB8 Call sub_0807DF50 - _0807E878 + EnablePlayerControl _0807F0B4 0x0004 CameraTargetPlayer DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc b/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc index 0ec77806..f56416aa 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc @@ -1,7 +1,7 @@ @ OBJECT_6A in sub_080954AC ? businessScrubPrologue? SCRIPT_START script_08015B14 BeginBlock - _0807E930 0x0018 + SetAnimation 0x0018 SetEntitySpeed 0x0300 EndBlock _0807EDD4 0x0248, 0x0218 diff --git a/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc b/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc index d93ccb08..f58c6a2e 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc @@ -20,15 +20,15 @@ SCRIPT_START script_08015B34 CallWithArg sub_0807F6B4, 0x00000318 JumpIfNot script_08015B34 EndBlock - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 MessageFromTargetPos 0x2506, 0x0002 WaitUntilTextboxCloses StartPlayerScript script_PlayerAtIntroBusinessScrub4 WaitForSyncFlagAndClear 0x00000004 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_08015B34 script_08015B7E: DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/introBusinessScrub/script_BusinessScrubIntro.inc b/data/scripts/cutscene/introBusinessScrub/script_BusinessScrubIntro.inc index 52ceeee2..e81470fa 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_BusinessScrubIntro.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_BusinessScrubIntro.inc @@ -3,15 +3,15 @@ SCRIPT_START script_BusinessScrubIntro BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000008 - _0807E908 0x0007 + SetAction 0x0007 WaitForSyncFlagAndClear 0x00000008 - _0807E908 0x0006 + SetAction 0x0006 SetRoomFlag 0x0000 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 WaitForSyncFlagAndClear 0x00000008 Wait 0x003c diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc index 02806a81..605ee80e 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc @@ -2,8 +2,8 @@ SCRIPT_START script_PlayerAtIntroBusinessScrub4 SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 - _0807EC64 0x0010 - _0807EB44 0x0000 + WalkNorth 0x0010 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 Call sub_080791BC diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc index a83e7979..36e3e08b 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerIntroBusinessScrub1 SetEntitySpeed 0x0100 _0807EDD4 0x0218, 0x0238 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 Call sub_080791BC diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc index ca673adf..d5c30e2a 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerIntroBusinessScrub2 SetEntitySpeed 0x0100 _0807EDD4 0x0238, 0x0228 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 Call sub_080791BC diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc index d9bb7e36..deea175d 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerIntroBusinessScrub3 SetEntitySpeed 0x0100 _0807EDD4 0x0248, 0x0208 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 Call sub_080791BC diff --git a/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc index 1d91c7f0..ae7c5633 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc @@ -12,39 +12,39 @@ SCRIPT_START script_ZeldaIntroBusinessScrub MoveEntityToPlayer EndBlock DoPostScriptAction 0x0007 - _0807EB74 + FacePlayer _0807EDD4 0x01f8, 0x02f8 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 MessageFromTargetPos 0x1011, 0x0002 WaitUntilTextboxCloses _0807EDD4 0x01f8, 0x0268 SetEntityPositionRelative 0x0248, 0x0218 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 Call sub_0807F3C8 PlaySound SFX_VO_ZELDA3 SetEntitySpeed 0x0200 - _0807ECC4 0x0008 - _0807E930 0x0040 - Call sub_0807F2D4 - _0807EB44 0x0006 + WalkSouth 0x0008 + SetAnimation 0x0040 + Call WaitForFrameHiBit + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 _0807EDD4 0x0238, 0x0238 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a _0807E9D4 @@ -52,7 +52,7 @@ SCRIPT_START script_ZeldaIntroBusinessScrub script_08015A32: EndBlock BeginBlock - _0807EB74 + FacePlayer CheckRoomFlag 0x0000 JumpIf script_08015A54 CheckEntityInteractType @@ -64,7 +64,7 @@ script_08015A32: script_08015A54: EndBlock DoPostScriptAction 0x000b - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 WaitForSyncFlagAndClear 0x00000001 Call sub_08066D4C diff --git a/data/scripts/cutscene/introCeremony/script_08011890.inc b/data/scripts/cutscene/introCeremony/script_08011890.inc index 9ccc9bc5..b6f22f79 100644 --- a/data/scripts/cutscene/introCeremony/script_08011890.inc +++ b/data/scripts/cutscene/introCeremony/script_08011890.inc @@ -1,7 +1,7 @@ @ Something during Intro Ceremony? Called via script_VaatiIntroCeremony SCRIPT_START script_08011890 BeginBlock - _0807E930 0x0000 + SetAnimation 0x0000 SetEntitySpeed 0x0200 Call nullsub_527 Call sub_08094B80 diff --git a/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc b/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc index 59b81dea..826ad37f 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc @@ -3,33 +3,33 @@ SCRIPT_START script_GuardBottomRight ClearSyncFlag 0x00002000 SetSyncFlag 0x00004000 WaitForSyncFlagAndClear 0x00002000 - _0807E930 0x0005 - _0807EB44 0x0002 - _0807EC94 0x0010 - _0807EB44 0x0004 - _0807E930 0x0002 + SetAnimation 0x0005 + SetAnimationState 0x0002 + WalkEast 0x0010 + SetAnimationState 0x0004 + SetAnimation 0x0002 SetSyncFlag 0x00004000 WaitForSyncFlagAndClear 0x00002000 DoPostScriptAction 0x0004 Wait 0x003c - _0807E930 0x0012 + SetAnimation 0x0012 PlaySound SFX_EM_MOBLIN_SPEAR Wait 0x003c - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0100 _0807EDD4 0x0200, 0x0098 _0807EDD4 0x0200, 0x00c8 - _0807E930 0x0013 + SetAnimation 0x0013 SetSyncFlag 0x00004000 WaitForSyncFlagAndClear 0x00002000 DoPostScriptAction 0x0010 Wait 0x000a DoPostScriptAction 0x0010 Call sub_0807F3C8 - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0400 SetEntityDirection 0x0002 - _0807EC1C 0x003c + WalkForward 0x003c 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 33d049b7..a2cdf5ff 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc @@ -5,17 +5,17 @@ SCRIPT_START script_GuardCarryingChest DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 Call sub_08095244 - Call sub_0807F338 + Call DeleteHitbox EndBlock WaitForSyncFlag 0x0002a800 DoPostScriptAction 0x0007 - _0807E930 0x0006 - _0807ECC4 0x0010 + SetAnimation 0x0006 + WalkSouth 0x0010 Wait 0x003c - _0807ECC4 0x0010 + WalkSouth 0x0010 Wait 0x003c - _0807ECC4 0x0010 - _0807E930 0x0002 + WalkSouth 0x0010 + SetAnimation 0x0002 Call sub_08064050 JumpTable script_08011312, script_GuardBottomRight, script_GuardTopLeft, script_GuardTopRight @ Guard bottom left: @@ -23,33 +23,33 @@ script_08011312: ClearSyncFlag 0x00000800 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 - _0807E930 0x0007 - _0807EB44 0x0006 - _0807ECF4 0x0010 - _0807EB44 0x0004 - _0807E930 0x0002 + SetAnimation 0x0007 + SetAnimationState 0x0006 + WalkWest 0x0010 + SetAnimationState 0x0004 + SetAnimation 0x0002 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 DoPostScriptAction 0x0004 Wait 0x003c - _0807E930 0x0012 + SetAnimation 0x0012 PlaySound SFX_EM_MOBLIN_SPEAR Wait 0x003c - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0100 _0807EDD4 0x01f0, 0x0098 _0807EDD4 0x01f0, 0x00c8 - _0807E930 0x0013 + SetAnimation 0x0013 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 DoPostScriptAction 0x0010 Wait 0x000a DoPostScriptAction 0x0010 Call sub_0807F3C8 - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0400 SetEntityDirection 0x001e - _0807EC1C 0x003c + WalkForward 0x003c 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 c826ed27..297a4f5c 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardEntryLeft.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardEntryLeft.inc @@ -2,14 +2,14 @@ SCRIPT_START script_GuardEntryLeft BeginBlock SetEntitySpeed 0x0100 - _0807EB44 0x0002 - _0807E930 0x0001 + SetAnimationState 0x0002 + SetAnimation 0x0001 EndBlock WaitForSyncFlagAndClear 0x00080000 - _0807E930 0x0005 + SetAnimation 0x0005 PlaySound SFX_11C - _0807ECF4 0x0010 - _0807E930 0x0001 + WalkWest 0x0010 + SetAnimation 0x0001 SetSyncFlag 0x00100000 WaitForSyncFlagAndClear 0x00080000 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/introCeremony/script_GuardEntryRight.inc b/data/scripts/cutscene/introCeremony/script_GuardEntryRight.inc index 3a132ca8..20ab6b1b 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardEntryRight.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardEntryRight.inc @@ -2,14 +2,14 @@ SCRIPT_START script_GuardEntryRight BeginBlock SetEntitySpeed 0x0100 - _0807EB44 0x0006 - _0807E930 0x0003 + SetAnimationState 0x0006 + SetAnimation 0x0003 EndBlock WaitForSyncFlagAndClear 0x00200000 - _0807E930 0x0007 + SetAnimation 0x0007 PlaySound SFX_11C - _0807EC94 0x0010 - _0807E930 0x0003 + WalkEast 0x0010 + SetAnimation 0x0003 SetSyncFlag 0x00400000 WaitForSyncFlagAndClear 0x00200000 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc b/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc index d8dd17d9..b92edbd5 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc @@ -3,42 +3,42 @@ SCRIPT_START script_GuardTopLeft ClearSyncFlag 0x00008000 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 - _0807E930 0x0007 - _0807EB44 0x0006 - _0807ECF4 0x0020 - _0807EB44 0x0004 - _0807E930 0x0006 - _0807ECC4 0x0010 - _0807E930 0x0002 + SetAnimation 0x0007 + SetAnimationState 0x0006 + WalkWest 0x0020 + SetAnimationState 0x0004 + SetAnimation 0x0006 + WalkSouth 0x0010 + SetAnimation 0x0002 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x0004 Wait 0x003c - _0807E930 0x0012 + SetAnimation 0x0012 PlaySound SFX_EM_MOBLIN_SPEAR SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0100 _0807EDD4 0x01e8, 0x0098 SetEntitySpeed 0x0040 _0807EEF4 0x0000, 0x0010 - _0807E930 0x0013 + SetAnimation 0x0013 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x000d - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0020 _0807EEF4 0x0000, 0xfff0 - _0807E930 0x0013 + SetAnimation 0x0013 DoPostScriptAction 0x0010 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 Call sub_0807F3C8 - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0400 SetEntityDirection 0x001e - _0807EC1C 0x003c + WalkForward 0x003c 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 1a5b8eb3..5a29854c 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc @@ -3,42 +3,42 @@ SCRIPT_START script_GuardTopRight ClearSyncFlag 0x00020000 SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 - _0807E930 0x0005 - _0807EB44 0x0002 - _0807EC94 0x0020 - _0807EB44 0x0004 - _0807E930 0x0006 - _0807ECC4 0x0010 - _0807E930 0x0002 + SetAnimation 0x0005 + SetAnimationState 0x0002 + WalkEast 0x0020 + SetAnimationState 0x0004 + SetAnimation 0x0006 + WalkSouth 0x0010 + SetAnimation 0x0002 SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 DoPostScriptAction 0x0004 Wait 0x003c - _0807E930 0x0012 + SetAnimation 0x0012 PlaySound SFX_EM_MOBLIN_SPEAR SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0100 _0807EDD4 0x0208, 0x0098 SetEntitySpeed 0x0040 _0807EEF4 0x0000, 0x0010 - _0807E930 0x0013 + SetAnimation 0x0013 SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 DoPostScriptAction 0x000d - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0020 _0807EEF4 0x0000, 0xfff0 - _0807E930 0x0013 + SetAnimation 0x0013 DoPostScriptAction 0x0010 SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 Call sub_0807F3C8 - _0807E930 0x0014 + SetAnimation 0x0014 SetEntitySpeed 0x0400 SetEntityDirection 0x0002 - _0807EC1C 0x003c + WalkForward 0x003c SetSyncFlag 0x00040000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc b/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc index cab32512..afefc1f7 100644 --- a/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc +++ b/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc @@ -2,10 +2,10 @@ SCRIPT_START script_KingDaltusIntroCeremony BeginBlock DoPostScriptAction 0x0008 - _0807EB44 0x0004 + SetAnimationState 0x0004 SetEntitySpeed 0x0100 EndBlock - Call sub_0807F338 + Call DeleteHitbox WaitForSyncFlagAndClear 0x00000040 DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 @@ -20,7 +20,7 @@ SCRIPT_START script_KingDaltusIntroCeremony Call sub_0807F3C8 SetEntitySpeed 0x0400 SetEntityDirection 0x0008 - _0807EC1C 0x003c + WalkForward 0x003c 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 0af3031f..3cf08be1 100644 --- a/data/scripts/cutscene/introCeremony/script_MinisterPothoIntroCastle.inc +++ b/data/scripts/cutscene/introCeremony/script_MinisterPothoIntroCastle.inc @@ -1,7 +1,7 @@ @ Intro Hyrule Castle Minister Potho SCRIPT_START script_MinisterPothoIntroCastle BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 .ifdef JP .ifndef DEMO_JP @@ -22,18 +22,18 @@ script_08011134: DoPostScriptAction 0x000b WaitForSyncFlagAndClear 0x00000004 SetEntityPositionRelative 0x01b8, 0x0058 - _0807EB44 0x0004 + SetAnimationState 0x0004 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807EB44 0x0006 + SetAnimationState 0x0006 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - _0807EB44 0x0004 + SetAnimationState 0x0004 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 - _0807ECC4 0x0010 + WalkSouth 0x0010 DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 @@ -43,7 +43,7 @@ script_08011134: Call sub_0807F3C8 SetEntitySpeed 0x0400 SetEntityDirection 0x001c - _0807EC1C 0x003c + WalkForward 0x003c SetSyncFlag 0x00000008 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc index f64d4428..4385bb7b 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc @@ -13,7 +13,7 @@ SCRIPT_START script_Npc4EMonsters PlaySound SFX_12C SetSyncFlag 0x00800000 WaitForSyncFlagAndClear 0x01000000 - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade7 WaitForFadeFinish Wait 0x003c @@ -22,14 +22,14 @@ SCRIPT_START script_Npc4EMonsters LoadRoomEntityList gUnk_080F0770 SetSyncFlag 0x00000010 WaitForSyncFlagAndClear 0x00000020 - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade6 WaitForFadeFinish CallWithArg DeleteManager36, 0x00000002 _0807F0C8 0x0000, 0x0000 Call sub_0806DC3C Call sub_080791BC - CallWithArg sub_0807F244, 0x0000000d + CallWithArg EquipItem, 0x0000000d CallWithArg sub_0807F29C, gUnk_080049F6 _0807F0B4 0x0001 SetEntityPositionRelative 0x01f8, 0x0068 diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc index 69a6d693..54bd0c43 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc @@ -9,7 +9,7 @@ SCRIPT_START script_Npc4EVaatiAttacking WaitUntilTextboxCloses Call sub_0806DC3C Call sub_080791BC - CallWithArg sub_0807F244, 0x0000000d + CallWithArg EquipItem, 0x0000000d CallWithArg sub_0807F29C, gUnk_080049F6 Wait 0x001e SetSyncFlag 0x00000100 diff --git a/data/scripts/cutscene/introCeremony/script_Object6ASwordInChest.inc b/data/scripts/cutscene/introCeremony/script_Object6ASwordInChest.inc index 3b4b91f2..2932134e 100644 --- a/data/scripts/cutscene/introCeremony/script_Object6ASwordInChest.inc +++ b/data/scripts/cutscene/introCeremony/script_Object6ASwordInChest.inc @@ -12,7 +12,7 @@ SCRIPT_START script_Object6ASwordInChest Wait 0x003c SetSyncFlag 0x01000000 WaitForSyncFlagAndClear 0x00800000 - _0807E930 0x0002 + SetAnimation 0x0002 SetSyncFlag 0x01000000 WaitForSyncFlagAndClear 0x00800000 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc b/data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc index 0d800ec9..33d0784c 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc @@ -1,7 +1,7 @@ @ Intro Ceremony Player SCRIPT_START script_PlayerAtIntroCeremony SetEntityPositionRelative 0x01a8, 0x0058 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 ClearSyncFlag 0x00000002 diff --git a/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc b/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc index 386826af..880c2d9e 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc @@ -1,17 +1,17 @@ @ Intro Ceremony Player fainting SCRIPT_START script_PlayerFainting PlaySound SFX_PLY_VO6 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000d PlaySound SFX_86 Call sub_0807F36C SetEntitySpeed 0x0400 - _0807ECF4 0x0008 + WalkWest 0x0008 BeginBlock Call sub_0807F1E8 DoPostScriptAction 0x0011 EndBlock - Call sub_0807F2D4 + Call WaitForFrameHiBit 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 f3d1557d..78be94a1 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerIntroCastle SetEntitySpeed 0x0080 EndBlock _0807EDD4 0x01e8, 0x0050 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 Call sub_080791BC diff --git a/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc b/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc index e0c26443..dc4e414f 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc @@ -6,7 +6,7 @@ SCRIPT_START script_PlayerProtectingZelda SetEntitySpeed 0x0200 DoPostScriptAction 0x0001 _0807EDD4 0x01d8, 0x0068 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 Call sub_080791BC diff --git a/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc b/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc index c00eb537..24b9f903 100644 --- a/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc +++ b/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc @@ -1,7 +1,7 @@ @ Intro Ceremony Vaati Dark magic? SCRIPT_START script_VaatiDarkMagic BeginBlock - _0807E930 0x0000 + SetAnimation 0x0000 SetEntitySpeed 0x0200 Call nullsub_527 Call sub_08094B80 diff --git a/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc b/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc index 2557a4c2..13d6fa8c 100644 --- a/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc +++ b/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc @@ -1,37 +1,37 @@ @ Intro Ceremony Vaati SCRIPT_START script_VaatiIntroCeremony BeginBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 SetEntitySpeed 0x0100 EndBlock - Call sub_0807F338 + Call DeleteHitbox WaitForSyncFlagAndClear 0x00000100 DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x00d0 DoPostScriptAction 0x0000 SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000100 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x001c - Call sub_0807F2D4 - _0807EB44 0x0004 + Call WaitForFrameHiBit + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000100 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x001c - Call sub_0807F2D4 - _0807EB44 0x0000 + Call WaitForFrameHiBit + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000100 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x001a - Call sub_0807F2D4 + Call WaitForFrameHiBit DoPostScriptAction 0x0000 SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000100 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0014 PlaySound SFX_CHARGING_UP CallWithArg sub_08095420, script_08011890 @@ -45,7 +45,7 @@ SCRIPT_START script_VaatiIntroCeremony SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 _0807EDD4 0x01d8, 0x00a8 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000100 @@ -65,14 +65,14 @@ SCRIPT_START script_VaatiIntroCeremony SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0098 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x0004 Wait 0x005a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x001c - Call sub_0807F2D4 - _0807EB44 0x0004 + Call WaitForFrameHiBit + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Wait 0x001e SetSyncFlag 0x00000200 diff --git a/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc b/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc index b0554ed0..cfe741b1 100644 --- a/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc +++ b/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc @@ -5,20 +5,20 @@ SCRIPT_START script_ZeldaIntroCastle SetEntitySpeed 0x0100 Call sub_08066D04 EndBlock - Call sub_0807F338 + Call DeleteHitbox WaitForSyncFlagAndClear 0x00000010 Call sub_08066D14 JumpIf script_080111F6 MoveEntityToPlayer script_080111F6: - Call sub_0807F8BC + Call CheckEntityOnScreen JumpIf script_08011206 SetEntityPositionRelative 0x01f8, 0x00b8 script_08011206: DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0050 - _0807EB74 + FacePlayer DoPostScriptAction 0x0000 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 @@ -48,7 +48,7 @@ script_08011206: Call sub_08066E20 Wait 0x0014 DoPostScriptAction 0x0010 - Call sub_0807F2D4 + Call WaitForFrameHiBit PlaySound SFX_1CA SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 diff --git a/data/scripts/cutscene/introTown/script_BeedleIntro.inc b/data/scripts/cutscene/introTown/script_BeedleIntro.inc index e0e1359b..743a6c56 100644 --- a/data/scripts/cutscene/introTown/script_BeedleIntro.inc +++ b/data/scripts/cutscene/introTown/script_BeedleIntro.inc @@ -1,20 +1,20 @@ @ Intro Hyrule Town Beedle SCRIPT_START script_BeedleIntro BeginBlock - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 _0807E9D4 DoPostScriptAction 0x000a - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_0800F604: CheckEntityInteractType JumpIfNot script_0800F604 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000008 MessageNoOverlap 0x2511 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800F604 diff --git a/data/scripts/cutscene/introTown/script_GuardIntro.inc b/data/scripts/cutscene/introTown/script_GuardIntro.inc index 9424bff8..e35ab50f 100644 --- a/data/scripts/cutscene/introTown/script_GuardIntro.inc +++ b/data/scripts/cutscene/introTown/script_GuardIntro.inc @@ -1,7 +1,7 @@ @ Intro Hyrule Town Guard SCRIPT_START script_GuardIntro BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000008 @@ -9,11 +9,11 @@ SCRIPT_START script_GuardIntro script_0800F5C8: CheckEntityInteractType JumpIfNot script_0800F5C8 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000008 Call sub_08064428 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800F5C8 .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_KidIntro1.inc b/data/scripts/cutscene/introTown/script_KidIntro1.inc index c705c186..e3ccdb3a 100644 --- a/data/scripts/cutscene/introTown/script_KidIntro1.inc +++ b/data/scripts/cutscene/introTown/script_KidIntro1.inc @@ -8,11 +8,11 @@ SCRIPT_START script_KidIntro1 script_0800F592: CheckEntityInteractType JumpIfNot script_0800F592 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806265C WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0001 Jump script_0800F592 .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_KidIntro2.inc b/data/scripts/cutscene/introTown/script_KidIntro2.inc index 008ef2e8..dfc9c3ce 100644 --- a/data/scripts/cutscene/introTown/script_KidIntro2.inc +++ b/data/scripts/cutscene/introTown/script_KidIntro2.inc @@ -23,11 +23,11 @@ script_0800F6F4: JumpIf script_0800F718 CheckEntityInteractType JumpIfNot script_0800F6F4 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806265C WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0001 Jump script_0800F6F4 script_0800F718: diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc index ea3471c4..722006a3 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc @@ -1,7 +1,7 @@ @ Intro Hyrule Castle NPC4E SCRIPT_START script_Npc4EIntroCastle - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerIntroCastle WaitForSyncFlagAndClear 0x00000400 @@ -17,7 +17,7 @@ SCRIPT_START script_Npc4EIntroCastle MessageFromTargetPos 0x1038, 0x000c WaitUntilTextboxCloses StopBgm - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade5 WaitForFadeFinish Call sub_08064180 @@ -38,7 +38,7 @@ SCRIPT_START script_Npc4EIntroCastle CameraTargetEntity Wait 0x000a _0807F0B4 0x0001 - _0807E778 0x0001 + SetFadeTime 0x0001 DoFade4 SetSyncFlag 0x0002a800 WaitForSyncFlagAndClear 0x00055000 diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc index 67df44fd..409387ac 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc @@ -14,23 +14,23 @@ SCRIPT_START script_Npc4EIntroTown .endif .endif JumpIf script_0800FA4C - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x00c8, 0x0148 Call sub_0807F844 - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade6 WaitForFadeFinish StartPlayerScript script_PlayerIntro1 SetSyncFlag 0x00000002 _0807F0B4 0x0001 SetEntityPositionRelative 0x00c8, 0x0218 - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder Wait 0x0064 @ Camera reaches center of town square _0807F0B4 0x0002 SetEntityPositionRelative 0x00c8, 0x0368 - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder WaitForSyncFlagAndClear 0x00000001 WaitForSyncFlagAndClear 0x00000004 @ First message from Zelda @@ -42,10 +42,10 @@ SCRIPT_START script_Npc4EIntroTown _0807F0B4 0x0004 CameraTargetPlayer Call sub_0807DF50 - _0807E878 + EnablePlayerControl SetSyncFlag 0x00000010 WaitForSyncFlagAndClear 0x00000004 - _0807E864 + SetPlayerIdle Call sub_0807DF28 StartPlayerScript script_PlayerIntro2 WaitForSyncFlagAndClear 0x00000001 @@ -56,9 +56,9 @@ SCRIPT_START script_Npc4EIntroTown SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 Call sub_0807DF50 - _0807E878 + EnablePlayerControl WaitForSyncFlagAndClear 0x00000004 - _0807E864 + SetPlayerIdle Call sub_0807DF28 StartPlayerScript script_PlayerIntro3 WaitForSyncFlagAndClear 0x00000001 @@ -69,9 +69,9 @@ SCRIPT_START script_Npc4EIntroTown SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 Call sub_0807DF50 - _0807E878 + EnablePlayerControl WaitForSyncFlagAndClear 0x00000004 - _0807E864 + SetPlayerIdle Call sub_0807DF28 StartPlayerScript script_PlayerIntro4 WaitForSyncFlagAndClear 0x00000001 @@ -82,16 +82,16 @@ SCRIPT_START script_Npc4EIntroTown SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 Call sub_0807DF50 - _0807E878 + EnablePlayerControl @ Wait for Link at Pina WaitForSyncFlagAndClear 0x00000004 - _0807E864 + SetPlayerIdle Call sub_0807DF28 Call sub_08063C5C PlaySound SFX_CUCCO_MINIGAME_BELL Wait 0x001e _0807E8E4_0 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c MessageFromTargetPos 0x1021, 0x000e WaitUntilTextboxCloses @@ -152,7 +152,7 @@ SCRIPT_START script_Npc4EIntroTown Call sub_08094E0C Wait 0x001e _0807E8E4_1 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c MessageFromTargetPos 0x102b, 0x0000 WaitUntilTextboxCloses @@ -161,7 +161,7 @@ SCRIPT_START script_Npc4EIntroTown WaitPlayerGetItem Call sub_0806DC3C Call sub_080791BC - CallWithArg sub_0807F244, 0x0000000d + CallWithArg EquipItem, 0x0000000d SetIntVariable 0x000000ff Call sub_0807F5B0 CallWithArg sub_0807F29C, gUnk_080049D6 @@ -192,7 +192,7 @@ SCRIPT_START script_Npc4EIntroTown .endif .endif Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_0800FA4C: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introTown/script_Object69IntroTown.inc b/data/scripts/cutscene/introTown/script_Object69IntroTown.inc index ff9f8d27..a2710b62 100644 --- a/data/scripts/cutscene/introTown/script_Object69IntroTown.inc +++ b/data/scripts/cutscene/introTown/script_Object69IntroTown.inc @@ -33,24 +33,24 @@ script_0800FD1A: .endif .endif JumpIf script_0800FD5C - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal MessageFromTargetPos 0x2506, 0x0000 WaitUntilTextboxCloses StartPlayerScript script_PlayerIntroTown WaitForSyncFlagAndClear 0x00000008 - _0807E878 + EnablePlayerControl Jump script_0800FD1A script_0800FD50: CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040 JumpIfNot script_0800FD50 script_0800FD5C: - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal MessageFromTargetPos 0x106c, 0x0000 WaitUntilTextboxCloses StartPlayerScript script_PlayerIntroTown WaitForSyncFlagAndClear 0x00000008 - _0807E878 + EnablePlayerControl Jump script_0800FD50 .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_PercyIntro.inc b/data/scripts/cutscene/introTown/script_PercyIntro.inc index a8fda42a..5904f8a8 100644 --- a/data/scripts/cutscene/introTown/script_PercyIntro.inc +++ b/data/scripts/cutscene/introTown/script_PercyIntro.inc @@ -1,7 +1,7 @@ @ Intro Hyrule Town Percy SCRIPT_START script_PercyIntro BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a _0807E9D4 @@ -9,13 +9,13 @@ SCRIPT_START script_PercyIntro script_0800F662: CheckEntityInteractType JumpIfNot script_0800F662 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0001 Call sub_0806B4F0 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0000 Jump script_0800F662 .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_PinaIntro.inc b/data/scripts/cutscene/introTown/script_PinaIntro.inc index bfe9dcf9..bc9ec670 100644 --- a/data/scripts/cutscene/introTown/script_PinaIntro.inc +++ b/data/scripts/cutscene/introTown/script_PinaIntro.inc @@ -1,17 +1,17 @@ @ Intro Hyrule Town Pina SCRIPT_START script_PinaIntro BeginBlock - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 _0807E9D4 DoPostScriptAction 0x000a - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_0800F6A0: CheckEntityInteractType JumpIfNot script_0800F6A0 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000004 .ifdef JP CheckLocalFlag 0x00ca @@ -34,7 +34,7 @@ script_0800F6C4: script_0800F6C8: WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl CallWithArg sub_0807F3D8, 0x00000000 Jump script_0800F6A0 .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro1.inc b/data/scripts/cutscene/introTown/script_PlayerIntro1.inc index 4732932e..d5a09109 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro1.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro1.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerIntro1 SetEntitySpeed 0x0100 EndBlock SetEntityPositionRelative 0x00d8, 0x0398 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro2.inc b/data/scripts/cutscene/introTown/script_PlayerIntro2.inc index 94540b8a..986893df 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro2.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro2.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerIntro2 SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x00a0, 0x0278 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro3.inc b/data/scripts/cutscene/introTown/script_PlayerIntro3.inc index 4f48ea8c..d2eda272 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro3.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro3.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerIntro3 SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0078, 0x01c0 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro4.inc b/data/scripts/cutscene/introTown/script_PlayerIntro4.inc index 9d304aea..33307f8c 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro4.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro4.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerIntro4 SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0108, 0x01c8 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro5.inc b/data/scripts/cutscene/introTown/script_PlayerIntro5.inc index ce887cd2..e90538d7 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro5.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro5.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerIntro5 BeginBlock SetEntitySpeed 0x0100 EndBlock - Call sub_0807F584 + Call ReadPlayerAnimationState JumpTable script_0800FB06, script_0800FB10, script_0800FB06, script_0800FAFC script_0800FAFC: CallWithArg sub_0807F4F8, 0x0000027c @@ -11,7 +11,7 @@ script_0800FB06: CallWithArg sub_0807F464, 0x000000e8 script_0800FB10: _0807EDD4 0x00e8, 0x0270 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/introTown/script_PlayerIntroTown.inc b/data/scripts/cutscene/introTown/script_PlayerIntroTown.inc index a15642df..453e2bbe 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntroTown.inc @@ -1,8 +1,8 @@ @ Hyrule Town Intro Player SCRIPT_START script_PlayerIntroTown SetEntitySpeed 0x0080 - _0807EC64 0x0020 - _0807EB44 0x0000 + WalkNorth 0x0020 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 Call sub_080791BC diff --git a/data/scripts/cutscene/introTown/script_TownsperonIntro.inc b/data/scripts/cutscene/introTown/script_TownsperonIntro.inc index 27ae1e54..7db70671 100644 --- a/data/scripts/cutscene/introTown/script_TownsperonIntro.inc +++ b/data/scripts/cutscene/introTown/script_TownsperonIntro.inc @@ -8,11 +8,11 @@ SCRIPT_START script_TownsperonIntro script_0800F564: CheckEntityInteractType JumpIfNot script_0800F564 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08061FE4 Call sub_08061FF4 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800F564 .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_WindtribespeopleIntro.inc b/data/scripts/cutscene/introTown/script_WindtribespeopleIntro.inc index 14a141fe..20a998f3 100644 --- a/data/scripts/cutscene/introTown/script_WindtribespeopleIntro.inc +++ b/data/scripts/cutscene/introTown/script_WindtribespeopleIntro.inc @@ -6,12 +6,12 @@ SCRIPT_START script_WindtribespeopleIntro DoPostScriptAction 0x0001 EndBlock script_0800F636: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_0800F636 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800F636 .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc b/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc index 6cda5954..a9d511f9 100644 --- a/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc @@ -13,25 +13,25 @@ SCRIPT_START script_ZeldaIntroTown script_0800FB6C: DoPostScriptAction 0x0007 SetEntityPositionRelative 0x00b8, 0x0398 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 _0807EDD4 0x00b8, 0x0318 SetEntityPositionRelative 0x00a0, 0x0260 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0001 SetSyncFlag 0x00000004 DoPostScriptAction 0x000a _0807E9D4 script_0800FBAE: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_0800FBAE DoPostScriptAction 0x000b SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 @@ -40,41 +40,41 @@ script_0800FBAE: _0807EDD4 0x0070, 0x0268 _0807EDD4 0x0070, 0x0208 SetEntityPositionRelative 0x0078, 0x01a8 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0001 SetSyncFlag 0x00000004 DoPostScriptAction 0x000a script_0800FC06: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_0800FC06 DoPostScriptAction 0x000b SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 _0807EDD4 0x00f8, 0x01a8 SetEntityPositionRelative 0x0118, 0x01c8 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0001 SetSyncFlag 0x00000004 DoPostScriptAction 0x000a script_0800FC52: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_0800FC52 DoPostScriptAction 0x000b SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 _0807EDD4 0x0118, 0x0260 SetEntityPositionRelative 0x00f8, 0x0270 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0001 SetSyncFlag 0x00000004 DoPostScriptAction 0x000a @@ -83,22 +83,22 @@ script_0800FC9E: CheckEntityInteractType JumpIfNot script_0800FC9E DoPostScriptAction 0x000b - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 DoPostScriptAction 0x0004 WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x000d SetEntitySpeed 0x0040 - _0807EC94 0x0020 - _0807EB44 0x0000 + WalkEast 0x0020 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x000c SetEntitySpeed 0x0040 - _0807ECF4 0x0020 - _0807EB44 0x0006 + WalkWest 0x0020 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 diff --git a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc index 2f96db73..b09e0dbf 100644 --- a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc @@ -5,15 +5,15 @@ SCRIPT_START script_HurdyGurdyManFirstKinstone DoPostScriptAction 0x0008 DoPostScriptAction 0x000a EndBlock - Call sub_0807F348 - _0807EB44 0x0002 + Call SetPriorityMessage + SetAnimationState 0x0002 WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 _0807EDD4 0x01b8, 0x0328 SetSyncFlag 0x00000040 _0807EDD4 0x01f8, 0x0328 - _0807EB44 0x0004 - _0807E930 0x0008 + SetAnimationState 0x0004 + SetAnimation 0x0008 _0807E8E4_0 SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000002 @@ -27,65 +27,65 @@ script_0800F1E6: CallWithArg sub_0807F680, 0x000001c0 JumpIf script_0800F22A EndBlock - _0807E864 - Call sub_0807F9A4 - _0807EB74 - _0807E930 0x0008 + SetPlayerIdle + Call WaitForPlayerNormal + FacePlayer + SetAnimation 0x0008 DoPostScriptAction 0x0004 Wait 0x003c MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone1 WaitForSyncFlagAndClear 0x00000400 - _0807E878 + EnablePlayerControl Jump script_0800F1E6 script_0800F22A: CallWithArg sub_0807F680, 0x00000230 JumpIfNot script_0800F26A EndBlock - _0807E864 - Call sub_0807F9A4 - _0807EB74 - _0807E930 0x0008 + SetPlayerIdle + Call WaitForPlayerNormal + FacePlayer + SetAnimation 0x0008 DoPostScriptAction 0x0004 Wait 0x003c MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone2 WaitForSyncFlagAndClear 0x00000400 - _0807E878 + EnablePlayerControl Jump script_0800F1E6 script_0800F26A: CallWithArg sub_0807F6B4, 0x00000310 JumpIf script_0800F2AA EndBlock - _0807E864 - Call sub_0807F9A4 - _0807EB74 - _0807E930 0x0008 + SetPlayerIdle + Call WaitForPlayerNormal + FacePlayer + SetAnimation 0x0008 DoPostScriptAction 0x0004 Wait 0x003c MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone3 WaitForSyncFlagAndClear 0x00000400 - _0807E878 + EnablePlayerControl Jump script_0800F1E6 script_0800F2AA: CallWithArg sub_0807F6B4, 0x00000340 JumpIfNot script_0800F2EA EndBlock - _0807E864 - Call sub_0807F9A4 - _0807EB74 - _0807E930 0x0008 + SetPlayerIdle + Call WaitForPlayerNormal + FacePlayer + SetAnimation 0x0008 DoPostScriptAction 0x0004 Wait 0x003c MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone4 WaitForSyncFlagAndClear 0x00000400 - _0807E878 + EnablePlayerControl Jump script_0800F1E6 script_0800F2EA: EndBlock @@ -95,19 +95,19 @@ script_0800F2EA: CheckEntityInteractType JumpIfNot script_0800F2EA EndBlock - _0807E864 - _0807EB74 - _0807E930 0x0008 + SetPlayerIdle + FacePlayer + SetAnimation 0x0008 MessageFromTargetPos 0x1208, 0x000c WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800F1E6 script_0800F314: EndBlock SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 - _0807EB44 0x0002 + SetAnimationState 0x0002 _0807EEF4 0x00c0, 0x0000 SetSyncFlag 0x00000040 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone1.inc b/data/scripts/cutscene/kinstones/script_KidKinstone1.inc index 21c9883d..c4eae773 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone1.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone1.inc @@ -2,19 +2,19 @@ SCRIPT_START script_KidKinstone1 BeginBlock _0807E9D4 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0001 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 DoPostScriptAction 0x000b EndBlock - Call sub_0807F348 + Call SetPriorityMessage WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0007 _0807EDD4 0x01f8, 0x0318 _0807EDD4 0x0208, 0x0318 _0807EDD4 0x0208, 0x0338 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a SetSyncFlag 0x00000080 @@ -24,11 +24,11 @@ script_0800F3EA: CheckEntityInteractType JumpIfNot script_0800F402 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x1237 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl script_0800F402: CheckSyncFlagAndClear 0x00000004 JumpIfNot script_0800F3EA @@ -36,7 +36,7 @@ script_0800F402: DoPostScriptAction 0x000b Wait 0x0010 SetEntitySpeed 0x0100 - _0807EC64 0x0010 + WalkNorth 0x0010 _0807EDD4 0x0288, 0x0328 SetSyncFlag 0x00000080 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone2.inc b/data/scripts/cutscene/kinstones/script_KidKinstone2.inc index d3cdd400..16f69917 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone2.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone2.inc @@ -2,18 +2,18 @@ SCRIPT_START script_KidKinstone2 BeginBlock _0807E9D4 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0001 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 DoPostScriptAction 0x000b EndBlock - Call sub_0807F348 + Call SetPriorityMessage WaitForSyncFlagAndClear 0x00000008 DoPostScriptAction 0x0007 _0807EDD4 0x01d8, 0x0328 _0807EDD4 0x01f8, 0x0348 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a SetSyncFlag 0x00000100 @@ -23,11 +23,11 @@ script_0800F478: CheckEntityInteractType JumpIfNot script_0800F490 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x1238 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl script_0800F490: CheckSyncFlagAndClear 0x00000008 JumpIfNot script_0800F478 @@ -35,8 +35,8 @@ script_0800F490: DoPostScriptAction 0x000b Wait 0x0018 SetEntitySpeed 0x0100 - _0807EC94 0x0010 - _0807EC64 0x0020 + WalkEast 0x0010 + WalkNorth 0x0020 _0807EDD4 0x0288, 0x0328 SetSyncFlag 0x00000100 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone3.inc b/data/scripts/cutscene/kinstones/script_KidKinstone3.inc index 1039e878..04145775 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone3.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone3.inc @@ -2,18 +2,18 @@ SCRIPT_START script_KidKinstone3 BeginBlock _0807E9D4 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0001 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 DoPostScriptAction 0x000b EndBlock - Call sub_0807F348 + Call SetPriorityMessage WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0007 _0807EDD4 0x01c8, 0x0328 _0807EDD4 0x01e8, 0x0338 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a SetSyncFlag 0x00000200 @@ -23,11 +23,11 @@ script_0800F50C: CheckEntityInteractType JumpIfNot script_0800F524 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x1239 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl script_0800F524: CheckSyncFlagAndClear 0x00000010 JumpIfNot script_0800F50C @@ -35,7 +35,7 @@ script_0800F524: DoPostScriptAction 0x000b Wait 0x0028 SetEntitySpeed 0x0100 - _0807EC64 0x0010 + WalkNorth 0x0010 _0807EDD4 0x0288, 0x0328 SetSyncFlag 0x00000200 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc index 80a76584..b3afd418 100644 --- a/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc @@ -7,8 +7,8 @@ SCRIPT_START script_Npc4EFirstKinstone script_0800F09A: CheckPlayerInRegion 0x01f8, 0x0338, 0x1030 JumpIfNot script_0800F09A - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 LoadRoomEntityList gUnk_080EE8AC StartPlayerScript script_PlayerAtFirstKinstone @@ -30,19 +30,19 @@ script_0800F09A: WaitUntilTextboxCloses SetSyncFlag 0x00000002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl WaitForSyncFlagAndClear 0x00000040 script_0800F11A: CheckKinstoneFused 0x0032 JumpIfNot script_0800F11A - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetSyncFlag 0x0000001e Wait 0x003c _0807E8E4_1 WaitForSyncFlagAndClear 0x000003c0 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc index d039a201..58479b51 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc @@ -4,12 +4,12 @@ SCRIPT_START script_PlayerAtFirstKinstone SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0000 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0004 Wait 0x003c DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0338 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc index 941d969d..7d7223dc 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc @@ -1,7 +1,7 @@ @ Player at Hyrule Town Kinstone cutscene HurdyGurdyMan SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone1 SetEntitySpeed 0x0100 - _0807EC94 0x0008 + WalkEast 0x0008 SetSyncFlag 0x00000400 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc index 8bcc7ac1..86076092 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc @@ -1,7 +1,7 @@ @ Player at Hyrule Town Kinstone cutscene HurdyGurdyMan 2 SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone2 SetEntitySpeed 0x0100 - _0807ECF4 0x0008 + WalkWest 0x0008 SetSyncFlag 0x00000400 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc index a86cda57..c64ab60a 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc @@ -1,7 +1,7 @@ @ Player at Hyrule Town Kinstone cutscene HurdyGurdyMan 3 SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone3 SetEntitySpeed 0x0100 - _0807ECC4 0x0008 + WalkSouth 0x0008 SetSyncFlag 0x00000400 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc index 01316111..5b436fa5 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc @@ -1,7 +1,7 @@ @ Player at Hyrule Town Kinstone cutscene HurdyGurdyMan 4 SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone4 SetEntitySpeed 0x0100 - _0807EC64 0x0008 + WalkNorth 0x0008 SetSyncFlag 0x00000400 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc index c1d7b3bb..f0e29084 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc @@ -5,12 +5,12 @@ SCRIPT_START script_ForestMinish5 DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f - Call sub_0807F338 + Call DeleteHitbox EndBlock WaitForSyncFlagAndClear 0x00000200 DoPostScriptAction 0x0007 _0807EDD4 0x0208, 0x0308 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 WaitForSyncFlagAndClear 0x00000200 diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc index 06076fd2..ea9e43fd 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc @@ -5,14 +5,14 @@ SCRIPT_START script_ForestMinish6 DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f - Call sub_0807F338 + Call DeleteHitbox EndBlock WaitForSyncFlagAndClear 0x00000800 DoPostScriptAction 0x0007 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0001 _0807EDD4 0x01a8, 0x0330 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc index 4e862a77..db6366f1 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc @@ -5,12 +5,12 @@ SCRIPT_START script_ForestMinish7 DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f - Call sub_0807F338 + Call DeleteHitbox EndBlock WaitForSyncFlagAndClear 0x00002000 DoPostScriptAction 0x0007 _0807EDD4 0x0258, 0x0330 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00004000 WaitForSyncFlagAndClear 0x00002000 diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc index 945415dc..302f4367 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc @@ -5,12 +5,12 @@ SCRIPT_START script_ForestMinish8 DoPostScriptAction 0x0000 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f - Call sub_0807F338 + Call DeleteHitbox EndBlock WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x0007 _0807EDD4 0x01b8, 0x0320 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc index 4b350a06..38805f14 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc @@ -5,12 +5,12 @@ SCRIPT_START script_ForestMinish9 DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f - Call sub_0807F338 + Call DeleteHitbox EndBlock WaitForSyncFlagAndClear 0x00020000 DoPostScriptAction 0x0007 _0807EDD4 0x0268, 0x0338 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 diff --git a/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc b/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc index 6419dba0..045da40d 100644 --- a/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc +++ b/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc @@ -1,19 +1,19 @@ @ Minish Village OBJECT_69 Intro Cutscene? SCRIPT_START script_Object69VillageIntro BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 SetEntitySpeed 0x0300 EndBlock script_0800C928: CheckPlayerInRegion 0x0208, 0x0360, 0x2040 JumpIfNot script_0800C928 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerAtVillageIntro WaitForSyncFlagAndClear 0x00000002 Wait 0x003c - _0807EB28 0x1125 + EzloMessage 0x1125 WaitUntilTextboxCloses SetSyncFlag 0x00000800 _0807E8E4_3 @@ -41,7 +41,7 @@ script_0800C928: WaitForSyncFlagAndClear 0x00000400 _0807E8E4_0 MessageFromTarget 0x1126 - Call sub_0807F40C + Call CreatePlayerQuestionMark WaitUntilTextboxCloses SetSyncFlag 0x00000200 SetSyncFlag 0x00000800 @@ -74,10 +74,10 @@ script_0800C928: WaitForSyncFlagAndClear 0x00010000 WaitForSyncFlagAndClear 0x00040000 _0807E8E4_0 - _0807EB28 0x1129 + EzloMessage 0x1129 WaitUntilTextboxCloses SetLocalFlag 0x008d Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc b/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc index 5931fc5e..d0c52080 100644 --- a/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc +++ b/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc @@ -4,18 +4,18 @@ SCRIPT_START script_EzloCapExplainingOriginStory SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 EndBlock - _0807E930 0x001f + SetAnimation 0x001f Call sub_0806D944 WaitForSyncFlagAndClear 0x00000008 - _0807E930 0x0010 + SetAnimation 0x0010 MessageFromTargetPos 0x1314, 0x000c WaitUntilTextboxCloses - _0807E930 0x0018 + SetAnimation 0x0018 Call sub_0806D8A0 script_080153C2: _0807EE30 JumpIfNot script_080153C2 - _0807E930 0x001f + SetAnimation 0x001f StartPlayerScript script_PlayerReceivedExposition Call sub_0806D9A4 DoPostScriptAction 0x0008 diff --git a/data/scripts/cutscene/originStory/script_MinishEzlo.inc b/data/scripts/cutscene/originStory/script_MinishEzlo.inc index bd1ee7c1..5acc0d71 100644 --- a/data/scripts/cutscene/originStory/script_MinishEzlo.inc +++ b/data/scripts/cutscene/originStory/script_MinishEzlo.inc @@ -3,24 +3,24 @@ SCRIPT_START script_MinishEzlo BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 - _0807EB44 0x0000 - Call sub_0807F338 + SetAnimationState 0x0000 + Call DeleteHitbox EndBlock CallWithArg sub_0806AF60, 0x00000000 WaitForSyncFlagAndClear 0x00008000 CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0078, 0x00b8 - _0807EB44 0x0000 + SetAnimationState 0x0000 CallWithArg sub_0806AF60, 0x00000000 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x000d - _0807EB44 0x0000 + SetAnimationState 0x0000 CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0078, 0x00c8 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 - _0807EB44 0x0000 + SetAnimationState 0x0000 CallWithArg sub_0806AF60, 0x00000000 DoPostScriptAction 0x0010 Wait 0x0028 @@ -33,8 +33,8 @@ SCRIPT_START script_MinishEzlo DoPostScriptAction 0x0010 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 - _0807E930 0x000d - Call sub_0807F2D4 + SetAnimation 0x000d + Call WaitForFrameHiBit SetSyncFlag 0x00010000 Wait 0x003c DoPostScriptAction 0x0005 diff --git a/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc b/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc index c505a57d..b6217240 100644 --- a/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc +++ b/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc @@ -19,7 +19,7 @@ SCRIPT_START script_Object69CameraTarget SetSyncFlag 0x00000800 WaitForSyncFlagAndClear 0x00001000 StopBgm - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade5 WaitForFadeFinish SetRoomFlag 0x0001 diff --git a/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc b/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc index 2ad51bff..8f2e5cee 100644 --- a/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc +++ b/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc @@ -6,7 +6,7 @@ SCRIPT_START script_Object69MinishVaati CameraTargetEntity EndBlock PlayBgm BGM_EZLO_STORY - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade4 WaitForFadeFinish Wait 0x003c diff --git a/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc b/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc index b1f37aad..411aae34 100644 --- a/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc +++ b/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc @@ -7,8 +7,8 @@ SCRIPT_START script_Object69VaatiAppears script_08014FCC: CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040 JumpIfNot script_08014FCC - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StopBgm _0807F0B4 0x0001 @@ -17,24 +17,24 @@ script_08014FCC: WaitForSyncFlagAndClear 0x00000001 MessageFromTargetPos 0x1301, 0x0002 WaitUntilTextboxCloses - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 PlayBgm BGM_VAATI_THEME - _0807EB28 0x1302 + EzloMessage 0x1302 WaitUntilTextboxCloses MessageFromTargetPos 0x1303, 0x0002 WaitUntilTextboxCloses - _0807EB28 0x1304 + EzloMessage 0x1304 WaitUntilTextboxCloses MessageFromTargetPos 0x1305, 0x0002 WaitUntilTextboxCloses SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 - _0807EB28 0x1306 + EzloMessage 0x1306 WaitUntilTextboxCloses StopBgm StartPlayerScript script_PlayerTryToFollowVaati @@ -71,13 +71,13 @@ script_08014FCC: LoadRoomEntityList gUnk_080F7FC0 PlayBgm BGM_FIGHT_THEME Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08015104: CheckRoomFlag 0x0000 JumpIfNot script_08015104 @ Defeated Moblins - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StopBgm StartPlayerScript script_PlayerDefeatedMoblins @@ -120,35 +120,35 @@ script_08015104: .endif .endif .endif - _0807EB28 0x130c + EzloMessage 0x130c WaitUntilTextboxCloses @ Ezlo cutscene starts CameraTargetPlayer - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E80C 0x00000000 WaitForFadeFinish Call sub_08053B3C BeginBlock - _0807E864 - CallWithArg sub_0807F6E8, 0x00000008 + SetPlayerIdle + CallWithArg SetPlayerFlag, 0x00000008 MoveEntityToPlayer _0807F0B4 0x0004 CameraTargetEntity - _0807E778 0x0100 + SetFadeTime 0x0100 DoFade4 _0807E80C 0x00000000 EndBlock StartPlayerScript script_PlayerSeenOriginStory WaitForSyncFlagAndClear 0x00000001 LoadRoomEntityList gUnk_080F7CB0 - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E800 0x00000000 WaitForFadeFinish SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000010 BeginBlock _0807E8E4_2 - _0807EB28 0x1315 + EzloMessage 0x1315 EndBlock WaitUntilTextboxCloses _0807F0B4 0x0004 @@ -156,6 +156,6 @@ script_08015104: Call sub_08054570 PlayBGM Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_Object6ADarkMagic.inc b/data/scripts/cutscene/originStory/script_Object6ADarkMagic.inc index 8b914690..786b7314 100644 --- a/data/scripts/cutscene/originStory/script_Object6ADarkMagic.inc +++ b/data/scripts/cutscene/originStory/script_Object6ADarkMagic.inc @@ -1,7 +1,7 @@ @ Ezlo Cutscene OBJECT_6A dark magic SCRIPT_START script_Object6ADarkMagic BeginBlock - _0807E930 0x0000 + SetAnimation 0x0000 SetEntitySpeed 0x0200 Call sub_08094B80 EndBlock diff --git a/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc b/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc index 93cafa90..75e76a5b 100644 --- a/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc +++ b/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc @@ -16,8 +16,8 @@ SCRIPT_START script_Object6AMinishCap Wait 0x003c SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 - _0807E930 0x0001 - Call sub_0807F2D4 + SetAnimation 0x0001 + Call WaitForFrameHiBit DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc b/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc index 39c0de0c..429a13fd 100644 --- a/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc +++ b/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerAtVaatisAppearance EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x00b8 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc b/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc index 76d0f7dc..253e6517 100644 --- a/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc +++ b/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerDefeatedMoblins EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0148 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc b/data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc index 0445fe14..1418123b 100644 --- a/data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc +++ b/data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerSeenOriginStory SetEntitySpeed 0x0100 SetEntityPositionRelative 0x0208, 0x0148 EndBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc b/data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc index 4f30a21d..26d0e170 100644 --- a/data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc +++ b/data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc @@ -1,14 +1,14 @@ @ Player Outside Castle when stones appear before Moblin Fight SCRIPT_START script_PlayerStoneWallsAppear - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc b/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc index 50664ad7..f6eb5063 100644 --- a/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc +++ b/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerTryToFollowVaati EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0148 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/originStory/script_Vaati.inc b/data/scripts/cutscene/originStory/script_Vaati.inc index fd727120..3a48e430 100644 --- a/data/scripts/cutscene/originStory/script_Vaati.inc +++ b/data/scripts/cutscene/originStory/script_Vaati.inc @@ -3,17 +3,17 @@ SCRIPT_START script_Vaati BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0017 - Call sub_0807F180 + Call SetCollisionLayer2 EndBlock WaitForSyncFlagAndClear 0x00000800 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0017 Wait 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0017 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x001b SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 @@ -23,19 +23,19 @@ SCRIPT_START script_Vaati SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 DoPostScriptAction 0x0018 - Call sub_0807F2D4 - _0807EB44 0x0004 + Call WaitForFrameHiBit + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0014 CallWithArg sub_0809545C, script_Object6ADarkMagic PlaySound SFX_1C4 Wait 0x0078 DoPostScriptAction 0x0016 WaitForSyncFlagAndClear 0x00020000 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 diff --git a/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc b/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc index 26990404..8e9cce5d 100644 --- a/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc +++ b/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc @@ -2,9 +2,9 @@ SCRIPT_START script_VaatiAppearsAgain BeginBlock DoPostScriptAction 0x0008 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 - Call sub_0807F354 + Call SetPriorityPlayerEvent EndBlock WaitForSyncFlagAndClear 0x00000002 Call sub_08066C94 @@ -14,9 +14,9 @@ SCRIPT_START script_VaatiAppearsAgain SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 Wait 0x0014 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x001c - Call sub_0807F2D4 + Call WaitForFrameHiBit DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 @@ -25,7 +25,7 @@ SCRIPT_START script_VaatiAppearsAgain SetEntitySpeed 0x0200 DoPostScriptAction 0x000d DoPostScriptAction 0x0000 - _0807ECC4 0x0030 + WalkSouth 0x0030 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 a923e5cc..e2b67e76 100644 --- a/data/scripts/cutscene/outro/script_EzloCapOutro.inc +++ b/data/scripts/cutscene/outro/script_EzloCapOutro.inc @@ -2,16 +2,16 @@ SCRIPT_START script_EzloCapOutro BeginBlock SetEntitySpeed 0x0080 - SetEntity0x20 0x00000000 + SetEntityVelocity 0x00000000 DoPostScriptAction 0x0008 - _0807EB44 0x0000 + SetAnimationState 0x0000 Call sub_0807F714 MoveEntityToPlayer - CallWithArg sub_0807F98C, 0xfff00000 + CallWithArg SetEntityHeight, 0xfff00000 EndBlock - _0807E930 0x0023 + SetAnimation 0x0023 WaitForSyncFlagAndClear 0x00000010 - CallWithArg sub_0807F6E8, 0x00000008 + CallWithArg SetPlayerFlag, 0x00000008 DoPostScriptAction 0x0007 PlaySound SFX_SPARKLES ClearSyncFlag 0x00000800 @@ -22,7 +22,7 @@ SCRIPT_START script_EzloCapOutro SetSyncFlag 0x00000800 PlaySound SFX_143 _0807EF3C 0x0000, 0x0020 - _0807E930 0x001f + SetAnimation 0x001f SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000010 Wait 0x0078 diff --git a/data/scripts/cutscene/outro/script_EzloZeldaMagic.inc b/data/scripts/cutscene/outro/script_EzloZeldaMagic.inc index e7707cc8..59336b95 100644 --- a/data/scripts/cutscene/outro/script_EzloZeldaMagic.inc +++ b/data/scripts/cutscene/outro/script_EzloZeldaMagic.inc @@ -3,7 +3,7 @@ SCRIPT_START script_EzloZeldaMagic BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - CallWithArg sub_0807F994, 0x0000fff8 + CallWithArg SetSpriteOffset, 0x0000fff8 EndBlock WaitForSyncFlag 0x00000020 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/outro/script_GuardStoneOutro1.inc b/data/scripts/cutscene/outro/script_GuardStoneOutro1.inc index bdfb1c15..fbd46660 100644 --- a/data/scripts/cutscene/outro/script_GuardStoneOutro1.inc +++ b/data/scripts/cutscene/outro/script_GuardStoneOutro1.inc @@ -2,17 +2,17 @@ SCRIPT_START script_GuardStoneOutro1 BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x0010 + SetAnimationState 0x0004 + SetAnimation 0x0010 EndBlock WaitForSyncFlag 0x00000001 - _0807E930 0x0002 + SetAnimation 0x0002 WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0004 Wait 0x003c script_0800A80C: - _0807E930 0x0001 + SetAnimation 0x0001 Wait 0x001e - _0807E930 0x0003 + SetAnimation 0x0003 Wait 0x001e Jump script_0800A80C diff --git a/data/scripts/cutscene/outro/script_GuardStoneOutro2.inc b/data/scripts/cutscene/outro/script_GuardStoneOutro2.inc index 59f06757..02015418 100644 --- a/data/scripts/cutscene/outro/script_GuardStoneOutro2.inc +++ b/data/scripts/cutscene/outro/script_GuardStoneOutro2.inc @@ -2,17 +2,17 @@ SCRIPT_START script_GuardStoneOutro2 BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x0010 + SetAnimationState 0x0004 + SetAnimation 0x0010 EndBlock WaitForSyncFlag 0x00000001 - _0807E930 0x0002 + SetAnimation 0x0002 WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c script_0800A848: - _0807E930 0x0001 + SetAnimation 0x0001 Wait 0x0014 - _0807E930 0x0003 + SetAnimation 0x0003 Wait 0x0014 Jump script_0800A848 diff --git a/data/scripts/cutscene/outro/script_GuardStoneOutro3.inc b/data/scripts/cutscene/outro/script_GuardStoneOutro3.inc index f7d9c800..e65ac209 100644 --- a/data/scripts/cutscene/outro/script_GuardStoneOutro3.inc +++ b/data/scripts/cutscene/outro/script_GuardStoneOutro3.inc @@ -2,17 +2,17 @@ SCRIPT_START script_GuardStoneOutro3 BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x0010 + SetAnimationState 0x0004 + SetAnimation 0x0010 EndBlock WaitForSyncFlag 0x00000001 - _0807E930 0x0002 + SetAnimation 0x0002 WaitForSyncFlagAndClear 0x00000008 DoPostScriptAction 0x0004 Wait 0x003c script_0800A884: - _0807E930 0x0001 + SetAnimation 0x0001 Wait 0x000a - _0807E930 0x0003 + SetAnimation 0x0003 Wait 0x000a Jump script_0800A884 diff --git a/data/scripts/cutscene/outro/script_MaidStoneOutro1.inc b/data/scripts/cutscene/outro/script_MaidStoneOutro1.inc index 46f28809..74ac7962 100644 --- a/data/scripts/cutscene/outro/script_MaidStoneOutro1.inc +++ b/data/scripts/cutscene/outro/script_MaidStoneOutro1.inc @@ -2,8 +2,8 @@ SCRIPT_START script_MaidStoneOutro1 BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x0008 + SetAnimationState 0x0004 + SetAnimation 0x0008 EndBlock WaitForSyncFlag 0x00000001 DoPostScriptAction 0x0000 @@ -11,8 +11,8 @@ SCRIPT_START script_MaidStoneOutro1 DoPostScriptAction 0x0004 Wait 0x003c script_0800A8C0: - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x0019 - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x0019 Jump script_0800A8C0 diff --git a/data/scripts/cutscene/outro/script_MaidStoneOutro2.inc b/data/scripts/cutscene/outro/script_MaidStoneOutro2.inc index f25c8c27..c4143c26 100644 --- a/data/scripts/cutscene/outro/script_MaidStoneOutro2.inc +++ b/data/scripts/cutscene/outro/script_MaidStoneOutro2.inc @@ -2,8 +2,8 @@ SCRIPT_START script_MaidStoneOutro2 BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x0008 + SetAnimationState 0x0004 + SetAnimation 0x0008 EndBlock WaitForSyncFlag 0x00000001 DoPostScriptAction 0x0000 @@ -11,8 +11,8 @@ SCRIPT_START script_MaidStoneOutro2 DoPostScriptAction 0x0004 Wait 0x003c script_0800A8FC: - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000f - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000f Jump script_0800A8FC diff --git a/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc index 83ef8867..ba35737d 100644 --- a/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc +++ b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc @@ -4,38 +4,38 @@ SCRIPT_START script_MinishEzloGoodbye SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x00000000 EndBlock WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0004 Wait 0x001e - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0807F3D8, 0x00000000 Wait 0x0006 - _0807EB44 0x0000 + SetAnimationState 0x0000 CallWithArg sub_0807F3D8, 0x00000000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0807F3D8, 0x00000000 Wait 0x0014 - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x00000000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - _0807E930 0x000c - Call sub_0807F2D4 + SetAnimation 0x000c + Call WaitForFrameHiBit Call sub_08094B94 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - _0807E930 0x000f - Call sub_0807F2D4 + SetAnimation 0x000f + Call WaitForFrameHiBit SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 CallWithArg sub_080960C4, script_Object6AEzloFinalMagic - _0807E930 0x0012 - Call sub_0807F2D4 + SetAnimation 0x0012 + Call WaitForFrameHiBit Wait 0x001e SetSyncFlag 0x00000020 StopBgm diff --git a/data/scripts/cutscene/outro/script_MinishEzloOutro.inc b/data/scripts/cutscene/outro/script_MinishEzloOutro.inc index 55f29440..b82f4618 100644 --- a/data/scripts/cutscene/outro/script_MinishEzloOutro.inc +++ b/data/scripts/cutscene/outro/script_MinishEzloOutro.inc @@ -4,26 +4,26 @@ SCRIPT_START script_MinishEzloOutro DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 DoPostScriptAction 0x000b - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x00000000 EndBlock WaitForSyncFlagAndClear 0x00000002 - _0807E930 0x000e + SetAnimation 0x000e DoPostScriptAction 0x0007 - Call sub_0807F2D4 + Call WaitForFrameHiBit DoPostScriptAction 0x0004 SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000002 - _0807E930 0x000c - Call sub_0807F2D4 + SetAnimation 0x000c + Call WaitForFrameHiBit SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000002 - _0807E930 0x000f - Call sub_0807F2D4 + SetAnimation 0x000f + Call WaitForFrameHiBit SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000002 - _0807E930 0x000c - Call sub_0807F2D4 + SetAnimation 0x000c + Call WaitForFrameHiBit SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000002 CallWithArg sub_080960C4, script_EzloZeldaMagic diff --git a/data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc b/data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc index 3f04796f..0b71e502 100644 --- a/data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc +++ b/data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc @@ -1,7 +1,7 @@ @ Outro NPC4E Fix DHC Entrance SCRIPT_START script_Npc4EDHCEntrance BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x0198, 0x01c8 Call sub_0807F844 diff --git a/data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc b/data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc index 4349136f..793d59c2 100644 --- a/data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc +++ b/data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc @@ -1,7 +1,7 @@ @ Outro NPC4E Fix DHC Throne SCRIPT_START script_Npc4EDHCThrone BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x0088, 0x0068 Call sub_0807F844 diff --git a/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc b/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc index f92b36db..e1e7e5fb 100644 --- a/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc +++ b/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc @@ -1,19 +1,19 @@ @ Outro NPC4E Fixed everything SCRIPT_START script_Npc4EFixedEverything BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x0088, 0x0148 Call sub_0807F844 _0807E8E4_3 - CallWithArg sub_0807F6E8, 0x00000008 - CallWithArg sub_0807F75C, 0x00a80088 + CallWithArg SetPlayerFlag, 0x00000008 + CallWithArg SetPlayerPos, 0x00a80088 PlaySound SFX_APPARATE EndBlock Wait 0x0078 _0807F0B4 0x0001 SetEntityPositionRelative 0x0088, 0x0078 - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder MessageFromTargetPos 0x1664, 0x0000 WaitUntilTextboxCloses MessageFromTargetPos 0x165e, 0x000e diff --git a/data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc index 97e8bc47..e974cfe8 100644 --- a/data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc +++ b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc @@ -1,7 +1,7 @@ @ Outro NPC4E Fix Hyrule Castle Entrance SCRIPT_START script_Npc4EHyruleCastleEntrance BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x00d8, 0x01c8 Call sub_0807F844 diff --git a/data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc index 890d3814..9509aee2 100644 --- a/data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc +++ b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc @@ -1,7 +1,7 @@ @ Outro NPC4E Fix Hyrule Castle Throne SCRIPT_START script_Npc4EHyruleCastleThrone BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x0088, 0x0070 Call sub_0807F844 diff --git a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc index 06f842dd..75cd30d5 100644 --- a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc +++ b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc @@ -7,7 +7,7 @@ SCRIPT_START script_Npc4EMinishPortalClosing SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000080 OffsetEntityPosition 0x0000, 0xffe0 - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder Wait 0x003c CallWithArg DeleteManager36, 0x00000001 _0807F0C8 0x0000, 0x0000 @@ -28,7 +28,7 @@ SCRIPT_START script_Npc4EMinishPortalClosing SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 OffsetEntityPosition 0x0000, 0x0020 - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder WaitForSyncFlagAndClear 0x00000010 StartPlayerScript script_PlayerGetGreenCap WaitForSyncFlagAndClear 0x00000001 @@ -38,7 +38,7 @@ SCRIPT_START script_Npc4EMinishPortalClosing MessageFromTargetPos 0x1663, 0x000e WaitUntilTextboxCloses OffsetEntityPosition 0x0000, 0xffe0 - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 SetSyncFlag 0x00000002 @@ -53,7 +53,7 @@ SCRIPT_START script_Npc4EMinishPortalClosing Wait 0x0078 Call sub_0808D280 Wait 0x0078 - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade5 WaitForFadeFinish Call sub_0807FB94 @ Roll Credits @@ -65,6 +65,6 @@ SCRIPT_START script_Npc4EMinishPortalClosing DoFade4 WaitForFadeFinish Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc b/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc index 83c7004d..1e34a26f 100644 --- a/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc +++ b/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc @@ -1,7 +1,7 @@ @ Outro NPC4E Minish Woods SCRIPT_START script_Npc4EMinishWoods BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x0378, 0x0178 Call sub_0807F844 diff --git a/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc b/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc index 22d244b2..91889416 100644 --- a/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc +++ b/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc @@ -1,7 +1,7 @@ @ Outro NPC4E Mt. Crenel SCRIPT_START script_Npc4EMtCrenel BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x0128, 0x0058 Call sub_0807F844 diff --git a/data/scripts/cutscene/outro/script_Npc4EOutro.inc b/data/scripts/cutscene/outro/script_Npc4EOutro.inc index 844ac95f..9dfe61d8 100644 --- a/data/scripts/cutscene/outro/script_Npc4EOutro.inc +++ b/data/scripts/cutscene/outro/script_Npc4EOutro.inc @@ -1,12 +1,12 @@ @ Outro NPC4E SCRIPT_START script_Npc4EOutro BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x0088, 0x0080 Call sub_0807F844 _0807E8E4_3 - CallWithArg sub_0807F75C, 0x00a80088 + CallWithArg SetPlayerPos, 0x00a80088 EndBlock Wait 0x003c StartPlayerScript script_PlayerAtOutro @@ -26,7 +26,7 @@ SCRIPT_START script_Npc4EOutro SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000040 SetSyncFlag 0x00000004 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark WaitForSyncFlagAndClear 0x00000080 MessageFromTargetPos 0x165a, 0x000e WaitUntilTextboxCloses diff --git a/data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc b/data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc index a9f2a329..2b2e2bb6 100644 --- a/data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc +++ b/data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc @@ -1,7 +1,7 @@ @ Outro NPC4E DHC Fix Sanctuary entrance SCRIPT_START script_Npc4ESanctuaryEntrance BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x0088, 0x0148 Call sub_0807F844 diff --git a/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc b/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc index 9cbea7ad..0430d9ce 100644 --- a/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc +++ b/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc @@ -1,19 +1,19 @@ @ Outro NPC4E Unfreeze castle staff SCRIPT_START script_Npc4EUnfreezeCastleStaff BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetEntityPositionRelative 0x00f8, 0x01b8 Call sub_0807F844 EndBlock Wait 0x003c PlaySound SFX_EVAPORATE - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade7 WaitForFadeFinish SetSyncFlag 0x00000001 PlaySound SFX_APPARATE - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade6 WaitForFadeFinish Wait 0x001e diff --git a/data/scripts/cutscene/outro/script_Object6AEzloDismounting.inc b/data/scripts/cutscene/outro/script_Object6AEzloDismounting.inc index e97a4de3..322badb2 100644 --- a/data/scripts/cutscene/outro/script_Object6AEzloDismounting.inc +++ b/data/scripts/cutscene/outro/script_Object6AEzloDismounting.inc @@ -3,7 +3,7 @@ SCRIPT_START script_Object6AEzloDismounting BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - CallWithArg sub_0807F994, 0x0000fff8 + CallWithArg SetSpriteOffset, 0x0000fff8 EndBlock WaitForSyncFlag 0x00000800 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/outro/script_Object6AEzloFinalMagic.inc b/data/scripts/cutscene/outro/script_Object6AEzloFinalMagic.inc index 93468e3d..1ec52e42 100644 --- a/data/scripts/cutscene/outro/script_Object6AEzloFinalMagic.inc +++ b/data/scripts/cutscene/outro/script_Object6AEzloFinalMagic.inc @@ -3,7 +3,7 @@ SCRIPT_START script_Object6AEzloFinalMagic BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - CallWithArg sub_0807F994, 0x0000fff8 + CallWithArg SetSpriteOffset, 0x0000fff8 PlaySound SFX_SPARKLES EndBlock WaitForSyncFlag 0x00000020 diff --git a/data/scripts/cutscene/outro/script_Object6AMinishCapOutro.inc b/data/scripts/cutscene/outro/script_Object6AMinishCapOutro.inc index 3b5704d0..b9e0c5ff 100644 --- a/data/scripts/cutscene/outro/script_Object6AMinishCapOutro.inc +++ b/data/scripts/cutscene/outro/script_Object6AMinishCapOutro.inc @@ -4,21 +4,21 @@ SCRIPT_START script_Object6AMinishCapOutro SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - _0807E930 0x0005 - Call sub_0807F348 + SetAnimation 0x0005 + Call SetPriorityMessage EndBlock WaitForSyncFlagAndClear 0x00000008 PlaySound SFX_SPARKLES ClearSyncFlag 0x00000800 CallWithArg sub_080960C4, script_Object6AEzloDismounting - _0807E930 0x0002 + SetAnimation 0x0002 Call sub_08094B0C _0807EDD4 0x0068, 0x0088 Call sub_08094B80 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000008 Call sub_08094B3C - _0807E930 0x0004 + SetAnimation 0x0004 SetSyncFlag 0x00000800 PlaySound SFX_143 SetSyncFlag 0x00000100 diff --git a/data/scripts/cutscene/outro/script_Object6AOctorok1.inc b/data/scripts/cutscene/outro/script_Object6AOctorok1.inc index 71af9ff5..4ee080a3 100644 --- a/data/scripts/cutscene/outro/script_Object6AOctorok1.inc +++ b/data/scripts/cutscene/outro/script_Object6AOctorok1.inc @@ -1,9 +1,9 @@ @ Outro OBJECT_6A Octorok 1 SCRIPT_START script_Object6AOctorok1 BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0007 - _0807E930 0x0001 + SetAnimation 0x0001 EndBlock WaitForSyncFlagAndClear 0x00000001 Call CreateDust diff --git a/data/scripts/cutscene/outro/script_Object6AOctorok2.inc b/data/scripts/cutscene/outro/script_Object6AOctorok2.inc index 1a823f2d..83c0bd16 100644 --- a/data/scripts/cutscene/outro/script_Object6AOctorok2.inc +++ b/data/scripts/cutscene/outro/script_Object6AOctorok2.inc @@ -1,9 +1,9 @@ @ Outro OBJECT_6A Octorok 2 SCRIPT_START script_Object6AOctorok2 BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0007 - _0807E930 0x0002 + SetAnimation 0x0002 EndBlock WaitForSyncFlagAndClear 0x00000002 Call CreateDust diff --git a/data/scripts/cutscene/outro/script_Object6AOctorok3.inc b/data/scripts/cutscene/outro/script_Object6AOctorok3.inc index 9e970232..abacdb6f 100644 --- a/data/scripts/cutscene/outro/script_Object6AOctorok3.inc +++ b/data/scripts/cutscene/outro/script_Object6AOctorok3.inc @@ -1,9 +1,9 @@ @ Outro OBJECT_6A Octorok 3 SCRIPT_START script_Object6AOctorok3 BeginBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0007 - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000004 Call CreateDust diff --git a/data/scripts/cutscene/outro/script_Object6AOctorok4.inc b/data/scripts/cutscene/outro/script_Object6AOctorok4.inc index ce4e0e15..f52e72f8 100644 --- a/data/scripts/cutscene/outro/script_Object6AOctorok4.inc +++ b/data/scripts/cutscene/outro/script_Object6AOctorok4.inc @@ -1,9 +1,9 @@ @ Outro OBJECT_6A Octorok 4 SCRIPT_START script_Object6AOctorok4 BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0007 - _0807E930 0x0003 + SetAnimation 0x0003 EndBlock WaitForSyncFlagAndClear 0x00000008 Call CreateDust diff --git a/data/scripts/cutscene/outro/script_Object6ATektite1.inc b/data/scripts/cutscene/outro/script_Object6ATektite1.inc index a8599488..9a83a445 100644 --- a/data/scripts/cutscene/outro/script_Object6ATektite1.inc +++ b/data/scripts/cutscene/outro/script_Object6ATektite1.inc @@ -1,9 +1,9 @@ @ Outro OBJECT_6A Tektite 1 SCRIPT_START script_Object6ATektite1 BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0007 - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000001 Call CreateDust diff --git a/data/scripts/cutscene/outro/script_Object6ATektite2.inc b/data/scripts/cutscene/outro/script_Object6ATektite2.inc index 3f666062..417ac068 100644 --- a/data/scripts/cutscene/outro/script_Object6ATektite2.inc +++ b/data/scripts/cutscene/outro/script_Object6ATektite2.inc @@ -1,9 +1,9 @@ @ Outro OBJECT_6A Tektite 2 SCRIPT_START script_Object6ATektite2 BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0007 - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000002 Call CreateDust diff --git a/data/scripts/cutscene/outro/script_Object6ATektite3.inc b/data/scripts/cutscene/outro/script_Object6ATektite3.inc index c088f9cf..6f877941 100644 --- a/data/scripts/cutscene/outro/script_Object6ATektite3.inc +++ b/data/scripts/cutscene/outro/script_Object6ATektite3.inc @@ -1,9 +1,9 @@ @ Outro OBJECT_6A Tektite 3 SCRIPT_START script_Object6ATektite3 BeginBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0007 - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000004 Call CreateDust diff --git a/data/scripts/cutscene/outro/script_Object6ATektite4.inc b/data/scripts/cutscene/outro/script_Object6ATektite4.inc index 68f9a905..94669abf 100644 --- a/data/scripts/cutscene/outro/script_Object6ATektite4.inc +++ b/data/scripts/cutscene/outro/script_Object6ATektite4.inc @@ -1,9 +1,9 @@ @ Outro OBJECT_6A Tektite 4 SCRIPT_START script_Object6ATektite4 BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0007 - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000008 Call CreateDust diff --git a/data/scripts/cutscene/outro/script_Object6ATheLittleHat.inc b/data/scripts/cutscene/outro/script_Object6ATheLittleHat.inc index da1e3fab..248601ee 100644 --- a/data/scripts/cutscene/outro/script_Object6ATheLittleHat.inc +++ b/data/scripts/cutscene/outro/script_Object6ATheLittleHat.inc @@ -4,7 +4,7 @@ SCRIPT_START script_Object6ATheLittleHat SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000008 Call sub_08094B80 diff --git a/data/scripts/cutscene/outro/script_Object6AZeldaMagic.inc b/data/scripts/cutscene/outro/script_Object6AZeldaMagic.inc index b4456a55..612c3676 100644 --- a/data/scripts/cutscene/outro/script_Object6AZeldaMagic.inc +++ b/data/scripts/cutscene/outro/script_Object6AZeldaMagic.inc @@ -3,7 +3,7 @@ SCRIPT_START script_Object6AZeldaMagic BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - CallWithArg sub_0807F994, 0x0000fff8 + CallWithArg SetSpriteOffset, 0x0000fff8 EndBlock WaitForSyncFlag 0x00001000 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc b/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc index c04735bc..8c2918ff 100644 --- a/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc +++ b/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtEzlo SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0088, 0x0080 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/outro/script_PlayerAtOutro.inc b/data/scripts/cutscene/outro/script_PlayerAtOutro.inc index 3aef29f7..fc956c5a 100644 --- a/data/scripts/cutscene/outro/script_PlayerAtOutro.inc +++ b/data/scripts/cutscene/outro/script_PlayerAtOutro.inc @@ -1,13 +1,13 @@ @ Player at Outro SCRIPT_START script_PlayerAtOutro EndBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc b/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc index 9b99fff7..96af6e03 100644 --- a/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc +++ b/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc @@ -2,24 +2,24 @@ SCRIPT_START script_PlayerGetGreenCap BeginBlock Call sub_08094BE0 - CallWithArg sub_0807F238, 0x0000045b + CallWithArg SetPlayerAnimation2, 0x0000045b PlaySound SFX_109 EndBlock - Call sub_0807F304 + Call WaitForPlayerFrameHiBit Wait 0x005a SetSyncFlag 0x00000008 BeginBlock - CallWithArg sub_0807F6F8, 0x00000008 - CallWithArg sub_0807F238, 0x000008e4 + CallWithArg ResetPlayerFlag, 0x00000008 + CallWithArg SetPlayerAnimation2, 0x000008e4 EndBlock - Call sub_0807F304 - _0807EB44 0x0004 + Call WaitForPlayerFrameHiBit + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Wait 0x003c - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 Wait 0x0004 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc b/data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc index a209c670..b10a0ba5 100644 --- a/data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc +++ b/data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc @@ -3,8 +3,8 @@ SCRIPT_START script_PlayerSayGoodbye BeginBlock SetEntitySpeed 0x0080 EndBlock - _0807EC64 0x0020 - _0807EB44 0x0000 + WalkNorth 0x0020 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cutscene/outro/script_ZeldaGoodbye.inc b/data/scripts/cutscene/outro/script_ZeldaGoodbye.inc index 470bddb0..3fb8ff81 100644 --- a/data/scripts/cutscene/outro/script_ZeldaGoodbye.inc +++ b/data/scripts/cutscene/outro/script_ZeldaGoodbye.inc @@ -4,11 +4,11 @@ SCRIPT_START script_ZeldaGoodbye SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000040 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000080 WaitForSyncFlagAndClear 0x80000000 diff --git a/data/scripts/cutscene/outro/script_ZeldaOutro.inc b/data/scripts/cutscene/outro/script_ZeldaOutro.inc index d639a25a..92bbcf27 100644 --- a/data/scripts/cutscene/outro/script_ZeldaOutro.inc +++ b/data/scripts/cutscene/outro/script_ZeldaOutro.inc @@ -4,21 +4,21 @@ SCRIPT_START script_ZeldaOutro SetEntitySpeed 0x0100 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000004 BeginBlock DoPostScriptAction 0x0004 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark EndBlock Wait 0x003c - _0807EC94 0x0010 - _0807EB44 0x0002 + WalkEast 0x0010 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000080 WaitForSyncFlagAndClear 0x00000004 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000080 WaitForSyncFlagAndClear 0x00000004 @@ -26,7 +26,7 @@ SCRIPT_START script_ZeldaOutro Wait 0x003c SetSyncFlag 0x00000080 WaitForSyncFlagAndClear 0x00000004 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 PlaySound SFX_SPARKLES CallWithArg sub_080960C4, script_Object6AZeldaMagic diff --git a/data/scripts/cutscene/reveal/script_08013494.inc b/data/scripts/cutscene/reveal/script_08013494.inc index fb3b1606..9eb632de 100644 --- a/data/scripts/cutscene/reveal/script_08013494.inc +++ b/data/scripts/cutscene/reveal/script_08013494.inc @@ -1,7 +1,7 @@ @ Something during Sanctuary Vaati cutscene? Called from script_VaatiSanctuary SCRIPT_START script_08013494 BeginBlock - _0807E930 0x0000 + SetAnimation 0x0000 SetEntitySpeed 0x0200 Call nullsub_527 Call sub_08094B80 diff --git a/data/scripts/cutscene/reveal/script_FakeKingDaltus.inc b/data/scripts/cutscene/reveal/script_FakeKingDaltus.inc index 4f9e3683..82f50ec8 100644 --- a/data/scripts/cutscene/reveal/script_FakeKingDaltus.inc +++ b/data/scripts/cutscene/reveal/script_FakeKingDaltus.inc @@ -1,10 +1,10 @@ @ Sanctuary King Daltus SCRIPT_START script_FakeKingDaltus BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - Call sub_0807F338 + Call DeleteHitbox EndBlock WaitForSyncFlagAndClear 0x00000008 Call sub_08061F94 diff --git a/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc b/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc index 9d81e3fb..a0dc7eb6 100644 --- a/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc +++ b/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc @@ -2,16 +2,16 @@ SCRIPT_START script_Object3EPictureBackRoom CheckPlayerInRegion 0x0098, 0x0038, 0x2060 JumpIfNot script_Object3EPictureBackRoom - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerAtPicture WaitForSyncFlagAndClear 0x00000002 - _0807EB28 0x1601 + EzloMessage 0x1601 WaitUntilTextboxCloses StartPlayerScript script_PlayerMoveToPicture WaitForSyncFlagAndClear 0x00000002 - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade5 WaitForFadeFinish LoadRoomEntityList gUnk_080F5680 @@ -22,7 +22,7 @@ SCRIPT_START script_Object3EPictureBackRoom Call sub_0807F844 CameraTargetEntity Call sub_080536B8 - _0807E864 + SetPlayerIdle Call sub_0807DF28 WaitForFadeFinish MessageFromTargetPos 0x1602, 0x000c @@ -44,29 +44,29 @@ SCRIPT_START script_Object3EPictureBackRoom SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000040 SetFadeMask 0xffff7fff - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade5 WaitForFadeFinish StopBgm _0807E858 0x0000 Wait 0x003c CameraTargetPlayer - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder MessageFromTargetPos 0x1604, 0x0007 WaitUntilTextboxCloses SetFadeMask 0xffffffff - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade4 WaitForFadeFinish SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - _0807EB28 0x1605 + EzloMessage 0x1605 WaitUntilTextboxCloses SetLocalFlag 0x0078 PlayBgm BGM_CASTLE_COLLAPSE SetGlobalFlag 0x005d Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc b/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc index 69a76452..f7760051 100644 --- a/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc +++ b/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerAtPicture EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0098, 0x0058 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 Call sub_080791BC diff --git a/data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc b/data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc index ed636572..c44f1f6c 100644 --- a/data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc +++ b/data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerDistanceFromVaati DoPostScriptAction 0x000d EndBlock DoPostScriptAction 0x0001 - _0807ECC4 0x0020 + WalkSouth 0x0020 DoPostScriptAction 0x0000 DoPostScriptAction 0x000c SetSyncFlag 0x00000002 diff --git a/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc b/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc index 91f9285d..b40b2b9e 100644 --- a/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc +++ b/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc @@ -1,13 +1,13 @@ @ Sanctuary Player faint from Vaati attack SCRIPT_START script_PlayerFaintAgain Call sub_0807F1C4 - Call sub_0807F2D4 + Call WaitForFrameHiBit Call sub_0807F1E8 - Call sub_0807F2D4 + Call WaitForFrameHiBit SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 PlaySound SFX_PLY_JUMP - _0807EB44 0x0004 + SetAnimationState 0x0004 Call sub_0807F210 _0807EF3C 0x0200, 0x0020 DoPostScriptAction 0x0000 diff --git a/data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc b/data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc index 76237d60..b2af1dd9 100644 --- a/data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc +++ b/data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerMoveToPicture SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 - _0807EC64 0x0020 + WalkNorth 0x0020 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 Call sub_080791BC diff --git a/data/scripts/cutscene/reveal/script_VaatiSanctuary.inc b/data/scripts/cutscene/reveal/script_VaatiSanctuary.inc index ca88188c..7619f004 100644 --- a/data/scripts/cutscene/reveal/script_VaatiSanctuary.inc +++ b/data/scripts/cutscene/reveal/script_VaatiSanctuary.inc @@ -1,10 +1,10 @@ @ Sanctuary Vaati SCRIPT_START script_VaatiSanctuary BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0008 DoPostScriptAction 0x000b - Call sub_0807F338 + Call DeleteHitbox EndBlock WaitForSyncFlagAndClear 0x00000020 SetEntityPositionRelative 0x0098, 0x0048 @@ -22,7 +22,7 @@ SCRIPT_START script_VaatiSanctuary WaitForSyncFlagAndClear 0x00000080 SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000020 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000020 diff --git a/data/scripts/cutscene/takeover/script_GuardTakeover.inc b/data/scripts/cutscene/takeover/script_GuardTakeover.inc index 42af6737..edb5e826 100644 --- a/data/scripts/cutscene/takeover/script_GuardTakeover.inc +++ b/data/scripts/cutscene/takeover/script_GuardTakeover.inc @@ -2,13 +2,13 @@ SCRIPT_START script_GuardTakeover BeginBlock SetEntitySpeed 0x0080 - _0807EB44 0x0000 - _0807E930 0x0000 + SetAnimationState 0x0000 + SetAnimation 0x0000 EndBlock WaitForSyncFlag 0x00000040 - _0807E930 0x0004 - _0807EC64 0x00c0 - _0807E930 0x0000 + SetAnimation 0x0004 + WalkNorth 0x00c0 + SetAnimation 0x0000 Wait 0x003c SetSyncFlag 0x00000080 WaitForSyncFlag 0x00000200 diff --git a/data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc b/data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc index f4263027..3f76d704 100644 --- a/data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc +++ b/data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc @@ -1,7 +1,7 @@ @ Western Wood Cutscene King Daltus SCRIPT_START script_KingDaltusTakeover BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000004 diff --git a/data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc b/data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc index c3f81281..83d69479 100644 --- a/data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc +++ b/data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc @@ -1,7 +1,7 @@ @ Western Wood Cutscene Minister Potho SCRIPT_START script_MinisterPothoTakeover BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000001 diff --git a/data/scripts/cutscene/takeover/script_Object69Takeover.inc b/data/scripts/cutscene/takeover/script_Object69Takeover.inc index d8ff3cae..773a0fef 100644 --- a/data/scripts/cutscene/takeover/script_Object69Takeover.inc +++ b/data/scripts/cutscene/takeover/script_Object69Takeover.inc @@ -6,31 +6,31 @@ SCRIPT_START script_Object69Takeover script_08015BF0: CheckPlayerInRegion 0x0160, 0x0020, 0x3040 JumpIfNot script_08015BF0 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 Call sub_0807FBC4 StartPlayerScript script_PlayerAtTakeover WaitForSyncFlagAndClear 0x00000100 CameraTargetPlayer - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E80C 0x00000000 WaitForFadeFinish StopBgm Call sub_08053BE8 BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807FBC4 CameraTargetPlayer - _0807E778 0x0100 + SetFadeTime 0x0100 DoFade4 _0807E80C 0x00000000 EndBlock - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E800 0x00000000 WaitForFadeFinish PlayBGM - _0807EB28 0x131f + EzloMessage 0x131f WaitUntilTextboxCloses .ifdef JP SetLocalFlag 0x009b @@ -47,7 +47,7 @@ script_08015BF0: .endif Call sub_0807FBCC Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc b/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc index 10feed63..dea65804 100644 --- a/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc +++ b/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object69TakeoverCutscene SetEntityPositionRelative 0x0088, 0x0068 CameraTargetEntity EndBlock - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade4 WaitForFadeFinish Wait 0x003c @@ -38,14 +38,14 @@ SCRIPT_START script_Object69TakeoverCutscene WaitForSyncFlagAndClear 0x00000008 SetSyncFlag 0x00000010 WaitForSyncFlagAndClear 0x00000020 - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade5 WaitForFadeFinish SetSyncFlag 0x00000010 LoadRoomEntityList gUnk_080FCE30 StopBgm Wait 0x0078 - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade4 WaitForFadeFinish PlayBgm BGM_DIGGING_CAVE @@ -59,7 +59,7 @@ SCRIPT_START script_Object69TakeoverCutscene Wait 0x003c SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade5 WaitForFadeFinish StopBgm diff --git a/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc index 551025aa..034b3197 100644 --- a/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc +++ b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc @@ -5,15 +5,15 @@ SCRIPT_START script_PlayerAtTakeover EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0168, 0x0058 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 - CallWithArg sub_0807F238, 0x000003c5 - Call sub_0807F304 + CallWithArg SetPlayerAnimation2, 0x000003c5 + Call WaitForPlayerFrameHiBit MessageFromTargetPos 0x1318, 0x000c WaitUntilTextboxCloses - CallWithArg sub_0807F238, 0x000003c9 - Call sub_0807F304 - _0807EB44 0x0004 + CallWithArg SetPlayerAnimation2, 0x000003c9 + Call WaitForPlayerFrameHiBit + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 Call sub_080791BC diff --git a/data/scripts/cutscene/takeover/script_VaatiTakeover.inc b/data/scripts/cutscene/takeover/script_VaatiTakeover.inc index 14796d93..efd31a2b 100644 --- a/data/scripts/cutscene/takeover/script_VaatiTakeover.inc +++ b/data/scripts/cutscene/takeover/script_VaatiTakeover.inc @@ -2,7 +2,7 @@ SCRIPT_START script_VaatiTakeover BeginBlock DoPostScriptAction 0x0008 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x001d EndBlock @@ -12,9 +12,9 @@ SCRIPT_START script_VaatiTakeover DoPostScriptAction 0x0007 DoPostScriptAction 0x001e Wait 0x0014 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x001c - Call sub_0807F2D4 + Call WaitForFrameHiBit DoPostScriptAction 0x0000 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 |