Merge pull request #38 from jsmolina/feature/vidas

WIP add nampac sprite for showing lives
jsmolina · Jun 18, 2019 · e0aff83 · e0aff83
2 parents 767d0fc + 900013d
commit e0aff83
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 15 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Makefile b/Makefile
@@ -18,6 +18,7 @@ compile:
 	png2udg ./build/union_left.png -a > ./build/union_left.asm
 	png2udg ./build/door.png -a > ./build/door.asm
 	png2udg ./build/ghostpill.png -a > ./build/ghostpill.asm
+	png2udg ./build/vidas.png -a > ./build/vidas.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

diff --git a/build/1UP.png b/build/1UP.png
diff --git a/build/Hiscore.png b/build/Hiscore.png
diff --git a/build/binaries.lst b/build/binaries.lst
@@ -21,3 +21,4 @@ union_left
 union_right
 door
 letterboxes
+vidas
diff --git a/build/vidas.asm b/build/vidas.asm
@@ -0,0 +1,4 @@
+SECTION rodata_user
+PUBLIC _vidas
+._vidas
+defb @00011100, @00111110, @01111000, @01110000, @01111000, @00111110, @00011100, @00000000
diff --git a/build/vidas.png b/build/vidas.png
diff --git a/game_zx.c b/game_zx.c
@@ -16,12 +16,12 @@ void print_points() {
 
     if(col != 0) {
         for(idx = 0; idx != 5; ++idx) {
-            sp1_PrintAtInv(0, 26 + idx, INK_CYAN | PAPER_BLACK, '0');
+            sp1_PrintAtInv(0, 25 + idx, INK_CYAN | PAPER_BLACK, '0');
         }
     }
     idx = 0;
     while(chars[idx] != '\0') {
-        sp1_PrintAtInv(0, 26 + idx + col, INK_CYAN | PAPER_BLACK, chars[idx]);
+        sp1_PrintAtInv(0, 25 + idx + col, INK_CYAN | PAPER_BLACK, chars[idx]);
         ++idx;
     }
 

diff --git a/globals.h b/globals.h
@@ -198,5 +198,7 @@ extern uint8_t letterboxes7[];
 extern uint8_t letterboxes8[];
 extern uint8_t letterboxes9[];
 
+extern uint8_t vidas[];
+
 #endif
 
diff --git a/logic.c b/logic.c
@@ -55,18 +55,14 @@ void reset_map() {
 
   }
 
-  sp1_PrintAtInv(0, 19, INK_RED | PAPER_BLACK, 'P');
-  sp1_PrintAtInv(0, 20, INK_RED | PAPER_BLACK, 'O');
-  sp1_PrintAtInv(0, 21, INK_RED | PAPER_BLACK, 'I');
-  sp1_PrintAtInv(0, 22, INK_RED | PAPER_BLACK, 'N');
-  sp1_PrintAtInv(0, 23, INK_RED | PAPER_BLACK, 'T');
-  sp1_PrintAtInv(0, 24, INK_RED | PAPER_BLACK, 'S');
-
-  sp1_PrintAt(0, 2, INK_RED | PAPER_BLACK, 'L');
-  sp1_PrintAt(0, 3, INK_RED | PAPER_BLACK, 'I');
-  sp1_PrintAt(0, 4, INK_RED | PAPER_BLACK, 'V');
-  sp1_PrintAt(0, 5, INK_RED | PAPER_BLACK, 'E');
-  sp1_PrintAt(0, 6, INK_RED | PAPER_BLACK, 'S');
+  sp1_PrintAtInv(0, 22, INK_WHITE | PAPER_BLACK, 'H');
+  sp1_PrintAtInv(0, 23, INK_WHITE | PAPER_BLACK, 'I');
+  sp1_PrintAtInv(0, 24, INK_WHITE | PAPER_BLACK, '-');
+
+  sp1_PrintAt(0, 2, INK_WHITE | PAPER_BLACK, '1');
+  sp1_PrintAt(0, 3, INK_WHITE | PAPER_BLACK, 'U');
+  sp1_PrintAt(0, 4, INK_WHITE | PAPER_BLACK, 'P');
+  sp1_PrintAt(0, 5, INK_WHITE | PAPER_BLACK, '-');
   // as points are restored...
   remaining_points = 238;
 
@@ -542,3 +538,13 @@ void check_fsm() {
         show_cherry();
     }
 }
+
+void paint_lives() {
+    for(idx = 0; idx != 6; ++idx) {
+        if(idx < lives) {
+            sp1_PrintAtInv(0, 6 + idx, INK_YELLOW | PAPER_BLACK | BRIGHT, 'z');
+        } else {
+            sp1_PrintAtInv(0, 6 + idx, INK_BLUE | PAPER_BLACK, 'a');
+        }
+    }
+}
diff --git a/logic.h b/logic.h
@@ -22,4 +22,5 @@ extern void reset_map();
 extern void set_ghosts_offsets();
 extern void show_billboard(uint8_t offset);
 extern void hide_billboard();
+extern void paint_lives() ;
 #endif
diff --git a/msnampac.c b/msnampac.c
@@ -104,6 +104,7 @@ int main()
   sp1_TileEntry('w', union_left);
   sp1_TileEntry('x', union_right);
   sp1_TileEntry('y', door);
+  sp1_TileEntry('z', vidas);
 
   pacman.sp = add_sprite();
   pacman.alt = add_dead_prota_sprite();
@@ -144,7 +145,7 @@ int main()
      }
 
      if(repaint_lives) {
-        sp1_PrintAtInv(0, 8, INK_CYAN | PAPER_BLACK, 48 + lives);
+        paint_lives();
         repaint_lives = 0;
      }
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,3 +21,4 @@ union_left @@
     union_right
     door
     letterboxes
+    vidas