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
@@ -605,7 +605,7 @@ RustboroCity_EventScript_ReturnGoods:: @ 81E0C5B
compare VAR_TEMP_1, 4
call_if_eq RustboroCity_EventScript_EmployeeFacePlayerRight
msgbox RustboroCity_Text_YouGotItThankYou, MSGBOX_DEFAULT
giveitem_std ITEM_GREAT_BALL
giveitem ITEM_GREAT_BALL
compare VAR_RESULT, FALSE
call_if_eq RustboroCity_EventScript_BagFull
msgbox RustboroCity_Text_PleaseComeWithMe, MSGBOX_DEFAULT