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

@@ -42,9 +42,9 @@ Route119_EventScript_1F4488:: @ 81F4488
lockall
addobject 25
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq Route119_EventScript_1F4501
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq Route119_EventScript_1F4506
delay 65
compare VAR_TEMP_1, 1
@@ -62,9 +62,9 @@ Route119_EventScript_1F4488:: @ 81F4488
addobject 16
delay 30
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq Route119_EventScript_1F450B
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq Route119_EventScript_1F4585
releaseall
end