summaryrefslogtreecommitdiff
path: root/data/scripts/windRuins
diff options
context:
space:
mode:
authortheo3 <arisstephenson2@gmail.com>2021-12-27 21:26:32 -0800
committertheo3 <arisstephenson2@gmail.com>2021-12-27 21:26:32 -0800
commitc4f2efe13278c5aeb094be914513d19f5ddbce2b (patch)
tree37a900c68d5a4918d8ae5502390666e45516f630 /data/scripts/windRuins
parentebaa6d76fa94540c12fad5eed634a796423fbd7b (diff)
label script functions
Diffstat (limited to 'data/scripts/windRuins')
-rw-r--r--data/scripts/windRuins/script_EzloTalkFoW.inc6
-rw-r--r--data/scripts/windRuins/script_Npc4EReceiveOcarina.inc6
-rw-r--r--data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc4
-rw-r--r--data/scripts/windRuins/script_PlayerAtTextboard.inc2
4 files changed, 9 insertions, 9 deletions
diff --git a/data/scripts/windRuins/script_EzloTalkFoW.inc b/data/scripts/windRuins/script_EzloTalkFoW.inc
index 8ac839e1..8370f5ef 100644
--- a/data/scripts/windRuins/script_EzloTalkFoW.inc
+++ b/data/scripts/windRuins/script_EzloTalkFoW.inc
@@ -1,12 +1,12 @@
@ Ezlo talk after Wind Ruins
SCRIPT_START script_EzloTalkFoW
- _0807E864
+ SetPlayerIdle
Call sub_0807DF28
- _0807EB28 0x1c03
+ EzloMessage 0x1c03
WaitUntilTextboxCloses
SetLocalFlagByBank 0x0100, 0x0003
Call sub_0807DF50
- _0807E878
+ EnablePlayerControl
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000
diff --git a/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc b/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc
index b3a0d2f2..b4e78dbb 100644
--- a/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc
+++ b/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc
@@ -9,14 +9,14 @@ script_0800D8F4:
CheckInventory1 0x0017
JumpIfNot script_0800D8F4
Call sub_0807DF28
- _0807E864
+ SetPlayerIdle
WaitPlayerGetItem
- _0807EB28 0x1325
+ EzloMessage 0x1325
WaitUntilTextboxCloses
PlaySound SFX_113
SetIntVariable 0x00000000
Call sub_0806DA1C
- _0807E878
+ EnablePlayerControl
Call sub_0807DF50
script_0800D924:
DoPostScriptAction 0x0006
diff --git a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc
index 3c0338b0..7d205905 100644
--- a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc
+++ b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc
@@ -9,7 +9,7 @@ SCRIPT_START script_Npc4EWindRuinsTextBoard
script_0800D88E:
CheckEntityInteractType
JumpIfNot script_0800D88E
- _0807E864
+ SetPlayerIdle
Call sub_0807DF28
CheckLocalFlag 0x0045
JumpIf script_0800D8B0
@@ -29,6 +29,6 @@ script_0800D8CE:
JumpIfNot script_0800D8CE
script_0800D8D6:
Call sub_0807DF50
- _0807E878
+ EnablePlayerControl
Jump script_0800D88E
.2byte 0x0000
diff --git a/data/scripts/windRuins/script_PlayerAtTextboard.inc b/data/scripts/windRuins/script_PlayerAtTextboard.inc
index a3c2a068..b8b909df 100644
--- a/data/scripts/windRuins/script_PlayerAtTextboard.inc
+++ b/data/scripts/windRuins/script_PlayerAtTextboard.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_PlayerAtTextboard
EndBlock
DoPostScriptAction 0x0001
_0807EDD4 0x00a0, 0x0078
- _0807EB44 0x0000
+ SetAnimationState 0x0000
DoPostScriptAction 0x0000
SetSyncFlag 0x00000001
Call sub_080791BC