Move to 256kb mapper 1 only to make room for audio

Makefile

@@ -5,29 +5,18 @@ OBJS = $(patsubst %.asm,%.o,$(wildcard *.asm))
 INC = $(wildcard *.inc)
 CHR = $(wildcard *.chr)
 
-PwnAdventureZ.nes: $(OBJS) flagemu.o mapper1.o Makefile mapper1.cfg PwnAdventureZ_prg.bin PwnAdventureZ_mapper2.nes
-	$(LD65) -C mapper1.cfg -o $@ $(OBJS) flagemu.o mapper1.o -vm --mapfile PwnAdventureZ.map
+PwnAdventureZ.nes: $(OBJS) flagemu.o Makefile mapper1.cfg PwnAdventureZ_prg.bin
+	$(LD65) -C mapper1.cfg -o $@ $(OBJS) flagemu.o -vm --mapfile PwnAdventureZ.map
 	md5 -q PwnAdventureZ.map | xxd -r -p | dd of=PwnAdventureZ.nes bs=1 seek=131078 count=4 conv=notrunc
 	python usage.py
 	python tools/map2nl.py PwnAdventureZ.map
 	tools/makehtml.sh
 	zip PwnAdventureZ.zip PwnAdventureZ.nes* PwnAdventureZ.map instructions.txt
 
-PwnAdventureZ_prg.bin: $(OBJS) flagreal.o mapper1.o Makefile mapper1.cfg
-	$(LD65) -C mapper1.cfg -o PwnAdventureZ_physical.nes $(OBJS) flagreal.o mapper1.o -vm --mapfile PwnAdventureZ.map
+PwnAdventureZ_prg.bin: $(OBJS) flagreal.o Makefile mapper1.cfg
+	$(LD65) -C mapper1.cfg -o PwnAdventureZ_physical.nes $(OBJS) flagreal.o -vm --mapfile PwnAdventureZ.map
 	md5 -q PwnAdventureZ.map | xxd -r -p | dd of=PwnAdventureZ_physical.nes bs=1 seek=131078 count=4 conv=notrunc
 	dd if=PwnAdventureZ_physical.nes of=PwnAdventureZ_prg.bin bs=1 skip=16
-	dd if=PwnAdventureZ_physical.nes of=PwnAdventureZ_prg.bin bs=1 skip=16 seek=131072 conv=notrunc
-
-PwnAdventureZ_mapper2.nes: $(OBJS) flagemu.o mapper2.o Makefile mapper2.cfg PwnAdventureZ_mapper2_prg.bin
-	$(LD65) -C mapper2.cfg -o $@ $(OBJS) flagemu.o mapper2.o -vm --mapfile PwnAdventureZ_mapper2.map
-	md5 -q PwnAdventureZ_mapper2.map | xxd -r -p | dd of=PwnAdventureZ_mapper2.nes bs=1 seek=131078 count=4 conv=notrunc
-	python tools/map2nl.py PwnAdventureZ_mapper2.map
-
-PwnAdventureZ_mapper2_prg.bin: $(OBJS) flagreal.o mapper2.o Makefile mapper2.cfg
-	$(LD65) -C mapper2.cfg -o PwnAdventureZ_mapper2_physical.nes $(OBJS) flagreal.o mapper2.o -vm --mapfile PwnAdventureZ_mapper2.map
-	md5 -q PwnAdventureZ_mapper2.map | xxd -r -p | dd of=PwnAdventureZ_mapper2_physical.nes bs=1 seek=131078 count=4 conv=notrunc
-	dd if=PwnAdventureZ_mapper2_physical.nes of=PwnAdventureZ_mapper2_prg.bin bs=1 skip=16
 
 $(CA65) $(LD65):
 	cd cc65; make ca65 ld65
@@ -40,20 +29,11 @@ flagreal.o: flag/flagreal.asm Makefile $(CA65) $(LD65) $(CHR) $(INC)
 flagemu.o: flag/flagemu.asm Makefile $(CA65) $(LD65) $(CHR) $(INC)
 	$(CA65) -o $@ -t nes -U $<
 
-mapper1.o: mapper/mapper1.asm Makefile $(CA65) $(LD65) $(CHR) $(INC)
-	$(CA65) -o $@ -t nes -U $<
-mapper2.o: mapper/mapper2.asm Makefile $(CA65) $(LD65) $(CHR) $(INC)
-	$(CA65) -o $@ -t nes -U $<
-
 clean:
 	rm -f PwnAdventureZ.zip 
 	rm -f PwnAdventureZ.html
 	rm -f PwnAdventureZ.nes
 	rm -f PwnAdventureZ.map
 	rm -f PwnAdventureZ_physical.nes
 	rm -f PwnAdventureZ_prg.bin
-	rm -f PwnAdventureZ_mapper2.nes
-	rm -f PwnAdventureZ_mapper2.map
-	rm -f PwnAdventureZ_mapper2_physical.nes
-	rm -f PwnAdventureZ_mapper2_prg.bin
 	rm -f *.o *.nl

audio.asm

@@ -440,7 +440,7 @@ VAR music_loop_bank_ptr
 .include "audio/neonstarlight.asm"
 .include "audio/neonstarlight_loop.asm"
 
-.segment "CHR5"
+.segment "AUDIO0"
 .include "audio/craft.asm"
 .include "audio/enemydie.asm"
 .include "audio/enemyhit.asm"
@@ -455,5 +455,5 @@ VAR music_loop_bank_ptr
 .include "audio/buy.asm"
 .include "audio/sell.asm"
 
-.segment "CHR1"
+.segment "AUDIO1"
 .include "audio/cave.asm"

audio/neonstarlight.asm

@@ -1,4 +1,4 @@
-.segment "CHR4"
+.segment "AUDIO7"
 
 VAR neonstarlight_ptr
 	.word neonstarlight_page_0 & $ffff

audio/neonstarlight_loop.asm

@@ -1,4 +1,4 @@
-.segment "CHR4"
+.segment "AUDIO0"
 
 VAR neonstarlight_loop_ptr
 	.word neonstarlight_loop_page_0 & $ffff