diff options
Diffstat (limited to 'data/scripts/dhc')
34 files changed, 168 insertions, 168 deletions
diff --git a/data/scripts/dhc/script_GuardCellLeft.inc b/data/scripts/dhc/script_GuardCellLeft.inc index a44c7ed5..58efe5f0 100644 --- a/data/scripts/dhc/script_GuardCellLeft.inc +++ b/data/scripts/dhc/script_GuardCellLeft.inc @@ -1,7 +1,7 @@ @ DHC left Guard at King cell SCRIPT_START script_GuardCellLeft BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0807F3D8, 0x00000000 DoPostScriptAction 0x000a _0807E9D4 @@ -9,10 +9,10 @@ SCRIPT_START script_GuardCellLeft script_0800E44C: CheckEntityInteractType JumpIfNot script_0800E44C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 MessageNoOverlap 0x2405 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800E44C diff --git a/data/scripts/dhc/script_GuardCellRight.inc b/data/scripts/dhc/script_GuardCellRight.inc index 9f85273b..83ddbacf 100644 --- a/data/scripts/dhc/script_GuardCellRight.inc +++ b/data/scripts/dhc/script_GuardCellRight.inc @@ -1,7 +1,7 @@ @ DHC right Guard at King cell SCRIPT_START script_GuardCellRight BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x00000000 DoPostScriptAction 0x000a _0807E9D4 @@ -9,12 +9,12 @@ SCRIPT_START script_GuardCellRight script_0800E484: CheckEntityInteractType JumpIfNot script_0800E484 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 MessageNoOverlap 0x2407 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800E484 diff --git a/data/scripts/dhc/script_GuardStone1.inc b/data/scripts/dhc/script_GuardStone1.inc index 506abd38..ae42371d 100644 --- a/data/scripts/dhc/script_GuardStone1.inc +++ b/data/scripts/dhc/script_GuardStone1.inc @@ -1,21 +1,21 @@ @ DHC Guard stone SCRIPT_START script_GuardStone1 BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0094 JumpIf script_0800E1D0 - _0807E930 0x0010 + SetAnimation 0x0010 CallWithArg sub_0807F8E8, 0x00000001 EndBlock script_0800E176: CheckRoomFlag 0x0001 JumpIfNot script_0800E176 - _0807E864 + SetPlayerIdle Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 - _0807E930 0x0015 + SetAnimation 0x0015 Wait 0x003c PlaySound SFX_1CA DoPostScriptAction 0x0010 @@ -25,8 +25,8 @@ script_0800E176: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB8C - _0807EB74 + FaceAwayFromPlayer + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 Wait 0x000a MessageNoOverlap 0x2401 @@ -35,15 +35,15 @@ script_0800E176: script_0800E1D0: CallWithArg sub_0807F3D8, 0x00000000 _0807E9D4 - _0807E878 + EnablePlayerControl EndBlock script_0800E1E0: CheckEntityInteractType JumpIfNot script_0800E1E0 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 MessageNoOverlap 0x2401 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800E1E0 diff --git a/data/scripts/dhc/script_GuardStone2.inc b/data/scripts/dhc/script_GuardStone2.inc index d7e613af..71483148 100644 --- a/data/scripts/dhc/script_GuardStone2.inc +++ b/data/scripts/dhc/script_GuardStone2.inc @@ -2,30 +2,30 @@ SCRIPT_START script_GuardStone2 BeginBlock SetEntitySpeed 0x0100 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0073 JumpIfNot script_0800E232 _0807E9D4 SetEntityPositionRelative 0x0070, 0x0168 - _0807EB44 0x0002 + SetAnimationState 0x0002 CallWithArg sub_0807F3D8, 0x00000000 EndBlock Jump script_0800E32E script_0800E232: CheckLocalFlag 0x0095 JumpIf script_0800E29A - _0807E930 0x0010 + SetAnimation 0x0010 CallWithArg sub_0807F8E8, 0x00000002 EndBlock script_0800E24A: CheckRoomFlag 0x0002 JumpIfNot script_0800E24A - _0807E864 + SetPlayerIdle Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 - _0807E930 0x0015 + SetAnimation 0x0015 Wait 0x003c PlaySound SFX_1CA DoPostScriptAction 0x0010 @@ -35,15 +35,15 @@ script_0800E24A: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB8C - _0807EB74 + FaceAwayFromPlayer + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 SetLocalFlag 0x0095 script_0800E29A: DoPostScriptAction 0x0000 CallWithArg sub_0807F3D8, 0x00000000 _0807E9D4 - _0807E878 + EnablePlayerControl EndBlock script_0800E2AE: EndBlock @@ -59,33 +59,33 @@ script_0800E2AE: _0807E9DC SetLocalFlag 0x0073 EndBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 CallWithArg sub_0807F3D8, 0x00000004 _0807EDD4 0x0088, 0x0168 - _0807EB44 0x0006 + SetAnimationState 0x0006 CallWithArg sub_0807F3D8, 0x00000004 _0807EDD4 0x0070, 0x0168 - _0807EB74 + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 _0807E9D4 Jump script_0800E32E script_0800E312: - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 EndBlock MessageNoOverlap 0x2404 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800E2AE script_0800E32E: CheckEntityInteractType JumpIfNot script_0800E32E - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 MessageNoOverlap 0x2403 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_0800E32E .2byte 0x0000 diff --git a/data/scripts/dhc/script_KingDaltusStone.inc b/data/scripts/dhc/script_KingDaltusStone.inc index ee83a886..23e38f64 100644 --- a/data/scripts/dhc/script_KingDaltusStone.inc +++ b/data/scripts/dhc/script_KingDaltusStone.inc @@ -1,23 +1,23 @@ @ DHC King Daltus stone SCRIPT_START script_KingDaltusStone BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0071 JumpIf script_0800E3E8 CheckLocalFlag 0x0096 JumpIf script_0800E3BE - _0807E930 0x000c + SetAnimation 0x000c CallWithArg sub_0807F8E8, 0x00000000 EndBlock script_0800E37A: CheckRoomFlag 0x0000 JumpIfNot script_0800E37A - _0807E864 + SetPlayerIdle Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 - _0807E930 0x000d + SetAnimation 0x000d Wait 0x003c PlaySound SFX_1CA DoPostScriptAction 0x0010 @@ -27,36 +27,36 @@ script_0800E37A: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB74 + FacePlayer SetLocalFlag 0x0096 script_0800E3BE: DoPostScriptAction 0x0000 _0807E9D4 - _0807E878 + EnablePlayerControl EndBlock script_0800E3C8: CheckEntityInteractType JumpIfNot script_0800E3C8 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x240c WaitUntilTextboxCloses Wait 0x000f GivePlayerItem 0x0053 WaitPlayerGetItem SetLocalFlag 0x0071 - _0807E878 + EnablePlayerControl script_0800E3E8: _0807E9D4 - _0807E878 + EnablePlayerControl EndBlock script_0800E3EE: CheckEntityInteractType JumpIfNot script_0800E3EE - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x240d WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800E3EE diff --git a/data/scripts/dhc/script_MinishterPothoStone.inc b/data/scripts/dhc/script_MinishterPothoStone.inc index b01fa4fa..caf8f250 100644 --- a/data/scripts/dhc/script_MinishterPothoStone.inc +++ b/data/scripts/dhc/script_MinishterPothoStone.inc @@ -1,21 +1,21 @@ @ DHC Minister Potho stone SCRIPT_START script_MinishterPothoStone BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0093 JumpIf script_0800E12E - _0807E930 0x0008 + SetAnimation 0x0008 CallWithArg sub_0807F8E8, 0x00000000 EndBlock script_0800E0DE: CheckRoomFlag 0x0000 JumpIfNot script_0800E0DE - _0807E864 + SetPlayerIdle Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 - _0807E930 0x0009 + SetAnimation 0x0009 Wait 0x003c PlaySound SFX_1CA DoPostScriptAction 0x0010 @@ -25,24 +25,24 @@ script_0800E0DE: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB8C - _0807EB74 + FaceAwayFromPlayer + FacePlayer Wait 0x000a MessageNoOverlap 0x2402 WaitUntilTextboxCloses SetLocalFlag 0x0093 script_0800E12E: Call sub_080668F0 - _0807E878 + EnablePlayerControl EndBlock script_0800E138: CheckEntityInteractType JumpIfNot script_0800E138 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x2402 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800E138 .2byte 0x0000 diff --git a/data/scripts/dhc/script_MinisterPothoCell.inc b/data/scripts/dhc/script_MinisterPothoCell.inc index 92639487..bbb05921 100644 --- a/data/scripts/dhc/script_MinisterPothoCell.inc +++ b/data/scripts/dhc/script_MinisterPothoCell.inc @@ -1,17 +1,17 @@ @ DHC Minister Potho in King cell SCRIPT_START script_MinisterPothoCell BeginBlock - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x000a Call sub_080668F0 EndBlock script_0800E41A: CheckEntityInteractType JumpIfNot script_0800E41A - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x2406 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_0800E41A diff --git a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc index 7862193e..67c2d035 100644 --- a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc @@ -5,28 +5,28 @@ SCRIPT_START script_Npc4EAfterDefeatingV2 script_0800DB7C: CallWithArg sub_0807F6B4, 0x000000a0 JumpIf script_0800DB7C - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 _0807F0B4 0x0001 SetEntityPositionRelative 0x0078, 0x0078 CameraTargetEntity - Call sub_0807F5C0 - _0807EB28 0x1648 + Call WaitForCameraTouchRoomBorder + EzloMessage 0x1648 WaitUntilTextboxCloses Call sub_0804D7EC SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_0800DBCA: CheckRoomFlag 0x0000 JumpIfNot script_0800DBCA - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 Call sub_0804D810 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c StartPlayerScript script_PlayerRescuedZelda WaitForSyncFlagAndClear 0x00000004 @@ -37,9 +37,9 @@ script_0800DBCA: WaitForSyncFlagAndClear 0x00000006 MessageFromTargetPos 0x1643, 0x0002 WaitUntilTextboxCloses - _0807EB28 0x1645 + EzloMessage 0x1645 WaitUntilTextboxCloses - Call sub_0807F3F8 + Call CreatePlayerExclamationMark SetSyncFlag 0x00000001 StopBgm Call sub_08094F98 diff --git a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc index 901ce247..1f2ae59d 100644 --- a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc +++ b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc @@ -4,12 +4,12 @@ SCRIPT_START script_Npc4ECastleCollapsing PlayBgm BGM_CASTLE_COLLAPSE StartPlayerScript script_PlayerStonesFall WaitForSyncFlagAndClear 0x00000006 - _0807EB28 0x1646 + EzloMessage 0x1646 WaitUntilTextboxCloses SetSyncFlag 0x00000001 StartPlayerScript script_PlayerCastleCollapsing CameraTargetPlayer - _0807E778 0x0004 + SetFadeTime 0x0004 _0807E80C 0x00000000 WaitForFadeFinish CallWithArg DeleteManager36, 0x00000001 @@ -17,6 +17,6 @@ SCRIPT_START script_Npc4ECastleCollapsing SetLocalFlag 0x0079 CallWithArg sub_0806DA1C, 0x00000002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/dhc/script_Npc4EV3Defeated.inc b/data/scripts/dhc/script_Npc4EV3Defeated.inc index c2f60ee1..09f214d5 100644 --- a/data/scripts/dhc/script_Npc4EV3Defeated.inc +++ b/data/scripts/dhc/script_Npc4EV3Defeated.inc @@ -5,7 +5,7 @@ script_0800A0FE: CheckGlobalFlag 0x0051 JumpIfNot script_0800A0FE BeginBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 StopBgm .ifndef EU @@ -14,10 +14,10 @@ script_0800A0FE: SetEntityPositionRelative 0x00b0, 0x0058 Call sub_0807F844 _0807E8E4_3 - CallWithArg sub_0807F75C, 0x00d00060 + CallWithArg SetPlayerPos, 0x00d00060 CallWithArg sub_08094AE8, script_Object6AV3DefeatedMinishCap PlaySound SFX_APPARATE - _0807E778 0x0002 + SetFadeTime 0x0002 DoFade6 EndBlock WaitForFadeFinish diff --git a/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc b/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc index b583efe7..4bdf7ea5 100644 --- a/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc +++ b/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc @@ -1,7 +1,7 @@ @ DHC OBJECT_69 Towards Vaati in room with Ball&Chain soldier SCRIPT_START script_Object69BallAndChainSoldierRoom BeginBlock - Call sub_0807F354 + Call SetPriorityPlayerEvent EndBlock CheckLocalFlag 0x007c JumpIf script_0800E4FA @@ -17,7 +17,7 @@ script_0800E4B6: .endif JumpIfNot script_0800E4B6 BeginBlock - _0807E864 + SetPlayerIdle .ifdef JP .ifndef DEMO_JP Call SetPlayerEventPriority @@ -28,7 +28,7 @@ script_0800E4B6: .endif .endif EndBlock - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c MessageFromTarget 0x160c WaitUntilTextboxCloses @@ -36,7 +36,7 @@ script_0800E4B6: MessageFromTarget 0x160d WaitUntilTextboxCloses Wait 0x001e - _0807EB28 0x160e + EzloMessage 0x160e Wait 0x003c WaitUntilTextboxCloses BeginBlock @@ -52,7 +52,7 @@ script_0800E4B6: .endif .endif script_0800E4FA: - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 EndBlock SCRIPT_END diff --git a/data/scripts/dhc/script_Object69CastleEscape.inc b/data/scripts/dhc/script_Object69CastleEscape.inc index ffd72119..f75e5bc4 100644 --- a/data/scripts/dhc/script_Object69CastleEscape.inc +++ b/data/scripts/dhc/script_Object69CastleEscape.inc @@ -1,15 +1,15 @@ @ DHC OBJECT_69 trying to escape the collapsing castle SCRIPT_START script_Object69CastleEscape - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerCastleEscape WaitForSyncFlagAndClear 0x00000001 WaitForSyncFlagAndClear 0x00000002 - _0807EB28 0x1647 + EzloMessage 0x1647 WaitUntilTextboxCloses SetLocalFlag 0x007a Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/dhc/script_Object69DarkNutsRoom.inc b/data/scripts/dhc/script_Object69DarkNutsRoom.inc index 44712e30..c2f30cae 100644 --- a/data/scripts/dhc/script_Object69DarkNutsRoom.inc +++ b/data/scripts/dhc/script_Object69DarkNutsRoom.inc @@ -7,17 +7,17 @@ SCRIPT_START script_Object69DarkNutsRoom script_0800E550: CheckPlayerInRegion 0x00a8, 0x00c0, 0x0880 JumpIfNot script_0800E550 - _0807E864 + SetPlayerIdle Wait 0x001e - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c PlaySound SFX_105 Wait 0x001e - _0807EB28 0x1622 + EzloMessage 0x1622 Call sub_08053494 SetLocalFlag 0x007e script_0800E582: - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_Object69KeatonsRoom.inc b/data/scripts/dhc/script_Object69KeatonsRoom.inc index ef855c7e..902cf230 100644 --- a/data/scripts/dhc/script_Object69KeatonsRoom.inc +++ b/data/scripts/dhc/script_Object69KeatonsRoom.inc @@ -7,15 +7,15 @@ SCRIPT_START script_Object69KeatonsRoom script_0800E510: CheckPlayerInRegion 0x00a8, 0x0178, 0x1080 JumpIfNot script_0800E510 - _0807E864 + SetPlayerIdle Wait 0x001e - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c PlaySound SFX_105 Wait 0x001e - _0807EB28 0x1617 + EzloMessage 0x1617 SetLocalFlag 0x007d script_0800E53C: - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/dhc/script_Object69KillDarkNut.inc b/data/scripts/dhc/script_Object69KillDarkNut.inc index 24b83cb0..23a85ddd 100644 --- a/data/scripts/dhc/script_Object69KillDarkNut.inc +++ b/data/scripts/dhc/script_Object69KillDarkNut.inc @@ -4,12 +4,12 @@ SCRIPT_START script_Object69KillDarkNut script_0800E5D8: CheckLocalFlag 0x0086 JumpIfNot script_0800E5D8 - _0807E864 + SetPlayerIdle Wait 0x003c SetIntVariable 0x00000905 - Call sub_0807F420 + Call LoadMenu SetRoomFlag 0x0001 Wait 0x001e - _0807E878 + EnablePlayerControl SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_Object69V1Defeated.inc b/data/scripts/dhc/script_Object69V1Defeated.inc index 5acee128..0fe8da38 100644 --- a/data/scripts/dhc/script_Object69V1Defeated.inc +++ b/data/scripts/dhc/script_Object69V1Defeated.inc @@ -5,11 +5,11 @@ script_0800DFB6: CheckRoomFlag 0x0001 JumpIfNot script_0800DFB6 StopBgm - _0807E864 + SetPlayerIdle Call sub_0807DF28 PlaySound SFX_EVAPORATE CallWithArg sub_0806DA1C, 0x00000004 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/dhc/script_Object69V2Defeated.inc b/data/scripts/dhc/script_Object69V2Defeated.inc index 9d356a54..ddd5df46 100644 --- a/data/scripts/dhc/script_Object69V2Defeated.inc +++ b/data/scripts/dhc/script_Object69V2Defeated.inc @@ -2,12 +2,12 @@ SCRIPT_START script_Object69V2Defeated BeginBlock Call sub_0807DF28 - _0807E864 + SetPlayerIdle EndBlock StopBgm StopBgm Wait 0x0078 - _0807EB28 0x1638 + EzloMessage 0x1638 WaitUntilTextboxCloses SetRoomFlag 0x0000 Wait 0x001e @@ -15,7 +15,7 @@ SCRIPT_START script_Object69V2Defeated StartPlayerScript script_PlayerV2Defeated WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_Object69V2Intro.inc b/data/scripts/dhc/script_Object69V2Intro.inc index a485ffb9..1e779703 100644 --- a/data/scripts/dhc/script_Object69V2Intro.inc +++ b/data/scripts/dhc/script_Object69V2Intro.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Object69V2Intro BeginBlock Call sub_0807DF28 - _0807E864 + SetPlayerIdle EndBlock StopBgm MessageFromTargetPos 0x1632, 0x0002 @@ -13,12 +13,12 @@ script_0800DFFE: JumpIfNot script_0800DFFE PlayBgm BGM_VAATI_TRANSFIGURED Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_0800E012: @ Defeated CheckRoomFlag 0x0002 JumpIfNot script_0800E012 - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetLocalFlag 0x007b MessageFromTargetPos 0x1639, 0x000c @@ -27,7 +27,7 @@ script_0800E012: PlaySound SFX_EVAPORATE CallWithArg sub_0806DA1C, 0x00000005 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_Object69VaatiWithZelda.inc b/data/scripts/dhc/script_Object69VaatiWithZelda.inc index e66a3b15..930fbcf2 100644 --- a/data/scripts/dhc/script_Object69VaatiWithZelda.inc +++ b/data/scripts/dhc/script_Object69VaatiWithZelda.inc @@ -5,16 +5,16 @@ SCRIPT_START script_Object69VaatiWithZelda script_0800DA64: CheckPlayerInRegion 0x0078, 0x0148, 0x4040 JumpIfNot script_0800DA64 - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 _0807E8E4_0 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c _0807F0B4 0x0004 SetEntityPositionRelative 0x0078, 0x0080 CameraTargetEntity - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 MessageFromTargetPos 0x162d, 0x0002 @@ -24,24 +24,24 @@ script_0800DA64: MessageFromTargetPos 0x162e, 0x0002 WaitUntilTextboxCloses _0807E8E4_0 - CallWithArg sub_0807F75C, 0x00780138 + CallWithArg SetPlayerPos, 0x00780138 _0807F0B4 0x0004 CameraTargetPlayer - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder SetRoomFlag 0x0000 - Call sub_0807F40C + Call CreatePlayerQuestionMark Wait 0x001e _0807E8E4_1 Wait 0x000a _0807E8E4_3 Wait 0x000a _0807E8E4_2 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c SetRoomFlag 0x0001 SetLocalFlag 0x0077 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc index 77dc7aaa..384e441c 100644 --- a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc +++ b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc @@ -4,15 +4,15 @@ SCRIPT_START script_Object6AV3DefeatedMinishCap SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - _0807E930 0x0002 + SetAnimation 0x0002 SetEntityPositionRelative 0x00b0, 0x0080 - CallWithArg sub_0807F98C, 0xff800000 + CallWithArg SetEntityHeight, 0xff800000 CallWithArg sub_080960C4, script_Object6AV3DefeatedMinishCap2 EndBlock PlaySound SFX_SPARKLES _0807EF3C 0xff80, 0x0000 PlaySound SFX_143 - _0807E930 0x0004 + SetAnimation 0x0004 SetSyncFlag 0x00000002 Wait 0x003c SetSyncFlag 0x00000004 diff --git a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc index 093a1833..200517d3 100644 --- a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc +++ b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc @@ -3,7 +3,7 @@ SCRIPT_START script_Object6AV3DefeatedMinishCap2 BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b - CallWithArg sub_0807F994, 0x0000fff8 + CallWithArg SetSpriteOffset, 0x0000fff8 EndBlock WaitForSyncFlag 0x00000002 DoPostScriptAction 0x0006 diff --git a/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc b/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc index 8c72e4c3..ee4b78c3 100644 --- a/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc @@ -3,10 +3,10 @@ SCRIPT_START script_PlayerAfterDefeatingV2 BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x000d DoPostScriptAction 0x0000 - _0807ECC4 0x0010 + WalkSouth 0x0010 DoPostScriptAction 0x000c SetSyncFlag 0x00000004 Call sub_080791BC diff --git a/data/scripts/dhc/script_PlayerAtDarkNut1.inc b/data/scripts/dhc/script_PlayerAtDarkNut1.inc index fd697e62..e37bcc9a 100644 --- a/data/scripts/dhc/script_PlayerAtDarkNut1.inc +++ b/data/scripts/dhc/script_PlayerAtDarkNut1.inc @@ -3,13 +3,13 @@ SCRIPT_START script_PlayerAtDarkNut1 BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0000 - _0807E864 - Call sub_0807F354 + SetPlayerIdle + Call SetPriorityPlayerEvent EndBlock - WaitForPlayerAction0x17 + WaitForPlayerEnterRoom _0807E8E4_0 DoPostScriptAction 0x0001 Call sub_080752AC - _0807E878 + EnablePlayerControl Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerAtDarkNut2.inc b/data/scripts/dhc/script_PlayerAtDarkNut2.inc index 274f6746..60ee6ace 100644 --- a/data/scripts/dhc/script_PlayerAtDarkNut2.inc +++ b/data/scripts/dhc/script_PlayerAtDarkNut2.inc @@ -3,13 +3,13 @@ SCRIPT_START script_PlayerAtDarkNut2 BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0008 - _0807E864 - Call sub_0807F354 + SetPlayerIdle + Call SetPriorityPlayerEvent EndBlock - WaitForPlayerAction0x17 + WaitForPlayerEnterRoom _0807E8E4_1 DoPostScriptAction 0x0001 Call sub_080752AC - _0807E878 + EnablePlayerControl Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerAtDarkNut3.inc b/data/scripts/dhc/script_PlayerAtDarkNut3.inc index 8cd1c2c9..b092a4c7 100644 --- a/data/scripts/dhc/script_PlayerAtDarkNut3.inc +++ b/data/scripts/dhc/script_PlayerAtDarkNut3.inc @@ -3,13 +3,13 @@ SCRIPT_START script_PlayerAtDarkNut3 BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0010 - _0807E864 - Call sub_0807F354 + SetPlayerIdle + Call SetPriorityPlayerEvent EndBlock - WaitForPlayerAction0x17 + WaitForPlayerEnterRoom _0807E8E4_2 DoPostScriptAction 0x0001 Call sub_080752AC - _0807E878 + EnablePlayerControl Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerCastleCollapsing.inc b/data/scripts/dhc/script_PlayerCastleCollapsing.inc index dff8b0a0..509a5e68 100644 --- a/data/scripts/dhc/script_PlayerCastleCollapsing.inc +++ b/data/scripts/dhc/script_PlayerCastleCollapsing.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerCastleCollapsing BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 _0807EEF4 0x0000, 0x0080 SetSyncFlag 0x00000004 diff --git a/data/scripts/dhc/script_PlayerCastleEscape.inc b/data/scripts/dhc/script_PlayerCastleEscape.inc index 997799ad..5f57f7d8 100644 --- a/data/scripts/dhc/script_PlayerCastleEscape.inc +++ b/data/scripts/dhc/script_PlayerCastleEscape.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerCastleEscape SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0198, 0x01c8 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/dhc/script_PlayerRescuedZelda.inc b/data/scripts/dhc/script_PlayerRescuedZelda.inc index 23a6112c..66d6d108 100644 --- a/data/scripts/dhc/script_PlayerRescuedZelda.inc +++ b/data/scripts/dhc/script_PlayerRescuedZelda.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerRescuedZelda EndBlock CallWithArg sub_0807F4F8, 0x000000a0 _0807EDD4 0x0078, 0x00a0 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 Call sub_080791BC diff --git a/data/scripts/dhc/script_PlayerStonesFall.inc b/data/scripts/dhc/script_PlayerStonesFall.inc index 5f9e57d1..12ba8a9d 100644 --- a/data/scripts/dhc/script_PlayerStonesFall.inc +++ b/data/scripts/dhc/script_PlayerStonesFall.inc @@ -1,10 +1,10 @@ @ Player after turning Zelda when stones fall SCRIPT_START script_PlayerStonesFall EndBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 - CallWithArg sub_0807F238, 0x000003c5 - Call sub_0807F304 + CallWithArg SetPlayerAnimation2, 0x000003c5 + Call WaitForPlayerFrameHiBit SetSyncFlag 0x00000004 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/dhc/script_Vaati1Intro.inc b/data/scripts/dhc/script_Vaati1Intro.inc index cbf2d189..3255d880 100644 --- a/data/scripts/dhc/script_Vaati1Intro.inc +++ b/data/scripts/dhc/script_Vaati1Intro.inc @@ -2,21 +2,21 @@ SCRIPT_START script_Vaati1Intro BeginBlock DoPostScriptAction 0x0008 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock - _0807E864 - Call sub_0807F9A4 + SetPlayerIdle + Call WaitForPlayerNormal Call sub_0807DF28 StopBgm _0807E8E4_2 Wait 0x005a - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x003c _0807E8E4_0 _0807F0B4 0x0001 CameraTargetEntity - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder Call sub_08066C94 Wait 0x00e9 DoPostScriptAction 0x0007 @@ -25,15 +25,15 @@ SCRIPT_START script_Vaati1Intro PlayBgm BGM_VAATI_REBORN DoPostScriptAction 0x0019 PlaySound SFX_198 - Call sub_0807F2D4 + Call WaitForFrameHiBit SetRoomFlag 0x0000 DoPostScriptAction 0x0008 Wait 0x0080 _0807F0B4 0x0004 CameraTargetPlayer - Call sub_0807F5C0 + Call WaitForCameraTouchRoomBorder SetLocalFlag 0x0078 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/dhc/script_VaatiWithZelda.inc b/data/scripts/dhc/script_VaatiWithZelda.inc index 252052f3..1464b9a8 100644 --- a/data/scripts/dhc/script_VaatiWithZelda.inc +++ b/data/scripts/dhc/script_VaatiWithZelda.inc @@ -2,21 +2,21 @@ SCRIPT_START script_VaatiWithZelda BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0014 EndBlock WaitForSyncFlagAndClear 0x00000001 Wait 0x003c DoPostScriptAction 0x0004 Wait 0x003c - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x001c - Call sub_0807F2D4 + Call WaitForFrameHiBit DoPostScriptAction 0x0000 Wait 0x003c SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0014 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc index c52b1a81..8c2d1161 100644 --- a/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc @@ -18,48 +18,48 @@ script_0800DCD0: StopBgm Call sub_08066E50 PlaySound SFX_1C9 - Call sub_0807F2D4 + Call WaitForFrameHiBit PlaySound SFX_1CA Wait 0x003c DoPostScriptAction 0x0004 PlayBgm BGM_SAVING_ZELDA Wait 0x0078 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Wait 0x003c SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 _0807EEF4 0x0000, 0x0008 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Wait 0x001e Call sub_08066E80 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x0004 Wait 0x003c - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x000a - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 diff --git a/data/scripts/dhc/script_ZeldaCastleEscape.inc b/data/scripts/dhc/script_ZeldaCastleEscape.inc index 83fd2afd..f8150ad9 100644 --- a/data/scripts/dhc/script_ZeldaCastleEscape.inc +++ b/data/scripts/dhc/script_ZeldaCastleEscape.inc @@ -1,7 +1,7 @@ @ DHC Zelda trying to escape the collapsing castle SCRIPT_START script_ZeldaCastleEscape BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetEntitySpeed 0x0100 DoPostScriptAction 0x000b @@ -13,7 +13,7 @@ SCRIPT_START script_ZeldaCastleEscape DoPostScriptAction 0x0007 EndBlock _0807EDD4 0x0198, 0x01a8 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 Call sub_08066D4C diff --git a/data/scripts/dhc/script_ZeldaStoneDHC.inc b/data/scripts/dhc/script_ZeldaStoneDHC.inc index 04ab862d..ae2bc504 100644 --- a/data/scripts/dhc/script_ZeldaStoneDHC.inc +++ b/data/scripts/dhc/script_ZeldaStoneDHC.inc @@ -2,7 +2,7 @@ SCRIPT_START script_ZeldaStoneDHC BeginBlock DoPostScriptAction 0x0007 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0014 EndBlock Wait 0x003c |