Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj

This commit is contained in:
GriffinR committed 2020-01-13 20:41:57 -05:00
commit e92cc7752b
118 files changed
+605 -638

No files matched your search

+1 -1
View File
@@ -229,7 +229,7 @@ MossdeepCity_EventScript_KingsRockBoy:: @ 81E4C26
compare VAR_RESULT, NO
goto_if_eq MossdeepCity_EventScript_DeclineKingsRock
msgbox MossdeepCity_Text_YouCanKeepIt, MSGBOX_DEFAULT
giveitem_std ITEM_KINGS_ROCK
giveitem ITEM_KINGS_ROCK
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_KINGS_ROCK