diff --git a/028.bs/Makefile b/028.bs/Makefile index 4ea123e..f914b26 100644 --- a/028.bs/Makefile +++ b/028.bs/Makefile @@ -22,7 +22,6 @@ IMAGES=foreground.png \ panel.png \ pickups.png \ mpanel.png \ - mpanelOrig.png \ sprite_pig-0.png \ sprite_pig-1.png \ sprite_pig-2.png \ @@ -127,10 +126,6 @@ out/countdown.bin: assets/countdown.png out/mpanel.bin: assets/mpanel.png $(IMAGECON) --input $< $(IMAGECON_ARGS) --colors 16 --output-bitplanes --output-palette --full-color-palette-file --output-palette-asm --output-palette --output-png --output-copperlist --output-grey-palette --output out/mpanel --use-palette=assets/mpanel.pal -out/mpanelOrig.bin: out/mpanelOrig.png - $(IMAGECON) --input $< $(IMAGECON_ARGS) --colors 16 --output-bitplanes --output-palette --full-color-palette-file --output-palette-asm --output-palette --output-png --output-copperlist --output-grey-palette --output out/mpanelOrig --use-palette=assets/mpanel.pal - - out/sprite_pig-%.bin: out/sprite_pig-%.png $(IMAGECON) --input $< $(IMAGECON_ARGS) --colors 4 --output-bitplanes --output-palette --full-color-palette-file --output-palette-asm --output-palette --output-png --output-copperlist --output out/sprite_pig-$* --palette-offset 16 --use-palette=assets/pig.pal @@ -301,6 +296,8 @@ bin/BlockySkies: $(ALL_OBJS) vlink -hunkattr DATA=2 -hunkattr CODE=2 -hunkattr .text=2 -hunkattr .code=2 -hunkattr .data=2 -hunkattr .noload=2 -hunkattr .bss=2 $(ALL_OBJS) -o $@ cp $@ ~/A1200 cp $@ ~/A4000 + cp assets/BlockySkies.info ~/A1200 + cp assets/BlockySkies.info ~/A4000 ls -lh bin/BlockySkies -mkdir BlockySkies cp assets/BlockySkiesDrawer.info BlockySkies.info diff --git a/028.bs/bees.i b/028.bs/bees.i index 8f688e2..508f246 100644 --- a/028.bs/bees.i +++ b/028.bs/bees.i @@ -113,6 +113,7 @@ DetectDownBeeCollisions: ble .skip bsr DeleteItemSprite + add.l #3*4,a7 ; dirty hack - unwind the call stack jmp BigBang .skip: rts @@ -159,6 +160,7 @@ DetectUpBeeCollisions: ble .skip bsr DeleteItemSprite + add.l #3*4,a7 ; dirty hack - unwind the call stack jmp BigBang .skip: rts diff --git a/028.bs/bob.i b/028.bs/bob.i index 8809aa5..2a152d6 100644 --- a/028.bs/bob.i +++ b/028.bs/bob.i @@ -1,21 +1,4 @@ -BOB_X equ 4 -BOB_Y equ 8 -BOB_DX equ 12 -BOB_SOURCE_ADDRESS equ 16 -BOB_MASK_ADDRESS equ 20 -BOB_SAVE_BUFFER_ADDRESS equ 24 -BOB_LAST_DEST_ADDRESS equ 32 -BOB_BLIT_SIZE equ 40 -BOB_BLIT_HEIGHT equ 32 -BOB_BLIT_WIDTH_WORDS equ 3 -BOB_BLIT_WIDTH_BYTES equ BOB_BLIT_WIDTH_WORDS*2 -BOB_MODULO equ BACKGROUND_TILEMAP_WIDTH_BYTES-BOB_BLIT_WIDTH_BYTES -BOB_SHIFT_CONVERT equ 4 -BOB_SAVE_SIZE equ BOB_BLIT_WIDTH_BYTES*SCREEN_BIT_DEPTH*BOB_BLIT_HEIGHT -BOB_IDLE_X equ (-31<