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/Route110/scripts.inc
View File

@@ -379,9 +379,9 @@ Route110_EventScript_1EF763:: @ 81EF763
Route110_EventScript_1EF76E:: @ 81EF76E
lockall
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq Route110_EventScript_1EF7E1
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq Route110_EventScript_1EF7E6
applymovement 28, Route110_Movement_2725AA
waitmovement 0
@@ -397,9 +397,9 @@ Route110_EventScript_1EF76E:: @ 81EF76E
compare VAR_0x8008, 3
call_if_eq Route110_EventScript_1EF964
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq Route110_EventScript_1EF7EB
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq Route110_EventScript_1EF865
releaseall
end