mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-10 04:11:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use enums across more scripts and files

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/cutscene/intro/script_Object69Intro.inc
+1 -1
View File
@@ -9,7 +9,7 @@ SCRIPT_START script_Object69Intro
Wait 0x0078
SetSyncFlag 0x00000004
WaitForSyncFlagAndClear 0x00000001
SetGlobalFlag 0x001c
SetGlobalFlag ZELDA_CHASE
Call sub_0807DF50
EnablePlayerControl
Call PlayerSetNormalAndCollide
data/scripts/cutscene/intro/script_PlayerIntro.inc
+1 -1
View File
@@ -8,7 +8,7 @@ SCRIPT_START script_PlayerIntro
WaitForFadeFinish
Wait 0x001e
@ Wake up message
MessageFromTarget 0x1005
MessageFromTarget TEXT_PROLOGUE, 0x05
WaitUntilTextboxCloses
Wait 0x003c
Call sub_0807529C
data/scripts/cutscene/intro/script_SmithIntro.inc
+2 -2
View File
@@ -17,7 +17,7 @@ SCRIPT_START script_SmithIntro
Wait 0x001e
SetAnimation 0x000b
Wait 0x001e
MessageFromTarget 0x1002
MessageFromTarget TEXT_PROLOGUE, 0x02
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
SetSyncFlag 0x00000004
@@ -27,7 +27,7 @@ SCRIPT_START script_SmithIntro
_0807EDD4 0x00b8, 0x005c
SetAnimationState 0x0006
DoPostScriptAction 0x0001
MessageFromTarget 0x1004
MessageFromTarget TEXT_PROLOGUE, 0x04
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
Wait 0x001e
data/scripts/cutscene/intro/script_SmithIntro2.inc
+6 -6
View File
@@ -6,7 +6,7 @@ SCRIPT_START script_SmithIntro2
_0807E9D4
Call SetPriorityMessage
EndBlock
CheckGlobalFlag 0x0013
CheckGlobalFlag START
JumpIf script_08009C4C
DisablePlayerControl
Wait 0x000a
@@ -19,7 +19,7 @@ SCRIPT_START script_SmithIntro2
DoPostScriptAction 0x0000
Wait 0x000f
DoPostScriptAction 0x0001
MessageFromTargetPos 0x1009, 0x0000
MessageFromTargetPos TEXT_PROLOGUE, 0x09, 0x0000
_0807E8E4_1
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
@@ -27,7 +27,7 @@ SCRIPT_START script_SmithIntro2
WaitForSyncFlagAndClear 0x00000008
FaceAwayFromPlayer
DoPostScriptAction 0x0001
MessageFromTargetPos 0x100b, 0x0000
MessageFromTargetPos TEXT_PROLOGUE, 0x0b, 0x0000
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
SetSyncFlag 0x00000002
@@ -43,11 +43,11 @@ SCRIPT_START script_SmithIntro2
WaitForSyncFlagAndClear 0x00000008
Call sub_08053250
@ Give player rusty sword
GivePlayerItem 0x0034
GivePlayerItem ITEM_QST_SWORD
WaitPlayerGetItem
_0807E8E4_1
DoPostScriptAction 0x0001
MessageFromTargetPos 0x100c, 0x0000
MessageFromTargetPos TEXT_PROLOGUE, 0x0c, 0x0000
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
SetSyncFlag 0x00000004
@@ -59,7 +59,7 @@ script_08009C50:
JumpIfNot script_08009C50
SetPlayerIdle
FacePlayer
MessageNoOverlap 0x100e
MessageNoOverlap TEXT_PROLOGUE, 0x0e
EnablePlayerControl
Jump script_08009C50
SCRIPT_END
data/scripts/cutscene/intro/script_ZeldaIntro.inc
+2 -2
View File
@@ -10,13 +10,13 @@ SCRIPT_START script_ZeldaIntro
DoPostScriptAction 0x0007
_0807EDD4 0x0068, 0x0060
Wait 0x000f
MessageFromTarget 0x1001
MessageFromTarget TEXT_PROLOGUE, 0x01
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
SetSyncFlag 0x00000008
WaitForSyncFlagAndClear 0x00000004
DoPostScriptAction 0x0001
MessageFromTarget 0x1003
MessageFromTarget TEXT_PROLOGUE, 0x03
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
SetSyncFlag 0x00000008
data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc
+5 -17
View File
@@ -12,7 +12,7 @@ SCRIPT_START script_ZeldaOutsideLinksHouse
WaitForSyncFlagAndClear 0x00000001
Call sub_08066E08
SetPlayerIdle
MessageFromTargetPos 0x1010, 0x000c
MessageFromTargetPos TEXT_PROLOGUE, 0x10, 0x000c
WaitUntilTextboxCloses
SetSyncFlag 0x00000002
script_08014D1E:
@@ -25,7 +25,7 @@ script_08014D1E:
SetPlayerIdle
Call WaitForPlayerNormal
Call sub_0807DF28
MessageNoOverlap 0x1012
MessageNoOverlap TEXT_PROLOGUE, 0x12
WaitUntilTextboxCloses
WalkNorth 0x0040
SetAnimationState 0x0004
@@ -39,7 +39,7 @@ script_08014D60:
JumpIf script_08014D60
SetPlayerIdle
Call sub_0807DF28
MessageNoOverlap 0x1013
MessageNoOverlap TEXT_PROLOGUE, 0x13
WaitUntilTextboxCloses
WalkNorth 0x0040
SetAnimationState 0x0004
@@ -54,22 +54,10 @@ script_08014D96:
SetPlayerIdle
Call WaitForPlayerNormal
Call sub_0807DF28
MessageNoOverlap 0x1014
MessageNoOverlap TEXT_PROLOGUE, 0x14
WaitUntilTextboxCloses
WalkNorth 0x0018
.ifdef JP
SetLocalFlag 0x006b
.else
.ifdef EU
SetLocalFlag 0x006b
.else
.ifdef DEMO_JP
SetLocalFlag 0x006b @ TODO deduplicate
.else
SetLocalFlag 0x006d
.endif
.endif
.endif
SetLocalFlag SOUGEN_01_ZELDA
Call sub_0807DF50
EnablePlayerControl
DoPostScriptAction 0x0006
data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc
+3 -3
View File
@@ -14,7 +14,7 @@ SCRIPT_START script_ZeldaTalkToSmith
FacePlayer
FaceAwayFromPlayer
DoPostScriptAction 0x0001
MessageFromTargetPos 0x100a, 0x0000
MessageFromTargetPos TEXT_PROLOGUE, 0x0a, 0x0000
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
SetSyncFlag 0x00000008
@@ -23,7 +23,7 @@ SCRIPT_START script_ZeldaTalkToSmith
DoPostScriptAction 0x0001
FaceAwayFromPlayer
SetAnimationState 0x0002
MessageFromTargetPos 0x100d, 0x0000
MessageFromTargetPos TEXT_PROLOGUE, 0x0d, 0x0000
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
@ Leave room
@@ -32,7 +32,7 @@ SCRIPT_START script_ZeldaTalkToSmith
Call sub_080536A8
Wait 0x001e
BeginBlock
SetGlobalFlag 0x0013
SetGlobalFlag START
Call sub_0807DF50
Call ResetPlayerAnimationAndAction
EnablePlayerControl