diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2023-12-28 14:59:23 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2023-12-28 14:59:23 +0100 |
| commit | 768efa50b308be03737d7eae2a1069627ea48b79 (patch) | |
| tree | 447c266172ef82df68bfd6d4737acb499f2b1a9d /data/scripts/dhc | |
| parent | b6a94d5062076ce53a00609e1e661b9da9e7ee5b (diff) | |
| parent | dae4c669913c3dc4248291f2d843ac39525b2738 (diff) | |
Merge branch 'master' into tilemap-docs
Diffstat (limited to 'data/scripts/dhc')
| -rw-r--r-- | data/scripts/dhc/script_KingDaltusStone.inc | 8 | ||||
| -rw-r--r-- | data/scripts/dhc/script_PlayerStonesFall.inc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/scripts/dhc/script_KingDaltusStone.inc b/data/scripts/dhc/script_KingDaltusStone.inc index 0cc87638..bc7550b9 100644 --- a/data/scripts/dhc/script_KingDaltusStone.inc +++ b/data/scripts/dhc/script_KingDaltusStone.inc @@ -3,9 +3,9 @@ SCRIPT_START script_KingDaltusStone BeginBlock SetAnimationState 0x0004 DoPostScriptAction 0x000a - CheckLocalFlag 0x0071 + CheckLocalFlag LV6_1d_KEYGET JumpIf script_0800E3E8 - CheckLocalFlag 0x0096 + CheckLocalFlag LV6_39_KING JumpIf script_0800E3BE SetAnimation 0x000c CallWithArg sub_0807F8E8, 0x00000000 @@ -28,7 +28,7 @@ script_0800E37A: Wait 0x001e DoPostScriptAction 0x0000 FacePlayer - SetLocalFlag 0x0096 + SetLocalFlag LV6_39_KING script_0800E3BE: DoPostScriptAction 0x0000 _0807E9D4 @@ -44,7 +44,7 @@ script_0800E3C8: Wait 0x000f GivePlayerItem ITEM_SMALL_KEY WaitPlayerGetItem - SetLocalFlag 0x0071 + SetLocalFlag LV6_1d_KEYGET EnablePlayerControl script_0800E3E8: _0807E9D4 diff --git a/data/scripts/dhc/script_PlayerStonesFall.inc b/data/scripts/dhc/script_PlayerStonesFall.inc index b2a41dd6..adafc6cd 100644 --- a/data/scripts/dhc/script_PlayerStonesFall.inc +++ b/data/scripts/dhc/script_PlayerStonesFall.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerStonesFall EndBlock SetAnimationState 0x0004 DoPostScriptAction 0x0000 - CallWithArg SetPlayerAnimation2, 0x000003c5 + CallWithArg SetPlayerAnimation2, ANIM_EZLO_SEARCH Call WaitForPlayerAnim SetSyncFlag 0x00000004 Call SetPlayerActionNormal |