falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use enums for GivePlayerItem and SoundReq in scripts

This commit is contained in:
Tal Hayon 2022-05-15 08:45:38 +03:00
parent 4543cd8297
commit 33e8152e60
23 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc
View File

@ -21,7 +21,7 @@ script_0800F09A:
_0807E8E4_0 _0807E8E4_0
MessageFromTargetPos TEXT_MINISH2, 0x02, 0x000c MessageFromTargetPos TEXT_MINISH2, 0x02, 0x000c
WaitUntilTextboxCloses WaitUntilTextboxCloses
GivePlayerItem 0x0067 GivePlayerItem ITEM_KINSTONE_BAG
WaitPlayerGetItem WaitPlayerGetItem
_0807E8E4_0 _0807E8E4_0
SetSyncFlag 0x00000002 SetSyncFlag 0x00000002

2
data/scripts/dhc/script_KingDaltusStone.inc
View File

@ -42,7 +42,7 @@ script_0800E3C8:
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x0c MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x0c
WaitUntilTextboxCloses WaitUntilTextboxCloses
Wait 0x000f Wait 0x000f
GivePlayerItem 0x0053 GivePlayerItem ITEM_SMALL_KEY
WaitPlayerGetItem WaitPlayerGetItem
SetLocalFlag 0x0071 SetLocalFlag 0x0071
EnablePlayerControl EnablePlayerControl

2
data/scripts/graveyard/script_GreatFairyArrows.inc
View File

@ -32,7 +32,7 @@ script_0800B684:
script_0800B68E: script_0800B68E:
WaitUntilTextboxCloses WaitUntilTextboxCloses
SetLocalFlag 0x009e SetLocalFlag 0x009e
GivePlayerItem 0x0066 GivePlayerItem ITEM_LARGE_QUIVER
script_0800B698: script_0800B698:
WaitPlayerGetItem WaitPlayerGetItem
FaceAwayFromPlayer FaceAwayFromPlayer

2
data/scripts/hyruleTown/script_Carlov.inc
View File

@ -44,7 +44,7 @@ script_080144C0:
.endif .endif
.endif .endif
script_080144C8: script_080144C8:
ModRupees 0xfff6 ModRupees -10
MessageFromTarget TEXT_BURLOV, 0x0c MessageFromTarget TEXT_BURLOV, 0x0c
PlaySound SFX_BUTTON_PRESS PlaySound SFX_BUTTON_PRESS
Wait 0x0018 Wait 0x0018

2
data/scripts/hyruleTown/script_DinMovedIn.inc
View File

@ -33,7 +33,7 @@ script_08012070:
JumpIfNot script_0801209A JumpIfNot script_0801209A
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x25 MessageNoOverlap TEXT_GORMAN_ORACLES, 0x25
WaitUntilTextboxCloses WaitUntilTextboxCloses
GivePlayerItem 0x0031 GivePlayerItem BOTTLE_CHARM_DIN
WaitPlayerGetItem WaitPlayerGetItem
.ifdef USA .ifdef USA
Call sub_0807FC24 Call sub_0807FC24

2
data/scripts/hyruleTown/script_DrLeftDoor.inc
View File

@ -9,7 +9,7 @@ script_0800EF50:
Call sub_080869A4 Call sub_080869A4
JumpIfNot script_0800EF50 JumpIfNot script_0800EF50
SetPlayerIdle SetPlayerIdle
CheckLocalFlagByBank 0x0200, 0x006d CheckLocalFlagByBank FLAG_BANK_2, 0x006d
JumpIf script_0800EF82 JumpIf script_0800EF82
MessageFromTarget TEXT_DR_LEFT, 0x01 MessageFromTarget TEXT_DR_LEFT, 0x01
WaitUntilTextboxCloses WaitUntilTextboxCloses

2
data/scripts/hyruleTown/script_Emma.inc
View File

