diff options
| author | theo3 <arisstephenson2@gmail.com> | 2021-12-27 21:26:32 -0800 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2021-12-27 21:26:32 -0800 |
| commit | c4f2efe13278c5aeb094be914513d19f5ddbce2b (patch) | |
| tree | 37a900c68d5a4918d8ae5502390666e45516f630 /data/scripts/northHyruleField | |
| parent | ebaa6d76fa94540c12fad5eed634a796423fbd7b (diff) | |
label script functions
Diffstat (limited to 'data/scripts/northHyruleField')
4 files changed, 17 insertions, 17 deletions
diff --git a/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc b/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc index c081612b..e9af8375 100644 --- a/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc +++ b/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc @@ -4,22 +4,22 @@ SCRIPT_START script_CarpenterOutsideTown BeginBlock Call sub_08067314 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 SetIntVariable 0x00000000 Call sub_080672B0 EndBlock script_08009592: CheckEntityInteractType JumpIfNot script_08009592 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer SetIntVariable 0x00000004 Call sub_080672B0 Call sub_080672C8 WaitUntilTextboxCloses Wait 0x000f - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 SetIntVariable 0x00000000 Call sub_080672B0 Jump script_08009592 diff --git a/data/scripts/northHyruleField/script_GuardNorthHyruleField.inc b/data/scripts/northHyruleField/script_GuardNorthHyruleField.inc index fb4474ad..f0acd305 100644 --- a/data/scripts/northHyruleField/script_GuardNorthHyruleField.inc +++ b/data/scripts/northHyruleField/script_GuardNorthHyruleField.inc @@ -2,7 +2,7 @@ @ also at Lon Lon Ranch SCRIPT_START script_GuardNorthHyruleField BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 @@ -10,11 +10,11 @@ SCRIPT_START script_GuardNorthHyruleField script_08014E2C: CheckEntityInteractType JumpIfNot script_08014E2C - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer CallWithArg sub_0807F3D8, 0x00000000 Call sub_08064428 WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08014E2C .2byte 0x0000 diff --git a/data/scripts/northHyruleField/script_MutohOutsideTown.inc b/data/scripts/northHyruleField/script_MutohOutsideTown.inc index 11002fe7..72f84118 100644 --- a/data/scripts/northHyruleField/script_MutohOutsideTown.inc +++ b/data/scripts/northHyruleField/script_MutohOutsideTown.inc @@ -3,19 +3,19 @@ SCRIPT_START script_MutohOutsideTown BeginBlock Call sub_08067100 DoPostScriptAction 0x000a - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock script_08009512: CheckEntityInteractType JumpIfNot script_08009512 - _0807E864 + SetPlayerIdle DoPostScriptAction 0x0001 - _0807EB74 + FacePlayer Call sub_080670B4 WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 + EnablePlayerControl + SetAnimationState 0x0004 DoPostScriptAction 0x0000 Jump script_08009512 .2byte 0x0000 diff --git a/data/scripts/northHyruleField/script_Object69FixBridge.inc b/data/scripts/northHyruleField/script_Object69FixBridge.inc index 3dff4c45..e7fca431 100644 --- a/data/scripts/northHyruleField/script_Object69FixBridge.inc +++ b/data/scripts/northHyruleField/script_Object69FixBridge.inc @@ -14,14 +14,14 @@ SCRIPT_START script_Object69FixBridge .endif .endif .endif - _0807E864 + SetPlayerIdle MoveEntityToPlayer CameraTargetEntity SetEntitySpeed 0x0200 EndBlock Wait 0x000f _0807E8E4_2 - Call sub_0807F3F8 + Call CreatePlayerExclamationMark Wait 0x001e _0807EDD4 0x00b8, 0x0258 Wait 0x001e @@ -29,6 +29,6 @@ SCRIPT_START script_Object69FixBridge Wait 0x0078 _0807EEB4 CameraTargetPlayer - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END |