dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Tetrable
2019-01-02 21:25:14 +00:00
parent 1e3da62d24 a0ff38d0be
commit a3ebca4d81
773 changed files with 11252 additions and 23425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/maps/Route104/scripts.inc
View File

@@ -72,9 +72,9 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3
Route104_EventScript_1ECD11:: @ 81ECD11
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq Route104_EventScript_1ECD29
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq Route104_EventScript_1ECD2E
return
@@ -88,9 +88,9 @@ Route104_EventScript_1ECD2E:: @ 81ECD2E
Route104_EventScript_1ECD33:: @ 81ECD33
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq Route104_EventScript_1ECD4B
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq Route104_EventScript_1ECE6F
end