diff --git a/data/event_scripts.s b/data/event_scripts.s index bfe879183..1e3ef3d8e 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1117,7 +1117,7 @@ EventScript_HandOverItem:: message Text_HandedOverItem waitmessage waitfanfare - removeitem VAR_0x8004, 1 + removeitem VAR_0x8004 return .include "data/scripts/pokemon_league.inc" diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 0a2208b66..46e824cf0 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -11,7 +11,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall:: lock faceplayer setvar VAR_TEMP_1, SPECIES_EEVEE - givemon SPECIES_EEVEE, 25, ITEM_NONE + givemon SPECIES_EEVEE, 25 compare VAR_RESULT, 0 goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveeParty compare VAR_RESULT, 1 diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 16e9df340..fd44f54e6 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -14,13 +14,13 @@ CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl:: CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks:: setvar VAR_TEMP_1, 0 - checkitem ITEM_FRESH_WATER, 1 + checkitem ITEM_FRESH_WATER compare VAR_RESULT, TRUE call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasFreshWater - checkitem ITEM_SODA_POP, 1 + checkitem ITEM_SODA_POP compare VAR_RESULT, TRUE call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasSodaPop - checkitem ITEM_LEMONADE, 1 + checkitem ITEM_LEMONADE compare VAR_RESULT, TRUE call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade return @@ -143,8 +143,8 @@ CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade:: CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink:: bufferitemname STR_VAR_1, VAR_0x8008 bufferitemname STR_VAR_2, VAR_0x8009 - removeitem VAR_0x8008, 1 - checkitemspace VAR_0x8009, 1 + removeitem VAR_0x8008 + checkitemspace VAR_0x8009 compare VAR_RESULT, FALSE goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward additem VAR_0x8009 @@ -210,7 +210,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine:: lockall message CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave waitmessage - showmoneybox 0, 0, 0 + showmoneybox 0, 0 goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink end @@ -227,38 +227,38 @@ CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink:: CeladonCity_DepartmentStore_Roof_EventScript_BuyFreshWater:: setvar VAR_TEMP_0, ITEM_FRESH_WATER - checkmoney 200, 0 + checkmoney 200 goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink end CeladonCity_DepartmentStore_Roof_EventScript_BuySodaPop:: setvar VAR_TEMP_0, ITEM_SODA_POP - checkmoney 300, 0 + checkmoney 300 goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink end CeladonCity_DepartmentStore_Roof_EventScript_BuyLemonade:: setvar VAR_TEMP_0, ITEM_LEMONADE - checkmoney 350, 0 + checkmoney 350 goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink end CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyFreshWater:: - removemoney 200, 0 + removemoney 200 return CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneySodaPop:: - removemoney 300, 0 + removemoney 300 return CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade:: - removemoney 350, 0 + removemoney 350 return CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink:: compare VAR_RESULT, FALSE goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NotEnoughMoney - checkitemspace VAR_TEMP_0, 1 + checkitemspace VAR_TEMP_0 compare VAR_RESULT, FALSE goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForDrink compare VAR_TEMP_1, 0 diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 8cd7ca69b..a020f1bab 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -24,7 +24,7 @@ CeladonCity_GameCorner_EventScript_CoinsClerk:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer - showmoneybox 0, 0, 0 + showmoneybox 0, 0 showcoinsbox 0, 5 message CeladonCity_GameCorner_Text_WelcomeBuySomeCoins waitmessage @@ -49,11 +49,11 @@ CeladonCity_GameCorner_EventScript_Buy500Coins:: checkcoins VAR_TEMP_1 compare VAR_TEMP_1, (MAX_COINS + 1) - 500 goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins - checkmoney 10000, 0 + checkmoney 10000 compare VAR_RESULT, FALSE goto_if_eq CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney addcoins 500 - removemoney 10000, 0 + removemoney 10000 goto CeladonCity_GameCorner_EventScript_BoughtCoins end @@ -61,11 +61,11 @@ CeladonCity_GameCorner_EventScript_Buy50Coins:: checkcoins VAR_TEMP_1 compare VAR_TEMP_1, (MAX_COINS + 1) - 50 goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins - checkmoney 1000, 0 + checkmoney 1000 compare VAR_RESULT, FALSE goto_if_eq CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney addcoins 50 - removemoney 1000, 0 + removemoney 1000 goto CeladonCity_GameCorner_EventScript_BoughtCoins end diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 544eb4a93..8a6c30770 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -123,10 +123,10 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon:: CeladonCity_GameCorner_PrizeRoom_EventScript_GiveAbra:: .ifdef FIRERED - givemon VAR_TEMP_1, 9, ITEM_NONE + givemon VAR_TEMP_1, 9 .else .ifdef LEAFGREEN - givemon VAR_TEMP_1, 7, ITEM_NONE + givemon VAR_TEMP_1, 7 .endif .endif goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon @@ -134,10 +134,10 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_GiveAbra:: CeladonCity_GameCorner_PrizeRoom_EventScript_GiveClefairy:: .ifdef FIRERED - givemon VAR_TEMP_1, 8, ITEM_NONE + givemon VAR_TEMP_1, 8 .else .ifdef LEAFGREEN - givemon VAR_TEMP_1, 12, ITEM_NONE + givemon VAR_TEMP_1, 12 .endif .endif goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon @@ -145,33 +145,33 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_GiveClefairy:: CeladonCity_GameCorner_PrizeRoom_EventScript_GiveDratini:: .ifdef FIRERED - givemon VAR_TEMP_1, 18, ITEM_NONE + givemon VAR_TEMP_1, 18 .else .ifdef LEAFGREEN - givemon VAR_TEMP_1, 24, ITEM_NONE + givemon VAR_TEMP_1, 24 .endif .endif goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end CeladonCity_GameCorner_PrizeRoom_EventScript_GiveScyther:: - givemon VAR_TEMP_1, 25, ITEM_NONE + givemon VAR_TEMP_1, 25 goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end CeladonCity_GameCorner_PrizeRoom_EventScript_GivePorygon:: .ifdef FIRERED - givemon VAR_TEMP_1, 26, ITEM_NONE + givemon VAR_TEMP_1, 26 .else .ifdef LEAFGREEN - givemon VAR_TEMP_1, 18, ITEM_NONE + givemon VAR_TEMP_1, 18 .endif .endif goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end CeladonCity_GameCorner_PrizeRoom_EventScript_GivePinsir:: - givemon VAR_TEMP_1, 18, ITEM_NONE + givemon VAR_TEMP_1, 18 goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end @@ -323,7 +323,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize:: checkcoins VAR_RESULT compare VAR_RESULT, VAR_TEMP_2 goto_if_lt CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins - checkitemspace VAR_TEMP_1, 1 + checkitemspace VAR_TEMP_1 compare VAR_RESULT, FALSE goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_BagFull removecoins VAR_TEMP_2 diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index 9795156b1..705ca6af6 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -21,7 +21,7 @@ CeladonCity_Gym_EventScript_DefeatedErika:: CeladonCity_Gym_EventScript_GiveTM19:: msgbox CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis - checkitemspace ITEM_TM19, 1 + checkitemspace ITEM_TM19 compare VAR_RESULT, FALSE goto_if_eq CeladonCity_Gym_EventScript_NoRoomForTM19 giveitem_msg CeladonCity_Gym_Text_ReceivedTM19FromErika, ITEM_TM19 diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index 65a625c7c..257bc1bb6 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -14,7 +14,7 @@ CeladonCity_Restaurant_EventScript_CoinCaseMan:: faceplayer goto_if_set FLAG_GOT_COIN_CASE, CeladonCity_Restaurant_EventScript_AlreadyGotCoinCase msgbox CeladonCity_Restaurant_Text_TakeThisImBusted - checkitemspace ITEM_COIN_CASE, 1 + checkitemspace ITEM_COIN_CASE compare VAR_RESULT, FALSE goto_if_eq CeladonCity_Restaurant_EventScript_NoRoomForCoinCase giveitem_msg CeladonCity_Restaurant_Text_ReceivedCoinCaseFromMan, ITEM_COIN_CASE diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index 2963e9228..f75ba95ee 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -35,7 +35,7 @@ CeruleanCave_B1F_EventScript_Mewtwo:: delay 20 playbgm MUS_ENCOUNTER_GYM_LEADER, 0 waitbuttonpress - setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE + setwildbattle SPECIES_MEWTWO, 70 setflag FLAG_SYS_SPECIAL_WILD_BATTLE special StartLegendaryBattle waitstate diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 110a2de4c..1aee74666 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -189,7 +189,7 @@ CeruleanCity_EventScript_Grunt:: CeruleanCity_EventScript_GruntDefeated:: msgbox CeruleanCity_Text_OkayIllReturnStolenTM - checkitemspace ITEM_TM28, 1 + checkitemspace ITEM_TM28 compare VAR_RESULT, FALSE goto_if_eq CeruleanCity_EventScript_NoRoomForTM28 giveitem_msg CeruleanCity_Text_RecoveredTM28FromGrunt, ITEM_TM28 diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 931ee7b12..9e8e0001f 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -6,7 +6,7 @@ CeruleanCity_BikeShop_EventScript_Clerk:: faceplayer goto_if_set FLAG_GOT_BICYCLE, CeruleanCity_BikeShop_EventScript_AlreadyGotBicycle goto_if_set FLAG_GOT_BIKE_VOUCHER, CeruleanCity_BikeShop_EventScript_ExchangeBikeVoucher - showmoneybox 0, 0, 0 + showmoneybox 0, 0 message CeruleanCity_BikeShop_Text_WelcomeToBikeShop waitmessage multichoice 11, 0, MULTICHOICE_BIKE_SHOP, FALSE diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index 1a1a02476..d20bab11e 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -20,7 +20,7 @@ CeruleanCity_Gym_EventScript_MistyDefeated:: CeruleanCity_Gym_EventScript_GiveTM03:: msgbox CeruleanCity_Gym_Text_ExplainCascadeBadge - checkitemspace ITEM_TM03, 1 + checkitemspace ITEM_TM03 compare VAR_RESULT, FALSE goto_if_eq CeruleanCity_Gym_EventScript_NoRoomForTM03 giveitem_msg CeruleanCity_Gym_Text_ReceivedTM03FromMisty, ITEM_TM03 diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 0d9a1ff0a..395f45419 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -73,7 +73,7 @@ CinnabarIsland_Gym_EventScript_DefeatedBlaine:: CinnabarIsland_Gym_EventScript_GiveTM38:: msgbox CinnabarIsland_Gym_Text_ExplainVolcanoBadge - checkitemspace ITEM_TM38, 1 + checkitemspace ITEM_TM38 compare VAR_RESULT, FALSE goto_if_eq CinnabarIsland_Gym_EventScript_NoRoomForTM38 giveitem_msg CinnabarIsland_Gym_Text_ReceivedTM38FromBlaine, ITEM_TM38 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 5644b408b..1488e054c 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -50,7 +50,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill:: removeobject LOCALID_BILL setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 clearflag FLAG_HIDE_CINNABAR_BILL - warp MAP_CINNABAR_ISLAND, 255, 14, 11 + warp MAP_CINNABAR_ISLAND, 14, 11 waitstate release end diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index f3e905b95..8db5d6f3c 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -215,7 +215,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveOmanyte:: setvar VAR_TEMP_1, SPECIES_OMANYTE bufferspeciesname STR_VAR_1, SPECIES_OMANYTE msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_FossilMonBackToLife - givemon SPECIES_OMANYTE, 5, ITEM_NONE + givemon SPECIES_OMANYTE, 5 compare VAR_RESULT, 2 goto_if_eq EventScript_NoMoreRoomForPokemon setflag FLAG_REVIVED_HELIX @@ -229,7 +229,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveKabuto:: setvar VAR_TEMP_1, SPECIES_KABUTO bufferspeciesname STR_VAR_1, SPECIES_KABUTO msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_FossilMonBackToLife - givemon SPECIES_KABUTO, 5, ITEM_NONE + givemon SPECIES_KABUTO, 5 compare VAR_RESULT, 2 goto_if_eq EventScript_NoMoreRoomForPokemon setflag FLAG_REVIVED_DOME @@ -243,7 +243,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl:: setvar VAR_TEMP_1, SPECIES_AERODACTYL bufferspeciesname STR_VAR_1, SPECIES_AERODACTYL msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_FossilMonBackToLife - givemon SPECIES_AERODACTYL, 5, ITEM_NONE + givemon SPECIES_AERODACTYL, 5 compare VAR_RESULT, 2 goto_if_eq EventScript_NoMoreRoomForPokemon setflag FLAG_REVIVED_AMBER diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index d442b9b40..c69268fc6 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -31,7 +31,7 @@ FiveIsland_LostCave_Room10_EventScript_FindSelphyScene:: msgbox FiveIsland_LostCave_Room10_Text_MayIAskYouToTakeMeHome closemessage call FiveIsland_LostCave_Room10_EventScript_SetSelphyFound - warp MAP_FIVE_ISLAND_RESORT_GORGEOUS, 255, 39, 10 + warp MAP_FIVE_ISLAND_RESORT_GORGEOUS, 39, 10 waitstate releaseall end diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index c240bdbba..de3403a7d 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -40,7 +40,7 @@ FiveIsland_MemorialPillar_EventScript_Memorial:: goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced msgbox FiveIsland_MemorialPillar_Text_HereLiesTectonixLemonadeOffering - checkitem ITEM_LEMONADE, 1 + checkitem ITEM_LEMONADE compare VAR_RESULT, TRUE goto_if_eq FiveIsland_MemorialPillar_EventScript_AskPlaceLemonade releaseall @@ -54,7 +54,7 @@ FiveIsland_MemorialPillar_EventScript_AskPlaceLemonade:: end FiveIsland_MemorialPillar_EventScript_PlaceLemonade:: - removeitem ITEM_LEMONADE, 1 + removeitem ITEM_LEMONADE msgbox FiveIsland_MemorialPillar_Text_PlacedCanOfLemonade closemessage applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFastestRight diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index 5b915f855..059a5710a 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -20,7 +20,7 @@ FuchsiaCity_Gym_EventScript_DefeatedKoga:: FuchsiaCity_Gym_EventScript_GiveTM06:: msgbox FuchsiaCity_Gym_Text_KogaExplainSoulBadge - checkitemspace ITEM_TM06, 1 + checkitemspace ITEM_TM06 compare VAR_RESULT, FALSE goto_if_eq FuchsiaCity_Gym_EventScript_NoRoomForTM06 giveitem_msg FuchsiaCity_Gym_Text_ReceivedTM06FromKoga, ITEM_TM06 diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc index 1d5df4cec..9cda26e43 100644 --- a/data/maps/FuchsiaCity_House2/scripts.inc +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -19,7 +19,7 @@ FuchsiaCity_House2_EventScript_AlreadyGotGoodRod:: FuchsiaCity_House2_EventScript_GiveGoodRod:: msgbox FuchsiaCity_House2_Text_LikeYourStyleTakeThis - checkitemspace ITEM_GOOD_ROD, 1 + checkitemspace ITEM_GOOD_ROD compare VAR_RESULT, FALSE goto_if_eq FuchsiaCity_House2_EventScript_NoRoomForGoodRod giveitem_msg FuchsiaCity_House2_Text_ReceivedGoodRod, ITEM_GOOD_ROD diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 00a22853b..cfca834fe 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -57,7 +57,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_ReturnToSafariZone:: closemessage applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ReEnter waitmovement 0 - warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 + warp MAP_SAFARI_ZONE_CENTER, 26, 30 waitstate end @@ -103,7 +103,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone:: msgbox FuchsiaCity_SafariZone_Entrance_Text_WelcomeToSafariZone applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - showmoneybox 0, 0, 0 + showmoneybox 0, 0 msgbox FuchsiaCity_SafariZone_Entrance_Text_PlaySafariGameFor500, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone @@ -113,10 +113,10 @@ FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone:: FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone:: call FuchsiaCity_SafariZone_Entrance_EventScript_CheckSpaceForMons - checkmoney 500, 0 + checkmoney 500 compare VAR_RESULT, FALSE goto_if_eq FuchsiaCity_SafariZone_Entrance_EventScript_NotEnoughMoney - removemoney 500, 0 + removemoney 500 updatemoneybox msgbox FuchsiaCity_SafariZone_Entrance_Text_ThatllBe500WeOnlyUseSpecialBalls textcolor 3 diff --git a/data/maps/FuchsiaCity_WardensHouse/scripts.inc b/data/maps/FuchsiaCity_WardensHouse/scripts.inc index 77ae03d2c..75b1afce1 100644 --- a/data/maps/FuchsiaCity_WardensHouse/scripts.inc +++ b/data/maps/FuchsiaCity_WardensHouse/scripts.inc @@ -29,7 +29,7 @@ FuchsiaCity_WardensHouse_EventScript_GiveGoldTeeth:: call_if_eq FuchsiaCity_WardensHouse_EventScript_WardenThanksFemale giveitem_msg FuchsiaCity_WardensHouse_Text_ReceivedHM04FromWarden, ITEM_HM04 setflag FLAG_GOT_HM04 - removeitem ITEM_GOLD_TEETH, 1 + removeitem ITEM_GOLD_TEETH release end diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index 1fe10e416..37d1ab7bc 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -6,7 +6,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_MrFuji:: faceplayer goto_if_set FLAG_GOT_POKE_FLUTE, LavenderTown_VolunteerPokemonHouse_EventScript_AlreadyHavePokeFlute msgbox LavenderTown_VolunteerPokemonHouse_Text_IdLikeYouToHaveThis - checkitemspace ITEM_POKE_FLUTE, 1 + checkitemspace ITEM_POKE_FLUTE compare VAR_RESULT, FALSE goto_if_eq LavenderTown_VolunteerPokemonHouse_EventScript_NoRoomForPokeFlute setflag FLAG_GOT_POKE_FLUTE diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 3c3757e63..fc59bb822 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -27,7 +27,7 @@ MtEmber_Summit_EventScript_Moltres:: special QuestLog_CutRecording lock faceplayer - setwildbattle SPECIES_MOLTRES, 50, ITEM_NONE + setwildbattle SPECIES_MOLTRES, 50 waitse playmoncry SPECIES_MOLTRES, CRY_MODE_ENCOUNTER message Text_Gyaoo diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index a8943e17a..900ea4550 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -32,7 +32,7 @@ OneIsland_EventScript_EnterOneIslandFirstTime:: waitdooranim removeobject LOCALID_BILL setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 3 - warp MAP_ONE_ISLAND_POKEMON_CENTER_1F, 255, 9, 9 + warp MAP_ONE_ISLAND_POKEMON_CENTER_1F, 9, 9 waitstate releaseall end diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index 359730fe5..0b899f9cf 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -21,7 +21,7 @@ OneIsland_Harbor_EventScript_PlayerEnterHarborFirstTime:: applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Harbor_Movement_PlayerExitHarbor waitmovement 0 setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2 - warp MAP_ONE_ISLAND, 255, 12, 18 + warp MAP_ONE_ISLAND, 12, 18 waitstate releaseall end diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 7219df19e..a038798e4 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -265,7 +265,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: waitmessage waitfanfare call EventScript_RestorePrevTextColor - removeitem ITEM_SAPPHIRE, 1 + removeitem ITEM_SAPPHIRE msgbox OneIsland_PokemonCenter_1F_Text_ThankYouGiveMeTime closemessage applymovement LOCALID_CELIO, OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine @@ -335,8 +335,8 @@ OneIsland_PokemonCenter_1F_EventScript_DeclineHelpCelio:: OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass:: msgbox OneIsland_PokemonCenter_1F_Text_AnotherGemstoneInSeviiIslands - removeitem ITEM_RUBY, 1 - removeitem ITEM_TRI_PASS, 1 + removeitem ITEM_RUBY + removeitem ITEM_TRI_PASS setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 additem ITEM_RAINBOW_PASS setflag FLAG_SYS_SEVII_MAP_4567 diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 6aedb3871..1e3d4f026 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -79,7 +79,7 @@ PalletTown_EventScript_OakRatingScene:: setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 3 setflag FLAG_HIDE_OAK_IN_PALLET_TOWN - warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 + warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6, 12 waitstate releaseall end @@ -225,7 +225,7 @@ PalletTown_EventScript_OakTrigger:: setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 1 setflag FLAG_HIDE_OAK_IN_PALLET_TOWN setflag FLAG_DONT_TRANSITION_MUSIC - warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 + warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6, 12 waitstate releaseall end diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index a862f2fd4..2c43a2d26 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -656,7 +656,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: waitmessage waitfanfare call EventScript_RestorePrevTextColor - removeitem ITEM_OAKS_PARCEL, 1 + removeitem ITEM_OAKS_PARCEL msgbox PalletTown_ProfessorOaksLab_Text_OakCustomBallIOrdered playbgm MUS_ENCOUNTER_RIVAL, 0 msgbox PalletTown_ProfessorOaksLab_Text_RivalGramps @@ -1003,7 +1003,7 @@ PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls:: special QuestLog_CutRecording goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls - checkitem ITEM_POKE_BALL, 1 + checkitem ITEM_POKE_BALL compare VAR_RESULT, FALSE goto_if_eq PalletTown_ProfessorOaksLab_EventScript_PlayerOutOfBalls goto PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait @@ -1215,7 +1215,7 @@ PalletTown_ProfessorOaksLab_EventScript_ChoseStarter:: call EventScript_RestorePrevTextColor setflag FLAG_SYS_POKEMON_GET setflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN - givemon PLAYER_STARTER_SPECIES, 5, ITEM_NONE + givemon PLAYER_STARTER_SPECIES, 5 copyvar VAR_STARTER_MON, PLAYER_STARTER_NUM bufferspeciesname STR_VAR_1, PLAYER_STARTER_SPECIES message PalletTown_ProfessorOaksLab_Text_ReceivedMonFromOak diff --git a/data/maps/PalletTown_RivalsHouse/scripts.inc b/data/maps/PalletTown_RivalsHouse/scripts.inc index 119ccba49..d7593eff3 100644 --- a/data/maps/PalletTown_RivalsHouse/scripts.inc +++ b/data/maps/PalletTown_RivalsHouse/scripts.inc @@ -144,7 +144,7 @@ PalletTown_RivalsHouse_EventScript_PleaseGiveMonsRest:: PalletTown_RivalsHouse_EventScript_GiveTownMap:: msgbox PalletTown_RivalsHouse_Text_ErrandForGrandpaThisWillHelp closemessage - checkitemspace ITEM_TOWN_MAP, 1 + checkitemspace ITEM_TOWN_MAP compare VAR_RESULT, FALSE goto_if_eq PalletTown_RivalsHouse_EventScript_NoRoomForTownMap applymovement LOCALID_DAISY, Movement_WalkInPlaceFastestRight diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index 0ab615946..95ed49e59 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -22,7 +22,7 @@ PewterCity_Gym_EventScript_DefeatedBrock:: PewterCity_Gym_EventScript_GiveTM39:: msgbox PewterCity_Gym_Text_TakeThisWithYou - checkitemspace ITEM_TM39, 1 + checkitemspace ITEM_TM39 compare VAR_RESULT, FALSE goto_if_eq PewterCity_Gym_EventScript_NoRoomForTM39 giveitem_msg PewterCity_Gym_Text_ReceivedTM39FromBrock, ITEM_TM39 diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index ad72bfbe4..a60e30aa6 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -65,7 +65,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerRight:: PewterCity_Museum_1F_EventScript_EntranceTrigger:: textcolor 0 - showmoneybox 0, 0, 0 + showmoneybox 0, 0 msgbox PewterCity_Museum_1F_Text_Its50YForChildsTicket, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq PewterCity_Museum_1F_EventScript_TryPayForTicket @@ -78,7 +78,7 @@ PewterCity_Museum_1F_EventScript_EntranceTrigger:: end PewterCity_Museum_1F_EventScript_TryPayForTicket:: - checkmoney 50, 0 + checkmoney 50 compare VAR_RESULT, FALSE goto_if_eq PewterCity_Museum_1F_EventScript_NotEnoughMoney closemessage @@ -89,7 +89,7 @@ PewterCity_Museum_1F_EventScript_TryPayForTicket:: compare VAR_TEMP_1, 2 call_if_eq PewterCity_Museum_1F_EventScript_PlayerApproachCounterRight playse SE_SHOP - removemoney 50, 0 + removemoney 50 updatemoneybox waitse msgbox PewterCity_Museum_1F_Text_Right50YThankYou @@ -157,7 +157,7 @@ PewterCity_Museum_1F_EventScript_OldAmberScientist:: faceplayer goto_if_set FLAG_GOT_OLD_AMBER, PewterCity_Museum_1F_EventScript_AlreadyGotOldAmber msgbox PewterCity_Museum_1F_Text_WantYouToGetAmberExamined - checkitemspace ITEM_OLD_AMBER, 1 + checkitemspace ITEM_OLD_AMBER compare VAR_RESULT, FALSE goto_if_eq PewterCity_Museum_1F_EventScript_NoRoomForOldAmber setflag FLAG_GOT_OLD_AMBER diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 8accc5502..8b9be1fc2 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -96,7 +96,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerExit waitmovement 0 setvar VAR_TEMP_1, 1 - warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 255, 5, 12 + warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 5, 12 waitstate releaseall end diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index e5c33b9af..5819189a1 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -6,7 +6,7 @@ PokemonTower_6F_EventScript_MarowakGhost:: textcolor 2 msgbox PokemonTower_6F_Text_BeGoneIntruders goto_if_questlog EventScript_ReleaseEnd - setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE + setwildbattle SPECIES_MAROWAK, 30 special StartMarowakBattle waitstate special QuestLog_CutRecording diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 91379e132..405209e69 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -14,7 +14,7 @@ PokemonTower_7F_EventScript_MrFuji:: setflag FLAG_RESCUED_MR_FUJI msgbox PokemonTower_7F_Text_MrFujiThankYouFollowMe closemessage - warp MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE, 255, 4, 7 + warp MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE, 4, 7 waitstate release end diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index 0be023701..129b7375f 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -38,7 +38,7 @@ PowerPlant_EventScript_Zapdos:: special QuestLog_CutRecording lock faceplayer - setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE + setwildbattle SPECIES_ZAPDOS, 50 waitse playmoncry SPECIES_ZAPDOS, CRY_MODE_ENCOUNTER message Text_Gyaoo @@ -76,7 +76,7 @@ PowerPlant_EventScript_Electrode1:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer - setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE + setwildbattle SPECIES_ELECTRODE, 34 waitse playmoncry SPECIES_ELECTRODE, CRY_MODE_ENCOUNTER delay 40 @@ -105,7 +105,7 @@ PowerPlant_EventScript_Electrode2:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer - setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE + setwildbattle SPECIES_ELECTRODE, 34 waitse playmoncry SPECIES_ELECTRODE, CRY_MODE_ENCOUNTER delay 40 diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index cd8a3cfaa..642fc2a6a 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -7,7 +7,7 @@ Route1_EventScript_MartClerk:: goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, Route1_EventScript_AlreadyGotPotion msgbox Route1_Text_WorkAtPokeMartTakeSample textcolor 3 - checkitemspace ITEM_POTION, 1 + checkitemspace ITEM_POTION compare VAR_RESULT, FALSE goto_if_eq EventScript_BagIsFull bufferitemname STR_VAR_2, ITEM_POTION diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index ad106810b..bb9b8aab0 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -44,7 +44,7 @@ Route10_PokemonCenter_1F_EventScript_Aide:: compare VAR_0x8006, REQUIRED_OWNED_MONS goto_if_lt Aide_EventScript_HaventCaughtEnough msgbox Route10_PokemonCenter_1F_Text_GreatHereYouGo - checkitemspace ITEM_EVERSTONE, 1 + checkitemspace ITEM_EVERSTONE compare VAR_RESULT, FALSE goto_if_eq Aide_EventScript_NoRoomForItem giveitem_msg Route10_PokemonCenter_1F_Text_ReceivedEverstoneFromAide, ITEM_EVERSTONE diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 51baa1f53..d673d3321 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -71,7 +71,7 @@ Route11_EastEntrance_2F_EventScript_Aide:: compare VAR_0x8006, REQUIRED_CAUGHT_MONS goto_if_lt Aide_EventScript_HaventCaughtEnough msgbox Route11_EastEntrance_2F_Text_GreatHereYouGo - checkitemspace ITEM_ITEMFINDER, 1 + checkitemspace ITEM_ITEMFINDER compare VAR_RESULT, FALSE goto_if_eq Aide_EventScript_NoRoomForItem giveitem_msg Route11_EastEntrance_2F_Text_ReceivedItemfinderFromAide, ITEM_ITEMFINDER diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index e6a1bc440..eadf4235a 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -20,7 +20,7 @@ Route12_EventScript_Snorlax:: compare VAR_RESULT, NO goto_if_eq Route12_EventScript_DontUsePokeFlute call EventScript_AwakenSnorlax - setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE + setwildbattle SPECIES_SNORLAX, 30 waitse playmoncry SPECIES_SNORLAX, CRY_MODE_ENCOUNTER delay 40 diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index 620753d7d..37b5c48a2 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -13,7 +13,7 @@ Route12_FishingHouse_EventScript_FishingGuruBrother:: end Route12_FishingHouse_EventScript_GiveSuperRod:: - checkitemspace ITEM_SUPER_ROD, 1 + checkitemspace ITEM_SUPER_ROD compare VAR_RESULT, FALSE goto_if_eq Route12_FishingHouse_EventScript_NoRoomForSuperRod additem ITEM_SUPER_ROD diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index c30488de4..c01d40be2 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -18,7 +18,7 @@ Route12_NorthEntrance_2F_EventScript_Lass:: call_if_eq Route12_NorthEntrance_2F_EventScript_TakeTMMale compare VAR_RESULT, FEMALE call_if_eq Route12_NorthEntrance_2F_EventScript_TakeTMFemale - checkitemspace ITEM_TM27, 1 + checkitemspace ITEM_TM27 compare VAR_RESULT, FALSE goto_if_eq Route12_NorthEntrance_2F_EventScript_NoRoomForTM27 giveitem_msg Route12_NorthEntrance_2F_Text_ReceivedTM27FromLittleGirl, ITEM_TM27 diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index e799ca57d..73780cc78 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -34,7 +34,7 @@ Route15_WestEntrance_2F_EventScript_Aide:: compare VAR_0x8006, REQUIRED_CAUGHT_MONS goto_if_lt Aide_EventScript_HaventCaughtEnough msgbox Route15_WestEntrance_2F_Text_GreatHereYouGo - checkitemspace ITEM_EXP_SHARE, 1 + checkitemspace ITEM_EXP_SHARE compare VAR_RESULT, FALSE goto_if_eq Aide_EventScript_NoRoomForItem giveitem_msg Route15_WestEntrance_2F_Text_ReceivedItemFromAide, ITEM_EXP_SHARE diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index c1cd5e8a8..f921db6d6 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -39,7 +39,7 @@ Route16_EventScript_Snorlax:: compare VAR_RESULT, NO goto_if_eq Route16_EventScript_DontUsePokeFlute call EventScript_AwakenSnorlax - setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE + setwildbattle SPECIES_SNORLAX, 30 waitse playmoncry SPECIES_SNORLAX, CRY_MODE_ENCOUNTER delay 40 diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc index 373259698..efa32d4d9 100644 --- a/data/maps/Route16_House/scripts.inc +++ b/data/maps/Route16_House/scripts.inc @@ -6,7 +6,7 @@ Route16_House_EventScript_Woman:: faceplayer goto_if_set FLAG_GOT_HM02, Route16_House_EventScript_AlreadyGotHM02 msgbox Route16_House_Text_FoundMySecretRetreat - checkitemspace ITEM_HM02, 1 + checkitemspace ITEM_HM02 compare VAR_RESULT, FALSE goto_if_eq Route16_House_EventScript_NoRoomForHM02 giveitem_msg Route16_House_Text_ReceivedHM02FromGirl, ITEM_HM02 diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 63f7c7c8a..c2d9c7f86 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -34,7 +34,7 @@ Route16_NorthEntrance_2F_EventScript_Aide:: compare VAR_0x8006, REQUIRED_CAUGHT_MONS goto_if_lt Aide_EventScript_HaventCaughtEnough msgbox Route16_NorthEntrance_2F_Text_GreatHereYouGo - checkitemspace ITEM_AMULET_COIN, 1 + checkitemspace ITEM_AMULET_COIN compare VAR_RESULT, FALSE goto_if_eq Aide_EventScript_NoRoomForItem giveitem_msg Route16_NorthEntrance_2F_Text_ReceivedAmuletCoinFromAide, ITEM_AMULET_COIN diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index dbcc621bc..12819e1e3 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -9,7 +9,7 @@ Route24_EventScript_Rocket:: compare VAR_MAP_SCENE_ROUTE24, 1 goto_if_eq Route24_EventScript_RocketPostBattle msgbox Route24_Text_JustEarnedFabulousPrize - checkitemspace ITEM_NUGGET, 1 + checkitemspace ITEM_NUGGET compare VAR_RESULT, FALSE goto_if_eq Route24_EventScript_NoRoomForNugget call Route24_EventScript_BattleRocket @@ -47,7 +47,7 @@ Route24_EventScript_RocketTrigger:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 msgbox Route24_Text_JustEarnedFabulousPrize - checkitemspace ITEM_NUGGET, 1 + checkitemspace ITEM_NUGGET compare VAR_RESULT, FALSE goto_if_eq Route24_EventScript_NoRoomForNuggetTrigger call Route24_EventScript_BattleRocket diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 182aec7e7..5b2fea3a7 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -110,7 +110,7 @@ Route25_SeaCottage_EventScript_BillGiveSSTicket:: call_if_eq Route25_SeaCottage_EventScript_BillThanksMale compare VAR_RESULT, FEMALE call_if_eq Route25_SeaCottage_EventScript_BillThanksFemale - checkitemspace ITEM_SS_TICKET, 1 + checkitemspace ITEM_SS_TICKET compare VAR_RESULT, FALSE goto_if_eq Route25_SeaCottage_EventScript_NoRoomForSSTicket giveitem_msg Route25_SeaCottage_Text_ReceivedSSTicketFromBill, ITEM_SS_TICKET, 1, MUS_OBTAIN_KEY_ITEM diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index 60d995140..57f997f2d 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -18,7 +18,7 @@ Route2_EastBuilding_EventScript_Aide:: compare VAR_0x8006, REQUIRED_SEEN_MONS goto_if_lt Aide_EventScript_HaventCaughtEnough msgbox Route2_EastBuilding_Text_GreatHereYouGo - checkitemspace ITEM_HM05, 1 + checkitemspace ITEM_HM05 compare VAR_RESULT, FALSE goto_if_eq Aide_EventScript_NoRoomForItem giveitem_msg Route2_EastBuilding_Text_ReceivedHM05FromAide, ITEM_HM05 diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index f7a37ac6e..b52a41390 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -24,7 +24,7 @@ Route4_PokemonCenter_1F_EventScript_MagikarpSalesman:: lock faceplayer goto_if_set FLAG_BOUGHT_MAGIKARP, Route4_PokemonCenter_1F_EventScript_AlreadyBoughtMagikarp - showmoneybox 0, 0, 0 + showmoneybox 0, 0 checkplayergender compare VAR_RESULT, MALE goto_if_eq Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpMale @@ -45,12 +45,12 @@ Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpFemale:: Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp:: compare VAR_RESULT, NO goto_if_eq Route4_PokemonCenter_1F_EventScript_DeclineMagikarp - checkmoney MAGIKARP_PRICE, 0 + checkmoney MAGIKARP_PRICE compare VAR_RESULT, FALSE goto_if_eq Route4_PokemonCenter_1F_EventScript_NotEnoughMoney textcolor 3 setvar VAR_TEMP_1, SPECIES_MAGIKARP - givemon SPECIES_MAGIKARP, 5, ITEM_NONE + givemon SPECIES_MAGIKARP, 5 compare VAR_RESULT, 0 goto_if_eq Route4_PokemonCenter_1F_EventScript_BuyMagikarpParty compare VAR_RESULT, 1 @@ -107,7 +107,7 @@ Route4_PokemonCenter_1F_EventScript_BoughtMagikarp:: end Route4_PokemonCenter_1F_EventScript_PayForMagikarp:: - removemoney MAGIKARP_PRICE, 0 + removemoney MAGIKARP_PRICE updatemoneybox playfanfare MUS_LEVEL_UP message Route4_PokemonCenter_1F_Text_PaidOutrageouslyForMagikarp diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index f9a914e26..831d97169 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -36,7 +36,7 @@ Route5_SouthEntrance_EventScript_GuardTrigger:: end Route5_SouthEntrance_EventScript_GiveTea:: - removeitem ITEM_TEA, 1 + removeitem ITEM_TEA goto Route5_SouthEntrance_EventScript_GuardDrinkTea end diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index 6fbbfe87d..a54806e4c 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -36,7 +36,7 @@ Route6_NorthEntrance_EventScript_GuardTrigger:: end Route6_NorthEntrance_EventScript_GiveTea:: - removeitem ITEM_TEA, 1 + removeitem ITEM_TEA goto Route6_NorthEntrance_EventScript_GuardDrinkTea end diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index 6786a148b..c2be1fe8e 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -36,7 +36,7 @@ Route7_EastEntrance_EventScript_GuardTrigger:: end Route7_EastEntrance_EventScript_GiveTea:: - removeitem ITEM_TEA, 1 + removeitem ITEM_TEA goto Route7_EastEntrance_EventScript_GuardDrinkTea end diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index f9ca6bda5..4a6af937b 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -36,19 +36,19 @@ Route8_WestEntrance_EventScript_GuardTrigger:: end Route8_WestEntrance_EventScript_GiveTea:: - removeitem ITEM_TEA, 1 + removeitem ITEM_TEA goto Route8_WestEntrance_EventScript_GuardDrinkTea end @ Unused Route8_WestEntrance_EventScript_GiveSodaPop:: - removeitem ITEM_SODA_POP, 1 + removeitem ITEM_SODA_POP goto Route8_WestEntrance_EventScript_GuardDrinkTea end @ Unused Route8_WestEntrance_EventScript_GiveLemonade:: - removeitem ITEM_LEMONADE, 1 + removeitem ITEM_LEMONADE goto Route8_WestEntrance_EventScript_GuardDrinkTea end diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index acd1c6aac..3d00d7272 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -29,7 +29,7 @@ SSAnne_Exterior_ExitSSAnne:: waitmovement 0 setvar VAR_MAP_SCENE_VERMILION_CITY, 2 setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0 - warp MAP_VERMILION_CITY, 255, 23, 34 + warp MAP_VERMILION_CITY, 23, 34 waitstate releaseall end diff --git a/data/maps/SafariZone_SecretHouse/scripts.inc b/data/maps/SafariZone_SecretHouse/scripts.inc index 8b3102f82..73ac94301 100644 --- a/data/maps/SafariZone_SecretHouse/scripts.inc +++ b/data/maps/SafariZone_SecretHouse/scripts.inc @@ -6,7 +6,7 @@ SafariZone_SecretHouse_EventScript_Attendant:: faceplayer goto_if_set FLAG_GOT_HM03, SafariZone_SecretHouse_EventScript_ExplainSurf msgbox SafariZone_SecretHouse_Text_CongratsYouveWon - checkitemspace ITEM_HM03, 1 + checkitemspace ITEM_HM03 compare VAR_RESULT, FALSE goto_if_eq SafariZone_SecretHouse_EventScript_NoRoomForHM03 giveitem_msg SafariZone_SecretHouse_Text_ReceivedHM03FromAttendant, ITEM_HM03 diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc index e30cb601b..a0e19293b 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc +++ b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc @@ -22,7 +22,7 @@ SaffronCity_CopycatsHouse_2F_EventScript_Copycat:: special QuestLog_CutRecording lock faceplayer - checkitem ITEM_POKE_DOLL, 1 + checkitem ITEM_POKE_DOLL compare VAR_RESULT, TRUE goto_if_eq EventScript_MimicTutor checkplayergender diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 126c2a6c5..4df12e773 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -60,7 +60,7 @@ SaffronCity_Dojo_EventScript_HitmonchanBall:: SaffronCity_Dojo_EventScript_GiveHitmon:: hidemonpic - givemon VAR_TEMP_1, 25, ITEM_NONE + givemon VAR_TEMP_1, 25 compare VAR_RESULT, 0 goto_if_eq SaffronCity_Dojo_EventScript_ReceivedHitmonParty compare VAR_RESULT, 1 diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index c142e9e7c..932554c0b 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -21,7 +21,7 @@ SaffronCity_Gym_EventScript_DefeatedSabrina:: SaffronCity_Gym_EventScript_GiveTM04:: msgbox SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis - checkitemspace ITEM_TM04, 1 + checkitemspace ITEM_TM04 compare VAR_RESULT, FALSE goto_if_eq SaffronCity_Gym_EventScript_NoRoomForTM04 giveitem_msg SaffronCity_Gym_Text_ReceivedTM04FromSabrina, ITEM_TM04 diff --git a/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc b/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc index 1455945d7..724850fde 100644 --- a/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc +++ b/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc @@ -6,7 +6,7 @@ SaffronCity_MrPsychicsHouse_EventScript_MrPsychic:: faceplayer goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, SaffronCity_MrPsychicsHouse_EventScript_AlreadyGotTM29 msgbox SaffronCity_MrPsychicsHouse_Text_YouWantedThis - checkitemspace ITEM_TM29, 1 + checkitemspace ITEM_TM29 compare VAR_RESULT, FALSE goto_if_eq SaffronCity_MrPsychicsHouse_EventScript_NoRoomForTM29 giveitem_msg SaffronCity_MrPsychicsHouse_Text_ReceivedTM29FromMrPsychic, ITEM_TM29 diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index e130a05d9..5ef1303d1 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -43,7 +43,7 @@ SeafoamIslands_B3F_EventScript_EnterByFalling:: compare VAR_0x8008, 24 call_if_ge SeafoamIslands_B3F_EventScript_RideCurrentClose setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1 - warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21 + warp MAP_SEAFOAM_ISLANDS_B4F, 27, 21 waitstate releaseall end diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 342c46759..40b91f698 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -162,7 +162,7 @@ SeafoamIslands_B4F_EventScript_Articuno:: special QuestLog_CutRecording lock faceplayer - setwildbattle SPECIES_ARTICUNO, 50, ITEM_NONE + setwildbattle SPECIES_ARTICUNO, 50 waitse playmoncry SPECIES_ARTICUNO, CRY_MODE_ENCOUNTER message Text_Gyaoo diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index fda16db24..e36ea4ea4 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -118,7 +118,7 @@ SevenIsland_House_Room1_EventScript_TrainerVisiting:: call_if_eq SevenIsland_House_Room1_EventScript_EnterBattleRoomEast compare VAR_FACING, DIR_WEST call_if_eq SevenIsland_House_Room1_EventScript_EnterBattleRoomWest - warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1 + warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 3, 1 waitstate release end diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index 2f319eebf..cc1e6dd8f 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -34,7 +34,7 @@ SevenIsland_House_Room2_EventScript_BattleVisitingTrainer:: waitmovement 0 special LoadPlayerParty setvar VAR_TEMP_1, 1 - warp MAP_SEVEN_ISLAND_HOUSE_ROOM1, 255, 4, 1 + warp MAP_SEVEN_ISLAND_HOUSE_ROOM1, 4, 1 waitstate releaseall end diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 61d2ef04b..5abe486ea 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -19,7 +19,7 @@ SilphCo_11F_EventScript_President:: call_if_eq SilphCo_11F_EventScript_PresidentThanksMale compare VAR_RESULT, FEMALE call_if_eq SilphCo_11F_EventScript_PresidentThanksFemale - checkitemspace ITEM_MASTER_BALL, 1 + checkitemspace ITEM_MASTER_BALL compare VAR_RESULT, FALSE goto_if_eq SilphCo_11F_EventScript_NoRoomForMasterBall giveitem_msg SilphCo_11F_Text_ObtainedMasterBallFromPresident, ITEM_MASTER_BALL, 1, MUS_OBTAIN_KEY_ITEM diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 353ed43af..77d38099e 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -129,7 +129,7 @@ SilphCo_7F_EventScript_LaprasGuy:: goto_if_set FLAG_GOT_LAPRAS_FROM_SILPH, SilphCo_7F_EventScript_AlreadyGotLapras msgbox SilphCo_7F_Text_HaveMonForSavingUs setvar VAR_TEMP_1, SPECIES_LAPRAS - givemon SPECIES_LAPRAS, 25, ITEM_NONE + givemon SPECIES_LAPRAS, 25 compare VAR_RESULT, 0 goto_if_eq SilphCo_7F_EventScript_ReceiveLaprasParty compare VAR_RESULT, 1 diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index f75505ea2..b6bc87870 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -56,7 +56,7 @@ ThreeIsland_EventScript_GiveFullRestore:: applymovement LOCALID_ANTIBIKER1, Movement_FacePlayer waitmovement 0 msgbox ThreeIsland_Text_ThankYouOhYourMonGotHurt - checkitemspace ITEM_FULL_RESTORE, 1 + checkitemspace ITEM_FULL_RESTORE compare VAR_RESULT, FALSE goto_if_eq ThreeIsland_EventScript_NoRoomForFullRestore msgreceiveditem ThreeIsland_Text_GivenFullRestore, ITEM_FULL_RESTORE diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 8f5210dec..61d329939 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -6,7 +6,7 @@ ThreeIsland_BerryForest_MapScripts:: ThreeIsland_BerryForest_OnTransition:: setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST - setescapewarp MAP_THREE_ISLAND_BOND_BRIDGE, 255, 12, 6 + setescapewarp MAP_THREE_ISLAND_BOND_BRIDGE, 12, 6 end ThreeIsland_BerryForest_EventScript_Lostelle:: @@ -23,7 +23,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: waitse playmoncry SPECIES_HYPNO, CRY_MODE_ENCOUNTER waitmoncry - setwildbattle SPECIES_HYPNO, 30, ITEM_NONE + setwildbattle SPECIES_HYPNO, 30 dowildbattle special QuestLog_CutRecording applymovement LOCALID_LOSTELLE, Movement_FacePlayer @@ -39,7 +39,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: setflag FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 clearflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE - warp MAP_TWO_ISLAND_JOYFUL_GAME_CORNER, 255, 6, 6 + warp MAP_TWO_ISLAND_JOYFUL_GAME_CORNER, 6, 6 waitstate release end diff --git a/data/maps/TrainerTower_Elevator/scripts.inc b/data/maps/TrainerTower_Elevator/scripts.inc index eb871699e..d46770895 100644 --- a/data/maps/TrainerTower_Elevator/scripts.inc +++ b/data/maps/TrainerTower_Elevator/scripts.inc @@ -38,7 +38,7 @@ TrainerTower_Elevator_EventScript_ChooseFloor:: TrainerTower_Elevator_EventScript_SelectLobby:: setvar VAR_0x8006, 3 - setdynamicwarp MAP_TRAINER_TOWER_LOBBY, 255, 17, 8 + setdynamicwarp MAP_TRAINER_TOWER_LOBBY, 17, 8 compare VAR_ELEVATOR_FLOOR, 3 goto_if_eq TrainerTower_Elevator_EventScript_CloseFloorSelect call TrainerTower_Elevator_EventScript_MoveElevator @@ -47,7 +47,7 @@ TrainerTower_Elevator_EventScript_SelectLobby:: delay 25 applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Elevator_Movement_ExitElevator waitmovement 0 - warp MAP_TRAINER_TOWER_LOBBY, 255, 17, 8 + warp MAP_TRAINER_TOWER_LOBBY, 17, 8 waitstate releaseall end diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 024c61f15..da3e4d171 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -21,7 +21,7 @@ TwoIsland_House_EventScript_MoveManiac:: end TwoIsland_House_EventScript_CheckPlayerHasMushrooms:: - checkitem ITEM_BIG_MUSHROOM, 1 + checkitem ITEM_BIG_MUSHROOM compare VAR_RESULT, TRUE call_if_eq TwoIsland_House_EventScript_SetHasBigMushroom checkitem ITEM_TINY_MUSHROOM, 2 @@ -75,7 +75,7 @@ TwoIsland_House_EventScript_ChooseMoveToTeach:: end TwoIsland_House_EventScript_GiveBigMushroom:: - removeitem ITEM_BIG_MUSHROOM, 1 + removeitem ITEM_BIG_MUSHROOM textcolor 3 msgbox TwoIsland_House_Text_HandedOverOneBigMushroom call EventScript_RestorePrevTextColor diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index e2a5cdf02..0b67e5836 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -163,13 +163,13 @@ TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite:: waitmessage waitfanfare call EventScript_RestorePrevTextColor - removeitem ITEM_METEORITE, 1 + removeitem ITEM_METEORITE msgbox TwoIsland_JoyfulGameCorner_Text_OhThisIsFromBill goto TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone end TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone:: - checkitemspace ITEM_MOON_STONE, 1 + checkitemspace ITEM_MOON_STONE compare VAR_RESULT, FALSE goto_if_eq TwoIsland_JoyfulGameCorner_EventScript_NoRoomForMoonStone additem ITEM_MOON_STONE diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 128850f03..c49b8d38e 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -60,7 +60,7 @@ VermilionCity_EventScript_FerrySailor:: VermilionCity_EventScript_CheckHasMysticTicket:: goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, EventScript_SetResultFalse - checkitem ITEM_MYSTIC_TICKET, 1 + checkitem ITEM_MYSTIC_TICKET compare VAR_RESULT, FALSE goto_if_eq EventScript_SetResultFalse goto EventScript_SetResultTrue @@ -68,7 +68,7 @@ VermilionCity_EventScript_CheckHasMysticTicket:: VermilionCity_EventScript_CheckHasAuroraTicket:: goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, EventScript_SetResultFalse - checkitem ITEM_AURORA_TICKET, 1 + checkitem ITEM_AURORA_TICKET compare VAR_RESULT, FALSE goto_if_eq EventScript_SetResultFalse goto EventScript_SetResultTrue diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 5e1ad744b..320c54ad0 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -229,7 +229,7 @@ VermilionCity_Gym_EventScript_ShowOaksAide:: VermilionCity_Gym_EventScript_GiveTM34:: msgbox VermilionCity_Gym_Text_ExplainThunderBadgeTakeThis - checkitemspace ITEM_TM34, 1 + checkitemspace ITEM_TM34 compare VAR_RESULT, FALSE goto_if_eq VermilionCity_Gym_EventScript_NoRoomForTM34 giveitem_msg VermilionCity_Gym_Text_ReceivedTM34FromLtSurge, ITEM_TM34 diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index e4194b549..e3d7a4605 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -18,7 +18,7 @@ VermilionCity_House1_EventScript_AlreadyGotOldRod:: end VermilionCity_House1_EventScript_GiveOldRod:: - checkitemspace ITEM_OLD_ROD, 1 + checkitemspace ITEM_OLD_ROD compare VAR_RESULT, FALSE goto_if_eq VermilionCity_House1_EventScript_NoRoomForOldRod additem ITEM_OLD_ROD diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 6c0efe151..28ee7527c 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -25,7 +25,7 @@ VermilionCity_PokemonFanClub_EventScript_AlreadyHeardStory:: VermilionCity_PokemonFanClub_EventScript_ChairmanStory:: msgbox VermilionCity_PokemonFanClub_Text_ChairmansStory - checkitemspace ITEM_BIKE_VOUCHER, 1 + checkitemspace ITEM_BIKE_VOUCHER compare VAR_RESULT, FALSE goto_if_eq VermilionCity_PokemonFanClub_EventScript_NoRoomForBikeVoucher setflag FLAG_GOT_BIKE_VOUCHER diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index a7fad40be..3fdf779d0 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -27,7 +27,7 @@ ViridianCity_Gym_EventScript_DefeatedGiovanni:: ViridianCity_Gym_EventScript_GiveTM26:: msgbox ViridianCity_Gym_Text_ExplainEarthBadgeTakeThis - checkitemspace ITEM_TM26, 1 + checkitemspace ITEM_TM26 compare VAR_RESULT, FALSE goto_if_eq ViridianCity_Gym_EventScript_NoRoomForTM26 giveitem_msg ViridianCity_Gym_Text_ReceivedTM26FromGiovanni, ITEM_TM26 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index dec8d1cb6..00b767374 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -330,7 +330,7 @@ CableClub_EventScript_EnterColosseum:: compare VAR_0x8004, USING_MULTI_BATTLE goto_if_eq CableClub_EventScript_WarpTo4PColosseum special SetCableClubWarp - warp MAP_BATTLE_COLOSSEUM_2P, 255, 6, 8 + warp MAP_BATTLE_COLOSSEUM_2P, 6, 8 special DoCableClubWarp waitstate end @@ -343,7 +343,7 @@ CableClub_EventScript_PlayerApproachLinkRoomRight:: CableClub_EventScript_WarpTo4PColosseum:: special SetCableClubWarp - warp MAP_BATTLE_COLOSSEUM_4P, 255, 5, 8 + warp MAP_BATTLE_COLOSSEUM_4P, 5, 8 special DoCableClubWarp waitstate end @@ -437,7 +437,7 @@ CableClub_EventScript_EnterTradeCenter:: waitdooranim release special SetCableClubWarp - setwarp MAP_TRADE_CENTER, 255, 5, 8 + setwarp MAP_TRADE_CENTER, 5, 8 special DoCableClubWarp waitstate end @@ -836,7 +836,7 @@ CableClub_EventScript_EnterUnionRoom:: waitdooranim special Script_ResetUnionRoomTrade special SetCableClubWarp - warpspinenter MAP_UNION_ROOM, 255, 7, 11 + warpspinenter MAP_UNION_ROOM, 7, 11 waitstate special UnionRoomSpecial waitstate diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index e227cbf52..6b14a58be 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -2,7 +2,7 @@ Route5_PokemonDayCare_EventScript_DaycareMan:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer - showmoneybox 0, 0, 0 + showmoneybox 0, 0 specialvar VAR_RESULT, IsThereMonInRoute5Daycare compare VAR_RESULT, TRUE goto_if_eq Route5_PokemonDayCare_EventScript_CheckOnMon @@ -22,7 +22,7 @@ Route5_PokemonDayCare_EventScript_TryGiveMon:: hidemoneybox special ChooseSendDaycareMon waitstate - showmoneybox 0, 0, 0 + showmoneybox 0, 0 compare VAR_0x8004, PARTY_SIZE goto_if_ge Route5_PokemonDayCare_EventScript_ComeAgain specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot diff --git a/data/scripts/hole.inc b/data/scripts/hole.inc index 6ca793691..ae64ccf5f 100644 --- a/data/scripts/hole.inc +++ b/data/scripts/hole.inc @@ -15,7 +15,7 @@ EventScript_FallDownHole:: waitmovement 0 playse SE_FALL delay 60 - warphole 0xFFFF + warphole MAP_UNDEFINED waitstate end diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index 711f6a5a3..d65cb1f18 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -390,7 +390,7 @@ EventScript_MimicTutor:: faceplayer compare VAR_RESULT, 0 goto_if_eq EventScript_MimicDeclined - removeitem ITEM_POKE_DOLL, 1 + removeitem ITEM_POKE_DOLL setflag FLAG_TUTOR_MIMIC goto EventScript_MimicTaught end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 96d8be444..93e2292f8 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,13 +1,13 @@ SafariZone_EventScript_OutOfBallsMidBattle:: setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 3 special ExitSafariMode - setwarp MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 255, 4, 1 + setwarp MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 4, 1 end SafariZone_EventScript_Exit:: setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 1 special ExitSafariMode - warp MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 255, 4, 1 + warp MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 4, 1 waitstate end diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc index 6ba90358b..9c70b4c7c 100644 --- a/data/scripts/trainer_card.inc +++ b/data/scripts/trainer_card.inc @@ -2,15 +2,15 @@ CeladonCity_GameCorner_EventScript_PhotoPrinter:: lockall - showmoneybox 0, 0, 0 + showmoneybox 0, 0 msgbox CeladonCity_GameCorner_Text_TryPokemonPrinter, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq CeladonCity_GameCorner_EventScript_DeclinePhoto - checkmoney 50, 0 + checkmoney 50 compare VAR_RESULT, FALSE goto_if_eq CeladonCity_GameCorner_EventScript_NotEnoughMoneyForPhoto playse SE_SHOP - removemoney 50, 0 + removemoney 50 updatemoneybox waitse message CeladonCity_GameCorner_Text_ChoosePrintType diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc index 3c54a90c4..bedf9bb6a 100644 --- a/data/scripts/trainer_tower.inc +++ b/data/scripts/trainer_tower.inc @@ -97,7 +97,7 @@ TrainerTower_EventScript_EndEnterFloor: @ Never reached TrainerTower_EventScript_WarpToLobby:: - warp MAP_TRAINER_TOWER_LOBBY, 255, 9, 7 + warp MAP_TRAINER_TOWER_LOBBY, 9, 7 waitstate @@ -221,7 +221,7 @@ TrainerTower_EventScript_SetFloorCleared: TrainerTower_EventScript_WarpToLobbyLost:: special HealPlayerParty ttower_setlost - warp MAP_TRAINER_TOWER_LOBBY, 255, 9, 7 + warp MAP_TRAINER_TOWER_LOBBY, 9, 7 waitstate diff --git a/data/scripts/white_out.inc b/data/scripts/white_out.inc index c86341d8e..679b9fb7b 100644 --- a/data/scripts/white_out.inc +++ b/data/scripts/white_out.inc @@ -44,7 +44,7 @@ EventScript_FieldPoison:: end EventScript_FieldWhiteOut:: - checkmoney 1, 0 + checkmoney 1 compare VAR_RESULT, FALSE goto_if_eq EventScript_FieldWhiteOutNoMoney compare VAR_RESULT, TRUE