diff options
| author | yenatch <yenatch@gmail.com> | 2016-02-10 00:32:58 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-02-10 00:32:58 -0500 |
| commit | 8e1167a1e594f226af6fc46638ef9eb713913608 (patch) | |
| tree | 75e3408e0ad35e8d22c068bc479b9c2045c9de5f /data | |
| parent | e044b8ec08fee4a5d4f9cd942551ff94f2577b76 (diff) | |
| parent | 36f0bda0b33f5444241f1081b93f63f94a1b046a (diff) | |
Merge branch 'fix-makefile'
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" |