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 -4
View File
@@ -5,8 +5,7 @@ SSAnne_1F_Room6_EventScript_Woman::
lock
faceplayer
msgbox SSAnne_1F_Room6_Text_TakeAShortRest, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SSAnne_1F_Room6_EventScript_DeclineHeal
goto_if_eq VAR_RESULT, NO, SSAnne_1F_Room6_EventScript_DeclineHeal
closemessage
call EventScript_OutOfCenterPartyHeal
msgbox SSAnne_1F_Room6_Text_GladEveryoneIsRefreshed
@@ -15,8 +14,7 @@ SSAnne_1F_Room6_EventScript_Woman::
SSAnne_1F_Room6_EventScript_DeclineHeal::
checkplayergender
compare VAR_RESULT, MALE
goto_if_eq SSAnne_1F_Room6_EventScript_DeclineHealMale
goto_if_eq VAR_RESULT, MALE, SSAnne_1F_Room6_EventScript_DeclineHealMale
msgbox SSAnne_1F_Room6_Text_SorryYouLookLikeMySister
release
end