@ -27,7 +27,7 @@ script_0800E872: @ Rent large room
WaitUntilTextboxCloses WaitUntilTextboxCloses
HasRupees 0x0190 HasRupees 0x0190
JumpIfNot script_EmmaNotEnoughRupees JumpIfNot script_EmmaNotEnoughRupees
ModRupees 0xfe70 ModRupees -400
SetLocalFlag 0x0091 SetLocalFlag 0x0091
MessageFromTarget TEXT_HAPPY_HEARTH, 0x08 MessageFromTarget TEXT_HAPPY_HEARTH, 0x08
WaitUntilTextboxCloses WaitUntilTextboxCloses

2
data/scripts/hyruleTown/script_FaroreMovedIn.inc
View File

@ -33,7 +33,7 @@ script_08012188:
JumpIfNot script_080121B2 JumpIfNot script_080121B2
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1f MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1f
WaitUntilTextboxCloses WaitUntilTextboxCloses
GivePlayerItem 0x0030 GivePlayerItem BOTTLE_CHARM_FARORE
WaitPlayerGetItem WaitPlayerGetItem
.ifdef USA .ifdef USA
Call sub_0807FC24 Call sub_0807FC24

2
data/scripts/hyruleTown/script_LibrariLater.inc
View File

@ -17,7 +17,7 @@ script_08012440:
CheckLocalFlag 0x00b3 CheckLocalFlag 0x00b3
JumpIf script_08012474 JumpIf script_08012474
SetLocalFlag 0x00b3 SetLocalFlag 0x00b3
GivePlayerItem 0x0062 GivePlayerItem ITEM_HEART_CONTAINER
WaitPlayerGetItem WaitPlayerGetItem
.ifdef USA .ifdef USA
SetLocalFlag 0x00d0 SetLocalFlag 0x00d0

4
data/scripts/hyruleTown/script_MalonHyruleTown.inc
View File

@ -25,8 +25,8 @@ script_08014F4A:
JumpIfNot script_08014F9A JumpIfNot script_08014F9A
CheckBottleContaining 0x0020 CheckBottleContaining 0x0020
JumpIfNot script_08014FA2 JumpIfNot script_08014FA2
ModRupees 0xff9c ModRupees -100
GivePlayerItem 0x0022 GivePlayerItem ITEM_BOTTLE_MILK
WaitPlayerGetItem WaitPlayerGetItem
MessageNoOverlap TEXT_MILK, 0x11 MessageNoOverlap TEXT_MILK, 0x11
Jump script_08014FA6 Jump script_08014FA6

2
data/scripts/hyruleTown/script_Marcy.inc
View File

@ -23,7 +23,7 @@ script_08010746:
MessageNoOverlap TEXT_POST, 0x08 MessageNoOverlap TEXT_POST, 0x08
Jump script_08010786 Jump script_08010786
script_08010778: script_08010778:
ModRupees 0xff38 ModRupees -200
Call sub_08062E14 Call sub_08062E14
MessageNoOverlap TEXT_POST, 0x07 MessageNoOverlap TEXT_POST, 0x07
script_08010786: script_08010786:

2
data/scripts/hyruleTown/script_NayruMovedIn.inc
View File

@ -33,7 +33,7 @@ script_080120FC:
JumpIfNot script_08012126 JumpIfNot script_08012126
MessageNoOverlap TEXT_GORMAN_ORACLES, 0x19 MessageNoOverlap TEXT_GORMAN_ORACLES, 0x19
WaitUntilTextboxCloses WaitUntilTextboxCloses
GivePlayerItem 0x002f GivePlayerItem BOTTLE_CHARM_NAYRU
WaitPlayerGetItem WaitPlayerGetItem
.ifdef USA .ifdef USA
Call sub_0807FC24 Call sub_0807FC24

2
data/scripts/hyruleTown/script_RemFallingAsleep.inc
View File

