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
@@ -1,41 +1,17 @@
@ Intro Hyrule Town OBJECT_69 ?
SCRIPT_START script_Object69IntroTown
.ifdef JP
CheckLocalFlag 0x00ca
.else
.ifdef EU
CheckLocalFlag 0x00ca
.else
.ifdef DEMO_JP
CheckLocalFlag 0x00ca @ TODO deduplicate
.else
CheckLocalFlag 0x00cd
.endif
.endif
.endif
CheckLocalFlag MACHI_01_DEMO
JumpIf script_0800FD50
WaitForSyncFlagAndClear 0x00000010
script_0800FD1A:
@ Prevent Link from leaving
CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040
JumpIfNot script_0800FD1A
.ifdef JP
CheckLocalFlag 0x00ca
.else
.ifdef EU
CheckLocalFlag 0x00ca
.else
.ifdef DEMO_JP
CheckLocalFlag 0x00ca @ TODO deduplicate
.else
CheckLocalFlag 0x00cd
.endif
.endif
.endif
CheckLocalFlag MACHI_01_DEMO
JumpIf script_0800FD5C
SetPlayerIdle
Call WaitForPlayerNormal
MessageFromTargetPos 0x2506, 0x0000
MessageFromTargetPos TEXT_FESTIVAL, 0x06, 0x0000
WaitUntilTextboxCloses
StartPlayerScript script_PlayerIntroTown
WaitForSyncFlagAndClear 0x00000008
@@ -47,7 +23,7 @@ script_0800FD50:
script_0800FD5C:
SetPlayerIdle
Call WaitForPlayerNormal
MessageFromTargetPos 0x106c, 0x0000
MessageFromTargetPos TEXT_PROLOGUE, 0x6c, 0x0000
WaitUntilTextboxCloses
StartPlayerScript script_PlayerIntroTown
WaitForSyncFlagAndClear 0x00000008