Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'kanzure/master'

This commit is contained in:
yenatch 2015-03-11 14:37:48 -07:00
parent 58e5b396c1 53b30efdfc
commit 715f0c8a8f
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -1,7 +1,7 @@
PYTHON := python PYTHON := python
.SUFFIXES: .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 .PHONY: all clean crystal pngs
.SECONDEXPANSION: .SECONDEXPANSION:
@ -54,8 +54,7 @@ all: $(roms)
crystal: pokecrystal.gbc crystal: pokecrystal.gbc
clean: clean:
rm -f $(roms) $(all_obj) rm -f $(roms) $(all_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym)
find . -iname '*.tx' -exec rm {} +
baserom.gbc: ; baserom.gbc: ;
@echo "Wait! Need baserom.gbc first. Check README and INSTALL for details." && false @echo "Wait! Need baserom.gbc first. Check README and INSTALL for details." && false

17
audio/music/magnettrain.asm
View File

@ -251,7 +251,22 @@ Music_MagnetTrain_Ch4: ; ef6f4
; ef711 ; 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 Music_MagnetTrain_branch_ef71e: ; ef71e

7
audio/music/unioncave.asm
View File

@ -262,10 +262,7 @@ Music_UnionCave_branch_f5da9: ; f5da9
note G#, 4 note G#, 4
note __, 8 note __, 8
loopchannel 0, Music_UnionCave_branch_f5da9 loopchannel 0, Music_UnionCave_branch_f5da9
; f5dc1 loopchannel 0, Music_UnionCave_branch_f5da9 ; unused
; f5dc5
INCBIN "baserom.gbc", $f5dc1, $f5dc5 - $f5dc1