More enum use in scripts

29 files changed, 46 insertions, 46 deletions

diff --git a/data/scripts/castorWilds/script_GreatFairyRupees.inc b/data/scripts/castorWilds/script_GreatFairyRupees.inc
index 07b03a14..eaaf8aa3 100644
--- a/data/scripts/castorWilds/script_GreatFairyRupees.inc
+++ b/data/scripts/castorWilds/script_GreatFairyRupees.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_GreatFairyRupees
 	BeginBlock
 	EndBlock
 script_0800B6CC:
-	HasRupees 0x0001
+	HasRupees 1
 	JumpIfNot script_0800B6CC
 script_0800B6D4:
 	CheckPlayerInRegion 0x0078, 0x00b8, 0x1060
diff --git a/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc b/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc
index 153ec77a..ebabde5d 100644
--- a/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc
+++ b/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc
@@ -1,7 +1,7 @@
 @ Intro Assembly Player gets Sword
 SCRIPT_START script_PlayerGetSword
-	SetInventoryValue 0x0001, 0x0001
-	CallWithArg PutItemAnySlot, 0x00000001
+	SetInventoryValue ITEM_SMITH_SWORD, 0x0001
+	CallWithArg PutItemAnySlot, ITEM_SMITH_SWORD
 	PlaySound SFX_ITEM_GET
 	CallWithArg SetPlayerAnimation2, 0x0000045f
 	Call WaitForPlayerAnim
diff --git a/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc b/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc
index 62c70f3d..558ff346 100644
--- a/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc
+++ b/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc
@@ -46,7 +46,7 @@ script_08015880:
 	JumpIfNot script_08015880
 script_08015888:
 	WaitUntilTextboxCloses
-	ComparePlayerAction 0x001c
+	ComparePlayerAction PLAYER_SLEEP
 	JumpIf script_08015888
 	SetPlayerIdle
 	Call sub_0807DF28
diff --git a/data/scripts/graveyard/script_DampeInside.inc b/data/scripts/graveyard/script_DampeInside.inc
index fec6e1fa..231e5b8a 100644
--- a/data/scripts/graveyard/script_DampeInside.inc
+++ b/data/scripts/graveyard/script_DampeInside.inc
@@ -9,11 +9,11 @@ SCRIPT_START script_DampeInside
 	WaitUntilTextboxCloses
 	JumpIfNot script_08009622
 	PlaySound SFX_ITEM_GET
-	InitItemGetSequence 0x003c
+	InitItemGetSequence ITEM_QST_GRAVEYARD_KEY
 	MessageFromTarget TEXT_ITEM_GET, 0x3c
 	WaitPlayerGetItem 
 	WaitUntilTextboxCloses
-	SetInventoryValue 0x003c, 0x0001
+	SetInventoryValue ITEM_QST_GRAVEYARD_KEY, 0x0001
 script_08009622:
 	EnablePlayerControl
 	DoPostScriptAction 0x0000
diff --git a/data/scripts/graveyard/script_DampeOuside.inc b/data/scripts/graveyard/script_DampeOuside.inc
index 7122cb38..b1cede54 100644
--- a/data/scripts/graveyard/script_DampeOuside.inc
+++ b/data/scripts/graveyard/script_DampeOuside.inc
@@ -28,7 +28,7 @@ script_08009660:
 	JumpIfNot script_0800968E
 	PlaySound SFX_111
 	PlaySound SFX_SECRET
-	SetInventoryValue 0x003c, 0x0002
+	SetInventoryValue ITEM_QST_GRAVEYARD_KEY, 0x0002
 	Call sub_0806BEFC
 script_0800968E:
 	EnablePlayerControl
diff --git a/data/scripts/hyruleTown/script_Carlov.inc b/data/scripts/hyruleTown/script_Carlov.inc
index ed2ecfb3..d91f44f0 100644
--- a/data/scripts/hyruleTown/script_Carlov.inc
+++ b/data/scripts/hyruleTown/script_Carlov.inc
@@ -21,7 +21,7 @@ script_08014462:
 	DoPostScriptAction 0x0001
 	Wait 0x008c
 	DoPostScriptAction 0x0000
