diff options
Diffstat (limited to 'data/maps')
95 files changed, 273 insertions, 325 deletions
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 3228fb4b6..6682d8cdb 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 21000df1f..e63f1b24e 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 9b3cbfcdb..01ce14588 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 0939bfe40..d1facba32 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 d6214588f..12b598346 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 3bb6ed5eb..28e68da9d 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 OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_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 OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_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 68e7d61f3..5d45ed144 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 1726c8132..5fd2a5fca 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 OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_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 75c963095..4ebc03c8c 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 94187b53d..4994b8775 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 b0013f72a..fd5c69962 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 2ac8ee7f2..7e78e3d9f 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 f86ec79cb..9e1213c1b 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 8bba1984b..0fa34bcce 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 5084b31a4..2d1dca1ae 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 5397708f8..bc947025c 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 578c04ee3..c4be6b292 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 0d968f45c..bbd888e05 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -88,7 +88,7 @@ PetalburgWoods_EventScript_DevonResearcherPostBattle:: @ 822E138 applymovement OBJ_EVENT_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 4ddba42f6..e7e698be6 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 6de9d3c55..39fa352e4 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 75a7d3f9a..96765aacc 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 8557a19da..ed70894e3 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 2db95f0ce..89002883c 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 2043c7c02..87ff20904 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 6eb657a11..2fbbb7016 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 947b8d184..93d7f257c 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 4b7799510..a8aff3f76 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 OBJ_EVENT_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 b1b1ad3e9..549f22772 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 c72a92f27..27bfab94d 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 76121f3ef..aedbc9f9b 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 OBJ_EVENT_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 36ef4c0cd..853b94fc7 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 OBJ_EVENT_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 731b31f1f..fae6efc1a 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 73b108c45..a9d10e297 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 651c28a38..811232e79 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 3292d05c2..e195485b2 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 OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_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 3c6298fac..81b4c2008 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 d76e10d35..a973a0429 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 dcc879a09..afb4845b3 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 25ed0770f..4685f0571 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 |