mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-08 14:36:41 -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/dhc/script_GuardCellLeft.inc
+1 -1
View File
@@ -12,7 +12,7 @@ script_0800E44C:
SetPlayerIdle
FacePlayer
CallWithArg sub_0807F3D8, 0x00000000
MessageNoOverlap 0x2405
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x05
WaitUntilTextboxCloses
EnablePlayerControl
Jump script_0800E44C
data/scripts/dhc/script_GuardCellRight.inc
+1 -1
View File
@@ -12,7 +12,7 @@ script_0800E484:
SetPlayerIdle
FacePlayer
CallWithArg sub_0807F3D8, 0x00000000
MessageNoOverlap 0x2407
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x07
WaitUntilTextboxCloses
EnablePlayerControl
Jump script_0800E484
data/scripts/dhc/script_GuardStone1.inc
+2 -2
View File
@@ -29,7 +29,7 @@ script_0800E176:
FacePlayer
CallWithArg sub_0807F3D8, 0x00000000
Wait 0x000a
MessageNoOverlap 0x2401
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x01
WaitUntilTextboxCloses
SetLocalFlag 0x0094
script_0800E1D0:
@@ -43,7 +43,7 @@ script_0800E1E0:
SetPlayerIdle
FacePlayer
CallWithArg sub_0807F3D8, 0x00000000
MessageNoOverlap 0x2401
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x01
WaitUntilTextboxCloses
EnablePlayerControl
Jump script_0800E1E0
data/scripts/dhc/script_GuardStone2.inc
+2 -2
View File
@@ -74,7 +74,7 @@ script_0800E312:
FacePlayer
CallWithArg sub_0807F3D8, 0x00000000
EndBlock
MessageNoOverlap 0x2404
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x04
WaitUntilTextboxCloses
EnablePlayerControl
Jump script_0800E2AE
@@ -84,7 +84,7 @@ script_0800E32E:
SetPlayerIdle
FacePlayer
CallWithArg sub_0807F3D8, 0x00000000
MessageNoOverlap 0x2403
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x03
WaitUntilTextboxCloses
EnablePlayerControl
Jump script_0800E32E
data/scripts/dhc/script_KingDaltusStone.inc
+2 -2
View File
@@ -39,7 +39,7 @@ script_0800E3C8:
JumpIfNot script_0800E3C8
SetPlayerIdle
FacePlayer
MessageNoOverlap 0x240c
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x0c
WaitUntilTextboxCloses
Wait 0x000f
GivePlayerItem 0x0053
@@ -55,7 +55,7 @@ script_0800E3EE:
JumpIfNot script_0800E3EE
SetPlayerIdle
FacePlayer
MessageNoOverlap 0x240d
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x0d
WaitUntilTextboxCloses
Wait 0x000f
EnablePlayerControl
data/scripts/dhc/script_MinishterPothoStone.inc
+2 -2
View File
@@ -28,7 +28,7 @@ script_0800E0DE:
FaceAwayFromPlayer
FacePlayer
Wait 0x000a
MessageNoOverlap 0x2402
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x02
WaitUntilTextboxCloses
SetLocalFlag 0x0093
script_0800E12E:
@@ -40,7 +40,7 @@ script_0800E138:
JumpIfNot script_0800E138
SetPlayerIdle
FacePlayer
MessageNoOverlap 0x2402
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x02
WaitUntilTextboxCloses
Wait 0x000f
EnablePlayerControl
data/scripts/dhc/script_MinisterPothoCell.inc
+1 -1
View File
@@ -10,7 +10,7 @@ script_0800E41A:
JumpIfNot script_0800E41A
SetPlayerIdle
FacePlayer
MessageNoOverlap 0x2406
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x06
WaitUntilTextboxCloses
Wait 0x000f
EnablePlayerControl
data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc
+3 -3
View File
@@ -12,7 +12,7 @@ script_0800DB7C:
SetEntityPositionRelative 0x0078, 0x0078
CameraTargetEntity
Call WaitForCameraTouchRoomBorder
EzloMessage 0x1648
EzloMessage TEXT_VAATI2, 0x48
WaitUntilTextboxCloses
Call sub_0804D7EC
SetSyncFlag 0x00000001
@@ -35,9 +35,9 @@ script_0800DBCA:
SetSyncFlag 0x00000001
StartPlayerScript script_PlayerAfterDefeatingV2
WaitForSyncFlagAndClear 0x00000006
MessageFromTargetPos 0x1643, 0x0002
MessageFromTargetPos TEXT_VAATI2, 0x43, 0x0002
WaitUntilTextboxCloses
EzloMessage 0x1645
EzloMessage TEXT_VAATI2, 0x45
WaitUntilTextboxCloses
Call CreatePlayerExclamationMark
SetSyncFlag 0x00000001
data/scripts/dhc/script_Npc4ECastleCollapsing.inc
+1 -1
View File
@@ -4,7 +4,7 @@ SCRIPT_START script_Npc4ECastleCollapsing
PlayBgm BGM_CASTLE_COLLAPSE
StartPlayerScript script_PlayerStonesFall
WaitForSyncFlagAndClear 0x00000006
EzloMessage 0x1646
EzloMessage TEXT_VAATI2, 0x46
WaitUntilTextboxCloses
SetSyncFlag 0x00000001
StartPlayerScript script_PlayerCastleCollapsing
data/scripts/dhc/script_Npc4EV3Defeated.inc
+1 -1
View File
@@ -2,7 +2,7 @@
SCRIPT_START script_Npc4EV3Defeated
EndBlock
script_0800A0FE:
CheckGlobalFlag 0x0051
CheckGlobalFlag ENDING
JumpIfNot script_0800A0FE
BeginBlock
SetPlayerIdle
data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc
+3 -3
View File
@@ -30,13 +30,13 @@ script_0800E4B6:
EndBlock
Call CreatePlayerExclamationMark
Wait 0x003c
MessageFromTarget 0x160c
MessageFromTarget TEXT_VAATI2, 0x0c
WaitUntilTextboxCloses
Wait 0x001e
MessageFromTarget 0x160d
MessageFromTarget TEXT_VAATI2, 0x0d
WaitUntilTextboxCloses
Wait 0x001e
EzloMessage 0x160e
EzloMessage TEXT_VAATI2, 0x0e
Wait 0x003c
WaitUntilTextboxCloses
BeginBlock
data/scripts/dhc/script_Object69CastleEscape.inc
+1 -1
View File
@@ -6,7 +6,7 @@ SCRIPT_START script_Object69CastleEscape
StartPlayerScript script_PlayerCastleEscape
WaitForSyncFlagAndClear 0x00000001
WaitForSyncFlagAndClear 0x00000002
EzloMessage 0x1647
EzloMessage TEXT_VAATI2, 0x47
WaitUntilTextboxCloses
SetLocalFlag 0x007a
Call sub_0807DF50
data/scripts/dhc/script_Object69DarkNutsRoom.inc
+1 -1
View File
@@ -13,7 +13,7 @@ script_0800E550:
Wait 0x003c
PlaySound SFX_105
Wait 0x001e
EzloMessage 0x1622
EzloMessage TEXT_VAATI2, 0x22
Call StartDarkNutTimer
SetLocalFlag 0x007e
script_0800E582:
data/scripts/dhc/script_Object69KeatonsRoom.inc
+1 -1
View File
@@ -13,7 +13,7 @@ script_0800E510:
Wait 0x003c
PlaySound SFX_105
Wait 0x001e
EzloMessage 0x1617
EzloMessage TEXT_VAATI2, 0x17
SetLocalFlag 0x007d
script_0800E53C:
EnablePlayerControl
data/scripts/dhc/script_Object69V2Defeated.inc
+1 -1
View File
@@ -7,7 +7,7 @@ SCRIPT_START script_Object69V2Defeated
StopBgm
StopBgm
Wait 0x0078
EzloMessage 0x1638
EzloMessage TEXT_VAATI2, 0x38
WaitUntilTextboxCloses
SetRoomFlag 0x0000
Wait 0x001e
data/scripts/dhc/script_Object69V2Intro.inc
+2 -2
View File
@@ -5,7 +5,7 @@ SCRIPT_START script_Object69V2Intro
SetPlayerIdle
EndBlock
StopBgm
MessageFromTargetPos 0x1632, 0x0002
MessageFromTargetPos TEXT_VAATI2, 0x32, 0x0002
WaitUntilTextboxCloses
SetRoomFlag 0x0003
script_0800DFFE:
@@ -21,7 +21,7 @@ script_0800E012:
SetPlayerIdle
Call sub_0807DF28
SetLocalFlag 0x007b
MessageFromTargetPos 0x1639, 0x000c
MessageFromTargetPos TEXT_VAATI2, 0x39, 0x000c
WaitUntilTextboxCloses
Wait 0x0096
PlaySound SFX_EVAPORATE
data/scripts/dhc/script_Object69VaatiWithZelda.inc
+2 -2
View File
@@ -17,11 +17,11 @@ script_0800DA64:
Call WaitForCameraTouchRoomBorder
SetSyncFlag 0x00000001
WaitForSyncFlagAndClear 0x00000002
MessageFromTargetPos 0x162d, 0x0002
MessageFromTargetPos TEXT_VAATI2, 0x2d, 0x0002
WaitUntilTextboxCloses
SetSyncFlag 0x00000001
Wait 0x001e
MessageFromTargetPos 0x162e, 0x0002
MessageFromTargetPos TEXT_VAATI2, 0x2e, 0x0002
WaitUntilTextboxCloses
_0807E8E4_0
CallWithArg SetPlayerPos, 0x00780138
data/scripts/dhc/script_Vaati1Intro.inc
+1 -1
View File
@@ -20,7 +20,7 @@ SCRIPT_START script_Vaati1Intro
Call sub_08066C94
Wait 0x00e9
DoPostScriptAction 0x0007
MessageFromTargetPos 0x162f, 0x0002
MessageFromTargetPos TEXT_VAATI2, 0x2f, 0x0002
WaitUntilTextboxCloses
PlayBgm BGM_VAATI_REBORN
DoPostScriptAction 0x0019
data/scripts/dhc/script_ZeldaStoneDHC.inc
+1 -1
View File
@@ -10,7 +10,7 @@ SCRIPT_START script_ZeldaStoneDHC
Wait 0x003c
PlaySound SFX_9B
Wait 0x001e
MessageNoOverlap 0x1625
MessageNoOverlap TEXT_VAATI2, 0x25
WaitUntilTextboxCloses
Wait 0x003c
Call sub_08053C84