-	HasRupees 0x000a
+	HasRupees 10
 	JumpIf script_080144A2
 	MessageFromTarget TEXT_BURLOV, 0x04
 	Jump script_080144FC
diff --git a/data/scripts/hyruleTown/script_DinMovedIn.inc b/data/scripts/hyruleTown/script_DinMovedIn.inc
index b28b5b99..79d38921 100644
--- a/data/scripts/hyruleTown/script_DinMovedIn.inc
+++ b/data/scripts/hyruleTown/script_DinMovedIn.inc
@@ -12,14 +12,14 @@ script_0801203A:
 	SetPlayerIdle
 	FacePlayer
 	DoPostScriptAction 0x0000
-	CheckLocalFlag 0x0094
+	CheckLocalFlag MHOUSE_DIN_TALK
 	JumpIf script_0801205E
 	MessageNoOverlap TEXT_GORMAN_ORACLES, 0x22
 	WaitUntilTextboxCloses
-	SetLocalFlag 0x0094
+	SetLocalFlag MHOUSE_DIN_TALK
 	Jump script_0801209E
 script_0801205E:
-	CheckBottleContaining 0x0031
+	CheckBottleContaining BOTTLE_CHARM_DIN
 	JumpIfNot script_08012070
 	MessageNoOverlap TEXT_GORMAN_ORACLES, 0x23
 	WaitUntilTextboxCloses
@@ -29,7 +29,7 @@ script_08012070:
 	WaitUntilTextboxCloses
 	CheckTextboxResult 
 	JumpIfNot script_0801209E
-	CheckBottleContaining 0x0020
+	CheckBottleContaining ITEM_BOTTLE_EMPTY
 	JumpIfNot script_0801209A
 	MessageNoOverlap TEXT_GORMAN_ORACLES, 0x25
 	WaitUntilTextboxCloses
diff --git a/data/scripts/hyruleTown/script_Emma.inc b/data/scripts/hyruleTown/script_Emma.inc
index 92631e30..428e4ed2 100644
--- a/data/scripts/hyruleTown/script_Emma.inc
+++ b/data/scripts/hyruleTown/script_Emma.inc
@@ -25,7 +25,7 @@ script_0800E872: @ Rent large room
 	CallWithArg sub_0807F854, 0x00010190
 	EndBlock
 	WaitUntilTextboxCloses
-	HasRupees 0x0190
+	HasRupees 400
 	JumpIfNot script_EmmaNotEnoughRupees
 	ModRupees -400
 	SetLocalFlag 0x0091
diff --git a/data/scripts/hyruleTown/script_FaroreMovedIn.inc b/data/scripts/hyruleTown/script_FaroreMovedIn.inc
index 5cb88b1b..4732a156 100644
--- a/data/scripts/hyruleTown/script_FaroreMovedIn.inc
+++ b/data/scripts/hyruleTown/script_FaroreMovedIn.inc
@@ -12,14 +12,14 @@ script_08012152:
 	SetPlayerIdle
 	FacePlayer
 	DoPostScriptAction 0x0000
-	CheckLocalFlag 0x0096
+	CheckLocalFlag MHOUSE_FARORE_TALK
 	JumpIf script_08012176
 	MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1c
 	WaitUntilTextboxCloses
-	SetLocalFlag 0x0096
+	SetLocalFlag MHOUSE_FARORE_TALK
 	Jump script_080121B6
 script_08012176:
-	CheckBottleContaining 0x0030
+	CheckBottleContaining BOTTLE_CHARM_FARORE
 	JumpIfNot script_08012188
 	MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1d
 	WaitUntilTextboxCloses
@@ -29,7 +29,7 @@ script_08012188:
 	WaitUntilTextboxCloses
 	CheckTextboxResult 
 	JumpIfNot script_080121B6
-	CheckBottleContaining 0x0020
+	CheckBottleContaining ITEM_BOTTLE_EMPTY
 	JumpIfNot script_080121B2
 	MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1f
 	WaitUntilTextboxCloses
