Merge pull request #14 from jsmolina/feature/ghost_status_independent

Feature/ghost status independent

Makefile

@@ -13,11 +13,11 @@ compile:
 	png2udg ./build/topvertiright.png -a > ./build/topvertiright.asm
 	png2udg ./build/ghostpill.png -a > ./build/ghostpill.asm
 	png2sp1sprite ./build/prota_sprites.png -b -i sprite_protar -f 16 -s rodata_user > ./build/prota.asm
+	png2sp1sprite ./build/prota_dead.png -b -i sprite_protar_dead -f 16 -s rodata_user > ./build/prota_dead.asm
 	png2sp1sprite ./build/red_ghost.png -b -i red_ghost -f 16 -s rodata_user > ./build/red_ghost.asm
 	ls *.bin
 
-	zcc +zx -v -startup=31 -DWFRAMES=3 -clib=sdcc_iy -Cz--screen=screen.scr -SO3 --max-allocs-per-node10000 @zproject.lst -pragma-include:zpragma.inc -o msnampac -create-app
-	#zcc +zx -v -m -startup=31 -clib=sdcc_iy -SO3 --max-allocs-per-node10000 @zproject.lst -pragma-include:zpragma.inc -o alley
+	zcc +zx -v -startup=31 -DWFRAMES=3 -clib=sdcc_iy -Cz--screen=intro.scr -SO3 --max-allocs-per-node10000 @zproject.lst -pragma-include:zpragma.inc -o msnampac -create-app	#zcc +zx -v -m -startup=31 -clib=sdcc_iy -SO3 --max-allocs-per-node10000 @zproject.lst -pragma-include:zpragma.inc -o alley
 	#appmake +zx -b screen.scr --org 16384 --noloader --blockname screen -o screen.tap
 	#appmake +zx -b alley_CODE.bin --org 24500 --noloader --blockname code -o code.tap
 	#appmake +zx -b alley_BANK_6.bin --org 49152 --noloader --blockname bank6 -o bank6.tap

build/binaries.lst

@@ -1,4 +1,5 @@
 prota
+prota_dead
 horizontal
 vertical
 corner_left

build/prota_dead.asm

@@ -0,0 +1,296 @@
+SECTION rodata_user
+
+; Original: 64, 24 (=8 x 3 chars)
+; Blocks: 2
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
+PUBLIC _sprite_protar_dead1
+._sprite_protar_dead1
+
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000110
+ defb @00111111
+ defb @01111111
+ defb @01111111
+ defb @11111111
+ defb @11110000
+ defb @11110000
+ defb @11100000
+ defb @11000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
+._sprite_protar_dead1_f2
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000001
+ defb @00000001
+ defb @00000001
+ defb @00000001
+ defb @00000011
+ defb @00000011
+ defb @00000011
+ defb @00000011
+ defb @00000011
+ defb @00001111
+ defb @00000010
+ defb @00000010
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
+._sprite_protar_dead1_f3
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000001
+ defb @00000001
+ defb @00000001
+ defb @00000001
+ defb @00000001
+ defb @00000001
+ defb @00000001
+ defb @00000001
+ defb @00000001
+ defb @00000001
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
+._sprite_protar_dead1_f4
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00001000
+ defb @00000101
+ defb @00000101
+ defb @01100000
+ defb @00010000
+ defb @00000000
+ defb @11100000
+ defb @00000000
+ defb @00010000
+ defb @00100101
+ defb @01000101
+ defb @00001000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
+PUBLIC _sprite_protar_dead2
+._sprite_protar_dead2
+
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @11000000
+ defb @11100000
+ defb @11100000
+ defb @11110000
+ defb @11110000
+ defb @11110000
+ defb @01110000
+ defb @00111000
+ defb @00001000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
+._sprite_protar_dead2_f2
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @11000000
+ defb @11000000
+ defb @11000000
+ defb @11000000
+ defb @11100000
+ defb @11100000
+ defb @11100000
+ defb @11100000
+ defb @11100000
+ defb @11111000
+ defb @00100000
+ defb @00100000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
+._sprite_protar_dead2_f3
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @10000000
+ defb @10000000
+ defb @10000000
+ defb @10000000
+ defb @10000000
+ defb @10000000
+ defb @10000000
+ defb @10000000
+ defb @10000000
+ defb @10000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
+._sprite_protar_dead2_f4
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @11000000
+ defb @00010000
+ defb @00010000
+ defb @00100000
+ defb @00000000
+ defb @00011000
+ defb @00000000
+ defb @00100000
+ defb @00010000
+ defb @00000000
+ defb @00000000
+ defb @11000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+

globals.h

@@ -33,6 +33,7 @@
 #define DIR_LEFT 3
 #define DIR_RIGHT 4
 #define NONE 250
+#define ELUDE 25
 #define JAILED 20
 #define JAILED_EXITING 1
 #define ACTIVE 0
@@ -46,6 +47,7 @@ extern struct sp1_Rect full_screen;
 // globals are supposed to generate less code and with 128k of memory it's important
 struct sprite {
     struct sp1_ss* sp;
+    struct sp1_ss* alt;
     uint8_t x;
     uint8_t y;
     uint8_t offset;
@@ -61,6 +63,10 @@ struct sprite {
 // it comes from built binaries:
 extern uint8_t sprite_protar1[];
 extern uint8_t sprite_protar2[];
+
+extern uint8_t sprite_protar_dead1[];
+extern uint8_t sprite_protar_dead2[];
+
 // red ghost
 extern uint8_t red_ghost1[];
 extern uint8_t red_ghost2[];