Use enums across more scripts and files

This commit is contained in:
Tal Hayon
2022-05-14 20:51:30 +03:00
parent 422fb8ed14
commit 968e200c78
259 changed files with 876 additions and 1318 deletions
+2 -2
View File
@@ -2,9 +2,9 @@
SCRIPT_START script_EzloTalkCoF
SetPlayerIdle
Call sub_0807DF28
EzloMessage 0x1c02
EzloMessage TEXT_EZLO_ELEMENTS_DONE, 0x02
WaitUntilTextboxCloses
SetLocalFlagByBank 0x0100, 0x0002
SetLocalFlagByBank FLAG_BANK_1, 0x0002
Call sub_0807DF50
EnablePlayerControl
DoPostScriptAction 0x0006
@@ -15,7 +15,7 @@ script_0800B734:
WaitForSyncFlagAndClear 0x00000004
CheckLocalFlag 0x00a0
JumpIf script_0800B7A2
MessageNoOverlap 0x0580
MessageNoOverlap TEXT_ITEM_GET, 0x80
WaitUntilTextboxCloses
CallWithArg CheckMessageEqual, 0x00000582
JumpIf script_0800B794
@@ -28,7 +28,7 @@ script_0800B794:
GivePlayerItem 0x0065
Jump script_0800B698
script_0800B7A2:
MessageNoOverlap 0x0590
MessageNoOverlap TEXT_ITEM_GET, 0x90
WaitUntilTextboxCloses
SetFadeTime 0x0010
SetFade7
@@ -36,7 +36,7 @@ script_0800B7A2:
ModHealth 0x00a0
SetFade6
WaitForFadeFinish
MessageNoOverlap 0x057f
MessageNoOverlap TEXT_ITEM_GET, 0x7f
WaitUntilTextboxCloses
Jump script_0800B6A6
.2byte 0x0000
+13 -13
View File
@@ -6,15 +6,15 @@ SCRIPT_START script_Melari
SetAnimationState 0x0004
SetAnimation 0x0000
EndBlock
CheckInventory1 0x0041
CheckInventory1 ITEM_FIRE_ELEMENT
JumpIf script_0800CFD2
CheckLocalFlag 0x007e
JumpIfNot script_0800CFD2
SetAnimation 0x0008
script_0800CFD2:
CheckInventory1 0x0002
CheckInventory1 ITEM_GREEN_SWORD
JumpIf script_0800CFFA
CheckInventory1 0x0041
CheckInventory1 ITEM_FIRE_ELEMENT
JumpIfNot script_0800CFEC
SetSyncFlag 0x00000020
Jump script_0800CFFA
@@ -31,22 +31,22 @@ script_0800CFFA:
EndBlock
SetPlayerIdle
Call sub_0807DF28
CheckInventory1 0x0002
CheckInventory1 ITEM_GREEN_SWORD
JumpIfNot script_0800D032
FacePlayer
SetIntVariable 0x00000000
Call sub_0806C028
MessageNoOverlap 0x1219
MessageNoOverlap TEXT_MINISH2, 0x19
Jump script_0800D17C
script_0800D032:
CheckInventory1 0x0041
CheckInventory1 ITEM_FIRE_ELEMENT
JumpIfNot script_0800D098
StartPlayerScript script_PlayerAtMelari
WaitForSyncFlagAndClear 0x00000008
FacePlayer
SetIntVariable 0x00000000
Call sub_0806C028
MessageFromTargetPos 0x125c, 0x0002
MessageFromTargetPos TEXT_MINISH2, 0x5c, 0x0002
WaitUntilTextboxCloses
StartPlayerScript script_PlayerPlaceBrokenSword
WaitForSyncFlagAndClear 0x00000008
@@ -57,12 +57,12 @@ script_0800D032:
SetSyncFlag 0x00000020
StartPlayerScript script_PlayerGetWhiteSword
WaitForSyncFlagAndClear 0x00000008
MessageFromTargetPos 0x125d, 0x0002
MessageFromTargetPos TEXT_MINISH2, 0x5d, 0x0002
Jump script_0800D17C
script_0800D098:
CheckLocalFlag 0x007e
JumpIfNot script_0800D0A8
MessageFromTarget 0x123e
MessageFromTarget TEXT_MINISH2, 0x3e
Jump script_0800D17C
script_0800D0A8:
StartPlayerScript script_PlayerAtMelari
@@ -74,7 +74,7 @@ script_0800D0A8:
FacePlayer
SetIntVariable 0x00000000
Call sub_0806C028
MessageFromTargetPos 0x123d, 0x0002
MessageFromTargetPos TEXT_MINISH2, 0x3d, 0x0002
WaitUntilTextboxCloses
StartPlayerScript script_PlayerPlaceBrokenSword
WaitForSyncFlagAndClear 0x00000008
@@ -89,7 +89,7 @@ script_0800D108:
PlaySound SFX_F8
SetSyncFlag 0x00000010
SetLocalFlag 0x007e
MessageFromTargetPos 0x123e, 0x0002
MessageFromTargetPos TEXT_MINISH2, 0x3e, 0x0002
WaitUntilTextboxCloses
Wait 0x000f
SetAnimation 0x0009
@@ -98,7 +98,7 @@ script_0800D108:
SetSyncFlag 0x00000002
WaitForSyncFlagAndClear 0x00000004
Wait 0x001e
MessageFromTargetPos 0x123f, 0x0002
MessageFromTargetPos TEXT_MINISH2, 0x3f, 0x0002
WaitUntilTextboxCloses
SetSyncFlag 0x00000001
WaitForSyncFlagAndClear 0x00000004
@@ -107,7 +107,7 @@ script_0800D108:
SetAnimation 0x0008
Wait 0x003c
Call sub_08095164
EzloMessage 0x1240
EzloMessage TEXT_MINISH2, 0x40
script_0800D17C:
WaitUntilTextboxCloses
Wait 0x000f
@@ -17,7 +17,7 @@ script_0800D31E:
FacePlayer
SetIntVariable 0x00000000
Call sub_0806C028
MessageFromTarget 0x1219
MessageFromTarget TEXT_MINISH2, 0x19
WaitUntilTextboxCloses
Wait 0x000f
EnablePlayerControl
@@ -5,7 +5,7 @@ SCRIPT_START script_MountainMinish3
DoPostScriptAction 0x000a
EndBlock
script_0800D282:
CheckInventory1 0x0041
CheckInventory1 ITEM_FIRE_ELEMENT
JumpIf script_0800D292
CheckLocalFlag 0x007e
JumpIf script_0800D2EA
@@ -1,7 +1,7 @@
@ Mines OBJECT_6A Broken Sword on Table?
SCRIPT_START script_Object6ABrokenSword
BeginBlock
CheckInventory1 0x0041
CheckInventory1 ITEM_FIRE_ELEMENT
JumpIf script_0800D24C
CheckLocalFlag 0x007e
JumpIf script_0800D242
@@ -5,7 +5,7 @@ SCRIPT_START script_PlayerGetWhiteSword
PlaySound SFX_ITEM_GET
CallWithArg SetPlayerAnimation2, 0x000001e2
Call WaitForPlayerAnim
MessageNoOverlap 0x0502
MessageNoOverlap TEXT_ITEM_GET, 0x02
WaitUntilTextboxCloses
SetSyncFlag 0x00000008
Call SetPlayerActionNormal