diff --git a/data/scripts/hyruleTown/script_MalonHyruleTown.inc b/data/scripts/hyruleTown/script_MalonHyruleTown.inc
index eaff55f4..1040f382 100644
--- a/data/scripts/hyruleTown/script_MalonHyruleTown.inc
+++ b/data/scripts/hyruleTown/script_MalonHyruleTown.inc
@@ -21,9 +21,9 @@ script_08014F4A:
 	WaitUntilTextboxCloses
 	CheckTextboxResult
 	JumpIfNot script_08014FA6
-	HasRupees 0x0064
+	HasRupees 100
 	JumpIfNot script_08014F9A
-	CheckBottleContaining 0x0020
+	CheckBottleContaining ITEM_BOTTLE_EMPTY
 	JumpIfNot script_08014FA2
 	ModRupees -100
 	GivePlayerItem ITEM_BOTTLE_MILK
diff --git a/data/scripts/hyruleTown/script_Marcy.inc b/data/scripts/hyruleTown/script_Marcy.inc
index 260bea1d..4ee17abf 100644
--- a/data/scripts/hyruleTown/script_Marcy.inc
+++ b/data/scripts/hyruleTown/script_Marcy.inc
@@ -18,7 +18,7 @@ script_08010746:
 	WaitUntilTextboxCloses
 	CheckTextboxResult
 	JumpIfNot script_08010786
-	HasRupees 0x00c8
+	HasRupees 200
 	JumpIf script_08010778
 	MessageNoOverlap TEXT_POST, 0x08
 	Jump script_08010786
diff --git a/data/scripts/hyruleTown/script_NayruMovedIn.inc b/data/scripts/hyruleTown/script_NayruMovedIn.inc
index 837ce193..3b88280c 100644
--- a/data/scripts/hyruleTown/script_NayruMovedIn.inc
+++ b/data/scripts/hyruleTown/script_NayruMovedIn.inc
@@ -12,14 +12,14 @@ script_080120C6:
 	SetPlayerIdle
 	FacePlayer
 	DoPostScriptAction 0x0000
-	CheckLocalFlag 0x0095
+	CheckLocalFlag MHOUSE_NAYRU_TALK
 	JumpIf script_080120EA
 	MessageNoOverlap TEXT_GORMAN_ORACLES, 0x16
 	WaitUntilTextboxCloses
-	SetLocalFlag 0x0095
+	SetLocalFlag MHOUSE_NAYRU_TALK
 	Jump script_0801212A
 script_080120EA:
-	CheckBottleContaining 0x002f
+	CheckBottleContaining BOTTLE_CHARM_NAYRU
 	JumpIfNot script_080120FC
 	MessageNoOverlap TEXT_GORMAN_ORACLES, 0x17
 	WaitUntilTextboxCloses
@@ -29,7 +29,7 @@ script_080120FC:
 	WaitUntilTextboxCloses
 	CheckTextboxResult 
 	JumpIfNot script_0801212A
-	CheckBottleContaining 0x0020
+	CheckBottleContaining ITEM_BOTTLE_EMPTY
 	JumpIfNot script_08012126
 	MessageNoOverlap TEXT_GORMAN_ORACLES, 0x19
 	WaitUntilTextboxCloses
diff --git a/data/scripts/hyruleTown/script_Pita.inc b/data/scripts/hyruleTown/script_Pita.inc
index d9d92ff5..c026e4cf 100644
--- a/data/scripts/hyruleTown/script_Pita.inc
+++ b/data/scripts/hyruleTown/script_Pita.inc
@@ -24,7 +24,7 @@ script_080106E0:
 	CheckTextboxResult
 	JumpIfNot script_08010726
 	WaitUntilTextboxCloses
-	BuyItem 0x0000, 0x0000
+	BuyItem ITEM_NONE, 0x0000
 	JumpIf script_0801070C
 	MessageNoOverlap TEXT_BAKERY, 0x04
 	Jump script_08010726
