Merge branch 'master' into clone-union

This commit is contained in:
GriffinR authored and GitHub committed 2022-08-17 15:41:50 -04:00
commit ab56ac41a1
322 files changed
+12564 -12748

No files matched your search

+2 -3
View File
@@ -20,9 +20,8 @@ CeruleanCity_Gym_EventScript_MistyDefeated::
CeruleanCity_Gym_EventScript_GiveTM03::
msgbox CeruleanCity_Gym_Text_ExplainCascadeBadge
checkitemspace ITEM_TM03, 1
compare VAR_RESULT, FALSE
goto_if_eq CeruleanCity_Gym_EventScript_NoRoomForTM03
checkitemspace ITEM_TM03
goto_if_eq VAR_RESULT, FALSE, CeruleanCity_Gym_EventScript_NoRoomForTM03
giveitem_msg CeruleanCity_Gym_Text_ReceivedTM03FromMisty, ITEM_TM03
setflag FLAG_GOT_TM03_FROM_MISTY
msgbox CeruleanCity_Gym_Text_ExplainTM03