Fix merge conflicts

This commit is contained in:
Tetrable
2019-01-02 21:25:14 +00:00
773 changed files with 11252 additions and 23425 deletions

View File

@@ -20,9 +20,9 @@ Route103_EventScript_1EC3AE:: @ 81EC3AE
Route103_EventScript_1EC3C1:: @ 81EC3C1
lockall
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq Route103_EventScript_1EC3DA
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq Route103_EventScript_1EC434
end