summaryrefslogtreecommitdiff
path: root/data/scripts/windRuins
diff options
context:
space:
mode:
authorTal Hayon <talhayon1@gmail.com>2022-05-14 20:51:30 +0300
committerTal Hayon <talhayon1@gmail.com>2022-05-14 20:51:30 +0300
commit968e200c78f057f46fae5bb9b71fec64bfb48bfe (patch)
tree060d0093471973d8ccd47bda45e43f056e439bb2 /data/scripts/windRuins
parent422fb8ed147ced68eb690ea6061e142a5eed6fb3 (diff)
Use enums across more scripts and files
Diffstat (limited to 'data/scripts/windRuins')
-rw-r--r--data/scripts/windRuins/script_EzloTalkFoW.inc4
-rw-r--r--data/scripts/windRuins/script_Npc4EReceiveOcarina.inc6
-rw-r--r--data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc4
3 files changed, 7 insertions, 7 deletions
diff --git a/data/scripts/windRuins/script_EzloTalkFoW.inc b/data/scripts/windRuins/script_EzloTalkFoW.inc
index 8370f5ef..6c2cb205 100644
--- a/data/scripts/windRuins/script_EzloTalkFoW.inc
+++ b/data/scripts/windRuins/script_EzloTalkFoW.inc
@@ -2,9 +2,9 @@
SCRIPT_START script_EzloTalkFoW
SetPlayerIdle
Call sub_0807DF28
- EzloMessage 0x1c03
+ EzloMessage TEXT_EZLO_ELEMENTS_DONE, 0x03
WaitUntilTextboxCloses
- SetLocalFlagByBank 0x0100, 0x0003
+ SetLocalFlagByBank FLAG_BANK_1, 0x0003
Call sub_0807DF50
EnablePlayerControl
DoPostScriptAction 0x0006
diff --git a/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc b/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc
index b4e78dbb..4b05dec7 100644
--- a/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc
+++ b/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc
@@ -2,16 +2,16 @@
SCRIPT_START script_Npc4EReceiveOcarina
BeginBlock
DoPostScriptAction 0x0008
- CheckInventory1 0x0017
+ CheckInventory1 ITEM_OCARINA
JumpIf script_0800D924
EndBlock
script_0800D8F4:
- CheckInventory1 0x0017
+ CheckInventory1 ITEM_OCARINA
JumpIfNot script_0800D8F4
Call sub_0807DF28
SetPlayerIdle
WaitPlayerGetItem
- EzloMessage 0x1325
+ EzloMessage TEXT_VAATI, 0x25
WaitUntilTextboxCloses
PlaySound SFX_113
SetIntVariable 0x00000000
diff --git a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc
index 7d205905..79244332 100644
--- a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc
+++ b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc
@@ -17,9 +17,9 @@ script_0800D88E:
WaitForSyncFlagAndClear 0x00000001
script_0800D8B0:
_0807E8E4_0
- MessageNoOverlap 0x1324
+ MessageNoOverlap TEXT_VAATI, 0x24
WaitUntilTextboxCloses
- CheckInventory1 0x0017
+ CheckInventory1 ITEM_OCARINA
JumpIf script_0800D8D6
CheckLocalFlag 0x0045
JumpIf script_0800D8D6