Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-08 19:16:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync

Browse Source
This commit is contained in:
ultima-soul
2021-12-09 14:16:05 -08:00
parent 349262ebc3 37d784af31
commit ac2bcece75
21 changed files with 146 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/maps/PetalburgCity_Gym/scripts.inc
View File

@@ -351,9 +351,9 @@ PetalburgCity_Gym_EventScript_NormanRematch::
PetalburgCity_Gym_EventScript_ShouldGiveEnigmaBerry::
specialvar VAR_RESULT, IsEnigmaBerryValid
goto_if_eq VAR_RESULT, FALSE, PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry
checkitem ITEM_ENIGMA_BERRY_E_READER
checkitem ITEM_ENIGMA_BERRY
goto_if_eq VAR_RESULT, TRUE, PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry
checkpcitem ITEM_ENIGMA_BERRY_E_READER
checkpcitem ITEM_ENIGMA_BERRY
goto_if_eq VAR_RESULT, TRUE, PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry
goto_if_eq VAR_ENIGMA_BERRY_AVAILABLE, 0, PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry
msgbox PetalburgCity_Gym_Text_GiveEnigmaBerry, MSGBOX_DEFAULT
@@ -365,7 +365,7 @@ PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry::
return
PetalburgCity_Gym_EventScript_GiveEnigmaBerry::
giveitem ITEM_ENIGMA_BERRY_E_READER
giveitem ITEM_ENIGMA_BERRY
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setvar VAR_ENIGMA_BERRY_AVAILABLE, 0
release