diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2015-03-08 12:14:42 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2015-03-08 12:14:42 -0500 |
| commit | 53b30efdfcdeffbbca3892532e5a542056816787 (patch) | |
| tree | 49c9fd79e1316d9ffcbf510054742bb936e00281 | |
| parent | 35644c330effcfb083591d20b3b5f780019ae24f (diff) | |
| parent | fa1c2c573a683185cf257cd3d6518b476f60e648 (diff) | |
Merge pull request #280 from dannye/master
Fix make clean; Final music incbins
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | audio/music/magnettrain.asm | 17 | ||||
| -rw-r--r-- | audio/music/unioncave.asm | 7 |
3 files changed, 20 insertions, 9 deletions
@@ -1,7 +1,7 @@ PYTHON := python .SUFFIXES: -.SUFFIXES: .asm .tx .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 .SECONDEXPANSION: @@ -54,8 +54,7 @@ all: $(roms) crystal: pokecrystal.gbc clean: - rm -f $(roms) $(all_obj) - find . -iname '*.tx' -exec rm {} + + rm -f $(roms) $(all_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) baserom.gbc: ; @echo "Wait! Need baserom.gbc first. Check README and INSTALL for details." && false diff --git a/audio/music/magnettrain.asm b/audio/music/magnettrain.asm index cb5647540..232c0ca4a 100644 --- a/audio/music/magnettrain.asm +++ b/audio/music/magnettrain.asm @@ -251,7 +251,22 @@ Music_MagnetTrain_Ch4: ; ef6f4 ; ef711 -INCBIN "baserom.gbc", $ef711, $ef71e - $ef711 +; unused +Music_MagnetTrain_branch_ef711: ; ef711 + note G#, 1 + note G_, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G_, 1 + endchannel +; ef71e Music_MagnetTrain_branch_ef71e: ; ef71e diff --git a/audio/music/unioncave.asm b/audio/music/unioncave.asm index f08926b12..c412cdc3c 100644 --- a/audio/music/unioncave.asm +++ b/audio/music/unioncave.asm @@ -262,10 +262,7 @@ Music_UnionCave_branch_f5da9: ; f5da9 note G#, 4 note __, 8 loopchannel 0, Music_UnionCave_branch_f5da9 -; f5dc1 - - -INCBIN "baserom.gbc", $f5dc1, $f5dc5 - $f5dc1 - + loopchannel 0, Music_UnionCave_branch_f5da9 ; unused +; f5dc5 |