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
+2 -2
View File
@@ -49,7 +49,7 @@ FortreeCity_Gym_EventScript_WinonaDefeated:: @ 82165FD
end
FortreeCity_Gym_EventScript_GiveAerialAce2:: @ 8216646
giveitem_std ITEM_TM40
giveitem ITEM_TM40
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT
@@ -58,7 +58,7 @@ FortreeCity_Gym_EventScript_GiveAerialAce2:: @ 8216646
end
FortreeCity_Gym_EventScript_GiveAerialAce:: @ 821666A
giveitem_std ITEM_TM40
giveitem ITEM_TM40
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_BagIsFull
msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT