diff --git a/Makefile b/Makefile index 98e59db..5957e92 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,6 @@ -COLORSPRITE = moldy_burger.png -BWSPRITE = apple-sprite9x11.png +SPRITES = atari-sprite9x11.png apple-sprite9x11.png -all: cpbg.dsk titles.dsk working.dsk - -cpbg-sprite-driver.s: $(BWSPRITE) - quicksprite.py -a mac65 -p 6502 -s hgrbw -m -k -d -g -f fatfont128.dat -o cpbg $(BWSPRITE) $(COLORSPRITE) - -cpbg.xex: cpbg.s cpbg-sprite-driver.s - atasm -mae -ocpbg.xex cpbg.s -Lcpbg.var -gcpbg.lst - -cpbg.dsk: cpbg.xex - atrcopy cpbg.dsk boot -b cpbg.xex --brun 6000 -f +all: titles.dsk working.dsk player-missile.hgr: player-missile.png quicksprite.py player-missile.png @@ -41,8 +31,8 @@ titles.dsk: cpbg.xex player-missile.hgr partycrasher-software.hgr kansasfest-hac #atrcopy titles.dsk boot -d kansasfest-hackfest.hgr@2000 player-missile.hgr@4000 partycrasher-software.hgr@2000 -b cpbg.xex --brun 6000 -f atrcopy titles.dsk boot -d title.hgr@2000 -b cpbg.xex --brun 6000 -f -working-sprite-driver.s: $(BWSPRITE) fatfont128.dat - quicksprite.py -a mac65 -p 6502 -s hgrbw -m -k -d -g -f fatfont128.dat -o working $(BWSPRITE) +working-sprite-driver.s: $(SPRITES) fatfont128.dat + quicksprite.py -a mac65 -p 6502 -s hgrbw -m -k -d -g -f fatfont128.dat -o working $(SPRITES) working.xex: working.s rand.s maze.s working-sprite-driver.s vars.s debug.s actors.s background.s screen.s logic.s rm -f working.xex diff --git a/actors.s b/actors.s index e0ea870..c633349 100644 --- a/actors.s +++ b/actors.s @@ -38,16 +38,40 @@ actor_init_func_h .byte >init_player, >init_orbiter, >init_amidar source_actor_active .byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 , $ff ; 1 = active, 0 = skip source_actor_l - .byte APPLE_SPRITE9X11, >APPLE_SPRITE9X11, >APPLE_SPRITE9X11, >APPLE_SPRITE9X11 - .byte >APPLE_SPRITE9X11, >APPLE_SPRITE9X11, >APPLE_SPRITE9X11, >APPLE_SPRITE9X11 - .byte >APPLE_SPRITE9X11, >APPLE_SPRITE9X11, >APPLE_SPRITE9X11, >APPLE_SPRITE9X11 - .byte >APPLE_SPRITE9X11, >APPLE_SPRITE9X11, >APPLE_SPRITE9X11, >APPLE_SPRITE9X11 + .byte >APPLE_SPRITE9X11 + .byte >APPLE_SPRITE9X11 + .byte >APPLE_SPRITE9X11 + .byte >APPLE_SPRITE9X11 + .byte >ATARI_SPRITE9X11 + .byte >ATARI_SPRITE9X11 + .byte >ATARI_SPRITE9X11 + .byte >ATARI_SPRITE9X11 + .byte >ATARI_SPRITE9X11 + .byte >ATARI_SPRITE9X11 + .byte >ATARI_SPRITE9X11 + .byte >ATARI_SPRITE9X11 + .byte >ATARI_SPRITE9X11 + .byte >ATARI_SPRITE9X11 + .byte >ATARI_SPRITE9X11 + .byte >ATARI_SPRITE9X11 source_actor_x .byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 , $ff diff --git a/atari-sprite9x11.png b/atari-sprite9x11.png new file mode 100644 index 0000000..1f354a0 Binary files /dev/null and b/atari-sprite9x11.png differ