Merge pull request #516 from hatal175/enumasm

Initial version of enum extractor script

19 files changed, 30 insertions, 30 deletions

diff --git a/data/scripts/dhc/script_GuardCellLeft.inc b/data/scripts/dhc/script_GuardCellLeft.inc
index 58efe5f0..c0f0c031 100644
--- a/data/scripts/dhc/script_GuardCellLeft.inc
+++ b/data/scripts/dhc/script_GuardCellLeft.inc
@@ -12,7 +12,7 @@ script_0800E44C:
 	SetPlayerIdle
 	FacePlayer
 	CallWithArg sub_0807F3D8, 0x00000000
-	MessageNoOverlap 0x2405
+	MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x05
 	WaitUntilTextboxCloses
 	EnablePlayerControl 
 	Jump script_0800E44C
diff --git a/data/scripts/dhc/script_GuardCellRight.inc b/data/scripts/dhc/script_GuardCellRight.inc
index 83ddbacf..9c23e9ff 100644
--- a/data/scripts/dhc/script_GuardCellRight.inc
+++ b/data/scripts/dhc/script_GuardCellRight.inc
@@ -12,7 +12,7 @@ script_0800E484:
 	SetPlayerIdle
 	FacePlayer
 	CallWithArg sub_0807F3D8, 0x00000000
-	MessageNoOverlap 0x2407
+	MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x07
 	WaitUntilTextboxCloses
 	EnablePlayerControl 
 	Jump script_0800E484
diff --git a/data/scripts/dhc/script_GuardStone1.inc b/data/scripts/dhc/script_GuardStone1.inc
index ae42371d..06f8aaea 100644
--- a/data/scripts/dhc/script_GuardStone1.inc
+++ b/data/scripts/dhc/script_GuardStone1.inc
@@ -29,7 +29,7 @@ script_0800E176:
 	FacePlayer
 	CallWithArg sub_0807F3D8, 0x00000000
 	Wait 0x000a
-	MessageNoOverlap 0x2401
+	MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x01
 	WaitUntilTextboxCloses
 	SetLocalFlag 0x0094
 script_0800E1D0:
@@ -43,7 +43,7 @@ script_0800E1E0:
 	SetPlayerIdle
 	FacePlayer
 	CallWithArg sub_0807F3D8, 0x00000000
-	MessageNoOverlap 0x2401
+	MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x01
 	WaitUntilTextboxCloses
 	EnablePlayerControl 
 	Jump script_0800E1E0
diff --git a/data/scripts/dhc/script_GuardStone2.inc b/data/scripts/dhc/script_GuardStone2.inc
index 71483148..254d6cbc 100644
--- a/data/scripts/dhc/script_GuardStone2.inc
+++ b/data/scripts/dhc/script_GuardStone2.inc
@@ -74,7 +74,7 @@ script_0800E312:
 	FacePlayer
 	CallWithArg sub_0807F3D8, 0x00000000
 	EndBlock 
-	MessageNoOverlap 0x2404
+	MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x04
 	WaitUntilTextboxCloses
 	EnablePlayerControl 
 	Jump script_0800E2AE
@@ -84,7 +84,7 @@ script_0800E32E:
 	SetPlayerIdle
 	FacePlayer
 	CallWithArg sub_0807F3D8, 0x00000000
-	MessageNoOverlap 0x2403
+	MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x03
 	WaitUntilTextboxCloses
 	EnablePlayerControl 
 	Jump script_0800E32E
diff --git a/data/scripts/dhc/script_KingDaltusStone.inc b/data/scripts/dhc/script_KingDaltusStone.inc
index 23e38f64..58b1f75b 100644
--- a/data/scripts/dhc/script_KingDaltusStone.inc
+++ b/data/scripts/dhc/script_KingDaltusStone.inc
@@ -39,10 +39,10 @@ script_0800E3C8:
 	JumpIfNot script_0800E3C8
 	SetPlayerIdle 
 	FacePlayer 
