Use enums across more scripts and files

8 files changed, 21 insertions, 45 deletions

diff --git a/data/scripts/graveyard/script_DampeInside.inc b/data/scripts/graveyard/script_DampeInside.inc
index 5fbc5024..fec6e1fa 100644
--- a/data/scripts/graveyard/script_DampeInside.inc
+++ b/data/scripts/graveyard/script_DampeInside.inc
@@ -10,7 +10,7 @@ SCRIPT_START script_DampeInside
 	JumpIfNot script_08009622
 	PlaySound SFX_ITEM_GET
 	InitItemGetSequence 0x003c
-	MessageFromTarget 0x053c
+	MessageFromTarget TEXT_ITEM_GET, 0x3c
 	WaitPlayerGetItem 
 	WaitUntilTextboxCloses
 	SetInventoryValue 0x003c, 0x0001
diff --git a/data/scripts/graveyard/script_DampeOuside.inc b/data/scripts/graveyard/script_DampeOuside.inc
index 21ea8e95..7122cb38 100644
--- a/data/scripts/graveyard/script_DampeOuside.inc
+++ b/data/scripts/graveyard/script_DampeOuside.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_DampeOuside
 script_08009638:
 	EndBlock
 	BeginBlock
-	CheckGlobalFlag 0x0020
+	CheckGlobalFlag HAKA_KEY_LOST
 	JumpIfNot script_08009638
 	EndBlock
 script_08009646:
diff --git a/data/scripts/graveyard/script_Gina.inc b/data/scripts/graveyard/script_Gina.inc
index bb427371..b463e667 100644
--- a/data/scripts/graveyard/script_Gina.inc
+++ b/data/scripts/graveyard/script_Gina.inc
@@ -12,7 +12,7 @@ script_0800B934:
 	JumpIfNot script_0800B934
 	SetPlayerIdle 
 	FacePlayer 
-	MessageFromTarget 0x3f19
+	MessageFromTarget TEXT_TINGLE, 0x19
 	WaitUntilTextboxCloses
 	SetLocalFlag 0x005f
 	EnablePlayerControl
@@ -22,7 +22,7 @@ script_0800B94E:
 	JumpIfNot script_0800B94E
 	SetPlayerIdle 
 	FacePlayer 
-	MessageFromTarget 0x3f1a
+	MessageFromTarget TEXT_TINGLE, 0x1a
 	WaitUntilTextboxCloses
 	EnablePlayerControl 
 	Jump script_0800B94E
diff --git a/data/scripts/graveyard/script_GraveyardHouseDoor.inc b/data/scripts/graveyard/script_GraveyardHouseDoor.inc
index c310b55e..1b69dfe4 100644
--- a/data/scripts/graveyard/script_GraveyardHouseDoor.inc
+++ b/data/scripts/graveyard/script_GraveyardHouseDoor.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_GraveyardHouseDoor
 	BeginBlock
 	DoPostScriptAction 0x0007
 	Jump script_080096FC
-	CheckGlobalFlag 0x0020
+	CheckGlobalFlag HAKA_KEY_LOST
 	JumpIf script_080096FC
 	EndBlock
 script_080096AC:
@@ -21,7 +21,7 @@ script_080096AC:
 	PlaySound SFX_111
 	DoPostScriptAction 0x0007
 script_080096EC:
-	CheckGlobalFlag 0x0020
+	CheckGlobalFlag HAKA_KEY_LOST
 	JumpIfNot script_080096EC
 	Call sub_0807DF50
 	EnablePlayerControl
diff --git a/data/scripts/graveyard/script_GreatFairyArrows.inc b/data/scripts/graveyard/script_GreatFairyArrows.inc
index 24b6ba6f..1ec25bc5 100644
--- a/data/scripts/graveyard/script_GreatFairyArrows.inc
+++ b/data/scripts/graveyard/script_GreatFairyArrows.inc
@@ -14,19 +14,19 @@ script_0800B618:
 	WaitForSyncFlagAndClear 0x00000004
 	CheckLocalFlag 0x009e
 	JumpIf script_0800B7A2
-	MessageNoOverlap 0x0583
+	MessageNoOverlap TEXT_ITEM_GET, 0x83
 	WaitUntilTextboxCloses
 	CheckTextboxResult 
 	JumpIfNot script_0800B684
 	Wait 0x000f
-	MessageNoOverlap 0x0584
+	MessageNoOverlap TEXT_ITEM_GET, 0x84
 	CallWithArg CheckMessageEqual, 0x0000058b
 	JumpIf script_0800B68E
 	CallWithArg sub_08087424, 0x00000000
 	Wait 0x00b4
 	Jump script_0800B6A6
 script_0800B684:
-	MessageNoOverlap 0x057d
+	MessageNoOverlap TEXT_ITEM_GET, 0x7d
 	WaitUntilTextboxCloses
 	Jump script_0800B6A6
 script_0800B68E:
