Merge remote-tracking branch 'kanzure/master'

Makefile

@@ -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

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

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