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 @@ FuchsiaCity_Gym_EventScript_DefeatedKoga::
FuchsiaCity_Gym_EventScript_GiveTM06::
msgbox FuchsiaCity_Gym_Text_KogaExplainSoulBadge
checkitemspace ITEM_TM06, 1
compare VAR_RESULT, FALSE
goto_if_eq FuchsiaCity_Gym_EventScript_NoRoomForTM06
checkitemspace ITEM_TM06
goto_if_eq VAR_RESULT, FALSE, FuchsiaCity_Gym_EventScript_NoRoomForTM06
giveitem_msg FuchsiaCity_Gym_Text_ReceivedTM06FromKoga, ITEM_TM06
setflag FLAG_GOT_TM06_FROM_KOGA
msgbox FuchsiaCity_Gym_Text_KogaExplainTM06