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
@@ -53,9 +53,9 @@ Route111_MapScript1_1F0D87: @ 81F0D87
Route111_EventScript_1F0DC2:: @ 81F0DC2
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq Route111_EventScript_1F0DDA
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq Route111_EventScript_1F0DE0
return