diff options
Diffstat (limited to 'data/scripts')
38 files changed, 60 insertions, 60 deletions
diff --git a/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc index ae7c5633..24942bab 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc @@ -33,7 +33,7 @@ SCRIPT_START script_ZeldaIntroBusinessScrub SetEntitySpeed 0x0200 WalkSouth 0x0008 SetAnimation 0x0040 - Call WaitForFrameHiBit + Call WaitForAnimDone SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc index 46e39e17..8427c4de 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc @@ -30,7 +30,7 @@ SCRIPT_START script_Npc4EMonsters Call NPC4E_SaveEquippedItems Call SetPlayerActionNormal CallWithArg EquipItem, 0x0000000d - CallWithArg sub_0807F29C, gUnk_080049F6 + CallWithArg SetInputMacro, gUnk_080049F6 _0807F0B4 0x0001 SetEntityPositionRelative 0x01f8, 0x0068 SetSyncFlag 0x00000004 @@ -41,7 +41,7 @@ SCRIPT_START script_Npc4EMonsters PlaySound SFX_1C3 SetSyncFlag 0x20000000 Wait 0x0078 - CallWithArg sub_0807F29C, 0x00000000 + CallWithArg SetInputMacro, 0x00000000 Call NPC4E_RestoreEquippedItems SetSyncFlag 0x40000000 SetSyncFlag 0x00000010 diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc index 02d18eba..f807fc41 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc @@ -10,11 +10,11 @@ SCRIPT_START script_Npc4EVaatiAttacking Call NPC4E_SaveEquippedItems Call SetPlayerActionNormal CallWithArg EquipItem, 0x0000000d - CallWithArg sub_0807F29C, gUnk_080049F6 + CallWithArg SetInputMacro, gUnk_080049F6 Wait 0x001e SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000200 - CallWithArg sub_0807F29C, 0x00000000 + CallWithArg SetInputMacro, 0x00000000 Call NPC4E_RestoreEquippedItems Wait 0x003c SetSyncFlag 0x08000000 diff --git a/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc b/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc index 8e0ae500..f35afc73 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc @@ -11,7 +11,7 @@ SCRIPT_START script_PlayerFainting Call sub_0807F1E8 DoPostScriptAction 0x0011 EndBlock - Call WaitForFrameHiBit + Call WaitForAnimDone WaitForSyncFlag 0x80000000 Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc b/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc index 13d6fa8c..5236e03b 100644 --- a/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc +++ b/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc @@ -13,21 +13,21 @@ SCRIPT_START script_VaatiIntroCeremony WaitForSyncFlagAndClear 0x00000100 SetAnimationState 0x0004 DoPostScriptAction 0x001c - Call WaitForFrameHiBit + Call WaitForAnimDone SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000100 SetAnimationState 0x0000 DoPostScriptAction 0x001c - Call WaitForFrameHiBit + Call WaitForAnimDone SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000100 SetAnimationState 0x0000 DoPostScriptAction 0x001a - Call WaitForFrameHiBit + Call WaitForAnimDone DoPostScriptAction 0x0000 SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000100 @@ -71,7 +71,7 @@ SCRIPT_START script_VaatiIntroCeremony Wait 0x005a SetAnimationState 0x0004 DoPostScriptAction 0x001c - Call WaitForFrameHiBit + Call WaitForAnimDone SetAnimationState 0x0004 DoPostScriptAction 0x0000 Wait 0x001e diff --git a/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc b/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc index cfe741b1..9ccd1167 100644 --- a/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc +++ b/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc @@ -48,7 +48,7 @@ script_08011206: Call sub_08066E20 Wait 0x0014 DoPostScriptAction 0x0010 - Call WaitForFrameHiBit + Call WaitForAnimDone PlaySound SFX_1CA SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc index 10f3eef7..ffd9dc02 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc @@ -164,14 +164,14 @@ SCRIPT_START script_Npc4EIntroTown CallWithArg EquipItem, 0x0000000d SetIntVariable 0x000000ff Call sub_0807F5B0 - CallWithArg sub_0807F29C, gUnk_080049D6 + CallWithArg SetInputMacro, gUnk_080049D6 Wait 0x00b7 SetIntVariable 0x00000000 Call sub_0807F5B0 MessageFromTargetPos 0x102c, 0x0000 WaitUntilTextboxCloses @ Give control back to the player - CallWithArg sub_0807F29C, 0x00000000 + CallWithArg SetInputMacro, 0x00000000 Call NPC4E_RestoreEquippedItems _0807F0B4 0x0004 CameraTargetPlayer diff --git a/data/scripts/cutscene/originStory/script_MinishEzlo.inc b/data/scripts/cutscene/originStory/script_MinishEzlo.inc index 5acc0d71..7b5e52c9 100644 --- a/data/scripts/cutscene/originStory/script_MinishEzlo.inc +++ b/data/scripts/cutscene/originStory/script_MinishEzlo.inc @@ -34,7 +34,7 @@ SCRIPT_START script_MinishEzlo SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 SetAnimation 0x000d - Call WaitForFrameHiBit + Call WaitForAnimDone SetSyncFlag 0x00010000 Wait 0x003c DoPostScriptAction 0x0005 diff --git a/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc b/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc index 75e76a5b..2d149f47 100644 --- a/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc +++ b/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc @@ -17,7 +17,7 @@ SCRIPT_START script_Object6AMinishCap SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 SetAnimation 0x0001 - Call WaitForFrameHiBit + Call WaitForAnimDone DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/originStory/script_Vaati.inc b/data/scripts/cutscene/originStory/script_Vaati.inc index 3a48e430..ac8c49a7 100644 --- a/data/scripts/cutscene/originStory/script_Vaati.inc +++ b/data/scripts/cutscene/originStory/script_Vaati.inc @@ -23,7 +23,7 @@ SCRIPT_START script_Vaati SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 DoPostScriptAction 0x0018 - Call WaitForFrameHiBit + Call WaitForAnimDone SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00001000 diff --git a/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc b/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc index 8e9cce5d..f356d65f 100644 --- a/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc +++ b/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc @@ -16,7 +16,7 @@ SCRIPT_START script_VaatiAppearsAgain Wait 0x0014 SetAnimationState 0x0000 DoPostScriptAction 0x001c - Call WaitForFrameHiBit + Call WaitForAnimDone DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 diff --git a/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc index ba35737d..db38ceb7 100644 --- a/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc +++ b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc @@ -25,17 +25,17 @@ SCRIPT_START script_MinishEzloGoodbye SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetAnimation 0x000c - Call WaitForFrameHiBit + Call WaitForAnimDone Call sub_08094B94 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetAnimation 0x000f - Call WaitForFrameHiBit + Call WaitForAnimDone SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 CallWithArg sub_080960C4, script_Object6AEzloFinalMagic SetAnimation 0x0012 - Call WaitForFrameHiBit + Call WaitForAnimDone Wait 0x001e SetSyncFlag 0x00000020 StopBgm diff --git a/data/scripts/cutscene/outro/script_MinishEzloOutro.inc b/data/scripts/cutscene/outro/script_MinishEzloOutro.inc index b82f4618..1741a522 100644 --- a/data/scripts/cutscene/outro/script_MinishEzloOutro.inc +++ b/data/scripts/cutscene/outro/script_MinishEzloOutro.inc @@ -10,20 +10,20 @@ SCRIPT_START script_MinishEzloOutro WaitForSyncFlagAndClear 0x00000002 SetAnimation 0x000e DoPostScriptAction 0x0007 - Call WaitForFrameHiBit + Call WaitForAnimDone DoPostScriptAction 0x0004 SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000002 SetAnimation 0x000c - Call WaitForFrameHiBit + Call WaitForAnimDone SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000002 SetAnimation 0x000f - Call WaitForFrameHiBit + Call WaitForAnimDone SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000002 SetAnimation 0x000c - Call WaitForFrameHiBit + Call WaitForAnimDone SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000002 CallWithArg sub_080960C4, script_EzloZeldaMagic diff --git a/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc b/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc index 6593d60f..460b706c 100644 --- a/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc +++ b/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc @@ -1,9 +1,9 @@ @ Sanctuary Player faint from Vaati attack SCRIPT_START script_PlayerFaintAgain Call sub_0807F1C4 - Call WaitForFrameHiBit + Call WaitForAnimDone Call sub_0807F1E8 - Call WaitForFrameHiBit + Call WaitForAnimDone SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 PlaySound SFX_PLY_JUMP diff --git a/data/scripts/cutscene/takeover/script_VaatiTakeover.inc b/data/scripts/cutscene/takeover/script_VaatiTakeover.inc index efd31a2b..1a2520c3 100644 --- a/data/scripts/cutscene/takeover/script_VaatiTakeover.inc +++ b/data/scripts/cutscene/takeover/script_VaatiTakeover.inc @@ -14,7 +14,7 @@ SCRIPT_START script_VaatiTakeover Wait 0x0014 SetAnimationState 0x0000 DoPostScriptAction 0x001c - Call WaitForFrameHiBit + Call WaitForAnimDone DoPostScriptAction 0x0000 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 diff --git a/data/scripts/dhc/script_Vaati1Intro.inc b/data/scripts/dhc/script_Vaati1Intro.inc index 3255d880..0308aab2 100644 --- a/data/scripts/dhc/script_Vaati1Intro.inc +++ b/data/scripts/dhc/script_Vaati1Intro.inc @@ -25,7 +25,7 @@ SCRIPT_START script_Vaati1Intro PlayBgm BGM_VAATI_REBORN DoPostScriptAction 0x0019 PlaySound SFX_198 - Call WaitForFrameHiBit + Call WaitForAnimDone SetRoomFlag 0x0000 DoPostScriptAction 0x0008 Wait 0x0080 diff --git a/data/scripts/dhc/script_VaatiWithZelda.inc b/data/scripts/dhc/script_VaatiWithZelda.inc index 1464b9a8..55897c74 100644 --- a/data/scripts/dhc/script_VaatiWithZelda.inc +++ b/data/scripts/dhc/script_VaatiWithZelda.inc @@ -11,7 +11,7 @@ SCRIPT_START script_VaatiWithZelda Wait 0x003c SetAnimationState 0x0004 DoPostScriptAction 0x001c - Call WaitForFrameHiBit + Call WaitForAnimDone DoPostScriptAction 0x0000 Wait 0x003c SetSyncFlag 0x00000002 diff --git a/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc index 8c2d1161..bad68ee4 100644 --- a/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc @@ -18,7 +18,7 @@ script_0800DCD0: StopBgm Call sub_08066E50 PlaySound SFX_1C9 - Call WaitForFrameHiBit + Call WaitForAnimDone PlaySound SFX_1CA Wait 0x003c DoPostScriptAction 0x0004 diff --git a/data/scripts/hyruleTown/script_Librari.inc b/data/scripts/hyruleTown/script_Librari.inc index 759b102e..7f456a0e 100644 --- a/data/scripts/hyruleTown/script_Librari.inc +++ b/data/scripts/hyruleTown/script_Librari.inc @@ -10,7 +10,7 @@ script_0800E974: JumpIfNot script_0800E974 SetPlayerIdle SetAnimation 0x0008 - Call WaitForFrameHiBit + Call WaitForAnimDone SetAnimation 0x0009 Call sub_0806B260 JumpIfNot script_0800E9E4 diff --git a/data/scripts/hyruleTown/script_LibrariLater.inc b/data/scripts/hyruleTown/script_LibrariLater.inc index cc4fda75..5b97f721 100644 --- a/data/scripts/hyruleTown/script_LibrariLater.inc +++ b/data/scripts/hyruleTown/script_LibrariLater.inc @@ -10,7 +10,7 @@ script_08012440: JumpIfNot script_08012440 SetPlayerIdle SetAnimation 0x0008 - Call WaitForFrameHiBit + Call WaitForAnimDone SetAnimation 0x0009 Call sub_0806B2B4 WaitUntilTextboxCloses diff --git a/data/scripts/hyruleTown/script_LibrarianLeft.inc b/data/scripts/hyruleTown/script_LibrarianLeft.inc index 2cda1ba0..bed65448 100644 --- a/data/scripts/hyruleTown/script_LibrarianLeft.inc +++ b/data/scripts/hyruleTown/script_LibrarianLeft.inc @@ -10,7 +10,7 @@ script_08008BA2: TriggerInteract SetPlayerIdle SetAnimation 0x0004 - Call WaitForFrameHiBit + Call WaitForAnimDone MessageFromTarget 0x4912 WaitUntilTextboxCloses SetAnimation 0x0008 diff --git a/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc b/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc index 6fbcd584..a6f0efee 100644 --- a/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc +++ b/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc @@ -16,13 +16,13 @@ script_08008BD2: SetGlobalFlag 0x0061 .endif SetAnimation 0x0004 - Call WaitForFrameHiBit + Call WaitForAnimDone WaitUntilTextboxCloses Call sub_0806BA34 JumpIfNot script_08008C54 WaitUntilTextboxCloses CallWithArg sub_0806BB1C, 0x00000000 - Call WaitForFrameHiBit + Call WaitForAnimDone CallWithArg sub_0806BB1C, 0x00000001 Call sub_0806BB7C JumpIfNot script_08008C5C @@ -34,11 +34,11 @@ script_08008BD2: Wait 0x000f PlaySound SFX_SECRET SetAnimation 0x0004 - Call WaitForFrameHiBit + Call WaitForAnimDone MessageNoOverlap 0x4913 WaitUntilTextboxCloses SetAnimation 0x0008 - Call WaitForFrameHiBit + Call WaitForAnimDone Jump script_08008C5C script_08008C54: SetAnimation 0x0008 diff --git a/data/scripts/hyruleTown/script_LibrarianRight.inc b/data/scripts/hyruleTown/script_LibrarianRight.inc index df64ef65..2945aaf2 100644 --- a/data/scripts/hyruleTown/script_LibrarianRight.inc +++ b/data/scripts/hyruleTown/script_LibrarianRight.inc @@ -10,7 +10,7 @@ script_08008B6E: TriggerInteract SetPlayerIdle SetAnimation 0x0004 - Call WaitForFrameHiBit + Call WaitForAnimDone Call sub_0806BBB0 WaitUntilTextboxCloses SetAnimation 0x0008 diff --git a/data/scripts/hyruleTown/script_Mayor.inc b/data/scripts/hyruleTown/script_Mayor.inc index 83a6c6a5..1761b2cf 100644 --- a/data/scripts/hyruleTown/script_Mayor.inc +++ b/data/scripts/hyruleTown/script_Mayor.inc @@ -12,12 +12,12 @@ script_0800EA6A: SetPlayerIdle FacePlayer CallWithArg sub_0807F3D8, 0x00000004 - Call WaitForFrameHiBit + Call WaitForAnimDone SetAnimation 0x0009 Call sub_0806CE80 WaitUntilTextboxCloses EnablePlayerControl SetAnimation 0x000a - Call WaitForFrameHiBit + Call WaitForAnimDone SetAnimation 0x0008 Jump script_0800EA6A diff --git a/data/scripts/hyruleTown/script_Pita.inc b/data/scripts/hyruleTown/script_Pita.inc index 5732755d..4c554ae1 100644 --- a/data/scripts/hyruleTown/script_Pita.inc +++ b/data/scripts/hyruleTown/script_Pita.inc @@ -11,7 +11,7 @@ script_080106BE: JumpIfNot script_080106BE SetPlayerIdle FacePlayer - Call WaitForFrameHiBit + Call WaitForAnimDone DoPostScriptAction 0x0000 HasRoomItemForSale JumpIf script_080106E0 diff --git a/data/scripts/hyruleTown/script_Stamp.inc b/data/scripts/hyruleTown/script_Stamp.inc index c478adeb..1b70e3de 100644 --- a/data/scripts/hyruleTown/script_Stamp.inc +++ b/data/scripts/hyruleTown/script_Stamp.inc @@ -11,7 +11,7 @@ script_080107AA: CheckEntityInteractType JumpIfNot script_080107AA SetPlayerIdle - Call WaitForFrameHiBit + Call WaitForAnimDone DoPostScriptAction 0x0001 Call sub_08062CBC WaitUntilTextboxCloses diff --git a/data/scripts/npc/script_BladeBrothers.inc b/data/scripts/npc/script_BladeBrothers.inc index e42d8c46..8dbcf6d5 100644 --- a/data/scripts/npc/script_BladeBrothers.inc +++ b/data/scripts/npc/script_BladeBrothers.inc @@ -36,7 +36,7 @@ script_08016262: Call sub_08068E00 WaitUntilTextboxCloses DoPostScriptAction 0x0001 - Call WaitForFrameHiBit + Call WaitForAnimDone Call sub_08068E90 Call sub_08068C8C JumpIf script_0801631C diff --git a/data/scripts/npc/script_Farmer.inc b/data/scripts/npc/script_Farmer.inc index a03617d1..2aa74c78 100644 --- a/data/scripts/npc/script_Farmer.inc +++ b/data/scripts/npc/script_Farmer.inc @@ -11,7 +11,7 @@ script_0800B0E8: script_0800B0F6: SetPlayerIdle Call sub_0807DF28 - Call WaitForFrameHiBit + Call WaitForAnimDone FacePlayer CallWithArg sub_0806BC94, 0x00000004 Call sub_0806BCE8 @@ -24,7 +24,7 @@ script_0800B0F6: script_0800B134: SetPlayerIdle Call sub_0807DF28 - Call WaitForFrameHiBit + Call WaitForAnimDone FacePlayer CallWithArg sub_0806BC94, 0x00000004 Call sub_0807F650 diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc index 3e97485d..509c2f48 100644 --- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc +++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc @@ -85,9 +85,9 @@ script_080138D0: .endif Call NPC4E_SaveEquippedItems CallWithArg EquipItem, 0x00010001 - CallWithArg sub_0807F29C, gUnk_080049FE + CallWithArg SetInputMacro, gUnk_080049FE Wait 0x00c8 - CallWithArg sub_0807F29C, 0x00000000 + CallWithArg SetInputMacro, 0x00000000 Call NPC4E_RestoreEquippedItems script_08013A8E: .ifndef EU diff --git a/data/scripts/sanctuary/script_Object6ASword2.inc b/data/scripts/sanctuary/script_Object6ASword2.inc index 2acab4f5..8723ac1a 100644 --- a/data/scripts/sanctuary/script_Object6ASword2.inc +++ b/data/scripts/sanctuary/script_Object6ASword2.inc @@ -6,7 +6,7 @@ SCRIPT_START script_Object6ASword2 EndBlock WaitForSyncFlagAndClear 0x00000080 SetAnimation 0x000c - Call WaitForFrameHiBit + Call WaitForAnimDone SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Object6ASword3.inc b/data/scripts/sanctuary/script_Object6ASword3.inc index 38b36455..1cd22b94 100644 --- a/data/scripts/sanctuary/script_Object6ASword3.inc +++ b/data/scripts/sanctuary/script_Object6ASword3.inc @@ -6,7 +6,7 @@ SCRIPT_START script_Object6ASword3 EndBlock WaitForSyncFlagAndClear 0x00000080 SetAnimation 0x000d - Call WaitForFrameHiBit + Call WaitForAnimDone SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge10.inc b/data/scripts/sanctuary/script_Object6ASwordCharge10.inc index 000d1c95..31fd102a 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge10.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge10.inc @@ -9,6 +9,6 @@ SCRIPT_START script_Object6ASwordCharge10 EndBlock WaitForSyncFlag 0x00000020 Wait 0x0078 - Call WaitForFrameHiBit + Call WaitForAnimDone DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge5.inc b/data/scripts/sanctuary/script_Object6ASwordCharge5.inc index 3b06636f..8dc55e5f 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge5.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge5.inc @@ -6,11 +6,11 @@ SCRIPT_START script_Object6ASwordCharge5 EndBlock WaitForSyncFlagAndClear 0x00000200 SetAnimation 0x0008 - Call WaitForFrameHiBit + Call WaitForAnimDone SetAnimation 0x000c SetSyncFlag 0x00002000 WaitForSyncFlag 0x00000020 SetAnimation 0x0010 - Call WaitForFrameHiBit + Call WaitForAnimDone DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge6.inc b/data/scripts/sanctuary/script_Object6ASwordCharge6.inc index 0fccc71d..1a080034 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge6.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge6.inc @@ -6,11 +6,11 @@ SCRIPT_START script_Object6ASwordCharge6 EndBlock WaitForSyncFlagAndClear 0x00000400 SetAnimation 0x0009 - Call WaitForFrameHiBit + Call WaitForAnimDone SetAnimation 0x000d SetSyncFlag 0x00004000 WaitForSyncFlag 0x00000020 SetAnimation 0x0011 - Call WaitForFrameHiBit + Call WaitForAnimDone DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge8.inc b/data/scripts/sanctuary/script_Object6ASwordCharge8.inc index 9120d4b9..d86e5dce 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge8.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge8.inc @@ -7,12 +7,12 @@ SCRIPT_START script_Object6ASwordCharge8 EndBlock WaitForSyncFlagAndClear 0x00001000 SetAnimation 0x000b - Call WaitForFrameHiBit + Call WaitForAnimDone SetAnimation 0x000f SetSyncFlag 0x00010000 WaitForSyncFlag 0x00000020 SetAnimation 0x0013 - Call WaitForFrameHiBit + Call WaitForAnimDone DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge9.inc b/data/scripts/sanctuary/script_Object6ASwordCharge9.inc index 637466b7..7b1b20c0 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge9.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge9.inc @@ -8,7 +8,7 @@ SCRIPT_START script_Object6ASwordCharge9 EndBlock WaitForSyncFlag 0x00000020 Wait 0x0078 - Call WaitForFrameHiBit + Call WaitForAnimDone DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc b/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc index 2584cb86..b2096d46 100644 --- a/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc +++ b/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc @@ -6,7 +6,7 @@ SCRIPT_START script_Object6ASwordInPedestal EndBlock WaitForSyncFlagAndClear 0x00000080 SetAnimation 0x000b - Call WaitForFrameHiBit + Call WaitForAnimDone SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc b/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc index 30ab72f0..ab1e6db4 100644 --- a/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc +++ b/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc @@ -7,12 +7,12 @@ SCRIPT_START script_Objet6ASwordCharge7 EndBlock WaitForSyncFlagAndClear 0x00000800 SetAnimation 0x000a - Call WaitForFrameHiBit + Call WaitForAnimDone SetAnimation 0x000e SetSyncFlag 0x00008000 WaitForSyncFlag 0x00000020 SetAnimation 0x0012 - Call WaitForFrameHiBit + Call WaitForAnimDone DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 |