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

4
data/maps/Route101/scripts.inc
View File

@@ -238,9 +238,9 @@ Route101_EventScript_1EBE16:: @ 81EBE16
setvar VAR_0x4060, 3
clearflag FLAG_SPECIAL_FLAG_0x4000
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq Route101_EventScript_1EBE85
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq Route101_EventScript_1EBE89
warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
waitstate