*_crystal.asm files are no longer needed to build crystal *.o.

This commit is contained in:
yenatch 2016-01-29 16:24:02 -05:00
parent 1176712cfe
commit 08ac6dfd80
8 changed files with 17 additions and 22 deletions

View File

@ -16,12 +16,12 @@ main11.o \
lib/mobile/main.o \ lib/mobile/main.o \
home.o \ home.o \
audio.o \ audio.o \
maps_crystal.o \ maps.o \
engine/events_crystal.o \ engine/events.o \
engine/credits_crystal.o \ engine/credits.o \
data/egg_moves_crystal.o \ data/egg_moves.o \
data/evos_attacks_crystal.o \ data/evos_attacks.o \
data/pokedex/entries_crystal.o \ data/pokedex/entries.o \
misc/crystal_misc.o \ misc/crystal_misc.o \
text/common_text.o \ text/common_text.o \
gfx/pics.o gfx/pics.o
@ -32,12 +32,12 @@ main.o \
lib/mobile/main.o \ lib/mobile/main.o \
home.o \ home.o \
audio.o \ audio.o \
maps_crystal.o \ maps.o \
engine/events_crystal.o \ engine/events.o \
engine/credits_crystal.o \ engine/credits.o \
data/egg_moves_crystal.o \ data/egg_moves.o \
data/evos_attacks_crystal.o \ data/evos_attacks.o \
data/pokedex/entries_crystal.o \ data/pokedex/entries.o \
misc/crystal_misc.o \ misc/crystal_misc.o \
text/common_text.o \ text/common_text.o \
gfx/pics.o gfx/pics.o
@ -69,6 +69,10 @@ compare: pokecrystal.gbc pokecrystal11.gbc
%.o: %.asm $$(%_dep) %.o: %.asm $$(%_dep)
rgbasm -o $@ $< 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) pokecrystal11.gbc: $(crystal11_obj)
rgblink -n $*.sym -m $*.map -o $@ $^ rgblink -n $*.sym -m $*.map -o $@ $^
rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@ rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@

View File

@ -1,2 +0,0 @@
INCLUDE "pokecrystal.asm"
INCLUDE "data/egg_moves.asm"

View File

@ -1,2 +0,0 @@
INCLUDE "pokecrystal.asm"
INCLUDE "data/evos_attacks.asm"

View File

@ -1,2 +0,0 @@
INCLUDE "pokecrystal.asm"
INCLUDE "engine/credits.asm"

View File

@ -1,2 +0,0 @@
INCLUDE "pokecrystal.asm"
INCLUDE "engine/events.asm"

View File

@ -1,2 +1,3 @@
INCLUDE "version.asm"
INCLUDE "contents.asm" INCLUDE "contents.asm"
INCLUDE "constants.asm" INCLUDE "constants.asm"

View File

@ -1,2 +0,0 @@
INCLUDE "pokecrystal.asm"
INCLUDE "maps.asm"