Use enums across more scripts and files

5 files changed, 15 insertions, 15 deletions

diff --git a/data/scripts/npc/script_ForestMinish12.inc b/data/scripts/npc/script_ForestMinish12.inc
index 944ee213..f407e417 100644
--- a/data/scripts/npc/script_ForestMinish12.inc
+++ b/data/scripts/npc/script_ForestMinish12.inc
@@ -6,5 +6,5 @@ SCRIPT_START script_ForestMinish12
 script_080165FE:
 	FacePlayerAndCheckDist
 	JumpIfNot script_080165FE
-	MessageFromTarget 0x0601
+	MessageFromTarget TEXT_LOCATIONS, 0x01
 	Jump script_080165FE
diff --git a/data/scripts/npc/script_ForestMinish13.inc b/data/scripts/npc/script_ForestMinish13.inc
index 448f7c85..00460f2c 100644
--- a/data/scripts/npc/script_ForestMinish13.inc
+++ b/data/scripts/npc/script_ForestMinish13.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_ForestMinish13
 script_08016612:
 	TriggerInteract 
 	SetPlayerIdle 
-	MessageFromTarget 0x0602
+	MessageFromTarget TEXT_LOCATIONS, 0x02
 	WaitUntilTextboxCloses
 	Wait 0x000f
 	EnablePlayerControl
diff --git a/data/scripts/npc/script_ForestMinish14.inc b/data/scripts/npc/script_ForestMinish14.inc
index 6fb1a794..b810cb1f 100644
--- a/data/scripts/npc/script_ForestMinish14.inc
+++ b/data/scripts/npc/script_ForestMinish14.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_ForestMinish14
 script_0801662E:
 	TriggerInteract
 	SetPlayerIdle
-	EzloMessage 0x0603
+	EzloMessage TEXT_LOCATIONS, 0x03
 	WaitUntilTextboxCloses
 	Wait 0x000f
 	EnablePlayerControl
diff --git a/data/scripts/npc/script_TingleSiblings.inc b/data/scripts/npc/script_TingleSiblings.inc
index f877881f..28ab518b 100644
--- a/data/scripts/npc/script_TingleSiblings.inc
+++ b/data/scripts/npc/script_TingleSiblings.inc
@@ -18,7 +18,7 @@ script_0801690A:
 	WaitPlayerGetItem
 script_08016926:
 	EnablePlayerControl
-	SetGlobalFlag 0x005c
+	SetGlobalFlag TINGLE_TALK1ST
 	Jump script_0801690A
 	BeginBlock
 	_0807E9D4
@@ -29,7 +29,7 @@ script_0801693E:
 	TriggerInteract
 	SetPlayerIdle
 	Wait 0x0018
-	MessageFromTarget 0x0a01
+	MessageFromTarget TEXT_EMPTY, 0x01
 	WaitUntilTextboxCloses
 	Wait 0x000f
 	EnablePlayerControl
@@ -45,7 +45,7 @@ script_0801696A:
 	TriggerInteract
 	SetPlayerIdle
 	Wait 0x0018
-	MessageFromTarget 0x0a01
+	MessageFromTarget TEXT_EMPTY, 0x01
 	WaitUntilTextboxCloses
 	Wait 0x000f
 	EnablePlayerControl
diff --git a/data/scripts/npc/script_Windcrest.inc b/data/scripts/npc/script_Windcrest.inc
index bc49eddd..09d94fef 100644
--- a/data/scripts/npc/script_Windcrest.inc
+++ b/data/scripts/npc/script_Windcrest.inc
@@ -11,35 +11,35 @@ script_0800B024:
 	JumpIfNot script_0800B024
 	SetPlayerIdle
 	Call sub_0807DF28
-	CheckGlobalFlag 0x0052
+	CheckGlobalFlag WARP_1ST
 	JumpIf script_0800B082
-	CheckGlobalFlag 0x0053
+	CheckGlobalFlag WARP_MONUMENT
 	JumpIf script_0800B064
-	MessageNoOverlap 0x3f32
+	MessageNoOverlap TEXT_TINGLE, 0x32
 	WaitUntilTextboxCloses
 	DoPostScriptAction 0x0008
 	Call Windcrest_Unlock
 	Wait 0x003c
-	EzloMessage 0x0b5c
+	EzloMessage TEXT_EZLO, 0x5c
 	WaitUntilTextboxCloses
-	SetGlobalFlag 0x0053
+	SetGlobalFlag WARP_MONUMENT
 	Jump script_0800B09C
 script_0800B064:
-	MessageNoOverlap 0x3f32
+	MessageNoOverlap TEXT_TINGLE, 0x32
 	WaitUntilTextboxCloses
 	DoPostScriptAction 0x0008
 	Call Windcrest_Unlock
 	Wait 0x003c
-	EzloMessage 0x0b5d
+	EzloMessage TEXT_EZLO, 0x5d
 	WaitUntilTextboxCloses
 	Jump script_0800B09C
 script_0800B082:
-	MessageNoOverlap 0x3f32
+	MessageNoOverlap TEXT_TINGLE, 0x32
 	WaitUntilTextboxCloses
 	DoPostScriptAction 0x0008
 	Call Windcrest_Unlock
 	Wait 0x003c
-	EzloMessage 0x0b5e
+	EzloMessage TEXT_EZLO, 0x5e
 	WaitUntilTextboxCloses
 script_0800B09C:
 	Call sub_0807DF50