diff --git a/data/scripts/hyruleTown/script_RemFallingAsleep.inc b/data/scripts/hyruleTown/script_RemFallingAsleep.inc
index 24f5736b..a4ca2e30 100644
--- a/data/scripts/hyruleTown/script_RemFallingAsleep.inc
+++ b/data/scripts/hyruleTown/script_RemFallingAsleep.inc
@@ -39,7 +39,7 @@ script_08013006:
 	Call sub_0807DF28
 	EndBlock
 	PlaySound SFX_TASK_COMPLETE
-	InitItemGetSequence 0x0038
+	InitItemGetSequence ITEM_QST_MUSHROOM
 	WaitPlayerGetItem
 	Wait 0x001e
 	_0807E8E4_0
diff --git a/data/scripts/hyruleTown/script_RentRegularRoom.inc b/data/scripts/hyruleTown/script_RentRegularRoom.inc
index b4b17a3b..98e52f5b 100644
--- a/data/scripts/hyruleTown/script_RentRegularRoom.inc
+++ b/data/scripts/hyruleTown/script_RentRegularRoom.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_RentRegularRoom
 	CallWithArg sub_0807F854, 0x000100c8
 	EndBlock
 	WaitUntilTextboxCloses
-	HasRupees 0x00c8
+	HasRupees 200
 	JumpIfNot script_EmmaNotEnoughRupees
 	ModRupees -200
 	SetLocalFlag 0x0091
diff --git a/data/scripts/hyruleTown/script_RentSmallRoom.inc b/data/scripts/hyruleTown/script_RentSmallRoom.inc
index f3d5785f..672d530b 100644
--- a/data/scripts/hyruleTown/script_RentSmallRoom.inc
+++ b/data/scripts/hyruleTown/script_RentSmallRoom.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_RentSmallRoom
 	CallWithArg sub_0807F854, 0x00010032
 	EndBlock
 	WaitUntilTextboxCloses
-	HasRupees 0x0032
+	HasRupees 50
 	JumpIfNot script_EmmaNotEnoughRupees
 	ModRupees -50
 	SetLocalFlag 0x0091
diff --git a/data/scripts/hyruleTown/script_Simon.inc b/data/scripts/hyruleTown/script_Simon.inc
index 6f664f90..a6ac0e6c 100644
--- a/data/scripts/hyruleTown/script_Simon.inc
+++ b/data/scripts/hyruleTown/script_Simon.inc
@@ -33,7 +33,7 @@ script_08011B9A:
 	SetAnimationState 0x0004
 	Jump script_08011B84
 script_08011BA4:
-	HasRupees 0x000a
+	HasRupees 10
 	JumpIf script_08011BBC
 	DoPostScriptAction 0x0004
 	Wait 0x003c
diff --git a/data/scripts/lakeHylia/script_Object69AfterToD.inc b/data/scripts/lakeHylia/script_Object69AfterToD.inc
index e5ca7fbf..09903bbe 100644
--- a/data/scripts/lakeHylia/script_Object69AfterToD.inc
+++ b/data/scripts/lakeHylia/script_Object69AfterToD.inc
@@ -5,7 +5,7 @@ script_0800AFB2:
 	EndBlock
 	BeginBlock
 	Call sub_0807FBB4
-	ComparePlayerAction 0x0001
+	ComparePlayerAction PLAYER_NORMAL
 	JumpIfNot script_0800AFB2
 	EndBlock
 	Call sub_0807DF28
diff --git a/data/scripts/lonLonRanch/script_TalonGotKey.inc b/data/scripts/lonLonRanch/script_TalonGotKey.inc
index 372a28b0..f169300f 100644
--- a/data/scripts/lonLonRanch/script_TalonGotKey.inc
+++ b/data/scripts/lonLonRanch/script_TalonGotKey.inc
@@ -17,7 +17,7 @@ SCRIPT_START script_TalonGotKey
 	FacePlayer
 	Wait 0x003c
 	PlaySound SFX_TASK_COMPLETE