-	MessageNoOverlap 0x240c
+	MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x0c
 	WaitUntilTextboxCloses
 	Wait 0x000f
-	GivePlayerItem 0x0053
+	GivePlayerItem ITEM_SMALL_KEY
 	WaitPlayerGetItem
 	SetLocalFlag 0x0071
 	EnablePlayerControl
@@ -55,7 +55,7 @@ script_0800E3EE:
 	JumpIfNot script_0800E3EE
 	SetPlayerIdle 
 	FacePlayer 
-	MessageNoOverlap 0x240d
+	MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x0d
 	WaitUntilTextboxCloses
 	Wait 0x000f
 	EnablePlayerControl
diff --git a/data/scripts/dhc/script_MinishterPothoStone.inc b/data/scripts/dhc/script_MinishterPothoStone.inc
index caf8f250..210e28cf 100644
--- a/data/scripts/dhc/script_MinishterPothoStone.inc
+++ b/data/scripts/dhc/script_MinishterPothoStone.inc
@@ -28,7 +28,7 @@ script_0800E0DE:
 	FaceAwayFromPlayer
 	FacePlayer
 	Wait 0x000a
-	MessageNoOverlap 0x2402
+	MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x02
 	WaitUntilTextboxCloses
 	SetLocalFlag 0x0093
 script_0800E12E:
@@ -40,7 +40,7 @@ script_0800E138:
 	JumpIfNot script_0800E138
 	SetPlayerIdle 
 	FacePlayer 
-	MessageNoOverlap 0x2402
+	MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x02
 	WaitUntilTextboxCloses
 	Wait 0x000f
 	EnablePlayerControl
diff --git a/data/scripts/dhc/script_MinisterPothoCell.inc b/data/scripts/dhc/script_MinisterPothoCell.inc
index bbb05921..0016a435 100644
--- a/data/scripts/dhc/script_MinisterPothoCell.inc
+++ b/data/scripts/dhc/script_MinisterPothoCell.inc
@@ -10,7 +10,7 @@ script_0800E41A:
 	JumpIfNot script_0800E41A
 	SetPlayerIdle 
 	FacePlayer 
-	MessageNoOverlap 0x2406
+	MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x06
 	WaitUntilTextboxCloses
 	Wait 0x000f
 	EnablePlayerControl
diff --git a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc
index 67c2d035..cdab5391 100644
--- a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc
+++ b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc
@@ -12,7 +12,7 @@ script_0800DB7C:
 	SetEntityPositionRelative 0x0078, 0x0078
 	CameraTargetEntity
 	Call WaitForCameraTouchRoomBorder
-	EzloMessage 0x1648
+	EzloMessage TEXT_VAATI2, 0x48
 	WaitUntilTextboxCloses
 	Call sub_0804D7EC
 	SetSyncFlag 0x00000001
@@ -35,9 +35,9 @@ script_0800DBCA:
 	SetSyncFlag 0x00000001
 	StartPlayerScript script_PlayerAfterDefeatingV2
 	WaitForSyncFlagAndClear 0x00000006
-	MessageFromTargetPos 0x1643, 0x0002
+	MessageFromTargetPos TEXT_VAATI2, 0x43, 0x0002
 	WaitUntilTextboxCloses
-	EzloMessage 0x1645
+	EzloMessage TEXT_VAATI2, 0x45
 	WaitUntilTextboxCloses
 	Call CreatePlayerExclamationMark
 	SetSyncFlag 0x00000001
diff --git a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc
index 1f2ae59d..018b2feb 100644
--- a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc
+++ b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_Npc4ECastleCollapsing
 	PlayBgm BGM_CASTLE_COLLAPSE
 	StartPlayerScript script_PlayerStonesFall
 	WaitForSyncFlagAndClear 0x00000006
-	EzloMessage 0x1646
+	EzloMessage TEXT_VAATI2, 0x46
 	WaitUntilTextboxCloses
 	SetSyncFlag 0x00000001
 	StartPlayerScript script_PlayerCastleCollapsing
