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
@@ -12,20 +12,20 @@ SCRIPT_START script_KingDaltusAtAssembly
SetAnimationState 0x0004
WalkSouth 0x0008
SetAnimation 0x0004
MessageFromTargetPos 0x1050, 0x000e
MessageFromTargetPos TEXT_PROLOGUE, 0x50, 0x000e
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
SetSyncFlag 0x00000100
WaitForSyncFlagAndClear 0x00000080
SetAnimation 0x0004
MessageFromTargetPos 0x1052, 0x000e
MessageFromTargetPos TEXT_PROLOGUE, 0x52, 0x000e
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
SetSyncFlag 0x00000100
WaitForSyncFlagAndClear 0x00000080
SetAnimationState 0x0006
SetAnimation 0x0005
MessageFromTargetPos 0x1054, 0x000e
MessageFromTargetPos TEXT_PROLOGUE, 0x54, 0x000e
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
SetSyncFlag 0x00000100
@@ -34,25 +34,25 @@ SCRIPT_START script_KingDaltusAtAssembly
SetSyncFlag 0x00000100
WaitForSyncFlagAndClear 0x00000080
SetAnimation 0x0004
MessageFromTargetPos 0x1056, 0x000e
MessageFromTargetPos TEXT_PROLOGUE, 0x56, 0x000e
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
SetSyncFlag 0x00000100
WaitForSyncFlagAndClear 0x00000080
SetAnimation 0x0004
MessageFromTargetPos 0x1057, 0x000e
MessageFromTargetPos TEXT_PROLOGUE, 0x57, 0x000e
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
SetSyncFlag 0x00000100
WaitForSyncFlagAndClear 0x00000080
SetAnimation 0x0004
MessageFromTargetPos 0x1058, 0x000e
MessageFromTargetPos TEXT_PROLOGUE, 0x58, 0x000e
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
SetSyncFlag 0x00000100
WaitForSyncFlagAndClear 0x00000080
SetAnimation 0x0004
MessageFromTargetPos 0x105c, 0x000e
MessageFromTargetPos TEXT_PROLOGUE, 0x5c, 0x000e
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
SetSyncFlag 0x00000100
@@ -29,7 +29,7 @@ script_08008E12:
WaitForSyncFlagAndClear 0x00000100
SetSyncFlag 0x00000004
WaitForSyncFlagAndClear 0x00000008
MessageFromTargetPos 0x1053, 0x000e
MessageFromTargetPos TEXT_PROLOGUE, 0x53, 0x000e
WaitUntilTextboxCloses
SetSyncFlag 0x00000080
WaitForSyncFlagAndClear 0x00000100
@@ -45,7 +45,7 @@ script_08008E12:
WaitForSyncFlagAndClear 0x00000020
SetSyncFlag 0x00000001
WaitForSyncFlagAndClear 0x00000002
GivePlayerItem 0x0035
GivePlayerItem ITEM_QST_BROKEN_SWORD
WaitPlayerGetItem
StartPlayerScript script_PlayerGetSword
WaitForSyncFlagAndClear 0x00000020
@@ -59,7 +59,7 @@ script_08008E12:
_0807E8E4_1
SetSyncFlag 0x00000001
WaitForSyncFlagAndClear 0x00000002
GivePlayerItem 0x0047
GivePlayerItem ITEM_MAP
WaitPlayerGetItem
SetIntVariable 0x00000003
Call LoadMenu
@@ -68,7 +68,7 @@ script_08008E12:
WaitForSyncFlagAndClear 0x00000100
_0807F0B4 0x0004
CameraTargetPlayer
SetGlobalFlag 0x0015
SetGlobalFlag TABIDACHI
Call sub_0806DCC0
Call sub_0807DF50
EnablePlayerControl
@@ -5,7 +5,7 @@ SCRIPT_START script_PlayerGetSword
PlaySound SFX_ITEM_GET
CallWithArg SetPlayerAnimation2, 0x0000045f
Call WaitForPlayerAnim
MessageFromTargetPos 0x0501, 0x000e
MessageFromTargetPos TEXT_ITEM_GET, 0x01, 0x000e
WaitUntilTextboxCloses
SetSyncFlag 0x00000020
Call SetPlayerActionNormal
@@ -3,19 +3,7 @@ SCRIPT_START script_PlayerWakingUpInHyruleCastle
BeginBlock
Call sub_0807DF28
SetPlayerIdle
.ifdef JP
SetLocalFlag 0x009e
.else
.ifdef EU
SetLocalFlag 0x009e
.else
.ifdef DEMO_JP
SetLocalFlag 0x009e @ TODO deduplicate
.else
SetLocalFlag 0x009f
.endif
.endif
.endif
SetLocalFlag CASTLE_04_MEZAME
EndBlock
Wait 0x003c
SetFadeTime 0x0004
@@ -8,7 +8,7 @@ SCRIPT_START script_SmithAtAssembly
WaitForSyncFlagAndClear 0x00000001
FacePlayer
DoPostScriptAction 0x0001
MessageFromTargetPos 0x105b, 0x0000
MessageFromTargetPos TEXT_PROLOGUE, 0x5b, 0x0000
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
SetSyncFlag 0x00000002
@@ -20,7 +20,7 @@ SCRIPT_START script_SmithAtAssembly
DoPostScriptAction 0x0005
Wait 0x003c
DoPostScriptAction 0x0001
MessageFromTargetPos 0x1051, 0x0000
MessageFromTargetPos TEXT_PROLOGUE, 0x51, 0x0000
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
SetSyncFlag 0x00000002
@@ -30,7 +30,7 @@ SCRIPT_START script_SmithAtAssembly
FacePlayer
FaceAwayFromPlayer
DoPostScriptAction 0x0001
MessageFromTargetPos 0x1055, 0x0000
MessageFromTargetPos TEXT_PROLOGUE, 0x55, 0x0000
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
SetSyncFlag 0x00000002
@@ -44,7 +44,7 @@ SCRIPT_START script_SmithAtAssembly
FacePlayer
DoPostScriptAction 0x0000
DoPostScriptAction 0x0001
MessageFromTargetPos 0x1059, 0x0000
MessageFromTargetPos TEXT_PROLOGUE, 0x59, 0x0000
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
SetSyncFlag 0x00000002