-	InitItemGetSequence 0x0037
+	InitItemGetSequence ITEM_QST_LONLON_KEY
 	WaitPlayerGetItem 
 	FaceAwayFromPlayer 
 	MessageFromTarget TEXT_LON_LON, 0x0c
diff --git a/data/scripts/lonLonRanch/script_TalonInside.inc b/data/scripts/lonLonRanch/script_TalonInside.inc
index 317d3600..854ab1db 100644
--- a/data/scripts/lonLonRanch/script_TalonInside.inc
+++ b/data/scripts/lonLonRanch/script_TalonInside.inc
@@ -18,7 +18,7 @@ script_08014E64:
 	JumpIfNot script_08014EBC
 	CallWithArg sub_0807F7C4, 0x00000022
 	JumpIfNot script_08014EB0
-	CheckBottleContaining 0x0020
+	CheckBottleContaining ITEM_BOTTLE_EMPTY
 	JumpIfNot script_08014EB8
 	CallWithArg sub_0807F800, 0x00000022
 	WaitPlayerGetItem 
diff --git a/data/scripts/minishWoods/script_Object69PotionRed.inc b/data/scripts/minishWoods/script_Object69PotionRed.inc
index 7dbed107..ded6314e 100644
--- a/data/scripts/minishWoods/script_Object69PotionRed.inc
+++ b/data/scripts/minishWoods/script_Object69PotionRed.inc
@@ -11,7 +11,7 @@ script_0801619A:
 	MessageFromTargetTable TEXT_SYRUP << 8 | 0x05, TEXT_SYRUP << 8 | 0x04, TEXT_SYRUP << 8 | 0x04, TEXT_SYRUP << 8 | 0x04
 	CheckTextboxResult 
 	JumpIfNot script_080161E2
-	CheckBottleContaining 0x0020
+	CheckBottleContaining ITEM_BOTTLE_EMPTY
 	JumpIf script_080161C6
 	MessageFromTarget TEXT_SYRUP, 0x0c
 	Jump script_080161E2
diff --git a/data/scripts/minishWoods/script_Syrup.inc b/data/scripts/minishWoods/script_Syrup.inc
index 7c0dbae1..57a2af86 100644
--- a/data/scripts/minishWoods/script_Syrup.inc
+++ b/data/scripts/minishWoods/script_Syrup.inc
@@ -28,7 +28,7 @@ script_080160E0:
 	WaitUntilTextboxCloses
 	CheckTextboxResult 
 	JumpIfNot script_08016132
-	BuyItem 0x0000, 0x0000
+	BuyItem ITEM_NONE, 0x0000
 	JumpIf script_0801610C
 	MessageFromTarget TEXT_SYRUP, 0x0b
 	WaitUntilTextboxCloses
diff --git a/data/scripts/mtCrenel/script_Melari.inc b/data/scripts/mtCrenel/script_Melari.inc
index 94ee722a..59c02f84 100644
--- a/data/scripts/mtCrenel/script_Melari.inc
+++ b/data/scripts/mtCrenel/script_Melari.inc
@@ -84,7 +84,7 @@ script_0800D0A8:
 	PlaySound SFX_TASK_COMPLETE
 	Call sub_08068964
 script_0800D108:
-	ComparePlayerAction 0x0008
+	ComparePlayerAction PLAYER_ITEMGET
 	JumpIf script_0800D108
 	PlaySound SFX_F8
 	SetSyncFlag 0x00000010
diff --git a/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc b/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc
index 1d48b308..2989fde6 100644
--- a/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc
+++ b/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc
@@ -1,7 +1,7 @@
 @ Mines Player get white sword
 SCRIPT_START script_PlayerGetWhiteSword
-	SetInventoryValue 0x0002, 0x0001
-	CallWithArg PutItemAnySlot, 0x00000002
+	SetInventoryValue ITEM_GREEN_SWORD, 0x0001
+	CallWithArg PutItemAnySlot, ITEM_GREEN_SWORD
 	PlaySound SFX_ITEM_GET
 	CallWithArg SetPlayerAnimation2, 0x000001e2
 	Call WaitForPlayerAnim
