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

@@ -6,9 +6,8 @@ SaffronCity_MrPsychicsHouse_EventScript_MrPsychic::
faceplayer
goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, SaffronCity_MrPsychicsHouse_EventScript_AlreadyGotTM29
msgbox SaffronCity_MrPsychicsHouse_Text_YouWantedThis
checkitemspace ITEM_TM29, 1
compare VAR_RESULT, FALSE
goto_if_eq SaffronCity_MrPsychicsHouse_EventScript_NoRoomForTM29
checkitemspace ITEM_TM29
goto_if_eq VAR_RESULT, FALSE, SaffronCity_MrPsychicsHouse_EventScript_NoRoomForTM29
giveitem_msg SaffronCity_MrPsychicsHouse_Text_ReceivedTM29FromMrPsychic, ITEM_TM29
msgbox SaffronCity_MrPsychicsHouse_Text_ExplainTM29
setflag FLAG_GOT_TM29_FROM_MR_PSYCHIC