diff options
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/hyruleCastleGarden/script_GuardEntry3.inc | 3 | ||||
| -rw-r--r-- | data/scripts/hyruleTown/script_GuardWest.inc | 8 | ||||
| -rw-r--r-- | data/scripts/npc/script_BladeBrothers.inc | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc b/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc index 36916c9c..663e740c 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc @@ -12,7 +12,8 @@ script_08011A7C: SetPlayerIdle FacePlayer CallWithArg sub_0807F3D8, 0x00000000 - CallWithArg sub_080644B4, 0x00000006 + @ Check if player has performed great spin. + CallWithArg CheckLastSwordMove, 0x00000006 JumpIf script_08011AFA MessageFromTarget TEXT_VAATI, 0x20 WaitUntilTextboxCloses diff --git a/data/scripts/hyruleTown/script_GuardWest.inc b/data/scripts/hyruleTown/script_GuardWest.inc index ced896a7..26ad9095 100644 --- a/data/scripts/hyruleTown/script_GuardWest.inc +++ b/data/scripts/hyruleTown/script_GuardWest.inc @@ -4,7 +4,7 @@ SCRIPT_START script_GuardWest SetAnimationState 0x0002 _0807E9D4 CallWithArg sub_0807F3D8, 0x00000008 - Call sub_080644A4 + Call GuardWithSpear_ResetLastSwordMove .ifndef EU ClearLocalFlag MACHI_02_HEISHI_TALK .endif @@ -19,10 +19,10 @@ script_0800FF92: Call sub_08064198 CheckLocalFlag MACHI_02_HEISHI_TALK JumpIfNot script_0800FFCC - Call sub_08064488 + Call GuardWithSpear_ResetLastSwordMoveIfNotInSwordState CheckPlayerInRegion2 0x4040 JumpIfNot script_0800FFCC - Call sub_08064470 + Call GuardWithSpear_CheckSwordMoveSpin JumpIf script_08010014 script_0800FFCC: CheckEntityInteractType @@ -65,7 +65,7 @@ script_08010014: CallWithArg sub_0807F3D8, 0x00000008 SetLocalFlag MACHI_02_HEISHI script_08010060: - Call sub_080644A4 + Call GuardWithSpear_ResetLastSwordMove CallWithArg sub_0807F5B0, 0x0000000a EnablePlayerControl Jump script_0800FF92 diff --git a/data/scripts/npc/script_BladeBrothers.inc b/data/scripts/npc/script_BladeBrothers.inc index 1a0c3f0b..6f888cb4 100644 --- a/data/scripts/npc/script_BladeBrothers.inc +++ b/data/scripts/npc/script_BladeBrothers.inc @@ -37,7 +37,7 @@ script_08016262: WaitUntilTextboxCloses DoPostScriptAction 0x0001 Call WaitForAnimDone - Call sub_08068E90 + Call BladeBrothers_LearnSkill Call sub_08068C8C JumpIf script_0801631C Call sub_08068F00 @@ -50,13 +50,13 @@ script_08016262: Wait 0x001e Call sub_08068E18 WaitUntilTextboxCloses - Call sub_08068EB4 + Call BladeBrothers_ResetLastSwordMove Call EnablePauseMenu EnablePlayerControl script_080162CC: EndBlock BeginBlock - Call sub_08068EC4 + Call BladeBrothers_CheckLastSwordMove JumpIf script_080162F6 CheckEntityInteractType JumpIf script_080162E4 |