diff --git a/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc index faaa623c..b3ba7abc 100644 --- a/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc @@ -21,7 +21,7 @@ script_0800F09A: _0807E8E4_0 MessageFromTargetPos TEXT_MINISH2, 0x02, 0x000c WaitUntilTextboxCloses - GivePlayerItem 0x0067 + GivePlayerItem ITEM_KINSTONE_BAG WaitPlayerGetItem _0807E8E4_0 SetSyncFlag 0x00000002 diff --git a/data/scripts/dhc/script_KingDaltusStone.inc b/data/scripts/dhc/script_KingDaltusStone.inc index b02b2498..58b1f75b 100644 --- a/data/scripts/dhc/script_KingDaltusStone.inc +++ b/data/scripts/dhc/script_KingDaltusStone.inc @@ -42,7 +42,7 @@ script_0800E3C8: MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x0c WaitUntilTextboxCloses Wait 0x000f - GivePlayerItem 0x0053 + GivePlayerItem ITEM_SMALL_KEY WaitPlayerGetItem SetLocalFlag 0x0071 EnablePlayerControl diff --git a/data/scripts/graveyard/script_GreatFairyArrows.inc b/data/scripts/graveyard/script_GreatFairyArrows.inc index 1ec25bc5..eec55eb1 100644 --- a/data/scripts/graveyard/script_GreatFairyArrows.inc +++ b/data/scripts/graveyard/script_GreatFairyArrows.inc @@ -32,7 +32,7 @@ script_0800B684: script_0800B68E: WaitUntilTextboxCloses SetLocalFlag 0x009e - GivePlayerItem 0x0066 + GivePlayerItem ITEM_LARGE_QUIVER script_0800B698: WaitPlayerGetItem FaceAwayFromPlayer diff --git a/data/scripts/hyruleTown/script_Carlov.inc b/data/scripts/hyruleTown/script_Carlov.inc index bbf7ec42..ed2ecfb3 100644 --- a/data/scripts/hyruleTown/script_Carlov.inc +++ b/data/scripts/hyruleTown/script_Carlov.inc @@ -44,7 +44,7 @@ script_080144C0: .endif .endif script_080144C8: - ModRupees 0xfff6 + ModRupees -10 MessageFromTarget TEXT_BURLOV, 0x0c PlaySound SFX_BUTTON_PRESS Wait 0x0018 diff --git a/data/scripts/hyruleTown/script_DinMovedIn.inc b/data/scripts/hyruleTown/script_DinMovedIn.inc index 4ee59c41..b28b5b99 100644 --- a/data/scripts/hyruleTown/script_DinMovedIn.inc +++ b/data/scripts/hyruleTown/script_DinMovedIn.inc @@ -33,7 +33,7 @@ script_08012070: JumpIfNot script_0801209A MessageNoOverlap TEXT_GORMAN_ORACLES, 0x25 WaitUntilTextboxCloses - GivePlayerItem 0x0031 + GivePlayerItem BOTTLE_CHARM_DIN WaitPlayerGetItem .ifdef USA Call sub_0807FC24 diff --git a/data/scripts/hyruleTown/script_DrLeftDoor.inc b/data/scripts/hyruleTown/script_DrLeftDoor.inc index ca293060..fd854ff9 100644 --- a/data/scripts/hyruleTown/script_DrLeftDoor.inc +++ b/data/scripts/hyruleTown/script_DrLeftDoor.inc @@ -9,7 +9,7 @@ script_0800EF50: Call sub_080869A4 JumpIfNot script_0800EF50 SetPlayerIdle - CheckLocalFlagByBank 0x0200, 0x006d + CheckLocalFlagByBank FLAG_BANK_2, 0x006d JumpIf script_0800EF82 MessageFromTarget TEXT_DR_LEFT, 0x01 WaitUntilTextboxCloses diff --git a/data/scripts/hyruleTown/script_Emma.inc b/data/scripts/hyruleTown/script_Emma.inc index 0f0e64f6..92631e30 100644 --- a/data/scripts/hyruleTown/script_Emma.inc +++ b/data/scripts/hyruleTown/script_Emma.inc @@ -27,7 +27,7 @@ script_0800E872: @ Rent large room WaitUntilTextboxCloses HasRupees 0x0190 JumpIfNot script_EmmaNotEnoughRupees - ModRupees 0xfe70 + ModRupees -400 SetLocalFlag 0x0091 MessageFromTarget TEXT_HAPPY_HEARTH, 0x08 WaitUntilTextboxCloses diff --git a/data/scripts/hyruleTown/script_FaroreMovedIn.inc b/data/scripts/hyruleTown/script_FaroreMovedIn.inc index a1383bf3..5cb88b1b 100644 --- a/data/scripts/hyruleTown/script_FaroreMovedIn.inc +++ b/data/scripts/hyruleTown/script_FaroreMovedIn.inc @@ -33,7 +33,7 @@ script_08012188: JumpIfNot script_080121B2 MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1f WaitUntilTextboxCloses - GivePlayerItem 0x0030 + GivePlayerItem BOTTLE_CHARM_FARORE WaitPlayerGetItem .ifdef USA Call sub_0807FC24 diff --git a/data/scripts/hyruleTown/script_LibrariLater.inc b/data/scripts/hyruleTown/script_LibrariLater.inc index 5b97f721..1363035f 100644 --- a/data/scripts/hyruleTown/script_LibrariLater.inc +++ b/data/scripts/hyruleTown/script_LibrariLater.inc @@ -17,7 +17,7 @@ script_08012440: CheckLocalFlag 0x00b3 JumpIf script_08012474 SetLocalFlag 0x00b3 - GivePlayerItem 0x0062 + GivePlayerItem ITEM_HEART_CONTAINER WaitPlayerGetItem .ifdef USA SetLocalFlag 0x00d0 diff --git a/data/scripts/hyruleTown/script_MalonHyruleTown.inc b/data/scripts/hyruleTown/script_MalonHyruleTown.inc index e5249244..eaff55f4 100644 --- a/data/scripts/hyruleTown/script_MalonHyruleTown.inc +++ b/data/scripts/hyruleTown/script_MalonHyruleTown.inc @@ -25,8 +25,8 @@ script_08014F4A: JumpIfNot script_08014F9A CheckBottleContaining 0x0020 JumpIfNot script_08014FA2 - ModRupees 0xff9c - GivePlayerItem 0x0022 + ModRupees -100 + GivePlayerItem ITEM_BOTTLE_MILK WaitPlayerGetItem MessageNoOverlap TEXT_MILK, 0x11 Jump script_08014FA6 diff --git a/data/scripts/hyruleTown/script_Marcy.inc b/data/scripts/hyruleTown/script_Marcy.inc index 357eed2b..260bea1d 100644 --- a/data/scripts/hyruleTown/script_Marcy.inc +++ b/data/scripts/hyruleTown/script_Marcy.inc @@ -23,7 +23,7 @@ script_08010746: MessageNoOverlap TEXT_POST, 0x08 Jump script_08010786 script_08010778: - ModRupees 0xff38 + ModRupees -200 Call sub_08062E14 MessageNoOverlap TEXT_POST, 0x07 script_08010786: diff --git a/data/scripts/hyruleTown/script_NayruMovedIn.inc b/data/scripts/hyruleTown/script_NayruMovedIn.inc index c5e664a0..837ce193 100644 --- a/data/scripts/hyruleTown/script_NayruMovedIn.inc +++ b/data/scripts/hyruleTown/script_NayruMovedIn.inc @@ -33,7 +33,7 @@ script_080120FC: JumpIfNot script_08012126 MessageNoOverlap TEXT_GORMAN_ORACLES, 0x19 WaitUntilTextboxCloses - GivePlayerItem 0x002f + GivePlayerItem BOTTLE_CHARM_NAYRU WaitPlayerGetItem .ifdef USA Call sub_0807FC24 diff --git a/data/scripts/hyruleTown/script_RemFallingAsleep.inc b/data/scripts/hyruleTown/script_RemFallingAsleep.inc index 55f9935c..24f5736b 100644 --- a/data/scripts/hyruleTown/script_RemFallingAsleep.inc +++ b/data/scripts/hyruleTown/script_RemFallingAsleep.inc @@ -62,7 +62,7 @@ script_08013006: MessageNoOverlap TEXT_REM, 0x05 WaitUntilTextboxCloses SetSyncFlag 0x00000200 - GivePlayerItem 0x0015 + GivePlayerItem ITEM_PEGASUS_BOOTS WaitPlayerGetItem FaceAwayFromPlayer MessageNoOverlap TEXT_REM, 0x06 diff --git a/data/scripts/hyruleTown/script_RentRegularRoom.inc b/data/scripts/hyruleTown/script_RentRegularRoom.inc index d2a518a6..b4b17a3b 100644 --- a/data/scripts/hyruleTown/script_RentRegularRoom.inc +++ b/data/scripts/hyruleTown/script_RentRegularRoom.inc @@ -7,7 +7,7 @@ SCRIPT_START script_RentRegularRoom WaitUntilTextboxCloses HasRupees 0x00c8 JumpIfNot script_EmmaNotEnoughRupees - ModRupees 0xff38 + ModRupees -200 SetLocalFlag 0x0091 MessageFromTarget TEXT_HAPPY_HEARTH, 0x08 WaitUntilTextboxCloses diff --git a/data/scripts/hyruleTown/script_RentSmallRoom.inc b/data/scripts/hyruleTown/script_RentSmallRoom.inc index 1384aae7..f3d5785f 100644 --- a/data/scripts/hyruleTown/script_RentSmallRoom.inc +++ b/data/scripts/hyruleTown/script_RentSmallRoom.inc @@ -7,7 +7,7 @@ SCRIPT_START script_RentSmallRoom WaitUntilTextboxCloses HasRupees 0x0032 JumpIfNot script_EmmaNotEnoughRupees - ModRupees 0xffce + ModRupees -50 SetLocalFlag 0x0091 MessageFromTarget TEXT_HAPPY_HEARTH, 0x08 WaitUntilTextboxCloses diff --git a/data/scripts/hyruleTown/script_Simon.inc b/data/scripts/hyruleTown/script_Simon.inc index c8b72f95..6f664f90 100644 --- a/data/scripts/hyruleTown/script_Simon.inc +++ b/data/scripts/hyruleTown/script_Simon.inc @@ -40,7 +40,7 @@ script_08011BA4: MessageNoOverlap TEXT_SIMON, 0x05 Jump script_08011B9A script_08011BBC: - ModRupees 0xfff6 + ModRupees -10 Wait 0x001e MessageNoOverlap TEXT_SIMON, 0x06 WaitUntilTextboxCloses diff --git a/data/scripts/hyruleTown/script_StockwellDogFood.inc b/data/scripts/hyruleTown/script_StockwellDogFood.inc index a1ac64a8..bdfea1ef 100644 --- a/data/scripts/hyruleTown/script_StockwellDogFood.inc +++ b/data/scripts/hyruleTown/script_StockwellDogFood.inc @@ -22,7 +22,7 @@ script_080143FA: Wait 0x000a SetIntVariable 0x00000000 Call sub_08065528 - GivePlayerItem 0x0036 + GivePlayerItem ITEM_QST_DOGFOOD WaitPlayerGetItem MessageNoOverlap TEXT_STOCKWELL, 0x19 WaitUntilTextboxCloses diff --git a/data/scripts/hyruleTown/script_TownMinish1.inc b/data/scripts/hyruleTown/script_TownMinish1.inc index 10db1da0..248f4c2d 100644 --- a/data/scripts/hyruleTown/script_TownMinish1.inc +++ b/data/scripts/hyruleTown/script_TownMinish1.inc @@ -22,7 +22,7 @@ script_0800E708: Jump script_0800E6F4 script_0800E722: WaitUntilTextboxCloses - GivePlayerItem 0x0057 + GivePlayerItem ITEM_RUPEE50 WaitPlayerGetItem WaitUntilTextboxCloses EnablePlayerControl diff --git a/data/scripts/mtCrenel/script_GreatFairyBombs.inc b/data/scripts/mtCrenel/script_GreatFairyBombs.inc index 55988944..8cc43395 100644 --- a/data/scripts/mtCrenel/script_GreatFairyBombs.inc +++ b/data/scripts/mtCrenel/script_GreatFairyBombs.inc @@ -25,7 +25,7 @@ script_0800B734: script_0800B794: WaitUntilTextboxCloses SetLocalFlag 0x00a0 - GivePlayerItem 0x0065 + GivePlayerItem ITEM_BOMBBAG Jump script_0800B698 script_0800B7A2: MessageNoOverlap TEXT_ITEM_GET, 0x90 diff --git a/data/scripts/npc/script_TingleSiblings.inc b/data/scripts/npc/script_TingleSiblings.inc index 28ab518b..d5ea4160 100644 --- a/data/scripts/npc/script_TingleSiblings.inc +++ b/data/scripts/npc/script_TingleSiblings.inc @@ -14,7 +14,7 @@ script_0801690A: Call sub_08064F28 WaitUntilTextboxCloses JumpIfNot script_08016926 - GivePlayerItem 0x003d + GivePlayerItem ITEM_QST_TINGLE_TROPHY WaitPlayerGetItem script_08016926: EnablePlayerControl diff --git a/data/scripts/unused/script_08016482.inc b/data/scripts/unused/script_08016482.inc index 469ac058..e25f9903 100644 --- a/data/scripts/unused/script_08016482.inc +++ b/data/scripts/unused/script_08016482.inc @@ -63,16 +63,16 @@ SCRIPT_START script_08016482 DoPostScriptAction2 0x0001 PlaySound SFX_METAL_CLINK PlayBgm BGM_MINISH_WOODS - SoundReq 0x00000074 + SoundReq SFX_METAL_CLINK StopBgm - ModRupees 0xff38 + ModRupees -200 ModHealth 0x0010 IncreaseMaxHealth GiveKinstone 0x0001 - GivePlayerItem 0x0001 - GetInventoryValue 0x0001 - SetInventoryValue 0x0001, 0x0002 - InitItemGetSequence 0x0001 + GivePlayerItem ITEM_SMITH_SWORD + GetInventoryValue ITEM_SMITH_SWORD + SetInventoryValue ITEM_SMITH_SWORD, 0x0002 + InitItemGetSequence ITEM_SMITH_SWORD CameraTargetEntity CameraTargetPlayer _0807F0B4 0x0007 diff --git a/data/scripts/westernWood/script_MoblinLady.inc b/data/scripts/westernWood/script_MoblinLady.inc index d088ef85..df8e7fcf 100644 --- a/data/scripts/westernWood/script_MoblinLady.inc +++ b/data/scripts/westernWood/script_MoblinLady.inc @@ -15,7 +15,7 @@ script_08012338: CheckLocalFlag 0x0042 JumpIf script_0801235A SetLocalFlag 0x0042 - GivePlayerItem 0x0057 + GivePlayerItem ITEM_RUPEE50 WaitPlayerGetItem script_0801235A: EnablePlayerControl diff --git a/src/flags.c b/src/flags.c index d492e3e5..17395102 100644 --- a/src/flags.c +++ b/src/flags.c @@ -33,7 +33,7 @@ u32 CheckFlags(u32 flags) { } u32 CheckGlobalFlag(u32 flag) { - return CheckLocalFlagByBank(0, flag); + return CheckLocalFlagByBank(FLAG_BANK_0, flag); } u32 CheckRoomFlag(u32 flag) { @@ -49,7 +49,7 @@ u32 CheckLocalFlags(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) {