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

This commit is contained in:
GriffinR
2020-01-13 20:41:57 -05:00
118 changed files with 605 additions and 638 deletions
+1 -1
View File
@@ -30,7 +30,7 @@ LavaridgeTown_HerbShop_EventScript_OldMan:: @ 81FE505
faceplayer
goto_if_set FLFLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_ExplainCharcoal
msgbox LavaridgeTown_HerbShop_Text_YouveComeToLookAtHerbalMedicine, MSGBOX_DEFAULT
giveitem_std ITEM_CHARCOAL
giveitem ITEM_CHARCOAL
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLFLAG_RECEIVED_CHARCOAL