diff --git a/data/scripts/dhc/script_Npc4EV3Defeated.inc b/data/scripts/dhc/script_Npc4EV3Defeated.inc
index 6788d7e5..e946f42e 100644
--- a/data/scripts/dhc/script_Npc4EV3Defeated.inc
+++ b/data/scripts/dhc/script_Npc4EV3Defeated.inc
@@ -2,7 +2,7 @@
 SCRIPT_START script_Npc4EV3Defeated
 	EndBlock
 script_0800A0FE:
-	CheckGlobalFlag 0x0051
+	CheckGlobalFlag ENDING
 	JumpIfNot script_0800A0FE
 	BeginBlock
 	SetPlayerIdle
diff --git a/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc b/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc
index 4bdf7ea5..51164ea1 100644
--- a/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc
+++ b/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc
@@ -30,13 +30,13 @@ script_0800E4B6:
 	EndBlock
 	Call CreatePlayerExclamationMark
 	Wait 0x003c
-	MessageFromTarget 0x160c
+	MessageFromTarget TEXT_VAATI2, 0x0c
 	WaitUntilTextboxCloses
 	Wait 0x001e
-	MessageFromTarget 0x160d
+	MessageFromTarget TEXT_VAATI2, 0x0d
 	WaitUntilTextboxCloses
 	Wait 0x001e
-	EzloMessage 0x160e
+	EzloMessage TEXT_VAATI2, 0x0e
 	Wait 0x003c
 	WaitUntilTextboxCloses
 	BeginBlock
diff --git a/data/scripts/dhc/script_Object69CastleEscape.inc b/data/scripts/dhc/script_Object69CastleEscape.inc
index f75e5bc4..93348aff 100644
--- a/data/scripts/dhc/script_Object69CastleEscape.inc
+++ b/data/scripts/dhc/script_Object69CastleEscape.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_Object69CastleEscape
 	StartPlayerScript script_PlayerCastleEscape
 	WaitForSyncFlagAndClear 0x00000001
 	WaitForSyncFlagAndClear 0x00000002
-	EzloMessage 0x1647
+	EzloMessage TEXT_VAATI2, 0x47
 	WaitUntilTextboxCloses
 	SetLocalFlag 0x007a
 	Call sub_0807DF50
diff --git a/data/scripts/dhc/script_Object69DarkNutsRoom.inc b/data/scripts/dhc/script_Object69DarkNutsRoom.inc
index 2b05c72c..12fe4aa3 100644
--- a/data/scripts/dhc/script_Object69DarkNutsRoom.inc
+++ b/data/scripts/dhc/script_Object69DarkNutsRoom.inc
@@ -13,7 +13,7 @@ script_0800E550:
 	Wait 0x003c
 	PlaySound SFX_105
 	Wait 0x001e
-	EzloMessage 0x1622
+	EzloMessage TEXT_VAATI2, 0x22
 	Call StartDarkNutTimer
 	SetLocalFlag 0x007e
 script_0800E582:
diff --git a/data/scripts/dhc/script_Object69KeatonsRoom.inc b/data/scripts/dhc/script_Object69KeatonsRoom.inc
index 902cf230..7d754cec 100644
--- a/data/scripts/dhc/script_Object69KeatonsRoom.inc
+++ b/data/scripts/dhc/script_Object69KeatonsRoom.inc
@@ -13,7 +13,7 @@ script_0800E510:
 	Wait 0x003c
 	PlaySound SFX_105
 	Wait 0x001e
-	EzloMessage 0x1617
+	EzloMessage TEXT_VAATI2, 0x17
 	SetLocalFlag 0x007d
 script_0800E53C:
 	EnablePlayerControl
diff --git a/data/scripts/dhc/script_Object69V2Defeated.inc b/data/scripts/dhc/script_Object69V2Defeated.inc
index ddd5df46..eb9bf0dd 100644
--- a/data/scripts/dhc/script_Object69V2Defeated.inc
+++ b/data/scripts/dhc/script_Object69V2Defeated.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_Object69V2Defeated
 	StopBgm
 	StopBgm
 	Wait 0x0078
