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/fow | |
| parent | ebaa6d76fa94540c12fad5eed634a796423fbd7b (diff) | |
label script functions
Diffstat (limited to 'data/scripts/fow')
| -rw-r--r-- | data/scripts/fow/script_MazaalMacroDefeated.inc | 6 | ||||
| -rw-r--r-- | data/scripts/fow/script_Object89Mazaal.inc | 6 | ||||
| -rw-r--r-- | data/scripts/fow/script_PlayerAtMazaal.inc | 2 | ||||
| -rw-r--r-- | data/scripts/fow/script_PlayerDefeatedMazaal.inc | 10 |
4 files changed, 12 insertions, 12 deletions
diff --git a/data/scripts/fow/script_MazaalMacroDefeated.inc b/data/scripts/fow/script_MazaalMacroDefeated.inc index 624a5513..694d5d25 100644 --- a/data/scripts/fow/script_MazaalMacroDefeated.inc +++ b/data/scripts/fow/script_MazaalMacroDefeated.inc @@ -1,12 +1,12 @@ @ Mazaal Macro when defeated SCRIPT_START script_MazaalMacroDefeated BeginBlock - _0807E864 + SetPlayerIdle EndBlock Wait 0x0078 - _0807E908 0x0004 + SetAction 0x0004 StartPlayerScript script_PlayerDefeatedMazaal WaitForSyncFlagAndClear 0x00000002 Wait 0x000c - _0807E908 0x0005 + SetAction 0x0005 SCRIPT_END diff --git a/data/scripts/fow/script_Object89Mazaal.inc b/data/scripts/fow/script_Object89Mazaal.inc index b5c522c0..75e0eb0b 100644 --- a/data/scripts/fow/script_Object89Mazaal.inc +++ b/data/scripts/fow/script_Object89Mazaal.inc @@ -2,11 +2,11 @@ SCRIPT_START script_Object89Mazaal BeginBlock EndBlock - _0807E888 + DisablePlayerControl Wait 0x0018 - _0807E864 + SetPlayerIdle StartPlayerScript script_PlayerAtMazaal WaitForSyncFlagAndClear 0x00000001 - _0807E908 0x0002 + SetAction 0x0002 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/fow/script_PlayerAtMazaal.inc b/data/scripts/fow/script_PlayerAtMazaal.inc index 75086071..d71de158 100644 --- a/data/scripts/fow/script_PlayerAtMazaal.inc +++ b/data/scripts/fow/script_PlayerAtMazaal.inc @@ -1,7 +1,7 @@ @ Player entering Mazaal SCRIPT_START script_PlayerAtMazaal BeginBlock - _0807EB44 0x0000 + SetAnimationState 0x0000 SetEntitySpeed 0x0140 EndBlock _0807EDD4 0x00b8, 0x0094 diff --git a/data/scripts/fow/script_PlayerDefeatedMazaal.inc b/data/scripts/fow/script_PlayerDefeatedMazaal.inc index 0f6d278a..89fb8ba8 100644 --- a/data/scripts/fow/script_PlayerDefeatedMazaal.inc +++ b/data/scripts/fow/script_PlayerDefeatedMazaal.inc @@ -4,15 +4,15 @@ SCRIPT_START script_PlayerDefeatedMazaal SetEntitySpeed 0x0140 EndBlock Wait 0x003c - _0807EB44 0x0004 + SetAnimationState 0x0004 Wait 0x000f - _0807EB44 0x0002 + SetAnimationState 0x0002 Wait 0x0012 - _0807EB44 0x0006 + SetAnimationState 0x0006 Wait 0x000c - _0807EB44 0x0000 + SetAnimationState 0x0000 Wait 0x0015 - _0807EB44 0x0004 + SetAnimationState 0x0004 Wait 0x0008 SetSyncFlag 0x00000002 _0807EDD4 0x0088, 0x0158 |