Merge branch 'master' into clone-union

This commit is contained in:
GriffinR
2022-08-17 15:41:50 -04:00
committed by GitHub
322 changed files with 12564 additions and 12748 deletions
+2 -3
View File
@@ -27,9 +27,8 @@ ViridianCity_Gym_EventScript_DefeatedGiovanni::
ViridianCity_Gym_EventScript_GiveTM26::
msgbox ViridianCity_Gym_Text_ExplainEarthBadgeTakeThis
checkitemspace ITEM_TM26, 1
compare VAR_RESULT, FALSE
goto_if_eq ViridianCity_Gym_EventScript_NoRoomForTM26
checkitemspace ITEM_TM26
goto_if_eq VAR_RESULT, FALSE, ViridianCity_Gym_EventScript_NoRoomForTM26
giveitem_msg ViridianCity_Gym_Text_ReceivedTM26FromGiovanni, ITEM_TM26
setflag FLAG_GOT_TM26_FROM_GIOVANNI
msgbox ViridianCity_Gym_Text_ExplainTM26