Merge branch 'master' of github.com:pret/pokecrystal

This commit is contained in:
surskitty
2018-01-23 00:02:56 -05:00
1232 changed files with 20484 additions and 19794 deletions

View File

@@ -1,7 +1,7 @@
const_value set 2
const ROUTE6SAFFRONGATE_OFFICER
Route6SaffronGate_MapScriptHeader:
Route6SaffronGate_MapScripts:
.SceneScripts:
db 1
scene_script .DummyScene
@@ -57,7 +57,7 @@ Route6SaffronGuardMagnetTrainText:
line "FRON."
done
Route6SaffronGate_MapEventHeader:
Route6SaffronGate_MapEvents:
; filler
db 0, 0