diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2021-12-27 21:32:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-27 21:32:31 -0800 |
| commit | 9456e38606b3ebfe388bd810a4187a5c06c97947 (patch) | |
| tree | 58b6bd533d86b0f74a25a22055415b17e01ae714 /data/scripts | |
| parent | d8dfff5de93387a6a8a77ea9e7bdbd53b6ff9500 (diff) | |
| parent | c4f2efe13278c5aeb094be914513d19f5ddbce2b (diff) | |
Merge pull request #225 from notyourav/asm_funcs
finish player, label script functions
Diffstat (limited to 'data/scripts')
522 files changed, 2436 insertions, 2436 deletions
diff --git a/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc b/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc index b8055c03..ffb45054 100644 --- a/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc +++ b/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc @@ -4,15 +4,15 @@ SCRIPT_START script_CastorWildsStatueLeft CheckKinstoneFused 0x0006 JumpIf script_0800B302 _0807EA88 0x0006 - _0807EB44 0x0002 + SetAnimationState 0x0002 EndBlock script_0800B268: _0807EA4C _0807E9F0 - _0807E864 + SetPlayerIdle CheckKinstoneFused 0x0006 JumpIf script_0800B2E2 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800B268 .2byte 0x0000 diff --git a/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc b/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc index 19b2defb..ef5548f6 100644 --- a/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc +++ b/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc @@ -4,15 +4,15 @@ SCRIPT_START script_CastorWildsStatueMiddle CheckKinstoneFused 0x0007 JumpIf script_0800B302 _0807EA88 0x0007 - _0807EB44 0x0002 + SetAnimationState 0x0002 EndBlock script_0800B298: _0807EA4C _0807E9F0 - _0807E864 + SetPlayerIdle CheckKinstoneFused 0x0007 JumpIf script_0800B2E2 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800B298 .2byte 0x0000 diff --git a/data/scripts/castorWilds/script_CastorWildsStatueRight.inc b/data/scripts/castorWilds/script_CastorWildsStatueRight.inc index e5553e6f..3c9c3c4f 100644 --- a/data/scripts/castorWilds/script_CastorWildsStatueRight.inc +++ b/data/scripts/castorWilds/script_CastorWildsStatueRight.inc @@ -4,20 +4,20 @@ SCRIPT_START script_CastorWildsStatueRight CheckKinstoneFused 0x0008 JumpIf script_0800B302 _0807EA88 0x0008 - _0807EB44 0x0002 + SetAnimationState 0x0002 EndBlock script_0800B2C8: _0807EA4C _0807E9F0 - _0807E864 + SetPlayerIdle CheckKinstoneFused 0x0008 JumpIf script_0800B2E2 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800B2C8 script_0800B2E2: DoPostScriptAction 0x0013 - _0807EB44 0x0004 + SetAnimationState 0x0004 _0807E9DC Call sub_080676E0 Call sub_08067534 diff --git a/data/scripts/castorWilds/script_GreatFairyRupees.inc b/data/scripts/castorWilds/script_GreatFairyRupees.inc index 2385d474..9ab8427f 100644 --- a/data/scripts/castorWilds/script_GreatFairyRupees.inc +++ b/data/scripts/castorWilds/script_GreatFairyRupees.inc @@ -9,8 +9,8 @@ script_0800B6D4: CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 JumpIfNot script_0800B6D4 Call sub_08079184 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal StartPlayerScript script_PlayerAtGreatFairy WaitForSyncFlagAndClear 0x00000004 SetRoomFlag 0x0000 @@ -19,7 +19,7 @@ script_0800B6D4: JumpIf script_0800B7A2 MessageNoOverlap 0x057b WaitUntilTextboxCloses - CallWithArg sub_0807F970, 0x0000057d + CallWithArg CheckMessageEqual, 0x0000057d JumpIf script_0800B6A6 WaitUntilTextboxCloses SetLocalFlag 0x009f diff --git a/data/scripts/castorWilds/script_MalonAtRanch.inc b/data/scripts/castorWilds/script_MalonAtRanch.inc index 640be984..91a5b4b2 100644 --- a/data/scripts/castorWilds/script_MalonAtRanch.inc +++ b/data/scripts/castorWilds/script_MalonAtRanch.inc @@ -8,10 +8,10 @@ SCRIPT_START script_MalonAtRanch script_0800B5FA: CheckEntityInteractType JumpIfNot script_0800B5FA - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x2009 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 Jump script_0800B5FA diff --git a/data/scripts/castorWilds/script_Object69.inc b/data/scripts/castorWilds/script_Object69.inc index 0bb907d2..399f5c77 100644 --- a/data/scripts/castorWilds/script_Object69.inc +++ b/data/scripts/castorWilds/script_Object69.inc @@ -30,7 +30,7 @@ script_0800B216: Wait 0x000c CameraTargetPlayer Wait 0x0008 - _0807E878 + EnablePlayerControl .ifdef JP CheckLocalFlag 0x001e .else diff --git a/data/scripts/castorWilds/script_Object69DarknutFight.inc b/data/scripts/castorWilds/script_Object69DarknutFight.inc index c62e659d..cfa00564 100644 --- a/data/scripts/castorWilds/script_Object69DarknutFight.inc +++ b/data/scripts/castorWilds/script_Object69DarknutFight.inc @@ -3,9 +3,9 @@ SCRIPT_START script_Object69DarknutFight BeginBlock Call sub_0807DF28 SetLocalFlag 0x0039 - _0807E864 + SetPlayerIdle EndBlock - WaitForPlayerAction0x17 + WaitForPlayerEnterRoom StartPlayerScript script_PlayerAtDarknutFight Wait 0x0018 SetSyncFlag 0x00000002 @@ -13,8 +13,8 @@ SCRIPT_START script_Object69DarknutFight SetRoomFlag 0x0000 Wait 0x0010 PlayBgm BGM_FIGHT_THEME - _0807EB28 0x2701 - _0807E878 + EzloMessage 0x2701 + EnablePlayerControl Call sub_0807DF50 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_EzloTalkPoW.inc b/data/scripts/cloudTops/script_EzloTalkPoW.inc index bba202e7..a8980ffa 100644 --- a/data/scripts/cloudTops/script_EzloTalkPoW.inc +++ b/data/scripts/cloudTops/script_EzloTalkPoW.inc @@ -1,12 +1,12 @@ @ Ezlo talk after getting wind element SCRIPT_START script_EzloTalkPoW - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB28 0x1c05 + EzloMessage 0x1c05 WaitUntilTextboxCloses SetLocalFlagByBank 0x0100, 0x0005 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_GregalHealthy.inc b/data/scripts/cloudTops/script_GregalHealthy.inc index 646b5d39..8f96aa4f 100644 --- a/data/scripts/cloudTops/script_GregalHealthy.inc +++ b/data/scripts/cloudTops/script_GregalHealthy.inc @@ -3,14 +3,14 @@ SCRIPT_START script_GregalHealthy BeginBlock Call sub_0806CD58 DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0006 + SetAnimationState 0x0004 + SetAnimation 0x0006 EndBlock script_08014C42: CheckEntityInteractType JumpIfNot script_08014C42 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer script_08014C4C: Call sub_0806CCD0 JumpIfNot script_08014C4C @@ -30,7 +30,7 @@ script_08014C7C: WaitUntilTextboxCloses script_08014C82: Wait 0x000f - _0807E878 - _0807EB44 0x0004 - _0807E930 0x0006 + EnablePlayerControl + SetAnimationState 0x0004 + SetAnimation 0x0006 Jump script_08014C42 diff --git a/data/scripts/cloudTops/script_GregalSick.inc b/data/scripts/cloudTops/script_GregalSick.inc index dac29473..038c7f29 100644 --- a/data/scripts/cloudTops/script_GregalSick.inc +++ b/data/scripts/cloudTops/script_GregalSick.inc @@ -2,7 +2,7 @@ SCRIPT_START script_GregalSick BeginBlock DoPostScriptAction 0x000a - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock CheckLocalFlag 0x0063 JumpIf script_08014BE8 @@ -14,21 +14,21 @@ script_08014B48: CheckEntityInteractType JumpIfNot script_08014B48 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x2f01 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08014B48 script_08014B70: EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetSyncFlag 0x00000001 DoPostScriptAction 0x0004 WaitForSyncFlagAndClear 0x00000002 - _0807E930 0x0010 + SetAnimation 0x0010 Call sub_0806CCF8 Wait 0x0014 Call sub_0806CD04 @@ -46,14 +46,14 @@ script_08014B70: SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08014BE8: - _0807E930 0x0010 + SetAnimation 0x0010 Call sub_0806CD4C script_08014BF2: CheckEntityInteractType JumpIfNot script_08014BF2 - _0807E864 + SetPlayerIdle CheckLocalFlag 0x0065 JumpIf script_08014C1C SetLocalFlag 0x0065 @@ -68,5 +68,5 @@ script_08014C1C: WaitUntilTextboxCloses script_08014C22: Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08014BF2 diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc index 14cce552..bec3df8e 100644 --- a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc +++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc @@ -2,7 +2,7 @@ @ Reponsible for Kinstone cutscenes SCRIPT_START script_Npc4EFirstCloud BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000b DoPostScriptAction 0x0008 Call sub_0806DAAC @@ -16,10 +16,10 @@ script_0800D636: Call sub_0806DAAC JumpIf script_0800D650 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800D636 script_0800D650: - _0807E864 + SetPlayerIdle Call sub_0807DF28 Call sub_0807FBC4 Call sub_0807FBA0 diff --git a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc index 91d9eae4..8f86a3a7 100644 --- a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc +++ b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc @@ -4,7 +4,7 @@ SCRIPT_START script_Npc4EKinstoneFused _0807F0B4 0x0004 CameraTargetPlayer Call sub_0807FBCC - _0807E878 + EnablePlayerControl Call sub_0807DF50 script_0800D6AE: DoPostScriptAction 0x0006 diff --git a/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc b/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc index c2d465d4..8053cca1 100644 --- a/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc +++ b/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc @@ -1,7 +1,7 @@ @ Cloud Tops OBJECT_69 great whirlwind revealed SCRIPT_START script_Object69GreatWhirlwindRevealed BeginBlock - Call sub_0807F360 + Call SetPriorityHighest SetEntitySpeed 0x0700 _0807F0B4 0x0007 CameraTargetEntity @@ -17,7 +17,7 @@ SCRIPT_START script_Object69GreatWhirlwindRevealed _0807F0B4 0x0004 CameraTargetPlayer Call sub_0807FBCC - _0807E878 + EnablePlayerControl Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cloudTops/script_Object6AMysteriousCloud.inc b/data/scripts/cloudTops/script_Object6AMysteriousCloud.inc index f2c812eb..686d63dd 100644 --- a/data/scripts/cloudTops/script_Object6AMysteriousCloud.inc +++ b/data/scripts/cloudTops/script_Object6AMysteriousCloud.inc @@ -3,7 +3,7 @@ SCRIPT_START script_Object6AMysteriousCloud BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x0011 - Call sub_0807F158 + Call SetCollisionLayer1 Call sub_0807F738 EndBlock SCRIPT_END diff --git a/data/scripts/cloudTops/script_PlayerAtSiroc.inc b/data/scripts/cloudTops/script_PlayerAtSiroc.inc index 5dd59161..ceeed89f 100644 --- a/data/scripts/cloudTops/script_PlayerAtSiroc.inc +++ b/data/scripts/cloudTops/script_PlayerAtSiroc.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtSiroc SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0078, 0x0040 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cloudTops/script_Siroc.inc b/data/scripts/cloudTops/script_Siroc.inc index 679d1966..94c1d72c 100644 --- a/data/scripts/cloudTops/script_Siroc.inc +++ b/data/scripts/cloudTops/script_Siroc.inc @@ -5,13 +5,13 @@ SCRIPT_START script_Siroc DoPostScriptAction 0x000a EndBlock script_08014AD2: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014AD2 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer StartPlayerScript script_PlayerAtSiroc WaitForSyncFlagAndClear 0x00000001 - _0807EB74 + FacePlayer CheckLocalFlag 0x0064 JumpIf script_08014AFE SetLocalFlag 0x0064 @@ -22,6 +22,6 @@ script_08014AFE: script_08014B02: WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08014AD2 .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople1.inc b/data/scripts/cloudTops/script_WindTribespeople1.inc index 987d6b13..94a6feb5 100644 --- a/data/scripts/cloudTops/script_WindTribespeople1.inc +++ b/data/scripts/cloudTops/script_WindTribespeople1.inc @@ -5,17 +5,17 @@ SCRIPT_START script_WindTribespeople1 DoPostScriptAction 0x000a CheckGlobalFlag 0x0058 JumpIf script_08014976 - _0807EB44 0x0004 + SetAnimationState 0x0004 SetEntityPositionRelative 0x0078, 0x0128 script_08014976: EndBlock script_08014978: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014978 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08014978 diff --git a/data/scripts/cloudTops/script_WindTribespeople2.inc b/data/scripts/cloudTops/script_WindTribespeople2.inc index 6cf49d01..f8fa2804 100644 --- a/data/scripts/cloudTops/script_WindTribespeople2.inc +++ b/data/scripts/cloudTops/script_WindTribespeople2.inc @@ -7,14 +7,14 @@ SCRIPT_START script_WindTribespeople2 JumpIfNot script_080149C6 EndBlock script_080149AA: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_080149AA - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_080149AA script_080149C6: DoPostScriptAction 0x0006 diff --git a/data/scripts/cloudTops/script_WindTribespeople3.inc b/data/scripts/cloudTops/script_WindTribespeople3.inc index 01977684..84c60935 100644 --- a/data/scripts/cloudTops/script_WindTribespeople3.inc +++ b/data/scripts/cloudTops/script_WindTribespeople3.inc @@ -6,10 +6,10 @@ SCRIPT_START script_WindTribespeople3 DoPostScriptAction 0x000a EndBlock script_080149DE: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_080149DE - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses CheckLocalFlag 0x0064 @@ -21,10 +21,10 @@ script_080149DE: DoPostScriptAction 0x0001 _0807EDD4 0x0068, 0x00f8 PlaySound SFX_SECRET - _0807EB74 + FacePlayer DoPostScriptAction 0x0000 DoPostScriptAction 0x000a script_08014A20: - _0807E878 + EnablePlayerControl Jump script_080149DE .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople4.inc b/data/scripts/cloudTops/script_WindTribespeople4.inc index 31e036e3..ba6fb854 100644 --- a/data/scripts/cloudTops/script_WindTribespeople4.inc +++ b/data/scripts/cloudTops/script_WindTribespeople4.inc @@ -5,13 +5,13 @@ SCRIPT_START script_WindTribespeople4 DoPostScriptAction 0x000a EndBlock script_08014A36: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014A36 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08014A36 .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople5.inc b/data/scripts/cloudTops/script_WindTribespeople5.inc index cf3a995e..698f9bb2 100644 --- a/data/scripts/cloudTops/script_WindTribespeople5.inc +++ b/data/scripts/cloudTops/script_WindTribespeople5.inc @@ -5,13 +5,13 @@ SCRIPT_START script_WindTribespeople5 DoPostScriptAction 0x000a EndBlock script_08014A62: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014A62 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08014A62 .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople6.inc b/data/scripts/cloudTops/script_WindTribespeople6.inc index fea83201..0633f743 100644 --- a/data/scripts/cloudTops/script_WindTribespeople6.inc +++ b/data/scripts/cloudTops/script_WindTribespeople6.inc @@ -4,7 +4,7 @@ SCRIPT_START script_WindTribespeople6 DoPostScriptAction 0x000a EndBlock WaitForSyncFlagAndClear 0x00000001 - _0807EB74 + FacePlayer DoPostScriptAction 0x0004 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 @@ -12,12 +12,12 @@ SCRIPT_START script_WindTribespeople6 WaitUntilTextboxCloses SetSyncFlag 0x00000002 script_08014AAC: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014AAC - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x2f0a WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08014AAC .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople7.inc b/data/scripts/cloudTops/script_WindTribespeople7.inc index a4c71788..72962d45 100644 --- a/data/scripts/cloudTops/script_WindTribespeople7.inc +++ b/data/scripts/cloudTops/script_WindTribespeople7.inc @@ -12,14 +12,14 @@ script_08014CAE: BeginBlock CheckGlobalFlag 0x0024 JumpIf script_08014CD4 - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014CAE EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08014CAE script_08014CD4: DoPostScriptAction 0x0006 diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc index 0561a0fb..c5d77432 100644 --- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc +++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc @@ -1,10 +1,10 @@ @ Cloud Tops WindTribespeople great whirlwind revealed 2 SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed1 BeginBlock - Call sub_0807F360 + Call SetPriorityHighest DoPostScriptAction 0x000b SetEntitySpeed 0x0200 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000008 @@ -13,14 +13,14 @@ SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed1 PlaySound SFX_123 CallWithArg sub_0807F464, 0x000001e0 _0807EDD4 0x01e0, 0x01d8 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0001 WaitForSyncFlagAndClear 0x00000008 Jump script_0800D80C diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc index 53f64c9b..1bdc67f5 100644 --- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc +++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc @@ -1,7 +1,7 @@ @ Cloud Tops WindTribespeople great whirlwind revealed SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed2 BeginBlock - Call sub_0807F360 + Call SetPriorityHighest DoPostScriptAction 0x000b SetEntityPositionRelative 0x0268, 0x01d8 SetEntitySpeed 0x0100 @@ -15,11 +15,11 @@ script_0800D80C: _0807EEF4 0x0000, 0xffe0 DoPostScriptAction 0x000e Call sub_0806CA5C - SetEntity0x20 0x00040000 + SetEntityVelocity 0x00040000 PlaySound SFX_F5 script_0800D82A: - CallWithArg sub_0807F8D0, 0xffffe000 - Call sub_0807F8BC + CallWithArg DoGravity, 0xffffe000 + Call CheckEntityOnScreen JumpIf script_0800D82A SetSyncFlag 0x00000004 DoPostScriptAction 0x0006 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 diff --git a/data/scripts/dhc/script_GuardCellLeft.inc b/data/scripts/dhc/script_GuardCellLeft.inc index a44c7ed5..58efe5f0 100644 --- a/data/scripts/dhc/script_GuardCellLeft.inc +++ b/data/scripts/dhc/script_GuardCellLeft.inc @@ -1,7 +1,7 @@ @ DHC left Guard at King cell SCRIPT_START script_GuardCellLeft BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0807F3D8, 0x00000000 DoPostScriptAction 0x000a _0807E9D4 @@ -9,10 +9,10 @@ SCRIPT_START script_GuardCellLeft script_0800E44C: CheckEntityInteractType JumpIfNot script_0800E44C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 MessageNoOverlap 0x2405 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800E44C diff --git a/data/scripts/dhc/script_GuardCellRight.inc b/data/scripts/dhc/script_GuardCellRight.inc index 9f85273b..83ddbacf 100644 --- a/data/scripts/dhc/script_GuardCellRight.inc +++ b/data/scripts/dhc/script_GuardCellRight.inc @@ -1,7 +1,7 @@ @ DHC right Guard at King cell SCRIPT_START script_GuardCellRight BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x00000000 DoPostScriptAction 0x000a _0807E9D4 @@ -9,12 +9,12 @@ SCRIPT_START script_GuardCellRight script_0800E484: CheckEntityInteractType JumpIfNot script_0800E484 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 MessageNoOverlap 0x2407 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800E484 diff --git a/data/scripts/dhc/script_GuardStone1.inc b/data/scripts/dhc/script_GuardStone1.inc index 506abd38..ae42371d 100644 --- a/data/scripts/dhc/script_GuardStone1.inc +++ b/data/scripts/dhc/script_GuardStone1.inc @@ -1,21 +1,21 @@ @ DHC Guard stone SCRIPT_START script_GuardStone1 BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0094 JumpIf script_0800E1D0 - _0807E930 0x0010 + SetAnimation 0x0010 CallWithArg sub_0807F8E8, 0x00000001 EndBlock script_0800E176: CheckRoomFlag 0x0001 JumpIfNot script_0800E176 - _0807E864 + SetPlayerIdle Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 - _0807E930 0x0015 + SetAnimation 0x0015 Wait 0x003c PlaySound SFX_1CA DoPostScriptAction 0x0010 @@ -25,8 +25,8 @@ script_0800E176: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB8C - _0807EB74 + FaceAwayFromPlayer + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 Wait 0x000a MessageNoOverlap 0x2401 @@ -35,15 +35,15 @@ script_0800E176: script_0800E1D0: CallWithArg sub_0807F3D8, 0x00000000 _0807E9D4 - _0807E878 + EnablePlayerControl EndBlock script_0800E1E0: CheckEntityInteractType JumpIfNot script_0800E1E0 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 MessageNoOverlap 0x2401 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800E1E0 diff --git a/data/scripts/dhc/script_GuardStone2.inc b/data/scripts/dhc/script_GuardStone2.inc index d7e613af..71483148 100644 --- a/data/scripts/dhc/script_GuardStone2.inc +++ b/data/scripts/dhc/script_GuardStone2.inc @@ -2,30 +2,30 @@ SCRIPT_START script_GuardStone2 BeginBlock SetEntitySpeed 0x0100 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0073 JumpIfNot script_0800E232 _0807E9D4 SetEntityPositionRelative 0x0070, 0x0168 - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0807F3D8, 0x00000000 EndBlock Jump script_0800E32E script_0800E232: CheckLocalFlag 0x0095 JumpIf script_0800E29A - _0807E930 0x0010 + SetAnimation 0x0010 CallWithArg sub_0807F8E8, 0x00000002 EndBlock script_0800E24A: CheckRoomFlag 0x0002 JumpIfNot script_0800E24A - _0807E864 + SetPlayerIdle Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 - _0807E930 0x0015 + SetAnimation 0x0015 Wait 0x003c PlaySound SFX_1CA DoPostScriptAction 0x0010 @@ -35,15 +35,15 @@ script_0800E24A: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB8C - _0807EB74 + FaceAwayFromPlayer + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 SetLocalFlag 0x0095 script_0800E29A: DoPostScriptAction 0x0000 CallWithArg sub_0807F3D8, 0x00000000 _0807E9D4 - _0807E878 + EnablePlayerControl EndBlock script_0800E2AE: EndBlock @@ -59,33 +59,33 @@ script_0800E2AE: _0807E9DC SetLocalFlag 0x0073 EndBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 CallWithArg sub_0807F3D8, 0x00000004 _0807EDD4 0x0088, 0x0168 - _0807EB44 0x0006 + SetAnimationState 0x0006 CallWithArg sub_0807F3D8, 0x00000004 _0807EDD4 0x0070, 0x0168 - _0807EB74 + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 _0807E9D4 Jump script_0800E32E script_0800E312: - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 EndBlock MessageNoOverlap 0x2404 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800E2AE script_0800E32E: CheckEntityInteractType JumpIfNot script_0800E32E - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 MessageNoOverlap 0x2403 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800E32E .2byte 0x0000 diff --git a/data/scripts/dhc/script_KingDaltusStone.inc b/data/scripts/dhc/script_KingDaltusStone.inc index ee83a886..23e38f64 100644 --- a/data/scripts/dhc/script_KingDaltusStone.inc +++ b/data/scripts/dhc/script_KingDaltusStone.inc @@ -1,23 +1,23 @@ @ DHC King Daltus stone SCRIPT_START script_KingDaltusStone BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0071 JumpIf script_0800E3E8 CheckLocalFlag 0x0096 JumpIf script_0800E3BE - _0807E930 0x000c + SetAnimation 0x000c CallWithArg sub_0807F8E8, 0x00000000 EndBlock script_0800E37A: CheckRoomFlag 0x0000 JumpIfNot script_0800E37A - _0807E864 + SetPlayerIdle Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 - _0807E930 0x000d + SetAnimation 0x000d Wait 0x003c PlaySound SFX_1CA DoPostScriptAction 0x0010 @@ -27,36 +27,36 @@ script_0800E37A: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB74 + FacePlayer SetLocalFlag 0x0096 script_0800E3BE: DoPostScriptAction 0x0000 _0807E9D4 - _0807E878 + EnablePlayerControl EndBlock script_0800E3C8: CheckEntityInteractType JumpIfNot script_0800E3C8 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x240c WaitUntilTextboxCloses Wait 0x000f GivePlayerItem 0x0053 WaitPlayerGetItem SetLocalFlag 0x0071 - _0807E878 + EnablePlayerControl script_0800E3E8: _0807E9D4 - _0807E878 + EnablePlayerControl EndBlock script_0800E3EE: CheckEntityInteractType JumpIfNot script_0800E3EE - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x240d WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800E3EE diff --git a/data/scripts/dhc/script_MinishterPothoStone.inc b/data/scripts/dhc/script_MinishterPothoStone.inc index b01fa4fa..caf8f250 100644 --- a/data/scripts/dhc/script_MinishterPothoStone.inc +++ b/data/scripts/dhc/script_MinishterPothoStone.inc @@ -1,21 +1,21 @@ @ DHC Minister Potho stone SCRIPT_START script_MinishterPothoStone BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0093 JumpIf script_0800E12E - _0807E930 0x0008 + SetAnimation 0x0008 CallWithArg sub_0807F8E8, 0x00000000 EndBlock script_0800E0DE: CheckRoomFlag 0x0000 JumpIfNot script_0800E0DE - _0807E864 + SetPlayerIdle Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 - _0807E930 0x0009 + SetAnimation 0x0009 Wait 0x003c PlaySound SFX_1CA DoPostScriptAction 0x0010 @@ -25,24 +25,24 @@ script_0800E0DE: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB8C - _0807EB74 + FaceAwayFromPlayer + FacePlayer Wait 0x000a MessageNoOverlap 0x2402 WaitUntilTextboxCloses SetLocalFlag 0x0093 script_0800E12E: Call sub_080668F0 - _0807E878 + EnablePlayerControl EndBlock script_0800E138: CheckEntityInteractType JumpIfNot script_0800E138 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x2402 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800E138 .2byte 0x0000 diff --git a/data/scripts/dhc/script_MinisterPothoCell.inc b/data/scripts/dhc/script_MinisterPothoCell.inc index 92639487..bbb05921 100644 --- a/data/scripts/dhc/script_MinisterPothoCell.inc +++ b/data/scripts/dhc/script_MinisterPothoCell.inc @@ -1,17 +1,17 @@ @ DHC Minister Potho in King cell SCRIPT_START script_MinisterPothoCell BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x000a Call sub_080668F0 EndBlock script_0800E41A: CheckEntityInteractType JumpIfNot script_0800E41A - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x2406 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800E41A diff --git a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc index 7862193e..67c2d035 100644 --- a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc @@ -5,28 +5,28 @@ SCRIPT_START script_Npc4EAfterDefeatingV2 script_0800DB7C: CallWithArg sub_0807F6B4, 0x000000a0 JumpIf script_0800DB7C - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 _0807F0B4 0x0001 SetEntityPositionRelative 0x0078, 0x0078 CameraTargetEntity - Call sub_0807F5C0 - _0807EB28 0x1648 + Call WaitForCameraTouchRoomBorder + EzloMessage 0x1648 WaitUntilTextboxCloses Call sub_0804D7EC SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_0800DBCA: CheckRoomFlag 0x0000 JumpIfNot script_0800DBCA - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 Call sub_0804D810 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c StartPlayerScript script_PlayerRescuedZelda WaitForSyncFlagAndClear 0x00000004 @@ -37,9 +37,9 @@ script_0800DBCA: WaitForSyncFlagAndClear 0x00000006 MessageFromTargetPos 0x1643, 0x0002 WaitUntilTextboxCloses - _0807EB28 0x1645 + EzloMessage 0x1645 WaitUntilTextboxCloses - Call sub_0807F3F8 + Call CreatePlayerExclamationMark SetSyncFlag 0x00000001 StopBgm Call sub_08094F98 diff --git a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc index 901ce247..1f2ae59d 100644 --- a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc +++ b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc @@ -4,12 +4,12 @@ SCRIPT_START script_Npc4ECastleCollapsing PlayBgm BGM_CASTLE_COLLAPSE StartPlayerScript script_PlayerStonesFall WaitForSyncFlagAndClear 0x00000006 - _0807EB28 0x1646 + EzloMessage 0x1646 WaitUntilTextboxCloses SetSyncFlag 0x00000001 StartPlayerScript script_PlayerCastleCollapsing CameraTargetPlayer - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E80C 0x00000000 WaitForFadeFinish CallWithArg DeleteManager36, 0x00000001 @@ -17,6 +17,6 @@ SCRIPT_START script_Npc4ECastleCollapsing SetLocalFlag 0x0079 CallWithArg sub_0806DA1C, 0x00000002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/dhc/script_Npc4EV3Defeated.inc b/data/scripts/dhc/script_Npc4EV3Defeated.inc index c2f60ee1..09f214d5 100644 --- a/data/scripts/dhc/script_Npc4EV3Defeated.inc +++ b/data/scripts/dhc/script_Npc4EV3Defeated.inc @@ -5,7 +5,7 @@ script_0800A0FE: CheckGlobalFlag 0x0051 JumpIfNot script_0800A0FE BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 StopBgm .ifndef EU @@ -14,10 +14,10 @@ script_0800A0FE: SetEntityPositionRelative 0x00b0, 0x0058 Call sub_0807F844 _0807E8E4_3 - CallWithArg sub_0807F75C, 0x00d00060 + CallWithArg SetPlayerPos, 0x00d00060 CallWithArg sub_08094AE8, script_Object6AV3DefeatedMinishCap PlaySound SFX_APPARATE - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade6 EndBlock WaitForFadeFinish diff --git a/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc b/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc index b583efe7..4bdf7ea5 100644 --- a/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc +++ b/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc @@ -1,7 +1,7 @@ @ DHC OBJECT_69 Towards Vaati in room with Ball&Chain soldier SCRIPT_START script_Object69BallAndChainSoldierRoom BeginBlock - Call sub_0807F354 + Call SetPriorityPlayerEvent EndBlock CheckLocalFlag 0x007c JumpIf script_0800E4FA @@ -17,7 +17,7 @@ script_0800E4B6: .endif JumpIfNot script_0800E4B6 BeginBlock - _0807E864 + SetPlayerIdle .ifdef JP .ifndef DEMO_JP Call SetPlayerEventPriority @@ -28,7 +28,7 @@ script_0800E4B6: .endif .endif EndBlock - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c MessageFromTarget 0x160c WaitUntilTextboxCloses @@ -36,7 +36,7 @@ script_0800E4B6: MessageFromTarget 0x160d WaitUntilTextboxCloses Wait 0x001e - _0807EB28 0x160e + EzloMessage 0x160e Wait 0x003c WaitUntilTextboxCloses BeginBlock @@ -52,7 +52,7 @@ script_0800E4B6: .endif .endif script_0800E4FA: - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 EndBlock SCRIPT_END diff --git a/data/scripts/dhc/script_Object69CastleEscape.inc b/data/scripts/dhc/script_Object69CastleEscape.inc index ffd72119..f75e5bc4 100644 --- a/data/scripts/dhc/script_Object69CastleEscape.inc +++ b/data/scripts/dhc/script_Object69CastleEscape.inc @@ -1,15 +1,15 @@ @ DHC OBJECT_69 trying to escape the collapsing castle SCRIPT_START script_Object69CastleEscape - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerCastleEscape WaitForSyncFlagAndClear 0x00000001 WaitForSyncFlagAndClear 0x00000002 - _0807EB28 0x1647 + EzloMessage 0x1647 WaitUntilTextboxCloses SetLocalFlag 0x007a Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/dhc/script_Object69DarkNutsRoom.inc b/data/scripts/dhc/script_Object69DarkNutsRoom.inc index 44712e30..c2f30cae 100644 --- a/data/scripts/dhc/script_Object69DarkNutsRoom.inc +++ b/data/scripts/dhc/script_Object69DarkNutsRoom.inc @@ -7,17 +7,17 @@ SCRIPT_START script_Object69DarkNutsRoom script_0800E550: CheckPlayerInRegion 0x00a8, 0x00c0, 0x0880 JumpIfNot script_0800E550 - _0807E864 + SetPlayerIdle Wait 0x001e - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c PlaySound SFX_105 Wait 0x001e - _0807EB28 0x1622 + EzloMessage 0x1622 Call sub_08053494 SetLocalFlag 0x007e script_0800E582: - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_Object69KeatonsRoom.inc b/data/scripts/dhc/script_Object69KeatonsRoom.inc index ef855c7e..902cf230 100644 --- a/data/scripts/dhc/script_Object69KeatonsRoom.inc +++ b/data/scripts/dhc/script_Object69KeatonsRoom.inc @@ -7,15 +7,15 @@ SCRIPT_START script_Object69KeatonsRoom script_0800E510: CheckPlayerInRegion 0x00a8, 0x0178, 0x1080 JumpIfNot script_0800E510 - _0807E864 + SetPlayerIdle Wait 0x001e - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c PlaySound SFX_105 Wait 0x001e - _0807EB28 0x1617 + EzloMessage 0x1617 SetLocalFlag 0x007d script_0800E53C: - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/dhc/script_Object69KillDarkNut.inc b/data/scripts/dhc/script_Object69KillDarkNut.inc index 24b83cb0..23a85ddd 100644 --- a/data/scripts/dhc/script_Object69KillDarkNut.inc +++ b/data/scripts/dhc/script_Object69KillDarkNut.inc @@ -4,12 +4,12 @@ SCRIPT_START script_Object69KillDarkNut script_0800E5D8: CheckLocalFlag 0x0086 JumpIfNot script_0800E5D8 - _0807E864 + SetPlayerIdle Wait 0x003c SetIntVariable 0x00000905 - Call sub_0807F420 + Call LoadMenu SetRoomFlag 0x0001 Wait 0x001e - _0807E878 + EnablePlayerControl SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_Object69V1Defeated.inc b/data/scripts/dhc/script_Object69V1Defeated.inc index 5acee128..0fe8da38 100644 --- a/data/scripts/dhc/script_Object69V1Defeated.inc +++ b/data/scripts/dhc/script_Object69V1Defeated.inc @@ -5,11 +5,11 @@ script_0800DFB6: CheckRoomFlag 0x0001 JumpIfNot script_0800DFB6 StopBgm - _0807E864 + SetPlayerIdle Call sub_0807DF28 PlaySound SFX_EVAPORATE CallWithArg sub_0806DA1C, 0x00000004 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/dhc/script_Object69V2Defeated.inc b/data/scripts/dhc/script_Object69V2Defeated.inc index 9d356a54..ddd5df46 100644 --- a/data/scripts/dhc/script_Object69V2Defeated.inc +++ b/data/scripts/dhc/script_Object69V2Defeated.inc @@ -2,12 +2,12 @@ SCRIPT_START script_Object69V2Defeated BeginBlock Call sub_0807DF28 - _0807E864 + SetPlayerIdle EndBlock StopBgm StopBgm Wait 0x0078 - _0807EB28 0x1638 + EzloMessage 0x1638 WaitUntilTextboxCloses SetRoomFlag 0x0000 Wait 0x001e @@ -15,7 +15,7 @@ SCRIPT_START script_Object69V2Defeated StartPlayerScript script_PlayerV2Defeated WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_Object69V2Intro.inc b/data/scripts/dhc/script_Object69V2Intro.inc index a485ffb9..1e779703 100644 --- a/data/scripts/dhc/script_Object69V2Intro.inc +++ b/data/scripts/dhc/script_Object69V2Intro.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Object69V2Intro BeginBlock Call sub_0807DF28 - _0807E864 + SetPlayerIdle EndBlock StopBgm MessageFromTargetPos 0x1632, 0x0002 @@ -13,12 +13,12 @@ script_0800DFFE: JumpIfNot script_0800DFFE PlayBgm BGM_VAATI_TRANSFIGURED Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_0800E012: @ Defeated CheckRoomFlag 0x0002 JumpIfNot script_0800E012 - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetLocalFlag 0x007b MessageFromTargetPos 0x1639, 0x000c @@ -27,7 +27,7 @@ script_0800E012: PlaySound SFX_EVAPORATE CallWithArg sub_0806DA1C, 0x00000005 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_Object69VaatiWithZelda.inc b/data/scripts/dhc/script_Object69VaatiWithZelda.inc index e66a3b15..930fbcf2 100644 --- a/data/scripts/dhc/script_Object69VaatiWithZelda.inc +++ b/data/scripts/dhc/script_Object69VaatiWithZelda.inc @@ -5,16 +5,16 @@ SCRIPT_START script_Object69VaatiWithZelda script_0800DA64: CheckPlayerInRegion 0x0078, 0x0148, 0x4040 JumpIfNot script_0800DA64 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 _0807E8E4_0 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c _0807F0B4 0x0004 SetEntityPositionRelative 0x0078, 0x0080 CameraTargetEntity - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 MessageFromTargetPos 0x162d, 0x0002 @@ -24,24 +24,24 @@ script_0800DA64: MessageFromTargetPos 0x162e, 0x0002 WaitUntilTextboxCloses _0807E8E4_0 - CallWithArg sub_0807F75C, 0x00780138 + CallWithArg SetPlayerPos, 0x00780138 _0807F0B4 0x0004 CameraTargetPlayer - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder SetRoomFlag 0x0000 - Call sub_0807F40C + Call CreatePlayerQuestionMark Wait 0x001e _0807E8E4_1 Wait 0x000a _0807E8E4_3 Wait 0x000a _0807E8E4_2 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c SetRoomFlag 0x0001 SetLocalFlag 0x0077 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc index 77dc7aaa..384e441c 100644 --- a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc +++ b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc @@ -4,15 +4,15 @@ SCRIPT_START script_Object6AV3DefeatedMinishCap SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - _0807E930 0x0002 + SetAnimation 0x0002 SetEntityPositionRelative 0x00b0, 0x0080 - CallWithArg sub_0807F98C, 0xff800000 + CallWithArg SetEntityHeight, 0xff800000 CallWithArg sub_080960C4, script_Object6AV3DefeatedMinishCap2 EndBlock PlaySound SFX_SPARKLES _0807EF3C 0xff80, 0x0000 PlaySound SFX_143 - _0807E930 0x0004 + SetAnimation 0x0004 SetSyncFlag 0x00000002 Wait 0x003c SetSyncFlag 0x00000004 diff --git a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc index 093a1833..200517d3 100644 --- a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc +++ b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc @@ -3,7 +3,7 @@ SCRIPT_START script_Object6AV3DefeatedMinishCap2 BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - CallWithArg sub_0807F994, 0x0000fff8 + CallWithArg SetSpriteOffset, 0x0000fff8 EndBlock WaitForSyncFlag 0x00000002 DoPostScriptAction 0x0006 diff --git a/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc b/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc index 8c72e4c3..ee4b78c3 100644 --- a/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc @@ -3,10 +3,10 @@ SCRIPT_START script_PlayerAfterDefeatingV2 BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x000d DoPostScriptAction 0x0000 - _0807ECC4 0x0010 + WalkSouth 0x0010 DoPostScriptAction 0x000c SetSyncFlag 0x00000004 Call sub_080791BC diff --git a/data/scripts/dhc/script_PlayerAtDarkNut1.inc b/data/scripts/dhc/script_PlayerAtDarkNut1.inc index fd697e62..e37bcc9a 100644 --- a/data/scripts/dhc/script_PlayerAtDarkNut1.inc +++ b/data/scripts/dhc/script_PlayerAtDarkNut1.inc @@ -3,13 +3,13 @@ SCRIPT_START script_PlayerAtDarkNut1 BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0000 - _0807E864 - Call sub_0807F354 + SetPlayerIdle + Call SetPriorityPlayerEvent EndBlock - WaitForPlayerAction0x17 + WaitForPlayerEnterRoom _0807E8E4_0 DoPostScriptAction 0x0001 Call sub_080752AC - _0807E878 + EnablePlayerControl Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerAtDarkNut2.inc b/data/scripts/dhc/script_PlayerAtDarkNut2.inc index 274f6746..60ee6ace 100644 --- a/data/scripts/dhc/script_PlayerAtDarkNut2.inc +++ b/data/scripts/dhc/script_PlayerAtDarkNut2.inc @@ -3,13 +3,13 @@ SCRIPT_START script_PlayerAtDarkNut2 BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0008 - _0807E864 - Call sub_0807F354 + SetPlayerIdle + Call SetPriorityPlayerEvent EndBlock - WaitForPlayerAction0x17 + WaitForPlayerEnterRoom _0807E8E4_1 DoPostScriptAction 0x0001 Call sub_080752AC - _0807E878 + EnablePlayerControl Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerAtDarkNut3.inc b/data/scripts/dhc/script_PlayerAtDarkNut3.inc index 8cd1c2c9..b092a4c7 100644 --- a/data/scripts/dhc/script_PlayerAtDarkNut3.inc +++ b/data/scripts/dhc/script_PlayerAtDarkNut3.inc @@ -3,13 +3,13 @@ SCRIPT_START script_PlayerAtDarkNut3 BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0010 - _0807E864 - Call sub_0807F354 + SetPlayerIdle + Call SetPriorityPlayerEvent EndBlock - WaitForPlayerAction0x17 + WaitForPlayerEnterRoom _0807E8E4_2 DoPostScriptAction 0x0001 Call sub_080752AC - _0807E878 + EnablePlayerControl Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerCastleCollapsing.inc b/data/scripts/dhc/script_PlayerCastleCollapsing.inc index dff8b0a0..509a5e68 100644 --- a/data/scripts/dhc/script_PlayerCastleCollapsing.inc +++ b/data/scripts/dhc/script_PlayerCastleCollapsing.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerCastleCollapsing BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 _0807EEF4 0x0000, 0x0080 SetSyncFlag 0x00000004 diff --git a/data/scripts/dhc/script_PlayerCastleEscape.inc b/data/scripts/dhc/script_PlayerCastleEscape.inc index 997799ad..5f57f7d8 100644 --- a/data/scripts/dhc/script_PlayerCastleEscape.inc +++ b/data/scripts/dhc/script_PlayerCastleEscape.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerCastleEscape SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0198, 0x01c8 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/dhc/script_PlayerRescuedZelda.inc b/data/scripts/dhc/script_PlayerRescuedZelda.inc index 23a6112c..66d6d108 100644 --- a/data/scripts/dhc/script_PlayerRescuedZelda.inc +++ b/data/scripts/dhc/script_PlayerRescuedZelda.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerRescuedZelda EndBlock CallWithArg sub_0807F4F8, 0x000000a0 _0807EDD4 0x0078, 0x00a0 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 Call sub_080791BC diff --git a/data/scripts/dhc/script_PlayerStonesFall.inc b/data/scripts/dhc/script_PlayerStonesFall.inc index 5f9e57d1..12ba8a9d 100644 --- a/data/scripts/dhc/script_PlayerStonesFall.inc +++ b/data/scripts/dhc/script_PlayerStonesFall.inc @@ -1,10 +1,10 @@ @ Player after turning Zelda when stones fall SCRIPT_START script_PlayerStonesFall EndBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 - CallWithArg sub_0807F238, 0x000003c5 - Call sub_0807F304 + CallWithArg SetPlayerAnimation2, 0x000003c5 + Call WaitForPlayerFrameHiBit SetSyncFlag 0x00000004 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/dhc/script_Vaati1Intro.inc b/data/scripts/dhc/script_Vaati1Intro.inc index cbf2d189..3255d880 100644 --- a/data/scripts/dhc/script_Vaati1Intro.inc +++ b/data/scripts/dhc/script_Vaati1Intro.inc @@ -2,21 +2,21 @@ SCRIPT_START script_Vaati1Intro BeginBlock DoPostScriptAction 0x0008 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StopBgm _0807E8E4_2 Wait 0x005a - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c _0807E8E4_0 _0807F0B4 0x0001 CameraTargetEntity - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder Call sub_08066C94 Wait 0x00e9 DoPostScriptAction 0x0007 @@ -25,15 +25,15 @@ SCRIPT_START script_Vaati1Intro PlayBgm BGM_VAATI_REBORN DoPostScriptAction 0x0019 PlaySound SFX_198 - Call sub_0807F2D4 + Call WaitForFrameHiBit SetRoomFlag 0x0000 DoPostScriptAction 0x0008 Wait 0x0080 _0807F0B4 0x0004 CameraTargetPlayer - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder SetLocalFlag 0x0078 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/dhc/script_VaatiWithZelda.inc b/data/scripts/dhc/script_VaatiWithZelda.inc index 252052f3..1464b9a8 100644 --- a/data/scripts/dhc/script_VaatiWithZelda.inc +++ b/data/scripts/dhc/script_VaatiWithZelda.inc @@ -2,21 +2,21 @@ SCRIPT_START script_VaatiWithZelda BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0014 EndBlock WaitForSyncFlagAndClear 0x00000001 Wait 0x003c DoPostScriptAction 0x0004 Wait 0x003c - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x001c - Call sub_0807F2D4 + Call WaitForFrameHiBit DoPostScriptAction 0x0000 Wait 0x003c SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0014 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc index c52b1a81..8c2d1161 100644 --- a/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc @@ -18,48 +18,48 @@ script_0800DCD0: StopBgm Call sub_08066E50 PlaySound SFX_1C9 - Call sub_0807F2D4 + Call WaitForFrameHiBit PlaySound SFX_1CA Wait 0x003c DoPostScriptAction 0x0004 PlayBgm BGM_SAVING_ZELDA Wait 0x0078 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Wait 0x003c SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 _0807EEF4 0x0000, 0x0008 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Wait 0x001e Call sub_08066E80 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x0004 Wait 0x003c - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 diff --git a/data/scripts/dhc/script_ZeldaCastleEscape.inc b/data/scripts/dhc/script_ZeldaCastleEscape.inc index 83fd2afd..f8150ad9 100644 --- a/data/scripts/dhc/script_ZeldaCastleEscape.inc +++ b/data/scripts/dhc/script_ZeldaCastleEscape.inc @@ -1,7 +1,7 @@ @ DHC Zelda trying to escape the collapsing castle SCRIPT_START script_ZeldaCastleEscape BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetEntitySpeed 0x0100 DoPostScriptAction 0x000b @@ -13,7 +13,7 @@ SCRIPT_START script_ZeldaCastleEscape DoPostScriptAction 0x0007 EndBlock _0807EDD4 0x0198, 0x01a8 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 Call sub_08066D4C diff --git a/data/scripts/dhc/script_ZeldaStoneDHC.inc b/data/scripts/dhc/script_ZeldaStoneDHC.inc index 04ab862d..ae2bc504 100644 --- a/data/scripts/dhc/script_ZeldaStoneDHC.inc +++ b/data/scripts/dhc/script_ZeldaStoneDHC.inc @@ -2,7 +2,7 @@ SCRIPT_START script_ZeldaStoneDHC BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0014 EndBlock Wait 0x003c diff --git a/data/scripts/fow/script_MazaalMacroDefeated.inc b/data/scripts/fow/script_MazaalMacroDefeated.inc index 624a5513..694d5d25 100644 --- a/data/scripts/fow/script_MazaalMacroDefeated.inc +++ b/data/scripts/fow/script_MazaalMacroDefeated.inc @@ -1,12 +1,12 @@ @ Mazaal Macro when defeated SCRIPT_START script_MazaalMacroDefeated BeginBlock - _0807E864 + SetPlayerIdle EndBlock Wait 0x0078 - _0807E908 0x0004 + SetAction 0x0004 StartPlayerScript script_PlayerDefeatedMazaal WaitForSyncFlagAndClear 0x00000002 Wait 0x000c - _0807E908 0x0005 + SetAction 0x0005 SCRIPT_END diff --git a/data/scripts/fow/script_Object89Mazaal.inc b/data/scripts/fow/script_Object89Mazaal.inc index b5c522c0..75e0eb0b 100644 --- a/data/scripts/fow/script_Object89Mazaal.inc +++ b/data/scripts/fow/script_Object89Mazaal.inc @@ -2,11 +2,11 @@ SCRIPT_START script_Object89Mazaal BeginBlock EndBlock - _0807E888 + DisablePlayerControl Wait 0x0018 - _0807E864 + SetPlayerIdle StartPlayerScript script_PlayerAtMazaal WaitForSyncFlagAndClear 0x00000001 - _0807E908 0x0002 + SetAction 0x0002 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/fow/script_PlayerAtMazaal.inc b/data/scripts/fow/script_PlayerAtMazaal.inc index 75086071..d71de158 100644 --- a/data/scripts/fow/script_PlayerAtMazaal.inc +++ b/data/scripts/fow/script_PlayerAtMazaal.inc @@ -1,7 +1,7 @@ @ Player entering Mazaal SCRIPT_START script_PlayerAtMazaal BeginBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 SetEntitySpeed 0x0140 EndBlock _0807EDD4 0x00b8, 0x0094 diff --git a/data/scripts/fow/script_PlayerDefeatedMazaal.inc b/data/scripts/fow/script_PlayerDefeatedMazaal.inc index 0f6d278a..89fb8ba8 100644 --- a/data/scripts/fow/script_PlayerDefeatedMazaal.inc +++ b/data/scripts/fow/script_PlayerDefeatedMazaal.inc @@ -4,15 +4,15 @@ SCRIPT_START script_PlayerDefeatedMazaal SetEntitySpeed 0x0140 EndBlock Wait 0x003c - _0807EB44 0x0004 + SetAnimationState 0x0004 Wait 0x000f - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x0012 - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000c - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x0015 - _0807EB44 0x0004 + SetAnimationState 0x0004 Wait 0x0008 SetSyncFlag 0x00000002 _0807EDD4 0x0088, 0x0158 diff --git a/data/scripts/graveyard/script_DampeInside.inc b/data/scripts/graveyard/script_DampeInside.inc index 4f7b7f6f..c722ae55 100644 --- a/data/scripts/graveyard/script_DampeInside.inc +++ b/data/scripts/graveyard/script_DampeInside.inc @@ -2,8 +2,8 @@ SCRIPT_START script_DampeInside CheckEntityInteractType JumpIfNot script_080095DE - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0001 Call sub_0806BE84 WaitUntilTextboxCloses @@ -15,6 +15,6 @@ SCRIPT_START script_DampeInside WaitUntilTextboxCloses _0807F078 0x003c, 0x0001 script_08009622: - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0000 Jump script_080095DE diff --git a/data/scripts/graveyard/script_DampeOuside.inc b/data/scripts/graveyard/script_DampeOuside.inc index fd0d90a2..653e1ee5 100644 --- a/data/scripts/graveyard/script_DampeOuside.inc +++ b/data/scripts/graveyard/script_DampeOuside.inc @@ -20,8 +20,8 @@ script_08009646: script_08009660: CheckEntityInteractType JumpIfNot script_08009660 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0001 Call sub_0806BEC8 WaitUntilTextboxCloses @@ -31,6 +31,6 @@ script_08009660: _0807F078 0x003c, 0x0002 Call sub_0806BEFC script_0800968E: - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0000 Jump script_08009660 diff --git a/data/scripts/graveyard/script_GhostBrothers.inc b/data/scripts/graveyard/script_GhostBrothers.inc index 4f734e51..b9fed2f1 100644 --- a/data/scripts/graveyard/script_GhostBrothers.inc +++ b/data/scripts/graveyard/script_GhostBrothers.inc @@ -2,7 +2,7 @@ SCRIPT_START script_GhostBrothers BeginBlock Call sub_08065D00 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a DoPostScriptAction 0x0007 @@ -10,11 +10,11 @@ SCRIPT_START script_GhostBrothers script_0800975A: CheckEntityInteractType JumpIfNot script_0800975A - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 Call sub_08065F64 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800975A .2byte 0x0000 diff --git a/data/scripts/graveyard/script_Gina.inc b/data/scripts/graveyard/script_Gina.inc index 2f0422c7..bb427371 100644 --- a/data/scripts/graveyard/script_Gina.inc +++ b/data/scripts/graveyard/script_Gina.inc @@ -1,7 +1,7 @@ @ Graveyard Gina SCRIPT_START script_Gina BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a EndBlock @@ -10,19 +10,19 @@ SCRIPT_START script_Gina script_0800B934: CheckEntityInteractType JumpIfNot script_0800B934 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageFromTarget 0x3f19 WaitUntilTextboxCloses SetLocalFlag 0x005f - _0807E878 + EnablePlayerControl Jump script_0800B934 script_0800B94E: CheckEntityInteractType JumpIfNot script_0800B94E - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageFromTarget 0x3f1a WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800B94E diff --git a/data/scripts/graveyard/script_GraveyardHouseDoor.inc b/data/scripts/graveyard/script_GraveyardHouseDoor.inc index 631a1c19..c310b55e 100644 --- a/data/scripts/graveyard/script_GraveyardHouseDoor.inc +++ b/data/scripts/graveyard/script_GraveyardHouseDoor.inc @@ -9,8 +9,8 @@ SCRIPT_START script_GraveyardHouseDoor script_080096AC: CheckPlayerInRegion 0x0188, 0x01c0, 0x1020 JumpIfNot script_080096AC - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerAtGraveyardHouseDoor WaitForSyncFlagAndClear 0x00000001 @@ -24,7 +24,7 @@ script_080096EC: CheckGlobalFlag 0x0020 JumpIfNot script_080096EC Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_080096FC: Call sub_0808692C SCRIPT_END diff --git a/data/scripts/graveyard/script_GreatFairyArrows.inc b/data/scripts/graveyard/script_GreatFairyArrows.inc index e43be1bd..9979e761 100644 --- a/data/scripts/graveyard/script_GreatFairyArrows.inc +++ b/data/scripts/graveyard/script_GreatFairyArrows.inc @@ -6,8 +6,8 @@ script_0800B618: CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 JumpIfNot script_0800B618 Call sub_08079184 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal StartPlayerScript script_PlayerAtGreatFairy WaitForSyncFlagAndClear 0x00000004 SetRoomFlag 0x0000 @@ -20,7 +20,7 @@ script_0800B618: JumpIfNot script_0800B684 Wait 0x000f MessageNoOverlap 0x0584 - CallWithArg sub_0807F970, 0x0000058b + CallWithArg CheckMessageEqual, 0x0000058b JumpIf script_0800B68E CallWithArg sub_08087424, 0x00000000 Wait 0x00b4 @@ -35,12 +35,12 @@ script_0800B68E: GivePlayerItem 0x0066 script_0800B698: WaitPlayerGetItem - _0807EB8C + FaceAwayFromPlayer Wait 0x001e MessageNoOverlap 0x057f WaitUntilTextboxCloses script_0800B6A6: - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade7 WaitForFadeFinish Call sub_080873FC @@ -49,5 +49,5 @@ script_0800B6A6: CameraTargetPlayer Wait 0x001e Call sub_0807DF50 - _0807E878 + EnablePlayerControl SCRIPT_END diff --git a/data/scripts/graveyard/script_KingGustav.inc b/data/scripts/graveyard/script_KingGustav.inc index f1b2e0fc..fc690dc8 100644 --- a/data/scripts/graveyard/script_KingGustav.inc +++ b/data/scripts/graveyard/script_KingGustav.inc @@ -2,34 +2,34 @@ SCRIPT_START script_KingGustav BeginBlock DoPostScriptAction 0x0008 - Call sub_0807F180 + Call SetCollisionLayer2 EndBlock script_0800D962: CheckPlayerInRegion 0x0118, 0x0038, 0x3050 JumpIfNot script_0800D962 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerAtKingGustav WaitForSyncFlagAndClear 0x00000001 Wait 0x003c - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x0007 PlaySound SFX_ELEMENT_FLOAT - SetEntity0x20 0xffff8000 + SetEntityVelocity 0xffff8000 MessageNoOverlap 0x1701 WaitUntilTextboxCloses SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 MessageNoOverlap 0x1702 WaitUntilTextboxCloses - SetEntity0x20 0x00010000 + SetEntityVelocity 0x00010000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - _0807F050 0x006d + GiveKinstone 0x006d WaitPlayerGetItem - _0807EB28 0x1703 + EzloMessage 0x1703 WaitUntilTextboxCloses Wait 0x003c SetLocalFlag 0x0032 @@ -37,7 +37,7 @@ script_0800D962: SetIntVariable 0x00000001 Call sub_0806DA1C Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/graveyard/script_Object69CrowStealingKey.inc b/data/scripts/graveyard/script_Object69CrowStealingKey.inc index 9c0bf816..47cf61f9 100644 --- a/data/scripts/graveyard/script_Object69CrowStealingKey.inc +++ b/data/scripts/graveyard/script_Object69CrowStealingKey.inc @@ -1,10 +1,10 @@ @ Graveyard OBJECT_69 Crow stealing key cutscene SCRIPT_START script_Object69CrowStealingKey - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 PlaySound SFX_1F3 - Call sub_0807F40C + Call CreatePlayerQuestionMark _0807E8E4_1 Wait 0x000a _0807E8E4_3 @@ -21,9 +21,9 @@ SCRIPT_START script_Object69CrowStealingKey SetGlobalFlag 0x0020 _0807E8E4_3 Wait 0x001e - _0807EB28 0x2809 + EzloMessage 0x2809 WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/graveyard/script_Object69GetKeyBack.inc b/data/scripts/graveyard/script_Object69GetKeyBack.inc index 7c9b1a25..b6e1073b 100644 --- a/data/scripts/graveyard/script_Object69GetKeyBack.inc +++ b/data/scripts/graveyard/script_Object69GetKeyBack.inc @@ -35,13 +35,13 @@ script_080098E0: .endif .endif .endif - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 - _0807EB28 0x280a + EzloMessage 0x280a WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08009910: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/graveyard/script_Object97FirstCrow.inc b/data/scripts/graveyard/script_Object97FirstCrow.inc index 4c5e2c80..0c997c0f 100644 --- a/data/scripts/graveyard/script_Object97FirstCrow.inc +++ b/data/scripts/graveyard/script_Object97FirstCrow.inc @@ -1,10 +1,10 @@ @ Graveyard OBJECT_97 Crow stealing the key? first crow that makes link loose the key SCRIPT_START script_Object97FirstCrow BeginBlock - _0807E930 0x0003 + SetAnimation 0x0003 DoPostScriptAction 0x0007 SetEntitySpeed 0x0300 - Call sub_0807F348 + Call SetPriorityMessage EndBlock WaitForSyncFlagAndClear 0x00000002 PlaySound SFX_123 diff --git a/data/scripts/graveyard/script_Object97SecondCrow.inc b/data/scripts/graveyard/script_Object97SecondCrow.inc index 131fe158..169a3ff5 100644 --- a/data/scripts/graveyard/script_Object97SecondCrow.inc +++ b/data/scripts/graveyard/script_Object97SecondCrow.inc @@ -1,10 +1,10 @@ @ Graveyard OBJECT_97 Crow stealing the key? Second crow that picks up the key SCRIPT_START script_Object97SecondCrow BeginBlock - _0807E930 0x0003 + SetAnimation 0x0003 DoPostScriptAction 0x0007 SetEntitySpeed 0x0300 - Call sub_0807F348 + Call SetPriorityMessage EndBlock WaitForSyncFlagAndClear 0x00000008 Call sub_0809E0A0 diff --git a/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc index 5d193069..cbb2b2d3 100644 --- a/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc +++ b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtGraveyardHouseDoor SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 _0807EDD4 0x01a0, 0x01b0 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 Wait 0x000a DoPostScriptAction 0x0004 @@ -11,6 +11,6 @@ SCRIPT_START script_PlayerAtGraveyardHouseDoor SetSyncFlag 0x00000001 DoPostScriptAction 0x000d SetEntitySpeed 0x0100 - _0807ECC4 0x0010 + WalkSouth 0x0010 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/graveyard/script_PlayerAtKingGustav.inc b/data/scripts/graveyard/script_PlayerAtKingGustav.inc index d1214171..d2f7d3bd 100644 --- a/data/scripts/graveyard/script_PlayerAtKingGustav.inc +++ b/data/scripts/graveyard/script_PlayerAtKingGustav.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerAtKingGustav EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0118, 0x0060 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/graveyard/script_PlayerGetKeyStolen.inc b/data/scripts/graveyard/script_PlayerGetKeyStolen.inc index c805299a..6133e319 100644 --- a/data/scripts/graveyard/script_PlayerGetKeyStolen.inc +++ b/data/scripts/graveyard/script_PlayerGetKeyStolen.inc @@ -1,17 +1,17 @@ @ Player when crow steals key SCRIPT_START script_PlayerGetKeyStolen PlaySound SFX_PLY_VO6 - _0807EB44 0x0004 + SetAnimationState 0x0004 PlaySound SFX_86 Call sub_0807F36C SetEntitySpeed 0x0400 - _0807ECF4 0x0004 + WalkWest 0x0004 Call sub_0807F1E8 Wait 0x001e SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000020 PlaySound SFX_PLY_JUMP - _0807EB44 0x0004 + SetAnimationState 0x0004 Call sub_0807F210 _0807EF3C 0x0200, 0x0020 DoPostScriptAction 0x0000 diff --git a/data/scripts/hyruleCastle/script_CastleMaid.inc b/data/scripts/hyruleCastle/script_CastleMaid.inc index 8e3726ba..90f05aed 100644 --- a/data/scripts/hyruleCastle/script_CastleMaid.inc +++ b/data/scripts/hyruleCastle/script_CastleMaid.inc @@ -2,7 +2,7 @@ SCRIPT_START script_CastleMaid BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a CallWithArg sub_08064644, sub_0806464C diff --git a/data/scripts/hyruleCastle/script_GuardAtEntry.inc b/data/scripts/hyruleCastle/script_GuardAtEntry.inc index 9fa561fc..a7161461 100644 --- a/data/scripts/hyruleCastle/script_GuardAtEntry.inc +++ b/data/scripts/hyruleCastle/script_GuardAtEntry.inc @@ -3,18 +3,18 @@ SCRIPT_START script_GuardAtEntry BeginBlock _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x00000000 EndBlock script_08008DD8: CheckEntityInteractType JumpIfNot script_08008DD8 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 Call sub_080643D8 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x00000000 Jump script_08008DD8 diff --git a/data/scripts/hyruleCastle/script_KingDaltus.inc b/data/scripts/hyruleCastle/script_KingDaltus.inc index 9c47505b..09965292 100644 --- a/data/scripts/hyruleCastle/script_KingDaltus.inc +++ b/data/scripts/hyruleCastle/script_KingDaltus.inc @@ -1,7 +1,7 @@ @ Hyrule Castle King Daltus SCRIPT_START script_KingDaltus BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Call sub_0806672C DoPostScriptAction 0x000a diff --git a/data/scripts/hyruleCastle/script_MinisterPotho.inc b/data/scripts/hyruleCastle/script_MinisterPotho.inc index 7cea778c..6bd64932 100644 --- a/data/scripts/hyruleCastle/script_MinisterPotho.inc +++ b/data/scripts/hyruleCastle/script_MinisterPotho.inc @@ -1,7 +1,7 @@ @ Hyrule Castle Minister Potho SCRIPT_START script_MinisterPotho BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 script_0800927E: Call sub_080668F0 @@ -10,11 +10,11 @@ script_0800927E: script_0800928A: CheckEntityInteractType JumpIfNot script_0800928A - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08066904 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800928A .2byte 0x0000 diff --git a/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc b/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc index 9f2a3cd7..fa317824 100644 --- a/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc +++ b/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc @@ -2,12 +2,12 @@ SCRIPT_START script_Object69SanctuaryEntrance CheckPlayerInRegion 0x0088, 0x0048, 0x3030 JumpIfNot script_Object69SanctuaryEntrance - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerAtSanctuaryEntrance WaitForSyncFlagAndClear 0x00000001 - _0807EB28 0x132d + EzloMessage 0x132d WaitUntilTextboxCloses .ifdef JP SetLocalFlag 0x0015 @@ -23,7 +23,7 @@ SCRIPT_START script_Object69SanctuaryEntrance .endif .endif Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleCastle/script_SmithAtCastle.inc b/data/scripts/hyruleCastle/script_SmithAtCastle.inc index 5aa10b08..2e354751 100644 --- a/data/scripts/hyruleCastle/script_SmithAtCastle.inc +++ b/data/scripts/hyruleCastle/script_SmithAtCastle.inc @@ -1,7 +1,7 @@ @ Hyrule Castle Smith SCRIPT_START script_SmithAtCastle BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 script_080092B2: _0807E9D4 @@ -10,10 +10,10 @@ script_080092B2: script_080092BA: CheckEntityInteractType JumpIfNot script_080092BA - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x105e WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_080092BA diff --git a/data/scripts/hyruleCastle/script_StoneZelda.inc b/data/scripts/hyruleCastle/script_StoneZelda.inc index 7c9cacd8..d17e0023 100644 --- a/data/scripts/hyruleCastle/script_StoneZelda.inc +++ b/data/scripts/hyruleCastle/script_StoneZelda.inc @@ -8,10 +8,10 @@ SCRIPT_START script_StoneZelda script_08009300: CheckEntityInteractType JumpIfNot script_08009300 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x1071 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08009300 .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GardGarden5.inc b/data/scripts/hyruleCastleGarden/script_GardGarden5.inc index 4d280b98..e12c1665 100644 --- a/data/scripts/hyruleCastleGarden/script_GardGarden5.inc +++ b/data/scripts/hyruleCastleGarden/script_GardGarden5.inc @@ -1,6 +1,6 @@ @ Guard in Castle garden? SCRIPT_START script_GardGarden5 BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 Jump script_080119F6 .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GuardEntry1.inc b/data/scripts/hyruleCastleGarden/script_GuardEntry1.inc index 36724e50..3a6d1e8d 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardEntry1.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardEntry1.inc @@ -1,7 +1,7 @@ @ Intro Hyrule Castle Entrance Guard SCRIPT_START script_GuardEntry1 BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 script_080119F6: _0807E9D4 DoPostScriptAction 0x000a @@ -10,11 +10,11 @@ script_080119F6: script_08011A08: CheckEntityInteractType JumpIfNot script_08011A08 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 Call sub_08064428 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08011A08 .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GuardEntry2.inc b/data/scripts/hyruleCastleGarden/script_GuardEntry2.inc index 061b8cb7..53bfb506 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardEntry2.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardEntry2.inc @@ -1,7 +1,7 @@ @ Hyrule Castle Guard guarding entry to castle SCRIPT_START script_GuardEntry2 BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 @@ -9,10 +9,10 @@ SCRIPT_START script_GuardEntry2 script_08011A44: CheckEntityInteractType JumpIfNot script_08011A44 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 MessageFromTarget 0x1320 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08011A44 diff --git a/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc b/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc index c1b2985d..af4c3020 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc @@ -1,7 +1,7 @@ @ Hyrule Castle Guard guarding entry to garden SCRIPT_START script_GuardEntry3 BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 @@ -9,18 +9,18 @@ SCRIPT_START script_GuardEntry3 script_08011A7C: CheckEntityInteractType JumpIfNot script_08011A7C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 CallWithArg sub_080644B4, 0x00000006 JumpIf script_08011AFA MessageFromTarget 0x1320 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08011A7C .2byte 0x0000 BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 @@ -28,11 +28,11 @@ script_08011A7C: script_08011AC4: CheckEntityInteractType JumpIfNot script_08011AC4 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 MessageFromTarget 0x1322 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08011AC4 diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden1.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden1.inc index ac2385f2..f623a1c7 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardGarden1.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden1.inc @@ -1,6 +1,6 @@ @ Guard in Castle garden? SCRIPT_START script_GuardGarden1 BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 Jump script_0801196A .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden2.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden2.inc index 72a8627b..fb2c48b0 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardGarden2.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden2.inc @@ -1,6 +1,6 @@ @ Guard in Castle garden? SCRIPT_START script_GuardGarden2 BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 Jump script_0801196A .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden3.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden3.inc index c59e34cc..7f7dc3a1 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardGarden3.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden3.inc @@ -1,7 +1,7 @@ @ Intro Hyrule Castle Garden Guard SCRIPT_START script_GuardGarden3 BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 script_0801196A: _0807E9D4 DoPostScriptAction 0x000a @@ -10,8 +10,8 @@ script_0801196A: script_0801197C: CheckEntityInteractType JumpIfNot script_0801197C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 CheckGlobalFlag 0x0015 JumpIf script_080119A0 @@ -22,5 +22,5 @@ script_080119A0: script_080119A4: WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0801197C diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden4.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden4.inc index ce7e7680..92b48937 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardGarden4.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden4.inc @@ -2,7 +2,7 @@ SCRIPT_START script_GuardGarden4 BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x0000000c EndBlock diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden6.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden6.inc index 244345f9..a9947ae2 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardGarden6.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden6.inc @@ -1,6 +1,6 @@ @ Guard in Castle garden? SCRIPT_START script_GuardGarden6 BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 Jump script_080119F6 .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc index 0dd6ee73..66a5123a 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc @@ -2,8 +2,8 @@ SCRIPT_START script_GuardGarden7 CheckRoomFlag 0x000f JumpIfNot script_GuardGarden7 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 script_08011AFA: MessageFromTargetPos 0x1321, 0x0007 @@ -22,7 +22,7 @@ script_08011AFA: .endif .endif CallWithArg sub_0806DA1C, 0x00000003 - _0807E878 + EnablePlayerControl Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden8.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden8.inc index beff4e16..67ecb871 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardGarden8.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden8.inc @@ -1,10 +1,10 @@ @ Hyrule Castle Guard kicking Link out of garden SCRIPT_START script_GuardGarden8 - _0807E864 + SetPlayerIdle Call sub_0807DF28 MessageFromTargetPos 0x1320, 0x000c WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/hyruleTown/script_Anju.inc b/data/scripts/hyruleTown/script_Anju.inc index 827726c2..96b1b07b 100644 --- a/data/scripts/hyruleTown/script_Anju.inc +++ b/data/scripts/hyruleTown/script_Anju.inc @@ -8,8 +8,8 @@ SCRIPT_START script_Anju script_0801015A: CheckEntityInteractType JumpIfNot script_0801015A - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CheckRoomFlag 0x0001 JumpIf script_0801019E MessageFromTargetPos 0x3001, 0x0000 @@ -18,7 +18,7 @@ script_0801015A: JumpIfNot script_080101A6 Call sub_080A1608 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl CallWithArg sub_080A1550, script_080101AC JumpIfNot script_0801015A PlayBgm BGM_CUCCO_MINIGAME @@ -28,7 +28,7 @@ script_0801019E: Call sub_080A1608 WaitUntilTextboxCloses script_080101A6: - _0807E878 + EnablePlayerControl Jump script_0801015A script_080101AC: BeginBlock @@ -36,19 +36,19 @@ script_080101AC: Call sub_080A1648 EndBlock Call sub_080A1270 - _0807E864 + SetPlayerIdle Call sub_0807DF28 MessageFromTargetPos 0x3004, 0x0007 WaitUntilTextboxCloses StopBgm - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade5 WaitForFadeFinish - CallWithArg sub_0807F75C, 0x03400378 + CallWithArg SetPlayerPos, 0x03400378 Call sub_080791BC Call sub_0807FB74 _0807E8E4_1 - Call sub_0807F168 + Call SetPlayerCollisionLayer1 Call sub_080A1388 Call sub_0806EC38 BeginBlock @@ -56,7 +56,7 @@ script_080101AC: Call sub_0807F844 CameraTargetPlayer EndBlock - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade4 WaitForFadeFinish PlayBGM @@ -70,7 +70,7 @@ script_080101AC: Call sub_080A14A8 script_08010240: Call sub_0807DF50 - _0807E878 + EnablePlayerControl CallWithArg sub_0807F5B0, 0x00000000 ClearRoomFlag 0x0001 Call sub_080A169C diff --git a/data/scripts/hyruleTown/script_AnjuInside.inc b/data/scripts/hyruleTown/script_AnjuInside.inc index 7494a7a3..6253c544 100644 --- a/data/scripts/hyruleTown/script_AnjuInside.inc +++ b/data/scripts/hyruleTown/script_AnjuInside.inc @@ -2,16 +2,16 @@ SCRIPT_START script_AnjuInside BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a EndBlock script_08010132: CheckEntityInteractType JumpIfNot script_08010132 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageFromTarget 0x4f22 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08010132 diff --git a/data/scripts/hyruleTown/script_Beedle.inc b/data/scripts/hyruleTown/script_Beedle.inc index 38c53a6c..e265823a 100644 --- a/data/scripts/hyruleTown/script_Beedle.inc +++ b/data/scripts/hyruleTown/script_Beedle.inc @@ -1,17 +1,17 @@ @ Hyrule Town Beedle SCRIPT_START script_Beedle BeginBlock - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 DoPostScriptAction 0x000a - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_08010502: CheckEntityInteractType JumpIfNot script_08010502 - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB74 + FacePlayer CallWithArg sub_0807F3D8, 0x00000008 CheckRoomFlag 0x000e JumpIf script_0801052E @@ -69,22 +69,22 @@ script_080105DC: script_080105E0: WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_08010502 .2byte 0x0000 BeginBlock _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_08010602: CheckEntityInteractType JumpIfNot script_08010602 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageFromTarget 0x0a01 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 Jump script_08010602 diff --git a/data/scripts/hyruleTown/script_Brocco.inc b/data/scripts/hyruleTown/script_Brocco.inc index 58b41e24..f01bc951 100644 --- a/data/scripts/hyruleTown/script_Brocco.inc +++ b/data/scripts/hyruleTown/script_Brocco.inc @@ -1,21 +1,21 @@ @ (Intro) Hyrule Town Brocco SCRIPT_START script_Brocco BeginBlock - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 Call sub_080636F4 DoPostScriptAction 0x000a - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_08010470: CheckEntityInteractType JumpIfNot script_08010470 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000004 Call sub_080636D8 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl CallWithArg sub_0807F3D8, 0x00000000 Jump script_08010470 diff --git a/data/scripts/hyruleTown/script_CafeGuy.inc b/data/scripts/hyruleTown/script_CafeGuy.inc index 32473eb5..751e6e01 100644 --- a/data/scripts/hyruleTown/script_CafeGuy.inc +++ b/data/scripts/hyruleTown/script_CafeGuy.inc @@ -5,28 +5,28 @@ SCRIPT_START script_CafeGuy CallWithArg sub_08061FB8, 0x00000001 SetEntitySpeed 0x0040 DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0002 + SetAnimationState 0x0004 + SetAnimation 0x0002 EndBlock script_0800ECAC: - _0807EB44 0x0006 - _0807E930 0x0007 + SetAnimationState 0x0006 + SetAnimation 0x0007 _0807EDD4 0x0028, 0x0050 Wait 0x001e - _0807EB44 0x0004 - _0807E930 0x0002 + SetAnimationState 0x0004 + SetAnimation 0x0002 Wait 0x001e - _0807EB44 0x0002 - _0807E930 0x0001 + SetAnimationState 0x0002 + SetAnimation 0x0001 Wait 0x001e - _0807EB44 0x0002 - _0807E930 0x0005 + SetAnimationState 0x0002 + SetAnimation 0x0005 _0807EDD4 0x0048, 0x0050 Wait 0x001e - _0807EB44 0x0004 - _0807E930 0x0002 + SetAnimationState 0x0004 + SetAnimation 0x0002 Wait 0x001e - _0807EB44 0x0006 - _0807E930 0x0003 + SetAnimationState 0x0006 + SetAnimation 0x0003 Wait 0x001e Jump script_0800ECAC diff --git a/data/scripts/hyruleTown/script_Carlov.inc b/data/scripts/hyruleTown/script_Carlov.inc index ac6a116b..8a925f4d 100644 --- a/data/scripts/hyruleTown/script_Carlov.inc +++ b/data/scripts/hyruleTown/script_Carlov.inc @@ -2,17 +2,17 @@ SCRIPT_START script_Carlov BeginBlock _0807E9D4 - _0807EB44 0x0000 + SetAnimationState 0x0000 SetEntitySpeed 0x01c0 DoPostScriptAction 0x000a EndBlock script_08014462: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014462 - _0807E864 - _0807E930 0x0008 + SetPlayerIdle + SetAnimation 0x0008 Wait 0x0020 - _0807E930 0x0002 + SetAnimation 0x0002 MessageFromTarget 0x4202 MessageFromTarget 0x4203 WaitUntilTextboxCloses @@ -54,11 +54,11 @@ script_080144C8: Call sub_0807DF38 Jump script_080144FC script_080144F0: - _0807E930 0x0009 + SetAnimation 0x0009 Wait 0x003c - _0807E930 0x0002 + SetAnimation 0x0002 script_080144FC: - _0807E878 + EnablePlayerControl CheckRoomFlag 0x0000 JumpIfNot script_08014462 .ifdef USA diff --git a/data/scripts/hyruleTown/script_Carlov2.inc b/data/scripts/hyruleTown/script_Carlov2.inc index 89c39d57..dcb9aa02 100644 --- a/data/scripts/hyruleTown/script_Carlov2.inc +++ b/data/scripts/hyruleTown/script_Carlov2.inc @@ -2,12 +2,12 @@ SCRIPT_START script_Carlov2 BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 SetEntityDirection 0x0000 DoPostScriptAction 0x000a EndBlock script_0801463A: - _0807E30C + FacePlayerAndCheckDist .ifdef EU JumpIf script_080146E2 .else @@ -20,21 +20,21 @@ script_0801463A: JumpIfNot script_0801463A CheckRoomFlag 0x0009 JumpIfNot script_0801463A - _0807E864 - _0807EB28 0x431f + SetPlayerIdle + EzloMessage 0x431f WaitUntilTextboxCloses script_0801469A: StartPlayerScript script_PlayerAtCarlov Wait 0x0010 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - _0807E878 + EnablePlayerControl Jump script_0801463A script_080146E2: - _0807E864 - _0807E930 0x0008 + SetPlayerIdle + SetAnimation 0x0008 Wait 0x0020 - _0807E930 0x0002 + SetAnimation 0x0002 CheckGlobalFlag 0x0059 JumpIf script_0801472E_2 CheckRoomFlag 0x0009 @@ -60,8 +60,8 @@ script_0801472E_2: JumpIfNot script_0801463A CheckLocalFlag 0x005e JumpIf script_080146A0 - _0807E864 - _0807EB8C + SetPlayerIdle + FaceAwayFromPlayer MessageFromTargetPos 0x432b, 0x000c Jump script_080147CE script_08014672: @@ -75,22 +75,22 @@ script_08014672: .endif .endif JumpIfNot script_0801463A - _0807E864 - _0807EB28 0x431f + SetPlayerIdle + EzloMessage 0x431f WaitUntilTextboxCloses StartPlayerScript script_PlayerAtCarlov Wait 0x0010 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - _0807E878 + EnablePlayerControl Jump script_0801463A script_080146A0: - _0807E864 - _0807E930 0x0008 + SetPlayerIdle + SetAnimation 0x0008 Wait 0x0010 - _0807EB8C + FaceAwayFromPlayer Wait 0x0010 - _0807E930 0x0002 + SetAnimation 0x0002 CheckGlobalFlag 0x0059 JumpIfNot script_080146C6 MessageFromTargetPos 0x432f, 0x000c @@ -125,7 +125,7 @@ script_0801474A: .endif MessageFromTargetPos 0x4305, 0x000c WaitUntilTextboxCloses - _0807E3BC 0x0001 + HasShells 0x0001 JumpIfNot script_080147C4 MessageFromTargetPos 0x4306, 0x000c Jump script_0801473C @@ -149,7 +149,7 @@ script_0801473C: CheckTextboxResult JumpIfNot script_08014770 WaitUntilTextboxCloses - _0807E3BC 0x0001 + HasShells 0x0001 JumpIfNot script_080147C4 SetRoomFlag 0x0001 Wait 0x0014 @@ -186,14 +186,14 @@ script_0801478A: SetSyncFlag 0x00000008 Jump script_080147CE script_080147A4: - _0807E930 0x0009 + SetAnimation 0x0009 Wait 0x003c - _0807E930 0x0002 + SetAnimation 0x0002 Jump script_0801478A script_080147B4: - _0807E930 0x000a + SetAnimation 0x000a Wait 0x008c - _0807E930 0x0002 + SetAnimation 0x0002 Jump script_0801478A script_080147C4: .ifdef EU @@ -209,6 +209,6 @@ script_080147CE: .else Wait 0x0004 .endif - _0807E878 + EnablePlayerControl Jump script_0801463A .align 2, 0 diff --git a/data/scripts/hyruleTown/script_CarlovChest.inc b/data/scripts/hyruleTown/script_CarlovChest.inc index 88a59859..00c7e8a0 100644 --- a/data/scripts/hyruleTown/script_CarlovChest.inc +++ b/data/scripts/hyruleTown/script_CarlovChest.inc @@ -11,13 +11,13 @@ script_080148F4: WaitUntilTextboxCloses CheckTextboxResult JumpIfNot script_08014938 - _0807E864 + SetPlayerIdle SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 Call sub_0806E1E0 WaitUntilTextboxCloses Wait 0x0018 - _0807E878 + EnablePlayerControl Jump script_080148F4 script_08014932: WaitUntilTextboxCloses diff --git a/data/scripts/hyruleTown/script_CarlovGame.inc b/data/scripts/hyruleTown/script_CarlovGame.inc index f22343fa..a43af767 100644 --- a/data/scripts/hyruleTown/script_CarlovGame.inc +++ b/data/scripts/hyruleTown/script_CarlovGame.inc @@ -2,40 +2,40 @@ SCRIPT_START script_CarlovGame BeginBlock _0807E9D4 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x000a EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF38 Wait 0x0010 CheckLocalFlag 0x0093 JumpIf script_080148B6 MessageFromTargetPos 0x4215, 0x000c - _0807E878 + EnablePlayerControl script_0801482E: CheckSyncFlagAndClear 0x00000001 JumpIf script_08014862 CheckSyncFlagAndClear 0x00000004 JumpIf script_08014878 - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_0801482E - _0807E864 - _0807E930 0x0008 + SetPlayerIdle + SetAnimation 0x0008 Wait 0x0020 - _0807E930 0x0002 + SetAnimation 0x0002 MessageFromTargetPos 0x4215, 0x000c - _0807E878 + EnablePlayerControl Jump script_0801482E script_08014862: - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x0020 - _0807E930 0x0002 + SetAnimation 0x0002 SetSyncFlag 0x00000002 Jump script_0801482E script_08014878: - _0807E930 0x0009 + SetAnimation 0x0009 Wait 0x003c - _0807E930 0x0002 + SetAnimation 0x0002 SetSyncFlag 0x00000008 Jump script_0801482E script_0801488E: @@ -43,26 +43,26 @@ script_0801488E: JumpIf script_080148C2 CheckSyncFlagAndClear 0x00000004 JumpIf script_080148D8 - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_0801488E - _0807E864 - _0807E930 0x0008 + SetPlayerIdle + SetAnimation 0x0008 Wait 0x0020 - _0807E930 0x0002 + SetAnimation 0x0002 script_080148B6: MessageFromTargetPos 0x4216, 0x000c - _0807E878 + EnablePlayerControl Jump script_0801488E script_080148C2: - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x0020 - _0807E930 0x0002 + SetAnimation 0x0002 SetSyncFlag 0x00000002 Jump script_0801488E script_080148D8: - _0807E930 0x0009 + SetAnimation 0x0009 Wait 0x003c - _0807E930 0x0002 + SetAnimation 0x0002 SetSyncFlag 0x00000008 Jump script_0801488E .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_CarlovWon.inc b/data/scripts/hyruleTown/script_CarlovWon.inc index b8c535ca..4a65f5ea 100644 --- a/data/scripts/hyruleTown/script_CarlovWon.inc +++ b/data/scripts/hyruleTown/script_CarlovWon.inc @@ -2,11 +2,11 @@ SCRIPT_START script_CarlovWon BeginBlock _0807E9D4 - _0807EB44 0x0000 + SetAnimationState 0x0000 SetEntitySpeed 0x01c0 DoPostScriptAction 0x000a EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 Call sub_0806E20C WaitUntilTextboxCloses diff --git a/data/scripts/hyruleTown/script_Carpenter.inc b/data/scripts/hyruleTown/script_Carpenter.inc index 2ea50d73..9a29615b 100644 --- a/data/scripts/hyruleTown/script_Carpenter.inc +++ b/data/scripts/hyruleTown/script_Carpenter.inc @@ -1,7 +1,7 @@ @ Hyrule Town carpeter next to post SCRIPT_START script_Carpenter BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_080672B0, 0x00000000 DoPostScriptAction 0x000a Call sub_08067314 @@ -9,12 +9,12 @@ SCRIPT_START script_Carpenter script_08010AB4: CheckEntityInteractType JumpIfNot script_08010AB4 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_080672B0, 0x00000004 Call sub_08067304 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 CallWithArg sub_080672B0, 0x00000000 Jump script_08010AB4 diff --git a/data/scripts/hyruleTown/script_CatPerson.inc b/data/scripts/hyruleTown/script_CatPerson.inc index 18c982e8..73cfba96 100644 --- a/data/scripts/hyruleTown/script_CatPerson.inc +++ b/data/scripts/hyruleTown/script_CatPerson.inc @@ -3,17 +3,17 @@ SCRIPT_START script_CatPerson BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 Call sub_08061FD8 EndBlock script_0800EC6C: CheckEntityInteractType JumpIfNot script_0800EC6C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08061FD8 Call sub_08062048 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800EC6C .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc b/data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc index 4b8a69e0..f81c9e64 100644 --- a/data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc +++ b/data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc @@ -3,18 +3,18 @@ SCRIPT_START script_CatPersonTalkingToDogPerson BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 Call sub_08061FD8 EndBlock script_0800EC2C: CheckEntityInteractType JumpIfNot script_0800EC2C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08061FD8 Call sub_08062048 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0002 + EnablePlayerControl + SetAnimationState 0x0002 Call sub_08061FD8 Jump script_0800EC2C diff --git a/data/scripts/hyruleTown/script_Din.inc b/data/scripts/hyruleTown/script_Din.inc index b78e1802..4b0c3e8c 100644 --- a/data/scripts/hyruleTown/script_Din.inc +++ b/data/scripts/hyruleTown/script_Din.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Din BeginBlock Call sub_08064828 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a CheckGlobalFlag 0x0047 @@ -14,13 +14,13 @@ script_08011C9A: CheckEntityInteractType JumpIfNot script_08011C9A EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x4515 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011C9A script_08011CC2: @@ -33,29 +33,29 @@ script_08011CC2: CheckEntityInteractType JumpIfNot script_08011CC2 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x3105 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_08011D0E - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011CC2 script_08011D00: CheckEntityInteractType JumpIfNot script_08011D00 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 script_08011D0E: MessageNoOverlap 0x3108 WaitUntilTextboxCloses SetGlobalFlag 0x002b - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011D00 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Din2.inc b/data/scripts/hyruleTown/script_Din2.inc index 31c5c728..95f9d5d8 100644 --- a/data/scripts/hyruleTown/script_Din2.inc +++ b/data/scripts/hyruleTown/script_Din2.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Din2 BeginBlock Call sub_08064828 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a EndBlock @@ -16,8 +16,8 @@ script_08011E96: CheckEntityInteractType JumpIfNot script_08011E96 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011ECC @@ -30,21 +30,21 @@ script_08011ECC: CheckTextboxResult JumpIf script_08011EF4 script_08011ED8: - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011E96 script_08011EE6: CheckEntityInteractType JumpIfNot script_08011EE6 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 script_08011EF4: MessageNoOverlap 0x3114 WaitUntilTextboxCloses SetGlobalFlag 0x002e - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011EE6 diff --git a/data/scripts/hyruleTown/script_DinAlone.inc b/data/scripts/hyruleTown/script_DinAlone.inc index 0a722830..60ae00b5 100644 --- a/data/scripts/hyruleTown/script_DinAlone.inc +++ b/data/scripts/hyruleTown/script_DinAlone.inc @@ -2,19 +2,19 @@ SCRIPT_START script_DinAlone BeginBlock Call sub_08064828 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a EndBlock script_080121DE: CheckEntityInteractType JumpIfNot script_080121DE - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x4527 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_080121DE diff --git a/data/scripts/hyruleTown/script_DinMovedIn.inc b/data/scripts/hyruleTown/script_DinMovedIn.inc index c0ee74ba..16ba4b27 100644 --- a/data/scripts/hyruleTown/script_DinMovedIn.inc +++ b/data/scripts/hyruleTown/script_DinMovedIn.inc @@ -2,15 +2,15 @@ SCRIPT_START script_DinMovedIn BeginBlock Call sub_08064828 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a EndBlock script_0801203A: CheckEntityInteractType JumpIfNot script_0801203A - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 CheckLocalFlag 0x0094 JumpIf script_0801205E @@ -51,8 +51,8 @@ script_0801209A: MessageNoOverlap 0x3127 script_0801209E: WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_0801203A .align 2, 0 diff --git a/data/scripts/hyruleTown/script_DogPersonInCatHouse.inc b/data/scripts/hyruleTown/script_DogPersonInCatHouse.inc index a26f16c7..2cc56734 100644 --- a/data/scripts/hyruleTown/script_DogPersonInCatHouse.inc +++ b/data/scripts/hyruleTown/script_DogPersonInCatHouse.inc @@ -3,25 +3,25 @@ SCRIPT_START script_DogPersonInCatHouse BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Call sub_08061FD8 EndBlock script_0800EB7C: CheckEntityInteractType JumpIfNot script_0800EB7C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08061FD8 Call sub_08062048 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0006 + EnablePlayerControl + SetAnimationState 0x0006 Call sub_08061FD8 Jump script_0800EB7C BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 Call sub_08061FD8 EndBlock Jump script_0800EBF4 diff --git a/data/scripts/hyruleTown/script_DrLeft.inc b/data/scripts/hyruleTown/script_DrLeft.inc index ae71d84b..ad325fa1 100644 --- a/data/scripts/hyruleTown/script_DrLeft.inc +++ b/data/scripts/hyruleTown/script_DrLeft.inc @@ -4,24 +4,24 @@ SCRIPT_START script_DrLeft _0807E9D4 Call sub_0806C09C DoPostScriptAction 0x000a - _0807E930 0x0000 - _0807EB44 0x0004 + SetAnimation 0x0000 + SetAnimationState 0x0004 EndBlock script_0800EABC: CheckEntityInteractType JumpIfNot script_0800EABC BeginBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0806C028, 0x00000004 EndBlock script_0800EAD4: Call sub_0806C00C JumpIfNot script_0800EAD4 - _0807E930 0x0008 + SetAnimation 0x0008 Call sub_0806C038 WaitUntilTextboxCloses Wait 0x000f - _0807E878 - _0807E930 0x0000 + EnablePlayerControl + SetAnimation 0x0000 Jump script_0800EABC diff --git a/data/scripts/hyruleTown/script_DrLeftDoor.inc b/data/scripts/hyruleTown/script_DrLeftDoor.inc index 9e92d307..73a86b68 100644 --- a/data/scripts/hyruleTown/script_DrLeftDoor.inc +++ b/data/scripts/hyruleTown/script_DrLeftDoor.inc @@ -8,7 +8,7 @@ SCRIPT_START script_DrLeftDoor script_0800EF50: Call sub_080869A4 JumpIfNot script_0800EF50 - _0807E864 + SetPlayerIdle CheckLocalFlagByBank 0x0200, 0x006d JumpIf script_0800EF82 MessageFromTarget 0x4d01 @@ -16,14 +16,14 @@ script_0800EF50: StartPlayerScript script_PlayerAtDrLeftDoor WaitForSyncFlagAndClear 0x00000001 Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800EF50 script_0800EF82: SetGlobalFlag 0x001f MessageFromTarget 0x4d02 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl script_0800EF92: Call sub_0808692C SCRIPT_END diff --git a/data/scripts/hyruleTown/script_Emma.inc b/data/scripts/hyruleTown/script_Emma.inc index 8e842540..5f058f79 100644 --- a/data/scripts/hyruleTown/script_Emma.inc +++ b/data/scripts/hyruleTown/script_Emma.inc @@ -3,13 +3,13 @@ SCRIPT_START script_Emma BeginBlock _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0000 + SetAnimationState 0x0000 EndBlock script_0800E832: CheckEntityInteractType JumpIfNot script_0800E832 - _0807E864 - _0807EB44 0x0004 + SetPlayerIdle + SetAnimationState 0x0004 BeginBlock MessageFromTarget 0x4501 CallWithArg sub_0807F854, 0x00010032 diff --git a/data/scripts/hyruleTown/script_EmmaNotEnoughRupees.inc b/data/scripts/hyruleTown/script_EmmaNotEnoughRupees.inc index c3a59c92..45bece10 100644 --- a/data/scripts/hyruleTown/script_EmmaNotEnoughRupees.inc +++ b/data/scripts/hyruleTown/script_EmmaNotEnoughRupees.inc @@ -6,6 +6,6 @@ script_0800E910: @ Rent no room MessageFromTarget 0x4509 script_0800E914: WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0000 + EnablePlayerControl + SetAnimationState 0x0000 Jump script_0800E832 diff --git a/data/scripts/hyruleTown/script_Farore.inc b/data/scripts/hyruleTown/script_Farore.inc index 23de485b..013522a1 100644 --- a/data/scripts/hyruleTown/script_Farore.inc +++ b/data/scripts/hyruleTown/script_Farore.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Farore BeginBlock Call sub_08064A28 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a CheckGlobalFlag 0x0047 @@ -14,13 +14,13 @@ script_08011DF2: CheckEntityInteractType JumpIfNot script_08011DF2 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x4514 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011DF2 script_08011E1A: @@ -33,29 +33,29 @@ script_08011E1A: CheckEntityInteractType JumpIfNot script_08011E1A EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x3104 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_08011E66 - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011E1A script_08011E58: CheckEntityInteractType JumpIfNot script_08011E58 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 script_08011E66: MessageNoOverlap 0x3107 WaitUntilTextboxCloses SetGlobalFlag 0x002d - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011E58 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Farore2.inc b/data/scripts/hyruleTown/script_Farore2.inc index 7920be1f..568120b7 100644 --- a/data/scripts/hyruleTown/script_Farore2.inc +++ b/data/scripts/hyruleTown/script_Farore2.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Farore2 BeginBlock Call sub_08064A28 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a EndBlock @@ -16,8 +16,8 @@ script_08011FAE: CheckEntityInteractType JumpIfNot script_08011FAE EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011FE4 @@ -30,22 +30,22 @@ script_08011FE4: CheckTextboxResult JumpIf script_0801200C script_08011FF0: - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011FAE script_08011FFE: CheckEntityInteractType JumpIfNot script_08011FFE - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 script_0801200C: MessageNoOverlap 0x3113 WaitUntilTextboxCloses SetGlobalFlag 0x0030 - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011FFE diff --git a/data/scripts/hyruleTown/script_FaroreAlone.inc b/data/scripts/hyruleTown/script_FaroreAlone.inc index 294915d9..4bfaf3df 100644 --- a/data/scripts/hyruleTown/script_FaroreAlone.inc +++ b/data/scripts/hyruleTown/script_FaroreAlone.inc @@ -2,19 +2,19 @@ SCRIPT_START script_FaroreAlone BeginBlock Call sub_08064A28 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a EndBlock script_0801224E: CheckEntityInteractType JumpIfNot script_0801224E - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x4526 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_0801224E diff --git a/data/scripts/hyruleTown/script_FaroreMovedIn.inc b/data/scripts/hyruleTown/script_FaroreMovedIn.inc index 474b8dea..370126a4 100644 --- a/data/scripts/hyruleTown/script_FaroreMovedIn.inc +++ b/data/scripts/hyruleTown/script_FaroreMovedIn.inc @@ -2,15 +2,15 @@ SCRIPT_START script_FaroreMovedIn BeginBlock Call sub_08064A28 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a EndBlock script_08012152: CheckEntityInteractType JumpIfNot script_08012152 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 CheckLocalFlag 0x0096 JumpIf script_08012176 @@ -51,8 +51,8 @@ script_080121B2: MessageNoOverlap 0x3121 script_080121B6: WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08012152 .align 2, 0 diff --git a/data/scripts/hyruleTown/script_FirstHouseDoor.inc b/data/scripts/hyruleTown/script_FirstHouseDoor.inc index 56501984..63b89955 100644 --- a/data/scripts/hyruleTown/script_FirstHouseDoor.inc +++ b/data/scripts/hyruleTown/script_FirstHouseDoor.inc @@ -8,18 +8,18 @@ SCRIPT_START script_FirstHouseDoor script_0801091C: Call sub_080869A4 JumpIfNot script_0801091C - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 CheckRoomFlag 0x0001 JumpIf script_08010942 - _0807EB28 0x0b62 + EzloMessage 0x0b62 WaitUntilTextboxCloses script_08010942: StartPlayerScript script_PlayerAtInnDoor WaitForSyncFlagAndClear 0x00000001 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0801091C Call sub_0808692C SCRIPT_END diff --git a/data/scripts/hyruleTown/script_ForestMinish11.inc b/data/scripts/hyruleTown/script_ForestMinish11.inc index 7cbb90db..9d5214c7 100644 --- a/data/scripts/hyruleTown/script_ForestMinish11.inc +++ b/data/scripts/hyruleTown/script_ForestMinish11.inc @@ -13,9 +13,9 @@ script_0800E6BE: Jump script_0800E6BE script_0800E6D2: EndBlock - _0807E864 + SetPlayerIdle Call sub_0806025C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800E6BE diff --git a/data/scripts/hyruleTown/script_Ghost.inc b/data/scripts/hyruleTown/script_Ghost.inc index d8e0119a..99fc400e 100644 --- a/data/scripts/hyruleTown/script_Ghost.inc +++ b/data/scripts/hyruleTown/script_Ghost.inc @@ -4,16 +4,16 @@ SCRIPT_START script_Ghost DoPostScriptAction 0x0007 _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 EndBlock script_0801027A: CheckEntityInteractType JumpIfNot script_0801027A - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08065F64 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0801027A .align 2 diff --git a/data/scripts/hyruleTown/script_GormanCats.inc b/data/scripts/hyruleTown/script_GormanCats.inc index c8d96d9e..cad4d713 100644 --- a/data/scripts/hyruleTown/script_GormanCats.inc +++ b/data/scripts/hyruleTown/script_GormanCats.inc @@ -1,7 +1,7 @@ @ Gorman at third house SCRIPT_START script_GormanCats BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a _0807E9D4 @@ -21,16 +21,16 @@ script_0800FE66: Jump script_0800FE5A script_0800FE7E: EndBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 Wait 0x001e - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 Wait 0x001e - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 Wait 0x001e - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 Wait 0x003c Call sub_08069A84 diff --git a/data/scripts/hyruleTown/script_GormanFirstHouse.inc b/data/scripts/hyruleTown/script_GormanFirstHouse.inc index 013e6afe..26447047 100644 --- a/data/scripts/hyruleTown/script_GormanFirstHouse.inc +++ b/data/scripts/hyruleTown/script_GormanFirstHouse.inc @@ -2,7 +2,7 @@ @ and at second house when ready to sell SCRIPT_START script_GormanFirstHouse BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a _0807E9D4 @@ -10,10 +10,10 @@ SCRIPT_START script_GormanFirstHouse script_0800FDB2: CheckEntityInteractType JumpIfNot script_0800FDB2 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08069888 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800FDB2 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_GormanSecondHouse.inc b/data/scripts/hyruleTown/script_GormanSecondHouse.inc index f75d0452..f223d84c 100644 --- a/data/scripts/hyruleTown/script_GormanSecondHouse.inc +++ b/data/scripts/hyruleTown/script_GormanSecondHouse.inc @@ -1,7 +1,7 @@ @ Hyrule Town Gorman at second house SCRIPT_START script_GormanSecondHouse BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a _0807E9D4 @@ -21,16 +21,16 @@ script_0800FDEE: Jump script_0800FDE2 script_0800FE06: EndBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 Wait 0x001e - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 Wait 0x001e - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 Wait 0x001e - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 Wait 0x003c Call sub_08069A3C diff --git a/data/scripts/hyruleTown/script_GoronMerchant.inc b/data/scripts/hyruleTown/script_GoronMerchant.inc index 66d1a451..8d32cbd0 100644 --- a/data/scripts/hyruleTown/script_GoronMerchant.inc +++ b/data/scripts/hyruleTown/script_GoronMerchant.inc @@ -1,12 +1,12 @@ @ Hyrule Town Goron Merchant SCRIPT_START script_GoronMerchant BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a DoPostScriptAction 0x0007 _0807E9D4 - Call sub_0807F348 + Call SetPriorityMessage Call sub_08069684 EndBlock script_080107F2: @@ -25,9 +25,9 @@ script_08010804: CheckEntityInteractType JumpIfNot script_08010804 EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB74 + FacePlayer CheckGlobalFlag 0x0042 JumpIfNot script_08010858 CheckGlobalFlag 0x0043 @@ -46,9 +46,9 @@ script_08010858: Jump script_080108BA script_08010860: EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF38 - _0807EB74 + FacePlayer Call sub_08069660 WaitUntilTextboxCloses CheckTextboxResult @@ -57,7 +57,7 @@ script_08010860: JumpIfNot script_080108B2 WaitPlayerGetItem WaitUntilTextboxCloses - _0807EB8C + FaceAwayFromPlayer CheckGlobalFlag 0x0042 JumpIfNot script_080108AA CheckGlobalFlag 0x0043 @@ -81,7 +81,7 @@ script_080108B2: script_080108BA: WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Jump script_08010804 diff --git a/data/scripts/hyruleTown/script_GuardEast.inc b/data/scripts/hyruleTown/script_GuardEast.inc index 9bf0316a..cf3f5d2e 100644 --- a/data/scripts/hyruleTown/script_GuardEast.inc +++ b/data/scripts/hyruleTown/script_GuardEast.inc @@ -3,7 +3,7 @@ SCRIPT_START script_GuardEast BeginBlock CheckInventory1 0x0012 JumpIf script_0800FF6A - _0807EB44 0x0006 + SetAnimationState 0x0006 _0807E9D4 CallWithArg sub_0807F3D8, 0x00000008 EndBlock @@ -15,13 +15,13 @@ script_0800FF34: CheckEntityInteractType JumpIfNot script_0800FF34 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000008 Call sub_08064428 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800FF34 script_0800FF6A: DoPostScriptAction 0x0008 diff --git a/data/scripts/hyruleTown/script_GuardLibrary.inc b/data/scripts/hyruleTown/script_GuardLibrary.inc index 7944844b..870c90b5 100644 --- a/data/scripts/hyruleTown/script_GuardLibrary.inc +++ b/data/scripts/hyruleTown/script_GuardLibrary.inc @@ -2,16 +2,16 @@ SCRIPT_START script_GuardLibrary BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 EndBlock script_08010410: CheckEntityInteractType JumpIfNot script_08010410 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08064428 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08010410 diff --git a/data/scripts/hyruleTown/script_GuardNorth.inc b/data/scripts/hyruleTown/script_GuardNorth.inc index 81e2d9af..603439eb 100644 --- a/data/scripts/hyruleTown/script_GuardNorth.inc +++ b/data/scripts/hyruleTown/script_GuardNorth.inc @@ -3,7 +3,7 @@ SCRIPT_START script_GuardNorth BeginBlock CheckInventory1 0x0012 JumpIf script_0800FF0E - _0807EB44 0x0006 + SetAnimationState 0x0006 _0807E9D4 CallWithArg sub_0807F3D8, 0x00000008 EndBlock @@ -15,13 +15,13 @@ script_0800FED8: CheckEntityInteractType JumpIfNot script_0800FED8 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000008 Call sub_08064428 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800FED8 script_0800FF0E: DoPostScriptAction 0x0008 diff --git a/data/scripts/hyruleTown/script_GuardPatrolling.inc b/data/scripts/hyruleTown/script_GuardPatrolling.inc index df0a7b81..891de121 100644 --- a/data/scripts/hyruleTown/script_GuardPatrolling.inc +++ b/data/scripts/hyruleTown/script_GuardPatrolling.inc @@ -2,7 +2,7 @@ SCRIPT_START script_GuardPatrolling BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000004 EndBlock diff --git a/data/scripts/hyruleTown/script_GuardWest.inc b/data/scripts/hyruleTown/script_GuardWest.inc index 3792ad68..a8538ddd 100644 --- a/data/scripts/hyruleTown/script_GuardWest.inc +++ b/data/scripts/hyruleTown/script_GuardWest.inc @@ -1,7 +1,7 @@ @ Hyrule Town Guard west SCRIPT_START script_GuardWest BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 _0807E9D4 CallWithArg sub_0807F3D8, 0x00000008 Call sub_080644A4 @@ -73,8 +73,8 @@ script_0800FFCC: .endif .endif .endif - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000008 CheckInventory1 0x0048 JumpIf script_0800FFF8 @@ -105,19 +105,19 @@ script_0801000A: Jump script_08010060 script_08010014: EndBlock - _0807E888 - Call sub_0807F594 - _0807E864 - _0807EB74 + DisablePlayerControl + Call WaitForPlayerIdle + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000008 PlaySound SFX_TASK_COMPLETE MessageNoOverlap 0x340a WaitUntilTextboxCloses - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x0000000c SetEntitySpeed 0x0100 _0807EDD4 0x0018, 0x0108 - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0807F3D8, 0x00000008 .ifdef JP SetLocalFlag 0x00cb @@ -135,26 +135,26 @@ script_08010014: script_08010060: Call sub_080644A4 CallWithArg sub_0807F5B0, 0x0000000a - _0807E878 + EnablePlayerControl Jump script_0800FF92 .2byte 0x0000 BeginBlock _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_080672B0, 0x00000000 EndBlock script_08010090: CheckEntityInteractType JumpIfNot script_08010090 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_080672B0, 0x00000004 MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 CallWithArg sub_080672B0, 0x00000000 Jump script_08010090 DoPostScriptAction 0x0006 diff --git a/data/scripts/hyruleTown/script_HurdyGurdyMan.inc b/data/scripts/hyruleTown/script_HurdyGurdyMan.inc index 0c01f429..7daf6e2c 100644 --- a/data/scripts/hyruleTown/script_HurdyGurdyMan.inc +++ b/data/scripts/hyruleTown/script_HurdyGurdyMan.inc @@ -2,19 +2,19 @@ SCRIPT_START script_HurdyGurdyMan BeginBlock DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0008 + SetAnimationState 0x0004 + SetAnimation 0x0008 Call sub_0806E440 EndBlock script_08010BCA: CheckEntityInteractType JumpIfNot script_08010BCA - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 Call sub_0806E418 WaitUntilTextboxCloses - _0807E878 - _0807E930 0x0008 + EnablePlayerControl + SetAnimation 0x0008 Jump script_08010BCA .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_InnDoor.inc b/data/scripts/hyruleTown/script_InnDoor.inc index 931ee30e..ea001419 100644 --- a/data/scripts/hyruleTown/script_InnDoor.inc +++ b/data/scripts/hyruleTown/script_InnDoor.inc @@ -2,16 +2,16 @@ SCRIPT_START script_InnDoor CheckPlayerInRegion2 0x0808 JumpIfNot script_InnDoor - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerAtInnDoor WaitForSyncFlagAndClear 0x00000001 CheckRoomFlag 0x0001 JumpIf script_08010900 - _0807EB28 0x0b63 + EzloMessage 0x0b63 WaitUntilTextboxCloses script_08010900: Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_InnDoor diff --git a/data/scripts/hyruleTown/script_Kid1.inc b/data/scripts/hyruleTown/script_Kid1.inc index dffebca2..732289b5 100644 --- a/data/scripts/hyruleTown/script_Kid1.inc +++ b/data/scripts/hyruleTown/script_Kid1.inc @@ -10,18 +10,18 @@ script_080102A6: JumpIfNot script_080102A6 CheckRoomFlag 0x0009 JumpIfNot script_080102CC - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806265C WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Call sub_08062500 Jump script_080102A6 script_080102CC: - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806265C WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_080102A6 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Kid2.inc b/data/scripts/hyruleTown/script_Kid2.inc index c5dc472e..65a9125b 100644 --- a/data/scripts/hyruleTown/script_Kid2.inc +++ b/data/scripts/hyruleTown/script_Kid2.inc @@ -8,10 +8,10 @@ SCRIPT_START script_Kid2 script_080102F2: CheckEntityInteractType JumpIfNot script_080102F2 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806265C WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_080102F2 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Kid3.inc b/data/scripts/hyruleTown/script_Kid3.inc index 5147a331..99f6a116 100644 --- a/data/scripts/hyruleTown/script_Kid3.inc +++ b/data/scripts/hyruleTown/script_Kid3.inc @@ -7,7 +7,7 @@ script_08010314: EndBlock Call sub_08062698 Call sub_080626AC - CallWithArg sub_0807F0EC, 0x00000009 + CallWithArg GetRandomInt, 0x00000009 JumpTable script_08010340, script_0801034A, script_08010354, script_0801035E, script_08010368, script_08010372, script_0801037C, script_08010386, script_08010390 script_08010340: _0807EE04 0x0358, 0x0078 diff --git a/data/scripts/hyruleTown/script_Kid5.inc b/data/scripts/hyruleTown/script_Kid5.inc index 84453c61..4465b197 100644 --- a/data/scripts/hyruleTown/script_Kid5.inc +++ b/data/scripts/hyruleTown/script_Kid5.inc @@ -1,7 +1,7 @@ @ Hyrule Town Kid in school SCRIPT_START script_Kid5 BeginBlock - _0807E930 0x0008 + SetAnimation 0x0008 script_08010622: Call sub_08062A48 DoPostScriptAction 0x000a @@ -9,8 +9,8 @@ script_08010622: script_0801062E: CheckEntityInteractType JumpIfNot script_0801062E - _0807E864 + SetPlayerIdle Call sub_0806265C WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0801062E diff --git a/data/scripts/hyruleTown/script_Kid6.inc b/data/scripts/hyruleTown/script_Kid6.inc index 58553883..c4c6e86d 100644 --- a/data/scripts/hyruleTown/script_Kid6.inc +++ b/data/scripts/hyruleTown/script_Kid6.inc @@ -1,6 +1,6 @@ @ Hyrule Town Kid in school 2? SCRIPT_START script_Kid6 BeginBlock - _0807E930 0x0009 + SetAnimation 0x0009 Jump script_08010622 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Kid7.inc b/data/scripts/hyruleTown/script_Kid7.inc index 599ee869..1d2fd690 100644 --- a/data/scripts/hyruleTown/script_Kid7.inc +++ b/data/scripts/hyruleTown/script_Kid7.inc @@ -1,14 +1,14 @@ @ Hyrule Town Kid in school 3? SCRIPT_START script_Kid7 BeginBlock - _0807E930 0x000b + SetAnimation 0x000b Jump script_08010622 .2byte 0x0000 BeginBlock - _0807E930 0x000c + SetAnimation 0x000c Jump script_08010622 .2byte 0x0000 BeginBlock - _0807E930 0x000d + SetAnimation 0x000d Jump script_08010622 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_KidInn.inc b/data/scripts/hyruleTown/script_KidInn.inc index f3de7eb9..43a709a2 100644 --- a/data/scripts/hyruleTown/script_KidInn.inc +++ b/data/scripts/hyruleTown/script_KidInn.inc @@ -8,7 +8,7 @@ script_0800D5AC: EndBlock Call sub_08062698 Call sub_080626AC - CallWithArg sub_0807F0EC, 0x00000004 + CallWithArg GetRandomInt, 0x00000004 JumpTable script_0800D5CE, script_0800D5D8, script_0800D5E2, script_0800D5EC script_0800D5CE: _0807EE04 0x0038, 0x0098 diff --git a/data/scripts/hyruleTown/script_Librari.inc b/data/scripts/hyruleTown/script_Librari.inc index 8aa1476a..759b102e 100644 --- a/data/scripts/hyruleTown/script_Librari.inc +++ b/data/scripts/hyruleTown/script_Librari.inc @@ -2,16 +2,16 @@ SCRIPT_START script_Librari BeginBlock DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 EndBlock script_0800E974: CheckEntityInteractType JumpIfNot script_0800E974 - _0807E864 - _0807E930 0x0008 - Call sub_0807F2D4 - _0807E930 0x0009 + SetPlayerIdle + SetAnimation 0x0008 + Call WaitForFrameHiBit + SetAnimation 0x0009 Call sub_0806B260 JumpIfNot script_0800E9E4 WaitUntilTextboxCloses @@ -21,11 +21,11 @@ script_0800E974: DoPostScriptAction 0x000a MessageFromTarget 0x4a24 WaitUntilTextboxCloses - _0807E930 0x000a + SetAnimation 0x000a Wait 0x0014 MessageFromTarget 0x4a25 WaitUntilTextboxCloses - _0807E930 0x0000 + SetAnimation 0x0000 StartPlayerScript script_PlayerActivatedTrapCard WaitForSyncFlagAndClear 0x00000001 SetLocalFlag 0x0074 @@ -37,6 +37,6 @@ script_0800E974: script_0800E9E4: WaitUntilTextboxCloses Wait 0x000f - _0807E878 - _0807E930 0x0000 + EnablePlayerControl + SetAnimation 0x0000 Jump script_0800E974 diff --git a/data/scripts/hyruleTown/script_LibrariLater.inc b/data/scripts/hyruleTown/script_LibrariLater.inc index cca9ae05..cc4fda75 100644 --- a/data/scripts/hyruleTown/script_LibrariLater.inc +++ b/data/scripts/hyruleTown/script_LibrariLater.inc @@ -2,16 +2,16 @@ SCRIPT_START script_LibrariLater BeginBlock DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 EndBlock script_08012440: CheckEntityInteractType JumpIfNot script_08012440 - _0807E864 - _0807E930 0x0008 - Call sub_0807F2D4 - _0807E930 0x0009 + SetPlayerIdle + SetAnimation 0x0008 + Call WaitForFrameHiBit + SetAnimation 0x0009 Call sub_0806B2B4 WaitUntilTextboxCloses CheckLocalFlag 0x00b3 @@ -27,8 +27,8 @@ script_08012440: .endif .endif script_08012474: - _0807E878 - _0807E930 0x0000 + EnablePlayerControl + SetAnimation 0x0000 Jump script_08012440 .align 2, 0 diff --git a/data/scripts/hyruleTown/script_LibrarianLeft.inc b/data/scripts/hyruleTown/script_LibrarianLeft.inc index 89861977..2cda1ba0 100644 --- a/data/scripts/hyruleTown/script_LibrarianLeft.inc +++ b/data/scripts/hyruleTown/script_LibrarianLeft.inc @@ -2,17 +2,17 @@ SCRIPT_START script_LibrarianLeft BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock script_08008BA2: - _0807E944 - _0807E864 - _0807E930 0x0004 - Call sub_0807F2D4 + TriggerInteract + SetPlayerIdle + SetAnimation 0x0004 + Call WaitForFrameHiBit MessageFromTarget 0x4912 WaitUntilTextboxCloses - _0807E930 0x0008 - _0807E878 + SetAnimation 0x0008 + EnablePlayerControl Jump script_08008BA2 diff --git a/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc b/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc index 888e490f..6fbcd584 100644 --- a/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc +++ b/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc @@ -2,27 +2,27 @@ SCRIPT_START script_LibrarianLeftWithQuest BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a - _0807E930 0x0000 + SetAnimation 0x0000 .ifdef EU SetGlobalFlag 0x0061 .endif EndBlock script_08008BD2: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle .ifndef EU SetGlobalFlag 0x0061 .endif - _0807E930 0x0004 - Call sub_0807F2D4 + SetAnimation 0x0004 + Call WaitForFrameHiBit WaitUntilTextboxCloses Call sub_0806BA34 JumpIfNot script_08008C54 WaitUntilTextboxCloses CallWithArg sub_0806BB1C, 0x00000000 - Call sub_0807F2D4 + Call WaitForFrameHiBit CallWithArg sub_0806BB1C, 0x00000001 Call sub_0806BB7C JumpIfNot script_08008C5C @@ -33,17 +33,17 @@ script_08008BD2: WaitForSyncFlag 0x00000004 Wait 0x000f PlaySound SFX_SECRET - _0807E930 0x0004 - Call sub_0807F2D4 + SetAnimation 0x0004 + Call WaitForFrameHiBit MessageNoOverlap 0x4913 WaitUntilTextboxCloses - _0807E930 0x0008 - Call sub_0807F2D4 + SetAnimation 0x0008 + Call WaitForFrameHiBit Jump script_08008C5C script_08008C54: - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x000f script_08008C5C: WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08008BD2 diff --git a/data/scripts/hyruleTown/script_LibrarianRight.inc b/data/scripts/hyruleTown/script_LibrarianRight.inc index b5af0dfc..df64ef65 100644 --- a/data/scripts/hyruleTown/script_LibrarianRight.inc +++ b/data/scripts/hyruleTown/script_LibrarianRight.inc @@ -2,18 +2,18 @@ SCRIPT_START script_LibrarianRight BeginBlock _0807E9D4 - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 DoPostScriptAction 0x000a EndBlock script_08008B6E: - _0807E944 - _0807E864 - _0807E930 0x0004 - Call sub_0807F2D4 + TriggerInteract + SetPlayerIdle + SetAnimation 0x0004 + Call WaitForFrameHiBit Call sub_0806BBB0 WaitUntilTextboxCloses - _0807E930 0x0008 - _0807E878 + SetAnimation 0x0008 + EnablePlayerControl Jump script_08008B6E .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_LibraryVisitor.inc b/data/scripts/hyruleTown/script_LibraryVisitor.inc index 1a5015fe..1d0d7132 100644 --- a/data/scripts/hyruleTown/script_LibraryVisitor.inc +++ b/data/scripts/hyruleTown/script_LibraryVisitor.inc @@ -8,11 +8,11 @@ SCRIPT_START script_LibraryVisitor script_08008DA0: CheckEntityInteractType JumpIfNot script_08008DA0 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08061FD8 Call sub_08062048 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08008DA0 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_MaidTown.inc b/data/scripts/hyruleTown/script_MaidTown.inc index c75426d4..bc708306 100644 --- a/data/scripts/hyruleTown/script_MaidTown.inc +++ b/data/scripts/hyruleTown/script_MaidTown.inc @@ -2,7 +2,7 @@ SCRIPT_START script_MaidTown BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a SetIntVariable sub_08064688 diff --git a/data/scripts/hyruleTown/script_MalonHyruleTown.inc b/data/scripts/hyruleTown/script_MalonHyruleTown.inc index 6e1f2b13..f9607b9c 100644 --- a/data/scripts/hyruleTown/script_MalonHyruleTown.inc +++ b/data/scripts/hyruleTown/script_MalonHyruleTown.inc @@ -3,16 +3,16 @@ SCRIPT_START script_MalonHyruleTown BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x000e + SetAnimationState 0x0004 + SetAnimation 0x000e EndBlock Call sub_08065914 script_08014F4A: CheckEntityInteractType JumpIfNot script_08014F4A - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB74 + FacePlayer DoPostScriptAction 0x0000 BeginBlock MessageNoOverlap 0x3b0b @@ -38,7 +38,7 @@ script_08014FA2: script_08014FA6: WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 - _0807EB44 0x0004 - _0807E930 0x000e + EnablePlayerControl + SetAnimationState 0x0004 + SetAnimation 0x000e Jump script_08014F4A diff --git a/data/scripts/hyruleTown/script_Mama.inc b/data/scripts/hyruleTown/script_Mama.inc index c7a31761..c286a0d2 100644 --- a/data/scripts/hyruleTown/script_Mama.inc +++ b/data/scripts/hyruleTown/script_Mama.inc @@ -3,21 +3,21 @@ SCRIPT_START script_Mama BeginBlock Call sub_0806C4F8 DoPostScriptAction 0x000a - _0807EB44 0x0000 + SetAnimationState 0x0000 EndBlock script_0800E932: CheckEntityInteractType JumpIfNot script_0800E932 - _0807E864 - _0807EB44 0x0004 - _0807E930 0x0004 + SetPlayerIdle + SetAnimationState 0x0004 + SetAnimation 0x0004 script_0800E942: Call sub_0806C4A8 JumpIfNot script_0800E942 Call sub_0806C4DC WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0000 - _0807E930 0x0000 + EnablePlayerControl + SetAnimationState 0x0000 + SetAnimation 0x0000 Jump script_0800E932 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Marcy.inc b/data/scripts/hyruleTown/script_Marcy.inc index f54f82fd..24c437a9 100644 --- a/data/scripts/hyruleTown/script_Marcy.inc +++ b/data/scripts/hyruleTown/script_Marcy.inc @@ -4,13 +4,13 @@ SCRIPT_START script_Marcy DoPostScriptAction 0x0007 _0807E9D4 DoPostScriptAction 0x000a - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock script_08010746: CheckEntityInteractType JumpIfNot script_08010746 - _0807E864 - _0807E930 0x0004 + SetPlayerIdle + SetAnimation 0x0004 BeginBlock Call sub_08062D18 JumpIfNot script_08010786 @@ -29,6 +29,6 @@ script_08010778: script_08010786: EndBlock WaitUntilTextboxCloses - _0807E878 - _0807E930 0x0008 + EnablePlayerControl + SetAnimation 0x0008 Jump script_08010746 diff --git a/data/scripts/hyruleTown/script_Mayor.inc b/data/scripts/hyruleTown/script_Mayor.inc index 53885de4..83a6c6a5 100644 --- a/data/scripts/hyruleTown/script_Mayor.inc +++ b/data/scripts/hyruleTown/script_Mayor.inc @@ -3,21 +3,21 @@ SCRIPT_START script_Mayor BeginBlock Call sub_0806CE5C DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0008 + SetAnimationState 0x0004 + SetAnimation 0x0008 EndBlock script_0800EA6A: CheckEntityInteractType JumpIfNot script_0800EA6A - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000004 - Call sub_0807F2D4 - _0807E930 0x0009 + Call WaitForFrameHiBit + SetAnimation 0x0009 Call sub_0806CE80 WaitUntilTextboxCloses - _0807E878 - _0807E930 0x000a - Call sub_0807F2D4 - _0807E930 0x0008 + EnablePlayerControl + SetAnimation 0x000a + Call WaitForFrameHiBit + SetAnimation 0x0008 Jump script_0800EA6A diff --git a/data/scripts/hyruleTown/script_MutohInMill.inc b/data/scripts/hyruleTown/script_MutohInMill.inc index fdefdeb9..ee10eeba 100644 --- a/data/scripts/hyruleTown/script_MutohInMill.inc +++ b/data/scripts/hyruleTown/script_MutohInMill.inc @@ -3,19 +3,19 @@ SCRIPT_START script_MutohInMill BeginBlock Call sub_08067100 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_0800954E: CheckEntityInteractType JumpIfNot script_0800954E - _0807E864 + SetPlayerIdle DoPostScriptAction 0x0001 - _0807EB74 + FacePlayer Call sub_080670E4 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Jump script_0800954E .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Nayru.inc b/data/scripts/hyruleTown/script_Nayru.inc index 2815c9c5..571e2bef 100644 --- a/data/scripts/hyruleTown/script_Nayru.inc +++ b/data/scripts/hyruleTown/script_Nayru.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Nayru BeginBlock Call sub_08064928 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a CheckGlobalFlag 0x0047 @@ -14,13 +14,13 @@ script_08011D46: CheckEntityInteractType JumpIfNot script_08011D46 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x4513 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011D46 script_08011D6E: @@ -33,29 +33,29 @@ script_08011D6E: CheckEntityInteractType JumpIfNot script_08011D6E EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x3103 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_08011DBA - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011D6E script_08011DAC: CheckEntityInteractType JumpIfNot script_08011DAC - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 script_08011DBA: MessageNoOverlap 0x3106 WaitUntilTextboxCloses SetGlobalFlag 0x002c - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011DAC .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Nayru2.inc b/data/scripts/hyruleTown/script_Nayru2.inc index c4ab770d..dadf8cb8 100644 --- a/data/scripts/hyruleTown/script_Nayru2.inc +++ b/data/scripts/hyruleTown/script_Nayru2.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Nayru2 BeginBlock Call sub_08064928 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a EndBlock @@ -16,8 +16,8 @@ script_08011F22: CheckEntityInteractType JumpIfNot script_08011F22 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011F58 @@ -30,21 +30,21 @@ script_08011F58: CheckTextboxResult JumpIf script_08011F80 script_08011F64: - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011F22 script_08011F72: CheckEntityInteractType JumpIfNot script_08011F72 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 script_08011F80: MessageNoOverlap 0x3112 WaitUntilTextboxCloses SetGlobalFlag 0x002f - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011F72 diff --git a/data/scripts/hyruleTown/script_NayruAlone.inc b/data/scripts/hyruleTown/script_NayruAlone.inc index 7436a2c2..c1e75c7d 100644 --- a/data/scripts/hyruleTown/script_NayruAlone.inc +++ b/data/scripts/hyruleTown/script_NayruAlone.inc @@ -2,19 +2,19 @@ SCRIPT_START script_NayruAlone BeginBlock Call sub_08064928 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a EndBlock script_08012216: CheckEntityInteractType JumpIfNot script_08012216 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x4525 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08012216 diff --git a/data/scripts/hyruleTown/script_NayruMovedIn.inc b/data/scripts/hyruleTown/script_NayruMovedIn.inc index dbef277e..ab975772 100644 --- a/data/scripts/hyruleTown/script_NayruMovedIn.inc +++ b/data/scripts/hyruleTown/script_NayruMovedIn.inc @@ -2,15 +2,15 @@ SCRIPT_START script_NayruMovedIn BeginBlock Call sub_08064928 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a EndBlock script_080120C6: CheckEntityInteractType JumpIfNot script_080120C6 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 CheckLocalFlag 0x0095 JumpIf script_080120EA @@ -51,8 +51,8 @@ script_08012126: MessageNoOverlap 0x311b script_0801212A: WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_080120C6 .align 2, 0 diff --git a/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc b/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc index 00761031..0a1a958a 100644 --- a/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc +++ b/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc @@ -1,30 +1,30 @@ @ Simons Simulation OBJECT_69 SCRIPT_START script_Object69SimonsSimulation BeginBlock - _0807E888 + DisablePlayerControl EndBlock CallWithArg sub_0806C2A0, 0x00000001 WaitForFadeFinish Wait 0x003c - _0807E878 + EnablePlayerControl SetRoomFlag 0x0000 PlayBgm BGM_FIGHT_THEME2 script_08011C04: CheckRoomFlag 0x0064 JumpIfNot script_08011C04 StopBgm - _0807E864 + SetPlayerIdle Wait 0x003c CameraTargetEntity Wait 0x003c Call Simon_CreateChest Wait 0x003c CameraTargetPlayer - _0807E878 + EnablePlayerControl script_08011C28: CheckLocalFlag 0x0001 JumpIfNot script_08011C28 - _0807E888 + DisablePlayerControl WaitPlayerGetItem Wait 0x001e CallWithArg sub_0806C2A0, 0x00000000 diff --git a/data/scripts/hyruleTown/script_Object6ACarlov.inc b/data/scripts/hyruleTown/script_Object6ACarlov.inc index b4987e83..6ba8d7a9 100644 --- a/data/scripts/hyruleTown/script_Object6ACarlov.inc +++ b/data/scripts/hyruleTown/script_Object6ACarlov.inc @@ -8,22 +8,22 @@ SCRIPT_START script_Object6ACarlov script_080145C2: CheckRoomFlag 0x0005 JumpIfNot script_080145C2 - _0807E864 + SetPlayerIdle ClearRoomFlag 0x0005 .ifdef EU Wait 0x0018 _0807E8E4_1 - _0807EB44 0x0006 + SetAnimationState 0x0006 .else Wait 0x000c - _0807EB8C + FaceAwayFromPlayer .endif MessageFromTargetPos 0x432e, 0x000c WaitUntilTextboxCloses .ifdef EU Wait 0x0018 .endif - _0807E878 + EnablePlayerControl Jump script_080145C2 script_080145E4: EndBlock diff --git a/data/scripts/hyruleTown/script_Object6ACarlov2.inc b/data/scripts/hyruleTown/script_Object6ACarlov2.inc index a10f0656..37ed8f5f 100644 --- a/data/scripts/hyruleTown/script_Object6ACarlov2.inc +++ b/data/scripts/hyruleTown/script_Object6ACarlov2.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Object6ACarlov2 BeginBlock DoPostScriptAction 0x0008 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_080145F8: @@ -13,19 +13,19 @@ script_080145F8: JumpIfNot script_080145F8 CheckRoomFlag 0x0009 JumpIf script_08014632 - _0807E864 + SetPlayerIdle Wait 0x0018 _0807E8E4_3 - _0807EB44 0x0002 + SetAnimationState 0x0002 MessageFromTargetPos 0x432b, 0x000c WaitUntilTextboxCloses Wait 0x0018 - _0807E878 + EnablePlayerControl Jump script_080145F8 script_08014632: CheckRoomFlag 0x0000 JumpIfNot script_08014632 - _0807E864 + SetPlayerIdle Call sub_0807DF28 script_08014642: CheckRoomFlag 0x0009 @@ -33,12 +33,12 @@ script_08014642: SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_080145F8 .else CheckRoomFlag 0x0000 JumpIfNot script_080145F8 - _0807E864 + SetPlayerIdle Call sub_0807DF28 script_08014608: CheckRoomFlag 0x0004 @@ -46,7 +46,7 @@ script_08014608: SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_080145F8 .endif .align 2, 0 diff --git a/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc b/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc index ad162bf7..853106e8 100644 --- a/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc +++ b/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc @@ -7,14 +7,14 @@ script_0801454C: JumpIfNot script_0801454C CheckRoomFlag 0x0000 JumpIfNot script_0801454C - _0807E864 - _0807EB28 0x4217 + SetPlayerIdle + EzloMessage 0x4217 WaitUntilTextboxCloses StartPlayerScript script_PlayerWhenLeavingCarlovAlreadyPaid Wait 0x0010 SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 - _0807E878 + EnablePlayerControl Jump script_0801454C SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_OldLadyCatHouse1.inc b/data/scripts/hyruleTown/script_OldLadyCatHouse1.inc index cfd7bef0..c5905a83 100644 --- a/data/scripts/hyruleTown/script_OldLadyCatHouse1.inc +++ b/data/scripts/hyruleTown/script_OldLadyCatHouse1.inc @@ -3,7 +3,7 @@ SCRIPT_START script_OldLadyCatHouse1 BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 Call sub_08061FD8 EndBlock Jump script_0800EBF4 diff --git a/data/scripts/hyruleTown/script_OldLadyCatHouse2.inc b/data/scripts/hyruleTown/script_OldLadyCatHouse2.inc index a2b33563..edaf3a11 100644 --- a/data/scripts/hyruleTown/script_OldLadyCatHouse2.inc +++ b/data/scripts/hyruleTown/script_OldLadyCatHouse2.inc @@ -3,18 +3,18 @@ SCRIPT_START script_OldLadyCatHouse2 BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Call sub_08061FD8 EndBlock @ Common end code for Townspersons? script_0800EBF4: CheckEntityInteractType JumpIfNot script_0800EBF4 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08061FD8 Call sub_08062048 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800EBF4 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Phonograph.inc b/data/scripts/hyruleTown/script_Phonograph.inc index b4cae722..9dae4972 100644 --- a/data/scripts/hyruleTown/script_Phonograph.inc +++ b/data/scripts/hyruleTown/script_Phonograph.inc @@ -6,7 +6,7 @@ SCRIPT_START script_Phonograph script_0800BA46: CheckEntityInteractType JumpIfNot script_0800BA46 - _0807E864 + SetPlayerIdle Call sub_0807DF28 MessageFromTarget 0x3301 WaitUntilTextboxCloses @@ -17,5 +17,5 @@ script_0800BA46: PlayBGM script_0800BA6C: Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800BA46 diff --git a/data/scripts/hyruleTown/script_PhonographDoor.inc b/data/scripts/hyruleTown/script_PhonographDoor.inc index f5de6c5e..163dfdae 100644 --- a/data/scripts/hyruleTown/script_PhonographDoor.inc +++ b/data/scripts/hyruleTown/script_PhonographDoor.inc @@ -19,18 +19,18 @@ SCRIPT_START script_PhonographDoor CheckPlayerInRegion2 0x0808 JumpIfNot script_PhonographDoor EndBlock - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerCannotEnter WaitForSyncFlagAndClear 0x00000001 CheckRoomFlag 0x0001 JumpIf script_080109DE - _0807EB28 0x0b64 + EzloMessage 0x0b64 WaitUntilTextboxCloses script_080109DE: Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_PhonographDoor script_080109EA: DoPostScriptAction 0x0006 diff --git a/data/scripts/hyruleTown/script_Pina.inc b/data/scripts/hyruleTown/script_Pina.inc index 2218ed8d..866ef334 100644 --- a/data/scripts/hyruleTown/script_Pina.inc +++ b/data/scripts/hyruleTown/script_Pina.inc @@ -1,21 +1,21 @@ @ Hyrule Town Pina SCRIPT_START script_Pina BeginBlock - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 Call sub_08063CAC DoPostScriptAction 0x000a - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_080104BC: CheckEntityInteractType JumpIfNot script_080104BC - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000004 Call sub_08063C90 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl CallWithArg sub_0807F3D8, 0x00000000 Jump script_080104BC diff --git a/data/scripts/hyruleTown/script_Pita.inc b/data/scripts/hyruleTown/script_Pita.inc index eaa60fe9..5732755d 100644 --- a/data/scripts/hyruleTown/script_Pita.inc +++ b/data/scripts/hyruleTown/script_Pita.inc @@ -3,15 +3,15 @@ SCRIPT_START script_Pita BeginBlock _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_080106BE: CheckEntityInteractType JumpIfNot script_080106BE - _0807E864 - _0807EB74 - Call sub_0807F2D4 + SetPlayerIdle + FacePlayer + Call WaitForFrameHiBit DoPostScriptAction 0x0000 HasRoomItemForSale JumpIf script_080106E0 @@ -39,7 +39,7 @@ script_08010724: WaitPlayerGetItem script_08010726: WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0001 Jump script_080106BE .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc b/data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc index 32ceacb2..da2b3e4f 100644 --- a/data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc +++ b/data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc @@ -1,12 +1,12 @@ @ Player at Library fall through trap SCRIPT_START script_PlayerActivatedTrapCard - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 Wait 0x0014 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 Wait 0x0014 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x0005 Wait 0x003c diff --git a/data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc b/data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc index 985483a2..bcc539a8 100644 --- a/data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc +++ b/data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc @@ -3,9 +3,9 @@ SCRIPT_START script_PlayerAtDrLeftDoor BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0001 - _0807ECC4 0x0008 + WalkSouth 0x0008 SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/hyruleTown/script_PlayerAtInnDoor.inc b/data/scripts/hyruleTown/script_PlayerAtInnDoor.inc index d74971cd..25411c1b 100644 --- a/data/scripts/hyruleTown/script_PlayerAtInnDoor.inc +++ b/data/scripts/hyruleTown/script_PlayerAtInnDoor.inc @@ -3,8 +3,8 @@ SCRIPT_START script_PlayerAtInnDoor BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807ECC4 0x0010 - _0807EB44 0x0004 + WalkSouth 0x0010 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/hyruleTown/script_PlayerAtRem.inc b/data/scripts/hyruleTown/script_PlayerAtRem.inc index 14ab94ad..3dab6b77 100644 --- a/data/scripts/hyruleTown/script_PlayerAtRem.inc +++ b/data/scripts/hyruleTown/script_PlayerAtRem.inc @@ -1,7 +1,7 @@ @ Player at Rem SCRIPT_START script_PlayerAtRem BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 SetEntitySpeed 0x0140 EndBlock _0807EDD4 0x00a8, 0x0060 diff --git a/data/scripts/hyruleTown/script_PlayerCannotEnter.inc b/data/scripts/hyruleTown/script_PlayerCannotEnter.inc index 9ae17985..e7ef3883 100644 --- a/data/scripts/hyruleTown/script_PlayerCannotEnter.inc +++ b/data/scripts/hyruleTown/script_PlayerCannotEnter.inc @@ -3,8 +3,8 @@ SCRIPT_START script_PlayerCannotEnter BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EC94 0x0010 - _0807EB44 0x0002 + WalkEast 0x0010 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/hyruleTown/script_PlayerSleepingInn.inc b/data/scripts/hyruleTown/script_PlayerSleepingInn.inc index eb09df0a..53d68d84 100644 --- a/data/scripts/hyruleTown/script_PlayerSleepingInn.inc +++ b/data/scripts/hyruleTown/script_PlayerSleepingInn.inc @@ -2,18 +2,18 @@ SCRIPT_START script_PlayerSleepingInn BeginBlock Call sub_0807DF28 - _0807E864 + SetPlayerIdle ModHealth 0x00a0 EndBlock Wait 0x003c - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade4 WaitForFadeFinish script_08010A78: - Call sub_0807F0D8 + Call CheckAnyKeyPressed JumpIfNot script_08010A78 DoPostScriptAction 0x0014 - _0807E878 + EnablePlayerControl Call sub_0807DF50 Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc b/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc index 1666a56b..261a7afb 100644 --- a/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc +++ b/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc @@ -1,7 +1,7 @@ @ Player at Librari move on trap SCRIPT_START script_PlayerStepOnTrap BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 diff --git a/data/scripts/hyruleTown/script_PlayerWakingUpAtSimons.inc b/data/scripts/hyruleTown/script_PlayerWakingUpAtSimons.inc index 748c70ef..8f68ac3c 100644 --- a/data/scripts/hyruleTown/script_PlayerWakingUpAtSimons.inc +++ b/data/scripts/hyruleTown/script_PlayerWakingUpAtSimons.inc @@ -1,7 +1,7 @@ @ Player waking up after Simons Simulation SCRIPT_START script_PlayerWakingUpAtSimons BeginBlock - _0807E864 + SetPlayerIdle EndBlock Wait 0x003c CallWithArg sub_0806C2A0, 0x00000001 diff --git a/data/scripts/hyruleTown/script_Postman.inc b/data/scripts/hyruleTown/script_Postman.inc index 01b75b3f..5f12cb8d 100644 --- a/data/scripts/hyruleTown/script_Postman.inc +++ b/data/scripts/hyruleTown/script_Postman.inc @@ -3,10 +3,10 @@ SCRIPT_START script_Postman BeginBlock CheckInventory1 0x0067 JumpIfNot script_08010B62 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetEntitySpeed 0x0180 - CallWithArg sub_0807F348 + CallWithArg SetPriorityMessage Call sub_0806075C EndBlock WaitUntilTextboxCloses @@ -20,7 +20,7 @@ script_08010B1C: script_08010B22: EndBlock BeginBlock - _0807E564 + CheckPlayerMinish JumpIf script_08010B3A CallWithArg sub_080608E4, 0x00000000 JumpIf script_08010B44 diff --git a/data/scripts/hyruleTown/script_Rem.inc b/data/scripts/hyruleTown/script_Rem.inc index 85487b0e..7fb0f0c8 100644 --- a/data/scripts/hyruleTown/script_Rem.inc +++ b/data/scripts/hyruleTown/script_Rem.inc @@ -2,8 +2,8 @@ SCRIPT_START script_Rem BeginBlock CallWithArg sub_0806A93C, 0x12345678 - _0807EB44 0x0004 - _0807E930 0x0002 + SetAnimationState 0x0004 + SetAnimation 0x0002 CheckInventory1 0x0015 JumpIf script_080130B6 CheckLocalFlag 0x0060 @@ -20,17 +20,17 @@ script_08012F48: script_08012F50: Call sub_0806A96C JumpIfNot script_08012F50 - _0807E864 + SetPlayerIdle MessageNoOverlap 0x4401 WaitUntilTextboxCloses SetLocalFlag 0x0061 - _0807E878 - _0807E908 0x0001 + EnablePlayerControl + SetAction 0x0001 script_08012F6C: Call sub_0806A96C JumpIfNot script_08012F6C MessageNoOverlap 0x4402 WaitUntilTextboxCloses - _0807E908 0x0001 + SetAction 0x0001 Jump script_08012F6C SCRIPT_END diff --git a/data/scripts/hyruleTown/script_RemFallingAsleep.inc b/data/scripts/hyruleTown/script_RemFallingAsleep.inc index b685fd1f..996ea20f 100644 --- a/data/scripts/hyruleTown/script_RemFallingAsleep.inc +++ b/data/scripts/hyruleTown/script_RemFallingAsleep.inc @@ -3,24 +3,24 @@ SCRIPT_START script_RemFallingAsleep BeginBlock CheckLocalFlag 0x0060 JumpIf script_08012FD2 - _0807E864 + SetPlayerIdle Call sub_0807DF28 StartPlayerScript script_PlayerAtRem SetLocalFlag 0x0060 ClearLocalFlag 0x0061 EndBlock WaitForSyncFlagAndClear 0x00000004 - _0807E908 0x0004 + SetAction 0x0004 Call sub_0806A958 CallWithArg sub_0807F93C, 0x0000f2f4 Call sub_0807DF50 - _0807E878 + EnablePlayerControl SetLocalFlag 0x0062 Jump script_08012FFA script_08012FD2: BeginBlock - _0807E930 0x000d - _0807E908 0x0005 + SetAnimation 0x000d + SetAction 0x0005 SetLocalFlag 0x0062 CallWithArg sub_0807F93C, 0x0000f2f4 Call sub_0806AA10 @@ -28,14 +28,14 @@ script_08012FD2: CheckInventory1 0x0038 JumpIf script_08013006 script_08012FFA: - _0807E944 + TriggerInteract MessageNoOverlap 0x4403 WaitUntilTextboxCloses Jump script_08012FFA script_08013006: - _0807E944 + TriggerInteract BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 EndBlock PlaySound SFX_TASK_COMPLETE @@ -44,7 +44,7 @@ script_08013006: Wait 0x001e _0807E8E4_0 Call sub_0806AB9C - _0807E930 0x000b + SetAnimation 0x000b Wait 0x003c DoPostScriptAction 0x0004 Wait 0x003c @@ -57,31 +57,31 @@ script_08013006: WaitUntilTextboxCloses Wait 0x001e Call sub_0806A9E8 - _0807E930 0x000f + SetAnimation 0x000f Wait 0x00f0 MessageNoOverlap 0x4405 WaitUntilTextboxCloses SetSyncFlag 0x00000200 GivePlayerItem 0x0015 WaitPlayerGetItem - _0807EB8C + FaceAwayFromPlayer MessageNoOverlap 0x4406 WaitUntilTextboxCloses - _0807E908 0x0001 + SetAction 0x0001 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_0801308A: Call sub_0806A96C JumpIfNot script_0801308A MessageNoOverlap 0x4407 WaitUntilTextboxCloses - _0807E908 0x0001 + SetAction 0x0001 script_0801309E: Call sub_0806A96C JumpIfNot script_0801309E MessageNoOverlap 0x440d WaitUntilTextboxCloses - _0807E908 0x0001 + SetAction 0x0001 Jump script_0801308A script_080130B6: CheckLocalFlag 0x0062 @@ -92,9 +92,9 @@ script_080130C4: script_080130C6: Call sub_0806A96C JumpIfNot script_080130C6 - _0807E864 + SetPlayerIdle Call sub_0806AA18 WaitUntilTextboxCloses - _0807E878 - _0807E908 0x0001 + EnablePlayerControl + SetAction 0x0001 Jump script_080130C6 diff --git a/data/scripts/hyruleTown/script_RemTownMinish.inc b/data/scripts/hyruleTown/script_RemTownMinish.inc index d7f649b8..fb5e9ec6 100644 --- a/data/scripts/hyruleTown/script_RemTownMinish.inc +++ b/data/scripts/hyruleTown/script_RemTownMinish.inc @@ -4,7 +4,7 @@ SCRIPT_START script_RemTownMinish _0807E9D4 DoPostScriptAction 0x000a DoPostScriptAction 0x0012 - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_08013128: EndBlock @@ -14,9 +14,9 @@ script_08013128: Call sub_0806AEE4 Jump script_08013128 script_0801313C: - _0807E864 + SetPlayerIdle EndBlock - _0807EB74 + FacePlayer Call sub_0806AED8 CallWithArg sub_0806AA50, 0x00000000 WaitUntilTextboxCloses @@ -25,10 +25,10 @@ script_0801313C: CallWithArg sub_0806AA50, 0x00000002 WaitUntilTextboxCloses JumpIf script_08013176 - _0807E878 + EnablePlayerControl Jump script_08013128 script_08013176: SetIntVariable 0x00000403 - Call sub_0807F420 - _0807E878 + Call LoadMenu + EnablePlayerControl Jump script_08013128 diff --git a/data/scripts/hyruleTown/script_Simon.inc b/data/scripts/hyruleTown/script_Simon.inc index 4eb0c09c..44bd59b5 100644 --- a/data/scripts/hyruleTown/script_Simon.inc +++ b/data/scripts/hyruleTown/script_Simon.inc @@ -3,34 +3,34 @@ SCRIPT_START script_Simon BeginBlock _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock CheckGlobalFlag 0x0050 JumpIfNot script_08011B84 WaitForSyncFlagAndClear 0x00000004 - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0004 Wait 0x003c - _0807EB8C + FaceAwayFromPlayer MessageNoOverlap 0x3d07 WaitUntilTextboxCloses - _0807EB44 0x0004 + SetAnimationState 0x0004 ClearGlobalFlag 0x0050 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08011B84: CheckEntityInteractType JumpIfNot script_08011B84 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x3d01 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_08011BA4 script_08011B9A: - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 Jump script_08011B84 script_08011BA4: HasRupees 0x000a diff --git a/data/scripts/hyruleTown/script_SimonsDoor.inc b/data/scripts/hyruleTown/script_SimonsDoor.inc index af0ab35f..4e9b8ba0 100644 --- a/data/scripts/hyruleTown/script_SimonsDoor.inc +++ b/data/scripts/hyruleTown/script_SimonsDoor.inc @@ -2,18 +2,18 @@ SCRIPT_START script_SimonsDoor CheckPlayerInRegion2 0x0808 JumpIfNot script_SimonsDoor - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerCannotEnter WaitForSyncFlagAndClear 0x00000001 CheckRoomFlag 0x0001 JumpIf script_08010994 - _0807EB28 0x0b63 + EzloMessage 0x0b63 WaitUntilTextboxCloses script_08010994: Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_SimonsDoor diff --git a/data/scripts/hyruleTown/script_SittingPerson.inc b/data/scripts/hyruleTown/script_SittingPerson.inc index de9aafde..0dc70fbc 100644 --- a/data/scripts/hyruleTown/script_SittingPerson.inc +++ b/data/scripts/hyruleTown/script_SittingPerson.inc @@ -10,16 +10,16 @@ SCRIPT_START script_SittingPerson script_0800ED20: CheckEntityInteractType JumpIfNot script_0800ED20 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_08063850, 0x00000000 Call sub_08063944 WaitUntilTextboxCloses JumpIfNot script_0800ED46 - _0807F050 0x0070 + GiveKinstone 0x0070 WaitPlayerGetItem script_0800ED46: - _0807E878 + EnablePlayerControl Call sub_08063874 CallWithArg sub_08063850, 0x00000000 Jump script_0800ED20 diff --git a/data/scripts/hyruleTown/script_SmallTownMinish.inc b/data/scripts/hyruleTown/script_SmallTownMinish.inc index 7438f1cd..d97d0801 100644 --- a/data/scripts/hyruleTown/script_SmallTownMinish.inc +++ b/data/scripts/hyruleTown/script_SmallTownMinish.inc @@ -1,10 +1,10 @@ @ Hyrule Town SmallTownMinish SCRIPT_START script_SmallTownMinish BeginBlock - _0807E564 + CheckPlayerMinish JumpIfNot script_08010BAC Call sub_0807F924 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x0007 DoPostScriptAction 0x000a @@ -12,16 +12,16 @@ SCRIPT_START script_SmallTownMinish script_08010B88: EndBlock BeginBlock - _0807E564 + CheckPlayerMinish JumpIfNot script_08010BAC CheckEntityInteractType JumpIfNot script_08010B88 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806E2DC WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08010B88 script_08010BAC: DoPostScriptAction 0x0006 diff --git a/data/scripts/hyruleTown/script_Stamp.inc b/data/scripts/hyruleTown/script_Stamp.inc index c26672bc..c478adeb 100644 --- a/data/scripts/hyruleTown/script_Stamp.inc +++ b/data/scripts/hyruleTown/script_Stamp.inc @@ -4,18 +4,18 @@ SCRIPT_START script_Stamp DoPostScriptAction 0x0007 _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_080107AA: CheckEntityInteractType JumpIfNot script_080107AA - _0807E864 - Call sub_0807F2D4 + SetPlayerIdle + Call WaitForFrameHiBit DoPostScriptAction 0x0001 Call sub_08062CBC WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0000 Jump script_080107AA .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Stockwell.inc b/data/scripts/hyruleTown/script_Stockwell.inc index c079da2b..b59499cf 100644 --- a/data/scripts/hyruleTown/script_Stockwell.inc +++ b/data/scripts/hyruleTown/script_Stockwell.inc @@ -9,56 +9,56 @@ SCRIPT_START script_Stockwell script_080142C4: EndBlock BeginBlock - _0807E564 + CheckPlayerMinish JumpIfNot script_080142C4 CheckPlayerInRegion 0x0098, 0x0058, 0x1818 JumpIfNot script_080142C4 EndBlock - _0807E864 + SetPlayerIdle SetLocalFlag 0x0053 Wait 0x0014 - _0807E908 0x0004 + SetAction 0x0004 Call sub_080654DC Wait 0x001e - _0807E930 0x0001 + SetAnimation 0x0001 Wait 0x000a - _0807E930 0x0003 + SetAnimation 0x0003 Wait 0x000a - _0807E930 0x0001 + SetAnimation 0x0001 Wait 0x000a - _0807E930 0x0003 + SetAnimation 0x0003 Wait 0x000a - _0807E930 0x0002 + SetAnimation 0x0002 Wait 0x001e MessageNoOverlap 0x2c12 WaitUntilTextboxCloses Wait 0x0014 - _0807E930 0x0004 - _0807E878 - _0807E908 0x0001 + SetAnimation 0x0004 + EnablePlayerControl + SetAction 0x0001 script_08014330: EndBlock BeginBlock - _0807E564 + CheckPlayerMinish JumpIf script_08014330 EntityHasHeight JumpIf script_08014330 CheckPlayerInRegion 0x00c0, 0x0068, 0x1010 JumpIfNot script_08014330 EndBlock - _0807E864 + SetPlayerIdle SetLocalFlag 0x0054 Wait 0x005a - _0807E908 0x0004 + SetAction 0x0004 Call sub_080654EC Wait 0x001e - _0807E930 0x0001 + SetAnimation 0x0001 Wait 0x001e MessageNoOverlap 0x2c13 WaitUntilTextboxCloses Wait 0x0014 - _0807E930 0x0004 - _0807E908 0x0001 - _0807E878 + SetAnimation 0x0004 + SetAction 0x0001 + EnablePlayerControl script_08014382: SCRIPT_END diff --git a/data/scripts/hyruleTown/script_StockwellBuy.inc b/data/scripts/hyruleTown/script_StockwellBuy.inc index 66e1b75f..436ae4dd 100644 --- a/data/scripts/hyruleTown/script_StockwellBuy.inc +++ b/data/scripts/hyruleTown/script_StockwellBuy.inc @@ -1,7 +1,7 @@ @ Hyrule Town Stockwell do you want to buy? SCRIPT_START script_StockwellBuy EndBlock - _0807E864 + SetPlayerIdle WaitUntilTextboxCloses CheckTextboxResult JumpIfNot script_080143AC @@ -10,14 +10,14 @@ SCRIPT_START script_StockwellBuy JumpIfNot script_080143AC Wait 0x003c WaitUntilTextboxCloses - _0807EB8C + FaceAwayFromPlayer Wait 0x001e MessageNoOverlapVar script_080143AC: WaitUntilTextboxCloses Wait 0x001e - _0807E930 0x0004 - _0807E908 0x0001 - _0807E878 + SetAnimation 0x0004 + SetAction 0x0001 + EnablePlayerControl SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_StockwellDogFood.inc b/data/scripts/hyruleTown/script_StockwellDogFood.inc index ea0f8908..90b56fc7 100644 --- a/data/scripts/hyruleTown/script_StockwellDogFood.inc +++ b/data/scripts/hyruleTown/script_StockwellDogFood.inc @@ -1,10 +1,10 @@ @ Stockwell pick up dog food SCRIPT_START script_StockwellDogFood EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 Call sub_080654FC - _0807E930 0x0001 + SetAnimation 0x0001 Call sub_080654EC Wait 0x003c MessageNoOverlap 0x2c16 @@ -27,16 +27,16 @@ script_080143FA: MessageNoOverlap 0x2c19 WaitUntilTextboxCloses SetIntVariable 0x00000303 - Call sub_0807F420 + Call LoadMenu .ifndef EU Wait 0x001e - _0807EB8C + FaceAwayFromPlayer MessageNoOverlap 0x2c22 WaitUntilTextboxCloses .endif script_0801443E: - _0807E930 0x0004 - _0807E908 0x0001 + SetAnimation 0x0004 + SetAction 0x0001 Call sub_0807DF50 - _0807E878 + EnablePlayerControl SCRIPT_END diff --git a/data/scripts/hyruleTown/script_Sturgeon.inc b/data/scripts/hyruleTown/script_Sturgeon.inc index 69be9796..db91eb49 100644 --- a/data/scripts/hyruleTown/script_Sturgeon.inc +++ b/data/scripts/hyruleTown/script_Sturgeon.inc @@ -4,16 +4,16 @@ SCRIPT_START script_Sturgeon Call sub_08064CC0 DoPostScriptAction 0x000a DoPostScriptAction 0x0007 - _0807EB44 0x0002 - _0807E930 0x0000 + SetAnimationState 0x0002 + SetAnimation 0x0000 EndBlock script_0800ED76: - _0807E944 - _0807E864 - _0807EB74 + TriggerInteract + SetPlayerIdle + FacePlayer Call sub_08064CD8 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800ED76 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc b/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc index a0742182..ac3c3aab 100644 --- a/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc +++ b/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc @@ -3,8 +3,8 @@ SCRIPT_START script_SturgeonAllBooksCollected BeginBlock SetEntityPositionRelative 0x0068, 0x0018 DoPostScriptAction 0x000f - _0807EB44 0x0004 - _0807E930 0x0004 + SetAnimationState 0x0004 + SetAnimation 0x0004 SetEntitySpeed 0x0300 PlaySound SFX_STAIRS EndBlock @@ -16,34 +16,34 @@ SCRIPT_START script_SturgeonAllBooksCollected _0807EDD4 0x0068, 0x0078 Call sub_08064D10 Wait 0x000f - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000f Call sub_08064D08 _0807EDD4 0x0098, 0x0078 Call sub_08064D10 Wait 0x000f - _0807EB44 0x0004 + SetAnimationState 0x0004 PlaySound SFX_PLY_LIFT Wait 0x000f - _0807EB44 0x0002 + SetAnimationState 0x0002 _0807EDD4 0x00ac, 0x0078 Wait 0x000f - _0807EB44 0x0004 + SetAnimationState 0x0004 PlaySound SFX_PLY_LIFT Wait 0x000f - _0807EB44 0x0002 + SetAnimationState 0x0002 _0807EDD4 0x00c0, 0x0078 Wait 0x000f - _0807EB44 0x0004 + SetAnimationState 0x0004 PlaySound SFX_PLY_LIFT Wait 0x000f - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x001e Call sub_08064D08 _0807EDD4 0x0068, 0x0078 Call sub_08064D10 Wait 0x000f - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x000f Call sub_08064D08 _0807EDD4 0x0068, 0x0018 diff --git a/data/scripts/hyruleTown/script_Teachers.inc b/data/scripts/hyruleTown/script_Teachers.inc index 5a9dfd9f..b7898239 100644 --- a/data/scripts/hyruleTown/script_Teachers.inc +++ b/data/scripts/hyruleTown/script_Teachers.inc @@ -3,16 +3,16 @@ SCRIPT_START script_Teachers BeginBlock Call sub_0806C674 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 EndBlock script_0800E806: CheckEntityInteractType JumpIfNot script_0800E806 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C70C WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 Jump script_0800E806 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_TownMinish1.inc b/data/scripts/hyruleTown/script_TownMinish1.inc index 48a4ba7c..10db1da0 100644 --- a/data/scripts/hyruleTown/script_TownMinish1.inc +++ b/data/scripts/hyruleTown/script_TownMinish1.inc @@ -13,18 +13,18 @@ script_0800E6F4: Jump script_0800E6F4 script_0800E708: EndBlock - _0807E864 + SetPlayerIdle Call sub_0806AFE8 JumpIf script_0800E722 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800E6F4 script_0800E722: WaitUntilTextboxCloses GivePlayerItem 0x0057 WaitPlayerGetItem WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800E6F4 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_TownMinish2.inc b/data/scripts/hyruleTown/script_TownMinish2.inc index 14f1a7ea..30167de3 100644 --- a/data/scripts/hyruleTown/script_TownMinish2.inc +++ b/data/scripts/hyruleTown/script_TownMinish2.inc @@ -7,10 +7,10 @@ SCRIPT_START script_TownMinish2 script_0800E73E: CheckEntityInteractType JumpIfNot script_0800E73E - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0806AF60, 0x00000000 Call sub_0806AFE8 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800E73E diff --git a/data/scripts/hyruleTown/script_TownMinish3.inc b/data/scripts/hyruleTown/script_TownMinish3.inc index 468a7163..072ace66 100644 --- a/data/scripts/hyruleTown/script_TownMinish3.inc +++ b/data/scripts/hyruleTown/script_TownMinish3.inc @@ -24,15 +24,15 @@ script_0800E788: Jump script_0800E788 script_0800E7A4: EndBlock - _0807E864 + SetPlayerIdle Call sub_0806AFE8 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800E788 script_0800E7BA: DoPostScriptAction 0x000f - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0806AF60, 0x00000004 Call sub_0806AF70 _0807EE04 0x0188, 0x0058 diff --git a/data/scripts/hyruleTown/script_TownMinish4.inc b/data/scripts/hyruleTown/script_TownMinish4.inc index e28d7805..79c063e0 100644 --- a/data/scripts/hyruleTown/script_TownMinish4.inc +++ b/data/scripts/hyruleTown/script_TownMinish4.inc @@ -14,7 +14,7 @@ script_0800ED98: Jump script_0800ED98 script_0800EDB6: EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 CheckLocalFlag 0x00ae JumpIf script_0800EE3E @@ -29,16 +29,16 @@ script_0800EDB6: MessageFromTarget 0x4c09 WaitUntilTextboxCloses SetIntVariable 0x00000503 - Call sub_0807F420 + Call LoadMenu SetSyncFlag 0x00000040 Call sub_0807DF50 - _0807E878 + EnablePlayerControl SetLocalFlag 0x00ae Jump script_0800ED98 script_0800EE12: EndBlock WaitForSyncFlagAndClear 0x00000002 - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0806AF60, 0x00000008 WaitForSyncFlagAndClear 0x00000004 Call sub_0806AED8 @@ -48,5 +48,5 @@ script_0800EE3E: MessageFromTarget 0x4c16 WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800ED98 diff --git a/data/scripts/hyruleTown/script_TownMinish5.inc b/data/scripts/hyruleTown/script_TownMinish5.inc index e389bbcc..b69a9b3b 100644 --- a/data/scripts/hyruleTown/script_TownMinish5.inc +++ b/data/scripts/hyruleTown/script_TownMinish5.inc @@ -14,7 +14,7 @@ script_0800EE58: Jump script_0800EE58 script_0800EE76: EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 CheckLocalFlag 0x00ae JumpIf script_0800EEFE @@ -29,16 +29,16 @@ script_0800EE76: MessageFromTarget 0x4c09 WaitUntilTextboxCloses SetIntVariable 0x00000503 - Call sub_0807F420 + Call LoadMenu SetSyncFlag 0x00000008 Call sub_0807DF50 - _0807E878 + EnablePlayerControl SetLocalFlag 0x00ae Jump script_0800EE58 script_0800EED2: EndBlock WaitForSyncFlagAndClear 0x00000010 - _0807EB44 0x0006 + SetAnimationState 0x0006 CallWithArg sub_0806AF60, 0x00000008 WaitForSyncFlagAndClear 0x00000020 Call sub_0806AED8 @@ -48,7 +48,7 @@ script_0800EEFE: MessageFromTarget 0x4c15 WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800EE58 MessageFromTarget 0x4c07 WaitUntilTextboxCloses diff --git a/data/scripts/hyruleTown/script_TownMinish6.inc b/data/scripts/hyruleTown/script_TownMinish6.inc index 40da66be..c02ceb81 100644 --- a/data/scripts/hyruleTown/script_TownMinish6.inc +++ b/data/scripts/hyruleTown/script_TownMinish6.inc @@ -9,30 +9,30 @@ SCRIPT_START script_TownMinish6 EndBlock Jump script_0800EFFE script_0800EFDA: - _0807EB44 0x0006 + SetAnimationState 0x0006 CallWithArg sub_0806AF60, 0x00000008 Wait 0x0004 - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_0806AF60, 0x00000008 Wait 0x0004 script_0800EFFE: - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0806AF60, 0x00000008 Wait 0x0004 - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0088, 0x0040 DoPostScriptAction 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0806AF60, 0x00000008 Wait 0x0004 - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_0806AF60, 0x00000008 Wait 0x0004 - _0807EB44 0x0006 + SetAnimationState 0x0006 CallWithArg sub_0806AF60, 0x00000008 Wait 0x0004 - _0807EB44 0x0006 + SetAnimationState 0x0006 CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0068, 0x0040 DoPostScriptAction 0x000a diff --git a/data/scripts/hyruleTown/script_Townsperson1.inc b/data/scripts/hyruleTown/script_Townsperson1.inc index a3e3fa02..259d47b4 100644 --- a/data/scripts/hyruleTown/script_Townsperson1.inc +++ b/data/scripts/hyruleTown/script_Townsperson1.inc @@ -8,11 +8,11 @@ SCRIPT_START script_Townsperson1 script_080100DC: CheckEntityInteractType JumpIfNot script_080100DC - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08061FE4 Call sub_08062048 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_080100DC .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_TownspersonInDogHouse.inc b/data/scripts/hyruleTown/script_TownspersonInDogHouse.inc index b9db7e3c..7be84de5 100644 --- a/data/scripts/hyruleTown/script_TownspersonInDogHouse.inc +++ b/data/scripts/hyruleTown/script_TownspersonInDogHouse.inc @@ -3,17 +3,17 @@ SCRIPT_START script_TownspersonInDogHouse BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 Call sub_08061FD8 EndBlock script_0800EB44: CheckEntityInteractType JumpIfNot script_0800EB44 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08061FD8 Call sub_08062048 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800EB44 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Wheaton.inc b/data/scripts/hyruleTown/script_Wheaton.inc index 277fcf4d..0eb0c98d 100644 --- a/data/scripts/hyruleTown/script_Wheaton.inc +++ b/data/scripts/hyruleTown/script_Wheaton.inc @@ -3,19 +3,19 @@ SCRIPT_START script_Wheaton BeginBlock _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_08010686: CheckEntityInteractType JumpIfNot script_08010686 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer HasRoomItemForSale - Call sub_0807F77C + Call GetConditionSet MessageFromTargetTable 0x3c08, 0x3c09 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 Jump script_08010686 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc b/data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc index c9cc110b..ce39d48f 100644 --- a/data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc +++ b/data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc @@ -3,17 +3,17 @@ SCRIPT_START script_WindTribespeopleVisitor BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 EndBlock script_0800EB0E: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_0800EB0E - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800EB0E .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_BombMinishKinstone.inc b/data/scripts/kinstoneFusion/script_BombMinishKinstone.inc index b72d6684..1094d83a 100644 --- a/data/scripts/kinstoneFusion/script_BombMinishKinstone.inc +++ b/data/scripts/kinstoneFusion/script_BombMinishKinstone.inc @@ -1,9 +1,9 @@ @ Bomb Forest Minish during Kinstone cutscene SCRIPT_START script_BombMinishKinstone BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_0800BB42: CheckRoomFlag 0x00ff diff --git a/data/scripts/kinstoneFusion/script_CarlovKinstone.inc b/data/scripts/kinstoneFusion/script_CarlovKinstone.inc index 93101d5e..a808530c 100644 --- a/data/scripts/kinstoneFusion/script_CarlovKinstone.inc +++ b/data/scripts/kinstoneFusion/script_CarlovKinstone.inc @@ -1,7 +1,7 @@ @ Kinstone Cutscene for Carlov SCRIPT_START script_CarlovKinstone BeginBlock - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock script_0800BBE4: CheckRoomFlag 0x00ff diff --git a/data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc b/data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc index ffa2b0be..edff4065 100644 --- a/data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc +++ b/data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc @@ -2,7 +2,7 @@ SCRIPT_START script_GhostBrotherKinstone BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_0800BC18: @@ -13,8 +13,8 @@ script_0800BC18: MessageNoOverlap 0x0e07 WaitUntilTextboxCloses BeginBlock - _0807EB44 0x0000 - _0807E930 0x0004 + SetAnimationState 0x0000 + SetAnimation 0x0004 EndBlock Wait 0x003c Call sub_08065CCC diff --git a/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc b/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc index ea1e2150..091c269b 100644 --- a/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc +++ b/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc @@ -1,10 +1,10 @@ @ Hyrule Town Gorman during Kinstone cutscene for first empty house SCRIPT_START script_GormanFirstAppearance BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetEntitySpeed 0x0040 - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_0800BA8E: CheckRoomFlag 0x00ff @@ -13,7 +13,7 @@ script_0800BA8E: Wait 0x001e DoPostScriptAction 0x0004 Wait 0x003c - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x001e _0807EDD4 0x02f0, 0x0350 Wait 0x001e diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc index 2262d29c..19b4002a 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc @@ -1,17 +1,17 @@ @ 1st Goron during Kinstone cutscene for 2nd Goron SCRIPT_START script_Goron1Kinstone2 BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 + SetAnimationState 0x0004 + SetAnimation 0x0008 + Call SetPriorityMessage EndBlock WaitForFadeFinish Wait 0x00f0 - _0807E930 0x0000 + SetAnimation 0x0000 Wait 0x003c MessageNoOverlap 0x0e0a WaitUntilTextboxCloses - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c SetSyncFlag 0x00000001 script_0800BD1C: @@ -19,7 +19,7 @@ script_0800BD1C: JumpIfNot script_0800BD1C SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 - _0807E930 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e0c @@ -27,11 +27,11 @@ script_0800BD1C: SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x0168 - _0807E930 0x0000 + SetAnimation 0x0000 Wait 0x003c - _0807EB44 0x0002 + SetAnimationState 0x0002 WaitForSyncFlagAndClear 0x00000004 SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xffe0 diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc index 145f5a99..743de7f4 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc @@ -1,18 +1,18 @@ @ 1st Goron during 3rd Goron Kinstone cutscene SCRIPT_START script_Goron1Kinstone3 BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 + SetAnimationState 0x0004 + SetAnimation 0x0008 + Call SetPriorityMessage EndBlock WaitForFadeFinish Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0002 + SetAnimation 0x0000 + SetAnimationState 0x0002 Wait 0x003c MessageNoOverlap 0x0e0d WaitUntilTextboxCloses - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c Jump script_0800BE88 .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc index 0756ea9e..08f4eb7f 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc @@ -1,18 +1,18 @@ @ 1st Goron during 4th Goron cutscene SCRIPT_START script_Goron1Kinstone4 BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 + SetAnimationState 0x0004 + SetAnimation 0x0008 + Call SetPriorityMessage EndBlock WaitForFadeFinish Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0002 + SetAnimation 0x0000 + SetAnimationState 0x0002 Wait 0x003c MessageNoOverlap 0x0e10 WaitUntilTextboxCloses - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c Jump script_0800BFA4 .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc index d1561411..9fbadfcc 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc @@ -1,18 +1,18 @@ @ 1st Goron during 5th Goron cutscene SCRIPT_START script_Goron1Kinstone5 BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 + SetAnimationState 0x0004 + SetAnimation 0x0008 + Call SetPriorityMessage EndBlock WaitForFadeFinish Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0002 + SetAnimation 0x0000 + SetAnimationState 0x0002 Wait 0x003c MessageNoOverlap 0x0e13 WaitUntilTextboxCloses - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c Jump script_0800C11C .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc index 6d2ee65f..ef803f64 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc @@ -1,18 +1,18 @@ @ 1st Goron in 6th Goron cutscene SCRIPT_START script_Goron1Kinstone6 BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 + SetAnimationState 0x0004 + SetAnimation 0x0008 + Call SetPriorityMessage EndBlock WaitForFadeFinish Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0002 + SetAnimation 0x0000 + SetAnimationState 0x0002 Wait 0x003c MessageNoOverlap 0x0e16 WaitUntilTextboxCloses - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c Jump script_0800C244 .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc index 5aeac45c..4d2762d7 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc @@ -1,11 +1,11 @@ @ 2nd Goron during Kinstone cutscene for 2nd Goron SCRIPT_START script_Goron2Kinstone2 BeginBlock - _0807EB44 0x0000 - _0807E930 0x0000 + SetAnimationState 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 - Call sub_0807F348 + Call SetPriorityMessage EndBlock WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 @@ -20,15 +20,15 @@ SCRIPT_START script_Goron2Kinstone2 Wait 0x000f SetSyncFlag 0x00000004 DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x00b4 CallWithArg sub_0804BF38, 0x00000000 Wait 0x00b4 CallWithArg sub_0804BF38, 0x00000003 - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 Wait 0x003c - _0807EB44 0x0006 + SetAnimationState 0x0006 SetSyncFlag 0x00000004 SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xffe0 diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc index 99a41fc4..c78e43ba 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc @@ -1,27 +1,27 @@ @ 2nd Goron during 3rd Goron cutscene SCRIPT_START script_Goron2Kinstone3 BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 + SetAnimationState 0x0004 + SetAnimation 0x0008 + Call SetPriorityMessage EndBlock WaitForFadeFinish Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0006 + SetAnimation 0x0000 + SetAnimationState 0x0006 Wait 0x003c WaitUntilTextboxCloses - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c SetSyncFlag 0x00000001 script_0800BE88: - _0807EB44 0x0004 + SetAnimationState 0x0004 script_0800BE8C: CheckRoomFlag 0x00ff JumpIfNot script_0800BE8C SetSyncFlag 0x00000002 Call sub_08054F64 - _0807E930 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e0f @@ -29,6 +29,6 @@ script_0800BE8C: SetSyncFlag 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x00f0 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc index c8305e1f..6809441e 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc @@ -1,27 +1,27 @@ @ 2nd and 3rd Goron during 4th Goron cutscene SCRIPT_START script_Goron2Kinstone4 BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 + SetAnimationState 0x0004 + SetAnimation 0x0008 + Call SetPriorityMessage EndBlock WaitForFadeFinish Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0006 + SetAnimation 0x0000 + SetAnimationState 0x0006 Wait 0x003c WaitUntilTextboxCloses - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c SetSyncFlag 0x00000001 script_0800BFA4: - _0807EB44 0x0004 + SetAnimationState 0x0004 script_0800BFA8: CheckRoomFlag 0x00ff JumpIfNot script_0800BFA8 SetSyncFlag 0x00000002 Call sub_08054F64 - _0807E930 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e12 @@ -29,10 +29,10 @@ script_0800BFA8: SetSyncFlag 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x0168 - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 Wait 0x003c Call sub_08054F64 SetEntitySpeed 0x0080 diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc index c82afd3a..829f8f8c 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc @@ -1,27 +1,27 @@ @ 2nd, 3rd and 4th Goron during 5th Goron cutscene SCRIPT_START script_Goron2Kinstone5 BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 + SetAnimationState 0x0004 + SetAnimation 0x0008 + Call SetPriorityMessage EndBlock WaitForFadeFinish Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0006 + SetAnimation 0x0000 + SetAnimationState 0x0006 Wait 0x003c WaitUntilTextboxCloses - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c SetSyncFlag 0x00000001 script_0800C11C: - _0807EB44 0x0004 + SetAnimationState 0x0004 script_0800C120: CheckRoomFlag 0x00ff JumpIfNot script_0800C120 SetSyncFlag 0x00000002 Call sub_08054F64 - _0807E930 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e15 @@ -29,6 +29,6 @@ script_0800C120: SetSyncFlag 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x00f0 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc index 87a5b960..88e1cb91 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc @@ -1,27 +1,27 @@ @ 2nd to 5th Goron in 6th Goron cutscene SCRIPT_START script_Goron2Kinstone6 BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 + SetAnimationState 0x0004 + SetAnimation 0x0008 + Call SetPriorityMessage EndBlock WaitForFadeFinish Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0006 + SetAnimation 0x0000 + SetAnimationState 0x0006 Wait 0x003c WaitUntilTextboxCloses - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c SetSyncFlag 0x00000001 script_0800C244: - _0807EB44 0x0004 + SetAnimationState 0x0004 script_0800C248: CheckRoomFlag 0x00ff JumpIfNot script_0800C248 SetSyncFlag 0x00000002 Call sub_08054F64 - _0807E930 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e18 @@ -29,10 +29,10 @@ script_0800C248: SetSyncFlag 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x0168 - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 Wait 0x003c Call sub_08054F64 SetEntitySpeed 0x0080 diff --git a/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc b/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc index fc4e637f..14b13031 100644 --- a/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc +++ b/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc @@ -1,11 +1,11 @@ @ 3rd Goron during 3rd Goron cutscene SCRIPT_START script_Goron3Kinstone3 BeginBlock - _0807EB44 0x0000 - _0807E930 0x0000 + SetAnimationState 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 - Call sub_0807F348 + Call SetPriorityMessage EndBlock WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 @@ -20,7 +20,7 @@ SCRIPT_START script_Goron3Kinstone3 Wait 0x000f SetSyncFlag 0x0000000c DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x00f0 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc index 9d81f728..940147da 100644 --- a/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc +++ b/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc @@ -1,11 +1,11 @@ @ 4th Goron during 4th Goron cutscene SCRIPT_START script_Goron4Kinstone4 BeginBlock - _0807EB44 0x0000 - _0807E930 0x0000 + SetAnimationState 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 - Call sub_0807F348 + Call SetPriorityMessage EndBlock WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 @@ -22,13 +22,13 @@ SCRIPT_START script_Goron4Kinstone4 Wait 0x000f SetSyncFlag 0x0000001c DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x00b4 CallWithArg sub_0804BF38, 0x00000001 Wait 0x00b4 CallWithArg sub_0804BF38, 0x00000004 - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 Wait 0x003c SetSyncFlag 0x0000001c SetEntitySpeed 0x0080 diff --git a/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc b/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc index 7f86fcd3..2a561509 100644 --- a/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc +++ b/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc @@ -1,11 +1,11 @@ @ 5th Goron during 5th Goron cutscene SCRIPT_START script_Goron5Kinstone5 BeginBlock - _0807EB44 0x0000 - _0807E930 0x0000 + SetAnimationState 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 - Call sub_0807F348 + Call SetPriorityMessage EndBlock WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 @@ -22,7 +22,7 @@ SCRIPT_START script_Goron5Kinstone5 Wait 0x000f SetSyncFlag 0x0000003c DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x00f0 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc b/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc index 54967407..db5c8677 100644 --- a/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc +++ b/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc @@ -1,11 +1,11 @@ @ 6th Goron in 6th Goron cutscene SCRIPT_START script_Goron6Kindstone6 BeginBlock - _0807EB44 0x0000 - _0807E930 0x0000 + SetAnimationState 0x0000 + SetAnimation 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 - Call sub_0807F348 + Call SetPriorityMessage EndBlock WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 @@ -22,13 +22,13 @@ SCRIPT_START script_Goron6Kindstone6 Wait 0x000f SetSyncFlag 0x0000007c DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x00b4 CallWithArg sub_0804BF38, 0x00000002 Wait 0x00b4 CallWithArg sub_0804BF38, 0x00000005 - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 Wait 0x003c SetSyncFlag 0x0000007c SetEntitySpeed 0x0080 diff --git a/data/scripts/kinstoneFusion/script_GoronKinstone.inc b/data/scripts/kinstoneFusion/script_GoronKinstone.inc index 3c4e7716..88fd97d3 100644 --- a/data/scripts/kinstoneFusion/script_GoronKinstone.inc +++ b/data/scripts/kinstoneFusion/script_GoronKinstone.inc @@ -1,25 +1,25 @@ @ Goron in fusing kinstone cutscene SCRIPT_START script_GoronKinstone BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 + SetAnimationState 0x0004 + SetAnimation 0x0008 Call sub_08054EB8 EndBlock script_0800BC62: CheckRoomFlag 0x00ff JumpIfNot script_0800BC62 - _0807E930 0x0000 + SetAnimation 0x0000 Wait 0x001e DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e08 WaitUntilTextboxCloses DoPostScriptAction 0x000f - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x00f0 Call sub_08054EFC - _0807EB44 0x0000 - _0807E930 0x0000 + SetAnimationState 0x0000 + SetAnimation 0x0000 SetEntitySpeed 0x0040 DoPostScriptAction 0x000d CallWithArg sub_0807F4F8, 0x00000378 @@ -28,7 +28,7 @@ script_0800BC62: Wait 0x003c MessageNoOverlap 0x0e09 WaitUntilTextboxCloses - Call sub_0807F158 + Call SetCollisionLayer1 CallWithArg sub_0807F4F8, 0x0000035c Wait 0x001e PlaySound SFX_STAIRS_DESCEND diff --git a/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc b/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc index 7787515f..2e4588c5 100644 --- a/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc +++ b/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc @@ -1,10 +1,10 @@ @ Goron Merchant in arriving Kinstone cutscene SCRIPT_START script_GoronMerchantArriving BeginBlock - _0807EB44 0x0006 + SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetEntitySpeed 0x0040 - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_0800BB7A: CheckRoomFlag 0x00ff diff --git a/data/scripts/kinstoneFusion/script_MutohKinstone.inc b/data/scripts/kinstoneFusion/script_MutohKinstone.inc index ecc3f65b..c6a48c7f 100644 --- a/data/scripts/kinstoneFusion/script_MutohKinstone.inc +++ b/data/scripts/kinstoneFusion/script_MutohKinstone.inc @@ -1,9 +1,9 @@ @ Hyrule Town Mutoh in Kinstone cutscene SCRIPT_START script_MutohKinstone BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_0800BADE: CheckRoomFlag 0x00ff diff --git a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSpark.inc b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSpark.inc index bc194636..a227cebc 100644 --- a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSpark.inc +++ b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSpark.inc @@ -2,7 +2,7 @@ SCRIPT_START script_ObjectB3KinstoneSpark BeginBlock SetEntitySpeed 0x0180 - _0807E930 0x0004 + SetAnimation 0x0004 Call sub_080A0B28 EndBlock Wait 0x000a @@ -13,7 +13,7 @@ script_0800C47A: JumpIfNot script_0800C47A Wait 0x003c SetRoomFlag 0x00ff - _0807E930 0x0005 + SetAnimation 0x0005 Wait 0x000f SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkFromBottom.inc b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkFromBottom.inc index 6b6cfe46..44d5e43f 100644 --- a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkFromBottom.inc +++ b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkFromBottom.inc @@ -2,7 +2,7 @@ SCRIPT_START script_ObjectB3KinstoneSparkFromBottom BeginBlock SetEntitySpeed 0x0120 - _0807E930 0x0004 + SetAnimation 0x0004 EndBlock Wait 0x000a DoPostScriptAction 0x0007 @@ -12,7 +12,7 @@ SCRIPT_START script_ObjectB3KinstoneSparkFromBottom _0807EEF4 0x0000, 0xffb0 Wait 0x003c SetRoomFlag 0x00ff - _0807E930 0x0005 + SetAnimation 0x0005 Wait 0x000f SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoron.inc b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoron.inc index e6bb438f..e77f34d3 100644 --- a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoron.inc +++ b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoron.inc @@ -3,7 +3,7 @@ SCRIPT_START script_ObjectB3KinstoneSparkGoron BeginBlock SetEntitySpeed 0x0100 - _0807E930 0x0004 + SetAnimation 0x0004 DoPostScriptAction 0x0008 EndBlock WaitForSyncFlagAndClear 0x00000001 @@ -15,6 +15,6 @@ SCRIPT_START script_ObjectB3KinstoneSparkGoron _0807EEF4 0x0000, 0x0060 Wait 0x001e SetRoomFlag 0x00ff - _0807E930 0x0005 + SetAnimation 0x0005 Wait 0x000f SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoronMerchang.inc b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoronMerchang.inc index 24ef7101..3a35b424 100644 --- a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoronMerchang.inc +++ b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoronMerchang.inc @@ -3,7 +3,7 @@ SCRIPT_START script_ObjectB3KinstoneSparkGoronMerchang BeginBlock SetEntitySpeed 0x0180 - _0807E930 0x0004 + SetAnimation 0x0004 EndBlock Wait 0x000a DoPostScriptAction 0x0007 @@ -13,7 +13,7 @@ SCRIPT_START script_ObjectB3KinstoneSparkGoronMerchang _0807EEF4 0x0070, 0x0000 Wait 0x003c SetRoomFlag 0x00ff - _0807E930 0x0005 + SetAnimation 0x0005 Wait 0x000f SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_StampKinstone.inc b/data/scripts/kinstoneFusion/script_StampKinstone.inc index 2e026161..6940cc83 100644 --- a/data/scripts/kinstoneFusion/script_StampKinstone.inc +++ b/data/scripts/kinstoneFusion/script_StampKinstone.inc @@ -2,9 +2,9 @@ SCRIPT_START script_StampKinstone BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 - Call sub_0807F348 + Call SetPriorityMessage EndBlock script_0800BBBA: CheckRoomFlag 0x00ff diff --git a/data/scripts/lakeHylia/script_EzloTalkOcarina.inc b/data/scripts/lakeHylia/script_EzloTalkOcarina.inc index 0846a9a4..0233ac50 100644 --- a/data/scripts/lakeHylia/script_EzloTalkOcarina.inc +++ b/data/scripts/lakeHylia/script_EzloTalkOcarina.inc @@ -1,12 +1,12 @@ @ Ezlo talk after first ocarina travel SCRIPT_START script_EzloTalkOcarina EndBlock - _0807E864 - Call sub_0807FA40 + SetPlayerIdle + Call WaitForPlayerNormalOrTalkEzlo Call sub_0807DF28 - _0807EB28 0x0b5f + EzloMessage 0x0b5f WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/lakeHylia/script_ForestMinish3.inc b/data/scripts/lakeHylia/script_ForestMinish3.inc index 583eeaa9..26ad3f5a 100644 --- a/data/scripts/lakeHylia/script_ForestMinish3.inc +++ b/data/scripts/lakeHylia/script_ForestMinish3.inc @@ -13,8 +13,8 @@ script_0800C5D6: Jump script_0800C5D6 script_0800C5EA: EndBlock - _0807E864 + SetPlayerIdle Call sub_08060270 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800C5D6 diff --git a/data/scripts/lakeHylia/script_KingGustafHologram.inc b/data/scripts/lakeHylia/script_KingGustafHologram.inc index 66c576f1..295cd219 100644 --- a/data/scripts/lakeHylia/script_KingGustafHologram.inc +++ b/data/scripts/lakeHylia/script_KingGustafHologram.inc @@ -7,23 +7,23 @@ script_08012368: CheckLocalFlag 0x0004 JumpIfNot script_08012368 Call sub_0807DF28 - _0807E864 + SetPlayerIdle StopBgm BeginBlock - _0807E778 0x0004 + SetFadeTime 0x0004 SetFadeMask 0x00007fff DoFade5 _0807E858 0x0080 EndBlock WaitForFadeFinish PlayBgm BGM_ELEMENTAL_SANCTUARY - _0807EB28 0x1401 + EzloMessage 0x1401 WaitUntilTextboxCloses - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x0007 PlaySound SFX_ELEMENT_FLOAT - SetEntity0x20 0xffff8000 + SetEntityVelocity 0xffff8000 Wait 0x003c _0807E8E4_0 StartPlayerScript script_PlayerAfterToD @@ -31,22 +31,22 @@ script_08012368: MessageNoOverlap 0x1402 WaitUntilTextboxCloses StopBgm - SetEntity0x20 0x00010000 + SetEntityVelocity 0x00010000 Wait 0x003c BeginBlock - _0807E778 0x0004 + SetFadeTime 0x0004 SetFadeMask 0xffffffff DoFade4 _0807E858 0x0080 EndBlock WaitForFadeFinish PlayBGM - _0807EB28 0x1403 + EzloMessage 0x1403 WaitUntilTextboxCloses SetIntVariable 0x00000203 - Call sub_0807F420 + Call LoadMenu Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/lakeHylia/script_Object69AfterToD.inc b/data/scripts/lakeHylia/script_Object69AfterToD.inc index 2ec33ffe..2a5c6a62 100644 --- a/data/scripts/lakeHylia/script_Object69AfterToD.inc +++ b/data/scripts/lakeHylia/script_Object69AfterToD.inc @@ -1,6 +1,6 @@ @ After ToD OBJECT_69 Cutscene SCRIPT_START script_Object69AfterToD - _0807E864 + SetPlayerIdle script_0800AFB2: EndBlock BeginBlock @@ -9,11 +9,11 @@ script_0800AFB2: JumpIfNot script_0800AFB2 EndBlock Call sub_0807DF28 - _0807EB28 0x1c04 + EzloMessage 0x1c04 WaitUntilTextboxCloses SetLocalFlagByBank 0x0100, 0x0004 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/lakeHylia/script_ShopwellsDog.inc b/data/scripts/lakeHylia/script_ShopwellsDog.inc index fbf22a4f..eaa7c31e 100644 --- a/data/scripts/lakeHylia/script_ShopwellsDog.inc +++ b/data/scripts/lakeHylia/script_ShopwellsDog.inc @@ -2,7 +2,7 @@ SCRIPT_START script_ShopwellsDog BeginBlock SetEntitySpeed 0x0100 - _0807EB44 0x0004 + SetAnimationState 0x0004 EndBlock Wait 0x001e PlaySound SFX_VO_DOG diff --git a/data/scripts/lonLonRanch/scriptMalonInside.inc b/data/scripts/lonLonRanch/scriptMalonInside.inc index 6cbe0145..f573b3f3 100644 --- a/data/scripts/lonLonRanch/scriptMalonInside.inc +++ b/data/scripts/lonLonRanch/scriptMalonInside.inc @@ -3,19 +3,19 @@ SCRIPT_START scriptMalonInside BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x000a + SetAnimationState 0x0004 + SetAnimation 0x000a EndBlock script_08014F0C: CheckEntityInteractType JumpIfNot script_08014F0C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageNoOverlap 0x200e WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - _0807E930 0x000a + EnablePlayerControl + SetAnimationState 0x0004 + SetAnimation 0x000a Jump script_08014F0C .2byte 0x0000 diff --git a/data/scripts/lonLonRanch/script_GoronPunching.inc b/data/scripts/lonLonRanch/script_GoronPunching.inc index 77b616b6..44c7f7b2 100644 --- a/data/scripts/lonLonRanch/script_GoronPunching.inc +++ b/data/scripts/lonLonRanch/script_GoronPunching.inc @@ -10,27 +10,27 @@ script_0800B9CA: Call sub_0807F434 JumpTable script_0800B9CA, script_0800B9D8, script_0800B9F4 script_0800B9D8: - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 Call sub_080694D8 WaitUntilTextboxCloses Call sub_080694EC - _0807E878 + EnablePlayerControl Jump script_0800B9CA script_0800B9F4: - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 Call sub_0807F650 _0807E9F0 - _0807E864 + SetPlayerIdle Call sub_0806948C JumpIf script_0800BA24 WaitUntilTextboxCloses Call sub_080694EC Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800B9CA script_0800BA24: WaitUntilTextboxCloses @@ -38,5 +38,5 @@ script_0800BA24: _0807E9D4 Call sub_080694EC Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800B9CA diff --git a/data/scripts/lonLonRanch/script_MalonLostKey.inc b/data/scripts/lonLonRanch/script_MalonLostKey.inc index 7298bdca..664c68c2 100644 --- a/data/scripts/lonLonRanch/script_MalonLostKey.inc +++ b/data/scripts/lonLonRanch/script_MalonLostKey.inc @@ -14,26 +14,26 @@ script_0800B4BC: JumpIf script_0800B4F0 Jump script_0800B4BC script_0800B4D4: - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0000 MessageFromTarget 0x200b EndBlock - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_0800B4BC script_0800B4F0: EndBlock ClearSyncFlag 0x00000008 _0807EDD4 0x0134, 0x0288 - _0807EB44 0x0004 + SetAnimationState 0x0004 WaitForSyncFlagAndClear 0x00000008 MessageFromTarget 0x2016 WaitUntilTextboxCloses _0807EDD4 0x0158, 0x0288 DoPostScriptAction 0x0000 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x000a SetSyncFlag 0x00000010 DoPostScriptAction 0x0008 @@ -41,7 +41,7 @@ script_0800B4F0: SetSyncFlag 0x00000010 SetGlobalFlag 0x001d Call sub_0807921C - _0807E878 + EnablePlayerControl Call sub_0807FBCC DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/lonLonRanch/script_PlayerGiveKey.inc b/data/scripts/lonLonRanch/script_PlayerGiveKey.inc index 2034cd11..5ca5f8f0 100644 --- a/data/scripts/lonLonRanch/script_PlayerGiveKey.inc +++ b/data/scripts/lonLonRanch/script_PlayerGiveKey.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerGiveKey EndBlock _0807EDD4 0x0128, 0x0298 Wait 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 diff --git a/data/scripts/lonLonRanch/script_TalonGotKey.inc b/data/scripts/lonLonRanch/script_TalonGotKey.inc index 1fb43ad5..ac25fc74 100644 --- a/data/scripts/lonLonRanch/script_TalonGotKey.inc +++ b/data/scripts/lonLonRanch/script_TalonGotKey.inc @@ -2,9 +2,9 @@ SCRIPT_START script_TalonGotKey BeginBlock SetEntitySpeed 0x00c0 - _0807E908 0x0001 + SetAction 0x0001 DoPostScriptAction 0x000b - _0807E864 + SetPlayerIdle Call sub_0807FBC4 EndBlock Wait 0x000a @@ -12,14 +12,14 @@ SCRIPT_START script_TalonGotKey SetSyncFlag 0x00000008 StartPlayerScript script_PlayerGiveKey _0807EDD4 0x0140, 0x0298 - _0807EB74 + FacePlayer WaitForSyncFlagAndClear 0x00000004 - _0807EB74 + FacePlayer Wait 0x003c PlaySound SFX_TASK_COMPLETE _0807F088 0x0037 WaitPlayerGetItem - _0807EB8C + FaceAwayFromPlayer MessageFromTarget 0x200c WaitUntilTextboxCloses Wait 0x0014 diff --git a/data/scripts/lonLonRanch/script_TalonInside.inc b/data/scripts/lonLonRanch/script_TalonInside.inc index 71485a34..ce0469db 100644 --- a/data/scripts/lonLonRanch/script_TalonInside.inc +++ b/data/scripts/lonLonRanch/script_TalonInside.inc @@ -3,15 +3,15 @@ SCRIPT_START script_TalonInside BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_08014E64: CheckEntityInteractType JumpIfNot script_08014E64 - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB74 + FacePlayer CallWithArg sub_0807F78C, 0x00000022 WaitUntilTextboxCloses CheckTextboxResult @@ -32,6 +32,6 @@ script_08014EB8: script_08014EBC: WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_08014E64 .2byte 0x0000 diff --git a/data/scripts/lonLonRanch/script_TalonInside2.inc b/data/scripts/lonLonRanch/script_TalonInside2.inc index ff3fcf53..27c19f50 100644 --- a/data/scripts/lonLonRanch/script_TalonInside2.inc +++ b/data/scripts/lonLonRanch/script_TalonInside2.inc @@ -3,16 +3,16 @@ SCRIPT_START script_TalonInside2 BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_08014EE0: CheckEntityInteractType JumpIfNot script_08014EE0 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x200d WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08014EE0 .2byte 0x0000 diff --git a/data/scripts/lonLonRanch/script_TalonLostKey.inc b/data/scripts/lonLonRanch/script_TalonLostKey.inc index 244d7435..0a5463c6 100644 --- a/data/scripts/lonLonRanch/script_TalonLostKey.inc +++ b/data/scripts/lonLonRanch/script_TalonLostKey.inc @@ -2,10 +2,10 @@ SCRIPT_START script_TalonLostKey BeginBlock DoPostScriptAction 0x000a - Call sub_0807F158 + Call SetCollisionLayer1 SetEntitySpeed 0x0120 - _0807EB44 0x0004 - _0807E908 0x0002 + SetAnimationState 0x0004 + SetAction 0x0002 SetIntVariable 0x0000200a EndBlock script_0800B3C4: diff --git a/data/scripts/minishWoods/script_08012C98.inc b/data/scripts/minishWoods/script_08012C98.inc index 64ddd7ac..c6ea3050 100644 --- a/data/scripts/minishWoods/script_08012C98.inc +++ b/data/scripts/minishWoods/script_08012C98.inc @@ -8,12 +8,12 @@ script_08012CA0: BeginBlock CheckPlayerInRegion 0x0398, 0x03b0, 0x2040 JumpIfNot script_08012CA0 - _0807E564 + CheckPlayerMinish JumpIf script_08012CD2 EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB28 0x2202 + EzloMessage 0x2202 WaitUntilTextboxCloses .ifdef JP SetLocalFlag 0x003a @@ -29,7 +29,7 @@ script_08012CA0: .endif .endif Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08012CD2: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/minishWoods/script_08012D18.inc b/data/scripts/minishWoods/script_08012D18.inc index 9b8be5cf..c8dbcadb 100644 --- a/data/scripts/minishWoods/script_08012D18.inc +++ b/data/scripts/minishWoods/script_08012D18.inc @@ -9,15 +9,15 @@ SCRIPT_START script_08012D18 CheckPlayerInRegion 0x0000, 0x01a8, 0x2010 JumpIfNot script_08012D18 EndBlock - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 - _0807EB28 0x111a + EzloMessage 0x111a WaitUntilTextboxCloses StartPlayerScript script_PlayerCannotEnter WaitForSyncFlagAndClear 0x00000001 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_08012D18 script_08012D68: DoPostScriptAction 0x0006 diff --git a/data/scripts/minishWoods/script_BombMinish.inc b/data/scripts/minishWoods/script_BombMinish.inc index 7a57205d..ce58873e 100644 --- a/data/scripts/minishWoods/script_BombMinish.inc +++ b/data/scripts/minishWoods/script_BombMinish.inc @@ -1,7 +1,7 @@ @ Minish Woods Bomb Minish SCRIPT_START script_BombMinish BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 Call sub_08060090 DoPostScriptAction 0x000a CheckKinstoneFused 0x001c @@ -16,7 +16,7 @@ script_08009F36: CheckEntityInteractType JumpIfNot script_08009F36 EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 DoPostScriptAction 0x000b StartPlayerScript script_PlayerAtBombMinish @@ -29,7 +29,7 @@ script_08009F36: WaitPlayerGetItem DoPostScriptAction 0x000a Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08009F84: EndBlock script_08009F86: @@ -39,19 +39,19 @@ script_08009F86: CheckEntityInteractType JumpIfNot script_08009F86 EndBlock - _0807E864 + SetPlayerIdle Call sub_080602BC WaitUntilTextboxCloses - CallWithArg sub_0807F970, 0x00001f03 + CallWithArg CheckMessageEqual, 0x00001f03 JumpIf script_08009FB6 - _0807E878 + EnablePlayerControl Jump script_08009F86 script_08009FB6: Wait 0x0008 PlaySound SFX_103 CallWithArg sub_0806030C, 0x00000063 Wait 0x0008 - _0807E878 + EnablePlayerControl Jump script_08009F86 script_08009FD2: EndBlock @@ -64,12 +64,12 @@ script_08009FDC: CheckEntityInteractType JumpIfNot script_08009FDC EndBlock - _0807E864 + SetPlayerIdle MessageNoOverlap 0x1f0e WaitUntilTextboxCloses CheckTextboxResult JumpIf script_0800A002 - _0807E878 + EnablePlayerControl Jump script_08009FDC script_0800A002: Wait 0x0008 @@ -77,11 +77,11 @@ script_0800A002: Call sub_08060318 WaitPlayerGetItem Wait 0x0008 - _0807EB8C + FaceAwayFromPlayer MessageFromTarget 0x1f13 WaitUntilTextboxCloses SetLocalFlag 0x00b0 - _0807E878 + EnablePlayerControl script_0800A024: EndBlock BeginBlock @@ -89,21 +89,21 @@ script_0800A024: CheckEntityInteractType JumpIfNot script_0800A024 EndBlock - _0807E864 + SetPlayerIdle CheckInventory1 0x0008 JumpIf script_0800A052 MessageNoOverlap 0x1f14 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_0800A002 - _0807E878 + EnablePlayerControl Jump script_0800A024 script_0800A052: MessageNoOverlap 0x1f11 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_0800A064 - _0807E878 + EnablePlayerControl Jump script_0800A024 script_0800A064: Wait 0x0008 @@ -111,9 +111,9 @@ script_0800A064: Call sub_08060318 WaitPlayerGetItem Wait 0x0008 - _0807EB8C + FaceAwayFromPlayer MessageFromTarget 0x1f10 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800A024 .2byte 0x0000 diff --git a/data/scripts/minishWoods/script_EzloTalkDWS.inc b/data/scripts/minishWoods/script_EzloTalkDWS.inc index 942b81bf..72455e32 100644 --- a/data/scripts/minishWoods/script_EzloTalkDWS.inc +++ b/data/scripts/minishWoods/script_EzloTalkDWS.inc @@ -1,12 +1,12 @@ @ Minish Woods Ezlo talks after finishing earth temple SCRIPT_START script_EzloTalkDWS - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB28 0x1c01 + EzloMessage 0x1c01 WaitUntilTextboxCloses SetLocalFlagByBank 0x0100, 0x0001 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/minishWoods/script_EzloTalkMinishPortal.inc b/data/scripts/minishWoods/script_EzloTalkMinishPortal.inc index b97e943e..b7f9c3b4 100644 --- a/data/scripts/minishWoods/script_EzloTalkMinishPortal.inc +++ b/data/scripts/minishWoods/script_EzloTalkMinishPortal.inc @@ -2,16 +2,16 @@ SCRIPT_START script_EzloTalkMinishPortal EndBlock BeginBlock - _0807E564 + CheckPlayerMinish JumpIfNot script_EzloTalkMinishPortal CheckPlayerInRegion 0x0380, 0x03b0, 0x4040 JumpIfNot script_EzloTalkMinishPortal ComparePlayerAction 0x0015 JumpIf script_EzloTalkMinishPortal - _0807E864 + SetPlayerIdle Call sub_0807DF28 EndBlock - _0807EB28 0x2203 + EzloMessage 0x2203 WaitUntilTextboxCloses .ifdef JP SetLocalFlag 0x003d @@ -27,6 +27,6 @@ SCRIPT_START script_EzloTalkMinishPortal .endif .endif Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/minishWoods/script_Festari.inc b/data/scripts/minishWoods/script_Festari.inc index ebaca487..0a79dea6 100644 --- a/data/scripts/minishWoods/script_Festari.inc +++ b/data/scripts/minishWoods/script_Festari.inc @@ -3,15 +3,15 @@ SCRIPT_START script_Festari BeginBlock DoPostScriptAction 0x000a SetEntitySpeed 0x0080 - _0807EB44 0x0004 + SetAnimationState 0x0004 CheckLocalFlag 0x0082 JumpIfNot script_0800C650 OffsetEntityPosition 0x0010, 0x0000 script_0800C650: EndBlock script_0800C652: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle Call sub_0807DF28 CheckLocalFlag 0x0082 JumpIf script_0800C684 @@ -34,7 +34,7 @@ script_0800C684: Wait 0x000a SetLocalFlag 0x0080 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C652 script_0800C6B6: CheckLocalFlag 0x0081 @@ -45,7 +45,7 @@ script_0800C6B6: DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C652 script_0800C6DC: CheckLocalFlag 0x0082 @@ -55,10 +55,10 @@ script_0800C6DC: WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0001 - _0807EC94 0x0020 - _0807EB44 0x0004 + WalkEast 0x0020 + SetAnimationState 0x0004 Wait 0x000f PlaySound SFX_SECRET SetLocalFlag 0x0082 @@ -69,7 +69,7 @@ script_0800C712: DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C652 script_0800C730: CheckLocalFlag 0x0083 @@ -80,7 +80,7 @@ script_0800C730: DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C652 script_0800C756: DoPostScriptAction 0x0002 @@ -89,5 +89,5 @@ script_0800C756: DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C652 diff --git a/data/scripts/minishWoods/script_ForestMinish10.inc b/data/scripts/minishWoods/script_ForestMinish10.inc index cc7dfc2e..f7c4ebe6 100644 --- a/data/scripts/minishWoods/script_ForestMinish10.inc +++ b/data/scripts/minishWoods/script_ForestMinish10.inc @@ -15,7 +15,7 @@ script_0800CD92: Jump script_0800CD92 script_0800CDA6: EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 CheckLocalFlag 0x009d JumpIf script_0800CDC4 @@ -57,7 +57,7 @@ script_0800CE14: _0807F088 0x0022 WaitPlayerGetItem script_0800CE32: - _0807EB8C + FaceAwayFromPlayer SetGlobalFlag 0x0054 Call sub_08060340 MessageNoOverlap 0x213f @@ -85,7 +85,7 @@ script_0800CE6E: PlaySound SFX_TASK_COMPLETE _0807F088 0x0027 WaitPlayerGetItem - _0807EB8C + FaceAwayFromPlayer SetGlobalFlag 0x0054 Call sub_08060340 MessageNoOverlap 0x2143 @@ -113,14 +113,14 @@ script_0800CECE: PlaySound SFX_TASK_COMPLETE _0807F088 0x0024 WaitPlayerGetItem - _0807EB8C + FaceAwayFromPlayer SetGlobalFlag 0x0054 Call sub_08060340 MessageNoOverlap 0x2147 script_0800CF02: WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_0800CF0C: EndBlock BeginBlock @@ -130,19 +130,19 @@ script_0800CF0C: Jump script_0800CF0C script_0800CF20: EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 script_0800CF2A: MessageNoOverlap 0x2140 WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800CF0C script_0800CF3C: MessageNoOverlap 0x214a script_0800CF40: WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800CD92 .2byte 0x0000 diff --git a/data/scripts/minishWoods/script_ForestMinish4.inc b/data/scripts/minishWoods/script_ForestMinish4.inc index 792f37d0..2663d585 100644 --- a/data/scripts/minishWoods/script_ForestMinish4.inc +++ b/data/scripts/minishWoods/script_ForestMinish4.inc @@ -14,9 +14,9 @@ script_0800C60A: Jump script_0800C60A script_0800C61E: EndBlock - _0807E864 + SetPlayerIdle Call sub_0806021C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800C60A diff --git a/data/scripts/minishWoods/script_Gentari.inc b/data/scripts/minishWoods/script_Gentari.inc index 4d7c8507..e032bf03 100644 --- a/data/scripts/minishWoods/script_Gentari.inc +++ b/data/scripts/minishWoods/script_Gentari.inc @@ -2,11 +2,11 @@ SCRIPT_START script_Gentari BeginBlock DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 EndBlock script_0800C780: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle Call sub_0807DF28 StartPlayerScript script_PlayerAtGentari WaitForSyncFlagAndClear 0x00000001 @@ -14,44 +14,44 @@ script_0800C780: JumpIf script_0800C824 CheckInventory1 0x005b JumpIf script_0800C7C0 - _0807E930 0x0008 + SetAnimation 0x0008 MessageFromTarget 0x2122 WaitUntilTextboxCloses DoPostScriptAction 0x0000 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C780 script_0800C7C0: - _0807E930 0x0008 + SetAnimation 0x0008 CheckLocalFlag 0x0081 JumpIf script_0800C80A MessageFromTarget 0x1130 WaitUntilTextboxCloses - _0807EB28 0x1131 + EzloMessage 0x1131 WaitUntilTextboxCloses - _0807EB8C + FaceAwayFromPlayer MessageFromTarget 0x1132 WaitUntilTextboxCloses SetIntVariable 0x00000103 - Call sub_0807F420 + Call LoadMenu MessageFromTarget 0x1133 WaitUntilTextboxCloses Wait 0x000a DoPostScriptAction 0x0000 SetLocalFlag 0x0081 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C780 script_0800C80A: MessageFromTarget 0x1133 WaitUntilTextboxCloses Wait 0x000a - _0807E930 0x0000 + SetAnimation 0x0000 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C780 script_0800C824: - _0807E930 0x0008 + SetAnimation 0x0008 CheckLocalFlag 0x0083 JumpIf script_0800C8AE MessageFromTarget 0x1135 @@ -64,22 +64,22 @@ script_0800C824: Wait 0x003c PlaySound SFX_SECRET Wait 0x003c - _0807EB74 - _0807EB8C + FacePlayer + FaceAwayFromPlayer MessageFromTarget 0x1136 WaitUntilTextboxCloses - _0807EB28 0x1137 + EzloMessage 0x1137 WaitUntilTextboxCloses Wait 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_0800C87C: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle Call sub_0807DF28 - _0807EB74 + FacePlayer SetIntVariable 0x00000008 Call sub_0807F3D8 MessageFromTarget 0x1136 @@ -87,7 +87,7 @@ script_0800C87C: Wait 0x000a DoPostScriptAction 0x0000 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C87C script_0800C8AE: MessageFromTarget 0x1136 @@ -95,5 +95,5 @@ script_0800C8AE: Wait 0x000a DoPostScriptAction 0x0000 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800C780 diff --git a/data/scripts/minishWoods/script_Object69PotionBlue.inc b/data/scripts/minishWoods/script_Object69PotionBlue.inc index 365530bf..6f865f7f 100644 --- a/data/scripts/minishWoods/script_Object69PotionBlue.inc +++ b/data/scripts/minishWoods/script_Object69PotionBlue.inc @@ -6,7 +6,7 @@ SCRIPT_START script_Object69PotionBlue script_08016146: CheckEntityInteractType JumpIfNot script_08016146 - _0807E864 + SetPlayerIdle GetInventoryValue 0x0025 MessageFromTargetTable 0x2d03, 0x2d02, 0x2d02, 0x2d02 CheckTextboxResult @@ -24,7 +24,7 @@ script_08016184: WaitPlayerGetItem MessageFromTarget 0x2d06 script_0801618A: - _0807E878 + EnablePlayerControl Jump script_08016146 .align 2, 0 diff --git a/data/scripts/minishWoods/script_Object69PotionRed.inc b/data/scripts/minishWoods/script_Object69PotionRed.inc index 6e3ed4a2..7bd47121 100644 --- a/data/scripts/minishWoods/script_Object69PotionRed.inc +++ b/data/scripts/minishWoods/script_Object69PotionRed.inc @@ -6,7 +6,7 @@ SCRIPT_START script_Object69PotionRed script_0801619A: CheckEntityInteractType JumpIfNot script_0801619A - _0807E864 + SetPlayerIdle GetInventoryValue 0x0024 MessageFromTargetTable 0x2d05, 0x2d04, 0x2d04, 0x2d04 CheckTextboxResult @@ -24,13 +24,13 @@ script_080161D8: .ifndef EU WaitPlayerGetItem WaitUntilTextboxCloses - _0807EB8C + FaceAwayFromPlayer MessageNoOverlap 0x2d06 .else MessageFromTarget 0x2d06 .endif script_080161E2: - _0807E878 + EnablePlayerControl Jump script_0801619A .align 2, 0 diff --git a/data/scripts/minishWoods/script_PlayerAtBombMinish.inc b/data/scripts/minishWoods/script_PlayerAtBombMinish.inc index 8d5d71c9..aa830e48 100644 --- a/data/scripts/minishWoods/script_PlayerAtBombMinish.inc +++ b/data/scripts/minishWoods/script_PlayerAtBombMinish.inc @@ -3,9 +3,9 @@ SCRIPT_START script_PlayerAtBombMinish BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807ECC4 0x0010 + WalkSouth 0x0010 _0807EDD4 0x0078, 0x0060 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x000f DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 diff --git a/data/scripts/minishWoods/script_PlayerAtFestari.inc b/data/scripts/minishWoods/script_PlayerAtFestari.inc index 3f69b969..90ad2c76 100644 --- a/data/scripts/minishWoods/script_PlayerAtFestari.inc +++ b/data/scripts/minishWoods/script_PlayerAtFestari.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtFestari SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x00e8, 0x0068 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x000f DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/minishWoods/script_PlayerAtGentari.inc b/data/scripts/minishWoods/script_PlayerAtGentari.inc index f53f6f0e..9e6468d3 100644 --- a/data/scripts/minishWoods/script_PlayerAtGentari.inc +++ b/data/scripts/minishWoods/script_PlayerAtGentari.inc @@ -3,9 +3,9 @@ SCRIPT_START script_PlayerAtGentari BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807ECC4 0x0010 + WalkSouth 0x0010 _0807EDD4 0x0078, 0x0058 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x000f DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/minishWoods/script_PlayerAtMadderpillar.inc b/data/scripts/minishWoods/script_PlayerAtMadderpillar.inc index 8a0c171a..4c48cc9f 100644 --- a/data/scripts/minishWoods/script_PlayerAtMadderpillar.inc +++ b/data/scripts/minishWoods/script_PlayerAtMadderpillar.inc @@ -4,13 +4,13 @@ SCRIPT_START script_PlayerAtMadderpillar BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0018 - _0807E864 - Call sub_0807F354 + SetPlayerIdle + Call SetPriorityPlayerEvent EndBlock - WaitForPlayerAction0x17 + WaitForPlayerEnterRoom _0807E8E4_3 DoPostScriptAction 0x0001 Call sub_080752AC - _0807E878 + EnablePlayerControl Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/minishWoods/script_Syrup.inc b/data/scripts/minishWoods/script_Syrup.inc index 332de656..0f6d46a5 100644 --- a/data/scripts/minishWoods/script_Syrup.inc +++ b/data/scripts/minishWoods/script_Syrup.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Syrup BeginBlock _0807E9D4 - _0807E930 0x0008 + SetAnimation 0x0008 script_080160B0: EndBlock BeginBlock @@ -15,12 +15,12 @@ script_080160B0: Jump script_080160B0 script_080160D2: EndBlock - _0807EB74 + FacePlayer WaitForSyncFlagAndClear 0x00000004 Jump script_080160B0 script_080160E0: - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer EndBlock HasRoomItemForSale JumpIfNot script_0801611A @@ -36,7 +36,7 @@ script_080160E0: script_0801610C: WaitPlayerGetItem .ifndef EU - _0807EB8C + FaceAwayFromPlayer MessageFromTarget 0x2d0d .else MessageFromTarget 0x2d08 @@ -53,8 +53,8 @@ script_0801612C: MessageFromTarget 0x2d01 WaitUntilTextboxCloses script_08016132: - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 Jump script_080160B0 .align 2, 0 diff --git a/data/scripts/mtCrenel/script_CrenelHermit.inc b/data/scripts/mtCrenel/script_CrenelHermit.inc index 9a05a3cf..91d499ad 100644 --- a/data/scripts/mtCrenel/script_CrenelHermit.inc +++ b/data/scripts/mtCrenel/script_CrenelHermit.inc @@ -3,17 +3,17 @@ SCRIPT_START script_CrenelHermit BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 Call sub_08061FD8 EndBlock script_0800B8FC: CheckEntityInteractType JumpIfNot script_0800B8FC - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08061FD8 Call sub_08062048 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800B8FC .2byte 0x0000 diff --git a/data/scripts/mtCrenel/script_EzloTalkCoF.inc b/data/scripts/mtCrenel/script_EzloTalkCoF.inc index bfc736fb..61676e73 100644 --- a/data/scripts/mtCrenel/script_EzloTalkCoF.inc +++ b/data/scripts/mtCrenel/script_EzloTalkCoF.inc @@ -1,12 +1,12 @@ @ Mountain Ezlo text after beating CoF SCRIPT_START script_EzloTalkCoF - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB28 0x1c02 + EzloMessage 0x1c02 WaitUntilTextboxCloses SetLocalFlagByBank 0x0100, 0x0002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/mtCrenel/script_GreatFairyBombs.inc b/data/scripts/mtCrenel/script_GreatFairyBombs.inc index e25eb65f..05470c3d 100644 --- a/data/scripts/mtCrenel/script_GreatFairyBombs.inc +++ b/data/scripts/mtCrenel/script_GreatFairyBombs.inc @@ -6,9 +6,9 @@ script_0800B734: Call sub_0808747C JumpIfNot script_0800B734 Call sub_08079184 - _0807E864 + SetPlayerIdle Wait 0x000a - Call sub_0807F9A4 + Call WaitForPlayerNormal StartPlayerScript script_PlayerAtGreatFairy WaitForSyncFlagAndClear 0x00000004 SetRoomFlag 0x0000 @@ -17,7 +17,7 @@ script_0800B734: JumpIf script_0800B7A2 MessageNoOverlap 0x0580 WaitUntilTextboxCloses - CallWithArg sub_0807F970, 0x00000582 + CallWithArg CheckMessageEqual, 0x00000582 JumpIf script_0800B794 CallWithArg sub_08087424, 0x00000001 Wait 0x00b4 @@ -30,7 +30,7 @@ script_0800B794: script_0800B7A2: MessageNoOverlap 0x0590 WaitUntilTextboxCloses - _0807E778 0x0010 + SetFadeTime 0x0010 DoFade7 WaitForFadeFinish ModHealth 0x00a0 diff --git a/data/scripts/mtCrenel/script_Melari.inc b/data/scripts/mtCrenel/script_Melari.inc index ccf1c55a..cb6458fc 100644 --- a/data/scripts/mtCrenel/script_Melari.inc +++ b/data/scripts/mtCrenel/script_Melari.inc @@ -3,14 +3,14 @@ SCRIPT_START script_Melari BeginBlock _0807E9D4 DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 EndBlock CheckInventory1 0x0041 JumpIf script_0800CFD2 CheckLocalFlag 0x007e JumpIfNot script_0800CFD2 - _0807E930 0x0008 + SetAnimation 0x0008 script_0800CFD2: CheckInventory1 0x0002 JumpIf script_0800CFFA @@ -29,11 +29,11 @@ script_0800CFFA: CheckEntityInteractType JumpIfNot script_0800CFFA EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 CheckInventory1 0x0002 JumpIfNot script_0800D032 - _0807EB74 + FacePlayer SetIntVariable 0x00000000 Call sub_0806C028 MessageNoOverlap 0x1219 @@ -43,14 +43,14 @@ script_0800D032: JumpIfNot script_0800D098 StartPlayerScript script_PlayerAtMelari WaitForSyncFlagAndClear 0x00000008 - _0807EB74 + FacePlayer SetIntVariable 0x00000000 Call sub_0806C028 MessageFromTargetPos 0x125c, 0x0002 WaitUntilTextboxCloses StartPlayerScript script_PlayerPlaceBrokenSword WaitForSyncFlagAndClear 0x00000008 - _0807EB44 0x0002 + SetAnimationState 0x0002 SetIntVariable 0x00000000 Call sub_0806C028 Wait 0x000f @@ -71,14 +71,14 @@ script_0800D0A8: WaitForSyncFlagAndClear 0x00000004 SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000004 - _0807EB74 + FacePlayer SetIntVariable 0x00000000 Call sub_0806C028 MessageFromTargetPos 0x123d, 0x0002 WaitUntilTextboxCloses StartPlayerScript script_PlayerPlaceBrokenSword WaitForSyncFlagAndClear 0x00000008 - _0807EB44 0x0002 + SetAnimationState 0x0002 SetIntVariable 0x00000000 Call sub_0806C028 PlaySound SFX_TASK_COMPLETE @@ -92,7 +92,7 @@ script_0800D108: MessageFromTargetPos 0x123e, 0x0002 WaitUntilTextboxCloses Wait 0x000f - _0807E930 0x0009 + SetAnimation 0x0009 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 SetSyncFlag 0x00000002 @@ -104,14 +104,14 @@ script_0800D108: WaitForSyncFlagAndClear 0x00000004 SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000004 - _0807E930 0x0008 + SetAnimation 0x0008 Wait 0x003c Call sub_08095164 - _0807EB28 0x1240 + EzloMessage 0x1240 script_0800D17C: WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Call sub_0807DF50 Jump script_0800CFFA .2byte 0x0000 diff --git a/data/scripts/mtCrenel/script_MelariInRoom.inc b/data/scripts/mtCrenel/script_MelariInRoom.inc index 255d95e6..a8e7e283 100644 --- a/data/scripts/mtCrenel/script_MelariInRoom.inc +++ b/data/scripts/mtCrenel/script_MelariInRoom.inc @@ -3,8 +3,8 @@ SCRIPT_START script_MelariInRoom BeginBlock Call sub_08068884 DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 EndBlock script_0800D31E: EndBlock @@ -13,12 +13,12 @@ script_0800D31E: CheckEntityInteractType JumpIfNot script_0800D31E EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer SetIntVariable 0x00000000 Call sub_0806C028 MessageFromTarget 0x1219 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800D31E diff --git a/data/scripts/mtCrenel/script_MountainMinish1.inc b/data/scripts/mtCrenel/script_MountainMinish1.inc index ef7567fc..20e946d1 100644 --- a/data/scripts/mtCrenel/script_MountainMinish1.inc +++ b/data/scripts/mtCrenel/script_MountainMinish1.inc @@ -13,9 +13,9 @@ script_0800CF5E: Jump script_0800CF5E script_0800CF72: EndBlock - _0807E864 + SetPlayerIdle Call sub_08068190 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800CF5E diff --git a/data/scripts/mtCrenel/script_MountainMinish2.inc b/data/scripts/mtCrenel/script_MountainMinish2.inc index ff89c97d..de34aca9 100644 --- a/data/scripts/mtCrenel/script_MountainMinish2.inc +++ b/data/scripts/mtCrenel/script_MountainMinish2.inc @@ -5,10 +5,10 @@ SCRIPT_START script_MountainMinish2 DoPostScriptAction 0x000a EndBlock script_0800CF96: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle Call sub_08068190 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800CF96 diff --git a/data/scripts/mtCrenel/script_MountainMinish3.inc b/data/scripts/mtCrenel/script_MountainMinish3.inc index 2fe3f475..59268025 100644 --- a/data/scripts/mtCrenel/script_MountainMinish3.inc +++ b/data/scripts/mtCrenel/script_MountainMinish3.inc @@ -20,28 +20,28 @@ script_0800D292: Jump script_0800D282 script_0800D2B0: EndBlock - _0807E864 + SetPlayerIdle Call sub_08068190 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800D282 script_0800D2C6: EndBlock SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetSyncFlag 0x00000004 - _0807E930 0x000c + SetAnimation 0x000c WaitForSyncFlagAndClear 0x00000001 SetSyncFlag 0x00000004 script_0800D2EA: - _0807E930 0x000b + SetAnimation 0x000b script_0800D2EE: CheckEntityInteractType JumpIfNot script_0800D2EE - _0807E864 + SetPlayerIdle Call sub_08068190 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800D2EE diff --git a/data/scripts/mtCrenel/script_MountainMinish4.inc b/data/scripts/mtCrenel/script_MountainMinish4.inc index a953ebfa..f1689e97 100644 --- a/data/scripts/mtCrenel/script_MountainMinish4.inc +++ b/data/scripts/mtCrenel/script_MountainMinish4.inc @@ -13,7 +13,7 @@ script_0800D35E: Jump script_0800D35E script_0800D372: EndBlock - _0807E864 + SetPlayerIdle Call sub_08068190 WaitUntilTextboxCloses Wait 0x000f @@ -28,11 +28,11 @@ script_0800D372: StartPlayerScript script_PlayerAtMountainMinishExit WaitForSyncFlagAndClear 0x00000001 script_0800D3B2: - _0807EB44 0x0002 - _0807E930 0x0005 + SetAnimationState 0x0002 + SetAnimation 0x0005 _0807EDD4 0x00a0, 0x0130 - _0807EB44 0x0006 - _0807E930 0x0003 + SetAnimationState 0x0006 + SetAnimation 0x0003 SetIntVariable 0x00000004 Call sub_080681D8 PlaySound SFX_TASK_COMPLETE @@ -40,6 +40,6 @@ script_0800D3B2: DoPostScriptAction 0x000a SetLocalFlag 0x007f script_0800D3E4: - _0807E878 + EnablePlayerControl Jump script_0800D35E .2byte 0x0000 diff --git a/data/scripts/mtCrenel/script_MountainMinish5.inc b/data/scripts/mtCrenel/script_MountainMinish5.inc index a31a712b..edbf2f01 100644 --- a/data/scripts/mtCrenel/script_MountainMinish5.inc +++ b/data/scripts/mtCrenel/script_MountainMinish5.inc @@ -6,35 +6,35 @@ SCRIPT_START script_MountainMinish5 DoPostScriptAction 0x000a EndBlock script_0800D426: - _0807EB44 0x0002 + SetAnimationState 0x0002 SetIntVariable 0x00000000 Call sub_0806AF60 Wait 0x0014 - _0807EB44 0x0004 + SetAnimationState 0x0004 SetIntVariable 0x00000000 Call sub_0806AF60 Wait 0x0014 - _0807EB44 0x0006 + SetAnimationState 0x0006 SetIntVariable 0x00000000 Call sub_0806AF60 Wait 0x0014 - _0807EB44 0x0006 + SetAnimationState 0x0006 SetIntVariable 0x00000004 Call sub_0806AF60 _0807EDD4 0x00a8, 0x01e8 - _0807EB44 0x0006 + SetAnimationState 0x0006 SetIntVariable 0x00000000 Call sub_0806AF60 Wait 0x0014 - _0807EB44 0x0004 + SetAnimationState 0x0004 SetIntVariable 0x00000000 Call sub_0806AF60 Wait 0x0014 - _0807EB44 0x0002 + SetAnimationState 0x0002 SetIntVariable 0x00000000 Call sub_0806AF60 Wait 0x0014 - _0807EB44 0x0002 + SetAnimationState 0x0002 SetIntVariable 0x00000004 Call sub_0806AF60 _0807EDD4 0x0228, 0x01e8 @@ -43,13 +43,13 @@ script_0800D426: BeginBlock DoPostScriptAction 0x000a Call sub_08062A48 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 script_0800D4E4: EndBlock Call sub_08062698 Call sub_080626AC - CallWithArg sub_0807F0EC, 0x00000009 + CallWithArg GetRandomInt, 0x00000009 JumpTable script_0800D510, script_0800D51A, script_0800D524, script_0800D52E, script_0800D538, script_0800D542, script_0800D54C, script_0800D556, script_0800D560 script_0800D510: _0807EE04 0x0038, 0x0068 @@ -89,10 +89,10 @@ script_0800D566: Jump script_0800D4E4 script_0800D584: EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806265C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800D4E4 diff --git a/data/scripts/mtCrenel/script_Object6ABrokenSword.inc b/data/scripts/mtCrenel/script_Object6ABrokenSword.inc index d586f992..8a738321 100644 --- a/data/scripts/mtCrenel/script_Object6ABrokenSword.inc +++ b/data/scripts/mtCrenel/script_Object6ABrokenSword.inc @@ -13,7 +13,7 @@ SCRIPT_START script_Object6ABrokenSword SCRIPT_END script_0800D242: DoPostScriptAction 0x0007 - _0807E930 0x0003 + SetAnimation 0x0003 SCRIPT_END script_0800D24C: DoPostScriptAction 0x0006 diff --git a/data/scripts/mtCrenel/script_PlayerAtMelari.inc b/data/scripts/mtCrenel/script_PlayerAtMelari.inc index 409ed3cc..82b3248e 100644 --- a/data/scripts/mtCrenel/script_PlayerAtMelari.inc +++ b/data/scripts/mtCrenel/script_PlayerAtMelari.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtMelari SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0170, 0x0140 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 Call sub_080791BC diff --git a/data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc b/data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc index 0934f626..0fda5e29 100644 --- a/data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc +++ b/data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc @@ -3,10 +3,10 @@ SCRIPT_START script_PlayerAtMountainMinishExit BeginBlock SetEntitySpeed 0x0080 EndBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000d - _0807ECC4 0x0020 + WalkSouth 0x0020 SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc b/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc index d9138b1b..10eed28e 100644 --- a/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc +++ b/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc @@ -1,10 +1,10 @@ @ Mines Player get white sword SCRIPT_START script_PlayerGetWhiteSword _0807F078 0x0002, 0x0001 - CallWithArg sub_0807F918, 0x00000002 + CallWithArg PutItemAnySlot, 0x00000002 PlaySound SFX_109 - CallWithArg sub_0807F238, 0x000001e2 - Call sub_0807F304 + CallWithArg SetPlayerAnimation2, 0x000001e2 + Call WaitForPlayerFrameHiBit MessageNoOverlap 0x0502 WaitUntilTextboxCloses SetSyncFlag 0x00000008 diff --git a/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc b/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc index 0cda5bcd..804412ab 100644 --- a/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc +++ b/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerPlaceBrokenSword EndBlock _0807EDD4 0x0170, 0x0120 _0807EDD4 0x01a8, 0x0120 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 Call sub_080791BC diff --git a/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc b/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc index c081612b..e9af8375 100644 --- a/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc +++ b/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc @@ -4,22 +4,22 @@ SCRIPT_START script_CarpenterOutsideTown BeginBlock Call sub_08067314 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 SetIntVariable 0x00000000 Call sub_080672B0 EndBlock script_08009592: CheckEntityInteractType JumpIfNot script_08009592 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer SetIntVariable 0x00000004 Call sub_080672B0 Call sub_080672C8 WaitUntilTextboxCloses Wait 0x000f - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 SetIntVariable 0x00000000 Call sub_080672B0 Jump script_08009592 diff --git a/data/scripts/northHyruleField/script_GuardNorthHyruleField.inc b/data/scripts/northHyruleField/script_GuardNorthHyruleField.inc index fb4474ad..f0acd305 100644 --- a/data/scripts/northHyruleField/script_GuardNorthHyruleField.inc +++ b/data/scripts/northHyruleField/script_GuardNorthHyruleField.inc @@ -2,7 +2,7 @@ @ also at Lon Lon Ranch SCRIPT_START script_GuardNorthHyruleField BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 @@ -10,11 +10,11 @@ SCRIPT_START script_GuardNorthHyruleField script_08014E2C: CheckEntityInteractType JumpIfNot script_08014E2C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 Call sub_08064428 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08014E2C .2byte 0x0000 diff --git a/data/scripts/northHyruleField/script_MutohOutsideTown.inc b/data/scripts/northHyruleField/script_MutohOutsideTown.inc index 11002fe7..72f84118 100644 --- a/data/scripts/northHyruleField/script_MutohOutsideTown.inc +++ b/data/scripts/northHyruleField/script_MutohOutsideTown.inc @@ -3,19 +3,19 @@ SCRIPT_START script_MutohOutsideTown BeginBlock Call sub_08067100 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_08009512: CheckEntityInteractType JumpIfNot script_08009512 - _0807E864 + SetPlayerIdle DoPostScriptAction 0x0001 - _0807EB74 + FacePlayer Call sub_080670B4 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Jump script_08009512 .2byte 0x0000 diff --git a/data/scripts/northHyruleField/script_Object69FixBridge.inc b/data/scripts/northHyruleField/script_Object69FixBridge.inc index 3dff4c45..e7fca431 100644 --- a/data/scripts/northHyruleField/script_Object69FixBridge.inc +++ b/data/scripts/northHyruleField/script_Object69FixBridge.inc @@ -14,14 +14,14 @@ SCRIPT_START script_Object69FixBridge .endif .endif .endif - _0807E864 + SetPlayerIdle MoveEntityToPlayer CameraTargetEntity SetEntitySpeed 0x0200 EndBlock Wait 0x000f _0807E8E4_2 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x001e _0807EDD4 0x00b8, 0x0258 Wait 0x001e @@ -29,6 +29,6 @@ SCRIPT_START script_Object69FixBridge Wait 0x0078 _0807EEB4 CameraTargetPlayer - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/npc/script_BladeBrothers.inc b/data/scripts/npc/script_BladeBrothers.inc index 8fec6673..e42d8c46 100644 --- a/data/scripts/npc/script_BladeBrothers.inc +++ b/data/scripts/npc/script_BladeBrothers.inc @@ -1,9 +1,9 @@ @ Blade Brothers SCRIPT_START script_BladeBrothers BeginBlock - Call sub_0807F348 + Call SetPriorityMessage DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_080161FE: @@ -11,9 +11,9 @@ script_080161FE: script_08016204: CheckEntityInteractType JumpIfNot script_08016204 - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB74 + FacePlayer Call sub_08068CA0 JumpIf script_0801633E Call sub_08068CFC @@ -26,7 +26,7 @@ script_08016204: JumpIfNot script_08016346 StartPlayerScript script_PlayerAtBladeBrothers WaitForSyncFlagAndClear 0x00000001 - _0807EB74 + FacePlayer Call sub_08068C8C JumpIf script_08016262 Call sub_08068DE8 @@ -36,14 +36,14 @@ script_08016262: Call sub_08068E00 WaitUntilTextboxCloses DoPostScriptAction 0x0001 - Call sub_0807F2D4 + Call WaitForFrameHiBit Call sub_08068E90 Call sub_08068C8C JumpIf script_0801631C Call sub_08068F00 Call sub_08068F14 Call sub_08068BB4 - CallWithArg sub_0807F244, 0x00010001 + CallWithArg EquipItem, 0x00010001 Call sub_08068B84 Call sub_0807F2A8 Call sub_08068BD0 @@ -52,7 +52,7 @@ script_08016262: WaitUntilTextboxCloses Call sub_08068EB4 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_080162CC: EndBlock BeginBlock @@ -63,17 +63,17 @@ script_080162CC: Jump script_080162CC script_080162E4: EndBlock - _0807E864 + SetPlayerIdle Call sub_08068E78 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_080162CC script_080162F6: EndBlock - _0807E888 - Call sub_0807F594 + DisablePlayerControl + Call WaitForPlayerIdle Call sub_0807DF28 - _0807E864 + SetPlayerIdle StopBgm PlaySound SFX_TASK_COMPLETE Wait 0x003c @@ -95,8 +95,8 @@ script_0801633E: WaitUntilTextboxCloses script_08016346: Call sub_0807DF50 - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Jump script_080161FE .2byte 0x0000 diff --git a/data/scripts/npc/script_Farmer.inc b/data/scripts/npc/script_Farmer.inc index 7316606b..a03617d1 100644 --- a/data/scripts/npc/script_Farmer.inc +++ b/data/scripts/npc/script_Farmer.inc @@ -9,23 +9,23 @@ script_0800B0E8: Call sub_0807F434 JumpTable script_0800B0E8, script_0800B0F6, script_0800B134 script_0800B0F6: - _0807E864 + SetPlayerIdle Call sub_0807DF28 - Call sub_0807F2D4 - _0807EB74 + Call WaitForFrameHiBit + FacePlayer CallWithArg sub_0806BC94, 0x00000004 Call sub_0806BCE8 WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl Call sub_0806BCB8 CallWithArg sub_0806BC94, 0x00000000 Jump script_0800B0E8 script_0800B134: - _0807E864 + SetPlayerIdle Call sub_0807DF28 - Call sub_0807F2D4 - _0807EB74 + Call WaitForFrameHiBit + FacePlayer CallWithArg sub_0806BC94, 0x00000004 Call sub_0807F650 _0807E9F0 @@ -35,7 +35,7 @@ script_0800B134: Call sub_0806BCC0 script_0800B160: Call sub_0807DF50 - _0807E878 + EnablePlayerControl Call sub_0806BCB8 CallWithArg sub_0806BC94, 0x00000000 Jump script_0800B0E8 diff --git a/data/scripts/npc/script_ForestMinish12.inc b/data/scripts/npc/script_ForestMinish12.inc index 0ba2e7ea..944ee213 100644 --- a/data/scripts/npc/script_ForestMinish12.inc +++ b/data/scripts/npc/script_ForestMinish12.inc @@ -4,7 +4,7 @@ SCRIPT_START script_ForestMinish12 _0807E9D4 EndBlock script_080165FE: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_080165FE MessageFromTarget 0x0601 Jump script_080165FE diff --git a/data/scripts/npc/script_ForestMinish13.inc b/data/scripts/npc/script_ForestMinish13.inc index c277126a..448f7c85 100644 --- a/data/scripts/npc/script_ForestMinish13.inc +++ b/data/scripts/npc/script_ForestMinish13.inc @@ -4,11 +4,11 @@ SCRIPT_START script_ForestMinish13 _0807E9D4 EndBlock script_08016612: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle MessageFromTarget 0x0602 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08016612 .2byte 0x0000 diff --git a/data/scripts/npc/script_ForestMinish14.inc b/data/scripts/npc/script_ForestMinish14.inc index 7eb3fa47..6fb1a794 100644 --- a/data/scripts/npc/script_ForestMinish14.inc +++ b/data/scripts/npc/script_ForestMinish14.inc @@ -4,11 +4,11 @@ SCRIPT_START script_ForestMinish14 _0807E9D4 EndBlock script_0801662E: - _0807E944 - _0807E864 - _0807EB28 0x0603 + TriggerInteract + SetPlayerIdle + EzloMessage 0x0603 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0801662E .2byte 0x0000 diff --git a/data/scripts/npc/script_ForestMinish15.inc b/data/scripts/npc/script_ForestMinish15.inc index c9b227b0..9ab52552 100644 --- a/data/scripts/npc/script_ForestMinish15.inc +++ b/data/scripts/npc/script_ForestMinish15.inc @@ -2,12 +2,12 @@ SCRIPT_START script_ForestMinish15 SetEntitySpeed 0x0100 script_08016648: - _0807ECF4 0x0030 + WalkWest 0x0030 Wait 0x0008 - _0807ECC4 0x0030 + WalkSouth 0x0030 Wait 0x0008 - _0807EC94 0x0030 + WalkEast 0x0030 Wait 0x0008 - _0807EC64 0x0030 + WalkNorth 0x0030 Wait 0x0008 Jump script_08016648 diff --git a/data/scripts/npc/script_ForestMinish18.inc b/data/scripts/npc/script_ForestMinish18.inc index 4198e7da..140817c4 100644 --- a/data/scripts/npc/script_ForestMinish18.inc +++ b/data/scripts/npc/script_ForestMinish18.inc @@ -2,38 +2,38 @@ SCRIPT_START script_ForestMinish18 SetEntitySpeed 0x0100 script_08016700: - _0807EC94 0x0030 + WalkEast 0x0030 SetSyncFlag 0x00000002 Wait 0x000f DoPostScriptAction 0x0000 - _0807EB44 0x0004 + SetAnimationState 0x0004 WaitForSyncFlag 0x00000001 ClearSyncFlag 0x00000001 DoPostScriptAction 0x0003 Wait 0x0002 - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x0002 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x0002 - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x0002 - _0807EB44 0x0004 + SetAnimationState 0x0004 WaitForSyncFlag 0x00000001 ClearSyncFlag 0x00000001 - _0807ECF4 0x0030 + WalkWest 0x0030 Wait 0x000f DoPostScriptAction 0x0000 - _0807EB44 0x0004 + SetAnimationState 0x0004 Wait 0x001e SetSyncFlag 0x00000006 DoPostScriptAction 0x0003 Wait 0x0002 - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x0002 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x0002 - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x0002 - _0807EB44 0x0004 + SetAnimationState 0x0004 Wait 0x003c Jump script_08016700 diff --git a/data/scripts/npc/script_ForestMinish19.inc b/data/scripts/npc/script_ForestMinish19.inc index 1e5e8056..44ac6a5f 100644 --- a/data/scripts/npc/script_ForestMinish19.inc +++ b/data/scripts/npc/script_ForestMinish19.inc @@ -4,38 +4,38 @@ SCRIPT_START script_ForestMinish19 script_0801679C: WaitForSyncFlag 0x00000002 ClearSyncFlag 0x00000002 - _0807EC94 0x0030 + WalkEast 0x0030 SetSyncFlag 0x00000004 Wait 0x000f DoPostScriptAction 0x0000 - _0807EB44 0x0004 + SetAnimationState 0x0004 WaitForSyncFlag 0x00000002 ClearSyncFlag 0x00000002 DoPostScriptAction 0x0003 Wait 0x0002 - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x0002 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x0002 - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x0002 - _0807EB44 0x0004 + SetAnimationState 0x0004 WaitForSyncFlag 0x00000002 ClearSyncFlag 0x00000002 - _0807ECF4 0x0030 + WalkWest 0x0030 SetSyncFlag 0x00000001 Wait 0x000f DoPostScriptAction 0x0000 - _0807EB44 0x0004 + SetAnimationState 0x0004 WaitForSyncFlag 0x00000002 ClearSyncFlag 0x00000002 DoPostScriptAction 0x0003 Wait 0x0002 - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x0002 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x0002 - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x0002 - _0807EB44 0x0004 + SetAnimationState 0x0004 Jump script_0801679C diff --git a/data/scripts/npc/script_ForestMinish20.inc b/data/scripts/npc/script_ForestMinish20.inc index e9aa1833..e07a0ef3 100644 --- a/data/scripts/npc/script_ForestMinish20.inc +++ b/data/scripts/npc/script_ForestMinish20.inc @@ -4,36 +4,36 @@ SCRIPT_START script_ForestMinish20 script_08016848: WaitForSyncFlag 0x00000004 ClearSyncFlag 0x00000004 - _0807EC94 0x0030 + WalkEast 0x0030 Wait 0x000f DoPostScriptAction 0x0000 - _0807EB44 0x0004 + SetAnimationState 0x0004 Wait 0x001e SetSyncFlag 0x00000003 DoPostScriptAction 0x0003 Wait 0x0002 - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x0002 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x0002 - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x0002 - _0807EB44 0x0004 + SetAnimationState 0x0004 Wait 0x003c - _0807ECF4 0x0030 + WalkWest 0x0030 SetSyncFlag 0x00000002 Wait 0x000f DoPostScriptAction 0x0000 - _0807EB44 0x0004 + SetAnimationState 0x0004 WaitForSyncFlag 0x00000004 ClearSyncFlag 0x00000004 DoPostScriptAction 0x0003 Wait 0x0002 - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x0002 - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x0002 - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x0002 - _0807EB44 0x0004 + SetAnimationState 0x0004 Jump script_08016848 diff --git a/data/scripts/npc/script_ForestMinish21.inc b/data/scripts/npc/script_ForestMinish21.inc index 4708f47d..f6b901c9 100644 --- a/data/scripts/npc/script_ForestMinish21.inc +++ b/data/scripts/npc/script_ForestMinish21.inc @@ -4,8 +4,8 @@ SCRIPT_START script_ForestMinish21 _0807E9D4 EndBlock script_080168E6: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_080168E6 diff --git a/data/scripts/npc/script_MysteriousWall.inc b/data/scripts/npc/script_MysteriousWall.inc index a55a6817..d7a22778 100644 --- a/data/scripts/npc/script_MysteriousWall.inc +++ b/data/scripts/npc/script_MysteriousWall.inc @@ -13,12 +13,12 @@ script_0800B98A: _0807E9F0 JumpIf script_0800B99E Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800B98A script_0800B99E: Call sub_0806F188 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_0800B9AC: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/npc/script_PlayerAtBladeBrothers.inc b/data/scripts/npc/script_PlayerAtBladeBrothers.inc index 7db4fb9c..d2025632 100644 --- a/data/scripts/npc/script_PlayerAtBladeBrothers.inc +++ b/data/scripts/npc/script_PlayerAtBladeBrothers.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerAtBladeBrothers SetEntitySpeed 0x0100 _0807EDD4 0x0078, 0x0050 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/npc/script_PlayerAtGreatFairy.inc b/data/scripts/npc/script_PlayerAtGreatFairy.inc index 8839a3cb..af017dba 100644 --- a/data/scripts/npc/script_PlayerAtGreatFairy.inc +++ b/data/scripts/npc/script_PlayerAtGreatFairy.inc @@ -18,8 +18,8 @@ script_0800B7FC: Jump script_0800B7EE BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/npc/script_TingleSiblings.inc b/data/scripts/npc/script_TingleSiblings.inc index 8393ee87..f877881f 100644 --- a/data/scripts/npc/script_TingleSiblings.inc +++ b/data/scripts/npc/script_TingleSiblings.inc @@ -2,52 +2,52 @@ SCRIPT_START script_TingleSiblings BeginBlock Call sub_08064EA4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a EndBlock script_0801690A: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_0801690A - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_08064F28 WaitUntilTextboxCloses JumpIfNot script_08016926 GivePlayerItem 0x003d WaitPlayerGetItem script_08016926: - _0807E878 + EnablePlayerControl SetGlobalFlag 0x005c Jump script_0801690A BeginBlock _0807E9D4 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x000a EndBlock script_0801693E: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle Wait 0x0018 MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0801693E .2byte 0x0000 BeginBlock _0807E9D4 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x000a - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock script_0801696A: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle Wait 0x0018 MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0801696A .2byte 0x0000 diff --git a/data/scripts/npc/script_Windcrest.inc b/data/scripts/npc/script_Windcrest.inc index ef4d0c4d..bc49eddd 100644 --- a/data/scripts/npc/script_Windcrest.inc +++ b/data/scripts/npc/script_Windcrest.inc @@ -9,7 +9,7 @@ SCRIPT_START script_Windcrest script_0800B024: CheckEntityInteractType JumpIfNot script_0800B024 - _0807E864 + SetPlayerIdle Call sub_0807DF28 CheckGlobalFlag 0x0052 JumpIf script_0800B082 @@ -20,7 +20,7 @@ script_0800B024: DoPostScriptAction 0x0008 Call Windcrest_Unlock Wait 0x003c - _0807EB28 0x0b5c + EzloMessage 0x0b5c WaitUntilTextboxCloses SetGlobalFlag 0x0053 Jump script_0800B09C @@ -30,7 +30,7 @@ script_0800B064: DoPostScriptAction 0x0008 Call Windcrest_Unlock Wait 0x003c - _0807EB28 0x0b5d + EzloMessage 0x0b5d WaitUntilTextboxCloses Jump script_0800B09C script_0800B082: @@ -39,11 +39,11 @@ script_0800B082: DoPostScriptAction 0x0008 Call Windcrest_Unlock Wait 0x003c - _0807EB28 0x0b5e + EzloMessage 0x0b5e WaitUntilTextboxCloses script_0800B09C: Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_08013F94.inc b/data/scripts/sanctuary/script_08013F94.inc index ec8cf7c0..4dc3b9e0 100644 --- a/data/scripts/sanctuary/script_08013F94.inc +++ b/data/scripts/sanctuary/script_08013F94.inc @@ -13,15 +13,15 @@ script_08013FA4: CheckPlayerFlags 0x00400000 JumpIfNot script_08013FA4 EndBlock - Call sub_0807FA40 - _0807E888 + Call WaitForPlayerNormalOrTalkEzlo + DisablePlayerControl Call sub_0807DF38 Wait 0x0078 - _0807EB28 0x1505 + EzloMessage 0x1505 WaitUntilTextboxCloses SetLocalFlag 0x007d Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08013FE0: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc b/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc index 56929281..8dca707e 100644 --- a/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc +++ b/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc @@ -15,17 +15,17 @@ script_08013FF0: CallWithArg sub_0807F6B4, 0x000000d0 JumpIfNot script_08013FF0 EndBlock - Call sub_0807F9A4 + Call WaitForPlayerNormal BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 EndBlock - _0807EB28 0x1508 + EzloMessage 0x1508 WaitUntilTextboxCloses StartPlayerScript script_PlayerSanctuary WaitForSyncFlagAndClear 0x00000001 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_08013FF0 script_0801404C: DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc index 3939de1e..d5c22881 100644 --- a/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc +++ b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc @@ -1,6 +1,6 @@ @ Sanctuary NPC4E Rumble after fusing final sword SCRIPT_START script_Npc4EFinalSwordRumble - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c .ifdef EU _0807F0B4 0x0007 @@ -23,13 +23,13 @@ SCRIPT_START script_Npc4EFinalSwordRumble MoveEntityToPlayer CameraTargetEntity Wait 0x003c - _0807EB28 0x1502 + EzloMessage 0x1502 WaitUntilTextboxCloses _0807F0B4 0x0004 CameraTargetPlayer SetLocalFlag 0x007c Call sub_08053250 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc b/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc index 26ed2582..dcc7d6c7 100644 --- a/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc +++ b/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc @@ -13,9 +13,9 @@ script_0801427C: script_08014298: CheckEntityInteractType JumpIfNot script_08014298 - _0807E864 + SetPlayerIdle MessageFromTargetPos 0x0647, 0x000c WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08014298 .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Npc4EPedestal.inc b/data/scripts/sanctuary/script_Npc4EPedestal.inc index 43bc49a9..6662c61f 100644 --- a/data/scripts/sanctuary/script_Npc4EPedestal.inc +++ b/data/scripts/sanctuary/script_Npc4EPedestal.inc @@ -10,7 +10,7 @@ SCRIPT_START script_Npc4EPedestal script_080134F8: CheckEntityInteractType JumpIfNot script_080134F8 - _0807E864 + SetPlayerIdle Call sub_0807DF28 StartPlayerScript script_PlayerAtPedestal WaitForSyncFlagAndClear 0x00000001 @@ -55,15 +55,15 @@ script_080134F8: _0807F078 0x0003, 0x0001 Call sub_0806DC3C Call sub_0806DC58 - Call sub_0807F304 + Call WaitForPlayerFrameHiBit Wait 0x003c - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade7 PlaySound SFX_EVAPORATE WaitForFadeFinish Wait 0x003c SetSyncFlag 0x00000010 - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade6 WaitForFadeFinish PlaySound SFX_109 diff --git a/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc b/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc index d34f479b..11af2ca2 100644 --- a/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc +++ b/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc @@ -12,14 +12,14 @@ script_08013B1E: CheckLocalFlag 0x0078 JumpIf script_08013B1E EndBlock - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 - _0807EB28 0x1507 + EzloMessage 0x1507 WaitUntilTextboxCloses StartPlayerScript script_PlayerSanctuary WaitForSyncFlagAndClear 0x00000001 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_08013B1E .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc b/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc index d52e0ba7..df1b5847 100644 --- a/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc +++ b/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc @@ -4,23 +4,23 @@ SCRIPT_START script_Npc4ESanctuaryIntro script_08013CA6: CheckPlayerInRegion 0x00e8, 0x01e8, 0x4080 JumpIfNot script_08013CA6 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c _0807F0B4 0x0001 SetEntityPositionRelative 0x00e8, 0x0138 CameraTargetEntity - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder Wait 0x0078 _0807F0B4 0x0004 CameraTargetPlayer - Call sub_0807F5C0 - _0807EB28 0x1504 + Call WaitForCameraTouchRoomBorder + EzloMessage 0x1504 WaitUntilTextboxCloses SetLocalFlag 0x0079 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc index e5bef48f..155c1dbf 100644 --- a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc +++ b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc @@ -10,7 +10,7 @@ SCRIPT_START script_Npc4ESecondSanctuary script_0801373C: CheckEntityInteractType JumpIfNot script_0801373C - _0807E864 + SetPlayerIdle Call sub_0807DF28 StartPlayerScript script_PlayerAtPedestal WaitForSyncFlagAndClear 0x00000001 @@ -58,15 +58,15 @@ script_0801373C: _0807F078 0x0004, 0x0001 Call sub_0806DC3C Call sub_0806DC58 - Call sub_0807F304 + Call WaitForPlayerFrameHiBit Wait 0x003c - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade7 PlaySound SFX_EVAPORATE WaitForFadeFinish Wait 0x003c SetSyncFlag 0x00000010 - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade6 WaitForFadeFinish PlaySound SFX_109 @@ -76,7 +76,7 @@ script_0801373C: SetLocalFlag 0x007b Call sub_08053250 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc index 24eb4ce1..4c913d06 100644 --- a/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc +++ b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc @@ -1,6 +1,6 @@ @ Sanctuary NPC4E spawn text board SCRIPT_START script_Npc4ESpawnTextBoard - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c _0807F0B4 0x0007 SetEntityPositionRelative 0x00e8, 0x00a8 @@ -12,13 +12,13 @@ SCRIPT_START script_Npc4ESpawnTextBoard _0807F0C8 0x0000, 0x0000 StartPlayerScript script_PlayerTextBoardAppears WaitForSyncFlagAndClear 0x00000002 - _0807EB28 0x1501 + EzloMessage 0x1501 WaitUntilTextboxCloses _0807F0B4 0x0004 CameraTargetPlayer SetLocalFlag 0x007a Call sub_08053250 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc index 05e2ccd9..9a57f37f 100644 --- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc +++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc @@ -10,7 +10,7 @@ SCRIPT_START script_Npc4EThirdSanctuary script_080138D0: CheckEntityInteractType JumpIfNot script_080138D0 - _0807E864 + SetPlayerIdle Call sub_0807DF28 StartPlayerScript script_PlayerAtPedestal WaitForSyncFlagAndClear 0x00000001 @@ -63,15 +63,15 @@ script_080138D0: Call sub_0807AEE4 Call sub_0806DC3C Call sub_0806DC58 - Call sub_0807F304 + Call WaitForPlayerFrameHiBit Wait 0x003c - _0807E778 0x0004 + SetFadeTime 0x0004 DoFade7 PlaySound SFX_EVAPORATE WaitForFadeFinish Wait 0x003c SetSyncFlag 0x00000010 - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade6 WaitForFadeFinish PlaySound SFX_109 @@ -84,7 +84,7 @@ script_080138D0: CameraTargetEntity .endif Call sub_0806DC3C - CallWithArg sub_0807F244, 0x00010001 + CallWithArg EquipItem, 0x00010001 CallWithArg sub_0807F29C, gUnk_080049FE Wait 0x00c8 CallWithArg sub_0807F29C, 0x00000000 diff --git a/data/scripts/sanctuary/script_Object6AEarthElement.inc b/data/scripts/sanctuary/script_Object6AEarthElement.inc index 55980676..6754c480 100644 --- a/data/scripts/sanctuary/script_Object6AEarthElement.inc +++ b/data/scripts/sanctuary/script_Object6AEarthElement.inc @@ -2,9 +2,9 @@ SCRIPT_START script_Object6AEarthElement BeginBlock DoPostScriptAction 0x0007 - Call sub_0807F180 + Call SetCollisionLayer2 SetEntityPositionRelative 0x00b0, 0x00f8 - _0807E930 0x0001 + SetAnimation 0x0001 EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6AEarthElementFloating.inc b/data/scripts/sanctuary/script_Object6AEarthElementFloating.inc index 4ab4fd4d..e6a7c7b8 100644 --- a/data/scripts/sanctuary/script_Object6AEarthElementFloating.inc +++ b/data/scripts/sanctuary/script_Object6AEarthElementFloating.inc @@ -2,11 +2,11 @@ SCRIPT_START script_Object6AEarthElementFloating BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock SetEntitySpeed 0x0080 _0807EDD4 0x00b0, 0x00f8 - _0807E930 0x0001 + SetAnimation 0x0001 SetSyncFlag 0x08000000 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6AFireElement.inc b/data/scripts/sanctuary/script_Object6AFireElement.inc index 48385c7a..e82683c5 100644 --- a/data/scripts/sanctuary/script_Object6AFireElement.inc +++ b/data/scripts/sanctuary/script_Object6AFireElement.inc @@ -2,9 +2,9 @@ SCRIPT_START script_Object6AFireElement BeginBlock DoPostScriptAction 0x0007 - Call sub_0807F180 + Call SetCollisionLayer2 SetEntityPositionRelative 0x0120, 0x00f8 - _0807E930 0x0003 + SetAnimation 0x0003 EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6AFireElementFloating.inc b/data/scripts/sanctuary/script_Object6AFireElementFloating.inc index 0e1febcc..65938a07 100644 --- a/data/scripts/sanctuary/script_Object6AFireElementFloating.inc +++ b/data/scripts/sanctuary/script_Object6AFireElementFloating.inc @@ -2,11 +2,11 @@ SCRIPT_START script_Object6AFireElementFloating BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0002 + SetAnimation 0x0002 EndBlock SetEntitySpeed 0x0080 _0807EDD4 0x0120, 0x00f8 - _0807E930 0x0003 + SetAnimation 0x0003 SetSyncFlag 0x10000000 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6ASword2.inc b/data/scripts/sanctuary/script_Object6ASword2.inc index fab7bbba..2acab4f5 100644 --- a/data/scripts/sanctuary/script_Object6ASword2.inc +++ b/data/scripts/sanctuary/script_Object6ASword2.inc @@ -2,11 +2,11 @@ SCRIPT_START script_Object6ASword2 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0009 + SetAnimation 0x0009 EndBlock WaitForSyncFlagAndClear 0x00000080 - _0807E930 0x000c - Call sub_0807F2D4 + SetAnimation 0x000c + Call WaitForFrameHiBit SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Object6ASword3.inc b/data/scripts/sanctuary/script_Object6ASword3.inc index 74a51519..38b36455 100644 --- a/data/scripts/sanctuary/script_Object6ASword3.inc +++ b/data/scripts/sanctuary/script_Object6ASword3.inc @@ -2,11 +2,11 @@ SCRIPT_START script_Object6ASword3 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x000a + SetAnimation 0x000a EndBlock WaitForSyncFlagAndClear 0x00000080 - _0807E930 0x000d - Call sub_0807F2D4 + SetAnimation 0x000d + Call WaitForFrameHiBit SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Object6ASwordChange1.inc b/data/scripts/sanctuary/script_Object6ASwordChange1.inc index d17fcb9e..6285b5c4 100644 --- a/data/scripts/sanctuary/script_Object6ASwordChange1.inc +++ b/data/scripts/sanctuary/script_Object6ASwordChange1.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Object6ASwordChange1 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0000 + SetAnimation 0x0000 Call sub_0807F738 EndBlock WaitForSyncFlag 0x00000040 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge10.inc b/data/scripts/sanctuary/script_Object6ASwordCharge10.inc index 11e22661..000d1c95 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge10.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge10.inc @@ -2,13 +2,13 @@ SCRIPT_START script_Object6ASwordCharge10 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0015 + SetAnimation 0x0015 Call sub_0807F714 Call sub_0807F714 - CallWithArg sub_0807F994, 0x0000fffc + CallWithArg SetSpriteOffset, 0x0000fffc EndBlock WaitForSyncFlag 0x00000020 Wait 0x0078 - Call sub_0807F2D4 + Call WaitForFrameHiBit DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge2.inc b/data/scripts/sanctuary/script_Object6ASwordCharge2.inc index d4ad0786..4fbd87f4 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge2.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge2.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Object6ASwordCharge2 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0001 + SetAnimation 0x0001 Call sub_0807F738 EndBlock WaitForSyncFlag 0x00000040 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge3.inc b/data/scripts/sanctuary/script_Object6ASwordCharge3.inc index dc8c915c..79a859c2 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge3.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge3.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Object6ASwordCharge3 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0002 + SetAnimation 0x0002 Call sub_0807F738 OffsetEntityPosition 0x0000, 0xfff0 EndBlock diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge4.inc b/data/scripts/sanctuary/script_Object6ASwordCharge4.inc index 55fea219..dd4a6123 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge4.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge4.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Object6ASwordCharge4 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0003 + SetAnimation 0x0003 Call sub_0807F738 OffsetEntityPosition 0x0000, 0xfff0 EndBlock diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge5.inc b/data/scripts/sanctuary/script_Object6ASwordCharge5.inc index deba7486..3b06636f 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge5.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge5.inc @@ -2,15 +2,15 @@ SCRIPT_START script_Object6ASwordCharge5 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0004 + SetAnimation 0x0004 EndBlock WaitForSyncFlagAndClear 0x00000200 - _0807E930 0x0008 - Call sub_0807F2D4 - _0807E930 0x000c + SetAnimation 0x0008 + Call WaitForFrameHiBit + SetAnimation 0x000c SetSyncFlag 0x00002000 WaitForSyncFlag 0x00000020 - _0807E930 0x0010 - Call sub_0807F2D4 + SetAnimation 0x0010 + Call WaitForFrameHiBit DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge6.inc b/data/scripts/sanctuary/script_Object6ASwordCharge6.inc index 6712fe80..0fccc71d 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge6.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge6.inc @@ -2,15 +2,15 @@ SCRIPT_START script_Object6ASwordCharge6 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0005 + SetAnimation 0x0005 EndBlock WaitForSyncFlagAndClear 0x00000400 - _0807E930 0x0009 - Call sub_0807F2D4 - _0807E930 0x000d + SetAnimation 0x0009 + Call WaitForFrameHiBit + SetAnimation 0x000d SetSyncFlag 0x00004000 WaitForSyncFlag 0x00000020 - _0807E930 0x0011 - Call sub_0807F2D4 + SetAnimation 0x0011 + Call WaitForFrameHiBit DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge8.inc b/data/scripts/sanctuary/script_Object6ASwordCharge8.inc index db235e91..9120d4b9 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge8.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge8.inc @@ -2,17 +2,17 @@ SCRIPT_START script_Object6ASwordCharge8 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0007 + SetAnimation 0x0007 OffsetEntityPosition 0x0000, 0xfff0 EndBlock WaitForSyncFlagAndClear 0x00001000 - _0807E930 0x000b - Call sub_0807F2D4 - _0807E930 0x000f + SetAnimation 0x000b + Call WaitForFrameHiBit + SetAnimation 0x000f SetSyncFlag 0x00010000 WaitForSyncFlag 0x00000020 - _0807E930 0x0013 - Call sub_0807F2D4 + SetAnimation 0x0013 + Call WaitForFrameHiBit DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge9.inc b/data/scripts/sanctuary/script_Object6ASwordCharge9.inc index 2920f0bc..637466b7 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge9.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge9.inc @@ -2,13 +2,13 @@ SCRIPT_START script_Object6ASwordCharge9 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0014 + SetAnimation 0x0014 Call sub_0807F714 - CallWithArg sub_0807F994, 0x0000fffc + CallWithArg SetSpriteOffset, 0x0000fffc EndBlock WaitForSyncFlag 0x00000020 Wait 0x0078 - Call sub_0807F2D4 + Call WaitForFrameHiBit DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc b/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc index 7681251b..2584cb86 100644 --- a/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc +++ b/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc @@ -2,11 +2,11 @@ SCRIPT_START script_Object6ASwordInPedestal BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0008 + SetAnimation 0x0008 EndBlock WaitForSyncFlagAndClear 0x00000080 - _0807E930 0x000b - Call sub_0807F2D4 + SetAnimation 0x000b + Call WaitForFrameHiBit SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Object6ATextBoard.inc b/data/scripts/sanctuary/script_Object6ATextBoard.inc index 174f0b6d..63469b76 100644 --- a/data/scripts/sanctuary/script_Object6ATextBoard.inc +++ b/data/scripts/sanctuary/script_Object6ATextBoard.inc @@ -14,7 +14,7 @@ SCRIPT_START script_Object6ATextBoard EndBlock DoPostScriptAction 0x0008 WaitForSyncFlagAndClear 0x00000004 - _0807E908 0x0002 + SetAction 0x0002 PlaySound SFX_134 Jump script_08013C32 script_08013C2A: @@ -38,22 +38,22 @@ script_08013C58: CheckEntityInteractType JumpIfNot script_08013C58 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CheckLocalFlag 0x007d JumpIf script_08013C82 - _0807EB28 0x1501 + EzloMessage 0x1501 Jump script_08013C86 script_08013C82: - _0807EB28 0x1506 + EzloMessage 0x1506 script_08013C86: WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08013C58 script_08013C92: EndBlock - _0807E908 0x0004 + SetAction 0x0004 script_08013C98: DoPostScriptAction 0x0008 DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Object6AWaterElement.inc b/data/scripts/sanctuary/script_Object6AWaterElement.inc index 0d40a625..e0617edf 100644 --- a/data/scripts/sanctuary/script_Object6AWaterElement.inc +++ b/data/scripts/sanctuary/script_Object6AWaterElement.inc @@ -2,9 +2,9 @@ SCRIPT_START script_Object6AWaterElement BeginBlock DoPostScriptAction 0x0007 - Call sub_0807F180 + Call SetCollisionLayer2 SetEntityPositionRelative 0x0120, 0x0168 - _0807E930 0x0005 + SetAnimation 0x0005 EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6AWaterElementFloating.inc b/data/scripts/sanctuary/script_Object6AWaterElementFloating.inc index 5571ce4f..9625d7c8 100644 --- a/data/scripts/sanctuary/script_Object6AWaterElementFloating.inc +++ b/data/scripts/sanctuary/script_Object6AWaterElementFloating.inc @@ -2,11 +2,11 @@ SCRIPT_START script_Object6AWaterElementFloating BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0004 + SetAnimation 0x0004 EndBlock SetEntitySpeed 0x0080 _0807EDD4 0x0120, 0x0168 - _0807E930 0x0005 + SetAnimation 0x0005 SetSyncFlag 0x20000000 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6AWindElement.inc b/data/scripts/sanctuary/script_Object6AWindElement.inc index b0a2e2c4..ab7eb8f0 100644 --- a/data/scripts/sanctuary/script_Object6AWindElement.inc +++ b/data/scripts/sanctuary/script_Object6AWindElement.inc @@ -2,9 +2,9 @@ SCRIPT_START script_Object6AWindElement BeginBlock DoPostScriptAction 0x0007 - Call sub_0807F180 + Call SetCollisionLayer2 SetEntityPositionRelative 0x00b0, 0x0168 - _0807E930 0x0007 + SetAnimation 0x0007 EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6AWindElementFloating.inc b/data/scripts/sanctuary/script_Object6AWindElementFloating.inc index c88547f6..3ee4e871 100644 --- a/data/scripts/sanctuary/script_Object6AWindElementFloating.inc +++ b/data/scripts/sanctuary/script_Object6AWindElementFloating.inc @@ -2,11 +2,11 @@ SCRIPT_START script_Object6AWindElementFloating BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0006 + SetAnimation 0x0006 EndBlock SetEntitySpeed 0x0080 _0807EDD4 0x00b0, 0x0168 - _0807E930 0x0007 + SetAnimation 0x0007 SetSyncFlag 0x40000000 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc b/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc index e56b82e0..30ab72f0 100644 --- a/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc +++ b/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc @@ -2,17 +2,17 @@ SCRIPT_START script_Objet6ASwordCharge7 BeginBlock DoPostScriptAction 0x0007 - _0807E930 0x0006 + SetAnimation 0x0006 OffsetEntityPosition 0x0000, 0xfff0 EndBlock WaitForSyncFlagAndClear 0x00000800 - _0807E930 0x000a - Call sub_0807F2D4 - _0807E930 0x000e + SetAnimation 0x000a + Call WaitForFrameHiBit + SetAnimation 0x000e SetSyncFlag 0x00008000 WaitForSyncFlag 0x00000020 - _0807E930 0x0012 - Call sub_0807F2D4 + SetAnimation 0x0012 + Call WaitForFrameHiBit DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_PlayerAtPedestal.inc b/data/scripts/sanctuary/script_PlayerAtPedestal.inc index f67ff329..0f82e0a9 100644 --- a/data/scripts/sanctuary/script_PlayerAtPedestal.inc +++ b/data/scripts/sanctuary/script_PlayerAtPedestal.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtPedestal BeginBlock SetEntitySpeed 0x0100 EndBlock - Call sub_0807F584 + Call ReadPlayerAnimationState JumpTable script_080136F0, script_080136FA, script_08013704, script_080136FA script_080136F0: CallWithArg sub_0807F464, 0x000000d0 @@ -11,7 +11,7 @@ script_080136FA: CallWithArg sub_0807F4F8, 0x00000124 script_08013704: _0807EDD4 0x00e8, 0x0124 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc b/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc index 69721bca..b6c21762 100644 --- a/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc +++ b/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtSanctuaryEntrance SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0088, 0x0068 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 Wait 0x001e SetSyncFlag 0x00000001 diff --git a/data/scripts/sanctuary/script_PlayerGetElement.inc b/data/scripts/sanctuary/script_PlayerGetElement.inc index c1285a04..71bf1bb6 100644 --- a/data/scripts/sanctuary/script_PlayerGetElement.inc +++ b/data/scripts/sanctuary/script_PlayerGetElement.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerGetElement BeginBlock SetEntitySpeed 0x0140 - _0807E864 + SetPlayerIdle Call sub_0807DF28 EndBlock Wait 0x0078 @@ -18,5 +18,5 @@ script_0800A0D2: WaitForSyncFlagAndClear 0x00000002 Wait 0x003c SetEntitySpeed 0x0080 - _0807EC64 0x0030 + WalkNorth 0x0030 SCRIPT_END diff --git a/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc b/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc index e2e0c734..fd4063b1 100644 --- a/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc +++ b/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc @@ -2,11 +2,11 @@ SCRIPT_START script_PlayerPickUpFinalSword CallWithArg sub_08095E7C, script_Object6ASwordCharge11 PlaySound SFX_1D3 - CallWithArg sub_0807F238, 0x000008e3 + CallWithArg SetPlayerAnimation2, 0x000008e3 Call sub_08096028 Wait 0x0078 SetSyncFlag 0x00020000 - Call sub_0807F304 + Call WaitForPlayerFrameHiBit Wait 0x0078 WaitForSyncFlagAndClear 0x00040000 Call sub_080791BC diff --git a/data/scripts/sanctuary/script_PlayerPickUpSword.inc b/data/scripts/sanctuary/script_PlayerPickUpSword.inc index 49aea300..0523c018 100644 --- a/data/scripts/sanctuary/script_PlayerPickUpSword.inc +++ b/data/scripts/sanctuary/script_PlayerPickUpSword.inc @@ -1,11 +1,11 @@ @ Player at Sanctuary pick up sword SCRIPT_START script_PlayerPickUpSword PlaySound SFX_1D3 - CallWithArg sub_0807F238, 0x000008bf + CallWithArg SetPlayerAnimation2, 0x000008bf Call sub_08096028 Wait 0x003c SetSyncFlag 0x00020000 - Call sub_0807F304 + Call WaitForPlayerFrameHiBit Wait 0x0078 WaitForSyncFlagAndClear 0x00040000 Call sub_080791BC diff --git a/data/scripts/sanctuary/script_PlayerSanctuary.inc b/data/scripts/sanctuary/script_PlayerSanctuary.inc index 2548d3a1..05672507 100644 --- a/data/scripts/sanctuary/script_PlayerSanctuary.inc +++ b/data/scripts/sanctuary/script_PlayerSanctuary.inc @@ -3,8 +3,8 @@ SCRIPT_START script_PlayerSanctuary BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EC64 0x0010 - _0807EB44 0x0000 + WalkNorth 0x0010 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc b/data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc index 7ba6faad..9ea5a652 100644 --- a/data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc +++ b/data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc @@ -1,7 +1,7 @@ @ Player in Sanctuary during intro cutscene SCRIPT_START script_PlayerSanctuaryIntro BeginBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 SetEntityPositionRelative 0x0098, 0x0070 EndBlock SetSyncFlag 0x00000002 diff --git a/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc b/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc index 29f92dd2..77e9fc90 100644 --- a/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc +++ b/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerTextBoardAppears SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x00e8, 0x00a8 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 Call sub_080791BC diff --git a/data/scripts/southHyruleField/script_ForestMinish2.inc b/data/scripts/southHyruleField/script_ForestMinish2.inc index 9815dd19..aa4f65ab 100644 --- a/data/scripts/southHyruleField/script_ForestMinish2.inc +++ b/data/scripts/southHyruleField/script_ForestMinish2.inc @@ -13,7 +13,7 @@ script_0800C592: Jump script_0800C592 script_0800C5A6: EndBlock - _0807E864 + SetPlayerIdle CheckInventory1 0x0067 JumpIfNot script_0800C5BC Call sub_08060208 @@ -22,5 +22,5 @@ script_0800C5BC: MessageNoOverlap 0x4710 script_0800C5C0: WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800C592 diff --git a/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc b/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc index 7fc77564..2474bfb8 100644 --- a/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc +++ b/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc @@ -5,29 +5,29 @@ SCRIPT_START script_Object69LinksHouseBed script_08009DF0: CheckPlayerInRegion 0x00a0, 0x0038, 0x1830 JumpIfNot script_08009DF0 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Wait 0x0008 - _0807EB28 0x3207 + EzloMessage 0x3207 CheckTextboxResult JumpIfNot script_08009E4E Call sub_0807DF28 - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade5 WaitForFadeFinish Call sub_0804E864 Wait 0x001e SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - _0807EB28 0x3209 + EzloMessage 0x3209 Wait 0x000f WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END script_08009E4E: - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc b/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc index 1b74f94c..e7d0ce43 100644 --- a/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc +++ b/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerWakeAfterRest Call sub_0807DF28 EndBlock WaitForSyncFlagAndClear 0x00000002 - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade4 WaitForFadeFinish DoPostScriptAction 0x0014 diff --git a/data/scripts/southHyruleField/script_SmithAtLinksHouse.inc b/data/scripts/southHyruleField/script_SmithAtLinksHouse.inc index 88aa8aa8..91e708c4 100644 --- a/data/scripts/southHyruleField/script_SmithAtLinksHouse.inc +++ b/data/scripts/southHyruleField/script_SmithAtLinksHouse.inc @@ -1,18 +1,18 @@ @ Links house Smith SCRIPT_START script_SmithAtLinksHouse BeginBlock - Call sub_0807F348 + Call SetPriorityMessage Call sub_08066288 Call sub_08066274 DoPostScriptAction 0x000a - _0807E930 0x000c - _0807E908 0x0003 + SetAnimation 0x000c + SetAction 0x0003 EndBlock script_08009DD2: - _0807E944 - _0807E908 0x0002 + TriggerInteract + SetAction 0x0002 Call sub_0806622C WaitUntilTextboxCloses - _0807E908 0x0003 - _0807E930 0x000c + SetAction 0x0003 + SetAnimation 0x000c Jump script_08009DD2 diff --git a/data/scripts/unused/script_0800B828.inc b/data/scripts/unused/script_0800B828.inc index 002888a2..944d257b 100644 --- a/data/scripts/unused/script_0800B828.inc +++ b/data/scripts/unused/script_0800B828.inc @@ -2,21 +2,21 @@ SCRIPT_START script_0800B828 BeginBlock _0807E9D4 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x000a EndBlock script_0800B836: - _0807E944 - _0807E864 + TriggerInteract + SetPlayerIdle MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800B836 .2byte 0x0000 BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a EndBlock @@ -26,8 +26,8 @@ script_0800B85E: Jump script_0800B85E BeginBlock _0807E9D4 - _0807EB44 0x0004 - _0807E930 0x0000 + SetAnimationState 0x0004 + SetAnimation 0x0000 DoPostScriptAction 0x000a EndBlock script_0800B87E: @@ -36,17 +36,17 @@ script_0800B87E: Jump script_0800B87E BeginBlock _0807E9D4 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a EndBlock script_0800B89E: CheckEntityInteractType JumpIfNot script_0800B89E - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800B89E diff --git a/data/scripts/unused/script_0800D84C.inc b/data/scripts/unused/script_0800D84C.inc index baf79ed1..0ac50278 100644 --- a/data/scripts/unused/script_0800D84C.inc +++ b/data/scripts/unused/script_0800D84C.inc @@ -5,11 +5,11 @@ SCRIPT_START script_0800D84C script_0800D850: CheckRoomFlag 0x0000 JumpIfNot script_0800D850 - _0807E864 + SetPlayerIdle Call sub_0807DF28 Wait 0x003c Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/unused/script_0800FB2C.inc b/data/scripts/unused/script_0800FB2C.inc index 2e11fe58..ec0ad048 100644 --- a/data/scripts/unused/script_0800FB2C.inc +++ b/data/scripts/unused/script_0800FB2C.inc @@ -1,6 +1,6 @@ @ TODO UNUSED? SCRIPT_START script_0800FB2C - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/unused/script_08012B24.inc b/data/scripts/unused/script_08012B24.inc index fe88c6a6..5483ab0b 100644 --- a/data/scripts/unused/script_08012B24.inc +++ b/data/scripts/unused/script_08012B24.inc @@ -2,10 +2,10 @@ SCRIPT_START script_08012B24 BeginBlock SetEntitySpeed 0x0100 - _0807EB44 0x0004 + SetAnimationState 0x0004 EndBlock DoPostScriptAction 0x0001 - _0807ECC4 0x0008 + WalkSouth 0x0008 SetSyncFlag 0x00000002 CallWithArg sub_0807FB64, 0xffffffe2 Call sub_080791BC diff --git a/data/scripts/unused/script_08012B50.inc b/data/scripts/unused/script_08012B50.inc index b97d546b..a7a3f781 100644 --- a/data/scripts/unused/script_08012B50.inc +++ b/data/scripts/unused/script_08012B50.inc @@ -2,10 +2,10 @@ SCRIPT_START script_08012B50 BeginBlock SetEntitySpeed 0x0100 - _0807EB44 0x0000 + SetAnimationState 0x0000 EndBlock DoPostScriptAction 0x0001 - _0807EC64 0x0008 + WalkNorth 0x0008 SetSyncFlag 0x00000002 CallWithArg sub_0807FB64, 0xffffffe2 Call sub_080791BC diff --git a/data/scripts/unused/script_08012B7C.inc b/data/scripts/unused/script_08012B7C.inc index d562bd07..50328e8a 100644 --- a/data/scripts/unused/script_08012B7C.inc +++ b/data/scripts/unused/script_08012B7C.inc @@ -2,10 +2,10 @@ SCRIPT_START script_08012B7C BeginBlock SetEntitySpeed 0x0100 - _0807EB44 0x0002 + SetAnimationState 0x0002 EndBlock DoPostScriptAction 0x0001 - _0807EC94 0x0008 + WalkEast 0x0008 SetSyncFlag 0x00000002 CallWithArg sub_0807FB64, 0xffffffe2 Call sub_080791BC diff --git a/data/scripts/unused/script_08012C68.inc b/data/scripts/unused/script_08012C68.inc index c27b36b3..ee6b94d7 100644 --- a/data/scripts/unused/script_08012C68.inc +++ b/data/scripts/unused/script_08012C68.inc @@ -9,11 +9,11 @@ SCRIPT_START script_08012C68 script_08012C7E: CheckEntityInteractType JumpIfNot script_08012C7E - _0807E864 + SetPlayerIdle _0807E8E4_0 MessageFromTarget 0x111d WaitUntilTextboxCloses SetGlobalFlag 0x0022 - _0807E878 + EnablePlayerControl Jump script_08012C7E diff --git a/data/scripts/unused/script_080155F4.inc b/data/scripts/unused/script_080155F4.inc index 7c934a2a..b41c1b81 100644 --- a/data/scripts/unused/script_080155F4.inc +++ b/data/scripts/unused/script_080155F4.inc @@ -1,7 +1,7 @@ @ TODO UNUSED? SCRIPT_START script_080155F4 WaitForSyncFlagAndClear 0x00000020 - _0807E930 0x0000 + SetAnimation 0x0000 Wait 0x0014 SetSyncFlag 0x00000040 script_08015608: diff --git a/data/scripts/unused/script_08015A7C.inc b/data/scripts/unused/script_08015A7C.inc index 3034137b..870e0b9d 100644 --- a/data/scripts/unused/script_08015A7C.inc +++ b/data/scripts/unused/script_08015A7C.inc @@ -2,8 +2,8 @@ SCRIPT_START script_08015A7C SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 - _0807EC64 0x0010 - _0807EB44 0x0000 + WalkNorth 0x0010 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 Call sub_080791BC diff --git a/data/scripts/unused/script_08015AA0.inc b/data/scripts/unused/script_08015AA0.inc index e0187879..746324a2 100644 --- a/data/scripts/unused/script_08015AA0.inc +++ b/data/scripts/unused/script_08015AA0.inc @@ -2,8 +2,8 @@ SCRIPT_START script_08015AA0 SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 - _0807EC94 0x0010 - _0807EB44 0x0002 + WalkEast 0x0010 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 Call sub_080791BC diff --git a/data/scripts/unused/script_08015F80.inc b/data/scripts/unused/script_08015F80.inc index af659a4f..f866aa42 100644 --- a/data/scripts/unused/script_08015F80.inc +++ b/data/scripts/unused/script_08015F80.inc @@ -1,7 +1,7 @@ @ TODO UNUSED? SCRIPT_START script_08015F80 BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlag 0x00000200 diff --git a/data/scripts/unused/script_08016384.inc b/data/scripts/unused/script_08016384.inc index 8d5b915f..c76c83cd 100644 --- a/data/scripts/unused/script_08016384.inc +++ b/data/scripts/unused/script_08016384.inc @@ -36,17 +36,17 @@ SCRIPT_START script_08016384 CheckPlayerInRegion 0x0000, 0x0000, 0x0000 CheckPlayerInRegion2 0x0000 CheckEntityInteractType - _0807E30C + FacePlayerAndCheckDist HasRupees 0x00c8 CheckTextboxResult CheckKinstoneFused 0x0001 BuyItem 0x006c, 0x0000 CheckBottleContaining 0x0020 - _0807E4CC 0x00000000 - _0807E4EC 0x00000000 - _0807E514 0x00000000 + VariableBitSet 0x00000000 + VariableOnlyBitSet 0x00000000 + VariableEqual 0x00000000 CheckPlayerFlags 0x00000080 - _0807E564 + CheckPlayerMinish EntityHasHeight ComparePlayerAction 0x0001 ComparePlayerAnimationState 0x0004 @@ -63,8 +63,8 @@ SCRIPT_START script_08016384 WaitForSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 WaitPlayerGetItem - WaitForPlayerAction0x17 + WaitForPlayerEnterRoom WaitFor_1 WaitForFadeFinish - _0807E778 0x0004 + SetFadeTime 0x0004 SetFadeMask 0x0000ffff diff --git a/data/scripts/unused/script_08016482.inc b/data/scripts/unused/script_08016482.inc index d7a983b0..4d1bcbe0 100644 --- a/data/scripts/unused/script_08016482.inc +++ b/data/scripts/unused/script_08016482.inc @@ -1,6 +1,6 @@ @ TODO UNUSED? SCRIPT_START script_08016482 - _0807E79C + FadeInvert Nop2 0x0080 DoFade4 DoFade5 @@ -9,21 +9,21 @@ SCRIPT_START script_08016482 _0807E800 0x00000000 _0807E80C 0x00000000 _0807E858_0 - _0807E864 - _0807E878 - _0807E888 + SetPlayerIdle + EnablePlayerControl + DisablePlayerControl SetPlayerAction 0x00005408 StartPlayerScript script_08016384 - _0807E8D4 0x03a0 + SetPlayerAnimation 0x03a0 _0807E8E4_0 _0807E8E4_1 _0807E8E4_2 _0807E8E4_3 - _0807E908 0x0004 + SetAction 0x0004 SetIntVariable 0x00000000 - _0807E924 - _0807E930 0x0000 - _0807E944 + SetVariableToFrame + SetAnimation 0x0000 + TriggerInteract _0807E974 0x0600 _0807E9D4 _0807E9DC @@ -35,24 +35,24 @@ SCRIPT_START script_08016482 MessageFromTargetPos_1 0x0601 MessageFromTargetTable 0x0601, 0x0602, 0x0603 MessageNoOverlapVar - _0807EB28 0x0602 + EzloMessage 0x0602 _0807EB38 - _0807EB44 0x0000 + SetAnimationState 0x0000 _0807EB4C 0x0000, 0x0000 - _0807EB74 - _0807EB8C + FacePlayer + FaceAwayFromPlayer SetEntityDirection 0x0000 SetEntityDirectionWithAnimationState 0x0000 SetEntitySpeed 0x0100 - SetEntity0x20 0x00018000 + SetEntityVelocity 0x00018000 SetEntityPositionRelative 0x0000, 0x0000 MoveEntityToPlayer Nop3 - _0807EC1C 0x0010 - _0807EC64 0x0020 - _0807EC94 0x0030 - _0807ECC4 0x0040 - _0807ECF4 0x0050 + WalkForward 0x0010 + WalkNorth 0x0020 + WalkEast 0x0030 + WalkSouth 0x0040 + WalkWest 0x0050 _0807ED24 0x0000, 0x0000, 0x0000 _0807EDD4 0x0000, 0x0000 _0807EE04 0x0000, 0x0000 @@ -68,7 +68,7 @@ SCRIPT_START script_08016482 ModRupees 0xff38 ModHealth 0x0010 IncreaseMaxHealth - _0807F050 0x0001 + GiveKinstone 0x0001 GivePlayerItem 0x0001 GetInventoryValue 0x0001 _0807F078 0x0001, 0x0002 diff --git a/data/scripts/unused/script_080165A4.inc b/data/scripts/unused/script_080165A4.inc index f3be3358..2f111b6f 100644 --- a/data/scripts/unused/script_080165A4.inc +++ b/data/scripts/unused/script_080165A4.inc @@ -2,7 +2,7 @@ SCRIPT_START script_080165A4 BeginBlock DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 _0807E9D4 EndBlock script_080165B2: diff --git a/data/scripts/veilFalls/script_BigGoron3.inc b/data/scripts/veilFalls/script_BigGoron3.inc index b6531c84..1718deb5 100644 --- a/data/scripts/veilFalls/script_BigGoron3.inc +++ b/data/scripts/veilFalls/script_BigGoron3.inc @@ -6,7 +6,7 @@ SCRIPT_START script_BigGoron3 script_0800934E: CheckEntityInteractType JumpIfNot script_0800934E - _0807E864 + SetPlayerIdle Call sub_0807DF28 Call sub_0806D638 _0807F0B4 0x0001 @@ -22,7 +22,7 @@ script_08009376: CameraTargetPlayer Wait 0x002d _0807F0B4 0x0004 - _0807E878 + EnablePlayerControl Call sub_0807DF50 Jump script_0800934E SCRIPT_END diff --git a/data/scripts/veilFalls/script_BigGoronMirrorShield.inc b/data/scripts/veilFalls/script_BigGoronMirrorShield.inc index 43fbb794..c0d457c7 100644 --- a/data/scripts/veilFalls/script_BigGoronMirrorShield.inc +++ b/data/scripts/veilFalls/script_BigGoronMirrorShield.inc @@ -22,7 +22,7 @@ SCRIPT_START script_BigGoronMirrorShield Call sub_0806D620 Wait 0x003c WaitPlayerGetItem - _0807EB8C + FaceAwayFromPlayer MessageNoOverlap 0x1d0c WaitUntilTextboxCloses Wait 0x000a diff --git a/data/scripts/veilFalls/script_BigGoronTalk.inc b/data/scripts/veilFalls/script_BigGoronTalk.inc index ceb73548..df44f817 100644 --- a/data/scripts/veilFalls/script_BigGoronTalk.inc +++ b/data/scripts/veilFalls/script_BigGoronTalk.inc @@ -78,7 +78,7 @@ script_080093EE: .endif .endif Call sub_0806D5D4 - _0807EB8C + FaceAwayFromPlayer MessageNoOverlap 0x1d09 WaitUntilTextboxCloses Wait 0x000a diff --git a/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc b/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc index 61995039..08f77eee 100644 --- a/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc +++ b/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc @@ -11,11 +11,11 @@ SCRIPT_START script_NPC4ESourceOfTheFlow script_08015FE4: _0807EA4C _0807E9F0 - _0807E864 + SetPlayerIdle CheckKinstoneFused 0x0009 JumpIf script_08015FFE Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_08015FE4 script_08015FFE: _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc b/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc index 9bd85e9f..93cd157c 100644 --- a/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc +++ b/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc @@ -4,10 +4,10 @@ SCRIPT_START script_NPC4ESouurceOfTheFlowOpening WaitForSyncFlagAndClear 0x0000000c _0807F0C8 0x0000, 0x0000 PlaySound SFX_SECRET - _0807EB28 0x0b1f + EzloMessage 0x0b1f WaitUntilTextboxCloses Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08016028: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc b/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc index d14749c2..a8e0f613 100644 --- a/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc +++ b/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc @@ -8,7 +8,7 @@ SCRIPT_START script_Object3ELeftStoneOpening DoPostScriptAction 0x0010 Wait 0x003c SetEntitySpeed 0x0020 - _0807ECF4 0x0080 + WalkWest 0x0080 Wait 0x001e DoPostScriptAction 0x0010 SetSyncFlag 0x00000008 diff --git a/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc b/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc index b8dfa814..53d2fb10 100644 --- a/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc +++ b/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc @@ -8,7 +8,7 @@ SCRIPT_START script_Object3ERightStoneOpening DoPostScriptAction 0x0010 Wait 0x003c SetEntitySpeed 0x0020 - _0807EC94 0x0080 + WalkEast 0x0080 Wait 0x001e DoPostScriptAction 0x0010 SetSyncFlag 0x00000004 diff --git a/data/scripts/veilFalls/script_Object6AMirrorShield.inc b/data/scripts/veilFalls/script_Object6AMirrorShield.inc index 63bca6f6..ad578502 100644 --- a/data/scripts/veilFalls/script_Object6AMirrorShield.inc +++ b/data/scripts/veilFalls/script_Object6AMirrorShield.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object6AMirrorShield SetEntitySpeed 0x0180 EndBlock Wait 0x003c - SetEntity0x20 0x00018000 + SetEntityVelocity 0x00018000 Call sub_0806D858 script_080094EA: _0807EE30 diff --git a/data/scripts/veilFalls/script_Object6AVeilFallsTop.inc b/data/scripts/veilFalls/script_Object6AVeilFallsTop.inc index a112bcb8..a17305b5 100644 --- a/data/scripts/veilFalls/script_Object6AVeilFallsTop.inc +++ b/data/scripts/veilFalls/script_Object6AVeilFallsTop.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object6AVeilFallsTop SetEntitySpeed 0x0080 EndBlock Wait 0x003c - SetEntity0x20 0x00018000 + SetEntityVelocity 0x00018000 script_080094BC: _0807EE30 JumpIfNot script_080094BC diff --git a/data/scripts/westernWood/script_ForestMinish1.inc b/data/scripts/westernWood/script_ForestMinish1.inc index f31443f3..3e681372 100644 --- a/data/scripts/westernWood/script_ForestMinish1.inc +++ b/data/scripts/westernWood/script_ForestMinish1.inc @@ -13,8 +13,8 @@ script_0800C55E: Jump script_0800C55E script_0800C572: EndBlock - _0807E864 + SetPlayerIdle Call sub_08060208 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800C55E diff --git a/data/scripts/westernWood/script_MoblinLady.inc b/data/scripts/westernWood/script_MoblinLady.inc index 75d7093e..7c1fb498 100644 --- a/data/scripts/westernWood/script_MoblinLady.inc +++ b/data/scripts/westernWood/script_MoblinLady.inc @@ -1,15 +1,15 @@ @ Western Wood MoblinLady in Percys house SCRIPT_START script_MoblinLady BeginBlock - _0807EB74 + FacePlayer _0807E9D4 DoPostScriptAction 0x000a EndBlock script_08012338: CheckEntityInteractType JumpIfNot script_08012338 - _0807EB74 - _0807E864 + FacePlayer + SetPlayerIdle MessageFromTarget 0x2304 WaitUntilTextboxCloses CheckLocalFlag 0x0042 @@ -18,5 +18,5 @@ script_08012338: GivePlayerItem 0x0057 WaitPlayerGetItem script_0801235A: - _0807E878 + EnablePlayerControl Jump script_08012338 diff --git a/data/scripts/westernWood/script_MoblinLadyDisguised.inc b/data/scripts/westernWood/script_MoblinLadyDisguised.inc index 3000aea1..576f873d 100644 --- a/data/scripts/westernWood/script_MoblinLadyDisguised.inc +++ b/data/scripts/westernWood/script_MoblinLadyDisguised.inc @@ -1,7 +1,7 @@ @ Western Wood Moblin disguised as Townsperson in Percys house SCRIPT_START script_MoblinLadyDisguised BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 Call sub_08061FD8 _0807E9D4 DoPostScriptAction 0x000a @@ -17,12 +17,12 @@ script_08012298: CheckEntityInteractType JumpIfNot script_08012284 EndBlock - _0807EB74 - _0807E864 + FacePlayer + SetPlayerIdle Call sub_08061FD8 MessageFromTarget 0x2302 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl SetGlobalFlag 0x001e Jump script_08012284 script_080122BA: @@ -36,17 +36,17 @@ script_080122CE: CheckEntityInteractType JumpIfNot script_080122BA EndBlock - _0807EB74 - _0807E864 + FacePlayer + SetPlayerIdle Call sub_08061FD8 MessageFromTarget 0x2303 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_080122BA script_080122EC: EndBlock - _0807EB74 - _0807E864 + FacePlayer + SetPlayerIdle Call sub_08061FD8 DoPostScriptAction 0x000b Call sub_08061FB0 @@ -57,7 +57,7 @@ script_080122EC: PlaySound SFX_SECRET SetLocalFlag 0x0043 Wait 0x001e - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .align 2, 0 diff --git a/data/scripts/westernWood/script_PercyInside.inc b/data/scripts/westernWood/script_PercyInside.inc index d0794615..e1c5666a 100644 --- a/data/scripts/westernWood/script_PercyInside.inc +++ b/data/scripts/westernWood/script_PercyInside.inc @@ -1,7 +1,7 @@ @ Tilby Highlands Percy in Tree or in his house SCRIPT_START script_PercyInside BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a Call sub_0806B60C @@ -9,12 +9,12 @@ SCRIPT_START script_PercyInside script_08012E9E: CheckEntityInteractType JumpIfNot script_08012E9E - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer DoPostScriptAction 0x0001 Call sub_0806B4F0 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0000 Jump script_08012E9E .2byte 0x0000 diff --git a/data/scripts/westernWood/script_PercyOutside.inc b/data/scripts/westernWood/script_PercyOutside.inc index e34359d9..612d4b1a 100644 --- a/data/scripts/westernWood/script_PercyOutside.inc +++ b/data/scripts/westernWood/script_PercyOutside.inc @@ -1,7 +1,7 @@ @ Trilby Highlands Percy in front of house SCRIPT_START script_PercyOutside BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x00000008 DoPostScriptAction 0x000a Call sub_0806B60C @@ -9,12 +9,12 @@ SCRIPT_START script_PercyOutside script_08012EDC: CheckEntityInteractType JumpIfNot script_08012EDC - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x0000000c Call sub_0806B4F0 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl CallWithArg sub_0807F3D8, 0x00000008 Jump script_08012EDC diff --git a/data/scripts/windRuins/script_EzloTalkFoW.inc b/data/scripts/windRuins/script_EzloTalkFoW.inc index 8ac839e1..8370f5ef 100644 --- a/data/scripts/windRuins/script_EzloTalkFoW.inc +++ b/data/scripts/windRuins/script_EzloTalkFoW.inc @@ -1,12 +1,12 @@ @ Ezlo talk after Wind Ruins SCRIPT_START script_EzloTalkFoW - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB28 0x1c03 + EzloMessage 0x1c03 WaitUntilTextboxCloses SetLocalFlagByBank 0x0100, 0x0003 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc b/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc index b3a0d2f2..b4e78dbb 100644 --- a/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc +++ b/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc @@ -9,14 +9,14 @@ script_0800D8F4: CheckInventory1 0x0017 JumpIfNot script_0800D8F4 Call sub_0807DF28 - _0807E864 + SetPlayerIdle WaitPlayerGetItem - _0807EB28 0x1325 + EzloMessage 0x1325 WaitUntilTextboxCloses PlaySound SFX_113 SetIntVariable 0x00000000 Call sub_0806DA1C - _0807E878 + EnablePlayerControl Call sub_0807DF50 script_0800D924: DoPostScriptAction 0x0006 diff --git a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc index 3c0338b0..7d205905 100644 --- a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc +++ b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc @@ -9,7 +9,7 @@ SCRIPT_START script_Npc4EWindRuinsTextBoard script_0800D88E: CheckEntityInteractType JumpIfNot script_0800D88E - _0807E864 + SetPlayerIdle Call sub_0807DF28 CheckLocalFlag 0x0045 JumpIf script_0800D8B0 @@ -29,6 +29,6 @@ script_0800D8CE: JumpIfNot script_0800D8CE script_0800D8D6: Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800D88E .2byte 0x0000 diff --git a/data/scripts/windRuins/script_PlayerAtTextboard.inc b/data/scripts/windRuins/script_PlayerAtTextboard.inc index a3c2a068..b8b909df 100644 --- a/data/scripts/windRuins/script_PlayerAtTextboard.inc +++ b/data/scripts/windRuins/script_PlayerAtTextboard.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerAtTextboard EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x00a0, 0x0078 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC |