mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-01 17:58:06 -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/cloudTops/script_EzloTalkPoW.inc
+2 -2
View File
@@ -2,9 +2,9 @@
SCRIPT_START script_EzloTalkPoW
SetPlayerIdle
Call sub_0807DF28
EzloMessage 0x1c05
EzloMessage TEXT_EZLO_ELEMENTS_DONE, 0x05
WaitUntilTextboxCloses
SetLocalFlagByBank 0x0100, 0x0005
SetLocalFlagByBank FLAG_BANK_1, 0x0005
Call sub_0807DF50
EnablePlayerControl
DoPostScriptAction 0x0006
data/scripts/cloudTops/script_GregalHealthy.inc
+3 -3
View File
@@ -20,13 +20,13 @@ script_08014C56:
CheckLocalFlag 0x0066
JumpIf script_08014C7C
SetLocalFlag 0x0066
MessageNoOverlap 0x2f0d
MessageNoOverlap TEXT_WIND_TRIBE, 0x0d
WaitUntilTextboxCloses
GivePlayerItem 0x000a
GivePlayerItem ITEM_LIGHT_ARROW
WaitPlayerGetItem
Jump script_08014C82
script_08014C7C:
MessageNoOverlap 0x2f09
MessageNoOverlap TEXT_WIND_TRIBE, 0x09
WaitUntilTextboxCloses
script_08014C82:
Wait 0x000f
data/scripts/cloudTops/script_GregalSick.inc
+5 -5
View File
@@ -16,7 +16,7 @@ script_08014B48:
EndBlock
SetPlayerIdle
FacePlayer
MessageNoOverlap 0x2f01
MessageNoOverlap TEXT_WIND_TRIBE, 0x01
WaitUntilTextboxCloses
Wait 0x000f
EnablePlayerControl
@@ -57,14 +57,14 @@ script_08014BF2:
CheckLocalFlag 0x0065
JumpIf script_08014C1C
SetLocalFlag 0x0065
MessageNoOverlap 0x2f07
MessageNoOverlap TEXT_WIND_TRIBE, 0x07
WaitUntilTextboxCloses
SetIntVariable 0x00000064
GivePlayerItem 0x003f
SetIntVariable 100
GivePlayerItem ITEM_SHELLS
WaitPlayerGetItem
Jump script_08014C22
script_08014C1C:
MessageNoOverlap 0x2f08
MessageNoOverlap TEXT_WIND_TRIBE, 0x08
WaitUntilTextboxCloses
script_08014C22:
Wait 0x000f
data/scripts/cloudTops/script_HiddenWhirlwind1.inc
+2 -26
View File
@@ -1,36 +1,12 @@
@ Cloud Tops Whirlwind hidden in clouds
SCRIPT_START script_HiddenWhirlwind1
BeginBlock
.ifdef JP
CheckLocalFlag 0x00f0
.else
.ifdef EU
CheckLocalFlag 0x00f0
.else
.ifdef DEMO_JP
CheckLocalFlag 0x00f0 @ TODO deduplicate
.else
CheckLocalFlag 0x00f3
.endif
.endif
.endif
CheckLocalFlag KUMOUE_02_00
JumpIf script_0800D6E8
DoPostScriptAction 0x0008
EndBlock
script_0800D6E0:
.ifdef JP
CheckLocalFlag 0x00f0
.else
.ifdef EU
CheckLocalFlag 0x00f0
.else
.ifdef DEMO_JP
CheckLocalFlag 0x00f0 @ TODO deduplicate
.else
CheckLocalFlag 0x00f3
.endif
.endif
.endif
CheckLocalFlag KUMOUE_02_00
JumpIfNot script_0800D6E0
script_0800D6E8:
DoPostScriptAction 0x0007
data/scripts/cloudTops/script_HiddenWhirlwind2.inc
+2 -26
View File
@@ -1,36 +1,12 @@
@ Cloud Tops Whirlwind hidden in clouds
SCRIPT_START script_HiddenWhirlwind2
BeginBlock
.ifdef JP
CheckLocalFlag 0x00f2
.else
.ifdef EU
CheckLocalFlag 0x00f2
.else
.ifdef DEMO_JP
CheckLocalFlag 0x00f2 @ TODO deduplicate
.else
CheckLocalFlag 0x00f5
.endif
.endif
.endif
CheckLocalFlag KUMOUE_02_02
JumpIf script_0800D6E8
DoPostScriptAction 0x0008
EndBlock
script_0800D700:
.ifdef JP
CheckLocalFlag 0x00f2
.else
.ifdef EU
CheckLocalFlag 0x00f2
.else
.ifdef DEMO_JP
CheckLocalFlag 0x00f2 @ TODO deduplicate
.else
CheckLocalFlag 0x00f5
.endif
.endif
.endif
CheckLocalFlag KUMOUE_02_02
JumpIfNot script_0800D700
DoPostScriptAction 0x0007
SCRIPT_END
data/scripts/cloudTops/script_Siroc.inc
+2 -2
View File
@@ -15,10 +15,10 @@ script_08014AD2:
CheckLocalFlag 0x0064
JumpIf script_08014AFE
SetLocalFlag 0x0064
MessageNoOverlap 0x2f0b
MessageNoOverlap TEXT_WIND_TRIBE, 0x0b
Jump script_08014B02
script_08014AFE:
MessageNoOverlap 0x2f0c
MessageNoOverlap TEXT_WIND_TRIBE, 0x0c
script_08014B02:
WaitUntilTextboxCloses
Wait 0x000f
data/scripts/cloudTops/script_WindTribespeople1.inc
+1 -1
View File
@@ -3,7 +3,7 @@ SCRIPT_START script_WindTribespeople1
BeginBlock
Call sub_0806C870
DoPostScriptAction 0x000a
CheckGlobalFlag 0x0058
CheckGlobalFlag WARP_EVENT_END
JumpIf script_08014976
SetAnimationState 0x0004
SetEntityPositionRelative 0x0078, 0x0128
data/scripts/cloudTops/script_WindTribespeople2.inc
+1 -1
View File
@@ -3,7 +3,7 @@ SCRIPT_START script_WindTribespeople2
BeginBlock
Call sub_0806C870
DoPostScriptAction 0x000a
CheckGlobalFlag 0x0058
CheckGlobalFlag WARP_EVENT_END
JumpIfNot script_080149C6
EndBlock
script_080149AA:
data/scripts/cloudTops/script_WindTribespeople6.inc
+2 -2
View File
@@ -8,7 +8,7 @@ SCRIPT_START script_WindTribespeople6
DoPostScriptAction 0x0004
SetSyncFlag 0x00000002
WaitForSyncFlagAndClear 0x00000001
MessageNoOverlap 0x2f0a
MessageNoOverlap TEXT_WIND_TRIBE, 0x0a
WaitUntilTextboxCloses
SetSyncFlag 0x00000002
script_08014AAC:
@@ -16,7 +16,7 @@ script_08014AAC:
JumpIfNot script_08014AAC
SetPlayerIdle
FacePlayer
MessageNoOverlap 0x2f0a
MessageNoOverlap TEXT_WIND_TRIBE, 0x0a
WaitUntilTextboxCloses
EnablePlayerControl
Jump script_08014AAC
data/scripts/cloudTops/script_WindTribespeople7.inc
+2 -2
View File
@@ -1,7 +1,7 @@
@ Cloud Tops Windtribespeople
SCRIPT_START script_WindTribespeople7
BeginBlock
CheckGlobalFlag 0x0024
CheckGlobalFlag KUMOTATSUMAKI
JumpIf script_08014CD4
Call sub_0806C870
DoPostScriptAction 0x000a
@@ -10,7 +10,7 @@ SCRIPT_START script_WindTribespeople7
script_08014CAE:
EndBlock
BeginBlock
CheckGlobalFlag 0x0024
CheckGlobalFlag KUMOTATSUMAKI
JumpIf script_08014CD4
FacePlayerAndCheckDist
JumpIfNot script_08014CAE
data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc
+1 -1
View File
@@ -18,7 +18,7 @@ script_0800D80C:
SetEntityVelocity 0x00040000
PlaySound SFX_F5
script_0800D82A:
CallWithArg DoGravity, 0xffffe000
CallWithArg DoGravity, -0x2000
Call CheckEntityOnScreen
JumpIf script_0800D82A
SetSyncFlag 0x00000004