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

+2 -2
View File
@@ -70,7 +70,7 @@ LavaridgeTown_EventScript_RivalGiveGoGoggles:: @ 81EA551
LavaridgeTown_EventScript_MayGiveGoGoggles:: @ 81EA5B5
msgbox LavaridgeTown_Text_MayNiceBadgesTakeThis, MSGBOX_DEFAULT
giveitem_std ITEM_GO_GOGGLES
giveitem ITEM_GO_GOGGLES
setflag FLAG_RECEIVED_GO_GOGGLES
msgbox LavaridgeTown_Text_MayExplainGoGogglesChallengeDad, MSGBOX_DEFAULT
goto LavaridgeTown_EventScript_RivalExit
@@ -78,7 +78,7 @@ LavaridgeTown_EventScript_MayGiveGoGoggles:: @ 81EA5B5
LavaridgeTown_EventScript_BrendanGiveGoGoggles:: @ 81EA5DA
msgbox LavaridgeTown_Text_BrendanNiceBadgesTakeThis, MSGBOX_DEFAULT
giveitem_std ITEM_GO_GOGGLES
giveitem ITEM_GO_GOGGLES
setflag FLAG_RECEIVED_GO_GOGGLES
msgbox LavaridgeTown_Text_BrendanExplainGoGogglesChallengeDad, MSGBOX_DEFAULT
goto LavaridgeTown_EventScript_RivalExit