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
@@ -58,7 +58,7 @@ Route116_EventScript_DevonEmployee:: @ 81F2CA2
Route116_EventScript_GiveRepeatBall:: @ 81F2CBB
setflag FLAG_MET_DEVON_EMPLOYEE
giveitem_std ITEM_REPEAT_BALL
giveitem ITEM_REPEAT_BALL
compare VAR_RESULT, FALSE
goto_if_eq Route116_EventScript_NoRoomForRepeatBall
msgbox Route116_Text_NewBallAvailableAtMart, MSGBOX_DEFAULT