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
data/maps/RustboroCity/scripts.inc
+4 -4
View File
@@ -677,9 +677,9 @@ RustboroCity_EventScript_1E0DB8:: @ 81E0DB8
Route104_EventScript_1E0DD1:: @ 81E0DD1
RustboroCity_EventScript_1E0DD1:: @ 81E0DD1
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq RustboroCity_EventScript_1E0DE9
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq RustboroCity_EventScript_1E0DEE
return
@@ -821,9 +821,9 @@ RustboroCity_EventScript_1E0FB3:: @ 81E0FB3
RustboroCity_EventScript_1E0FF3:: @ 81E0FF3
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq RustboroCity_EventScript_1E100B
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq RustboroCity_EventScript_1E1114
end