atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add extra key item bag space checks (#4066)

Browse source 
* Fix 4019

* I am exceedingly brilliant in my failure to build before pushing
This commit is contained in:
Bassoonian 2024-01-26 21:11:04 +01:00 committed by GitHub
parent 91f429b5e5
commit e995927d13
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/maps/DewfordTown/scripts.inc
View file

@ -93,6 +93,7 @@ DewfordTown_EventScript_OldRodFisherman::
DewfordTown_EventScript_GiveOldRod::
msgbox DewfordTown_Text_GiveYouOneOfMyRods, MSGBOX_DEFAULT
giveitem ITEM_OLD_ROD
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_OLD_ROD
msgbox DewfordTown_Text_ThrowInFishingAdvice, MSGBOX_DEFAULT
release

1
data/maps/MauvilleCity/scripts.inc
View file

@ -423,6 +423,7 @@ MauvilleCity_EventScript_Wattson::
goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_BegunNewMauville
msgbox MauvilleCity_Text_WattsonNeedFavorTakeKey, MSGBOX_DEFAULT
giveitem ITEM_BASEMENT_KEY
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON
msgbox MauvilleCity_Text_WattsonWontBeChallenge, MSGBOX_DEFAULT
release

2
data/maps/MauvilleCity_BikeShop/scripts.inc
View file

@ -41,12 +41,14 @@ MauvilleCity_BikeShop_EventScript_YesFar::
MauvilleCity_BikeShop_EventScript_GetMachBike::
msgbox MauvilleCity_BikeShop_Text_ChoseMachBike, MSGBOX_DEFAULT
giveitem ITEM_MACH_BIKE
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
end
MauvilleCity_BikeShop_EventScript_GetAcroBike::
msgbox MauvilleCity_BikeShop_Text_ChoseAcroBike, MSGBOX_DEFAULT
giveitem ITEM_ACRO_BIKE
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
end

3
data/maps/MauvilleCity_House2/scripts.inc
View file

@ -24,8 +24,9 @@ MauvilleCity_House2_EventScript_AskToTradeForHarborMail::
MauvilleCity_House2_EventScript_AcceptTrade::
msgbox MauvilleCity_House2_Text_IllTradeYouCoinCase, MSGBOX_DEFAULT
removeitem ITEM_HARBOR_MAIL
giveitem ITEM_COIN_CASE
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
removeitem ITEM_HARBOR_MAIL
setflag FLAG_RECEIVED_COIN_CASE
goto MauvilleCity_House2_EventScript_ReceivedCoinCase
end

1
data/maps/MossdeepCity_House3/scripts.inc
View file

@ -9,6 +9,7 @@ MossdeepCity_House3_EventScript_SuperRodFisherman::
goto_if_eq VAR_RESULT, NO, MossdeepCity_House3_EventScript_DeclineSuperRod
msgbox MossdeepCity_House3_Text_SuperRodIsSuper, MSGBOX_DEFAULT
giveitem ITEM_SUPER_ROD
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_SUPER_ROD
msgbox MossdeepCity_House3_Text_TryDroppingRodInWater, MSGBOX_DEFAULT
release

1
data/maps/MtChimney/scripts.inc
View file

@ -448,6 +448,7 @@ MtChimney_EventScript_MeteoriteMachine::
goto_if_eq VAR_RESULT, NO, MtChimney_EventScript_LeaveMeteoriteAlone
msgbox MtChimney_Text_PlayerRemovedMeteorite, MSGBOX_DEFAULT
giveitem ITEM_METEORITE
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_METEORITE
releaseall
end

1
data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
View file

@ -74,6 +74,7 @@ Route104_PrettyPetalFlowerShop_EventScript_WailmerPailGirl::
Route104_PrettyPetalFlowerShop_EventScript_GiveWailmerPail::
msgbox Route104_PrettyPetalFlowerShop_Text_YouCanHaveThis, MSGBOX_DEFAULT
giveitem ITEM_WAILMER_PAIL
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
msgbox Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_WAILMER_PAIL
release

1
data/maps/Route113_GlassWorkshop/scripts.inc
View file

@ -28,6 +28,7 @@ Route113_GlassWorkshop_EventScript_GlassWorker::
goto_if_eq VAR_GLASS_WORKSHOP_STATE, 1, Route113_GlassWorkshop_EventScript_ExplainSootSack
msgbox Route113_GlassWorkshop_Text_GoCollectAshWithThis, MSGBOX_DEFAULT
giveitem ITEM_SOOT_SACK
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setvar VAR_GLASS_WORKSHOP_STATE, 1
msgbox Route113_GlassWorkshop_Text_ExplainSootSack, MSGBOX_DEFAULT
release

1
data/maps/Route118/scripts.inc
View file

@ -34,6 +34,7 @@ Route118_EventScript_GoodRodFisherman::
Route118_EventScript_ReceiveGoodRod::
msgbox Route118_Text_IdenticalMindsTakeThis, MSGBOX_DEFAULT
giveitem ITEM_GOOD_ROD
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_GOOD_ROD
msgbox Route118_Text_TryYourLuckFishing, MSGBOX_DEFAULT
release

1
data/scripts/contest_hall.inc
View file

@ -31,6 +31,7 @@ LilycoveCity_ContestLobby_EventScript_ReceptionWelcome::
LilycoveCity_ContestLobby_EventScript_GivePokeblockCase::
msgbox LilycoveCity_ContestLobby_Text_ReceptionDontHavePokeblockCase, MSGBOX_DEFAULT
giveitem ITEM_POKEBLOCK_CASE
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_POKEBLOCK_CASE
msgbox LilycoveCity_ContestLobby_Text_NowThatWeveClearedThatUp, MSGBOX_DEFAULT
return