pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use rgbasm -D instead of extra files for version differences.

Browse Source
This commit is contained in:
yenatch 2016-01-29 01:10:41 -05:00
parent 00d491a646
commit 1176712cfe
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -12,7 +12,7 @@ includes := $(PYTHON) $(poketools)/scan_includes.py
crystal11_obj := \ crystal11_obj := \
wram11.o \ wram11.o \
crystal11.o \ main11.o \
lib/mobile/main.o \ lib/mobile/main.o \
home.o \ home.o \
audio.o \ audio.o \
@ -42,10 +42,10 @@ misc/crystal_misc.o \
text/common_text.o \ text/common_text.o \
gfx/pics.o gfx/pics.o
all_obj := $(crystal_obj) crystal11.o wram11.o all_obj := $(crystal_obj) main11.o wram11.o
# object dependencies # object dependencies
$(foreach obj, $(all_obj), \ $(foreach obj, $(crystal_obj), \
$(eval $(obj:.o=)_dep := $(shell $(includes) $(obj:.o=.asm))) \ $(eval $(obj:.o=)_dep := $(shell $(includes) $(obj:.o=.asm))) \
) )
@ -64,7 +64,9 @@ compare: pokecrystal.gbc pokecrystal11.gbc
@$(MD5) roms.md5 @$(MD5) roms.md5
%.asm: ; %.asm: ;
$(all_obj): $$*.asm $$($$*_dep) %11.o: %.asm $$(%_dep)
rgbasm -D CRYSTAL11 -o $@ $<
%.o: %.asm $$(%_dep)
rgbasm -o $@ $< rgbasm -o $@ $<
pokecrystal11.gbc: $(crystal11_obj) pokecrystal11.gbc: $(crystal11_obj)

4
crystal11.asm
View File

@ -1,4 +0,0 @@
CRYSTAL11 = 1
CORRUPT_TILES = 1
INCLUDE "main.asm"

2
misc/mobile_5c.asm
View File

@ -934,7 +934,7 @@ GFX_172f1f:
INCBIN "gfx/unknown/172f1f.2bpp" INCBIN "gfx/unknown/172f1f.2bpp"
Tilemap_1733af: Tilemap_1733af:
IF DEF(CORRUPT_TILES) IF DEF(CRYSTAL11)
INCBIN "gfx/unknown/1733af_corrupt.tilemap" INCBIN "gfx/unknown/1733af_corrupt.tilemap"
ELSE ELSE
INCBIN "gfx/unknown/1733af.tilemap" INCBIN "gfx/unknown/1733af.tilemap"

3
wram11.asm
View File

@ -1,3 +0,0 @@
CRYSTAL11 = 1
INCLUDE "wram.asm"