dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop some optional script command arguments

Browse Source
This commit is contained in:
GriffinR
2022-08-09 15:19:49 -04:00
parent acb480f1c1
commit 8e7dd94eca
82 changed files with 144 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
+1 -1
View File
@@ -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
data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+13 -13
View File
@@ -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
data/maps/CeladonCity_GameCorner/scripts.inc
+5 -5
View File
@@ -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
data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+11 -11
View File
@@ -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
data/maps/CeladonCity_Gym/scripts.inc
+1 -1
View File
@@ -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
data/maps/CeladonCity_Restaurant/scripts.inc
+1 -1
View File
@@ -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
data/maps/CeruleanCave_B1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/CeruleanCity/scripts.inc
+1 -1
View File
@@ -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
data/maps/CeruleanCity_BikeShop/scripts.inc
+1 -1
View File
@@ -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
data/maps/CeruleanCity_Gym/scripts.inc
+1 -1
View File
@@ -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
data/maps/CinnabarIsland_Gym/scripts.inc
+1 -1
View File
@@ -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
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
+3 -3
View File
@@ -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
data/maps/FiveIsland_LostCave_Room10/scripts.inc
+1 -1
View File
@@ -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
data/maps/FiveIsland_MemorialPillar/scripts.inc
+2 -2
View File
@@ -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
data/maps/FuchsiaCity_Gym/scripts.inc
+1 -1
View File
@@ -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
data/maps/FuchsiaCity_House2/scripts.inc
+1 -1
View File
@@ -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
data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+4 -4
View File
@@ -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
data/maps/FuchsiaCity_WardensHouse/scripts.inc
+1 -1
View File
@@ -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
data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
+1 -1
View File
@@ -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
data/maps/MtEmber_Summit/scripts.inc
+1 -1
View File
@@ -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
data/maps/OneIsland/scripts.inc
+1 -1
View File
@@ -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
data/maps/OneIsland_Harbor/scripts.inc
+1 -1
View File
@@ -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
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+3 -3
View File
@@ -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
data/maps/PalletTown/scripts.inc
+2 -2
View File
@@ -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
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+3 -3
View File
@@ -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
data/maps/PalletTown_RivalsHouse/scripts.inc
+1 -1
View File
@@ -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
data/maps/PewterCity_Gym/scripts.inc
+1 -1
View File
@@ -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
data/maps/PewterCity_Museum_1F/scripts.inc
+4 -4
View File
@@ -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
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+1 -1
View File
@@ -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
data/maps/PokemonTower_6F/scripts.inc
+1 -1
View File
@@ -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
data/maps/PokemonTower_7F/scripts.inc
+1 -1
View File
@@ -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
data/maps/PowerPlant/scripts.inc
+3 -3
View File
@@ -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
data/maps/Route1/scripts.inc
+1 -1
View File
@@ -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
data/maps/Route10_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/Route11_EastEntrance_2F/scripts.inc
+1 -1
View File
@@ -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
data/maps/Route12/scripts.inc
+1 -1
View File
@@ -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
data/maps/Route12_FishingHouse/scripts.inc
+1 -1
View File
@@ -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
data/maps/Route12_NorthEntrance_2F/scripts.inc
+1 -1
View File
@@ -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
data/maps/Route15_WestEntrance_2F/scripts.inc
+1 -1
View File
@@ -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
data/maps/Route16/scripts.inc
+1 -1
View File
@@ -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
data/maps/Route16_House/scripts.inc
+1 -1
View File
@@ -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
data/maps/Route16_NorthEntrance_2F/scripts.inc
+1 -1
View File
@@ -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
data/maps/Route24/scripts.inc
+2 -2
View File
@@ -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
data/maps/Route25_SeaCottage/scripts.inc
+1 -1
View File
@@ -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
data/maps/Route2_EastBuilding/scripts.inc
+1 -1
View File
@@ -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
data/maps/Route4_PokemonCenter_1F/scripts.inc
+4 -4
View File
@@ -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
data/maps/Route5_SouthEntrance/scripts.inc
+1 -1
View File
@@ -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
data/maps/Route6_NorthEntrance/scripts.inc
+1 -1
View File
@@ -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
data/maps/Route7_EastEntrance/scripts.inc
+1 -1
View File
@@ -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
data/maps/Route8_WestEntrance/scripts.inc
+3 -3
View File
@@ -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
data/maps/SSAnne_Exterior/scripts.inc
+1 -1
View File
@@ -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
data/maps/SafariZone_SecretHouse/scripts.inc
+1 -1
View File
@@ -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
data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc
+1 -1
View File
@@ -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
data/maps/SaffronCity_Dojo/scripts.inc
+1 -1
View File
@@ -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
data/maps/SaffronCity_Gym/scripts.inc
+1 -1
View File
@@ -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
data/maps/SaffronCity_MrPsychicsHouse/scripts.inc
+1 -1
View File
@@ -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
data/maps/SeafoamIslands_B3F/scripts.inc
+1 -1
View File
@@ -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
data/maps/SeafoamIslands_B4F/scripts.inc
+1 -1
View File
@@ -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
data/maps/SevenIsland_House_Room1/scripts.inc
+1 -1
View File
@@ -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
data/maps/SevenIsland_House_Room2/scripts.inc
+1 -1
View File
@@ -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
data/maps/SilphCo_11F/scripts.inc
+1 -1
View File
@@ -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
data/maps/SilphCo_7F/scripts.inc
+1 -1
View File
@@ -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
data/maps/ThreeIsland/scripts.inc
+1 -1
View File
@@ -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
data/maps/ThreeIsland_BerryForest/scripts.inc
+3 -3
View File
@@ -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
data/maps/TrainerTower_Elevator/scripts.inc
+2 -2
View File
@@ -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
data/maps/TwoIsland_House/scripts.inc
+2 -2
View File
@@ -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
data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+2 -2
View File
@@ -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
data/maps/VermilionCity/scripts.inc
+2 -2
View File
@@ -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
data/maps/VermilionCity_Gym/scripts.inc
+1 -1
View File
@@ -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
data/maps/VermilionCity_House1/scripts.inc
+1 -1
View File
@@ -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
data/maps/VermilionCity_PokemonFanClub/scripts.inc
+1 -1
View File
@@ -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
data/maps/ViridianCity_Gym/scripts.inc
+1 -1
View File
@@ -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