Added MAZOGS (changes by Paul Fearnley)

10 files changed, 76 insertions, 8 deletions

diff --git a/README b/README
index 2ec8460..17a4e2b 100644
--- a/README
+++ b/README
@@ -14,4 +14,4 @@ ZX81 BASIC ROM (c) 1981 Nine Tiles Networks LTD
 
 3D Monster Maze (c) 1983 Malcom E. Evans
 
-City Patrol and Sabotage (c) 1982 Don Priestley
+Mazogs, City Patrol and Sabotage (c) 1982 Don Priestley
diff --git a/arm9/README b/arm9/README
index 2ec8460..17a4e2b 100644
--- a/arm9/README
+++ b/arm9/README
@@ -14,4 +14,4 @@ ZX81 BASIC ROM (c) 1981 Nine Tiles Networks LTD
 
 3D Monster Maze (c) 1983 Malcom E. Evans
 
-City Patrol and Sabotage (c) 1982 Don Priestley
+Mazogs, City Patrol and Sabotage (c) 1982 Don Priestley
diff --git a/arm9/data/mazogs.bin b/arm9/data/mazogs.bin
new file mode 100644
index 0000000..be3effb
--- /dev/null
+++ b/arm9/data/mazogs.bin
diff --git a/arm9/data/mazogs_inlay.bin b/arm9/data/mazogs_inlay.bin
new file mode 100644
index 0000000..a725c57
--- /dev/null
+++ b/arm9/data/mazogs_inlay.bin
diff --git a/arm9/source/main.c b/arm9/source/main.c
index 1a3aa8c..83bc543 100644
--- a/arm9/source/main.c
+++ b/arm9/source/main.c
@@ -90,6 +90,8 @@ static void Splash(void)
     int f;
     int y;
 
+    ZX81DisplayString("10 print '%the zx81 is ace%'\n20 goto 10");
+
     FB_Clear();
 
     loadPCX(splashimg_bin,&img);
@@ -146,8 +148,6 @@ static void Splash(void)
 	y+=8;
     }
 
