diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2021-12-28 13:56:21 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-28 13:56:21 -0800 |
| commit | 4d04c1c920dc6ab02de60a2774ed4cc5feb3d7b3 (patch) | |
| tree | b6226159f870a5974379851e986261eb8d1ce5fc /data/scripts/dhc | |
| parent | 9456e38606b3ebfe388bd810a4187a5c06c97947 (diff) | |
| parent | 3fd900f1bc81cbaf106de17f5b8d41e26de682a8 (diff) | |
Merge pull request #227 from notyourav/cl
cleanup
Diffstat (limited to 'data/scripts/dhc')
| -rw-r--r-- | data/scripts/dhc/script_PlayerAfterDefeatingV2.inc | 2 | ||||
| -rw-r--r-- | data/scripts/dhc/script_PlayerAtDarkNut1.inc | 2 | ||||
| -rw-r--r-- | data/scripts/dhc/script_PlayerAtDarkNut2.inc | 2 | ||||
| -rw-r--r-- | data/scripts/dhc/script_PlayerAtDarkNut3.inc | 2 | ||||
| -rw-r--r-- | data/scripts/dhc/script_PlayerCastleCollapsing.inc | 2 | ||||
| -rw-r--r-- | data/scripts/dhc/script_PlayerCastleEscape.inc | 2 | ||||
| -rw-r--r-- | data/scripts/dhc/script_PlayerRescuedZelda.inc | 2 | ||||
| -rw-r--r-- | data/scripts/dhc/script_PlayerStonesFall.inc | 2 | ||||
| -rw-r--r-- | data/scripts/dhc/script_PlayerV2Defeated.inc | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc b/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc index ee4b78c3..3d9de90b 100644 --- a/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc @@ -9,6 +9,6 @@ SCRIPT_START script_PlayerAfterDefeatingV2 WalkSouth 0x0010 DoPostScriptAction 0x000c SetSyncFlag 0x00000004 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_PlayerAtDarkNut1.inc b/data/scripts/dhc/script_PlayerAtDarkNut1.inc index e37bcc9a..ad302065 100644 --- a/data/scripts/dhc/script_PlayerAtDarkNut1.inc +++ b/data/scripts/dhc/script_PlayerAtDarkNut1.inc @@ -11,5 +11,5 @@ SCRIPT_START script_PlayerAtDarkNut1 DoPostScriptAction 0x0001 Call sub_080752AC EnablePlayerControl - Call sub_080791D0 + Call ResetPlayerAnimationAndAction SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerAtDarkNut2.inc b/data/scripts/dhc/script_PlayerAtDarkNut2.inc index 60ee6ace..975bc5a2 100644 --- a/data/scripts/dhc/script_PlayerAtDarkNut2.inc +++ b/data/scripts/dhc/script_PlayerAtDarkNut2.inc @@ -11,5 +11,5 @@ SCRIPT_START script_PlayerAtDarkNut2 DoPostScriptAction 0x0001 Call sub_080752AC EnablePlayerControl - Call sub_080791D0 + Call ResetPlayerAnimationAndAction SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerAtDarkNut3.inc b/data/scripts/dhc/script_PlayerAtDarkNut3.inc index b092a4c7..698c4108 100644 --- a/data/scripts/dhc/script_PlayerAtDarkNut3.inc +++ b/data/scripts/dhc/script_PlayerAtDarkNut3.inc @@ -11,5 +11,5 @@ SCRIPT_START script_PlayerAtDarkNut3 DoPostScriptAction 0x0001 Call sub_080752AC EnablePlayerControl - Call sub_080791D0 + Call ResetPlayerAnimationAndAction SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerCastleCollapsing.inc b/data/scripts/dhc/script_PlayerCastleCollapsing.inc index 509a5e68..5ee0ccfe 100644 --- a/data/scripts/dhc/script_PlayerCastleCollapsing.inc +++ b/data/scripts/dhc/script_PlayerCastleCollapsing.inc @@ -7,5 +7,5 @@ SCRIPT_START script_PlayerCastleCollapsing DoPostScriptAction 0x0000 _0807EEF4 0x0000, 0x0080 SetSyncFlag 0x00000004 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerCastleEscape.inc b/data/scripts/dhc/script_PlayerCastleEscape.inc index 5f57f7d8..45468213 100644 --- a/data/scripts/dhc/script_PlayerCastleEscape.inc +++ b/data/scripts/dhc/script_PlayerCastleEscape.inc @@ -7,5 +7,5 @@ SCRIPT_START script_PlayerCastleEscape SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerRescuedZelda.inc b/data/scripts/dhc/script_PlayerRescuedZelda.inc index 66d6d108..b792296a 100644 --- a/data/scripts/dhc/script_PlayerRescuedZelda.inc +++ b/data/scripts/dhc/script_PlayerRescuedZelda.inc @@ -8,6 +8,6 @@ SCRIPT_START script_PlayerRescuedZelda SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_PlayerStonesFall.inc b/data/scripts/dhc/script_PlayerStonesFall.inc index 12ba8a9d..538adc2a 100644 --- a/data/scripts/dhc/script_PlayerStonesFall.inc +++ b/data/scripts/dhc/script_PlayerStonesFall.inc @@ -6,5 +6,5 @@ SCRIPT_START script_PlayerStonesFall CallWithArg SetPlayerAnimation2, 0x000003c5 Call WaitForPlayerFrameHiBit SetSyncFlag 0x00000004 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerV2Defeated.inc b/data/scripts/dhc/script_PlayerV2Defeated.inc index 33f6d785..f16621e5 100644 --- a/data/scripts/dhc/script_PlayerV2Defeated.inc +++ b/data/scripts/dhc/script_PlayerV2Defeated.inc @@ -7,6 +7,6 @@ SCRIPT_START script_PlayerV2Defeated DoPostScriptAction 0x0001 _0807EDD4 0x00a8, 0x002c SetSyncFlag 0x00000002 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 |