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

nerge with master, fix conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-12-16 01:08:55 +01:00
parent 039c9f4bd8 224fdbf026
commit 44abbae60b
189 changed files with 20685 additions and 24533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ Route102_EventScript_1EC105:: @ 81EC105
Route102_EventScript_1EC146:: @ 81EC146
special sub_80B4808
waitmovement 0
checkflag FLAG_0x12F
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route102_EventScript_1EC157
release
end
@@ -48,7 +48,7 @@ Route102_EventScript_1EC157:: @ 81EC157
end
Route102_EventScript_1EC170:: @ 81EC170
checkflag FLAG_0x12F
checkflag FLAG_HAS_MATCH_CALL
goto_eq Route102_EventScript_1EC183
msgbox Route102_Text_2945AC, 4
release