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

View File

@@ -91,7 +91,7 @@ MossdeepCity_Gym_EventScript_TateAndLizaDefeated:: @ 82208D1
end
MossdeepCity_Gym_EventScript_GiveCalmMind2:: @ 8220937
giveitem_std ITEM_TM04
giveitem ITEM_TM04
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
msgbox MossdeepCity_Gym_Text_ExplainCalmMind, MSGBOX_DEFAULT
@@ -100,7 +100,7 @@ MossdeepCity_Gym_EventScript_GiveCalmMind2:: @ 8220937
end
MossdeepCity_Gym_EventScript_GiveCalmMind:: @ 822095B
giveitem_std ITEM_TM04
giveitem ITEM_TM04
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_BagIsFull
msgbox MossdeepCity_Gym_Text_ExplainCalmMind, MSGBOX_DEFAULT