ref: 08ac6dfd80000f1cdd449225e4d2cc195e086439
parent: 1176712cfebba527fac1438fdf8ca8b9e643a8e7
author: yenatch <yenatch@gmail.com>
date: Fri Jan 29 11:24:02 EST 2016
*_crystal.asm files are no longer needed to build crystal *.o.
--- a/Makefile
+++ b/Makefile
@@ -16,12 +16,12 @@
lib/mobile/main.o \
home.o \
audio.o \
-maps_crystal.o \
-engine/events_crystal.o \
-engine/credits_crystal.o \
-data/egg_moves_crystal.o \
-data/evos_attacks_crystal.o \
-data/pokedex/entries_crystal.o \
+maps.o \
+engine/events.o \
+engine/credits.o \
+data/egg_moves.o \
+data/evos_attacks.o \
+data/pokedex/entries.o \
misc/crystal_misc.o \
text/common_text.o \
gfx/pics.o
@@ -32,12 +32,12 @@
lib/mobile/main.o \
home.o \
audio.o \
-maps_crystal.o \
-engine/events_crystal.o \
-engine/credits_crystal.o \
-data/egg_moves_crystal.o \
-data/evos_attacks_crystal.o \
-data/pokedex/entries_crystal.o \
+maps.o \
+engine/events.o \
+engine/credits.o \
+data/egg_moves.o \
+data/evos_attacks.o \
+data/pokedex/entries.o \
misc/crystal_misc.o \
text/common_text.o \
gfx/pics.o
@@ -67,6 +67,10 @@
%11.o: %.asm $$(%_dep)
rgbasm -D CRYSTAL11 -o $@ $<
%.o: %.asm $$(%_dep)
+ rgbasm -o $@ $<
+
+# This seems to be required because of a filename collision (but not a path collision).
+lib/%.o: lib/%.asm $$(lib/%_dep)
rgbasm -o $@ $<
pokecrystal11.gbc: $(crystal11_obj)
--- a/data/egg_moves_crystal.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-INCLUDE "pokecrystal.asm"
-INCLUDE "data/egg_moves.asm"
--- a/data/evos_attacks_crystal.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-INCLUDE "pokecrystal.asm"
-INCLUDE "data/evos_attacks.asm"
--- a/engine/credits_crystal.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-INCLUDE "pokecrystal.asm"
-INCLUDE "engine/credits.asm"
--- a/engine/events_crystal.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-INCLUDE "pokecrystal.asm"
-INCLUDE "engine/events.asm"
--- a/includes.asm
+++ b/includes.asm
@@ -1,2 +1,3 @@
+INCLUDE "version.asm"
INCLUDE "contents.asm"
INCLUDE "constants.asm"
--- a/maps_crystal.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-INCLUDE "pokecrystal.asm"
-INCLUDE "maps.asm"
--- a/pokecrystal.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-_CRYSTAL EQU 1
-VERSION EQU 0
--- /dev/null
+++ b/version.asm
@@ -1,0 +1,2 @@
+_CRYSTAL EQU 1
+VERSION EQU 0
--
⑨