dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
GriffinR
2020-01-13 20:41:57 -05:00
parent 655910a16f 736f3bbbe0
commit e92cc7752b
118 changed files with 605 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/scripts/berry_blender.inc
View File

@@ -263,7 +263,7 @@ BerryBlender_EventScript_Blender1NoSpareBerries: @ 8293C92
BerryBlender_EventScript_Blender1GiveSpareBerry: @ 8293C9C
msgbox BerryBlender_Text_CanHaveOneOfMyBerries, MSGBOX_DEFAULT
giveitem_std ITEM_PECHA_BERRY
giveitem ITEM_PECHA_BERRY
setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
goto BerryBlender_EventScript_UseBerryBlender1
end
@@ -551,7 +551,7 @@ BerryBlender_EventScript_ExpertMNoSpareBerries: @ 8294028
BerryBlender_EventScript_ExpertMGiveBerry: @ 8294032
msgbox BerryBlender_Text_DontHaveAnyBerriesHaveOne, MSGBOX_DEFAULT
giveitem_std ITEM_PECHA_BERRY
giveitem ITEM_PECHA_BERRY
setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
msgbox BerryBlender_Text_UseItToMakePokeblocksTogether, MSGBOX_DEFAULT
release