dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

merge conflicts, review changes, daycare

Browse Source
This commit is contained in:
DizzyEggg
2017-11-17 19:31:03 +01:00
parent ba00a1c688 a98c6bf210
commit 1b7246395d
61 changed files with 3368 additions and 6216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/scripts/maps/Route117.inc
View File

@@ -7,7 +7,7 @@ Route117_MapScript1_1F3983: @ 81F3983
end
Route117_EventScript_1F3989:: @ 81F3989
checkflag FLAG_0x086
checkflag FLAG_PENDING_DAYCARE_EGG
goto_if 0, Route117_EventScript_1F3999
setobjectxyperm 3, 47, 6