diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-15 15:53:49 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-15 15:53:49 -0500 |
| commit | 434c97a146d4416829a44955d325d023dacf9e54 (patch) | |
| tree | a15cbd96d3e4d23d6c3850b0f192f76f6d71536e | |
| parent | 36470537e09762f1963e003a0566c56041fc23ea (diff) | |
Makefile cleanup
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | wram.asm | 13 |
2 files changed, 8 insertions, 10 deletions
@@ -1,9 +1,8 @@ PYTHON := python MD5 := md5sum -c --quiet -.SUFFIXES: .SUFFIXES: .asm .o .gbc .png .2bpp .1bpp .lz .pal .bin .blk .tilemap -.PHONY: all clean crystal pngs +.PHONY: all clean crystal crystal11 pngs .SECONDEXPANSION: poketools := extras/pokemontools @@ -54,6 +53,8 @@ roms := pokecrystal.gbc all: $(roms) crystal: pokecrystal.gbc +crystal11: pokecrystal11.gbc + clean: rm -f $(roms) $(all_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) @@ -974,12 +974,12 @@ wc7e8:: ds 24 SECTION "Overworld Map", WRAM0 [$c800] -wc800:: OverworldMap:: ; c800 -; too lazy to reconcile these labels -; ds 1300 + ds 1300 +OverworldMapEnd:: + ds OverworldMap - @ - ds 1 +wc800:: ds 1 wc801:: ds 1 wc802:: ds 1 wc803:: ds 4 @@ -1111,10 +1111,7 @@ wccb4:: ds 1 wccb5:: ds 3 wccb8:: ds 1 wccb9:: ds 1 -wccba:: ds 90 -OverworldMapEnd:: - - ds 12 +wccba:: ds 102 SECTION "Video", WRAM0 CreditsPos:: |