diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
| commit | e2fb7acac0e3c1d598021b52fc2583dd983321bc (patch) | |
| tree | ea5922596ce167e5b0485ea3bacd65f43339ca60 /data/default_options.asm | |
| parent | 1a888f22004aec967d2b6049ede7e04b1815f956 (diff) | |
| parent | 364854623267a8a39242243b0cdf80144e868642 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# engine/items/mart.asm
Diffstat (limited to 'data/default_options.asm')
| -rw-r--r-- | data/default_options.asm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/data/default_options.asm b/data/default_options.asm index 7a4f77128..991827316 100644 --- a/data/default_options.asm +++ b/data/default_options.asm @@ -1,4 +1,4 @@ -DefaultOptions: ; 14f7c +DefaultOptions: ; wOptions: med text speed db TEXT_DELAY_MED ; wSaveFileExists: no @@ -14,4 +14,3 @@ DefaultOptions: ; 14f7c db $00 db $00 -; 14f84 |