From 3a3905863218639428e37d9cad679a3ee3057a69 Mon Sep 17 00:00:00 2001
From: jordism <jordism@tid.es>
Date: Sun, 12 May 2019 23:13:44 +0200
Subject: [PATCH 1/6] pass level

---
 .DS_Store          | Bin 8196 -> 8196 bytes
 Makefile           |   1 +
 build/binaries.lst |   1 +
 build/cerezas.asm  |  86 +++++++++++++++++++++++++++++++++++++++++++++
 build/cerezas.png  | Bin 0 -> 267 bytes
 globals.c          |   2 ++
 globals.h          |  14 ++++++++
 int.h              |   2 +-
 logic.c            |  36 +++++++++++++++++--
 logic.h            |   2 ++
 msnampac.c         |  15 +++++---
 sprites.c          |  33 ++++++++---------
 sprites.h          |   1 +
 13 files changed, 166 insertions(+), 27 deletions(-)
 create mode 100644 build/cerezas.asm
 create mode 100644 build/cerezas.png

diff --git a/.DS_Store b/.DS_Store
index 4c33a03fb20063eccea3e1951e245e2aec11dae2..c6b7aebbca4dd82e09f7b71d39b4b3a0157a5056 100644
GIT binary patch
delta 1122
zcmeH^OGs2v7{|Z=__{ZbdeoUwM{N}IN$NOSYGjTw&8QiYDK3g~hPlDu&DT{6duSwt
zl#94jk}eX8C<_ct3tAOzD(K;~$adkj7ex?lI(n^@Zd!LY_uTIXm+$<3Bd!tG%nZji
z{T^@IeBIxz2DLtiV+p3P@QBDLN!}FAVr<?zZ$>@Sd(0NSGQKB|_iIYCqWb!R1B%<%
zr)V7VbZk;uW_CewS!GpiD2~S`Ff-E^<Lkln^aMu}%eCdp+$XhY!9m5~TUn9JHMylD
z*cn)z*h*Nb!~=4x>hmkAG1|^5B)&&(8&G<+U{|Lx6n~yfs2-xVC(D&*oU&XF;~<kn
z>Et9gHBvkE(g_-)ahjqznx_SNLN6#pOSDX%=?i_M@AMNUL?Z^Vh(j_`kcu?q!--Oq
z!G(G>pb>k~i~~4`LpY28j-u0vZuH<7hH(aGF@g)Ygv+>sYq*8mxP!ZRgr|6kS9py#
zc#ma#)IC;v#V4_21o^3-f}~PF)dsr#YL}nLG`hZiyT|L{b$|8euBZQ9?27Y5v&EW}
zk)2=YEZ<q9PncVU{jcU7L(w^Q#_vmVC^^NJT99M6bCV>keiRi85+=eJth9{Td4y<S
z(27dNc({mU(5hX6Mv5E;txXq{WLe5u3qc!{7}_w!Gg_n%BEv5bB1M8kp+6J3C`37`
zQ3E%2!-FR5!+x}&Rmg9L4}Ns41V9&#V-P2C3a4=nqc|@bjEM&0xQYo(;s$Q6wkVm#
y9Okir2Y86bc#e><unB96H~hJP@y6TPBi1Qg9JbCzCI1N5qbytgEBr@=iN66e{^rmC

delta 1138
zcmeIv%S%*o6bJD0^?9$qwBL-Ak1-oVbVd`MNfR~HL5+NoW|~l>jCmJBlTO`f!lEY1
zMPvqX%?LAT6O~1V*>hKIqUbp-bP<G$Hc^oDpiTX}*LEiT0sS`Tch48@J@<V2-Tm%~
z363J|CU1A$=<@r#YQX87K}2L!bWE%y$1xUf-B??fRNv6a`94)?QGA|&H>lKj0*b1w
zH|@zW2ffPvCV#-&+oNt(_Nt=F@_0h>%GFu91x2OhRpI5_WM&qog-vx}+A6cNiP^0=
zGWSTWs`r3m<asP#=BnJf%iGhfcdRZ}DDiH&&FAS-d`7F7l}NlnZVwvYF`DAdqvpzx
zTlLfY$#gsPN|{EP?>LPs2T7DpPO74M>L5S$(Ett87~P^Nx=j!1DZQa-nx#+lnZD2*
z{QwY$Wr#-tl92){(%^s#Yf*?w)S?azXvAi0!}bpBKnHfhhu!FfA3=n01V?cU0~o>?
z3}XzJaRuYJh6i|z=Ximac!e3v;v>Eq14dwB=Egs>8x`NR>xrqZp~Zo0I#BjsfE<eg
zO()E&BwAJ^C1+&i<`<TfS81m$ZNle+r7V<fw=oVrCCTBGRBPHAyUoTUBuRfLaEdHa
z;2BxbI%eb1!pTTW%NXNP0@6q;Dn%M2$c(f)U8E$-Qs$Ccp@qL+3hN2IruPEsC;dXS
zKr#!U3}hn@#i)QA)u_P+Y(g_yum!C`rxPA@=|VlaP#+HB5Dp8c<2Zqn7{n=@#W{>1
y{X9l-NpM}&xu$RjcX1E*@d(fGRvS#T;oW3&(nU<hrhJRi<}CUDH}+2(yMW(@%=kY5

diff --git a/Makefile b/Makefile
index 6604afa..008901f 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ compile:
 	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
+	png2sp1sprite ./build/cerezas.png -b -i cerezas -f 16 -s rodata_user > ./build/cerezas.asm
 	ls *.bin
 
 	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
diff --git a/build/binaries.lst b/build/binaries.lst
index 861998b..2325fba 100644
--- a/build/binaries.lst
+++ b/build/binaries.lst
@@ -13,3 +13,4 @@ topvertiright
 topvertileft
 ghostpill
 red_ghost
+cerezas
diff --git a/build/cerezas.asm b/build/cerezas.asm
new file mode 100644
index 0000000..cc9677d
--- /dev/null
+++ b/build/cerezas.asm
@@ -0,0 +1,86 @@
+SECTION rodata_user
+
+; Original: 16, 24 (=2 x 3 chars)
+; Blocks: 2
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
+PUBLIC _cerezas1
+._cerezas1
+
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000001
+ defb @00000010
+ defb @00000100
+ defb @00001000
+ defb @00111100
+ defb @00111100
+ defb @11111111
+ defb @11111111
+ defb @11111101
+ defb @11111101
+ defb @00111100
+ 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
+
+PUBLIC _cerezas2
+._cerezas2
+
+ defb @00000000
+ defb @00000000
+ defb @00001110
+ defb @00111110
+ defb @00111110
+ defb @11010000
+ defb @00010000
+ defb @00100000
+ defb @00100000
+ defb @00100000
+ defb @11110000
+ defb @11111100
+ defb @11111100
+ defb @11111100
+ defb @11111100
+ defb @11110000
+ defb @11110000
+ 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
+
diff --git a/build/cerezas.png b/build/cerezas.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ab7cce2040e8ef7a6a719bf74b5ac9e3a21179d
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm!3HEhFR0}KQfx`y?k)^}fRN!tWY2V<2xoyu
zWHAGSo-znCRxGtI0}8U2c>21sKW60-(d0_(>yrfvNtU=qlsM<-=BDPAFgO>bCYGe8
zD3oWGWGJ|M`UZqI@`(c#6??ikhFF|_8{#Q+K!HQq@Bja&UxK3D6IossX}TY4X>sk~
zP!)8Yw9%FEiK;}y`~|H0(icwm4r2JhvE_Ikx6}<Koz+v>nI<hyU;WrSc!pr}#3J1f
z8)n{XHd_7RhvC9`#rL~b9XQ25TVm$kRS!1vKULq+n84oaWv-IBOCc6$J%gvKpUXO@
GgeCy?R#}q(

literal 0
HcmV?d00001

diff --git a/globals.c b/globals.c
index d3023c7..10582aa 100644
--- a/globals.c
+++ b/globals.c
@@ -46,6 +46,7 @@ struct sprite ghost_red;
 struct sprite ghost_cyan;
 struct sprite ghost_magenta;
 struct sprite ghost_yellow;
+struct bonus cherry;
 
 struct sprite * ghosts[4] = {&ghost_red, &ghost_cyan, &ghost_magenta, &ghost_yellow};
 
@@ -58,6 +59,7 @@ uint8_t row;
 uint8_t col;
 uint8_t current;
 uint16_t points = 0;
+uint8_t remaining_points;
 
 uint8_t frame = 0;
 
diff --git a/globals.h b/globals.h
index 2f5f41b..faf7b75 100644
--- a/globals.h
+++ b/globals.h
@@ -60,6 +60,14 @@ struct sprite {
     void *default_color;
 };
 
+struct bonus {
+    struct sp1_ss* sp;
+    uint8_t x;
+    uint8_t y;
+    uint8_t offset;
+    uint8_t showing;
+};
+
 // it comes from built binaries:
 extern uint8_t sprite_protar1[];
 extern uint8_t sprite_protar2[];
@@ -67,6 +75,10 @@ extern uint8_t sprite_protar2[];
 extern uint8_t sprite_protar_dead1[];
 extern uint8_t sprite_protar_dead2[];
 
+// extra
+extern uint8_t cerezas1[];
+extern uint8_t cerezas2[];
+
 // red ghost
 extern uint8_t red_ghost1[];
 extern uint8_t red_ghost2[];
@@ -97,6 +109,7 @@ extern struct sprite ghost_cyan;
 extern struct sprite ghost_magenta;
 extern struct sprite ghost_yellow;
 extern struct sprite * ghosts[4];
+extern struct bonus cherry;
 
 extern JOYFUNC joy;
 extern udk_t joy_keys;
@@ -106,6 +119,7 @@ extern uint8_t row;
 extern uint8_t col;
 extern uint8_t current;
 extern uint16_t points;
+extern uint8_t remaining_points;
 
 extern uint8_t frame;
 
diff --git a/int.h b/int.h
index f518460..2ea1f41 100644
--- a/int.h
+++ b/int.h
@@ -14,7 +14,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL
 
 #ifndef WFRAMES
 // WFRAMES 3, are 50/3 -> 25 FPS.
-#define WFRAMES  3
+#define WFRAMES  2
 #endif
 
 #define clock(x) (tick)
diff --git a/logic.c b/logic.c
index 81ce399..2517c09 100644
--- a/logic.c
+++ b/logic.c
@@ -2,6 +2,19 @@
 #include "int.h"
 
 
+void show_cherry() {
+    cherry.y = 21;
+    cherry.x = 14;
+    cherry.showing = 100;
+}
+
+void hide_cherry() {
+    cherry.y = 21;
+    cherry.x = 32;
+    cherry.showing = 0;
+}
+
+
 void check_keys()
 {
     // checks keys
@@ -262,9 +275,10 @@ void check_fsm() {
 
         if(current == 9) {
             pick += 1;
-            points += 10; // ten points each
+            points += 5; // 5 points each dot
+            --remaining_points;
         } else if(current == 11) {
-            points += 50;  // energizers - are worth 50 points each
+            points += 20;  // energizers - are worth 20 points each
             pill_eaten = 125;
             for(idx = 0; idx != 4; ++idx) {
                 if(ghosts[idx]->active == ACTIVE) {
@@ -339,4 +353,22 @@ void check_fsm() {
         sp1_IterateSprChar(ghost_magenta.sp, initialiseColourGhostMagenta);
         sp1_IterateSprChar(ghost_yellow.sp, initialiseColourYellow);
     }
+
+    if(cherry.showing > 0) {
+        if(pacman.x == cherry.x && pacman.y == cherry.y) {
+            hide_cherry();
+            points += 10;
+        }
+        --cherry.showing;
+        if(cherry.showing == 0) {
+            hide_cherry();
+        }
+    } else if(random_value == 100) {
+        show_cherry();
+    }
+
+    if(remaining_points == 0) {
+        // level finished!
+        zx_border(INK_CYAN);
+    }
 }
diff --git a/logic.h b/logic.h
index 35fb87d..157eff4 100644
--- a/logic.h
+++ b/logic.h
@@ -14,5 +14,7 @@
 extern void check_fsm();
 extern uint8_t allow_next(uint8_t next);
 extern void set_eaten(struct sprite * for_who);
+extern void hide_cherry();
+extern void show_cherry();
 
 #endif
diff --git a/msnampac.c b/msnampac.c
index e4f4774..594eb88 100644
--- a/msnampac.c
+++ b/msnampac.c
@@ -23,6 +23,7 @@ void all_lives_lost() {
   pacman.y = 21;
   pacman.x = 14;
   repaint_lives = 1;
+  remaining_points = 242;
 
   ghost_red.offset = GHOST_RED;
   ghost_red.currentoffset = GHOST_RED;
@@ -129,10 +130,12 @@ int main()
   pacman.offset = 1;
   pacman.currentoffset = 1;
 
-  ghost_red.sp = add_ghost_red_sprite();
-  ghost_cyan.sp = add_ghost_cyan_sprite();
-  ghost_magenta.sp = add_ghost_magenta_sprite();
-  ghost_yellow.sp = add_ghost_yellow_sprite();
+  ghost_red.sp = add_ghost_sprite();
+  ghost_cyan.sp = add_ghost_sprite();
+  ghost_magenta.sp = add_ghost_sprite();
+  ghost_yellow.sp = add_ghost_sprite();
+  cherry.sp = add_cherry_sprite();
+  hide_cherry();
 
   // painting an UDG is just assigning it to any char
   // row, col, char
@@ -152,7 +155,9 @@ int main()
      for(idx = 0; idx != 4; ++idx) {
           sp1_MoveSprAbs(ghosts[idx]->sp, &full_screen, (void*) ghosts[idx]->offset, ghosts[idx]->y, ghosts[idx]->x, 0, 0);
      }
-
+     if(cherry.showing != 0) {
+         sp1_MoveSprAbs(cherry.sp, &full_screen, (void*) 0, cherry.y, cherry.x, 0, 0);
+     }
 
      if(repaint_lives) {
         sp1_PrintAtInv(0, 8, INK_CYAN | PAPER_BLACK, 48 + lives);
diff --git a/sprites.c b/sprites.c
index 07dcb9d..1c5868b 100644
--- a/sprites.c
+++ b/sprites.c
@@ -89,29 +89,24 @@ struct sp1_ss * add_ghost_sprite() {
   return sp;
 }
 
-struct sp1_ss * add_ghost_red_sprite() {
-  struct sp1_ss * sp = add_ghost_sprite();
-
-
-  return sp;
-}
-
-struct sp1_ss * add_ghost_cyan_sprite() {
-  struct sp1_ss * sp = add_ghost_sprite();
-
-
-  return sp;
+void initialiseColourGreenRed(unsigned int count, struct sp1_cs *c)
+{
+  c->attr_mask = SP1_AMASK_INK;
+  if(count < 2) {
+     c->attr      = INK_GREEN;
+  } else {
+     c->attr      = INK_RED;
+  }
 }
 
-struct sp1_ss * add_ghost_magenta_sprite() {
-  struct sp1_ss * sp = add_ghost_sprite();
-
+struct sp1_ss * add_cherry_sprite() {
+  struct sp1_ss * sp;
+  sp = sp1_CreateSpr(SP1_DRAW_LOAD1LB, SP1_TYPE_1BYTE, 3, (int)cerezas1, 1);
+  sp1_AddColSpr(sp, SP1_DRAW_LOAD1,    SP1_TYPE_1BYTE, (int)cerezas2, 1);
 
-  return sp;
-}
+  sp1_AddColSpr(sp, SP1_DRAW_LOAD1RB,  SP1_TYPE_1BYTE, 0, 0);
 
-struct sp1_ss * add_ghost_yellow_sprite() {
-  struct sp1_ss * sp = add_ghost_sprite();
+  sp1_IterateSprChar(sp, initialiseColourGreenRed);
 
 
   return sp;
diff --git a/sprites.h b/sprites.h
index a136c87..d54a3a4 100644
--- a/sprites.h
+++ b/sprites.h
@@ -15,6 +15,7 @@ extern struct sp1_ss * add_ghost_red_sprite();
 extern struct sp1_ss * add_ghost_cyan_sprite();
 extern struct sp1_ss * add_ghost_magenta_sprite();
 extern struct sp1_ss * add_ghost_yellow_sprite();
+extern struct sp1_ss * add_cherry_sprite();
 
 extern void initialiseColourBlue(unsigned int count, struct sp1_cs *c);
 extern void initialiseColourWhite(unsigned int count, struct sp1_cs *c);

From e2a972fa542093ae339ef9dbc20b85f2c48beec7 Mon Sep 17 00:00:00 2001
From: jordism <jordism@tid.es>
Date: Sun, 12 May 2019 23:14:32 +0200
Subject: [PATCH 2/6] pass level

---
 logic.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/logic.c b/logic.c
index 2517c09..3fbc2ed 100644
--- a/logic.c
+++ b/logic.c
@@ -365,6 +365,8 @@ void check_fsm() {
         }
     } else if(random_value == 100) {
         show_cherry();
+        zx_border(INK_RED);
+        zx_border(INK_BLACK);
     }
 
     if(remaining_points == 0) {

From 13fd7e6f2f83cc39d3046d8ff8482ab99a13db1b Mon Sep 17 00:00:00 2001
From: jordism <jordism@tid.es>
Date: Mon, 20 May 2019 23:18:34 +0200
Subject: [PATCH 3/6] slower nampac

---
 globals.c  |  1 +
 globals.h  |  2 +-
 int.c      |  5 ++++-
 logic.c    | 46 ++++++++++++++++++++++++++++++++--------------
 logic.h    |  3 ++-
 msnampac.c | 15 ++++-----------
 6 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/globals.c b/globals.c
index 10582aa..147a7c0 100644
--- a/globals.c
+++ b/globals.c
@@ -65,5 +65,6 @@ uint8_t frame = 0;
 
 uint8_t lives = 0;
 uint8_t repaint_lives = 1;
+uint8_t speed = 5;
 uint8_t idx;
 struct sprite * collided_sprite;
diff --git a/globals.h b/globals.h
index faf7b75..2e516ad 100644
--- a/globals.h
+++ b/globals.h
@@ -120,7 +120,7 @@ extern uint8_t col;
 extern uint8_t current;
 extern uint16_t points;
 extern uint8_t remaining_points;
-
+extern uint8_t speed;
 extern uint8_t frame;
 
 extern uint8_t lives;
diff --git a/int.c b/int.c
index 177cff7..ef12ee2 100644
--- a/int.c
+++ b/int.c
@@ -1,5 +1,6 @@
 #include <z80.h>
 #include "int.h"
+#include "globals.h"
 #include <stdlib.h>
 #include <intrinsic.h>
 
@@ -12,8 +13,10 @@ unsigned char pick;
 void
 wait(void)
 {
-   while (abs(tick - timer) < WFRAMES)
+   while (abs(tick - timer) < speed) {
       intrinsic_halt();
+      in = (joy)(&joy_keys);
+   }
 
    timer = tick;
 }
diff --git a/logic.c b/logic.c
index 3fbc2ed..cb35cb6 100644
--- a/logic.c
+++ b/logic.c
@@ -1,5 +1,6 @@
 #include "logic.h"
 #include "int.h"
+#include <sound.h>
 
 
 void show_cherry() {
@@ -12,6 +13,7 @@ void hide_cherry() {
     cherry.y = 21;
     cherry.x = 32;
     cherry.showing = 0;
+    sp1_MoveSprAbs(cherry.sp, &full_screen, (void*) 0, cherry.y, cherry.x, 0, 0);
 }
 
 
@@ -37,19 +39,28 @@ void check_keys()
     }
 }
 
+void all_ghosts_go_home() {
+    uint8_t i;
+    for(i = 0; i != 4; ++i) {
+        set_eaten(ghosts[i]);
+        sp1_MoveSprAbs(ghosts[i]->sp, &full_screen, (void*) ghosts[i]->offset, ghosts[i]->default_y, ghosts[i]->default_x, 0, 0);
+    }
+}
+
+void nampac_go_home() {
+    pacman.y = 21;
+    pacman.x = 14;
+    pacman.dx = 0;
+    pacman.dy = 0;
+}
+
 
 void loose_a_live() {
     uint8_t i, j;
+    hide_cherry();
     repaint_lives = 1;
     --lives;
-    set_eaten(&ghost_magenta);
-    set_eaten(&ghost_red);
-    set_eaten(&ghost_cyan);
-    set_eaten(&ghost_yellow);
-
-    for(i = 0; i != 4; ++i) {
-        sp1_MoveSprAbs(ghosts[i]->sp, &full_screen, (void*) ghosts[i]->offset, ghosts[i]->default_y, ghosts[i]->default_x, 0, 0);
-    }
+    all_ghosts_go_home();
 
     // prota dead animation, first hide the sprite from the screen
     sp1_MoveSprAbs(pacman.sp, &full_screen, (void*) pacman.offset, pacman.y, 32, 0, 0);
@@ -65,10 +76,7 @@ void loose_a_live() {
     sp1_MoveSprAbs(pacman.alt, &full_screen, (void*) col, pacman.y, 32, 0, 0);
     sp1_UpdateNow();
 
-    pacman.y = 21;
-    pacman.x = 14;
-    pacman.dx = 0;
-    pacman.dy = 0;
+    nampac_go_home();
 }
 
 uint8_t allow_next(uint8_t next) {
@@ -250,10 +258,19 @@ void move_ghosts() {
             // "a su bola"
             move_one_ghost(125, 255, 125, 255);
     }
+}
 
 
+void next_level() {
+    zx_border(INK_BLUE);
+    bit_beepfx_di_fastcall(BEEPFX_SCORE);
+    zx_border(INK_BLACK);
+    remaining_points = 238;
+    nampac_go_home();
+    all_ghosts_go_home();
 }
 
+
 void check_fsm() {
     random_value = rand();
     row = pacman.y + 1;
@@ -363,7 +380,7 @@ void check_fsm() {
         if(cherry.showing == 0) {
             hide_cherry();
         }
-    } else if(random_value == 100) {
+    } else if(random_value == 200) {
         show_cherry();
         zx_border(INK_RED);
         zx_border(INK_BLACK);
@@ -371,6 +388,7 @@ void check_fsm() {
 
     if(remaining_points == 0) {
         // level finished!
-        zx_border(INK_CYAN);
+        next_level();
     }
 }
+
diff --git a/logic.h b/logic.h
index 157eff4..bd409d5 100644
--- a/logic.h
+++ b/logic.h
@@ -16,5 +16,6 @@ extern uint8_t allow_next(uint8_t next);
 extern void set_eaten(struct sprite * for_who);
 extern void hide_cherry();
 extern void show_cherry();
-
+extern void nampac_go_home();
+extern void all_ghosts_go_home();
 #endif
diff --git a/msnampac.c b/msnampac.c
index 594eb88..657e5ee 100644
--- a/msnampac.c
+++ b/msnampac.c
@@ -20,39 +20,33 @@ void all_lives_lost() {
   sp1_Invalidate(&full_screen);
   lives = 5;
   points = 0;
-  pacman.y = 21;
-  pacman.x = 14;
+  nampac_go_home();
   repaint_lives = 1;
-  remaining_points = 242;
+  remaining_points = 238;
 
   ghost_red.offset = GHOST_RED;
   ghost_red.currentoffset = GHOST_RED;
   ghost_red.default_color =  initialiseColourGhostRed;
   ghost_red.default_y = 15;
   ghost_red.default_x = 14;
-  set_eaten(&ghost_red);
 
   ghost_cyan.offset = GHOST_CYAN;
   ghost_cyan.currentoffset = GHOST_CYAN;
   ghost_cyan.default_color =  initialiseColourGhostCyan;
   ghost_cyan.default_y = 15;
   ghost_cyan.default_x = 12;
-  set_eaten(&ghost_cyan);
 
   ghost_magenta.offset = GHOST_MAGENTA;
   ghost_magenta.currentoffset = GHOST_CYAN;
   ghost_magenta.default_color =  initialiseColourGhostMagenta;
   ghost_magenta.default_y = 15;
   ghost_magenta.default_x = 16;
-  set_eaten(&ghost_magenta);
 
   ghost_yellow.offset = GHOST_YELLOW;
   ghost_yellow.currentoffset = GHOST_YELLOW;
   ghost_yellow.default_color =  initialiseColourYellow;
   ghost_yellow.default_y = 15;
   ghost_yellow.default_x = 18;
-  set_eaten(&ghost_yellow);
-
 
   for(row = 0; row != 24; ++row) {
       for(col = 0; col != 32; ++col) {
@@ -80,9 +74,8 @@ void all_lives_lost() {
   sp1_PrintAt(0, 5, INK_RED | PAPER_BLACK, 'E');
   sp1_PrintAt(0, 6, INK_RED | PAPER_BLACK, 'S');
 
-  for(idx = 0; idx != 4; ++idx) {
-      sp1_MoveSprAbs(ghosts[idx]->sp, &full_screen, (void*) ghosts[idx]->offset, ghosts[idx]->y, ghosts[idx]->x, 0, 0);
-  }
+  all_ghosts_go_home();
+
 
   sp1_UpdateNow();
 

From e55d6b2aadf8705cde66219ba1bcb728764cf0b9 Mon Sep 17 00:00:00 2001
From: jordism <jordism@tid.es>
Date: Wed, 22 May 2019 23:21:21 +0200
Subject: [PATCH 4/6] change sprite

---
 .DS_Store               | Bin 8196 -> 8196 bytes
 build/prota.asm         | 554 ++++++++++++++++++++++++++++++----------
 build/prota_sprites.png | Bin 4311 -> 5242 bytes
 globals.c               |   2 +-
 globals.h               |  34 ++-
 logic.c                 |  26 +-
 msnampac.c              |   2 +-
 7 files changed, 460 insertions(+), 158 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index c6b7aebbca4dd82e09f7b71d39b4b3a0157a5056..db0ed80efdcc9169016b6f65a0bf21ceaabe2b8d 100644
GIT binary patch
delta 1043
zcmeH^OGs2<7>2)R)I6ug`qk0YkQo|sq{2qj@Ip3p)6mFL%r0PR$2cV_&8XEPk?cYj
zu#UAVMJl32rHw7kF1u<INu^OxyKq|ywdpitiy(yd{hOEXd-&nweR>1Ef#Ew!E6DY)
z_T=T~S|e(g?|x%@ix~|0{Zlw%V&fLXYx=@P&V-Dz@~s|cMV;By)>>^IH>{Gx=G=Ov
zI)cVdqopBab{d-+LPoG&C3Tuc*Y@_1+147YHI4-B^alJAdExQIOu7Td_D3dfAUnGD
zMngnbh$fkmC4~}@8flg`>5&UED5EkakL0<$miO{Wre#KE<-7bq&`H8Y3aPm9upBRb
ziYTUpGOE}?H8t#}ktPh9IZUXQ4!StX3C?hqbDYQG8rK=%Hp7e%W|U{V<PC3m$0VPb
z<}2T#H#(TRwet7P(PY-To1E_J|9g9GyFKO1`lG$g|J<HFxp;|6OiFg8q%QTWSecVo
zxNd`W$<^1L<#Rg~>Y=7jq@`ypTjg`Rl|$1a!y3QMVpPK%%P(-cRh&AYM`=;9)2U)r
zP>=pBU2oF`s$!0A%(SWKy5^lnnP}bf7<(mC@<nEF5Kn?_D#NyvO%C~#vW0RgsAL<p
z)Uk)X?6Vym#N^N~Pjp5!^>C6?oVI24ahZOuaFs!ZxWP?sanDwk@*v`DjBy_Ggr~e<
ff)CckWH%qfRjEUS<I`qht!dZV|4q%?)BryLx5wqs

delta 1035
zcmeH^OGuPa7>2)R9QFTm)MJj5mvjuvGBWK~(V)v1HeNC!EeeWsCPx^WyfkWI7mb9F
z5{jXcYLQfgU7*mkpjA<e3cA@M+lAXMPz2GYKWA!{En0Ur=Q}(cc)$1QbM?7y4lB(l
zDOr+jl$L~UsV!NTylnx0u%obW5=)ddIwn@rXT{m#(<`egv#V{Pc6&;wAgMWPtAA%}
zOTE9_*Pv8q&{yXRcsl%Dz6wu=FQ^!Kl$1%2L{5%tQFzL66@~|0G|3c0Dx_8#WsmHa
z0U4Ab8I>^^mk07xCS+2k<fD9&&+<jSVIhuq5=bPKG%}b=9tK4e<D!}xYFSSm+t|(y
z8faoSEe370vzJ~DbA&#QbBfcP;R3^4<vKUG$3vd+oEN<0EmOP?xgE~34`#+_@k*!o
zB_K_KU{{+r(CQVj^#8dVr@PXvs(yE4{Jk6fO+undnw@M<am>kHke6?it|$*(w4dmS
z%XQk+ZB3s@O-s*Moa=Ndi>6IKmKK;KN_irzsMzLI(W*%g)3W6@o3g5)9{#y<l}TgN
zx(Hp9X;RU3Ehl0_X3)_yqmRe(O5T|+z9Yn#9+FK5^H@kerL3l$3fAIg0~@Jl6Prx~
zjd<{~>!$@;*+(}AILIN6($6td#DFPckh7fQJeRpLEo9j>Mj2zAJKW_yPnZY?wh#$k
h^J{_d&Fhh7#}Frb9V4-+U#+3Ul==TF{KpEDe*i0()pq~@

diff --git a/build/prota.asm b/build/prota.asm
index 036a586..02a5324 100644
--- a/build/prota.asm
+++ b/build/prota.asm
@@ -1,6 +1,6 @@
 SECTION rodata_user
 
-; Original: 128, 24 (=16 x 3 chars)
+; Original: 192, 24 (=24 x 3 chars)
 ; Blocks: 2
  defb @00000000
  defb @00000000
@@ -16,20 +16,20 @@ PUBLIC _sprite_protar1
  defb @00000000
  defb @00000000
  defb @00000000
- defb @00000000
- defb @00000000
- defb @00001111
+ defb @00011100
+ defb @00011100
+ defb @01110011
+ defb @01101111
+ defb @00011110
+ defb @00011101
  defb @00111111
- defb @01111111
- defb @01111111
- defb @11111111
- defb @11111100
- defb @11111100
- defb @11111111
- defb @01111111
- defb @01111111
  defb @00111111
+ defb @00111111
+ defb @00110111
+ defb @00011111
+ defb @00011111
  defb @00001111
+ defb @00000011
  defb @00000000
  defb @00000000
  defb @00000000
@@ -51,20 +51,20 @@ PUBLIC _sprite_protar1
  defb @00000000
  defb @00000000
  defb @00000000
- defb @00000000
- defb @00000000
+ defb @00001110
+ defb @00001110
+ defb @00111001
+ defb @00110111
+ defb @00001110
+ defb @00001101
+ defb @00011111
+ defb @00011111
+ defb @00011111
+ defb @00011011
  defb @00001111
- defb @00111111
- defb @01111111
- defb @01111110
- defb @01111000
- defb @11111000
- defb @11111000
- defb @01111000
- defb @01111110
- defb @01111111
- defb @00111111
  defb @00001111
+ defb @00000111
+ defb @00000001
  defb @00000000
  defb @00000000
  defb @00000000
@@ -86,20 +86,20 @@ PUBLIC _sprite_protar1
  defb @00000000
  defb @00000000
  defb @00000000
- defb @00000000
- defb @00000000
- defb @11111000
- defb @11111110
- defb @01111111
- defb @00111111
- defb @00001111
+ defb @00001100
+ defb @00001100
+ defb @00111001
+ defb @00110111
  defb @00001111
+ defb @00001110
+ defb @00011101
+ defb @00011111
+ defb @00011111
+ defb @00011011
  defb @00001111
  defb @00001111
- defb @00111111
- defb @01111111
- defb @11111110
- defb @11111000
+ defb @00000111
+ defb @00000001
  defb @00000000
  defb @00000000
  defb @00000000
@@ -123,18 +123,18 @@ PUBLIC _sprite_protar1
  defb @00000000
  defb @00000000
  defb @00000000
- defb @00011110
- defb @01111111
- defb @11111111
- defb @11111111
- defb @00011111
- defb @00000111
  defb @00000111
  defb @00011111
- defb @11111111
- defb @11111111
+ defb @00111110
+ defb @00111111
  defb @01111111
- defb @00011110
+ defb @01111111
+ defb @01111111
+ defb @01111111
+ defb @00111111
+ defb @00111111
+ defb @00011111
+ defb @00000111
  defb @00000000
  defb @00000000
  defb @00000000
@@ -158,18 +158,18 @@ PUBLIC _sprite_protar1
  defb @00000000
  defb @00000000
  defb @00000000
- defb @11000000
- defb @11100000
- defb @11110000
- defb @11110000
- defb @11111111
- defb @01111111
- defb @01111111
- defb @00111111
- defb @00000110
- defb @00000000
+ defb @00000111
+ defb @00001110
+ defb @00000111
+ defb @00000011
+ defb @00000001
  defb @00000000
  defb @00000000
+ defb @00000001
+ defb @00000011
+ defb @00000111
+ defb @00001111
+ defb @00000111
  defb @00000000
  defb @00000000
  defb @00000000
@@ -193,18 +193,18 @@ PUBLIC _sprite_protar1
  defb @00000000
  defb @00000000
  defb @00000000
- defb @01110000
- defb @01110000
- defb @11111001
- defb @11111001
- defb @11111111
- defb @11111111
- defb @01111111
- defb @01111111
- defb @00111111
- defb @00001111
+ defb @00000011
+ defb @00001110
+ defb @00011111
+ defb @00011111
+ defb @00000011
  defb @00000000
  defb @00000000
+ defb @00000011
+ defb @00011111
+ defb @00011111
+ defb @00001111
+ defb @00000011
  defb @00000000
  defb @00000000
  defb @00000000
@@ -229,18 +229,18 @@ PUBLIC _sprite_protar1
  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 @00001100
+ defb @00011100
+ defb @00011100
+ defb @00111110
+ defb @00101110
+ defb @00110111
+ defb @00111011
+ defb @11011111
+ defb @11011111
+ defb @11101111
+ defb @00110011
+ defb @00110000
  defb @00000000
  defb @00000000
  defb @00000000
@@ -263,19 +263,19 @@ PUBLIC _sprite_protar1
  defb @00000000
  defb @00000000
  defb @00000000
- defb @00001111
- defb @00111111
- defb @01111111
- defb @01111111
- defb @11111111
- defb @11111111
- defb @11111001
- defb @11111001
- defb @01110000
- defb @01110000
- defb @00110000
  defb @00000000
  defb @00000000
+ defb @00010000
+ defb @00111000
+ defb @00111100
+ defb @00101110
+ defb @00110111
+ defb @11011011
+ defb @11011111
+ defb @11101111
+ defb @00110011
+ defb @00110000
+ defb @00000000
  defb @00000000
  defb @00000000
  defb @00000000
@@ -292,8 +292,31 @@ PUBLIC _sprite_protar1
  defb @00000000
  defb @00000000
 
-PUBLIC _sprite_protar2
-._sprite_protar2
+._sprite_protar1_f9
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000011
+ defb @00001111
+ defb @00011111
+ defb @00011111
+ defb @00111111
+ defb @00111111
+ defb @00110111
+ defb @00111011
+ defb @00011101
+ defb @11011111
+ defb @11101111
+ defb @00110011
+ defb @00110000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
 
  defb @00000000
  defb @00000000
@@ -301,16 +324,26 @@ PUBLIC _sprite_protar2
  defb @00000000
  defb @00000000
  defb @00000000
- defb @11000000
- defb @11100000
- defb @11100000
  defb @00000000
  defb @00000000
+
+._sprite_protar1_f10
  defb @00000000
  defb @00000000
- defb @11100000
- defb @11100000
- defb @11000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000011
+ defb @00001111
+ defb @00011101
+ defb @00011111
+ defb @00111111
+ defb @00111111
+ defb @00111110
+ defb @00111110
+ defb @00011100
+ defb @00011100
+ defb @00001100
  defb @00000000
  defb @00000000
  defb @00000000
@@ -329,14 +362,22 @@ PUBLIC _sprite_protar2
  defb @00000000
  defb @00000000
 
-._sprite_protar2_f2
+._sprite_protar1_f11
  defb @00000000
  defb @00000000
  defb @00000000
  defb @00000000
  defb @00000000
- defb @10000000
- defb @10000000
+ defb @00000000
+ defb @00000011
+ defb @00001111
+ defb @00011101
+ defb @00011111
+ defb @00111111
+ defb @00111110
+ defb @00111100
+ defb @00111000
+ defb @00010000
  defb @00000000
  defb @00000000
  defb @00000000
@@ -345,8 +386,9 @@ PUBLIC _sprite_protar2
  defb @00000000
  defb @00000000
  defb @00000000
- defb @10000000
- defb @10000000
+ defb @00000000
+
+ defb @00000000
  defb @00000000
  defb @00000000
  defb @00000000
@@ -355,16 +397,32 @@ PUBLIC _sprite_protar2
  defb @00000000
  defb @00000000
 
+._sprite_protar1_f12
+ defb @00000000
+ defb @00000000
  defb @00000000
  defb @00000000
  defb @00000000
  defb @00000000
+ defb @00000011
+ defb @00001111
+ defb @00011101
+ defb @00011111
+ defb @00111111
+ defb @00111111
+ defb @00111111
+ defb @00111111
+ defb @00011111
+ defb @00011111
+ defb @00001111
+ defb @00000011
+ defb @00000000
+ defb @00000000
  defb @00000000
  defb @00000000
  defb @00000000
  defb @00000000
 
-._sprite_protar2_f3
  defb @00000000
  defb @00000000
  defb @00000000
@@ -373,15 +431,27 @@ PUBLIC _sprite_protar2
  defb @00000000
  defb @00000000
  defb @00000000
+
+PUBLIC _sprite_protar2
+._sprite_protar2
+
  defb @00000000
  defb @00000000
- defb @10000000
- defb @10000000
  defb @00000000
  defb @00000000
  defb @00000000
+ defb @11000000
+ defb @01110000
+ defb @11111000
+ defb @11111000
+ defb @11000000
  defb @00000000
  defb @00000000
+ defb @11000000
+ defb @11111000
+ defb @11111000
+ defb @11110000
+ defb @11000000
  defb @00000000
  defb @00000000
  defb @00000000
@@ -399,23 +469,32 @@ PUBLIC _sprite_protar2
  defb @00000000
  defb @00000000
 
-._sprite_protar2_f4
+._sprite_protar2_f2
+ defb @00000000
  defb @00000000
  defb @00000000
  defb @00000000
  defb @00000000
+ defb @11100000
+ defb @01110000
+ defb @11100000
+ defb @11000000
+ defb @10000000
  defb @00000000
  defb @00000000
  defb @10000000
  defb @11000000
- defb @11000000
- defb @11100000
- defb @11100000
  defb @11100000
+ defb @11110000
  defb @11100000
- defb @11000000
- defb @11000000
- defb @10000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
  defb @00000000
  defb @00000000
  defb @00000000
@@ -425,33 +504,94 @@ PUBLIC _sprite_protar2
  defb @00000000
  defb @00000000
 
+._sprite_protar2_f3
  defb @00000000
  defb @00000000
  defb @00000000
  defb @00000000
  defb @00000000
+ defb @11100000
+ defb @11111000
+ defb @01111100
+ defb @11111100
+ defb @11111110
+ defb @11111110
+ defb @11111110
+ defb @11111110
+ defb @11111100
+ defb @11111100
+ defb @11111000
+ defb @11100000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
  defb @00000000
  defb @00000000
  defb @00000000
 
-._sprite_protar2_f5
  defb @00000000
  defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
+._sprite_protar2_f4
  defb @00000000
  defb @00000000
  defb @00000000
  defb @00110000
- defb @01110000
+ defb @00110000
+ defb @10011100
+ defb @11101100
  defb @11110000
+ defb @01110000
+ defb @10111000
+ defb @11111000
+ defb @11111000
+ defb @11011000
  defb @11110000
  defb @11110000
  defb @11100000
- defb @11100000
- defb @11000000
+ 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
+
+._sprite_protar2_f5
+ defb @00000000
  defb @00000000
  defb @00000000
+ defb @01110000
+ defb @01110000
+ defb @10011100
+ defb @11101100
+ defb @01110000
+ defb @10110000
+ defb @11111000
+ defb @11111000
+ defb @11111000
+ defb @11011000
+ defb @11110000
+ defb @11110000
+ defb @11100000
+ defb @10000000
  defb @00000000
  defb @00000000
  defb @00000000
@@ -473,19 +613,63 @@ PUBLIC _sprite_protar2
  defb @00000000
  defb @00000000
  defb @00000000
+ defb @00111000
+ defb @00111000
+ defb @11001110
+ defb @11110110
+ defb @01111000
+ defb @10111000
+ defb @11111100
+ defb @11111100
+ defb @11111100
+ defb @11101100
+ defb @11111000
+ defb @11111000
+ defb @11110000
+ defb @11000000
  defb @00000000
  defb @00000000
- defb @11100000
- defb @11100000
- defb @11110000
- defb @11110000
- defb @11110000
+ 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_protar2_f7
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00110000
+ defb @00111000
+ defb @00111000
+ defb @01111100
+ defb @01111100
+ defb @11111100
+ defb @11111100
+ defb @11111000
+ defb @10111000
  defb @11110000
- defb @11100000
- defb @11100000
  defb @11000000
  defb @00000000
  defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
  defb @00000000
  defb @00000000
  defb @00000000
@@ -495,6 +679,23 @@ PUBLIC _sprite_protar2
  defb @00000000
  defb @00000000
 
+._sprite_protar2_f8
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00001000
+ defb @00011100
+ defb @00111100
+ defb @01111100
+ defb @11111100
+ defb @11111000
+ defb @10111000
+ defb @11110000
+ defb @11000000
  defb @00000000
  defb @00000000
  defb @00000000
@@ -504,23 +705,76 @@ PUBLIC _sprite_protar2
  defb @00000000
  defb @00000000
 
-._sprite_protar2_f7
  defb @00000000
  defb @00000000
  defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
+._sprite_protar2_f9
  defb @00000000
  defb @00000000
  defb @00000000
  defb @00000000
  defb @11000000
- defb @11100000
- defb @11100000
- defb @11110000
  defb @11110000
+ defb @11111000
+ defb @11111000
+ defb @11111100
+ defb @11111100
+ defb @11111100
+ defb @11111100
+ defb @11111000
+ defb @10111000
  defb @11110000
- defb @01110000
+ 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
+
+._sprite_protar2_f10
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00001100
+ defb @11001100
+ defb @11110111
+ defb @11111011
+ defb @11111011
+ defb @11011100
+ defb @11101100
+ defb @01110100
+ defb @01111100
+ defb @00111000
+ defb @00111000
  defb @00110000
  defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
  defb @00000000
  defb @00000000
  defb @00000000
@@ -530,6 +784,23 @@ PUBLIC _sprite_protar2
  defb @00000000
  defb @00000000
 
+._sprite_protar2_f11
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00001100
+ defb @11001100
+ defb @11110111
+ defb @11111011
+ defb @11011011
+ defb @11101100
+ defb @01110100
+ defb @00111100
+ defb @00011100
+ defb @00001000
+ defb @00000000
  defb @00000000
  defb @00000000
  defb @00000000
@@ -539,25 +810,34 @@ PUBLIC _sprite_protar2
  defb @00000000
  defb @00000000
 
-._sprite_protar2_f8
  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 @11110000
- defb @11100000
- defb @11100000
- defb @11000000
  defb @00000000
  defb @00000000
+
+._sprite_protar2_f12
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00001100
+ defb @11001100
+ defb @11110111
+ defb @11111011
+ defb @10111000
+ defb @11011100
+ defb @11101100
+ defb @11111100
+ defb @11111100
+ defb @11111000
+ defb @11111000
+ defb @11110000
+ defb @11000000
  defb @00000000
  defb @00000000
  defb @00000000
diff --git a/build/prota_sprites.png b/build/prota_sprites.png
index 62e477335fb14a95bfbd45a885a9d2cd73779fff..9619cc9f3330803aa6baeb650a2ce44d1e1384c8 100644
GIT binary patch
literal 5242
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
A3;+NC

literal 4311
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
FV1kdI7|#Fz

diff --git a/globals.c b/globals.c
index 147a7c0..52a318c 100644
--- a/globals.c
+++ b/globals.c
@@ -41,7 +41,7 @@ uint8_t colors[] =         {INK_BLUE, INK_BLUE, INK_BLUE, INK_BLUE, INK_BLUE, IN
 
 
 uint8_t pill_eaten = NONE;
-struct sprite pacman;
+struct spritep pacman;
 struct sprite ghost_red;
 struct sprite ghost_cyan;
 struct sprite ghost_magenta;
diff --git a/globals.h b/globals.h
index 2e516ad..578a7ec 100644
--- a/globals.h
+++ b/globals.h
@@ -10,12 +10,17 @@
 
 #define RIGHTC1 1
 #define RIGHTC2 33
-#define LEFTC1 65
-#define LEFTC2 97
-#define UP1 129
-#define UP2 161
-#define DOWN1 193
-#define DOWN2 225
+#define RIGHTC3 65
+#define LEFTC1 97
+#define LEFTC2 129
+#define LEFTC3 161
+#define UP1 193
+#define UP2 225
+#define UP3 257
+#define DOWN1 289
+#define DOWN2 321
+#define DOWN3 353
+
 #define DECIDED_DIRECTION 1
 #define UNDECIDED 0
 
@@ -60,6 +65,21 @@ struct sprite {
     void *default_color;
 };
 
+struct spritep {
+    struct sp1_ss* sp;
+    struct sp1_ss* alt;
+    uint8_t x;
+    uint8_t y;
+    uint16_t offset;
+    uint16_t currentoffset;
+    uint8_t active;
+    int8_t dx;
+    int8_t dy;
+    uint8_t default_x;
+    uint8_t default_y;
+    void *default_color;
+};
+
 struct bonus {
     struct sp1_ss* sp;
     uint8_t x;
@@ -103,7 +123,7 @@ extern uint8_t correspondence[];
 extern uint8_t colors[];
 
 extern uint8_t pill_eaten;
-extern struct sprite pacman;
+extern struct spritep pacman;
 extern struct sprite ghost_red;
 extern struct sprite ghost_cyan;
 extern struct sprite ghost_magenta;
diff --git a/logic.c b/logic.c
index cb35cb6..0634ab9 100644
--- a/logic.c
+++ b/logic.c
@@ -315,15 +315,6 @@ void check_fsm() {
         }
     }
 
-    if(ghosts[frame]->y == 12) {
-        if(ghosts[frame]->x < 2 && ghosts[frame]->dx == -1) {
-            ghosts[frame]->x = 29;
-        } else if(ghosts[frame]->x > 28 && ghosts[frame]->dx == 1) {
-            ghosts[frame]->x = 1;
-        }
-    }
-
-
     if(allow_next(map[row + pacman.dy][col + pacman.dx])) {
         pacman.y += pacman.dy;
         pacman.x += pacman.dx;
@@ -331,11 +322,14 @@ void check_fsm() {
         pacman.dy = 0;
         pacman.dx = 0;
     }
-
-    if((tick & 1) == 0) {
+    // todo fix offset
+    if(frame == 0) {
+        pacman.offset = pacman.currentoffset;
+        ghosts[frame]->offset = ghosts[frame]->currentoffset;
+    } else if(frame == 1) {
         pacman.offset = pacman.currentoffset + 32;
         ghosts[frame]->offset = ghosts[frame]->currentoffset + 32;
-    } else {
+    } else if(frame == 2) {
         pacman.offset = pacman.currentoffset;
         ghosts[frame]->offset = ghosts[frame]->currentoffset;
     }
@@ -351,6 +345,14 @@ void check_fsm() {
         } else if(ghosts[idx]->active <= JAILED) {
             --ghosts[idx]->active;
         }
+        // side change
+        if(ghosts[idx]->y == 12) {
+            if(ghosts[idx]->x < 2 && ghosts[idx]->dx == -1) {
+                ghosts[idx]->x = 29;
+            } else if(ghosts[idx]->x > 28 && ghosts[idx]->dx == 1) {
+                ghosts[idx]->x = 1;
+            }
+        }
     }
     // while has eaten pill
     if(pill_eaten != NONE) {
diff --git a/msnampac.c b/msnampac.c
index 657e5ee..3e2eedf 100644
--- a/msnampac.c
+++ b/msnampac.c
@@ -161,7 +161,7 @@ int main()
 
      frame += 1;
 
-     if(frame == 5) {
+     if(frame == 3) { // frame will go 0, 1, 2
         frame = 0;
         print_points();
      }

From e45a76b0f08b4643e8cad03d921c4d50c8603a23 Mon Sep 17 00:00:00 2001
From: jordism <jordism@tid.es>
Date: Wed, 22 May 2019 23:25:21 +0200
Subject: [PATCH 5/6] fix wrong sum

---
 logic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/logic.c b/logic.c
index 0634ab9..4a38469 100644
--- a/logic.c
+++ b/logic.c
@@ -330,7 +330,7 @@ void check_fsm() {
         pacman.offset = pacman.currentoffset + 32;
         ghosts[frame]->offset = ghosts[frame]->currentoffset + 32;
     } else if(frame == 2) {
-        pacman.offset = pacman.currentoffset;
+        pacman.offset = pacman.currentoffset + 64;
         ghosts[frame]->offset = ghosts[frame]->currentoffset;
     }
 

From 884996b9ba62de0155af169773b17622de39a89b Mon Sep 17 00:00:00 2001
From: jordism <jordism@tid.es>
Date: Thu, 23 May 2019 23:07:52 +0200
Subject: [PATCH 6/6] fix directions

---
 globals.h |  1 +
 logic.c   | 34 +++++++++++++++++++++++++++-------
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/globals.h b/globals.h
index 578a7ec..6eccc27 100644
--- a/globals.h
+++ b/globals.h
@@ -75,6 +75,7 @@ struct spritep {
     uint8_t active;
     int8_t dx;
     int8_t dy;
+    uint8_t direction;
     uint8_t default_x;
     uint8_t default_y;
     void *default_color;
diff --git a/logic.c b/logic.c
index 4a38469..40ffda3 100644
--- a/logic.c
+++ b/logic.c
@@ -24,18 +24,22 @@ void check_keys()
     if ((in & IN_STICK_UP) && allow_next(map[row - 1][col])) {
         pacman.dy = -1;
         pacman.currentoffset = UP1;
+        pacman.direction = DIR_UP;
 
     } else if((in & IN_STICK_DOWN) && allow_next(map[row + 1][col])) {
         pacman.dy = 1;
         pacman.currentoffset = DOWN1;
+        pacman.direction = DIR_DOWN;
     }
 
     if((in & IN_STICK_LEFT) && allow_next(map[row][col - 1])) {
         pacman.dx = -1;
         pacman.currentoffset = LEFTC1;
+        pacman.direction = DIR_LEFT;
     } else if((in & IN_STICK_RIGHT) && allow_next(map[row][col + 1])) {
         pacman.dx = 1;
         pacman.currentoffset = RIGHTC1;
+        pacman.direction = DIR_RIGHT;
     }
 }
 
@@ -52,6 +56,7 @@ void nampac_go_home() {
     pacman.x = 14;
     pacman.dx = 0;
     pacman.dy = 0;
+    pacman.offset = RIGHTC1;
 }
 
 
@@ -243,7 +248,7 @@ void move_ghosts() {
     row = ghosts[idx]->y + 1;
 
     switch(idx) {
-        case 0: // Rojo: Intenta estár detrás de Pac-Man en modo "Acoso"
+        case 0: // Rojo: Intenta estár detras de Pac-Man en modo "Acoso"
             move_one_ghost(40, 80, 40, 100);
             break;
         case 1:
@@ -315,23 +320,30 @@ void check_fsm() {
         }
     }
 
-    if(allow_next(map[row + pacman.dy][col + pacman.dx])) {
+    if(pacman.direction == DIR_UP && allow_next(map[row - 1][col])) {
+        --pacman.y;
+    } else if(pacman.direction == DIR_DOWN && allow_next(map[row + 1][col])) {
+        ++pacman.y;
+    } else if(pacman.direction == DIR_LEFT && allow_next(map[row][col - 1])) {
+        --pacman.x;
+    } else if(pacman.direction == DIR_RIGHT && allow_next(map[row][col + 1])) {
+        ++pacman.x;
+    }
+
+    /*if(allow_next(map[row + pacman.dy][col + pacman.dx])) {
         pacman.y += pacman.dy;
         pacman.x += pacman.dx;
     } else if (pacman.dy != 0) {
         pacman.dy = 0;
         pacman.dx = 0;
-    }
-    // todo fix offset
+    }*/
+
     if(frame == 0) {
         pacman.offset = pacman.currentoffset;
-        ghosts[frame]->offset = ghosts[frame]->currentoffset;
     } else if(frame == 1) {
         pacman.offset = pacman.currentoffset + 32;
-        ghosts[frame]->offset = ghosts[frame]->currentoffset + 32;
     } else if(frame == 2) {
         pacman.offset = pacman.currentoffset + 64;
-        ghosts[frame]->offset = ghosts[frame]->currentoffset;
     }
 
     // IA FOR GHOSTS
@@ -353,6 +365,14 @@ void check_fsm() {
                 ghosts[idx]->x = 1;
             }
         }
+
+        if(frame == 0) {
+            ghosts[idx]->offset = ghosts[idx]->currentoffset;
+        } else if(frame == 1) {
+            ghosts[idx]->offset = ghosts[idx]->currentoffset + 32;
+        } else if(frame == 2) {
+            ghosts[idx]->offset = ghosts[idx]->currentoffset;
+        }
     }
     // while has eaten pill
     if(pill_eaten != NONE) {