diff options
| author | huderlem <huderlem@gmail.com> | 2020-01-13 19:33:47 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 19:33:47 -0600 |
| commit | 6d6c57f3832c14aadd07b9d39c658c838fcd42cf (patch) | |
| tree | eb87fc3634991f5ce401b25dfca9968ee5c36f69 | |
| parent | fa5816915d2a089549bfae3851c36336eae35d43 (diff) | |
| parent | 96720db08319d8f69d7864e186722d13dc9ceb05 (diff) | |
Merge pull request #953 from GriffinRichards/sync-script
Port some macro/script fixes from pokefirered
117 files changed, 604 insertions, 637 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 5865856c3..abb2eb13a 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -469,14 +469,14 @@ .endm @ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and VAR_RESULT will be set to TRUE; otherwise, VAR_RESULT is set to FALSE. - .macro giveitem index:req, quantity:req + .macro additem index:req, quantity=1 .byte 0x44 .2byte \index .2byte \quantity .endm @ Removes quantity of item index from the player's Bag. - .macro takeitem index:req, quantity:req + .macro removeitem index:req, quantity=1 .byte 0x45 .2byte \index .2byte \quantity @@ -503,7 +503,7 @@ .endm @ Adds a quantity amount of item index to the player's PC. Both arguments can be variables. - .macro givepcitem index:req, quantity:req + .macro addpcitem index:req, quantity:req .byte 0x49 .2byte \index .2byte \quantity @@ -517,13 +517,13 @@ .endm @ Adds decoration to the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.) - .macro givedecoration decoration:req + .macro adddecoration decoration:req .byte 0x4b .2byte \decoration .endm @ Removes a decoration from the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.) - .macro takedecoration decoration:req + .macro removedecoration decoration:req .byte 0x4c .2byte \decoration .endm @@ -1050,14 +1050,14 @@ .endm @ If check is 0x00, this command adds value to the player's money. - .macro givemoney value:req, check:req + .macro addmoney value:req, check:req .byte 0x90 .4byte \value .byte \check .endm @ If check is 0x00, this command subtracts value from the player's money. - .macro takemoney value:req, check:req + .macro removemoney value:req, check:req .byte 0x91 .4byte \value .byte \check @@ -1281,12 +1281,12 @@ .2byte \out .endm - .macro givecoins count:req + .macro addcoins count:req .byte 0xb4 .2byte \count .endm - .macro takecoins count:req + .macro removecoins count:req .byte 0xb5 .2byte \count .endm @@ -1564,12 +1564,12 @@ .macro goto_if_unset flag:req, dest:req checkflag \flag - goto_if 0, \dest + goto_if FALSE, \dest .endm .macro goto_if_set flag:req, dest:req checkflag \flag - goto_if 1, \dest + goto_if TRUE, \dest .endm .macro goto_if_lt dest:req @ LESS THAN @@ -1598,12 +1598,12 @@ .macro call_if_unset flag:req, dest:req checkflag \flag - call_if 0, \dest + call_if FALSE, \dest .endm .macro call_if_set flag:req, dest:req checkflag \flag - call_if 1, \dest + call_if TRUE, \dest .endm .macro call_if_lt dest:req @ LESS THAN @@ -1631,11 +1631,41 @@ .endm .macro vgoto_if_eq dest:req - vgoto_if 1, \dest + vgoto_if TRUE, \dest .endm .macro vgoto_if_ne dest:req - vgoto_if 0, \dest + vgoto_if FALSE, \dest + .endm + + .macro vgoto_if_unset flag:req, dest:req + checkflag \flag + vgoto_if FALSE, \dest + .endm + + .macro vgoto_if_set flag:req, dest:req + checkflag \flag + vgoto_if TRUE, \dest + .endm + + .macro goto_if_defeated trainer:req, dest:req + checktrainerflag \trainer + goto_if TRUE, \dest + .endm + + .macro goto_if_not_defeated trainer:req, dest:req + checktrainerflag \trainer + goto_if FALSE, \dest + .endm + + .macro call_if_defeated trainer:req, dest:req + checktrainerflag \trainer + call_if TRUE, \dest + .endm + + .macro call_if_not_defeated trainer:req, dest:req + checktrainerflag \trainer + call_if FALSE, \dest .endm .macro switch var:req @@ -1663,19 +1693,19 @@ callstd \type .endm - .macro giveitem_std item:req, amount=1 + .macro giveitem item:req, amount=1 setorcopyvar VAR_0x8000, \item setorcopyvar VAR_0x8001, \amount callstd STD_OBTAIN_ITEM .endm - .macro finditem_std item:req, amount=1 + .macro finditem item:req, amount=1 setorcopyvar VAR_0x8000, \item setorcopyvar VAR_0x8001, \amount callstd STD_FIND_ITEM .endm - .macro givedecoration_std decoration:req + .macro givedecoration decoration:req setorcopyvar VAR_0x8000, \decoration callstd STD_OBTAIN_DECORATION .endm diff --git a/data/event_scripts.s b/data/event_scripts.s index 2d56bae9f..58dd1951f 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -570,65 +570,8 @@ gStdScripts_End:: @ 81DC2CC .include "data/maps/Route119_House/scripts.inc" .include "data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc" -@ Below could be split as std_msgbox.inc but autoclose straddles trainer_battle.inc -Std_MsgboxNPC: @ 8271315 - lock - faceplayer - message 0x0 - waitmessage - waitbuttonpress - release - return - -Std_MsgboxSign: @ 8271320 - lockall - message 0x0 - waitmessage - waitbuttonpress - releaseall - return - -Std_MsgboxDefault: @ 827132A - message 0x0 - waitmessage - waitbuttonpress - return - -Std_MsgboxYesNo: @ 8271332 - message 0x0 - waitmessage - yesnobox 20, 8 - return - -Std_MsgboxGetPoints: @ 827133C - message 0x0 - playfanfare MUS_ME_POINTGET - waitfanfare - waitmessage - return - -Std_10: @ 8271347 - pokenavcall 0x0 - waitmessage - return - -EventScript_UnusedReturn: @ 827134E - return - -Common_EventScript_SaveGame:: @ 827134F - special SaveGame - waitstate - return - + .include "data/scripts/std_msgbox.inc" .include "data/scripts/trainer_battle.inc" - -Std_MsgboxAutoclose:: @ 8271494 - message 0x0 - waitmessage - waitbuttonpress - release - return - .include "data/scripts/new_game.inc" .include "data/scripts/hall_of_fame.inc" @@ -844,7 +787,7 @@ EventScript_UnusedBoardFerry:: @ 827222B delay 30 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - showobjectat 255, MAP_PETALBURG_CITY + showobjectat EVENT_OBJ_ID_PLAYER, 0 delay 30 applymovement EVENT_OBJ_ID_PLAYER, Movement_UnusedBoardFerry waitmovement 0 @@ -861,7 +804,7 @@ Common_EventScript_FerryDepartIsland:: @ 8272250 compare VAR_FACING, DIR_WEST call_if_eq Ferry_EventScript_DepartIslandWest delay 30 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, 0 call Common_EventScript_FerryDepart return @@ -880,7 +823,7 @@ Common_EventScript_PlayerHandedOverTheItem:: @ 82723E4 message gText_PlayerHandedOverTheItem waitmessage waitfanfare - takeitem VAR_0x8004, 1 + removeitem VAR_0x8004 return .include "data/scripts/elite_four.inc" diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index c56951a03..94ed2ef7e 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -32,7 +32,7 @@ AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor:: @ 8237DC8 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked msgbox AbandonedShip_Corridors_B1F_Text_InsertedStorageKey, MSGBOX_DEFAULT playse SE_PIN - takeitem ITEM_STORAGE_KEY, 1 + removeitem ITEM_STORAGE_KEY setflag FLAG_USED_STORAGE_KEY call AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom special DrawWholeMapView diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index 5fc4160f8..612d46a9a 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -58,7 +58,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door:: @ 8238A19 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN - takeitem ITEM_ROOM_1_KEY, 1 + removeitem ITEM_ROOM_1_KEY setflag FLAG_USED_ROOM_1_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1 special DrawWholeMapView @@ -73,7 +73,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door:: @ 8238A50 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN - takeitem ITEM_ROOM_2_KEY, 1 + removeitem ITEM_ROOM_2_KEY setflag FLAG_USED_ROOM_2_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2 special DrawWholeMapView @@ -88,7 +88,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door:: @ 8238A87 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN - takeitem ITEM_ROOM_4_KEY, 1 + removeitem ITEM_ROOM_4_KEY setflag FLAG_USED_ROOM_4_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4 special DrawWholeMapView @@ -103,7 +103,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door:: @ 8238ABE goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN - takeitem ITEM_ROOM_6_KEY, 1 + removeitem ITEM_ROOM_6_KEY setflag FLAG_USED_ROOM_6_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6 special DrawWholeMapView diff --git a/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc index a822c463b..f0fb42bb4 100644 --- a/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc +++ b/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc @@ -40,7 +40,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor:: @ 825F0E5 goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_NoRoomForDecor copyvar VAR_0x8004, VAR_0x8008 special TakeFrontierBattlePoints - givedecoration VAR_0x8009 + adddecoration VAR_0x8009 special UpdateBattlePointsWindow playse SE_REGI msgbox BattleFrontier_ExchangeServiceCorner_Text_WellSendItToPC, MSGBOX_DEFAULT @@ -61,7 +61,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem:: @ 825F12A goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_BagFull copyvar VAR_0x8004, VAR_0x8008 special TakeFrontierBattlePoints - giveitem VAR_0x8009, 1 + additem VAR_0x8009 special UpdateBattlePointsWindow playse SE_REGI msgbox BattleFrontier_ExchangeServiceCorner_Text_HereIsYourPrize, MSGBOX_DEFAULT diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index 0f3663f1a..e4b0c28e9 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -32,7 +32,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckSilverSymbols:: @ 8263704 goto_if_unset FLAG_SYS_PIKE_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield goto_if_unset FLAG_SYS_PYRAMID_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield msgbox BattleFrontier_ScottsHouse_Text_YouveCollectedAllSilverSymbols, MSGBOX_DEFAULT - giveitem_std ITEM_LANSAT_BERRY + giveitem ITEM_LANSAT_BERRY compare VAR_RESULT, FALSE goto_if_eq BattleFrontier_ScottsHouse_EventScript_BerryPocketFull setflag FLAG_COLLECTED_ALL_SILVER_SYMBOLS @@ -49,7 +49,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckGoldSymbols:: @ 826376A goto_if_unset FLAG_SYS_PIKE_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield goto_if_unset FLAG_SYS_PYRAMID_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield msgbox BattleFrontier_ScottsHouse_Text_YouveCollectedAllGoldSymbols, MSGBOX_DEFAULT - giveitem_std ITEM_STARF_BERRY + giveitem ITEM_STARF_BERRY compare VAR_RESULT, FALSE goto_if_eq BattleFrontier_ScottsHouse_EventScript_BerryPocketFull setflag FLAG_COLLECTED_ALL_GOLD_SYMBOLS @@ -102,7 +102,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckGiveSilverShield:: @ 826381B BattleFrontier_ScottsHouse_EventScript_GiveSilverShield:: @ 826387A msgbox BattleFrontier_ScottsHouse_Text_Beat50TrainersInARow, MSGBOX_DEFAULT - givedecoration_std DECOR_SILVER_SHIELD + givedecoration DECOR_SILVER_SHIELD compare VAR_RESULT, FALSE goto_if_eq BattleFrontier_ScottsHouse_EventScript_NoRoomForShield setflag FLAG_RECEIVED_SILVER_SHIELD @@ -135,7 +135,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckGiveGoldShield:: @ 82638B4 BattleFrontier_ScottsHouse_EventScript_GiveGoldShield:: @ 8263913 msgbox BattleFrontier_ScottsHouse_Text_Beat100TrainersInARow, MSGBOX_DEFAULT - givedecoration_std DECOR_GOLD_SHIELD + givedecoration DECOR_GOLD_SHIELD compare VAR_RESULT, FALSE goto_if_eq BattleFrontier_ScottsHouse_EventScript_NoRoomForShield setflag FLAG_RECEIVED_GOLD_SHIELD diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc index 437f5de4b..bba7dfe08 100644 --- a/data/maps/DesertUnderpass/scripts.inc +++ b/data/maps/DesertUnderpass/scripts.inc @@ -15,13 +15,13 @@ DesertUnderpass_EventScript_Fossil:: @ 823AF41 end DesertUnderpass_EventScript_GiveClawFossil:: @ 823AF57 - giveitem_std ITEM_CLAW_FOSSIL + giveitem ITEM_CLAW_FOSSIL removeobject 1 release end DesertUnderpass_EventScript_GiveRootFossil:: @ 823AF68 - giveitem_std ITEM_ROOT_FOSSIL + giveitem ITEM_ROOT_FOSSIL removeobject 1 release end diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 137b394b1..62bd15063 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -83,7 +83,7 @@ DewfordTown_EventScript_OldRodFisherman:: @ 81E95D5 DewfordTown_EventScript_GiveOldRod:: @ 81E95FF msgbox DewfordTown_Text_GiveYouOneOfMyRods, MSGBOX_DEFAULT - giveitem_std ITEM_OLD_ROD + giveitem ITEM_OLD_ROD setflag FLAG_RECEIVED_OLD_ROD msgbox DewfordTown_Text_ThrowInFishingAdvice, MSGBOX_DEFAULT release diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 9ddd4aa1d..98acc97dc 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -7,8 +7,7 @@ DewfordTown_Gym_OnTransition: @ 81FC642 end DewfordTown_Gym_EventScript_SetFlashRadius:: @ 81FC648 - checktrainerflag TRAINER_BRAWLY_1 - goto_if_eq DewfordTown_Gym_EventScript_SetLightsOn + goto_if_defeated TRAINER_BRAWLY_1, DewfordTown_Gym_EventScript_SetLightsOn call DewfordTown_Gym_EventScript_CountTrainersDefeated copyvar VAR_0x8001, VAR_0x8000 compare VAR_0x8000, 0 @@ -124,28 +123,22 @@ DewfordTown_Gym_EventScript_AnimateFlashFullBrightness:: @ 81FC75D DewfordTown_Gym_EventScript_CountTrainersDefeated:: @ 81FC768 setvar VAR_0x8000, 0 - checktrainerflag TRAINER_TAKAO - goto_if_lt DewfordTown_Gym_EventScript_CheckJocelyn + goto_if_not_defeated TRAINER_TAKAO, DewfordTown_Gym_EventScript_CheckJocelyn addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_CheckJocelyn:: @ 81FC77B - checktrainerflag TRAINER_JOCELYN - goto_if_lt DewfordTown_Gym_EventScript_CheckLaura + goto_if_not_defeated TRAINER_JOCELYN, DewfordTown_Gym_EventScript_CheckLaura addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_CheckLaura:: @ 81FC789 - checktrainerflag TRAINER_LAURA - goto_if_lt DewfordTown_Gym_EventScript_CheckBrenden + goto_if_not_defeated TRAINER_LAURA, DewfordTown_Gym_EventScript_CheckBrenden addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_CheckBrenden:: @ 81FC797 - checktrainerflag TRAINER_BRENDEN - goto_if_lt DewfordTown_Gym_EventScript_CheckCristian + goto_if_not_defeated TRAINER_BRENDEN, DewfordTown_Gym_EventScript_CheckCristian addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_CheckCristian:: @ 81FC7A5 - checktrainerflag TRAINER_CRISTIAN - goto_if_lt DewfordTown_Gym_EventScript_CheckLilith + goto_if_not_defeated TRAINER_CRISTIAN, DewfordTown_Gym_EventScript_CheckLilith addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_CheckLilith:: @ 81FC7B3 - checktrainerflag TRAINER_LILITH - goto_if_lt DewfordTown_Gym_EventScript_StopCountingTrainers + goto_if_not_defeated TRAINER_LILITH, DewfordTown_Gym_EventScript_StopCountingTrainers addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_StopCountingTrainers:: @ 81FC7C1 return @@ -188,7 +181,7 @@ DewfordTown_Gym_EventScript_BrawlyDefeated:: @ 81FC7F7 end DewfordTown_Gym_EventScript_GiveBulkUp:: @ 81FC855 - giveitem_std ITEM_TM08 + giveitem ITEM_TM08 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_BagIsFull msgbox DewfordTown_Gym_Text_ExplainBulkUp, MSGBOX_DEFAULT @@ -196,7 +189,7 @@ DewfordTown_Gym_EventScript_GiveBulkUp:: @ 81FC855 return DewfordTown_Gym_EventScript_GiveBulkUp2: @ 81FC878 - giveitem_std ITEM_TM08 + giveitem ITEM_TM08 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull msgbox DewfordTown_Gym_Text_ExplainBulkUp, MSGBOX_DEFAULT diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 9f9a36d99..6065bc957 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -254,7 +254,7 @@ DewfordTown_Hall_EventScript_SludgeBombMan:: @ 81FD7DA call Common_EventScript_BufferTrendyPhrase goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_ReceivedSludgeBomb msgbox DewfordTown_Hall_Text_GiveYouSludgeBomb, MSGBOX_DEFAULT - giveitem_std ITEM_TM36 + giveitem ITEM_TM36 compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM36 diff --git a/data/maps/DewfordTown_House2/scripts.inc b/data/maps/DewfordTown_House2/scripts.inc index 43d2c1b5e..4a57cfdcf 100644 --- a/data/maps/DewfordTown_House2/scripts.inc +++ b/data/maps/DewfordTown_House2/scripts.inc @@ -6,7 +6,7 @@ DewfordTown_House2_EventScript_Man:: @ 81FE22E faceplayer goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_ExplainSilkScarf msgbox DewfordTown_House2_Text_WantYouToHaveSilkScarf, MSGBOX_DEFAULT - giveitem_std ITEM_SILK_SCARF + giveitem ITEM_SILK_SCARF compare VAR_RESULT, FALSE goto_if_eq DewfordTown_House2_EventScript_NoRoomForScarf setflag FLAG_RECEIVED_SILK_SCARF diff --git a/data/maps/FallarborTown_CozmosHouse/scripts.inc b/data/maps/FallarborTown_CozmosHouse/scripts.inc index 224147bc5..3f4db18d3 100644 --- a/data/maps/FallarborTown_CozmosHouse/scripts.inc +++ b/data/maps/FallarborTown_CozmosHouse/scripts.inc @@ -18,7 +18,7 @@ FallarborTown_CozmosHouse_EventScript_PlayerHasMeteorite:: @ 8200F38 compare VAR_RESULT, NO goto_if_eq FallarborTown_CozmosHouse_EventScript_DeclineGiveMeteorite msgbox FallarborTown_CozmosHouse_Text_PleaseUseThisTM, MSGBOX_DEFAULT - giveitem_std ITEM_TM27 + giveitem ITEM_TM27 compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setvar VAR_0x8004, ITEM_METEORITE diff --git a/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc b/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc index 788ee088d..ac0f42f20 100644 --- a/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc +++ b/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc @@ -42,7 +42,7 @@ FallarborTown_MoveRelearnersHouse_EventScript_ChooseMove:: @ 820140C compare VAR_0x8004, 0 goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon msgbox FallarborTown_MoveRelearnersHouse_Text_HandedOverHeartScale, MSGBOX_DEFAULT - takeitem ITEM_HEART_SCALE, 1 + removeitem ITEM_HEART_SCALE goto FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale end diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 88fbe8b92..15e359175 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -49,7 +49,7 @@ FortreeCity_Gym_EventScript_WinonaDefeated:: @ 82165FD end FortreeCity_Gym_EventScript_GiveAerialAce2:: @ 8216646 - giveitem_std ITEM_TM40 + giveitem ITEM_TM40 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT @@ -58,7 +58,7 @@ FortreeCity_Gym_EventScript_GiveAerialAce2:: @ 8216646 end FortreeCity_Gym_EventScript_GiveAerialAce:: @ 821666A - giveitem_std ITEM_TM40 + giveitem ITEM_TM40 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_BagIsFull msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index bfbe40ff4..98b8272fe 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -19,7 +19,7 @@ FortreeCity_House2_EventScript_HiddenPowerGiver:: @ 82177CB switch VAR_RESULT case 0, FortreeCity_House2_EventScript_WrongGuess msgbox FortreeCity_House2_Text_YourHiddenPowerHasAwoken, MSGBOX_DEFAULT - giveitem_std ITEM_TM10 + giveitem ITEM_TM10 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM10 diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index b050ba3f9..be5ff9c6e 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -31,7 +31,7 @@ FortreeCity_House4_EventScript_WingullReturned:: @ 8217CD8 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb, MSGBOX_DEFAULT - giveitem_std ITEM_MENTAL_HERB + giveitem ITEM_MENTAL_HERB compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MENTAL_HERB diff --git a/data/maps/GraniteCave_1F/scripts.inc b/data/maps/GraniteCave_1F/scripts.inc index 9aa0332f7..a35147691 100644 --- a/data/maps/GraniteCave_1F/scripts.inc +++ b/data/maps/GraniteCave_1F/scripts.inc @@ -6,7 +6,7 @@ GraniteCave_1F_EventScript_Hiker:: @ 822DA5E faceplayer goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_ReceivedFlash msgbox GraniteCave_1F_Text_GetsDarkAheadHereYouGo, MSGBOX_DEFAULT - giveitem_std ITEM_HM05 + giveitem ITEM_HM05 setflag FLAG_RECEIVED_HM05 msgbox GraniteCave_1F_Text_ExplainFlash, MSGBOX_DEFAULT release diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index 0456f5eaf..1e8c44766 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -9,7 +9,7 @@ GraniteCave_StevensRoom_EventScript_Steven:: @ 822DC7B call Common_EventScript_PlayerHandedOverTheItem setflag FLAG_DELIVERED_STEVEN_LETTER msgbox GraniteCave_StevensRoom_Text_ThankYouTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_TM47 + giveitem ITEM_TM47 compare VAR_RESULT, FALSE call_if_eq GraniteCave_StevensRoom_EventScript_BagFull msgbox GraniteCave_StevensRoom_Text_CouldBecomeChampionLetsRegister, MSGBOX_DEFAULT diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index dc45f94d4..5d86f3652 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -70,7 +70,7 @@ LavaridgeTown_EventScript_RivalGiveGoGoggles:: @ 81EA551 LavaridgeTown_EventScript_MayGiveGoGoggles:: @ 81EA5B5 msgbox LavaridgeTown_Text_MayNiceBadgesTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_GO_GOGGLES + giveitem ITEM_GO_GOGGLES setflag FLAG_RECEIVED_GO_GOGGLES msgbox LavaridgeTown_Text_MayExplainGoGogglesChallengeDad, MSGBOX_DEFAULT goto LavaridgeTown_EventScript_RivalExit @@ -78,7 +78,7 @@ LavaridgeTown_EventScript_MayGiveGoGoggles:: @ 81EA5B5 LavaridgeTown_EventScript_BrendanGiveGoGoggles:: @ 81EA5DA msgbox LavaridgeTown_Text_BrendanNiceBadgesTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_GO_GOGGLES + giveitem ITEM_GO_GOGGLES setflag FLAG_RECEIVED_GO_GOGGLES msgbox LavaridgeTown_Text_BrendanExplainGoGogglesChallengeDad, MSGBOX_DEFAULT goto LavaridgeTown_EventScript_RivalExit diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 539917a90..904abfae9 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -14,39 +14,31 @@ LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars:: @ 81FE705 setvar VAR_TEMP_D, 0 setvar VAR_TEMP_E, 0 setvar VAR_TEMP_F, 0 - checktrainerflag TRAINER_COLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar + goto_if_defeated TRAINER_COLE LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar setvar VAR_TEMP_B, 1 LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar:: @ 81FE72C - checktrainerflag TRAINER_GERALD - goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar + goto_if_defeated TRAINER_GERALD, LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar setvar VAR_TEMP_C, 1 LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar:: @ 81FE73A - checktrainerflag TRAINER_AXLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar + goto_if_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar setvar VAR_TEMP_D, 1 LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar:: @ 81FE748 - checktrainerflag TRAINER_DANIELLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars + goto_if_defeated TRAINER_DANIELLE, LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars setvar VAR_TEMP_E, 1 LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars:: @ 81FE756 return LavaridgeTown_Gym_1F_EventScript_CheckHideTrainers:: @ 81FE757 - checktrainerflag TRAINER_COLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideGerald + goto_if_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_CheckHideGerald setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_1F_EventScript_CheckHideGerald:: @ 81FE764 - checktrainerflag TRAINER_GERALD - goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideAxle + goto_if_defeated TRAINER_GERALD, LavaridgeTown_Gym_1F_EventScript_CheckHideAxle setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_1F_EventScript_CheckHideAxle:: @ 81FE771 - checktrainerflag TRAINER_AXLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle + goto_if_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle:: @ 81FE77E - checktrainerflag TRAINER_DANIELLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers + goto_if_defeated TRAINER_DANIELLE, LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers setobjectmovementtype 5, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers:: @ 81FE78B return @@ -89,7 +81,7 @@ LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated:: @ 81FE7C1 end LavaridgeTown_Gym_1F_EventScript_GiveOverheat2:: @ 81FE81D - giveitem_std ITEM_TM50 + giveitem ITEM_TM50 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull msgbox LavaridgeTown_Gym_1F_Text_ExplainOverheat, MSGBOX_DEFAULT @@ -98,7 +90,7 @@ LavaridgeTown_Gym_1F_EventScript_GiveOverheat2:: @ 81FE81D end LavaridgeTown_Gym_1F_EventScript_GiveOverheat:: @ 81FE841 - giveitem_std ITEM_TM50 + giveitem ITEM_TM50 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_BagIsFull msgbox LavaridgeTown_Gym_1F_Text_ExplainOverheat, MSGBOX_DEFAULT diff --git a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc index 9be4e2975..3a8f71fad 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc @@ -13,39 +13,31 @@ LavaridgeTown_Gym_B1F_EventScript_SetTrainerTempVars:: @ 81FF88F setvar VAR_TEMP_8, 0 setvar VAR_TEMP_9, 0 setvar VAR_TEMP_A, 0 - checktrainerflag TRAINER_KEEGAN - goto_if_eq LavaridgeTown_Gym_B1F_EventScript_SetJaceTempVar + goto_if_defeated TRAINER_KEEGAN, LavaridgeTown_Gym_B1F_EventScript_SetJaceTempVar setvar VAR_TEMP_7, 1 LavaridgeTown_Gym_B1F_EventScript_SetJaceTempVar:: @ 81FF8B1 - checktrainerflag TRAINER_JACE - goto_if_eq LavaridgeTown_Gym_B1F_EventScript_SetJeffTempVar + goto_if_defeated TRAINER_JACE, LavaridgeTown_Gym_B1F_EventScript_SetJeffTempVar setvar VAR_TEMP_8, 1 LavaridgeTown_Gym_B1F_EventScript_SetJeffTempVar:: @ 81FF8BF - checktrainerflag TRAINER_JEFF - goto_if_eq LavaridgeTown_Gym_B1F_EventScript_SetEliTempVar + goto_if_defeated TRAINER_JEFF, LavaridgeTown_Gym_B1F_EventScript_SetEliTempVar setvar VAR_TEMP_9, 1 LavaridgeTown_Gym_B1F_EventScript_SetEliTempVar:: @ 81FF8CD - checktrainerflag TRAINER_ELI - goto_if_eq LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars + goto_if_defeated TRAINER_ELI, LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars setvar VAR_TEMP_A, 1 LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars:: @ 81FF8DB return LavaridgeTown_Gym_B1F_EventScript_CheckHideTrainers:: @ 81FF8DC - checktrainerflag TRAINER_KEEGAN - goto_if_eq LavaridgeTown_Gym_B1F_EventScript_CheckHideJace + goto_if_defeated TRAINER_KEEGAN, LavaridgeTown_Gym_B1F_EventScript_CheckHideJace setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_B1F_EventScript_CheckHideJace:: @ 81FF8E9 - checktrainerflag TRAINER_JACE - goto_if_eq LavaridgeTown_Gym_B1F_EventScript_CheckHideJeff + goto_if_defeated TRAINER_JACE, LavaridgeTown_Gym_B1F_EventScript_CheckHideJeff setobjectmovementtype 1, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_B1F_EventScript_CheckHideJeff:: @ 81FF8F6 - checktrainerflag TRAINER_JEFF - goto_if_eq LavaridgeTown_Gym_B1F_EventScript_CheckHideEli + goto_if_defeated TRAINER_JEFF, LavaridgeTown_Gym_B1F_EventScript_CheckHideEli setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_B1F_EventScript_CheckHideEli:: @ 81FF903 - checktrainerflag TRAINER_ELI - goto_if_eq LavaridgeTown_Gym_B1F_EventScript_EndCheckHideTrainers + goto_if_defeated TRAINER_ELI, LavaridgeTown_Gym_B1F_EventScript_EndCheckHideTrainers setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_B1F_EventScript_EndCheckHideTrainers:: @ 81FF910 return diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index c32468589..5f320a942 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -30,7 +30,7 @@ LavaridgeTown_HerbShop_EventScript_OldMan:: @ 81FE505 faceplayer goto_if_set FLFLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_ExplainCharcoal msgbox LavaridgeTown_HerbShop_Text_YouveComeToLookAtHerbalMedicine, MSGBOX_DEFAULT - giveitem_std ITEM_CHARCOAL + giveitem ITEM_CHARCOAL compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLFLAG_RECEIVED_CHARCOAL diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index ea0017f3c..fb3775f95 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -38,7 +38,7 @@ LilycoveCity_EventScript_BerryGentleman:: @ 81E2BD8 msgbox LilycoveCity_Text_BerrySuitsYou, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, FIRST_BERRY_INDEX - giveitem_std VAR_RESULT + giveitem VAR_RESULT compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_LILYCOVE_RECEIVED_BERRY diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index bdfce4325..3dd3259c7 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -360,7 +360,7 @@ LilycoveCity_ContestLobby_EventScript_SetMasterContestType:: @ 821A5C9 LilycoveCity_ContestLobby_EventScript_SetDebug:: @ 821A5CF setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1 - giveitem ITEM_CONTEST_PASS, 1 + additem ITEM_CONTEST_PASS setvar VAR_0x800B, 8 setvar VAR_CONTEST_RANK, CONTEST_RANK_MASTER setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 906286bc7..12cb4727c 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -113,16 +113,16 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyLemonade:: @ 8220313 checkmoney 350, 0 return -LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyFreshWater:: @ 822031A - takemoney 200, 0 +LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneyFreshWater:: @ 822031A + removemoney 200, 0 return -LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneySodaPop:: @ 8220321 - takemoney 300, 0 +LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneySodaPop:: @ 8220321 + removemoney 300, 0 return -LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyLemonade:: @ 8220328 - takemoney 350, 0 +LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneyLemonade:: @ 8220328 + removemoney 350, 0 return LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F @@ -138,16 +138,16 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F compare VAR_RESULT, FALSE goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink compare VAR_TEMP_1, 0 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyFreshWater + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneyFreshWater compare VAR_TEMP_1, 1 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneySodaPop + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneySodaPop compare VAR_TEMP_1, 2 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyLemonade + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneyLemonade updatemoneybox 0, 0 bufferitemname 0, VAR_TEMP_0 playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_CanOfDrinkDroppedDown, MSGBOX_DEFAULT - giveitem VAR_TEMP_0, 1 + additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, STDSTRING_ITEMS msgbox gText_PutItemInPocket, MSGBOX_DEFAULT @@ -159,7 +159,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown, MSGBOX_DEFAULT - giveitem VAR_TEMP_0, 1 + additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, STDSTRING_ITEMS msgbox gText_PutItemInPocket, MSGBOX_DEFAULT @@ -171,7 +171,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown, MSGBOX_DEFAULT - giveitem VAR_TEMP_0, 1 + additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, STDSTRING_ITEMS msgbox gText_PutItemInPocket, MSGBOX_DEFAULT diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index 117dc6034..a3cf54ee0 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -48,7 +48,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_LotteryClerk:: @ 821F69C call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_FourDigitMatch compare VAR_0x8004, 4 call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_FullMatch - giveitem_std VAR_0x8005 + giveitem VAR_0x8005 compare VAR_RESULT, FALSE goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_RecordPrizeNoRoom special TryPutLotteryWinnerReportOnAir @@ -112,7 +112,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_NoRoomForPrize:: @ 821F7ED LilycoveCity_DepartmentStore_1F_EventScript_GivePrizeFromEarlier:: @ 821F7F7 msgbox LilycoveCity_DepartmentStore_1F_Text_PrizeWeveBeenHolding, MSGBOX_DEFAULT - giveitem_std VAR_POKELOT_PRIZE_ITEM + giveitem VAR_POKELOT_PRIZE_ITEM compare VAR_RESULT, FALSE goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_NoRoomForPrize copyvar VAR_0x8004, VAR_POKELOT_PRIZE_PLACE diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 1c2bf07ea..355b813de 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -364,7 +364,7 @@ LilycoveCity_Harbor_EventScript_BoardFerryWithSailor:: @ 821E514 compare VAR_FACING, DIR_EAST call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast delay 30 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, 0 setvar VAR_0x8004, 2 call Common_EventScript_FerryDepart return @@ -428,7 +428,7 @@ LilycoveCity_Harbor_EventScript_BoardFerry:: @ 821E5CC compare VAR_FACING, DIR_EAST call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast delay 30 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, 0 setvar VAR_0x8004, 2 call Common_EventScript_FerryDepart return diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc index 517ba0434..29d741abd 100644 --- a/data/maps/LilycoveCity_House2/scripts.inc +++ b/data/maps/LilycoveCity_House2/scripts.inc @@ -6,7 +6,7 @@ LilycoveCity_House2_EventScript_FatMan:: @ 821ED75 faceplayer goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_ReceivedRest msgbox LilycoveCity_House2_Text_NotAwakeYetHaveThis, MSGBOX_DEFAULT - giveitem_std ITEM_TM44 + giveitem ITEM_TM44 compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM44 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index f3328a979..0d06d8af4 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -118,7 +118,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_ThankPlayer:: @ 82198C3 LilycoveCity_LilycoveMuseum_2F_EventScript_GiveGlassOrnament:: @ 82198EA applymovement 1, Common_Movement_FacePlayer msgbox LilycoveCity_LilycoveMuseum_2F_Text_TokenOfGratitude, MSGBOX_DEFAULT - givedecoration_std DECOR_GLASS_ORNAMENT + givedecoration DECOR_GLASS_ORNAMENT compare VAR_RESULT, FALSE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_NoRoomForGlassOrnament setflag FLAG_RECEIVED_GLASS_ORNAMENT diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index cb2589ed2..72b7b1050 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -167,7 +167,7 @@ LittlerootTown_EventScript_GoInsideWithMom:: @ 81E7F17 waitmovement 0 setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE setvar VAR_LITTLEROOT_INTRO_STATE, 3 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, 0 closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index b27cb1f8a..f6ed7d8ca 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -563,7 +563,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex:: @ 81FA2F8 LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls:: @ 81FA352 msgbox LittlerootTown_ProfessorBirchsLab_Text_MayGotPokedexTooTakeThese, MSGBOX_DEFAULT - giveitem_std ITEM_POKE_BALL, 5 + giveitem ITEM_POKE_BALL, 5 compare VAR_RESULT, FALSE call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayNoRoomForPokeBalls msgbox LittlerootTown_ProfessorBirchsLab_Text_CatchCutePokemonWithPokeBalls, MSGBOX_DEFAULT @@ -572,7 +572,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls:: @ 81FA352 LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls:: @ 81FA37F msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanGotPokedexTooTakeThese, MSGBOX_DEFAULT - giveitem_std ITEM_POKE_BALL, 5 + giveitem ITEM_POKE_BALL, 5 compare VAR_RESULT, FALSE call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanNoRoomForPokeBalls msgbox LittlerootTown_ProfessorBirchsLab_Text_CatchCoolPokemonWithPokeBalls, MSGBOX_DEFAULT diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 9c83d8098..fac5e84ce 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -425,7 +425,7 @@ MauvilleCity_EventScript_Wattson:: @ 81DF73A goto_if_eq MauvilleCity_EventScript_CompletedNewMauville goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_BegunNewMauville msgbox MauvilleCity_Text_WattsonNeedFavorTakeKey, MSGBOX_DEFAULT - giveitem_std ITEM_BASEMENT_KEY + giveitem ITEM_BASEMENT_KEY setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON msgbox MauvilleCity_Text_WattsonWontBeChallenge, MSGBOX_DEFAULT release @@ -438,7 +438,7 @@ MauvilleCity_EventScript_BegunNewMauville:: @ 81DF77A MauvilleCity_EventScript_CompletedNewMauville:: @ 81DF784 msgbox MauvilleCity_Text_WattsonThanksTakeTM, MSGBOX_DEFAULT - giveitem_std ITEM_TM24 + giveitem ITEM_TM24 compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_GOT_TM24_FROM_WATTSON diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc index 4b0372eac..ffde9583b 100644 --- a/data/maps/MauvilleCity_BikeShop/scripts.inc +++ b/data/maps/MauvilleCity_BikeShop/scripts.inc @@ -44,13 +44,13 @@ MauvilleCity_BikeShop_EventScript_YesFar:: @ 820EC4A MauvilleCity_BikeShop_EventScript_GetMachBike:: @ 820EC53 msgbox MauvilleCity_BikeShop_Text_ChoseMachBike, MSGBOX_DEFAULT - giveitem_std ITEM_MACH_BIKE + giveitem ITEM_MACH_BIKE goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes end MauvilleCity_BikeShop_EventScript_GetAcroBike:: @ 820EC6D msgbox MauvilleCity_BikeShop_Text_ChoseAcroBike, MSGBOX_DEFAULT - giveitem_std ITEM_ACRO_BIKE + giveitem ITEM_ACRO_BIKE goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes end @@ -89,16 +89,16 @@ MauvilleCity_BikeShop_EventScript_KeepBike:: @ 820ECE5 MauvilleCity_BikeShop_EventScript_SwitchAcroForMach:: @ 820ECEF incrementgamestat GAME_STAT_TRADED_BIKES msgbox MauvilleCity_BikeShop_Text_ExchangedAcroForMach, MSGBOX_DEFAULT - takeitem ITEM_ACRO_BIKE, 1 - giveitem_std ITEM_MACH_BIKE + removeitem ITEM_ACRO_BIKE + giveitem ITEM_MACH_BIKE goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes end MauvilleCity_BikeShop_EventScript_SwitchMachForAcro:: @ 820ED10 incrementgamestat GAME_STAT_TRADED_BIKES msgbox MauvilleCity_BikeShop_Text_ExchangedMachForAcro, MSGBOX_DEFAULT - takeitem ITEM_MACH_BIKE, 1 - giveitem_std ITEM_ACRO_BIKE + removeitem ITEM_MACH_BIKE + giveitem ITEM_ACRO_BIKE goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes end diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 2bafd056e..3401251cf 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -49,8 +49,8 @@ MauvilleCity_GameCorner_EventScript_Buy50Coins:: @ 820FC33 checkmoney COINS_PRICE_50, 0 compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NotEnoughMoney - givecoins 50 - takemoney COINS_PRICE_50, 0 + addcoins 50 + removemoney COINS_PRICE_50, 0 updatemoneybox 0, 0 updatecoinsbox 1, 6 playse SE_REGI @@ -67,8 +67,8 @@ MauvilleCity_GameCorner_EventScript_Buy500Coins:: @ 820FC75 checkmoney COINS_PRICE_500, 0 compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NotEnoughMoney - givecoins 500 - takemoney COINS_PRICE_500, 0 + addcoins 500 + removemoney COINS_PRICE_500, 0 updatemoneybox 0, 0 updatecoinsbox 1, 6 playse SE_REGI @@ -169,8 +169,8 @@ MauvilleCity_GameCorner_EventScript_BuyTreeckoDoll:: @ 820FDCB checkdecorspace DECOR_TREECKO_DOLL compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForDoll - takecoins DOLL_COINS - givedecoration DECOR_TREECKO_DOLL + removecoins DOLL_COINS + adddecoration DECOR_TREECKO_DOLL updatecoinsbox 1, 1 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT @@ -185,8 +185,8 @@ MauvilleCity_GameCorner_EventScript_BuyTorchicDoll:: @ 820FE05 checkdecorspace DECOR_TORCHIC_DOLL compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForDoll - takecoins DOLL_COINS - givedecoration DECOR_TORCHIC_DOLL + removecoins DOLL_COINS + adddecoration DECOR_TORCHIC_DOLL updatecoinsbox 1, 1 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT @@ -201,8 +201,8 @@ MauvilleCity_GameCorner_EventScript_BuyMudkipDoll:: @ 820FE3F checkdecorspace DECOR_MUDKIP_DOLL compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForDoll - takecoins DOLL_COINS - givedecoration DECOR_MUDKIP_DOLL + removecoins DOLL_COINS + adddecoration DECOR_MUDKIP_DOLL updatecoinsbox 1, 1 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT @@ -309,8 +309,8 @@ MauvilleCity_GameCorner_EventScript_BuyTM32:: @ 820FFDD checkitemspace ITEM_TM32, 1 compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM - takecoins TM32_COINS - giveitem ITEM_TM32, 1 + removecoins TM32_COINS + additem ITEM_TM32 updatecoinsbox 1, 1 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT @@ -324,8 +324,8 @@ MauvilleCity_GameCorner_EventScript_BuyTM29:: @ 8210017 checkitemspace ITEM_TM29, 1 compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM - takecoins TM29_COINS - giveitem ITEM_TM29, 1 + removecoins TM29_COINS + additem ITEM_TM29 updatecoinsbox 1, 1 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT @@ -339,8 +339,8 @@ MauvilleCity_GameCorner_EventScript_BuyTM35:: @ 8210051 checkitemspace ITEM_TM35, 1 compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM - takecoins TM35_COINS - giveitem ITEM_TM35, 1 + removecoins TM35_COINS + additem ITEM_TM35 updatecoinsbox 1, 1 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT @@ -354,8 +354,8 @@ MauvilleCity_GameCorner_EventScript_BuyTM24:: @ 821008B checkitemspace ITEM_TM24, 1 compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM - takecoins TM24_COINS - giveitem ITEM_TM24, 1 + removecoins TM24_COINS + additem ITEM_TM24 updatecoinsbox 1, 1 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT @@ -369,8 +369,8 @@ MauvilleCity_GameCorner_EventScript_BuyTM13:: @ 82100C5 checkitemspace ITEM_TM13, 1 compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM - takecoins TM13_COINS - giveitem ITEM_TM13, 1 + removecoins TM13_COINS + additem ITEM_TM13 updatecoinsbox 1, 1 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT @@ -420,7 +420,7 @@ MauvilleCity_GameCorner_EventScript_GiveTreeckoDoll:: @ 821017C compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll msgbox MauvilleCity_GameCorner_Text_HereYouGo2, MSGBOX_DEFAULT - givedecoration_std DECOR_TREECKO_DOLL + givedecoration DECOR_TREECKO_DOLL setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll end @@ -431,7 +431,7 @@ MauvilleCity_GameCorner_EventScript_GiveTorchicDoll:: @ 82101A6 compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll msgbox MauvilleCity_GameCorner_Text_HereYouGo2, MSGBOX_DEFAULT - givedecoration_std DECOR_TORCHIC_DOLL + givedecoration DECOR_TORCHIC_DOLL setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll end @@ -442,7 +442,7 @@ MauvilleCity_GameCorner_EventScript_GiveMudkipDoll:: @ 82101D0 compare VAR_RESULT, FALSE goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll msgbox MauvilleCity_GameCorner_Text_HereYouGo2, MSGBOX_DEFAULT - givedecoration_std DECOR_MUDKIP_DOLL + givedecoration DECOR_MUDKIP_DOLL setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll end @@ -479,7 +479,7 @@ MauvilleCity_GameCorner_EventScript_TryGive20Coins:: @ 821023D compare VAR_TEMP_1, 1 @ Only give 20 coins if player has no coins goto_if_ge MauvilleCity_GameCorner_EventScript_PokefanMNormal setflag FLAG_RECEIVED_20_COINS - givecoins 20 + addcoins 20 msgbox MauvilleCity_GameCorner_Text_LuckOnlyLastSoLongTakeCoins, MSGBOX_DEFAULT playse SE_REGI goto MauvilleCity_GameCorner_EventScript_PokefanMNormal diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index efc946fdc..1a62fb9df 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -115,7 +115,7 @@ MauvilleCity_Gym_EventScript_WattsonDefeated:: @ 820DF2B end MauvilleCity_Gym_EventScript_GiveShockWave2:: @ 820DF8D - giveitem_std ITEM_TM34 + giveitem ITEM_TM34 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull msgbox MauvilleCity_Gym_Text_ExplainShockWave, MSGBOX_DEFAULT @@ -124,7 +124,7 @@ MauvilleCity_Gym_EventScript_GiveShockWave2:: @ 820DF8D end MauvilleCity_Gym_EventScript_GiveShockWave:: @ 820DFB1 - giveitem_std ITEM_TM34 + giveitem ITEM_TM34 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_BagIsFull msgbox MauvilleCity_Gym_Text_ExplainShockWave, MSGBOX_DEFAULT diff --git a/data/maps/MauvilleCity_House1/scripts.inc b/data/maps/MauvilleCity_House1/scripts.inc index eff01eb94..21655a1b8 100644 --- a/data/maps/MauvilleCity_House1/scripts.inc +++ b/data/maps/MauvilleCity_House1/scripts.inc @@ -6,7 +6,7 @@ MauvilleCity_House1_EventScript_RockSmashDude:: @ 820F976 faceplayer goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_ReceivedRockSmash msgbox MauvilleCity_House1_Text_ImRockSmashDudeTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_HM06 + giveitem ITEM_HM06 setflag FLAG_RECEIVED_HM06 setflag FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY msgbox MauvilleCity_House1_Text_ExplainRockSmash, MSGBOX_DEFAULT diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index 5dbf5d411..06ec830ea 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -27,8 +27,8 @@ MauvilleCity_House2_EventScript_AskToTradeForHarborMail:: @ 8210C82 MauvilleCity_House2_EventScript_AcceptTrade:: @ 8210CB8 msgbox MauvilleCity_House2_Text_IllTradeYouCoinCase, MSGBOX_DEFAULT - takeitem ITEM_HARBOR_MAIL, 1 - giveitem_std ITEM_COIN_CASE + removeitem ITEM_HARBOR_MAIL + giveitem ITEM_COIN_CASE setflag FLAG_RECEIVED_COIN_CASE goto MauvilleCity_House2_EventScript_ReceivedCoinCase end diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc index d23cb160e..ceb78ab45 100644 --- a/data/maps/MirageTower_4F/scripts.inc +++ b/data/maps/MirageTower_4F/scripts.inc @@ -7,7 +7,7 @@ MirageTower_4F_EventScript_RootFossil:: @ 823AD48 msgbox MirageTower_4F_Text_TakeRootFossil, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq MirageTower_4F_EventScript_LeaveRootFossil - giveitem_std ITEM_ROOT_FOSSIL + giveitem ITEM_ROOT_FOSSIL closemessage setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL @@ -28,7 +28,7 @@ MirageTower_4F_EventScript_ClawFossil:: @ 823AD89 msgbox MirageTower_4F_Text_TakeClawFossil, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq MirageTower_4F_EventScript_LeaveClawFossil - giveitem_std ITEM_CLAW_FOSSIL + giveitem ITEM_CLAW_FOSSIL closemessage setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index ce53af427..945a92dfb 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -229,7 +229,7 @@ MossdeepCity_EventScript_KingsRockBoy:: @ 81E4C26 compare VAR_RESULT, NO goto_if_eq MossdeepCity_EventScript_DeclineKingsRock msgbox MossdeepCity_Text_YouCanKeepIt, MSGBOX_DEFAULT - giveitem_std ITEM_KINGS_ROCK + giveitem ITEM_KINGS_ROCK compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_KINGS_ROCK diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index d1d1a7a23..ab6677ff5 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -91,7 +91,7 @@ MossdeepCity_Gym_EventScript_TateAndLizaDefeated:: @ 82208D1 end MossdeepCity_Gym_EventScript_GiveCalmMind2:: @ 8220937 - giveitem_std ITEM_TM04 + giveitem ITEM_TM04 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull msgbox MossdeepCity_Gym_Text_ExplainCalmMind, MSGBOX_DEFAULT @@ -100,7 +100,7 @@ MossdeepCity_Gym_EventScript_GiveCalmMind2:: @ 8220937 end MossdeepCity_Gym_EventScript_GiveCalmMind:: @ 822095B - giveitem_std ITEM_TM04 + giveitem ITEM_TM04 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_BagIsFull msgbox MossdeepCity_Gym_Text_ExplainCalmMind, MSGBOX_DEFAULT diff --git a/data/maps/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc index 96285cf25..b968dfc04 100644 --- a/data/maps/MossdeepCity_House3/scripts.inc +++ b/data/maps/MossdeepCity_House3/scripts.inc @@ -9,7 +9,7 @@ MossdeepCity_House3_EventScript_SuperRodFisherman:: @ 82225C3 compare VAR_RESULT, NO goto_if_eq MossdeepCity_House3_EventScript_DeclineSuperRod msgbox MossdeepCity_House3_Text_SuperRodIsSuper, MSGBOX_DEFAULT - giveitem_std ITEM_SUPER_ROD + giveitem ITEM_SUPER_ROD setflag FLAG_RECEIVED_SUPER_ROD msgbox MossdeepCity_House3_Text_TryDroppingRodInWater, MSGBOX_DEFAULT release diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 3499244ed..05c14f11a 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -119,7 +119,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_SunStoneMan:: @ 822308E goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_SunStoneManMagma goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStone msgbox MossdeepCity_SpaceCenter_1F_Text_FoundThisYouCanHaveIt, MSGBOX_DEFAULT - giveitem_std ITEM_SUN_STONE + giveitem ITEM_SUN_STONE compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP @@ -135,7 +135,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStone:: @ 82230D0 MossdeepCity_SpaceCenter_1F_EventScript_SunStoneManMagma:: @ 82230DA goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStoneMagma msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaCantStealFuelTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_SUN_STONE + giveitem ITEM_SUN_STONE compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index b5598e60d..bc71c6ca4 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -38,7 +38,7 @@ MossdeepCity_StevensHouse_EventScript_StevenGivesDive:: @ 82227CA applymovement 1, MossdeepCity_StevensHouse_Movement_StevenApproachPlayer waitmovement 0 msgbox MossdeepCity_StevensHouse_Text_YouveEarnedHMDive, MSGBOX_DEFAULT - giveitem_std ITEM_HM08 + giveitem ITEM_HM08 setflag FLAG_RECEIVED_HM08 setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER msgbox MossdeepCity_StevensHouse_Text_ExplainDive, MSGBOX_DEFAULT @@ -149,7 +149,7 @@ MossdeepCity_StevensHouse_EventScript_Letter:: @ 822291B @ Unused, leftover from RS MossdeepCity_StevensHouse_EventScript_DiveItemBall:: @ 8222926 - finditem_std ITEM_HM08 + finditem ITEM_HM08 setflag FLAG_RECEIVED_HM08 end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 158e13678..8371d811b 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -110,8 +110,8 @@ MtChimney_EventScript_LavaCookieLady:: @ 822EEF3 msgbox MtChimney_Text_ThankYouDear, MSGBOX_DEFAULT checkitemspace ITEM_LAVA_COOKIE, 1 compare VAR_RESULT, TRUE - call_if_eq MtChimney_EventScript_TakeMoney - giveitem_std ITEM_LAVA_COOKIE + call_if_eq MtChimney_EventScript_RemoveMoney + giveitem ITEM_LAVA_COOKIE compare VAR_RESULT, FALSE goto_if_eq MtChimney_EventScript_BagIsFull hidemoneybox @@ -124,8 +124,8 @@ MtChimney_EventScript_BagIsFull:: @ 822EF51 release end -MtChimney_EventScript_TakeMoney:: @ 822EF5E - takemoney 200, 0 +MtChimney_EventScript_RemoveMoney:: @ 822EF5E + removemoney 200, 0 updatemoneybox 0, 0 return @@ -449,7 +449,7 @@ MtChimney_EventScript_MeteoriteMachine:: @ 822F0E4 compare VAR_RESULT, NO goto_if_eq MtChimney_EventScript_LeaveMeteoriteAlone msgbox MtChimney_Text_PlayerRemovedMeteorite, MSGBOX_DEFAULT - giveitem_std ITEM_METEORITE + giveitem ITEM_METEORITE setflag FLAG_RECEIVED_METEORITE releaseall end diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc index 2574e6851..a303cb2c1 100644 --- a/data/maps/MtPyre_1F/scripts.inc +++ b/data/maps/MtPyre_1F/scripts.inc @@ -6,7 +6,7 @@ MtPyre_1F_EventScript_CleanseTagWoman:: @ 8230F3F faceplayer goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_ReceivedCleanseTag msgbox MtPyre_1F_Text_TakeThisForYourOwnGood, MSGBOX_DEFAULT - giveitem_std ITEM_CLEANSE_TAG + giveitem ITEM_CLEANSE_TAG compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_CLEANSE_TAG diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index c13dd0da7..2b475b1ae 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -64,7 +64,7 @@ MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C compare VAR_0x8008, 2 call_if_eq MtPyre_Summit_EventScript_OldLadyApproachPlayer2 msgbox MtPyre_Summit_Text_BothOrbsTakenMagmaLeftThis, MSGBOX_DEFAULT - giveitem_std ITEM_MAGMA_EMBLEM + giveitem ITEM_MAGMA_EMBLEM setflag FLAG_RECEIVED_RED_OR_BLUE_ORB setflag FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD releaseall diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 88f73d39b..754e322a0 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -71,7 +71,7 @@ OldaleTown_EventScript_GoToMartEast:: @ 81E8F75 OldaleTown_EventScript_ExplainPokemonMart:: @ 81E8F8C msgbox OldaleTown_Text_ThisIsAPokemonMart, MSGBOX_DEFAULT - giveitem_std ITEM_POTION + giveitem ITEM_POTION compare VAR_RESULT, 0 goto_if_eq OldaleTown_EventScript_BagIsFull msgbox OldaleTown_Text_PotionExplanation, MSGBOX_DEFAULT diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index d22a87dc9..2dcff9f29 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -41,7 +41,7 @@ PacifidlogTown_House2_EventScript_ClearReceivedFanClubTM:: @ 8203812 PacifidlogTown_House2_EventScript_GiveReturn:: @ 8203816 msgbox PacifidlogTown_House2_Text_AdoringPokemonTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_TM27 + giveitem ITEM_TM27 compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK @@ -57,7 +57,7 @@ PacifidlogTown_House2_EventScript_PutInEffort:: @ 8203845 PacifidlogTown_House2_EventScript_GiveFrustration:: @ 820384F msgbox PacifidlogTown_House2_Text_ViciousPokemonTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_TM21 + giveitem ITEM_TM21 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 016f26896..2c78f0759 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -16,20 +16,13 @@ PetalburgCity_Gym_OnLoad: @ 820489E PetalburgCity_Gym_EventScript_OpenUnlockedDoors:: @ 82048B5 setvar VAR_0x8005, 1 call PetalburgCity_Gym_EventScript_OpenGymEntranceDoors - checktrainerflag TRAINER_RANDALL - call_if_eq PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors - checktrainerflag TRAINER_MARY - call_if_eq PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors - checktrainerflag TRAINER_PARKER - call_if_eq PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors - checktrainerflag TRAINER_ALEXIA - call_if_eq PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors - checktrainerflag TRAINER_GEORGE - call_if_eq PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors - checktrainerflag TRAINER_JODY - call_if_eq PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors - checktrainerflag TRAINER_BERKE - call_if_eq PetalburgCity_Gym_EventScript_OpenOHKORoomDoors + call_if_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors + call_if_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors + call_if_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors + call_if_defeated TRAINER_ALEXIA, PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors + call_if_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors + call_if_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors + call_if_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_OpenOHKORoomDoors end PetalburgCity_Gym_EventScript_UnlockAllDoors:: @ 82048FF @@ -403,7 +396,7 @@ PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry:: @ 8204E17 return PetalburgCity_Gym_EventScript_GiveEnigmaBerry:: @ 8204E1D - giveitem_std ITEM_ENIGMA_BERRY + giveitem ITEM_ENIGMA_BERRY compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setvar VAR_ENIGMA_BERRY_AVAILABLE, 0 @@ -444,7 +437,7 @@ PetalburgCity_Gym_EventScript_NormanBattle:: @ 8204E3B end PetalburgCity_Gym_EventScript_GiveFacade:: @ 8204ED2 - giveitem_std ITEM_TM42 + giveitem ITEM_TM42 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_BagIsFull setflag FLAG_RECEIVED_TM42 @@ -829,8 +822,7 @@ PetalburgCity_Gym_EventScript_AccuracyRoomDoor:: @ 8205187 PetalburgCity_Gym_EventScript_ConfusionRoomDoor:: @ 82051BC lockall - checktrainerflag TRAINER_RANDALL - goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked + goto_if_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 46 msgbox PetalburgCity_Gym_Text_EnterConfusionRoom, MSGBOX_YESNO @@ -842,8 +834,7 @@ PetalburgCity_Gym_EventScript_ConfusionRoomDoor:: @ 82051BC PetalburgCity_Gym_EventScript_LeftDefenseRoomDoor:: @ 82051EF lockall - checktrainerflag TRAINER_RANDALL - goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked + goto_if_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 59 msgbox PetalburgCity_Gym_Text_EnterDefenseRoom, MSGBOX_YESNO @@ -855,8 +846,7 @@ PetalburgCity_Gym_EventScript_LeftDefenseRoomDoor:: @ 82051EF PetalburgCity_Gym_EventScript_RightDefenseRoomDoor:: @ 8205222 lockall - checktrainerflag TRAINER_MARY - goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked + goto_if_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 59 msgbox PetalburgCity_Gym_Text_EnterDefenseRoom, MSGBOX_YESNO @@ -868,8 +858,7 @@ PetalburgCity_Gym_EventScript_RightDefenseRoomDoor:: @ 8205222 PetalburgCity_Gym_EventScript_RecoveryRoomDoor:: @ 8205255 lockall - checktrainerflag TRAINER_MARY - goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked + goto_if_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 72 msgbox PetalburgCity_Gym_Text_EnterRecoveryRoom, MSGBOX_YESNO @@ -881,8 +870,7 @@ PetalburgCity_Gym_EventScript_RecoveryRoomDoor:: @ 8205255 PetalburgCity_Gym_EventScript_LeftStrengthRoomDoor:: @ 8205288 lockall - checktrainerflag TRAINER_PARKER - goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked + goto_if_not_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 20 msgbox PetalburgCity_Gym_Text_EnterStrengthRoom, MSGBOX_YESNO @@ -894,8 +882,7 @@ PetalburgCity_Gym_EventScript_LeftStrengthRoomDoor:: @ 8205288 PetalburgCity_Gym_EventScript_RightStrengthRoomDoor:: @ 82052BB lockall - checktrainerflag TRAINER_ALEXIA - goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked + goto_if_not_defeated TRAINER_ALEXIA, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 20 msgbox PetalburgCity_Gym_Text_EnterStrengthRoom, MSGBOX_YESNO @@ -907,8 +894,7 @@ PetalburgCity_Gym_EventScript_RightStrengthRoomDoor:: @ 82052BB PetalburgCity_Gym_EventScript_LeftOHKORoomDoor:: @ 82052EE lockall - checktrainerflag TRAINER_ALEXIA - goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked + goto_if_not_defeated TRAINER_ALEXIA, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 33 msgbox PetalburgCity_Gym_Text_EnterOHKORoom, MSGBOX_YESNO @@ -920,8 +906,7 @@ PetalburgCity_Gym_EventScript_LeftOHKORoomDoor:: @ 82052EE PetalburgCity_Gym_EventScript_RightOHKORoomDoor:: @ 8205321 lockall - checktrainerflag TRAINER_GEORGE - goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked + goto_if_not_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 33 msgbox PetalburgCity_Gym_Text_EnterOHKORoom, MSGBOX_YESNO @@ -933,8 +918,7 @@ PetalburgCity_Gym_EventScript_RightOHKORoomDoor:: @ 8205321 PetalburgCity_Gym_EventScript_LeftGymLeadersRoomDoor:: @ 8205354 lockall - checktrainerflag TRAINER_JODY - goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked + goto_if_not_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 7 msgbox PetalburgCity_Gym_Text_EnterGymLeadersRoom, MSGBOX_YESNO @@ -946,8 +930,7 @@ PetalburgCity_Gym_EventScript_LeftGymLeadersRoomDoor:: @ 8205354 PetalburgCity_Gym_EventScript_RightGymLeadersRoomDoor:: @ 8205387 lockall - checktrainerflag TRAINER_BERKE - goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked + goto_if_not_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 7 msgbox PetalburgCity_Gym_Text_EnterGymLeadersRoom, MSGBOX_YESNO diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index 786fb26e7..2da3bf870 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -19,7 +19,7 @@ PetalburgCity_WallysHouse_OnFrame: @ 8204247 PetalburgCity_WallysHouse_EventScript_GiveHM03Surf:: @ 8204251 lockall msgbox PetalburgCity_WallysHouse_Text_PleaseExcuseUs, MSGBOX_DEFAULT - giveitem_std ITEM_HM03 + giveitem ITEM_HM03 setflag FLAG_RECEIVED_HM03 msgbox PetalburgCity_WallysHouse_Text_SurfGoAllSortsOfPlaces, MSGBOX_DEFAULT setvar VAR_PETALBURG_CITY_STATE, 5 diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 4c53891fd..9b2d9d586 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -88,7 +88,7 @@ PetalburgWoods_EventScript_DevonResearcherPostBattle:: @ 822E138 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox PetalburgWoods_Text_ThatWasAwfullyClose, MSGBOX_DEFAULT - giveitem_std ITEM_GREAT_BALL + giveitem ITEM_GREAT_BALL compare VAR_RESULT, 0 goto_if_eq PetalburgWoods_EventScript_BagFull goto PetalburgWoods_EventScript_DevonResearcherFinish @@ -251,7 +251,7 @@ PetalburgWoods_EventScript_Girl:: @ 822E222 faceplayer goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_ExplainMiracleSeed msgbox PetalburgWoods_Text_TryUsingThisItem, MSGBOX_DEFAULT - giveitem_std ITEM_MIRACLE_SEED + giveitem ITEM_MIRACLE_SEED compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MIRACLE_SEED diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index db8a329d6..deb31d178 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -269,7 +269,7 @@ Route104_EventScript_ExpertF:: @ 81ECF8C faceplayer goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104, Route104_EventScript_ReceivedBerry msgbox Route104_Text_PlantBerriesInSoilTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_CHESTO_BERRY + giveitem ITEM_CHESTO_BERRY compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104 @@ -287,7 +287,7 @@ Route104_EventScript_WhiteHerbFlorist:: @ 81ECFCD faceplayer goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_ReceivedWhiteHerb msgbox Route104_Text_DontNeedThisTakeIt, MSGBOX_DEFAULT - giveitem_std ITEM_WHITE_HERB + giveitem ITEM_WHITE_HERB compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_WHITE_HERB @@ -340,7 +340,7 @@ Route104_EventScript_Boy2:: @ 81ED057 faceplayer goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_ReceivedBulletSeed msgbox Route104_Text_LikeFillingMouthWithSeedsTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_TM09 + giveitem ITEM_TM09 compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM09 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index fe0dbf632..253ae7192 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -75,7 +75,7 @@ Route104_PrettyPetalFlowerShop_EventScript_WailmerPailGirl:: @ 822A40C Route104_PrettyPetalFlowerShop_EventScript_GiveWailmerPail:: @ 822A421 msgbox Route104_PrettyPetalFlowerShop_Text_YouCanHaveThis, MSGBOX_DEFAULT - giveitem_std ITEM_WAILMER_PAIL + giveitem ITEM_WAILMER_PAIL msgbox Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation, MSGBOX_DEFAULT setflag FLAG_RECEIVED_WAILMER_PAIL release @@ -89,7 +89,7 @@ Route104_PrettyPetalFlowerShop_EventScript_RandomBerryGirl:: @ 822A442 msgbox Route104_PrettyPetalFlowerShop_Text_ImGrowingFlowers, MSGBOX_DEFAULT random 8 addvar VAR_RESULT, FIRST_BERRY_INDEX - giveitem_std VAR_RESULT + giveitem VAR_RESULT compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index e7080ac50..7ec6701a8 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -330,7 +330,7 @@ Route109_EventScript_SoftSandGirl:: @ 81EE9B5 special GetPlayerBigGuyGirlString goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_AlreadyReceivedSoftSand msgbox Route109_Text_YouCanHaveThis, MSGBOX_DEFAULT - giveitem_std ITEM_SOFT_SAND + giveitem ITEM_SOFT_SAND compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull closemessage diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index dc54ab491..dd29e47c3 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -24,7 +24,7 @@ Route109_SeashoreHouse_EventScript_AlreadyGaveIntroduction:: @ 8269428 Route109_SeashoreHouse_EventScript_DefeatedTrainers:: @ 8269432 msgbox Route109_SeashoreHouse_Text_TakeTheseSodaPopBottles, MSGBOX_DEFAULT - giveitem_std ITEM_SODA_POP, 6 + giveitem ITEM_SODA_POP, 6 compare VAR_RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_BagFull setflag FLAG_RECEIVED_6_SODA_POP @@ -54,9 +54,9 @@ Route109_SeashoreHouse_EventScript_BuySodaPop:: @ 8269484 compare VAR_RESULT, FALSE goto_if_eq Route109_SeashoreHouse_EventScript_NotEnoughSpace msgbox Route109_SeashoreHouse_Text_HereYouGo, MSGBOX_DEFAULT - takemoney 300, 0 + removemoney 300, 0 updatemoneybox 0, 0 - giveitem_std ITEM_SODA_POP + giveitem ITEM_SODA_POP hidemoneybox release end @@ -89,12 +89,9 @@ Route109_SeashoreHouse_EventScript_Simon:: @ 8269518 end Route109_SeashoreHouse_EventScript_CheckTrainersCompletion:: @ 8269533 - checktrainerflag TRAINER_DWAYNE - goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted - checktrainerflag TRAINER_JOHANNA - goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted - checktrainerflag TRAINER_SIMON - goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted + goto_if_not_defeated TRAINER_DWAYNE, Route109_SeashoreHouse_EventScript_TrainersNotCompleted + goto_if_not_defeated TRAINER_JOHANNA, Route109_SeashoreHouse_EventScript_TrainersNotCompleted + goto_if_not_defeated TRAINER_SIMON, Route109_SeashoreHouse_EventScript_TrainersNotCompleted setflag FLAG_DEFEATED_SEASHORE_HOUSE release end diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index be1931d19..1cb4f4b88 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -473,7 +473,7 @@ Route110_EventScript_BrendanDefeated:: @ 81EF8C4 end Route110_EventScript_GiveItemfinder:: @ 81EF8DF - giveitem_std ITEM_ITEMFINDER + giveitem ITEM_ITEMFINDER return Route110_EventScript_RivalExit:: @ 81EF8EC diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index e7ac835bd..7fec5ffa7 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -60,7 +60,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle1:: @ 826AD84 msgbox Route110_TrickHouseEnd_Text_AllNightToPlantTrees, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 - giveitem_std ITEM_RARE_CANDY + giveitem ITEM_RARE_CANDY compare VAR_RESULT, FALSE call_if_eq Route110_TrickHouseEnd_EventScript_BagFull msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT @@ -73,7 +73,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle2:: @ 826ADC0 msgbox Route110_TrickHouseEnd_Text_AllNightToMakeMaze, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 - giveitem_std ITEM_TIMER_BALL + giveitem ITEM_TIMER_BALL compare VAR_RESULT, FALSE call_if_eq Route110_TrickHouseEnd_EventScript_BagFull msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT @@ -86,7 +86,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle3:: @ 826ADFC msgbox Route110_TrickHouseEnd_Text_AllNightToPreparePanels, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 - giveitem_std ITEM_HARD_STONE + giveitem ITEM_HARD_STONE compare VAR_RESULT, FALSE call_if_eq Route110_TrickHouseEnd_EventScript_BagFull msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT @@ -99,7 +99,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle4:: @ 826AE38 msgbox Route110_TrickHouseEnd_Text_AllNightToShoveBoulders, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 - giveitem_std ITEM_SMOKE_BALL + giveitem ITEM_SMOKE_BALL compare VAR_RESULT, FALSE call_if_eq Route110_TrickHouseEnd_EventScript_BagFull msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT @@ -112,7 +112,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle5:: @ 826AE74 msgbox Route110_TrickHouseEnd_Text_AllNightToMakeMechadolls, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 - giveitem_std ITEM_TM12 + giveitem ITEM_TM12 compare VAR_RESULT, FALSE call_if_eq Route110_TrickHouseEnd_EventScript_BagFull msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT @@ -125,7 +125,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle6:: @ 826AEB0 msgbox Route110_TrickHouseEnd_Text_AllNightToInstallDoors, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 - giveitem_std ITEM_MAGNET + giveitem ITEM_MAGNET compare VAR_RESULT, FALSE call_if_eq Route110_TrickHouseEnd_EventScript_BagFull msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT @@ -138,7 +138,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle7:: @ 826AEEC msgbox Route110_TrickHouseEnd_Text_AllNightSettingUpArrows, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 - giveitem_std ITEM_PP_MAX + giveitem ITEM_PP_MAX compare VAR_RESULT, FALSE call_if_eq Route110_TrickHouseEnd_EventScript_BagFull msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT @@ -182,11 +182,11 @@ Route110_TrickHouseEnd_EventScript_ChooseTent:: @ 826AFA5 goto Route110_TrickHouseEnd_EventScript_GiveBlueTent Route110_TrickHouseEnd_EventScript_GiveRedTent:: @ 826AFBF - givedecoration_std DECOR_RED_TENT + givedecoration DECOR_RED_TENT return Route110_TrickHouseEnd_EventScript_GiveBlueTent:: @ 826AFC7 - givedecoration_std DECOR_BLUE_TENT + givedecoration DECOR_BLUE_TENT return Route110_TrickHouseEnd_EventScript_TrickMasterExit:: @ 826AFCF diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 0de4153cc..06cd23651 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -367,7 +367,7 @@ Route110_TrickHouseEntrance_EventScript_GiveReward:: @ 8269E8F end Route110_TrickHouseEntrance_EventScript_GivePuzzle1Reward:: @ 8269EEF - giveitem_std ITEM_RARE_CANDY + giveitem ITEM_RARE_CANDY compare VAR_RESULT, TRUE goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward compare VAR_RESULT, FALSE @@ -377,7 +377,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle1Reward:: @ 8269EEF end Route110_TrickHouseEntrance_EventScript_GivePuzzle2Reward:: @ 8269F1B - giveitem_std ITEM_TIMER_BALL + giveitem ITEM_TIMER_BALL compare VAR_RESULT, TRUE goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward compare VAR_RESULT, FALSE @@ -387,7 +387,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle2Reward:: @ 8269F1B end Route110_TrickHouseEntrance_EventScript_GivePuzzle3Reward:: @ 8269F47 - giveitem_std ITEM_HARD_STONE + giveitem ITEM_HARD_STONE compare VAR_RESULT, TRUE goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward compare VAR_RESULT, FALSE @@ -397,7 +397,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle3Reward:: @ 8269F47 end Route110_TrickHouseEntrance_EventScript_GivePuzzle4Reward:: @ 8269F73 - giveitem_std ITEM_SMOKE_BALL + giveitem ITEM_SMOKE_BALL compare VAR_RESULT, TRUE goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward compare VAR_RESULT, FALSE @@ -407,7 +407,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle4Reward:: @ 8269F73 end Route110_TrickHouseEntrance_EventScript_GivePuzzle5Reward:: @ 8269F9F - giveitem_std ITEM_TM12 + giveitem ITEM_TM12 compare VAR_RESULT, TRUE goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward compare VAR_RESULT, FALSE @@ -417,7 +417,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle5Reward:: @ 8269F9F end Route110_TrickHouseEntrance_EventScript_GivePuzzle6Reward:: @ 8269FCB - giveitem_std ITEM_MAGNET + giveitem ITEM_MAGNET compare VAR_RESULT, TRUE goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward compare VAR_RESULT, FALSE @@ -427,7 +427,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle6Reward:: @ 8269FCB end Route110_TrickHouseEntrance_EventScript_GivePuzzle7Reward:: @ 8269FF7 - giveitem_std ITEM_PP_MAX + giveitem ITEM_PP_MAX compare VAR_RESULT, TRUE goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward compare VAR_RESULT, FALSE @@ -464,11 +464,11 @@ Route110_TrickHouseEntrance_EventScript_ChooseTent:: @ 826A070 goto Route110_TrickHouseEntrance_EventScript_GiveBlueTent Route110_TrickHouseEntrance_EventScript_GiveRedTent:: @ 826A08A - givedecoration_std DECOR_RED_TENT + givedecoration DECOR_RED_TENT return Route110_TrickHouseEntrance_EventScript_GiveBlueTent:: @ 826A092 - givedecoration_std DECOR_BLUE_TENT + givedecoration DECOR_BLUE_TENT return Route110_TrickHouseEntrance_EventScript_ReceivedTent:: @ 826A09A diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index b80ef6b84..5971dc7f9 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -48,8 +48,7 @@ Route111_OnTransition: @ 81F0D87 call_if_eq Route111_EventScript_SetMirageTowerGone call Route111_EventScript_CheckSetSandstorm call GabbyAndTy_EventScript_UpdateLocation - checktrainerflag TRAINER_VICKY - goto_if_lt Route111_EventScript_SetWinstratesNotDefeated + goto_if_not_defeated TRAINER_VICKY, Route111_EventScript_SetWinstratesNotDefeated end Route111_EventScript_SetFallingPlayerGfx:: @ 81F0DC2 @@ -162,7 +161,7 @@ Route111_EventScript_Girl:: @ 81F0EB9 dotimebasedevents goto_if_set FLAG_DAILY_ROUTE_111_RECEIVED_BERRY, Route111_EventScript_ReceivedBerry msgbox Route111_Text_WateredPlantsEveryDayTakeBerry, MSGBOX_DEFAULT - giveitem_std ITEM_RAZZ_BERRY + giveitem ITEM_RAZZ_BERRY compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_111_RECEIVED_BERRY diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index 387b8f630..499459c24 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -15,7 +15,7 @@ Route111_WinstrateFamilysHouse_EventScript_Victoria:: @ 822A4A2 setvar VAR_0x8008, 3 goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_ReceivedMachoBrace msgbox Route111_WinstrateFamilysHouse_Text_LikeYouToHaveMachoBrace, MSGBOX_DEFAULT - giveitem_std ITEM_MACHO_BRACE + giveitem ITEM_MACHO_BRACE compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MACHO_BRACE diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index 57c5f9f57..eed6d8eab 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -31,7 +31,7 @@ Route113_GlassWorkshop_EventScript_GlassWorker:: @ 826ED1E compare VAR_GLASS_WORKSHOP_STATE, 1 goto_if_eq Route113_GlassWorkshop_EventScript_ExplainSootSack msgbox Route113_GlassWorkshop_Text_GoCollectAshWithThis, MSGBOX_DEFAULT - giveitem_std ITEM_SOOT_SACK + giveitem ITEM_SOOT_SACK setvar VAR_GLASS_WORKSHOP_STATE, 1 msgbox Route113_GlassWorkshop_Text_ExplainSootSack, MSGBOX_DEFAULT release @@ -220,13 +220,13 @@ Route113_GlassWorkshop_EventScript_MakeGlassItem:: @ 826F00F end Route113_GlassWorkshop_EventScript_GiveGlassFlute:: @ 826F047 - giveitem_std VAR_0x8008 + giveitem VAR_0x8008 compare VAR_RESULT, FALSE goto_if_eq Route113_GlassWorkshop_EventScript_NoRoomForFlute return Route113_GlassWorkshop_EventScript_GiveGlassDecor:: @ 826F05F - givedecoration_std VAR_0x8008 + givedecoration VAR_0x8008 compare VAR_RESULT, FALSE goto_if_eq Route113_GlassWorkshop_EventScript_NoRoomForDecor return diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 5e0e564b1..dda7f270d 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -33,7 +33,7 @@ Route114_EventScript_Man:: @ 81F2582 random NUM_ROUTE_114_MAN_BERRIES addvar VAR_RESULT, NUM_ROUTE_114_MAN_BERRIES_SKIPPED addvar VAR_RESULT, FIRST_BERRY_INDEX - giveitem_std VAR_RESULT + giveitem VAR_RESULT compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_114_RECEIVED_BERRY @@ -51,7 +51,7 @@ Route114_EventScript_RoarGentleman:: @ 81F25D1 faceplayer goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_ReceivedRoar msgbox Route114_Text_AllMyMonDoesIsRoarTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_TM05 + giveitem ITEM_TM05 compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM05 diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index 5313f8705..8db686d10 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -11,7 +11,7 @@ Route114_FossilManiacsHouse_EventScript_FossilManiacsBrother:: @ 822AD3A faceplayer goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_ReceivedDig msgbox Route114_FossilManiacsHouse_Text_HaveThisToDigLikeMyBrother, MSGBOX_DEFAULT - giveitem_std ITEM_TM28 + giveitem ITEM_TM28 compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM28 diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index b772228e4..cd2f808fc 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -12,7 +12,7 @@ Route114_LanettesHouse_EventScript_Lanette:: @ 822B2D2 goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_OfferAdvice setflag FLAG_SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_EverythingClutteredKeepThis, MSGBOX_DEFAULT - givedecoration_std DECOR_LOTAD_DOLL + givedecoration DECOR_LOTAD_DOLL compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowNoRoomForDecor setflag FLAG_RECEIVED_DOLL_LANETTE diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 8dbdeb69d..eee823975 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -58,7 +58,7 @@ Route116_EventScript_DevonEmployee:: @ 81F2CA2 Route116_EventScript_GiveRepeatBall:: @ 81F2CBB setflag FLAG_MET_DEVON_EMPLOYEE - giveitem_std ITEM_REPEAT_BALL + giveitem ITEM_REPEAT_BALL compare VAR_RESULT, FALSE goto_if_eq Route116_EventScript_NoRoomForRepeatBall msgbox Route116_Text_NewBallAvailableAtMart, MSGBOX_DEFAULT diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index cccbe0085..af77193ba 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -38,7 +38,7 @@ Route118_EventScript_GoodRodFisherman:: @ 81F3E14 Route118_EventScript_ReceiveGoodRod:: @ 81F3E3E msgbox Route118_Text_IdenticalMindsTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_GOOD_ROD + giveitem ITEM_GOOD_ROD setflag FLAG_RECEIVED_GOOD_ROD msgbox Route118_Text_TryYourLuckFishing, MSGBOX_DEFAULT release diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 8377b62ad..ee07cc5cd 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -138,7 +138,7 @@ Route119_EventScript_DefeatedBrendan:: @ 81F45E4 end Route119_EventScript_GiveFlyHM:: @ 81F45FF - giveitem_std ITEM_HM02 + giveitem ITEM_HM02 setflag FLAG_RECEIVED_HM02 return diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 6018e2d95..2c97da9e1 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -145,7 +145,7 @@ Route120_EventScript_GiveIapapaBerry:: @ 81F55F6 end Route120_EventScript_GiveBerry:: @ 81F5601 - giveitem_std VAR_0x8004 + giveitem VAR_0x8004 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_120_RECEIVED_BERRY @@ -237,7 +237,7 @@ Route120_EventScript_StevenGiveDeconScope:: @ 81F572C applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox Route120_Text_StevenGiveDevonScope, MSGBOX_DEFAULT - giveitem_std ITEM_DEVON_SCOPE + giveitem ITEM_DEVON_SCOPE setflag FLAG_RECEIVED_DEVON_SCOPE msgbox Route120_Text_StevenGoodbye, MSGBOX_DEFAULT closemessage diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 6da6396be..f29fe583e 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -66,7 +66,7 @@ Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone:: @ 822BC48 goto_if_eq Route121_SafariZoneEntrance_EventScript_NotEnoughMoney playse SE_REGI msgbox Route121_SafariZoneEntrance_Text_ThatWillBe500Please, MSGBOX_DEFAULT - takemoney 500, 0 + removemoney 500, 0 updatemoneybox 0, 0 msgbox Route121_SafariZoneEntrance_Text_HereAreYourSafariBalls, MSGBOX_DEFAULT playfanfare MUS_FANFA4 diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index b74b16865..0c57d209c 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -15,7 +15,7 @@ Route123_EventScript_GigaDrainGirl:: @ 81F6151 compare VAR_RESULT, FALSE goto_if_eq Route123_EventScript_NoGrassMons msgbox Route123_Text_YouLikeGrassMonsTooHaveThis, MSGBOX_DEFAULT - giveitem_std ITEM_TM19 + giveitem ITEM_TM19 compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM19 diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index 9e63dc608..8b2cc5919 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -15,7 +15,7 @@ Route123_BerryMastersHouse_EventScript_BerryMaster:: @ 826F845 random NUM_BERRY_MASTER_BERRIES addvar VAR_RESULT, NUM_BERRY_MASTER_BERRIES_SKIPPED addvar VAR_RESULT, FIRST_BERRY_INDEX - giveitem_std VAR_RESULT + giveitem VAR_RESULT compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY @@ -23,7 +23,7 @@ Route123_BerryMastersHouse_EventScript_BerryMaster:: @ 826F845 random NUM_BERRY_MASTER_BERRIES addvar VAR_RESULT, NUM_BERRY_MASTER_BERRIES_SKIPPED addvar VAR_RESULT, FIRST_BERRY_INDEX - giveitem_std VAR_RESULT + giveitem VAR_RESULT compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull msgbox Route123_BerryMastersHouse_Text_VisitPrettyPetalFlowerShop, MSGBOX_DEFAULT @@ -76,7 +76,7 @@ Route123_BerryMastersHouse_EventScript_GiveNormalBerry:: @ 826F94C msgbox Route123_BerryMastersHouse_Text_GoodSayingTakeThis, MSGBOX_DEFAULT random NUM_BERRY_MASTER_WIFE_BERRIES addvar VAR_RESULT, FIRST_BERRY_INDEX - giveitem_std VAR_RESULT + giveitem VAR_RESULT compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull goto Route123_BerryMastersHouse_EventScript_GaveBerry @@ -86,7 +86,7 @@ Route123_BerryMastersHouse_EventScript_GiveNormalBerry:: @ 826F94C Route123_BerryMastersHouse_EventScript_GiveSpelonBerry:: @ 826F97A goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_SPELON_BERRY + giveitem ITEM_SPELON_BERRY compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SPELON_BERRY @@ -96,7 +96,7 @@ Route123_BerryMastersHouse_EventScript_GiveSpelonBerry:: @ 826F97A Route123_BerryMastersHouse_EventScript_GivePamtreBerry:: @ 826F9AB goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_PAMTRE_BERRY + giveitem ITEM_PAMTRE_BERRY compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_PAMTRE_BERRY @@ -106,7 +106,7 @@ Route123_BerryMastersHouse_EventScript_GivePamtreBerry:: @ 826F9AB Route123_BerryMastersHouse_EventScript_GiveWatmelBerry:: @ 826F9DC goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_WATMEL_BERRY + giveitem ITEM_WATMEL_BERRY compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_WATMEL_BERRY @@ -116,7 +116,7 @@ Route123_BerryMastersHouse_EventScript_GiveWatmelBerry:: @ 826F9DC Route123_BerryMastersHouse_EventScript_GiveDurinBerry:: @ 826FA0D goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_DURIN_BERRY + giveitem ITEM_DURIN_BERRY compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_DURIN_BERRY @@ -126,7 +126,7 @@ Route123_BerryMastersHouse_EventScript_GiveDurinBerry:: @ 826FA0D Route123_BerryMastersHouse_EventScript_GiveBelueBerry:: @ 826FA3E goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_BELUE_BERRY + giveitem ITEM_BELUE_BERRY compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_BELUE_BERRY diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc index b2c00c1cc..c5d43799d 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -258,8 +258,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard:: @ 8270EC0 end Route124_DivingTreasureHuntersHouse_EventScript_TradeShard:: @ 8270F01 - takeitem VAR_0x8008, 1 - giveitem_std VAR_0x8009 + removeitem VAR_0x8008 + giveitem VAR_0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_ItsADeal, MSGBOX_DEFAULT call Route124_DivingTreasureHuntersHouse_EventScript_GetPlayersShards compare VAR_TEMP_1, 0 diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index dbe5dfd41..2c710a075 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -605,7 +605,7 @@ RustboroCity_EventScript_ReturnGoods:: @ 81E0C5B compare VAR_TEMP_1, 4 call_if_eq RustboroCity_EventScript_EmployeeFacePlayerRight msgbox RustboroCity_Text_YouGotItThankYou, MSGBOX_DEFAULT - giveitem_std ITEM_GREAT_BALL + giveitem ITEM_GREAT_BALL compare VAR_RESULT, FALSE call_if_eq RustboroCity_EventScript_BagFull msgbox RustboroCity_Text_PleaseComeWithMe, MSGBOX_DEFAULT diff --git a/data/maps/RustboroCity_CuttersHouse/scripts.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc index f19d56a2d..9ee4fc575 100644 --- a/data/maps/RustboroCity_CuttersHouse/scripts.inc +++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc @@ -6,7 +6,7 @@ RustboroCity_CuttersHouse_EventScript_Cutter:: @ 8215BD4 faceplayer goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_ExplainCut msgbox RustboroCity_CuttersHouse_Text_YouCanPutThisHMToGoodUse, MSGBOX_DEFAULT - giveitem_std ITEM_HM01 + giveitem ITEM_HM01 setflag FLAG_RECEIVED_HM01 msgbox RustboroCity_CuttersHouse_Text_ExplainCut, MSGBOX_DEFAULT release diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 7b8dbdadf..9df6d7ab6 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -96,7 +96,7 @@ RustboroCity_DevonCorp_2F_EventScript_NoticeRootFossil:: @ 8211933 RustboroCity_DevonCorp_2F_EventScript_GiveRootFossil:: @ 8211974 bufferitemname 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher, MSGBOX_DEFAULT - takeitem ITEM_ROOT_FOSSIL, 1 + removeitem ITEM_ROOT_FOSSIL setvar VAR_FOSSIL_RESURRECTION_STATE, 1 setvar VAR_WHICH_FOSSIL_REVIVED, 1 release @@ -121,7 +121,7 @@ RustboroCity_DevonCorp_2F_EventScript_NoticeClawFossil:: @ 8211991 RustboroCity_DevonCorp_2F_EventScript_GiveClawFossil:: @ 82119D2 bufferitemname 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher, MSGBOX_DEFAULT - takeitem ITEM_CLAW_FOSSIL, 1 + removeitem ITEM_CLAW_FOSSIL setvar VAR_FOSSIL_RESURRECTION_STATE, 1 setvar VAR_WHICH_FOSSIL_REVIVED, 2 release diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 034f6fbd4..9e918ca63 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -48,7 +48,7 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor, MSGBOX_DEFAULT - giveitem_std ITEM_LETTER + giveitem ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_MrStoneWantYouToHaveThis, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message RustboroCity_DevonCorp_3F_Text_ReceivedPokenav @@ -161,7 +161,7 @@ RustboroCity_DevonCorp_3F_EventScript_MrStone:: @ 821256C RustboroCity_DevonCorp_3F_EventScript_GiveExpShare:: @ 8212595 msgbox RustboroCity_DevonCorp_3F_Text_ThankYouForDeliveringLetter, MSGBOX_DEFAULT - giveitem_std ITEM_EXP_SHARE + giveitem ITEM_EXP_SHARE compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_EXP_SHARE diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc index f328b71c1..1caeda683 100644 --- a/data/maps/RustboroCity_Flat2_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -10,7 +10,7 @@ RustboroCity_Flat2_2F_EventScript_NinjaBoy:: @ 8215FE1 faceplayer goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_GavePremierBall msgbox RustboroCity_Flat2_2F_Text_MyDaddyMadeThisYouCanHaveIt, MSGBOX_DEFAULT - giveitem_std ITEM_PREMIER_BALL + giveitem ITEM_PREMIER_BALL compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index bbe01389f..94e032692 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -28,7 +28,7 @@ RustboroCity_Gym_EventScript_RoxanneDefeated:: @ 8212F66 end RustboroCity_Gym_EventScript_GiveRockTomb:: @ 8212FA4 - giveitem_std ITEM_TM39 + giveitem ITEM_TM39 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM39 diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index 9fb4146da..6e5bf0fce 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -83,7 +83,7 @@ RustboroCity_PokemonSchool_EventScript_Teacher:: @ 8213F95 compare VAR_FACING, DIR_WEST call_if_eq RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsWest msgbox RustboroCity_PokemonSchool_Text_StudentsWhoDontStudyGetQuickClaw, MSGBOX_DEFAULT - giveitem_std ITEM_QUICK_CLAW + giveitem ITEM_QUICK_CLAW compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull closemessage diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index aa99d8740..c3be000a6 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -62,7 +62,7 @@ RusturfTunnel_EventScript_ClearTunnelScene:: @ 822CEAE call_if_eq RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer compare VAR_TEMP_1, 3 call_if_eq RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer - giveitem_std ITEM_HM04 + giveitem ITEM_HM04 setflag FLAG_RECEIVED_HM04 msgbox RusturfTunnel_Text_ExplainStrength, MSGBOX_DEFAULT closemessage @@ -314,7 +314,7 @@ RusturfTunnel_EventScript_Grunt:: @ 822D0C2 msgbox RusturfTunnel_Text_GruntIntro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_RUSTURF_TUNNEL, RusturfTunnel_Text_GruntDefeat msgbox RusturfTunnel_Text_GruntTakePackage, MSGBOX_DEFAULT - giveitem_std ITEM_DEVON_GOODS + giveitem ITEM_DEVON_GOODS closemessage applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PushPlayerAsideForGrunt applymovement 6, RusturfTunnel_Movement_GruntEscape diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 6b88b7ae1..a276be20f 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -174,22 +174,14 @@ SSTidalCorridor_EventScript_EnjoyYourCruise:: @ 823C1BD end SSTidalCorridor_EventScript_CheckIfTrainersDefeated:: @ 823C1C7 - checktrainerflag TRAINER_PHILLIP - goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated - checktrainerflag TRAINER_LEONARD - goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated - checktrainerflag TRAINER_COLTON - goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated - checktrainerflag TRAINER_MICAH - goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated - checktrainerflag TRAINER_THOMAS - goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated - checktrainerflag TRAINER_LEA_AND_JED - goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated - checktrainerflag TRAINER_GARRET - goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated - checktrainerflag TRAINER_NAOMI - goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_not_defeated TRAINER_PHILLIP, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_not_defeated TRAINER_LEONARD, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_not_defeated TRAINER_COLTON, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_not_defeated TRAINER_MICAH, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_not_defeated TRAINER_THOMAS, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_not_defeated TRAINER_LEA_AND_JED, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_not_defeated TRAINER_GARRET, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_not_defeated TRAINER_NAOMI, SSTidalCorridor_EventScript_TrainerNotDefeated setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_EnjoyYourCruise return diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index bf2c5e36b..1cf464d0d 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -6,7 +6,7 @@ SSTidalRooms_EventScript_SnatchGiver:: @ 823C9F2 faceplayer goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_ExplainSnatch msgbox SSTidalRooms_Text_NotSuspiciousTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_TM49 + giveitem ITEM_TM49 compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM49 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index 8713578cf..89cadd56d 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -35,9 +35,9 @@ ShoalCave_LowTideEntranceRoom_EventScript_ShellBellExpert:: @ 8236DD9 compare VAR_RESULT, 2 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_NoRoomForShellBell msgbox ShoalCave_LowTideEntranceRoom_Text_MakeShellBellRightAway, MSGBOX_DEFAULT - takeitem ITEM_SHOAL_SALT, 4 - takeitem ITEM_SHOAL_SHELL, 4 - giveitem_std ITEM_SHELL_BELL + removeitem ITEM_SHOAL_SALT, 4 + removeitem ITEM_SHOAL_SHELL, 4 + giveitem ITEM_SHELL_BELL compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull msgbox ShoalCave_LowTideEntranceRoom_Text_ExplainShellBell, MSGBOX_DEFAULT diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index 089d38458..69ef1e75f 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -62,7 +62,7 @@ ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatilesEnd:: @ 8236FB9 ShoalCave_LowTideInnerRoom_EventScript_ShoalShell1:: @ 8236FBA lockall goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell - giveitem_std ITEM_SHOAL_SHELL + giveitem ITEM_SHOAL_SHELL compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Small, 0 @@ -79,7 +79,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell:: @ 8236FEC ShoalCave_LowTideInnerRoom_EventScript_ShoalShell2:: @ 8236FF6 lockall goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell - giveitem_std ITEM_SHOAL_SHELL + giveitem ITEM_SHOAL_SHELL compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Small, 0 @@ -91,7 +91,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalShell2:: @ 8236FF6 ShoalCave_LowTideInnerRoom_EventScript_ShoalShell3:: @ 8237028 lockall goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell - giveitem_std ITEM_SHOAL_SHELL + giveitem ITEM_SHOAL_SHELL compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Small, 0 @@ -103,7 +103,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalShell3:: @ 8237028 ShoalCave_LowTideInnerRoom_EventScript_ShoalShell4:: @ 823705A lockall goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell - giveitem_std ITEM_SHOAL_SHELL + giveitem ITEM_SHOAL_SHELL compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Small, 0 @@ -115,7 +115,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalShell4:: @ 823705A ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt1:: @ 823708C lockall goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt - giveitem_std ITEM_SHOAL_SALT + giveitem ITEM_SHOAL_SALT compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Small, 0 @@ -132,7 +132,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt:: @ 82370BE ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt2:: @ 82370C8 lockall goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt - giveitem_std ITEM_SHOAL_SALT + giveitem ITEM_SHOAL_SALT compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Small, 0 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index 2cbf8138d..0c259ff23 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -17,7 +17,7 @@ ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatilesEnd:: @ 8237175 ShoalCave_LowTideLowerRoom_EventScript_ShoalSalt4:: @ 8237176 lockall goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_ReceivedShoalSalt - giveitem_std ITEM_SHOAL_SALT + giveitem ITEM_SHOAL_SALT compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 18, 2, METATILE_Cave_ShoalCave_DirtPile_Small, 0 @@ -36,7 +36,7 @@ ShoalCave_LowTideLowerRoom_EventScript_BlackBelt:: @ 82371B2 faceplayer goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_ReceivedFocusBand msgbox ShoalCave_LowTideLowerRoom_Text_CanOvercomeColdWithFocus, MSGBOX_DEFAULT - giveitem_std ITEM_FOCUS_BAND + giveitem ITEM_FOCUS_BAND compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FOCUS_BAND diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index 32ec5b298..6bbdf0345 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -17,7 +17,7 @@ ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatilesEnd:: @ 8237119 ShoalCave_LowTideStairsRoom_EventScript_ShoalSalt3:: @ 823711A lockall goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_ReceivedShoalSalt - giveitem_std ITEM_SHOAL_SALT + giveitem ITEM_SHOAL_SALT compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Small, 0 diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 025618b61..11045361f 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -726,7 +726,7 @@ SlateportCity_EventScript_BerryPowderClerk:: @ 81DD36E faceplayer goto_if_set FLAG_RECEIVED_POWDER_JAR, SlateportCity_EventScript_ReceivedPowderJar msgbox SlateportCity_Text_ExplainBerries, MSGBOX_DEFAULT - giveitem_std ITEM_POWDER_JAR + giveitem ITEM_POWDER_JAR setflag FLAG_RECEIVED_POWDER_JAR msgbox SlateportCity_Text_ExplainBerryPowder, MSGBOX_DEFAULT release @@ -860,7 +860,7 @@ SlateportCity_EventScript_TryBuyBerryPowderItem:: @ 81DD557 specialvar VAR_RESULT, HasEnoughBerryPowder compare VAR_RESULT, FALSE goto_if_eq SlateportCity_EventScript_NotEnoughBerryPowder - giveitem_std VAR_0x8008 + giveitem VAR_0x8008 compare VAR_RESULT, FALSE goto_if_eq SlateportCity_EventScript_NoRoomForBerryPowderItem copyvar VAR_0x8004, VAR_0x8009 diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 6a74d6a6f..e0969a591 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -201,7 +201,7 @@ SlateportCity_BattleTentLobby_EventScript_TormentGiver:: @ 8208A3D faceplayer goto_if_set FLAG_RECEIVED_TM41, SlateportCity_BattleTentLobby_EventScript_ReceivedTorment msgbox SlateportCity_BattleTentLobby_Text_CouldntFindMonForMe, MSGBOX_DEFAULT - giveitem_std ITEM_TM41 + giveitem ITEM_TM41 compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM41 diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 1abb66b57..39025033e 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -237,7 +237,7 @@ SlateportCity_Harbor_EventScript_BoardFerry:: @ 820CBE9 compare VAR_FACING, DIR_EAST call_if_eq SlateportCity_Harbor_EventScript_BoardFerryEast delay 30 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, 0 setvar VAR_0x8004, 5 call Common_EventScript_FerryDepart return @@ -358,10 +358,10 @@ SlateportCity_Harbor_EventScript_DeepSeaTooth:: @ 820CD7B msgbox SlateportCity_Harbor_Text_TradeForDeepSeaTooth, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_ChooseDifferentTrade - giveitem_std ITEM_DEEP_SEA_TOOTH + giveitem ITEM_DEEP_SEA_TOOTH compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull - takeitem ITEM_SCANNER, 1 + removeitem ITEM_SCANNER msgbox SlateportCity_Harbor_Text_HandedScannerToStern, MSGBOX_DEFAULT setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_TradedScanner @@ -371,10 +371,10 @@ SlateportCity_Harbor_EventScript_DeepSeaScale:: @ 820CDBB msgbox SlateportCity_Harbor_Text_TradeForDeepSeaScale, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_ChooseDifferentTrade - giveitem_std ITEM_DEEP_SEA_SCALE + giveitem ITEM_DEEP_SEA_SCALE compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull - takeitem ITEM_SCANNER, 1 + removeitem ITEM_SCANNER msgbox SlateportCity_Harbor_Text_HandedScannerToStern, MSGBOX_DEFAULT setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_TradedScanner diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index a6e6541da..aeb9f3ac9 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -36,7 +36,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee:: @ 820ADE8 compare VAR_RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney playse SE_REGI - takemoney 50, 0 + removemoney 50, 0 updatemoneybox 0, 0 msgbox SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 @@ -151,7 +151,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGrunt:: @ 820AEF8 applymovement 13, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_RememberMeTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_TM46 + giveitem ITEM_TM46 compare VAR_RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_NoRoomForThief setflag FLAG_RECEIVED_TM46 diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 25de15889..e4086fa19 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -77,7 +77,7 @@ SlateportCity_PokemonFanClub_EventScript_GiveRedScarf:: @ 8209FE0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT setflag FLAG_RECEIVED_RED_SCARF - giveitem_std ITEM_RED_SCARF + giveitem ITEM_RED_SCARF msgbox SlateportCity_PokemonFanClub_Text_ExplainRedScarf, MSGBOX_DEFAULT release end @@ -88,7 +88,7 @@ SlateportCity_PokemonFanClub_EventScript_GiveBlueScarf:: @ 820A011 goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT setflag FLAG_RECEIVED_BLUE_SCARF - giveitem_std ITEM_BLUE_SCARF + giveitem ITEM_BLUE_SCARF msgbox SlateportCity_PokemonFanClub_Text_ExplainBlueScarf, MSGBOX_DEFAULT release end @@ -99,7 +99,7 @@ SlateportCity_PokemonFanClub_EventScript_GivePinkScarf:: @ 820A042 goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT setflag FLAG_RECEIVED_PINK_SCARF - giveitem_std ITEM_PINK_SCARF + giveitem ITEM_PINK_SCARF msgbox SlateportCity_PokemonFanClub_Text_ExplainPinkScarf, MSGBOX_DEFAULT release end @@ -110,7 +110,7 @@ SlateportCity_PokemonFanClub_EventScript_GiveGreenScarf:: @ 820A073 goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT setflag FLAG_RECEIVED_GREEN_SCARF - giveitem_std ITEM_GREEN_SCARF + giveitem ITEM_GREEN_SCARF msgbox SlateportCity_PokemonFanClub_Text_ExplainGreenScarf, MSGBOX_DEFAULT release end @@ -121,7 +121,7 @@ SlateportCity_PokemonFanClub_EventScript_GiveYellowScarf:: @ 820A0A4 goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT setflag FLAG_RECEIVED_YELLOW_SCARF - giveitem_std ITEM_YELLOW_SCARF + giveitem ITEM_YELLOW_SCARF msgbox SlateportCity_PokemonFanClub_Text_ExplainYellowScarf, MSGBOX_DEFAULT release end @@ -216,7 +216,7 @@ SlateportCity_PokemonFanClub_EventScript_GiveSootheBell:: @ 820A1A3 applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_PokemonAdoresYou, MSGBOX_DEFAULT - giveitem_std ITEM_SOOTHE_BELL + giveitem ITEM_SOOTHE_BELL compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SOOTHE_BELL diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 8a4c6ea4e..35cbcc425 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -755,7 +755,7 @@ SootopolisCity_EventScript_KiriGiveBerry:: @ 81E5F1B random NUM_KIRI_BERRIES addvar VAR_RESULT, NUM_KIRI_BERRIES_SKIPPED addvar VAR_RESULT, FIRST_BERRY_INDEX - giveitem_std VAR_RESULT + giveitem VAR_RESULT compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY @@ -768,7 +768,7 @@ SootopolisCity_EventScript_KiriGiveBerry:: @ 81E5F1B end SootopolisCity_EventScript_GiveFigyBerry:: @ 81E5F79 - giveitem_std ITEM_FIGY_BERRY + giveitem ITEM_FIGY_BERRY compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull msgbox SootopolisCity_Text_WhatKindOfWishInYourName, MSGBOX_DEFAULT @@ -776,7 +776,7 @@ SootopolisCity_EventScript_GiveFigyBerry:: @ 81E5F79 end SootopolisCity_EventScript_GiveIapapaBerry:: @ 81E5F9A - giveitem_std ITEM_IAPAPA_BERRY + giveitem ITEM_IAPAPA_BERRY compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull msgbox SootopolisCity_Text_WhatKindOfWishInYourName, MSGBOX_DEFAULT @@ -1356,7 +1356,7 @@ SootopolisCity_EventScript_Wallace:: @ 81E6446 SootopolisCity_EventScript_GiveWaterfall:: @ 81E646F msgbox SootopolisCity_Text_ThankYouForHelpAcceptThis, MSGBOX_DEFAULT - giveitem_std ITEM_HM07 + giveitem ITEM_HM07 setflag FLAG_RECEIVED_HM07 msgbox SootopolisCity_Text_ExplainWaterfallGoToGym, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index b32b322d8..2d4e43671 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -120,7 +120,7 @@ SootopolisCity_Gym_1F_EventScript_JuanDefeated:: @ 8224F82 end SootopolisCity_Gym_1F_EventScript_GiveWaterPulse:: @ 8224FD4 - giveitem_std ITEM_TM03 + giveitem ITEM_TM03 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_BagIsFull msgbox SootopolisCity_Gym_1F_Text_ExplainWaterPulse, MSGBOX_DEFAULT @@ -128,7 +128,7 @@ SootopolisCity_Gym_1F_EventScript_GiveWaterPulse:: @ 8224FD4 return SootopolisCity_Gym_1F_EventScript_GiveWaterPulse2:: @ 8224FF7 - giveitem_std ITEM_TM03 + giveitem ITEM_TM03 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull msgbox SootopolisCity_Gym_1F_Text_ExplainWaterPulse, MSGBOX_DEFAULT diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc index d38e35494..90a429c2c 100644 --- a/data/maps/SootopolisCity_House1/scripts.inc +++ b/data/maps/SootopolisCity_House1/scripts.inc @@ -6,7 +6,7 @@ SootopolisCity_House1_EventScript_BrickBreakBlackBelt:: @ 822694D faceplayer goto_if_set FLAG_RECEIVED_TM31, SootopolisCity_House1_EventScript_ReceivedBrickBreak msgbox SootopolisCity_House1_Text_DevelopedThisTM, MSGBOX_DEFAULT - giveitem_std ITEM_TM31 + giveitem ITEM_TM31 compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM31 diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc index bd3ce0742..d62273864 100644 --- a/data/maps/SootopolisCity_House6/scripts.inc +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -9,7 +9,7 @@ SootopolisCity_House6_EventScript_Woman:: @ 8226F5C compare VAR_RESULT, NO call_if_eq SootopolisCity_House6_EventScript_DeclineWailmerDoll msgbox SootopolisCity_House6_Text_TakeGoodCareOfIt, MSGBOX_DEFAULT - givedecoration_std DECOR_WAILMER_DOLL + givedecoration DECOR_WAILMER_DOLL compare VAR_RESULT, FALSE goto_if_eq SootopolisCity_House6_EventScript_NoRoomForWailmerDoll setflag FLAG_RECEIVED_WAILMER_DOLL diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc index a9f3ffdf4..1951a33d5 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc @@ -38,7 +38,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_SmallSeedot:: @ 8227286 SootopolisCity_LotadAndSeedotHouse_EventScript_BigSeedot:: @ 8227290 msgbox SootopolisCity_LotadAndSeedotHouse_Text_GoshMightBeBiggerThanLotad, MSGBOX_DEFAULT - giveitem_std ITEM_ELIXIR + giveitem ITEM_ELIXIR compare VAR_RESULT, FALSE goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir1 closemessage @@ -87,7 +87,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_SmallLotad:: @ 8227317 SootopolisCity_LotadAndSeedotHouse_EventScript_BigLotad:: @ 8227321 msgbox SootopolisCity_LotadAndSeedotHouse_Text_WowMightBeBiggerThanSeedot, MSGBOX_DEFAULT - giveitem_std ITEM_ELIXIR + giveitem ITEM_ELIXIR compare VAR_RESULT, FALSE goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir2 closemessage diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index 882b0e887..8a0de33f5 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -229,7 +229,7 @@ VerdanturfTown_BattleTentLobby_EventScript_AttractGiver:: @ 8201A7B faceplayer goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_BattleTentLobby_EventScript_ReceivedAttract msgbox VerdanturfTown_BattleTentLobby_Text_AttractionRunsDeep, MSGBOX_DEFAULT - giveitem_std ITEM_TM45 + giveitem ITEM_TM45 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM45 diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index f447d5f25..2cde7190f 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -68,15 +68,15 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_setholewarp .4byte ScrCmd_getplayerxy .4byte ScrCmd_getpartysize - .4byte ScrCmd_giveitem - .4byte ScrCmd_takeitem + .4byte ScrCmd_additem + .4byte ScrCmd_removeitem .4byte ScrCmd_checkitemspace .4byte ScrCmd_checkitem .4byte ScrCmd_checkitemtype - .4byte ScrCmd_givepcitem + .4byte ScrCmd_addpcitem .4byte ScrCmd_checkpcitem - .4byte ScrCmd_givedecoration - .4byte ScrCmd_takedecoration + .4byte ScrCmd_adddecoration + .4byte ScrCmd_removedecoration .4byte ScrCmd_checkdecor .4byte ScrCmd_checkdecorspace .4byte ScrCmd_applymovement @@ -144,8 +144,8 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_showcontestresults .4byte ScrCmd_contestlinktransfer .4byte ScrCmd_random - .4byte ScrCmd_givemoney - .4byte ScrCmd_takemoney + .4byte ScrCmd_addmoney + .4byte ScrCmd_removemoney .4byte ScrCmd_checkmoney .4byte ScrCmd_showmoneybox .4byte ScrCmd_hidemoneybox @@ -180,8 +180,8 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_addelevmenuitem .4byte ScrCmd_showelevmenu .4byte ScrCmd_checkcoins - .4byte ScrCmd_givecoins - .4byte ScrCmd_takecoins + .4byte ScrCmd_addcoins + .4byte ScrCmd_removecoins .4byte ScrCmd_setwildbattle .4byte ScrCmd_dowildbattle .4byte ScrCmd_setvaddress diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc index b699c8e04..a3dc2a8e2 100644 --- a/data/scripts/berry_blender.inc +++ b/data/scripts/berry_blender.inc @@ -263,7 +263,7 @@ BerryBlender_EventScript_Blender1NoSpareBerries: @ 8293C92 BerryBlender_EventScript_Blender1GiveSpareBerry: @ 8293C9C msgbox BerryBlender_Text_CanHaveOneOfMyBerries, MSGBOX_DEFAULT - giveitem_std ITEM_PECHA_BERRY + giveitem ITEM_PECHA_BERRY setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY goto BerryBlender_EventScript_UseBerryBlender1 end @@ -551,7 +551,7 @@ BerryBlender_EventScript_ExpertMNoSpareBerries: @ 8294028 BerryBlender_EventScript_ExpertMGiveBerry: @ 8294032 msgbox BerryBlender_Text_DontHaveAnyBerriesHaveOne, MSGBOX_DEFAULT - giveitem_std ITEM_PECHA_BERRY + giveitem ITEM_PECHA_BERRY setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY msgbox BerryBlender_Text_UseItToMakePokeblocksTogether, MSGBOX_DEFAULT release diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index f4b592b69..18378077c 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -45,7 +45,7 @@ BerryTree_EventScript_ChooseBerryToPlant:: @ 8274393 waitstate compare VAR_ITEM_ID, 0 goto_if_eq BerryTree_EventScript_CancelPlanting - takeitem VAR_ITEM_ID, 1 + removeitem VAR_ITEM_ID call BerryTree_EventScript_PlantBerry BerryTree_EventScript_CancelPlanting:: @ 82743AF diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 006ad9688..4f2fab0f4 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -41,7 +41,7 @@ CableClub_EventScript_DistributeEonTicket:: @ 8276B23 goto_if_eq CableClub_EventScript_AlreadyGotEonTicket goto_if_set FLAG_SYS_HAS_EON_TICKET, CableClub_EventScript_AlreadyGotEonTicket msgbox Mevent_Text_TheresATicketForYou, MSGBOX_DEFAULT - giveitem_std ITEM_EON_TICKET + giveitem ITEM_EON_TICKET setflag FLAG_SYS_HAS_EON_TICKET setvar VAR_DISTRIBUTE_EON_TICKET, 0 msgbox Mevent_Text_TryUsingItAtLilycovePort, MSGBOX_DEFAULT @@ -383,7 +383,7 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD waitdooranim applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, 0 closedoor 9, 1 waitdooranim release @@ -488,7 +488,7 @@ CableClub_EventScript_EnterTradeCenter:: @ 827713A waitdooranim applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, 0 closedoor 9, 1 waitdooranim release @@ -563,7 +563,7 @@ CableClub_EventScript_EnterRecordCorner:: @ 827724C waitdooranim applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, 0 closedoor 9, 1 waitdooranim release @@ -965,7 +965,7 @@ CableClub_EventScript_EnterUnionRoom:: @ 827759F waitdooranim applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, 0 closedoor 5, 1 waitdooranim special Script_ResetUnionRoomTrade @@ -1296,7 +1296,7 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 8277B3A waitdooranim applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, 0 closedoor 9, 1 waitdooranim release @@ -1488,7 +1488,7 @@ MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom:: @ 8277E0E closemessage applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterMinigameRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, 0 release waitstate end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index cabf923b6..9775c40dc 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -15,7 +15,7 @@ LilycoveCity_ContestLobby_EventScript_ReceptionWelcome:: @ 8279CEA LilycoveCity_ContestLobby_EventScript_GivePokeblockCase:: @ 8279CF3 msgbox LilycoveCity_ContestLobby_Text_ReceptionDontHavePokeblockCase, MSGBOX_DEFAULT - giveitem_std ITEM_POKEBLOCK_CASE + giveitem ITEM_POKEBLOCK_CASE setflag FLAG_RECEIVED_POKEBLOCK_CASE msgbox LilycoveCity_ContestLobby_Text_NowThatWeveClearedThatUp, MSGBOX_DEFAULT return @@ -27,7 +27,7 @@ LilycoveCity_ContestLobby_EventScript_PickUpPrize:: @ 8279D13 end LilycoveCity_ContestLobby_EventScript_GiveLuxuryBallAtCounter:: @ 8279D2C - giveitem_std ITEM_LUXURY_BALL + giveitem ITEM_LUXURY_BALL compare VAR_RESULT, FALSE goto_if_eq LilycoveCity_ContestLobby_EventScript_NoRoomForLuxuryBallAtCounter setvar VAR_CONTEST_PRIZE_PICKUP, 0 @@ -1236,7 +1236,7 @@ ContestHall_EventScript_NoRoomForLuxuryBall:: @ 827ACA8 return ContestHall_EventScript_GiveLuxuryBall:: @ 827ACBD - giveitem_std ITEM_LUXURY_BALL + giveitem ITEM_LUXURY_BALL compare VAR_RESULT, FALSE goto_if_eq ContestHall_EventScript_NoRoomForLuxuryBall lockall diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc index 5e926afc0..2876e9e8c 100644 --- a/data/scripts/item_ball_scripts.inc +++ b/data/scripts/item_ball_scripts.inc @@ -1,659 +1,659 @@ Route102_EventScript_ItemPotion:: @ 8290CD8 - finditem_std ITEM_POTION + finditem ITEM_POTION end Route103_EventScript_ItemGuardSpec:: @ 8290CE5 - finditem_std ITEM_GUARD_SPEC + finditem ITEM_GUARD_SPEC end Route103_EventScript_ItemPPUp:: @ 8290CF2 - finditem_std ITEM_PP_UP + finditem ITEM_PP_UP end Route104_EventScript_ItemPPUp:: @ 8290CFF - finditem_std ITEM_PP_UP + finditem ITEM_PP_UP end Route104_EventScript_ItemPokeBall:: @ 8290D0C - finditem_std ITEM_POKE_BALL + finditem ITEM_POKE_BALL end Route104_EventScript_ItemXAccuracy:: @ 8290D19 - finditem_std ITEM_X_ACCURACY + finditem ITEM_X_ACCURACY end Route104_EventScript_ItemPotion:: @ 8290D26 - finditem_std ITEM_POTION + finditem ITEM_POTION end Route105_EventScript_ItemIron:: @ 8290D33 - finditem_std ITEM_IRON + finditem ITEM_IRON end Route106_EventScript_ItemProtein:: @ 8290D40 - finditem_std ITEM_PROTEIN + finditem ITEM_PROTEIN end Route108_EventScript_ItemStarPiece:: @ 8290D4D - finditem_std ITEM_STAR_PIECE + finditem ITEM_STAR_PIECE end Route109_EventScript_ItemPPUp:: @ 8290D5A - finditem_std ITEM_PP_UP + finditem ITEM_PP_UP end Route109_EventScript_ItemPotion:: @ 8290D67 - finditem_std ITEM_POTION + finditem ITEM_POTION end Route110_EventScript_ItemRareCandy:: @ 8290D74 - finditem_std ITEM_RARE_CANDY + finditem ITEM_RARE_CANDY end Route110_EventScript_ItemDireHit:: @ 8290D81 - finditem_std ITEM_DIRE_HIT + finditem ITEM_DIRE_HIT end Route110_EventScript_ItemElixir:: @ 8290D8E - finditem_std ITEM_ELIXIR + finditem ITEM_ELIXIR end Route111_EventScript_ItemTM37:: @ 8290D9B - finditem_std ITEM_TM37 + finditem ITEM_TM37 end Route111_EventScript_ItemStardust:: @ 8290DA8 - finditem_std ITEM_STARDUST + finditem ITEM_STARDUST end Route111_EventScript_ItemHPUp:: @ 8290DB5 - finditem_std ITEM_HP_UP + finditem ITEM_HP_UP end Route111_EventScript_ItemElixir:: @ 8290DC2 - finditem_std ITEM_ELIXIR + finditem ITEM_ELIXIR end Route112_EventScript_ItemNugget:: @ 8290DCF - finditem_std ITEM_NUGGET + finditem ITEM_NUGGET end Route113_EventScript_ItemMaxEther:: @ 8290DDC - finditem_std ITEM_MAX_ETHER + finditem ITEM_MAX_ETHER end Route113_EventScript_ItemSuperRepel:: @ 8290DE9 - finditem_std ITEM_SUPER_REPEL + finditem ITEM_SUPER_REPEL end Route113_EventScript_ItemHyperPotion:: @ 8290DF6 - finditem_std ITEM_HYPER_POTION + finditem ITEM_HYPER_POTION end Route114_EventScript_ItemRareCandy:: @ 8290E03 - finditem_std ITEM_RARE_CANDY + finditem ITEM_RARE_CANDY end Route114_EventScript_ItemProtein:: @ 8290E10 - finditem_std ITEM_PROTEIN + finditem ITEM_PROTEIN end Route114_EventScript_ItemEnergyPowder:: @ 8290E1D - finditem_std ITEM_ENERGY_POWDER + finditem ITEM_ENERGY_POWDER end Route115_EventScript_ItemSuperPotion:: @ 8290E2A - finditem_std ITEM_SUPER_POTION + finditem ITEM_SUPER_POTION end Route115_EventScript_ItemTM01:: @ 8290E37 - finditem_std ITEM_TM01 + finditem ITEM_TM01 end Route115_EventScript_ItemIron:: @ 8290E44 - finditem_std ITEM_IRON + finditem ITEM_IRON end Route115_EventScript_ItemGreatBall:: @ 8290E51 - finditem_std ITEM_GREAT_BALL + finditem ITEM_GREAT_BALL end Route115_EventScript_ItemHealPowder:: @ 8290E5E - finditem_std ITEM_HEAL_POWDER + finditem ITEM_HEAL_POWDER end Route115_EventScript_ItemPPUp:: @ 8290E6B - finditem_std ITEM_PP_UP + finditem ITEM_PP_UP end Route116_EventScript_ItemXSpecial:: @ 8290E78 - finditem_std ITEM_X_SPECIAL + finditem ITEM_X_SPECIAL end Route116_EventScript_ItemEther:: @ 8290E85 - finditem_std ITEM_ETHER + finditem ITEM_ETHER end Route116_EventScript_ItemRepel:: @ 8290E92 - finditem_std ITEM_REPEL + finditem ITEM_REPEL end Route116_EventScript_ItemHPUp:: @ 8290E9F - finditem_std ITEM_HP_UP + finditem ITEM_HP_UP end Route116_EventScript_ItemPotion:: @ 8290EAC - finditem_std ITEM_POTION + finditem ITEM_POTION end Route117_EventScript_ItemGreatBall:: @ 8290EB9 - finditem_std ITEM_GREAT_BALL + finditem ITEM_GREAT_BALL end Route117_EventScript_ItemRevive:: @ 8290EC6 - finditem_std ITEM_REVIVE + finditem ITEM_REVIVE end Route118_EventScript_ItemHyperPotion:: @ 8290ED3 - finditem_std ITEM_HYPER_POTION + finditem ITEM_HYPER_POTION end Route119_EventScript_ItemSuperRepel:: @ 8290EE0 - finditem_std ITEM_SUPER_REPEL + finditem ITEM_SUPER_REPEL end Route119_EventScript_ItemZinc:: @ 8290EED - finditem_std ITEM_ZINC + finditem ITEM_ZINC end Route119_EventScript_ItemElixir:: @ 8290EFA - finditem_std ITEM_ELIXIR + finditem ITEM_ELIXIR end Route119_EventScript_ItemLeafStone:: @ 8290F07 - finditem_std ITEM_LEAF_STONE + finditem ITEM_LEAF_STONE end Route119_EventScript_ItemRareCandy:: @ 8290F14 - finditem_std ITEM_RARE_CANDY + finditem ITEM_RARE_CANDY end Route119_EventScript_ItemHyperPotion:: @ 8290F21 - finditem_std ITEM_HYPER_POTION + finditem ITEM_HYPER_POTION end Route119_EventScript_ItemHyperPotion2:: @ 8290F2E - finditem_std ITEM_HYPER_POTION + finditem ITEM_HYPER_POTION end Route119_EventScript_ItemElixir2:: @ 8290F3B - finditem_std ITEM_ELIXIR + finditem ITEM_ELIXIR end Route120_EventScript_ItemNugget:: @ 8290F48 - finditem_std ITEM_NUGGET + finditem ITEM_NUGGET end Route120_EventScript_ItemFullHeal:: @ 8290F55 - finditem_std ITEM_FULL_HEAL + finditem ITEM_FULL_HEAL end Route120_EventScript_ItemHyperPotion:: @ 8290F62 - finditem_std ITEM_HYPER_POTION + finditem ITEM_HYPER_POTION end Route120_EventScript_ItemNestBall:: @ 8290F6F - finditem_std ITEM_NEST_BALL + finditem ITEM_NEST_BALL end Route120_EventScript_ItemRevive:: @ 8290F7C - finditem_std ITEM_REVIVE + finditem ITEM_REVIVE end Route121_EventScript_ItemCarbos:: @ 8290F89 - finditem_std ITEM_CARBOS + finditem ITEM_CARBOS end Route121_EventScript_ItemRevive:: @ 8290F96 - finditem_std ITEM_REVIVE + finditem ITEM_REVIVE end Route121_EventScript_ItemZinc:: @ 8290FA3 - finditem_std ITEM_ZINC + finditem ITEM_ZINC end Route123_EventScript_ItemCalcium:: @ 8290FB0 - finditem_std ITEM_CALCIUM + finditem ITEM_CALCIUM end Route123_EventScript_ItemUltraBall:: @ 8290FBD - finditem_std ITEM_ULTRA_BALL + finditem ITEM_ULTRA_BALL end Route123_EventScript_ItemElixir:: @ 8290FCA - finditem_std ITEM_ELIXIR + finditem ITEM_ELIXIR end Route123_EventScript_ItemPPUp:: @ 8290FD7 - finditem_std ITEM_PP_UP + finditem ITEM_PP_UP end Route123_EventScript_ItemRevivalHerb:: @ 8290FE4 - finditem_std ITEM_REVIVAL_HERB + finditem ITEM_REVIVAL_HERB end Route124_EventScript_ItemRedShard:: @ 8290FF1 - finditem_std ITEM_RED_SHARD + finditem ITEM_RED_SHARD end Route124_EventScript_ItemBlueShard:: @ 8290FFE - finditem_std ITEM_BLUE_SHARD + finditem ITEM_BLUE_SHARD end Route124_EventScript_ItemYellowShard:: @ 829100B - finditem_std ITEM_YELLOW_SHARD + finditem ITEM_YELLOW_SHARD end Route125_EventScript_ItemBigPearl:: @ 8291018 - finditem_std ITEM_BIG_PEARL + finditem ITEM_BIG_PEARL end Route126_EventScript_ItemGreenShard:: @ 8291025 - finditem_std ITEM_GREEN_SHARD + finditem ITEM_GREEN_SHARD end Route127_EventScript_ItemZinc:: @ 8291032 - finditem_std ITEM_ZINC + finditem ITEM_ZINC end Route127_EventScript_ItemCarbos:: @ 829103F - finditem_std ITEM_CARBOS + finditem ITEM_CARBOS end Route127_EventScript_ItemRareCandy:: @ 829104C - finditem_std ITEM_RARE_CANDY + finditem ITEM_RARE_CANDY end Route132_EventScript_ItemRareCandy:: @ 8291059 - finditem_std ITEM_RARE_CANDY + finditem ITEM_RARE_CANDY end Route132_EventScript_ItemProtein:: @ 8291066 - finditem_std ITEM_PROTEIN + finditem ITEM_PROTEIN end Route133_EventScript_ItemBigPearl:: @ 8291073 - finditem_std ITEM_BIG_PEARL + finditem ITEM_BIG_PEARL end Route133_EventScript_ItemStarPiece:: @ 8291080 - finditem_std ITEM_STAR_PIECE + finditem ITEM_STAR_PIECE end Route133_EventScript_ItemMaxRevive:: @ 829108D - finditem_std ITEM_MAX_REVIVE + finditem ITEM_MAX_REVIVE end Route134_EventScript_ItemCarbos:: @ 829109A - finditem_std ITEM_CARBOS + finditem ITEM_CARBOS end Route134_EventScript_ItemStarPiece:: @ 82910A7 - finditem_std ITEM_STAR_PIECE + finditem ITEM_STAR_PIECE end PetalburgCity_EventScript_ItemMaxRevive:: @ 82910B4 - finditem_std ITEM_MAX_REVIVE + finditem ITEM_MAX_REVIVE end PetalburgCity_EventScript_ItemEther:: @ 82910C1 - finditem_std ITEM_ETHER + finditem ITEM_ETHER end MauvilleCity_EventScript_ItemXSpeed:: @ 82910CE - finditem_std ITEM_X_SPEED + finditem ITEM_X_SPEED end RustboroCity_EventScript_ItemXDefend:: @ 82910DB - finditem_std ITEM_X_DEFEND + finditem ITEM_X_DEFEND end LilycoveCity_EventScript_ItemMaxRepel:: @ 82910E8 - finditem_std ITEM_MAX_REPEL + finditem ITEM_MAX_REPEL end MossdeepCity_EventScript_ItemNetBall:: @ 82910F5 - finditem_std ITEM_NET_BALL + finditem ITEM_NET_BALL end PetalburgWoods_EventScript_ItemXAttack:: @ 8291102 - finditem_std ITEM_X_ATTACK + finditem ITEM_X_ATTACK end PetalburgWoods_EventScript_ItemGreatBall:: @ 829110F - finditem_std ITEM_GREAT_BALL + finditem ITEM_GREAT_BALL end PetalburgWoods_EventScript_ItemEther:: @ 829111C - finditem_std ITEM_ETHER + finditem ITEM_ETHER end PetalburgWoods_EventScript_ItemParalyzeHeal:: @ 8291129 - finditem_std ITEM_PARALYZE_HEAL + finditem ITEM_PARALYZE_HEAL end RusturfTunnel_EventScript_ItemPokeBall:: @ 8291136 - finditem_std ITEM_POKE_BALL + finditem ITEM_POKE_BALL end RusturfTunnel_EventScript_ItemMaxEther:: @ 8291143 - finditem_std ITEM_MAX_ETHER + finditem ITEM_MAX_ETHER end GraniteCave_1F_EventScript_ItemEscapeRope:: @ 8291150 - finditem_std ITEM_ESCAPE_ROPE + finditem ITEM_ESCAPE_ROPE end GraniteCave_B1F_EventScript_ItemPokeBall:: @ 829115D - finditem_std ITEM_POKE_BALL + finditem ITEM_POKE_BALL end GraniteCave_B2F_EventScript_ItemRepel:: @ 829116A - finditem_std ITEM_REPEL + finditem ITEM_REPEL end GraniteCave_B2F_EventScript_ItemRareCandy:: @ 8291177 - finditem_std ITEM_RARE_CANDY + finditem ITEM_RARE_CANDY end JaggedPass_EventScript_ItemBurnHeal:: @ 8291184 - finditem_std ITEM_BURN_HEAL + finditem ITEM_BURN_HEAL end FieryPath_EventScript_ItemFireStone:: @ 8291191 - finditem_std ITEM_FIRE_STONE + finditem ITEM_FIRE_STONE end FieryPath_EventScript_ItemTM06:: @ 829119E - finditem_std ITEM_TM06 + finditem ITEM_TM06 end MeteorFalls_1F_1R_EventScript_ItemTM23:: @ 82911AB - finditem_std ITEM_TM23 + finditem ITEM_TM23 end MeteorFalls_1F_1R_EventScript_ItemFullHeal:: @ 82911B8 - finditem_std ITEM_FULL_HEAL + finditem ITEM_FULL_HEAL end MeteorFalls_1F_1R_EventScript_ItemMoonStone:: @ 82911C5 - finditem_std ITEM_MOON_STONE + finditem ITEM_MOON_STONE end MeteorFalls_1F_1R_EventScript_ItemPPUP:: @ 82911D2 - finditem_std ITEM_PP_UP + finditem ITEM_PP_UP end MeteorFalls_B1F_2R_EventScript_ItemTM02:: @ 82911DF - finditem_std ITEM_TM02 + finditem ITEM_TM02 end NewMauville_Inside_EventScript_ItemUltraRope:: @ 82911EC - finditem_std ITEM_ULTRA_BALL + finditem ITEM_ULTRA_BALL end NewMauville_Inside_EventScript_ItemEscapeRope:: @ 82911F9 - finditem_std ITEM_ESCAPE_ROPE + finditem ITEM_ESCAPE_ROPE end NewMauville_Inside_EventScript_ItemThunderStone:: @ 8291206 - finditem_std ITEM_THUNDER_STONE + finditem ITEM_THUNDER_STONE end NewMauville_Inside_EventScript_ItemFullHeal:: @ 8291213 - finditem_std ITEM_FULL_HEAL + finditem ITEM_FULL_HEAL end NewMauville_Inside_EventScript_ItemParalyzeHeal:: @ 8291220 - finditem_std ITEM_PARALYZE_HEAL + finditem ITEM_PARALYZE_HEAL end AbandonedShip_Rooms_1F_EventScript_ItemHarborMail:: @ 829122D - finditem_std ITEM_HARBOR_MAIL + finditem ITEM_HARBOR_MAIL end AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope:: @ 829123A - finditem_std ITEM_ESCAPE_ROPE + finditem ITEM_ESCAPE_ROPE end AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall:: @ 8291247 - finditem_std ITEM_DIVE_BALL + finditem ITEM_DIVE_BALL end AbandonedShip_Room_B1F_EventScript_ItemTM13:: @ 8291254 - finditem_std ITEM_TM13 + finditem ITEM_TM13 end AbandonedShip_Rooms2_1F_EventScript_ItemRevive:: @ 8291261 - finditem_std ITEM_REVIVE + finditem ITEM_REVIVE end AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey:: @ 829126E - finditem_std ITEM_STORAGE_KEY + finditem ITEM_STORAGE_KEY end AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall:: @ 829127B - finditem_std ITEM_LUXURY_BALL + finditem ITEM_LUXURY_BALL end AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner:: @ 8291288 - finditem_std ITEM_SCANNER + finditem ITEM_SCANNER end AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone:: @ 8291295 - finditem_std ITEM_WATER_STONE + finditem ITEM_WATER_STONE end AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18:: @ 82912A2 - finditem_std ITEM_TM18 + finditem ITEM_TM18 end ScorchedSlab_EventScript_ItemTM11:: @ 82912AF - finditem_std ITEM_TM11 + finditem ITEM_TM11 end SafariZone_Northwest_EventScript_ItemTM22:: @ 82912BC - finditem_std ITEM_TM22 + finditem ITEM_TM22 end SafariZone_North_EventScript_ItemCalcium:: @ 82912C9 - finditem_std ITEM_CALCIUM + finditem ITEM_CALCIUM end SafariZone_Southwest_EventScript_ItemMaxRevive:: @ 82912D6 - finditem_std ITEM_MAX_REVIVE + finditem ITEM_MAX_REVIVE end SafariZone_Northeast_EventScript_ItemNugget:: @ 82912E3 - finditem_std ITEM_NUGGET + finditem ITEM_NUGGET end SafariZone_Southeast_EventScript_ItemBigPearl:: @ 82912F0 - finditem_std ITEM_BIG_PEARL + finditem ITEM_BIG_PEARL end MtPyre_2F_EventScript_ItemUltraBall:: @ 82912FD - finditem_std ITEM_ULTRA_BALL + finditem ITEM_ULTRA_BALL end MtPyre_3F_EventScript_ItemSuperRepel:: @ 829130A - finditem_std ITEM_SUPER_REPEL + finditem ITEM_SUPER_REPEL end MtPyre_4F_EventScript_ItemSeaIncense:: @ 8291317 - finditem_std ITEM_SEA_INCENSE + finditem ITEM_SEA_INCENSE end MtPyre_5F_EventScript_ItemLaxIncense:: @ 8291324 - finditem_std ITEM_LAX_INCENSE + finditem ITEM_LAX_INCENSE end MtPyre_6F_EventScript_ItemTM30:: @ 8291331 - finditem_std ITEM_TM30 + finditem ITEM_TM30 end MtPyre_Exterior_EventScript_ItemMaxPotion:: @ 829133E - finditem_std ITEM_MAX_POTION + finditem ITEM_MAX_POTION end MtPyre_Exterior_EventScript_ItemTM48:: @ 829134B - finditem_std ITEM_TM48 + finditem ITEM_TM48 end AquaHideout_B1F_EventScript_ItemMasterBall:: @ 8291358 - finditem_std ITEM_MASTER_BALL + finditem ITEM_MASTER_BALL end AquaHideout_B1F_EventScript_ItemNugget:: @ 8291365 - finditem_std ITEM_NUGGET + finditem ITEM_NUGGET end AquaHideout_B1F_EventScript_ItemMaxElixir:: @ 8291372 - finditem_std ITEM_MAX_ELIXIR + finditem ITEM_MAX_ELIXIR end AquaHideout_B2F_EventScript_ItemNestBall:: @ 829137F - finditem_std ITEM_NEST_BALL + finditem ITEM_NEST_BALL end AquaHideout_B2F_EventScript_ItemMasterBall:: @ 829138C - finditem_std ITEM_MASTER_BALL // Unused + finditem ITEM_MASTER_BALL // Unused end Route119_EventScript_ItemNugget:: @ 8291399 - finditem_std ITEM_NUGGET + finditem ITEM_NUGGET end Route119_EventScript_ItemMaxElixir:: @ 82913A6 - finditem_std ITEM_MAX_ELIXIR + finditem ITEM_MAX_ELIXIR end Route119_EventScript_ItemNestBall:: @ 82913B3 - finditem_std ITEM_NEST_BALL + finditem ITEM_NEST_BALL end ShoalCave_LowTideEntranceRoom_EventScript_ItemBigPearl:: @ 82913C0 - finditem_std ITEM_BIG_PEARL + finditem ITEM_BIG_PEARL end ShoalCave_LowTideInnerRoom_EventScript_ItemRareCandy:: @ 82913CD - finditem_std ITEM_RARE_CANDY + finditem ITEM_RARE_CANDY end ShoalCave_LowTideStairsRoom_EventScript_ItemIceHeal:: @ 82913DA - finditem_std ITEM_ICE_HEAL + finditem ITEM_ICE_HEAL end ShoalCave_LowTideIceRoom_EventScript_ItemTM07:: @ 82913E7 - finditem_std ITEM_TM07 + finditem ITEM_TM07 end ShoalCave_LowTideIceRoom_EventScript_ItemNeverMeltIce:: @ 82913F4 - finditem_std ITEM_NEVER_MELT_ICE + finditem ITEM_NEVER_MELT_ICE end SeafloorCavern_Room9_EventScript_ItemTM26:: @ 8291401 - finditem_std ITEM_TM26 + finditem ITEM_TM26 end Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail:: @ 829140E - finditem_std ITEM_ORANGE_MAIL + finditem ITEM_ORANGE_MAIL end Route110_TrickHousePuzzle2_EventScript_ItemHarborMail:: @ 829141B - finditem_std ITEM_HARBOR_MAIL + finditem ITEM_HARBOR_MAIL end Route110_TrickHousePuzzle2_EventScript_ItemWaveMail:: @ 8291428 - finditem_std ITEM_WAVE_MAIL + finditem ITEM_WAVE_MAIL end Route110_TrickHousePuzzle3_EventScript_ItemShadowMail:: @ 8291435 - finditem_std ITEM_SHADOW_MAIL + finditem ITEM_SHADOW_MAIL end Route110_TrickHousePuzzle3_EventScript_ItemWoodMail:: @ 8291442 - finditem_std ITEM_WOOD_MAIL + finditem ITEM_WOOD_MAIL end Route110_TrickHousePuzzle4_EventScript_ItemMechMail:: @ 829144F - finditem_std ITEM_MECH_MAIL + finditem ITEM_MECH_MAIL end Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail:: @ 829145C - finditem_std ITEM_GLITTER_MAIL + finditem ITEM_GLITTER_MAIL end Route110_TrickHousePuzzle7_EventScript_ItemTropicMail:: @ 8291469 - finditem_std ITEM_TROPIC_MAIL + finditem ITEM_TROPIC_MAIL end Route110_TrickHousePuzzle8_EventScript_ItemBeadMail:: @ 8291476 - finditem_std ITEM_BEAD_MAIL + finditem ITEM_BEAD_MAIL end VictoryRoad_1F_EventScript_ItemMaxElixir:: @ 8291483 - finditem_std ITEM_MAX_ELIXIR + finditem ITEM_MAX_ELIXIR end VictoryRoad_1F_EventScript_ItemPPUp:: @ 8291490 - finditem_std ITEM_PP_UP + finditem ITEM_PP_UP end VictoryRoad_B1F_EventScript_ItemTM29:: @ 829149D - finditem_std ITEM_TM29 + finditem ITEM_TM29 end VictoryRoad_B1F_EventScript_ItemFullRestore:: @ 82914AA - finditem_std ITEM_FULL_RESTORE + finditem ITEM_FULL_RESTORE end VictoryRoad_B2F_EventScript_ItemFullHeal:: @ 82914B7 - finditem_std ITEM_FULL_HEAL + finditem ITEM_FULL_HEAL end ArtisanCave_B1F_EventScript_ItemHPUp:: @ 82914C4 - finditem_std ITEM_HP_UP + finditem ITEM_HP_UP end ArtisanCave_1F_EventScript_ItemCarbos:: @ 82914D1 - finditem_std ITEM_CARBOS + finditem ITEM_CARBOS end MagmaHideout_1F_EventScript_ItemRareCandy:: @ 82914DE - finditem_std ITEM_RARE_CANDY + finditem ITEM_RARE_CANDY end MagmaHideout_2F_2R_EventScript_MaxElixir:: @ 82914EB - finditem_std ITEM_MAX_ELIXIR + finditem ITEM_MAX_ELIXIR end MagmaHideout_2F_2R_EventScript_ItemFullRestore:: @ 82914F8 - finditem_std ITEM_FULL_RESTORE + finditem ITEM_FULL_RESTORE end MagmaHideout_3F_1R_EventScript_ItemNugget:: @ 8291505 - finditem_std ITEM_NUGGET + finditem ITEM_NUGGET end MagmaHideout_3F_2R_EventScript_ItemPPMax:: @ 8291512 - finditem_std ITEM_PP_MAX + finditem ITEM_PP_MAX end MagmaHideout_4F_EventScript_MaxRevive:: @ 829151F - finditem_std ITEM_MAX_REVIVE + finditem ITEM_MAX_REVIVE end MagmaHideout_3F_3R_EventScript_ItemEscapeRope:: @ 829152C - finditem_std ITEM_ESCAPE_ROPE + finditem ITEM_ESCAPE_ROPE end diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc index c2ff593cf..bdd670031 100644 --- a/data/scripts/lilycove_lady.inc +++ b/data/scripts/lilycove_lady.inc @@ -129,7 +129,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize:: @ 82A8510 setvar VAR_0x8004, 0 specialvar VAR_0x8004, FavorLadyGetPrize msgbox LilycoveCity_PokemonCenter_1F_Text_IllGiveYouThisInReturn, MSGBOX_DEFAULT - giveitem_std VAR_0x8004 + giveitem VAR_0x8004 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoRoomForFavorPrize compare VAR_RESULT, 1 @@ -297,7 +297,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_GivePrize:: @ 82A8724 setvar VAR_0x8005, 0 special BufferQuizPrizeItem special SetQuizLadyState_Complete - giveitem_std VAR_0x8005 + giveitem VAR_0x8005 compare VAR_RESULT, FALSE goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoSpaceForQuizPrize goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz diff --git a/data/scripts/mevent_aurora_ticket.inc b/data/scripts/mevent_aurora_ticket.inc index 177d69681..f26be068f 100644 --- a/data/scripts/mevent_aurora_ticket.inc +++ b/data/scripts/mevent_aurora_ticket.inc @@ -2,10 +2,8 @@ MysteryEventScript_AuroraTicket:: @ 867533C setvaddress MysteryEventScript_AuroraTicket lock faceplayer - checkflag FLAG_RECEIVED_AURORA_TICKET - vgoto_if_eq AuroraTicket_Obtained - checkflag FLAG_BATTLED_DEOXYS - vgoto_if_eq AuroraTicket_Obtained + vgoto_if_set FLAG_RECEIVED_AURORA_TICKET, AuroraTicket_Obtained + vgoto_if_set FLAG_BATTLED_DEOXYS, AuroraTicket_Obtained checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, TRUE vgoto_if_eq AuroraTicket_Obtained @@ -15,7 +13,7 @@ MysteryEventScript_AuroraTicket:: @ 867533C checkitemspace ITEM_AURORA_TICKET, 1 compare VAR_RESULT, FALSE vgoto_if_eq AuroraTicket_NoBagSpace - giveitem_std ITEM_AURORA_TICKET + giveitem ITEM_AURORA_TICKET setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND setflag FLAG_RECEIVED_AURORA_TICKET vmessage sText_AuroraTicketUseAtPort diff --git a/data/scripts/mevent_battle_card.inc b/data/scripts/mevent_battle_card.inc index 77f9a9b24..70462bdd9 100644 --- a/data/scripts/mevent_battle_card.inc +++ b/data/scripts/mevent_battle_card.inc @@ -1,7 +1,6 @@ MysteryEventScript_BattleCard:: @ 867513C setvaddress MysteryEventScript_BattleCard - checkflag FLAG_MYSTERY_EVENT_DONE - vgoto_if_eq MysteryEventScript_BattleCardInfo + vgoto_if_set FLAG_MYSTERY_EVENT_DONE, MysteryEventScript_BattleCardInfo setorcopyvar VAR_RESULT, GET_CARD_BATTLES_WON specialvar VAR_0x8008, GetMysteryEventCardVal compare VAR_0x8008, REQUIRED_CARD_BATTLES @@ -11,7 +10,7 @@ MysteryEventScript_BattleCard:: @ 867513C vmessage sText_MysteryGiftBattleCountCard_WonPrize waitmessage waitbuttonpress - giveitem_std ITEM_POTION + giveitem ITEM_POTION release setflag FLAG_MYSTERY_EVENT_DONE end diff --git a/data/scripts/mevent_mystic_ticket.inc b/data/scripts/mevent_mystic_ticket.inc index 9d532b043..8f938dc33 100644 --- a/data/scripts/mevent_mystic_ticket.inc +++ b/data/scripts/mevent_mystic_ticket.inc @@ -2,12 +2,9 @@ MysteryEventScript_MysticTicket:: @ 867550B setvaddress MysteryEventScript_MysticTicket lock faceplayer - checkflag FLAG_RECEIVED_MYSTIC_TICKET - vgoto_if_eq MysticTicket_Obtained - checkflag FLAG_CAUGHT_LUGIA - vgoto_if_eq MysticTicket_Obtained - checkflag FLAG_CAUGHT_HO_OH - vgoto_if_eq MysticTicket_Obtained + vgoto_if_set FLAG_RECEIVED_MYSTIC_TICKET, MysticTicket_Obtained + vgoto_if_set FLAG_CAUGHT_LUGIA, MysticTicket_Obtained + vgoto_if_set FLAG_CAUGHT_HO_OH, MysticTicket_Obtained checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, TRUE vgoto_if_eq MysticTicket_Obtained @@ -17,7 +14,7 @@ MysteryEventScript_MysticTicket:: @ 867550B checkitemspace ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, FALSE vgoto_if_eq MysticTicket_NoBagSpace - giveitem_std ITEM_MYSTIC_TICKET + giveitem ITEM_MYSTIC_TICKET setflag FLAG_ENABLE_SHIP_NAVEL_ROCK setflag FLAG_RECEIVED_MYSTIC_TICKET vmessage sText_MysticTicketUseAtPort diff --git a/data/scripts/mevent_old_sea_map.inc b/data/scripts/mevent_old_sea_map.inc index 45c5f6728..0fb3c1002 100644 --- a/data/scripts/mevent_old_sea_map.inc +++ b/data/scripts/mevent_old_sea_map.inc @@ -2,10 +2,8 @@ MysteryEventScript_OldSeaMap:: @ 86757F4 setvaddress MysteryEventScript_OldSeaMap lock faceplayer - checkflag FLAG_RECEIVED_OLD_SEA_MAP - vgoto_if_eq OldSeaMap_Obtained - checkflag FLAG_CAUGHT_MEW - vgoto_if_eq OldSeaMap_Obtained + vgoto_if_set FLAG_RECEIVED_OLD_SEA_MAP, OldSeaMap_Obtained + vgoto_if_set FLAG_CAUGHT_MEW, OldSeaMap_Obtained checkitem ITEM_OLD_SEA_MAP, 1 compare VAR_RESULT, TRUE vgoto_if_eq OldSeaMap_Obtained @@ -15,7 +13,7 @@ MysteryEventScript_OldSeaMap:: @ 86757F4 checkitemspace ITEM_OLD_SEA_MAP, 1 compare VAR_RESULT, FALSE vgoto_if_eq OldSeaMap_NoBagSpace - giveitem_std ITEM_OLD_SEA_MAP + giveitem ITEM_OLD_SEA_MAP setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND setflag FLAG_RECEIVED_OLD_SEA_MAP vmessage sText_MysteryGiftOldSeaMapUseAtPort diff --git a/data/scripts/mevent_pichu.inc b/data/scripts/mevent_pichu.inc index 4f5c739af..cc947e396 100644 --- a/data/scripts/mevent_pichu.inc +++ b/data/scripts/mevent_pichu.inc @@ -1,7 +1,6 @@ MysteryEventScript_SurfPichu:: @ 8674D3D setvaddress MysteryEventScript_SurfPichu - checkflag FLAG_MYSTERY_EVENT_DONE - vgoto_if_ne SurfPichu_GiveIfPossible + vgoto_if_unset FLAG_MYSTERY_EVENT_DONE, SurfPichu_GiveIfPossible returnram SurfPichu_GiveIfPossible: @ 8674D4C diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc index 77b795f60..3afd92588 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -1,5 +1,5 @@ Std_ObtainItem:: @ 8271AD3 - giveitem VAR_0x8000, VAR_0x8001 + additem VAR_0x8000, VAR_0x8001 copyvar VAR_0x8007, VAR_RESULT call EventScript_ObtainItemMessage return @@ -73,7 +73,7 @@ EventScript_PlayFanfareObtainedTMHM:: @ 8271BB3 return Std_ObtainDecoration:: @ 8271BB7 - givedecoration VAR_0x8000 + adddecoration VAR_0x8000 copyvar VAR_0x8007, VAR_RESULT call EventScript_ObtainDecorationMessage return @@ -118,7 +118,7 @@ Std_FindItem:: @ 8271BFD EventScript_PickUpItem:: @ 8271C3A removeobject VAR_LAST_TALKED - giveitem VAR_0x8004, VAR_0x8005 + additem VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, BufferTMHMMoveName copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 1 @@ -156,7 +156,7 @@ EventScript_NoRoomToPickUpItem:: @ 8271CA1 EventScript_HiddenItemScript:: @ 8271CB7 lockall waitse - giveitem VAR_0x8005, 1 + additem VAR_0x8005 copyvar VAR_0x8007, VAR_RESULT bufferitemnameplural 1, VAR_0x8005, 1 checkitemtype VAR_0x8005 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 58618efe7..8f15fcd58 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -345,7 +345,7 @@ PlayersHouse_1F_EventScript_CheckGiveAmuletCoin:: @ 8292A43 PlayersHouse_1F_EventScript_TryGiveAmuletCoin:: @ 8292A51 goto_if_set FLAG_RECEIVED_AMULET_COIN, PlayersHouse_1F_EventScript_MomHealsParty msgbox PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom, MSGBOX_DEFAULT - giveitem_std ITEM_AMULET_COIN + giveitem ITEM_AMULET_COIN compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull msgbox PlayersHouse_1F_Text_DontPushYourselfTooHard, MSGBOX_DEFAULT @@ -448,7 +448,7 @@ PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 8292AF2 compare VAR_0x8008, FEMALE call_if_eq PlayersHouse_1F_EventScript_DadApproachPlayerFemale msgbox PlayersHouse_1F_Text_TicketFromBrineyCameForYou, MSGBOX_DEFAULT - giveitem_std ITEM_SS_TICKET + giveitem ITEM_SS_TICKET msgbox PlayersHouse_1F_Text_PortsInSlateportLilycove, MSGBOX_DEFAULT closemessage delay 20 diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 7be69ec58..6684ec98b 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -44,7 +44,7 @@ Route111_EventScript_SecretPowerMan:: @ 82765FF end Route111_EventScript_GiveSecretPower:: @ 827661E - giveitem_std ITEM_TM43 + giveitem ITEM_TM43 compare VAR_RESULT, FALSE goto_if_eq Route111_EventScript_NoRoomForSecretPower msgbox Route111_Text_ExplainSecretPower, MSGBOX_DEFAULT diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc new file mode 100644 index 000000000..1d82bb381 --- /dev/null +++ b/data/scripts/std_msgbox.inc @@ -0,0 +1,48 @@ +Std_MsgboxNPC: @ 8271315 + lock + faceplayer + message 0x0 + waitmessage + waitbuttonpress + release + return + +Std_MsgboxSign: @ 8271320 + lockall + message 0x0 + waitmessage + waitbuttonpress + releaseall + return + +Std_MsgboxDefault: @ 827132A + message 0x0 + waitmessage + waitbuttonpress + return + +Std_MsgboxYesNo: @ 8271332 + message 0x0 + waitmessage + yesnobox 20, 8 + return + +Std_MsgboxGetPoints: @ 827133C + message 0x0 + playfanfare MUS_ME_POINTGET + waitfanfare + waitmessage + return + +Std_10: @ 8271347 + pokenavcall 0x0 + waitmessage + return + +EventScript_UnusedReturn: @ 827134E + return + +Common_EventScript_SaveGame:: @ 827134F + special SaveGame + waitstate + return diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index 0ba8bcda6..d609fcc93 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -130,3 +130,10 @@ EventScript_EndTrainerBattle:: @ 8271491 gotobeatenscript releaseall end + +Std_MsgboxAutoclose:: @ 8271494 + message 0x0 + waitmessage + waitbuttonpress + release + return diff --git a/include/coins.h b/include/coins.h index 996519605..6190ebbab 100644 --- a/include/coins.h +++ b/include/coins.h @@ -6,7 +6,7 @@ void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y); void HideCoinsWindow(void); u16 GetCoins(void); void SetCoins(u16 coinAmount); -bool8 GiveCoins(u16 toAdd); -bool8 TakeCoins(u16 toSub); +bool8 AddCoins(u16 toAdd); +bool8 RemoveCoins(u16 toSub); #endif // GUARD_COINS_H diff --git a/src/coins.c b/src/coins.c index 1b9656abd..302817f8d 100644 --- a/src/coins.c +++ b/src/coins.c @@ -48,7 +48,7 @@ void SetCoins(u16 coinAmount) gSaveBlock1Ptr->coins = coinAmount ^ gSaveBlock2Ptr->encryptionKey; } -bool8 GiveCoins(u16 toAdd) +bool8 AddCoins(u16 toAdd) { u16 newAmount; u16 ownedCoins = GetCoins(); @@ -70,7 +70,7 @@ bool8 GiveCoins(u16 toAdd) return TRUE; } -bool8 TakeCoins(u16 toSub) +bool8 RemoveCoins(u16 toSub) { u16 ownedCoins = GetCoins(); if (ownedCoins >= toSub) diff --git a/src/scrcmd.c b/src/scrcmd.c index ac6e2d689..0e52f5953 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -486,7 +486,7 @@ bool8 ScrCmd_random(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_giveitem(struct ScriptContext *ctx) +bool8 ScrCmd_additem(struct ScriptContext *ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u32 quantity = VarGet(ScriptReadHalfword(ctx)); @@ -495,7 +495,7 @@ bool8 ScrCmd_giveitem(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_takeitem(struct ScriptContext *ctx) +bool8 ScrCmd_removeitem(struct ScriptContext *ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u32 quantity = VarGet(ScriptReadHalfword(ctx)); @@ -530,7 +530,7 @@ bool8 ScrCmd_checkitemtype(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_givepcitem(struct ScriptContext *ctx) +bool8 ScrCmd_addpcitem(struct ScriptContext *ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u16 quantity = VarGet(ScriptReadHalfword(ctx)); @@ -548,7 +548,7 @@ bool8 ScrCmd_checkpcitem(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_givedecoration(struct ScriptContext *ctx) +bool8 ScrCmd_adddecoration(struct ScriptContext *ctx) { u32 decorId = VarGet(ScriptReadHalfword(ctx)); @@ -556,7 +556,7 @@ bool8 ScrCmd_givedecoration(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_takedecoration(struct ScriptContext *ctx) +bool8 ScrCmd_removedecoration(struct ScriptContext *ctx) { u32 decorId = VarGet(ScriptReadHalfword(ctx)); @@ -1726,7 +1726,7 @@ bool8 ScrCmd_checkpartymove(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_givemoney(struct ScriptContext *ctx) +bool8 ScrCmd_addmoney(struct ScriptContext *ctx) { u32 amount = ScriptReadWord(ctx); u8 ignore = ScriptReadByte(ctx); @@ -1736,7 +1736,7 @@ bool8 ScrCmd_givemoney(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_takemoney(struct ScriptContext *ctx) +bool8 ScrCmd_removemoney(struct ScriptContext *ctx) { u32 amount = ScriptReadWord(ctx); u8 ignore = ScriptReadByte(ctx); @@ -2127,22 +2127,22 @@ bool8 ScrCmd_checkcoins(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_givecoins(struct ScriptContext *ctx) +bool8 ScrCmd_addcoins(struct ScriptContext *ctx) { u16 coins = VarGet(ScriptReadHalfword(ctx)); - if (GiveCoins(coins) == TRUE) + if (AddCoins(coins) == TRUE) gSpecialVar_Result = 0; else gSpecialVar_Result = 1; return FALSE; } -bool8 ScrCmd_takecoins(struct ScriptContext *ctx) +bool8 ScrCmd_removecoins(struct ScriptContext *ctx) { u16 coins = VarGet(ScriptReadHalfword(ctx)); - if (TakeCoins(coins) == TRUE) + if (RemoveCoins(coins) == TRUE) gSpecialVar_Result = 0; else gSpecialVar_Result = 1; |