diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2016-03-01 22:31:28 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2016-03-01 22:31:28 -0500 |
| commit | f31da089bbd46f56d488b5657f08f8595490e51e (patch) | |
| tree | d6455d4a4c893c997d44241f3599c27039900f8e /data | |
| parent | 599e6e8d16571235f2054aa38f39e66181da3796 (diff) | |
| parent | 0be6e6c910ea4ab7909d878aa12c4c7989d5ca13 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'data')
| -rw-r--r-- | data/egg_moves_crystal.asm | 2 | ||||
| -rw-r--r-- | data/evos_attacks_crystal.asm | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/data/egg_moves_crystal.asm b/data/egg_moves_crystal.asm deleted file mode 100644 index 50fbb1471..000000000 --- a/data/egg_moves_crystal.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "pokecrystal.asm" -INCLUDE "data/egg_moves.asm" diff --git a/data/evos_attacks_crystal.asm b/data/evos_attacks_crystal.asm deleted file mode 100644 index 22ec9d84c..000000000 --- a/data/evos_attacks_crystal.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "pokecrystal.asm" -INCLUDE "data/evos_attacks.asm" |