mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-16 23:00:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

More enum use in scripts

Browse Source
This commit is contained in:
Tal Hayon
2022-05-15 21:20:25 +03:00
parent 33e8152e60
commit aceb014a82
29 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/castorWilds/script_GreatFairyRupees.inc
+1 -1
View File
@@ -3,7 +3,7 @@ SCRIPT_START script_GreatFairyRupees
BeginBlock
EndBlock
script_0800B6CC:
HasRupees 0x0001
HasRupees 1
JumpIfNot script_0800B6CC
script_0800B6D4:
CheckPlayerInRegion 0x0078, 0x00b8, 0x1060
data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc
+2 -2
View File
@@ -1,7 +1,7 @@
@ Intro Assembly Player gets Sword
SCRIPT_START script_PlayerGetSword
SetInventoryValue 0x0001, 0x0001
CallWithArg PutItemAnySlot, 0x00000001
SetInventoryValue ITEM_SMITH_SWORD, 0x0001
CallWithArg PutItemAnySlot, ITEM_SMITH_SWORD
PlaySound SFX_ITEM_GET
CallWithArg SetPlayerAnimation2, 0x0000045f
Call WaitForPlayerAnim
data/scripts/cutscene/introBusinessScrub/script_080157AC.inc
+1 -1
View File
@@ -46,7 +46,7 @@ script_08015880:
JumpIfNot script_08015880
script_08015888:
WaitUntilTextboxCloses
ComparePlayerAction 0x001c
ComparePlayerAction PLAYER_SLEEP
JumpIf script_08015888
SetPlayerIdle
Call sub_0807DF28
data/scripts/graveyard/script_DampeInside.inc
+2 -2
View File
@@ -9,11 +9,11 @@ SCRIPT_START script_DampeInside
WaitUntilTextboxCloses
JumpIfNot script_08009622
PlaySound SFX_ITEM_GET
InitItemGetSequence 0x003c
InitItemGetSequence ITEM_QST_GRAVEYARD_KEY
MessageFromTarget TEXT_ITEM_GET, 0x3c
WaitPlayerGetItem
WaitUntilTextboxCloses
SetInventoryValue 0x003c, 0x0001
SetInventoryValue ITEM_QST_GRAVEYARD_KEY, 0x0001
script_08009622:
EnablePlayerControl
DoPostScriptAction 0x0000
data/scripts/graveyard/script_DampeOuside.inc
+1 -1
View File
@@ -28,7 +28,7 @@ script_08009660:
JumpIfNot script_0800968E
PlaySound SFX_111
PlaySound SFX_SECRET
SetInventoryValue 0x003c, 0x0002
SetInventoryValue ITEM_QST_GRAVEYARD_KEY, 0x0002
Call sub_0806BEFC
script_0800968E:
EnablePlayerControl
data/scripts/hyruleTown/script_Carlov.inc
+1 -1
View File
@@ -21,7 +21,7 @@ script_08014462:
DoPostScriptAction 0x0001
Wait 0x008c
DoPostScriptAction 0x0000
HasRupees 0x000a
HasRupees 10
JumpIf script_080144A2
MessageFromTarget TEXT_BURLOV, 0x04
Jump script_080144FC
data/scripts/hyruleTown/script_DinMovedIn.inc
+4 -4
View File
@@ -12,14 +12,14 @@ script_0801203A:
SetPlayerIdle
FacePlayer
DoPostScriptAction 0x0000
CheckLocalFlag 0x0094
CheckLocalFlag MHOUSE_DIN_TALK
JumpIf script_0801205E
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x22
WaitUntilTextboxCloses
SetLocalFlag 0x0094
SetLocalFlag MHOUSE_DIN_TALK
Jump script_0801209E
script_0801205E:
CheckBottleContaining 0x0031
CheckBottleContaining BOTTLE_CHARM_DIN
JumpIfNot script_08012070
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x23
WaitUntilTextboxCloses
@@ -29,7 +29,7 @@ script_08012070:
WaitUntilTextboxCloses
CheckTextboxResult
JumpIfNot script_0801209E
CheckBottleContaining 0x0020
CheckBottleContaining ITEM_BOTTLE_EMPTY
JumpIfNot script_0801209A
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x25
WaitUntilTextboxCloses
data/scripts/hyruleTown/script_Emma.inc
+1 -1
View File
@@ -25,7 +25,7 @@ script_0800E872: @ Rent large room
CallWithArg sub_0807F854, 0x00010190
EndBlock
WaitUntilTextboxCloses
HasRupees 0x0190
HasRupees 400
JumpIfNot script_EmmaNotEnoughRupees
ModRupees -400
SetLocalFlag 0x0091
data/scripts/hyruleTown/script_FaroreMovedIn.inc
+4 -4
View File
@@ -12,14 +12,14 @@ script_08012152:
SetPlayerIdle
FacePlayer
DoPostScriptAction 0x0000
CheckLocalFlag 0x0096
CheckLocalFlag MHOUSE_FARORE_TALK
JumpIf script_08012176
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1c
WaitUntilTextboxCloses
SetLocalFlag 0x0096
SetLocalFlag MHOUSE_FARORE_TALK
Jump script_080121B6
script_08012176:
CheckBottleContaining 0x0030
CheckBottleContaining BOTTLE_CHARM_FARORE
JumpIfNot script_08012188
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1d
WaitUntilTextboxCloses
@@ -29,7 +29,7 @@ script_08012188:
WaitUntilTextboxCloses
CheckTextboxResult
JumpIfNot script_080121B6
CheckBottleContaining 0x0020
CheckBottleContaining ITEM_BOTTLE_EMPTY
JumpIfNot script_080121B2
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1f
WaitUntilTextboxCloses
data/scripts/hyruleTown/script_MalonHyruleTown.inc
+2 -2
View File
@@ -21,9 +21,9 @@ script_08014F4A:
WaitUntilTextboxCloses
CheckTextboxResult
JumpIfNot script_08014FA6
HasRupees 0x0064
HasRupees 100
JumpIfNot script_08014F9A
CheckBottleContaining 0x0020
CheckBottleContaining ITEM_BOTTLE_EMPTY
JumpIfNot script_08014FA2
ModRupees -100
GivePlayerItem ITEM_BOTTLE_MILK
data/scripts/hyruleTown/script_Marcy.inc
+1 -1
View File
@@ -18,7 +18,7 @@ script_08010746:
WaitUntilTextboxCloses
CheckTextboxResult
JumpIfNot script_08010786
HasRupees 0x00c8
HasRupees 200
JumpIf script_08010778
MessageNoOverlap TEXT_POST, 0x08
Jump script_08010786
data/scripts/hyruleTown/script_NayruMovedIn.inc
+4 -4
View File
@@ -12,14 +12,14 @@ script_080120C6:
SetPlayerIdle
FacePlayer
DoPostScriptAction 0x0000
CheckLocalFlag 0x0095
CheckLocalFlag MHOUSE_NAYRU_TALK
JumpIf script_080120EA
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x16
WaitUntilTextboxCloses
SetLocalFlag 0x0095
SetLocalFlag MHOUSE_NAYRU_TALK
Jump script_0801212A
script_080120EA:
CheckBottleContaining 0x002f
CheckBottleContaining BOTTLE_CHARM_NAYRU
JumpIfNot script_080120FC
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x17
WaitUntilTextboxCloses
@@ -29,7 +29,7 @@ script_080120FC:
WaitUntilTextboxCloses
CheckTextboxResult
JumpIfNot script_0801212A
CheckBottleContaining 0x0020
CheckBottleContaining ITEM_BOTTLE_EMPTY
JumpIfNot script_08012126
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x19
WaitUntilTextboxCloses
data/scripts/hyruleTown/script_Pita.inc
+1 -1
View File
@@ -24,7 +24,7 @@ script_080106E0:
CheckTextboxResult
JumpIfNot script_08010726
WaitUntilTextboxCloses
BuyItem 0x0000, 0x0000
BuyItem ITEM_NONE, 0x0000
JumpIf script_0801070C
MessageNoOverlap TEXT_BAKERY, 0x04
Jump script_08010726
data/scripts/hyruleTown/script_RemFallingAsleep.inc
+1 -1
View File
@@ -39,7 +39,7 @@ script_08013006:
Call sub_0807DF28
EndBlock
PlaySound SFX_TASK_COMPLETE
InitItemGetSequence 0x0038
InitItemGetSequence ITEM_QST_MUSHROOM
WaitPlayerGetItem
Wait 0x001e
_0807E8E4_0
data/scripts/hyruleTown/script_RentRegularRoom.inc
+1 -1
View File
@@ -5,7 +5,7 @@ SCRIPT_START script_RentRegularRoom
CallWithArg sub_0807F854, 0x000100c8
EndBlock
WaitUntilTextboxCloses
HasRupees 0x00c8
HasRupees 200
JumpIfNot script_EmmaNotEnoughRupees
ModRupees -200
SetLocalFlag 0x0091
data/scripts/hyruleTown/script_RentSmallRoom.inc
+1 -1
View File
@@ -5,7 +5,7 @@ SCRIPT_START script_RentSmallRoom
CallWithArg sub_0807F854, 0x00010032
EndBlock
WaitUntilTextboxCloses
HasRupees 0x0032
HasRupees 50
JumpIfNot script_EmmaNotEnoughRupees
ModRupees -50
SetLocalFlag 0x0091
data/scripts/hyruleTown/script_Simon.inc
+1 -1
View File
@@ -33,7 +33,7 @@ script_08011B9A:
SetAnimationState 0x0004
Jump script_08011B84
script_08011BA4:
HasRupees 0x000a
HasRupees 10
JumpIf script_08011BBC
DoPostScriptAction 0x0004
Wait 0x003c
data/scripts/lakeHylia/script_Object69AfterToD.inc
+1 -1
View File
@@ -5,7 +5,7 @@ script_0800AFB2:
EndBlock
BeginBlock
Call sub_0807FBB4
ComparePlayerAction 0x0001
ComparePlayerAction PLAYER_NORMAL
JumpIfNot script_0800AFB2
EndBlock
Call sub_0807DF28
data/scripts/lonLonRanch/script_TalonGotKey.inc
+1 -1
View File
@@ -17,7 +17,7 @@ SCRIPT_START script_TalonGotKey
FacePlayer
Wait 0x003c
PlaySound SFX_TASK_COMPLETE
InitItemGetSequence 0x0037
InitItemGetSequence ITEM_QST_LONLON_KEY
WaitPlayerGetItem
FaceAwayFromPlayer
MessageFromTarget TEXT_LON_LON, 0x0c
data/scripts/lonLonRanch/script_TalonInside.inc
+1 -1
View File
@@ -18,7 +18,7 @@ script_08014E64:
JumpIfNot script_08014EBC
CallWithArg sub_0807F7C4, 0x00000022
JumpIfNot script_08014EB0
CheckBottleContaining 0x0020
CheckBottleContaining ITEM_BOTTLE_EMPTY
JumpIfNot script_08014EB8
CallWithArg sub_0807F800, 0x00000022
WaitPlayerGetItem
data/scripts/minishWoods/script_Object69PotionRed.inc
+1 -1
View File
@@ -11,7 +11,7 @@ script_0801619A:
MessageFromTargetTable TEXT_SYRUP << 8 | 0x05, TEXT_SYRUP << 8 | 0x04, TEXT_SYRUP << 8 | 0x04, TEXT_SYRUP << 8 | 0x04
CheckTextboxResult
JumpIfNot script_080161E2
CheckBottleContaining 0x0020
CheckBottleContaining ITEM_BOTTLE_EMPTY
JumpIf script_080161C6
MessageFromTarget TEXT_SYRUP, 0x0c
Jump script_080161E2
data/scripts/minishWoods/script_Syrup.inc
+1 -1
View File
@@ -28,7 +28,7 @@ script_080160E0:
WaitUntilTextboxCloses
CheckTextboxResult
JumpIfNot script_08016132
BuyItem 0x0000, 0x0000
BuyItem ITEM_NONE, 0x0000
JumpIf script_0801610C
MessageFromTarget TEXT_SYRUP, 0x0b
WaitUntilTextboxCloses
data/scripts/mtCrenel/script_Melari.inc
+1 -1
View File
@@ -84,7 +84,7 @@ script_0800D0A8:
PlaySound SFX_TASK_COMPLETE
Call sub_08068964
script_0800D108:
ComparePlayerAction 0x0008
ComparePlayerAction PLAYER_ITEMGET
JumpIf script_0800D108
PlaySound SFX_F8
SetSyncFlag 0x00000010
data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc
+2 -2
View File
@@ -1,7 +1,7 @@
@ Mines Player get white sword
SCRIPT_START script_PlayerGetWhiteSword
SetInventoryValue 0x0002, 0x0001
CallWithArg PutItemAnySlot, 0x00000002
SetInventoryValue ITEM_GREEN_SWORD, 0x0001
CallWithArg PutItemAnySlot, ITEM_GREEN_SWORD
PlaySound SFX_ITEM_GET
CallWithArg SetPlayerAnimation2, 0x000001e2
Call WaitForPlayerAnim
data/scripts/sanctuary/script_08013F94.inc
+1 -1
View File
@@ -10,7 +10,7 @@ script_08013FA4:
BeginBlock
CheckInventory1 ITEM_RED_SWORD
JumpIfNot script_08013FA4
CheckPlayerFlags 0x00400000
CheckPlayerFlags PL_CLONING
JumpIfNot script_08013FA4
EndBlock
Call WaitForPlayerNormalOrTalkEzlo
data/scripts/sanctuary/script_Npc4EPedestal.inc
+1 -1
View File
@@ -52,7 +52,7 @@ script_080134F8:
Wait 0x003c
StartPlayerScript script_PlayerPickUpSword
SetSyncFlag 0x00000080
SetInventoryValue 0x0003, 0x0001
SetInventoryValue ITEM_RED_SWORD, 0x0001
Call NPC4E_SaveEquippedItems
Call NPC4E_RestoreEquippedItems
Call WaitForPlayerAnim
data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
+1 -1
View File
@@ -55,7 +55,7 @@ script_0801373C:
Wait 0x003c
StartPlayerScript script_PlayerPickUpSword
SetSyncFlag 0x00000080
SetInventoryValue 0x0004, 0x0001
SetInventoryValue ITEM_BLUE_SWORD, 0x0001
Call NPC4E_SaveEquippedItems
Call NPC4E_RestoreEquippedItems
Call WaitForPlayerAnim
data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
+1 -1
View File
@@ -59,7 +59,7 @@ script_080138D0:
Wait 0x003c
StartPlayerScript script_PlayerPickUpFinalSword
SetSyncFlag 0x00000080
SetInventoryValue 0x0006, 0x0001
SetInventoryValue ITEM_FOURSWORD, 0x0001
Call UpdatePlayerSkills
Call NPC4E_SaveEquippedItems
Call NPC4E_RestoreEquippedItems
data/scripts/unused/script_08016384.inc
+5 -5
View File
@@ -25,18 +25,18 @@ SCRIPT_START script_08016384
CheckPlayerInRegion2 0x0000
CheckEntityInteractType
FacePlayerAndCheckDist
HasRupees 0x00c8
HasRupees 200
CheckTextboxResult
CheckKinstoneFused KINSTONE_1
BuyItem 0x006c, 0x0000
CheckBottleContaining 0x0020
BuyItem ITEM_BOMBS10, 0x0000
CheckBottleContaining ITEM_BOTTLE_EMPTY
VariableBitSet 0x00000000
VariableOnlyBitSet 0x00000000
VariableEqual 0x00000000
CheckPlayerFlags 0x00000080
CheckPlayerFlags PL_MINISH
CheckPlayerMinish
EntityHasHeight
ComparePlayerAction 0x0001
ComparePlayerAction PLAYER_NORMAL
ComparePlayerAnimationState 0x0004
SetSyncFlag 0x00000001
ClearSyncFlag 0x00000002