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
@@ -21,9 +21,8 @@ CeladonCity_Gym_EventScript_DefeatedErika::
CeladonCity_Gym_EventScript_GiveTM19::
msgbox CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis
checkitemspace ITEM_TM19, 1
compare VAR_RESULT, FALSE
goto_if_eq CeladonCity_Gym_EventScript_NoRoomForTM19
checkitemspace ITEM_TM19
goto_if_eq VAR_RESULT, FALSE, CeladonCity_Gym_EventScript_NoRoomForTM19
giveitem_msg CeladonCity_Gym_Text_ReceivedTM19FromErika, ITEM_TM19
setflag FLAG_GOT_TM19_FROM_ERIKA
msgbox CeladonCity_Gym_Text_ExplainTM19