pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Makefile cleanup

Browse Source
This commit is contained in:
PikalaxALT 2015-11-15 15:53:49 -05:00
parent 36470537e0
commit 434c97a146
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -1,9 +1,8 @@
PYTHON := python PYTHON := python
MD5 := md5sum -c --quiet MD5 := md5sum -c --quiet
.SUFFIXES:
.SUFFIXES: .asm .o .gbc .png .2bpp .1bpp .lz .pal .bin .blk .tilemap .SUFFIXES: .asm .o .gbc .png .2bpp .1bpp .lz .pal .bin .blk .tilemap
.PHONY: all clean crystal pngs .PHONY: all clean crystal crystal11 pngs
.SECONDEXPANSION: .SECONDEXPANSION:
poketools := extras/pokemontools poketools := extras/pokemontools
@ -54,6 +53,8 @@ roms := pokecrystal.gbc
all: $(roms) all: $(roms)
crystal: pokecrystal.gbc crystal: pokecrystal.gbc
crystal11: pokecrystal11.gbc
clean: clean:
rm -f $(roms) $(all_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rm -f $(roms) $(all_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym)

13
wram.asm
View File

@ -974,12 +974,12 @@ wc7e8:: ds 24
SECTION "Overworld Map", WRAM0 [$c800] SECTION "Overworld Map", WRAM0 [$c800]
wc800::
OverworldMap:: ; c800 OverworldMap:: ; c800
; too lazy to reconcile these labels ds 1300
; ds 1300 OverworldMapEnd::
ds OverworldMap - @
ds 1 wc800:: ds 1
wc801:: ds 1 wc801:: ds 1
wc802:: ds 1 wc802:: ds 1
wc803:: ds 4 wc803:: ds 4
@ -1111,10 +1111,7 @@ wccb4:: ds 1
wccb5:: ds 3 wccb5:: ds 3
wccb8:: ds 1 wccb8:: ds 1
wccb9:: ds 1 wccb9:: ds 1
wccba:: ds 90 wccba:: ds 102
OverworldMapEnd::
ds 12
SECTION "Video", WRAM0 SECTION "Video", WRAM0
CreditsPos:: CreditsPos::