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
@@ -6,9 +6,8 @@ SafariZone_SecretHouse_EventScript_Attendant::
faceplayer
goto_if_set FLAG_GOT_HM03, SafariZone_SecretHouse_EventScript_ExplainSurf
msgbox SafariZone_SecretHouse_Text_CongratsYouveWon
checkitemspace ITEM_HM03, 1
compare VAR_RESULT, FALSE
goto_if_eq SafariZone_SecretHouse_EventScript_NoRoomForHM03
checkitemspace ITEM_HM03
goto_if_eq VAR_RESULT, FALSE, SafariZone_SecretHouse_EventScript_NoRoomForHM03
giveitem_msg SafariZone_SecretHouse_Text_ReceivedHM03FromAttendant, ITEM_HM03
msgbox SafariZone_SecretHouse_Text_ExplainSurf
setflag FLAG_GOT_HM03