Browse Source

prog_uchar etc excised #2

jamesbowman 8 years ago
parent
commit
f060e5ba11
52 changed files with 310 additions and 306 deletions
  1. 6 6
      GD.cpp
  2. 7 4
      GD.h
  3. 8 8
      asteroids.ino
  4. 1 1
      chessboard.ino
  5. 2 2
      chopper.ino
  6. 3 3
      converted-assets/Wood32.h
  7. 11 11
      converted-assets/asteroidgraphics.h
  8. 4 4
      converted-assets/ball.h
  9. 8 8
      converted-assets/chopper.h
  10. 3 3
      converted-assets/cp437.h
  11. 2 2
      converted-assets/digits.h
  12. 70 70
      converted-assets/dna.h
  13. 60 60
      converted-assets/eliteships.h
  14. 1 1
      converted-assets/eraser.h
  15. 3 3
      converted-assets/froggerbg.h
  16. 15 15
      converted-assets/instruments.h
  17. 2 2
      converted-assets/lena.h
  18. 29 29
      converted-assets/manicminer.h
  19. 1 1
      converted-assets/mont.h
  20. 1 1
      converted-assets/music.h
  21. 2 2
      converted-assets/pickups2.h
  22. 3 3
      converted-assets/platformer.h
  23. 2 2
      converted-assets/r.h
  24. 1 1
      converted-assets/random.h
  25. 1 1
      converted-assets/rasterinterrupt.h
  26. 1 1
      converted-assets/selftest1.h
  27. 1 1
      converted-assets/showvoices.h
  28. 1 1
      converted-assets/soundbuffer.h
  29. 1 1
      converted-assets/spectrum.h
  30. 10 10
      converted-assets/spectrum_data.h
  31. 2 2
      converted-assets/sphere.h
  32. 1 1
      converted-assets/splitscreen.h
  33. 3 3
      converted-assets/splitscreen_graphics.h
  34. 2 2
      converted-assets/sprite.h
  35. 3 3
      converted-assets/sprites256.h
  36. 3 3
      converted-assets/staunton.h
  37. 3 3
      converted-assets/stone_wall_texture.h
  38. 6 6
      converted-assets/watterott_logo.h
  39. 1 1
      converted-assets/wireframe.h
  40. 3 3
      dna.ino
  41. 1 1
      frogger.ino
  42. 2 1
      go
  43. 1 1
      instruments2.ino
  44. 8 8
      manicminer.ino
  45. 1 1
      memloader.ino
  46. 1 1
      player.ino
  47. 1 1
      runtests
  48. 1 1
      screenshot.ino
  49. 1 1
      scroll.ino
  50. 1 1
      toccata.ino
  51. 1 1
      watterott.ino
  52. 4 4
      wireframe.ino

+ 6 - 6
GD.cpp

@@ -126,7 +126,7 @@ void GDClass::fill(int addr, byte v, unsigned int count)
   __end();
 }
 