diff --git a/data/scripts/sanctuary/script_08013F94.inc b/data/scripts/sanctuary/script_08013F94.inc
index f9b39421..473b9fa3 100644
--- a/data/scripts/sanctuary/script_08013F94.inc
+++ b/data/scripts/sanctuary/script_08013F94.inc
@@ -10,7 +10,7 @@ script_08013FA4:
 	BeginBlock
 	CheckInventory1 ITEM_RED_SWORD
 	JumpIfNot script_08013FA4
-	CheckPlayerFlags 0x00400000
+	CheckPlayerFlags PL_CLONING
 	JumpIfNot script_08013FA4
 	EndBlock
 	Call WaitForPlayerNormalOrTalkEzlo
diff --git a/data/scripts/sanctuary/script_Npc4EPedestal.inc b/data/scripts/sanctuary/script_Npc4EPedestal.inc
index 02c7a166..ee42d5ef 100644
--- a/data/scripts/sanctuary/script_Npc4EPedestal.inc
+++ b/data/scripts/sanctuary/script_Npc4EPedestal.inc
@@ -52,7 +52,7 @@ script_080134F8:
 	Wait 0x003c
 	StartPlayerScript script_PlayerPickUpSword
 	SetSyncFlag 0x00000080
-	SetInventoryValue 0x0003, 0x0001
+	SetInventoryValue ITEM_RED_SWORD, 0x0001
 	Call NPC4E_SaveEquippedItems
 	Call NPC4E_RestoreEquippedItems
 	Call WaitForPlayerAnim
diff --git a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
index 3c488eb3..46453d34 100644
--- a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
+++ b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
@@ -55,7 +55,7 @@ script_0801373C:
 	Wait 0x003c
 	StartPlayerScript script_PlayerPickUpSword
 	SetSyncFlag 0x00000080
-	SetInventoryValue 0x0004, 0x0001
+	SetInventoryValue ITEM_BLUE_SWORD, 0x0001
 	Call NPC4E_SaveEquippedItems
 	Call NPC4E_RestoreEquippedItems
 	Call WaitForPlayerAnim
diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
index 01f38063..02c82868 100644
--- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
+++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
@@ -59,7 +59,7 @@ script_080138D0:
 	Wait 0x003c
 	StartPlayerScript script_PlayerPickUpFinalSword
 	SetSyncFlag 0x00000080
-	SetInventoryValue 0x0006, 0x0001
+	SetInventoryValue ITEM_FOURSWORD, 0x0001
 	Call UpdatePlayerSkills
 	Call NPC4E_SaveEquippedItems
 	Call NPC4E_RestoreEquippedItems
diff --git a/data/scripts/unused/script_08016384.inc b/data/scripts/unused/script_08016384.inc
index ebb5cf72..b1975a48 100644
--- a/data/scripts/unused/script_08016384.inc
+++ b/data/scripts/unused/script_08016384.inc
@@ -25,18 +25,18 @@ SCRIPT_START script_08016384
 	CheckPlayerInRegion2 0x0000
 	CheckEntityInteractType
 	FacePlayerAndCheckDist
-	HasRupees 0x00c8
+	HasRupees 200
 	CheckTextboxResult
 	CheckKinstoneFused KINSTONE_1
-	BuyItem 0x006c, 0x0000
-	CheckBottleContaining 0x0020
+	BuyItem ITEM_BOMBS10, 0x0000
+	CheckBottleContaining ITEM_BOTTLE_EMPTY
 	VariableBitSet 0x00000000
 	VariableOnlyBitSet 0x00000000
 	VariableEqual 0x00000000
-	CheckPlayerFlags 0x00000080
+	CheckPlayerFlags PL_MINISH
 	CheckPlayerMinish
 	EntityHasHeight
-	ComparePlayerAction 0x0001
+	ComparePlayerAction PLAYER_NORMAL
 	ComparePlayerAnimationState 0x0004
 	SetSyncFlag 0x00000001
 	ClearSyncFlag 0x00000002