mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-19 13:54:04 -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/veilFalls/script_BigGoron3.inc
+2 -2
View File
@@ -11,9 +11,9 @@ script_0800934E:
Call sub_0806D638
_0807F0B4 0x0001
CameraTargetEntity
CheckGlobalFlag 0x0055
CheckGlobalFlag GAMECLEAR
JumpIf script_BigGoronTalk
MessageNoOverlap 0x1d01
MessageNoOverlap TEXT_GORONS, 0x01
WaitUntilTextboxCloses
script_08009376:
WaitUntilTextboxCloses
data/scripts/veilFalls/script_BigGoronMirrorShield.inc
+2 -14
View File
@@ -6,24 +6,12 @@ SCRIPT_START script_BigGoronMirrorShield
Wait 0x003c
Call sub_0806D70C
Wait 0x003c
.ifdef JP
ClearLocalFlag 0x00ac
.else
.ifdef EU
ClearLocalFlag 0x00ac
.else
.ifdef DEMO_JP
ClearLocalFlag 0x00ac @ TODO deduplicate
.else
ClearLocalFlag 0x00ae
.endif
.endif
.endif
ClearLocalFlag DAIGORON_EXCHG
Call sub_0806D620
Wait 0x003c
WaitPlayerGetItem
FaceAwayFromPlayer
MessageNoOverlap 0x1d0c
MessageNoOverlap TEXT_GORONS, 0x0c
WaitUntilTextboxCloses
Wait 0x000a
Jump script_08009376
data/scripts/veilFalls/script_BigGoronTalk.inc
+13 -52
View File
@@ -1,49 +1,25 @@
@ Veil Falls Talk to BigGoron
SCRIPT_START script_BigGoronTalk
.ifdef JP
CheckLocalFlag 0x00ac
.else
.ifdef EU
CheckLocalFlag 0x00ac
.else
.ifdef DEMO_JP @ TODO deduplicate
CheckLocalFlag 0x00ac
.else
CheckLocalFlag 0x00ae
.endif
.endif
.endif
CheckLocalFlag DAIGORON_EXCHG
JumpIf script_0800943E
CheckInventory1 0x000d
CheckInventory1 ITEM_SHIELD
JumpIf script_080093BC
CheckInventory1 0x000e
CheckInventory1 ITEM_MIRROR_SHIELD
JumpIf script_080093BC
MessageNoOverlap 0x1d02
MessageNoOverlap TEXT_GORONS, 0x02
WaitUntilTextboxCloses
Jump script_08009376
script_080093BC:
CheckInventory1 0x000e
CheckInventory1 ITEM_MIRROR_SHIELD
JumpIfNot script_080093DA
Call sub_0806D788
MessageNoOverlap 0x1d03
MessageNoOverlap TEXT_GORONS, 0x03
WaitUntilTextboxCloses
Call sub_0806D70C
Jump script_08009376
script_080093DA:
SetIntVariable 0x00001d05
.ifdef JP
CheckLocalFlag 0x00ab
.else
.ifdef EU
CheckLocalFlag 0x00ab
.else
.ifdef DEMO_JP
CheckLocalFlag 0x00ab @ TODO deduplicate
.else
CheckLocalFlag 0x00ad
.endif
.endif
.endif
CheckLocalFlag DAIGORON_SHIELD
JumpIf script_080093EE
SetIntVariable 0x00001d04
script_080093EE:
@@ -52,7 +28,7 @@ script_080093EE:
CheckTextboxResult
JumpIfNot script_08009376
Wait 0x001e
MessageNoOverlap 0x1d08
MessageNoOverlap TEXT_GORONS, 0x08
WaitUntilTextboxCloses
LoadRoomEntityList gUnk_080F9C38
Wait 0x0078
@@ -60,37 +36,22 @@ script_080093EE:
Wait 0x00b4
Call sub_0806D70C
Wait 0x0078
.ifdef JP
SetLocalFlag 0x00ac
SetLocalFlag 0x00ab
.else
.ifdef EU
SetLocalFlag 0x00ac
SetLocalFlag 0x00ab
.else
.ifdef DEMO_JP
SetLocalFlag 0x00ac @ TODO deduplicate
SetLocalFlag 0x00ab
.else
SetLocalFlag 0x00ae
SetLocalFlag 0x00ad
.endif
.endif
.endif
SetLocalFlag DAIGORON_EXCHG
SetLocalFlag DAIGORON_SHIELD
Call sub_0806D5D4
FaceAwayFromPlayer
MessageNoOverlap 0x1d09
MessageNoOverlap TEXT_GORONS, 0x09
WaitUntilTextboxCloses
Wait 0x000a
Jump script_08009376
script_0800943E:
Call sub_0806D600
JumpIf script_08009452
MessageNoOverlap 0x1d0a
MessageNoOverlap TEXT_GORONS, 0x0a
WaitUntilTextboxCloses
JumpIfNot script_08009376
script_08009452:
MessageNoOverlap 0x1d0b
MessageNoOverlap TEXT_GORONS, 0x0b
WaitUntilTextboxCloses
Call sub_0806D74C
_0807F0C8 0xffff, 0x0000
data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc
+2 -2
View File
@@ -2,7 +2,7 @@
SCRIPT_START script_NPC4ESourceOfTheFlow
BeginBlock
Call sub_0806DB84
CheckKinstoneFused 0x0009
CheckKinstoneFused KINSTONE_9
JumpIf script_08016028
_0807EA88 0x0009
CallWithArg sub_0806DA04, 0x00000007
@@ -12,7 +12,7 @@ script_08015FE4:
_0807EA4C
_0807E9F0
SetPlayerIdle
CheckKinstoneFused 0x0009
CheckKinstoneFused KINSTONE_9
JumpIf script_08015FFE
Call sub_0807DF50
EnablePlayerControl
data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc
+1 -1
View File
@@ -4,7 +4,7 @@ SCRIPT_START script_NPC4ESouurceOfTheFlowOpening
WaitForSyncFlagAndClear 0x0000000c
_0807F0C8 0x0000, 0x0000
PlaySound SFX_SECRET
EzloMessage 0x0b1f
EzloMessage TEXT_EZLO, 0x1f
WaitUntilTextboxCloses
Call sub_0807DF50
EnablePlayerControl
data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc
+1 -1
View File
@@ -1,7 +1,7 @@
@ Waterfalls OBJECT_3E during kinstone cutscene?
SCRIPT_START script_Object3ELeftStoneOpening
BeginBlock
CheckKinstoneFused 0x0009
CheckKinstoneFused KINSTONE_9
JumpIf script_Object3ELeftStone
EndBlock
WaitForSyncFlagAndClear 0x00000001
data/scripts/veilFalls/script_Object3ERightStoneOpening.inc
+1 -1
View File
@@ -1,7 +1,7 @@
@ Waterfalls OBJECT_3E during kinstone cutscene?
SCRIPT_START script_Object3ERightStoneOpening
BeginBlock
CheckKinstoneFused 0x0009
CheckKinstoneFused KINSTONE_9
JumpIf script_Object3ERightStone
EndBlock
WaitForSyncFlagAndClear 0x00000002