mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
Use rgbasm -D instead of extra files for version differences.
This commit is contained in:
parent
00d491a646
commit
1176712cfe
10
Makefile
10
Makefile
@ -12,7 +12,7 @@ includes := $(PYTHON) $(poketools)/scan_includes.py
|
||||
|
||||
crystal11_obj := \
|
||||
wram11.o \
|
||||
crystal11.o \
|
||||
main11.o \
|
||||
lib/mobile/main.o \
|
||||
home.o \
|
||||
audio.o \
|
||||
@ -42,10 +42,10 @@ misc/crystal_misc.o \
|
||||
text/common_text.o \
|
||||
gfx/pics.o
|
||||
|
||||
all_obj := $(crystal_obj) crystal11.o wram11.o
|
||||
all_obj := $(crystal_obj) main11.o wram11.o
|
||||
|
||||
# object dependencies
|
||||
$(foreach obj, $(all_obj), \
|
||||
$(foreach obj, $(crystal_obj), \
|
||||
$(eval $(obj:.o=)_dep := $(shell $(includes) $(obj:.o=.asm))) \
|
||||
)
|
||||
|
||||
@ -64,7 +64,9 @@ compare: pokecrystal.gbc pokecrystal11.gbc
|
||||
@$(MD5) roms.md5
|
||||
|
||||
%.asm: ;
|
||||
$(all_obj): $$*.asm $$($$*_dep)
|
||||
%11.o: %.asm $$(%_dep)
|
||||
rgbasm -D CRYSTAL11 -o $@ $<
|
||||
%.o: %.asm $$(%_dep)
|
||||
rgbasm -o $@ $<
|
||||
|
||||
pokecrystal11.gbc: $(crystal11_obj)
|
||||
|
@ -1,4 +0,0 @@
|
||||
CRYSTAL11 = 1
|
||||
CORRUPT_TILES = 1
|
||||
|
||||
INCLUDE "main.asm"
|
@ -934,7 +934,7 @@ GFX_172f1f:
|
||||
INCBIN "gfx/unknown/172f1f.2bpp"
|
||||
|
||||
Tilemap_1733af:
|
||||
IF DEF(CORRUPT_TILES)
|
||||
IF DEF(CRYSTAL11)
|
||||
INCBIN "gfx/unknown/1733af_corrupt.tilemap"
|
||||
ELSE
|
||||
INCBIN "gfx/unknown/1733af.tilemap"
|
||||
|
@ -1,3 +0,0 @@
|
||||
CRYSTAL11 = 1
|
||||
|
||||
INCLUDE "wram.asm"
|
Loading…
Reference in New Issue
Block a user