diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2022-12-21 23:40:27 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2022-12-21 23:40:27 +0100 |
| commit | c28018843601b99907ab79ef3fd9e689b078e384 (patch) | |
| tree | 6314f7b3d36863e0fc9da44e1626fcefc3261848 /data/scripts | |
| parent | ec0678872fd29522f2b93a73af8a6196dd0fdbe8 (diff) | |
Fix paths
Diffstat (limited to 'data/scripts')
142 files changed, 272 insertions, 272 deletions
diff --git a/data/scripts/castorWilds/script_CutsceneOrchestrator.inc b/data/scripts/castorWilds/script_CutsceneOrchestrator.inc index d64f1ee5..c90e2862 100644 --- a/data/scripts/castorWilds/script_CutsceneOrchestrator.inc +++ b/data/scripts/castorWilds/script_CutsceneOrchestrator.inc @@ -11,7 +11,7 @@ script_0800B216: Call DisablePauseMenuAndPutAwayItems MoveEntityToPlayer CameraTargetEntity - _0807EDD4 0x0068, 0x0380 + MoveTo 0x0068, 0x0380 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 Call EnablePauseMenu diff --git a/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc b/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc index c09e6ed0..e73e1517 100644 --- a/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc +++ b/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerAtDarknutFight EndBlock WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x00e0 - _0807EDD4 0x0088, 0x0090 + MoveTo 0x0088, 0x0090 ClearLocalFlag 0x0039 DoPostScriptAction 0x0000 DoPostScriptAction 0x0004 diff --git a/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc b/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc index 135e95c0..30c270a4 100644 --- a/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc +++ b/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc @@ -13,7 +13,7 @@ SCRIPT_START script_CutsceneOrchestratorGreatWhirlwindRevealed WaitForSyncFlagAndClear 0x00000004 SetSyncFlag 0x0000000a WaitForSyncFlagAndClear 0x00000004 - _0807EEB4 + MoveToPlayer SetScrollSpeed 4 CameraTargetPlayer Call sub_0807FBCC diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc index 126ad33e..26b0a439 100644 --- a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc +++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc @@ -26,7 +26,7 @@ script_0800D650: SetEntitySpeed 0x0700 SetScrollSpeed 7 CameraTargetEntity - _0807EDD4 0x01e8, 0x01b8 + MoveTo 0x01e8, 0x01b8 Wait 0x003c Call sub_0806DAE8 Wait 0x0078 diff --git a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc index f4372344..e9766d70 100644 --- a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc +++ b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc @@ -1,6 +1,6 @@ @ Cloud Tops NPC4E after Kinstone has been fused SCRIPT_START script_Npc4EKinstoneFused - _0807EEB4 + MoveToPlayer SetScrollSpeed 4 CameraTargetPlayer Call sub_0807FBCC diff --git a/data/scripts/cloudTops/script_PlayerAtSiroc.inc b/data/scripts/cloudTops/script_PlayerAtSiroc.inc index ebdfb81b..a6c2bd7b 100644 --- a/data/scripts/cloudTops/script_PlayerAtSiroc.inc +++ b/data/scripts/cloudTops/script_PlayerAtSiroc.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtSiroc BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0078, 0x0040 + MoveTo 0x0078, 0x0040 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cloudTops/script_WindTribespeople3.inc b/data/scripts/cloudTops/script_WindTribespeople3.inc index 84c60935..b10db604 100644 --- a/data/scripts/cloudTops/script_WindTribespeople3.inc +++ b/data/scripts/cloudTops/script_WindTribespeople3.inc @@ -19,7 +19,7 @@ script_080149DE: SetLocalFlag 0x00b1 DoPostScriptAction 0x000b DoPostScriptAction 0x0001 - _0807EDD4 0x0068, 0x00f8 + MoveTo 0x0068, 0x00f8 PlaySound SFX_SECRET FacePlayer DoPostScriptAction 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc index c5d77432..56c3be62 100644 --- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc +++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc @@ -12,7 +12,7 @@ SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed1 Wait 0x003c PlaySound SFX_123 CallWithArg sub_0807F464, 0x000001e0 - _0807EDD4 0x01e0, 0x01d8 + MoveTo 0x01e0, 0x01d8 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc index 76862484..ef4f7130 100644 --- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc +++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc @@ -7,12 +7,12 @@ SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed2 SetEntitySpeed 0x0100 EndBlock WaitForSyncFlagAndClear 0x00000002 - _0807EDD4 0x01f0, 0x01d8 + MoveTo 0x01f0, 0x01d8 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 script_0800D80C: SetEntitySpeed 0x0100 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 DoPostScriptAction 0x000e Call sub_0806CA5C SetEntityVelocity 0x00040000 diff --git a/data/scripts/cutscene/ezlo/script_EzloCap.inc b/data/scripts/cutscene/ezlo/script_EzloCap.inc index 0c5328b2..9bd3aed2 100644 --- a/data/scripts/cutscene/ezlo/script_EzloCap.inc +++ b/data/scripts/cutscene/ezlo/script_EzloCap.inc @@ -225,7 +225,7 @@ script_08012A3E: SetEntitySpeed 0x0080 Call sub_0806D8A0 script_08012A74: - _0807EE30 + MoveTowardsTarget JumpIfNot script_08012A74 SetAnimation 0x001f WaitUntilTextboxCloses diff --git a/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc b/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc index eaa33a4c..9e784a5c 100644 --- a/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc +++ b/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerDefeatedOctoroks SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x0388, 0x0180 + MoveTo 0x0388, 0x0180 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/intro/script_IntroCameraTarget.inc b/data/scripts/cutscene/intro/script_IntroCameraTarget.inc index 3c3d8b38..13c25f82 100644 --- a/data/scripts/cutscene/intro/script_IntroCameraTarget.inc +++ b/data/scripts/cutscene/intro/script_IntroCameraTarget.inc @@ -13,5 +13,5 @@ SCRIPT_START script_IntroCameraTarget SetSyncFlag 0x00000004 Call sub_08053648 @ Move camera target down - _0807EDD4 0x0240, 0x0228 + MoveTo 0x0240, 0x0228 SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc b/data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc index 8bec701d..0f441d0d 100644 --- a/data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc +++ b/data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc @@ -7,8 +7,8 @@ SCRIPT_START script_PlayerMoveToSmith SetSyncFlag 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c - _0807EDD4 0x0040, 0x0060 - _0807EDD4 0x0060, 0x0068 + MoveTo 0x0040, 0x0060 + MoveTo 0x0060, 0x0068 SetSyncFlag 0x00000004 DoPostScriptAction 0x0000 _0807E8E4_0 @@ -18,7 +18,7 @@ SCRIPT_START script_PlayerMoveToSmith Wait 0x001e SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000002 - _0807EDD4 0x0070, 0x005c + MoveTo 0x0070, 0x005c _0807E8E4_1 DoPostScriptAction 0x0000 Wait 0x000f diff --git a/data/scripts/cutscene/intro/script_SmithIntro.inc b/data/scripts/cutscene/intro/script_SmithIntro.inc index fe1ac39c..bdc21562 100644 --- a/data/scripts/cutscene/intro/script_SmithIntro.inc +++ b/data/scripts/cutscene/intro/script_SmithIntro.inc @@ -24,7 +24,7 @@ SCRIPT_START script_SmithIntro WaitForSyncFlagAndClear 0x00000008 SetAction 0x0001 SetAnimationState 0x0004 - _0807EDD4 0x00b8, 0x005c + MoveTo 0x00b8, 0x005c SetAnimationState 0x0006 DoPostScriptAction 0x0001 MessageFromTarget TEXT_PROLOGUE, 0x04 diff --git a/data/scripts/cutscene/intro/script_SmithIntro2.inc b/data/scripts/cutscene/intro/script_SmithIntro2.inc index ca938451..b5362248 100644 --- a/data/scripts/cutscene/intro/script_SmithIntro2.inc +++ b/data/scripts/cutscene/intro/script_SmithIntro2.inc @@ -14,7 +14,7 @@ SCRIPT_START script_SmithIntro2 StartPlayerScript script_PlayerMoveToSmith Call DisablePauseMenuAndPutAwayItems WaitForSyncFlagAndClear 0x00000008 - _0807EDD4 0x0080, 0x005c + MoveTo 0x0080, 0x005c SetAnimationState 0x0006 DoPostScriptAction 0x0000 Wait 0x000f @@ -32,10 +32,10 @@ SCRIPT_START script_SmithIntro2 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000008 - _0807EDD4 0x007c, 0x005c + MoveTo 0x007c, 0x005c Wait 0x000f DoPostScriptAction 0x000d - _0807EDD4 0x0084, 0x005c + MoveTo 0x0084, 0x005c SetAnimationState 0x0006 DoPostScriptAction 0x000c DoPostScriptAction 0x0000 diff --git a/data/scripts/cutscene/intro/script_ZeldaIntro.inc b/data/scripts/cutscene/intro/script_ZeldaIntro.inc index 9d82ffad..990afc63 100644 --- a/data/scripts/cutscene/intro/script_ZeldaIntro.inc +++ b/data/scripts/cutscene/intro/script_ZeldaIntro.inc @@ -8,7 +8,7 @@ SCRIPT_START script_ZeldaIntro EndBlock WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0007 - _0807EDD4 0x0068, 0x0060 + MoveTo 0x0068, 0x0060 Wait 0x000f MessageFromTarget TEXT_PROLOGUE, 0x01 WaitUntilTextboxCloses diff --git a/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc b/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc index 0b496f45..738d55a5 100644 --- a/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc @@ -4,12 +4,12 @@ SCRIPT_START script_ZeldaLeaveLinksHouse SetEntitySpeed 0x0100 SetAnimationState 0x0006 EndBlock - _0807EDD4 0x0078, 0x0060 - _0807EDD4 0x0078, 0x007c + MoveTo 0x0078, 0x0060 + MoveTo 0x0078, 0x007c Wait 0x001e Call sub_0805368C Wait 0x0008 - _0807EDD4 0x0078, 0x0098 + MoveTo 0x0078, 0x0098 DoPostScriptAction 0x0008 SetFadeTime 0x0010 SetFade5 diff --git a/data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc b/data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc index d86a142b..f6dc08b1 100644 --- a/data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc @@ -7,23 +7,23 @@ SCRIPT_START script_ZeldaMoveToLinksHouse EndBlock WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0007 - _0807EDD4 0x01e8, 0x0200 - _0807EDD4 0x01f8, 0x0218 - _0807EDD4 0x0220, 0x0228 - _0807EDD4 0x0240, 0x0228 + MoveTo 0x01e8, 0x0200 + MoveTo 0x01f8, 0x0218 + MoveTo 0x0220, 0x0228 + MoveTo 0x0240, 0x0228 @ Now the camera follows Zelda CameraTargetEntity - _0807EDD4 0x0290, 0x0228 - _0807EDD4 0x0290, 0x01f8 + MoveTo 0x0290, 0x0228 + MoveTo 0x0290, 0x01f8 SetEntitySpeed 0x0080 - _0807EDD4 0x0290, 0x01c8 + MoveTo 0x0290, 0x01c8 SetEntitySpeed 0x00c0 - _0807EDD4 0x0290, 0x0198 + MoveTo 0x0290, 0x0198 Wait 0x001e @ Door is opening SetSyncFlag 0x00000010 @ Send signal to door - _0807EDD4 0x0290, 0x0190 + MoveTo 0x0290, 0x0190 DoPostScriptAction 0x0008 - _0807EDD4 0x0290, 0x0188 + MoveTo 0x0290, 0x0188 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc index 16bebcaf..67a5eefc 100644 --- a/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc +++ b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc @@ -27,8 +27,8 @@ SCRIPT_START script_ZeldaTalkToSmith WaitUntilTextboxCloses DoPostScriptAction 0x0000 @ Leave room - _0807EDD4 0x0028, 0x0060 - _0807EDD4 0x0000, 0x0060 + MoveTo 0x0028, 0x0060 + MoveTo 0x0000, 0x0060 Call sub_080536A8 Wait 0x001e BeginBlock diff --git a/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc b/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc index daa91183..9f2a8bfe 100644 --- a/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc @@ -4,13 +4,13 @@ SCRIPT_START script_PlayerEnters SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x00b8, 0x0090 + MoveTo 0x00b8, 0x0090 SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000040 DoPostScriptAction 0x0001 - _0807EDD4 0x0088, 0x0078 + MoveTo 0x0088, 0x0078 SetAnimationState 0x0000 DoPostScriptAction 0x0000 Wait 0x000f diff --git a/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc index e971d99d..68a3e12c 100644 --- a/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc @@ -40,7 +40,7 @@ SCRIPT_START script_SmithAtAssembly WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 - _0807EDD4 0x0098, 0x0078 + MoveTo 0x0098, 0x0078 FacePlayer DoPostScriptAction 0x0000 DoPostScriptAction 0x0001 diff --git a/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc b/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc index 28987c7e..6e0017f9 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08015B14 SetAnimation 0x0018 SetEntitySpeed 0x0300 EndBlock - _0807EDD4 0x0248, 0x0218 + MoveTo 0x0248, 0x0218 SetSyncFlag 0x00000020 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc index f5475ac2..3021ba57 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc @@ -1,7 +1,7 @@ @ Player at intro outside castle 1? SCRIPT_START script_PlayerIntroBusinessScrub1 SetEntitySpeed 0x0100 - _0807EDD4 0x0218, 0x0238 + MoveTo 0x0218, 0x0238 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc index 3f6979a5..aeae6cf6 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc @@ -1,7 +1,7 @@ @ Player at intro outside castle SCRIPT_START script_PlayerIntroBusinessScrub2 SetEntitySpeed 0x0100 - _0807EDD4 0x0238, 0x0228 + MoveTo 0x0238, 0x0228 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc index b9ea15ff..28a713d3 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc @@ -1,7 +1,7 @@ @ Intro Outside Castle Player SCRIPT_START script_PlayerIntroBusinessScrub3 SetEntitySpeed 0x0100 - _0807EDD4 0x0248, 0x0208 + MoveTo 0x0248, 0x0208 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 diff --git a/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc index 0e44b4ea..a83b2580 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc @@ -13,12 +13,12 @@ SCRIPT_START script_ZeldaIntroBusinessScrub EndBlock DoPostScriptAction 0x0007 FacePlayer - _0807EDD4 0x01f8, 0x02f8 + MoveTo 0x01f8, 0x02f8 SetAnimationState 0x0004 DoPostScriptAction 0x0000 MessageFromTargetPos TEXT_PROLOGUE, 0x11, 0x0002 WaitUntilTextboxCloses - _0807EDD4 0x01f8, 0x0268 + MoveTo 0x01f8, 0x0268 SetEntityPositionRelative 0x0248, 0x0218 SetAnimationState 0x0006 DoPostScriptAction 0x0000 @@ -43,7 +43,7 @@ SCRIPT_START script_ZeldaIntroBusinessScrub SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 - _0807EDD4 0x0238, 0x0238 + MoveTo 0x0238, 0x0238 SetAnimationState 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a diff --git a/data/scripts/cutscene/introCeremony/script_08011890.inc b/data/scripts/cutscene/introCeremony/script_08011890.inc index b6f22f79..5b03f447 100644 --- a/data/scripts/cutscene/introCeremony/script_08011890.inc +++ b/data/scripts/cutscene/introCeremony/script_08011890.inc @@ -8,7 +8,7 @@ SCRIPT_START script_08011890 EndBlock Wait 0x00f0 Call sub_08094B6C - _0807EDD4 0x01f8, 0x0088 + MoveTo 0x01f8, 0x0088 Call sub_08094B80 PlaySound SFX_1CC SetSyncFlag 0x10000000 diff --git a/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc b/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc index 826ad37f..ac1fba62 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc @@ -17,8 +17,8 @@ SCRIPT_START script_GuardBottomRight Wait 0x003c SetAnimation 0x0014 SetEntitySpeed 0x0100 - _0807EDD4 0x0200, 0x0098 - _0807EDD4 0x0200, 0x00c8 + MoveTo 0x0200, 0x0098 + MoveTo 0x0200, 0x00c8 SetAnimation 0x0013 SetSyncFlag 0x00004000 WaitForSyncFlagAndClear 0x00002000 diff --git a/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc b/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc index a2cdf5ff..1d859822 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc @@ -37,8 +37,8 @@ script_08011312: Wait 0x003c SetAnimation 0x0014 SetEntitySpeed 0x0100 - _0807EDD4 0x01f0, 0x0098 - _0807EDD4 0x01f0, 0x00c8 + MoveTo 0x01f0, 0x0098 + MoveTo 0x01f0, 0x00c8 SetAnimation 0x0013 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 diff --git a/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc b/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc index b92edbd5..1b10d516 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc @@ -20,16 +20,16 @@ SCRIPT_START script_GuardTopLeft WaitForSyncFlagAndClear 0x00008000 SetAnimation 0x0014 SetEntitySpeed 0x0100 - _0807EDD4 0x01e8, 0x0098 + MoveTo 0x01e8, 0x0098 SetEntitySpeed 0x0040 - _0807EEF4 0x0000, 0x0010 + MoveToOffset 0x0000, 0x0010 SetAnimation 0x0013 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x000d SetAnimation 0x0014 SetEntitySpeed 0x0020 - _0807EEF4 0x0000, 0xfff0 + MoveToOffset 0x0000, 0xfff0 SetAnimation 0x0013 DoPostScriptAction 0x0010 SetSyncFlag 0x00010000 diff --git a/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc b/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc index 5a29854c..b6fb34c5 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc @@ -20,16 +20,16 @@ SCRIPT_START script_GuardTopRight WaitForSyncFlagAndClear 0x00020000 SetAnimation 0x0014 SetEntitySpeed 0x0100 - _0807EDD4 0x0208, 0x0098 + MoveTo 0x0208, 0x0098 SetEntitySpeed 0x0040 - _0807EEF4 0x0000, 0x0010 + MoveToOffset 0x0000, 0x0010 SetAnimation 0x0013 SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 DoPostScriptAction 0x000d SetAnimation 0x0014 SetEntitySpeed 0x0020 - _0807EEF4 0x0000, 0xfff0 + MoveToOffset 0x0000, 0xfff0 SetAnimation 0x0013 DoPostScriptAction 0x0010 SetSyncFlag 0x00040000 diff --git a/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc b/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc index afefc1f7..aed20525 100644 --- a/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc +++ b/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc @@ -10,7 +10,7 @@ SCRIPT_START script_KingDaltusIntroCeremony DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 SetEntitySpeed 0x0040 - _0807EDD4 0x01f8, 0x0048 + MoveTo 0x01f8, 0x0048 DoPostScriptAction 0x0000 SetSyncFlag 0x00000080 WaitForSyncFlagAndClear 0x00000040 diff --git a/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc b/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc index 124fe933..9ffed96c 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerIntroCastle BeginBlock SetEntitySpeed 0x0080 EndBlock - _0807EDD4 0x01e8, 0x0050 + MoveTo 0x01e8, 0x0050 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 diff --git a/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc b/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc index 13efecf9..0860ba5f 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerProtectingZelda EndBlock SetEntitySpeed 0x0200 DoPostScriptAction 0x0001 - _0807EDD4 0x01d8, 0x0068 + MoveTo 0x01d8, 0x0068 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 diff --git a/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc b/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc index 24b9f903..47a5a071 100644 --- a/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc +++ b/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc @@ -8,9 +8,9 @@ SCRIPT_START script_VaatiDarkMagic EndBlock WaitForSyncFlagAndClear 0x08000000 Call sub_08094B6C - _0807EDD4 0x01d8, 0x0078 + MoveTo 0x01d8, 0x0078 StartPlayerScript script_PlayerFainting - _0807EDD4 0x01d8, 0x0058 + MoveTo 0x01d8, 0x0058 Call sub_08094B80 PlaySound SFX_VO_ZELDA7 PlaySound SFX_1C6 diff --git a/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc b/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc index d34dd18e..9e3c5845 100644 --- a/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc +++ b/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc @@ -7,7 +7,7 @@ SCRIPT_START script_VaatiIntroCeremony Call DeleteHitbox WaitForSyncFlagAndClear 0x00000100 DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x00d0 + MoveTo 0x01f8, 0x00d0 DoPostScriptAction 0x0000 SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000100 @@ -44,7 +44,7 @@ SCRIPT_START script_VaatiIntroCeremony WaitForSyncFlagAndClear 0x00000100 SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 - _0807EDD4 0x01d8, 0x00a8 + MoveTo 0x01d8, 0x00a8 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000200 @@ -64,7 +64,7 @@ SCRIPT_START script_VaatiIntroCeremony WaitForSyncFlagAndClear 0x00000100 SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x0098 + MoveTo 0x01f8, 0x0098 SetAnimationState 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x0004 diff --git a/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc b/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc index 9ccd1167..71d1229a 100644 --- a/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc +++ b/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc @@ -17,20 +17,20 @@ script_080111F6: script_08011206: DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x0050 + MoveTo 0x01f8, 0x0050 FacePlayer DoPostScriptAction 0x0000 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x0020 + MoveTo 0x01f8, 0x0020 DoPostScriptAction 0x0008 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 SetEntitySpeed 0x0040 - _0807EDD4 0x01e8, 0x0040 + MoveTo 0x01e8, 0x0040 DoPostScriptAction 0x0000 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 @@ -38,7 +38,7 @@ script_08011206: SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0001 - _0807EDD4 0x01d8, 0x0058 + MoveTo 0x01d8, 0x0058 DoPostScriptAction 0x0000 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc index 0884bbc7..936f7c59 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc @@ -74,7 +74,7 @@ SCRIPT_START script_Npc4EIntroCastle SetSyncFlag 0x00000100 SetEntityPositionRelative 0x01f8, 0x0220 SetEntitySpeed 0x0100 - _0807EDD4 0x01f8, 0x0098 + MoveTo 0x01f8, 0x0098 Wait 0x003c WaitForSyncFlagAndClear 0x00000200 SetSyncFlag 0x00280000 diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro2.inc b/data/scripts/cutscene/introTown/script_PlayerIntro2.inc index 02058ebd..d13433e5 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro2.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro2.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerIntro2 BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x00a0, 0x0278 + MoveTo 0x00a0, 0x0278 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro3.inc b/data/scripts/cutscene/introTown/script_PlayerIntro3.inc index 2ee42514..5bb61b0a 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro3.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro3.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerIntro3 BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0078, 0x01c0 + MoveTo 0x0078, 0x01c0 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro4.inc b/data/scripts/cutscene/introTown/script_PlayerIntro4.inc index ad1b34dd..83a20961 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro4.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro4.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerIntro4 BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0108, 0x01c8 + MoveTo 0x0108, 0x01c8 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro5.inc b/data/scripts/cutscene/introTown/script_PlayerIntro5.inc index f1393d94..3f0be7a3 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro5.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro5.inc @@ -10,7 +10,7 @@ script_0800FAFC: script_0800FB06: CallWithArg sub_0807F464, 0x000000e8 script_0800FB10: - _0807EDD4 0x00e8, 0x0270 + MoveTo 0x00e8, 0x0270 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc b/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc index a9d511f9..d4a8caf7 100644 --- a/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc @@ -18,7 +18,7 @@ script_0800FB6C: SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 - _0807EDD4 0x00b8, 0x0318 + MoveTo 0x00b8, 0x0318 SetEntityPositionRelative 0x00a0, 0x0260 SetAnimationState 0x0000 DoPostScriptAction 0x0001 @@ -36,9 +36,9 @@ script_0800FBAE: SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 - _0807EDD4 0x00a0, 0x0268 - _0807EDD4 0x0070, 0x0268 - _0807EDD4 0x0070, 0x0208 + MoveTo 0x00a0, 0x0268 + MoveTo 0x0070, 0x0268 + MoveTo 0x0070, 0x0208 SetEntityPositionRelative 0x0078, 0x01a8 SetAnimationState 0x0000 DoPostScriptAction 0x0001 @@ -55,7 +55,7 @@ script_0800FC06: SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 - _0807EDD4 0x00f8, 0x01a8 + MoveTo 0x00f8, 0x01a8 SetEntityPositionRelative 0x0118, 0x01c8 SetAnimationState 0x0002 DoPostScriptAction 0x0001 @@ -72,7 +72,7 @@ script_0800FC52: SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 - _0807EDD4 0x0118, 0x0260 + MoveTo 0x0118, 0x0260 SetEntityPositionRelative 0x00f8, 0x0270 SetAnimationState 0x0000 DoPostScriptAction 0x0001 diff --git a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc index fa1a008d..96bf8f6d 100644 --- a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc @@ -9,9 +9,9 @@ SCRIPT_START script_HurdyGurdyManFirstKinstone SetAnimationState 0x0002 WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 - _0807EDD4 0x01b8, 0x0328 + MoveTo 0x01b8, 0x0328 SetSyncFlag 0x00000040 - _0807EDD4 0x01f8, 0x0328 + MoveTo 0x01f8, 0x0328 SetAnimationState 0x0004 SetAnimation 0x0008 _0807E8E4_0 @@ -108,7 +108,7 @@ script_0800F314: WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 SetAnimationState 0x0002 - _0807EEF4 0x00c0, 0x0000 + MoveToOffset 0x00c0, 0x0000 SetSyncFlag 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone1.inc b/data/scripts/cutscene/kinstones/script_KidKinstone1.inc index 747f8a64..53d49396 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone1.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone1.inc @@ -11,9 +11,9 @@ SCRIPT_START script_KidKinstone1 Call SetPriorityMessage WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0007 - _0807EDD4 0x01f8, 0x0318 - _0807EDD4 0x0208, 0x0318 - _0807EDD4 0x0208, 0x0338 + MoveTo 0x01f8, 0x0318 + MoveTo 0x0208, 0x0318 + MoveTo 0x0208, 0x0338 SetAnimationState 0x0006 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a @@ -37,7 +37,7 @@ script_0800F402: Wait 0x0010 SetEntitySpeed 0x0100 WalkNorth 0x0010 - _0807EDD4 0x0288, 0x0328 + MoveTo 0x0288, 0x0328 SetSyncFlag 0x00000080 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone2.inc b/data/scripts/cutscene/kinstones/script_KidKinstone2.inc index e181fe47..820b1f79 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone2.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone2.inc @@ -11,8 +11,8 @@ SCRIPT_START script_KidKinstone2 Call SetPriorityMessage WaitForSyncFlagAndClear 0x00000008 DoPostScriptAction 0x0007 - _0807EDD4 0x01d8, 0x0328 - _0807EDD4 0x01f8, 0x0348 + MoveTo 0x01d8, 0x0328 + MoveTo 0x01f8, 0x0348 SetAnimationState 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a @@ -37,7 +37,7 @@ script_0800F490: SetEntitySpeed 0x0100 WalkEast 0x0010 WalkNorth 0x0020 - _0807EDD4 0x0288, 0x0328 + MoveTo 0x0288, 0x0328 SetSyncFlag 0x00000100 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone3.inc b/data/scripts/cutscene/kinstones/script_KidKinstone3.inc index 18cb648c..7fec2ebb 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone3.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone3.inc @@ -11,8 +11,8 @@ SCRIPT_START script_KidKinstone3 Call SetPriorityMessage WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0007 - _0807EDD4 0x01c8, 0x0328 - _0807EDD4 0x01e8, 0x0338 + MoveTo 0x01c8, 0x0328 + MoveTo 0x01e8, 0x0338 SetAnimationState 0x0002 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a @@ -36,7 +36,7 @@ script_0800F524: Wait 0x0028 SetEntitySpeed 0x0100 WalkNorth 0x0010 - _0807EDD4 0x0288, 0x0328 + MoveTo 0x0288, 0x0328 SetSyncFlag 0x00000200 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc index 937cf7a9..36f40dcf 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc @@ -8,7 +8,7 @@ SCRIPT_START script_PlayerAtFirstKinstone DoPostScriptAction 0x0004 Wait 0x003c DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x0338 + MoveTo 0x01f8, 0x0338 SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc index f0e29084..028538fa 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc @@ -9,7 +9,7 @@ SCRIPT_START script_ForestMinish5 EndBlock WaitForSyncFlagAndClear 0x00000200 DoPostScriptAction 0x0007 - _0807EDD4 0x0208, 0x0308 + MoveTo 0x0208, 0x0308 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 @@ -22,13 +22,13 @@ SCRIPT_START script_ForestMinish5 WaitForSyncFlagAndClear 0x00000200 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f - _0807EDD4 0x0208, 0x0328 + MoveTo 0x0208, 0x0328 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 WaitForSyncFlagAndClear 0x00000200 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f - _0807EDD4 0x0208, 0x02b0 + MoveTo 0x0208, 0x02b0 SetSyncFlag 0x00000400 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc index ea9e43fd..d58f9983 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc @@ -11,20 +11,20 @@ SCRIPT_START script_ForestMinish6 DoPostScriptAction 0x0007 SetAnimationState 0x0002 DoPostScriptAction 0x0001 - _0807EDD4 0x01a8, 0x0330 + MoveTo 0x01a8, 0x0330 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f - _0807EDD4 0x01f8, 0x0348 + MoveTo 0x01f8, 0x0348 DoPostScriptAction 0x0000 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f - _0807EDD4 0x0178, 0x0328 + MoveTo 0x0178, 0x0328 SetSyncFlag 0x00001000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc index db6366f1..a38ea170 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc @@ -9,14 +9,14 @@ SCRIPT_START script_ForestMinish7 EndBlock WaitForSyncFlagAndClear 0x00002000 DoPostScriptAction 0x0007 - _0807EDD4 0x0258, 0x0330 + MoveTo 0x0258, 0x0330 SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00004000 WaitForSyncFlagAndClear 0x00002000 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f - _0807EDD4 0x0218, 0x0340 + MoveTo 0x0218, 0x0340 DoPostScriptAction 0x0000 SetSyncFlag 0x00004000 WaitForSyncFlagAndClear 0x00002000 @@ -28,7 +28,7 @@ SCRIPT_START script_ForestMinish7 WaitForSyncFlagAndClear 0x00002000 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f - _0807EDD4 0x0288, 0x02d8 + MoveTo 0x0288, 0x02d8 SetSyncFlag 0x00004000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc index 302f4367..b0058910 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc @@ -9,14 +9,14 @@ SCRIPT_START script_ForestMinish8 EndBlock WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x0007 - _0807EDD4 0x01b8, 0x0320 + MoveTo 0x01b8, 0x0320 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f - _0807EDD4 0x01f8, 0x0330 + MoveTo 0x01f8, 0x0330 DoPostScriptAction 0x0000 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 @@ -28,7 +28,7 @@ SCRIPT_START script_ForestMinish8 WaitForSyncFlagAndClear 0x00008000 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f - _0807EDD4 0x0188, 0x02d8 + MoveTo 0x0188, 0x02d8 SetSyncFlag 0x00010000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc index 38805f14..e07a448d 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc @@ -9,20 +9,20 @@ SCRIPT_START script_ForestMinish9 EndBlock WaitForSyncFlagAndClear 0x00020000 DoPostScriptAction 0x0007 - _0807EDD4 0x0268, 0x0338 + MoveTo 0x0268, 0x0338 SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f - _0807EDD4 0x0218, 0x0350 + MoveTo 0x0218, 0x0350 DoPostScriptAction 0x0000 SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f - _0807EDD4 0x02a8, 0x0328 + MoveTo 0x02a8, 0x0328 SetSyncFlag 0x00040000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc b/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc index 2e9cc5ce..8598a952 100644 --- a/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc +++ b/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc @@ -4,9 +4,9 @@ SCRIPT_START script_PlayerAtVillageIntro SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x0208, 0x0358 + MoveTo 0x0208, 0x0358 SetEntitySpeed 0x0080 - _0807EDD4 0x0208, 0x0340 + MoveTo 0x0208, 0x0340 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 Call SetPlayerActionNormal diff --git a/data/scripts/cutscene/originStory/script_CutsceneMiscObjectDarkMagic.inc b/data/scripts/cutscene/originStory/script_CutsceneMiscObjectDarkMagic.inc index 4055742b..ecb017bb 100644 --- a/data/scripts/cutscene/originStory/script_CutsceneMiscObjectDarkMagic.inc +++ b/data/scripts/cutscene/originStory/script_CutsceneMiscObjectDarkMagic.inc @@ -8,13 +8,13 @@ SCRIPT_START script_CutsceneMiscObjectDarkMagic Wait 0x0078 PlaySound SFX_1C5 Call sub_08094B6C - _0807EDD4 0x0078, 0x00b8 + MoveTo 0x0078, 0x00b8 PlaySound SFX_1C6 Call sub_08094B80 SetSyncFlag 0x00020000 SetEntitySpeed 0x0080 WaitForSyncFlagAndClear 0x00040000 - _0807EDD4 0x0078, 0x00c8 + MoveTo 0x0078, 0x00c8 SetSyncFlag 0x00080000 WaitForSyncFlagAndClear 0x00040000 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc b/data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc index b835a4ce..9bd8a859 100644 --- a/data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc +++ b/data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc @@ -8,7 +8,7 @@ SCRIPT_START script_CutsceneMiscObjectMinishCap WaitForSyncFlagAndClear 0x00000080 CallWithArg CreateRepeatedSoundManager, 0x00000003 Call sub_08094B0C - _0807EDD4 0x0078, 0x0068 + MoveTo 0x0078, 0x0068 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 _0807EF3C -128, 0x0000 diff --git a/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc b/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc index cbdf8c8b..591e30c7 100644 --- a/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc +++ b/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc @@ -13,7 +13,7 @@ SCRIPT_START script_EzloCapExplainingOriginStory SetAnimation 0x0018 Call sub_0806D8A0 script_080153C2: - _0807EE30 + MoveTowardsTarget JumpIfNot script_080153C2 SetAnimation 0x001f StartPlayerScript script_PlayerReceivedExposition diff --git a/data/scripts/cutscene/originStory/script_MinishEzlo.inc b/data/scripts/cutscene/originStory/script_MinishEzlo.inc index 7b5e52c9..631bacb8 100644 --- a/data/scripts/cutscene/originStory/script_MinishEzlo.inc +++ b/data/scripts/cutscene/originStory/script_MinishEzlo.inc @@ -9,7 +9,7 @@ SCRIPT_START script_MinishEzlo CallWithArg sub_0806AF60, 0x00000000 WaitForSyncFlagAndClear 0x00008000 CallWithArg sub_0806AF60, 0x00000004 - _0807EDD4 0x0078, 0x00b8 + MoveTo 0x0078, 0x00b8 SetAnimationState 0x0000 CallWithArg sub_0806AF60, 0x00000000 SetSyncFlag 0x00010000 @@ -17,7 +17,7 @@ SCRIPT_START script_MinishEzlo DoPostScriptAction 0x000d SetAnimationState 0x0000 CallWithArg sub_0806AF60, 0x00000004 - _0807EDD4 0x0078, 0x00c8 + MoveTo 0x0078, 0x00c8 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 SetAnimationState 0x0000 diff --git a/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc b/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc index 6269f54b..5bdd4252 100644 --- a/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc +++ b/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtVaatisAppearance SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x00b8 + MoveTo 0x01f8, 0x00b8 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc b/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc index 88e9a2fd..18c67273 100644 --- a/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc +++ b/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerDefeatedMoblins SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x0148 + MoveTo 0x01f8, 0x0148 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc b/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc index 42f14dc0..06615df8 100644 --- a/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc +++ b/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerTryToFollowVaati SetEntitySpeed 0x0200 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x0148 + MoveTo 0x01f8, 0x0148 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/outro/script_CutsceneMiscObjectMinishCapOutro.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectMinishCapOutro.inc index 6888f3eb..11974a0b 100644 --- a/data/scripts/cutscene/outro/script_CutsceneMiscObjectMinishCapOutro.inc +++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectMinishCapOutro.inc @@ -13,7 +13,7 @@ SCRIPT_START script_CutsceneMiscObjectMinishCapOutro CallWithArg sub_080960C4, script_CutsceneMiscObjectEzloDismounting SetAnimation 0x0002 Call sub_08094B0C - _0807EDD4 0x0068, 0x0088 + MoveTo 0x0068, 0x0088 Call sub_08094B80 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000008 diff --git a/data/scripts/cutscene/outro/script_EzloCapOutro.inc b/data/scripts/cutscene/outro/script_EzloCapOutro.inc index 5d0daa98..b4c39e81 100644 --- a/data/scripts/cutscene/outro/script_EzloCapOutro.inc +++ b/data/scripts/cutscene/outro/script_EzloCapOutro.inc @@ -17,7 +17,7 @@ SCRIPT_START script_EzloCapOutro ClearSyncFlag 0x00000800 CallWithArg sub_080960C4, script_CutsceneMiscObjectEzloDismounting Wait 0x003c - _0807EDD4 0x0088, 0x0068 + MoveTo 0x0088, 0x0068 Wait 0x0078 SetSyncFlag 0x00000800 PlaySound SFX_143 diff --git a/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc index abe8787a..91afc910 100644 --- a/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc +++ b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc @@ -47,12 +47,12 @@ SCRIPT_START script_MinishEzloGoodbye SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0080 - _0807EEF4 0x0000, 0xfff0 + MoveToOffset 0x0000, 0xfff0 Wait 0x003c - _0807EEF4 0x0000, 0xfff0 + MoveToOffset 0x0000, 0xfff0 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - _0807EDD4 0x0088, 0x0040 + MoveTo 0x0088, 0x0040 SetSyncFlag 0x00000004 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc b/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc index 1959b1e5..b3d28b53 100644 --- a/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc +++ b/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtEzlo BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0088, 0x0080 + MoveTo 0x0088, 0x0080 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/reveal/script_08013494.inc b/data/scripts/cutscene/reveal/script_08013494.inc index 9eb632de..d3141e52 100644 --- a/data/scripts/cutscene/reveal/script_08013494.inc +++ b/data/scripts/cutscene/reveal/script_08013494.inc @@ -8,7 +8,7 @@ SCRIPT_START script_08013494 EndBlock Wait 0x005a Call sub_08094B6C - _0807EDD4 0x0098, 0x0080 + MoveTo 0x0098, 0x0080 BeginBlock Call sub_08094B80 PlaySound SFX_1CC diff --git a/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc b/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc index 106508d6..d63a6fec 100644 --- a/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc +++ b/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtPicture SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x0098, 0x0058 + MoveTo 0x0098, 0x0058 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 diff --git a/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc index aea96906..2249aaad 100644 --- a/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc +++ b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtTakeover SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x0168, 0x0058 + MoveTo 0x0168, 0x0058 SetAnimationState 0x0004 DoPostScriptAction 0x0000 CallWithArg SetPlayerAnimation2, 0x000003c5 diff --git a/data/scripts/dhc/script_GuardStone2.inc b/data/scripts/dhc/script_GuardStone2.inc index 77848677..b67d32d2 100644 --- a/data/scripts/dhc/script_GuardStone2.inc +++ b/data/scripts/dhc/script_GuardStone2.inc @@ -61,10 +61,10 @@ script_0800E2AE: EndBlock SetAnimationState 0x0000 CallWithArg sub_0807F3D8, 0x00000004 - _0807EDD4 0x0088, 0x0168 + MoveTo 0x0088, 0x0168 SetAnimationState 0x0006 CallWithArg sub_0807F3D8, 0x00000004 - _0807EDD4 0x0070, 0x0168 + MoveTo 0x0070, 0x0168 FacePlayer CallWithArg sub_0807F3D8, 0x00000000 _0807E9D4 diff --git a/data/scripts/dhc/script_PlayerCastleCollapsing.inc b/data/scripts/dhc/script_PlayerCastleCollapsing.inc index 5ee0ccfe..e2a4b720 100644 --- a/data/scripts/dhc/script_PlayerCastleCollapsing.inc +++ b/data/scripts/dhc/script_PlayerCastleCollapsing.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerCastleCollapsing EndBlock SetAnimationState 0x0004 DoPostScriptAction 0x0000 - _0807EEF4 0x0000, 0x0080 + MoveToOffset 0x0000, 0x0080 SetSyncFlag 0x00000004 Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerCastleEscape.inc b/data/scripts/dhc/script_PlayerCastleEscape.inc index 45468213..12dffdf3 100644 --- a/data/scripts/dhc/script_PlayerCastleEscape.inc +++ b/data/scripts/dhc/script_PlayerCastleEscape.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerCastleEscape BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0198, 0x01c8 + MoveTo 0x0198, 0x01c8 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/dhc/script_PlayerRescuedZelda.inc b/data/scripts/dhc/script_PlayerRescuedZelda.inc index b792296a..b5dce732 100644 --- a/data/scripts/dhc/script_PlayerRescuedZelda.inc +++ b/data/scripts/dhc/script_PlayerRescuedZelda.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerRescuedZelda SetEntitySpeed 0x0100 EndBlock CallWithArg sub_0807F4F8, 0x000000a0 - _0807EDD4 0x0078, 0x00a0 + MoveTo 0x0078, 0x00a0 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 diff --git a/data/scripts/dhc/script_PlayerV2Defeated.inc b/data/scripts/dhc/script_PlayerV2Defeated.inc index f16621e5..aae5682c 100644 --- a/data/scripts/dhc/script_PlayerV2Defeated.inc +++ b/data/scripts/dhc/script_PlayerV2Defeated.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerV2Defeated EndBlock WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x0001 - _0807EDD4 0x00a8, 0x002c + MoveTo 0x00a8, 0x002c SetSyncFlag 0x00000002 Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc index bad68ee4..e7e5d0f8 100644 --- a/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc @@ -39,7 +39,7 @@ script_0800DCD0: SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 - _0807EEF4 0x0000, 0x0008 + MoveToOffset 0x0000, 0x0008 SetAnimationState 0x0004 DoPostScriptAction 0x0000 Wait 0x001e @@ -64,6 +64,6 @@ script_0800DCD0: SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 - _0807EEF4 0x0000, 0x0080 + MoveToOffset 0x0000, 0x0080 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_ZeldaCastleEscape.inc b/data/scripts/dhc/script_ZeldaCastleEscape.inc index f8150ad9..3647fd75 100644 --- a/data/scripts/dhc/script_ZeldaCastleEscape.inc +++ b/data/scripts/dhc/script_ZeldaCastleEscape.inc @@ -12,7 +12,7 @@ SCRIPT_START script_ZeldaCastleEscape SetEntityPositionRelative 0x0198, 0x0148 DoPostScriptAction 0x0007 EndBlock - _0807EDD4 0x0198, 0x01a8 + MoveTo 0x0198, 0x01a8 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 diff --git a/data/scripts/fow/script_PlayerAtMazaal.inc b/data/scripts/fow/script_PlayerAtMazaal.inc index d71de158..91c4da4b 100644 --- a/data/scripts/fow/script_PlayerAtMazaal.inc +++ b/data/scripts/fow/script_PlayerAtMazaal.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtMazaal SetAnimationState 0x0000 SetEntitySpeed 0x0140 EndBlock - _0807EDD4 0x00b8, 0x0094 + MoveTo 0x00b8, 0x0094 Wait 0x0008 DoPostScriptAction 0x0000 Wait 0x0008 diff --git a/data/scripts/fow/script_PlayerDefeatedMazaal.inc b/data/scripts/fow/script_PlayerDefeatedMazaal.inc index 89fb8ba8..221c85d6 100644 --- a/data/scripts/fow/script_PlayerDefeatedMazaal.inc +++ b/data/scripts/fow/script_PlayerDefeatedMazaal.inc @@ -15,6 +15,6 @@ SCRIPT_START script_PlayerDefeatedMazaal SetAnimationState 0x0004 Wait 0x0008 SetSyncFlag 0x00000002 - _0807EDD4 0x0088, 0x0158 + MoveTo 0x0088, 0x0158 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/graveyard/script_CutsceneMiscObjectKingsGravestone.inc b/data/scripts/graveyard/script_CutsceneMiscObjectKingsGravestone.inc index 21c7d682..39ed9170 100644 --- a/data/scripts/graveyard/script_CutsceneMiscObjectKingsGravestone.inc +++ b/data/scripts/graveyard/script_CutsceneMiscObjectKingsGravestone.inc @@ -9,7 +9,7 @@ SCRIPT_START script_CutsceneMiscObjectKingsGravestone Wait 0x003c SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 - _0807EDD4 0x0118, 0x0060 + MoveTo 0x0118, 0x0060 SetSyncFlag 0x00000002 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/graveyard/script_KeyStealingTakkuriFirstCrow.inc b/data/scripts/graveyard/script_KeyStealingTakkuriFirstCrow.inc index 267d3ca2..5c8ba697 100644 --- a/data/scripts/graveyard/script_KeyStealingTakkuriFirstCrow.inc +++ b/data/scripts/graveyard/script_KeyStealingTakkuriFirstCrow.inc @@ -12,7 +12,7 @@ SCRIPT_START script_CameraTarget7FirstCrow script_08009816: EndBlock BeginBlock - _0807EE30 + MoveTowardsTarget JumpIfNot script_08009816 EndBlock SetSyncFlag 0x00000004 diff --git a/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc index 99931985..6a1f2ee4 100644 --- a/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc +++ b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerAtGraveyardHouseDoor SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 - _0807EDD4 0x01a0, 0x01b0 + MoveTo 0x01a0, 0x01b0 SetAnimationState 0x0000 DoPostScriptAction 0x0000 Wait 0x000a diff --git a/data/scripts/graveyard/script_PlayerAtKingGustav.inc b/data/scripts/graveyard/script_PlayerAtKingGustav.inc index 96b9a99e..6385c175 100644 --- a/data/scripts/graveyard/script_PlayerAtKingGustav.inc +++ b/data/scripts/graveyard/script_PlayerAtKingGustav.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtKingGustav SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x0118, 0x0060 + MoveTo 0x0118, 0x0060 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/hyruleTown/script_CafeGuy.inc b/data/scripts/hyruleTown/script_CafeGuy.inc index 751e6e01..4346d346 100644 --- a/data/scripts/hyruleTown/script_CafeGuy.inc +++ b/data/scripts/hyruleTown/script_CafeGuy.inc @@ -11,7 +11,7 @@ SCRIPT_START script_CafeGuy script_0800ECAC: SetAnimationState 0x0006 SetAnimation 0x0007 - _0807EDD4 0x0028, 0x0050 + MoveTo 0x0028, 0x0050 Wait 0x001e SetAnimationState 0x0004 SetAnimation 0x0002 @@ -21,7 +21,7 @@ script_0800ECAC: Wait 0x001e SetAnimationState 0x0002 SetAnimation 0x0005 - _0807EDD4 0x0048, 0x0050 + MoveTo 0x0048, 0x0050 Wait 0x001e SetAnimationState 0x0004 SetAnimation 0x0002 diff --git a/data/scripts/hyruleTown/script_Carlov.inc b/data/scripts/hyruleTown/script_Carlov.inc index 418511d1..d30f346f 100644 --- a/data/scripts/hyruleTown/script_Carlov.inc +++ b/data/scripts/hyruleTown/script_Carlov.inc @@ -50,7 +50,7 @@ script_080144C8: Wait 0x0018 SetRoomFlag 0x0000 SetLocalFlag 0x0092 - _0807EEF4 0x0000, -96 + MoveToOffset 0x0000, -96 Call DisablePauseMenu Jump script_080144FC script_080144F0: diff --git a/data/scripts/hyruleTown/script_GormanCats.inc b/data/scripts/hyruleTown/script_GormanCats.inc index cad4d713..8451e8bb 100644 --- a/data/scripts/hyruleTown/script_GormanCats.inc +++ b/data/scripts/hyruleTown/script_GormanCats.inc @@ -16,7 +16,7 @@ script_0800FE66: BeginBlock Call sub_08069ACC JumpIf script_0800FE7E - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800FE66 Jump script_0800FE5A script_0800FE7E: diff --git a/data/scripts/hyruleTown/script_GormanSecondHouse.inc b/data/scripts/hyruleTown/script_GormanSecondHouse.inc index f223d84c..cd0a269e 100644 --- a/data/scripts/hyruleTown/script_GormanSecondHouse.inc +++ b/data/scripts/hyruleTown/script_GormanSecondHouse.inc @@ -16,7 +16,7 @@ script_0800FDEE: BeginBlock Call sub_08069ACC JumpIf script_0800FE06 - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800FDEE Jump script_0800FDE2 script_0800FE06: diff --git a/data/scripts/hyruleTown/script_GuardWest.inc b/data/scripts/hyruleTown/script_GuardWest.inc index 26ad9095..fbf3ca77 100644 --- a/data/scripts/hyruleTown/script_GuardWest.inc +++ b/data/scripts/hyruleTown/script_GuardWest.inc @@ -60,7 +60,7 @@ script_08010014: SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x0000000c SetEntitySpeed 0x0100 - _0807EDD4 0x0018, 0x0108 + MoveTo 0x0018, 0x0108 SetAnimationState 0x0002 CallWithArg sub_0807F3D8, 0x00000008 SetLocalFlag MACHI_02_HEISHI diff --git a/data/scripts/hyruleTown/script_Kid3.inc b/data/scripts/hyruleTown/script_Kid3.inc index 99f6a116..9592452b 100644 --- a/data/scripts/hyruleTown/script_Kid3.inc +++ b/data/scripts/hyruleTown/script_Kid3.inc @@ -10,37 +10,37 @@ script_08010314: 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 + LookAt 0x0358, 0x0078 Jump script_08010396 script_0801034A: - _0807EE04 0x0390, 0x0078 + LookAt 0x0390, 0x0078 Jump script_08010396 script_08010354: - _0807EE04 0x03c8, 0x0078 + LookAt 0x03c8, 0x0078 Jump script_08010396 script_0801035E: - _0807EE04 0x0358, 0x0098 + LookAt 0x0358, 0x0098 Jump script_08010396 script_08010368: - _0807EE04 0x0390, 0x0098 + LookAt 0x0390, 0x0098 Jump script_08010396 script_08010372: - _0807EE04 0x03c8, 0x0098 + LookAt 0x03c8, 0x0098 Jump script_08010396 script_0801037C: - _0807EE04 0x0358, 0x00b8 + LookAt 0x0358, 0x00b8 Jump script_08010396 script_08010386: - _0807EE04 0x0390, 0x00b8 + LookAt 0x0390, 0x00b8 Jump script_08010396 script_08010390: - _0807EE04 0x03c8, 0x00b8 + LookAt 0x03c8, 0x00b8 script_08010396: EndBlock BeginBlock Call sub_080626C0 JumpIf script_08010314 - _0807EE30 + MoveTowardsTarget JumpIfNot script_08010396 Jump script_08010314 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_KidInn.inc b/data/scripts/hyruleTown/script_KidInn.inc index 43a709a2..e33b7daa 100644 --- a/data/scripts/hyruleTown/script_KidInn.inc +++ b/data/scripts/hyruleTown/script_KidInn.inc @@ -11,22 +11,22 @@ script_0800D5AC: CallWithArg GetRandomInt, 0x00000004 JumpTable script_0800D5CE, script_0800D5D8, script_0800D5E2, script_0800D5EC script_0800D5CE: - _0807EE04 0x0038, 0x0098 + LookAt 0x0038, 0x0098 Jump script_0800D5F2 script_0800D5D8: - _0807EE04 0x0058, 0x0098 + LookAt 0x0058, 0x0098 Jump script_0800D5F2 script_0800D5E2: - _0807EE04 0x0038, 0x00c8 + LookAt 0x0038, 0x00c8 Jump script_0800D5F2 script_0800D5EC: - _0807EE04 0x0058, 0x00c8 + LookAt 0x0058, 0x00c8 script_0800D5F2: EndBlock BeginBlock Call sub_080626C0 JumpIf script_0800D5AC - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800D5F2 Jump script_0800D5AC .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_PlayerAtCarlov.inc b/data/scripts/hyruleTown/script_PlayerAtCarlov.inc index 1b37c9d3..d93ecabd 100644 --- a/data/scripts/hyruleTown/script_PlayerAtCarlov.inc +++ b/data/scripts/hyruleTown/script_PlayerAtCarlov.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtCarlov EndBlock WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x00e0 - _0807EDD4 0x0078, 0x0068 + MoveTo 0x0078, 0x0068 DoPostScriptAction 0x0000 Wait 0x0010 SetSyncFlag 0x00000001 diff --git a/data/scripts/hyruleTown/script_PlayerAtRem.inc b/data/scripts/hyruleTown/script_PlayerAtRem.inc index 3dab6b77..c241c0ec 100644 --- a/data/scripts/hyruleTown/script_PlayerAtRem.inc +++ b/data/scripts/hyruleTown/script_PlayerAtRem.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtRem SetAnimationState 0x0006 SetEntitySpeed 0x0140 EndBlock - _0807EDD4 0x00a8, 0x0060 + MoveTo 0x00a8, 0x0060 Wait 0x0008 DoPostScriptAction 0x0000 Wait 0x0008 diff --git a/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc b/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc index bc6ae225..49a6425f 100644 --- a/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc +++ b/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerStepOnTrap SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x0078, 0x0080 + MoveTo 0x0078, 0x0080 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call SetPlayerActionNormal diff --git a/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc b/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc index 9e17ee23..59813b25 100644 --- a/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc +++ b/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerWhenLeavingCarlovAlreadyPaid EndBlock WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x00e0 - _0807EDD4 0x0078, 0x0078 + MoveTo 0x0078, 0x0078 DoPostScriptAction 0x0000 Wait 0x0010 SetSyncFlag 0x00000002 diff --git a/data/scripts/hyruleTown/script_Postman.inc b/data/scripts/hyruleTown/script_Postman.inc index 1aff3231..3c531a62 100644 --- a/data/scripts/hyruleTown/script_Postman.inc +++ b/data/scripts/hyruleTown/script_Postman.inc @@ -25,7 +25,7 @@ script_08010B22: CallWithArg sub_080608E4, 0x00000000 JumpIf script_08010B44 script_08010B3A: - _0807EE30 + MoveTowardsTarget JumpIfNot script_08010B22 Jump script_08010B10 script_08010B44: diff --git a/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc b/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc index d3b1b690..bebab8d5 100644 --- a/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc +++ b/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc @@ -13,26 +13,26 @@ SCRIPT_START script_SturgeonAllBooksCollected WaitUntilTextboxCloses DoPostScriptAction 0x0007 Call sub_08064D08 - _0807EDD4 0x0068, 0x0078 + MoveTo 0x0068, 0x0078 Call sub_08064D10 Wait 0x000f SetAnimationState 0x0002 Wait 0x000f Call sub_08064D08 - _0807EDD4 0x0098, 0x0078 + MoveTo 0x0098, 0x0078 Call sub_08064D10 Wait 0x000f SetAnimationState 0x0004 PlaySound SFX_PLY_LIFT Wait 0x000f SetAnimationState 0x0002 - _0807EDD4 0x00ac, 0x0078 + MoveTo 0x00ac, 0x0078 Wait 0x000f SetAnimationState 0x0004 PlaySound SFX_PLY_LIFT Wait 0x000f SetAnimationState 0x0002 - _0807EDD4 0x00c0, 0x0078 + MoveTo 0x00c0, 0x0078 Wait 0x000f SetAnimationState 0x0004 PlaySound SFX_PLY_LIFT @@ -40,13 +40,13 @@ SCRIPT_START script_SturgeonAllBooksCollected SetAnimationState 0x0006 Wait 0x001e Call sub_08064D08 - _0807EDD4 0x0068, 0x0078 + MoveTo 0x0068, 0x0078 Call sub_08064D10 Wait 0x000f SetAnimationState 0x0000 Wait 0x000f Call sub_08064D08 - _0807EDD4 0x0068, 0x0018 + MoveTo 0x0068, 0x0018 Call sub_08064D10 PlaySound SFX_STAIRS SetSyncFlag 0x00000001 diff --git a/data/scripts/hyruleTown/script_TownMinish3.inc b/data/scripts/hyruleTown/script_TownMinish3.inc index 3edddfec..51d7093e 100644 --- a/data/scripts/hyruleTown/script_TownMinish3.inc +++ b/data/scripts/hyruleTown/script_TownMinish3.inc @@ -35,12 +35,12 @@ script_0800E7BA: SetAnimationState 0x0002 CallWithArg sub_0806AF60, 0x00000004 Call sub_0806AF70 - _0807EE04 0x0188, 0x0058 + LookAt 0x0188, 0x0058 script_0800E7D8: EndBlock BeginBlock Call sub_0806AF78 - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800E7D8 EntityHasHeight JumpIf script_0800E7D8 diff --git a/data/scripts/hyruleTown/script_TownMinish6.inc b/data/scripts/hyruleTown/script_TownMinish6.inc index c02ceb81..a897e7e5 100644 --- a/data/scripts/hyruleTown/script_TownMinish6.inc +++ b/data/scripts/hyruleTown/script_TownMinish6.inc @@ -21,7 +21,7 @@ script_0800EFFE: Wait 0x0004 SetAnimationState 0x0002 CallWithArg sub_0806AF60, 0x00000004 - _0807EDD4 0x0088, 0x0040 + MoveTo 0x0088, 0x0040 DoPostScriptAction 0x000a SetAnimationState 0x0002 CallWithArg sub_0806AF60, 0x00000008 @@ -34,7 +34,7 @@ script_0800EFFE: Wait 0x0004 SetAnimationState 0x0006 CallWithArg sub_0806AF60, 0x00000004 - _0807EDD4 0x0068, 0x0040 + MoveTo 0x0068, 0x0040 DoPostScriptAction 0x000a CheckLocalFlag 0x007b JumpIf script_0800F082 diff --git a/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc b/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc index 592035a3..c9385e0c 100644 --- a/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc +++ b/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc @@ -1,10 +1,10 @@ @ BigGoron Kinstone cutscene 4 SCRIPT_START script_BigGoronKinstone4 - _0807EEF4 0xfff8, 0x0000 - _0807EEF4 0x0010, 0x0000 - _0807EEF4 0xfff0, 0x0000 - _0807EEF4 0x0010, 0x0000 - _0807EEF4 0xfff8, 0x0000 + MoveToOffset 0xfff8, 0x0000 + MoveToOffset 0x0010, 0x0000 + MoveToOffset 0xfff0, 0x0000 + MoveToOffset 0x0010, 0x0000 + MoveToOffset 0xfff8, 0x0000 _0807F0C8 0x0000, 0x0000 Wait 0x001e MessageNoOverlap TEXT_GORONS, 0x00 diff --git a/data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc b/data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc index 4bd86b55..117294d4 100644 --- a/data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc +++ b/data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc @@ -1,7 +1,7 @@ @ BigGoron Kinstone Cutscene 5 SCRIPT_START script_BigGoronKinstone5 SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -208 + MoveToOffset 0x0000, -208 _0807F0C8 0x0000, 0x0000 Wait 0x00b4 Call sub_08054968 diff --git a/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc b/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc index 70417b22..b47146bd 100644 --- a/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc +++ b/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc @@ -9,13 +9,13 @@ SCRIPT_START script_GormanFirstAppearance script_0800BA8E: CheckRoomFlag 0x00ff JumpIfNot script_0800BA8E - _0807EDD4 0x02f8, 0x0350 + MoveTo 0x02f8, 0x0350 Wait 0x001e DoPostScriptAction 0x0004 Wait 0x003c SetAnimationState 0x0006 Wait 0x001e - _0807EDD4 0x02f0, 0x0350 + MoveTo 0x02f0, 0x0350 Wait 0x001e MessageNoOverlap TEXT_KINSTONE, 0x00 WaitUntilTextboxCloses diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc index 87ce4e77..b6b03859 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc @@ -34,5 +34,5 @@ script_0800BD1C: SetAnimationState 0x0002 WaitForSyncFlagAndClear 0x00000004 SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc index 226eb90c..282e9164 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc @@ -16,7 +16,7 @@ SCRIPT_START script_Goron2Kinstone2 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 - _0807EDD4 0x0088, 0x0228 + MoveTo 0x0088, 0x0228 Wait 0x000f SetSyncFlag 0x00000004 DoPostScriptAction 0x000f @@ -31,6 +31,6 @@ SCRIPT_START script_Goron2Kinstone2 SetAnimationState 0x0006 SetSyncFlag 0x00000004 SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc index b65e77f2..11b910ec 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc @@ -36,5 +36,5 @@ script_0800BFA8: Wait 0x003c Call sub_08054F64 SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc index 62165e7f..fc5550a9 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc @@ -36,5 +36,5 @@ script_0800C248: Wait 0x003c Call sub_08054F64 SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc b/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc index 14f1657f..45505c7d 100644 --- a/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc +++ b/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc @@ -16,7 +16,7 @@ SCRIPT_START script_Goron3Kinstone3 SetSyncFlag 0x0000000c WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 - _0807EDD4 0x0088, 0x0178 + MoveTo 0x0088, 0x0178 Wait 0x000f SetSyncFlag 0x0000000c DoPostScriptAction 0x000f diff --git a/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc index 3a632fca..da2cc67c 100644 --- a/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc +++ b/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc @@ -16,9 +16,9 @@ SCRIPT_START script_Goron4Kinstone4 SetSyncFlag 0x0000001c WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 - _0807EDD4 0x0088, 0x0188 - _0807EDD4 0x00a8, 0x0188 - _0807EDD4 0x00a8, 0x0178 + MoveTo 0x0088, 0x0188 + MoveTo 0x00a8, 0x0188 + MoveTo 0x00a8, 0x0178 Wait 0x000f SetSyncFlag 0x0000001c DoPostScriptAction 0x000f @@ -32,6 +32,6 @@ SCRIPT_START script_Goron4Kinstone4 Wait 0x003c SetSyncFlag 0x0000001c SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc b/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc index 78e04c52..2f051b60 100644 --- a/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc +++ b/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc @@ -16,9 +16,9 @@ SCRIPT_START script_Goron5Kinstone5 SetSyncFlag 0x0000003c WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 - _0807EDD4 0x0098, 0x00e8 - _0807EDD4 0x00a8, 0x00e8 - _0807EDD4 0x00a8, 0x00d8 + MoveTo 0x0098, 0x00e8 + MoveTo 0x00a8, 0x00e8 + MoveTo 0x00a8, 0x00d8 Wait 0x000f SetSyncFlag 0x0000003c DoPostScriptAction 0x000f diff --git a/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc b/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc index 4eaed958..900cc470 100644 --- a/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc +++ b/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc @@ -16,9 +16,9 @@ SCRIPT_START script_Goron6Kindstone6 SetSyncFlag 0x0000007c WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 - _0807EDD4 0x0098, 0x00e8 - _0807EDD4 0x00c8, 0x00e8 - _0807EDD4 0x00c8, 0x00d8 + MoveTo 0x0098, 0x00e8 + MoveTo 0x00c8, 0x00e8 + MoveTo 0x00c8, 0x00d8 Wait 0x000f SetSyncFlag 0x0000007c DoPostScriptAction 0x000f @@ -32,6 +32,6 @@ SCRIPT_START script_Goron6Kindstone6 Wait 0x003c SetSyncFlag 0x0000007c SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc b/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc index b5385222..bc8b2b0f 100644 --- a/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc +++ b/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc @@ -9,11 +9,11 @@ SCRIPT_START script_GoronMerchantArriving script_0800BB7A: CheckRoomFlag 0x00ff JumpIfNot script_0800BB7A - _0807EDD4 0x03a0, 0x00f8 + MoveTo 0x03a0, 0x00f8 Wait 0x001e MessageNoOverlap TEXT_KINSTONE, 0x06 WaitUntilTextboxCloses Wait 0x000f - _0807EDD4 0x0380, 0x00f8 + MoveTo 0x0380, 0x00f8 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSpark.inc b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSpark.inc index 944bc020..070a8685 100644 --- a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSpark.inc +++ b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSpark.inc @@ -9,7 +9,7 @@ SCRIPT_START script_KinstoneSparkKinstoneSpark DoPostScriptAction 0x0007 PlaySound SFX_136 script_0800C47A: - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800C47A Wait 0x003c SetRoomFlag 0x00ff diff --git a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkFromBottom.inc b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkFromBottom.inc index cd7f7c5e..2bf2003a 100644 --- a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkFromBottom.inc +++ b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkFromBottom.inc @@ -7,9 +7,9 @@ SCRIPT_START script_KinstoneSparkKinstoneSparkFromBottom Wait 0x000a DoPostScriptAction 0x0007 PlaySound SFX_136 - _0807EEF4 0x0000, -112 + MoveToOffset 0x0000, -112 Wait 0x001e - _0807EEF4 0x0000, -80 + MoveToOffset 0x0000, -80 Wait 0x003c SetRoomFlag 0x00ff SetAnimation 0x0005 diff --git a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoron.inc b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoron.inc index 21d715b9..0cab3d53 100644 --- a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoron.inc +++ b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoron.inc @@ -10,9 +10,9 @@ SCRIPT_START script_KinstoneSparkKinstoneSparkGoron Wait 0x000a DoPostScriptAction 0x0007 PlaySound SFX_136 - _0807EEF4 0x0000, 0x0060 + MoveToOffset 0x0000, 0x0060 Wait 0x003c - _0807EEF4 0x0000, 0x0060 + MoveToOffset 0x0000, 0x0060 Wait 0x001e SetRoomFlag 0x00ff SetAnimation 0x0005 diff --git a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoronMerchang.inc b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoronMerchang.inc index 3a9aada3..442079e0 100644 --- a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoronMerchang.inc +++ b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoronMerchang.inc @@ -8,9 +8,9 @@ SCRIPT_START script_KinstoneSparkKinstoneSparkGoronMerchang Wait 0x000a DoPostScriptAction 0x0007 PlaySound SFX_136 - _0807EEF4 0x00c0, 0x0000 + MoveToOffset 0x00c0, 0x0000 Wait 0x001e - _0807EEF4 0x0070, 0x0000 + MoveToOffset 0x0070, 0x0000 Wait 0x003c SetRoomFlag 0x00ff SetAnimation 0x0005 diff --git a/data/scripts/lakeHylia/script_ShopwellsDog.inc b/data/scripts/lakeHylia/script_ShopwellsDog.inc index eaa7c31e..9a165e75 100644 --- a/data/scripts/lakeHylia/script_ShopwellsDog.inc +++ b/data/scripts/lakeHylia/script_ShopwellsDog.inc @@ -6,7 +6,7 @@ SCRIPT_START script_ShopwellsDog EndBlock Wait 0x001e PlaySound SFX_VO_DOG - _0807EDD4 0x008a, 0x005a + MoveTo 0x008a, 0x005a Wait 0x000a Call sub_08069EE8 SCRIPT_END diff --git a/data/scripts/lonLonRanch/script_MalonLostKey.inc b/data/scripts/lonLonRanch/script_MalonLostKey.inc index 951b43ae..6646d6c0 100644 --- a/data/scripts/lonLonRanch/script_MalonLostKey.inc +++ b/data/scripts/lonLonRanch/script_MalonLostKey.inc @@ -26,12 +26,12 @@ script_0800B4D4: script_0800B4F0: EndBlock ClearSyncFlag 0x00000008 - _0807EDD4 0x0134, 0x0288 + MoveTo 0x0134, 0x0288 SetAnimationState 0x0004 WaitForSyncFlagAndClear 0x00000008 MessageFromTarget TEXT_LON_LON, 0x16 WaitUntilTextboxCloses - _0807EDD4 0x0158, 0x0288 + MoveTo 0x0158, 0x0288 DoPostScriptAction 0x0000 SetAnimationState 0x0000 Wait 0x000a diff --git a/data/scripts/lonLonRanch/script_PlayerGiveKey.inc b/data/scripts/lonLonRanch/script_PlayerGiveKey.inc index 5ca5f8f0..ba2c47e0 100644 --- a/data/scripts/lonLonRanch/script_PlayerGiveKey.inc +++ b/data/scripts/lonLonRanch/script_PlayerGiveKey.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerGiveKey BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0128, 0x0298 + MoveTo 0x0128, 0x0298 Wait 0x000a SetAnimationState 0x0002 DoPostScriptAction 0x0000 diff --git a/data/scripts/lonLonRanch/script_TalonGotKey.inc b/data/scripts/lonLonRanch/script_TalonGotKey.inc index 7cb713e4..2d95cd9b 100644 --- a/data/scripts/lonLonRanch/script_TalonGotKey.inc +++ b/data/scripts/lonLonRanch/script_TalonGotKey.inc @@ -11,7 +11,7 @@ SCRIPT_START script_TalonGotKey DoPostScriptAction 0x0004 SetSyncFlag 0x00000008 StartPlayerScript script_PlayerGiveKey - _0807EDD4 0x0140, 0x0298 + MoveTo 0x0140, 0x0298 FacePlayer WaitForSyncFlagAndClear 0x00000004 FacePlayer @@ -23,12 +23,12 @@ SCRIPT_START script_TalonGotKey MessageFromTarget TEXT_LON_LON, 0x0c WaitUntilTextboxCloses Wait 0x0014 - _0807EDD4 0x0158, 0x0290 + MoveTo 0x0158, 0x0290 Wait 0x000a - _0807EDD4 0x0158, 0x0288 + MoveTo 0x0158, 0x0288 Wait 0x0014 SetSyncFlag 0x00000010 - _0807EDD4 0x0158, 0x0280 + MoveTo 0x0158, 0x0280 Wait 0x000a DoPostScriptAction 0x0008 SetSyncFlag 0x00000010 diff --git a/data/scripts/lonLonRanch/script_TalonLostKey.inc b/data/scripts/lonLonRanch/script_TalonLostKey.inc index 0a5463c6..9500c940 100644 --- a/data/scripts/lonLonRanch/script_TalonLostKey.inc +++ b/data/scripts/lonLonRanch/script_TalonLostKey.inc @@ -9,14 +9,14 @@ SCRIPT_START script_TalonLostKey SetIntVariable 0x0000200a EndBlock script_0800B3C4: - _0807EDD4 0x0158, 0x0290 + MoveTo 0x0158, 0x0290 Call sub_08065780 Call sub_08065780 Call sub_08065780 Call sub_08065780 Call sub_08065780 Call sub_08065780 - _0807EDD4 0x0128, 0x0290 + MoveTo 0x0128, 0x0290 Call sub_08065780 Call sub_08065780 Call sub_08065780 diff --git a/data/scripts/minishWoods/script_Gentari.inc b/data/scripts/minishWoods/script_Gentari.inc index 0a534bc4..50205186 100644 --- a/data/scripts/minishWoods/script_Gentari.inc +++ b/data/scripts/minishWoods/script_Gentari.inc @@ -57,7 +57,7 @@ script_0800C824: MessageFromTarget TEXT_FINDING_EZLO, 0x35 WaitUntilTextboxCloses SetEntitySpeed 0x0040 - _0807EDD4 0x0038, 0x0044 + MoveTo 0x0038, 0x0044 DoPostScriptAction 0x0000 Wait 0x000f SetLocalFlag 0x0083 diff --git a/data/scripts/minishWoods/script_PlayerAtBombMinish.inc b/data/scripts/minishWoods/script_PlayerAtBombMinish.inc index 89e06331..5c7e43fe 100644 --- a/data/scripts/minishWoods/script_PlayerAtBombMinish.inc +++ b/data/scripts/minishWoods/script_PlayerAtBombMinish.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtBombMinish SetEntitySpeed 0x0100 EndBlock WalkSouth 0x0010 - _0807EDD4 0x0078, 0x0060 + MoveTo 0x0078, 0x0060 SetAnimationState 0x0000 Wait 0x000f DoPostScriptAction 0x0000 diff --git a/data/scripts/minishWoods/script_PlayerAtFestari.inc b/data/scripts/minishWoods/script_PlayerAtFestari.inc index ac2f94c3..45220e22 100644 --- a/data/scripts/minishWoods/script_PlayerAtFestari.inc +++ b/data/scripts/minishWoods/script_PlayerAtFestari.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtFestari BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x00e8, 0x0068 + MoveTo 0x00e8, 0x0068 SetAnimationState 0x0000 Wait 0x000f DoPostScriptAction 0x0000 diff --git a/data/scripts/minishWoods/script_PlayerAtGentari.inc b/data/scripts/minishWoods/script_PlayerAtGentari.inc index 0804180c..16d1aca2 100644 --- a/data/scripts/minishWoods/script_PlayerAtGentari.inc +++ b/data/scripts/minishWoods/script_PlayerAtGentari.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtGentari SetEntitySpeed 0x0100 EndBlock WalkSouth 0x0010 - _0807EDD4 0x0078, 0x0058 + MoveTo 0x0078, 0x0058 SetAnimationState 0x0000 Wait 0x000f DoPostScriptAction 0x0000 diff --git a/data/scripts/mtCrenel/script_MountainMinish4.inc b/data/scripts/mtCrenel/script_MountainMinish4.inc index f1689e97..d42891a8 100644 --- a/data/scripts/mtCrenel/script_MountainMinish4.inc +++ b/data/scripts/mtCrenel/script_MountainMinish4.inc @@ -30,7 +30,7 @@ script_0800D372: script_0800D3B2: SetAnimationState 0x0002 SetAnimation 0x0005 - _0807EDD4 0x00a0, 0x0130 + MoveTo 0x00a0, 0x0130 SetAnimationState 0x0006 SetAnimation 0x0003 SetIntVariable 0x00000004 diff --git a/data/scripts/mtCrenel/script_MountainMinish5.inc b/data/scripts/mtCrenel/script_MountainMinish5.inc index edbf2f01..c1a52532 100644 --- a/data/scripts/mtCrenel/script_MountainMinish5.inc +++ b/data/scripts/mtCrenel/script_MountainMinish5.inc @@ -21,7 +21,7 @@ script_0800D426: SetAnimationState 0x0006 SetIntVariable 0x00000004 Call sub_0806AF60 - _0807EDD4 0x00a8, 0x01e8 + MoveTo 0x00a8, 0x01e8 SetAnimationState 0x0006 SetIntVariable 0x00000000 Call sub_0806AF60 @@ -37,7 +37,7 @@ script_0800D426: SetAnimationState 0x0002 SetIntVariable 0x00000004 Call sub_0806AF60 - _0807EDD4 0x0228, 0x01e8 + MoveTo 0x0228, 0x01e8 Jump script_0800D426 .2byte 0x0000 BeginBlock @@ -52,31 +52,31 @@ script_0800D4E4: 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 + LookAt 0x0038, 0x0068 Jump script_0800D566 script_0800D51A: - _0807EE04 0x0078, 0x0068 + LookAt 0x0078, 0x0068 Jump script_0800D566 script_0800D524: - _0807EE04 0x00b8, 0x0068 + LookAt 0x00b8, 0x0068 Jump script_0800D566 script_0800D52E: - _0807EE04 0x0038, 0x0090 + LookAt 0x0038, 0x0090 Jump script_0800D566 script_0800D538: - _0807EE04 0x0078, 0x0090 + LookAt 0x0078, 0x0090 Jump script_0800D566 script_0800D542: - _0807EE04 0x00b8, 0x0090 + LookAt 0x00b8, 0x0090 Jump script_0800D566 script_0800D54C: - _0807EE04 0x0038, 0x00b8 + LookAt 0x0038, 0x00b8 Jump script_0800D566 script_0800D556: - _0807EE04 0x0078, 0x00b8 + LookAt 0x0078, 0x00b8 Jump script_0800D566 script_0800D560: - _0807EE04 0x00b8, 0x00b8 + LookAt 0x00b8, 0x00b8 script_0800D566: EndBlock BeginBlock @@ -84,7 +84,7 @@ script_0800D566: JumpIf script_0800D4E4 CheckEntityInteractType JumpIf script_0800D584 - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800D566 Jump script_0800D4E4 script_0800D584: diff --git a/data/scripts/mtCrenel/script_PlayerAtMelari.inc b/data/scripts/mtCrenel/script_PlayerAtMelari.inc index b4560caa..3241a3ee 100644 --- a/data/scripts/mtCrenel/script_PlayerAtMelari.inc +++ b/data/scripts/mtCrenel/script_PlayerAtMelari.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtMelari BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0170, 0x0140 + MoveTo 0x0170, 0x0140 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 diff --git a/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc b/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc index fad1fc4f..aaca4421 100644 --- a/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc +++ b/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc @@ -3,8 +3,8 @@ SCRIPT_START script_PlayerPlaceBrokenSword BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0170, 0x0120 - _0807EDD4 0x01a8, 0x0120 + MoveTo 0x0170, 0x0120 + MoveTo 0x01a8, 0x0120 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 diff --git a/data/scripts/northHyruleField/script_CutsceneOrchestratorFixBridge.inc b/data/scripts/northHyruleField/script_CutsceneOrchestratorFixBridge.inc index 4d285787..3fc1ff44 100644 --- a/data/scripts/northHyruleField/script_CutsceneOrchestratorFixBridge.inc +++ b/data/scripts/northHyruleField/script_CutsceneOrchestratorFixBridge.inc @@ -11,11 +11,11 @@ SCRIPT_START script_CutsceneOrchestratorFixBridge _0807E8E4_2 Call CreatePlayerExclamationMark Wait 0x001e - _0807EDD4 0x00b8, 0x0258 + MoveTo 0x00b8, 0x0258 Wait 0x001e SetRoomFlag 0x0065 Wait 0x0078 - _0807EEB4 + MoveToPlayer CameraTargetPlayer EnablePlayerControl DoPostScriptAction 0x0006 diff --git a/data/scripts/npc/script_08012C48.inc b/data/scripts/npc/script_08012C48.inc index 18ba3fce..9b299444 100644 --- a/data/scripts/npc/script_08012C48.inc +++ b/data/scripts/npc/script_08012C48.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08012C48 DoPostScriptAction 0x0007 SetEntitySpeed 0x0280 EndBlock - _0807EDD4 0x0388, 0x0168 + MoveTo 0x0388, 0x0168 SetSyncFlag 0x00000100 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/npc/script_ForestMinish17.inc b/data/scripts/npc/script_ForestMinish17.inc index 376c28db..fb76c3a1 100644 --- a/data/scripts/npc/script_ForestMinish17.inc +++ b/data/scripts/npc/script_ForestMinish17.inc @@ -2,16 +2,16 @@ SCRIPT_START script_ForestMinish17 SetEntitySpeed 0x0100 script_080166BC: - _0807EDD4 0x0055, 0x0039 + MoveTo 0x0055, 0x0039 Wait 0x0008 - _0807EDD4 0x0075, 0x0076 + MoveTo 0x0075, 0x0076 Wait 0x0008 - _0807EDD4 0x0105, 0x006c + MoveTo 0x0105, 0x006c Wait 0x0008 - _0807EDD4 0x018e, 0x007a + MoveTo 0x018e, 0x007a Wait 0x0008 - _0807EDD4 0x0173, 0x0023 + MoveTo 0x0173, 0x0023 Wait 0x0008 - _0807EDD4 0x00d8, 0x003f + MoveTo 0x00d8, 0x003f Wait 0x0008 Jump script_080166BC diff --git a/data/scripts/npc/script_PlayerAtBladeBrothers.inc b/data/scripts/npc/script_PlayerAtBladeBrothers.inc index 319170e6..d67a60e8 100644 --- a/data/scripts/npc/script_PlayerAtBladeBrothers.inc +++ b/data/scripts/npc/script_PlayerAtBladeBrothers.inc @@ -1,7 +1,7 @@ @ Player at Blade Brothers SCRIPT_START script_PlayerAtBladeBrothers SetEntitySpeed 0x0100 - _0807EDD4 0x0078, 0x0050 + MoveTo 0x0078, 0x0050 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElementFloating.inc index 29d74646..0a40c1bb 100644 --- a/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElementFloating.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElementFloating.inc @@ -5,7 +5,7 @@ SCRIPT_START script_CutsceneMiscObjectEarthElementFloating SetAnimation 0x0000 EndBlock SetEntitySpeed 0x0080 - _0807EDD4 0x00b0, 0x00f8 + MoveTo 0x00b0, 0x00f8 SetAnimation 0x0001 SetSyncFlag 0x08000000 SCRIPT_END diff --git a/data/scripts/sanctuary/script_CutsceneMiscObjectFireElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectFireElementFloating.inc index b45d6891..1e476e77 100644 --- a/data/scripts/sanctuary/script_CutsceneMiscObjectFireElementFloating.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectFireElementFloating.inc @@ -5,7 +5,7 @@ SCRIPT_START script_CutsceneMiscObjectFireElementFloating SetAnimation 0x0002 EndBlock SetEntitySpeed 0x0080 - _0807EDD4 0x0120, 0x00f8 + MoveTo 0x0120, 0x00f8 SetAnimation 0x0003 SetSyncFlag 0x10000000 SCRIPT_END diff --git a/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElementFloating.inc index 6d52dba8..57afa54a 100644 --- a/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElementFloating.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElementFloating.inc @@ -5,7 +5,7 @@ SCRIPT_START script_CutsceneMiscObjectWaterElementFloating SetAnimation 0x0004 EndBlock SetEntitySpeed 0x0080 - _0807EDD4 0x0120, 0x0168 + MoveTo 0x0120, 0x0168 SetAnimation 0x0005 SetSyncFlag 0x20000000 SCRIPT_END diff --git a/data/scripts/sanctuary/script_CutsceneMiscObjectWindElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectWindElementFloating.inc index c764dc05..16dc2fdd 100644 --- a/data/scripts/sanctuary/script_CutsceneMiscObjectWindElementFloating.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectWindElementFloating.inc @@ -5,7 +5,7 @@ SCRIPT_START script_CutsceneMiscObjectWindElementFloating SetAnimation 0x0006 EndBlock SetEntitySpeed 0x0080 - _0807EDD4 0x00b0, 0x0168 + MoveTo 0x00b0, 0x0168 SetAnimation 0x0007 SetSyncFlag 0x40000000 SCRIPT_END diff --git a/data/scripts/sanctuary/script_PlayerAtPedestal.inc b/data/scripts/sanctuary/script_PlayerAtPedestal.inc index 6f85106d..866d3499 100644 --- a/data/scripts/sanctuary/script_PlayerAtPedestal.inc +++ b/data/scripts/sanctuary/script_PlayerAtPedestal.inc @@ -10,7 +10,7 @@ script_080136F0: script_080136FA: CallWithArg sub_0807F4F8, 0x00000124 script_08013704: - _0807EDD4 0x00e8, 0x0124 + MoveTo 0x00e8, 0x0124 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc b/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc index 69391d04..7a437e50 100644 --- a/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc +++ b/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtSanctuaryEntrance BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0088, 0x0068 + MoveTo 0x0088, 0x0068 SetAnimationState 0x0000 DoPostScriptAction 0x0000 Wait 0x001e diff --git a/data/scripts/sanctuary/script_PlayerGetElement.inc b/data/scripts/sanctuary/script_PlayerGetElement.inc index c73af53c..bfe5d187 100644 --- a/data/scripts/sanctuary/script_PlayerGetElement.inc +++ b/data/scripts/sanctuary/script_PlayerGetElement.inc @@ -9,7 +9,7 @@ SCRIPT_START script_PlayerGetElement PlayBgm BGM_ELEMENT_THEME Call sub_080A0464 script_0800A0D2: - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800A0D2 _0807E8E4_0 Wait 0x0008 diff --git a/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc b/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc index 516cef54..e587d4b1 100644 --- a/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc +++ b/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerTextBoardAppears BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x00e8, 0x00a8 + MoveTo 0x00e8, 0x00a8 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 diff --git a/data/scripts/unused/script_08016482.inc b/data/scripts/unused/script_08016482.inc index be00febe..dd58b799 100644 --- a/data/scripts/unused/script_08016482.inc +++ b/data/scripts/unused/script_08016482.inc @@ -54,11 +54,11 @@ SCRIPT_START script_08016482 WalkSouth 0x0040 WalkWest 0x0050 _0807ED24 0x0000, 0x0000, 0x0000 - _0807EDD4 0x0000, 0x0000 - _0807EE04 0x0000, 0x0000 - _0807EE30 - _0807EEB4 - _0807EEF4 0xfff0, 0x0014 + MoveTo 0x0000, 0x0000 + LookAt 0x0000, 0x0000 + MoveTowardsTarget + MoveToPlayer + MoveToOffset 0xfff0, 0x0014 DoPostScriptAction 0x0000 DoPostScriptAction2 0x0001 PlaySound SFX_METAL_CLINK diff --git a/data/scripts/veilFalls/script_BigGoronHiding.inc b/data/scripts/veilFalls/script_BigGoronHiding.inc index 237d4470..b2e5063d 100644 --- a/data/scripts/veilFalls/script_BigGoronHiding.inc +++ b/data/scripts/veilFalls/script_BigGoronHiding.inc @@ -5,7 +5,7 @@ SCRIPT_START script_BigGoronHiding SetEntitySpeed 0x0010 EndBlock script_0800932E: - _0807EEF4 -8, 0x0000 - _0807EEF4 0x0008, 0x0000 + MoveToOffset -8, 0x0000 + MoveToOffset 0x0008, 0x0000 Jump script_0800932E SCRIPT_END diff --git a/data/scripts/veilFalls/script_CutsceneMiscObjectMirrorShield.inc b/data/scripts/veilFalls/script_CutsceneMiscObjectMirrorShield.inc index bc49bebb..28aa819c 100644 --- a/data/scripts/veilFalls/script_CutsceneMiscObjectMirrorShield.inc +++ b/data/scripts/veilFalls/script_CutsceneMiscObjectMirrorShield.inc @@ -8,7 +8,7 @@ SCRIPT_START script_CutsceneMiscObjectMirrorShield SetEntityVelocity 0x00018000 Call sub_0806D858 script_080094EA: - _0807EE30 + MoveTowardsTarget JumpIfNot script_080094EA Wait 0x001e DoPostScriptAction 0x0006 diff --git a/data/scripts/veilFalls/script_CutsceneMiscObjectVeilFallsTop.inc b/data/scripts/veilFalls/script_CutsceneMiscObjectVeilFallsTop.inc index 051cfe84..6809a172 100644 --- a/data/scripts/veilFalls/script_CutsceneMiscObjectVeilFallsTop.inc +++ b/data/scripts/veilFalls/script_CutsceneMiscObjectVeilFallsTop.inc @@ -7,7 +7,7 @@ SCRIPT_START script_CutsceneMiscObjectVeilFallsTop Wait 0x003c SetEntityVelocity 0x00018000 script_080094BC: - _0807EE30 + MoveTowardsTarget JumpIfNot script_080094BC Wait 0x003c DoPostScriptAction 0x0006 diff --git a/data/scripts/windRuins/script_PlayerAtTextboard.inc b/data/scripts/windRuins/script_PlayerAtTextboard.inc index c85f6145..739d42e9 100644 --- a/data/scripts/windRuins/script_PlayerAtTextboard.inc +++ b/data/scripts/windRuins/script_PlayerAtTextboard.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtTextboard SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x00a0, 0x0078 + MoveTo 0x00a0, 0x0078 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 |