-    ZX81DisplayString("10 print '%the zx81 is ace%'\n20 goto 10");
-
     while(!(keysDown() & KEY_A))
     {
 	swiWaitForVBlank();
diff --git a/arm9/source/tapes.c b/arm9/source/tapes.c
index 86da796..bc5ac8b 100644
--- a/arm9/source/tapes.c
+++ b/arm9/source/tapes.c
@@ -33,6 +33,8 @@
 #include "cpatrol_inlay_bin.h"
 #include "sabotage_bin.h"
 #include "sabotage_inlay_bin.h"
+#include "mazogs_bin.h"
+#include "mazogs_inlay_bin.h"
 
 
 /* ---------------------------------------- STATIC DATA
@@ -47,7 +49,7 @@ typedef struct
     const char	*text;
 } Tape;
 
-#define NO_TAPES	3
+#define NO_TAPES	4
 
 static SoftKey	maze_keys[]=
 		    {
@@ -85,6 +87,20 @@ static SoftKey	sabotage_keys[]=
 			NUM_SOFT_KEYS
 		    };
 
+static SoftKey	mazogs_keys[]=
+		    {
+		    	SK_PAD_UP,	SK_W,
+		    	SK_PAD_LEFT,	SK_H,
+		    	SK_PAD_RIGHT,	SK_J,
+			SK_PAD_DOWN,	SK_S,
+			SK_PAD_A,	SK_NEWLINE,
+			SK_PAD_R,	SK_R,
+			SK_PAD_L,	SK_L,
+			SK_PAD_START,	SK_Y,
+			SK_PAD_SELECT,	SK_V,
+			NUM_SOFT_KEYS
+		    };
+
 static Tape	tapes[NO_TAPES]=
 		{
 		    {
@@ -106,6 +122,24 @@ static Tape	tapes[NO_TAPES]=
 			"the maze."
 		    },
 		    {
+		    	mazogs_bin,
+			&mazogs_bin_size,
+			{0},
+			mazogs_inlay_bin,
+			mazogs_keys,
+			"%Mazogs%\n"
+			"(c) 1981 Don Priestley\n\n"
+			"Find the treasure and\n"
+			"return to the start.\n"
+			"Avoid the %Mazogs% that roam\n"
+			"the maze.\n\n"
+			"Use joypad to move.\n"
+			"%select% to view map.\n"
+			"%start% to quit.\n"
+			"%L% or %R% shoulder to select\n"
+			"direction at start."
+		    },
+		    {
 		    	cpatrol_bin,
 			&cpatrol_bin_size,
 			{0},
diff --git a/data/mazogs.bin b/data/mazogs.bin
new file mode 100644
index 0000000..be3effb
--- /dev/null
+++ b/data/mazogs.bin
diff --git a/data/mazogs_inlay.bin b/data/mazogs_inlay.bin
new file mode 100644
index 0000000..a725c57
--- /dev/null
+++ b/data/mazogs_inlay.bin
diff --git a/source/main.c b/source/main.c
index 1a3aa8c..83bc543 100644
--- a/source/main.c
+++ b/source/main.c
@@ -90,6 +90,8 @@ static void Splash(void)
     int f;
     int y;
 
+    ZX81DisplayString("10 print '%the zx81 is ace%'\n20 goto 10");
+
     FB_Clear();
 
     loadPCX(splashimg_bin,&img);
@@ -146,8 +148,6 @@ static void Splash(void)
 	y+=8;
     }
 
-    ZX81DisplayString("10 print '%the zx81 is ace%'\n20 goto 10");
-
     while(!(keysDown() & KEY_A))
     {
 	swiWaitForVBlank();
diff --git a/source/tapes.c b/source/tapes.c
index 86da796..bc5ac8b 100644
--- a/source/tapes.c
+++ b/source/tapes.c
@@ -33,6 +33,8 @@
 #include "cpatrol_inlay_bin.h"
 #include "sabotage_bin.h"
 #include "sabotage_inlay_bin.h"
+#include "mazogs_bin.h"
+#include "mazogs_inlay_bin.h"
 
 
 /* ---------------------------------------- STATIC DATA
@@ -47,7 +49,7 @@ typedef struct
     const char	*text;
 } Tape;
 
-#define NO_TAPES	3
+#define NO_TAPES	4
 
 static SoftKey	maze_keys[]=
 		    {
@@ -85,6 +87,20 @@ static SoftKey	sabotage_keys[]=
 			NUM_SOFT_KEYS
 		    };
 
+static SoftKey	mazogs_keys[]=
+		    {
+		    	SK_PAD_UP,	SK_W,
+		    	SK_PAD_LEFT,	SK_H,
+		    	SK_PAD_RIGHT,	SK_J,
+			SK_PAD_DOWN,	SK_S,
+			SK_PAD_A,	SK_NEWLINE,
+			SK_PAD_R,	SK_R,
+			SK_PAD_L,	SK_L,
+			SK_PAD_START,	SK_Y,
+			SK_PAD_SELECT,	SK_V,
+			NUM_SOFT_KEYS
+		    };
+
 static Tape	tapes[NO_TAPES]=
 		{
 		    {
@@ -106,6 +122,24 @@ static Tape	tapes[NO_TAPES]=
 			"the maze."
 		    },
 		    {
+		    	mazogs_bin,
+			&mazogs_bin_size,
+			{0},
+			mazogs_inlay_bin,
+			mazogs_keys,
+			"%Mazogs%\n"
+			"(c) 1981 Don Priestley\n\n"
+			"Find the treasure and\n"
+			"return to the start.\n"
+			"Avoid the %Mazogs% that roam\n"
+			"the maze.\n\n"
+			"Use joypad to move.\n"
+			"%select% to view map.\n"
+			"%start% to quit.\n"
+			"%L% or %R% shoulder to select\n"
+			"direction at start."
+		    },
+		    {
 		    	cpatrol_bin,
 			&cpatrol_bin_size,
 			{0},