diff options
| author | yenatch <yenatch@gmail.com> | 2016-01-29 01:10:41 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-01-29 01:10:41 -0500 |
| commit | 1176712cfebba527fac1438fdf8ca8b9e643a8e7 (patch) | |
| tree | ce7617844b0d570715da68be703b85b0fa0be34b | |
| parent | 00d491a646174a0b00475969675c1e6e60da81df (diff) | |
Use rgbasm -D instead of extra files for version differences.
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | crystal11.asm | 4 | ||||
| -rwxr-xr-x | misc/mobile_5c.asm | 2 | ||||
| -rw-r--r-- | wram11.asm | 3 |
4 files changed, 7 insertions, 12 deletions
@@ -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) diff --git a/crystal11.asm b/crystal11.asm deleted file mode 100644 index c4c7712e8..000000000 --- a/crystal11.asm +++ /dev/null @@ -1,4 +0,0 @@ -CRYSTAL11 = 1 -CORRUPT_TILES = 1 - -INCLUDE "main.asm" diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm index b8710a78a..8ecd35edf 100755 --- a/misc/mobile_5c.asm +++ b/misc/mobile_5c.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" diff --git a/wram11.asm b/wram11.asm deleted file mode 100644 index 4d3303fd0..000000000 --- a/wram11.asm +++ /dev/null @@ -1,3 +0,0 @@ -CRYSTAL11 = 1 - -INCLUDE "wram.asm" |