@@ -37,7 +37,7 @@ script_0800B698:
 	WaitPlayerGetItem
 	FaceAwayFromPlayer
 	Wait 0x001e
-	MessageNoOverlap 0x057f
+	MessageNoOverlap TEXT_ITEM_GET, 0x7f
 	WaitUntilTextboxCloses
 script_0800B6A6:
 	SetFadeTime 0x0004
diff --git a/data/scripts/graveyard/script_KingGustav.inc b/data/scripts/graveyard/script_KingGustav.inc
index fc690dc8..4d921ed4 100644
--- a/data/scripts/graveyard/script_KingGustav.inc
+++ b/data/scripts/graveyard/script_KingGustav.inc
@@ -18,18 +18,18 @@ script_0800D962:
 	DoPostScriptAction 0x0007
 	PlaySound SFX_ELEMENT_FLOAT
 	SetEntityVelocity 0xffff8000
-	MessageNoOverlap 0x1701
+	MessageNoOverlap TEXT_GUSTAF2, 0x01
 	WaitUntilTextboxCloses
 	SetSyncFlag 0x00000004
 	WaitForSyncFlagAndClear 0x00000002
-	MessageNoOverlap 0x1702
+	MessageNoOverlap TEXT_GUSTAF2, 0x02
 	WaitUntilTextboxCloses
 	SetEntityVelocity 0x00010000
 	SetSyncFlag 0x00000004
 	WaitForSyncFlagAndClear 0x00000002
 	GiveKinstone 0x006d
 	WaitPlayerGetItem
-	EzloMessage 0x1703
+	EzloMessage TEXT_GUSTAF2, 0x03
 	WaitUntilTextboxCloses
 	Wait 0x003c
 	SetLocalFlag 0x0032
diff --git a/data/scripts/graveyard/script_Object69CrowStealingKey.inc b/data/scripts/graveyard/script_Object69CrowStealingKey.inc
index 420f5f94..0608e6ef 100644
--- a/data/scripts/graveyard/script_Object69CrowStealingKey.inc
+++ b/data/scripts/graveyard/script_Object69CrowStealingKey.inc
@@ -17,11 +17,11 @@ SCRIPT_START script_Object69CrowStealingKey
 	WaitForSyncFlagAndClear 0x00000010
 	SetSyncFlag 0x00000020
 	WaitForSyncFlagAndClear 0x00000040
-	SetInventoryValue 0x003c, 0x0000
-	SetGlobalFlag 0x0020
+	SetInventoryValue ITEM_QST_GRAVEYARD_KEY, 0x0000
+	SetGlobalFlag HAKA_KEY_LOST
 	_0807E8E4_3
 	Wait 0x001e
-	EzloMessage 0x2809
+	EzloMessage TEXT_DAMPE, 0x09
 	WaitUntilTextboxCloses
 	Call sub_0807DF50
 	EnablePlayerControl
diff --git a/data/scripts/graveyard/script_Object69GetKeyBack.inc b/data/scripts/graveyard/script_Object69GetKeyBack.inc
index b6e1073b..222c1abf 100644
--- a/data/scripts/graveyard/script_Object69GetKeyBack.inc
+++ b/data/scripts/graveyard/script_Object69GetKeyBack.inc
@@ -3,42 +3,18 @@ SCRIPT_START script_Object69GetKeyBack
 	BeginBlock
 	EndBlock
 script_080098D8:
-	CheckGlobalFlag 0x0020
+	CheckGlobalFlag HAKA_KEY_LOST
 	JumpIfNot script_080098D8
 script_080098E0:
-	CheckInventory1 0x003c
+	CheckInventory1 ITEM_QST_GRAVEYARD_KEY
 	JumpIfNot script_080098E0
-.ifdef JP
-	CheckLocalFlag 0x5b
-.else
-.ifdef EU
-	CheckLocalFlag 0x5b
-.else
-.ifdef DEMO_JP
-	CheckLocalFlag 0x5b @ TODO deduplicate
-.else
-	CheckLocalFlag 0x5d
-.endif
-.endif
-.endif
+	CheckLocalFlag HAKA_KEY_GET
 	JumpIf script_08009910
-.ifdef JP
-	SetLocalFlag 0x005b
-.else
-.ifdef EU
-	SetLocalFlag 0x005b
-.else
-.ifdef DEMO_JP
-	SetLocalFlag 0x005b @ TODO deduplicate
-.else
-	SetLocalFlag 0x005d
-.endif
-.endif
-.endif
+	SetLocalFlag HAKA_KEY_GET
 	SetPlayerIdle
 	Call WaitForPlayerNormal
 	Call sub_0807DF28
-	EzloMessage 0x280a
+	EzloMessage TEXT_DAMPE, 0x0a
 	WaitUntilTextboxCloses
 	Call sub_0807DF50
 	EnablePlayerControl