@ -62,7 +62,7 @@ script_08013006:
MessageNoOverlap TEXT_REM, 0x05 MessageNoOverlap TEXT_REM, 0x05
WaitUntilTextboxCloses WaitUntilTextboxCloses
SetSyncFlag 0x00000200 SetSyncFlag 0x00000200
GivePlayerItem 0x0015 GivePlayerItem ITEM_PEGASUS_BOOTS
WaitPlayerGetItem WaitPlayerGetItem
FaceAwayFromPlayer FaceAwayFromPlayer
MessageNoOverlap TEXT_REM, 0x06 MessageNoOverlap TEXT_REM, 0x06

2
data/scripts/hyruleTown/script_RentRegularRoom.inc
View File

@ -7,7 +7,7 @@ SCRIPT_START script_RentRegularRoom
WaitUntilTextboxCloses WaitUntilTextboxCloses
HasRupees 0x00c8 HasRupees 0x00c8
JumpIfNot script_EmmaNotEnoughRupees JumpIfNot script_EmmaNotEnoughRupees
ModRupees 0xff38 ModRupees -200
SetLocalFlag 0x0091 SetLocalFlag 0x0091
MessageFromTarget TEXT_HAPPY_HEARTH, 0x08 MessageFromTarget TEXT_HAPPY_HEARTH, 0x08
WaitUntilTextboxCloses WaitUntilTextboxCloses

2
data/scripts/hyruleTown/script_RentSmallRoom.inc
View File

@ -7,7 +7,7 @@ SCRIPT_START script_RentSmallRoom
WaitUntilTextboxCloses WaitUntilTextboxCloses
HasRupees 0x0032 HasRupees 0x0032
JumpIfNot script_EmmaNotEnoughRupees JumpIfNot script_EmmaNotEnoughRupees
ModRupees 0xffce ModRupees -50
SetLocalFlag 0x0091 SetLocalFlag 0x0091
MessageFromTarget TEXT_HAPPY_HEARTH, 0x08 MessageFromTarget TEXT_HAPPY_HEARTH, 0x08
WaitUntilTextboxCloses WaitUntilTextboxCloses

2
data/scripts/hyruleTown/script_Simon.inc
View File

@ -40,7 +40,7 @@ script_08011BA4:
MessageNoOverlap TEXT_SIMON, 0x05 MessageNoOverlap TEXT_SIMON, 0x05
Jump script_08011B9A Jump script_08011B9A
script_08011BBC: script_08011BBC:
ModRupees 0xfff6 ModRupees -10
Wait 0x001e Wait 0x001e
MessageNoOverlap TEXT_SIMON, 0x06 MessageNoOverlap TEXT_SIMON, 0x06
WaitUntilTextboxCloses WaitUntilTextboxCloses

2
data/scripts/hyruleTown/script_StockwellDogFood.inc
View File

@ -22,7 +22,7 @@ script_080143FA:
Wait 0x000a Wait 0x000a
SetIntVariable 0x00000000 SetIntVariable 0x00000000
Call sub_08065528 Call sub_08065528
GivePlayerItem 0x0036 GivePlayerItem ITEM_QST_DOGFOOD
WaitPlayerGetItem WaitPlayerGetItem
MessageNoOverlap TEXT_STOCKWELL, 0x19 MessageNoOverlap TEXT_STOCKWELL, 0x19
WaitUntilTextboxCloses WaitUntilTextboxCloses

2
data/scripts/hyruleTown/script_TownMinish1.inc
View File

@ -22,7 +22,7 @@ script_0800E708:
Jump script_0800E6F4 Jump script_0800E6F4
script_0800E722: script_0800E722:
WaitUntilTextboxCloses WaitUntilTextboxCloses
GivePlayerItem 0x0057 GivePlayerItem ITEM_RUPEE50
WaitPlayerGetItem WaitPlayerGetItem
WaitUntilTextboxCloses WaitUntilTextboxCloses
EnablePlayerControl EnablePlayerControl

2
data/scripts/mtCrenel/script_GreatFairyBombs.inc
View File

