Merge branch 'fix-makefile'

2016-02-10 00:32:58 -05:00
parent e044b8ec08 36f0bda0b3
commit 8e1167a1e5
12 changed files with 16 additions and 48 deletions
--- a/data/egg_moves_crystal.asm
+++ b/data/egg_moves_crystal.asm
@@ -1,2 +0,0 @@
-INCLUDE "pokecrystal.asm"
-INCLUDE "data/egg_moves.asm"
--- a/data/evos_attacks_crystal.asm
+++ b/data/evos_attacks_crystal.asm
@@ -1,2 +0,0 @@
-INCLUDE "pokecrystal.asm"
-INCLUDE "data/evos_attacks.asm"