summaryrefslogtreecommitdiff
path: root/data/scripts/npc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/npc')
-rw-r--r--data/scripts/npc/script_BladeBrothers.inc30
-rw-r--r--data/scripts/npc/script_Farmer.inc16
-rw-r--r--data/scripts/npc/script_ForestMinish12.inc2
-rw-r--r--data/scripts/npc/script_ForestMinish13.inc6
-rw-r--r--data/scripts/npc/script_ForestMinish14.inc8
-rw-r--r--data/scripts/npc/script_ForestMinish15.inc8
-rw-r--r--data/scripts/npc/script_ForestMinish18.inc24
-rw-r--r--data/scripts/npc/script_ForestMinish19.inc24
-rw-r--r--data/scripts/npc/script_ForestMinish20.inc24
-rw-r--r--data/scripts/npc/script_ForestMinish21.inc6
-rw-r--r--data/scripts/npc/script_MysteriousWall.inc4
-rw-r--r--data/scripts/npc/script_PlayerAtBladeBrothers.inc2
-rw-r--r--data/scripts/npc/script_PlayerAtGreatFairy.inc4
-rw-r--r--data/scripts/npc/script_TingleSiblings.inc28
-rw-r--r--data/scripts/npc/script_Windcrest.inc10
15 files changed, 98 insertions, 98 deletions
diff --git a/data/scripts/npc/script_BladeBrothers.inc b/data/scripts/npc/script_BladeBrothers.inc
index 8fec6673..e42d8c46 100644
--- a/data/scripts/npc/script_BladeBrothers.inc
+++ b/data/scripts/npc/script_BladeBrothers.inc
@@ -1,9 +1,9 @@
@ Blade Brothers
SCRIPT_START script_BladeBrothers
BeginBlock
- Call sub_0807F348
+ Call SetPriorityMessage
DoPostScriptAction 0x000a
- _0807EB44 0x0004
+ SetAnimationState 0x0004
DoPostScriptAction 0x0000
EndBlock
script_080161FE:
@@ -11,9 +11,9 @@ script_080161FE:
script_08016204:
CheckEntityInteractType
JumpIfNot script_08016204
- _0807E864
+ SetPlayerIdle
Call sub_0807DF28
- _0807EB74
+ FacePlayer
Call sub_08068CA0
JumpIf script_0801633E
Call sub_08068CFC
@@ -26,7 +26,7 @@ script_08016204:
JumpIfNot script_08016346
StartPlayerScript script_PlayerAtBladeBrothers
WaitForSyncFlagAndClear 0x00000001
- _0807EB74
+ FacePlayer
Call sub_08068C8C
JumpIf script_08016262
Call sub_08068DE8
@@ -36,14 +36,14 @@ script_08016262:
Call sub_08068E00
WaitUntilTextboxCloses
DoPostScriptAction 0x0001
- Call sub_0807F2D4
+ Call WaitForFrameHiBit
Call sub_08068E90
Call sub_08068C8C
JumpIf script_0801631C
Call sub_08068F00
Call sub_08068F14
Call sub_08068BB4
- CallWithArg sub_0807F244, 0x00010001
+ CallWithArg EquipItem, 0x00010001
Call sub_08068B84
Call sub_0807F2A8
Call sub_08068BD0
@@ -52,7 +52,7 @@ script_08016262:
WaitUntilTextboxCloses
Call sub_08068EB4
Call sub_0807DF50
- _0807E878
+ EnablePlayerControl
script_080162CC:
EndBlock
BeginBlock
@@ -63,17 +63,17 @@ script_080162CC:
Jump script_080162CC
script_080162E4:
EndBlock
- _0807E864
+ SetPlayerIdle
Call sub_08068E78
WaitUntilTextboxCloses
- _0807E878
+ EnablePlayerControl
Jump script_080162CC
script_080162F6:
EndBlock
- _0807E888
- Call sub_0807F594
+ DisablePlayerControl
+ Call WaitForPlayerIdle
Call sub_0807DF28
- _0807E864
+ SetPlayerIdle
StopBgm
PlaySound SFX_TASK_COMPLETE
Wait 0x003c
@@ -95,8 +95,8 @@ script_0801633E:
WaitUntilTextboxCloses
script_08016346:
Call sub_0807DF50
- _0807E878
- _0807EB44 0x0004
+ EnablePlayerControl
+ SetAnimationState 0x0004
DoPostScriptAction 0x0000
Jump script_080161FE
.2byte 0x0000
diff --git a/data/scripts/npc/script_Farmer.inc b/data/scripts/npc/script_Farmer.inc
index 7316606b..a03617d1 100644
--- a/data/scripts/npc/script_Farmer.inc
+++ b/data/scripts/npc/script_Farmer.inc
@@ -9,23 +9,23 @@ script_0800B0E8:
Call sub_0807F434
JumpTable script_0800B0E8, script_0800B0F6, script_0800B134
script_0800B0F6:
- _0807E864
+ SetPlayerIdle
Call sub_0807DF28
- Call sub_0807F2D4
- _0807EB74
+ Call WaitForFrameHiBit
+ FacePlayer
CallWithArg sub_0806BC94, 0x00000004
Call sub_0806BCE8
WaitUntilTextboxCloses
Call sub_0807DF50
- _0807E878
+ EnablePlayerControl
Call sub_0806BCB8
CallWithArg sub_0806BC94, 0x00000000
Jump script_0800B0E8
script_0800B134:
- _0807E864
+ SetPlayerIdle
Call sub_0807DF28
- Call sub_0807F2D4
- _0807EB74
+ Call WaitForFrameHiBit
+ FacePlayer
CallWithArg sub_0806BC94, 0x00000004
Call sub_0807F650
_0807E9F0
@@ -35,7 +35,7 @@ script_0800B134:
Call sub_0806BCC0
script_0800B160:
Call sub_0807DF50
- _0807E878
+ EnablePlayerControl
Call sub_0806BCB8
CallWithArg sub_0806BC94, 0x00000000
Jump script_0800B0E8
diff --git a/data/scripts/npc/script_ForestMinish12.inc b/data/scripts/npc/script_ForestMinish12.inc
index 0ba2e7ea..944ee213 100644
--- a/data/scripts/npc/script_ForestMinish12.inc
+++ b/data/scripts/npc/script_ForestMinish12.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_ForestMinish12
_0807E9D4
EndBlock
script_080165FE:
- _0807E30C
+ FacePlayerAndCheckDist
JumpIfNot script_080165FE
MessageFromTarget 0x0601
Jump script_080165FE
diff --git a/data/scripts/npc/script_ForestMinish13.inc b/data/scripts/npc/script_ForestMinish13.inc
index c277126a..448f7c85 100644
--- a/data/scripts/npc/script_ForestMinish13.inc
+++ b/data/scripts/npc/script_ForestMinish13.inc
@@ -4,11 +4,11 @@ SCRIPT_START script_ForestMinish13
_0807E9D4
EndBlock
script_08016612:
- _0807E944
- _0807E864
+ TriggerInteract
+ SetPlayerIdle
MessageFromTarget 0x0602
WaitUntilTextboxCloses
Wait 0x000f
- _0807E878
+ EnablePlayerControl
Jump script_08016612
.2byte 0x0000
diff --git a/data/scripts/npc/script_ForestMinish14.inc b/data/scripts/npc/script_ForestMinish14.inc
index 7eb3fa47..6fb1a794 100644
--- a/data/scripts/npc/script_ForestMinish14.inc
+++ b/data/scripts/npc/script_ForestMinish14.inc
@@ -4,11 +4,11 @@ SCRIPT_START script_ForestMinish14
_0807E9D4
EndBlock
script_0801662E:
- _0807E944
- _0807E864
- _0807EB28 0x0603
+ TriggerInteract
+ SetPlayerIdle
+ EzloMessage 0x0603
WaitUntilTextboxCloses
Wait 0x000f
- _0807E878
+ EnablePlayerControl
Jump script_0801662E
.2byte 0x0000
diff --git a/data/scripts/npc/script_ForestMinish15.inc b/data/scripts/npc/script_ForestMinish15.inc
index c9b227b0..9ab52552 100644
--- a/data/scripts/npc/script_ForestMinish15.inc
+++ b/data/scripts/npc/script_ForestMinish15.inc
@@ -2,12 +2,12 @@
SCRIPT_START script_ForestMinish15
SetEntitySpeed 0x0100
script_08016648:
- _0807ECF4 0x0030
+ WalkWest 0x0030
Wait 0x0008
- _0807ECC4 0x0030
+ WalkSouth 0x0030
Wait 0x0008
- _0807EC94 0x0030
+ WalkEast 0x0030
Wait 0x0008
- _0807EC64 0x0030
+ WalkNorth 0x0030
Wait 0x0008
Jump script_08016648
diff --git a/data/scripts/npc/script_ForestMinish18.inc b/data/scripts/npc/script_ForestMinish18.inc
index 4198e7da..140817c4 100644
--- a/data/scripts/npc/script_ForestMinish18.inc
+++ b/data/scripts/npc/script_ForestMinish18.inc
@@ -2,38 +2,38 @@
SCRIPT_START script_ForestMinish18
SetEntitySpeed 0x0100
script_08016700:
- _0807EC94 0x0030
+ WalkEast 0x0030
SetSyncFlag 0x00000002
Wait 0x000f
DoPostScriptAction 0x0000
- _0807EB44 0x0004
+ SetAnimationState 0x0004
WaitForSyncFlag 0x00000001
ClearSyncFlag 0x00000001
DoPostScriptAction 0x0003
Wait 0x0002
- _0807EB44 0x0006
+ SetAnimationState 0x0006
Wait 0x0002
- _0807EB44 0x0000
+ SetAnimationState 0x0000
Wait 0x0002
- _0807EB44 0x0002
+ SetAnimationState 0x0002
Wait 0x0002
- _0807EB44 0x0004
+ SetAnimationState 0x0004
WaitForSyncFlag 0x00000001
ClearSyncFlag 0x00000001
- _0807ECF4 0x0030
+ WalkWest 0x0030
Wait 0x000f
DoPostScriptAction 0x0000
- _0807EB44 0x0004
+ SetAnimationState 0x0004
Wait 0x001e
SetSyncFlag 0x00000006
DoPostScriptAction 0x0003
Wait 0x0002
- _0807EB44 0x0006
+ SetAnimationState 0x0006
Wait 0x0002
- _0807EB44 0x0000
+ SetAnimationState 0x0000
Wait 0x0002
- _0807EB44 0x0002
+ SetAnimationState 0x0002
Wait 0x0002
- _0807EB44 0x0004
+ SetAnimationState 0x0004
Wait 0x003c
Jump script_08016700
diff --git a/data/scripts/npc/script_ForestMinish19.inc b/data/scripts/npc/script_ForestMinish19.inc
index 1e5e8056..44ac6a5f 100644
--- a/data/scripts/npc/script_ForestMinish19.inc
+++ b/data/scripts/npc/script_ForestMinish19.inc
@@ -4,38 +4,38 @@ SCRIPT_START script_ForestMinish19
script_0801679C:
WaitForSyncFlag 0x00000002
ClearSyncFlag 0x00000002
- _0807EC94 0x0030
+ WalkEast 0x0030
SetSyncFlag 0x00000004
Wait 0x000f
DoPostScriptAction 0x0000
- _0807EB44 0x0004
+ SetAnimationState 0x0004
WaitForSyncFlag 0x00000002
ClearSyncFlag 0x00000002
DoPostScriptAction 0x0003
Wait 0x0002
- _0807EB44 0x0006
+ SetAnimationState 0x0006
Wait 0x0002
- _0807EB44 0x0000
+ SetAnimationState 0x0000
Wait 0x0002
- _0807EB44 0x0002
+ SetAnimationState 0x0002
Wait 0x0002
- _0807EB44 0x0004
+ SetAnimationState 0x0004
WaitForSyncFlag 0x00000002
ClearSyncFlag 0x00000002
- _0807ECF4 0x0030
+ WalkWest 0x0030
SetSyncFlag 0x00000001
Wait 0x000f
DoPostScriptAction 0x0000
- _0807EB44 0x0004
+ SetAnimationState 0x0004
WaitForSyncFlag 0x00000002
ClearSyncFlag 0x00000002
DoPostScriptAction 0x0003
Wait 0x0002
- _0807EB44 0x0006
+ SetAnimationState 0x0006
Wait 0x0002
- _0807EB44 0x0000
+ SetAnimationState 0x0000
Wait 0x0002
- _0807EB44 0x0002
+ SetAnimationState 0x0002
Wait 0x0002
- _0807EB44 0x0004
+ SetAnimationState 0x0004
Jump script_0801679C
diff --git a/data/scripts/npc/script_ForestMinish20.inc b/data/scripts/npc/script_ForestMinish20.inc
index e9aa1833..e07a0ef3 100644
--- a/data/scripts/npc/script_ForestMinish20.inc
+++ b/data/scripts/npc/script_ForestMinish20.inc
@@ -4,36 +4,36 @@ SCRIPT_START script_ForestMinish20
script_08016848:
WaitForSyncFlag 0x00000004
ClearSyncFlag 0x00000004
- _0807EC94 0x0030
+ WalkEast 0x0030
Wait 0x000f
DoPostScriptAction 0x0000
- _0807EB44 0x0004
+ SetAnimationState 0x0004
Wait 0x001e
SetSyncFlag 0x00000003
DoPostScriptAction 0x0003
Wait 0x0002
- _0807EB44 0x0006
+ SetAnimationState 0x0006
Wait 0x0002
- _0807EB44 0x0000
+ SetAnimationState 0x0000
Wait 0x0002
- _0807EB44 0x0002
+ SetAnimationState 0x0002
Wait 0x0002
- _0807EB44 0x0004
+ SetAnimationState 0x0004
Wait 0x003c
- _0807ECF4 0x0030
+ WalkWest 0x0030
SetSyncFlag 0x00000002
Wait 0x000f
DoPostScriptAction 0x0000
- _0807EB44 0x0004
+ SetAnimationState 0x0004
WaitForSyncFlag 0x00000004
ClearSyncFlag 0x00000004
DoPostScriptAction 0x0003
Wait 0x0002
- _0807EB44 0x0006
+ SetAnimationState 0x0006
Wait 0x0002
- _0807EB44 0x0000
+ SetAnimationState 0x0000
Wait 0x0002
- _0807EB44 0x0002
+ SetAnimationState 0x0002
Wait 0x0002
- _0807EB44 0x0004
+ SetAnimationState 0x0004
Jump script_08016848
diff --git a/data/scripts/npc/script_ForestMinish21.inc b/data/scripts/npc/script_ForestMinish21.inc
index 4708f47d..f6b901c9 100644
--- a/data/scripts/npc/script_ForestMinish21.inc
+++ b/data/scripts/npc/script_ForestMinish21.inc
@@ -4,8 +4,8 @@ SCRIPT_START script_ForestMinish21
_0807E9D4
EndBlock
script_080168E6:
- _0807E944
- _0807E864
+ TriggerInteract
+ SetPlayerIdle
Wait 0x000f
- _0807E878
+ EnablePlayerControl
Jump script_080168E6
diff --git a/data/scripts/npc/script_MysteriousWall.inc b/data/scripts/npc/script_MysteriousWall.inc
index a55a6817..d7a22778 100644
--- a/data/scripts/npc/script_MysteriousWall.inc
+++ b/data/scripts/npc/script_MysteriousWall.inc
@@ -13,12 +13,12 @@ script_0800B98A:
_0807E9F0
JumpIf script_0800B99E
Call sub_0807DF50
- _0807E878
+ EnablePlayerControl
Jump script_0800B98A
script_0800B99E:
Call sub_0806F188
Call sub_0807DF50
- _0807E878
+ EnablePlayerControl
script_0800B9AC:
DoPostScriptAction 0x0006
SCRIPT_END
diff --git a/data/scripts/npc/script_PlayerAtBladeBrothers.inc b/data/scripts/npc/script_PlayerAtBladeBrothers.inc
index 7db4fb9c..d2025632 100644
--- a/data/scripts/npc/script_PlayerAtBladeBrothers.inc
+++ b/data/scripts/npc/script_PlayerAtBladeBrothers.inc
@@ -2,7 +2,7 @@
SCRIPT_START script_PlayerAtBladeBrothers
SetEntitySpeed 0x0100
_0807EDD4 0x0078, 0x0050
- _0807EB44 0x0000
+ SetAnimationState 0x0000
DoPostScriptAction 0x0000
SetSyncFlag 0x00000001
Call sub_080791BC
diff --git a/data/scripts/npc/script_PlayerAtGreatFairy.inc b/data/scripts/npc/script_PlayerAtGreatFairy.inc
index 8839a3cb..af017dba 100644
--- a/data/scripts/npc/script_PlayerAtGreatFairy.inc
+++ b/data/scripts/npc/script_PlayerAtGreatFairy.inc
@@ -18,8 +18,8 @@ script_0800B7FC:
Jump script_0800B7EE
BeginBlock
DoPostScriptAction 0x0007
- _0807EB44 0x0004
- _0807E930 0x0000
+ SetAnimationState 0x0004
+ SetAnimation 0x0000
EndBlock
SCRIPT_END
.2byte 0x0000
diff --git a/data/scripts/npc/script_TingleSiblings.inc b/data/scripts/npc/script_TingleSiblings.inc
index 8393ee87..f877881f 100644
--- a/data/scripts/npc/script_TingleSiblings.inc
+++ b/data/scripts/npc/script_TingleSiblings.inc
@@ -2,52 +2,52 @@
SCRIPT_START script_TingleSiblings
BeginBlock
Call sub_08064EA4
- _0807EB44 0x0004
+ SetAnimationState 0x0004
DoPostScriptAction 0x0000
DoPostScriptAction 0x000a
EndBlock
script_0801690A:
- _0807E30C
+ FacePlayerAndCheckDist
JumpIfNot script_0801690A
- _0807E864
- _0807EB74
+ SetPlayerIdle
+ FacePlayer
Call sub_08064F28
WaitUntilTextboxCloses
JumpIfNot script_08016926
GivePlayerItem 0x003d
WaitPlayerGetItem
script_08016926:
- _0807E878
+ EnablePlayerControl
SetGlobalFlag 0x005c
Jump script_0801690A
BeginBlock
_0807E9D4
- _0807EB44 0x0000
+ SetAnimationState 0x0000
DoPostScriptAction 0x000a
EndBlock
script_0801693E:
- _0807E944
- _0807E864
+ TriggerInteract
+ SetPlayerIdle
Wait 0x0018
MessageFromTarget 0x0a01
WaitUntilTextboxCloses
Wait 0x000f
- _0807E878
+ EnablePlayerControl
Jump script_0801693E
.2byte 0x0000
BeginBlock
_0807E9D4
- _0807EB44 0x0000
+ SetAnimationState 0x0000
DoPostScriptAction 0x000a
- _0807E930 0x0000
+ SetAnimation 0x0000
EndBlock
script_0801696A:
- _0807E944
- _0807E864
+ TriggerInteract
+ SetPlayerIdle
Wait 0x0018
MessageFromTarget 0x0a01
WaitUntilTextboxCloses
Wait 0x000f
- _0807E878
+ EnablePlayerControl
Jump script_0801696A
.2byte 0x0000
diff --git a/data/scripts/npc/script_Windcrest.inc b/data/scripts/npc/script_Windcrest.inc
index ef4d0c4d..bc49eddd 100644
--- a/data/scripts/npc/script_Windcrest.inc
+++ b/data/scripts/npc/script_Windcrest.inc
@@ -9,7 +9,7 @@ SCRIPT_START script_Windcrest
script_0800B024:
CheckEntityInteractType
JumpIfNot script_0800B024
- _0807E864
+ SetPlayerIdle
Call sub_0807DF28
CheckGlobalFlag 0x0052
JumpIf script_0800B082
@@ -20,7 +20,7 @@ script_0800B024:
DoPostScriptAction 0x0008
Call Windcrest_Unlock
Wait 0x003c
- _0807EB28 0x0b5c
+ EzloMessage 0x0b5c
WaitUntilTextboxCloses
SetGlobalFlag 0x0053
Jump script_0800B09C
@@ -30,7 +30,7 @@ script_0800B064:
DoPostScriptAction 0x0008
Call Windcrest_Unlock
Wait 0x003c
- _0807EB28 0x0b5d
+ EzloMessage 0x0b5d
WaitUntilTextboxCloses
Jump script_0800B09C
script_0800B082:
@@ -39,11 +39,11 @@ script_0800B082:
DoPostScriptAction 0x0008
Call Windcrest_Unlock
Wait 0x003c
- _0807EB28 0x0b5e
+ EzloMessage 0x0b5e
WaitUntilTextboxCloses
script_0800B09C:
Call sub_0807DF50
- _0807E878
+ EnablePlayerControl
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-19 12:12:25 +0000