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
@@ -115,7 +115,7 @@ MauvilleCity_Gym_EventScript_WattsonDefeated:: @ 820DF2B
end
MauvilleCity_Gym_EventScript_GiveShockWave2:: @ 820DF8D
giveitem_std ITEM_TM34
giveitem ITEM_TM34
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
msgbox MauvilleCity_Gym_Text_ExplainShockWave, MSGBOX_DEFAULT
@@ -124,7 +124,7 @@ MauvilleCity_Gym_EventScript_GiveShockWave2:: @ 820DF8D
end
MauvilleCity_Gym_EventScript_GiveShockWave:: @ 820DFB1
giveitem_std ITEM_TM34
giveitem ITEM_TM34
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_BagIsFull
msgbox MauvilleCity_Gym_Text_ExplainShockWave, MSGBOX_DEFAULT