-	EzloMessage 0x1638
+	EzloMessage TEXT_VAATI2, 0x38
 	WaitUntilTextboxCloses
 	SetRoomFlag 0x0000
 	Wait 0x001e
diff --git a/data/scripts/dhc/script_Object69V2Intro.inc b/data/scripts/dhc/script_Object69V2Intro.inc
index 1e779703..edcff907 100644
--- a/data/scripts/dhc/script_Object69V2Intro.inc
+++ b/data/scripts/dhc/script_Object69V2Intro.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_Object69V2Intro
 	SetPlayerIdle
 	EndBlock
 	StopBgm
-	MessageFromTargetPos 0x1632, 0x0002
+	MessageFromTargetPos TEXT_VAATI2, 0x32, 0x0002
 	WaitUntilTextboxCloses
 	SetRoomFlag 0x0003
 script_0800DFFE:
@@ -21,7 +21,7 @@ script_0800E012:
 	SetPlayerIdle
 	Call sub_0807DF28
 	SetLocalFlag 0x007b
-	MessageFromTargetPos 0x1639, 0x000c
+	MessageFromTargetPos TEXT_VAATI2, 0x39, 0x000c
 	WaitUntilTextboxCloses
 	Wait 0x0096
 	PlaySound SFX_EVAPORATE
diff --git a/data/scripts/dhc/script_Object69VaatiWithZelda.inc b/data/scripts/dhc/script_Object69VaatiWithZelda.inc
index 930fbcf2..fe5d2128 100644
--- a/data/scripts/dhc/script_Object69VaatiWithZelda.inc
+++ b/data/scripts/dhc/script_Object69VaatiWithZelda.inc
@@ -17,11 +17,11 @@ script_0800DA64:
 	Call WaitForCameraTouchRoomBorder
 	SetSyncFlag 0x00000001
 	WaitForSyncFlagAndClear 0x00000002
-	MessageFromTargetPos 0x162d, 0x0002
+	MessageFromTargetPos TEXT_VAATI2, 0x2d, 0x0002
 	WaitUntilTextboxCloses
 	SetSyncFlag 0x00000001
 	Wait 0x001e
-	MessageFromTargetPos 0x162e, 0x0002
+	MessageFromTargetPos TEXT_VAATI2, 0x2e, 0x0002
 	WaitUntilTextboxCloses
 	_0807E8E4_0 
 	CallWithArg SetPlayerPos, 0x00780138
diff --git a/data/scripts/dhc/script_Vaati1Intro.inc b/data/scripts/dhc/script_Vaati1Intro.inc
index 0308aab2..c5af958a 100644
--- a/data/scripts/dhc/script_Vaati1Intro.inc
+++ b/data/scripts/dhc/script_Vaati1Intro.inc
@@ -20,7 +20,7 @@ SCRIPT_START script_Vaati1Intro
 	Call sub_08066C94
 	Wait 0x00e9
 	DoPostScriptAction 0x0007
-	MessageFromTargetPos 0x162f, 0x0002
+	MessageFromTargetPos TEXT_VAATI2, 0x2f, 0x0002
 	WaitUntilTextboxCloses
 	PlayBgm BGM_VAATI_REBORN
 	DoPostScriptAction 0x0019
diff --git a/data/scripts/dhc/script_ZeldaStoneDHC.inc b/data/scripts/dhc/script_ZeldaStoneDHC.inc
index ae2bc504..3c72b52d 100644
--- a/data/scripts/dhc/script_ZeldaStoneDHC.inc
+++ b/data/scripts/dhc/script_ZeldaStoneDHC.inc
@@ -10,7 +10,7 @@ SCRIPT_START script_ZeldaStoneDHC
 	Wait 0x003c
 	PlaySound SFX_9B
 	Wait 0x001e
-	MessageNoOverlap 0x1625
+	MessageNoOverlap TEXT_VAATI2, 0x25
 	WaitUntilTextboxCloses
 	Wait 0x003c
 	Call sub_08053C84