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
@@ -229,7 +229,7 @@ VerdanturfTown_BattleTentLobby_EventScript_AttractGiver:: @ 8201A7B
faceplayer
goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_BattleTentLobby_EventScript_ReceivedAttract
msgbox VerdanturfTown_BattleTentLobby_Text_AttractionRunsDeep, MSGBOX_DEFAULT
giveitem_std ITEM_TM45
giveitem ITEM_TM45
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_TM45