Fix merge conflicts

This commit is contained in:
Tetrable committed 2019-01-02 21:25:14 +00:00
commit a3ebca4d81
773 files changed
+11252 -23425

No files matched your search

+2 -2
View File
@@ -231,9 +231,9 @@ LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE
lock
faceplayer
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq LilycoveCity_EventScript_1E2DF8
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq LilycoveCity_EventScript_1E2E6B
end