@ -25,7 +25,7 @@ script_0800B734:
script_0800B794: script_0800B794:
WaitUntilTextboxCloses WaitUntilTextboxCloses
SetLocalFlag 0x00a0 SetLocalFlag 0x00a0
GivePlayerItem 0x0065 GivePlayerItem ITEM_BOMBBAG
Jump script_0800B698 Jump script_0800B698
script_0800B7A2: script_0800B7A2:
MessageNoOverlap TEXT_ITEM_GET, 0x90 MessageNoOverlap TEXT_ITEM_GET, 0x90

2
data/scripts/npc/script_TingleSiblings.inc
View File

@ -14,7 +14,7 @@ script_0801690A:
Call sub_08064F28 Call sub_08064F28
WaitUntilTextboxCloses WaitUntilTextboxCloses
JumpIfNot script_08016926 JumpIfNot script_08016926
GivePlayerItem 0x003d GivePlayerItem ITEM_QST_TINGLE_TROPHY
WaitPlayerGetItem WaitPlayerGetItem
script_08016926: script_08016926:
EnablePlayerControl EnablePlayerControl

12
data/scripts/unused/script_08016482.inc
View File

@ -63,16 +63,16 @@ SCRIPT_START script_08016482
DoPostScriptAction2 0x0001 DoPostScriptAction2 0x0001
PlaySound SFX_METAL_CLINK PlaySound SFX_METAL_CLINK
PlayBgm BGM_MINISH_WOODS PlayBgm BGM_MINISH_WOODS
SoundReq 0x00000074 SoundReq SFX_METAL_CLINK
StopBgm StopBgm
ModRupees 0xff38 ModRupees -200
ModHealth 0x0010 ModHealth 0x0010
IncreaseMaxHealth IncreaseMaxHealth
GiveKinstone 0x0001 GiveKinstone 0x0001
GivePlayerItem 0x0001 GivePlayerItem ITEM_SMITH_SWORD
GetInventoryValue 0x0001 GetInventoryValue ITEM_SMITH_SWORD
SetInventoryValue 0x0001, 0x0002 SetInventoryValue ITEM_SMITH_SWORD, 0x0002
InitItemGetSequence 0x0001 InitItemGetSequence ITEM_SMITH_SWORD
CameraTargetEntity CameraTargetEntity
CameraTargetPlayer CameraTargetPlayer
_0807F0B4 0x0007 _0807F0B4 0x0007

2
data/scripts/westernWood/script_MoblinLady.inc
View File

@ -15,7 +15,7 @@ script_08012338:
CheckLocalFlag 0x0042 CheckLocalFlag 0x0042
JumpIf script_0801235A JumpIf script_0801235A
SetLocalFlag 0x0042 SetLocalFlag 0x0042
GivePlayerItem 0x0057 GivePlayerItem ITEM_RUPEE50
WaitPlayerGetItem WaitPlayerGetItem
script_0801235A: script_0801235A:
EnablePlayerControl EnablePlayerControl

4
src/flags.c
View File

@ -33,7 +33,7 @@ u32 CheckFlags(u32 flags) {
} }
u32 CheckGlobalFlag(u32 flag) { u32 CheckGlobalFlag(u32 flag) {
return CheckLocalFlagByBank(0, flag); return CheckLocalFlagByBank(FLAG_BANK_0, flag);
} }
u32 CheckRoomFlag(u32 flag) { u32 CheckRoomFlag(u32 flag) {
@ -49,7 +49,7 @@ u32 CheckLocalFlags(u32 flag, u32 length) {
} }
u32 CheckGlobalFlags(u32 flag, u32 length) { u32 CheckGlobalFlags(u32 flag, u32 length) {
return CheckLocalFlagsByBank(0, flag, length); return CheckLocalFlagsByBank(FLAG_BANK_0, flag, length);
} }
u32 CheckRoomFlags(u32 flag, u32 length) { u32 CheckRoomFlags(u32 flag, u32 length) {