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
@@ -8,7 +8,7 @@ SCRIPT_START script_08013F94
script_08013FA4:
EndBlock
BeginBlock
CheckInventory1 0x0003
CheckInventory1 ITEM_RED_SWORD
JumpIfNot script_08013FA4
CheckPlayerFlags 0x00400000
JumpIfNot script_08013FA4
@@ -17,7 +17,7 @@ script_08013FA4:
DisablePlayerControl
Call sub_0807DF38
Wait 0x0078
EzloMessage 0x1505
EzloMessage TEXT_PANEL_TUTORIAL, 0x05
WaitUntilTextboxCloses
SetLocalFlag 0x007d
Call sub_0807DF50
@@ -10,7 +10,7 @@ script_08013FF0:
JumpIf script_0801404C
CheckLocalFlag 0x007a
JumpIfNot script_08013FF0
CheckInventory1 0x0003
CheckInventory1 ITEM_RED_SWORD
JumpIfNot script_08013FF0
CallWithArg sub_0807F6B4, 0x000000d0
JumpIfNot script_08013FF0
@@ -20,7 +20,7 @@ script_08013FF0:
SetPlayerIdle
Call sub_0807DF28
EndBlock
EzloMessage 0x1508
EzloMessage TEXT_PANEL_TUTORIAL, 0x08
WaitUntilTextboxCloses
StartPlayerScript script_PlayerSanctuary
WaitForSyncFlagAndClear 0x00000001
@@ -23,7 +23,7 @@ SCRIPT_START script_Npc4EFinalSwordRumble
MoveEntityToPlayer
CameraTargetEntity
Wait 0x003c
EzloMessage 0x1502
EzloMessage TEXT_PANEL_TUTORIAL, 0x02
WaitUntilTextboxCloses
_0807F0B4 0x0004
CameraTargetPlayer
@@ -67,7 +67,7 @@ script_080134F8:
SetFade6
WaitForFadeFinish
PlaySound SFX_ITEM_GET
MessageFromTargetPos 0x0503, 0x000c
MessageFromTargetPos TEXT_ITEM_GET, 0x03, 0x000c
WaitUntilTextboxCloses
SetSyncFlag 0x00040000
CallWithArg CreateManager36, 0x00000001
@@ -7,7 +7,7 @@ script_08013B1E:
BeginBlock
CallWithArg sub_0807F6B4, 0x000001c8
JumpIfNot script_08013B1E
CheckInventory1 0x0006
CheckInventory1 ITEM_FOURSWORD
JumpIfNot script_08013B1E
CheckLocalFlag 0x0078
JumpIf script_08013B1E
@@ -15,7 +15,7 @@ script_08013B1E:
SetPlayerIdle
Call WaitForPlayerNormal
Call sub_0807DF28
EzloMessage 0x1507
EzloMessage TEXT_PANEL_TUTORIAL, 0x07
WaitUntilTextboxCloses
StartPlayerScript script_PlayerSanctuary
WaitForSyncFlagAndClear 0x00000001
@@ -17,7 +17,7 @@ script_08013CA6:
_0807F0B4 0x0004
CameraTargetPlayer
Call WaitForCameraTouchRoomBorder
EzloMessage 0x1504
EzloMessage TEXT_PANEL_TUTORIAL, 0x04
WaitUntilTextboxCloses
SetLocalFlag 0x0079
Call sub_0807DF50
@@ -70,7 +70,7 @@ script_0801373C:
SetFade6
WaitForFadeFinish
PlaySound SFX_ITEM_GET
MessageFromTargetPos 0x0504, 0x000c
MessageFromTargetPos TEXT_ITEM_GET, 0x04, 0x000c
WaitUntilTextboxCloses
SetSyncFlag 0x00040000
SetLocalFlag 0x007b
@@ -12,7 +12,7 @@ SCRIPT_START script_Npc4ESpawnTextBoard
_0807F0C8 0x0000, 0x0000
StartPlayerScript script_PlayerTextBoardAppears
WaitForSyncFlagAndClear 0x00000002
EzloMessage 0x1501
EzloMessage TEXT_PANEL_TUTORIAL, 0x01
WaitUntilTextboxCloses
_0807F0B4 0x0004
CameraTargetPlayer
@@ -75,7 +75,7 @@ script_080138D0:
SetFade6
WaitForFadeFinish
PlaySound SFX_ITEM_GET
MessageFromTargetPos 0x0505, 0x000c
MessageFromTargetPos TEXT_ITEM_GET, 0x05, 0x000c
WaitUntilTextboxCloses
SetSyncFlag 0x00040000
.ifndef EU
@@ -3,13 +3,13 @@ SCRIPT_START script_Object6ATextBoard
BeginBlock
CheckLocalFlag 0x007a
JumpIf script_08013C2A
CheckInventory1 0x0003
CheckInventory1 ITEM_RED_SWORD
JumpIf script_08013C2A
CheckInventory1 0x0002
CheckInventory1 ITEM_GREEN_SWORD
JumpIfNot script_08013C98
CheckInventory1 0x0040
CheckInventory1 ITEM_EARTH_ELEMENT
JumpIfNot script_08013C98
CheckInventory1 0x0041
CheckInventory1 ITEM_FIRE_ELEMENT
JumpIfNot script_08013C98
EndBlock
DoPostScriptAction 0x0008
@@ -42,10 +42,10 @@ script_08013C58:
FacePlayer
CheckLocalFlag 0x007d
JumpIf script_08013C82
EzloMessage 0x1501
EzloMessage TEXT_PANEL_TUTORIAL, 0x01
Jump script_08013C86
script_08013C82:
EzloMessage 0x1506
EzloMessage TEXT_PANEL_TUTORIAL, 0x06
script_08013C86:
WaitUntilTextboxCloses
Wait 0x000f