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

@@ -53,18 +53,18 @@ LavaridgeTown_EventScript_1EA551:: @ 81EA551
call_if_ne LavaridgeTown_EventScript_1EA65C
delay 20
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq LavaridgeTown_EventScript_1EA630
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq LavaridgeTown_EventScript_1EA635
compare VAR_0x8008, 9
call_if_eq LavaridgeTown_EventScript_1EA6A1
compare VAR_0x8008, 9
call_if_ne LavaridgeTown_EventScript_1EA6AC
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq LavaridgeTown_EventScript_1EA5B5
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq LavaridgeTown_EventScript_1EA5DA
end