-void GDClass::copy(unsigned int addr, PROGMEM prog_uchar *src, int count)
+void GDClass::copy(unsigned int addr, flash_uint8_t *src, int count)
 {
   __wstart(addr);
   while (count--) {
@@ -148,7 +148,7 @@ void GDClass::copy(unsigned int addr, uint_farptr_t src, int count)
 }
 #endif
 
-void GDClass::microcode(PROGMEM prog_uchar *src, int count)
+void GDClass::microcode(flash_uint8_t *src, int count)
 {
   wr(J1_RESET, 1);
   copy(J1_CODE, src, count);
@@ -207,7 +207,7 @@ void GDClass::xhide()
   spr++;
 }
 
-void GDClass::plots(int ox, int oy, PROGMEM sprplot *psp, byte count, byte rot, byte jk)
+void GDClass::plots(int ox, int oy, const PROGMEM sprplot *psp, byte count, byte rot, byte jk)
 {
   while (count--) {
     struct sprplot sp;
@@ -343,7 +343,7 @@ void GDClass::screenshot(unsigned int frame)
 // near ptr version
 class GDflashbits {
 public:
-  void begin(prog_uchar *s) {
+  void begin(flash_uint8_t *s) {
     src = s;
     mask = 0x01;
   }
@@ -365,13 +365,13 @@ public:
     return r;
   }
 private:
-  prog_uchar *src;
+  flash_uint8_t *src;
   byte mask;
 };
 
 static GDflashbits GDFB;
 
-void GDClass::uncompress(unsigned int addr, prog_uchar *src)
+void GDClass::uncompress(unsigned int addr, flash_uint8_t *src)
 {
   GDFB.begin(src);
   byte b_off = GDFB.getn(4);

+ 7 - 4
GD.h

@@ -29,6 +29,9 @@ extern HardwareSPI SPI;
 #include <string.h>
 #endif
 
+#define flash_uint8_t   const PROGMEM uint8_t
+#define flash_int8_t    const PROGMEM int8_t
+
 struct sprplot
 {
   char x, y;
@@ -47,7 +50,7 @@ public:
   static unsigned int rd16(unsigned int addr);
   static void wr16(unsigned int addr, unsigned int v);
   static void fill(int addr, byte v, unsigned int count);
-  static void copy(unsigned int addr, prog_uchar *src, int count);
+  static void copy(unsigned int addr, flash_uint8_t *src, int count);
 #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
   static void copy(unsigned int addr, uint_farptr_t src, int count);
   static void microcode(uint_farptr_t src, int count);
@@ -58,8 +61,8 @@ public:
   static void sprite(int spr, int x, int y, byte image, byte palette, byte rot = 0, byte jk = 0);
   static void sprite2x2(int spr, int x, int y, byte image, byte palette, byte rot = 0, byte jk = 0);
   static void waitvblank();
-  static void microcode(prog_uchar *src, int count);
-  static void uncompress(unsigned int addr, prog_uchar *src);
+  static void microcode(flash_uint8_t *src, int count);
+  static void uncompress(unsigned int addr, flash_uint8_t *src);
 
   static void voice(int v, byte wave, unsigned int freq, byte lamp, byte ramp);
   static void ascii();
@@ -70,7 +73,7 @@ public:
   void __wstartspr(unsigned int spr = 0);
   void xsprite(int ox, int oy, char x, char y, byte image, byte palette, byte rot = 0, byte jk = 0);
   void xhide();
-  void plots(int ox, int oy, sprplot *psp, byte count, byte rot, byte jk);
+  void plots(int ox, int oy, const sprplot *psp, byte count, byte rot, byte jk);
 
   byte spr;   // Current sprite, incremented by xsprite/xhide above
 };

+ 8 - 8
asteroids.ino

@@ -107,7 +107,7 @@ uint16_t swapRG(uint16_t color)
 static void update_score();
 
 // [int(127 * math.sin(math.pi * 2 * i / 16)) for i in range(16)]
-static PROGMEM prog_uchar charsin[16] = {0, 48, 89, 117, 127, 117, 89, 48, 0, -48, -89, -117, -127, -117, -89, -48};
+static flash_uint8_t charsin[16] = {0, 48, 89, 117, 127, 117, 89, 48, 0, -48, -89, -117, -127, -117, -89, -48};
 #define qsin(a) (char)pgm_read_byte_near(charsin + ((a) & 15))
 #define qcos(a) qsin((a) + 4)
 
@@ -421,7 +421,7 @@ static handler handlers[] = {
 
 class GDflashbits {
 public:
-  void begin(prog_uchar *s) {
+  void begin(flash_uint8_t *s) {
     src = s;
     mask = 0x01;
   }
@@ -443,13 +443,13 @@ public:
     return r;
   }
 private:
-  prog_uchar *src;
+  flash_uint8_t *src;
   byte mask;
 };
 
 static GDflashbits GDFB;
 
-static void GD_uncompress(unsigned int addr, PROGMEM prog_uchar *src)
+static void GD_uncompress(unsigned int addr, flash_uint8_t *src)
 {
   GDFB.begin(src);
   byte b_off = GDFB.getn(4);
@@ -475,7 +475,7 @@ static void GD_uncompress(unsigned int addr, PROGMEM prog_uchar *src)
 static void titlepaint(char *dst, byte src, byte mask)
 {
   if (src != 0xff) {
-    prog_uchar *psrc = title_runs + 2 * src;
+    flash_uint8_t *psrc = title_runs + 2 * src;
     byte a, b;
     do {
       a = pgm_read_byte_near(psrc++);
@@ -491,7 +491,7 @@ static void column(byte dst, byte src)
 {
   static char scratch[76];
   memset(scratch, 0, sizeof(scratch));
-  prog_uchar line = pgm_read_byte_near(title + 2 * src);
+  uint8_t line = pgm_read_byte_near(title + 2 * src);
   titlepaint(scratch, line, 1);
   line = pgm_read_byte_near(title + 2 * src + 1);
   titlepaint(scratch, line, 2);
@@ -561,7 +561,7 @@ static byte scrap;
 // copy a (w,h) rectangle from the source image (x,y) into picture RAM
 static void rect(unsigned int dst, byte x, byte y, byte w, byte h)
 {
-  prog_uchar *src = bg_pic + (16 * y) + x;
+  flash_uint8_t *src = bg_pic + (16 * y) + x;
   while (h--) {
     GD.copy(dst, src, w);
     dst += 64;
@@ -627,7 +627,7 @@ static int atxy(int x, int y)
 
 static void update_score()
 {
-  prog_uchar* digitcodes = bg_pic + (16 * 30);
+  flash_uint8_t* digitcodes = bg_pic + (16 * 30);
   unsigned long s = score;
   uint16_t a = atxy(49, scrap << 3);
   byte i;

+ 1 - 1
chessboard.ino

@@ -14,7 +14,7 @@ int atxy(int x, int y)
 
 static void square(byte x, byte y, byte light)
 {
-  prog_uchar *src = Wood32_pic + (16 * light);
+  flash_uint8_t *src = Wood32_pic + (16 * light);
   int addr = atxy(x, y);
   GD.copy(addr + 0 * 64, src, 4);
   GD.copy(addr + 1 * 64, src + 4, 4);

+ 2 - 2
chopper.ino

@@ -27,7 +27,7 @@ int atxy(int x, int y)
 // copy a (w,h) rectangle from the source image (x,y) into picture RAM
 static void rect(unsigned int dst, byte x, byte y, byte w, byte h)
 {
-  prog_uchar *src = desert_pic + (16 * y) + x;
+  flash_uint8_t *src = desert_pic + (16 * y) + x;
   while (h--) {
     GD.copy(dst, src, w);
     dst += 64;
@@ -87,7 +87,7 @@ void setup()
   GD.uncompress(RAM_PAL, desert_pal_compressed);
 
   {
-    prog_uchar *src = desert_pic;
+    flash_uint8_t *src = desert_pic;
     for (byte y = 0; y < 32; y++) {
       for (byte x = 0; x < 64; x += 16)
         GD.copy(atxy(x, y), src, 16);

+ 3 - 3
converted-assets/Wood32.h

@@ -1,9 +1,9 @@
-static PROGMEM prog_uchar Wood32_pic[] = {
+static flash_uint8_t Wood32_pic[] = {
 
 0x00,  0x01,  0x02,  0x03,  0x04,  0x05,  0x06,  0x07,  0x08,  0x09,  0x0a,  0x0b,  0x0c,  0x0d,  0x0e,  0x0f, 
 0x10,  0x11,  0x12,  0x13,  0x14,  0x15,  0x16,  0x17,  0x18,  0x19,  0x1a,  0x1b,  0x1c,  0x1d,  0x1e,  0x1f, 
 };
-static PROGMEM prog_uchar Wood32_chr[] = {
+static flash_uint8_t Wood32_chr[] = {
 
 0x55,  0xa5,  0xc0,  0xcc,  0x8a,  0xae,  0x55,  0x02,  0xfe,  0xfb,  0xbe,  0xaf,  0x12,  0x0a,  0x6b,  0xff, 
 0x55,  0x55,  0xfa,  0xee,  0xbc,  0x2f,  0x66,  0x5e,  0x00,  0x0f,  0xeb,  0xba,  0xea,  0xbe,  0x00,  0x03, 
@@ -39,7 +39,7 @@ static PROGMEM prog_uchar Wood32_chr[] = {
 0x08,  0x00,  0xaa,  0x5e,  0x9f,  0x5f,  0xbf,  0xfe,  0xeb,  0x55,  0x9b,  0xef,  0x1c,  0x0a,  0xd5,  0xa7, 
 0x00,  0xf0,  0x0e,  0xbe,  0xda,  0x9a,  0x39,  0x95,  0xa7,  0xea,  0x9f,  0x57,  0x63,  0xb0,  0x55,  0xa7, 
 };
-static PROGMEM prog_uchar Wood32_pal[] = {
+static flash_uint8_t Wood32_pal[] = {
 
 0x32,  0x6f,  0xf0,  0x6e,  0x11,  0x73,  0x32,  0x77,  0x32,  0x77,  0xf0,  0x6a,  0x11,  0x73,  0x32,  0x73, 
 0x10,  0x6f,  0x32,  0x77,  0x32,  0x73,  0x32,  0x77,  0xf0,  0x6e,  0x32,  0x73,  0x53,  0x77,  0x11,  0x73, 

+ 11 - 11
converted-assets/asteroidgraphics.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar title_runs[] = {
+static flash_uint8_t title_runs[] = {
 
 0x01,  0x11,  0x1a,  0x2a,  0x3c,  0xca,  0x01,  0x0e,  0x1c,  0x2a,  0x3e,  0xca,  0x01,  0x0d,  0x1d,  0x2a, 
 0x3e,  0xca,  0x00,  0x0d,  0x1e,  0x2a,  0x3f,  0xcb,  0x00,  0x0c,  0x1e,  0x2a,  0x3f,  0xcb,  0x00,  0x0c, 
@@ -34,7 +34,7 @@ static PROGMEM prog_uchar title_runs[] = {
 0x05,  0xc6,  0x05,  0xc7,  0x04,  0xc7,  0x03,  0xc8,  0x02,  0xc9,  0x0c,  0xbe,  0x11,  0xba,  0x18,  0xb2, 
 0x06,  0xc6,  0x07,  0xc4,  0x0d,  0xbe,  0x10,  0xb9,  0x16,  0xaf, 
 };
-static PROGMEM prog_uchar title[] = {
+static flash_uint8_t title[] = {
 255,
 255,
 196,
@@ -548,7 +548,7 @@ static PROGMEM prog_uchar title[] = {
 255,
 255,
 };
-static PROGMEM prog_uchar palette16a[] = {
+static flash_uint8_t palette16a[] = {
 
 0x76,  0x7b,  0x0a,  0x7f,  0xe2,  0x7e,  0xc0,  0x7e,  0x82,  0x7e,  0x41,  0x7e,  0xe0,  0x7d,  0x80,  0x7d, 
 0x40,  0x75,  0x00,  0x71,  0xc0,  0x6c,  0x80,  0x64,  0x40,  0x60,  0x00,  0x54,  0x00,  0x00,  0x00,  0x80, 
@@ -667,7 +667,7 @@ static void draw_explode16(int x, int y, byte anim, byte rot, byte jk = 0) {
   }
 }
 
-static PROGMEM prog_uchar palette16b[] = {
+static flash_uint8_t palette16b[] = {
 
 0xff,  0x4e,  0xff,  0x4e,  0xde,  0x4a,  0xde,  0x46,  0xdd,  0x46,  0xbc,  0x46,  0xbb,  0x42,  0x9a,  0x3e, 
 0x99,  0x3a,  0x58,  0x36,  0x35,  0x32,  0xf3,  0x29,  0x90,  0x21,  0x2b,  0x15,  0x00,  0x00,  0x00,  0x80, 
@@ -720,7 +720,7 @@ static void draw_rock1r(int x, int y, byte anim, byte rot, byte jk = 0) {
   }
 }
 
-static PROGMEM prog_uchar palette4a[] = {
+static flash_uint8_t palette4a[] = {
 
 0x7d,  0x02,  0x10,  0x00,  0x00,  0x00,  0x00,  0x80, 
 };
@@ -742,7 +742,7 @@ static void draw_sparkr(int x, int y, byte anim, byte rot, byte jk = 0) {
   }
 }
 
-static PROGMEM prog_uchar palette256a[] = {
+static flash_uint8_t palette256a[] = {
 
 0x00,  0x80,  0x45,  0x04,  0x63,  0x0c,  0x50,  0x04,  0xa0,  0x20,  0xc5,  0x18,  0xf0,  0x18,  0x29,  0x25, 
 0x41,  0x41,  0x6e,  0x29,  0x8c,  0x31,  0xef,  0x3d,  0x31,  0x46,  0x73,  0x4e,  0x60,  0x72,  0xf7,  0x5e, 
@@ -777,7 +777,7 @@ static void draw_player(int x, int y, byte anim, byte rot, byte jk = 0) {
   }
 }
 
-static PROGMEM prog_uchar asteroid_images_compressed[] = {
+static flash_uint8_t asteroid_images_compressed[] = {
 
 0xc9,  0xa1,  0xbf,  0xfa,  0x0f,  0xe0,  0x41,  0x3e,  0xa4,  0x87,  0xfd,  0x48,  0x1e,  0xed,  0x63,  0x7b, 
 0xfc,  0x4f,  0xe2,  0x29,  0x3e,  0xad,  0x67,  0xfc,  0x6c,  0x9e,  0xeb,  0xf3,  0x7b,  0xe1,  0x2f,  0xe1, 
@@ -1309,7 +1309,7 @@ static PROGMEM prog_uchar asteroid_images_compressed[] = {
 0x3f,  0xbb,  0x6b,  0x86,  0x47,  0xd0,  0xc7,  0xea,  0xc2,  0xfe,  0xa7,  0xfe,  0xf1,  0xc2,  0x43,  0xf2, 
 0xff,  0xff,  0xfc,  0x3f,  0xfc,  0x4f,  0x03,  0x00, 
 };
-static PROGMEM prog_uchar bg_pic[] = {
+static flash_uint8_t bg_pic[] = {
 
 0x00,  0x01,  0x02,  0x03,  0x04,  0x05,  0x06,  0x07,  0x08,  0x09,  0x0a,  0x0b,  0x0c,  0x0d,  0x0e,  0x0f, 
 0x10,  0x11,  0x12,  0x13,  0x14,  0x15,  0x00,  0x00,  0x16,  0x17,  0x18,  0x19,  0x1a,  0x00,  0x00,  0x00, 
@@ -1345,7 +1345,7 @@ static PROGMEM prog_uchar bg_pic[] = {
 0x89,  0x8a,  0x8b,  0x8c,  0x8d,  0x8e,  0x8f,  0x90,  0x91,  0x92,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x93,  0x94,  0x95,  0x96,  0x97,  0x98,  0x99,  0x9a,  0x89,  0x9b,  0x9c,  0x89,  0x95,  0x00,  0x00,  0x00, 
 };
-static PROGMEM prog_uchar bg_chr_compressed[] = {
+static flash_uint8_t bg_chr_compressed[] = {
 
 0xc9,  0x81,  0xde,  0x01,  0x08,  0xe0,  0x41,  0x1e,  0x48,  0xc8,  0x0f,  0x67,  0x04,  0x22,  0x7d,  0x44, 
 0x8f,  0xfd,  0x09,  0x14,  0x42,  0x12,  0x4f,  0x71,  0x00,  0xd3,  0x7a,  0xc6,  0x8f,  0x84,  0x54,  0xa9, 
@@ -1474,7 +1474,7 @@ static PROGMEM prog_uchar bg_chr_compressed[] = {
 0x9f,  0x01,  0x9c,  0x0a,  0xd4,  0x00,  0x11,  0x2c,  0xa6,  0xb7,  0xbe,  0x16,  0x31,  0x3c,  0xa5,  0xc5, 
 0x4f,  0x55, 
 };
-static PROGMEM prog_uchar bg_pal_compressed[] = {
+static flash_uint8_t bg_pal_compressed[] = {
 
 0xc9,  0x01,  0xd9,  0x01,  0x08,  0xe0,  0xfe,  0xf9,  0x07,  0xfe,  0xe0,  0x1f,  0xfa,  0xc3,  0x7f,  0xe4, 
 0x83,  0x40,  0x28,  0xce,  0x04,  0xfe,  0xe0,  0x1f,  0xfa,  0xc3,  0x7f,  0xc6,  0x92,  0x42,  0x29,  0xf0, 
@@ -1532,7 +1532,7 @@ static PROGMEM prog_uchar bg_pal_compressed[] = {
 0xf4,  0x47,  0xff,  0xc8,  0x1f,  0xfb,  0xc3,  0x7f,  0xe2,  0x4f,  0xff,  0x91,  0x3f,  0xfe,  0x87,  0x7f, 
 0xd6,  0x89,  0xaa,  0xf4,  0xa7,  0x0f,  0xd6, 
 };
-static PROGMEM prog_uchar title_ramp[] = {
+static flash_uint8_t title_ramp[] = {
 
 0xc8,  0x66,  0xea,  0x6a,  0x0d,  0x6b,  0x30,  0x6f,  0x73,  0x73,  0x96,  0x77,  0xba,  0x7b,  0xfd,  0x7f, 
 0xff,  0x7f,  0xfd,  0x7f,  0xb9,  0x7b,  0x96,  0x77,  0x73,  0x73,  0x30,  0x6f,  0x0d,  0x6b,  0xea,  0x6a, 

+ 4 - 4
converted-assets/ball.h

@@ -45,7 +45,7 @@ GD.xsprite(x, y, -8, 40, 42, pal, 0);
 GD.xsprite(x, y, 8, 40, 43, pal, 0);
 GD.xsprite(x, y, 24, 40, 44, pal, 0);
 }
-static PROGMEM prog_uchar ball[] = {
+static flash_uint8_t ball[] = {
 
 0xc9,  0xa1,  0xdc,  0xf9,  0x0f,  0xe0,  0x41,  0x3c,  0x88,  0x07,  0xf1,  0x20,  0x1e,  0xc4,  0x83,  0x78, 
 0x10,  0x0f,  0xe2,  0x41,  0x3c,  0x88,  0x07,  0x71,  0xff,  0x06,  0xed,  0x85,  0xf2,  0x20,  0x68,  0xd8, 
@@ -530,7 +530,7 @@ static PROGMEM prog_uchar ball[] = {
 0xf7,  0x0f,  0x15,  0x12,  0x04,  0x30,  0xa5,  0x3e,  0x08,  0x86,  0x83,  0x6a,  0x1e,  0xc4,  0x83,  0x78, 
 0x10,  0x0f,  0xe2,  0x41,  0x3c,  0x88,  0x07,  0xf1,  0x20,  0x1e,  0xc4,  0x83,  0x78,  0x10,  0x0f,  0x02, 
 };
-static PROGMEM prog_uchar bg_pic[] = {
+static flash_uint8_t bg_pic[] = {
 
 0x00,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01, 
 0x01,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01,  0x01, 
@@ -694,7 +694,7 @@ static PROGMEM prog_uchar bg_pic[] = {
 0x06,  0x06,  0x06,  0x06,  0x06,  0x06,  0x06,  0x06,  0x06,  0x06,  0x06,  0x06,  0x06,  0x06,  0x06,  0x06, 
 0x06,  0x0c,  0x03,  0x03,  0x03,  0x03,  0x03,  0x03,  0x03,  0x03,  0x03,  0x03,  0x03,  0x03,  0x03,  0x03, 
 };
-static PROGMEM prog_uchar bg_chr[] = {
+static flash_uint8_t bg_chr[] = {
 
 0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x54, 
 0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x00,  0x00, 
@@ -710,7 +710,7 @@ static PROGMEM prog_uchar bg_chr[] = {
 0x55,  0x54,  0x55,  0x54,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55, 
 0x50,  0x00,  0x50,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 };
-static PROGMEM prog_uchar bg_pal[] = {
+static flash_uint8_t bg_pal[] = {
 
 0x10,  0x42,  0x18,  0x63,  0x00,  0x00,  0x00,  0x00,  0x10,  0x42,  0x18,  0x63,  0x00,  0x00,  0x00,  0x00, 
 0x10,  0x42,  0x18,  0x63,  0x00,  0x00,  0x00,  0x00,  0x18,  0x63,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 

+ 8 - 8
converted-assets/chopper.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar roof[] = {
+static flash_uint8_t roof[] = {
 
 0x24,  0x21,  0x21,  0x20,  0x21,  0x1f,  0x1e,  0x1d,  0x1c,  0x1b,  0x1a,  0x1a,  0x19,  0x1a,  0x1a,  0x1b, 
 0x1c,  0x1e,  0x1f,  0x1f,  0x25,  0x28,  0x2a,  0x2c,  0x2b,  0x2a,  0x27,  0x25,  0x22,  0x21,  0x21,  0x22, 
@@ -136,7 +136,7 @@ static PROGMEM prog_uchar roof[] = {
 0x18,  0x19,  0x1d,  0x1f,  0x2f,  0x3f,  0x42,  0x40,  0x3e,  0x3b,  0x38,  0x2c,  0x1e,  0x19,  0x14,  0x12, 
 0x11,  0x12,  0x13,  0x14,  0x13,  0x11,  0x0e,  0x0b,  0x09,  0x08,  0x08,  0x09,  0x0b,  0x0e,  0x13,  0x1b, 
 };
-static PROGMEM prog_uchar foot[] = {
+static flash_uint8_t foot[] = {
 
 0x27,  0x26,  0x28,  0x29,  0x2a,  0x2a,  0x2b,  0x2c,  0x2d,  0x2e,  0x2f,  0x31,  0x30,  0x31,  0x2e,  0x2c, 
 0x27,  0x26,  0x23,  0x23,  0x1f,  0x1e,  0x1d,  0x1c,  0x1c,  0x1e,  0x1f,  0x1f,  0x24,  0x26,  0x26,  0x25, 
@@ -274,7 +274,7 @@ static PROGMEM prog_uchar foot[] = {
 0x17,  0x19,  0x1d,  0x1f,  0x2f,  0x3f,  0x4f,  0x8b,  0x90,  0x4f,  0x3f,  0x2f,  0x1f,  0x1e,  0x1d,  0x1b, 
 0x18,  0x16,  0x15,  0x14,  0x14,  0x16,  0x18,  0x1b,  0x1e,  0x21,  0x20,  0x1b,  0x14,  0x10,  0x10,  0x10, 
 };
-static PROGMEM prog_uchar chopper_palette[] = {
+static flash_uint8_t chopper_palette[] = {
 
 0x1a,  0x5b,  0xc0,  0x7a,  0x96,  0x4a,  0xd0,  0x31,  0xc0,  0x78,  0xc8,  0x18,  0x00,  0x48,  0x00,  0x28, 
 0x00,  0x18,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x80, 
@@ -432,7 +432,7 @@ static void draw_dead(int x, int y, byte anim, byte rot, byte jk = 0)
         }
     }
     
-static PROGMEM prog_uchar blocks_palette[] = {
+static flash_uint8_t blocks_palette[] = {
 
 0xab,  0x7a,  0x69,  0x76,  0x28,  0x6e,  0x08,  0x66,  0xe7,  0x61,  0xc7,  0x5d,  0xa7,  0x55,  0x86,  0x51, 
 0x65,  0x49,  0x25,  0x41,  0x05,  0x35,  0xe4,  0x30,  0xc3,  0x28,  0xa3,  0x1c,  0x21,  0x08,  0x00,  0x80, 
@@ -476,7 +476,7 @@ static void draw_blocks(int x, int y, byte anim, byte rot, byte jk = 0)
         }
     }
     
-static PROGMEM prog_uchar chopper_compressed[] = {
+static flash_uint8_t chopper_compressed[] = {
 
 0xc9,  0xc1,  0xc6,  0xfb,  0x0f,  0xe0,  0x41,  0x3e,  0xa4,  0x87,  0xfd,  0x48,  0x1e,  0xed,  0x63,  0x7b, 
 0xfc,  0x4f,  0xe2,  0x29,  0x3e,  0xad,  0x67,  0xfc,  0x6c,  0x9e,  0xeb,  0xfd,  0xa3,  0x07,  0x0f,  0x1e, 
@@ -807,7 +807,7 @@ static PROGMEM prog_uchar chopper_compressed[] = {
 0x53,  0x65,  0x26,  0xdd,  0xa6,  0x2d,  0x37,  0x2e,  0x6c,  0xb0,  0x04,  0xc9,  0x0a,  0x33,  0x44,  0xc4, 
 0x48,  0x88,  0x0a,  0x97,  0xa1,  0xc3,  0xa6,  0x6d,  0x37,  0xce,  0x6d,  0x88,  0x42,  0xc1,  0x0b, 
 };
-static PROGMEM prog_uchar desert_pic[] = {
+static flash_uint8_t desert_pic[] = {
 
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x00,  0x00,  0x00,  0x00,  0x01,  0x02,  0x03,  0x04,  0x05,  0x06,  0x07,  0x08,  0x09,  0x0a,  0x0b,  0x00, 
@@ -852,7 +852,7 @@ static PROGMEM prog_uchar desert_pic[] = {
 0xf7,  0xf7,  0xfa,  0xf9,  0xf7,  0xfa,  0xf7,  0xf7,  0xfa,  0xf9,  0xf7,  0xfa,  0xf7,  0xf7,  0xfa,  0xf7, 
 0xf7,  0xfc,  0xf7,  0xf7,  0xfc,  0xf7,  0xf7,  0xf7,  0xf7,  0xf7,  0xfc,  0xf7,  0xf7,  0xfc,  0xf7,  0xf7, 
 };
-static PROGMEM prog_uchar desert_chr_compressed[] = {
+static flash_uint8_t desert_chr_compressed[] = {
 
 0xc9,  0x41,  0x7a,  0x03,  0x08,  0xe0,  0x41,  0x46,  0x55,  0x00,  0x0f,  0x92,  0x42,  0x85,  0x52,  0xf5, 
 0x1f,  0x00,  0xfc,  0x01,  0x50,  0x19,  0x28,  0xfd,  0x0b,  0x40,  0x45,  0x95,  0x2a,  0x2b,  0x55,  0xc1, 
@@ -1060,7 +1060,7 @@ static PROGMEM prog_uchar desert_chr_compressed[] = {
 
 0x00,  0x00, 
 };
-static PROGMEM prog_uchar desert_pal_compressed[] = {
+static flash_uint8_t desert_pal_compressed[] = {
 
 0xc9,  0x01,  0x8a,  0xe1,  0x87,  0x08,  0x20,  0x00,  0xeb,  0x06,  0x48,  0x0d,  0x5b,  0xd0,  0x0a,  0x5c, 
 0xba,  0x91,  0x86,  0x0a,  0xfb,  0xd8,  0x02,  0x27,  0xd4,  0x70,  0x11,  0x30,  0x42,  0x47,  0xd0,  0x88, 

+ 3 - 3
converted-assets/cp437.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar cp437_pic[] = {
+static flash_uint8_t cp437_pic[] = {
 
 0x00,  0x00,  0x01,  0x02,  0x03,  0x04,  0x05,  0x06,  0x07,  0x08,  0x09,  0x0a,  0x0b,  0x0c,  0x0d,  0x0e, 
 0x0f,  0x10,  0x11,  0x12,  0x13,  0x14,  0x15,  0x16,  0x17,  0x18,  0x19,  0x1a,  0x1b,  0x1c,  0x1d,  0x1e, 
@@ -17,7 +17,7 @@ static PROGMEM prog_uchar cp437_pic[] = {
 0xb6,  0xb9,  0xab,  0xba,  0xbb,  0x7d,  0xbc,  0xbd,  0xbe,  0xbf,  0xc0,  0x46,  0xc1,  0xc2,  0xc3,  0xc4, 
 0xc5,  0xc6,  0xc7,  0xc8,  0xc9,  0xca,  0xcb,  0xcc,  0xcd,  0x2d,  0xce,  0xcf,  0xd0,  0x00,  0xd1,  0xd2, 
 };
-static PROGMEM prog_uchar cp437_chr[] = {
+static flash_uint8_t cp437_chr[] = {
 
 0xc9,  0x01,  0x4d,  0x02,  0x08,  0xe0,  0x41,  0x1e,  0x00,  0x54,  0x2a,  0x04,  0x00,  0x12,  0x81,  0x18, 
 0x30,  0x02,  0x04,  0x51,  0x8a,  0x04,  0x09,  0x06,  0xae,  0x10,  0x11,  0xf9,  0xc3,  0x37,  0x55,  0xaa, 
@@ -94,7 +94,7 @@ static PROGMEM prog_uchar cp437_chr[] = {
 0xbf,  0x9f,  0x53,  0x7b,  0x22,  0x5f,  0xec,  0x8b,  0x53,  0xbd,  0x3f,  0x7c,  0x35,  0x8c,  0xfa,  0x9f, 
 0xf0,  0x97,  0x64,  0xed,  0x2a,  0x5f,  0xf9,  0x7e,  0x1a,  0x00,  0x00, 
 };
-static PROGMEM prog_uchar cp437_pal[] = {
+static flash_uint8_t cp437_pal[] = {
 
 0xc9,  0x01,  0x0c,  0x00,  0x08,  0xe0,  0xfe,  0xf9,  0x07,  0xfe,  0xe0,  0x1f,  0xfa,  0xc3,  0x7f,  0xe4, 
 0x0f,  0xfd,  0xe1,  0x3f,  0xf6,  0x27,  0xff,  0xd4,  0x9f,  0xfe,  0x33,  0x7f,  0xf6,  0x4f,  0xff,  0x91, 

+ 2 - 2
converted-assets/digits.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar digits_img[] = {
+static flash_uint8_t digits_img[] = {
 
 0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda, 
 0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda, 
@@ -374,7 +374,7 @@ static PROGMEM prog_uchar digits_img[] = {
 0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda, 
 0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda,  0xda, 
 };
-static PROGMEM prog_uchar digits_pal[] = {
+static flash_uint8_t digits_pal[] = {
 
 0xff,  0x7f,  0xff,  0x7f,  0xff,  0x7f,  0xff,  0x7f,  0xff,  0x7f,  0xff,  0x7f,  0xff,  0x7f,  0xff,  0x7f, 
 0xde,  0x7b,  0xde,  0x7b,  0xde,  0x7b,  0xde,  0x7b,  0xde,  0x7b,  0xde,  0x7b,  0xde,  0x7b,  0xde,  0x7b, 

+ 70 - 70
converted-assets/dna.h

@@ -3,392 +3,392 @@ static void draw_sphere(int x, int y, byte anim, byte rot, byte jk = 0) {
   switch (anim) {
   case 0:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 0, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 0, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 1:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 0, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 0, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 2:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 1, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 1, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 3:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 1, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 1, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 4:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 2, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 2, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 5:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 2, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 2, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 6:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 3, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 3, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 7:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 3, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 3, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 8:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 4, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 4, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 9:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 4, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 4, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 10:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 5, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 5, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 11:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 5, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 5, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 12:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 6, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 6, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 13:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 6, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 6, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 14:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 7, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 7, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 15:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 7, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 7, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 16:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 8, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 8, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 17:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 8, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 8, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 18:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 9, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 9, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 19:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 9, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 9, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 20:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 10, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 10, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 21:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 10, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 10, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 22:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 11, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 11, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 23:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 11, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 11, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 24:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 12, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 12, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 25:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 12, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 12, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 26:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 13, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 13, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 27:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 13, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 13, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 28:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 14, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 14, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 29:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 14, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 14, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 30:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 15, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 15, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 31:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 15, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 15, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 32:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 16, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 16, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 33:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 16, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 16, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 34:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 17, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 17, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 35:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 17, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 17, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 36:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 18, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 18, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 37:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 18, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 18, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 38:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 19, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 19, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 39:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 19, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 19, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 40:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 20, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 20, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 41:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 20, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 20, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 42:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 21, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 21, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 43:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 21, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 21, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 44:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 22, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 22, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 45:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 22, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 22, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 46:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 23, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 23, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 47:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 23, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 23, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 48:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 24, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 24, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 49:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 24, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 24, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 50:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 25, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 25, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 51:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 25, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 25, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 52:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 26, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 26, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 53:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 26, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 26, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 54:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 27, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 27, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 55:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 27, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 27, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 56:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 28, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 28, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 57:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 28, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 28, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 58:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 29, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 29, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 59:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 29, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 29, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 60:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 30, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 30, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 61:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 30, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 30, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 62:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 31, 4}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 31, 4}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   case 63:
 {
-    static PROGMEM sprplot sp[] = {{-8, -8, 31, 6}};
+    static const PROGMEM sprplot sp[] = {{-8, -8, 31, 6}};
     GD.plots(x, y, sp, 1, rot, jk);
 }
     break;
   }
 }
 
-static PROGMEM prog_uchar sphere_img[] = {
+static flash_uint8_t sphere_img[] = {
 
 0xff,  0xff,  0xff,  0xff,  0xff,  0xf3,  0x32,  0x32,  0x33,  0x33,  0xf3,  0xff,  0xff,  0xff,  0xff,  0xff, 
 0xff,  0xff,  0xff,  0xf3,  0x22,  0x10,  0x00,  0x00,  0x11,  0x32,  0x44,  0x55,  0xf6,  0xff,  0xff,  0xff, 
@@ -934,12 +934,12 @@ static PROGMEM prog_uchar sphere_img[] = {
 0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, 
 0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, 
 };
-static PROGMEM prog_uchar sphere_pal[] = {
+static flash_uint8_t sphere_pal[] = {
 
 0x7a,  0x7f,  0xb3,  0x6a,  0xec,  0x59,  0xa8,  0x55,  0x88,  0x49,  0x46,  0x45,  0x46,  0x41,  0x25,  0x3d, 
 0x05,  0x35,  0xe4,  0x30,  0xc4,  0x2c,  0xa3,  0x24,  0x82,  0x20,  0x62,  0x18,  0x00,  0x00,  0x00,  0x80, 
 };
-static PROGMEM prog_char cloud[] = {
+static flash_int8_t cloud[] = {
 0,107,-127,
 0,-69,-127,
 17,75,-124,
@@ -1191,7 +1191,7 @@ static PROGMEM prog_char cloud[] = {
 -17,75,124,
 -8,-102,124,
 };
-static PROGMEM prog_uchar ramp_pic[] = {
+static flash_uint8_t ramp_pic[] = {
 
 0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80, 
 0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80,  0x80, 
@@ -1204,7 +1204,7 @@ static PROGMEM prog_uchar ramp_pic[] = {
 0xc1,  0xc2,  0xc3,  0xc4,  0xc5,  0xc6,  0xc7,  0xc8,  0xc9,  0xca,  0xcb,  0xcc,  0xcd,  0xce,  0xcf,  0xd0, 
 0xd1,  0xd2,  0xd3,  0xd4,  0xd5,  0xd6,  0xd6,  0xd7, 
 };
-static PROGMEM prog_uchar ramp_chr[] = {
+static flash_uint8_t ramp_chr[] = {
 
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x45,  0x54,  0x51,  0x40,  0x05,  0x45, 
@@ -1300,7 +1300,7 @@ static PROGMEM prog_uchar ramp_chr[] = {
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x55,  0x54,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55, 
 };
-static PROGMEM prog_uchar ramp_pal[] = {
+static flash_uint8_t ramp_pal[] = {
 
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x21,  0x04,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x21,  0x04,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x21,  0x04,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 

+ 60 - 60
converted-assets/eliteships.h

@@ -1,175 +1,175 @@
-static PROGMEM prog_char ADDER_vertices[] = {
+static flash_int8_t ADDER_vertices[] = {
 -28,0,63, 28,0,63, 47,0,-37, 47,0,-63, 28,-11,-63, -28,-11,-63, -47,0,-63, -47,0,-37, -28,11,-63, 28,11,-63, -28,11,20, 28,11,20, -28,-11,20, 28,-11,20, -17,4,45, 17,4,45, 17,6,37, -17,6,37
 };
-static PROGMEM prog_uchar ADDER_edges[] = {
+static flash_uint8_t ADDER_edges[] = {
 14,17, 10,11, 5,6, 0,7, 8,9, 0,10, 1,11, 1,2, 6,7, 12,13, 5,12, 8,10, 4,13, 7,12, 2,13, 9,11, 7,10, 16,17, 4,5, 1,13, 0,12, 3,9, 2,3, 0,1, 6,8, 15,16, 2,11, 14,15, 3,4
 };
-static PROGMEM prog_char ANACONDA_vertices[] = {
+static flash_int8_t ANACONDA_vertices[] = {
 0,1,-14, -10,-3,-9, -6,-11,0, 6,-11,0, 10,-3,-9, 0,11,-12, -17,3,-3, -10,-9,9, 10,-9,9, 17,3,-3, -10,13,-5, -17,0,7, 0,0,63, 17,0,7, 10,13,-5
 };
-static PROGMEM prog_uchar ANACONDA_edges[] = {
+static flash_uint8_t ANACONDA_edges[] = {
 8,13, 7,12, 1,6, 7,11, 1,2, 5,14, 4,9, 12,13, 6,10, 10,12, 0,4, 2,7, 9,14, 12,14, 6,11, 2,3, 11,12, 0,1, 9,13, 5,10, 8,12, 3,8, 10,14, 0,5, 3,4
 };
-static PROGMEM prog_char ASP_vertices[] = {
+static flash_int8_t ASP_vertices[] = {
 0,-15,0, 0,-7,-38, 37,0,-38, 59,-2,0, 37,-12,24, -37,0,-38, -59,-2,0, -37,-12,24, 22,-6,63, -22,-6,63, 37,12,24, -37,12,24, 0,7,-38, -14,0,-38, 14,0,-38, 0,-3,-38, 0,3,-38
 };
-static PROGMEM prog_uchar ASP_edges[] = {
+static flash_uint8_t ASP_edges[] = {
 6,9, 10,11, 4,8, 5,6, 0,7, 8,10, 8,9, 2,12, 1,2, 6,7, 5,12, 10,12, 13,16, 1,5, 9,11, 0,4, 6,11, 13,15, 2,3, 11,12, 7,9, 0,1, 14,16, 3,8, 14,15, 3,4, 3,10
 };
-static PROGMEM prog_char ASTEROID_vertices[] = {
+static flash_int8_t ASTEROID_vertices[] = {
 0,63,0, -63,-7,0, 0,-63,0, 55,-31,0, 47,39,0, 39,0,47, -31,0,55, 0,23,-59, 0,-39,-47
 };
-static PROGMEM prog_uchar ASTEROID_edges[] = {
+static flash_uint8_t ASTEROID_edges[] = {
 0,1, 1,2, 4,7, 2,6, 3,7, 5,6, 7,8, 0,4, 2,8, 0,7, 1,7, 3,8, 0,6, 1,8, 0,5, 4,5, 2,3, 1,6, 2,5, 3,4, 3,5
 };
-static PROGMEM prog_char BARREL_vertices[] = {
+static flash_int8_t BARREL_vertices[] = {
 63,42,0, 63,13,39, 63,-34,23, 63,-34,-23, 63,13,-39, -63,42,0, -63,13,39, -63,-34,23, -63,-34,-23, -63,13,-39
 };
-static PROGMEM prog_uchar BARREL_edges[] = {
+static flash_uint8_t BARREL_edges[] = {
 0,1, 1,2, 6,7, 5,9, 5,6, 7,8, 2,7, 1,6, 3,8, 2,3, 0,4, 0,5, 8,9, 4,9, 3,4
 };
-static PROGMEM prog_char BOA_vertices[] = {
+static flash_int8_t BOA_vertices[] = {
 0,0,54, 0,23,-51, 22,-14,-58, -22,-14,-58, -22,23,-34, 22,23,-34, 36,0,-39, 14,-38,-46, -14,-38,-46, -36,0,-39, 0,4,-62, 7,-5,-62, -7,-5,-62
 };
-static PROGMEM prog_uchar BOA_edges[] = {
+static flash_uint8_t BOA_edges[] = {
 10,11, 5,6, 0,7, 8,9, 6,7, 10,12, 1,5, 0,4, 1,10, 2,6, 4,5, 1,4, 3,9, 0,5, 4,9, 0,8, 11,12, 2,7, 3,12, 2,11, 3,8, 0,6, 0,9, 7,8
 };
-static PROGMEM prog_char BOULDER_vertices[] = {
+static flash_int8_t BOULDER_vertices[] = {
 -29,59,-17, 48,11,19, 45,-11,-19, 3,0,-63, -45,54,-48, 8,-16,21, 32,27,-48
 };
-static PROGMEM prog_uchar BOULDER_edges[] = {
+static flash_uint8_t BOULDER_edges[] = {
 0,1, 1,2, 2,6, 4,6, 0,6, 4,5, 1,6, 1,5, 0,5, 3,6, 0,4, 2,3, 2,5, 3,4, 3,5
 };
-static PROGMEM prog_char CAPSULE_vertices[] = {
+static flash_int8_t CAPSULE_vertices[] = {
 -12,0,63, -12,-24,-21, -12,24,-21, 36,0,0
 };
-static PROGMEM prog_uchar CAPSULE_edges[] = {
+static flash_uint8_t CAPSULE_edges[] = {
 1,2, 0,1, 1,3, 2,3, 0,3, 0,2
 };
-static PROGMEM prog_char COBRA_vertices[] = {
+static flash_int8_t COBRA_vertices[] = {
 15,0,37, -15,0,37, 0,12,11, -59,-1,-3, 59,-1,-3, -43,7,-19, 43,7,-19, 63,-3,-19, -63,-3,-19, 0,12,-19, -15,-11,-19, 15,-11,-19, -17,3,-19, -3,5,-19, 3,5,-19, 17,3,-19, 17,-5,-19, 3,-7,-19, -3,-7,-19, -17,-5,-19, 0,0,37, 0,0,44, -39,-2,-19, -39,2,-19, -43,0,-19, 39,2,-19, 43,0,-19, 39,-2,-19
 };
-static PROGMEM prog_uchar COBRA_edges[] = {
+static flash_uint8_t COBRA_edges[] = {
 5,9, 6,9, 1,3, 10,11, 4,7, 14,17, 25,27, 18,19, 7,11, 2,5, 5,8, 1,2, 6,7, 2,9, 12,13, 8,10, 25,26, 1,5, 0,11, 0,4, 1,10, 16,17, 2,6, 22,24, 22,23, 14,15, 23,24, 3,5, 0,1, 26,27, 4,6, 12,19, 3,8, 0,6, 13,18, 15,16, 0,2
 };
-static PROGMEM prog_char COBRAMK1_vertices[] = {
+static flash_int8_t COBRAMK1_vertices[] = {
 -17,0,47, 17,0,47, -63,0,6, 63,0,6, -30,11,-36, 30,11,-36, -51,-11,-36, 51,-11,-36, 0,11,-5, 0,0,47, 0,0,57
 };
-static PROGMEM prog_uchar COBRAMK1_edges[] = {
+static flash_uint8_t COBRAMK1_edges[] = {
 0,1, 2,6, 6,7, 4,6, 4,8, 4,5, 5,7, 2,4, 0,6, 1,8, 1,3, 1,7, 3,7, 0,8, 0,2, 5,8, 3,5
 };
-static PROGMEM prog_char CONSTRICTOR_vertices[] = {
+static flash_int8_t CONSTRICTOR_vertices[] = {
 15,-5,63, -15,-5,63, -42,-5,31, -42,-5,-31, -15,10,-31, 15,10,-31, 42,-5,-31, 42,-5,31, 15,10,3, -15,10,3, 15,-5,48, -15,-5,48, 19,-5,-19, -19,-5,-19, 11,-5,-11, -11,-5,-11, 0,-5,0
 };
-static PROGMEM prog_uchar CONSTRICTOR_edges[] = {
+static flash_uint8_t CONSTRICTOR_edges[] = {
 5,6, 0,7, 8,9, 5,8, 1,2, 6,7, 2,9, 10,12, 3,6, 11,13, 12,14, 4,5, 13,15, 3,9, 2,3, 1,9, 4,9, 0,8, 0,1, 6,8, 7,8, 10,14, 11,15, 3,4
 };
-static PROGMEM prog_char CORIOLIS_vertices[] = {
+static flash_int8_t CORIOLIS_vertices[] = {
 63,0,63, 0,63,63, -63,0,63, 0,-63,63, 63,-63,0, 63,63,0, -63,63,0, -63,-63,0, 63,0,-63, 0,63,-63, -63,0,-63, 0,-63,-63, 3,-11,63, 3,11,63, -3,11,63, -3,-11,63
 };
-static PROGMEM prog_uchar CORIOLIS_edges[] = {
+static flash_uint8_t CORIOLIS_edges[] = {
 5,9, 6,9, 10,11, 4,8, 8,9, 1,6, 7,11, 3,7, 0,3, 5,8, 1,2, 12,13, 6,10, 1,5, 7,10, 0,4, 14,15, 2,7, 2,6, 8,11, 9,10, 2,3, 4,11, 0,1, 12,15, 13,14, 0,5, 3,4
 };
-static PROGMEM prog_char COUGAR_vertices[] = {
+static flash_int8_t COUGAR_vertices[] = {
 0,4,63, -18,0,37, -37,0,-37, 0,13,-37, 0,-13,-37, 18,0,37, 37,0,-37, -33,0,52, -56,0,-18, 33,0,52, 56,0,-18, 0,6,32, 0,7,23, -11,1,42, 11,1,42, -9,5,-37, -9,-5,-37, 9,-5,-37, 9,5,-37, 0,0,-37
 };
-static PROGMEM prog_uchar COUGAR_edges[] = {
+static flash_uint8_t COUGAR_edges[] = {
 5,9, 5,6, 2,8, 18,19, 11,14, 15,19, 0,3, 1,2, 12,13, 6,10, 3,6, 11,13, 17,18, 17,19, 12,14, 4,5, 1,4, 9,10, 2,3, 16,19, 11,12, 0,1, 4,6, 7,8, 1,7, 0,5, 15,16, 2,4
 };
-static PROGMEM prog_char DODO_vertices[] = {
+static flash_int8_t DODO_vertices[] = {
 0,38,50, 37,11,50, 22,-31,50, -22,-31,50, -37,11,50, 0,63,11, 59,19,11, 37,-50,11, -37,-50,11, -59,19,11, 37,50,-11, 59,-19,-11, 0,-63,-11, -59,-19,-11, -37,50,-11, 22,31,-50, 37,-11,-50, 0,-38,-50, -37,-11,-50, -22,31,-50, -4,8,50, -4,-8,50, 4,8,50, 4,-8,50
 };
-static PROGMEM prog_uchar DODO_edges[] = {
+static flash_uint8_t DODO_edges[] = {
 11,16, 8,13, 7,12, 10,15, 1,6, 7,11, 15,19, 18,19, 1,2, 5,14, 4,9, 20,21, 6,10, 14,19, 12,17, 0,4, 2,7, 9,14, 20,22, 6,11, 21,23, 22,23, 2,3, 17,18, 16,17, 0,1, 9,13, 5,10, 8,12, 15,16, 3,8, 13,18, 0,5, 3,4
 };
-static PROGMEM prog_char FERDELANCE_vertices[] = {
+static flash_int8_t FERDELANCE_vertices[] = {
 0,-8,63, -23,-8,-2, -7,-8,-30, 7,-8,-30, 23,-8,-2, -23,8,-2, -7,1,-30, 7,1,-30, 23,8,-2, 0,10,-11, -1,-6,56, -15,4,10, -9,8,-2, 1,-6,56, 15,4,10, 9,8,-2, 0,-8,-11, -8,-8,25, 8,-8,25
 };
-static PROGMEM prog_uchar FERDELANCE_edges[] = {
+static flash_uint8_t FERDELANCE_edges[] = {
 5,9, 6,9, 10,11, 4,8, 5,6, 8,9, 3,7, 1,2, 6,7, 10,12, 1,5, 0,4, 7,9, 16,18, 17,18, 2,6, 13,15, 14,15, 0,5, 0,8, 11,12, 16,17, 0,1, 13,14, 7,8, 2,3, 3,4
 };
-static PROGMEM prog_char GECKO_vertices[] = {
+static flash_int8_t GECKO_vertices[] = {
 -9,-3,44, 9,-3,44, -15,7,-21, 15,7,-21, -63,0,-2, 63,0,-2, -19,-13,-21, 19,-13,-21, -7,-5,31, 7,-5,31, -7,-12,-15, 7,-12,-15
 };
-static PROGMEM prog_uchar GECKO_edges[] = {
+static flash_uint8_t GECKO_edges[] = {
 0,1, 1,3, 6,7, 4,6, 0,6, 5,7, 2,4, 3,7, 1,5, 2,6, 2,3, 1,7, 0,4, 0,2, 3,5
 };
-static PROGMEM prog_char KRAIT_vertices[] = {
+static flash_int8_t KRAIT_vertices[] = {
 0,0,63, 0,11,-31, 0,-11,-31, 59,0,-1, -59,0,-1, 59,0,57, -59,0,57, 0,3,34, 0,4,24, -11,4,12, 11,4,12, 11,7,-25, 11,-7,-25, 23,0,-19, -11,7,-25, -11,-7,-25, -23,0,-19
 };
-static PROGMEM prog_uchar KRAIT_edges[] = {
+static flash_uint8_t KRAIT_edges[] = {
 0,1, 1,2, 1,3, 14,16, 12,13, 15,16, 8,10, 1,4, 2,4, 8,9, 2,3, 7,10, 0,4, 14,15, 0,3, 7,9, 11,12, 0,2, 7,8, 11,13
 };
-static PROGMEM prog_char MAMBA_vertices[] = {
+static flash_int8_t MAMBA_vertices[] = {
 0,0,63, -63,-7,-31, -31,7,-31, 31,7,-31, 63,-7,-31, -3,3,15, 3,3,15, 7,2,27, -7,2,27, -19,-3,15, 19,-3,15, -23,-6,-19, -15,-6,-19, 15,-6,-19, 23,-6,-19, -7,3,-31, 7,3,-31, 7,-3,-31, -7,-3,-31, -31,3,-31, 31,3,-31, 35,-3,-31, -35,-3,-31, -37,0,-31, 37,0,-31
 };
-static PROGMEM prog_uchar MAMBA_edges[] = {
+static flash_uint8_t MAMBA_edges[] = {
 22,23, 5,6, 19,22, 0,3, 5,8, 1,2, 6,7, 20,21, 9,11, 15,18, 0,4, 17,18, 10,13, 1,4, 2,3, 3,4, 11,12, 16,17, 0,1, 20,24, 13,14, 15,16, 10,14, 21,24, 19,23, 7,8, 0,2, 9,12
 };
-static PROGMEM prog_char MISSILE_vertices[] = {
+static flash_int8_t MISSILE_vertices[] = {
 0,0,63, 7,7,33, -7,7,33, -7,-7,33, 7,-7,33, 7,7,-40, -7,7,-40, -7,-7,-40, 7,-7,-40, 11,11,-40, -11,11,-40, -11,-11,-40, 11,-11,-40, 7,7,-11, -7,7,-11, -7,-7,-11, 7,-7,-11
 };
-static PROGMEM prog_uchar MISSILE_edges[] = {
+static flash_uint8_t MISSILE_edges[] = {
 5,9, 4,8, 5,6, 12,16, 5,13, 7,11, 3,7, 0,3, 5,8, 6,14, 1,2, 6,7, 7,15, 6,10, 1,5, 0,4, 8,16, 2,6, 1,4, 2,3, 0,1, 9,13, 8,12, 3,4, 10,14, 11,15, 7,8, 0,2
 };
-static PROGMEM prog_char MORAY_vertices[] = {
+static flash_int8_t MORAY_vertices[] = {
 14,0,63, -14,0,63, 0,17,-38, -58,0,0, 58,0,0, 29,-26,-9, -29,-26,-9, -8,-3,-24, 8,-3,-24, 0,-17,-15, 12,2,47, 5,0,63, -12,2,47, -5,0,63
 };
-static PROGMEM prog_uchar MORAY_edges[] = {
+static flash_uint8_t MORAY_edges[] = {
 1,2, 0,1, 1,3, 0,5, 5,6, 2,4, 8,9, 4,5, 2,6, 2,3, 3,6, 0,4, 1,6, 2,5, 7,8, 0,2, 7,9
 };
-static PROGMEM prog_char PLATELET_vertices[] = {
+static flash_int8_t PLATELET_vertices[] = {
 -20,-30,-12, -20,52,-12, 26,43,15, 13,-63,8
 };
-static PROGMEM prog_uchar PLATELET_edges[] = {
+static flash_uint8_t PLATELET_edges[] = {
 0,1, 1,2, 0,3, 2,3
 };
-static PROGMEM prog_char PYTHON_vertices[] = {
+static flash_int8_t PYTHON_vertices[] = {
 0,0,63, 0,13,13, 27,0,-4, -27,0,-4, 0,13,-9, 0,6,-31, -13,0,-31, 13,0,-31, 0,-13,13, 0,-13,-9, 0,-6,-31
 };
-static PROGMEM prog_uchar PYTHON_edges[] = {
+static flash_uint8_t PYTHON_edges[] = {
 1,3, 5,6, 2,8, 8,9, 0,3, 1,2, 2,9, 6,10, 3,6, 2,7, 7,10, 4,5, 1,4, 9,10, 3,9, 0,8, 0,1, 5,7, 0,2, 3,8, 3,4, 2,4
 };
-static PROGMEM prog_char SIDEWINDER_vertices[] = {
+static flash_int8_t SIDEWINDER_vertices[] = {
 -31,0,35, 31,0,35, 63,0,-27, -63,0,-27, 0,15,-27, 0,-15,-27, -11,5,-27, 11,5,-27, 11,-5,-27, -11,-5,-27
 };
-static PROGMEM prog_uchar SIDEWINDER_edges[] = {
+static flash_uint8_t SIDEWINDER_edges[] = {
 0,1, 1,2, 2,5, 6,7, 7,8, 6,9, 1,4, 8,9, 1,5, 0,5, 0,4, 0,3, 3,4, 2,4, 3,5
 };
-static PROGMEM prog_char SHUTTLE_vertices[] = {
+static flash_int8_t SHUTTLE_vertices[] = {
 0,-30,41, -30,0,41, 0,32,41, 32,0,41, -36,-36,-48, -36,36,-48, 36,36,-48, 36,-36,-48, 9,0,-48, 0,-3,-48, -9,0,-48, 0,5,-48, 0,-16,63, 5,-1,55, 7,19,45, 19,7,45, -5,-1,55, -5,19,45, -18,7,45
 };
-static PROGMEM prog_uchar SHUTTLE_edges[] = {
+static flash_uint8_t SHUTTLE_edges[] = {
 4,7, 10,11, 5,6, 0,7, 8,9, 2,12, 3,7, 2,5, 0,3, 1,2, 6,7, 1,5, 3,6, 0,4, 16,18, 16,17, 2,6, 4,5, 8,11, 13,15, 1,4, 0,12, 9,10, 2,3, 0,1, 3,12, 1,12, 13,14, 17,18, 14,15
 };
-static PROGMEM prog_char THARGLET_vertices[] = {
+static flash_int8_t THARGLET_vertices[] = {
 -14,0,63, -14,-59,18, -14,-37,-50, -14,37,-50, -14,59,18, 14,0,-12, 14,-15,-23, 14,-9,-40, 14,9,-40, 14,15,-23
 };
-static PROGMEM prog_uchar THARGLET_edges[] = {
+static flash_uint8_t THARGLET_edges[] = {
 0,1, 1,2, 6,7, 5,9, 5,6, 7,8, 2,7, 1,6, 3,8, 2,3, 0,4, 0,5, 8,9, 4,9, 3,4
 };
-static PROGMEM prog_char THARGOID_vertices[] = {
+static flash_int8_t THARGOID_vertices[] = {
 12,-18,18, 12,-26,0, 12,-18,-18, 12,0,-26, 12,18,-18, 12,26,0, 12,18,18, 12,0,26, -9,-44,44, -9,-63,0, -9,-44,-44, -9,0,-63, -9,44,-44, -9,63,0, -9,44,44, -9,0,63, -9,24,30, -9,24,-30, -9,-24,-30, -9,-24,30
 };
-static PROGMEM prog_uchar THARGOID_edges[] = {
+static flash_uint8_t THARGOID_edges[] = {
 10,11, 5,6, 5,13, 0,7, 8,9, 4,12, 6,14, 1,2, 0,8, 6,7, 7,15, 12,13, 8,15, 4,5, 3,11, 9,10, 2,3, 1,9, 2,10, 11,12, 0,1, 13,14, 14,15, 3,4
 };
-static PROGMEM prog_char TRANSPORTER_vertices[] = {
+static flash_int8_t TRANSPORTER_vertices[] = {
 0,19,-49, -47,7,-49, -53,-5,-49, -47,-15,-49, 49,-15,-49, 55,-5,-49, 49,7,-49, 0,11,22, -57,-1,22, -63,-15,22, 63,-15,22, 57,-1,22, -21,-3,57, -24,-15,57, 26,-15,57, 21,-3,57, -9,11,3, -34,5,3, -9,13,-13, -34,7,-13, -21,11,-26, -21,9,-13, 9,13,-26, 34,7,-26, 21,9,-13, 9,11,-5, 34,5,-5, 21,7,15, 21,9,-5, -30,-15,-24, -30,-15,30, 32,-15,-24, 32,-15,30, -24,-5,-49, 24,-5,-49, 17,5,-49, -15,5,-49
 };
-static PROGMEM prog_uchar TRANSPORTER_edges[] = {
+static flash_uint8_t TRANSPORTER_edges[] = {
 10,11, 5,6, 0,7, 8,9, 34,35, 7,11, 1,2, 7,15, 2,9, 12,13, 6,11, 35,36, 4,10, 4,5, 33,34, 3,9, 2,3, 33,36, 7,12, 11,15, 0,1, 9,13, 12,15, 5,10, 8,12, 13,14, 3,4, 0,6, 1,8, 10,14, 14,15, 7,8
 };
-static PROGMEM prog_char VIPER_vertices[] = {
+static flash_int8_t VIPER_vertices[] = {
 0,0,63, 0,14,21, 0,-14,21, 42,0,-21, -42,0,-21, 21,-14,-21, -21,-14,-21, 21,14,-21, -21,14,-21, -28,0,-21, 28,0,-21, 7,7,-21, -7,7,-21, -7,-7,-21, 7,-7,-21
 };
-static PROGMEM prog_uchar VIPER_edges[] = {
+static flash_uint8_t VIPER_edges[] = {
 0,1, 9,13, 2,5, 2,6, 10,11, 4,6, 4,8, 5,6, 1,7, 12,13, 1,8, 10,14, 11,14, 0,4, 3,7, 0,3, 7,8, 0,2, 9,12, 3,5
 };
-static PROGMEM prog_char WORM_vertices[] = {
+static flash_int8_t WORM_vertices[] = {
 18,-18,63, -18,-18,63, 9,10,27, -9,10,27, 27,-18,45, -27,-18,45, 46,-18,-45, -46,-18,-45, 14,25,-45, -14,25,-45
 };
-static PROGMEM prog_uchar WORM_edges[] = {
+static flash_uint8_t WORM_edges[] = {
 0,1, 1,3, 6,7, 6,8, 4,6, 2,8, 5,7, 2,4, 8,9, 1,5, 3,9, 2,3, 0,4, 7,9, 0,2, 3,5
 };
 
@@ -177,9 +177,9 @@ struct ship
 {
   const char *name;
   byte nvertices;
-  prog_char *vertices;
+  flash_int8_t *vertices;
   byte nedges;
-  prog_uchar *edges;
+  flash_uint8_t *edges;
 };
 
 static struct ship eliteships[] = {

+ 1 - 1
converted-assets/eraser.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar eraser_code[] = {
+static flash_uint8_t eraser_code[] = {
 0x81,0x15,
 0x98,0xA8,
 0x00,0x60,

+ 3 - 3
converted-assets/froggerbg.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar froggerbg_pic[] = {
+static flash_uint8_t froggerbg_pic[] = {
 
 0x00,  0x00,  0x00,  0x00,  0x01,  0x02,  0x03,  0x04,  0x00,  0x00,  0x05,  0x06,  0x02,  0x07,  0x08,  0x09, 
 0x0a,  0x0b,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x0c,  0x0d,  0x0e,  0x0f, 
@@ -60,7 +60,7 @@ static PROGMEM prog_uchar froggerbg_pic[] = {
 0x22,  0x24,  0x22,  0x22,  0x22,  0x22,  0x22,  0x22,  0x22,  0x22,  0x22,  0x22,  0x22,  0x25,  0x25,  0x25, 
 0x25,  0x25,  0x25,  0x25,  0x25,  0x25,  0x25,  0x25,  0x25,  0x25,  0x25,  0x25,  0x26,  0x27,  0x28,  0x29, 
 };
-static PROGMEM prog_uchar froggerbg_chr[] = {
+static flash_uint8_t froggerbg_chr[] = {
 
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x55,  0x05,  0x54,  0x05,  0x55,  0x05,  0x55,  0x05,  0x55,  0x05,  0x55,  0x05,  0x50,  0x00,  0x55,  0x55, 
@@ -107,7 +107,7 @@ static PROGMEM prog_uchar froggerbg_chr[] = {
 0x14,  0x05,  0x15,  0x15,  0x15,  0x55,  0x15,  0x55,  0x14,  0x45,  0x14,  0x05,  0x14,  0x05,  0x00,  0x00, 
 0x05,  0x55,  0x05,  0x00,  0x05,  0x00,  0x05,  0x54,  0x05,  0x00,  0x05,  0x00,  0x05,  0x55,  0x00,  0x00, 
 };
-static PROGMEM prog_uchar froggerbg_pal[] = {
+static flash_uint8_t froggerbg_pal[] = {
 
 0x08,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x7e,  0x6f,  0x08,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x7e,  0x6f,  0x08,  0x00,  0x00,  0x00,  0x00,  0x00,  0x7e,  0x6f,  0x08,  0x00,  0x00,  0x00,  0x00,  0x00, 

+ 15 - 15
converted-assets/instruments.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar harp[] = {
+static flash_uint8_t harp[] = {
 
 0x10,  0x25,  0xad,  0x54,  0x29,  0x24,  0x9b,  0x50,  0x8d,  0x4c,  0x37,  0x2c,  0x1d,  0x1c,  0x18,  0x18, 
 0x9b,  0x96,  0x48,  0x34,  0x41,  0x30,  0x17,  0x14,  0x30,  0x28,  0x10,  0x10,  0x0a,  0x0c,  0x07,  0x08, 
@@ -43,7 +43,7 @@ static PROGMEM prog_uchar harp[] = {
 0x10,  0x14,  0x00,  0x01,  0x01,  0x00,  0x01,  0x00,  0x02,  0x00,  0x01,  0x01,  0x02,  0x01,  0x0a,  0x04, 
 0x0f,  0x13, 
 };
-static PROGMEM prog_uchar flute[] = {
+static flash_uint8_t flute[] = {
 
 0x10,  0x28,  0x24,  0x18,  0x6c,  0x1c,  0xd9,  0x2c,  0x16,  0x18,  0x70,  0x28,  0x0c,  0x0e,  0xd8,  0x24, 
 0x73,  0x20,  0xa0,  0x1b,  0xca,  0x17,  0x65,  0x0f,  0xf4,  0x0f,  0xe6,  0x13,  0xf3,  0x0b,  0xf0,  0x07, 
@@ -91,7 +91,7 @@ static PROGMEM prog_uchar flute[] = {
 0x0a,  0xc6,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x01,  0x00,  0x08, 
 0x1f,  0xb4, 
 };
-static PROGMEM prog_uchar recorder[] = {
+static flash_uint8_t recorder[] = {
 
 0x10,  0x3d,  0x2e,  0x30,  0x59,  0x13,  0xa9,  0x13,  0x86,  0x13,  0xae,  0x13,  0xcf,  0x14,  0x89,  0x13, 
 0x5d,  0x13,  0x49,  0x13,  0x55,  0x13,  0x72,  0x13,  0x6f,  0x14,  0x36,  0x20,  0x28,  0x18,  0x14,  0x10, 
@@ -161,7 +161,7 @@ static PROGMEM prog_uchar recorder[] = {
 0x02,  0x7d,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x02,  0x03, 
 0x05,  0x9e, 
 };
-static PROGMEM prog_uchar bass[] = {
+static flash_uint8_t bass[] = {
 
 0x10,  0x09,  0xd5,  0x3e,  0x31,  0x6e,  0xcb,  0x65,  0x38,  0x36,  0x40,  0x5d,  0x60,  0x2f,  0xc3,  0x54, 
 0x48,  0x4c,  0xcc,  0x43,  0x52,  0x3b,  0xd9,  0x32,  0x60,  0x2a,  0xe6,  0x21,  0x6d,  0x19,  0xf1,  0x10, 
@@ -176,7 +176,7 @@ static PROGMEM prog_uchar bass[] = {
 0x0e,  0x27,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x01,  0x02,  0x04, 
 0x07,  0x14, 
 };
-static PROGMEM prog_uchar bowed[] = {
+static flash_uint8_t bowed[] = {
 
 0x10,  0x89,  0x6e,  0x24,  0x4b,  0x48,  0x08,  0x0c,  0xe0,  0x4c,  0x8a,  0x31,  0x8f,  0x06,  0x94,  0x0b, 
 0x15,  0x0c,  0xb5,  0x20,  0x13,  0x1c,  0xfb,  0x03,  0xd9,  0x07,  0x9b,  0x0f,  0x18,  0x0c,  0xf4,  0x17, 
@@ -327,7 +327,7 @@ static PROGMEM prog_uchar bowed[] = {
 0x02,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x07,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x01,  0x00, 
 };
-static PROGMEM prog_uchar chimebar[] = {
+static flash_uint8_t chimebar[] = {
 
 0x10,  0x87,  0x43,  0x11,  0x27,  0x0e,  0x2d,  0x0b,  0xbe,  0x11,  0x02,  0x0b,  0xac,  0x35,  0x3f,  0x2b, 
 0x41,  0x0e,  0xf5,  0x1d,  0xcc,  0x23,  0x46,  0x0a,  0x7d,  0x12,  0xd8,  0x18,  0x5c,  0x21,  0x02,  0x04, 
@@ -476,7 +476,7 @@ static PROGMEM prog_uchar chimebar[] = {
 0x01,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x01,  0x00, 
 };
-static PROGMEM prog_uchar clarinet[] = {
+static flash_uint8_t clarinet[] = {
 
 0x10,  0x4e,  0x0e,  0x30,  0xa6,  0x1f,  0x61,  0x24,  0xce,  0x33,  0xc9,  0x32,  0x86,  0x1f,  0x17,  0x24, 
 0xda,  0x2b,  0xfc,  0x1f,  0x07,  0x08,  0x74,  0x1b,  0x19,  0x14,  0x3b,  0x10,  0x86,  0x17,  0x80,  0x0b, 
@@ -565,7 +565,7 @@ static PROGMEM prog_uchar clarinet[] = {
 
 0x00,  0x01, 
 };
-static PROGMEM prog_uchar fiddle[] = {
+static flash_uint8_t fiddle[] = {
 
 0x10,  0x36,  0x5a,  0x6c,  0x1b,  0x56,  0xfd,  0x5c,  0xd3,  0x64,  0x6f,  0x83,  0x0b,  0x08,  0x6e,  0x4d, 
 0xd0,  0x45,  0x16,  0x3e,  0x2b,  0x35,  0xaf,  0x2e,  0x3d,  0x10,  0xef,  0x26,  0x88,  0x07,  0x9b,  0x17, 
@@ -628,7 +628,7 @@ static PROGMEM prog_uchar fiddle[] = {
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x01, 
 0x00,  0x00, 
 };
-static PROGMEM prog_uchar glock[] = {
+static flash_uint8_t glock[] = {
 
 0x10,  0x6c,  0xdd,  0x59,  0x3f,  0x26,  0xd8,  0x59,  0xac,  0x1d,  0x1d,  0x40,  0xb1,  0x19,  0xb4,  0x18, 
 0xc7,  0x5e,  0x7a,  0x50,  0x9f,  0x37,  0xb1,  0x6f,  0xf5,  0x2b,  0x83,  0x56,  0x5c,  0x45,  0x06,  0x10, 
@@ -748,7 +748,7 @@ static PROGMEM prog_uchar glock[] = {
 0x01,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x01,  0x00, 
 };
-static PROGMEM prog_uchar guitar[] = {
+static flash_uint8_t guitar[] = {
 
 0x10,  0x8e,  0x83,  0x34,  0x0d,  0x18,  0xc2,  0x51,  0xf6,  0x55,  0x3e,  0x28,  0x50,  0x4d,  0xc6,  0x3c, 
 0x92,  0x38,  0x2b,  0x24,  0x18,  0x20,  0x19,  0x1c,  0x00,  0x08,  0x0c,  0x14,  0x00,  0x0c,  0x01,  0x04, 
@@ -905,7 +905,7 @@ static PROGMEM prog_uchar guitar[] = {
 
 0x01,  0x00, 
 };
-static PROGMEM prog_uchar musicbox[] = {
+static flash_uint8_t musicbox[] = {
 
 0x10,  0x0e,  0x29,  0x68,  0xec,  0x0c,  0x38,  0x0c,  0x60,  0x03,  0x47,  0x70,  0xfb,  0x03,  0x00,  0x04, 
 0xf9,  0x03,  0x5a,  0x03,  0x95,  0x22,  0x48,  0x81,  0xd6,  0x03,  0x4e,  0x0f,  0x65,  0x29,  0x0f,  0x70, 
@@ -926,7 +926,7 @@ static PROGMEM prog_uchar musicbox[] = {
 
 0x00,  0x0f, 
 };
-static PROGMEM prog_uchar nylon[] = {
+static flash_uint8_t nylon[] = {
 
 0x10,  0x35,  0x62,  0x80,  0x1d,  0x38,  0x11,  0x68,  0x2a,  0x60,  0x1b,  0x78,  0xa4,  0x14,  0x13,  0x40, 
 0x07,  0x30,  0x29,  0x58,  0x26,  0x50,  0x0f,  0x28,  0x0e,  0x48,  0x02,  0x20,  0x09,  0x18,  0xfc,  0x07, 
@@ -988,7 +988,7 @@ static PROGMEM prog_uchar nylon[] = {
 0x00,  0x01,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x02, 
 0x00,  0x00, 
 };
-static PROGMEM prog_uchar oboe[] = {
+static flash_uint8_t oboe[] = {
 
 0x10,  0x7a,  0xe5,  0x0d,  0x0d,  0x25,  0x93,  0x1c,  0xad,  0x30,  0xfd,  0x17,  0x14,  0x04,  0x73,  0x2c, 
 0xa8,  0x24,  0x7c,  0x28,  0x33,  0x0c,  0x4f,  0x20,  0x48,  0x10,  0x2a,  0x08,  0x41,  0x14,  0x67,  0x1c, 
@@ -1123,7 +1123,7 @@ static PROGMEM prog_uchar oboe[] = {
 0x09,  0x0c,  0x00,  0x00,  0x00,  0x00,  0x00,  0x04,  0x00,  0x01,  0x01,  0x06,  0x01,  0x02,  0x04,  0x03, 
 0x03,  0x03, 
 };
-static PROGMEM prog_uchar organ[] = {
+static flash_uint8_t organ[] = {
 
 0x10,  0x59,  0xfa,  0x4b,  0x91,  0x2e,  0xa5,  0x1d,  0x01,  0x87,  0x41,  0x65,  0x1c,  0x26,  0xa9,  0x43, 
 0x57,  0x2a,  0x2a,  0x15,  0xb1,  0x0c,  0x47,  0x19,  0x94,  0x32,  0xd6,  0x21,  0xe9,  0x10,  0x77,  0x08, 
@@ -1223,7 +1223,7 @@ static PROGMEM prog_uchar organ[] = {
 0x21,  0x3e,  0x03,  0x00,  0x04,  0x04,  0x03,  0x03,  0x00,  0x04,  0x06,  0x06,  0x05,  0x0f,  0x0a,  0x11, 
 0x1c,  0x33, 
 };
-static PROGMEM prog_uchar piano[] = {
+static flash_uint8_t piano[] = {
 
 0x10,  0x20,  0x9c,  0x5e,  0x1e,  0x5a,  0x0d,  0x56,  0xf7,  0x30,  0xb1,  0x25,  0xb3,  0x38,  0x43,  0x24, 
 0xc7,  0x68,  0xed,  0x1b,  0x29,  0x28,  0xfb,  0x33,  0xfb,  0x13,  0xf0,  0x17,  0xf5,  0x07,  0x5b,  0x10, 

+ 2 - 2
converted-assets/lena.h

@@ -73,7 +73,7 @@ break;
         }
     }
     
-static PROGMEM prog_uchar lenaimg[] = {
+static flash_uint8_t lenaimg[] = {
 
 0x8e,  0xd1,  0x03,  0xa3,  0x0d,  0x40,  0x90,  0x20,  0x31,  0x62,  0x41,  0x50,  0xa3,  0x46,  0x82,  0x0c, 
 0x35,  0x29,  0xf1,  0xf1,  0x08,  0xc4,  0x0a,  0x4c,  0x0c,  0x3d,  0x8a,  0x78,  0xe8,  0x28,  0x4a,  0x89, 
@@ -975,7 +975,7 @@ static PROGMEM prog_uchar lenaimg[] = {
 0xdc,  0xba,  0xb5,  0x6b,  0xce,  0xb0,  0x19,  0x7d,  0xba,  0xbe,  0xc8,  0xe7,  0xc3,  0x47,  0x9b,  0x35, 
 0x17,  0xde,  0xdc,  0x5a,  0xd3,  0xa3,  0x04, 
 };
-static PROGMEM prog_uchar lenapal[] = {
+static flash_uint8_t lenapal[] = {
 
 0x77,  0x7b,  0x55,  0x7b,  0x54,  0x7b,  0x56,  0x77,  0x35,  0x7b,  0x32,  0x7b,  0x37,  0x73,  0x35,  0x77, 
 0x16,  0x7b,  0x16,  0x77,  0x33,  0x7b,  0x11,  0x7b,  0x17,  0x73,  0x16,  0x73,  0x16,  0x73,  0x16,  0x6f, 

File diff suppressed because it is too large
+ 29 - 29
converted-assets/manicminer.h


+ 1 - 1
converted-assets/mont.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar mont[] = {
+static flash_uint8_t mont[] = {
 
 0xa1,  0x70,  0x03,  0x05,  0x8f,  0xe0,  0x06,  0x0a,  0x98,  0x26,  0x05,  0x05,  0xa9,  0x4d,  0x0a,  0x0a, 
 0xa2,  0xb8,  0x01,  0x02,  0xaf,  0xba,  0x01,  0x02,  0x82,  0xb5,  0x01,  0x01,  0x89,  0x26,  0x05,  0x02, 

+ 1 - 1
converted-assets/music.h

@@ -1,6 +1,6 @@
 #define PAUSE(x)      255,x
 #define NOTE(v, p, a) v, p, a
-static PROGMEM prog_uchar widor_toccata[] = {
+static flash_uint8_t widor_toccata[] = {
 /* {'track': 1, 'velocity': 70, 't': 0, 'channel': 2, 'pitch': 65} */
 PAUSE(1),
 NOTE(8, 65, 70),

+ 2 - 2
converted-assets/pickups2.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar pickups2_img[] = {
+static flash_uint8_t pickups2_img[] = {
 
 0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, 
 0xff,  0xff,  0x4d,  0x49,  0x46,  0x02,  0x41,  0x43,  0x45,  0x46,  0x49,  0x4c,  0x4d,  0xff,  0xff,  0xff, 
@@ -884,7 +884,7 @@ static PROGMEM prog_uchar pickups2_img[] = {
 0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0x50,  0x50,  0x50,  0x50,  0x50,  0xff,  0xff,  0xff,  0xff,  0xff, 
 0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, 
 };
-static PROGMEM prog_uchar pickups2_pal[] = {
+static flash_uint8_t pickups2_pal[] = {
 
 0xff,  0x7f,  0xbd,  0x77,  0x9c,  0x73,  0x5a,  0x6b,  0x31,  0x7f,  0x24,  0x7b,  0x10,  0x7f,  0xef,  0x7e, 
 0xcf,  0x7e,  0xce,  0x7e,  0xcc,  0x7a,  0xe3,  0x76,  0xab,  0x76,  0x8b,  0x76,  0xa3,  0x6e,  0x83,  0x6a, 

+ 3 - 3
converted-assets/platformer.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar platformer_pic[] = {
+static flash_uint8_t platformer_pic[] = {
 
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x01,  0x02,  0x03,  0x00,  0x01,  0x02,  0x03,  0x00,  0x01,  0x02,  0x03,  0x00,  0x01,  0x02,  0x03,  0x00, 
@@ -34,7 +34,7 @@ static PROGMEM prog_uchar platformer_pic[] = {
 0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d, 
 0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d,  0x5d, 
 };
-static PROGMEM prog_uchar platformer_chr[] = {
+static flash_uint8_t platformer_chr[] = {
 
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x15,  0x55,  0x41,  0x55,  0x54, 
@@ -203,7 +203,7 @@ static PROGMEM prog_uchar platformer_chr[] = {
 0x80,  0x03,  0x80,  0x0c,  0x80,  0x03,  0x80,  0x0c,  0x80,  0x03,  0x80,  0x0c,  0x80,  0x03,  0x80,  0x4c, 
 0x55,  0x05,  0x55,  0x05,  0x15,  0x05,  0x55,  0x41,  0x15,  0x41,  0x55,  0x41,  0x15,  0x41,  0x56,  0x41, 
 };
-static PROGMEM prog_uchar platformer_pal[] = {
+static flash_uint8_t platformer_pal[] = {
 
 0x9f,  0x73,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x3f,  0x5f,  0x9f,  0x73,  0x00,  0x00,  0x00,  0x00, 
 0xff,  0x52,  0x3f,  0x5f,  0x9f,  0x73,  0x00,  0x00,  0xff,  0x52,  0x3f,  0x5f,  0x9f,  0x73,  0x00,  0x00, 

+ 2 - 2
converted-assets/r.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar r_img[] = {
+static flash_uint8_t r_img[] = {
 
 0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e, 
 0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e, 
@@ -17,7 +17,7 @@ static PROGMEM prog_uchar r_img[] = {
 0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e, 
 0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e,  0x0e, 
 };
-static PROGMEM prog_uchar r_pal[] = {
+static flash_uint8_t r_pal[] = {
 
 0xff,  0x7f,  0xff,  0x7f,  0xdf,  0x7b,  0xbf,  0x77,  0x5f,  0x6f,  0x3f,  0x6b,  0xbf,  0x5e,  0x7f,  0x5a, 
 0xbf,  0x45,  0x7f,  0x41,  0x3f,  0x39,  0x9f,  0x28,  0x5f,  0x24,  0x1f,  0x1c,  0x1f,  0x1c,  0x00,  0x00, 

+ 1 - 1
converted-assets/random.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar random_code[] = {
+static flash_uint8_t random_code[] = {
 0x81,0x15,
 0x00,0x80,
 0xED,0xFF,

+ 1 - 1
converted-assets/rasterinterrupt.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar rasterinterrupt_code[] = {
+static flash_uint8_t rasterinterrupt_code[] = {
 0x8C,0x15,
 0x01,0x80,
 0x0F,0x72,

+ 1 - 1
converted-assets/selftest1.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar selftest1_code[] = {
+static flash_uint8_t selftest1_code[] = {
 0x94,0x15,
 0x01,0x80,
 0x0F,0x72,

+ 1 - 1
converted-assets/showvoices.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar showvoices_code[] = {
+static flash_uint8_t showvoices_code[] = {
 0x81,0x15,
 0x00,0x80,
 0x81,0x60,

+ 1 - 1
converted-assets/soundbuffer.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar soundbuffer_code[] = {
+static flash_uint8_t soundbuffer_code[] = {
 0x86,0x15,
 0x01,0x80,
 0x0F,0x72,

+ 1 - 1
converted-assets/spectrum.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar spectrum_code[] = {
+static flash_uint8_t spectrum_code[] = {
 0xEE,0x15,
 0x01,0x80,
 0x0F,0x72,

+ 10 - 10
converted-assets/spectrum_data.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar spectrum_tables[] = {
+static flash_uint8_t spectrum_tables[] = {
 
 0xa1,  0x01,  0x98,  0x00,  0x08,  0x80,  0xe1,  0x07,  0x43,  0x7c,  0x82,  0xc3,  0xc0,  0xd0,  0x01,  0xe0, 
 0xc8,  0xc0,  0x7f,  0x60,  0xe8,  0x80,  0x7f,  0x70,  0xc8,  0x3f,  0x26,  0x0a,  0x0c,  0x02,  0xa2,  0xf8, 
@@ -12,7 +12,7 @@ static PROGMEM prog_uchar spectrum_tables[] = {
 0x8b,  0x01,  0x83,  0x01,  0x8f,  0x01,  0x33,  0x1e,  0xfc,  0x06,  0x0c,  0x9b,  0x31,  0xef,  0xc1,  0xb3, 
 0x1f,  0xff, 
 };
-static PROGMEM prog_uchar screen_mm1[] = {
+static flash_uint8_t screen_mm1[] = {
 
 0xa1,  0x81,  0x1a,  0x03,  0x05,  0x10,  0x00,  0x39,  0x08,  0x8a,  0x83,  0x08,  0x80,  0x02,  0x05,  0x0a, 
 0x88,  0x44,  0x70,  0x03,  0x00,  0xc1,  0x38,  0x7e,  0x00,  0xe0,  0xdf,  0x7f,  0x76,  0x04,  0xdc,  0xbf, 
@@ -141,7 +141,7 @@ static PROGMEM prog_uchar screen_mm1[] = {
 0x02,  0x5c,  0xea,  0x01,  0x38,  0xf3,  0x00,  0x99,  0x58,  0x80,  0x9f,  0xf0,  0x07,  0xda,  0x44,  0x03, 
 0xfc,  0x84,  0x07,  0x40,  0x80,  0x03,  0x00, 
 };
-static PROGMEM prog_uchar screen_mm2[] = {
+static flash_uint8_t screen_mm2[] = {
 
 0xa1,  0x01,  0x53,  0x21,  0x02,  0x10,  0x80,  0x62,  0x00,  0xe0,  0x3f,  0x14,  0x0a,  0x82,  0x23,  0x0b, 
 0x44,  0xf1,  0x79,  0x32,  0x1e,  0x41,  0xc7,  0xf7,  0xe9,  0x6c,  0xfc,  0x9f,  0xbf,  0x12,  0x69,  0x0e, 
@@ -226,7 +226,7 @@ static PROGMEM prog_uchar screen_mm2[] = {
 0x9c,  0x79,  0x80,  0x4c,  0x2c,  0xc0,  0x4f,  0xf8,  0x03,  0x6d,  0xa2,  0x01,  0x7e,  0xc2,  0x03,  0x20, 
 0xc0,  0x01,  0x00, 
 };
-static PROGMEM prog_uchar screen_aa0[] = {
+static flash_uint8_t screen_aa0[] = {
 
 0xa1,  0x41,  0x5f,  0x02,  0x08,  0x70,  0xd1,  0x25,  0x80,  0x00,  0xf9,  0x00,  0xf5,  0xef,  0xdf,  0x27, 
 0x7f,  0xff,  0xe8,  0x3d,  0xa4,  0x05,  0x80,  0x7c,  0x00,  0x08,  0x0d,  0xfc,  0x1b,  0x80,  0x6f,  0x00, 
@@ -504,7 +504,7 @@ static PROGMEM prog_uchar screen_aa0[] = {
 0x8f,  0xdb,  0xa2,  0xc0,  0x8a,  0x38,  0xc1,  0x04,  0xe8,  0x09,  0x78,  0x0a,  0x17,  0xc1,  0xf8,  0xf1, 
 0x3c,  0x48,  0x40,  0xfb,  0xc3,  0xc0,  0x60,  0x61,  0x00,  0x1e,  0xe0,  0x27,  0xdc,  0xc0,  0x01, 
 };
-static PROGMEM prog_uchar screen_aa1[] = {
+static flash_uint8_t screen_aa1[] = {
 
 0xa1,  0x41,  0xb0,  0x02,  0x08,  0x70,  0x41,  0x08,  0x48,  0x08,  0xc1,  0xfb,  0xf7,  0xef,  0x21,  0x05, 
 0x81,  0x0d,  0x07,  0xa3,  0x8d,  0x4c,  0x10,  0x20,  0x04,  0x0b,  0x39,  0x30,  0x6e,  0x91,  0x20,  0x00, 
@@ -698,7 +698,7 @@ static PROGMEM prog_uchar screen_aa1[] = {
 0x10,  0x1f,  0x6f,  0x41,  0xf5,  0x49,  0x3e,  0xd2,  0x9f,  0x11,  0xcf,  0x0b,  0x08,  0x07,  0x80,  0xf1, 
 0x75,  0xff,  0x13,  0x9f,  0x00,  0x05, 
 };
-static PROGMEM prog_uchar screen_fl1[] = {
+static flash_uint8_t screen_fl1[] = {
 
 0xa1,  0xc1,  0xf5,  0x00,  0xf7,  0x1f,  0x00,  0xb8,  0x17,  0x00,  0x20,  0x00,  0x08,  0x0e,  0x03,  0xc8, 
 0x08,  0x10,  0xa0,  0xf7,  0x58,  0xd0,  0x81,  0x7d,  0x79,  0xee,  0xfd,  0xeb,  0x00,  0xe0,  0x83,  0xaf, 
@@ -1031,7 +1031,7 @@ static PROGMEM prog_uchar screen_fl1[] = {
 0x9b,  0x87,  0x05,  0xc4,  0xc8,  0xcd,  0x07,  0xe4,  0xe2,  0xc3,  0x00,  0x73,  0x01,  0x08,  0x4e,  0xc3, 
 0xb3,  0x98,  0x22,  0x32,  0xbe,  0x01,  0x71,  0x04,  0x00,  0x1f,  0x65,  0x08,  0x0b,  0x1c, 
 };
-static PROGMEM prog_uchar screen_jp0[] = {
+static flash_uint8_t screen_jp0[] = {
 
 0xa1,  0x41,  0x33,  0xfa,  0x0f,  0xf0,  0x01,  0xe0,  0x4f,  0x0c,  0x0c,  0x80,  0x4f,  0x0e,  0x3c,  0x00, 
 0x4e,  0x0d,  0xfc,  0x00,  0x08,  0x01,  0x0d,  0x00,  0x08,  0x09,  0x1d,  0x00,  0xc8,  0x09,  0x7c,  0x00, 
@@ -1279,7 +1279,7 @@ static PROGMEM prog_uchar screen_jp0[] = {
 0x15,  0x10,  0xc0,  0x7c,  0x05,  0x77,  0x68,  0x42,  0x12,  0x3f,  0xd4,  0xa7,  0x01,  0x51,  0x7e,  0x14, 
 0xe0,  0xe2,  0x08,  0xf0,  0x13,  0x6e,  0x1c, 
 };
-static PROGMEM prog_uchar screen_jp1[] = {
+static flash_uint8_t screen_jp1[] = {
 
 0xa1,  0x01,  0x45,  0x01,  0x08,  0xc0,  0x60,  0x84,  0xe4,  0x21,  0x7e,  0xca,  0x5f,  0xea,  0xb7,  0xfe, 
 0x63,  0xfe,  0xda,  0x87,  0x5e,  0x6f,  0x00,  0x48,  0xe6,  0x2e,  0x03,  0x28,  0xe0,  0xee,  0x84,  0x41, 
@@ -1346,7 +1346,7 @@ static PROGMEM prog_uchar screen_jp1[] = {
 0x45,  0x5d,  0xf0,  0x22,  0x48,  0x28,  0x15,  0x7c,  0x4b,  0x5e,  0xc3,  0xf8,  0x84,  0x28,  0xd0,  0xfc, 
 0xac,  0xbe,  0x6c,  0x23,  0xef,  0xb2,  0xfc,  0x2c,  0x2f,  0x8e,  0x22,  0x81,  0x05,  0x38,  0xc0,  0x00, 
 };
-static PROGMEM prog_uchar screen_kl0[] = {
+static flash_uint8_t screen_kl0[] = {
 
 0xa1,  0x41,  0xfd,  0xfb,  0x0f,  0x70,  0x0d,  0x1a,  0x34,  0x00,  0x20,  0x00,  0x04,  0x2c,  0x20,  0x28, 
 0x0a,  0xce,  0x83,  0x31,  0xc1,  0x82,  0x0d,  0x0a,  0x8c,  0x8f,  0x43,  0x81,  0x12,  0xc8,  0x5f,  0x2c, 
@@ -1602,7 +1602,7 @@ static PROGMEM prog_uchar screen_kl0[] = {
 0xe6,  0x2d,  0x60,  0x20,  0x1c,  0xdf,  0x03,  0x20,  0xf6,  0x10,  0x1c,  0x06,  0xf5,  0x51,  0x03,  0x54, 
 0x9f,  0x04,  0xfe,  0x01,  0x37,  0x80,  0x00,  0x17,  0x78,  0x80,  0x9f,  0x70,  0x03,  0x07, 
 };
-static PROGMEM prog_uchar screen_kl1[] = {
+static flash_uint8_t screen_kl1[] = {
 
 0xa1,  0x41,  0xc6,  0x01,  0x08,  0xa0,  0x01,  0x01,  0x20,  0x40,  0x20,  0xa2,  0x89,  0xaf,  0x10,  0x20, 
 0xc0,  0x00,  0x03,  0x16,  0x06,  0x10,  0x20,  0x12,  0x16,  0x20,  0x40,  0xd0,  0xc0,  0x00,  0x6e,  0x84, 

+ 2 - 2
converted-assets/sphere.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar sphere_img[] = {
+static flash_uint8_t sphere_img[] = {
 
 0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, 
 0xff,  0xff,  0xff,  0xff,  0x00,  0x00,  0x00,  0x00,  0x03,  0x0b,  0x12,  0x20,  0xff,  0xff,  0xff,  0xff, 
@@ -17,7 +17,7 @@ static PROGMEM prog_uchar sphere_img[] = {
 0xff,  0xff,  0xff,  0xff,  0x27,  0x27,  0x27,  0x27,  0x27,  0x27,  0x27,  0x27,  0xff,  0xff,  0xff,  0xff, 
 0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, 
 };
-static PROGMEM prog_uchar sphere_pal[] = {
+static flash_uint8_t sphere_pal[] = {
 
 0xff,  0x7f,  0xff,  0x7f,  0xff,  0x7f,  0xde,  0x7b,  0xbd,  0x77,  0x9c,  0x73,  0x9c,  0x73,  0x7b,  0x6f, 
 0x7b,  0x6f,  0x5a,  0x6b,  0x5a,  0x6b,  0x5a,  0x6b,  0x39,  0x67,  0x18,  0x63,  0xf7,  0x5e,  0xf7,  0x5e, 

+ 1 - 1
converted-assets/splitscreen.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar splitscreen_code[] = {
+static flash_uint8_t splitscreen_code[] = {
 0xB3,0x15,
 0x01,0x80,
 0x0F,0x72,

+ 3 - 3
converted-assets/splitscreen_graphics.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar splitscreen_pic[] = {
+static flash_uint8_t splitscreen_pic[] = {
 
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
@@ -272,7 +272,7 @@ static PROGMEM prog_uchar splitscreen_pic[] = {
 0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74, 
 0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74,  0x74, 
 };
-static PROGMEM prog_uchar splitscreen_chr[] = {
+static flash_uint8_t splitscreen_chr[] = {
 
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x55,  0x55,  0x55,  0x57,  0x55,  0x4a,  0x55,  0xaa,  0x54,  0xaa,  0x5e,  0xaa,  0x5a,  0xaa,  0x7a,  0xaa, 
@@ -521,7 +521,7 @@ static PROGMEM prog_uchar splitscreen_chr[] = {
 0x54,  0x00,  0x54,  0x00,  0x54,  0x00,  0x54,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x55,  0x2a,  0x55,  0x6a,  0x55,  0x4a,  0x55,  0x5a,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55, 
 };
-static PROGMEM prog_uchar splitscreen_pal[] = {
+static flash_uint8_t splitscreen_pal[] = {
 
 0x1c,  0x02,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0xbc,  0x56,  0x1c,  0x02,  0xff,  0x7f,  0x1c,  0x2a, 
 0xbc,  0x56,  0x1c,  0x02,  0xff,  0x7f,  0x1c,  0x2a,  0x1c,  0x02,  0xff,  0x7f,  0x00,  0x00,  0x00,  0x00, 

+ 2 - 2
converted-assets/sprite.h

@@ -166,7 +166,7 @@ static void draw_sprite(int x, int y, byte anim, byte rot, byte jk = 0) {
   }
 }
 
-static PROGMEM prog_uchar sprite_sprimg[] = {
+static flash_uint8_t sprite_sprimg[] = {
 
 0xc9,  0x81,  0x89,  0xf8,  0x0f,  0xe0,  0x41,  0x3e,  0xa4,  0x87,  0x5d,  0x2f,  0xe4,  0x23,  0x09,  0x79, 
 0x2f,  0xc1,  0x85,  0x48,  0xf0,  0x80,  0x48,  0x04,  0x22,  0xc4,  0xe0,  0x41,  0x24,  0x84,  0x92,  0x97, 
@@ -329,7 +329,7 @@ static PROGMEM prog_uchar sprite_sprimg[] = {
 0x05,  0xaf,  0xfa,  0x31,  0xe3,  0x83,  0x77,  0xfe,  0x0f,  0xfe,  0x12,  0xfb,  0x4e,  0xfd,  0xaf,  0xff, 
 0xcd,  0xb7,  0xef,  0xd4,  0xff,  0x3a,  0xdf,  0x97,  0xfc,  0x03, 
 };
-static PROGMEM prog_uchar sprite_sprpal[] = {
+static flash_uint8_t sprite_sprpal[] = {
 
 0x7e,  0x6f,  0xe0,  0x7f,  0xe0,  0x4b,  0x7e,  0x03,  0x60,  0x13,  0xa9,  0x6d,  0x1e,  0x7d,  0x00,  0x7d, 
 0xa9,  0x49,  0x1e,  0x7c,  0x00,  0x7c,  0x1e,  0x48,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x80, 

+ 3 - 3
converted-assets/sprites256.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar sprites256_pic[] = {
+static flash_uint8_t sprites256_pic[] = {
 
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
@@ -272,7 +272,7 @@ static PROGMEM prog_uchar sprites256_pic[] = {
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 };
-static PROGMEM prog_uchar sprites256_chr[] = {
+static flash_uint8_t sprites256_chr[] = {
 
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x54,  0x56,  0x3f, 
@@ -527,7 +527,7 @@ static PROGMEM prog_uchar sprites256_chr[] = {
 0xaa,  0xaa,  0xaa,  0xaa,  0xaf,  0xc0,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55,  0x55, 
 0xfe,  0x40,  0xe4,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 };
-static PROGMEM prog_uchar sprites256_pal[] = {
+static flash_uint8_t sprites256_pal[] = {
 
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0xef,  0x3d,  0x00,  0x00,  0xc6,  0x18,  0xbd,  0x77, 
 0x08,  0x21,  0x00,  0x00,  0xff,  0x7f,  0xd6,  0x5a,  0x00,  0x00,  0xff,  0x7f,  0xbd,  0x77,  0x18,  0x63, 

+ 3 - 3
converted-assets/staunton.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar staunton_white[] = {
+static flash_uint8_t staunton_white[] = {
 
 0x00,  0x80,  0xfc,  0x7f,  0xdb,  0x7f,  0xda,  0x7f,  0xd8,  0x7f,  0xb9,  0x7f,  0xb8,  0x7f,  0xb7,  0x7b, 
 0x98,  0x7b,  0x98,  0x7f,  0x96,  0x7b,  0x76,  0x7f,  0x76,  0x7b,  0x97,  0x77,  0x96,  0x7b,  0x76,  0x77, 
@@ -34,7 +34,7 @@ static PROGMEM prog_uchar staunton_white[] = {
 0xa4,  0x24,  0xa4,  0x24,  0xa4,  0x20,  0xa4,  0x24,  0xa4,  0x20,  0xa4,  0x20,  0xa3,  0x20,  0xa3,  0x20, 
 0xa4,  0x1c,  0xa3,  0x20,  0xa5,  0x18,  0x83,  0x18,  0x62,  0x14,  0x41,  0x10,  0x21,  0x0c,  0x00,  0x00, 
 };
-static PROGMEM prog_uchar staunton_black[] = {
+static flash_uint8_t staunton_black[] = {
 
 0x00,  0x80,  0xff,  0x7f,  0xff,  0x7f,  0xde,  0x7b,  0xde,  0x7b,  0xbd,  0x77,  0x9c,  0x77,  0x9c,  0x73, 
 0x7b,  0x6f,  0x5a,  0x6f,  0x5a,  0x6b,  0xf7,  0x6e,  0xd6,  0x5e,  0x39,  0x67,  0x18,  0x63,  0xf7,  0x5e, 
@@ -70,7 +70,7 @@ static PROGMEM prog_uchar staunton_black[] = {
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 };
-static PROGMEM prog_uchar staunton_img[] = {
+static flash_uint8_t staunton_img[] = {
 
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 

+ 3 - 3
converted-assets/stone_wall_texture.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar stone_wall_texture_pic[] = {
+static flash_uint8_t stone_wall_texture_pic[] = {
 
 0x00,  0x01,  0x02,  0x03,  0x04,  0x05,  0x06,  0x07,  0x08,  0x09,  0x0a,  0x0b,  0x0c,  0x0d,  0x0e,  0x0f, 
 0x10,  0x11,  0x12,  0x13,  0x14,  0x15,  0x16,  0x17,  0x18,  0x19,  0x1a,  0x1b,  0x1c,  0x1d,  0x1e,  0x1f, 
@@ -17,7 +17,7 @@ static PROGMEM prog_uchar stone_wall_texture_pic[] = {
 0xe0,  0xe1,  0xe2,  0xe3,  0xe4,  0xe5,  0xe6,  0xe7,  0xe8,  0xe9,  0xea,  0xeb,  0xec,  0xed,  0xee,  0xef, 
 0xf0,  0xf1,  0xf2,  0xf3,  0xf4,  0xf5,  0xf6,  0xf7,  0xf8,  0xf9,  0xfa,  0xfb,  0xfc,  0xfd,  0xfe,  0xff, 
 };
-static PROGMEM prog_uchar stone_wall_texture_chr[] = {
+static flash_uint8_t stone_wall_texture_chr[] = {
 
 0xc8,  0x1b,  0xc9,  0x67,  0x18,  0x47,  0x21,  0x3e,  0x8a,  0x7d,  0xbc,  0x4d,  0x95,  0x1c,  0x90,  0x37, 
 0x8a,  0xdc,  0xba,  0xdf,  0x0a,  0xdc,  0xa2,  0x16,  0x0c,  0x57,  0x30,  0x57,  0x00,  0xfd,  0x2b,  0xa7, 
@@ -291,7 +291,7 @@ static PROGMEM prog_uchar stone_wall_texture_chr[] = {
 0x1f,  0xfc,  0xd3,  0xfc,  0x24,  0xea,  0x19,  0xa5,  0x0a,  0x84,  0x1a,  0xf5,  0x42,  0x01,  0x09,  0x4d, 
 0xd4,  0x27,  0x5f,  0x9f,  0xbd,  0x90,  0xf2,  0x92,  0x8c,  0x88,  0xbf,  0x24,  0x83,  0x18,  0x00,  0x2a, 
 };
-static PROGMEM prog_uchar stone_wall_texture_pal[] = {
+static flash_uint8_t stone_wall_texture_pal[] = {
 
 0x06,  0x21,  0xc5,  0x18,  0xa3,  0x14,  0x8a,  0x31,  0x69,  0x2d,  0x83,  0x10,  0xed,  0x3d,  0x27,  0x25, 
 0x83,  0x14,  0xac,  0x39,  0xc5,  0x1c,  0x27,  0x29,  0x06,  0x25,  0x8a,  0x31,  0x41,  0x0c,  0xa3,  0x18, 

+ 6 - 6
converted-assets/watterott_logo.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar wlogo_palette[] = {
+static flash_uint8_t wlogo_palette[] = {
 
 0xff,  0x7f,  0xd6,  0x5a,  0xb5,  0x56,  0xb5,  0x56,  0xb5,  0x56,  0xb5,  0x56,  0xb5,  0x56,  0x28,  0x6e, 
 0x94,  0x52,  0x52,  0x4e,  0xe3,  0x75,  0xe2,  0x71,  0x08,  0x21,  0x63,  0x0c,  0x00,  0x00,  0x00,  0x80, 
@@ -114,11 +114,11 @@ static void draw_spark(int x, int y, byte anim, byte rot, byte jk = 0)
         }
     }
     
-static PROGMEM prog_uchar spark_palette[] = {
+static flash_uint8_t spark_palette[] = {
 
 0xff,  0x7f,  0xc2,  0x71,  0x00,  0x00,  0x00,  0x80, 
 };
-static PROGMEM prog_uchar wlogo_compressed[] = {
+static flash_uint8_t wlogo_compressed[] = {
 
 0xc9,  0x81,  0x8e,  0xfb,  0x0f,  0x40,  0xe0,  0xdd,  0x07,  0xf0,  0xe0,  0x1f,  0xfc,  0x3c,  0x04,  0x40, 
 0x00,  0x0e,  0x02,  0x78,  0xf0,  0xf0,  0x17,  0x00,  0xc0,  0xb9,  0x0b,  0x60,  0xc1,  0x27,  0x84,  0x07, 
@@ -267,7 +267,7 @@ static PROGMEM prog_uchar wlogo_compressed[] = {
 0xaf,  0xe8,  0x35,  0xbc,  0xce,  0x37,  0xf4,  0xa6,  0xdf,  0xca,  0xdb,  0x7d,  0x67,  0xef,  0x7e,  0x80, 
 0x01, 
 };
-static PROGMEM prog_uchar logobg_pic[] = {
+static flash_uint8_t logobg_pic[] = {
 
 0x00,  0x00,  0x00,  0x01,  0x02,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x03,  0x04,  0x05, 
@@ -369,7 +369,7 @@ static PROGMEM prog_uchar logobg_pic[] = {
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00, 
 };
-static PROGMEM prog_uchar logobg_chr_compressed[] = {
+static flash_uint8_t logobg_chr_compressed[] = {
 
 0xc9,  0x01,  0x6f,  0x02,  0x08,  0xe0,  0x41,  0x1e,  0x00,  0x04,  0x00,  0x40,  0x01,  0x00,  0xa4,  0x00, 
 0x00,  0x2a,  0x00,  0x60,  0x81,  0x21,  0xfc,  0x47,  0xc1,  0x90,  0xa0,  0x14,  0x00,  0x2b,  0x02,  0xd0, 
@@ -468,7 +468,7 @@ static PROGMEM prog_uchar logobg_chr_compressed[] = {
 0x5c,  0x1e,  0x01,  0x86,  0x65,  0x80,  0x09,  0x59,  0xa1,  0x3b,  0xe5,  0x85,  0x2e,  0x26,  0x01,  0x12, 
 0x4a,  0x80,  0x85,  0x10,  0xa0,  0x73,  0x1c,  0x00, 
 };
-static PROGMEM prog_uchar logobg_pal_compressed[] = {
+static flash_uint8_t logobg_pal_compressed[] = {
 
 0xc9,  0x01,  0x6c,  0x00,  0x10,  0x00,  0x20,  0x80,  0x08,  0xf0,  0xcf,  0xdf,  0x11,  0xc7,  0xc0,  0x1f, 
 0xfc,  0x43,  0x7f,  0xf8,  0x8c,  0xfc,  0xe1,  0x3f,  0xf4,  0xc7,  0xff,  0xe8,  0x1f,  0xfb,  0xc3,  0x7f, 

+ 1 - 1
converted-assets/wireframe.h

@@ -1,4 +1,4 @@
-static PROGMEM prog_uchar wireframe_code[] = {
+static flash_uint8_t wireframe_code[] = {
 0xE0,0x15,
 0x44,0x60,
 0x0F,0x80,

+ 3 - 3
dna.ino

@@ -65,8 +65,8 @@ static struct screenpt projected[NVERTICES];
 void project(float distance)
 {
   byte vx;
-  prog_char *pm = cloud; 
-  prog_char *pm_e = cloud + (NVERTICES*3);
+  flash_int8_t *pm = cloud; 
+  flash_int8_t *pm_e = cloud + (NVERTICES*3);
   struct screenpt *dst = projected;
   signed char x, y, z;
 
@@ -178,7 +178,7 @@ void setup()
   Serial.begin(1000000);  // JCB
 
   for (byte y = 0; y < 38; y++) {
-    prog_uchar *src = ramp_pic + y * 4;
+    flash_uint8_t *src = ramp_pic + y * 4;
     for (byte x = 0; x < 50; x++)
       GD.wr(RAM_PIC + y * 64 + x, pgm_read_byte(src + random(4)));
   }

File diff suppressed because it is too large
+ 1 - 1
frogger.ino


+ 2 - 1
go

@@ -3,8 +3,9 @@ set -e
 python publish.py
 ls -l Gameduino.zip
 cp Gameduino.zip ~
+rm -rf $HOME/Arduino/libraries/Gameduino/
 unzip -o ~/Gameduino.zip -d $HOME/Arduino/libraries/ &&
 
-# ./runtests `cat testset` ; exit
 ./mkino manicminer
+./runtests `cat testset` ; exit
 # python /usr/share/doc/python-serial/examples/miniterm.py /dev/ttyUSB0 115200

File diff suppressed because it is too large
+ 1 - 1
instruments2.ino


File diff suppressed because it is too large
+ 8 - 8
manicminer.ino


+ 1 - 1
memloader.ino

@@ -1,7 +1,7 @@
 #include <SPI.h>
 #include <GD.h>
 
-static PROGMEM prog_uint32_t crc_table[16] = {
+static const PROGMEM uint32_t crc_table[16] = {
     0x00000000, 0x1db71064, 0x3b6e20c8, 0x26d930ac,
     0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c,
     0xedb88320, 0xf00f9344, 0xd6d6a3e8, 0xcb61b38c,

+ 1 - 1
player.ino

@@ -78,7 +78,7 @@ void adsr()  // handle ADSR for 64 voices
 
 void loop()
 {
-  prog_uchar *pc;
+  flash_uint8_t *pc;
   long started = millis();
   int ticks = 0;
   for (pc = mont; pc < mont + sizeof(mont);) {

+ 1 - 1
runtests

@@ -3,5 +3,5 @@ for p in $*
 do
   echo $p
   ./mkino $p
-  read X
+  # read X
 done

+ 1 - 1
screenshot.ino

@@ -14,7 +14,7 @@ void setup()
 
   GD.wr16(RAM_PAL + (8 * 127), RED);   // char 127: 0=red, 3=green
   GD.wr16(RAM_PAL + (8 * 127) + 6, GREEN);
-  static PROGMEM prog_uchar box[] = {
+  static flash_uint8_t box[] = {
      0xff, 0xff,
      0xc0, 0x03,
      0xc0, 0x03,

+ 1 - 1
scroll.ino

@@ -11,7 +11,7 @@ int atxy(int x, int y)
 // copy a (w,h) rectangle from the source image (x,y) into picture RAM
 static void rect(unsigned int dst, byte x, byte y, byte w, byte h)
 {
-  prog_uchar *src = platformer_pic + (16 * y) + x;
+  flash_uint8_t *src = platformer_pic + (16 * y) + x;
   while (h--) {
     GD.copy(dst, src, w);
     dst += 64;

+ 1 - 1
toccata.ino

@@ -74,7 +74,7 @@ static void pause(int n)
 
 static void play()
 {
-  prog_uchar *pc = widor_toccata;
+  flash_uint8_t *pc = widor_toccata;
   while (pc < (widor_toccata + sizeof(widor_toccata))) {
     byte a = pgm_read_byte_near(pc++);
     byte b = pgm_read_byte_near(pc++);

+ 1 - 1
watterott.ino

@@ -196,7 +196,7 @@ void loop()
     // JCB-JITTER-A
     GD.wr16(SCROLL_X, random(-1, 2));
     GD.wr16(SCROLL_Y, random(-1, 2));
-    prog_uchar *src = logobg_pic + (12 * 25 * jitter);
+    flash_uint8_t *src = logobg_pic + (12 * 25 * jitter);
     for (byte y = 0; y < 12; y++) {
       GD.copy(atxy(24, 12 + y), src, 25);
       src += 25;

+ 4 - 4
wireframe.ino

@@ -171,8 +171,8 @@ static byte projected[40 * 2];
 void project(struct ship *s, float distance)
 {
   byte vx;
-  prog_char *pm = s->vertices; 
-  prog_char *pm_e = pm + (s->nvertices * 3);
+  flash_int8_t *pm = s->vertices; 
+  flash_int8_t *pm_e = pm + (s->nvertices * 3);
   byte *dst = projected;
   char x, y, z;
 
@@ -193,8 +193,8 @@ void draw(struct ship *s, float distance)
 {
   project(s, distance);
 
-  prog_uchar *pe = s->edges; 
-  prog_uchar *pe_e = pe + (s->nedges * 2);
+  flash_uint8_t *pe = s->edges; 
+  flash_uint8_t *pe_e = pe + (s->nedges * 2);
   while (pe < pe_e) {
     byte *v0 = &projected[pgm_read_byte_near(pe++) << 1];
     byte *v1 = &projected[pgm_read_byte_near(pe++) << 1];

Some files were not shown because too many files changed in this diff