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
@@ -19,7 +19,7 @@ PetalburgCity_WallysHouse_OnFrame: @ 8204247
PetalburgCity_WallysHouse_EventScript_GiveHM03Surf:: @ 8204251
lockall
msgbox PetalburgCity_WallysHouse_Text_PleaseExcuseUs, MSGBOX_DEFAULT
giveitem_std ITEM_HM03
giveitem ITEM_HM03
setflag FLAG_RECEIVED_HM03
msgbox PetalburgCity_WallysHouse_Text_SurfGoAllSortsOfPlaces, MSGBOX_DEFAULT
setvar VAR_PETALBURG_CITY_STATE, 5