Merge branch 'master' into remove-extras

This commit is contained in:
Bryan Bishop
2013-08-27 10:51:30 -05:00
393 changed files with 73016 additions and 6914 deletions

View File

@@ -21,7 +21,7 @@ pokecrystal.o: $(TEXTFILES:.asm=.tx) wram.asm constants.asm $(shell find constan
@rm -f $@
pokecrystal.gbc: pokecrystal.o
rgblink -o $@ $<
rgblink -n pokecrystal.sym -m pokecrystal.map -o $@ $<
rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
pngs: